gclient_scm.py - Issue 214813002: Ignore anything after '@' in SCMWrapper.DoesRemoteURLMatch

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 214813002: Ignore anything after '@' in SCMWrapper.DoesRemoteURLMatch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Use gclient_urils.SplitUrlRevision Created 6 years, 9 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:

View side-by-side diff with in-line comments

Download patch

Index: gclient_scm.py

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

index fd098e2405f4cfb17e4a20d2fc8618f3300f9a5e..4f2e1e2186eef28c05e13731a74c8ed3088f175b 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -158,7 +158,8 @@ class SCMWrapper(object):

actual_remote_url = self.GetActualRemoteURL()

if actual_remote_url:

- return actual_remote_url.rstrip('/') == self.url.rstrip('/')

+ return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')

+ == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))

else:

# This may occur if the self.checkout_path exists but does not contain a

# valid git or svn checkout.

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