diff hgsubversion/hg_delta_editor.py @ 399:94f7e8c53c36

tags: end branch while tagging instead of creating extra changeset
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 10 Jun 2009 09:35:45 +0200
parents f13dd964d10c
children 09625f3abdb0
line wrap: on
line diff
--- a/hgsubversion/hg_delta_editor.py
+++ b/hgsubversion/hg_delta_editor.py
@@ -584,6 +584,8 @@ class HgChangeReceiver(delta.Editor):
             extra = util.build_extra(rev.revnum, b, self.uuid, self.subdir)
             if not self.usebranchnames:
                 extra.pop('branch', None)
+            if b in endbranches:
+                extra['close'] = 1
             ctx = context.memctx(self.repo,
                                  (parent.node(), node.nullid),
                                  rev.message or ' ',
@@ -596,7 +598,9 @@ class HgChangeReceiver(delta.Editor):
             if (rev.revnum, b) not in self.revmap:
                 self.add_to_revmap(rev.revnum, b, new)
             if b in endbranches:
-                endbranches[b] = new
+                endbranches.pop(b)
+                bname = b or 'default'
+                self.ui.status('Marked branch %s as closed.\n' % bname)
 
     def commit_current_delta(self, tbdelta):
         if hasattr(self, '_exception_info'):  #pragma: no cover