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

Add the Phabricator ID to the commit messages

Browse source 
This allows parsing the commit message to get the Phabricator ID when
triggering jobs from unrelated pipelines.
This commit is contained in:
Louis Dionne 2020-09-24 15:23:07 -04:00 • committed by Mikhail Goncharov
parent 606f209bf2
commit 3a0eda3819
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/buildkite/apply_patch.sh
View file

@ -24,6 +24,7 @@ scripts/phabtalk/apply_patch2.py $ph_buildable_diff \
--url $PHABRICATOR_HOST \ --url $PHABRICATOR_HOST \
--log-level $LOG_LEVEL \ --log-level $LOG_LEVEL \
--commit $BASE_COMMIT \ --commit $BASE_COMMIT \
--phid ${ph_target_phid} \
--push-branch --push-branch
EXIT_STATUS=$? EXIT_STATUS=$?

12
scripts/phabtalk/apply_patch2.py
View file

@ -56,12 +56,13 @@ class ApplyPatch:
""" """
def __init__(self, path: str, diff_id: int, token: str, url: str, git_hash: str, def __init__(self, path: str, diff_id: int, token: str, url: str, git_hash: str,
push_branch: bool = False): phid: str, push_branch: bool = False):
self.push_branch = push_branch # type: bool self.push_branch = push_branch # type: bool
self.conduit_token = token # type: Optional[str] self.conduit_token = token # type: Optional[str]
self.host = url # type: Optional[str] self.host = url # type: Optional[str]
self._load_arcrc() self._load_arcrc()
self.diff_id = diff_id # type: int self.diff_id = diff_id # type: int
self.phid = phid # type: str
if not self.host.endswith('/api/'): if not self.host.endswith('/api/'):
self.host += '/api/' self.host += '/api/'
self.phab = self._create_phab() self.phab = self._create_phab()
@ -181,8 +182,12 @@ class ApplyPatch:
return return
self.repo.git.add('-A') self.repo.git.add('-A')
self.repo.index.commit(message='applying Diff {}'.format( message = """
self.diff_id)) Applying diff {}
Phabricator-ID: {}
""".format(self.diff_id, self.phid)
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))
pass pass
@ -319,6 +324,7 @@ if __name__ == "__main__":
help='Use this commit as a base. For "auto" tool tries to pick the base commit itself') help='Use this commit as a base. For "auto" tool tries to pick the base commit itself')
parser.add_argument('--push-branch', action='store_true', dest='push_branch', parser.add_argument('--push-branch', action='store_true', dest='push_branch',
help='choose if branch shall be pushed to origin') help='choose if branch shall be pushed to origin')
parser.add_argument('--phid', type=str, default=None, help='Phabricator ID of the review this commit pertains to')
parser.add_argument('--log-level', type=str, default='INFO') parser.add_argument('--log-level', type=str, default='INFO')
args = parser.parse_args() args = parser.parse_args()
logging.basicConfig(level=args.log_level, format='%(levelname)-7s %(message)s') logging.basicConfig(level=args.log_level, format='%(levelname)-7s %(message)s')