Bug 508955. Address comment #2 in proper handling of hg clone options. r=Callek
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Wed, 17 Feb 2010 15:24:59 -0500
changeset 4943 8c50713ab30c85ae980f5b2fae8f66e4a4dd30a4
parent 4942 c01d3c82ff6f8af3f7a0d9893e08b5b162b15f91
child 4944 a32f7e8e995d61f9ed06cff9db39b48f2e123b2f
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs508955
Bug 508955. Address comment #2 in proper handling of hg clone options. r=Callek
client.py
--- a/client.py
+++ b/client.py
@@ -227,17 +227,17 @@ def switch_mozilla_repo():
             # Print the exception without its traceback.
             sys.excepthook(sys.exc_info()[0], sys.exc_info()[1], None)
             sys.exit("Error: Renaming old backup directory failed! You must recover manually.")
         # Let's leave the hgrc as it was, so any repo specific config is left
         # the same.
         return
 
     # Locally clone common repository history.
-    check_call_noisy([options.hg, 'clone', hgcloneopts, '-r', SWITCH_MOZILLA_BASE_REV] + hgopts + [backup_mozilla_path, mozilla_path],
+    check_call_noisy([options.hg, 'clone', '-r', SWITCH_MOZILLA_BASE_REV] + hgcloneopts + hgopts + [backup_mozilla_path, mozilla_path],
                      retryMax=options.retries)
 
     # Rewrite hgrc for new local mozilla repo based on pre-existing hgrc
     # but with new values
     f = open(os.path.join(topsrcdir, 'mozilla', '.hg', 'hgrc'), 'w')
     try:
       config.write(f)
     finally: