Show More
@@ -1,338 +1,338 b'' | |||
|
1 | 1 | Show all commands except debug commands |
|
2 | 2 | $ hg debugcomplete |
|
3 | 3 | add |
|
4 | 4 | addremove |
|
5 | 5 | annotate |
|
6 | 6 | archive |
|
7 | 7 | backout |
|
8 | 8 | bisect |
|
9 | 9 | bookmarks |
|
10 | 10 | branch |
|
11 | 11 | branches |
|
12 | 12 | bundle |
|
13 | 13 | cat |
|
14 | 14 | clone |
|
15 | 15 | commit |
|
16 | 16 | copy |
|
17 | 17 | diff |
|
18 | 18 | export |
|
19 | 19 | forget |
|
20 | 20 | graft |
|
21 | 21 | grep |
|
22 | 22 | heads |
|
23 | 23 | help |
|
24 | 24 | identify |
|
25 | 25 | import |
|
26 | 26 | incoming |
|
27 | 27 | init |
|
28 | 28 | locate |
|
29 | 29 | log |
|
30 | 30 | manifest |
|
31 | 31 | merge |
|
32 | 32 | outgoing |
|
33 | 33 | parents |
|
34 | 34 | paths |
|
35 | 35 | phase |
|
36 | 36 | pull |
|
37 | 37 | push |
|
38 | 38 | recover |
|
39 | 39 | remove |
|
40 | 40 | rename |
|
41 | 41 | resolve |
|
42 | 42 | revert |
|
43 | 43 | rollback |
|
44 | 44 | root |
|
45 | 45 | serve |
|
46 | 46 | showconfig |
|
47 | 47 | status |
|
48 | 48 | summary |
|
49 | 49 | tag |
|
50 | 50 | tags |
|
51 | 51 | tip |
|
52 | 52 | unbundle |
|
53 | 53 | update |
|
54 | 54 | verify |
|
55 | 55 | version |
|
56 | 56 | |
|
57 | 57 | Show all commands that start with "a" |
|
58 | 58 | $ hg debugcomplete a |
|
59 | 59 | add |
|
60 | 60 | addremove |
|
61 | 61 | annotate |
|
62 | 62 | archive |
|
63 | 63 | |
|
64 | 64 | Do not show debug commands if there are other candidates |
|
65 | 65 | $ hg debugcomplete d |
|
66 | 66 | diff |
|
67 | 67 | |
|
68 | 68 | Show debug commands if there are no other candidates |
|
69 | 69 | $ hg debugcomplete debug |
|
70 | 70 | debugancestor |
|
71 | 71 | debugbuilddag |
|
72 | 72 | debugbundle |
|
73 | 73 | debugcheckstate |
|
74 | 74 | debugcommands |
|
75 | 75 | debugcomplete |
|
76 | 76 | debugconfig |
|
77 | 77 | debugdag |
|
78 | 78 | debugdata |
|
79 | 79 | debugdate |
|
80 | 80 | debugdirstate |
|
81 | 81 | debugdiscovery |
|
82 | 82 | debugfileset |
|
83 | 83 | debugfsinfo |
|
84 | 84 | debuggetbundle |
|
85 | 85 | debugignore |
|
86 | 86 | debugindex |
|
87 | 87 | debugindexdot |
|
88 | 88 | debuginstall |
|
89 | 89 | debugknown |
|
90 | 90 | debuglabelcomplete |
|
91 | 91 | debugobsolete |
|
92 | 92 | debugpathcomplete |
|
93 | 93 | debugpushkey |
|
94 | 94 | debugpvec |
|
95 | 95 | debugrebuilddirstate |
|
96 | 96 | debugrename |
|
97 | 97 | debugrevlog |
|
98 | 98 | debugrevspec |
|
99 | 99 | debugsetparents |
|
100 | 100 | debugsub |
|
101 | 101 | debugsuccessorssets |
|
102 | 102 | debugwalk |
|
103 | 103 | debugwireargs |
|
104 | 104 | |
|
105 | 105 | Do not show the alias of a debug command if there are other candidates |
|
106 | 106 | (this should hide rawcommit) |
|
107 | 107 | $ hg debugcomplete r |
|
108 | 108 | recover |
|
109 | 109 | remove |
|
110 | 110 | rename |
|
111 | 111 | resolve |
|
112 | 112 | revert |
|
113 | 113 | rollback |
|
114 | 114 | root |
|
115 | 115 | Show the alias of a debug command if there are no other candidates |
|
116 | 116 | $ hg debugcomplete rawc |
|
117 | 117 | |
|
118 | 118 | |
|
119 | 119 | Show the global options |
|
120 | 120 | $ hg debugcomplete --options | sort |
|
121 | 121 | --config |
|
122 | 122 | --cwd |
|
123 | 123 | --debug |
|
124 | 124 | --debugger |
|
125 | 125 | --encoding |
|
126 | 126 | --encodingmode |
|
127 | 127 | --help |
|
128 | 128 | --hidden |
|
129 | 129 | --noninteractive |
|
130 | 130 | --profile |
|
131 | 131 | --quiet |
|
132 | 132 | --repository |
|
133 | 133 | --time |
|
134 | 134 | --traceback |
|
135 | 135 | --verbose |
|
136 | 136 | --version |
|
137 | 137 | -R |
|
138 | 138 | -h |
|
139 | 139 | -q |
|
140 | 140 | -v |
|
141 | 141 | -y |
|
142 | 142 | |
|
143 | 143 | Show the options for the "serve" command |
|
144 | 144 | $ hg debugcomplete --options serve | sort |
|
145 | 145 | --accesslog |
|
146 | 146 | --address |
|
147 | 147 | --certificate |
|
148 | 148 | --cmdserver |
|
149 | 149 | --config |
|
150 | 150 | --cwd |
|
151 | 151 | --daemon |
|
152 | 152 | --daemon-pipefds |
|
153 | 153 | --debug |
|
154 | 154 | --debugger |
|
155 | 155 | --encoding |
|
156 | 156 | --encodingmode |
|
157 | 157 | --errorlog |
|
158 | 158 | --help |
|
159 | 159 | --hidden |
|
160 | 160 | --ipv6 |
|
161 | 161 | --name |
|
162 | 162 | --noninteractive |
|
163 | 163 | --pid-file |
|
164 | 164 | --port |
|
165 | 165 | --prefix |
|
166 | 166 | --profile |
|
167 | 167 | --quiet |
|
168 | 168 | --repository |
|
169 | 169 | --stdio |
|
170 | 170 | --style |
|
171 | 171 | --templates |
|
172 | 172 | --time |
|
173 | 173 | --traceback |
|
174 | 174 | --verbose |
|
175 | 175 | --version |
|
176 | 176 | --web-conf |
|
177 | 177 | -6 |
|
178 | 178 | -A |
|
179 | 179 | -E |
|
180 | 180 | -R |
|
181 | 181 | -a |
|
182 | 182 | -d |
|
183 | 183 | -h |
|
184 | 184 | -n |
|
185 | 185 | -p |
|
186 | 186 | -q |
|
187 | 187 | -t |
|
188 | 188 | -v |
|
189 | 189 | -y |
|
190 | 190 | |
|
191 | 191 | Show an error if we use --options with an ambiguous abbreviation |
|
192 | 192 | $ hg debugcomplete --options s |
|
193 | 193 | hg: command 's' is ambiguous: |
|
194 | 194 | serve showconfig status summary |
|
195 | 195 | [255] |
|
196 | 196 | |
|
197 | 197 | Show all commands + options |
|
198 | 198 | $ hg debugcommands |
|
199 | 199 | add: include, exclude, subrepos, dry-run |
|
200 | 200 | annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude |
|
201 | 201 | clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure |
|
202 | commit: addremove, close-branch, amend, include, exclude, message, logfile, date, user, subrepos | |
|
202 | commit: addremove, close-branch, amend, secret, include, exclude, message, logfile, date, user, subrepos | |
|
203 | 203 | diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude, subrepos |
|
204 | 204 | export: output, switch-parent, rev, text, git, nodates |
|
205 | 205 | forget: include, exclude |
|
206 | 206 | init: ssh, remotecmd, insecure |
|
207 | 207 | log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude |
|
208 | 208 | merge: force, rev, preview, tool |
|
209 | 209 | pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure |
|
210 | 210 | push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure |
|
211 | 211 | remove: after, force, include, exclude |
|
212 | 212 | serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate |
|
213 | 213 | status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos |
|
214 | 214 | summary: remote |
|
215 | 215 | update: clean, check, date, rev |
|
216 | 216 | addremove: similarity, include, exclude, dry-run |
|
217 | 217 | archive: no-decode, prefix, rev, type, subrepos, include, exclude |
|
218 | 218 | backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user |
|
219 | 219 | bisect: reset, good, bad, skip, extend, command, noupdate |
|
220 | 220 | bookmarks: force, rev, delete, rename, inactive |
|
221 | 221 | branch: force, clean |
|
222 | 222 | branches: active, closed |
|
223 | 223 | bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure |
|
224 | 224 | cat: output, rev, decode, include, exclude |
|
225 | 225 | copy: after, force, include, exclude, dry-run |
|
226 | 226 | debugancestor: |
|
227 | 227 | debugbuilddag: mergeable-file, overwritten-file, new-file |
|
228 | 228 | debugbundle: all |
|
229 | 229 | debugcheckstate: |
|
230 | 230 | debugcommands: |
|
231 | 231 | debugcomplete: options |
|
232 | 232 | debugdag: tags, branches, dots, spaces |
|
233 | 233 | debugdata: changelog, manifest |
|
234 | 234 | debugdate: extended |
|
235 | 235 | debugdirstate: nodates, datesort |
|
236 | 236 | debugdiscovery: old, nonheads, ssh, remotecmd, insecure |
|
237 | 237 | debugfileset: rev |
|
238 | 238 | debugfsinfo: |
|
239 | 239 | debuggetbundle: head, common, type |
|
240 | 240 | debugignore: |
|
241 | 241 | debugindex: changelog, manifest, format |
|
242 | 242 | debugindexdot: |
|
243 | 243 | debuginstall: |
|
244 | 244 | debugknown: |
|
245 | 245 | debuglabelcomplete: |
|
246 | 246 | debugobsolete: flags, date, user |
|
247 | 247 | debugpathcomplete: full, normal, added, removed |
|
248 | 248 | debugpushkey: |
|
249 | 249 | debugpvec: |
|
250 | 250 | debugrebuilddirstate: rev |
|
251 | 251 | debugrename: rev |
|
252 | 252 | debugrevlog: changelog, manifest, dump |
|
253 | 253 | debugrevspec: |
|
254 | 254 | debugsetparents: |
|
255 | 255 | debugsub: rev |
|
256 | 256 | debugsuccessorssets: |
|
257 | 257 | debugwalk: include, exclude |
|
258 | 258 | debugwireargs: three, four, five, ssh, remotecmd, insecure |
|
259 | 259 | graft: rev, continue, edit, log, currentdate, currentuser, date, user, tool, dry-run |
|
260 | 260 | grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude |
|
261 | 261 | heads: rev, topo, active, closed, style, template |
|
262 | 262 | help: extension, command, keyword |
|
263 | 263 | identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure |
|
264 | 264 | import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity |
|
265 | 265 | incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos |
|
266 | 266 | locate: rev, print0, fullpath, include, exclude |
|
267 | 267 | manifest: rev, all |
|
268 | 268 | outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos |
|
269 | 269 | parents: rev, style, template |
|
270 | 270 | paths: |
|
271 | 271 | phase: public, draft, secret, force, rev |
|
272 | 272 | recover: |
|
273 | 273 | rename: after, force, include, exclude, dry-run |
|
274 | 274 | resolve: all, list, mark, unmark, no-status, tool, include, exclude |
|
275 | 275 | revert: all, date, rev, no-backup, include, exclude, dry-run |
|
276 | 276 | rollback: dry-run, force |
|
277 | 277 | root: |
|
278 | 278 | showconfig: untrusted |
|
279 | 279 | tag: force, local, rev, remove, edit, message, date, user |
|
280 | 280 | tags: |
|
281 | 281 | tip: patch, git, style, template |
|
282 | 282 | unbundle: update |
|
283 | 283 | verify: |
|
284 | 284 | version: |
|
285 | 285 | |
|
286 | 286 | $ hg init a |
|
287 | 287 | $ cd a |
|
288 | 288 | $ echo fee > fee |
|
289 | 289 | $ hg ci -q -Amfee |
|
290 | 290 | $ hg tag fee |
|
291 | 291 | $ mkdir fie |
|
292 | 292 | $ echo dead > fie/dead |
|
293 | 293 | $ echo live > fie/live |
|
294 | 294 | $ hg bookmark fo |
|
295 | 295 | $ hg branch -q fie |
|
296 | 296 | $ hg ci -q -Amfie |
|
297 | 297 | $ echo fo > fo |
|
298 | 298 | $ hg branch -qf default |
|
299 | 299 | $ hg ci -q -Amfo |
|
300 | 300 | $ echo Fum > Fum |
|
301 | 301 | $ hg ci -q -AmFum |
|
302 | 302 | $ hg bookmark Fum |
|
303 | 303 | |
|
304 | 304 | Test debugpathcomplete |
|
305 | 305 | |
|
306 | 306 | $ hg debugpathcomplete f |
|
307 | 307 | fee |
|
308 | 308 | fie/ |
|
309 | 309 | fo |
|
310 | 310 | $ hg debugpathcomplete -f f |
|
311 | 311 | fee |
|
312 | 312 | fie/dead |
|
313 | 313 | fie/live |
|
314 | 314 | fo |
|
315 | 315 | |
|
316 | 316 | $ hg rm Fum |
|
317 | 317 | $ hg debugpathcomplete -r F |
|
318 | 318 | Fum |
|
319 | 319 | |
|
320 | 320 | If one directory and no files match, give an ambiguous answer |
|
321 | 321 | |
|
322 | 322 | $ hg debugpathcomplete fi |
|
323 | 323 | fie/ |
|
324 | 324 | fie/. |
|
325 | 325 | |
|
326 | 326 | Test debuglabelcomplete |
|
327 | 327 | |
|
328 | 328 | $ hg debuglabelcomplete |
|
329 | 329 | Fum |
|
330 | 330 | default |
|
331 | 331 | fee |
|
332 | 332 | fie |
|
333 | 333 | fo |
|
334 | 334 | tip |
|
335 | 335 | $ hg debuglabelcomplete f |
|
336 | 336 | fee |
|
337 | 337 | fie |
|
338 | 338 | fo |
@@ -1,402 +1,403 b'' | |||
|
1 | 1 | Create configuration |
|
2 | 2 | |
|
3 | 3 | $ echo "[ui]" >> $HGRCPATH |
|
4 | 4 | $ echo "interactive=true" >> $HGRCPATH |
|
5 | 5 | |
|
6 | 6 | help record (no record) |
|
7 | 7 | |
|
8 | 8 | $ hg help record |
|
9 | 9 | record extension - commands to interactively select changes for |
|
10 | 10 | commit/qrefresh |
|
11 | 11 | |
|
12 | 12 | use "hg help extensions" for information on enabling extensions |
|
13 | 13 | |
|
14 | 14 | help qrecord (no record) |
|
15 | 15 | |
|
16 | 16 | $ hg help qrecord |
|
17 | 17 | 'qrecord' is provided by the following extension: |
|
18 | 18 | |
|
19 | 19 | record commands to interactively select changes for commit/qrefresh |
|
20 | 20 | |
|
21 | 21 | use "hg help extensions" for information on enabling extensions |
|
22 | 22 | |
|
23 | 23 | $ echo "[extensions]" >> $HGRCPATH |
|
24 | 24 | $ echo "record=" >> $HGRCPATH |
|
25 | 25 | |
|
26 | 26 | help record (record) |
|
27 | 27 | |
|
28 | 28 | $ hg help record |
|
29 | 29 | hg record [OPTION]... [FILE]... |
|
30 | 30 | |
|
31 | 31 | interactively select changes to commit |
|
32 | 32 | |
|
33 | 33 | If a list of files is omitted, all changes reported by "hg status" will be |
|
34 | 34 | candidates for recording. |
|
35 | 35 | |
|
36 | 36 | See "hg help dates" for a list of formats valid for -d/--date. |
|
37 | 37 | |
|
38 | 38 | You will be prompted for whether to record changes to each modified file, |
|
39 | 39 | and for files with multiple changes, for each change to use. For each |
|
40 | 40 | query, the following responses are possible: |
|
41 | 41 | |
|
42 | 42 | y - record this change |
|
43 | 43 | n - skip this change |
|
44 | 44 | e - edit this change manually |
|
45 | 45 | |
|
46 | 46 | s - skip remaining changes to this file |
|
47 | 47 | f - record remaining changes to this file |
|
48 | 48 | |
|
49 | 49 | d - done, skip remaining changes and files |
|
50 | 50 | a - record all changes to all remaining files |
|
51 | 51 | q - quit, recording no changes |
|
52 | 52 | |
|
53 | 53 | ? - display help |
|
54 | 54 | |
|
55 | 55 | This command is not available when committing a merge. |
|
56 | 56 | |
|
57 | 57 | options: |
|
58 | 58 | |
|
59 | 59 | -A --addremove mark new/missing files as added/removed before |
|
60 | 60 | committing |
|
61 | 61 | --close-branch mark a branch as closed, hiding it from the branch |
|
62 | 62 | list |
|
63 | 63 | --amend amend the parent of the working dir |
|
64 | -s --secret use the secret phase for committing | |
|
64 | 65 | -I --include PATTERN [+] include names matching the given patterns |
|
65 | 66 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
66 | 67 | -m --message TEXT use text as commit message |
|
67 | 68 | -l --logfile FILE read commit message from file |
|
68 | 69 | -d --date DATE record the specified date as commit date |
|
69 | 70 | -u --user USER record the specified user as committer |
|
70 | 71 | -S --subrepos recurse into subrepositories |
|
71 | 72 | -w --ignore-all-space ignore white space when comparing lines |
|
72 | 73 | -b --ignore-space-change ignore changes in the amount of white space |
|
73 | 74 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
74 | 75 | |
|
75 | 76 | [+] marked option can be specified multiple times |
|
76 | 77 | |
|
77 | 78 | use "hg -v help record" to show the global options |
|
78 | 79 | |
|
79 | 80 | help (no mq, so no qrecord) |
|
80 | 81 | |
|
81 | 82 | $ hg help qrecord |
|
82 | 83 | hg qrecord [OPTION]... PATCH [FILE]... |
|
83 | 84 | |
|
84 | 85 | interactively record a new patch |
|
85 | 86 | |
|
86 | 87 | See "hg help qnew" & "hg help record" for more information and usage. |
|
87 | 88 | |
|
88 | 89 | use "hg -v help qrecord" to show the global options |
|
89 | 90 | |
|
90 | 91 | $ hg init a |
|
91 | 92 | |
|
92 | 93 | qrecord (mq not present) |
|
93 | 94 | |
|
94 | 95 | $ hg -R a qrecord |
|
95 | 96 | hg qrecord: invalid arguments |
|
96 | 97 | hg qrecord [OPTION]... PATCH [FILE]... |
|
97 | 98 | |
|
98 | 99 | interactively record a new patch |
|
99 | 100 | |
|
100 | 101 | use "hg help qrecord" to show the full help text |
|
101 | 102 | [255] |
|
102 | 103 | |
|
103 | 104 | qrecord patch (mq not present) |
|
104 | 105 | |
|
105 | 106 | $ hg -R a qrecord patch |
|
106 | 107 | abort: 'mq' extension not loaded |
|
107 | 108 | [255] |
|
108 | 109 | |
|
109 | 110 | help (bad mq) |
|
110 | 111 | |
|
111 | 112 | $ echo "mq=nonexistent" >> $HGRCPATH |
|
112 | 113 | $ hg help qrecord |
|
113 | 114 | *** failed to import extension mq from nonexistent: [Errno *] * (glob) |
|
114 | 115 | hg qrecord [OPTION]... PATCH [FILE]... |
|
115 | 116 | |
|
116 | 117 | interactively record a new patch |
|
117 | 118 | |
|
118 | 119 | See "hg help qnew" & "hg help record" for more information and usage. |
|
119 | 120 | |
|
120 | 121 | use "hg -v help qrecord" to show the global options |
|
121 | 122 | |
|
122 | 123 | help (mq present) |
|
123 | 124 | |
|
124 | 125 | $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp |
|
125 | 126 | $ mv hgrc.tmp $HGRCPATH |
|
126 | 127 | |
|
127 | 128 | $ hg help qrecord |
|
128 | 129 | hg qrecord [OPTION]... PATCH [FILE]... |
|
129 | 130 | |
|
130 | 131 | interactively record a new patch |
|
131 | 132 | |
|
132 | 133 | See "hg help qnew" & "hg help record" for more information and usage. |
|
133 | 134 | |
|
134 | 135 | options: |
|
135 | 136 | |
|
136 | 137 | -e --edit edit commit message |
|
137 | 138 | -g --git use git extended diff format |
|
138 | 139 | -U --currentuser add "From: <current user>" to patch |
|
139 | 140 | -u --user USER add "From: <USER>" to patch |
|
140 | 141 | -D --currentdate add "Date: <current date>" to patch |
|
141 | 142 | -d --date DATE add "Date: <DATE>" to patch |
|
142 | 143 | -I --include PATTERN [+] include names matching the given patterns |
|
143 | 144 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
144 | 145 | -m --message TEXT use text as commit message |
|
145 | 146 | -l --logfile FILE read commit message from file |
|
146 | 147 | -w --ignore-all-space ignore white space when comparing lines |
|
147 | 148 | -b --ignore-space-change ignore changes in the amount of white space |
|
148 | 149 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
149 | 150 | --mq operate on patch repository |
|
150 | 151 | |
|
151 | 152 | [+] marked option can be specified multiple times |
|
152 | 153 | |
|
153 | 154 | use "hg -v help qrecord" to show the global options |
|
154 | 155 | |
|
155 | 156 | $ cd a |
|
156 | 157 | |
|
157 | 158 | Base commit |
|
158 | 159 | |
|
159 | 160 | $ cat > 1.txt <<EOF |
|
160 | 161 | > 1 |
|
161 | 162 | > 2 |
|
162 | 163 | > 3 |
|
163 | 164 | > 4 |
|
164 | 165 | > 5 |
|
165 | 166 | > EOF |
|
166 | 167 | $ cat > 2.txt <<EOF |
|
167 | 168 | > a |
|
168 | 169 | > b |
|
169 | 170 | > c |
|
170 | 171 | > d |
|
171 | 172 | > e |
|
172 | 173 | > f |
|
173 | 174 | > EOF |
|
174 | 175 | |
|
175 | 176 | $ mkdir dir |
|
176 | 177 | $ cat > dir/a.txt <<EOF |
|
177 | 178 | > hello world |
|
178 | 179 | > |
|
179 | 180 | > someone |
|
180 | 181 | > up |
|
181 | 182 | > there |
|
182 | 183 | > loves |
|
183 | 184 | > me |
|
184 | 185 | > EOF |
|
185 | 186 | |
|
186 | 187 | $ hg add 1.txt 2.txt dir/a.txt |
|
187 | 188 | $ hg commit -m 'initial checkin' |
|
188 | 189 | |
|
189 | 190 | Changing files |
|
190 | 191 | |
|
191 | 192 | $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new |
|
192 | 193 | $ sed -e 's/b/b b/' 2.txt > 2.txt.new |
|
193 | 194 | $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new |
|
194 | 195 | |
|
195 | 196 | $ mv -f 1.txt.new 1.txt |
|
196 | 197 | $ mv -f 2.txt.new 2.txt |
|
197 | 198 | $ mv -f dir/a.txt.new dir/a.txt |
|
198 | 199 | |
|
199 | 200 | Whole diff |
|
200 | 201 | |
|
201 | 202 | $ hg diff --nodates |
|
202 | 203 | diff -r 1057167b20ef 1.txt |
|
203 | 204 | --- a/1.txt |
|
204 | 205 | +++ b/1.txt |
|
205 | 206 | @@ -1,5 +1,5 @@ |
|
206 | 207 | 1 |
|
207 | 208 | -2 |
|
208 | 209 | +2 2 |
|
209 | 210 | 3 |
|
210 | 211 | -4 |
|
211 | 212 | +4 4 |
|
212 | 213 | 5 |
|
213 | 214 | diff -r 1057167b20ef 2.txt |
|
214 | 215 | --- a/2.txt |
|
215 | 216 | +++ b/2.txt |
|
216 | 217 | @@ -1,5 +1,5 @@ |
|
217 | 218 | a |
|
218 | 219 | -b |
|
219 | 220 | +b b |
|
220 | 221 | c |
|
221 | 222 | d |
|
222 | 223 | e |
|
223 | 224 | diff -r 1057167b20ef dir/a.txt |
|
224 | 225 | --- a/dir/a.txt |
|
225 | 226 | +++ b/dir/a.txt |
|
226 | 227 | @@ -1,4 +1,4 @@ |
|
227 | 228 | -hello world |
|
228 | 229 | +hello world! |
|
229 | 230 | |
|
230 | 231 | someone |
|
231 | 232 | up |
|
232 | 233 | |
|
233 | 234 | qrecord with bad patch name, should abort before prompting |
|
234 | 235 | |
|
235 | 236 | $ hg qrecord .hg |
|
236 | 237 | abort: patch name cannot begin with ".hg" |
|
237 | 238 | [255] |
|
238 | 239 | |
|
239 | 240 | qrecord a.patch |
|
240 | 241 | |
|
241 | 242 | $ hg qrecord -d '0 0' -m aaa a.patch <<EOF |
|
242 | 243 | > y |
|
243 | 244 | > y |
|
244 | 245 | > n |
|
245 | 246 | > y |
|
246 | 247 | > y |
|
247 | 248 | > n |
|
248 | 249 | > EOF |
|
249 | 250 | diff --git a/1.txt b/1.txt |
|
250 | 251 | 2 hunks, 2 lines changed |
|
251 | 252 | examine changes to '1.txt'? [Ynesfdaq?] |
|
252 | 253 | @@ -1,3 +1,3 @@ |
|
253 | 254 | 1 |
|
254 | 255 | -2 |
|
255 | 256 | +2 2 |
|
256 | 257 | 3 |
|
257 | 258 | record change 1/4 to '1.txt'? [Ynesfdaq?] |
|
258 | 259 | @@ -3,3 +3,3 @@ |
|
259 | 260 | 3 |
|
260 | 261 | -4 |
|
261 | 262 | +4 4 |
|
262 | 263 | 5 |
|
263 | 264 | record change 2/4 to '1.txt'? [Ynesfdaq?] |
|
264 | 265 | diff --git a/2.txt b/2.txt |
|
265 | 266 | 1 hunks, 1 lines changed |
|
266 | 267 | examine changes to '2.txt'? [Ynesfdaq?] |
|
267 | 268 | @@ -1,5 +1,5 @@ |
|
268 | 269 | a |
|
269 | 270 | -b |
|
270 | 271 | +b b |
|
271 | 272 | c |
|
272 | 273 | d |
|
273 | 274 | e |
|
274 | 275 | record change 3/4 to '2.txt'? [Ynesfdaq?] |
|
275 | 276 | diff --git a/dir/a.txt b/dir/a.txt |
|
276 | 277 | 1 hunks, 1 lines changed |
|
277 | 278 | examine changes to 'dir/a.txt'? [Ynesfdaq?] |
|
278 | 279 | |
|
279 | 280 | After qrecord a.patch 'tip'" |
|
280 | 281 | |
|
281 | 282 | $ hg tip -p |
|
282 | 283 | changeset: 1:5d1ca63427ee |
|
283 | 284 | tag: a.patch |
|
284 | 285 | tag: qbase |
|
285 | 286 | tag: qtip |
|
286 | 287 | tag: tip |
|
287 | 288 | user: test |
|
288 | 289 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
289 | 290 | summary: aaa |
|
290 | 291 | |
|
291 | 292 | diff -r 1057167b20ef -r 5d1ca63427ee 1.txt |
|
292 | 293 | --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 |
|
293 | 294 | +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 |
|
294 | 295 | @@ -1,5 +1,5 @@ |
|
295 | 296 | 1 |
|
296 | 297 | -2 |
|
297 | 298 | +2 2 |
|
298 | 299 | 3 |
|
299 | 300 | 4 |
|
300 | 301 | 5 |
|
301 | 302 | diff -r 1057167b20ef -r 5d1ca63427ee 2.txt |
|
302 | 303 | --- a/2.txt Thu Jan 01 00:00:00 1970 +0000 |
|
303 | 304 | +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000 |
|
304 | 305 | @@ -1,5 +1,5 @@ |
|
305 | 306 | a |
|
306 | 307 | -b |
|
307 | 308 | +b b |
|
308 | 309 | c |
|
309 | 310 | d |
|
310 | 311 | e |
|
311 | 312 | |
|
312 | 313 | |
|
313 | 314 | After qrecord a.patch 'diff'" |
|
314 | 315 | |
|
315 | 316 | $ hg diff --nodates |
|
316 | 317 | diff -r 5d1ca63427ee 1.txt |
|
317 | 318 | --- a/1.txt |
|
318 | 319 | +++ b/1.txt |
|
319 | 320 | @@ -1,5 +1,5 @@ |
|
320 | 321 | 1 |
|
321 | 322 | 2 2 |
|
322 | 323 | 3 |
|
323 | 324 | -4 |
|
324 | 325 | +4 4 |
|
325 | 326 | 5 |
|
326 | 327 | diff -r 5d1ca63427ee dir/a.txt |
|
327 | 328 | --- a/dir/a.txt |
|
328 | 329 | +++ b/dir/a.txt |
|
329 | 330 | @@ -1,4 +1,4 @@ |
|
330 | 331 | -hello world |
|
331 | 332 | +hello world! |
|
332 | 333 | |
|
333 | 334 | someone |
|
334 | 335 | up |
|
335 | 336 | |
|
336 | 337 | qrecord b.patch |
|
337 | 338 | |
|
338 | 339 | $ hg qrecord -d '0 0' -m bbb b.patch <<EOF |
|
339 | 340 | > y |
|
340 | 341 | > y |
|
341 | 342 | > y |
|
342 | 343 | > y |
|
343 | 344 | > EOF |
|
344 | 345 | diff --git a/1.txt b/1.txt |
|
345 | 346 | 1 hunks, 1 lines changed |
|
346 | 347 | examine changes to '1.txt'? [Ynesfdaq?] |
|
347 | 348 | @@ -1,5 +1,5 @@ |
|
348 | 349 | 1 |
|
349 | 350 | 2 2 |
|
350 | 351 | 3 |
|
351 | 352 | -4 |
|
352 | 353 | +4 4 |
|
353 | 354 | 5 |
|
354 | 355 | record change 1/2 to '1.txt'? [Ynesfdaq?] |
|
355 | 356 | diff --git a/dir/a.txt b/dir/a.txt |
|
356 | 357 | 1 hunks, 1 lines changed |
|
357 | 358 | examine changes to 'dir/a.txt'? [Ynesfdaq?] |
|
358 | 359 | @@ -1,4 +1,4 @@ |
|
359 | 360 | -hello world |
|
360 | 361 | +hello world! |
|
361 | 362 | |
|
362 | 363 | someone |
|
363 | 364 | up |
|
364 | 365 | record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] |
|
365 | 366 | |
|
366 | 367 | After qrecord b.patch 'tip' |
|
367 | 368 | |
|
368 | 369 | $ hg tip -p |
|
369 | 370 | changeset: 2:b056198bf878 |
|
370 | 371 | tag: b.patch |
|
371 | 372 | tag: qtip |
|
372 | 373 | tag: tip |
|
373 | 374 | user: test |
|
374 | 375 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
375 | 376 | summary: bbb |
|
376 | 377 | |
|
377 | 378 | diff -r 5d1ca63427ee -r b056198bf878 1.txt |
|
378 | 379 | --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 |
|
379 | 380 | +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 |
|
380 | 381 | @@ -1,5 +1,5 @@ |
|
381 | 382 | 1 |
|
382 | 383 | 2 2 |
|
383 | 384 | 3 |
|
384 | 385 | -4 |
|
385 | 386 | +4 4 |
|
386 | 387 | 5 |
|
387 | 388 | diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt |
|
388 | 389 | --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 |
|
389 | 390 | +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 |
|
390 | 391 | @@ -1,4 +1,4 @@ |
|
391 | 392 | -hello world |
|
392 | 393 | +hello world! |
|
393 | 394 | |
|
394 | 395 | someone |
|
395 | 396 | up |
|
396 | 397 | |
|
397 | 398 | |
|
398 | 399 | After qrecord b.patch 'diff' |
|
399 | 400 | |
|
400 | 401 | $ hg diff --nodates |
|
401 | 402 | |
|
402 | 403 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now