Allow specifying base commit in apply_patch2
+ formatting changes and IDE warnings about types (e.g. str <-> int)
This commit is contained in:
parent
7e51fbcd8f
commit
cf69866178
1 changed files with 29 additions and 25 deletions
|
@ -12,6 +12,7 @@
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
@ -23,6 +24,7 @@ from typing import List, Optional, Tuple
|
||||||
from phabricator import Phabricator
|
from phabricator import Phabricator
|
||||||
from git import Repo, GitCommandError
|
from git import Repo, GitCommandError
|
||||||
|
|
||||||
|
|
||||||
class ApplyPatch:
|
class ApplyPatch:
|
||||||
"""Apply a diff from Phabricator on local working copy.
|
"""Apply a diff from Phabricator on local working copy.
|
||||||
|
|
||||||
|
@ -30,29 +32,26 @@ class ApplyPatch:
|
||||||
that have already landed, but could not be identified by `arc patch`.
|
that have already landed, but could not be identified by `arc patch`.
|
||||||
|
|
||||||
For a given diff_id, this class will get the dependencies listed on Phabricator.
|
For a given diff_id, this class will get the dependencies listed on Phabricator.
|
||||||
For each dependency D it wil check, if D has already landed by looking
|
For each dependency D it will check the diff history:
|
||||||
for the id of D in the gif history. If D has not landed, it will download
|
- if D has already landed, skip it.
|
||||||
the patch for D and try to apply it locally. Once this class has applied all
|
- If D has not landed, it will download the patch for D and try to apply it locally.
|
||||||
dependencies, it will apply the diff itself.
|
Once this class has applied all dependencies, it will apply the diff itself.
|
||||||
|
|
||||||
|
|
||||||
This script must be called from the root folder of a local checkout of
|
This script must be called from the root folder of a local checkout of
|
||||||
https://github.com/llvm/llvm-project
|
https://github.com/llvm/llvm-project
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, diff_id:str, comment_file_path: str, token: str, url: str, store_json_diff: str):
|
def __init__(self, diff_id: int, comment_file_path: str, token: str, url: str, store_json_diff: str, git_hash: 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.comment_file_path = comment_file_path
|
||||||
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: str
|
self.diff_id = diff_id # type: int
|
||||||
self.diff_json_path = store_json_diff # type: str
|
self.diff_json_path = store_json_diff # 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()
|
||||||
self.git_hash = None # type: Optional[str]
|
self.git_hash = git_hash # type: Optional[str]
|
||||||
self.msg = [] # type: List[str]
|
self.msg = [] # type: List[str]
|
||||||
self.repo = Repo(os.getcwd()) # type: Repo
|
self.repo = Repo(os.getcwd()) # type: Repo
|
||||||
|
|
||||||
|
@ -75,6 +74,9 @@ class ApplyPatch:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
revision_id, dependencies, base_revision = self._get_dependencies()
|
revision_id, dependencies, base_revision = self._get_dependencies()
|
||||||
|
if self.git_hash is not None:
|
||||||
|
print('Using base revision provided by command line')
|
||||||
|
base_revision = self.git_hash
|
||||||
print('Checking out {}...'.format(base_revision))
|
print('Checking out {}...'.format(base_revision))
|
||||||
try:
|
try:
|
||||||
self.repo.git.checkout(base_revision)
|
self.repo.git.checkout(base_revision)
|
||||||
|
@ -94,6 +96,7 @@ class ApplyPatch:
|
||||||
print(' These are missing on master: {}'.format(diff_list_to_str(missing)))
|
print(' These are missing on master: {}'.format(diff_list_to_str(missing)))
|
||||||
for revision in missing:
|
for revision in missing:
|
||||||
self._apply_revision(revision)
|
self._apply_revision(revision)
|
||||||
|
print('All depended diffs are applied')
|
||||||
self._apply_diff(self.diff_id, revision_id)
|
self._apply_diff(self.diff_id, revision_id)
|
||||||
print('done.')
|
print('done.')
|
||||||
finally:
|
finally:
|
||||||
|
@ -104,7 +107,7 @@ class ApplyPatch:
|
||||||
phab.update_interfaces()
|
phab.update_interfaces()
|
||||||
return phab
|
return phab
|
||||||
|
|
||||||
def _get_diff(self, diff_id: str):
|
def _get_diff(self, diff_id: int):
|
||||||
"""Get a diff from Phabricator based on it's diff id."""
|
"""Get a diff from Phabricator based on it's diff id."""
|
||||||
return self.phab.differential.getdiff(diff_id=diff_id)
|
return self.phab.differential.getdiff(diff_id=diff_id)
|
||||||
|
|
||||||
|
@ -112,17 +115,16 @@ class ApplyPatch:
|
||||||
"""Get a revision from Phabricator based on its revision id."""
|
"""Get a revision from Phabricator based on its revision id."""
|
||||||
return self.phab.differential.query(ids=[revision_id])[0]
|
return self.phab.differential.query(ids=[revision_id])[0]
|
||||||
|
|
||||||
def _get_revisions(self, *, phids: str = None):
|
def _get_revisions(self, *, phids: List[str] = None):
|
||||||
"""Get a list of revisions from Phabricator based on their PH-IDs."""
|
"""Get a list of revisions from Phabricator based on their PH-IDs."""
|
||||||
if phids is None:
|
if phids is None:
|
||||||
raise InputError('no arguments given')
|
raise Exception('_get_revisions phids is None')
|
||||||
if phids == []:
|
if not phids:
|
||||||
# Handle an empty query locally. Otherwise the connection
|
# Handle an empty query locally. Otherwise the connection
|
||||||
# will time out.
|
# will time out.
|
||||||
return []
|
return []
|
||||||
return self.phab.differential.query(phids=phids)
|
return self.phab.differential.query(phids=phids)
|
||||||
|
|
||||||
|
|
||||||
def _get_dependencies(self) -> Tuple[int, List[int], str]:
|
def _get_dependencies(self) -> Tuple[int, List[int], str]:
|
||||||
"""Get all dependencies for the diff."""
|
"""Get all dependencies for the diff."""
|
||||||
diff = self._get_diff(self.diff_id)
|
diff = self._get_diff(self.diff_id)
|
||||||
|
@ -201,12 +203,14 @@ def diff_list_to_str(diffs: List[int]) -> str:
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
parser = argparse.ArgumentParser(description='Apply Phabricator patch to working directory.')
|
parser = argparse.ArgumentParser(description='Apply Phabricator patch to working directory.')
|
||||||
parser.add_argument('diff_id', type=str)
|
parser.add_argument('diff_id', type=int)
|
||||||
|
# TODO: instead of --comment-file use stdout / stderr.
|
||||||
parser.add_argument('--comment-file', type=str, dest='comment_file_path', default=None)
|
parser.add_argument('--comment-file', type=str, dest='comment_file_path', default=None)
|
||||||
parser.add_argument('--token', type=str, default=None)
|
parser.add_argument('--token', type=str, default=None, help='Conduit API token')
|
||||||
parser.add_argument('--url', type=str, default=None)
|
parser.add_argument('--url', type=str, default=None, help='Phabricator URL')
|
||||||
parser.add_argument('--store-json-diff', dest='store_json_diff', type=str, default=None)
|
parser.add_argument('--store-json-diff', dest='store_json_diff', type=str, default=None)
|
||||||
|
parser.add_argument('--commit', dest='commit', type=str, default=None,
|
||||||
|
help='Use this commit as a base. By default tool tries to pick the base commit itself')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
patcher = ApplyPatch(args.diff_id, args.comment_file_path, args.token, args.url, args.store_json_diff)
|
patcher = ApplyPatch(args.diff_id, args.comment_file_path, args.token, args.url, args.store_json_diff)
|
||||||
patcher.run()
|
patcher.run()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue