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

Drop support for master branch in roll_dep

Browse Source 
R=gavinmak@google.com

Fixed: 1118447
Change-Id: I733c7f345a3a8e1dd4bf3a9935306ba43b1584c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3360904
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
This commit is contained in:
Josip Sokcevic
2022-01-12 00:44:14 +00:00
committed by LUCI CQ
parent 35061445ba
commit c1a06c1ae0
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
roll_dep.py
View File

@@ -5,8 +5,8 @@
"""Rolls DEPS controlled dependency.
Works only with git checkout and git dependencies. Currently this
script will always roll to the tip of to origin/main or origin/master.
Works only with git checkout and git dependencies. Currently this script will
always roll to the tip of to origin/main.
"""
from __future__ import print_function
@@ -72,22 +72,13 @@ def return_code(*args, **kwargs):
def is_pristine(root):
"""Returns True if a git checkout is pristine."""
# Check both origin/master and origin/main since many projects are
# transitioning to origin/main.
for branch in ('origin/main', 'origin/master'):
# `git rev-parse --verify` has a non-zero return code if the revision
# doesn't exist.
rev_cmd = ['git', 'rev-parse', '--verify', '--quiet',
'refs/remotes/' + branch]
if return_code(rev_cmd, cwd=root) != 0:
continue
diff_cmd = ['git', 'diff', '--ignore-submodules', branch]
return (not check_output(diff_cmd, cwd=root).strip() and
not check_output(diff_cmd + ['--cached'], cwd=root).strip())
# `git rev-parse --verify` has a non-zero return code if the revision
# doesn't exist.
diff_cmd = ['git', 'diff', '--ignore-submodules', 'origin/main']
return (not check_output(diff_cmd, cwd=root).strip() and
not check_output(diff_cmd + ['--cached'], cwd=root).strip())
raise Error('Couldn\'t find any of origin/main or origin/master')
def get_log_url(upstream_url, head, tot):
"""Returns an URL to read logs via a Web UI if applicable."""