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

fail gracefully if git mark-merge-base is called in cog

Browse Source 
Bug: 339231299
Change-Id: I882365cd75e5945ecbf01bdca5a2b67735eb58da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5540670
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Yiwei Zhang
2024-05-15 21:26:36 +00:00
committed by LUCI CQ
parent 60997ea745
commit 25120f4278
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git_mark_merge_base.py
View File

@@ -18,8 +18,14 @@ from subprocess2 import CalledProcessError
from git_common import remove_merge_base, manual_merge_base, current_branch from git_common import remove_merge_base, manual_merge_base, current_branch
from git_common import get_or_create_merge_base, hash_one, upstream from git_common import get_or_create_merge_base, hash_one, upstream
import gclient_utils
def main(argv): def main(argv):
if gclient_utils.IsEnvCog():
print('mark-merge-base command is not supported in non-git '
'environment.', file=sys.stderr)
return 1
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description=__doc__.strip().splitlines()[0], description=__doc__.strip().splitlines()[0],
epilog=' '.join(__doc__.strip().splitlines()[1:])) epilog=' '.join(__doc__.strip().splitlines()[1:]))