Mercurial > hgsubversion

diff wrappers.py @ 265:9f0738587f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-re-refix username support, add a comment so maybe I remember this time.
author Augie Fackler <durin42@gmail.com>
date Mon, 13 Apr 2009 21:12:33 -0500
parents 112d57bb736e
children a5f20358f737
line wrap: on
line diff
--- a/wrappers.py
+++ b/wrappers.py
@@ -98,9 +98,7 @@ def push(orig, ui, repo, dest=None, *arg
         raise hgutil.Abort('wrong subversion url!')
     svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
                                  hge.revmap.iterkeys()))
-    user = opts.get('username', hgutil.getuser())
-    passwd = opts.get('password', '')
-
+    user, passwd = util.getuserpass(opts)
     # Strategy:
     # 1. Find all outgoing commits from this head
     if len(repo.parents()) != 1:
@@ -250,8 +248,7 @@ def pull(orig, ui, repo, source="default
                   ' of SWIG.\n')
         have_replay = False
     initializing_repo = False
-    user = opts.get('username', hgutil.getuser())
-    passwd = opts.get('password', '')
+    user, passwd = util.getuserpass(opts)
     svn = svnwrap.SubversionRepo(svn_url, user, passwd)
     author_host = "@%s" % svn.uuid
     tag_locations = ['tags', ]