InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[git_common] Add type annotations

Browse Source 
Bug: b/351071334
Change-Id: I876db267bdd8d876a22d4582bd6505705d1c38ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5754254
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Allen Li <ayatane@chromium.org>
This commit is contained in:
Allen Li
2024-08-02 23:56:05 +00:00
committed by LUCI CQ
parent 29838db8fe
commit 0cb94fcfa9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
git_common.py
View File

@@ -358,7 +358,9 @@ def blame(filename, revision=None, porcelain=False, abbrev=None, *_args):
return run(*command)
def branch_config(branch, option, default=None):
def branch_config(branch: str,
option: str,
default: Optional[str] = None) -> Optional[str]:
return get_config('branch.%s.%s' % (branch, option), default=default)
@@ -402,7 +404,7 @@ def branches(use_limit=True, *args):
yield line.split()[-1]
def get_config(option, default=None):
def get_config(option: str, default: Optional[str] = None) -> Optional[str]:
return scm.GIT.GetConfig(os.getcwd(), option, default)
def get_config_int(option, default=0):
@@ -581,17 +583,17 @@ def get_branch_tree(use_limit=False):
return skipped, branch_tree
def get_or_create_merge_base(branch, parent=None):
def get_or_create_merge_base(branch, parent=None) -> str:
"""Finds the configured merge base for branch.
If parent is supplied, it's used instead of calling upstream(branch).
"""
base = branch_config(branch, 'base')
base: Optional[str] = branch_config(branch, 'base')
base_upstream = branch_config(branch, 'base-upstream')
parent = parent or upstream(branch)
if parent is None or branch is None:
return None
actual_merge_base = run('merge-base', parent, branch)
actual_merge_base: str = run('merge-base', parent, branch)
if base_upstream != parent:
base = None
@@ -616,6 +618,7 @@ def get_or_create_merge_base(branch, parent=None):
base = actual_merge_base
manual_merge_base(branch, base, parent)
assert isinstance(base, str)
return base