Mercurial > hg
annotate tests/test-qrecord.t @ 16620:e22d6b1dec1d stable
tests: fix test-parseindex2.py when run with --pure
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Fri, 11 May 2012 02:32:26 -0700 |
parents | 55982f62651f |
children | d71ada5a6a33 |
rev | line source |
---|---|
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
1 Create configuration |
5933 | 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 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
9 record extension - commands to interactively select changes for commit/qrefresh |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
10 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
11 use "hg help extensions" for information on enabling extensions |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
12 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
13 help qrecord (no record) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
14 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
15 $ hg help qrecord |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
16 'qrecord' is provided by the following extension: |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
17 |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15521
diff
changeset
|
18 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
|
19 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
20 use "hg help extensions" for information on enabling extensions |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
21 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
22 $ echo "[extensions]" >> $HGRCPATH |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
23 $ echo "record=" >> $HGRCPATH |
5933 | 24 |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
25 help record (record) |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
26 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
27 $ hg help record |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
28 hg record [OPTION]... [FILE]... |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
29 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
30 interactively select changes to commit |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
31 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
32 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
|
33 candidates for recording. |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
34 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
35 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
|
36 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
37 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
|
38 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
|
39 query, the following responses are possible: |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
40 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
41 y - record this change |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
42 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
|
43 e - edit this change manually |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
44 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
45 s - skip remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
46 f - record remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
47 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
48 d - done, skip remaining changes and files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
49 a - record all changes to all remaining files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
50 q - quit, recording no changes |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
51 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
52 ? - display help |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
53 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
54 This command is not available when committing a merge. |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
55 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
56 options: |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
57 |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
58 -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
|
59 committing |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
60 --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
|
61 list |
16458
55982f62651f
commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents:
16324
diff
changeset
|
62 --amend amend the parent of the working dir |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
63 -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
|
64 -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
|
65 -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
|
66 -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
|
67 -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
|
68 -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
|
69 -S --subrepos recurse into subrepositories |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
70 -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
|
71 -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
|
72 -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
|
73 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
74 [+] marked option can be specified multiple times |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
75 |
15202
0150741caace
help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com>
parents:
15145
diff
changeset
|
76 use "hg -v help record" to show more info |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
77 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
78 help (no mq, so no qrecord) |
5933 | 79 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
80 $ hg help qrecord |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
81 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
82 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
83 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
84 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
85 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
|
86 |
15202
0150741caace
help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com>
parents:
15145
diff
changeset
|
87 use "hg -v help qrecord" to show more info |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
88 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
89 $ hg init a |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
90 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
91 qrecord (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
92 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
93 $ hg -R a qrecord |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
94 hg qrecord: invalid arguments |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
95 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
96 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
97 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
98 |
13950
14d0553bd48b
help: do not show full help text for command on option errors
Adrian Buehlmann <adrian@cadifra.com>
parents:
13936
diff
changeset
|
99 use "hg help qrecord" to show the full help text |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
100 [255] |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
101 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
102 qrecord patch (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
103 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
104 $ hg -R a qrecord patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
105 abort: 'mq' extension not loaded |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12075
diff
changeset
|
106 [255] |
5933 | 107 |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
108 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
|
109 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
110 $ echo "mq=nonexistant" >> $HGRCPATH |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
111 $ hg help qrecord |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
15321
diff
changeset
|
112 *** failed to import extension mq from nonexistant: [Errno 2] * (glob) |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
113 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
|
114 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
115 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
|
116 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
117 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
|
118 |
15202
0150741caace
help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com>
parents:
15145
diff
changeset
|
119 use "hg -v help qrecord" to show more info |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
120 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
121 help (mq present) |
5933 | 122 |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
123 $ sed 's/mq=nonexistant/mq=/' $HGRCPATH > hgrc.tmp |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
124 $ 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
|
125 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
126 $ hg help qrecord |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
127 hg qrecord [OPTION]... PATCH [FILE]... |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
128 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
129 interactively record a new patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
130 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
131 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
|
132 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
133 options: |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
134 |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
135 -e --edit edit commit message |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
136 -g --git use git extended diff format |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
137 -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
|
138 -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
|
139 -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
|
140 -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
|
141 -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
|
142 -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
|
143 -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
|
144 -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
|
145 -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
|
146 -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
|
147 -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
|
148 --mq operate on patch repository |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
149 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
150 [+] marked option can be specified multiple times |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
151 |
15202
0150741caace
help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com>
parents:
15145
diff
changeset
|
152 use "hg -v help qrecord" to show more info |
5933 | 153 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
154 $ cd a |
5933 | 155 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
156 Base commit |
5933 | 157 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
158 $ cat > 1.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
159 > 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
160 > 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
161 > 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
162 > 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
163 > 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
164 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
165 $ cat > 2.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
166 > a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
167 > b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
168 > c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
169 > d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
170 > e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
171 > f |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
172 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
173 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
174 $ mkdir dir |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
175 $ cat > dir/a.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
176 > hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
177 > |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
178 > someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
179 > up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
180 > there |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
181 > loves |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
182 > me |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
183 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
184 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
185 $ 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
|
186 $ hg commit -m 'initial checkin' |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
187 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
188 Changing files |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
189 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
190 $ 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
|
191 $ 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
|
192 $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new |
5933 | 193 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
194 $ mv -f 1.txt.new 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
195 $ mv -f 2.txt.new 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
196 $ 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
|
197 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
198 Whole diff |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
199 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
200 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
201 diff -r 1057167b20ef 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
202 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
203 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
204 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
205 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
206 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
207 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
208 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
209 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
210 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
211 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
212 diff -r 1057167b20ef 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
213 --- a/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
214 +++ b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
215 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
216 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
217 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
218 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
219 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
220 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
221 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
222 diff -r 1057167b20ef dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
223 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
224 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
225 @@ -1,4 +1,4 @@ |
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 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
228 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
229 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
230 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
231 |
14424
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
232 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
|
233 |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
234 $ hg qrecord .hg |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
235 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
|
236 [255] |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
237 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
238 qrecord a.patch |
5933 | 239 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
240 $ 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
|
241 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
242 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
243 > n |
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 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
246 > n |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
247 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
248 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
249 2 hunks, 2 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
250 examine changes to '1.txt'? [Ynesfdaq?] |
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 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
256 record change 1/4 to '1.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
257 @@ -3,3 +3,3 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
258 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
259 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
260 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
261 5 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
262 record change 2/4 to '1.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
263 diff --git a/2.txt b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
264 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
265 examine changes to '2.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
266 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
267 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
268 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
269 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
270 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
271 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
272 e |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
273 record change 3/4 to '2.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
274 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
|
275 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
276 examine changes to 'dir/a.txt'? [Ynesfdaq?] |
5933 | 277 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
278 After qrecord a.patch 'tip'" |
5933 | 279 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
280 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
281 changeset: 1:5d1ca63427ee |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
282 tag: a.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
283 tag: qbase |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
284 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
285 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
286 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
287 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
|
288 summary: aaa |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
289 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
290 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
291 --- 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
|
292 +++ 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
|
293 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
294 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
295 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
296 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
297 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
298 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
299 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
300 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
301 --- 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
|
302 +++ 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
|
303 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
304 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
305 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
306 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
307 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
308 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
309 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
310 |
5933 | 311 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
312 After qrecord a.patch 'diff'" |
5933 | 313 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
314 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
315 diff -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
316 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
317 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
318 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
319 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
320 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
321 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
322 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
323 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
324 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
325 diff -r 5d1ca63427ee dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
326 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
327 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
328 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
329 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
330 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
331 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
332 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
333 up |
5933 | 334 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
335 qrecord b.patch |
5933 | 336 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
337 $ 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
|
338 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
339 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
340 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
341 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
342 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
343 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
344 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
345 examine changes to '1.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
346 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
347 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
348 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
349 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
350 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
351 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
352 5 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
353 record change 1/2 to '1.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
354 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
|
355 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
356 examine changes to 'dir/a.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
357 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
358 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
359 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
360 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
361 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
362 up |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
363 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
364 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
365 After qrecord b.patch 'tip' |
5933 | 366 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
367 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
368 changeset: 2:b056198bf878 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
369 tag: b.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
370 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
371 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
372 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
373 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
|
374 summary: bbb |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
375 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
376 diff -r 5d1ca63427ee -r b056198bf878 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
377 --- 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
|
378 +++ 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
|
379 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
380 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
381 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
382 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
383 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
384 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
385 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
386 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
387 --- 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
|
388 +++ 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
|
389 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
390 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
391 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
392 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
393 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
394 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
395 |
5933 | 396 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
397 After qrecord b.patch 'diff' |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
398 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
399 $ hg diff --nodates |