# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1239556684 18000
# Node ID 141513b5173b595444f0fc906480c71534facf9c
# Parent  87dc4d0dd048713a01685574d2f6865be42479da
Stop breaking hg pull <path>.

diff --git a/wrappers.py b/wrappers.py
--- a/wrappers.py
+++ b/wrappers.py
@@ -202,8 +202,9 @@ def clone(orig, ui, source, dest=None, *
     res = -1
     try:
         try:
-            res = pull(None, ui, None, True, opts.pop('svn_stupid', False),
-                       source=url, create_new_dest=dest, **opts)
+            res = pull(None, ui, None, source=url, svn=None,
+                       svn_stupid=opts.pop('svn_stupid', False),
+                       create_new_dest=dest, **opts)
         except core.SubversionException, e:
             if e.apr_err == core.SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED:
                 raise hgutil.Abort('It appears svn does not trust the ssl cert for this site.\n'
@@ -223,10 +224,14 @@ def clone(orig, ui, source, dest=None, *
     return res
 
 
-def pull(orig, ui, repo, svn=None, svn_stupid=False, source="default", create_new_dest=False,
-         *args, **opts):
+def pull(orig, ui, repo, source="default", *args, **opts):
     """pull new revisions from Subversion
+
+    Also takes svn, svn_stupid, and create_new_dest kwargs.
     """
+    svn = opts.pop('svn', None)
+    svn_stupid = opts.pop('svn_stupid', False)
+    create_new_dest = opts.pop('create_new_dest', False)
     url = ((repo and repo.ui) or ui).expandpath(source)
     if not (cmdutil.issvnurl(url) or svn or create_new_dest):
         return orig(ui, repo, source=source, *args, **opts)