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).

     1

# foo-%nof%N.patch

     2

exporting patches:

     3

foo-01of10.patch

     4

foo-02of10.patch

     5

foo-03of10.patch

     6

foo-04of10.patch

     7

foo-05of10.patch

     8

foo-06of10.patch

     9

foo-07of10.patch

    10

foo-08of10.patch

    11

foo-09of10.patch

    12

foo-10of10.patch

    13

# foo-%%%H.patch

    14

exporting patches:

    15

foo-%617188a1c80f869a7b66c85134da88a6fb145f67.patch

    16

foo-%dd41a5ff707a5225204105611ba49cc5c229d55f.patch

    17

foo-%f95a5410f8664b6e1490a4af654e4b7d41a7b321.patch

    18

foo-%4346bcfde53b4d9042489078bcfa9c3e28201db2.patch

    19

foo-%afda8c3a009cc99449a05ad8aa4655648c4ecd34.patch

    20

foo-%35284ce2b6b99c9d2ac66268fe99e68e1974e1aa.patch

    21

foo-%9688c41894e6931305fa7165a37f6568050b4e9b.patch

    22

foo-%747d3c68f8ec44bb35816bfcd59aeb50b9654c2f.patch

    23

foo-%5f17a83f5fbd9414006a5e563eab4c8a00729efd.patch

    24

foo-%f3acbafac161ec68f1598af38f794f28847ca5d3.patch

    25

# foo-%b-%R.patch

    26

exporting patches:

    27

foo-repo-2.patch

    28

foo-repo-3.patch

    29

foo-repo-4.patch

    30

foo-repo-5.patch

    31

foo-repo-6.patch

    32

foo-repo-7.patch

    33

foo-repo-8.patch

    34

foo-repo-9.patch

    35

foo-repo-10.patch

    36

foo-repo-11.patch

    37

# foo-%h.patch

    38

exporting patches:

    39

foo-617188a1c80f.patch

    40

foo-dd41a5ff707a.patch

    41

foo-f95a5410f866.patch

    42

foo-4346bcfde53b.patch

    43

foo-afda8c3a009c.patch

    44

foo-35284ce2b6b9.patch

    45

foo-9688c41894e6.patch

    46

foo-747d3c68f8ec.patch

    47

foo-5f17a83f5fbd.patch

    48

foo-f3acbafac161.patch

    49

# foo-%r.patch

    50

exporting patches:

    51

foo-02.patch

    52

foo-03.patch

    53

foo-04.patch

    54

foo-05.patch

    55

foo-06.patch

    56

foo-07.patch

    57

foo-08.patch

    58

foo-09.patch

    59

foo-10.patch

    60

foo-11.patch