Mercurial > hgsubversion
diff fetch_command.py @ 300:4aba7542f6a9
Various cleanups, cosmetics and removal of superfluous assertions.
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Fri, 27 Mar 2009 03:16:21 +0100 |
parents | 9be04de434ed |
children | 79440ed81011 |
line wrap: on
line diff
--- a/fetch_command.py +++ b/fetch_command.py @@ -28,10 +28,12 @@ def fetch_revisions(ui, svn_url, hg_repo **opts): """pull new revisions from Subversion """ + svn_url = util.normalize_url(svn_url) old_encoding = merc_util._encoding merc_util._encoding = 'UTF-8' skipto_rev=int(skipto_rev) + have_replay = not stupid if have_replay and not callable( delta.svn_txdelta_apply(None, None, None)[0]): #pragma: no cover @@ -41,7 +43,6 @@ def fetch_revisions(ui, svn_url, hg_repo ' contribute a patch to use the ctypes bindings instead' ' of SWIG.\n') have_replay = False - initializing_repo = False svn = svnwrap.SubversionRepo(svn_url, username=merc_util.getuser()) author_host = "@%s" % svn.uuid tag_locations = tag_locations.split(',') @@ -52,7 +53,9 @@ def fetch_revisions(ui, svn_url, hg_repo tag_locations=tag_locations, authors=authors, filemap=filemap) + if os.path.exists(hg_editor.uuid_file): + initializing_repo = False uuid = open(hg_editor.uuid_file).read() assert uuid == svn.uuid start = hg_editor.last_known_revision()