Mercurial > hgsubversion

comparison 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
comparison
equal deleted inserted replaced
264:112d57bb736e 265:9f0738587f94
96 svnurl = util.normalize_url(svnurl) 96 svnurl = util.normalize_url(svnurl)
97 if svnurl != hge.url: 97 if svnurl != hge.url:
98 raise hgutil.Abort('wrong subversion url!') 98 raise hgutil.Abort('wrong subversion url!')
99 svn_commit_hashes = dict(zip(hge.revmap.itervalues(), 99 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
100 hge.revmap.iterkeys())) 100 hge.revmap.iterkeys()))
101 user = opts.get('username', hgutil.getuser()) 101 user, passwd = util.getuserpass(opts)
102 passwd = opts.get('password', '')
103
104 # Strategy: 102 # Strategy:
105 # 1. Find all outgoing commits from this head 103 # 1. Find all outgoing commits from this head
106 if len(repo.parents()) != 1: 104 if len(repo.parents()) != 1:
107 ui.status('Cowardly refusing to push branch merge') 105 ui.status('Cowardly refusing to push branch merge')
108 return 1 106 return 1
248 ' a slower method that may be buggier. Please upgrade, or' 246 ' a slower method that may be buggier. Please upgrade, or'
249 ' contribute a patch to use the ctypes bindings instead' 247 ' contribute a patch to use the ctypes bindings instead'
250 ' of SWIG.\n') 248 ' of SWIG.\n')
251 have_replay = False 249 have_replay = False
252 initializing_repo = False 250 initializing_repo = False
253 user = opts.get('username', hgutil.getuser()) 251 user, passwd = util.getuserpass(opts)
254 passwd = opts.get('password', '')
255 svn = svnwrap.SubversionRepo(svn_url, user, passwd) 252 svn = svnwrap.SubversionRepo(svn_url, user, passwd)
256 author_host = "@%s" % svn.uuid 253 author_host = "@%s" % svn.uuid
257 tag_locations = ['tags', ] 254 tag_locations = ['tags', ]
258 authors = opts.pop('svn_authors', None) 255 authors = opts.pop('svn_authors', None)
259 filemap = opts.pop('svn_filemap', None) 256 filemap = opts.pop('svn_filemap', None)