diff hgsubversion/wrappers.py @ 432:4bf90f8c9b7b

consolidate metadata calls from stupid and replay code
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 15 Jun 2009 16:10:24 +0200
parents 612b8d753549
children 7c576ae19d80
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -266,7 +266,14 @@ def pull(repo, source, heads=[], force=F
                         bits = (r.revnum, r.author, msg)
                         ui.status(('[r%d] %s: %s\n' % bits)[:w])
 
-                        pullfuns[have_replay](ui, meta, svn, r, tbdelta)
+                        close = pullfuns[have_replay](ui, meta, svn, r, tbdelta)
+                        if tbdelta['tags'][0] or tbdelta['tags'][1]:
+                            meta.committags(tbdelta['tags'], r, close)
+                        for branch, parent in close.iteritems():
+                            if parent in (None, node.nullid):
+                                continue
+                            meta.delbranch(branch, parent, r)
+
                         meta.save()
                         converted = True