)]}'
{"zuul/merger/merger.py":[{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"857790902ee198abdc1dd3e2c066e9ac32d809c1","unresolved":false,"context_lines":[{"line_number":472,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":473,"context_line":"        self._git_fetch(repo, repository, zuul_event_id, ref\u003dref)"},{"line_number":474,"context_line":""},{"line_number":475,"context_line":"    def push(self, branch, zuul_event_id\u003dNone):"},{"line_number":476,"context_line":"        log \u003d get_annotated_logger(self.log, zuul_event_id)"},{"line_number":477,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":478,"context_line":"        log.debug(\"Pushing repository %s\" % self.local_path)"}],"source_content_type":"text/x-python","patch_set":4,"id":"7faddb67_37f254e5","line":475,"updated":"2019-08-22 22:41:09.000000000","message":"Does it make sense to keep the remote and have it default to origin? That may be useful to push code to multiple locations?\n\nAdditionally I think you can push to any ref so \"branch\" may not be the best parameter name here.","commit_id":"21db64bdaa4b71ed5ff9e5084e5abf06139c2b85"},{"author":{"_account_id":27952,"name":"Felix Edel","email":"felix.edel@bmw.de","username":"felix.schmidt"},"change_message_id":"9fdd3a8dba0632f21978a60c97c31e097c672742","unresolved":false,"context_lines":[{"line_number":472,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":473,"context_line":"        self._git_fetch(repo, repository, zuul_event_id, ref\u003dref)"},{"line_number":474,"context_line":""},{"line_number":475,"context_line":"    def push(self, branch, zuul_event_id\u003dNone):"},{"line_number":476,"context_line":"        log \u003d get_annotated_logger(self.log, zuul_event_id)"},{"line_number":477,"context_line":"        repo \u003d self.createRepoObject(zuul_event_id)"},{"line_number":478,"context_line":"        log.debug(\"Pushing repository %s\" % self.local_path)"}],"source_content_type":"text/x-python","patch_set":4,"id":"7faddb67_e3ecfabc","line":475,"in_reply_to":"7faddb67_37f254e5","updated":"2019-08-23 05:26:52.000000000","message":"That sounds reasonable :), I will change it.","commit_id":"21db64bdaa4b71ed5ff9e5084e5abf06139c2b85"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"857790902ee198abdc1dd3e2c066e9ac32d809c1","unresolved":false,"context_lines":[{"line_number":865,"context_line":"                # local state to the remote branch"},{"line_number":866,"context_line":"                log.debug(\"Merging for change %s,%s before pushing\" %"},{"line_number":867,"context_line":"                          (item[\"number\"], item[\"patchset\"]))"},{"line_number":868,"context_line":"                orig_commit, commit \u003d self._mergeItem("},{"line_number":869,"context_line":"                    item, recent, repo_state, zuul_event_id, branches\u003dbranches)"},{"line_number":870,"context_line":"                if not commit:"},{"line_number":871,"context_line":"                    return None"}],"source_content_type":"text/x-python","patch_set":4,"id":"7faddb67_171e380d","line":868,"updated":"2019-08-22 22:41:09.000000000","message":"I know one of the reasons why people want zuul to push changes back is to preserve commit ids between what was tested and what gets merged into the canonical repo.\n\nI don\u0027t think we can do a new merge if we want that behavior. That said because the mergers are distributed there is no guarantee that the merger that gets the push job will have previously merged the commit for testing.\n\nThat is a long winded way of saying I think we should consider how we might accomplish this functionality, but it probably isn\u0027t necessary for the first pass.","commit_id":"21db64bdaa4b71ed5ff9e5084e5abf06139c2b85"},{"author":{"_account_id":27952,"name":"Felix Edel","email":"felix.edel@bmw.de","username":"felix.schmidt"},"change_message_id":"9fdd3a8dba0632f21978a60c97c31e097c672742","unresolved":false,"context_lines":[{"line_number":865,"context_line":"                # local state to the remote branch"},{"line_number":866,"context_line":"                log.debug(\"Merging for change %s,%s before pushing\" %"},{"line_number":867,"context_line":"                          (item[\"number\"], item[\"patchset\"]))"},{"line_number":868,"context_line":"                orig_commit, commit \u003d self._mergeItem("},{"line_number":869,"context_line":"                    item, recent, repo_state, zuul_event_id, branches\u003dbranches)"},{"line_number":870,"context_line":"                if not commit:"},{"line_number":871,"context_line":"                    return None"}],"source_content_type":"text/x-python","patch_set":4,"id":"7faddb67_a307e281","line":868,"in_reply_to":"7faddb67_171e380d","updated":"2019-08-23 05:26:52.000000000","message":"I\u0027m not too familiar with this, but could we use the repo_state for that? In the beginning I wanted to use the mergeChanges() function directly as this should \"recreate\" the same merge if it was present once, right? But then I wasn\u0027t sure how to deal with the looping and repo_locks in that case as I think that the push should be done in one go with the merge. Otherwise there could be another job or repo interfering with that operation, or?","commit_id":"21db64bdaa4b71ed5ff9e5084e5abf06139c2b85"}]}