convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).

--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -219,7 +219,10 @@ class convert(object):
                             # Merely marks that a copy happened.
                             self.dest.copyfile(copyf, newf)
 
-        newnode = self.dest.putcommit(filenames, parents, commit)
+        if not filenames and self.mapfile.active():
+            newnode = parents[0]
+        else:
+            newnode = self.dest.putcommit(filenames, parents, commit)
         self.mapentry(rev, newnode)
 
     def convert(self):
@@ -352,6 +355,9 @@ class filemapper(object):
             return newpre
         return name
 
+    def active(self):
+        return bool(self.include or self.exclude or self.rename)
+
 def _convert(ui, src, dest=None, revmapfile=None, **opts):
     """Convert a foreign SCM repository to a Mercurial one.
 

--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -86,10 +86,7 @@ class mercurial_sink(converter_sink):
                 self.repo = hg.repository(self.ui, branchpath)
 
     def putcommit(self, files, parents, commit):
-        if not files:
-            return hex(self.repo.changelog.tip())
-
-        seen = {hex(nullid): 1}
+        seen = {}
         pl = []
         for p in parents:
             if p not in seen: