Mercurial > hg
annotate tests/test-committer.out @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 951730b2b8ba |
children |
rev | line source |
---|---|
2104
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
1 changeset: 0:9426b370c206 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
2 tag: tip |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
3 user: My Name <myname@example.com> |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
4 date: Mon Jan 12 13:46:40 1970 +0000 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
5 summary: commit-1 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
6 |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3489
diff
changeset
|
7 changeset: 1:4997f15a1b24 |
3466
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
8 tag: tip |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
9 user: foo@bar.com |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
10 date: Mon Jan 12 13:46:40 1970 +0000 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
11 summary: commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
12 |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3489
diff
changeset
|
13 changeset: 2:72b8012b424e |
3466
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
14 tag: tip |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
15 user: foobar <foo@bar.com> |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
16 date: Mon Jan 12 13:46:40 1970 +0000 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
17 summary: commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
18 |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3489
diff
changeset
|
19 changeset: 3:35ff3067bedd |
3466
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
20 tag: tip |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
21 user: foo@bar.com |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
22 date: Mon Jan 12 13:46:40 1970 +0000 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
23 summary: commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
24 |
9786
951730b2b8ba
ui: refer to "hg help config" when no username is set
Martin Geisler <mg@lazybytes.net>
parents:
8424
diff
changeset
|
25 abort: no username supplied (see "hg help config") |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3489
diff
changeset
|
26 No username found, using user@host instead |
8424
c5b3d3e30de7
changelog: refuse to add revisions with empty usernames
Martin Geisler <mg@lazybytes.net>
parents:
6709
diff
changeset
|
27 transaction abort! |
c5b3d3e30de7
changelog: refuse to add revisions with empty usernames
Martin Geisler <mg@lazybytes.net>
parents:
6709
diff
changeset
|
28 rollback completed |
c5b3d3e30de7
changelog: refuse to add revisions with empty usernames
Martin Geisler <mg@lazybytes.net>
parents:
6709
diff
changeset
|
29 abort: empty username! |