diff hgsubversion/hg_delta_editor.py @ 397:1b9d004a8c0a

branches: correctly deal with branch closing directly after copy/rename
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 11 Jun 2009 18:00:58 +0200
parents a8811c84e3ee
children f13dd964d10c
line wrap: on
line diff
--- a/hgsubversion/hg_delta_editor.py
+++ b/hgsubversion/hg_delta_editor.py
@@ -737,8 +737,6 @@ class HgChangeReceiver(delta.Editor):
 
     def delbranch(self, branch, node, rev):
         pctx = self.repo[node]
-        def filectxfun(repo, memctx, path):
-            return pctx[path]
         files = pctx.manifest().keys()
         extra = {'close': 1}
         if self.usebranchnames:
@@ -746,8 +744,8 @@ class HgChangeReceiver(delta.Editor):
         ctx = context.memctx(self.repo,
                              (node, revlog.nullid),
                              rev.message or util.default_commit_msg,
-                             files,
-                             filectxfun,
+                             [],
+                             lambda x, y, z: None,
                              self.authors[rev.author],
                              self.fixdate(rev.date),
                              extra)