Mercurial > hg
annotate tests/test-mq-qimport.out @ 9287:53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
patch.extract extracts just the message below HG changeset patch. So to not
parse comments above the patch, we reset the message if we find a changeset
patch as we know the commit message comes after the changeset patch data.
This is similar to the behavior of patch.extract.
The drawback of this approach, after a qref -e the comment above HG changeset
patch is gone. Without this patch the message would become part of the commit
message in the HG changset patch part.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Tue, 28 Jul 2009 15:36:28 +0200 |
parents | 6e6f5b80e056 |
children | e668bcd0e25f 74e717a21779 |
rev | line source |
---|---|
6940
05ec27530d04
qimport: report filename in case of IOError
Martin Geisler <mg@daimi.au.dk>
parents:
6027
diff
changeset
|
1 % qimport non-existing-file |
7421
4c4324476be6
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7271
diff
changeset
|
2 abort: unable to read non-existing-file |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
3 % import email |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
4 adding email to series file |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
5 applying email |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
6 now at: email |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
7 % hg tip -v |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
8 changeset: 0:1a706973a7d8 |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
9 tag: qtip |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
10 tag: tip |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
11 tag: email |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
12 tag: qbase |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
13 user: Username in patch <test@example.net> |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
14 date: Thu Jan 01 00:00:00 1970 +0000 |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
15 files: x |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
16 description: |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
17 First line of commit message. |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
18 |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
19 More text in commit message. |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
20 |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
21 |
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8832
diff
changeset
|
22 patch queue now empty |
7158
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
23 % import URL |
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
24 adding url.diff to series file |
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
25 url.diff |
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
26 % import patch that already exists |
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
27 abort: patch "url.diff" already exists |
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
28 applying url.diff |
7627 | 29 now at: url.diff |
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
30 foo |
7627 | 31 patch queue now empty |
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
32 % qimport -f |
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
33 adding url.diff to series file |
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
34 applying url.diff |
7627 | 35 now at: url.diff |
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
36 foo2 |
7627 | 37 patch queue now empty |
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
38 % build diff with CRLF |
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 adding b |
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
41 % qimport CRLF diff |
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
42 adding b.diff to series file |
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 applying b.diff |
7627 | 44 now at: b.diff |
8362
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
45 % try to import --push |
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
47 adding another.diff to series file |
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
48 applying another.diff |
bbc74c05b8a4
mq: add -P/--push option to qimport
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7627
diff
changeset
|
49 now at: another.diff |
8832
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8362
diff
changeset
|
50 patch b.diff finalized without changeset message |
6e6f5b80e056
mq: warn about finalizing patches without cset message
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8362
diff
changeset
|
51 patch another.diff finalized without changeset message |