gclient_scm.py - Issue 488273003: Only check for clean repos when not (--force or --reset).

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 488273003: Only check for clean repos when not (--force or --reset). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 4 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 acebb099637dd0b486079f766657a98feecc294d..0dabd265e4fbfb1b388156dff71cca2914444a3e 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -426,8 +426,9 @@ class GitWrapper(SCMWrapper):

['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],

cwd=self.checkout_path).strip() != 'False'):

self.Print('_____ switching %s to a new upstream' % self.relpath)

- # Make sure it's clean

- self._CheckClean(rev_str)

+ if not (options.force or options.reset):

+ # Make sure it's clean

+ self._CheckClean(rev_str)

# Switch over to the new upstream

self._Run(['remote', 'set-url', self.remote, url], options)

self._FetchAndReset(revision, file_list, options)

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