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

#!/bin/sh

     2

# test children command

     3

     4

cat <<EOF >> $HGRCPATH

     5

[extensions]

     6

hgext.children=

     7

EOF

     8

     9

echo "% init"

    10

hg init t

    11

cd t

    12

    13

echo "% no working directory"

    14

hg children

    15

    16

echo % setup

    17

echo 0 > file0

    18

hg ci -qAm 0 -d '0 0'

    19

    20

echo 1 > file1

    21

hg ci -qAm 1 -d '1 0'

    22

    23

echo 2 >> file0

    24

hg ci -qAm 2 -d '2 0'

    25

    26

hg co null

    27

echo 3 > file3

    28

hg ci -qAm 3 -d '3 0'

    29

    30

echo "% hg children at revision 3 (tip)"

    31

hg children

    32

    33

hg co null

    34

echo "% hg children at nullrev (should be 0 and 3)"

    35

hg children

    36

    37

hg co 1

    38

echo "% hg children at revision 1 (should be 2)"

    39

hg children

    40

    41

hg co 2

    42

echo "% hg children at revision 2 (other head)"

    43

hg children

    44

    45

for i in null 0 1 2 3; do

    46

  echo "% hg children -r $i"

    47

  hg children -r $i

    48

done

    49

    50

echo "% hg children -r 0 file0 (should be 2)"

    51

hg children -r 0 file0

    52

    53

echo "% hg children -r 1 file0 (should be 2)"

    54

hg children -r 1 file0

    55

    56

hg co 0

    57

echo "% hg children file0 at revision 0 (should be 2)"

    58

hg children file0

    59