revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

Include the Phabricator review ID in commit messages

Browse source 
This allows jobs that trigger on these branches being created to
access this information.
This commit is contained in:
Louis Dionne 2020-09-29 15:08:42 -04:00 committed by Mikhail Goncharov
parent 405643a089
commit fbdc3d9ecc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/phabtalk/apply_patch2.py
View file

@ -129,7 +129,7 @@ class ApplyPatch:
logging.info('applying original diff') logging.info('applying original diff')
self._apply_diff(self.diff_id, revision_id) self._apply_diff(self.diff_id, revision_id)
if self.push_branch: if self.push_branch:
self._commit_and_push() self._commit_and_push(revision_id)
else: else:
self.repo.git.add('-u', '.') self.repo.git.add('-u', '.')
return 0 return 0
@ -179,7 +179,7 @@ class ApplyPatch:
self.repo.head.reset(index=True, working_tree=True) self.repo.head.reset(index=True, working_tree=True)
logging.info('Base branch revision is {}'.format(self.repo.head.commit.hexsha)) logging.info('Base branch revision is {}'.format(self.repo.head.commit.hexsha))
def _commit_and_push(self): def _commit_and_push(self, revision_id):
"""Commit the patch and push it to origin.""" """Commit the patch and push it to origin."""
if not self.push_branch: if not self.push_branch:
return return
@ -189,7 +189,8 @@ class ApplyPatch:
Applying diff {} Applying diff {}
Phabricator-ID: {} Phabricator-ID: {}
""".format(self.diff_id, self.phid) Review-ID: {}
""".format(self.diff_id, self.phid, diff_to_str(revision_id))
self.repo.index.commit(message=message) self.repo.index.commit(message=message)
self.repo.git.push('--force', 'origin', self.branch_name) self.repo.git.push('--force', 'origin', self.branch_name)
logging.info('Branch {} pushed to origin'.format(self.branch_name)) logging.info('Branch {} pushed to origin'.format(self.branch_name))