From 8c2a605d248d1ba40944399709151fe0126c6668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Wed, 15 Jan 2020 17:35:45 +0100 Subject: [PATCH] restored original script --- scripts/phabtalk/apply_patch.py | 126 ++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100755 scripts/phabtalk/apply_patch.py diff --git a/scripts/phabtalk/apply_patch.py b/scripts/phabtalk/apply_patch.py new file mode 100755 index 0000000..2a9d7c0 --- /dev/null +++ b/scripts/phabtalk/apply_patch.py @@ -0,0 +1,126 @@ +#!/bin/env python3 +# Copyright 2019 Google LLC +# +# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://llvm.org/LICENSE.txt +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import argparse +import json +import os +import subprocess +import sys +from typing import List, Optional +from phabricator import Phabricator + +class ApplyPatch: + + def __init__(self, comment_file_path: str): + # TODO: turn os.environ parameter into command line arguments + # this would be much clearer and easier for testing + self.comment_file_path = comment_file_path + self.conduit_token = os.environ.get('CONDUIT_TOKEN') # type: Optional[str] + self.host = os.environ.get('PHABRICATOR_HOST') # type: Optional[str] + self._load_arcrc() + self.diff_id = os.environ['DIFF_ID'] # type: str + self.diff_json_path = os.environ['DIFF_JSON'] # type: str + if not self.host.endswith('/api/'): + self.host += '/api/' + self.phab = Phabricator(token=self.conduit_token, host=self.host) + self.git_hash = None # type: Optional[str] + self.msg = [] # type: List[str] + + def _load_arcrc(self): + """Load arc configuration from file if not set.""" + if self.conduit_token is not None or self.host is not None: + return + print('Loading configuration from ~/.arcrc file') + with open(os.path.expanduser('~/.arcrc'), 'r') as arcrc_file: + arcrc = json.load(arcrc_file) + # use the first host configured in the file + self.host = next(iter(arcrc['hosts'])) + self.conduit_token = arcrc['hosts'][self.host]['token'] + + def run(self): + """try to apply the patch from phabricator + + Write to `self.comment_file` for showing error messages on Phabricator. + """ + self.phab.update_interfaces() + + try: + self._get_parent_hash() + self._git_checkout() + self._apply_patch() + finally: + self._write_error_message() + + def _get_parent_hash(self) -> str: + diff = self.phab.differential.getdiff(diff_id=self.diff_id) + # Keep a copy of the Phabricator answer for later usage in a json file + try: + with open(self.diff_json_path,'w') as json_file: + json.dump(diff.response, json_file, sort_keys=True, indent=4) + print('Wrote diff details to "{}".'.format(self.diff_json_path)) + except Exception: + print('WARNING: could not write build/diff.json log file') + self.git_hash = diff['sourceControlBaseRevision'] + + def _git_checkout(self): + try: + print('Checking out git hash {}'.format(self.git_hash)) + subprocess.check_call('git reset --hard {}'.format(self.git_hash), + stdout=sys.stdout, stderr=sys.stderr, shell=True) + except subprocess.CalledProcessError: + print('WARNING: checkout of hash failed, using master branch instead.') + self.msg += [ + 'Could not check out parent git hash "{}". It was not found in ' + 'the repository. Did you configure the "Parent Revision" in ' + 'Phabricator properly? Trying to apply the patch to the ' + 'master branch instead...'.format(self.git_hash)] + subprocess.check_call('git checkout master', stdout=sys.stdout, + stderr=sys.stderr, shell=True) + print('git checkout completed.') + + def _apply_patch(self): + print('running arc patch...') + cmd = 'arc patch --force --nobranch --no-ansi --diff "{}" --nocommit '\ + '--conduit-token "{}" --conduit-uri "{}"'.format( + self.diff_id, self.conduit_token, self.host ) + result = subprocess.run(cmd, capture_output=True, shell=True, text=True) + print(result.stdout + result.stderr) + if result.returncode != 0: + msg = ( + 'ERROR: arc patch failed with error code {}. ' + 'Check build log for details.'.format(result.returncode)) + self.msg += [msg] + raise Exception(msg) + print('Patching completed.') + + def _write_error_message(self): + """Write the log message to a file.""" + if self.comment_file_path is None: + return + + if len(self.msg) == 0: + return + print('writing error message to {}'.format(self.comment_file_path)) + with open(self.comment_file_path, 'a') as comment_file: + text = '\n\n'.join(self.msg) + comment_file.write(text) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Apply Phabricator patch to working directory.') + parser.add_argument('--comment-file', type=str, dest='comment_file_path', default=None) + args = parser.parse_args() + patcher = ApplyPatch(args.comment_file_path) + patcher.run() +