Mercurial > hg
annotate tests/test-qrecord.t @ 14415:c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
extensions that depend on other extensions (such as record) use this pattern
to check if the dependant extension is available:
try:
mq = extensions.find('mq')
except KeyError:
return
but since if an error occurs while loading an extension it leaves its entry
in the _extensions map as None, we want to raise in that situation too.
(rather than adding another check if the return value is None)
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Mon, 23 May 2011 23:09:00 +0300 |
parents | bd738875943a |
children | 4eb88d296f63 |
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 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
18 record commands to interactively select changes for commit/qrefresh |
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 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
43 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
44 s - skip remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
45 f - record remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
46 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
47 d - done, skip remaining changes and files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
48 a - record all changes to all remaining files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
49 q - quit, recording no changes |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
50 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
51 ? - display help |
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 This command is not available when committing a merge. |
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 options: |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
56 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
57 -A --addremove mark new/missing files as added/removed before |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
58 committing |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
59 --close-branch mark a branch as closed, hiding it from the branch |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
60 list |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
61 -I --include PATTERN [+] include names matching the given patterns |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
62 -X --exclude PATTERN [+] exclude names matching the given patterns |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
63 -m --message TEXT use text as commit message |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
64 -l --logfile FILE read commit message from file |
14016 | 65 -d --date DATE record the specified date as commit date |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
66 -u --user USER record the specified user as committer |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
67 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
68 [+] marked option can be specified multiple times |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
69 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
70 use "hg -v help record" to show global options |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
71 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
72 help (no mq, so no qrecord) |
5933 | 73 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
74 $ hg help qrecord |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
75 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
76 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
77 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
78 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
79 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
|
80 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
81 use "hg -v help qrecord" to show global options |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
82 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
83 $ hg init a |
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 qrecord (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
86 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
87 $ hg -R a qrecord |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
88 hg qrecord: invalid arguments |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
89 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
90 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
91 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
92 |
13950
14d0553bd48b
help: do not show full help text for command on option errors
Adrian Buehlmann <adrian@cadifra.com>
parents:
13936
diff
changeset
|
93 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
|
94 [255] |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
95 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
96 qrecord patch (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
97 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
98 $ hg -R a qrecord patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
99 abort: 'mq' extension not loaded |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12075
diff
changeset
|
100 [255] |
5933 | 101 |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
102 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
|
103 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
104 $ 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
|
105 $ hg help qrecord |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
106 *** failed to import extension mq from nonexistant: [Errno 2] No such file or directory |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
107 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
|
108 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
109 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
|
110 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
111 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
|
112 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
113 use "hg -v help qrecord" to show global options |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
114 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
115 help (mq present) |
5933 | 116 |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
117 $ 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
|
118 $ 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
|
119 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
120 $ hg help qrecord |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
121 hg qrecord [OPTION]... PATCH [FILE]... |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
122 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
123 interactively record a new patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
124 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
125 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
|
126 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
127 options: |
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 -e --edit edit commit message |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
130 -g --git use git extended diff format |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
131 -U --currentuser add "From: <current user>" to patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
132 -u --user USER add "From: <USER>" to patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
133 -D --currentdate add "Date: <current date>" to patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
134 -d --date DATE add "Date: <DATE>" to patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
135 -I --include PATTERN [+] include names matching the given patterns |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
136 -X --exclude PATTERN [+] exclude names matching the given patterns |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
137 -m --message TEXT use text as commit message |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
138 -l --logfile FILE read commit message from file |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
139 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
140 [+] marked option can be specified multiple times |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
141 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
142 use "hg -v help qrecord" to show global options |
5933 | 143 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
144 $ cd a |
5933 | 145 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
146 Base commit |
5933 | 147 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
148 $ cat > 1.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
149 > 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
150 > 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
151 > 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
152 > 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
153 > 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
154 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
155 $ cat > 2.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
156 > a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
157 > b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
158 > c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
159 > d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
160 > e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
161 > f |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
162 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
163 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
164 $ mkdir dir |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
165 $ cat > dir/a.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
166 > hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
167 > |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
168 > someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
169 > up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
170 > there |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
171 > loves |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
172 > me |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
173 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
174 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
175 $ 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
|
176 $ hg commit -m 'initial checkin' |
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 Changing files |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
179 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
180 $ 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
|
181 $ 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
|
182 $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new |
5933 | 183 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
184 $ mv -f 1.txt.new 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
185 $ mv -f 2.txt.new 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
186 $ 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
|
187 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
188 Whole diff |
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 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
191 diff -r 1057167b20ef 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
192 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
193 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
194 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
195 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
196 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
197 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
198 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
199 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
200 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
201 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
202 diff -r 1057167b20ef 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
203 --- a/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
204 +++ b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
205 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
206 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
207 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
208 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
209 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
210 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
211 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
212 diff -r 1057167b20ef dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
213 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
214 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
215 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
216 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
217 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
218 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
219 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
220 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
221 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
222 qrecord a.patch |
5933 | 223 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
224 $ 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
|
225 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
226 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
227 > n |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
228 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
229 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
230 > n |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
231 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
232 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
233 2 hunks, 2 lines changed |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
234 examine changes to '1.txt'? [Ynsfdaq?] |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
235 @@ -1,3 +1,3 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
236 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
237 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
238 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
239 3 |
13295
fb446228c0d4
record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents:
12934
diff
changeset
|
240 record change 1/4 to '1.txt'? [Ynsfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
241 @@ -3,3 +3,3 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
242 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
243 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
244 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
245 5 |
13295
fb446228c0d4
record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents:
12934
diff
changeset
|
246 record change 2/4 to '1.txt'? [Ynsfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
247 diff --git a/2.txt b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
248 1 hunks, 1 lines changed |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
249 examine changes to '2.txt'? [Ynsfdaq?] |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
250 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
251 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
252 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
253 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
254 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
255 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
256 e |
13295
fb446228c0d4
record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents:
12934
diff
changeset
|
257 record change 3/4 to '2.txt'? [Ynsfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
258 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
|
259 1 hunks, 1 lines changed |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
260 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
5933 | 261 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
262 After qrecord a.patch 'tip'" |
5933 | 263 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
264 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
265 changeset: 1:5d1ca63427ee |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
266 tag: a.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
267 tag: qbase |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
268 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
269 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
270 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
271 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
|
272 summary: aaa |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
273 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
274 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
275 --- 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
|
276 +++ 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
|
277 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
278 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
279 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
280 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
281 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
282 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
283 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
284 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
285 --- 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
|
286 +++ 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
|
287 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
288 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
289 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
290 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
291 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
292 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
293 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
294 |
5933 | 295 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
296 After qrecord a.patch 'diff'" |
5933 | 297 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
298 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
299 diff -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
300 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
301 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
302 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
303 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
304 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
305 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
306 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
307 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
308 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
309 diff -r 5d1ca63427ee dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
310 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
311 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
312 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
313 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
314 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
315 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
316 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
317 up |
5933 | 318 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
319 qrecord b.patch |
5933 | 320 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
321 $ 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
|
322 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
323 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
324 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
325 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
326 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
327 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
328 1 hunks, 1 lines changed |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
329 examine changes to '1.txt'? [Ynsfdaq?] |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
330 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
331 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
332 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
333 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
334 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
335 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
336 5 |
13295
fb446228c0d4
record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents:
12934
diff
changeset
|
337 record change 1/2 to '1.txt'? [Ynsfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
338 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
|
339 1 hunks, 1 lines changed |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
340 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
341 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
342 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
343 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
344 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
345 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
346 up |
13295
fb446228c0d4
record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents:
12934
diff
changeset
|
347 record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
348 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
349 After qrecord b.patch 'tip' |
5933 | 350 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
351 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
352 changeset: 2:b056198bf878 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
353 tag: b.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
354 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
355 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
356 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
357 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
|
358 summary: bbb |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
359 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
360 diff -r 5d1ca63427ee -r b056198bf878 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
361 --- 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
|
362 +++ 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
|
363 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
364 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
365 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
366 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
367 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
368 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
369 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
370 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
371 --- 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
|
372 +++ 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
|
373 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
374 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
375 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
376 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
377 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
378 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
379 |
5933 | 380 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
381 After qrecord b.patch 'diff' |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
382 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
383 $ hg diff --nodates |