Mercurial > hgsubversion
comparison svncommands.py @ 265:9f0738587f94
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 | ffccf0080e54 |
children | a119ab6135f3 |
comparison
equal
deleted
inserted
replaced
264:112d57bb736e | 265:9f0738587f94 |
---|---|
17 """show incoming revisions from Subversion | 17 """show incoming revisions from Subversion |
18 """ | 18 """ |
19 svn_url = util.normalize_url(svn_url) | 19 svn_url = util.normalize_url(svn_url) |
20 | 20 |
21 initializing_repo = False | 21 initializing_repo = False |
22 user = opts.get('username', hgutil.getuser()) | 22 user, passwd = util.getuserpass(opts) |
23 passwd = opts.get('password', '') | |
24 svn = svnwrap.SubversionRepo(svn_url, user, passwd) | 23 svn = svnwrap.SubversionRepo(svn_url, user, passwd) |
25 author_host = "@%s" % svn.uuid | 24 author_host = "@%s" % svn.uuid |
26 tag_locations = tag_locations.split(',') | 25 tag_locations = tag_locations.split(',') |
27 hg_editor = hg_delta_editor.HgChangeReceiver(hg_repo_path, | 26 hg_editor = hg_delta_editor.HgChangeReceiver(hg_repo_path, |
28 ui_=ui, | 27 ui_=ui, |
66 """ | 65 """ |
67 if len(args) != 1: | 66 if len(args) != 1: |
68 raise hgutil.Abort('You must pass the svn URI used to create this repo.') | 67 raise hgutil.Abort('You must pass the svn URI used to create this repo.') |
69 uuid = None | 68 uuid = None |
70 url = args[0].rstrip('/') | 69 url = args[0].rstrip('/') |
71 user = opts.get('username', hgutil.getuser()) | 70 user, passwd = util.getuserpass(opts) |
72 passwd = opts.get('password', '') | |
73 svn = svnwrap.SubversionRepo(url, user, passwd) | 71 svn = svnwrap.SubversionRepo(url, user, passwd) |
74 subdir = svn.subdir | 72 subdir = svn.subdir |
75 svnmetadir = os.path.join(repo.path, 'svn') | 73 svnmetadir = os.path.join(repo.path, 'svn') |
76 if not os.path.exists(svnmetadir): | 74 if not os.path.exists(svnmetadir): |
77 os.makedirs(svnmetadir) | 75 os.makedirs(svnmetadir) |