Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: gclient.py

Issue 671003003: Get rid of spurious warning about bad --revision flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient.py
diff --git a/gclient.py b/gclient.py
index bbe6d582b8aaa12e412e8ce3a9eb51288739e0dc..86d45131786521073529607216f830503918ea38 100755
--- a/gclient.py
+++ b/gclient.py
@@ -802,6 +802,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
run_scm = command not in ('runhooks', 'recurse', None)
parsed_url = self.LateOverride(self.url)
file_list = [] if not options.nohooks else None
+ revision_override = revision_overrides.pop(self.name, None)
if run_scm and parsed_url:
if isinstance(parsed_url, self.FileImpl):
# Special support for single-file checkout.
@@ -817,7 +818,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
else:
# Create a shallow copy to mutate revision.
options = copy.copy(options)
- options.revision = revision_overrides.pop(self.name, None)
+ options.revision = revision_override
self.maybeGetParentRevision(
command, options, parsed_url, self.parent)
self._used_revision = options.revision
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698