changeset 444:8c545dcad7b1

wrappers: save tbdelta in one place for both stupid and replay
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Tue, 16 Jun 2009 13:59:03 +0200
parents f55d2954b158
children 24a8471069c0
files hgsubversion/replay.py hgsubversion/stupid.py hgsubversion/wrappers.py
diffstat 3 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/replay.py
+++ b/hgsubversion/replay.py
@@ -24,7 +24,6 @@ def convert_rev(ui, meta, svn, r, tbdelt
     editor = meta.editor
     editor.current.clear()
     editor.current.rev = r
-    meta.save_tbdelta(tbdelta)
     svn.get_replay(r.revnum, editor)
     current = editor.current
     current.findmissing(svn)
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -515,7 +515,6 @@ def branches_in_paths(meta, tbdelta, pat
 def convert_rev(ui, meta, svn, r, tbdelta):
     # this server fails at replay
 
-    meta.save_tbdelta(tbdelta)
     branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum,
                                  svn.checkpath, svn.list_files)
     brpaths = branches.values()
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -267,6 +267,7 @@ def pull(repo, source, heads=[], force=F
                         bits = (r.revnum, r.author, msg)
                         ui.status(('[r%d] %s: %s\n' % bits)[:w])
 
+                        meta.save_tbdelta(tbdelta)
                         close = pullfuns[have_replay](ui, meta, svn, r, tbdelta)
                         if tbdelta['tags'][0] or tbdelta['tags'][1]:
                             meta.committags(tbdelta['tags'], r, close)