Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/convert/__init__.py @ 5192:33015dac5df5
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).
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 17 Aug 2007 20:18:05 -0300 |
| parents | 6b4c332f241b |
| children | 653790c2fa52 |
comparison
equal
deleted
inserted
replaced
| 5191:b111e9a907b1 | 5192:33015dac5df5 |
|---|---|
| 217 copyf = self.mapfile(copies[f]) | 217 copyf = self.mapfile(copies[f]) |
| 218 if copyf: | 218 if copyf: |
| 219 # Merely marks that a copy happened. | 219 # Merely marks that a copy happened. |
| 220 self.dest.copyfile(copyf, newf) | 220 self.dest.copyfile(copyf, newf) |
| 221 | 221 |
| 222 newnode = self.dest.putcommit(filenames, parents, commit) | 222 if not filenames and self.mapfile.active(): |
| 223 newnode = parents[0] | |
| 224 else: | |
| 225 newnode = self.dest.putcommit(filenames, parents, commit) | |
| 223 self.mapentry(rev, newnode) | 226 self.mapentry(rev, newnode) |
| 224 | 227 |
| 225 def convert(self): | 228 def convert(self): |
| 226 try: | 229 try: |
| 227 self.dest.before() | 230 self.dest.before() |
| 350 if suf: | 353 if suf: |
| 351 return newpre + '/' + suf | 354 return newpre + '/' + suf |
| 352 return newpre | 355 return newpre |
| 353 return name | 356 return name |
| 354 | 357 |
| 358 def active(self): | |
| 359 return bool(self.include or self.exclude or self.rename) | |
| 360 | |
| 355 def _convert(ui, src, dest=None, revmapfile=None, **opts): | 361 def _convert(ui, src, dest=None, revmapfile=None, **opts): |
| 356 """Convert a foreign SCM repository to a Mercurial one. | 362 """Convert a foreign SCM repository to a Mercurial one. |
| 357 | 363 |
| 358 Accepted source formats: | 364 Accepted source formats: |
| 359 - GIT | 365 - GIT |