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