Mercurial > hgsubversion

changeset 423:021bdbf391bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put convert_revision in branch-closing csets
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 12 Jun 2009 09:24:46 +0200
parents 6086363e8230
children 3ae8edc3d8f1
files hgsubversion/svncommands.py hgsubversion/svnmeta.py
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
@@ -109,6 +109,10 @@ def rebuildmeta(ui, repo, hg_repo_path, 
             uuidfile.write(uuid)
             uuidfile.close()
 
+        # don't reflect closed branches
+        if ctx.extra().get('close') and not ctx.files():
+            continue
+
         # find commitpath, write to revmap
         commitpath = revpath[len(subdir)+1:]
         if commitpath.startswith('branches'):
@@ -125,7 +129,7 @@ def rebuildmeta(ui, repo, hg_repo_path, 
             last_rev = revision
 
         # deal with branches
-        if ctx.extra().get('close'): # don't re-add, we just deleted!
+        if ctx.extra().get('close'):
             continue
         branch = ctx.branch()
         if branch == 'default':
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
@@ -454,7 +454,8 @@ class SVNMeta(object):
     def delbranch(self, branch, node, rev):
         pctx = self.repo[node]
         files = pctx.manifest().keys()
-        extra = {'close': 1}
+        extra = self.genextra(rev.revnum, branch)
+        extra['close'] = 1
         if self.usebranchnames:
             extra['branch'] = branch or 'default'
         ctx = context.memctx(self.repo,