tests/test-committer
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 17 Aug 2007 20:18:05 -0300
changeset 5195 33015dac5df5
parent 4044 78a0dd93db0b
child 8424 c5b3d3e30de7
permissions -rwxr-xr-x
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).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2104
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     1
#!/bin/sh
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     2
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     3
unset HGUSER
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     4
EMAIL="My Name <myname@example.com>"
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     5
export EMAIL
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     6
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     7
hg init test
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     8
cd test
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
     9
touch asdf
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
    10
hg add asdf
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
    11
hg commit -d '1000000 0' -m commit-1
f1085d34d20d Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff changeset
    12
hg tip
3466
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    13
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    14
unset EMAIL
3721
98f2507c5551 only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3466
diff changeset
    15
echo 1234 > asdf
3466
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    16
hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    17
hg tip
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    18
echo "[ui]" >> .hg/hgrc
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    19
echo "username = foobar <foo@bar.com>" >> .hg/hgrc
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    20
echo 12 > asdf
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    21
hg commit -d '1000000 0' -m commit-1
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    22
hg tip
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    23
echo 1 > asdf
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    24
hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1
8b55c0ba8048 makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2104
diff changeset
    25
hg tip
3721
98f2507c5551 only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3466
diff changeset
    26
echo 123 > asdf
4044
78a0dd93db0b Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3722
diff changeset
    27
echo "[ui]" > .hg/hgrc
78a0dd93db0b Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3722
diff changeset
    28
echo "username = " >> .hg/hgrc
78a0dd93db0b Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3722
diff changeset
    29
hg commit -d '1000000 0' -m commit-1
3721
98f2507c5551 only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3466
diff changeset
    30
rm .hg/hgrc
3722
5191e2299d63 Make sed expression in test-committer compatible with GNU sed 3.x.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3721
diff changeset
    31
hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/"