5 Commits (0781020be2613a61de52640939d1e05f73a2287b)

Author SHA1 Message Date
Clark Boylan 4c6566b9d5 Add more logging to zuul merger process 9 years ago
James E. Blair bb1fe50c6f Fix ZUUL_COMMIT in certain conditions 9 years ago
Antoine Musso 5f53e600c9 Merger: log non Git exceptions on merge 9 years ago
James E. Blair 4076e2b432 Split the merger into a separate process 9 years ago
James E. Blair ac2c324e4f Move the merger to a JSON-compatible API 9 years ago
James E. Blair 9ca3983a75 Remove Zuul ref replication. 9 years ago
James E. Blair 01c2e63057 Remove push refs to gerrit feature 9 years ago
James E. Blair 87650fa736 Add Zuul ref replication 9 years ago
Clark Boylan 4ba48d9967 GC git.Repo objects in merger.Repo operations. 9 years ago
Clark Boylan 6dbbc488d2 Clone repo if it is not on disk 9 years ago
James E. Blair b34e9261fe Revert bogus merger optimizations 9 years ago
James E. Blair 6eeb24743a Fix checkout when preparing a ref 9 years ago
James E. Blair 96ee718c4b Don't reset the local repo 9 years ago
James E. Blair bfd5853957 Fetch specific refs on ref-updated events 9 years ago
James E. Blair 19deff2a49 Use the 'resolve' merge strategy by default 9 years ago
James E. Blair 287c06dca6 Delay initialization of local repos 9 years ago
James E. Blair 78e31b30ba Make E128 pep8 clean 9 years ago
James E. Blair fee8d6588a Idempotent scheduler and QueueItems 9 years ago
Paul Belanger b67aba1d94 Add the ability to set git user.email and user.name 9 years ago
Antoine Musso feba967f30 update remote on ref-update 10 years ago
Antoine Musso d71e297421 support to update a repository 10 years ago
Clark Boylan c259232d04 Remember merges to save time. 10 years ago
Clark Boylan e9ed907690 Revert "Dequeue changes if they have no hope of merging." 10 years ago
Clark Boylan dd26978d5d Dequeue changes if they have no hope of merging. 10 years ago
Antoine Musso f2626eb384 reset on origin/HEAD not master 10 years ago
James E. Blair ad61501575 Support sshkey in merger. 10 years ago
James E. Blair 4886f28533 Reinitialize the repo object after a fetch. 10 years ago
James E. Blair 554ba5431f Log merge errors (at level DEBUG). 10 years ago
Clark Boylan 14b5537607 Retry git fetches to work around GitPython bug. 10 years ago
James E. Blair 81515adbd6 Add ZUUL_COMMIT. 10 years ago
James E. Blair 05fed6074e Clear the git repo cache on update. 10 years ago
James E. Blair ceabcbca1b Make pushing zuul refs upstream optional. 10 years ago
James E. Blair c6294a5925 Fix merger handling of branches. 10 years ago
James E. Blair daabed2d7f Push zuul-merged refs to gerrit. 10 years ago
James E. Blair 973721faaf Have zuul handle merge failures. 10 years ago
James E. Blair 4886cc186f Add merging capability. 10 years ago