# HG changeset patch # User Dirkjan Ochtman # Date 1245153543 -7200 # Node ID 8c545dcad7b1aa0ca9a6de02d119c34f6de24f54 # Parent f55d2954b158ab446942f7727801a6fe536fe90a wrappers: save tbdelta in one place for both stupid and replay diff --git a/hgsubversion/replay.py b/hgsubversion/replay.py --- 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) diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py --- 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() diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- 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)