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

Unified Diff: fetch.py

Issue 1959193002: Fix depot_tools presubmit's local_rietveld script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: gitignore Created 4 years, 7 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: fetch.py
diff --git a/fetch.py b/fetch.py
index cf34404e4c1a15b1353869c7489cb1462a3e04a8..0fbc378511b1f6ee44209731a7ba0976ed10c1e7 100755
--- a/fetch.py
+++ b/fetch.py
@@ -231,6 +231,7 @@ def usage(msg=None):
Valid options:
-h, --help, help Print this message.
--nohooks Don't run hooks after checkout.
+ --force (dangerous) Don't look for existing .gclient file.
-n, --dry-run Don't run commands, only print them.
--no-history Perform shallow clones, don't fetch the full git history.
@@ -255,6 +256,7 @@ def handle_args(argv):
dry_run = False
nohooks = False
no_history = False
+ force = False
while len(argv) >= 2:
dsansome 2016/05/10 07:37:45 Parsing arguments manually in Python... what year
arg = argv[1]
if not arg.startswith('-'):
@@ -266,6 +268,8 @@ def handle_args(argv):
nohooks = True
elif arg == '--no-history':
no_history = True
+ elif arg == '--force':
+ force = True
else:
usage('Invalid option %s.' % arg)
@@ -279,8 +283,11 @@ def handle_args(argv):
config = argv[1]
props = argv[2:]
return (
- optparse.Values(
- {'dry_run':dry_run, 'nohooks':nohooks, 'no_history': no_history }),
+ optparse.Values({
+ 'dry_run': dry_run,
+ 'nohooks': nohooks,
+ 'no_history': no_history,
+ 'force': force}),
config,
props)
@@ -324,7 +331,7 @@ def run(options, spec, root):
checkout = CheckoutFactory(checkout_type, options, checkout_spec, root)
except KeyError:
return 1
- if checkout.exists():
+ if not options.force and checkout.exists():
print 'Your current directory appears to already contain, or be part of, '
print 'a checkout. "fetch" is used only to get new checkouts. Use '
print '"gclient sync" to update existing checkouts.'
« no previous file with comments | « .gitignore ('k') | fetch_configs/infra.py » ('j') | testing_support/local_rietveld.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698