gclient_scm.py - Issue 10694022: Only call IsValidRevision() when it is a git hash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gclient_scm.py

Issue 10694022: Only call IsValidRevision() when it is a git hash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index 0f34d38601fc3d3ebd9df62b775ec9e7e249db79..a466e3f7239d464ed8c258fb0ea5d7f13211a6e7 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -353,7 +353,8 @@ class GitWrapper(SCMWrapper):

else:

raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)

- if not scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=revision):

+ if (not re.match(r'^[0-9a-fA-F]{40}$', revision) or

+ not scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=revision)):

# Update the remotes first so we have all the refs.

backoff_time = 5

for _ in range(10):

« no previous file with comments | « no previous file | no next file » | no next file with comments »