changeset 14607:bd1acea552ff

hg: rename opts argument to peeropts in clone This should make it clearer that the options are used with remoteui only and are not used otherwise in hg.clone.
author Martin Geisler <mg@aragost.com>
date Tue, 14 Jun 2011 16:33:46 +0200
parents 6e631c24c6d9
children 4aef71839337
files mercurial/hg.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Mon Jun 13 16:25:18 2011 -0500
+++ b/mercurial/hg.py	Tue Jun 14 16:33:46 2011 +0200
@@ -174,8 +174,8 @@
                 continue
         _update(r, uprev)
 
-def clone(ui, opts, source, dest=None, pull=False, rev=None, update=True,
-          stream=False, branch=None):
+def clone(ui, peeropts, source, dest=None, pull=False, rev=None,
+          update=True, stream=False, branch=None):
     """Make a copy of an existing repository.
 
     Create a copy of an existing repository in a new directory.  The
@@ -214,7 +214,7 @@
     if isinstance(source, str):
         origsource = ui.expandpath(source)
         source, branch = parseurl(origsource, branch)
-        srcrepo = repository(remoteui(ui, opts), source)
+        srcrepo = repository(remoteui(ui, peeropts), source)
     else:
         srcrepo = source
         branch = (None, branch or [])
@@ -308,12 +308,13 @@
 
             # we need to re-init the repo after manually copying the data
             # into it
-            destrepo = repository(remoteui(ui, opts), dest)
+            destrepo = repository(remoteui(ui, peeropts), dest)
             srcrepo.hook('outgoing', source='clone',
                           node=node.hex(node.nullid))
         else:
             try:
-                destrepo = repository(remoteui(ui, opts), dest, create=True)
+                destrepo = repository(remoteui(ui, peeropts), dest,
+                                      create=True)
             except OSError, inst:
                 if inst.errno == errno.EEXIST:
                     dircleanup.close()