annotate tests/test-qrecord.t @ 23344:6333412245ec stable

mq: when setting message in plain mode, separate it from header (issue4453) Fix inconsistent handling of plain header separation in mq patcheader - and contrary to c87f2a5a6e49, do it in the direction of having an empty line between header and description. Plain patches are like mails and should thus have an empty line between headers and body in compliance with RFC 822 3.1.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 16 Nov 2014 19:57:40 +0100
parents 9ab18a912c44
children f1eaf03dd608
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
1 Create configuration
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
2
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
3 $ echo "[ui]" >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
4 $ echo "interactive=true" >> $HGRCPATH
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
5
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
6 help record (no record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
7
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
8 $ hg help record
16854
d71ada5a6a33 help: format all output using RST
Olav Reinert <seroton10@gmail.com>
parents: 16458
diff changeset
9 record extension - commands to interactively select changes for
d71ada5a6a33 help: format all output using RST
Olav Reinert <seroton10@gmail.com>
parents: 16458
diff changeset
10 commit/qrefresh
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
11
22113
2d2cb5e50095 help: normalize hint about enabling extensions
Matt Mackall <mpm@selenic.com>
parents: 22111
diff changeset
12 (use "hg help extensions" for information on enabling extensions)
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
13
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
14 help qrecord (no record)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
15
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
16 $ hg help qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
17 'qrecord' is provided by the following extension:
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
18
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15521
diff changeset
19 record commands to interactively select changes for commit/qrefresh
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
20
22113
2d2cb5e50095 help: normalize hint about enabling extensions
Matt Mackall <mpm@selenic.com>
parents: 22111
diff changeset
21 (use "hg help extensions" for information on enabling extensions)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
22
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
23 $ echo "[extensions]" >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
24 $ echo "record=" >> $HGRCPATH
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
25
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
26 help record (record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
27
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
28 $ hg help record
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
29 hg record [OPTION]... [FILE]...
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
30
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
31 interactively select changes to commit
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
32
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
33 If a list of files is omitted, all changes reported by "hg status" will be
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
34 candidates for recording.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
35
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
36 See "hg help dates" for a list of formats valid for -d/--date.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
37
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
38 You will be prompted for whether to record changes to each modified file,
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
39 and for files with multiple changes, for each change to use. For each
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
40 query, the following responses are possible:
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
41
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
42 y - record this change
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
43 n - skip this change
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
44 e - edit this change manually
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
45
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
46 s - skip remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
47 f - record remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
48
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
49 d - done, skip remaining changes and files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
50 a - record all changes to all remaining files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
51 q - quit, recording no changes
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
52
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
53 ? - display help
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
54
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
55 This command is not available when committing a merge.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
56
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22113
diff changeset
57 options ([+] can be repeated):
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
58
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
59 -A --addremove mark new/missing files as added/removed before
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
60 committing
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
61 --close-branch mark a branch as closed, hiding it from the branch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
62 list
16458
55982f62651f commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents: 16324
diff changeset
63 --amend amend the parent of the working dir
19445
29c726e9c3ab tests: update for commit --secret
Matt Mackall <mpm@selenic.com>
parents: 18028
diff changeset
64 -s --secret use the secret phase for committing
21952
3838b910fa6b doc: unify help text for "--edit" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21021
diff changeset
65 -e --edit invoke editor on commit messages
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
66 -I --include PATTERN [+] include names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
67 -X --exclude PATTERN [+] exclude names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
68 -m --message TEXT use text as commit message
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
69 -l --logfile FILE read commit message from file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
70 -d --date DATE record the specified date as commit date
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
71 -u --user USER record the specified user as committer
15321
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents: 15202
diff changeset
72 -S --subrepos recurse into subrepositories
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
73 -w --ignore-all-space ignore white space when comparing lines
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
74 -b --ignore-space-change ignore changes in the amount of white space
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
75 -B --ignore-blank-lines ignore changes whose lines are all blank
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
76
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
77 (some details hidden, use --verbose to show complete help)
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
78
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
79 help (no mq, so no qrecord)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
80
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
81 $ hg help qrecord
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
82 hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
83
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
84 interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
85
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
86 See "hg help qnew" & "hg help record" for more information and usage.
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
87
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
88 (some details hidden, use --verbose to show complete help)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
89
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
90 $ hg init a
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
91
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
92 qrecord (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
93
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
94 $ hg -R a qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
95 hg qrecord: invalid arguments
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
96 hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
97
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
98 interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
99
22111
aa5e256839d5 help: improve command summary hint
Matt Mackall <mpm@selenic.com>
parents: 22110
diff changeset
100 (use "hg qrecord -h" to show more help)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
101 [255]
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
102
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
103 qrecord patch (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
104
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
105 $ hg -R a qrecord patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
106 abort: 'mq' extension not loaded
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12075
diff changeset
107 [255]
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
108
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
109 help (bad mq)
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
110
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
111 $ echo "mq=nonexistent" >> $HGRCPATH
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
112 $ hg help qrecord
18028
5dbefa846903 tests: don't hardcode errno==2 for ENOENT
Julien Cristau <julien.cristau@logilab.fr>
parents: 17837
diff changeset
113 *** failed to import extension mq from nonexistent: [Errno *] * (glob)
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
114 hg qrecord [OPTION]... PATCH [FILE]...
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
115
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
116 interactively record a new patch
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
117
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
118 See "hg help qnew" & "hg help record" for more information and usage.
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
119
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
120 (some details hidden, use --verbose to show complete help)
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
121
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
122 help (mq present)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
123
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
124 $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
125 $ mv hgrc.tmp $HGRCPATH
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
126
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
127 $ hg help qrecord
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
128 hg qrecord [OPTION]... PATCH [FILE]...
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
129
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
130 interactively record a new patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
131
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
132 See "hg help qnew" & "hg help record" for more information and usage.
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
133
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22113
diff changeset
134 options ([+] can be repeated):
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
135
21952
3838b910fa6b doc: unify help text for "--edit" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21021
diff changeset
136 -e --edit invoke editor on commit messages
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
137 -g --git use git extended diff format
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
138 -U --currentuser add "From: <current user>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
139 -u --user USER add "From: <USER>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
140 -D --currentdate add "Date: <current date>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
141 -d --date DATE add "Date: <DATE>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
142 -I --include PATTERN [+] include names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
143 -X --exclude PATTERN [+] exclude names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
144 -m --message TEXT use text as commit message
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
145 -l --logfile FILE read commit message from file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
146 -w --ignore-all-space ignore white space when comparing lines
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
147 -b --ignore-space-change ignore changes in the amount of white space
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
148 -B --ignore-blank-lines ignore changes whose lines are all blank
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
149 --mq operate on patch repository
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
150
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
151 (some details hidden, use --verbose to show complete help)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
152
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
153 $ cd a
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
154
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
155 Base commit
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
156
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
157 $ cat > 1.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
158 > 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
159 > 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
160 > 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
161 > 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
162 > 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
163 > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
164 $ cat > 2.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
165 > a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
166 > b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
167 > c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
168 > d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
169 > e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
170 > f
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
171 > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
172
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
173 $ mkdir dir
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
174 $ cat > dir/a.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
175 > hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
176 >
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
177 > someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
178 > up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
179 > there
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
180 > loves
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
181 > me
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
182 > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
183
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
184 $ hg add 1.txt 2.txt dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
185 $ hg commit -m 'initial checkin'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
186
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
187 Changing files
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
188
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
189 $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
190 $ sed -e 's/b/b b/' 2.txt > 2.txt.new
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
191 $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
192
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
193 $ mv -f 1.txt.new 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
194 $ mv -f 2.txt.new 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
195 $ mv -f dir/a.txt.new dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
196
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
197 Whole diff
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
198
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
199 $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
200 diff -r 1057167b20ef 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
201 --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
202 +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
203 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
204 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
205 -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
206 +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
207 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
208 -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
209 +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
210 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
211 diff -r 1057167b20ef 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
212 --- a/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
213 +++ b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
214 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
215 a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
216 -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
217 +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
218 c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
219 d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
220 e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
221 diff -r 1057167b20ef dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
222 --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
223 +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
224 @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
225 -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
226 +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
227
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
228 someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
229 up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
230
14424
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
231 qrecord with bad patch name, should abort before prompting
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
232
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
233 $ hg qrecord .hg
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
234 abort: patch name cannot begin with ".hg"
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
235 [255]
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
236
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
237 qrecord a.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
238
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
239 $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
240 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
241 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
242 > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
243 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
244 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
245 > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
246 > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
247 diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
248 2 hunks, 2 lines changed
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
249 examine changes to '1.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
250
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
251 @@ -1,3 +1,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
252 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
253 -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
254 +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
255 3
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
256 record change 1/4 to '1.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
257
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
258 @@ -3,3 +3,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
259 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
260 -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
261 +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
262 5
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
263 record change 2/4 to '1.txt'? [Ynesfdaq?] n
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
264
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
265 diff --git a/2.txt b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
266 1 hunks, 1 lines changed
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
267 examine changes to '2.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
268
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
269 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
270 a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
271 -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
272 +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
273 c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
274 d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
275 e
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
276 record change 3/4 to '2.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
277
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
278 diff --git a/dir/a.txt b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
279 1 hunks, 1 lines changed
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
280 examine changes to 'dir/a.txt'? [Ynesfdaq?] n
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
281
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
282
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
283 After qrecord a.patch 'tip'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
284
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
285 $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
286 changeset: 1:5d1ca63427ee
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
287 tag: a.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
288 tag: qbase
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
289 tag: qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
290 tag: tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
291 user: test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
292 date: Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
293 summary: aaa
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
294
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
295 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
296 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
297 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
298 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
299 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
300 -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
301 +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
302 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
303 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
304 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
305 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
306 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
307 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
308 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
309 a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
310 -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
311 +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
312 c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
313 d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
314 e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
315
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
316
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
317 After qrecord a.patch 'diff'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
318
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
319 $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
320 diff -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
321 --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
322 +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
323 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
324 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
325 2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
326 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
327 -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
328 +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
329 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
330 diff -r 5d1ca63427ee dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
331 --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
332 +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
333 @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
334 -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
335 +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
336
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
337 someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
338 up
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
339
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
340 qrecord b.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
341
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
342 $ hg qrecord -d '0 0' -m bbb b.patch <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
343 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
344 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
345 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
346 > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
347 > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
348 diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
349 1 hunks, 1 lines changed
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
350 examine changes to '1.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
351
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
352 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
353 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
354 2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
355 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
356 -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
357 +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
358 5
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
359 record change 1/2 to '1.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
360
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
361 diff --git a/dir/a.txt b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
362 1 hunks, 1 lines changed
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
363 examine changes to 'dir/a.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
364
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
365 @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
366 -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
367 +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
368
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
369 someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
370 up
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
371 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
372
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
373
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
374 After qrecord b.patch 'tip'
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
375
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
376 $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
377 changeset: 2:b056198bf878
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
378 tag: b.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
379 tag: qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
380 tag: tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
381 user: test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
382 date: Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
383 summary: bbb
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
384
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
385 diff -r 5d1ca63427ee -r b056198bf878 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
386 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
387 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
388 @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
389 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
390 2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
391 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
392 -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
393 +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
394 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
395 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
396 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
397 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
398 @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
399 -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
400 +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
401
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
402 someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
403 up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
404
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
405
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
406 After qrecord b.patch 'diff'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
407
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
408 $ hg diff --nodates
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
409
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
410 $ cd ..