comparison wrappers.py @ 316:c3c647aff97c

Merge with danchr's changes.
author Augie Fackler <durin42@gmail.com>
date Sun, 03 May 2009 21:44:53 -0500
parents 1d48d9a34c19
children b6c6d32c8ef1 33736e2e25f0
comparison
equal deleted inserted replaced
315:963d27a0b1c2 316:c3c647aff97c
262 ' of SWIG.\n') 262 ' of SWIG.\n')
263 have_replay = False 263 have_replay = False
264 initializing_repo = False 264 initializing_repo = False
265 user, passwd = util.getuserpass(opts) 265 user, passwd = util.getuserpass(opts)
266 svn = svnwrap.SubversionRepo(svn_url, user, passwd) 266 svn = svnwrap.SubversionRepo(svn_url, user, passwd)
267 author_host = "@%s" % svn.uuid 267 author_host = ui.config('hgsubversion', 'defaulthost', svn.uuid)
268 tag_locations = ['tags', ] 268 tag_locations = ['tags', ]
269 authors = opts.pop('svn_authors', None) 269 authors = opts.pop('svn_authors', None)
270 filemap = opts.pop('svn_filemap', None) 270 filemap = opts.pop('svn_filemap', None)
271 if repo: 271 if repo:
272 hg_editor = hg_delta_editor.HgChangeReceiver(repo=repo, 272 hg_editor = hg_delta_editor.HgChangeReceiver(repo=repo,