##// END OF EJS Templates
grep: fix hash(linestate) to not include linenum...
Yuya Nishihara -
r45999:e47385ef default
parent child Browse files
Show More
@@ -1,7844 +1,7844
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 mergestate as mergestatemod,
49 mergestate as mergestatemod,
50 narrowspec,
50 narrowspec,
51 obsolete,
51 obsolete,
52 obsutil,
52 obsutil,
53 patch,
53 patch,
54 phases,
54 phases,
55 pycompat,
55 pycompat,
56 rcutil,
56 rcutil,
57 registrar,
57 registrar,
58 revsetlang,
58 revsetlang,
59 rewriteutil,
59 rewriteutil,
60 scmutil,
60 scmutil,
61 server,
61 server,
62 shelve as shelvemod,
62 shelve as shelvemod,
63 state as statemod,
63 state as statemod,
64 streamclone,
64 streamclone,
65 tags as tagsmod,
65 tags as tagsmod,
66 ui as uimod,
66 ui as uimod,
67 util,
67 util,
68 verify as verifymod,
68 verify as verifymod,
69 wireprotoserver,
69 wireprotoserver,
70 )
70 )
71 from .utils import (
71 from .utils import (
72 dateutil,
72 dateutil,
73 stringutil,
73 stringutil,
74 )
74 )
75
75
76 table = {}
76 table = {}
77 table.update(debugcommandsmod.command._table)
77 table.update(debugcommandsmod.command._table)
78
78
79 command = registrar.command(table)
79 command = registrar.command(table)
80 INTENT_READONLY = registrar.INTENT_READONLY
80 INTENT_READONLY = registrar.INTENT_READONLY
81
81
82 # common command options
82 # common command options
83
83
84 globalopts = [
84 globalopts = [
85 (
85 (
86 b'R',
86 b'R',
87 b'repository',
87 b'repository',
88 b'',
88 b'',
89 _(b'repository root directory or name of overlay bundle file'),
89 _(b'repository root directory or name of overlay bundle file'),
90 _(b'REPO'),
90 _(b'REPO'),
91 ),
91 ),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
93 (
93 (
94 b'y',
94 b'y',
95 b'noninteractive',
95 b'noninteractive',
96 None,
96 None,
97 _(
97 _(
98 b'do not prompt, automatically pick the first choice for all prompts'
98 b'do not prompt, automatically pick the first choice for all prompts'
99 ),
99 ),
100 ),
100 ),
101 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'q', b'quiet', None, _(b'suppress output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
103 (
103 (
104 b'',
104 b'',
105 b'color',
105 b'color',
106 b'',
106 b'',
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
108 # and should not be translated
108 # and should not be translated
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
110 _(b'TYPE'),
110 _(b'TYPE'),
111 ),
111 ),
112 (
112 (
113 b'',
113 b'',
114 b'config',
114 b'config',
115 [],
115 [],
116 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'set/override config option (use \'section.name=value\')'),
117 _(b'CONFIG'),
117 _(b'CONFIG'),
118 ),
118 ),
119 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debug', None, _(b'enable debugging output')),
120 (b'', b'debugger', None, _(b'start debugger')),
120 (b'', b'debugger', None, _(b'start debugger')),
121 (
121 (
122 b'',
122 b'',
123 b'encoding',
123 b'encoding',
124 encoding.encoding,
124 encoding.encoding,
125 _(b'set the charset encoding'),
125 _(b'set the charset encoding'),
126 _(b'ENCODE'),
126 _(b'ENCODE'),
127 ),
127 ),
128 (
128 (
129 b'',
129 b'',
130 b'encodingmode',
130 b'encodingmode',
131 encoding.encodingmode,
131 encoding.encodingmode,
132 _(b'set the charset encoding mode'),
132 _(b'set the charset encoding mode'),
133 _(b'MODE'),
133 _(b'MODE'),
134 ),
134 ),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
136 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'time', None, _(b'time how long the command takes')),
137 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'profile', None, _(b'print command execution profile')),
138 (b'', b'version', None, _(b'output version information and exit')),
138 (b'', b'version', None, _(b'output version information and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
141 (
141 (
142 b'',
142 b'',
143 b'pager',
143 b'pager',
144 b'auto',
144 b'auto',
145 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b"when to paginate (boolean, always, auto, or never)"),
146 _(b'TYPE'),
146 _(b'TYPE'),
147 ),
147 ),
148 ]
148 ]
149
149
150 dryrunopts = cmdutil.dryrunopts
150 dryrunopts = cmdutil.dryrunopts
151 remoteopts = cmdutil.remoteopts
151 remoteopts = cmdutil.remoteopts
152 walkopts = cmdutil.walkopts
152 walkopts = cmdutil.walkopts
153 commitopts = cmdutil.commitopts
153 commitopts = cmdutil.commitopts
154 commitopts2 = cmdutil.commitopts2
154 commitopts2 = cmdutil.commitopts2
155 commitopts3 = cmdutil.commitopts3
155 commitopts3 = cmdutil.commitopts3
156 formatteropts = cmdutil.formatteropts
156 formatteropts = cmdutil.formatteropts
157 templateopts = cmdutil.templateopts
157 templateopts = cmdutil.templateopts
158 logopts = cmdutil.logopts
158 logopts = cmdutil.logopts
159 diffopts = cmdutil.diffopts
159 diffopts = cmdutil.diffopts
160 diffwsopts = cmdutil.diffwsopts
160 diffwsopts = cmdutil.diffwsopts
161 diffopts2 = cmdutil.diffopts2
161 diffopts2 = cmdutil.diffopts2
162 mergetoolopts = cmdutil.mergetoolopts
162 mergetoolopts = cmdutil.mergetoolopts
163 similarityopts = cmdutil.similarityopts
163 similarityopts = cmdutil.similarityopts
164 subrepoopts = cmdutil.subrepoopts
164 subrepoopts = cmdutil.subrepoopts
165 debugrevlogopts = cmdutil.debugrevlogopts
165 debugrevlogopts = cmdutil.debugrevlogopts
166
166
167 # Commands start here, listed alphabetically
167 # Commands start here, listed alphabetically
168
168
169
169
170 @command(
170 @command(
171 b'abort',
171 b'abort',
172 dryrunopts,
172 dryrunopts,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
174 helpbasic=True,
174 helpbasic=True,
175 )
175 )
176 def abort(ui, repo, **opts):
176 def abort(ui, repo, **opts):
177 """abort an unfinished operation (EXPERIMENTAL)
177 """abort an unfinished operation (EXPERIMENTAL)
178
178
179 Aborts a multistep operation like graft, histedit, rebase, merge,
179 Aborts a multistep operation like graft, histedit, rebase, merge,
180 and unshelve if they are in an unfinished state.
180 and unshelve if they are in an unfinished state.
181
181
182 use --dry-run/-n to dry run the command.
182 use --dry-run/-n to dry run the command.
183 """
183 """
184 dryrun = opts.get('dry_run')
184 dryrun = opts.get('dry_run')
185 abortstate = cmdutil.getunfinishedstate(repo)
185 abortstate = cmdutil.getunfinishedstate(repo)
186 if not abortstate:
186 if not abortstate:
187 raise error.Abort(_(b'no operation in progress'))
187 raise error.Abort(_(b'no operation in progress'))
188 if not abortstate.abortfunc:
188 if not abortstate.abortfunc:
189 raise error.Abort(
189 raise error.Abort(
190 (
190 (
191 _(b"%s in progress but does not support 'hg abort'")
191 _(b"%s in progress but does not support 'hg abort'")
192 % (abortstate._opname)
192 % (abortstate._opname)
193 ),
193 ),
194 hint=abortstate.hint(),
194 hint=abortstate.hint(),
195 )
195 )
196 if dryrun:
196 if dryrun:
197 ui.status(
197 ui.status(
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
199 )
199 )
200 return
200 return
201 return abortstate.abortfunc(ui, repo)
201 return abortstate.abortfunc(ui, repo)
202
202
203
203
204 @command(
204 @command(
205 b'add',
205 b'add',
206 walkopts + subrepoopts + dryrunopts,
206 walkopts + subrepoopts + dryrunopts,
207 _(b'[OPTION]... [FILE]...'),
207 _(b'[OPTION]... [FILE]...'),
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
209 helpbasic=True,
209 helpbasic=True,
210 inferrepo=True,
210 inferrepo=True,
211 )
211 )
212 def add(ui, repo, *pats, **opts):
212 def add(ui, repo, *pats, **opts):
213 """add the specified files on the next commit
213 """add the specified files on the next commit
214
214
215 Schedule files to be version controlled and added to the
215 Schedule files to be version controlled and added to the
216 repository.
216 repository.
217
217
218 The files will be added to the repository at the next commit. To
218 The files will be added to the repository at the next commit. To
219 undo an add before that, see :hg:`forget`.
219 undo an add before that, see :hg:`forget`.
220
220
221 If no names are given, add all files to the repository (except
221 If no names are given, add all files to the repository (except
222 files matching ``.hgignore``).
222 files matching ``.hgignore``).
223
223
224 .. container:: verbose
224 .. container:: verbose
225
225
226 Examples:
226 Examples:
227
227
228 - New (unknown) files are added
228 - New (unknown) files are added
229 automatically by :hg:`add`::
229 automatically by :hg:`add`::
230
230
231 $ ls
231 $ ls
232 foo.c
232 foo.c
233 $ hg status
233 $ hg status
234 ? foo.c
234 ? foo.c
235 $ hg add
235 $ hg add
236 adding foo.c
236 adding foo.c
237 $ hg status
237 $ hg status
238 A foo.c
238 A foo.c
239
239
240 - Specific files to be added can be specified::
240 - Specific files to be added can be specified::
241
241
242 $ ls
242 $ ls
243 bar.c foo.c
243 bar.c foo.c
244 $ hg status
244 $ hg status
245 ? bar.c
245 ? bar.c
246 ? foo.c
246 ? foo.c
247 $ hg add bar.c
247 $ hg add bar.c
248 $ hg status
248 $ hg status
249 A bar.c
249 A bar.c
250 ? foo.c
250 ? foo.c
251
251
252 Returns 0 if all files are successfully added.
252 Returns 0 if all files are successfully added.
253 """
253 """
254
254
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
258 return rejected and 1 or 0
258 return rejected and 1 or 0
259
259
260
260
261 @command(
261 @command(
262 b'addremove',
262 b'addremove',
263 similarityopts + subrepoopts + walkopts + dryrunopts,
263 similarityopts + subrepoopts + walkopts + dryrunopts,
264 _(b'[OPTION]... [FILE]...'),
264 _(b'[OPTION]... [FILE]...'),
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
266 inferrepo=True,
266 inferrepo=True,
267 )
267 )
268 def addremove(ui, repo, *pats, **opts):
268 def addremove(ui, repo, *pats, **opts):
269 """add all new files, delete all missing files
269 """add all new files, delete all missing files
270
270
271 Add all new files and remove all missing files from the
271 Add all new files and remove all missing files from the
272 repository.
272 repository.
273
273
274 Unless names are given, new files are ignored if they match any of
274 Unless names are given, new files are ignored if they match any of
275 the patterns in ``.hgignore``. As with add, these changes take
275 the patterns in ``.hgignore``. As with add, these changes take
276 effect at the next commit.
276 effect at the next commit.
277
277
278 Use the -s/--similarity option to detect renamed files. This
278 Use the -s/--similarity option to detect renamed files. This
279 option takes a percentage between 0 (disabled) and 100 (files must
279 option takes a percentage between 0 (disabled) and 100 (files must
280 be identical) as its parameter. With a parameter greater than 0,
280 be identical) as its parameter. With a parameter greater than 0,
281 this compares every removed file with every added file and records
281 this compares every removed file with every added file and records
282 those similar enough as renames. Detecting renamed files this way
282 those similar enough as renames. Detecting renamed files this way
283 can be expensive. After using this option, :hg:`status -C` can be
283 can be expensive. After using this option, :hg:`status -C` can be
284 used to check which files were identified as moved or renamed. If
284 used to check which files were identified as moved or renamed. If
285 not specified, -s/--similarity defaults to 100 and only renames of
285 not specified, -s/--similarity defaults to 100 and only renames of
286 identical files are detected.
286 identical files are detected.
287
287
288 .. container:: verbose
288 .. container:: verbose
289
289
290 Examples:
290 Examples:
291
291
292 - A number of files (bar.c and foo.c) are new,
292 - A number of files (bar.c and foo.c) are new,
293 while foobar.c has been removed (without using :hg:`remove`)
293 while foobar.c has been removed (without using :hg:`remove`)
294 from the repository::
294 from the repository::
295
295
296 $ ls
296 $ ls
297 bar.c foo.c
297 bar.c foo.c
298 $ hg status
298 $ hg status
299 ! foobar.c
299 ! foobar.c
300 ? bar.c
300 ? bar.c
301 ? foo.c
301 ? foo.c
302 $ hg addremove
302 $ hg addremove
303 adding bar.c
303 adding bar.c
304 adding foo.c
304 adding foo.c
305 removing foobar.c
305 removing foobar.c
306 $ hg status
306 $ hg status
307 A bar.c
307 A bar.c
308 A foo.c
308 A foo.c
309 R foobar.c
309 R foobar.c
310
310
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
312 Afterwards, it was edited slightly::
312 Afterwards, it was edited slightly::
313
313
314 $ ls
314 $ ls
315 foo.c
315 foo.c
316 $ hg status
316 $ hg status
317 ! foobar.c
317 ! foobar.c
318 ? foo.c
318 ? foo.c
319 $ hg addremove --similarity 90
319 $ hg addremove --similarity 90
320 removing foobar.c
320 removing foobar.c
321 adding foo.c
321 adding foo.c
322 recording removal of foobar.c as rename to foo.c (94% similar)
322 recording removal of foobar.c as rename to foo.c (94% similar)
323 $ hg status -C
323 $ hg status -C
324 A foo.c
324 A foo.c
325 foobar.c
325 foobar.c
326 R foobar.c
326 R foobar.c
327
327
328 Returns 0 if all files are successfully added.
328 Returns 0 if all files are successfully added.
329 """
329 """
330 opts = pycompat.byteskwargs(opts)
330 opts = pycompat.byteskwargs(opts)
331 if not opts.get(b'similarity'):
331 if not opts.get(b'similarity'):
332 opts[b'similarity'] = b'100'
332 opts[b'similarity'] = b'100'
333 matcher = scmutil.match(repo[None], pats, opts)
333 matcher = scmutil.match(repo[None], pats, opts)
334 relative = scmutil.anypats(pats, opts)
334 relative = scmutil.anypats(pats, opts)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
337
337
338
338
339 @command(
339 @command(
340 b'annotate|blame',
340 b'annotate|blame',
341 [
341 [
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
343 (
343 (
344 b'',
344 b'',
345 b'follow',
345 b'follow',
346 None,
346 None,
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
348 ),
348 ),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
350 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'a', b'text', None, _(b'treat all files as text')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
352 (b'f', b'file', None, _(b'list the filename')),
352 (b'f', b'file', None, _(b'list the filename')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
356 (
356 (
357 b'l',
357 b'l',
358 b'line-number',
358 b'line-number',
359 None,
359 None,
360 _(b'show line number at the first appearance'),
360 _(b'show line number at the first appearance'),
361 ),
361 ),
362 (
362 (
363 b'',
363 b'',
364 b'skip',
364 b'skip',
365 [],
365 [],
366 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'revset to not display (EXPERIMENTAL)'),
367 _(b'REV'),
367 _(b'REV'),
368 ),
368 ),
369 ]
369 ]
370 + diffwsopts
370 + diffwsopts
371 + walkopts
371 + walkopts
372 + formatteropts,
372 + formatteropts,
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
375 helpbasic=True,
375 helpbasic=True,
376 inferrepo=True,
376 inferrepo=True,
377 )
377 )
378 def annotate(ui, repo, *pats, **opts):
378 def annotate(ui, repo, *pats, **opts):
379 """show changeset information by line for each file
379 """show changeset information by line for each file
380
380
381 List changes in files, showing the revision id responsible for
381 List changes in files, showing the revision id responsible for
382 each line.
382 each line.
383
383
384 This command is useful for discovering when a change was made and
384 This command is useful for discovering when a change was made and
385 by whom.
385 by whom.
386
386
387 If you include --file, --user, or --date, the revision number is
387 If you include --file, --user, or --date, the revision number is
388 suppressed unless you also include --number.
388 suppressed unless you also include --number.
389
389
390 Without the -a/--text option, annotate will avoid processing files
390 Without the -a/--text option, annotate will avoid processing files
391 it detects as binary. With -a, annotate will annotate the file
391 it detects as binary. With -a, annotate will annotate the file
392 anyway, although the results will probably be neither useful
392 anyway, although the results will probably be neither useful
393 nor desirable.
393 nor desirable.
394
394
395 .. container:: verbose
395 .. container:: verbose
396
396
397 Template:
397 Template:
398
398
399 The following keywords are supported in addition to the common template
399 The following keywords are supported in addition to the common template
400 keywords and functions. See also :hg:`help templates`.
400 keywords and functions. See also :hg:`help templates`.
401
401
402 :lines: List of lines with annotation data.
402 :lines: List of lines with annotation data.
403 :path: String. Repository-absolute path of the specified file.
403 :path: String. Repository-absolute path of the specified file.
404
404
405 And each entry of ``{lines}`` provides the following sub-keywords in
405 And each entry of ``{lines}`` provides the following sub-keywords in
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
407
407
408 :line: String. Line content.
408 :line: String. Line content.
409 :lineno: Integer. Line number at that revision.
409 :lineno: Integer. Line number at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
411
411
412 See :hg:`help templates.operators` for the list expansion syntax.
412 See :hg:`help templates.operators` for the list expansion syntax.
413
413
414 Returns 0 on success.
414 Returns 0 on success.
415 """
415 """
416 opts = pycompat.byteskwargs(opts)
416 opts = pycompat.byteskwargs(opts)
417 if not pats:
417 if not pats:
418 raise error.Abort(_(b'at least one filename or pattern is required'))
418 raise error.Abort(_(b'at least one filename or pattern is required'))
419
419
420 if opts.get(b'follow'):
420 if opts.get(b'follow'):
421 # --follow is deprecated and now just an alias for -f/--file
421 # --follow is deprecated and now just an alias for -f/--file
422 # to mimic the behavior of Mercurial before version 1.5
422 # to mimic the behavior of Mercurial before version 1.5
423 opts[b'file'] = True
423 opts[b'file'] = True
424
424
425 if (
425 if (
426 not opts.get(b'user')
426 not opts.get(b'user')
427 and not opts.get(b'changeset')
427 and not opts.get(b'changeset')
428 and not opts.get(b'date')
428 and not opts.get(b'date')
429 and not opts.get(b'file')
429 and not opts.get(b'file')
430 ):
430 ):
431 opts[b'number'] = True
431 opts[b'number'] = True
432
432
433 linenumber = opts.get(b'line_number') is not None
433 linenumber = opts.get(b'line_number') is not None
434 if (
434 if (
435 linenumber
435 linenumber
436 and (not opts.get(b'changeset'))
436 and (not opts.get(b'changeset'))
437 and (not opts.get(b'number'))
437 and (not opts.get(b'number'))
438 ):
438 ):
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
440
440
441 rev = opts.get(b'rev')
441 rev = opts.get(b'rev')
442 if rev:
442 if rev:
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
444 ctx = scmutil.revsingle(repo, rev)
444 ctx = scmutil.revsingle(repo, rev)
445
445
446 ui.pager(b'annotate')
446 ui.pager(b'annotate')
447 rootfm = ui.formatter(b'annotate', opts)
447 rootfm = ui.formatter(b'annotate', opts)
448 if ui.debugflag:
448 if ui.debugflag:
449 shorthex = pycompat.identity
449 shorthex = pycompat.identity
450 else:
450 else:
451
451
452 def shorthex(h):
452 def shorthex(h):
453 return h[:12]
453 return h[:12]
454
454
455 if ui.quiet:
455 if ui.quiet:
456 datefunc = dateutil.shortdate
456 datefunc = dateutil.shortdate
457 else:
457 else:
458 datefunc = dateutil.datestr
458 datefunc = dateutil.datestr
459 if ctx.rev() is None:
459 if ctx.rev() is None:
460 if opts.get(b'changeset'):
460 if opts.get(b'changeset'):
461 # omit "+" suffix which is appended to node hex
461 # omit "+" suffix which is appended to node hex
462 def formatrev(rev):
462 def formatrev(rev):
463 if rev == wdirrev:
463 if rev == wdirrev:
464 return b'%d' % ctx.p1().rev()
464 return b'%d' % ctx.p1().rev()
465 else:
465 else:
466 return b'%d' % rev
466 return b'%d' % rev
467
467
468 else:
468 else:
469
469
470 def formatrev(rev):
470 def formatrev(rev):
471 if rev == wdirrev:
471 if rev == wdirrev:
472 return b'%d+' % ctx.p1().rev()
472 return b'%d+' % ctx.p1().rev()
473 else:
473 else:
474 return b'%d ' % rev
474 return b'%d ' % rev
475
475
476 def formathex(h):
476 def formathex(h):
477 if h == wdirhex:
477 if h == wdirhex:
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
479 else:
479 else:
480 return b'%s ' % shorthex(h)
480 return b'%s ' % shorthex(h)
481
481
482 else:
482 else:
483 formatrev = b'%d'.__mod__
483 formatrev = b'%d'.__mod__
484 formathex = shorthex
484 formathex = shorthex
485
485
486 opmap = [
486 opmap = [
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
493 ]
493 ]
494 opnamemap = {
494 opnamemap = {
495 b'rev': b'number',
495 b'rev': b'number',
496 b'node': b'changeset',
496 b'node': b'changeset',
497 b'path': b'file',
497 b'path': b'file',
498 b'lineno': b'line_number',
498 b'lineno': b'line_number',
499 }
499 }
500
500
501 if rootfm.isplain():
501 if rootfm.isplain():
502
502
503 def makefunc(get, fmt):
503 def makefunc(get, fmt):
504 return lambda x: fmt(get(x))
504 return lambda x: fmt(get(x))
505
505
506 else:
506 else:
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return get
509 return get
510
510
511 datahint = rootfm.datahint()
511 datahint = rootfm.datahint()
512 funcmap = [
512 funcmap = [
513 (makefunc(get, fmt), sep)
513 (makefunc(get, fmt), sep)
514 for fn, sep, get, fmt in opmap
514 for fn, sep, get, fmt in opmap
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
516 ]
516 ]
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
518 fields = b' '.join(
518 fields = b' '.join(
519 fn
519 fn
520 for fn, sep, get, fmt in opmap
520 for fn, sep, get, fmt in opmap
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
522 )
522 )
523
523
524 def bad(x, y):
524 def bad(x, y):
525 raise error.Abort(b"%s: %s" % (x, y))
525 raise error.Abort(b"%s: %s" % (x, y))
526
526
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
528
528
529 follow = not opts.get(b'no_follow')
529 follow = not opts.get(b'no_follow')
530 diffopts = patch.difffeatureopts(
530 diffopts = patch.difffeatureopts(
531 ui, opts, section=b'annotate', whitespace=True
531 ui, opts, section=b'annotate', whitespace=True
532 )
532 )
533 skiprevs = opts.get(b'skip')
533 skiprevs = opts.get(b'skip')
534 if skiprevs:
534 if skiprevs:
535 skiprevs = scmutil.revrange(repo, skiprevs)
535 skiprevs = scmutil.revrange(repo, skiprevs)
536
536
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
538 for abs in ctx.walk(m):
538 for abs in ctx.walk(m):
539 fctx = ctx[abs]
539 fctx = ctx[abs]
540 rootfm.startitem()
540 rootfm.startitem()
541 rootfm.data(path=abs)
541 rootfm.data(path=abs)
542 if not opts.get(b'text') and fctx.isbinary():
542 if not opts.get(b'text') and fctx.isbinary():
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
544 continue
544 continue
545
545
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
547 lines = fctx.annotate(
547 lines = fctx.annotate(
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
549 )
549 )
550 if not lines:
550 if not lines:
551 fm.end()
551 fm.end()
552 continue
552 continue
553 formats = []
553 formats = []
554 pieces = []
554 pieces = []
555
555
556 for f, sep in funcmap:
556 for f, sep in funcmap:
557 l = [f(n) for n in lines]
557 l = [f(n) for n in lines]
558 if fm.isplain():
558 if fm.isplain():
559 sizes = [encoding.colwidth(x) for x in l]
559 sizes = [encoding.colwidth(x) for x in l]
560 ml = max(sizes)
560 ml = max(sizes)
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
562 else:
562 else:
563 formats.append([b'%s'] * len(l))
563 formats.append([b'%s'] * len(l))
564 pieces.append(l)
564 pieces.append(l)
565
565
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
567 fm.startitem()
567 fm.startitem()
568 fm.context(fctx=n.fctx)
568 fm.context(fctx=n.fctx)
569 fm.write(fields, b"".join(f), *p)
569 fm.write(fields, b"".join(f), *p)
570 if n.skip:
570 if n.skip:
571 fmt = b"* %s"
571 fmt = b"* %s"
572 else:
572 else:
573 fmt = b": %s"
573 fmt = b": %s"
574 fm.write(b'line', fmt, n.text)
574 fm.write(b'line', fmt, n.text)
575
575
576 if not lines[-1].text.endswith(b'\n'):
576 if not lines[-1].text.endswith(b'\n'):
577 fm.plain(b'\n')
577 fm.plain(b'\n')
578 fm.end()
578 fm.end()
579
579
580 rootfm.end()
580 rootfm.end()
581
581
582
582
583 @command(
583 @command(
584 b'archive',
584 b'archive',
585 [
585 [
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
587 (
587 (
588 b'p',
588 b'p',
589 b'prefix',
589 b'prefix',
590 b'',
590 b'',
591 _(b'directory prefix for files in archive'),
591 _(b'directory prefix for files in archive'),
592 _(b'PREFIX'),
592 _(b'PREFIX'),
593 ),
593 ),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
596 ]
596 ]
597 + subrepoopts
597 + subrepoopts
598 + walkopts,
598 + walkopts,
599 _(b'[OPTION]... DEST'),
599 _(b'[OPTION]... DEST'),
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
601 )
601 )
602 def archive(ui, repo, dest, **opts):
602 def archive(ui, repo, dest, **opts):
603 '''create an unversioned archive of a repository revision
603 '''create an unversioned archive of a repository revision
604
604
605 By default, the revision used is the parent of the working
605 By default, the revision used is the parent of the working
606 directory; use -r/--rev to specify a different revision.
606 directory; use -r/--rev to specify a different revision.
607
607
608 The archive type is automatically detected based on file
608 The archive type is automatically detected based on file
609 extension (to override, use -t/--type).
609 extension (to override, use -t/--type).
610
610
611 .. container:: verbose
611 .. container:: verbose
612
612
613 Examples:
613 Examples:
614
614
615 - create a zip file containing the 1.0 release::
615 - create a zip file containing the 1.0 release::
616
616
617 hg archive -r 1.0 project-1.0.zip
617 hg archive -r 1.0 project-1.0.zip
618
618
619 - create a tarball excluding .hg files::
619 - create a tarball excluding .hg files::
620
620
621 hg archive project.tar.gz -X ".hg*"
621 hg archive project.tar.gz -X ".hg*"
622
622
623 Valid types are:
623 Valid types are:
624
624
625 :``files``: a directory full of files (default)
625 :``files``: a directory full of files (default)
626 :``tar``: tar archive, uncompressed
626 :``tar``: tar archive, uncompressed
627 :``tbz2``: tar archive, compressed using bzip2
627 :``tbz2``: tar archive, compressed using bzip2
628 :``tgz``: tar archive, compressed using gzip
628 :``tgz``: tar archive, compressed using gzip
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
630 :``uzip``: zip archive, uncompressed
630 :``uzip``: zip archive, uncompressed
631 :``zip``: zip archive, compressed using deflate
631 :``zip``: zip archive, compressed using deflate
632
632
633 The exact name of the destination archive or directory is given
633 The exact name of the destination archive or directory is given
634 using a format string; see :hg:`help export` for details.
634 using a format string; see :hg:`help export` for details.
635
635
636 Each member added to an archive file has a directory prefix
636 Each member added to an archive file has a directory prefix
637 prepended. Use -p/--prefix to specify a format string for the
637 prepended. Use -p/--prefix to specify a format string for the
638 prefix. The default is the basename of the archive, with suffixes
638 prefix. The default is the basename of the archive, with suffixes
639 removed.
639 removed.
640
640
641 Returns 0 on success.
641 Returns 0 on success.
642 '''
642 '''
643
643
644 opts = pycompat.byteskwargs(opts)
644 opts = pycompat.byteskwargs(opts)
645 rev = opts.get(b'rev')
645 rev = opts.get(b'rev')
646 if rev:
646 if rev:
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
648 ctx = scmutil.revsingle(repo, rev)
648 ctx = scmutil.revsingle(repo, rev)
649 if not ctx:
649 if not ctx:
650 raise error.Abort(_(b'no working directory: please specify a revision'))
650 raise error.Abort(_(b'no working directory: please specify a revision'))
651 node = ctx.node()
651 node = ctx.node()
652 dest = cmdutil.makefilename(ctx, dest)
652 dest = cmdutil.makefilename(ctx, dest)
653 if os.path.realpath(dest) == repo.root:
653 if os.path.realpath(dest) == repo.root:
654 raise error.Abort(_(b'repository root cannot be destination'))
654 raise error.Abort(_(b'repository root cannot be destination'))
655
655
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
657 prefix = opts.get(b'prefix')
657 prefix = opts.get(b'prefix')
658
658
659 if dest == b'-':
659 if dest == b'-':
660 if kind == b'files':
660 if kind == b'files':
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
662 dest = cmdutil.makefileobj(ctx, dest)
662 dest = cmdutil.makefileobj(ctx, dest)
663 if not prefix:
663 if not prefix:
664 prefix = os.path.basename(repo.root) + b'-%h'
664 prefix = os.path.basename(repo.root) + b'-%h'
665
665
666 prefix = cmdutil.makefilename(ctx, prefix)
666 prefix = cmdutil.makefilename(ctx, prefix)
667 match = scmutil.match(ctx, [], opts)
667 match = scmutil.match(ctx, [], opts)
668 archival.archive(
668 archival.archive(
669 repo,
669 repo,
670 dest,
670 dest,
671 node,
671 node,
672 kind,
672 kind,
673 not opts.get(b'no_decode'),
673 not opts.get(b'no_decode'),
674 match,
674 match,
675 prefix,
675 prefix,
676 subrepos=opts.get(b'subrepos'),
676 subrepos=opts.get(b'subrepos'),
677 )
677 )
678
678
679
679
680 @command(
680 @command(
681 b'backout',
681 b'backout',
682 [
682 [
683 (
683 (
684 b'',
684 b'',
685 b'merge',
685 b'merge',
686 None,
686 None,
687 _(b'merge with old dirstate parent after backout'),
687 _(b'merge with old dirstate parent after backout'),
688 ),
688 ),
689 (
689 (
690 b'',
690 b'',
691 b'commit',
691 b'commit',
692 None,
692 None,
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
694 ),
694 ),
695 (b'', b'no-commit', None, _(b'do not commit')),
695 (b'', b'no-commit', None, _(b'do not commit')),
696 (
696 (
697 b'',
697 b'',
698 b'parent',
698 b'parent',
699 b'',
699 b'',
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
701 _(b'REV'),
701 _(b'REV'),
702 ),
702 ),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
705 ]
705 ]
706 + mergetoolopts
706 + mergetoolopts
707 + walkopts
707 + walkopts
708 + commitopts
708 + commitopts
709 + commitopts2,
709 + commitopts2,
710 _(b'[OPTION]... [-r] REV'),
710 _(b'[OPTION]... [-r] REV'),
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
712 )
712 )
713 def backout(ui, repo, node=None, rev=None, **opts):
713 def backout(ui, repo, node=None, rev=None, **opts):
714 '''reverse effect of earlier changeset
714 '''reverse effect of earlier changeset
715
715
716 Prepare a new changeset with the effect of REV undone in the
716 Prepare a new changeset with the effect of REV undone in the
717 current working directory. If no conflicts were encountered,
717 current working directory. If no conflicts were encountered,
718 it will be committed immediately.
718 it will be committed immediately.
719
719
720 If REV is the parent of the working directory, then this new changeset
720 If REV is the parent of the working directory, then this new changeset
721 is committed automatically (unless --no-commit is specified).
721 is committed automatically (unless --no-commit is specified).
722
722
723 .. note::
723 .. note::
724
724
725 :hg:`backout` cannot be used to fix either an unwanted or
725 :hg:`backout` cannot be used to fix either an unwanted or
726 incorrect merge.
726 incorrect merge.
727
727
728 .. container:: verbose
728 .. container:: verbose
729
729
730 Examples:
730 Examples:
731
731
732 - Reverse the effect of the parent of the working directory.
732 - Reverse the effect of the parent of the working directory.
733 This backout will be committed immediately::
733 This backout will be committed immediately::
734
734
735 hg backout -r .
735 hg backout -r .
736
736
737 - Reverse the effect of previous bad revision 23::
737 - Reverse the effect of previous bad revision 23::
738
738
739 hg backout -r 23
739 hg backout -r 23
740
740
741 - Reverse the effect of previous bad revision 23 and
741 - Reverse the effect of previous bad revision 23 and
742 leave changes uncommitted::
742 leave changes uncommitted::
743
743
744 hg backout -r 23 --no-commit
744 hg backout -r 23 --no-commit
745 hg commit -m "Backout revision 23"
745 hg commit -m "Backout revision 23"
746
746
747 By default, the pending changeset will have one parent,
747 By default, the pending changeset will have one parent,
748 maintaining a linear history. With --merge, the pending
748 maintaining a linear history. With --merge, the pending
749 changeset will instead have two parents: the old parent of the
749 changeset will instead have two parents: the old parent of the
750 working directory and a new child of REV that simply undoes REV.
750 working directory and a new child of REV that simply undoes REV.
751
751
752 Before version 1.7, the behavior without --merge was equivalent
752 Before version 1.7, the behavior without --merge was equivalent
753 to specifying --merge followed by :hg:`update --clean .` to
753 to specifying --merge followed by :hg:`update --clean .` to
754 cancel the merge and leave the child of REV as a head to be
754 cancel the merge and leave the child of REV as a head to be
755 merged separately.
755 merged separately.
756
756
757 See :hg:`help dates` for a list of formats valid for -d/--date.
757 See :hg:`help dates` for a list of formats valid for -d/--date.
758
758
759 See :hg:`help revert` for a way to restore files to the state
759 See :hg:`help revert` for a way to restore files to the state
760 of another revision.
760 of another revision.
761
761
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
763 files.
763 files.
764 '''
764 '''
765 with repo.wlock(), repo.lock():
765 with repo.wlock(), repo.lock():
766 return _dobackout(ui, repo, node, rev, **opts)
766 return _dobackout(ui, repo, node, rev, **opts)
767
767
768
768
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
770 opts = pycompat.byteskwargs(opts)
770 opts = pycompat.byteskwargs(opts)
771 if opts.get(b'commit') and opts.get(b'no_commit'):
771 if opts.get(b'commit') and opts.get(b'no_commit'):
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
773 if opts.get(b'merge') and opts.get(b'no_commit'):
773 if opts.get(b'merge') and opts.get(b'no_commit'):
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
775
775
776 if rev and node:
776 if rev and node:
777 raise error.Abort(_(b"please specify just one revision"))
777 raise error.Abort(_(b"please specify just one revision"))
778
778
779 if not rev:
779 if not rev:
780 rev = node
780 rev = node
781
781
782 if not rev:
782 if not rev:
783 raise error.Abort(_(b"please specify a revision to backout"))
783 raise error.Abort(_(b"please specify a revision to backout"))
784
784
785 date = opts.get(b'date')
785 date = opts.get(b'date')
786 if date:
786 if date:
787 opts[b'date'] = dateutil.parsedate(date)
787 opts[b'date'] = dateutil.parsedate(date)
788
788
789 cmdutil.checkunfinished(repo)
789 cmdutil.checkunfinished(repo)
790 cmdutil.bailifchanged(repo)
790 cmdutil.bailifchanged(repo)
791 node = scmutil.revsingle(repo, rev).node()
791 node = scmutil.revsingle(repo, rev).node()
792
792
793 op1, op2 = repo.dirstate.parents()
793 op1, op2 = repo.dirstate.parents()
794 if not repo.changelog.isancestor(node, op1):
794 if not repo.changelog.isancestor(node, op1):
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
796
796
797 p1, p2 = repo.changelog.parents(node)
797 p1, p2 = repo.changelog.parents(node)
798 if p1 == nullid:
798 if p1 == nullid:
799 raise error.Abort(_(b'cannot backout a change with no parents'))
799 raise error.Abort(_(b'cannot backout a change with no parents'))
800 if p2 != nullid:
800 if p2 != nullid:
801 if not opts.get(b'parent'):
801 if not opts.get(b'parent'):
802 raise error.Abort(_(b'cannot backout a merge changeset'))
802 raise error.Abort(_(b'cannot backout a merge changeset'))
803 p = repo.lookup(opts[b'parent'])
803 p = repo.lookup(opts[b'parent'])
804 if p not in (p1, p2):
804 if p not in (p1, p2):
805 raise error.Abort(
805 raise error.Abort(
806 _(b'%s is not a parent of %s') % (short(p), short(node))
806 _(b'%s is not a parent of %s') % (short(p), short(node))
807 )
807 )
808 parent = p
808 parent = p
809 else:
809 else:
810 if opts.get(b'parent'):
810 if opts.get(b'parent'):
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
812 parent = p1
812 parent = p1
813
813
814 # the backout should appear on the same branch
814 # the backout should appear on the same branch
815 branch = repo.dirstate.branch()
815 branch = repo.dirstate.branch()
816 bheads = repo.branchheads(branch)
816 bheads = repo.branchheads(branch)
817 rctx = scmutil.revsingle(repo, hex(parent))
817 rctx = scmutil.revsingle(repo, hex(parent))
818 if not opts.get(b'merge') and op1 != node:
818 if not opts.get(b'merge') and op1 != node:
819 with dirstateguard.dirstateguard(repo, b'backout'):
819 with dirstateguard.dirstateguard(repo, b'backout'):
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
821 with ui.configoverride(overrides, b'backout'):
821 with ui.configoverride(overrides, b'backout'):
822 stats = mergemod.update(
822 stats = mergemod.update(
823 repo,
823 repo,
824 parent,
824 parent,
825 branchmerge=True,
825 branchmerge=True,
826 force=True,
826 force=True,
827 ancestor=node,
827 ancestor=node,
828 mergeancestor=False,
828 mergeancestor=False,
829 )
829 )
830 repo.setparents(op1, op2)
830 repo.setparents(op1, op2)
831 hg._showstats(repo, stats)
831 hg._showstats(repo, stats)
832 if stats.unresolvedcount:
832 if stats.unresolvedcount:
833 repo.ui.status(
833 repo.ui.status(
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
835 )
835 )
836 return 1
836 return 1
837 else:
837 else:
838 hg.clean(repo, node, show_stats=False)
838 hg.clean(repo, node, show_stats=False)
839 repo.dirstate.setbranch(branch)
839 repo.dirstate.setbranch(branch)
840 cmdutil.revert(ui, repo, rctx)
840 cmdutil.revert(ui, repo, rctx)
841
841
842 if opts.get(b'no_commit'):
842 if opts.get(b'no_commit'):
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
844 ui.status(msg % short(node))
844 ui.status(msg % short(node))
845 return 0
845 return 0
846
846
847 def commitfunc(ui, repo, message, match, opts):
847 def commitfunc(ui, repo, message, match, opts):
848 editform = b'backout'
848 editform = b'backout'
849 e = cmdutil.getcommiteditor(
849 e = cmdutil.getcommiteditor(
850 editform=editform, **pycompat.strkwargs(opts)
850 editform=editform, **pycompat.strkwargs(opts)
851 )
851 )
852 if not message:
852 if not message:
853 # we don't translate commit messages
853 # we don't translate commit messages
854 message = b"Backed out changeset %s" % short(node)
854 message = b"Backed out changeset %s" % short(node)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
856 return repo.commit(
856 return repo.commit(
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
858 )
858 )
859
859
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
861 if not newnode:
861 if not newnode:
862 ui.status(_(b"nothing changed\n"))
862 ui.status(_(b"nothing changed\n"))
863 return 1
863 return 1
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
865
865
866 def nice(node):
866 def nice(node):
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
868
868
869 ui.status(
869 ui.status(
870 _(b'changeset %s backs out changeset %s\n')
870 _(b'changeset %s backs out changeset %s\n')
871 % (nice(repo.changelog.tip()), nice(node))
871 % (nice(repo.changelog.tip()), nice(node))
872 )
872 )
873 if opts.get(b'merge') and op1 != node:
873 if opts.get(b'merge') and op1 != node:
874 hg.clean(repo, op1, show_stats=False)
874 hg.clean(repo, op1, show_stats=False)
875 ui.status(
875 ui.status(
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
877 )
877 )
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
879 with ui.configoverride(overrides, b'backout'):
879 with ui.configoverride(overrides, b'backout'):
880 return hg.merge(repo[b'tip'])
880 return hg.merge(repo[b'tip'])
881 return 0
881 return 0
882
882
883
883
884 @command(
884 @command(
885 b'bisect',
885 b'bisect',
886 [
886 [
887 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'r', b'reset', False, _(b'reset bisect state')),
888 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'g', b'good', False, _(b'mark changeset good')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
892 (
892 (
893 b'c',
893 b'c',
894 b'command',
894 b'command',
895 b'',
895 b'',
896 _(b'use command to check changeset state'),
896 _(b'use command to check changeset state'),
897 _(b'CMD'),
897 _(b'CMD'),
898 ),
898 ),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
900 ],
900 ],
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
903 )
903 )
904 def bisect(
904 def bisect(
905 ui,
905 ui,
906 repo,
906 repo,
907 rev=None,
907 rev=None,
908 extra=None,
908 extra=None,
909 command=None,
909 command=None,
910 reset=None,
910 reset=None,
911 good=None,
911 good=None,
912 bad=None,
912 bad=None,
913 skip=None,
913 skip=None,
914 extend=None,
914 extend=None,
915 noupdate=None,
915 noupdate=None,
916 ):
916 ):
917 """subdivision search of changesets
917 """subdivision search of changesets
918
918
919 This command helps to find changesets which introduce problems. To
919 This command helps to find changesets which introduce problems. To
920 use, mark the earliest changeset you know exhibits the problem as
920 use, mark the earliest changeset you know exhibits the problem as
921 bad, then mark the latest changeset which is free from the problem
921 bad, then mark the latest changeset which is free from the problem
922 as good. Bisect will update your working directory to a revision
922 as good. Bisect will update your working directory to a revision
923 for testing (unless the -U/--noupdate option is specified). Once
923 for testing (unless the -U/--noupdate option is specified). Once
924 you have performed tests, mark the working directory as good or
924 you have performed tests, mark the working directory as good or
925 bad, and bisect will either update to another candidate changeset
925 bad, and bisect will either update to another candidate changeset
926 or announce that it has found the bad revision.
926 or announce that it has found the bad revision.
927
927
928 As a shortcut, you can also use the revision argument to mark a
928 As a shortcut, you can also use the revision argument to mark a
929 revision as good or bad without checking it out first.
929 revision as good or bad without checking it out first.
930
930
931 If you supply a command, it will be used for automatic bisection.
931 If you supply a command, it will be used for automatic bisection.
932 The environment variable HG_NODE will contain the ID of the
932 The environment variable HG_NODE will contain the ID of the
933 changeset being tested. The exit status of the command will be
933 changeset being tested. The exit status of the command will be
934 used to mark revisions as good or bad: status 0 means good, 125
934 used to mark revisions as good or bad: status 0 means good, 125
935 means to skip the revision, 127 (command not found) will abort the
935 means to skip the revision, 127 (command not found) will abort the
936 bisection, and any other non-zero exit status means the revision
936 bisection, and any other non-zero exit status means the revision
937 is bad.
937 is bad.
938
938
939 .. container:: verbose
939 .. container:: verbose
940
940
941 Some examples:
941 Some examples:
942
942
943 - start a bisection with known bad revision 34, and good revision 12::
943 - start a bisection with known bad revision 34, and good revision 12::
944
944
945 hg bisect --bad 34
945 hg bisect --bad 34
946 hg bisect --good 12
946 hg bisect --good 12
947
947
948 - advance the current bisection by marking current revision as good or
948 - advance the current bisection by marking current revision as good or
949 bad::
949 bad::
950
950
951 hg bisect --good
951 hg bisect --good
952 hg bisect --bad
952 hg bisect --bad
953
953
954 - mark the current revision, or a known revision, to be skipped (e.g. if
954 - mark the current revision, or a known revision, to be skipped (e.g. if
955 that revision is not usable because of another issue)::
955 that revision is not usable because of another issue)::
956
956
957 hg bisect --skip
957 hg bisect --skip
958 hg bisect --skip 23
958 hg bisect --skip 23
959
959
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
961
961
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
963
963
964 - forget the current bisection::
964 - forget the current bisection::
965
965
966 hg bisect --reset
966 hg bisect --reset
967
967
968 - use 'make && make tests' to automatically find the first broken
968 - use 'make && make tests' to automatically find the first broken
969 revision::
969 revision::
970
970
971 hg bisect --reset
971 hg bisect --reset
972 hg bisect --bad 34
972 hg bisect --bad 34
973 hg bisect --good 12
973 hg bisect --good 12
974 hg bisect --command "make && make tests"
974 hg bisect --command "make && make tests"
975
975
976 - see all changesets whose states are already known in the current
976 - see all changesets whose states are already known in the current
977 bisection::
977 bisection::
978
978
979 hg log -r "bisect(pruned)"
979 hg log -r "bisect(pruned)"
980
980
981 - see the changeset currently being bisected (especially useful
981 - see the changeset currently being bisected (especially useful
982 if running with -U/--noupdate)::
982 if running with -U/--noupdate)::
983
983
984 hg log -r "bisect(current)"
984 hg log -r "bisect(current)"
985
985
986 - see all changesets that took part in the current bisection::
986 - see all changesets that took part in the current bisection::
987
987
988 hg log -r "bisect(range)"
988 hg log -r "bisect(range)"
989
989
990 - you can even get a nice graph::
990 - you can even get a nice graph::
991
991
992 hg log --graph -r "bisect(range)"
992 hg log --graph -r "bisect(range)"
993
993
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
995
995
996 Returns 0 on success.
996 Returns 0 on success.
997 """
997 """
998 # backward compatibility
998 # backward compatibility
999 if rev in b"good bad reset init".split():
999 if rev in b"good bad reset init".split():
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1001 cmd, rev, extra = rev, extra, None
1001 cmd, rev, extra = rev, extra, None
1002 if cmd == b"good":
1002 if cmd == b"good":
1003 good = True
1003 good = True
1004 elif cmd == b"bad":
1004 elif cmd == b"bad":
1005 bad = True
1005 bad = True
1006 else:
1006 else:
1007 reset = True
1007 reset = True
1008 elif extra:
1008 elif extra:
1009 raise error.Abort(_(b'incompatible arguments'))
1009 raise error.Abort(_(b'incompatible arguments'))
1010
1010
1011 incompatibles = {
1011 incompatibles = {
1012 b'--bad': bad,
1012 b'--bad': bad,
1013 b'--command': bool(command),
1013 b'--command': bool(command),
1014 b'--extend': extend,
1014 b'--extend': extend,
1015 b'--good': good,
1015 b'--good': good,
1016 b'--reset': reset,
1016 b'--reset': reset,
1017 b'--skip': skip,
1017 b'--skip': skip,
1018 }
1018 }
1019
1019
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1021
1021
1022 if len(enabled) > 1:
1022 if len(enabled) > 1:
1023 raise error.Abort(
1023 raise error.Abort(
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1025 )
1025 )
1026
1026
1027 if reset:
1027 if reset:
1028 hbisect.resetstate(repo)
1028 hbisect.resetstate(repo)
1029 return
1029 return
1030
1030
1031 state = hbisect.load_state(repo)
1031 state = hbisect.load_state(repo)
1032
1032
1033 # update state
1033 # update state
1034 if good or bad or skip:
1034 if good or bad or skip:
1035 if rev:
1035 if rev:
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1037 else:
1037 else:
1038 nodes = [repo.lookup(b'.')]
1038 nodes = [repo.lookup(b'.')]
1039 if good:
1039 if good:
1040 state[b'good'] += nodes
1040 state[b'good'] += nodes
1041 elif bad:
1041 elif bad:
1042 state[b'bad'] += nodes
1042 state[b'bad'] += nodes
1043 elif skip:
1043 elif skip:
1044 state[b'skip'] += nodes
1044 state[b'skip'] += nodes
1045 hbisect.save_state(repo, state)
1045 hbisect.save_state(repo, state)
1046 if not (state[b'good'] and state[b'bad']):
1046 if not (state[b'good'] and state[b'bad']):
1047 return
1047 return
1048
1048
1049 def mayupdate(repo, node, show_stats=True):
1049 def mayupdate(repo, node, show_stats=True):
1050 """common used update sequence"""
1050 """common used update sequence"""
1051 if noupdate:
1051 if noupdate:
1052 return
1052 return
1053 cmdutil.checkunfinished(repo)
1053 cmdutil.checkunfinished(repo)
1054 cmdutil.bailifchanged(repo)
1054 cmdutil.bailifchanged(repo)
1055 return hg.clean(repo, node, show_stats=show_stats)
1055 return hg.clean(repo, node, show_stats=show_stats)
1056
1056
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1058
1058
1059 if command:
1059 if command:
1060 changesets = 1
1060 changesets = 1
1061 if noupdate:
1061 if noupdate:
1062 try:
1062 try:
1063 node = state[b'current'][0]
1063 node = state[b'current'][0]
1064 except LookupError:
1064 except LookupError:
1065 raise error.Abort(
1065 raise error.Abort(
1066 _(
1066 _(
1067 b'current bisect revision is unknown - '
1067 b'current bisect revision is unknown - '
1068 b'start a new bisect to fix'
1068 b'start a new bisect to fix'
1069 )
1069 )
1070 )
1070 )
1071 else:
1071 else:
1072 node, p2 = repo.dirstate.parents()
1072 node, p2 = repo.dirstate.parents()
1073 if p2 != nullid:
1073 if p2 != nullid:
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1075 if rev:
1075 if rev:
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1077 with hbisect.restore_state(repo, state, node):
1077 with hbisect.restore_state(repo, state, node):
1078 while changesets:
1078 while changesets:
1079 # update state
1079 # update state
1080 state[b'current'] = [node]
1080 state[b'current'] = [node]
1081 hbisect.save_state(repo, state)
1081 hbisect.save_state(repo, state)
1082 status = ui.system(
1082 status = ui.system(
1083 command,
1083 command,
1084 environ={b'HG_NODE': hex(node)},
1084 environ={b'HG_NODE': hex(node)},
1085 blockedtag=b'bisect_check',
1085 blockedtag=b'bisect_check',
1086 )
1086 )
1087 if status == 125:
1087 if status == 125:
1088 transition = b"skip"
1088 transition = b"skip"
1089 elif status == 0:
1089 elif status == 0:
1090 transition = b"good"
1090 transition = b"good"
1091 # status < 0 means process was killed
1091 # status < 0 means process was killed
1092 elif status == 127:
1092 elif status == 127:
1093 raise error.Abort(_(b"failed to execute %s") % command)
1093 raise error.Abort(_(b"failed to execute %s") % command)
1094 elif status < 0:
1094 elif status < 0:
1095 raise error.Abort(_(b"%s killed") % command)
1095 raise error.Abort(_(b"%s killed") % command)
1096 else:
1096 else:
1097 transition = b"bad"
1097 transition = b"bad"
1098 state[transition].append(node)
1098 state[transition].append(node)
1099 ctx = repo[node]
1099 ctx = repo[node]
1100 ui.status(
1100 ui.status(
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1102 )
1102 )
1103 hbisect.checkstate(state)
1103 hbisect.checkstate(state)
1104 # bisect
1104 # bisect
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1106 # update to next check
1106 # update to next check
1107 node = nodes[0]
1107 node = nodes[0]
1108 mayupdate(repo, node, show_stats=False)
1108 mayupdate(repo, node, show_stats=False)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1110 return
1110 return
1111
1111
1112 hbisect.checkstate(state)
1112 hbisect.checkstate(state)
1113
1113
1114 # actually bisect
1114 # actually bisect
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1116 if extend:
1116 if extend:
1117 if not changesets:
1117 if not changesets:
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1119 if extendnode is not None:
1119 if extendnode is not None:
1120 ui.write(
1120 ui.write(
1121 _(b"Extending search to changeset %d:%s\n")
1121 _(b"Extending search to changeset %d:%s\n")
1122 % (extendnode.rev(), extendnode)
1122 % (extendnode.rev(), extendnode)
1123 )
1123 )
1124 state[b'current'] = [extendnode.node()]
1124 state[b'current'] = [extendnode.node()]
1125 hbisect.save_state(repo, state)
1125 hbisect.save_state(repo, state)
1126 return mayupdate(repo, extendnode.node())
1126 return mayupdate(repo, extendnode.node())
1127 raise error.Abort(_(b"nothing to extend"))
1127 raise error.Abort(_(b"nothing to extend"))
1128
1128
1129 if changesets == 0:
1129 if changesets == 0:
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1131 else:
1131 else:
1132 assert len(nodes) == 1 # only a single node can be tested next
1132 assert len(nodes) == 1 # only a single node can be tested next
1133 node = nodes[0]
1133 node = nodes[0]
1134 # compute the approximate number of remaining tests
1134 # compute the approximate number of remaining tests
1135 tests, size = 0, 2
1135 tests, size = 0, 2
1136 while size <= changesets:
1136 while size <= changesets:
1137 tests, size = tests + 1, size * 2
1137 tests, size = tests + 1, size * 2
1138 rev = repo.changelog.rev(node)
1138 rev = repo.changelog.rev(node)
1139 ui.write(
1139 ui.write(
1140 _(
1140 _(
1141 b"Testing changeset %d:%s "
1141 b"Testing changeset %d:%s "
1142 b"(%d changesets remaining, ~%d tests)\n"
1142 b"(%d changesets remaining, ~%d tests)\n"
1143 )
1143 )
1144 % (rev, short(node), changesets, tests)
1144 % (rev, short(node), changesets, tests)
1145 )
1145 )
1146 state[b'current'] = [node]
1146 state[b'current'] = [node]
1147 hbisect.save_state(repo, state)
1147 hbisect.save_state(repo, state)
1148 return mayupdate(repo, node)
1148 return mayupdate(repo, node)
1149
1149
1150
1150
1151 @command(
1151 @command(
1152 b'bookmarks|bookmark',
1152 b'bookmarks|bookmark',
1153 [
1153 [
1154 (b'f', b'force', False, _(b'force')),
1154 (b'f', b'force', False, _(b'force')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1160 ]
1160 ]
1161 + formatteropts,
1161 + formatteropts,
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1164 )
1164 )
1165 def bookmark(ui, repo, *names, **opts):
1165 def bookmark(ui, repo, *names, **opts):
1166 '''create a new bookmark or list existing bookmarks
1166 '''create a new bookmark or list existing bookmarks
1167
1167
1168 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are labels on changesets to help track lines of development.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1171
1171
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1173 The active bookmark is indicated with a '*'.
1173 The active bookmark is indicated with a '*'.
1174 When a commit is made, the active bookmark will advance to the new commit.
1174 When a commit is made, the active bookmark will advance to the new commit.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1176 Updating away from a bookmark will cause it to be deactivated.
1176 Updating away from a bookmark will cause it to be deactivated.
1177
1177
1178 Bookmarks can be pushed and pulled between repositories (see
1178 Bookmarks can be pushed and pulled between repositories (see
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1181 be created. Using :hg:`merge` will resolve the divergence.
1181 be created. Using :hg:`merge` will resolve the divergence.
1182
1182
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1184 the active bookmark's name.
1184 the active bookmark's name.
1185
1185
1186 A bookmark named '@' has the special property that :hg:`clone` will
1186 A bookmark named '@' has the special property that :hg:`clone` will
1187 check it out by default if it exists.
1187 check it out by default if it exists.
1188
1188
1189 .. container:: verbose
1189 .. container:: verbose
1190
1190
1191 Template:
1191 Template:
1192
1192
1193 The following keywords are supported in addition to the common template
1193 The following keywords are supported in addition to the common template
1194 keywords and functions such as ``{bookmark}``. See also
1194 keywords and functions such as ``{bookmark}``. See also
1195 :hg:`help templates`.
1195 :hg:`help templates`.
1196
1196
1197 :active: Boolean. True if the bookmark is active.
1197 :active: Boolean. True if the bookmark is active.
1198
1198
1199 Examples:
1199 Examples:
1200
1200
1201 - create an active bookmark for a new line of development::
1201 - create an active bookmark for a new line of development::
1202
1202
1203 hg book new-feature
1203 hg book new-feature
1204
1204
1205 - create an inactive bookmark as a place marker::
1205 - create an inactive bookmark as a place marker::
1206
1206
1207 hg book -i reviewed
1207 hg book -i reviewed
1208
1208
1209 - create an inactive bookmark on another changeset::
1209 - create an inactive bookmark on another changeset::
1210
1210
1211 hg book -r .^ tested
1211 hg book -r .^ tested
1212
1212
1213 - rename bookmark turkey to dinner::
1213 - rename bookmark turkey to dinner::
1214
1214
1215 hg book -m turkey dinner
1215 hg book -m turkey dinner
1216
1216
1217 - move the '@' bookmark from another branch::
1217 - move the '@' bookmark from another branch::
1218
1218
1219 hg book -f @
1219 hg book -f @
1220
1220
1221 - print only the active bookmark name::
1221 - print only the active bookmark name::
1222
1222
1223 hg book -ql .
1223 hg book -ql .
1224 '''
1224 '''
1225 opts = pycompat.byteskwargs(opts)
1225 opts = pycompat.byteskwargs(opts)
1226 force = opts.get(b'force')
1226 force = opts.get(b'force')
1227 rev = opts.get(b'rev')
1227 rev = opts.get(b'rev')
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1229
1229
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1231 if action:
1231 if action:
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1233 elif names or rev:
1233 elif names or rev:
1234 action = b'add'
1234 action = b'add'
1235 elif inactive:
1235 elif inactive:
1236 action = b'inactive' # meaning deactivate
1236 action = b'inactive' # meaning deactivate
1237 else:
1237 else:
1238 action = b'list'
1238 action = b'list'
1239
1239
1240 cmdutil.check_incompatible_arguments(
1240 cmdutil.check_incompatible_arguments(
1241 opts, b'inactive', [b'delete', b'list']
1241 opts, b'inactive', [b'delete', b'list']
1242 )
1242 )
1243 if not names and action in {b'add', b'delete'}:
1243 if not names and action in {b'add', b'delete'}:
1244 raise error.Abort(_(b"bookmark name required"))
1244 raise error.Abort(_(b"bookmark name required"))
1245
1245
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1248 if action == b'delete':
1248 if action == b'delete':
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1250 bookmarks.delete(repo, tr, names)
1250 bookmarks.delete(repo, tr, names)
1251 elif action == b'rename':
1251 elif action == b'rename':
1252 if not names:
1252 if not names:
1253 raise error.Abort(_(b"new bookmark name required"))
1253 raise error.Abort(_(b"new bookmark name required"))
1254 elif len(names) > 1:
1254 elif len(names) > 1:
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1258 elif action == b'add':
1258 elif action == b'add':
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1260 elif action == b'inactive':
1260 elif action == b'inactive':
1261 if len(repo._bookmarks) == 0:
1261 if len(repo._bookmarks) == 0:
1262 ui.status(_(b"no bookmarks set\n"))
1262 ui.status(_(b"no bookmarks set\n"))
1263 elif not repo._activebookmark:
1263 elif not repo._activebookmark:
1264 ui.status(_(b"no active bookmark\n"))
1264 ui.status(_(b"no active bookmark\n"))
1265 else:
1265 else:
1266 bookmarks.deactivate(repo)
1266 bookmarks.deactivate(repo)
1267 elif action == b'list':
1267 elif action == b'list':
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1269 with ui.formatter(b'bookmarks', opts) as fm:
1269 with ui.formatter(b'bookmarks', opts) as fm:
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1271 else:
1271 else:
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1273
1273
1274
1274
1275 @command(
1275 @command(
1276 b'branch',
1276 b'branch',
1277 [
1277 [
1278 (
1278 (
1279 b'f',
1279 b'f',
1280 b'force',
1280 b'force',
1281 None,
1281 None,
1282 _(b'set branch name even if it shadows an existing branch'),
1282 _(b'set branch name even if it shadows an existing branch'),
1283 ),
1283 ),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1285 (
1285 (
1286 b'r',
1286 b'r',
1287 b'rev',
1287 b'rev',
1288 [],
1288 [],
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1290 ),
1290 ),
1291 ],
1291 ],
1292 _(b'[-fC] [NAME]'),
1292 _(b'[-fC] [NAME]'),
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1294 )
1294 )
1295 def branch(ui, repo, label=None, **opts):
1295 def branch(ui, repo, label=None, **opts):
1296 """set or show the current branch name
1296 """set or show the current branch name
1297
1297
1298 .. note::
1298 .. note::
1299
1299
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1302 information about named branches and bookmarks.
1302 information about named branches and bookmarks.
1303
1303
1304 With no argument, show the current branch name. With one argument,
1304 With no argument, show the current branch name. With one argument,
1305 set the working directory branch name (the branch will not exist
1305 set the working directory branch name (the branch will not exist
1306 in the repository until the next commit). Standard practice
1306 in the repository until the next commit). Standard practice
1307 recommends that primary development take place on the 'default'
1307 recommends that primary development take place on the 'default'
1308 branch.
1308 branch.
1309
1309
1310 Unless -f/--force is specified, branch will not let you set a
1310 Unless -f/--force is specified, branch will not let you set a
1311 branch name that already exists.
1311 branch name that already exists.
1312
1312
1313 Use -C/--clean to reset the working directory branch to that of
1313 Use -C/--clean to reset the working directory branch to that of
1314 the parent of the working directory, negating a previous branch
1314 the parent of the working directory, negating a previous branch
1315 change.
1315 change.
1316
1316
1317 Use the command :hg:`update` to switch to an existing branch. Use
1317 Use the command :hg:`update` to switch to an existing branch. Use
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1319 When all heads of a branch are closed, the branch will be
1319 When all heads of a branch are closed, the branch will be
1320 considered closed.
1320 considered closed.
1321
1321
1322 Returns 0 on success.
1322 Returns 0 on success.
1323 """
1323 """
1324 opts = pycompat.byteskwargs(opts)
1324 opts = pycompat.byteskwargs(opts)
1325 revs = opts.get(b'rev')
1325 revs = opts.get(b'rev')
1326 if label:
1326 if label:
1327 label = label.strip()
1327 label = label.strip()
1328
1328
1329 if not opts.get(b'clean') and not label:
1329 if not opts.get(b'clean') and not label:
1330 if revs:
1330 if revs:
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1333 return
1333 return
1334
1334
1335 with repo.wlock():
1335 with repo.wlock():
1336 if opts.get(b'clean'):
1336 if opts.get(b'clean'):
1337 label = repo[b'.'].branch()
1337 label = repo[b'.'].branch()
1338 repo.dirstate.setbranch(label)
1338 repo.dirstate.setbranch(label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1340 elif label:
1340 elif label:
1341
1341
1342 scmutil.checknewlabel(repo, label, b'branch')
1342 scmutil.checknewlabel(repo, label, b'branch')
1343 if revs:
1343 if revs:
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1345
1345
1346 if not opts.get(b'force') and label in repo.branchmap():
1346 if not opts.get(b'force') and label in repo.branchmap():
1347 if label not in [p.branch() for p in repo[None].parents()]:
1347 if label not in [p.branch() for p in repo[None].parents()]:
1348 raise error.Abort(
1348 raise error.Abort(
1349 _(b'a branch of the same name already exists'),
1349 _(b'a branch of the same name already exists'),
1350 # i18n: "it" refers to an existing branch
1350 # i18n: "it" refers to an existing branch
1351 hint=_(b"use 'hg update' to switch to it"),
1351 hint=_(b"use 'hg update' to switch to it"),
1352 )
1352 )
1353
1353
1354 repo.dirstate.setbranch(label)
1354 repo.dirstate.setbranch(label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1356
1356
1357 # find any open named branches aside from default
1357 # find any open named branches aside from default
1358 for n, h, t, c in repo.branchmap().iterbranches():
1358 for n, h, t, c in repo.branchmap().iterbranches():
1359 if n != b"default" and not c:
1359 if n != b"default" and not c:
1360 return 0
1360 return 0
1361 ui.status(
1361 ui.status(
1362 _(
1362 _(
1363 b'(branches are permanent and global, '
1363 b'(branches are permanent and global, '
1364 b'did you want a bookmark?)\n'
1364 b'did you want a bookmark?)\n'
1365 )
1365 )
1366 )
1366 )
1367
1367
1368
1368
1369 @command(
1369 @command(
1370 b'branches',
1370 b'branches',
1371 [
1371 [
1372 (
1372 (
1373 b'a',
1373 b'a',
1374 b'active',
1374 b'active',
1375 False,
1375 False,
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1377 ),
1377 ),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1380 ]
1380 ]
1381 + formatteropts,
1381 + formatteropts,
1382 _(b'[-c]'),
1382 _(b'[-c]'),
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1384 intents={INTENT_READONLY},
1384 intents={INTENT_READONLY},
1385 )
1385 )
1386 def branches(ui, repo, active=False, closed=False, **opts):
1386 def branches(ui, repo, active=False, closed=False, **opts):
1387 """list repository named branches
1387 """list repository named branches
1388
1388
1389 List the repository's named branches, indicating which ones are
1389 List the repository's named branches, indicating which ones are
1390 inactive. If -c/--closed is specified, also list branches which have
1390 inactive. If -c/--closed is specified, also list branches which have
1391 been marked closed (see :hg:`commit --close-branch`).
1391 been marked closed (see :hg:`commit --close-branch`).
1392
1392
1393 Use the command :hg:`update` to switch to an existing branch.
1393 Use the command :hg:`update` to switch to an existing branch.
1394
1394
1395 .. container:: verbose
1395 .. container:: verbose
1396
1396
1397 Template:
1397 Template:
1398
1398
1399 The following keywords are supported in addition to the common template
1399 The following keywords are supported in addition to the common template
1400 keywords and functions such as ``{branch}``. See also
1400 keywords and functions such as ``{branch}``. See also
1401 :hg:`help templates`.
1401 :hg:`help templates`.
1402
1402
1403 :active: Boolean. True if the branch is active.
1403 :active: Boolean. True if the branch is active.
1404 :closed: Boolean. True if the branch is closed.
1404 :closed: Boolean. True if the branch is closed.
1405 :current: Boolean. True if it is the current branch.
1405 :current: Boolean. True if it is the current branch.
1406
1406
1407 Returns 0.
1407 Returns 0.
1408 """
1408 """
1409
1409
1410 opts = pycompat.byteskwargs(opts)
1410 opts = pycompat.byteskwargs(opts)
1411 revs = opts.get(b'rev')
1411 revs = opts.get(b'rev')
1412 selectedbranches = None
1412 selectedbranches = None
1413 if revs:
1413 if revs:
1414 revs = scmutil.revrange(repo, revs)
1414 revs = scmutil.revrange(repo, revs)
1415 getbi = repo.revbranchcache().branchinfo
1415 getbi = repo.revbranchcache().branchinfo
1416 selectedbranches = {getbi(r)[0] for r in revs}
1416 selectedbranches = {getbi(r)[0] for r in revs}
1417
1417
1418 ui.pager(b'branches')
1418 ui.pager(b'branches')
1419 fm = ui.formatter(b'branches', opts)
1419 fm = ui.formatter(b'branches', opts)
1420 hexfunc = fm.hexfunc
1420 hexfunc = fm.hexfunc
1421
1421
1422 allheads = set(repo.heads())
1422 allheads = set(repo.heads())
1423 branches = []
1423 branches = []
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1425 if selectedbranches is not None and tag not in selectedbranches:
1425 if selectedbranches is not None and tag not in selectedbranches:
1426 continue
1426 continue
1427 isactive = False
1427 isactive = False
1428 if not isclosed:
1428 if not isclosed:
1429 openheads = set(repo.branchmap().iteropen(heads))
1429 openheads = set(repo.branchmap().iteropen(heads))
1430 isactive = bool(openheads & allheads)
1430 isactive = bool(openheads & allheads)
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1433
1433
1434 for tag, ctx, isactive, isopen in branches:
1434 for tag, ctx, isactive, isopen in branches:
1435 if active and not isactive:
1435 if active and not isactive:
1436 continue
1436 continue
1437 if isactive:
1437 if isactive:
1438 label = b'branches.active'
1438 label = b'branches.active'
1439 notice = b''
1439 notice = b''
1440 elif not isopen:
1440 elif not isopen:
1441 if not closed:
1441 if not closed:
1442 continue
1442 continue
1443 label = b'branches.closed'
1443 label = b'branches.closed'
1444 notice = _(b' (closed)')
1444 notice = _(b' (closed)')
1445 else:
1445 else:
1446 label = b'branches.inactive'
1446 label = b'branches.inactive'
1447 notice = _(b' (inactive)')
1447 notice = _(b' (inactive)')
1448 current = tag == repo.dirstate.branch()
1448 current = tag == repo.dirstate.branch()
1449 if current:
1449 if current:
1450 label = b'branches.current'
1450 label = b'branches.current'
1451
1451
1452 fm.startitem()
1452 fm.startitem()
1453 fm.write(b'branch', b'%s', tag, label=label)
1453 fm.write(b'branch', b'%s', tag, label=label)
1454 rev = ctx.rev()
1454 rev = ctx.rev()
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1456 fmt = b' ' * padsize + b' %d:%s'
1456 fmt = b' ' * padsize + b' %d:%s'
1457 fm.condwrite(
1457 fm.condwrite(
1458 not ui.quiet,
1458 not ui.quiet,
1459 b'rev node',
1459 b'rev node',
1460 fmt,
1460 fmt,
1461 rev,
1461 rev,
1462 hexfunc(ctx.node()),
1462 hexfunc(ctx.node()),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1464 )
1464 )
1465 fm.context(ctx=ctx)
1465 fm.context(ctx=ctx)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1467 if not ui.quiet:
1467 if not ui.quiet:
1468 fm.plain(notice)
1468 fm.plain(notice)
1469 fm.plain(b'\n')
1469 fm.plain(b'\n')
1470 fm.end()
1470 fm.end()
1471
1471
1472
1472
1473 @command(
1473 @command(
1474 b'bundle',
1474 b'bundle',
1475 [
1475 [
1476 (
1476 (
1477 b'f',
1477 b'f',
1478 b'force',
1478 b'force',
1479 None,
1479 None,
1480 _(b'run even when the destination is unrelated'),
1480 _(b'run even when the destination is unrelated'),
1481 ),
1481 ),
1482 (
1482 (
1483 b'r',
1483 b'r',
1484 b'rev',
1484 b'rev',
1485 [],
1485 [],
1486 _(b'a changeset intended to be added to the destination'),
1486 _(b'a changeset intended to be added to the destination'),
1487 _(b'REV'),
1487 _(b'REV'),
1488 ),
1488 ),
1489 (
1489 (
1490 b'b',
1490 b'b',
1491 b'branch',
1491 b'branch',
1492 [],
1492 [],
1493 _(b'a specific branch you would like to bundle'),
1493 _(b'a specific branch you would like to bundle'),
1494 _(b'BRANCH'),
1494 _(b'BRANCH'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'',
1497 b'',
1498 b'base',
1498 b'base',
1499 [],
1499 [],
1500 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'a base changeset assumed to be available at the destination'),
1501 _(b'REV'),
1501 _(b'REV'),
1502 ),
1502 ),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1504 (
1504 (
1505 b't',
1505 b't',
1506 b'type',
1506 b'type',
1507 b'bzip2',
1507 b'bzip2',
1508 _(b'bundle compression type to use'),
1508 _(b'bundle compression type to use'),
1509 _(b'TYPE'),
1509 _(b'TYPE'),
1510 ),
1510 ),
1511 ]
1511 ]
1512 + remoteopts,
1512 + remoteopts,
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1515 )
1515 )
1516 def bundle(ui, repo, fname, dest=None, **opts):
1516 def bundle(ui, repo, fname, dest=None, **opts):
1517 """create a bundle file
1517 """create a bundle file
1518
1518
1519 Generate a bundle file containing data to be transferred to another
1519 Generate a bundle file containing data to be transferred to another
1520 repository.
1520 repository.
1521
1521
1522 To create a bundle containing all changesets, use -a/--all
1522 To create a bundle containing all changesets, use -a/--all
1523 (or --base null). Otherwise, hg assumes the destination will have
1523 (or --base null). Otherwise, hg assumes the destination will have
1524 all the nodes you specify with --base parameters. Otherwise, hg
1524 all the nodes you specify with --base parameters. Otherwise, hg
1525 will assume the repository has all the nodes in destination, or
1525 will assume the repository has all the nodes in destination, or
1526 default-push/default if no destination is specified, where destination
1526 default-push/default if no destination is specified, where destination
1527 is the repository you provide through DEST option.
1527 is the repository you provide through DEST option.
1528
1528
1529 You can change bundle format with the -t/--type option. See
1529 You can change bundle format with the -t/--type option. See
1530 :hg:`help bundlespec` for documentation on this format. By default,
1530 :hg:`help bundlespec` for documentation on this format. By default,
1531 the most appropriate format is used and compression defaults to
1531 the most appropriate format is used and compression defaults to
1532 bzip2.
1532 bzip2.
1533
1533
1534 The bundle file can then be transferred using conventional means
1534 The bundle file can then be transferred using conventional means
1535 and applied to another repository with the unbundle or pull
1535 and applied to another repository with the unbundle or pull
1536 command. This is useful when direct push and pull are not
1536 command. This is useful when direct push and pull are not
1537 available or when exporting an entire repository is undesirable.
1537 available or when exporting an entire repository is undesirable.
1538
1538
1539 Applying bundles preserves all changeset contents including
1539 Applying bundles preserves all changeset contents including
1540 permissions, copy/rename information, and revision history.
1540 permissions, copy/rename information, and revision history.
1541
1541
1542 Returns 0 on success, 1 if no changes found.
1542 Returns 0 on success, 1 if no changes found.
1543 """
1543 """
1544 opts = pycompat.byteskwargs(opts)
1544 opts = pycompat.byteskwargs(opts)
1545 revs = None
1545 revs = None
1546 if b'rev' in opts:
1546 if b'rev' in opts:
1547 revstrings = opts[b'rev']
1547 revstrings = opts[b'rev']
1548 revs = scmutil.revrange(repo, revstrings)
1548 revs = scmutil.revrange(repo, revstrings)
1549 if revstrings and not revs:
1549 if revstrings and not revs:
1550 raise error.Abort(_(b'no commits to bundle'))
1550 raise error.Abort(_(b'no commits to bundle'))
1551
1551
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1553 try:
1553 try:
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1555 except error.UnsupportedBundleSpecification as e:
1555 except error.UnsupportedBundleSpecification as e:
1556 raise error.Abort(
1556 raise error.Abort(
1557 pycompat.bytestr(e),
1557 pycompat.bytestr(e),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1559 )
1559 )
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1561
1561
1562 # Packed bundles are a pseudo bundle format for now.
1562 # Packed bundles are a pseudo bundle format for now.
1563 if cgversion == b's1':
1563 if cgversion == b's1':
1564 raise error.Abort(
1564 raise error.Abort(
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1567 )
1567 )
1568
1568
1569 if opts.get(b'all'):
1569 if opts.get(b'all'):
1570 if dest:
1570 if dest:
1571 raise error.Abort(
1571 raise error.Abort(
1572 _(b"--all is incompatible with specifying a destination")
1572 _(b"--all is incompatible with specifying a destination")
1573 )
1573 )
1574 if opts.get(b'base'):
1574 if opts.get(b'base'):
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1576 base = [nullrev]
1576 base = [nullrev]
1577 else:
1577 else:
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1580 raise error.Abort(
1580 raise error.Abort(
1581 _(b"repository does not support bundle version %s") % cgversion
1581 _(b"repository does not support bundle version %s") % cgversion
1582 )
1582 )
1583
1583
1584 if base:
1584 if base:
1585 if dest:
1585 if dest:
1586 raise error.Abort(
1586 raise error.Abort(
1587 _(b"--base is incompatible with specifying a destination")
1587 _(b"--base is incompatible with specifying a destination")
1588 )
1588 )
1589 common = [repo[rev].node() for rev in base]
1589 common = [repo[rev].node() for rev in base]
1590 heads = [repo[r].node() for r in revs] if revs else None
1590 heads = [repo[r].node() for r in revs] if revs else None
1591 outgoing = discovery.outgoing(repo, common, heads)
1591 outgoing = discovery.outgoing(repo, common, heads)
1592 else:
1592 else:
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1595 other = hg.peer(repo, opts, dest)
1595 other = hg.peer(repo, opts, dest)
1596 revs = [repo[r].hex() for r in revs]
1596 revs = [repo[r].hex() for r in revs]
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1599 outgoing = discovery.findcommonoutgoing(
1599 outgoing = discovery.findcommonoutgoing(
1600 repo,
1600 repo,
1601 other,
1601 other,
1602 onlyheads=heads,
1602 onlyheads=heads,
1603 force=opts.get(b'force'),
1603 force=opts.get(b'force'),
1604 portable=True,
1604 portable=True,
1605 )
1605 )
1606
1606
1607 if not outgoing.missing:
1607 if not outgoing.missing:
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1609 return 1
1609 return 1
1610
1610
1611 if cgversion == b'01': # bundle1
1611 if cgversion == b'01': # bundle1
1612 bversion = b'HG10' + bundlespec.wirecompression
1612 bversion = b'HG10' + bundlespec.wirecompression
1613 bcompression = None
1613 bcompression = None
1614 elif cgversion in (b'02', b'03'):
1614 elif cgversion in (b'02', b'03'):
1615 bversion = b'HG20'
1615 bversion = b'HG20'
1616 bcompression = bundlespec.wirecompression
1616 bcompression = bundlespec.wirecompression
1617 else:
1617 else:
1618 raise error.ProgrammingError(
1618 raise error.ProgrammingError(
1619 b'bundle: unexpected changegroup version %s' % cgversion
1619 b'bundle: unexpected changegroup version %s' % cgversion
1620 )
1620 )
1621
1621
1622 # TODO compression options should be derived from bundlespec parsing.
1622 # TODO compression options should be derived from bundlespec parsing.
1623 # This is a temporary hack to allow adjusting bundle compression
1623 # This is a temporary hack to allow adjusting bundle compression
1624 # level without a) formalizing the bundlespec changes to declare it
1624 # level without a) formalizing the bundlespec changes to declare it
1625 # b) introducing a command flag.
1625 # b) introducing a command flag.
1626 compopts = {}
1626 compopts = {}
1627 complevel = ui.configint(
1627 complevel = ui.configint(
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1629 )
1629 )
1630 if complevel is None:
1630 if complevel is None:
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1632 if complevel is not None:
1632 if complevel is not None:
1633 compopts[b'level'] = complevel
1633 compopts[b'level'] = complevel
1634
1634
1635 # Allow overriding the bundling of obsmarker in phases through
1635 # Allow overriding the bundling of obsmarker in phases through
1636 # configuration while we don't have a bundle version that include them
1636 # configuration while we don't have a bundle version that include them
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1638 bundlespec.contentopts[b'obsolescence'] = True
1638 bundlespec.contentopts[b'obsolescence'] = True
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1640 bundlespec.contentopts[b'phases'] = True
1640 bundlespec.contentopts[b'phases'] = True
1641
1641
1642 bundle2.writenewbundle(
1642 bundle2.writenewbundle(
1643 ui,
1643 ui,
1644 repo,
1644 repo,
1645 b'bundle',
1645 b'bundle',
1646 fname,
1646 fname,
1647 bversion,
1647 bversion,
1648 outgoing,
1648 outgoing,
1649 bundlespec.contentopts,
1649 bundlespec.contentopts,
1650 compression=bcompression,
1650 compression=bcompression,
1651 compopts=compopts,
1651 compopts=compopts,
1652 )
1652 )
1653
1653
1654
1654
1655 @command(
1655 @command(
1656 b'cat',
1656 b'cat',
1657 [
1657 [
1658 (
1658 (
1659 b'o',
1659 b'o',
1660 b'output',
1660 b'output',
1661 b'',
1661 b'',
1662 _(b'print output to file with formatted name'),
1662 _(b'print output to file with formatted name'),
1663 _(b'FORMAT'),
1663 _(b'FORMAT'),
1664 ),
1664 ),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1667 ]
1667 ]
1668 + walkopts
1668 + walkopts
1669 + formatteropts,
1669 + formatteropts,
1670 _(b'[OPTION]... FILE...'),
1670 _(b'[OPTION]... FILE...'),
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1672 inferrepo=True,
1672 inferrepo=True,
1673 intents={INTENT_READONLY},
1673 intents={INTENT_READONLY},
1674 )
1674 )
1675 def cat(ui, repo, file1, *pats, **opts):
1675 def cat(ui, repo, file1, *pats, **opts):
1676 """output the current or given revision of files
1676 """output the current or given revision of files
1677
1677
1678 Print the specified files as they were at the given revision. If
1678 Print the specified files as they were at the given revision. If
1679 no revision is given, the parent of the working directory is used.
1679 no revision is given, the parent of the working directory is used.
1680
1680
1681 Output may be to a file, in which case the name of the file is
1681 Output may be to a file, in which case the name of the file is
1682 given using a template string. See :hg:`help templates`. In addition
1682 given using a template string. See :hg:`help templates`. In addition
1683 to the common template keywords, the following formatting rules are
1683 to the common template keywords, the following formatting rules are
1684 supported:
1684 supported:
1685
1685
1686 :``%%``: literal "%" character
1686 :``%%``: literal "%" character
1687 :``%s``: basename of file being printed
1687 :``%s``: basename of file being printed
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1689 :``%p``: root-relative path name of file being printed
1689 :``%p``: root-relative path name of file being printed
1690 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%H``: changeset hash (40 hexadecimal digits)
1691 :``%R``: changeset revision number
1691 :``%R``: changeset revision number
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1693 :``%r``: zero-padded changeset revision number
1693 :``%r``: zero-padded changeset revision number
1694 :``%b``: basename of the exporting repository
1694 :``%b``: basename of the exporting repository
1695 :``\\``: literal "\\" character
1695 :``\\``: literal "\\" character
1696
1696
1697 .. container:: verbose
1697 .. container:: verbose
1698
1698
1699 Template:
1699 Template:
1700
1700
1701 The following keywords are supported in addition to the common template
1701 The following keywords are supported in addition to the common template
1702 keywords and functions. See also :hg:`help templates`.
1702 keywords and functions. See also :hg:`help templates`.
1703
1703
1704 :data: String. File content.
1704 :data: String. File content.
1705 :path: String. Repository-absolute path of the file.
1705 :path: String. Repository-absolute path of the file.
1706
1706
1707 Returns 0 on success.
1707 Returns 0 on success.
1708 """
1708 """
1709 opts = pycompat.byteskwargs(opts)
1709 opts = pycompat.byteskwargs(opts)
1710 rev = opts.get(b'rev')
1710 rev = opts.get(b'rev')
1711 if rev:
1711 if rev:
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1713 ctx = scmutil.revsingle(repo, rev)
1713 ctx = scmutil.revsingle(repo, rev)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1715 fntemplate = opts.pop(b'output', b'')
1715 fntemplate = opts.pop(b'output', b'')
1716 if cmdutil.isstdiofilename(fntemplate):
1716 if cmdutil.isstdiofilename(fntemplate):
1717 fntemplate = b''
1717 fntemplate = b''
1718
1718
1719 if fntemplate:
1719 if fntemplate:
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1721 else:
1721 else:
1722 ui.pager(b'cat')
1722 ui.pager(b'cat')
1723 fm = ui.formatter(b'cat', opts)
1723 fm = ui.formatter(b'cat', opts)
1724 with fm:
1724 with fm:
1725 return cmdutil.cat(
1725 return cmdutil.cat(
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1727 )
1727 )
1728
1728
1729
1729
1730 @command(
1730 @command(
1731 b'clone',
1731 b'clone',
1732 [
1732 [
1733 (
1733 (
1734 b'U',
1734 b'U',
1735 b'noupdate',
1735 b'noupdate',
1736 None,
1736 None,
1737 _(
1737 _(
1738 b'the clone will include an empty working '
1738 b'the clone will include an empty working '
1739 b'directory (only a repository)'
1739 b'directory (only a repository)'
1740 ),
1740 ),
1741 ),
1741 ),
1742 (
1742 (
1743 b'u',
1743 b'u',
1744 b'updaterev',
1744 b'updaterev',
1745 b'',
1745 b'',
1746 _(b'revision, tag, or branch to check out'),
1746 _(b'revision, tag, or branch to check out'),
1747 _(b'REV'),
1747 _(b'REV'),
1748 ),
1748 ),
1749 (
1749 (
1750 b'r',
1750 b'r',
1751 b'rev',
1751 b'rev',
1752 [],
1752 [],
1753 _(
1753 _(
1754 b'do not clone everything, but include this changeset'
1754 b'do not clone everything, but include this changeset'
1755 b' and its ancestors'
1755 b' and its ancestors'
1756 ),
1756 ),
1757 _(b'REV'),
1757 _(b'REV'),
1758 ),
1758 ),
1759 (
1759 (
1760 b'b',
1760 b'b',
1761 b'branch',
1761 b'branch',
1762 [],
1762 [],
1763 _(
1763 _(
1764 b'do not clone everything, but include this branch\'s'
1764 b'do not clone everything, but include this branch\'s'
1765 b' changesets and their ancestors'
1765 b' changesets and their ancestors'
1766 ),
1766 ),
1767 _(b'BRANCH'),
1767 _(b'BRANCH'),
1768 ),
1768 ),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1772 ]
1772 ]
1773 + remoteopts,
1773 + remoteopts,
1774 _(b'[OPTION]... SOURCE [DEST]'),
1774 _(b'[OPTION]... SOURCE [DEST]'),
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1776 helpbasic=True,
1776 helpbasic=True,
1777 norepo=True,
1777 norepo=True,
1778 )
1778 )
1779 def clone(ui, source, dest=None, **opts):
1779 def clone(ui, source, dest=None, **opts):
1780 """make a copy of an existing repository
1780 """make a copy of an existing repository
1781
1781
1782 Create a copy of an existing repository in a new directory.
1782 Create a copy of an existing repository in a new directory.
1783
1783
1784 If no destination directory name is specified, it defaults to the
1784 If no destination directory name is specified, it defaults to the
1785 basename of the source.
1785 basename of the source.
1786
1786
1787 The location of the source is added to the new repository's
1787 The location of the source is added to the new repository's
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1789
1789
1790 Only local paths and ``ssh://`` URLs are supported as
1790 Only local paths and ``ssh://`` URLs are supported as
1791 destinations. For ``ssh://`` destinations, no working directory or
1791 destinations. For ``ssh://`` destinations, no working directory or
1792 ``.hg/hgrc`` will be created on the remote side.
1792 ``.hg/hgrc`` will be created on the remote side.
1793
1793
1794 If the source repository has a bookmark called '@' set, that
1794 If the source repository has a bookmark called '@' set, that
1795 revision will be checked out in the new repository by default.
1795 revision will be checked out in the new repository by default.
1796
1796
1797 To check out a particular version, use -u/--update, or
1797 To check out a particular version, use -u/--update, or
1798 -U/--noupdate to create a clone with no working directory.
1798 -U/--noupdate to create a clone with no working directory.
1799
1799
1800 To pull only a subset of changesets, specify one or more revisions
1800 To pull only a subset of changesets, specify one or more revisions
1801 identifiers with -r/--rev or branches with -b/--branch. The
1801 identifiers with -r/--rev or branches with -b/--branch. The
1802 resulting clone will contain only the specified changesets and
1802 resulting clone will contain only the specified changesets and
1803 their ancestors. These options (or 'clone src#rev dest') imply
1803 their ancestors. These options (or 'clone src#rev dest') imply
1804 --pull, even for local source repositories.
1804 --pull, even for local source repositories.
1805
1805
1806 In normal clone mode, the remote normalizes repository data into a common
1806 In normal clone mode, the remote normalizes repository data into a common
1807 exchange format and the receiving end translates this data into its local
1807 exchange format and the receiving end translates this data into its local
1808 storage format. --stream activates a different clone mode that essentially
1808 storage format. --stream activates a different clone mode that essentially
1809 copies repository files from the remote with minimal data processing. This
1809 copies repository files from the remote with minimal data processing. This
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1811 However, it often increases the transferred data size by 30-40%. This can
1811 However, it often increases the transferred data size by 30-40%. This can
1812 result in substantially faster clones where I/O throughput is plentiful,
1812 result in substantially faster clones where I/O throughput is plentiful,
1813 especially for larger repositories. A side-effect of --stream clones is
1813 especially for larger repositories. A side-effect of --stream clones is
1814 that storage settings and requirements on the remote are applied locally:
1814 that storage settings and requirements on the remote are applied locally:
1815 a modern client may inherit legacy or inefficient storage used by the
1815 a modern client may inherit legacy or inefficient storage used by the
1816 remote or a legacy Mercurial client may not be able to clone from a
1816 remote or a legacy Mercurial client may not be able to clone from a
1817 modern Mercurial remote.
1817 modern Mercurial remote.
1818
1818
1819 .. note::
1819 .. note::
1820
1820
1821 Specifying a tag will include the tagged changeset but not the
1821 Specifying a tag will include the tagged changeset but not the
1822 changeset containing the tag.
1822 changeset containing the tag.
1823
1823
1824 .. container:: verbose
1824 .. container:: verbose
1825
1825
1826 For efficiency, hardlinks are used for cloning whenever the
1826 For efficiency, hardlinks are used for cloning whenever the
1827 source and destination are on the same filesystem (note this
1827 source and destination are on the same filesystem (note this
1828 applies only to the repository data, not to the working
1828 applies only to the repository data, not to the working
1829 directory). Some filesystems, such as AFS, implement hardlinking
1829 directory). Some filesystems, such as AFS, implement hardlinking
1830 incorrectly, but do not report errors. In these cases, use the
1830 incorrectly, but do not report errors. In these cases, use the
1831 --pull option to avoid hardlinking.
1831 --pull option to avoid hardlinking.
1832
1832
1833 Mercurial will update the working directory to the first applicable
1833 Mercurial will update the working directory to the first applicable
1834 revision from this list:
1834 revision from this list:
1835
1835
1836 a) null if -U or the source repository has no changesets
1836 a) null if -U or the source repository has no changesets
1837 b) if -u . and the source repository is local, the first parent of
1837 b) if -u . and the source repository is local, the first parent of
1838 the source repository's working directory
1838 the source repository's working directory
1839 c) the changeset specified with -u (if a branch name, this means the
1839 c) the changeset specified with -u (if a branch name, this means the
1840 latest head of that branch)
1840 latest head of that branch)
1841 d) the changeset specified with -r
1841 d) the changeset specified with -r
1842 e) the tipmost head specified with -b
1842 e) the tipmost head specified with -b
1843 f) the tipmost head specified with the url#branch source syntax
1843 f) the tipmost head specified with the url#branch source syntax
1844 g) the revision marked with the '@' bookmark, if present
1844 g) the revision marked with the '@' bookmark, if present
1845 h) the tipmost head of the default branch
1845 h) the tipmost head of the default branch
1846 i) tip
1846 i) tip
1847
1847
1848 When cloning from servers that support it, Mercurial may fetch
1848 When cloning from servers that support it, Mercurial may fetch
1849 pre-generated data from a server-advertised URL or inline from the
1849 pre-generated data from a server-advertised URL or inline from the
1850 same stream. When this is done, hooks operating on incoming changesets
1850 same stream. When this is done, hooks operating on incoming changesets
1851 and changegroups may fire more than once, once for each pre-generated
1851 and changegroups may fire more than once, once for each pre-generated
1852 bundle and as well as for any additional remaining data. In addition,
1852 bundle and as well as for any additional remaining data. In addition,
1853 if an error occurs, the repository may be rolled back to a partial
1853 if an error occurs, the repository may be rolled back to a partial
1854 clone. This behavior may change in future releases.
1854 clone. This behavior may change in future releases.
1855 See :hg:`help -e clonebundles` for more.
1855 See :hg:`help -e clonebundles` for more.
1856
1856
1857 Examples:
1857 Examples:
1858
1858
1859 - clone a remote repository to a new directory named hg/::
1859 - clone a remote repository to a new directory named hg/::
1860
1860
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1862
1862
1863 - create a lightweight local clone::
1863 - create a lightweight local clone::
1864
1864
1865 hg clone project/ project-feature/
1865 hg clone project/ project-feature/
1866
1866
1867 - clone from an absolute path on an ssh server (note double-slash)::
1867 - clone from an absolute path on an ssh server (note double-slash)::
1868
1868
1869 hg clone ssh://user@server//home/projects/alpha/
1869 hg clone ssh://user@server//home/projects/alpha/
1870
1870
1871 - do a streaming clone while checking out a specified version::
1871 - do a streaming clone while checking out a specified version::
1872
1872
1873 hg clone --stream http://server/repo -u 1.5
1873 hg clone --stream http://server/repo -u 1.5
1874
1874
1875 - create a repository without changesets after a particular revision::
1875 - create a repository without changesets after a particular revision::
1876
1876
1877 hg clone -r 04e544 experimental/ good/
1877 hg clone -r 04e544 experimental/ good/
1878
1878
1879 - clone (and track) a particular named branch::
1879 - clone (and track) a particular named branch::
1880
1880
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1882
1882
1883 See :hg:`help urls` for details on specifying URLs.
1883 See :hg:`help urls` for details on specifying URLs.
1884
1884
1885 Returns 0 on success.
1885 Returns 0 on success.
1886 """
1886 """
1887 opts = pycompat.byteskwargs(opts)
1887 opts = pycompat.byteskwargs(opts)
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1889
1889
1890 # --include/--exclude can come from narrow or sparse.
1890 # --include/--exclude can come from narrow or sparse.
1891 includepats, excludepats = None, None
1891 includepats, excludepats = None, None
1892
1892
1893 # hg.clone() differentiates between None and an empty set. So make sure
1893 # hg.clone() differentiates between None and an empty set. So make sure
1894 # patterns are sets if narrow is requested without patterns.
1894 # patterns are sets if narrow is requested without patterns.
1895 if opts.get(b'narrow'):
1895 if opts.get(b'narrow'):
1896 includepats = set()
1896 includepats = set()
1897 excludepats = set()
1897 excludepats = set()
1898
1898
1899 if opts.get(b'include'):
1899 if opts.get(b'include'):
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1901 if opts.get(b'exclude'):
1901 if opts.get(b'exclude'):
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1903
1903
1904 r = hg.clone(
1904 r = hg.clone(
1905 ui,
1905 ui,
1906 opts,
1906 opts,
1907 source,
1907 source,
1908 dest,
1908 dest,
1909 pull=opts.get(b'pull'),
1909 pull=opts.get(b'pull'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1911 revs=opts.get(b'rev'),
1911 revs=opts.get(b'rev'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1913 branch=opts.get(b'branch'),
1913 branch=opts.get(b'branch'),
1914 shareopts=opts.get(b'shareopts'),
1914 shareopts=opts.get(b'shareopts'),
1915 storeincludepats=includepats,
1915 storeincludepats=includepats,
1916 storeexcludepats=excludepats,
1916 storeexcludepats=excludepats,
1917 depth=opts.get(b'depth') or None,
1917 depth=opts.get(b'depth') or None,
1918 )
1918 )
1919
1919
1920 return r is None
1920 return r is None
1921
1921
1922
1922
1923 @command(
1923 @command(
1924 b'commit|ci',
1924 b'commit|ci',
1925 [
1925 [
1926 (
1926 (
1927 b'A',
1927 b'A',
1928 b'addremove',
1928 b'addremove',
1929 None,
1929 None,
1930 _(b'mark new/missing files as added/removed before committing'),
1930 _(b'mark new/missing files as added/removed before committing'),
1931 ),
1931 ),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1936 (
1936 (
1937 b'',
1937 b'',
1938 b'force-close-branch',
1938 b'force-close-branch',
1939 None,
1939 None,
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1941 ),
1941 ),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1943 ]
1943 ]
1944 + walkopts
1944 + walkopts
1945 + commitopts
1945 + commitopts
1946 + commitopts2
1946 + commitopts2
1947 + subrepoopts,
1947 + subrepoopts,
1948 _(b'[OPTION]... [FILE]...'),
1948 _(b'[OPTION]... [FILE]...'),
1949 helpcategory=command.CATEGORY_COMMITTING,
1949 helpcategory=command.CATEGORY_COMMITTING,
1950 helpbasic=True,
1950 helpbasic=True,
1951 inferrepo=True,
1951 inferrepo=True,
1952 )
1952 )
1953 def commit(ui, repo, *pats, **opts):
1953 def commit(ui, repo, *pats, **opts):
1954 """commit the specified files or all outstanding changes
1954 """commit the specified files or all outstanding changes
1955
1955
1956 Commit changes to the given files into the repository. Unlike a
1956 Commit changes to the given files into the repository. Unlike a
1957 centralized SCM, this operation is a local operation. See
1957 centralized SCM, this operation is a local operation. See
1958 :hg:`push` for a way to actively distribute your changes.
1958 :hg:`push` for a way to actively distribute your changes.
1959
1959
1960 If a list of files is omitted, all changes reported by :hg:`status`
1960 If a list of files is omitted, all changes reported by :hg:`status`
1961 will be committed.
1961 will be committed.
1962
1962
1963 If you are committing the result of a merge, do not provide any
1963 If you are committing the result of a merge, do not provide any
1964 filenames or -I/-X filters.
1964 filenames or -I/-X filters.
1965
1965
1966 If no commit message is specified, Mercurial starts your
1966 If no commit message is specified, Mercurial starts your
1967 configured editor where you can enter a message. In case your
1967 configured editor where you can enter a message. In case your
1968 commit fails, you will find a backup of your message in
1968 commit fails, you will find a backup of your message in
1969 ``.hg/last-message.txt``.
1969 ``.hg/last-message.txt``.
1970
1970
1971 The --close-branch flag can be used to mark the current branch
1971 The --close-branch flag can be used to mark the current branch
1972 head closed. When all heads of a branch are closed, the branch
1972 head closed. When all heads of a branch are closed, the branch
1973 will be considered closed and no longer listed.
1973 will be considered closed and no longer listed.
1974
1974
1975 The --amend flag can be used to amend the parent of the
1975 The --amend flag can be used to amend the parent of the
1976 working directory with a new commit that contains the changes
1976 working directory with a new commit that contains the changes
1977 in the parent in addition to those currently reported by :hg:`status`,
1977 in the parent in addition to those currently reported by :hg:`status`,
1978 if there are any. The old commit is stored in a backup bundle in
1978 if there are any. The old commit is stored in a backup bundle in
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1980 on how to restore it).
1980 on how to restore it).
1981
1981
1982 Message, user and date are taken from the amended commit unless
1982 Message, user and date are taken from the amended commit unless
1983 specified. When a message isn't specified on the command line,
1983 specified. When a message isn't specified on the command line,
1984 the editor will open with the message of the amended commit.
1984 the editor will open with the message of the amended commit.
1985
1985
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1987 or changesets that have children.
1987 or changesets that have children.
1988
1988
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1990
1990
1991 Returns 0 on success, 1 if nothing changed.
1991 Returns 0 on success, 1 if nothing changed.
1992
1992
1993 .. container:: verbose
1993 .. container:: verbose
1994
1994
1995 Examples:
1995 Examples:
1996
1996
1997 - commit all files ending in .py::
1997 - commit all files ending in .py::
1998
1998
1999 hg commit --include "set:**.py"
1999 hg commit --include "set:**.py"
2000
2000
2001 - commit all non-binary files::
2001 - commit all non-binary files::
2002
2002
2003 hg commit --exclude "set:binary()"
2003 hg commit --exclude "set:binary()"
2004
2004
2005 - amend the current commit and set the date to now::
2005 - amend the current commit and set the date to now::
2006
2006
2007 hg commit --amend --date now
2007 hg commit --amend --date now
2008 """
2008 """
2009 with repo.wlock(), repo.lock():
2009 with repo.wlock(), repo.lock():
2010 return _docommit(ui, repo, *pats, **opts)
2010 return _docommit(ui, repo, *pats, **opts)
2011
2011
2012
2012
2013 def _docommit(ui, repo, *pats, **opts):
2013 def _docommit(ui, repo, *pats, **opts):
2014 if opts.get('interactive'):
2014 if opts.get('interactive'):
2015 opts.pop('interactive')
2015 opts.pop('interactive')
2016 ret = cmdutil.dorecord(
2016 ret = cmdutil.dorecord(
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2018 )
2018 )
2019 # ret can be 0 (no changes to record) or the value returned by
2019 # ret can be 0 (no changes to record) or the value returned by
2020 # commit(), 1 if nothing changed or None on success.
2020 # commit(), 1 if nothing changed or None on success.
2021 return 1 if ret == 0 else ret
2021 return 1 if ret == 0 else ret
2022
2022
2023 opts = pycompat.byteskwargs(opts)
2023 opts = pycompat.byteskwargs(opts)
2024 if opts.get(b'subrepos'):
2024 if opts.get(b'subrepos'):
2025 if opts.get(b'amend'):
2025 if opts.get(b'amend'):
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2027 # Let --subrepos on the command line override config setting.
2027 # Let --subrepos on the command line override config setting.
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2029
2029
2030 cmdutil.checkunfinished(repo, commit=True)
2030 cmdutil.checkunfinished(repo, commit=True)
2031
2031
2032 branch = repo[None].branch()
2032 branch = repo[None].branch()
2033 bheads = repo.branchheads(branch)
2033 bheads = repo.branchheads(branch)
2034
2034
2035 extra = {}
2035 extra = {}
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2037 extra[b'close'] = b'1'
2037 extra[b'close'] = b'1'
2038
2038
2039 if repo[b'.'].closesbranch():
2039 if repo[b'.'].closesbranch():
2040 raise error.Abort(
2040 raise error.Abort(
2041 _(b'current revision is already a branch closing head')
2041 _(b'current revision is already a branch closing head')
2042 )
2042 )
2043 elif not bheads:
2043 elif not bheads:
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2045 elif (
2045 elif (
2046 branch == repo[b'.'].branch()
2046 branch == repo[b'.'].branch()
2047 and repo[b'.'].node() not in bheads
2047 and repo[b'.'].node() not in bheads
2048 and not opts.get(b'force_close_branch')
2048 and not opts.get(b'force_close_branch')
2049 ):
2049 ):
2050 hint = _(
2050 hint = _(
2051 b'use --force-close-branch to close branch from a non-head'
2051 b'use --force-close-branch to close branch from a non-head'
2052 b' changeset'
2052 b' changeset'
2053 )
2053 )
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2055 elif opts.get(b'amend'):
2055 elif opts.get(b'amend'):
2056 if (
2056 if (
2057 repo[b'.'].p1().branch() != branch
2057 repo[b'.'].p1().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2059 ):
2059 ):
2060 raise error.Abort(_(b'can only close branch heads'))
2060 raise error.Abort(_(b'can only close branch heads'))
2061
2061
2062 if opts.get(b'amend'):
2062 if opts.get(b'amend'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2065
2065
2066 old = repo[b'.']
2066 old = repo[b'.']
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2068
2068
2069 # Currently histedit gets confused if an amend happens while histedit
2069 # Currently histedit gets confused if an amend happens while histedit
2070 # is in progress. Since we have a checkunfinished command, we are
2070 # is in progress. Since we have a checkunfinished command, we are
2071 # temporarily honoring it.
2071 # temporarily honoring it.
2072 #
2072 #
2073 # Note: eventually this guard will be removed. Please do not expect
2073 # Note: eventually this guard will be removed. Please do not expect
2074 # this behavior to remain.
2074 # this behavior to remain.
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2076 cmdutil.checkunfinished(repo)
2076 cmdutil.checkunfinished(repo)
2077
2077
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2079 if node == old.node():
2079 if node == old.node():
2080 ui.status(_(b"nothing changed\n"))
2080 ui.status(_(b"nothing changed\n"))
2081 return 1
2081 return 1
2082 else:
2082 else:
2083
2083
2084 def commitfunc(ui, repo, message, match, opts):
2084 def commitfunc(ui, repo, message, match, opts):
2085 overrides = {}
2085 overrides = {}
2086 if opts.get(b'secret'):
2086 if opts.get(b'secret'):
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2088
2088
2089 baseui = repo.baseui
2089 baseui = repo.baseui
2090 with baseui.configoverride(overrides, b'commit'):
2090 with baseui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2092 editform = cmdutil.mergeeditform(
2092 editform = cmdutil.mergeeditform(
2093 repo[None], b'commit.normal'
2093 repo[None], b'commit.normal'
2094 )
2094 )
2095 editor = cmdutil.getcommiteditor(
2095 editor = cmdutil.getcommiteditor(
2096 editform=editform, **pycompat.strkwargs(opts)
2096 editform=editform, **pycompat.strkwargs(opts)
2097 )
2097 )
2098 return repo.commit(
2098 return repo.commit(
2099 message,
2099 message,
2100 opts.get(b'user'),
2100 opts.get(b'user'),
2101 opts.get(b'date'),
2101 opts.get(b'date'),
2102 match,
2102 match,
2103 editor=editor,
2103 editor=editor,
2104 extra=extra,
2104 extra=extra,
2105 )
2105 )
2106
2106
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2108
2108
2109 if not node:
2109 if not node:
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2111 if stat.deleted:
2111 if stat.deleted:
2112 ui.status(
2112 ui.status(
2113 _(
2113 _(
2114 b"nothing changed (%d missing files, see "
2114 b"nothing changed (%d missing files, see "
2115 b"'hg status')\n"
2115 b"'hg status')\n"
2116 )
2116 )
2117 % len(stat.deleted)
2117 % len(stat.deleted)
2118 )
2118 )
2119 else:
2119 else:
2120 ui.status(_(b"nothing changed\n"))
2120 ui.status(_(b"nothing changed\n"))
2121 return 1
2121 return 1
2122
2122
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2124
2124
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2126 status(
2126 status(
2127 ui,
2127 ui,
2128 repo,
2128 repo,
2129 modified=True,
2129 modified=True,
2130 added=True,
2130 added=True,
2131 removed=True,
2131 removed=True,
2132 deleted=True,
2132 deleted=True,
2133 unknown=True,
2133 unknown=True,
2134 subrepos=opts.get(b'subrepos'),
2134 subrepos=opts.get(b'subrepos'),
2135 )
2135 )
2136
2136
2137
2137
2138 @command(
2138 @command(
2139 b'config|showconfig|debugconfig',
2139 b'config|showconfig|debugconfig',
2140 [
2140 [
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2145 ]
2145 ]
2146 + formatteropts,
2146 + formatteropts,
2147 _(b'[-u] [NAME]...'),
2147 _(b'[-u] [NAME]...'),
2148 helpcategory=command.CATEGORY_HELP,
2148 helpcategory=command.CATEGORY_HELP,
2149 optionalrepo=True,
2149 optionalrepo=True,
2150 intents={INTENT_READONLY},
2150 intents={INTENT_READONLY},
2151 )
2151 )
2152 def config(ui, repo, *values, **opts):
2152 def config(ui, repo, *values, **opts):
2153 """show combined config settings from all hgrc files
2153 """show combined config settings from all hgrc files
2154
2154
2155 With no arguments, print names and values of all config items.
2155 With no arguments, print names and values of all config items.
2156
2156
2157 With one argument of the form section.name, print just the value
2157 With one argument of the form section.name, print just the value
2158 of that config item.
2158 of that config item.
2159
2159
2160 With multiple arguments, print names and values of all config
2160 With multiple arguments, print names and values of all config
2161 items with matching section names or section.names.
2161 items with matching section names or section.names.
2162
2162
2163 With --edit, start an editor on the user-level config file. With
2163 With --edit, start an editor on the user-level config file. With
2164 --global, edit the system-wide config file. With --local, edit the
2164 --global, edit the system-wide config file. With --local, edit the
2165 repository-level config file.
2165 repository-level config file.
2166
2166
2167 With --debug, the source (filename and line number) is printed
2167 With --debug, the source (filename and line number) is printed
2168 for each config item.
2168 for each config item.
2169
2169
2170 See :hg:`help config` for more information about config files.
2170 See :hg:`help config` for more information about config files.
2171
2171
2172 .. container:: verbose
2172 .. container:: verbose
2173
2173
2174 Template:
2174 Template:
2175
2175
2176 The following keywords are supported. See also :hg:`help templates`.
2176 The following keywords are supported. See also :hg:`help templates`.
2177
2177
2178 :name: String. Config name.
2178 :name: String. Config name.
2179 :source: String. Filename and line number where the item is defined.
2179 :source: String. Filename and line number where the item is defined.
2180 :value: String. Config value.
2180 :value: String. Config value.
2181
2181
2182 Returns 0 on success, 1 if NAME does not exist.
2182 Returns 0 on success, 1 if NAME does not exist.
2183
2183
2184 """
2184 """
2185
2185
2186 opts = pycompat.byteskwargs(opts)
2186 opts = pycompat.byteskwargs(opts)
2187 editopts = (b'edit', b'local', b'global')
2187 editopts = (b'edit', b'local', b'global')
2188 if any(opts.get(o) for o in editopts):
2188 if any(opts.get(o) for o in editopts):
2189 if opts.get(b'local') and opts.get(b'global'):
2189 if opts.get(b'local') and opts.get(b'global'):
2190 raise error.Abort(_(b"can't use --local and --global together"))
2190 raise error.Abort(_(b"can't use --local and --global together"))
2191
2191
2192 if opts.get(b'local'):
2192 if opts.get(b'local'):
2193 if not repo:
2193 if not repo:
2194 raise error.Abort(_(b"can't use --local outside a repository"))
2194 raise error.Abort(_(b"can't use --local outside a repository"))
2195 paths = [repo.vfs.join(b'hgrc')]
2195 paths = [repo.vfs.join(b'hgrc')]
2196 elif opts.get(b'global'):
2196 elif opts.get(b'global'):
2197 paths = rcutil.systemrcpath()
2197 paths = rcutil.systemrcpath()
2198 else:
2198 else:
2199 paths = rcutil.userrcpath()
2199 paths = rcutil.userrcpath()
2200
2200
2201 for f in paths:
2201 for f in paths:
2202 if os.path.exists(f):
2202 if os.path.exists(f):
2203 break
2203 break
2204 else:
2204 else:
2205 if opts.get(b'global'):
2205 if opts.get(b'global'):
2206 samplehgrc = uimod.samplehgrcs[b'global']
2206 samplehgrc = uimod.samplehgrcs[b'global']
2207 elif opts.get(b'local'):
2207 elif opts.get(b'local'):
2208 samplehgrc = uimod.samplehgrcs[b'local']
2208 samplehgrc = uimod.samplehgrcs[b'local']
2209 else:
2209 else:
2210 samplehgrc = uimod.samplehgrcs[b'user']
2210 samplehgrc = uimod.samplehgrcs[b'user']
2211
2211
2212 f = paths[0]
2212 f = paths[0]
2213 fp = open(f, b"wb")
2213 fp = open(f, b"wb")
2214 fp.write(util.tonativeeol(samplehgrc))
2214 fp.write(util.tonativeeol(samplehgrc))
2215 fp.close()
2215 fp.close()
2216
2216
2217 editor = ui.geteditor()
2217 editor = ui.geteditor()
2218 ui.system(
2218 ui.system(
2219 b"%s \"%s\"" % (editor, f),
2219 b"%s \"%s\"" % (editor, f),
2220 onerr=error.Abort,
2220 onerr=error.Abort,
2221 errprefix=_(b"edit failed"),
2221 errprefix=_(b"edit failed"),
2222 blockedtag=b'config_edit',
2222 blockedtag=b'config_edit',
2223 )
2223 )
2224 return
2224 return
2225 ui.pager(b'config')
2225 ui.pager(b'config')
2226 fm = ui.formatter(b'config', opts)
2226 fm = ui.formatter(b'config', opts)
2227 for t, f in rcutil.rccomponents():
2227 for t, f in rcutil.rccomponents():
2228 if t == b'path':
2228 if t == b'path':
2229 ui.debug(b'read config from: %s\n' % f)
2229 ui.debug(b'read config from: %s\n' % f)
2230 elif t == b'resource':
2230 elif t == b'resource':
2231 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2231 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2232 elif t == b'items':
2232 elif t == b'items':
2233 # Don't print anything for 'items'.
2233 # Don't print anything for 'items'.
2234 pass
2234 pass
2235 else:
2235 else:
2236 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2236 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2237 untrusted = bool(opts.get(b'untrusted'))
2237 untrusted = bool(opts.get(b'untrusted'))
2238
2238
2239 selsections = selentries = []
2239 selsections = selentries = []
2240 if values:
2240 if values:
2241 selsections = [v for v in values if b'.' not in v]
2241 selsections = [v for v in values if b'.' not in v]
2242 selentries = [v for v in values if b'.' in v]
2242 selentries = [v for v in values if b'.' in v]
2243 uniquesel = len(selentries) == 1 and not selsections
2243 uniquesel = len(selentries) == 1 and not selsections
2244 selsections = set(selsections)
2244 selsections = set(selsections)
2245 selentries = set(selentries)
2245 selentries = set(selentries)
2246
2246
2247 matched = False
2247 matched = False
2248 for section, name, value in ui.walkconfig(untrusted=untrusted):
2248 for section, name, value in ui.walkconfig(untrusted=untrusted):
2249 source = ui.configsource(section, name, untrusted)
2249 source = ui.configsource(section, name, untrusted)
2250 value = pycompat.bytestr(value)
2250 value = pycompat.bytestr(value)
2251 defaultvalue = ui.configdefault(section, name)
2251 defaultvalue = ui.configdefault(section, name)
2252 if fm.isplain():
2252 if fm.isplain():
2253 source = source or b'none'
2253 source = source or b'none'
2254 value = value.replace(b'\n', b'\\n')
2254 value = value.replace(b'\n', b'\\n')
2255 entryname = section + b'.' + name
2255 entryname = section + b'.' + name
2256 if values and not (section in selsections or entryname in selentries):
2256 if values and not (section in selsections or entryname in selentries):
2257 continue
2257 continue
2258 fm.startitem()
2258 fm.startitem()
2259 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2259 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2260 if uniquesel:
2260 if uniquesel:
2261 fm.data(name=entryname)
2261 fm.data(name=entryname)
2262 fm.write(b'value', b'%s\n', value)
2262 fm.write(b'value', b'%s\n', value)
2263 else:
2263 else:
2264 fm.write(b'name value', b'%s=%s\n', entryname, value)
2264 fm.write(b'name value', b'%s=%s\n', entryname, value)
2265 if formatter.isprintable(defaultvalue):
2265 if formatter.isprintable(defaultvalue):
2266 fm.data(defaultvalue=defaultvalue)
2266 fm.data(defaultvalue=defaultvalue)
2267 elif isinstance(defaultvalue, list) and all(
2267 elif isinstance(defaultvalue, list) and all(
2268 formatter.isprintable(e) for e in defaultvalue
2268 formatter.isprintable(e) for e in defaultvalue
2269 ):
2269 ):
2270 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2270 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2271 # TODO: no idea how to process unsupported defaultvalue types
2271 # TODO: no idea how to process unsupported defaultvalue types
2272 matched = True
2272 matched = True
2273 fm.end()
2273 fm.end()
2274 if matched:
2274 if matched:
2275 return 0
2275 return 0
2276 return 1
2276 return 1
2277
2277
2278
2278
2279 @command(
2279 @command(
2280 b'continue',
2280 b'continue',
2281 dryrunopts,
2281 dryrunopts,
2282 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2282 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2283 helpbasic=True,
2283 helpbasic=True,
2284 )
2284 )
2285 def continuecmd(ui, repo, **opts):
2285 def continuecmd(ui, repo, **opts):
2286 """resumes an interrupted operation (EXPERIMENTAL)
2286 """resumes an interrupted operation (EXPERIMENTAL)
2287
2287
2288 Finishes a multistep operation like graft, histedit, rebase, merge,
2288 Finishes a multistep operation like graft, histedit, rebase, merge,
2289 and unshelve if they are in an interrupted state.
2289 and unshelve if they are in an interrupted state.
2290
2290
2291 use --dry-run/-n to dry run the command.
2291 use --dry-run/-n to dry run the command.
2292 """
2292 """
2293 dryrun = opts.get('dry_run')
2293 dryrun = opts.get('dry_run')
2294 contstate = cmdutil.getunfinishedstate(repo)
2294 contstate = cmdutil.getunfinishedstate(repo)
2295 if not contstate:
2295 if not contstate:
2296 raise error.Abort(_(b'no operation in progress'))
2296 raise error.Abort(_(b'no operation in progress'))
2297 if not contstate.continuefunc:
2297 if not contstate.continuefunc:
2298 raise error.Abort(
2298 raise error.Abort(
2299 (
2299 (
2300 _(b"%s in progress but does not support 'hg continue'")
2300 _(b"%s in progress but does not support 'hg continue'")
2301 % (contstate._opname)
2301 % (contstate._opname)
2302 ),
2302 ),
2303 hint=contstate.continuemsg(),
2303 hint=contstate.continuemsg(),
2304 )
2304 )
2305 if dryrun:
2305 if dryrun:
2306 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2306 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2307 return
2307 return
2308 return contstate.continuefunc(ui, repo)
2308 return contstate.continuefunc(ui, repo)
2309
2309
2310
2310
2311 @command(
2311 @command(
2312 b'copy|cp',
2312 b'copy|cp',
2313 [
2313 [
2314 (b'', b'forget', None, _(b'unmark a file as copied')),
2314 (b'', b'forget', None, _(b'unmark a file as copied')),
2315 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2315 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2316 (
2316 (
2317 b'',
2317 b'',
2318 b'at-rev',
2318 b'at-rev',
2319 b'',
2319 b'',
2320 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2320 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2321 _(b'REV'),
2321 _(b'REV'),
2322 ),
2322 ),
2323 (
2323 (
2324 b'f',
2324 b'f',
2325 b'force',
2325 b'force',
2326 None,
2326 None,
2327 _(b'forcibly copy over an existing managed file'),
2327 _(b'forcibly copy over an existing managed file'),
2328 ),
2328 ),
2329 ]
2329 ]
2330 + walkopts
2330 + walkopts
2331 + dryrunopts,
2331 + dryrunopts,
2332 _(b'[OPTION]... SOURCE... DEST'),
2332 _(b'[OPTION]... SOURCE... DEST'),
2333 helpcategory=command.CATEGORY_FILE_CONTENTS,
2333 helpcategory=command.CATEGORY_FILE_CONTENTS,
2334 )
2334 )
2335 def copy(ui, repo, *pats, **opts):
2335 def copy(ui, repo, *pats, **opts):
2336 """mark files as copied for the next commit
2336 """mark files as copied for the next commit
2337
2337
2338 Mark dest as having copies of source files. If dest is a
2338 Mark dest as having copies of source files. If dest is a
2339 directory, copies are put in that directory. If dest is a file,
2339 directory, copies are put in that directory. If dest is a file,
2340 the source must be a single file.
2340 the source must be a single file.
2341
2341
2342 By default, this command copies the contents of files as they
2342 By default, this command copies the contents of files as they
2343 exist in the working directory. If invoked with -A/--after, the
2343 exist in the working directory. If invoked with -A/--after, the
2344 operation is recorded, but no copying is performed.
2344 operation is recorded, but no copying is performed.
2345
2345
2346 To undo marking a file as copied, use --forget. With that option,
2346 To undo marking a file as copied, use --forget. With that option,
2347 all given (positional) arguments are unmarked as copies. The destination
2347 all given (positional) arguments are unmarked as copies. The destination
2348 file(s) will be left in place (still tracked).
2348 file(s) will be left in place (still tracked).
2349
2349
2350 This command takes effect with the next commit by default.
2350 This command takes effect with the next commit by default.
2351
2351
2352 Returns 0 on success, 1 if errors are encountered.
2352 Returns 0 on success, 1 if errors are encountered.
2353 """
2353 """
2354 opts = pycompat.byteskwargs(opts)
2354 opts = pycompat.byteskwargs(opts)
2355 with repo.wlock():
2355 with repo.wlock():
2356 return cmdutil.copy(ui, repo, pats, opts)
2356 return cmdutil.copy(ui, repo, pats, opts)
2357
2357
2358
2358
2359 @command(
2359 @command(
2360 b'debugcommands',
2360 b'debugcommands',
2361 [],
2361 [],
2362 _(b'[COMMAND]'),
2362 _(b'[COMMAND]'),
2363 helpcategory=command.CATEGORY_HELP,
2363 helpcategory=command.CATEGORY_HELP,
2364 norepo=True,
2364 norepo=True,
2365 )
2365 )
2366 def debugcommands(ui, cmd=b'', *args):
2366 def debugcommands(ui, cmd=b'', *args):
2367 """list all available commands and options"""
2367 """list all available commands and options"""
2368 for cmd, vals in sorted(pycompat.iteritems(table)):
2368 for cmd, vals in sorted(pycompat.iteritems(table)):
2369 cmd = cmd.split(b'|')[0]
2369 cmd = cmd.split(b'|')[0]
2370 opts = b', '.join([i[1] for i in vals[1]])
2370 opts = b', '.join([i[1] for i in vals[1]])
2371 ui.write(b'%s: %s\n' % (cmd, opts))
2371 ui.write(b'%s: %s\n' % (cmd, opts))
2372
2372
2373
2373
2374 @command(
2374 @command(
2375 b'debugcomplete',
2375 b'debugcomplete',
2376 [(b'o', b'options', None, _(b'show the command options'))],
2376 [(b'o', b'options', None, _(b'show the command options'))],
2377 _(b'[-o] CMD'),
2377 _(b'[-o] CMD'),
2378 helpcategory=command.CATEGORY_HELP,
2378 helpcategory=command.CATEGORY_HELP,
2379 norepo=True,
2379 norepo=True,
2380 )
2380 )
2381 def debugcomplete(ui, cmd=b'', **opts):
2381 def debugcomplete(ui, cmd=b'', **opts):
2382 """returns the completion list associated with the given command"""
2382 """returns the completion list associated with the given command"""
2383
2383
2384 if opts.get('options'):
2384 if opts.get('options'):
2385 options = []
2385 options = []
2386 otables = [globalopts]
2386 otables = [globalopts]
2387 if cmd:
2387 if cmd:
2388 aliases, entry = cmdutil.findcmd(cmd, table, False)
2388 aliases, entry = cmdutil.findcmd(cmd, table, False)
2389 otables.append(entry[1])
2389 otables.append(entry[1])
2390 for t in otables:
2390 for t in otables:
2391 for o in t:
2391 for o in t:
2392 if b"(DEPRECATED)" in o[3]:
2392 if b"(DEPRECATED)" in o[3]:
2393 continue
2393 continue
2394 if o[0]:
2394 if o[0]:
2395 options.append(b'-%s' % o[0])
2395 options.append(b'-%s' % o[0])
2396 options.append(b'--%s' % o[1])
2396 options.append(b'--%s' % o[1])
2397 ui.write(b"%s\n" % b"\n".join(options))
2397 ui.write(b"%s\n" % b"\n".join(options))
2398 return
2398 return
2399
2399
2400 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2400 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2401 if ui.verbose:
2401 if ui.verbose:
2402 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2402 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2403 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2403 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2404
2404
2405
2405
2406 @command(
2406 @command(
2407 b'diff',
2407 b'diff',
2408 [
2408 [
2409 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2409 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2410 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2410 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2411 ]
2411 ]
2412 + diffopts
2412 + diffopts
2413 + diffopts2
2413 + diffopts2
2414 + walkopts
2414 + walkopts
2415 + subrepoopts,
2415 + subrepoopts,
2416 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2416 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2417 helpcategory=command.CATEGORY_FILE_CONTENTS,
2417 helpcategory=command.CATEGORY_FILE_CONTENTS,
2418 helpbasic=True,
2418 helpbasic=True,
2419 inferrepo=True,
2419 inferrepo=True,
2420 intents={INTENT_READONLY},
2420 intents={INTENT_READONLY},
2421 )
2421 )
2422 def diff(ui, repo, *pats, **opts):
2422 def diff(ui, repo, *pats, **opts):
2423 """diff repository (or selected files)
2423 """diff repository (or selected files)
2424
2424
2425 Show differences between revisions for the specified files.
2425 Show differences between revisions for the specified files.
2426
2426
2427 Differences between files are shown using the unified diff format.
2427 Differences between files are shown using the unified diff format.
2428
2428
2429 .. note::
2429 .. note::
2430
2430
2431 :hg:`diff` may generate unexpected results for merges, as it will
2431 :hg:`diff` may generate unexpected results for merges, as it will
2432 default to comparing against the working directory's first
2432 default to comparing against the working directory's first
2433 parent changeset if no revisions are specified.
2433 parent changeset if no revisions are specified.
2434
2434
2435 When two revision arguments are given, then changes are shown
2435 When two revision arguments are given, then changes are shown
2436 between those revisions. If only one revision is specified then
2436 between those revisions. If only one revision is specified then
2437 that revision is compared to the working directory, and, when no
2437 that revision is compared to the working directory, and, when no
2438 revisions are specified, the working directory files are compared
2438 revisions are specified, the working directory files are compared
2439 to its first parent.
2439 to its first parent.
2440
2440
2441 Alternatively you can specify -c/--change with a revision to see
2441 Alternatively you can specify -c/--change with a revision to see
2442 the changes in that changeset relative to its first parent.
2442 the changes in that changeset relative to its first parent.
2443
2443
2444 Without the -a/--text option, diff will avoid generating diffs of
2444 Without the -a/--text option, diff will avoid generating diffs of
2445 files it detects as binary. With -a, diff will generate a diff
2445 files it detects as binary. With -a, diff will generate a diff
2446 anyway, probably with undesirable results.
2446 anyway, probably with undesirable results.
2447
2447
2448 Use the -g/--git option to generate diffs in the git extended diff
2448 Use the -g/--git option to generate diffs in the git extended diff
2449 format. For more information, read :hg:`help diffs`.
2449 format. For more information, read :hg:`help diffs`.
2450
2450
2451 .. container:: verbose
2451 .. container:: verbose
2452
2452
2453 Examples:
2453 Examples:
2454
2454
2455 - compare a file in the current working directory to its parent::
2455 - compare a file in the current working directory to its parent::
2456
2456
2457 hg diff foo.c
2457 hg diff foo.c
2458
2458
2459 - compare two historical versions of a directory, with rename info::
2459 - compare two historical versions of a directory, with rename info::
2460
2460
2461 hg diff --git -r 1.0:1.2 lib/
2461 hg diff --git -r 1.0:1.2 lib/
2462
2462
2463 - get change stats relative to the last change on some date::
2463 - get change stats relative to the last change on some date::
2464
2464
2465 hg diff --stat -r "date('may 2')"
2465 hg diff --stat -r "date('may 2')"
2466
2466
2467 - diff all newly-added files that contain a keyword::
2467 - diff all newly-added files that contain a keyword::
2468
2468
2469 hg diff "set:added() and grep(GNU)"
2469 hg diff "set:added() and grep(GNU)"
2470
2470
2471 - compare a revision and its parents::
2471 - compare a revision and its parents::
2472
2472
2473 hg diff -c 9353 # compare against first parent
2473 hg diff -c 9353 # compare against first parent
2474 hg diff -r 9353^:9353 # same using revset syntax
2474 hg diff -r 9353^:9353 # same using revset syntax
2475 hg diff -r 9353^2:9353 # compare against the second parent
2475 hg diff -r 9353^2:9353 # compare against the second parent
2476
2476
2477 Returns 0 on success.
2477 Returns 0 on success.
2478 """
2478 """
2479
2479
2480 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2480 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2481 opts = pycompat.byteskwargs(opts)
2481 opts = pycompat.byteskwargs(opts)
2482 revs = opts.get(b'rev')
2482 revs = opts.get(b'rev')
2483 change = opts.get(b'change')
2483 change = opts.get(b'change')
2484 stat = opts.get(b'stat')
2484 stat = opts.get(b'stat')
2485 reverse = opts.get(b'reverse')
2485 reverse = opts.get(b'reverse')
2486
2486
2487 if change:
2487 if change:
2488 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2488 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2489 ctx2 = scmutil.revsingle(repo, change, None)
2489 ctx2 = scmutil.revsingle(repo, change, None)
2490 ctx1 = ctx2.p1()
2490 ctx1 = ctx2.p1()
2491 else:
2491 else:
2492 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2492 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2493 ctx1, ctx2 = scmutil.revpair(repo, revs)
2493 ctx1, ctx2 = scmutil.revpair(repo, revs)
2494
2494
2495 if reverse:
2495 if reverse:
2496 ctxleft = ctx2
2496 ctxleft = ctx2
2497 ctxright = ctx1
2497 ctxright = ctx1
2498 else:
2498 else:
2499 ctxleft = ctx1
2499 ctxleft = ctx1
2500 ctxright = ctx2
2500 ctxright = ctx2
2501
2501
2502 diffopts = patch.diffallopts(ui, opts)
2502 diffopts = patch.diffallopts(ui, opts)
2503 m = scmutil.match(ctx2, pats, opts)
2503 m = scmutil.match(ctx2, pats, opts)
2504 m = repo.narrowmatch(m)
2504 m = repo.narrowmatch(m)
2505 ui.pager(b'diff')
2505 ui.pager(b'diff')
2506 logcmdutil.diffordiffstat(
2506 logcmdutil.diffordiffstat(
2507 ui,
2507 ui,
2508 repo,
2508 repo,
2509 diffopts,
2509 diffopts,
2510 ctxleft,
2510 ctxleft,
2511 ctxright,
2511 ctxright,
2512 m,
2512 m,
2513 stat=stat,
2513 stat=stat,
2514 listsubrepos=opts.get(b'subrepos'),
2514 listsubrepos=opts.get(b'subrepos'),
2515 root=opts.get(b'root'),
2515 root=opts.get(b'root'),
2516 )
2516 )
2517
2517
2518
2518
2519 @command(
2519 @command(
2520 b'export',
2520 b'export',
2521 [
2521 [
2522 (
2522 (
2523 b'B',
2523 b'B',
2524 b'bookmark',
2524 b'bookmark',
2525 b'',
2525 b'',
2526 _(b'export changes only reachable by given bookmark'),
2526 _(b'export changes only reachable by given bookmark'),
2527 _(b'BOOKMARK'),
2527 _(b'BOOKMARK'),
2528 ),
2528 ),
2529 (
2529 (
2530 b'o',
2530 b'o',
2531 b'output',
2531 b'output',
2532 b'',
2532 b'',
2533 _(b'print output to file with formatted name'),
2533 _(b'print output to file with formatted name'),
2534 _(b'FORMAT'),
2534 _(b'FORMAT'),
2535 ),
2535 ),
2536 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2536 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2537 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2537 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2538 ]
2538 ]
2539 + diffopts
2539 + diffopts
2540 + formatteropts,
2540 + formatteropts,
2541 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2541 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2542 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2542 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2543 helpbasic=True,
2543 helpbasic=True,
2544 intents={INTENT_READONLY},
2544 intents={INTENT_READONLY},
2545 )
2545 )
2546 def export(ui, repo, *changesets, **opts):
2546 def export(ui, repo, *changesets, **opts):
2547 """dump the header and diffs for one or more changesets
2547 """dump the header and diffs for one or more changesets
2548
2548
2549 Print the changeset header and diffs for one or more revisions.
2549 Print the changeset header and diffs for one or more revisions.
2550 If no revision is given, the parent of the working directory is used.
2550 If no revision is given, the parent of the working directory is used.
2551
2551
2552 The information shown in the changeset header is: author, date,
2552 The information shown in the changeset header is: author, date,
2553 branch name (if non-default), changeset hash, parent(s) and commit
2553 branch name (if non-default), changeset hash, parent(s) and commit
2554 comment.
2554 comment.
2555
2555
2556 .. note::
2556 .. note::
2557
2557
2558 :hg:`export` may generate unexpected diff output for merge
2558 :hg:`export` may generate unexpected diff output for merge
2559 changesets, as it will compare the merge changeset against its
2559 changesets, as it will compare the merge changeset against its
2560 first parent only.
2560 first parent only.
2561
2561
2562 Output may be to a file, in which case the name of the file is
2562 Output may be to a file, in which case the name of the file is
2563 given using a template string. See :hg:`help templates`. In addition
2563 given using a template string. See :hg:`help templates`. In addition
2564 to the common template keywords, the following formatting rules are
2564 to the common template keywords, the following formatting rules are
2565 supported:
2565 supported:
2566
2566
2567 :``%%``: literal "%" character
2567 :``%%``: literal "%" character
2568 :``%H``: changeset hash (40 hexadecimal digits)
2568 :``%H``: changeset hash (40 hexadecimal digits)
2569 :``%N``: number of patches being generated
2569 :``%N``: number of patches being generated
2570 :``%R``: changeset revision number
2570 :``%R``: changeset revision number
2571 :``%b``: basename of the exporting repository
2571 :``%b``: basename of the exporting repository
2572 :``%h``: short-form changeset hash (12 hexadecimal digits)
2572 :``%h``: short-form changeset hash (12 hexadecimal digits)
2573 :``%m``: first line of the commit message (only alphanumeric characters)
2573 :``%m``: first line of the commit message (only alphanumeric characters)
2574 :``%n``: zero-padded sequence number, starting at 1
2574 :``%n``: zero-padded sequence number, starting at 1
2575 :``%r``: zero-padded changeset revision number
2575 :``%r``: zero-padded changeset revision number
2576 :``\\``: literal "\\" character
2576 :``\\``: literal "\\" character
2577
2577
2578 Without the -a/--text option, export will avoid generating diffs
2578 Without the -a/--text option, export will avoid generating diffs
2579 of files it detects as binary. With -a, export will generate a
2579 of files it detects as binary. With -a, export will generate a
2580 diff anyway, probably with undesirable results.
2580 diff anyway, probably with undesirable results.
2581
2581
2582 With -B/--bookmark changesets reachable by the given bookmark are
2582 With -B/--bookmark changesets reachable by the given bookmark are
2583 selected.
2583 selected.
2584
2584
2585 Use the -g/--git option to generate diffs in the git extended diff
2585 Use the -g/--git option to generate diffs in the git extended diff
2586 format. See :hg:`help diffs` for more information.
2586 format. See :hg:`help diffs` for more information.
2587
2587
2588 With the --switch-parent option, the diff will be against the
2588 With the --switch-parent option, the diff will be against the
2589 second parent. It can be useful to review a merge.
2589 second parent. It can be useful to review a merge.
2590
2590
2591 .. container:: verbose
2591 .. container:: verbose
2592
2592
2593 Template:
2593 Template:
2594
2594
2595 The following keywords are supported in addition to the common template
2595 The following keywords are supported in addition to the common template
2596 keywords and functions. See also :hg:`help templates`.
2596 keywords and functions. See also :hg:`help templates`.
2597
2597
2598 :diff: String. Diff content.
2598 :diff: String. Diff content.
2599 :parents: List of strings. Parent nodes of the changeset.
2599 :parents: List of strings. Parent nodes of the changeset.
2600
2600
2601 Examples:
2601 Examples:
2602
2602
2603 - use export and import to transplant a bugfix to the current
2603 - use export and import to transplant a bugfix to the current
2604 branch::
2604 branch::
2605
2605
2606 hg export -r 9353 | hg import -
2606 hg export -r 9353 | hg import -
2607
2607
2608 - export all the changesets between two revisions to a file with
2608 - export all the changesets between two revisions to a file with
2609 rename information::
2609 rename information::
2610
2610
2611 hg export --git -r 123:150 > changes.txt
2611 hg export --git -r 123:150 > changes.txt
2612
2612
2613 - split outgoing changes into a series of patches with
2613 - split outgoing changes into a series of patches with
2614 descriptive names::
2614 descriptive names::
2615
2615
2616 hg export -r "outgoing()" -o "%n-%m.patch"
2616 hg export -r "outgoing()" -o "%n-%m.patch"
2617
2617
2618 Returns 0 on success.
2618 Returns 0 on success.
2619 """
2619 """
2620 opts = pycompat.byteskwargs(opts)
2620 opts = pycompat.byteskwargs(opts)
2621 bookmark = opts.get(b'bookmark')
2621 bookmark = opts.get(b'bookmark')
2622 changesets += tuple(opts.get(b'rev', []))
2622 changesets += tuple(opts.get(b'rev', []))
2623
2623
2624 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2624 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2625
2625
2626 if bookmark:
2626 if bookmark:
2627 if bookmark not in repo._bookmarks:
2627 if bookmark not in repo._bookmarks:
2628 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2628 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2629
2629
2630 revs = scmutil.bookmarkrevs(repo, bookmark)
2630 revs = scmutil.bookmarkrevs(repo, bookmark)
2631 else:
2631 else:
2632 if not changesets:
2632 if not changesets:
2633 changesets = [b'.']
2633 changesets = [b'.']
2634
2634
2635 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2635 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2636 revs = scmutil.revrange(repo, changesets)
2636 revs = scmutil.revrange(repo, changesets)
2637
2637
2638 if not revs:
2638 if not revs:
2639 raise error.Abort(_(b"export requires at least one changeset"))
2639 raise error.Abort(_(b"export requires at least one changeset"))
2640 if len(revs) > 1:
2640 if len(revs) > 1:
2641 ui.note(_(b'exporting patches:\n'))
2641 ui.note(_(b'exporting patches:\n'))
2642 else:
2642 else:
2643 ui.note(_(b'exporting patch:\n'))
2643 ui.note(_(b'exporting patch:\n'))
2644
2644
2645 fntemplate = opts.get(b'output')
2645 fntemplate = opts.get(b'output')
2646 if cmdutil.isstdiofilename(fntemplate):
2646 if cmdutil.isstdiofilename(fntemplate):
2647 fntemplate = b''
2647 fntemplate = b''
2648
2648
2649 if fntemplate:
2649 if fntemplate:
2650 fm = formatter.nullformatter(ui, b'export', opts)
2650 fm = formatter.nullformatter(ui, b'export', opts)
2651 else:
2651 else:
2652 ui.pager(b'export')
2652 ui.pager(b'export')
2653 fm = ui.formatter(b'export', opts)
2653 fm = ui.formatter(b'export', opts)
2654 with fm:
2654 with fm:
2655 cmdutil.export(
2655 cmdutil.export(
2656 repo,
2656 repo,
2657 revs,
2657 revs,
2658 fm,
2658 fm,
2659 fntemplate=fntemplate,
2659 fntemplate=fntemplate,
2660 switch_parent=opts.get(b'switch_parent'),
2660 switch_parent=opts.get(b'switch_parent'),
2661 opts=patch.diffallopts(ui, opts),
2661 opts=patch.diffallopts(ui, opts),
2662 )
2662 )
2663
2663
2664
2664
2665 @command(
2665 @command(
2666 b'files',
2666 b'files',
2667 [
2667 [
2668 (
2668 (
2669 b'r',
2669 b'r',
2670 b'rev',
2670 b'rev',
2671 b'',
2671 b'',
2672 _(b'search the repository as it is in REV'),
2672 _(b'search the repository as it is in REV'),
2673 _(b'REV'),
2673 _(b'REV'),
2674 ),
2674 ),
2675 (
2675 (
2676 b'0',
2676 b'0',
2677 b'print0',
2677 b'print0',
2678 None,
2678 None,
2679 _(b'end filenames with NUL, for use with xargs'),
2679 _(b'end filenames with NUL, for use with xargs'),
2680 ),
2680 ),
2681 ]
2681 ]
2682 + walkopts
2682 + walkopts
2683 + formatteropts
2683 + formatteropts
2684 + subrepoopts,
2684 + subrepoopts,
2685 _(b'[OPTION]... [FILE]...'),
2685 _(b'[OPTION]... [FILE]...'),
2686 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2686 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2687 intents={INTENT_READONLY},
2687 intents={INTENT_READONLY},
2688 )
2688 )
2689 def files(ui, repo, *pats, **opts):
2689 def files(ui, repo, *pats, **opts):
2690 """list tracked files
2690 """list tracked files
2691
2691
2692 Print files under Mercurial control in the working directory or
2692 Print files under Mercurial control in the working directory or
2693 specified revision for given files (excluding removed files).
2693 specified revision for given files (excluding removed files).
2694 Files can be specified as filenames or filesets.
2694 Files can be specified as filenames or filesets.
2695
2695
2696 If no files are given to match, this command prints the names
2696 If no files are given to match, this command prints the names
2697 of all files under Mercurial control.
2697 of all files under Mercurial control.
2698
2698
2699 .. container:: verbose
2699 .. container:: verbose
2700
2700
2701 Template:
2701 Template:
2702
2702
2703 The following keywords are supported in addition to the common template
2703 The following keywords are supported in addition to the common template
2704 keywords and functions. See also :hg:`help templates`.
2704 keywords and functions. See also :hg:`help templates`.
2705
2705
2706 :flags: String. Character denoting file's symlink and executable bits.
2706 :flags: String. Character denoting file's symlink and executable bits.
2707 :path: String. Repository-absolute path of the file.
2707 :path: String. Repository-absolute path of the file.
2708 :size: Integer. Size of the file in bytes.
2708 :size: Integer. Size of the file in bytes.
2709
2709
2710 Examples:
2710 Examples:
2711
2711
2712 - list all files under the current directory::
2712 - list all files under the current directory::
2713
2713
2714 hg files .
2714 hg files .
2715
2715
2716 - shows sizes and flags for current revision::
2716 - shows sizes and flags for current revision::
2717
2717
2718 hg files -vr .
2718 hg files -vr .
2719
2719
2720 - list all files named README::
2720 - list all files named README::
2721
2721
2722 hg files -I "**/README"
2722 hg files -I "**/README"
2723
2723
2724 - list all binary files::
2724 - list all binary files::
2725
2725
2726 hg files "set:binary()"
2726 hg files "set:binary()"
2727
2727
2728 - find files containing a regular expression::
2728 - find files containing a regular expression::
2729
2729
2730 hg files "set:grep('bob')"
2730 hg files "set:grep('bob')"
2731
2731
2732 - search tracked file contents with xargs and grep::
2732 - search tracked file contents with xargs and grep::
2733
2733
2734 hg files -0 | xargs -0 grep foo
2734 hg files -0 | xargs -0 grep foo
2735
2735
2736 See :hg:`help patterns` and :hg:`help filesets` for more information
2736 See :hg:`help patterns` and :hg:`help filesets` for more information
2737 on specifying file patterns.
2737 on specifying file patterns.
2738
2738
2739 Returns 0 if a match is found, 1 otherwise.
2739 Returns 0 if a match is found, 1 otherwise.
2740
2740
2741 """
2741 """
2742
2742
2743 opts = pycompat.byteskwargs(opts)
2743 opts = pycompat.byteskwargs(opts)
2744 rev = opts.get(b'rev')
2744 rev = opts.get(b'rev')
2745 if rev:
2745 if rev:
2746 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2746 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2747 ctx = scmutil.revsingle(repo, rev, None)
2747 ctx = scmutil.revsingle(repo, rev, None)
2748
2748
2749 end = b'\n'
2749 end = b'\n'
2750 if opts.get(b'print0'):
2750 if opts.get(b'print0'):
2751 end = b'\0'
2751 end = b'\0'
2752 fmt = b'%s' + end
2752 fmt = b'%s' + end
2753
2753
2754 m = scmutil.match(ctx, pats, opts)
2754 m = scmutil.match(ctx, pats, opts)
2755 ui.pager(b'files')
2755 ui.pager(b'files')
2756 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2756 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2757 with ui.formatter(b'files', opts) as fm:
2757 with ui.formatter(b'files', opts) as fm:
2758 return cmdutil.files(
2758 return cmdutil.files(
2759 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2759 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2760 )
2760 )
2761
2761
2762
2762
2763 @command(
2763 @command(
2764 b'forget',
2764 b'forget',
2765 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2765 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2766 + walkopts
2766 + walkopts
2767 + dryrunopts,
2767 + dryrunopts,
2768 _(b'[OPTION]... FILE...'),
2768 _(b'[OPTION]... FILE...'),
2769 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2769 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2770 helpbasic=True,
2770 helpbasic=True,
2771 inferrepo=True,
2771 inferrepo=True,
2772 )
2772 )
2773 def forget(ui, repo, *pats, **opts):
2773 def forget(ui, repo, *pats, **opts):
2774 """forget the specified files on the next commit
2774 """forget the specified files on the next commit
2775
2775
2776 Mark the specified files so they will no longer be tracked
2776 Mark the specified files so they will no longer be tracked
2777 after the next commit.
2777 after the next commit.
2778
2778
2779 This only removes files from the current branch, not from the
2779 This only removes files from the current branch, not from the
2780 entire project history, and it does not delete them from the
2780 entire project history, and it does not delete them from the
2781 working directory.
2781 working directory.
2782
2782
2783 To delete the file from the working directory, see :hg:`remove`.
2783 To delete the file from the working directory, see :hg:`remove`.
2784
2784
2785 To undo a forget before the next commit, see :hg:`add`.
2785 To undo a forget before the next commit, see :hg:`add`.
2786
2786
2787 .. container:: verbose
2787 .. container:: verbose
2788
2788
2789 Examples:
2789 Examples:
2790
2790
2791 - forget newly-added binary files::
2791 - forget newly-added binary files::
2792
2792
2793 hg forget "set:added() and binary()"
2793 hg forget "set:added() and binary()"
2794
2794
2795 - forget files that would be excluded by .hgignore::
2795 - forget files that would be excluded by .hgignore::
2796
2796
2797 hg forget "set:hgignore()"
2797 hg forget "set:hgignore()"
2798
2798
2799 Returns 0 on success.
2799 Returns 0 on success.
2800 """
2800 """
2801
2801
2802 opts = pycompat.byteskwargs(opts)
2802 opts = pycompat.byteskwargs(opts)
2803 if not pats:
2803 if not pats:
2804 raise error.Abort(_(b'no files specified'))
2804 raise error.Abort(_(b'no files specified'))
2805
2805
2806 m = scmutil.match(repo[None], pats, opts)
2806 m = scmutil.match(repo[None], pats, opts)
2807 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2807 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2808 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2808 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2809 rejected = cmdutil.forget(
2809 rejected = cmdutil.forget(
2810 ui,
2810 ui,
2811 repo,
2811 repo,
2812 m,
2812 m,
2813 prefix=b"",
2813 prefix=b"",
2814 uipathfn=uipathfn,
2814 uipathfn=uipathfn,
2815 explicitonly=False,
2815 explicitonly=False,
2816 dryrun=dryrun,
2816 dryrun=dryrun,
2817 interactive=interactive,
2817 interactive=interactive,
2818 )[0]
2818 )[0]
2819 return rejected and 1 or 0
2819 return rejected and 1 or 0
2820
2820
2821
2821
2822 @command(
2822 @command(
2823 b'graft',
2823 b'graft',
2824 [
2824 [
2825 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2825 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2826 (
2826 (
2827 b'',
2827 b'',
2828 b'base',
2828 b'base',
2829 b'',
2829 b'',
2830 _(b'base revision when doing the graft merge (ADVANCED)'),
2830 _(b'base revision when doing the graft merge (ADVANCED)'),
2831 _(b'REV'),
2831 _(b'REV'),
2832 ),
2832 ),
2833 (b'c', b'continue', False, _(b'resume interrupted graft')),
2833 (b'c', b'continue', False, _(b'resume interrupted graft')),
2834 (b'', b'stop', False, _(b'stop interrupted graft')),
2834 (b'', b'stop', False, _(b'stop interrupted graft')),
2835 (b'', b'abort', False, _(b'abort interrupted graft')),
2835 (b'', b'abort', False, _(b'abort interrupted graft')),
2836 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2836 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2837 (b'', b'log', None, _(b'append graft info to log message')),
2837 (b'', b'log', None, _(b'append graft info to log message')),
2838 (
2838 (
2839 b'',
2839 b'',
2840 b'no-commit',
2840 b'no-commit',
2841 None,
2841 None,
2842 _(b"don't commit, just apply the changes in working directory"),
2842 _(b"don't commit, just apply the changes in working directory"),
2843 ),
2843 ),
2844 (b'f', b'force', False, _(b'force graft')),
2844 (b'f', b'force', False, _(b'force graft')),
2845 (
2845 (
2846 b'D',
2846 b'D',
2847 b'currentdate',
2847 b'currentdate',
2848 False,
2848 False,
2849 _(b'record the current date as commit date'),
2849 _(b'record the current date as commit date'),
2850 ),
2850 ),
2851 (
2851 (
2852 b'U',
2852 b'U',
2853 b'currentuser',
2853 b'currentuser',
2854 False,
2854 False,
2855 _(b'record the current user as committer'),
2855 _(b'record the current user as committer'),
2856 ),
2856 ),
2857 ]
2857 ]
2858 + commitopts2
2858 + commitopts2
2859 + mergetoolopts
2859 + mergetoolopts
2860 + dryrunopts,
2860 + dryrunopts,
2861 _(b'[OPTION]... [-r REV]... REV...'),
2861 _(b'[OPTION]... [-r REV]... REV...'),
2862 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2862 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2863 )
2863 )
2864 def graft(ui, repo, *revs, **opts):
2864 def graft(ui, repo, *revs, **opts):
2865 '''copy changes from other branches onto the current branch
2865 '''copy changes from other branches onto the current branch
2866
2866
2867 This command uses Mercurial's merge logic to copy individual
2867 This command uses Mercurial's merge logic to copy individual
2868 changes from other branches without merging branches in the
2868 changes from other branches without merging branches in the
2869 history graph. This is sometimes known as 'backporting' or
2869 history graph. This is sometimes known as 'backporting' or
2870 'cherry-picking'. By default, graft will copy user, date, and
2870 'cherry-picking'. By default, graft will copy user, date, and
2871 description from the source changesets.
2871 description from the source changesets.
2872
2872
2873 Changesets that are ancestors of the current revision, that have
2873 Changesets that are ancestors of the current revision, that have
2874 already been grafted, or that are merges will be skipped.
2874 already been grafted, or that are merges will be skipped.
2875
2875
2876 If --log is specified, log messages will have a comment appended
2876 If --log is specified, log messages will have a comment appended
2877 of the form::
2877 of the form::
2878
2878
2879 (grafted from CHANGESETHASH)
2879 (grafted from CHANGESETHASH)
2880
2880
2881 If --force is specified, revisions will be grafted even if they
2881 If --force is specified, revisions will be grafted even if they
2882 are already ancestors of, or have been grafted to, the destination.
2882 are already ancestors of, or have been grafted to, the destination.
2883 This is useful when the revisions have since been backed out.
2883 This is useful when the revisions have since been backed out.
2884
2884
2885 If a graft merge results in conflicts, the graft process is
2885 If a graft merge results in conflicts, the graft process is
2886 interrupted so that the current merge can be manually resolved.
2886 interrupted so that the current merge can be manually resolved.
2887 Once all conflicts are addressed, the graft process can be
2887 Once all conflicts are addressed, the graft process can be
2888 continued with the -c/--continue option.
2888 continued with the -c/--continue option.
2889
2889
2890 The -c/--continue option reapplies all the earlier options.
2890 The -c/--continue option reapplies all the earlier options.
2891
2891
2892 .. container:: verbose
2892 .. container:: verbose
2893
2893
2894 The --base option exposes more of how graft internally uses merge with a
2894 The --base option exposes more of how graft internally uses merge with a
2895 custom base revision. --base can be used to specify another ancestor than
2895 custom base revision. --base can be used to specify another ancestor than
2896 the first and only parent.
2896 the first and only parent.
2897
2897
2898 The command::
2898 The command::
2899
2899
2900 hg graft -r 345 --base 234
2900 hg graft -r 345 --base 234
2901
2901
2902 is thus pretty much the same as::
2902 is thus pretty much the same as::
2903
2903
2904 hg diff -r 234 -r 345 | hg import
2904 hg diff -r 234 -r 345 | hg import
2905
2905
2906 but using merge to resolve conflicts and track moved files.
2906 but using merge to resolve conflicts and track moved files.
2907
2907
2908 The result of a merge can thus be backported as a single commit by
2908 The result of a merge can thus be backported as a single commit by
2909 specifying one of the merge parents as base, and thus effectively
2909 specifying one of the merge parents as base, and thus effectively
2910 grafting the changes from the other side.
2910 grafting the changes from the other side.
2911
2911
2912 It is also possible to collapse multiple changesets and clean up history
2912 It is also possible to collapse multiple changesets and clean up history
2913 by specifying another ancestor as base, much like rebase --collapse
2913 by specifying another ancestor as base, much like rebase --collapse
2914 --keep.
2914 --keep.
2915
2915
2916 The commit message can be tweaked after the fact using commit --amend .
2916 The commit message can be tweaked after the fact using commit --amend .
2917
2917
2918 For using non-ancestors as the base to backout changes, see the backout
2918 For using non-ancestors as the base to backout changes, see the backout
2919 command and the hidden --parent option.
2919 command and the hidden --parent option.
2920
2920
2921 .. container:: verbose
2921 .. container:: verbose
2922
2922
2923 Examples:
2923 Examples:
2924
2924
2925 - copy a single change to the stable branch and edit its description::
2925 - copy a single change to the stable branch and edit its description::
2926
2926
2927 hg update stable
2927 hg update stable
2928 hg graft --edit 9393
2928 hg graft --edit 9393
2929
2929
2930 - graft a range of changesets with one exception, updating dates::
2930 - graft a range of changesets with one exception, updating dates::
2931
2931
2932 hg graft -D "2085::2093 and not 2091"
2932 hg graft -D "2085::2093 and not 2091"
2933
2933
2934 - continue a graft after resolving conflicts::
2934 - continue a graft after resolving conflicts::
2935
2935
2936 hg graft -c
2936 hg graft -c
2937
2937
2938 - show the source of a grafted changeset::
2938 - show the source of a grafted changeset::
2939
2939
2940 hg log --debug -r .
2940 hg log --debug -r .
2941
2941
2942 - show revisions sorted by date::
2942 - show revisions sorted by date::
2943
2943
2944 hg log -r "sort(all(), date)"
2944 hg log -r "sort(all(), date)"
2945
2945
2946 - backport the result of a merge as a single commit::
2946 - backport the result of a merge as a single commit::
2947
2947
2948 hg graft -r 123 --base 123^
2948 hg graft -r 123 --base 123^
2949
2949
2950 - land a feature branch as one changeset::
2950 - land a feature branch as one changeset::
2951
2951
2952 hg up -cr default
2952 hg up -cr default
2953 hg graft -r featureX --base "ancestor('featureX', 'default')"
2953 hg graft -r featureX --base "ancestor('featureX', 'default')"
2954
2954
2955 See :hg:`help revisions` for more about specifying revisions.
2955 See :hg:`help revisions` for more about specifying revisions.
2956
2956
2957 Returns 0 on successful completion, 1 if there are unresolved files.
2957 Returns 0 on successful completion, 1 if there are unresolved files.
2958 '''
2958 '''
2959 with repo.wlock():
2959 with repo.wlock():
2960 return _dograft(ui, repo, *revs, **opts)
2960 return _dograft(ui, repo, *revs, **opts)
2961
2961
2962
2962
2963 def _dograft(ui, repo, *revs, **opts):
2963 def _dograft(ui, repo, *revs, **opts):
2964 opts = pycompat.byteskwargs(opts)
2964 opts = pycompat.byteskwargs(opts)
2965 if revs and opts.get(b'rev'):
2965 if revs and opts.get(b'rev'):
2966 ui.warn(
2966 ui.warn(
2967 _(
2967 _(
2968 b'warning: inconsistent use of --rev might give unexpected '
2968 b'warning: inconsistent use of --rev might give unexpected '
2969 b'revision ordering!\n'
2969 b'revision ordering!\n'
2970 )
2970 )
2971 )
2971 )
2972
2972
2973 revs = list(revs)
2973 revs = list(revs)
2974 revs.extend(opts.get(b'rev'))
2974 revs.extend(opts.get(b'rev'))
2975 # a dict of data to be stored in state file
2975 # a dict of data to be stored in state file
2976 statedata = {}
2976 statedata = {}
2977 # list of new nodes created by ongoing graft
2977 # list of new nodes created by ongoing graft
2978 statedata[b'newnodes'] = []
2978 statedata[b'newnodes'] = []
2979
2979
2980 cmdutil.resolvecommitoptions(ui, opts)
2980 cmdutil.resolvecommitoptions(ui, opts)
2981
2981
2982 editor = cmdutil.getcommiteditor(
2982 editor = cmdutil.getcommiteditor(
2983 editform=b'graft', **pycompat.strkwargs(opts)
2983 editform=b'graft', **pycompat.strkwargs(opts)
2984 )
2984 )
2985
2985
2986 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2986 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2987
2987
2988 cont = False
2988 cont = False
2989 if opts.get(b'no_commit'):
2989 if opts.get(b'no_commit'):
2990 cmdutil.check_incompatible_arguments(
2990 cmdutil.check_incompatible_arguments(
2991 opts,
2991 opts,
2992 b'no_commit',
2992 b'no_commit',
2993 [b'edit', b'currentuser', b'currentdate', b'log'],
2993 [b'edit', b'currentuser', b'currentdate', b'log'],
2994 )
2994 )
2995
2995
2996 graftstate = statemod.cmdstate(repo, b'graftstate')
2996 graftstate = statemod.cmdstate(repo, b'graftstate')
2997
2997
2998 if opts.get(b'stop'):
2998 if opts.get(b'stop'):
2999 cmdutil.check_incompatible_arguments(
2999 cmdutil.check_incompatible_arguments(
3000 opts,
3000 opts,
3001 b'stop',
3001 b'stop',
3002 [
3002 [
3003 b'edit',
3003 b'edit',
3004 b'log',
3004 b'log',
3005 b'user',
3005 b'user',
3006 b'date',
3006 b'date',
3007 b'currentdate',
3007 b'currentdate',
3008 b'currentuser',
3008 b'currentuser',
3009 b'rev',
3009 b'rev',
3010 ],
3010 ],
3011 )
3011 )
3012 return _stopgraft(ui, repo, graftstate)
3012 return _stopgraft(ui, repo, graftstate)
3013 elif opts.get(b'abort'):
3013 elif opts.get(b'abort'):
3014 cmdutil.check_incompatible_arguments(
3014 cmdutil.check_incompatible_arguments(
3015 opts,
3015 opts,
3016 b'abort',
3016 b'abort',
3017 [
3017 [
3018 b'edit',
3018 b'edit',
3019 b'log',
3019 b'log',
3020 b'user',
3020 b'user',
3021 b'date',
3021 b'date',
3022 b'currentdate',
3022 b'currentdate',
3023 b'currentuser',
3023 b'currentuser',
3024 b'rev',
3024 b'rev',
3025 ],
3025 ],
3026 )
3026 )
3027 return cmdutil.abortgraft(ui, repo, graftstate)
3027 return cmdutil.abortgraft(ui, repo, graftstate)
3028 elif opts.get(b'continue'):
3028 elif opts.get(b'continue'):
3029 cont = True
3029 cont = True
3030 if revs:
3030 if revs:
3031 raise error.Abort(_(b"can't specify --continue and revisions"))
3031 raise error.Abort(_(b"can't specify --continue and revisions"))
3032 # read in unfinished revisions
3032 # read in unfinished revisions
3033 if graftstate.exists():
3033 if graftstate.exists():
3034 statedata = cmdutil.readgraftstate(repo, graftstate)
3034 statedata = cmdutil.readgraftstate(repo, graftstate)
3035 if statedata.get(b'date'):
3035 if statedata.get(b'date'):
3036 opts[b'date'] = statedata[b'date']
3036 opts[b'date'] = statedata[b'date']
3037 if statedata.get(b'user'):
3037 if statedata.get(b'user'):
3038 opts[b'user'] = statedata[b'user']
3038 opts[b'user'] = statedata[b'user']
3039 if statedata.get(b'log'):
3039 if statedata.get(b'log'):
3040 opts[b'log'] = True
3040 opts[b'log'] = True
3041 if statedata.get(b'no_commit'):
3041 if statedata.get(b'no_commit'):
3042 opts[b'no_commit'] = statedata.get(b'no_commit')
3042 opts[b'no_commit'] = statedata.get(b'no_commit')
3043 if statedata.get(b'base'):
3043 if statedata.get(b'base'):
3044 opts[b'base'] = statedata.get(b'base')
3044 opts[b'base'] = statedata.get(b'base')
3045 nodes = statedata[b'nodes']
3045 nodes = statedata[b'nodes']
3046 revs = [repo[node].rev() for node in nodes]
3046 revs = [repo[node].rev() for node in nodes]
3047 else:
3047 else:
3048 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3048 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3049 else:
3049 else:
3050 if not revs:
3050 if not revs:
3051 raise error.Abort(_(b'no revisions specified'))
3051 raise error.Abort(_(b'no revisions specified'))
3052 cmdutil.checkunfinished(repo)
3052 cmdutil.checkunfinished(repo)
3053 cmdutil.bailifchanged(repo)
3053 cmdutil.bailifchanged(repo)
3054 revs = scmutil.revrange(repo, revs)
3054 revs = scmutil.revrange(repo, revs)
3055
3055
3056 skipped = set()
3056 skipped = set()
3057 basectx = None
3057 basectx = None
3058 if opts.get(b'base'):
3058 if opts.get(b'base'):
3059 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3059 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3060 if basectx is None:
3060 if basectx is None:
3061 # check for merges
3061 # check for merges
3062 for rev in repo.revs(b'%ld and merge()', revs):
3062 for rev in repo.revs(b'%ld and merge()', revs):
3063 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3063 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3064 skipped.add(rev)
3064 skipped.add(rev)
3065 revs = [r for r in revs if r not in skipped]
3065 revs = [r for r in revs if r not in skipped]
3066 if not revs:
3066 if not revs:
3067 return -1
3067 return -1
3068 if basectx is not None and len(revs) != 1:
3068 if basectx is not None and len(revs) != 1:
3069 raise error.Abort(_(b'only one revision allowed with --base '))
3069 raise error.Abort(_(b'only one revision allowed with --base '))
3070
3070
3071 # Don't check in the --continue case, in effect retaining --force across
3071 # Don't check in the --continue case, in effect retaining --force across
3072 # --continues. That's because without --force, any revisions we decided to
3072 # --continues. That's because without --force, any revisions we decided to
3073 # skip would have been filtered out here, so they wouldn't have made their
3073 # skip would have been filtered out here, so they wouldn't have made their
3074 # way to the graftstate. With --force, any revisions we would have otherwise
3074 # way to the graftstate. With --force, any revisions we would have otherwise
3075 # skipped would not have been filtered out, and if they hadn't been applied
3075 # skipped would not have been filtered out, and if they hadn't been applied
3076 # already, they'd have been in the graftstate.
3076 # already, they'd have been in the graftstate.
3077 if not (cont or opts.get(b'force')) and basectx is None:
3077 if not (cont or opts.get(b'force')) and basectx is None:
3078 # check for ancestors of dest branch
3078 # check for ancestors of dest branch
3079 ancestors = repo.revs(b'%ld & (::.)', revs)
3079 ancestors = repo.revs(b'%ld & (::.)', revs)
3080 for rev in ancestors:
3080 for rev in ancestors:
3081 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3081 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3082
3082
3083 revs = [r for r in revs if r not in ancestors]
3083 revs = [r for r in revs if r not in ancestors]
3084
3084
3085 if not revs:
3085 if not revs:
3086 return -1
3086 return -1
3087
3087
3088 # analyze revs for earlier grafts
3088 # analyze revs for earlier grafts
3089 ids = {}
3089 ids = {}
3090 for ctx in repo.set(b"%ld", revs):
3090 for ctx in repo.set(b"%ld", revs):
3091 ids[ctx.hex()] = ctx.rev()
3091 ids[ctx.hex()] = ctx.rev()
3092 n = ctx.extra().get(b'source')
3092 n = ctx.extra().get(b'source')
3093 if n:
3093 if n:
3094 ids[n] = ctx.rev()
3094 ids[n] = ctx.rev()
3095
3095
3096 # check ancestors for earlier grafts
3096 # check ancestors for earlier grafts
3097 ui.debug(b'scanning for duplicate grafts\n')
3097 ui.debug(b'scanning for duplicate grafts\n')
3098
3098
3099 # The only changesets we can be sure doesn't contain grafts of any
3099 # The only changesets we can be sure doesn't contain grafts of any
3100 # revs, are the ones that are common ancestors of *all* revs:
3100 # revs, are the ones that are common ancestors of *all* revs:
3101 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3101 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3102 ctx = repo[rev]
3102 ctx = repo[rev]
3103 n = ctx.extra().get(b'source')
3103 n = ctx.extra().get(b'source')
3104 if n in ids:
3104 if n in ids:
3105 try:
3105 try:
3106 r = repo[n].rev()
3106 r = repo[n].rev()
3107 except error.RepoLookupError:
3107 except error.RepoLookupError:
3108 r = None
3108 r = None
3109 if r in revs:
3109 if r in revs:
3110 ui.warn(
3110 ui.warn(
3111 _(
3111 _(
3112 b'skipping revision %d:%s '
3112 b'skipping revision %d:%s '
3113 b'(already grafted to %d:%s)\n'
3113 b'(already grafted to %d:%s)\n'
3114 )
3114 )
3115 % (r, repo[r], rev, ctx)
3115 % (r, repo[r], rev, ctx)
3116 )
3116 )
3117 revs.remove(r)
3117 revs.remove(r)
3118 elif ids[n] in revs:
3118 elif ids[n] in revs:
3119 if r is None:
3119 if r is None:
3120 ui.warn(
3120 ui.warn(
3121 _(
3121 _(
3122 b'skipping already grafted revision %d:%s '
3122 b'skipping already grafted revision %d:%s '
3123 b'(%d:%s also has unknown origin %s)\n'
3123 b'(%d:%s also has unknown origin %s)\n'
3124 )
3124 )
3125 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3125 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3126 )
3126 )
3127 else:
3127 else:
3128 ui.warn(
3128 ui.warn(
3129 _(
3129 _(
3130 b'skipping already grafted revision %d:%s '
3130 b'skipping already grafted revision %d:%s '
3131 b'(%d:%s also has origin %d:%s)\n'
3131 b'(%d:%s also has origin %d:%s)\n'
3132 )
3132 )
3133 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3133 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3134 )
3134 )
3135 revs.remove(ids[n])
3135 revs.remove(ids[n])
3136 elif ctx.hex() in ids:
3136 elif ctx.hex() in ids:
3137 r = ids[ctx.hex()]
3137 r = ids[ctx.hex()]
3138 if r in revs:
3138 if r in revs:
3139 ui.warn(
3139 ui.warn(
3140 _(
3140 _(
3141 b'skipping already grafted revision %d:%s '
3141 b'skipping already grafted revision %d:%s '
3142 b'(was grafted from %d:%s)\n'
3142 b'(was grafted from %d:%s)\n'
3143 )
3143 )
3144 % (r, repo[r], rev, ctx)
3144 % (r, repo[r], rev, ctx)
3145 )
3145 )
3146 revs.remove(r)
3146 revs.remove(r)
3147 if not revs:
3147 if not revs:
3148 return -1
3148 return -1
3149
3149
3150 if opts.get(b'no_commit'):
3150 if opts.get(b'no_commit'):
3151 statedata[b'no_commit'] = True
3151 statedata[b'no_commit'] = True
3152 if opts.get(b'base'):
3152 if opts.get(b'base'):
3153 statedata[b'base'] = opts[b'base']
3153 statedata[b'base'] = opts[b'base']
3154 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3154 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3155 desc = b'%d:%s "%s"' % (
3155 desc = b'%d:%s "%s"' % (
3156 ctx.rev(),
3156 ctx.rev(),
3157 ctx,
3157 ctx,
3158 ctx.description().split(b'\n', 1)[0],
3158 ctx.description().split(b'\n', 1)[0],
3159 )
3159 )
3160 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3160 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3161 if names:
3161 if names:
3162 desc += b' (%s)' % b' '.join(names)
3162 desc += b' (%s)' % b' '.join(names)
3163 ui.status(_(b'grafting %s\n') % desc)
3163 ui.status(_(b'grafting %s\n') % desc)
3164 if opts.get(b'dry_run'):
3164 if opts.get(b'dry_run'):
3165 continue
3165 continue
3166
3166
3167 source = ctx.extra().get(b'source')
3167 source = ctx.extra().get(b'source')
3168 extra = {}
3168 extra = {}
3169 if source:
3169 if source:
3170 extra[b'source'] = source
3170 extra[b'source'] = source
3171 extra[b'intermediate-source'] = ctx.hex()
3171 extra[b'intermediate-source'] = ctx.hex()
3172 else:
3172 else:
3173 extra[b'source'] = ctx.hex()
3173 extra[b'source'] = ctx.hex()
3174 user = ctx.user()
3174 user = ctx.user()
3175 if opts.get(b'user'):
3175 if opts.get(b'user'):
3176 user = opts[b'user']
3176 user = opts[b'user']
3177 statedata[b'user'] = user
3177 statedata[b'user'] = user
3178 date = ctx.date()
3178 date = ctx.date()
3179 if opts.get(b'date'):
3179 if opts.get(b'date'):
3180 date = opts[b'date']
3180 date = opts[b'date']
3181 statedata[b'date'] = date
3181 statedata[b'date'] = date
3182 message = ctx.description()
3182 message = ctx.description()
3183 if opts.get(b'log'):
3183 if opts.get(b'log'):
3184 message += b'\n(grafted from %s)' % ctx.hex()
3184 message += b'\n(grafted from %s)' % ctx.hex()
3185 statedata[b'log'] = True
3185 statedata[b'log'] = True
3186
3186
3187 # we don't merge the first commit when continuing
3187 # we don't merge the first commit when continuing
3188 if not cont:
3188 if not cont:
3189 # perform the graft merge with p1(rev) as 'ancestor'
3189 # perform the graft merge with p1(rev) as 'ancestor'
3190 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3190 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3191 base = ctx.p1() if basectx is None else basectx
3191 base = ctx.p1() if basectx is None else basectx
3192 with ui.configoverride(overrides, b'graft'):
3192 with ui.configoverride(overrides, b'graft'):
3193 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3193 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3194 # report any conflicts
3194 # report any conflicts
3195 if stats.unresolvedcount > 0:
3195 if stats.unresolvedcount > 0:
3196 # write out state for --continue
3196 # write out state for --continue
3197 nodes = [repo[rev].hex() for rev in revs[pos:]]
3197 nodes = [repo[rev].hex() for rev in revs[pos:]]
3198 statedata[b'nodes'] = nodes
3198 statedata[b'nodes'] = nodes
3199 stateversion = 1
3199 stateversion = 1
3200 graftstate.save(stateversion, statedata)
3200 graftstate.save(stateversion, statedata)
3201 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3201 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3202 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3202 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3203 return 1
3203 return 1
3204 else:
3204 else:
3205 cont = False
3205 cont = False
3206
3206
3207 # commit if --no-commit is false
3207 # commit if --no-commit is false
3208 if not opts.get(b'no_commit'):
3208 if not opts.get(b'no_commit'):
3209 node = repo.commit(
3209 node = repo.commit(
3210 text=message, user=user, date=date, extra=extra, editor=editor
3210 text=message, user=user, date=date, extra=extra, editor=editor
3211 )
3211 )
3212 if node is None:
3212 if node is None:
3213 ui.warn(
3213 ui.warn(
3214 _(b'note: graft of %d:%s created no changes to commit\n')
3214 _(b'note: graft of %d:%s created no changes to commit\n')
3215 % (ctx.rev(), ctx)
3215 % (ctx.rev(), ctx)
3216 )
3216 )
3217 # checking that newnodes exist because old state files won't have it
3217 # checking that newnodes exist because old state files won't have it
3218 elif statedata.get(b'newnodes') is not None:
3218 elif statedata.get(b'newnodes') is not None:
3219 statedata[b'newnodes'].append(node)
3219 statedata[b'newnodes'].append(node)
3220
3220
3221 # remove state when we complete successfully
3221 # remove state when we complete successfully
3222 if not opts.get(b'dry_run'):
3222 if not opts.get(b'dry_run'):
3223 graftstate.delete()
3223 graftstate.delete()
3224
3224
3225 return 0
3225 return 0
3226
3226
3227
3227
3228 def _stopgraft(ui, repo, graftstate):
3228 def _stopgraft(ui, repo, graftstate):
3229 """stop the interrupted graft"""
3229 """stop the interrupted graft"""
3230 if not graftstate.exists():
3230 if not graftstate.exists():
3231 raise error.Abort(_(b"no interrupted graft found"))
3231 raise error.Abort(_(b"no interrupted graft found"))
3232 pctx = repo[b'.']
3232 pctx = repo[b'.']
3233 hg.updaterepo(repo, pctx.node(), overwrite=True)
3233 hg.updaterepo(repo, pctx.node(), overwrite=True)
3234 graftstate.delete()
3234 graftstate.delete()
3235 ui.status(_(b"stopped the interrupted graft\n"))
3235 ui.status(_(b"stopped the interrupted graft\n"))
3236 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3236 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3237 return 0
3237 return 0
3238
3238
3239
3239
3240 statemod.addunfinished(
3240 statemod.addunfinished(
3241 b'graft',
3241 b'graft',
3242 fname=b'graftstate',
3242 fname=b'graftstate',
3243 clearable=True,
3243 clearable=True,
3244 stopflag=True,
3244 stopflag=True,
3245 continueflag=True,
3245 continueflag=True,
3246 abortfunc=cmdutil.hgabortgraft,
3246 abortfunc=cmdutil.hgabortgraft,
3247 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3247 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3248 )
3248 )
3249
3249
3250
3250
3251 @command(
3251 @command(
3252 b'grep',
3252 b'grep',
3253 [
3253 [
3254 (b'0', b'print0', None, _(b'end fields with NUL')),
3254 (b'0', b'print0', None, _(b'end fields with NUL')),
3255 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3255 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3256 (
3256 (
3257 b'',
3257 b'',
3258 b'diff',
3258 b'diff',
3259 None,
3259 None,
3260 _(
3260 _(
3261 b'search revision differences for when the pattern was added '
3261 b'search revision differences for when the pattern was added '
3262 b'or removed'
3262 b'or removed'
3263 ),
3263 ),
3264 ),
3264 ),
3265 (b'a', b'text', None, _(b'treat all files as text')),
3265 (b'a', b'text', None, _(b'treat all files as text')),
3266 (
3266 (
3267 b'f',
3267 b'f',
3268 b'follow',
3268 b'follow',
3269 None,
3269 None,
3270 _(
3270 _(
3271 b'follow changeset history,'
3271 b'follow changeset history,'
3272 b' or file history across copies and renames'
3272 b' or file history across copies and renames'
3273 ),
3273 ),
3274 ),
3274 ),
3275 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3275 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3276 (
3276 (
3277 b'l',
3277 b'l',
3278 b'files-with-matches',
3278 b'files-with-matches',
3279 None,
3279 None,
3280 _(b'print only filenames and revisions that match'),
3280 _(b'print only filenames and revisions that match'),
3281 ),
3281 ),
3282 (b'n', b'line-number', None, _(b'print matching line numbers')),
3282 (b'n', b'line-number', None, _(b'print matching line numbers')),
3283 (
3283 (
3284 b'r',
3284 b'r',
3285 b'rev',
3285 b'rev',
3286 [],
3286 [],
3287 _(b'search files changed within revision range'),
3287 _(b'search files changed within revision range'),
3288 _(b'REV'),
3288 _(b'REV'),
3289 ),
3289 ),
3290 (
3290 (
3291 b'',
3291 b'',
3292 b'all-files',
3292 b'all-files',
3293 None,
3293 None,
3294 _(
3294 _(
3295 b'include all files in the changeset while grepping (DEPRECATED)'
3295 b'include all files in the changeset while grepping (DEPRECATED)'
3296 ),
3296 ),
3297 ),
3297 ),
3298 (b'u', b'user', None, _(b'list the author (long with -v)')),
3298 (b'u', b'user', None, _(b'list the author (long with -v)')),
3299 (b'd', b'date', None, _(b'list the date (short with -q)')),
3299 (b'd', b'date', None, _(b'list the date (short with -q)')),
3300 ]
3300 ]
3301 + formatteropts
3301 + formatteropts
3302 + walkopts,
3302 + walkopts,
3303 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3303 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3304 helpcategory=command.CATEGORY_FILE_CONTENTS,
3304 helpcategory=command.CATEGORY_FILE_CONTENTS,
3305 inferrepo=True,
3305 inferrepo=True,
3306 intents={INTENT_READONLY},
3306 intents={INTENT_READONLY},
3307 )
3307 )
3308 def grep(ui, repo, pattern, *pats, **opts):
3308 def grep(ui, repo, pattern, *pats, **opts):
3309 """search for a pattern in specified files
3309 """search for a pattern in specified files
3310
3310
3311 Search the working directory or revision history for a regular
3311 Search the working directory or revision history for a regular
3312 expression in the specified files for the entire repository.
3312 expression in the specified files for the entire repository.
3313
3313
3314 By default, grep searches the repository files in the working
3314 By default, grep searches the repository files in the working
3315 directory and prints the files where it finds a match. To specify
3315 directory and prints the files where it finds a match. To specify
3316 historical revisions instead of the working directory, use the
3316 historical revisions instead of the working directory, use the
3317 --rev flag.
3317 --rev flag.
3318
3318
3319 To search instead historical revision differences that contains a
3319 To search instead historical revision differences that contains a
3320 change in match status ("-" for a match that becomes a non-match,
3320 change in match status ("-" for a match that becomes a non-match,
3321 or "+" for a non-match that becomes a match), use the --diff flag.
3321 or "+" for a non-match that becomes a match), use the --diff flag.
3322
3322
3323 PATTERN can be any Python (roughly Perl-compatible) regular
3323 PATTERN can be any Python (roughly Perl-compatible) regular
3324 expression.
3324 expression.
3325
3325
3326 If no FILEs are specified and the --rev flag isn't supplied, all
3326 If no FILEs are specified and the --rev flag isn't supplied, all
3327 files in the working directory are searched. When using the --rev
3327 files in the working directory are searched. When using the --rev
3328 flag and specifying FILEs, use the --follow argument to also
3328 flag and specifying FILEs, use the --follow argument to also
3329 follow the specified FILEs across renames and copies.
3329 follow the specified FILEs across renames and copies.
3330
3330
3331 .. container:: verbose
3331 .. container:: verbose
3332
3332
3333 Template:
3333 Template:
3334
3334
3335 The following keywords are supported in addition to the common template
3335 The following keywords are supported in addition to the common template
3336 keywords and functions. See also :hg:`help templates`.
3336 keywords and functions. See also :hg:`help templates`.
3337
3337
3338 :change: String. Character denoting insertion ``+`` or removal ``-``.
3338 :change: String. Character denoting insertion ``+`` or removal ``-``.
3339 Available if ``--diff`` is specified.
3339 Available if ``--diff`` is specified.
3340 :lineno: Integer. Line number of the match.
3340 :lineno: Integer. Line number of the match.
3341 :path: String. Repository-absolute path of the file.
3341 :path: String. Repository-absolute path of the file.
3342 :texts: List of text chunks.
3342 :texts: List of text chunks.
3343
3343
3344 And each entry of ``{texts}`` provides the following sub-keywords.
3344 And each entry of ``{texts}`` provides the following sub-keywords.
3345
3345
3346 :matched: Boolean. True if the chunk matches the specified pattern.
3346 :matched: Boolean. True if the chunk matches the specified pattern.
3347 :text: String. Chunk content.
3347 :text: String. Chunk content.
3348
3348
3349 See :hg:`help templates.operators` for the list expansion syntax.
3349 See :hg:`help templates.operators` for the list expansion syntax.
3350
3350
3351 Returns 0 if a match is found, 1 otherwise.
3351 Returns 0 if a match is found, 1 otherwise.
3352
3352
3353 """
3353 """
3354 opts = pycompat.byteskwargs(opts)
3354 opts = pycompat.byteskwargs(opts)
3355 diff = opts.get(b'all') or opts.get(b'diff')
3355 diff = opts.get(b'all') or opts.get(b'diff')
3356 if diff and opts.get(b'all_files'):
3356 if diff and opts.get(b'all_files'):
3357 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3357 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3358 if opts.get(b'all_files') is None and not diff:
3358 if opts.get(b'all_files') is None and not diff:
3359 opts[b'all_files'] = True
3359 opts[b'all_files'] = True
3360 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3360 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3361 all_files = opts.get(b'all_files')
3361 all_files = opts.get(b'all_files')
3362 if plaingrep:
3362 if plaingrep:
3363 opts[b'rev'] = [b'wdir()']
3363 opts[b'rev'] = [b'wdir()']
3364
3364
3365 reflags = re.M
3365 reflags = re.M
3366 if opts.get(b'ignore_case'):
3366 if opts.get(b'ignore_case'):
3367 reflags |= re.I
3367 reflags |= re.I
3368 try:
3368 try:
3369 regexp = util.re.compile(pattern, reflags)
3369 regexp = util.re.compile(pattern, reflags)
3370 except re.error as inst:
3370 except re.error as inst:
3371 ui.warn(
3371 ui.warn(
3372 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3372 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3373 )
3373 )
3374 return 1
3374 return 1
3375 sep, eol = b':', b'\n'
3375 sep, eol = b':', b'\n'
3376 if opts.get(b'print0'):
3376 if opts.get(b'print0'):
3377 sep = eol = b'\0'
3377 sep = eol = b'\0'
3378
3378
3379 getfile = util.lrucachefunc(repo.file)
3379 getfile = util.lrucachefunc(repo.file)
3380
3380
3381 def matchlines(body):
3381 def matchlines(body):
3382 begin = 0
3382 begin = 0
3383 linenum = 0
3383 linenum = 0
3384 while begin < len(body):
3384 while begin < len(body):
3385 match = regexp.search(body, begin)
3385 match = regexp.search(body, begin)
3386 if not match:
3386 if not match:
3387 break
3387 break
3388 mstart, mend = match.span()
3388 mstart, mend = match.span()
3389 linenum += body.count(b'\n', begin, mstart) + 1
3389 linenum += body.count(b'\n', begin, mstart) + 1
3390 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3390 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3391 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3391 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3392 lend = begin - 1
3392 lend = begin - 1
3393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3394
3394
3395 class linestate(object):
3395 class linestate(object):
3396 def __init__(self, line, linenum, colstart, colend):
3396 def __init__(self, line, linenum, colstart, colend):
3397 self.line = line
3397 self.line = line
3398 self.linenum = linenum
3398 self.linenum = linenum
3399 self.colstart = colstart
3399 self.colstart = colstart
3400 self.colend = colend
3400 self.colend = colend
3401
3401
3402 def __hash__(self):
3402 def __hash__(self):
3403 return hash((self.linenum, self.line))
3403 return hash(self.line)
3404
3404
3405 def __eq__(self, other):
3405 def __eq__(self, other):
3406 return self.line == other.line
3406 return self.line == other.line
3407
3407
3408 def findpos(self):
3408 def findpos(self):
3409 """Iterate all (start, end) indices of matches"""
3409 """Iterate all (start, end) indices of matches"""
3410 yield self.colstart, self.colend
3410 yield self.colstart, self.colend
3411 p = self.colend
3411 p = self.colend
3412 while p < len(self.line):
3412 while p < len(self.line):
3413 m = regexp.search(self.line, p)
3413 m = regexp.search(self.line, p)
3414 if not m:
3414 if not m:
3415 break
3415 break
3416 if m.end() == p:
3416 if m.end() == p:
3417 p += 1
3417 p += 1
3418 else:
3418 else:
3419 yield m.span()
3419 yield m.span()
3420 p = m.end()
3420 p = m.end()
3421
3421
3422 matches = {}
3422 matches = {}
3423 copies = {}
3423 copies = {}
3424
3424
3425 def grepbody(fn, rev, body):
3425 def grepbody(fn, rev, body):
3426 matches[rev].setdefault(fn, [])
3426 matches[rev].setdefault(fn, [])
3427 m = matches[rev][fn]
3427 m = matches[rev][fn]
3428 if body is None:
3428 if body is None:
3429 return
3429 return
3430
3430
3431 for lnum, cstart, cend, line in matchlines(body):
3431 for lnum, cstart, cend, line in matchlines(body):
3432 s = linestate(line, lnum, cstart, cend)
3432 s = linestate(line, lnum, cstart, cend)
3433 m.append(s)
3433 m.append(s)
3434
3434
3435 def difflinestates(a, b):
3435 def difflinestates(a, b):
3436 sm = difflib.SequenceMatcher(None, a, b)
3436 sm = difflib.SequenceMatcher(None, a, b)
3437 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3437 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3438 if tag == 'insert':
3438 if tag == 'insert':
3439 for i in pycompat.xrange(blo, bhi):
3439 for i in pycompat.xrange(blo, bhi):
3440 yield (b'+', b[i])
3440 yield (b'+', b[i])
3441 elif tag == 'delete':
3441 elif tag == 'delete':
3442 for i in pycompat.xrange(alo, ahi):
3442 for i in pycompat.xrange(alo, ahi):
3443 yield (b'-', a[i])
3443 yield (b'-', a[i])
3444 elif tag == 'replace':
3444 elif tag == 'replace':
3445 for i in pycompat.xrange(alo, ahi):
3445 for i in pycompat.xrange(alo, ahi):
3446 yield (b'-', a[i])
3446 yield (b'-', a[i])
3447 for i in pycompat.xrange(blo, bhi):
3447 for i in pycompat.xrange(blo, bhi):
3448 yield (b'+', b[i])
3448 yield (b'+', b[i])
3449
3449
3450 uipathfn = scmutil.getuipathfn(repo)
3450 uipathfn = scmutil.getuipathfn(repo)
3451
3451
3452 def display(fm, fn, ctx, pstates, states):
3452 def display(fm, fn, ctx, pstates, states):
3453 rev = scmutil.intrev(ctx)
3453 rev = scmutil.intrev(ctx)
3454 if fm.isplain():
3454 if fm.isplain():
3455 formatuser = ui.shortuser
3455 formatuser = ui.shortuser
3456 else:
3456 else:
3457 formatuser = pycompat.bytestr
3457 formatuser = pycompat.bytestr
3458 if ui.quiet:
3458 if ui.quiet:
3459 datefmt = b'%Y-%m-%d'
3459 datefmt = b'%Y-%m-%d'
3460 else:
3460 else:
3461 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3461 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3462 found = False
3462 found = False
3463
3463
3464 @util.cachefunc
3464 @util.cachefunc
3465 def binary():
3465 def binary():
3466 flog = getfile(fn)
3466 flog = getfile(fn)
3467 try:
3467 try:
3468 return stringutil.binary(flog.read(ctx.filenode(fn)))
3468 return stringutil.binary(flog.read(ctx.filenode(fn)))
3469 except error.WdirUnsupported:
3469 except error.WdirUnsupported:
3470 return ctx[fn].isbinary()
3470 return ctx[fn].isbinary()
3471
3471
3472 fieldnamemap = {b'linenumber': b'lineno'}
3472 fieldnamemap = {b'linenumber': b'lineno'}
3473 if diff:
3473 if diff:
3474 iter = difflinestates(pstates, states)
3474 iter = difflinestates(pstates, states)
3475 else:
3475 else:
3476 iter = [(b'', l) for l in states]
3476 iter = [(b'', l) for l in states]
3477 for change, l in iter:
3477 for change, l in iter:
3478 fm.startitem()
3478 fm.startitem()
3479 fm.context(ctx=ctx)
3479 fm.context(ctx=ctx)
3480 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3480 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3481 fm.plain(uipathfn(fn), label=b'grep.filename')
3481 fm.plain(uipathfn(fn), label=b'grep.filename')
3482
3482
3483 cols = [
3483 cols = [
3484 (b'rev', b'%d', rev, not plaingrep, b''),
3484 (b'rev', b'%d', rev, not plaingrep, b''),
3485 (
3485 (
3486 b'linenumber',
3486 b'linenumber',
3487 b'%d',
3487 b'%d',
3488 l.linenum,
3488 l.linenum,
3489 opts.get(b'line_number'),
3489 opts.get(b'line_number'),
3490 b'',
3490 b'',
3491 ),
3491 ),
3492 ]
3492 ]
3493 if diff:
3493 if diff:
3494 cols.append(
3494 cols.append(
3495 (
3495 (
3496 b'change',
3496 b'change',
3497 b'%s',
3497 b'%s',
3498 change,
3498 change,
3499 True,
3499 True,
3500 b'grep.inserted '
3500 b'grep.inserted '
3501 if change == b'+'
3501 if change == b'+'
3502 else b'grep.deleted ',
3502 else b'grep.deleted ',
3503 )
3503 )
3504 )
3504 )
3505 cols.extend(
3505 cols.extend(
3506 [
3506 [
3507 (
3507 (
3508 b'user',
3508 b'user',
3509 b'%s',
3509 b'%s',
3510 formatuser(ctx.user()),
3510 formatuser(ctx.user()),
3511 opts.get(b'user'),
3511 opts.get(b'user'),
3512 b'',
3512 b'',
3513 ),
3513 ),
3514 (
3514 (
3515 b'date',
3515 b'date',
3516 b'%s',
3516 b'%s',
3517 fm.formatdate(ctx.date(), datefmt),
3517 fm.formatdate(ctx.date(), datefmt),
3518 opts.get(b'date'),
3518 opts.get(b'date'),
3519 b'',
3519 b'',
3520 ),
3520 ),
3521 ]
3521 ]
3522 )
3522 )
3523 for name, fmt, data, cond, extra_label in cols:
3523 for name, fmt, data, cond, extra_label in cols:
3524 if cond:
3524 if cond:
3525 fm.plain(sep, label=b'grep.sep')
3525 fm.plain(sep, label=b'grep.sep')
3526 field = fieldnamemap.get(name, name)
3526 field = fieldnamemap.get(name, name)
3527 label = extra_label + (b'grep.%s' % name)
3527 label = extra_label + (b'grep.%s' % name)
3528 fm.condwrite(cond, field, fmt, data, label=label)
3528 fm.condwrite(cond, field, fmt, data, label=label)
3529 if not opts.get(b'files_with_matches'):
3529 if not opts.get(b'files_with_matches'):
3530 fm.plain(sep, label=b'grep.sep')
3530 fm.plain(sep, label=b'grep.sep')
3531 if not opts.get(b'text') and binary():
3531 if not opts.get(b'text') and binary():
3532 fm.plain(_(b" Binary file matches"))
3532 fm.plain(_(b" Binary file matches"))
3533 else:
3533 else:
3534 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3534 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3535 fm.plain(eol)
3535 fm.plain(eol)
3536 found = True
3536 found = True
3537 if opts.get(b'files_with_matches'):
3537 if opts.get(b'files_with_matches'):
3538 break
3538 break
3539 return found
3539 return found
3540
3540
3541 def displaymatches(fm, l):
3541 def displaymatches(fm, l):
3542 p = 0
3542 p = 0
3543 for s, e in l.findpos():
3543 for s, e in l.findpos():
3544 if p < s:
3544 if p < s:
3545 fm.startitem()
3545 fm.startitem()
3546 fm.write(b'text', b'%s', l.line[p:s])
3546 fm.write(b'text', b'%s', l.line[p:s])
3547 fm.data(matched=False)
3547 fm.data(matched=False)
3548 fm.startitem()
3548 fm.startitem()
3549 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3549 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3550 fm.data(matched=True)
3550 fm.data(matched=True)
3551 p = e
3551 p = e
3552 if p < len(l.line):
3552 if p < len(l.line):
3553 fm.startitem()
3553 fm.startitem()
3554 fm.write(b'text', b'%s', l.line[p:])
3554 fm.write(b'text', b'%s', l.line[p:])
3555 fm.data(matched=False)
3555 fm.data(matched=False)
3556 fm.end()
3556 fm.end()
3557
3557
3558 skip = set()
3558 skip = set()
3559 revfiles = {}
3559 revfiles = {}
3560 match = scmutil.match(repo[None], pats, opts)
3560 match = scmutil.match(repo[None], pats, opts)
3561 found = False
3561 found = False
3562 follow = opts.get(b'follow')
3562 follow = opts.get(b'follow')
3563
3563
3564 getrenamed = scmutil.getrenamedfn(repo)
3564 getrenamed = scmutil.getrenamedfn(repo)
3565
3565
3566 def readfile(ctx, fn):
3566 def readfile(ctx, fn):
3567 rev = ctx.rev()
3567 rev = ctx.rev()
3568 if rev is None:
3568 if rev is None:
3569 fctx = ctx[fn]
3569 fctx = ctx[fn]
3570 try:
3570 try:
3571 return fctx.data()
3571 return fctx.data()
3572 except IOError as e:
3572 except IOError as e:
3573 if e.errno != errno.ENOENT:
3573 if e.errno != errno.ENOENT:
3574 raise
3574 raise
3575 else:
3575 else:
3576 flog = getfile(fn)
3576 flog = getfile(fn)
3577 fnode = ctx.filenode(fn)
3577 fnode = ctx.filenode(fn)
3578 try:
3578 try:
3579 return flog.read(fnode)
3579 return flog.read(fnode)
3580 except error.CensoredNodeError:
3580 except error.CensoredNodeError:
3581 ui.warn(
3581 ui.warn(
3582 _(
3582 _(
3583 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3583 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3584 )
3584 )
3585 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3585 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3586 )
3586 )
3587
3587
3588 def prep(ctx, fns):
3588 def prep(ctx, fns):
3589 rev = ctx.rev()
3589 rev = ctx.rev()
3590 pctx = ctx.p1()
3590 pctx = ctx.p1()
3591 matches.setdefault(rev, {})
3591 matches.setdefault(rev, {})
3592 if diff:
3592 if diff:
3593 parent = pctx.rev()
3593 parent = pctx.rev()
3594 matches.setdefault(parent, {})
3594 matches.setdefault(parent, {})
3595 files = revfiles.setdefault(rev, [])
3595 files = revfiles.setdefault(rev, [])
3596 if rev is None:
3596 if rev is None:
3597 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3597 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3598 # pathauditor checks without this in mozilla-central
3598 # pathauditor checks without this in mozilla-central
3599 contextmanager = repo.wvfs.audit.cached
3599 contextmanager = repo.wvfs.audit.cached
3600 else:
3600 else:
3601 contextmanager = util.nullcontextmanager
3601 contextmanager = util.nullcontextmanager
3602 with contextmanager():
3602 with contextmanager():
3603 for fn in fns:
3603 for fn in fns:
3604 # fn might not exist in the revision (could be a file removed by
3604 # fn might not exist in the revision (could be a file removed by
3605 # the revision). We could check `fn not in ctx` even when rev is
3605 # the revision). We could check `fn not in ctx` even when rev is
3606 # None, but it's less racy to protect againt that in readfile.
3606 # None, but it's less racy to protect againt that in readfile.
3607 if rev is not None and fn not in ctx:
3607 if rev is not None and fn not in ctx:
3608 continue
3608 continue
3609
3609
3610 copy = None
3610 copy = None
3611 if follow:
3611 if follow:
3612 copy = getrenamed(fn, rev)
3612 copy = getrenamed(fn, rev)
3613 if copy:
3613 if copy:
3614 copies.setdefault(rev, {})[fn] = copy
3614 copies.setdefault(rev, {})[fn] = copy
3615 if fn in skip:
3615 if fn in skip:
3616 skip.add(copy)
3616 skip.add(copy)
3617 if fn in skip:
3617 if fn in skip:
3618 continue
3618 continue
3619 files.append(fn)
3619 files.append(fn)
3620
3620
3621 if fn not in matches[rev]:
3621 if fn not in matches[rev]:
3622 grepbody(fn, rev, readfile(ctx, fn))
3622 grepbody(fn, rev, readfile(ctx, fn))
3623
3623
3624 if diff:
3624 if diff:
3625 pfn = copy or fn
3625 pfn = copy or fn
3626 if pfn not in matches[parent] and pfn in pctx:
3626 if pfn not in matches[parent] and pfn in pctx:
3627 grepbody(pfn, parent, readfile(pctx, pfn))
3627 grepbody(pfn, parent, readfile(pctx, pfn))
3628
3628
3629 ui.pager(b'grep')
3629 ui.pager(b'grep')
3630 fm = ui.formatter(b'grep', opts)
3630 fm = ui.formatter(b'grep', opts)
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3632 rev = ctx.rev()
3632 rev = ctx.rev()
3633 parent = ctx.p1().rev()
3633 parent = ctx.p1().rev()
3634 for fn in sorted(revfiles.get(rev, [])):
3634 for fn in sorted(revfiles.get(rev, [])):
3635 states = matches[rev][fn]
3635 states = matches[rev][fn]
3636 copy = copies.get(rev, {}).get(fn)
3636 copy = copies.get(rev, {}).get(fn)
3637 if fn in skip:
3637 if fn in skip:
3638 if copy:
3638 if copy:
3639 skip.add(copy)
3639 skip.add(copy)
3640 continue
3640 continue
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3642 if pstates or states:
3642 if pstates or states:
3643 r = display(fm, fn, ctx, pstates, states)
3643 r = display(fm, fn, ctx, pstates, states)
3644 found = found or r
3644 found = found or r
3645 if r and not diff and not all_files:
3645 if r and not diff and not all_files:
3646 skip.add(fn)
3646 skip.add(fn)
3647 if copy:
3647 if copy:
3648 skip.add(copy)
3648 skip.add(copy)
3649 del revfiles[rev]
3649 del revfiles[rev]
3650 # We will keep the matches dict for the duration of the window
3650 # We will keep the matches dict for the duration of the window
3651 # clear the matches dict once the window is over
3651 # clear the matches dict once the window is over
3652 if not revfiles:
3652 if not revfiles:
3653 matches.clear()
3653 matches.clear()
3654 fm.end()
3654 fm.end()
3655
3655
3656 return not found
3656 return not found
3657
3657
3658
3658
3659 @command(
3659 @command(
3660 b'heads',
3660 b'heads',
3661 [
3661 [
3662 (
3662 (
3663 b'r',
3663 b'r',
3664 b'rev',
3664 b'rev',
3665 b'',
3665 b'',
3666 _(b'show only heads which are descendants of STARTREV'),
3666 _(b'show only heads which are descendants of STARTREV'),
3667 _(b'STARTREV'),
3667 _(b'STARTREV'),
3668 ),
3668 ),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3670 (
3670 (
3671 b'a',
3671 b'a',
3672 b'active',
3672 b'active',
3673 False,
3673 False,
3674 _(b'show active branchheads only (DEPRECATED)'),
3674 _(b'show active branchheads only (DEPRECATED)'),
3675 ),
3675 ),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3677 ]
3677 ]
3678 + templateopts,
3678 + templateopts,
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3681 intents={INTENT_READONLY},
3681 intents={INTENT_READONLY},
3682 )
3682 )
3683 def heads(ui, repo, *branchrevs, **opts):
3683 def heads(ui, repo, *branchrevs, **opts):
3684 """show branch heads
3684 """show branch heads
3685
3685
3686 With no arguments, show all open branch heads in the repository.
3686 With no arguments, show all open branch heads in the repository.
3687 Branch heads are changesets that have no descendants on the
3687 Branch heads are changesets that have no descendants on the
3688 same branch. They are where development generally takes place and
3688 same branch. They are where development generally takes place and
3689 are the usual targets for update and merge operations.
3689 are the usual targets for update and merge operations.
3690
3690
3691 If one or more REVs are given, only open branch heads on the
3691 If one or more REVs are given, only open branch heads on the
3692 branches associated with the specified changesets are shown. This
3692 branches associated with the specified changesets are shown. This
3693 means that you can use :hg:`heads .` to see the heads on the
3693 means that you can use :hg:`heads .` to see the heads on the
3694 currently checked-out branch.
3694 currently checked-out branch.
3695
3695
3696 If -c/--closed is specified, also show branch heads marked closed
3696 If -c/--closed is specified, also show branch heads marked closed
3697 (see :hg:`commit --close-branch`).
3697 (see :hg:`commit --close-branch`).
3698
3698
3699 If STARTREV is specified, only those heads that are descendants of
3699 If STARTREV is specified, only those heads that are descendants of
3700 STARTREV will be displayed.
3700 STARTREV will be displayed.
3701
3701
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3703 topological heads (changesets with no children) will be shown.
3703 topological heads (changesets with no children) will be shown.
3704
3704
3705 Returns 0 if matching heads are found, 1 if not.
3705 Returns 0 if matching heads are found, 1 if not.
3706 """
3706 """
3707
3707
3708 opts = pycompat.byteskwargs(opts)
3708 opts = pycompat.byteskwargs(opts)
3709 start = None
3709 start = None
3710 rev = opts.get(b'rev')
3710 rev = opts.get(b'rev')
3711 if rev:
3711 if rev:
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3713 start = scmutil.revsingle(repo, rev, None).node()
3713 start = scmutil.revsingle(repo, rev, None).node()
3714
3714
3715 if opts.get(b'topo'):
3715 if opts.get(b'topo'):
3716 heads = [repo[h] for h in repo.heads(start)]
3716 heads = [repo[h] for h in repo.heads(start)]
3717 else:
3717 else:
3718 heads = []
3718 heads = []
3719 for branch in repo.branchmap():
3719 for branch in repo.branchmap():
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3721 heads = [repo[h] for h in heads]
3721 heads = [repo[h] for h in heads]
3722
3722
3723 if branchrevs:
3723 if branchrevs:
3724 branches = {
3724 branches = {
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3726 }
3726 }
3727 heads = [h for h in heads if h.branch() in branches]
3727 heads = [h for h in heads if h.branch() in branches]
3728
3728
3729 if opts.get(b'active') and branchrevs:
3729 if opts.get(b'active') and branchrevs:
3730 dagheads = repo.heads(start)
3730 dagheads = repo.heads(start)
3731 heads = [h for h in heads if h.node() in dagheads]
3731 heads = [h for h in heads if h.node() in dagheads]
3732
3732
3733 if branchrevs:
3733 if branchrevs:
3734 haveheads = {h.branch() for h in heads}
3734 haveheads = {h.branch() for h in heads}
3735 if branches - haveheads:
3735 if branches - haveheads:
3736 headless = b', '.join(b for b in branches - haveheads)
3736 headless = b', '.join(b for b in branches - haveheads)
3737 msg = _(b'no open branch heads found on branches %s')
3737 msg = _(b'no open branch heads found on branches %s')
3738 if opts.get(b'rev'):
3738 if opts.get(b'rev'):
3739 msg += _(b' (started at %s)') % opts[b'rev']
3739 msg += _(b' (started at %s)') % opts[b'rev']
3740 ui.warn((msg + b'\n') % headless)
3740 ui.warn((msg + b'\n') % headless)
3741
3741
3742 if not heads:
3742 if not heads:
3743 return 1
3743 return 1
3744
3744
3745 ui.pager(b'heads')
3745 ui.pager(b'heads')
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3748 for ctx in heads:
3748 for ctx in heads:
3749 displayer.show(ctx)
3749 displayer.show(ctx)
3750 displayer.close()
3750 displayer.close()
3751
3751
3752
3752
3753 @command(
3753 @command(
3754 b'help',
3754 b'help',
3755 [
3755 [
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3759 (
3759 (
3760 b's',
3760 b's',
3761 b'system',
3761 b'system',
3762 [],
3762 [],
3763 _(b'show help for specific platform(s)'),
3763 _(b'show help for specific platform(s)'),
3764 _(b'PLATFORM'),
3764 _(b'PLATFORM'),
3765 ),
3765 ),
3766 ],
3766 ],
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3768 helpcategory=command.CATEGORY_HELP,
3768 helpcategory=command.CATEGORY_HELP,
3769 norepo=True,
3769 norepo=True,
3770 intents={INTENT_READONLY},
3770 intents={INTENT_READONLY},
3771 )
3771 )
3772 def help_(ui, name=None, **opts):
3772 def help_(ui, name=None, **opts):
3773 """show help for a given topic or a help overview
3773 """show help for a given topic or a help overview
3774
3774
3775 With no arguments, print a list of commands with short help messages.
3775 With no arguments, print a list of commands with short help messages.
3776
3776
3777 Given a topic, extension, or command name, print help for that
3777 Given a topic, extension, or command name, print help for that
3778 topic.
3778 topic.
3779
3779
3780 Returns 0 if successful.
3780 Returns 0 if successful.
3781 """
3781 """
3782
3782
3783 keep = opts.get('system') or []
3783 keep = opts.get('system') or []
3784 if len(keep) == 0:
3784 if len(keep) == 0:
3785 if pycompat.sysplatform.startswith(b'win'):
3785 if pycompat.sysplatform.startswith(b'win'):
3786 keep.append(b'windows')
3786 keep.append(b'windows')
3787 elif pycompat.sysplatform == b'OpenVMS':
3787 elif pycompat.sysplatform == b'OpenVMS':
3788 keep.append(b'vms')
3788 keep.append(b'vms')
3789 elif pycompat.sysplatform == b'plan9':
3789 elif pycompat.sysplatform == b'plan9':
3790 keep.append(b'plan9')
3790 keep.append(b'plan9')
3791 else:
3791 else:
3792 keep.append(b'unix')
3792 keep.append(b'unix')
3793 keep.append(pycompat.sysplatform.lower())
3793 keep.append(pycompat.sysplatform.lower())
3794 if ui.verbose:
3794 if ui.verbose:
3795 keep.append(b'verbose')
3795 keep.append(b'verbose')
3796
3796
3797 commands = sys.modules[__name__]
3797 commands = sys.modules[__name__]
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3799 ui.pager(b'help')
3799 ui.pager(b'help')
3800 ui.write(formatted)
3800 ui.write(formatted)
3801
3801
3802
3802
3803 @command(
3803 @command(
3804 b'identify|id',
3804 b'identify|id',
3805 [
3805 [
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3809 (b'b', b'branch', None, _(b'show branch')),
3809 (b'b', b'branch', None, _(b'show branch')),
3810 (b't', b'tags', None, _(b'show tags')),
3810 (b't', b'tags', None, _(b'show tags')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3812 ]
3812 ]
3813 + remoteopts
3813 + remoteopts
3814 + formatteropts,
3814 + formatteropts,
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3817 optionalrepo=True,
3817 optionalrepo=True,
3818 intents={INTENT_READONLY},
3818 intents={INTENT_READONLY},
3819 )
3819 )
3820 def identify(
3820 def identify(
3821 ui,
3821 ui,
3822 repo,
3822 repo,
3823 source=None,
3823 source=None,
3824 rev=None,
3824 rev=None,
3825 num=None,
3825 num=None,
3826 id=None,
3826 id=None,
3827 branch=None,
3827 branch=None,
3828 tags=None,
3828 tags=None,
3829 bookmarks=None,
3829 bookmarks=None,
3830 **opts
3830 **opts
3831 ):
3831 ):
3832 """identify the working directory or specified revision
3832 """identify the working directory or specified revision
3833
3833
3834 Print a summary identifying the repository state at REV using one or
3834 Print a summary identifying the repository state at REV using one or
3835 two parent hash identifiers, followed by a "+" if the working
3835 two parent hash identifiers, followed by a "+" if the working
3836 directory has uncommitted changes, the branch name (if not default),
3836 directory has uncommitted changes, the branch name (if not default),
3837 a list of tags, and a list of bookmarks.
3837 a list of tags, and a list of bookmarks.
3838
3838
3839 When REV is not given, print a summary of the current state of the
3839 When REV is not given, print a summary of the current state of the
3840 repository including the working directory. Specify -r. to get information
3840 repository including the working directory. Specify -r. to get information
3841 of the working directory parent without scanning uncommitted changes.
3841 of the working directory parent without scanning uncommitted changes.
3842
3842
3843 Specifying a path to a repository root or Mercurial bundle will
3843 Specifying a path to a repository root or Mercurial bundle will
3844 cause lookup to operate on that repository/bundle.
3844 cause lookup to operate on that repository/bundle.
3845
3845
3846 .. container:: verbose
3846 .. container:: verbose
3847
3847
3848 Template:
3848 Template:
3849
3849
3850 The following keywords are supported in addition to the common template
3850 The following keywords are supported in addition to the common template
3851 keywords and functions. See also :hg:`help templates`.
3851 keywords and functions. See also :hg:`help templates`.
3852
3852
3853 :dirty: String. Character ``+`` denoting if the working directory has
3853 :dirty: String. Character ``+`` denoting if the working directory has
3854 uncommitted changes.
3854 uncommitted changes.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3856 :parents: List of strings. Parent nodes of the changeset.
3856 :parents: List of strings. Parent nodes of the changeset.
3857
3857
3858 Examples:
3858 Examples:
3859
3859
3860 - generate a build identifier for the working directory::
3860 - generate a build identifier for the working directory::
3861
3861
3862 hg id --id > build-id.dat
3862 hg id --id > build-id.dat
3863
3863
3864 - find the revision corresponding to a tag::
3864 - find the revision corresponding to a tag::
3865
3865
3866 hg id -n -r 1.3
3866 hg id -n -r 1.3
3867
3867
3868 - check the most recent revision of a remote repository::
3868 - check the most recent revision of a remote repository::
3869
3869
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3871
3871
3872 See :hg:`log` for generating more information about specific revisions,
3872 See :hg:`log` for generating more information about specific revisions,
3873 including full hash identifiers.
3873 including full hash identifiers.
3874
3874
3875 Returns 0 if successful.
3875 Returns 0 if successful.
3876 """
3876 """
3877
3877
3878 opts = pycompat.byteskwargs(opts)
3878 opts = pycompat.byteskwargs(opts)
3879 if not repo and not source:
3879 if not repo and not source:
3880 raise error.Abort(
3880 raise error.Abort(
3881 _(b"there is no Mercurial repository here (.hg not found)")
3881 _(b"there is no Mercurial repository here (.hg not found)")
3882 )
3882 )
3883
3883
3884 default = not (num or id or branch or tags or bookmarks)
3884 default = not (num or id or branch or tags or bookmarks)
3885 output = []
3885 output = []
3886 revs = []
3886 revs = []
3887
3887
3888 if source:
3888 if source:
3889 source, branches = hg.parseurl(ui.expandpath(source))
3889 source, branches = hg.parseurl(ui.expandpath(source))
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3891 repo = peer.local()
3891 repo = peer.local()
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3893
3893
3894 fm = ui.formatter(b'identify', opts)
3894 fm = ui.formatter(b'identify', opts)
3895 fm.startitem()
3895 fm.startitem()
3896
3896
3897 if not repo:
3897 if not repo:
3898 if num or branch or tags:
3898 if num or branch or tags:
3899 raise error.Abort(
3899 raise error.Abort(
3900 _(b"can't query remote revision number, branch, or tags")
3900 _(b"can't query remote revision number, branch, or tags")
3901 )
3901 )
3902 if not rev and revs:
3902 if not rev and revs:
3903 rev = revs[0]
3903 rev = revs[0]
3904 if not rev:
3904 if not rev:
3905 rev = b"tip"
3905 rev = b"tip"
3906
3906
3907 remoterev = peer.lookup(rev)
3907 remoterev = peer.lookup(rev)
3908 hexrev = fm.hexfunc(remoterev)
3908 hexrev = fm.hexfunc(remoterev)
3909 if default or id:
3909 if default or id:
3910 output = [hexrev]
3910 output = [hexrev]
3911 fm.data(id=hexrev)
3911 fm.data(id=hexrev)
3912
3912
3913 @util.cachefunc
3913 @util.cachefunc
3914 def getbms():
3914 def getbms():
3915 bms = []
3915 bms = []
3916
3916
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3918 hexremoterev = hex(remoterev)
3918 hexremoterev = hex(remoterev)
3919 bms = [
3919 bms = [
3920 bm
3920 bm
3921 for bm, bmr in pycompat.iteritems(
3921 for bm, bmr in pycompat.iteritems(
3922 peer.listkeys(b'bookmarks')
3922 peer.listkeys(b'bookmarks')
3923 )
3923 )
3924 if bmr == hexremoterev
3924 if bmr == hexremoterev
3925 ]
3925 ]
3926
3926
3927 return sorted(bms)
3927 return sorted(bms)
3928
3928
3929 if fm.isplain():
3929 if fm.isplain():
3930 if bookmarks:
3930 if bookmarks:
3931 output.extend(getbms())
3931 output.extend(getbms())
3932 elif default and not ui.quiet:
3932 elif default and not ui.quiet:
3933 # multiple bookmarks for a single parent separated by '/'
3933 # multiple bookmarks for a single parent separated by '/'
3934 bm = b'/'.join(getbms())
3934 bm = b'/'.join(getbms())
3935 if bm:
3935 if bm:
3936 output.append(bm)
3936 output.append(bm)
3937 else:
3937 else:
3938 fm.data(node=hex(remoterev))
3938 fm.data(node=hex(remoterev))
3939 if bookmarks or b'bookmarks' in fm.datahint():
3939 if bookmarks or b'bookmarks' in fm.datahint():
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3941 else:
3941 else:
3942 if rev:
3942 if rev:
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3944 ctx = scmutil.revsingle(repo, rev, None)
3944 ctx = scmutil.revsingle(repo, rev, None)
3945
3945
3946 if ctx.rev() is None:
3946 if ctx.rev() is None:
3947 ctx = repo[None]
3947 ctx = repo[None]
3948 parents = ctx.parents()
3948 parents = ctx.parents()
3949 taglist = []
3949 taglist = []
3950 for p in parents:
3950 for p in parents:
3951 taglist.extend(p.tags())
3951 taglist.extend(p.tags())
3952
3952
3953 dirty = b""
3953 dirty = b""
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3955 dirty = b'+'
3955 dirty = b'+'
3956 fm.data(dirty=dirty)
3956 fm.data(dirty=dirty)
3957
3957
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3959 if default or id:
3959 if default or id:
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3962
3962
3963 if num:
3963 if num:
3964 numoutput = [b"%d" % p.rev() for p in parents]
3964 numoutput = [b"%d" % p.rev() for p in parents]
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3966
3966
3967 fm.data(
3967 fm.data(
3968 parents=fm.formatlist(
3968 parents=fm.formatlist(
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3970 )
3970 )
3971 )
3971 )
3972 else:
3972 else:
3973 hexoutput = fm.hexfunc(ctx.node())
3973 hexoutput = fm.hexfunc(ctx.node())
3974 if default or id:
3974 if default or id:
3975 output = [hexoutput]
3975 output = [hexoutput]
3976 fm.data(id=hexoutput)
3976 fm.data(id=hexoutput)
3977
3977
3978 if num:
3978 if num:
3979 output.append(pycompat.bytestr(ctx.rev()))
3979 output.append(pycompat.bytestr(ctx.rev()))
3980 taglist = ctx.tags()
3980 taglist = ctx.tags()
3981
3981
3982 if default and not ui.quiet:
3982 if default and not ui.quiet:
3983 b = ctx.branch()
3983 b = ctx.branch()
3984 if b != b'default':
3984 if b != b'default':
3985 output.append(b"(%s)" % b)
3985 output.append(b"(%s)" % b)
3986
3986
3987 # multiple tags for a single parent separated by '/'
3987 # multiple tags for a single parent separated by '/'
3988 t = b'/'.join(taglist)
3988 t = b'/'.join(taglist)
3989 if t:
3989 if t:
3990 output.append(t)
3990 output.append(t)
3991
3991
3992 # multiple bookmarks for a single parent separated by '/'
3992 # multiple bookmarks for a single parent separated by '/'
3993 bm = b'/'.join(ctx.bookmarks())
3993 bm = b'/'.join(ctx.bookmarks())
3994 if bm:
3994 if bm:
3995 output.append(bm)
3995 output.append(bm)
3996 else:
3996 else:
3997 if branch:
3997 if branch:
3998 output.append(ctx.branch())
3998 output.append(ctx.branch())
3999
3999
4000 if tags:
4000 if tags:
4001 output.extend(taglist)
4001 output.extend(taglist)
4002
4002
4003 if bookmarks:
4003 if bookmarks:
4004 output.extend(ctx.bookmarks())
4004 output.extend(ctx.bookmarks())
4005
4005
4006 fm.data(node=ctx.hex())
4006 fm.data(node=ctx.hex())
4007 fm.data(branch=ctx.branch())
4007 fm.data(branch=ctx.branch())
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4010 fm.context(ctx=ctx)
4010 fm.context(ctx=ctx)
4011
4011
4012 fm.plain(b"%s\n" % b' '.join(output))
4012 fm.plain(b"%s\n" % b' '.join(output))
4013 fm.end()
4013 fm.end()
4014
4014
4015
4015
4016 @command(
4016 @command(
4017 b'import|patch',
4017 b'import|patch',
4018 [
4018 [
4019 (
4019 (
4020 b'p',
4020 b'p',
4021 b'strip',
4021 b'strip',
4022 1,
4022 1,
4023 _(
4023 _(
4024 b'directory strip option for patch. This has the same '
4024 b'directory strip option for patch. This has the same '
4025 b'meaning as the corresponding patch option'
4025 b'meaning as the corresponding patch option'
4026 ),
4026 ),
4027 _(b'NUM'),
4027 _(b'NUM'),
4028 ),
4028 ),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4032 (
4032 (
4033 b'f',
4033 b'f',
4034 b'force',
4034 b'force',
4035 None,
4035 None,
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4037 ),
4037 ),
4038 (
4038 (
4039 b'',
4039 b'',
4040 b'no-commit',
4040 b'no-commit',
4041 None,
4041 None,
4042 _(b"don't commit, just update the working directory"),
4042 _(b"don't commit, just update the working directory"),
4043 ),
4043 ),
4044 (
4044 (
4045 b'',
4045 b'',
4046 b'bypass',
4046 b'bypass',
4047 None,
4047 None,
4048 _(b"apply patch without touching the working directory"),
4048 _(b"apply patch without touching the working directory"),
4049 ),
4049 ),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4053 (
4053 (
4054 b'',
4054 b'',
4055 b'import-branch',
4055 b'import-branch',
4056 None,
4056 None,
4057 _(b'use any branch information in patch (implied by --exact)'),
4057 _(b'use any branch information in patch (implied by --exact)'),
4058 ),
4058 ),
4059 ]
4059 ]
4060 + commitopts
4060 + commitopts
4061 + commitopts2
4061 + commitopts2
4062 + similarityopts,
4062 + similarityopts,
4063 _(b'[OPTION]... PATCH...'),
4063 _(b'[OPTION]... PATCH...'),
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4065 )
4065 )
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4067 """import an ordered set of patches
4067 """import an ordered set of patches
4068
4068
4069 Import a list of patches and commit them individually (unless
4069 Import a list of patches and commit them individually (unless
4070 --no-commit is specified).
4070 --no-commit is specified).
4071
4071
4072 To read a patch from standard input (stdin), use "-" as the patch
4072 To read a patch from standard input (stdin), use "-" as the patch
4073 name. If a URL is specified, the patch will be downloaded from
4073 name. If a URL is specified, the patch will be downloaded from
4074 there.
4074 there.
4075
4075
4076 Import first applies changes to the working directory (unless
4076 Import first applies changes to the working directory (unless
4077 --bypass is specified), import will abort if there are outstanding
4077 --bypass is specified), import will abort if there are outstanding
4078 changes.
4078 changes.
4079
4079
4080 Use --bypass to apply and commit patches directly to the
4080 Use --bypass to apply and commit patches directly to the
4081 repository, without affecting the working directory. Without
4081 repository, without affecting the working directory. Without
4082 --exact, patches will be applied on top of the working directory
4082 --exact, patches will be applied on top of the working directory
4083 parent revision.
4083 parent revision.
4084
4084
4085 You can import a patch straight from a mail message. Even patches
4085 You can import a patch straight from a mail message. Even patches
4086 as attachments work (to use the body part, it must have type
4086 as attachments work (to use the body part, it must have type
4087 text/plain or text/x-patch). From and Subject headers of email
4087 text/plain or text/x-patch). From and Subject headers of email
4088 message are used as default committer and commit message. All
4088 message are used as default committer and commit message. All
4089 text/plain body parts before first diff are added to the commit
4089 text/plain body parts before first diff are added to the commit
4090 message.
4090 message.
4091
4091
4092 If the imported patch was generated by :hg:`export`, user and
4092 If the imported patch was generated by :hg:`export`, user and
4093 description from patch override values from message headers and
4093 description from patch override values from message headers and
4094 body. Values given on command line with -m/--message and -u/--user
4094 body. Values given on command line with -m/--message and -u/--user
4095 override these.
4095 override these.
4096
4096
4097 If --exact is specified, import will set the working directory to
4097 If --exact is specified, import will set the working directory to
4098 the parent of each patch before applying it, and will abort if the
4098 the parent of each patch before applying it, and will abort if the
4099 resulting changeset has a different ID than the one recorded in
4099 resulting changeset has a different ID than the one recorded in
4100 the patch. This will guard against various ways that portable
4100 the patch. This will guard against various ways that portable
4101 patch formats and mail systems might fail to transfer Mercurial
4101 patch formats and mail systems might fail to transfer Mercurial
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4103
4103
4104 Use --partial to ensure a changeset will be created from the patch
4104 Use --partial to ensure a changeset will be created from the patch
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4107 by hand before :hg:`commit --amend` is run to update the created
4107 by hand before :hg:`commit --amend` is run to update the created
4108 changeset. This flag exists to let people import patches that
4108 changeset. This flag exists to let people import patches that
4109 partially apply without losing the associated metadata (author,
4109 partially apply without losing the associated metadata (author,
4110 date, description, ...).
4110 date, description, ...).
4111
4111
4112 .. note::
4112 .. note::
4113
4113
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4115 an empty changeset, importing only the patch metadata.
4115 an empty changeset, importing only the patch metadata.
4116
4116
4117 With -s/--similarity, hg will attempt to discover renames and
4117 With -s/--similarity, hg will attempt to discover renames and
4118 copies in the patch in the same way as :hg:`addremove`.
4118 copies in the patch in the same way as :hg:`addremove`.
4119
4119
4120 It is possible to use external patch programs to perform the patch
4120 It is possible to use external patch programs to perform the patch
4121 by setting the ``ui.patch`` configuration option. For the default
4121 by setting the ``ui.patch`` configuration option. For the default
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4123 See :hg:`help config` for more information about configuration
4123 See :hg:`help config` for more information about configuration
4124 files and how to use these options.
4124 files and how to use these options.
4125
4125
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4127
4127
4128 .. container:: verbose
4128 .. container:: verbose
4129
4129
4130 Examples:
4130 Examples:
4131
4131
4132 - import a traditional patch from a website and detect renames::
4132 - import a traditional patch from a website and detect renames::
4133
4133
4134 hg import -s 80 http://example.com/bugfix.patch
4134 hg import -s 80 http://example.com/bugfix.patch
4135
4135
4136 - import a changeset from an hgweb server::
4136 - import a changeset from an hgweb server::
4137
4137
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4139
4139
4140 - import all the patches in an Unix-style mbox::
4140 - import all the patches in an Unix-style mbox::
4141
4141
4142 hg import incoming-patches.mbox
4142 hg import incoming-patches.mbox
4143
4143
4144 - import patches from stdin::
4144 - import patches from stdin::
4145
4145
4146 hg import -
4146 hg import -
4147
4147
4148 - attempt to exactly restore an exported changeset (not always
4148 - attempt to exactly restore an exported changeset (not always
4149 possible)::
4149 possible)::
4150
4150
4151 hg import --exact proposed-fix.patch
4151 hg import --exact proposed-fix.patch
4152
4152
4153 - use an external tool to apply a patch which is too fuzzy for
4153 - use an external tool to apply a patch which is too fuzzy for
4154 the default internal tool.
4154 the default internal tool.
4155
4155
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4157
4157
4158 - change the default fuzzing from 2 to a less strict 7
4158 - change the default fuzzing from 2 to a less strict 7
4159
4159
4160 hg import --config ui.fuzz=7 fuzz.patch
4160 hg import --config ui.fuzz=7 fuzz.patch
4161
4161
4162 Returns 0 on success, 1 on partial success (see --partial).
4162 Returns 0 on success, 1 on partial success (see --partial).
4163 """
4163 """
4164
4164
4165 opts = pycompat.byteskwargs(opts)
4165 opts = pycompat.byteskwargs(opts)
4166 if not patch1:
4166 if not patch1:
4167 raise error.Abort(_(b'need at least one patch to import'))
4167 raise error.Abort(_(b'need at least one patch to import'))
4168
4168
4169 patches = (patch1,) + patches
4169 patches = (patch1,) + patches
4170
4170
4171 date = opts.get(b'date')
4171 date = opts.get(b'date')
4172 if date:
4172 if date:
4173 opts[b'date'] = dateutil.parsedate(date)
4173 opts[b'date'] = dateutil.parsedate(date)
4174
4174
4175 exact = opts.get(b'exact')
4175 exact = opts.get(b'exact')
4176 update = not opts.get(b'bypass')
4176 update = not opts.get(b'bypass')
4177 if not update and opts.get(b'no_commit'):
4177 if not update and opts.get(b'no_commit'):
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4181 try:
4181 try:
4182 sim = float(opts.get(b'similarity') or 0)
4182 sim = float(opts.get(b'similarity') or 0)
4183 except ValueError:
4183 except ValueError:
4184 raise error.Abort(_(b'similarity must be a number'))
4184 raise error.Abort(_(b'similarity must be a number'))
4185 if sim < 0 or sim > 100:
4185 if sim < 0 or sim > 100:
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4187 if sim and not update:
4187 if sim and not update:
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4189 if exact:
4189 if exact:
4190 if opts.get(b'edit'):
4190 if opts.get(b'edit'):
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4192 if opts.get(b'prefix'):
4192 if opts.get(b'prefix'):
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4194
4194
4195 base = opts[b"base"]
4195 base = opts[b"base"]
4196 msgs = []
4196 msgs = []
4197 ret = 0
4197 ret = 0
4198
4198
4199 with repo.wlock():
4199 with repo.wlock():
4200 if update:
4200 if update:
4201 cmdutil.checkunfinished(repo)
4201 cmdutil.checkunfinished(repo)
4202 if exact or not opts.get(b'force'):
4202 if exact or not opts.get(b'force'):
4203 cmdutil.bailifchanged(repo)
4203 cmdutil.bailifchanged(repo)
4204
4204
4205 if not opts.get(b'no_commit'):
4205 if not opts.get(b'no_commit'):
4206 lock = repo.lock
4206 lock = repo.lock
4207 tr = lambda: repo.transaction(b'import')
4207 tr = lambda: repo.transaction(b'import')
4208 dsguard = util.nullcontextmanager
4208 dsguard = util.nullcontextmanager
4209 else:
4209 else:
4210 lock = util.nullcontextmanager
4210 lock = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4213 with lock(), tr(), dsguard():
4213 with lock(), tr(), dsguard():
4214 parents = repo[None].parents()
4214 parents = repo[None].parents()
4215 for patchurl in patches:
4215 for patchurl in patches:
4216 if patchurl == b'-':
4216 if patchurl == b'-':
4217 ui.status(_(b'applying patch from stdin\n'))
4217 ui.status(_(b'applying patch from stdin\n'))
4218 patchfile = ui.fin
4218 patchfile = ui.fin
4219 patchurl = b'stdin' # for error message
4219 patchurl = b'stdin' # for error message
4220 else:
4220 else:
4221 patchurl = os.path.join(base, patchurl)
4221 patchurl = os.path.join(base, patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4224
4224
4225 haspatch = False
4225 haspatch = False
4226 for hunk in patch.split(patchfile):
4226 for hunk in patch.split(patchfile):
4227 with patch.extract(ui, hunk) as patchdata:
4227 with patch.extract(ui, hunk) as patchdata:
4228 msg, node, rej = cmdutil.tryimportone(
4228 msg, node, rej = cmdutil.tryimportone(
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4230 )
4230 )
4231 if msg:
4231 if msg:
4232 haspatch = True
4232 haspatch = True
4233 ui.note(msg + b'\n')
4233 ui.note(msg + b'\n')
4234 if update or exact:
4234 if update or exact:
4235 parents = repo[None].parents()
4235 parents = repo[None].parents()
4236 else:
4236 else:
4237 parents = [repo[node]]
4237 parents = [repo[node]]
4238 if rej:
4238 if rej:
4239 ui.write_err(_(b"patch applied partially\n"))
4239 ui.write_err(_(b"patch applied partially\n"))
4240 ui.write_err(
4240 ui.write_err(
4241 _(
4241 _(
4242 b"(fix the .rej files and run "
4242 b"(fix the .rej files and run "
4243 b"`hg commit --amend`)\n"
4243 b"`hg commit --amend`)\n"
4244 )
4244 )
4245 )
4245 )
4246 ret = 1
4246 ret = 1
4247 break
4247 break
4248
4248
4249 if not haspatch:
4249 if not haspatch:
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4251
4251
4252 if msgs:
4252 if msgs:
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4254 return ret
4254 return ret
4255
4255
4256
4256
4257 @command(
4257 @command(
4258 b'incoming|in',
4258 b'incoming|in',
4259 [
4259 [
4260 (
4260 (
4261 b'f',
4261 b'f',
4262 b'force',
4262 b'force',
4263 None,
4263 None,
4264 _(b'run even if remote repository is unrelated'),
4264 _(b'run even if remote repository is unrelated'),
4265 ),
4265 ),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4268 (
4268 (
4269 b'r',
4269 b'r',
4270 b'rev',
4270 b'rev',
4271 [],
4271 [],
4272 _(b'a remote changeset intended to be added'),
4272 _(b'a remote changeset intended to be added'),
4273 _(b'REV'),
4273 _(b'REV'),
4274 ),
4274 ),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4276 (
4276 (
4277 b'b',
4277 b'b',
4278 b'branch',
4278 b'branch',
4279 [],
4279 [],
4280 _(b'a specific branch you would like to pull'),
4280 _(b'a specific branch you would like to pull'),
4281 _(b'BRANCH'),
4281 _(b'BRANCH'),
4282 ),
4282 ),
4283 ]
4283 ]
4284 + logopts
4284 + logopts
4285 + remoteopts
4285 + remoteopts
4286 + subrepoopts,
4286 + subrepoopts,
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4289 )
4289 )
4290 def incoming(ui, repo, source=b"default", **opts):
4290 def incoming(ui, repo, source=b"default", **opts):
4291 """show new changesets found in source
4291 """show new changesets found in source
4292
4292
4293 Show new changesets found in the specified path/URL or the default
4293 Show new changesets found in the specified path/URL or the default
4294 pull location. These are the changesets that would have been pulled
4294 pull location. These are the changesets that would have been pulled
4295 by :hg:`pull` at the time you issued this command.
4295 by :hg:`pull` at the time you issued this command.
4296
4296
4297 See pull for valid source format details.
4297 See pull for valid source format details.
4298
4298
4299 .. container:: verbose
4299 .. container:: verbose
4300
4300
4301 With -B/--bookmarks, the result of bookmark comparison between
4301 With -B/--bookmarks, the result of bookmark comparison between
4302 local and remote repositories is displayed. With -v/--verbose,
4302 local and remote repositories is displayed. With -v/--verbose,
4303 status is also displayed for each bookmark like below::
4303 status is also displayed for each bookmark like below::
4304
4304
4305 BM1 01234567890a added
4305 BM1 01234567890a added
4306 BM2 1234567890ab advanced
4306 BM2 1234567890ab advanced
4307 BM3 234567890abc diverged
4307 BM3 234567890abc diverged
4308 BM4 34567890abcd changed
4308 BM4 34567890abcd changed
4309
4309
4310 The action taken locally when pulling depends on the
4310 The action taken locally when pulling depends on the
4311 status of each bookmark:
4311 status of each bookmark:
4312
4312
4313 :``added``: pull will create it
4313 :``added``: pull will create it
4314 :``advanced``: pull will update it
4314 :``advanced``: pull will update it
4315 :``diverged``: pull will create a divergent bookmark
4315 :``diverged``: pull will create a divergent bookmark
4316 :``changed``: result depends on remote changesets
4316 :``changed``: result depends on remote changesets
4317
4317
4318 From the point of view of pulling behavior, bookmark
4318 From the point of view of pulling behavior, bookmark
4319 existing only in the remote repository are treated as ``added``,
4319 existing only in the remote repository are treated as ``added``,
4320 even if it is in fact locally deleted.
4320 even if it is in fact locally deleted.
4321
4321
4322 .. container:: verbose
4322 .. container:: verbose
4323
4323
4324 For remote repository, using --bundle avoids downloading the
4324 For remote repository, using --bundle avoids downloading the
4325 changesets twice if the incoming is followed by a pull.
4325 changesets twice if the incoming is followed by a pull.
4326
4326
4327 Examples:
4327 Examples:
4328
4328
4329 - show incoming changes with patches and full description::
4329 - show incoming changes with patches and full description::
4330
4330
4331 hg incoming -vp
4331 hg incoming -vp
4332
4332
4333 - show incoming changes excluding merges, store a bundle::
4333 - show incoming changes excluding merges, store a bundle::
4334
4334
4335 hg in -vpM --bundle incoming.hg
4335 hg in -vpM --bundle incoming.hg
4336 hg pull incoming.hg
4336 hg pull incoming.hg
4337
4337
4338 - briefly list changes inside a bundle::
4338 - briefly list changes inside a bundle::
4339
4339
4340 hg in changes.hg -T "{desc|firstline}\\n"
4340 hg in changes.hg -T "{desc|firstline}\\n"
4341
4341
4342 Returns 0 if there are incoming changes, 1 otherwise.
4342 Returns 0 if there are incoming changes, 1 otherwise.
4343 """
4343 """
4344 opts = pycompat.byteskwargs(opts)
4344 opts = pycompat.byteskwargs(opts)
4345 if opts.get(b'graph'):
4345 if opts.get(b'graph'):
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4347
4347
4348 def display(other, chlist, displayer):
4348 def display(other, chlist, displayer):
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4350 logcmdutil.displaygraph(
4350 logcmdutil.displaygraph(
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4352 )
4352 )
4353
4353
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4355 return 0
4355 return 0
4356
4356
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4359
4359
4360 if opts.get(b'bookmarks'):
4360 if opts.get(b'bookmarks'):
4361 source, branches = hg.parseurl(
4361 source, branches = hg.parseurl(
4362 ui.expandpath(source), opts.get(b'branch')
4362 ui.expandpath(source), opts.get(b'branch')
4363 )
4363 )
4364 other = hg.peer(repo, opts, source)
4364 other = hg.peer(repo, opts, source)
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4367 return 0
4367 return 0
4368 ui.pager(b'incoming')
4368 ui.pager(b'incoming')
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4370 return bookmarks.incoming(ui, repo, other)
4370 return bookmarks.incoming(ui, repo, other)
4371
4371
4372 repo._subtoppath = ui.expandpath(source)
4372 repo._subtoppath = ui.expandpath(source)
4373 try:
4373 try:
4374 return hg.incoming(ui, repo, source, opts)
4374 return hg.incoming(ui, repo, source, opts)
4375 finally:
4375 finally:
4376 del repo._subtoppath
4376 del repo._subtoppath
4377
4377
4378
4378
4379 @command(
4379 @command(
4380 b'init',
4380 b'init',
4381 remoteopts,
4381 remoteopts,
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4384 helpbasic=True,
4384 helpbasic=True,
4385 norepo=True,
4385 norepo=True,
4386 )
4386 )
4387 def init(ui, dest=b".", **opts):
4387 def init(ui, dest=b".", **opts):
4388 """create a new repository in the given directory
4388 """create a new repository in the given directory
4389
4389
4390 Initialize a new repository in the given directory. If the given
4390 Initialize a new repository in the given directory. If the given
4391 directory does not exist, it will be created.
4391 directory does not exist, it will be created.
4392
4392
4393 If no directory is given, the current directory is used.
4393 If no directory is given, the current directory is used.
4394
4394
4395 It is possible to specify an ``ssh://`` URL as the destination.
4395 It is possible to specify an ``ssh://`` URL as the destination.
4396 See :hg:`help urls` for more information.
4396 See :hg:`help urls` for more information.
4397
4397
4398 Returns 0 on success.
4398 Returns 0 on success.
4399 """
4399 """
4400 opts = pycompat.byteskwargs(opts)
4400 opts = pycompat.byteskwargs(opts)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4402
4402
4403
4403
4404 @command(
4404 @command(
4405 b'locate',
4405 b'locate',
4406 [
4406 [
4407 (
4407 (
4408 b'r',
4408 b'r',
4409 b'rev',
4409 b'rev',
4410 b'',
4410 b'',
4411 _(b'search the repository as it is in REV'),
4411 _(b'search the repository as it is in REV'),
4412 _(b'REV'),
4412 _(b'REV'),
4413 ),
4413 ),
4414 (
4414 (
4415 b'0',
4415 b'0',
4416 b'print0',
4416 b'print0',
4417 None,
4417 None,
4418 _(b'end filenames with NUL, for use with xargs'),
4418 _(b'end filenames with NUL, for use with xargs'),
4419 ),
4419 ),
4420 (
4420 (
4421 b'f',
4421 b'f',
4422 b'fullpath',
4422 b'fullpath',
4423 None,
4423 None,
4424 _(b'print complete paths from the filesystem root'),
4424 _(b'print complete paths from the filesystem root'),
4425 ),
4425 ),
4426 ]
4426 ]
4427 + walkopts,
4427 + walkopts,
4428 _(b'[OPTION]... [PATTERN]...'),
4428 _(b'[OPTION]... [PATTERN]...'),
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4430 )
4430 )
4431 def locate(ui, repo, *pats, **opts):
4431 def locate(ui, repo, *pats, **opts):
4432 """locate files matching specific patterns (DEPRECATED)
4432 """locate files matching specific patterns (DEPRECATED)
4433
4433
4434 Print files under Mercurial control in the working directory whose
4434 Print files under Mercurial control in the working directory whose
4435 names match the given patterns.
4435 names match the given patterns.
4436
4436
4437 By default, this command searches all directories in the working
4437 By default, this command searches all directories in the working
4438 directory. To search just the current directory and its
4438 directory. To search just the current directory and its
4439 subdirectories, use "--include .".
4439 subdirectories, use "--include .".
4440
4440
4441 If no patterns are given to match, this command prints the names
4441 If no patterns are given to match, this command prints the names
4442 of all files under Mercurial control in the working directory.
4442 of all files under Mercurial control in the working directory.
4443
4443
4444 If you want to feed the output of this command into the "xargs"
4444 If you want to feed the output of this command into the "xargs"
4445 command, use the -0 option to both this command and "xargs". This
4445 command, use the -0 option to both this command and "xargs". This
4446 will avoid the problem of "xargs" treating single filenames that
4446 will avoid the problem of "xargs" treating single filenames that
4447 contain whitespace as multiple filenames.
4447 contain whitespace as multiple filenames.
4448
4448
4449 See :hg:`help files` for a more versatile command.
4449 See :hg:`help files` for a more versatile command.
4450
4450
4451 Returns 0 if a match is found, 1 otherwise.
4451 Returns 0 if a match is found, 1 otherwise.
4452 """
4452 """
4453 opts = pycompat.byteskwargs(opts)
4453 opts = pycompat.byteskwargs(opts)
4454 if opts.get(b'print0'):
4454 if opts.get(b'print0'):
4455 end = b'\0'
4455 end = b'\0'
4456 else:
4456 else:
4457 end = b'\n'
4457 end = b'\n'
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4459
4459
4460 ret = 1
4460 ret = 1
4461 m = scmutil.match(
4461 m = scmutil.match(
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4463 )
4463 )
4464
4464
4465 ui.pager(b'locate')
4465 ui.pager(b'locate')
4466 if ctx.rev() is None:
4466 if ctx.rev() is None:
4467 # When run on the working copy, "locate" includes removed files, so
4467 # When run on the working copy, "locate" includes removed files, so
4468 # we get the list of files from the dirstate.
4468 # we get the list of files from the dirstate.
4469 filesgen = sorted(repo.dirstate.matches(m))
4469 filesgen = sorted(repo.dirstate.matches(m))
4470 else:
4470 else:
4471 filesgen = ctx.matches(m)
4471 filesgen = ctx.matches(m)
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4473 for abs in filesgen:
4473 for abs in filesgen:
4474 if opts.get(b'fullpath'):
4474 if opts.get(b'fullpath'):
4475 ui.write(repo.wjoin(abs), end)
4475 ui.write(repo.wjoin(abs), end)
4476 else:
4476 else:
4477 ui.write(uipathfn(abs), end)
4477 ui.write(uipathfn(abs), end)
4478 ret = 0
4478 ret = 0
4479
4479
4480 return ret
4480 return ret
4481
4481
4482
4482
4483 @command(
4483 @command(
4484 b'log|history',
4484 b'log|history',
4485 [
4485 [
4486 (
4486 (
4487 b'f',
4487 b'f',
4488 b'follow',
4488 b'follow',
4489 None,
4489 None,
4490 _(
4490 _(
4491 b'follow changeset history, or file history across copies and renames'
4491 b'follow changeset history, or file history across copies and renames'
4492 ),
4492 ),
4493 ),
4493 ),
4494 (
4494 (
4495 b'',
4495 b'',
4496 b'follow-first',
4496 b'follow-first',
4497 None,
4497 None,
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4499 ),
4499 ),
4500 (
4500 (
4501 b'd',
4501 b'd',
4502 b'date',
4502 b'date',
4503 b'',
4503 b'',
4504 _(b'show revisions matching date spec'),
4504 _(b'show revisions matching date spec'),
4505 _(b'DATE'),
4505 _(b'DATE'),
4506 ),
4506 ),
4507 (b'C', b'copies', None, _(b'show copied files')),
4507 (b'C', b'copies', None, _(b'show copied files')),
4508 (
4508 (
4509 b'k',
4509 b'k',
4510 b'keyword',
4510 b'keyword',
4511 [],
4511 [],
4512 _(b'do case-insensitive search for a given text'),
4512 _(b'do case-insensitive search for a given text'),
4513 _(b'TEXT'),
4513 _(b'TEXT'),
4514 ),
4514 ),
4515 (
4515 (
4516 b'r',
4516 b'r',
4517 b'rev',
4517 b'rev',
4518 [],
4518 [],
4519 _(b'show the specified revision or revset'),
4519 _(b'show the specified revision or revset'),
4520 _(b'REV'),
4520 _(b'REV'),
4521 ),
4521 ),
4522 (
4522 (
4523 b'L',
4523 b'L',
4524 b'line-range',
4524 b'line-range',
4525 [],
4525 [],
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4527 _(b'FILE,RANGE'),
4527 _(b'FILE,RANGE'),
4528 ),
4528 ),
4529 (
4529 (
4530 b'',
4530 b'',
4531 b'removed',
4531 b'removed',
4532 None,
4532 None,
4533 _(b'include revisions where files were removed'),
4533 _(b'include revisions where files were removed'),
4534 ),
4534 ),
4535 (
4535 (
4536 b'm',
4536 b'm',
4537 b'only-merges',
4537 b'only-merges',
4538 None,
4538 None,
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4540 ),
4540 ),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4542 (
4542 (
4543 b'',
4543 b'',
4544 b'only-branch',
4544 b'only-branch',
4545 [],
4545 [],
4546 _(
4546 _(
4547 b'show only changesets within the given named branch (DEPRECATED)'
4547 b'show only changesets within the given named branch (DEPRECATED)'
4548 ),
4548 ),
4549 _(b'BRANCH'),
4549 _(b'BRANCH'),
4550 ),
4550 ),
4551 (
4551 (
4552 b'b',
4552 b'b',
4553 b'branch',
4553 b'branch',
4554 [],
4554 [],
4555 _(b'show changesets within the given named branch'),
4555 _(b'show changesets within the given named branch'),
4556 _(b'BRANCH'),
4556 _(b'BRANCH'),
4557 ),
4557 ),
4558 (
4558 (
4559 b'P',
4559 b'P',
4560 b'prune',
4560 b'prune',
4561 [],
4561 [],
4562 _(b'do not display revision or any of its ancestors'),
4562 _(b'do not display revision or any of its ancestors'),
4563 _(b'REV'),
4563 _(b'REV'),
4564 ),
4564 ),
4565 ]
4565 ]
4566 + logopts
4566 + logopts
4567 + walkopts,
4567 + walkopts,
4568 _(b'[OPTION]... [FILE]'),
4568 _(b'[OPTION]... [FILE]'),
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4570 helpbasic=True,
4570 helpbasic=True,
4571 inferrepo=True,
4571 inferrepo=True,
4572 intents={INTENT_READONLY},
4572 intents={INTENT_READONLY},
4573 )
4573 )
4574 def log(ui, repo, *pats, **opts):
4574 def log(ui, repo, *pats, **opts):
4575 """show revision history of entire repository or files
4575 """show revision history of entire repository or files
4576
4576
4577 Print the revision history of the specified files or the entire
4577 Print the revision history of the specified files or the entire
4578 project.
4578 project.
4579
4579
4580 If no revision range is specified, the default is ``tip:0`` unless
4580 If no revision range is specified, the default is ``tip:0`` unless
4581 --follow is set, in which case the working directory parent is
4581 --follow is set, in which case the working directory parent is
4582 used as the starting revision.
4582 used as the starting revision.
4583
4583
4584 File history is shown without following rename or copy history of
4584 File history is shown without following rename or copy history of
4585 files. Use -f/--follow with a filename to follow history across
4585 files. Use -f/--follow with a filename to follow history across
4586 renames and copies. --follow without a filename will only show
4586 renames and copies. --follow without a filename will only show
4587 ancestors of the starting revision.
4587 ancestors of the starting revision.
4588
4588
4589 By default this command prints revision number and changeset id,
4589 By default this command prints revision number and changeset id,
4590 tags, non-trivial parents, user, date and time, and a summary for
4590 tags, non-trivial parents, user, date and time, and a summary for
4591 each commit. When the -v/--verbose switch is used, the list of
4591 each commit. When the -v/--verbose switch is used, the list of
4592 changed files and full commit message are shown.
4592 changed files and full commit message are shown.
4593
4593
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4595 recent changeset at the top.
4595 recent changeset at the top.
4596 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4596 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4597 involved in an unresolved merge conflict, '_' closes a branch,
4597 involved in an unresolved merge conflict, '_' closes a branch,
4598 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4598 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4599 changeset from the lines below is a parent of the 'o' merge on the same
4599 changeset from the lines below is a parent of the 'o' merge on the same
4600 line.
4600 line.
4601 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4601 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4602 of a '|' indicates one or more revisions in a path are omitted.
4602 of a '|' indicates one or more revisions in a path are omitted.
4603
4603
4604 .. container:: verbose
4604 .. container:: verbose
4605
4605
4606 Use -L/--line-range FILE,M:N options to follow the history of lines
4606 Use -L/--line-range FILE,M:N options to follow the history of lines
4607 from M to N in FILE. With -p/--patch only diff hunks affecting
4607 from M to N in FILE. With -p/--patch only diff hunks affecting
4608 specified line range will be shown. This option requires --follow;
4608 specified line range will be shown. This option requires --follow;
4609 it can be specified multiple times. Currently, this option is not
4609 it can be specified multiple times. Currently, this option is not
4610 compatible with --graph. This option is experimental.
4610 compatible with --graph. This option is experimental.
4611
4611
4612 .. note::
4612 .. note::
4613
4613
4614 :hg:`log --patch` may generate unexpected diff output for merge
4614 :hg:`log --patch` may generate unexpected diff output for merge
4615 changesets, as it will only compare the merge changeset against
4615 changesets, as it will only compare the merge changeset against
4616 its first parent. Also, only files different from BOTH parents
4616 its first parent. Also, only files different from BOTH parents
4617 will appear in files:.
4617 will appear in files:.
4618
4618
4619 .. note::
4619 .. note::
4620
4620
4621 For performance reasons, :hg:`log FILE` may omit duplicate changes
4621 For performance reasons, :hg:`log FILE` may omit duplicate changes
4622 made on branches and will not show removals or mode changes. To
4622 made on branches and will not show removals or mode changes. To
4623 see all such changes, use the --removed switch.
4623 see all such changes, use the --removed switch.
4624
4624
4625 .. container:: verbose
4625 .. container:: verbose
4626
4626
4627 .. note::
4627 .. note::
4628
4628
4629 The history resulting from -L/--line-range options depends on diff
4629 The history resulting from -L/--line-range options depends on diff
4630 options; for instance if white-spaces are ignored, respective changes
4630 options; for instance if white-spaces are ignored, respective changes
4631 with only white-spaces in specified line range will not be listed.
4631 with only white-spaces in specified line range will not be listed.
4632
4632
4633 .. container:: verbose
4633 .. container:: verbose
4634
4634
4635 Some examples:
4635 Some examples:
4636
4636
4637 - changesets with full descriptions and file lists::
4637 - changesets with full descriptions and file lists::
4638
4638
4639 hg log -v
4639 hg log -v
4640
4640
4641 - changesets ancestral to the working directory::
4641 - changesets ancestral to the working directory::
4642
4642
4643 hg log -f
4643 hg log -f
4644
4644
4645 - last 10 commits on the current branch::
4645 - last 10 commits on the current branch::
4646
4646
4647 hg log -l 10 -b .
4647 hg log -l 10 -b .
4648
4648
4649 - changesets showing all modifications of a file, including removals::
4649 - changesets showing all modifications of a file, including removals::
4650
4650
4651 hg log --removed file.c
4651 hg log --removed file.c
4652
4652
4653 - all changesets that touch a directory, with diffs, excluding merges::
4653 - all changesets that touch a directory, with diffs, excluding merges::
4654
4654
4655 hg log -Mp lib/
4655 hg log -Mp lib/
4656
4656
4657 - all revision numbers that match a keyword::
4657 - all revision numbers that match a keyword::
4658
4658
4659 hg log -k bug --template "{rev}\\n"
4659 hg log -k bug --template "{rev}\\n"
4660
4660
4661 - the full hash identifier of the working directory parent::
4661 - the full hash identifier of the working directory parent::
4662
4662
4663 hg log -r . --template "{node}\\n"
4663 hg log -r . --template "{node}\\n"
4664
4664
4665 - list available log templates::
4665 - list available log templates::
4666
4666
4667 hg log -T list
4667 hg log -T list
4668
4668
4669 - check if a given changeset is included in a tagged release::
4669 - check if a given changeset is included in a tagged release::
4670
4670
4671 hg log -r "a21ccf and ancestor(1.9)"
4671 hg log -r "a21ccf and ancestor(1.9)"
4672
4672
4673 - find all changesets by some user in a date range::
4673 - find all changesets by some user in a date range::
4674
4674
4675 hg log -k alice -d "may 2008 to jul 2008"
4675 hg log -k alice -d "may 2008 to jul 2008"
4676
4676
4677 - summary of all changesets after the last tag::
4677 - summary of all changesets after the last tag::
4678
4678
4679 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4679 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4680
4680
4681 - changesets touching lines 13 to 23 for file.c::
4681 - changesets touching lines 13 to 23 for file.c::
4682
4682
4683 hg log -L file.c,13:23
4683 hg log -L file.c,13:23
4684
4684
4685 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4685 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4686 main.c with patch::
4686 main.c with patch::
4687
4687
4688 hg log -L file.c,13:23 -L main.c,2:6 -p
4688 hg log -L file.c,13:23 -L main.c,2:6 -p
4689
4689
4690 See :hg:`help dates` for a list of formats valid for -d/--date.
4690 See :hg:`help dates` for a list of formats valid for -d/--date.
4691
4691
4692 See :hg:`help revisions` for more about specifying and ordering
4692 See :hg:`help revisions` for more about specifying and ordering
4693 revisions.
4693 revisions.
4694
4694
4695 See :hg:`help templates` for more about pre-packaged styles and
4695 See :hg:`help templates` for more about pre-packaged styles and
4696 specifying custom templates. The default template used by the log
4696 specifying custom templates. The default template used by the log
4697 command can be customized via the ``ui.logtemplate`` configuration
4697 command can be customized via the ``ui.logtemplate`` configuration
4698 setting.
4698 setting.
4699
4699
4700 Returns 0 on success.
4700 Returns 0 on success.
4701
4701
4702 """
4702 """
4703 opts = pycompat.byteskwargs(opts)
4703 opts = pycompat.byteskwargs(opts)
4704 linerange = opts.get(b'line_range')
4704 linerange = opts.get(b'line_range')
4705
4705
4706 if linerange and not opts.get(b'follow'):
4706 if linerange and not opts.get(b'follow'):
4707 raise error.Abort(_(b'--line-range requires --follow'))
4707 raise error.Abort(_(b'--line-range requires --follow'))
4708
4708
4709 if linerange and pats:
4709 if linerange and pats:
4710 # TODO: take pats as patterns with no line-range filter
4710 # TODO: take pats as patterns with no line-range filter
4711 raise error.Abort(
4711 raise error.Abort(
4712 _(b'FILE arguments are not compatible with --line-range option')
4712 _(b'FILE arguments are not compatible with --line-range option')
4713 )
4713 )
4714
4714
4715 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4715 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4716 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4716 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4717 if linerange:
4717 if linerange:
4718 # TODO: should follow file history from logcmdutil._initialrevs(),
4718 # TODO: should follow file history from logcmdutil._initialrevs(),
4719 # then filter the result by logcmdutil._makerevset() and --limit
4719 # then filter the result by logcmdutil._makerevset() and --limit
4720 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4720 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4721
4721
4722 getcopies = None
4722 getcopies = None
4723 if opts.get(b'copies'):
4723 if opts.get(b'copies'):
4724 endrev = None
4724 endrev = None
4725 if revs:
4725 if revs:
4726 endrev = revs.max() + 1
4726 endrev = revs.max() + 1
4727 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4727 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4728
4728
4729 ui.pager(b'log')
4729 ui.pager(b'log')
4730 displayer = logcmdutil.changesetdisplayer(
4730 displayer = logcmdutil.changesetdisplayer(
4731 ui, repo, opts, differ, buffered=True
4731 ui, repo, opts, differ, buffered=True
4732 )
4732 )
4733 if opts.get(b'graph'):
4733 if opts.get(b'graph'):
4734 displayfn = logcmdutil.displaygraphrevs
4734 displayfn = logcmdutil.displaygraphrevs
4735 else:
4735 else:
4736 displayfn = logcmdutil.displayrevs
4736 displayfn = logcmdutil.displayrevs
4737 displayfn(ui, repo, revs, displayer, getcopies)
4737 displayfn(ui, repo, revs, displayer, getcopies)
4738
4738
4739
4739
4740 @command(
4740 @command(
4741 b'manifest',
4741 b'manifest',
4742 [
4742 [
4743 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4743 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4744 (b'', b'all', False, _(b"list files from all revisions")),
4744 (b'', b'all', False, _(b"list files from all revisions")),
4745 ]
4745 ]
4746 + formatteropts,
4746 + formatteropts,
4747 _(b'[-r REV]'),
4747 _(b'[-r REV]'),
4748 helpcategory=command.CATEGORY_MAINTENANCE,
4748 helpcategory=command.CATEGORY_MAINTENANCE,
4749 intents={INTENT_READONLY},
4749 intents={INTENT_READONLY},
4750 )
4750 )
4751 def manifest(ui, repo, node=None, rev=None, **opts):
4751 def manifest(ui, repo, node=None, rev=None, **opts):
4752 """output the current or given revision of the project manifest
4752 """output the current or given revision of the project manifest
4753
4753
4754 Print a list of version controlled files for the given revision.
4754 Print a list of version controlled files for the given revision.
4755 If no revision is given, the first parent of the working directory
4755 If no revision is given, the first parent of the working directory
4756 is used, or the null revision if no revision is checked out.
4756 is used, or the null revision if no revision is checked out.
4757
4757
4758 With -v, print file permissions, symlink and executable bits.
4758 With -v, print file permissions, symlink and executable bits.
4759 With --debug, print file revision hashes.
4759 With --debug, print file revision hashes.
4760
4760
4761 If option --all is specified, the list of all files from all revisions
4761 If option --all is specified, the list of all files from all revisions
4762 is printed. This includes deleted and renamed files.
4762 is printed. This includes deleted and renamed files.
4763
4763
4764 Returns 0 on success.
4764 Returns 0 on success.
4765 """
4765 """
4766 opts = pycompat.byteskwargs(opts)
4766 opts = pycompat.byteskwargs(opts)
4767 fm = ui.formatter(b'manifest', opts)
4767 fm = ui.formatter(b'manifest', opts)
4768
4768
4769 if opts.get(b'all'):
4769 if opts.get(b'all'):
4770 if rev or node:
4770 if rev or node:
4771 raise error.Abort(_(b"can't specify a revision with --all"))
4771 raise error.Abort(_(b"can't specify a revision with --all"))
4772
4772
4773 res = set()
4773 res = set()
4774 for rev in repo:
4774 for rev in repo:
4775 ctx = repo[rev]
4775 ctx = repo[rev]
4776 res |= set(ctx.files())
4776 res |= set(ctx.files())
4777
4777
4778 ui.pager(b'manifest')
4778 ui.pager(b'manifest')
4779 for f in sorted(res):
4779 for f in sorted(res):
4780 fm.startitem()
4780 fm.startitem()
4781 fm.write(b"path", b'%s\n', f)
4781 fm.write(b"path", b'%s\n', f)
4782 fm.end()
4782 fm.end()
4783 return
4783 return
4784
4784
4785 if rev and node:
4785 if rev and node:
4786 raise error.Abort(_(b"please specify just one revision"))
4786 raise error.Abort(_(b"please specify just one revision"))
4787
4787
4788 if not node:
4788 if not node:
4789 node = rev
4789 node = rev
4790
4790
4791 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4791 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4792 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4792 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4793 if node:
4793 if node:
4794 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4794 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4795 ctx = scmutil.revsingle(repo, node)
4795 ctx = scmutil.revsingle(repo, node)
4796 mf = ctx.manifest()
4796 mf = ctx.manifest()
4797 ui.pager(b'manifest')
4797 ui.pager(b'manifest')
4798 for f in ctx:
4798 for f in ctx:
4799 fm.startitem()
4799 fm.startitem()
4800 fm.context(ctx=ctx)
4800 fm.context(ctx=ctx)
4801 fl = ctx[f].flags()
4801 fl = ctx[f].flags()
4802 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4802 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4803 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4803 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4804 fm.write(b'path', b'%s\n', f)
4804 fm.write(b'path', b'%s\n', f)
4805 fm.end()
4805 fm.end()
4806
4806
4807
4807
4808 @command(
4808 @command(
4809 b'merge',
4809 b'merge',
4810 [
4810 [
4811 (
4811 (
4812 b'f',
4812 b'f',
4813 b'force',
4813 b'force',
4814 None,
4814 None,
4815 _(b'force a merge including outstanding changes (DEPRECATED)'),
4815 _(b'force a merge including outstanding changes (DEPRECATED)'),
4816 ),
4816 ),
4817 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4817 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4818 (
4818 (
4819 b'P',
4819 b'P',
4820 b'preview',
4820 b'preview',
4821 None,
4821 None,
4822 _(b'review revisions to merge (no merge is performed)'),
4822 _(b'review revisions to merge (no merge is performed)'),
4823 ),
4823 ),
4824 (b'', b'abort', None, _(b'abort the ongoing merge')),
4824 (b'', b'abort', None, _(b'abort the ongoing merge')),
4825 ]
4825 ]
4826 + mergetoolopts,
4826 + mergetoolopts,
4827 _(b'[-P] [[-r] REV]'),
4827 _(b'[-P] [[-r] REV]'),
4828 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4828 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4829 helpbasic=True,
4829 helpbasic=True,
4830 )
4830 )
4831 def merge(ui, repo, node=None, **opts):
4831 def merge(ui, repo, node=None, **opts):
4832 """merge another revision into working directory
4832 """merge another revision into working directory
4833
4833
4834 The current working directory is updated with all changes made in
4834 The current working directory is updated with all changes made in
4835 the requested revision since the last common predecessor revision.
4835 the requested revision since the last common predecessor revision.
4836
4836
4837 Files that changed between either parent are marked as changed for
4837 Files that changed between either parent are marked as changed for
4838 the next commit and a commit must be performed before any further
4838 the next commit and a commit must be performed before any further
4839 updates to the repository are allowed. The next commit will have
4839 updates to the repository are allowed. The next commit will have
4840 two parents.
4840 two parents.
4841
4841
4842 ``--tool`` can be used to specify the merge tool used for file
4842 ``--tool`` can be used to specify the merge tool used for file
4843 merges. It overrides the HGMERGE environment variable and your
4843 merges. It overrides the HGMERGE environment variable and your
4844 configuration files. See :hg:`help merge-tools` for options.
4844 configuration files. See :hg:`help merge-tools` for options.
4845
4845
4846 If no revision is specified, the working directory's parent is a
4846 If no revision is specified, the working directory's parent is a
4847 head revision, and the current branch contains exactly one other
4847 head revision, and the current branch contains exactly one other
4848 head, the other head is merged with by default. Otherwise, an
4848 head, the other head is merged with by default. Otherwise, an
4849 explicit revision with which to merge must be provided.
4849 explicit revision with which to merge must be provided.
4850
4850
4851 See :hg:`help resolve` for information on handling file conflicts.
4851 See :hg:`help resolve` for information on handling file conflicts.
4852
4852
4853 To undo an uncommitted merge, use :hg:`merge --abort` which
4853 To undo an uncommitted merge, use :hg:`merge --abort` which
4854 will check out a clean copy of the original merge parent, losing
4854 will check out a clean copy of the original merge parent, losing
4855 all changes.
4855 all changes.
4856
4856
4857 Returns 0 on success, 1 if there are unresolved files.
4857 Returns 0 on success, 1 if there are unresolved files.
4858 """
4858 """
4859
4859
4860 opts = pycompat.byteskwargs(opts)
4860 opts = pycompat.byteskwargs(opts)
4861 abort = opts.get(b'abort')
4861 abort = opts.get(b'abort')
4862 if abort and repo.dirstate.p2() == nullid:
4862 if abort and repo.dirstate.p2() == nullid:
4863 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4863 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4864 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4864 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4865 if abort:
4865 if abort:
4866 state = cmdutil.getunfinishedstate(repo)
4866 state = cmdutil.getunfinishedstate(repo)
4867 if state and state._opname != b'merge':
4867 if state and state._opname != b'merge':
4868 raise error.Abort(
4868 raise error.Abort(
4869 _(b'cannot abort merge with %s in progress') % (state._opname),
4869 _(b'cannot abort merge with %s in progress') % (state._opname),
4870 hint=state.hint(),
4870 hint=state.hint(),
4871 )
4871 )
4872 if node:
4872 if node:
4873 raise error.Abort(_(b"cannot specify a node with --abort"))
4873 raise error.Abort(_(b"cannot specify a node with --abort"))
4874 return hg.abortmerge(repo.ui, repo)
4874 return hg.abortmerge(repo.ui, repo)
4875
4875
4876 if opts.get(b'rev') and node:
4876 if opts.get(b'rev') and node:
4877 raise error.Abort(_(b"please specify just one revision"))
4877 raise error.Abort(_(b"please specify just one revision"))
4878 if not node:
4878 if not node:
4879 node = opts.get(b'rev')
4879 node = opts.get(b'rev')
4880
4880
4881 if node:
4881 if node:
4882 ctx = scmutil.revsingle(repo, node)
4882 ctx = scmutil.revsingle(repo, node)
4883 else:
4883 else:
4884 if ui.configbool(b'commands', b'merge.require-rev'):
4884 if ui.configbool(b'commands', b'merge.require-rev'):
4885 raise error.Abort(
4885 raise error.Abort(
4886 _(
4886 _(
4887 b'configuration requires specifying revision to merge '
4887 b'configuration requires specifying revision to merge '
4888 b'with'
4888 b'with'
4889 )
4889 )
4890 )
4890 )
4891 ctx = repo[destutil.destmerge(repo)]
4891 ctx = repo[destutil.destmerge(repo)]
4892
4892
4893 if ctx.node() is None:
4893 if ctx.node() is None:
4894 raise error.Abort(_(b'merging with the working copy has no effect'))
4894 raise error.Abort(_(b'merging with the working copy has no effect'))
4895
4895
4896 if opts.get(b'preview'):
4896 if opts.get(b'preview'):
4897 # find nodes that are ancestors of p2 but not of p1
4897 # find nodes that are ancestors of p2 but not of p1
4898 p1 = repo[b'.'].node()
4898 p1 = repo[b'.'].node()
4899 p2 = ctx.node()
4899 p2 = ctx.node()
4900 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4900 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4901
4901
4902 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4902 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4903 for node in nodes:
4903 for node in nodes:
4904 displayer.show(repo[node])
4904 displayer.show(repo[node])
4905 displayer.close()
4905 displayer.close()
4906 return 0
4906 return 0
4907
4907
4908 # ui.forcemerge is an internal variable, do not document
4908 # ui.forcemerge is an internal variable, do not document
4909 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4909 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4910 with ui.configoverride(overrides, b'merge'):
4910 with ui.configoverride(overrides, b'merge'):
4911 force = opts.get(b'force')
4911 force = opts.get(b'force')
4912 labels = [b'working copy', b'merge rev']
4912 labels = [b'working copy', b'merge rev']
4913 return hg.merge(ctx, force=force, labels=labels)
4913 return hg.merge(ctx, force=force, labels=labels)
4914
4914
4915
4915
4916 statemod.addunfinished(
4916 statemod.addunfinished(
4917 b'merge',
4917 b'merge',
4918 fname=None,
4918 fname=None,
4919 clearable=True,
4919 clearable=True,
4920 allowcommit=True,
4920 allowcommit=True,
4921 cmdmsg=_(b'outstanding uncommitted merge'),
4921 cmdmsg=_(b'outstanding uncommitted merge'),
4922 abortfunc=hg.abortmerge,
4922 abortfunc=hg.abortmerge,
4923 statushint=_(
4923 statushint=_(
4924 b'To continue: hg commit\nTo abort: hg merge --abort'
4924 b'To continue: hg commit\nTo abort: hg merge --abort'
4925 ),
4925 ),
4926 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4926 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4927 )
4927 )
4928
4928
4929
4929
4930 @command(
4930 @command(
4931 b'outgoing|out',
4931 b'outgoing|out',
4932 [
4932 [
4933 (
4933 (
4934 b'f',
4934 b'f',
4935 b'force',
4935 b'force',
4936 None,
4936 None,
4937 _(b'run even when the destination is unrelated'),
4937 _(b'run even when the destination is unrelated'),
4938 ),
4938 ),
4939 (
4939 (
4940 b'r',
4940 b'r',
4941 b'rev',
4941 b'rev',
4942 [],
4942 [],
4943 _(b'a changeset intended to be included in the destination'),
4943 _(b'a changeset intended to be included in the destination'),
4944 _(b'REV'),
4944 _(b'REV'),
4945 ),
4945 ),
4946 (b'n', b'newest-first', None, _(b'show newest record first')),
4946 (b'n', b'newest-first', None, _(b'show newest record first')),
4947 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4947 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4948 (
4948 (
4949 b'b',
4949 b'b',
4950 b'branch',
4950 b'branch',
4951 [],
4951 [],
4952 _(b'a specific branch you would like to push'),
4952 _(b'a specific branch you would like to push'),
4953 _(b'BRANCH'),
4953 _(b'BRANCH'),
4954 ),
4954 ),
4955 ]
4955 ]
4956 + logopts
4956 + logopts
4957 + remoteopts
4957 + remoteopts
4958 + subrepoopts,
4958 + subrepoopts,
4959 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4959 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4960 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4960 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4961 )
4961 )
4962 def outgoing(ui, repo, dest=None, **opts):
4962 def outgoing(ui, repo, dest=None, **opts):
4963 """show changesets not found in the destination
4963 """show changesets not found in the destination
4964
4964
4965 Show changesets not found in the specified destination repository
4965 Show changesets not found in the specified destination repository
4966 or the default push location. These are the changesets that would
4966 or the default push location. These are the changesets that would
4967 be pushed if a push was requested.
4967 be pushed if a push was requested.
4968
4968
4969 See pull for details of valid destination formats.
4969 See pull for details of valid destination formats.
4970
4970
4971 .. container:: verbose
4971 .. container:: verbose
4972
4972
4973 With -B/--bookmarks, the result of bookmark comparison between
4973 With -B/--bookmarks, the result of bookmark comparison between
4974 local and remote repositories is displayed. With -v/--verbose,
4974 local and remote repositories is displayed. With -v/--verbose,
4975 status is also displayed for each bookmark like below::
4975 status is also displayed for each bookmark like below::
4976
4976
4977 BM1 01234567890a added
4977 BM1 01234567890a added
4978 BM2 deleted
4978 BM2 deleted
4979 BM3 234567890abc advanced
4979 BM3 234567890abc advanced
4980 BM4 34567890abcd diverged
4980 BM4 34567890abcd diverged
4981 BM5 4567890abcde changed
4981 BM5 4567890abcde changed
4982
4982
4983 The action taken when pushing depends on the
4983 The action taken when pushing depends on the
4984 status of each bookmark:
4984 status of each bookmark:
4985
4985
4986 :``added``: push with ``-B`` will create it
4986 :``added``: push with ``-B`` will create it
4987 :``deleted``: push with ``-B`` will delete it
4987 :``deleted``: push with ``-B`` will delete it
4988 :``advanced``: push will update it
4988 :``advanced``: push will update it
4989 :``diverged``: push with ``-B`` will update it
4989 :``diverged``: push with ``-B`` will update it
4990 :``changed``: push with ``-B`` will update it
4990 :``changed``: push with ``-B`` will update it
4991
4991
4992 From the point of view of pushing behavior, bookmarks
4992 From the point of view of pushing behavior, bookmarks
4993 existing only in the remote repository are treated as
4993 existing only in the remote repository are treated as
4994 ``deleted``, even if it is in fact added remotely.
4994 ``deleted``, even if it is in fact added remotely.
4995
4995
4996 Returns 0 if there are outgoing changes, 1 otherwise.
4996 Returns 0 if there are outgoing changes, 1 otherwise.
4997 """
4997 """
4998 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4998 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4999 # style URLs, so don't overwrite dest.
4999 # style URLs, so don't overwrite dest.
5000 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5000 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5001 if not path:
5001 if not path:
5002 raise error.Abort(
5002 raise error.Abort(
5003 _(b'default repository not configured!'),
5003 _(b'default repository not configured!'),
5004 hint=_(b"see 'hg help config.paths'"),
5004 hint=_(b"see 'hg help config.paths'"),
5005 )
5005 )
5006
5006
5007 opts = pycompat.byteskwargs(opts)
5007 opts = pycompat.byteskwargs(opts)
5008 if opts.get(b'graph'):
5008 if opts.get(b'graph'):
5009 logcmdutil.checkunsupportedgraphflags([], opts)
5009 logcmdutil.checkunsupportedgraphflags([], opts)
5010 o, other = hg._outgoing(ui, repo, dest, opts)
5010 o, other = hg._outgoing(ui, repo, dest, opts)
5011 if not o:
5011 if not o:
5012 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5013 return
5013 return
5014
5014
5015 revdag = logcmdutil.graphrevs(repo, o, opts)
5015 revdag = logcmdutil.graphrevs(repo, o, opts)
5016 ui.pager(b'outgoing')
5016 ui.pager(b'outgoing')
5017 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5017 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5018 logcmdutil.displaygraph(
5018 logcmdutil.displaygraph(
5019 ui, repo, revdag, displayer, graphmod.asciiedges
5019 ui, repo, revdag, displayer, graphmod.asciiedges
5020 )
5020 )
5021 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5021 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5022 return 0
5022 return 0
5023
5023
5024 if opts.get(b'bookmarks'):
5024 if opts.get(b'bookmarks'):
5025 dest = path.pushloc or path.loc
5025 dest = path.pushloc or path.loc
5026 other = hg.peer(repo, opts, dest)
5026 other = hg.peer(repo, opts, dest)
5027 if b'bookmarks' not in other.listkeys(b'namespaces'):
5027 if b'bookmarks' not in other.listkeys(b'namespaces'):
5028 ui.warn(_(b"remote doesn't support bookmarks\n"))
5028 ui.warn(_(b"remote doesn't support bookmarks\n"))
5029 return 0
5029 return 0
5030 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5030 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5031 ui.pager(b'outgoing')
5031 ui.pager(b'outgoing')
5032 return bookmarks.outgoing(ui, repo, other)
5032 return bookmarks.outgoing(ui, repo, other)
5033
5033
5034 repo._subtoppath = path.pushloc or path.loc
5034 repo._subtoppath = path.pushloc or path.loc
5035 try:
5035 try:
5036 return hg.outgoing(ui, repo, dest, opts)
5036 return hg.outgoing(ui, repo, dest, opts)
5037 finally:
5037 finally:
5038 del repo._subtoppath
5038 del repo._subtoppath
5039
5039
5040
5040
5041 @command(
5041 @command(
5042 b'parents',
5042 b'parents',
5043 [
5043 [
5044 (
5044 (
5045 b'r',
5045 b'r',
5046 b'rev',
5046 b'rev',
5047 b'',
5047 b'',
5048 _(b'show parents of the specified revision'),
5048 _(b'show parents of the specified revision'),
5049 _(b'REV'),
5049 _(b'REV'),
5050 ),
5050 ),
5051 ]
5051 ]
5052 + templateopts,
5052 + templateopts,
5053 _(b'[-r REV] [FILE]'),
5053 _(b'[-r REV] [FILE]'),
5054 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5054 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5055 inferrepo=True,
5055 inferrepo=True,
5056 )
5056 )
5057 def parents(ui, repo, file_=None, **opts):
5057 def parents(ui, repo, file_=None, **opts):
5058 """show the parents of the working directory or revision (DEPRECATED)
5058 """show the parents of the working directory or revision (DEPRECATED)
5059
5059
5060 Print the working directory's parent revisions. If a revision is
5060 Print the working directory's parent revisions. If a revision is
5061 given via -r/--rev, the parent of that revision will be printed.
5061 given via -r/--rev, the parent of that revision will be printed.
5062 If a file argument is given, the revision in which the file was
5062 If a file argument is given, the revision in which the file was
5063 last changed (before the working directory revision or the
5063 last changed (before the working directory revision or the
5064 argument to --rev if given) is printed.
5064 argument to --rev if given) is printed.
5065
5065
5066 This command is equivalent to::
5066 This command is equivalent to::
5067
5067
5068 hg log -r "p1()+p2()" or
5068 hg log -r "p1()+p2()" or
5069 hg log -r "p1(REV)+p2(REV)" or
5069 hg log -r "p1(REV)+p2(REV)" or
5070 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5070 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5071 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5071 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5072
5072
5073 See :hg:`summary` and :hg:`help revsets` for related information.
5073 See :hg:`summary` and :hg:`help revsets` for related information.
5074
5074
5075 Returns 0 on success.
5075 Returns 0 on success.
5076 """
5076 """
5077
5077
5078 opts = pycompat.byteskwargs(opts)
5078 opts = pycompat.byteskwargs(opts)
5079 rev = opts.get(b'rev')
5079 rev = opts.get(b'rev')
5080 if rev:
5080 if rev:
5081 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5081 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5082 ctx = scmutil.revsingle(repo, rev, None)
5082 ctx = scmutil.revsingle(repo, rev, None)
5083
5083
5084 if file_:
5084 if file_:
5085 m = scmutil.match(ctx, (file_,), opts)
5085 m = scmutil.match(ctx, (file_,), opts)
5086 if m.anypats() or len(m.files()) != 1:
5086 if m.anypats() or len(m.files()) != 1:
5087 raise error.Abort(_(b'can only specify an explicit filename'))
5087 raise error.Abort(_(b'can only specify an explicit filename'))
5088 file_ = m.files()[0]
5088 file_ = m.files()[0]
5089 filenodes = []
5089 filenodes = []
5090 for cp in ctx.parents():
5090 for cp in ctx.parents():
5091 if not cp:
5091 if not cp:
5092 continue
5092 continue
5093 try:
5093 try:
5094 filenodes.append(cp.filenode(file_))
5094 filenodes.append(cp.filenode(file_))
5095 except error.LookupError:
5095 except error.LookupError:
5096 pass
5096 pass
5097 if not filenodes:
5097 if not filenodes:
5098 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5098 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5099 p = []
5099 p = []
5100 for fn in filenodes:
5100 for fn in filenodes:
5101 fctx = repo.filectx(file_, fileid=fn)
5101 fctx = repo.filectx(file_, fileid=fn)
5102 p.append(fctx.node())
5102 p.append(fctx.node())
5103 else:
5103 else:
5104 p = [cp.node() for cp in ctx.parents()]
5104 p = [cp.node() for cp in ctx.parents()]
5105
5105
5106 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5106 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5107 for n in p:
5107 for n in p:
5108 if n != nullid:
5108 if n != nullid:
5109 displayer.show(repo[n])
5109 displayer.show(repo[n])
5110 displayer.close()
5110 displayer.close()
5111
5111
5112
5112
5113 @command(
5113 @command(
5114 b'paths',
5114 b'paths',
5115 formatteropts,
5115 formatteropts,
5116 _(b'[NAME]'),
5116 _(b'[NAME]'),
5117 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5117 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5118 optionalrepo=True,
5118 optionalrepo=True,
5119 intents={INTENT_READONLY},
5119 intents={INTENT_READONLY},
5120 )
5120 )
5121 def paths(ui, repo, search=None, **opts):
5121 def paths(ui, repo, search=None, **opts):
5122 """show aliases for remote repositories
5122 """show aliases for remote repositories
5123
5123
5124 Show definition of symbolic path name NAME. If no name is given,
5124 Show definition of symbolic path name NAME. If no name is given,
5125 show definition of all available names.
5125 show definition of all available names.
5126
5126
5127 Option -q/--quiet suppresses all output when searching for NAME
5127 Option -q/--quiet suppresses all output when searching for NAME
5128 and shows only the path names when listing all definitions.
5128 and shows only the path names when listing all definitions.
5129
5129
5130 Path names are defined in the [paths] section of your
5130 Path names are defined in the [paths] section of your
5131 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5131 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5132 repository, ``.hg/hgrc`` is used, too.
5132 repository, ``.hg/hgrc`` is used, too.
5133
5133
5134 The path names ``default`` and ``default-push`` have a special
5134 The path names ``default`` and ``default-push`` have a special
5135 meaning. When performing a push or pull operation, they are used
5135 meaning. When performing a push or pull operation, they are used
5136 as fallbacks if no location is specified on the command-line.
5136 as fallbacks if no location is specified on the command-line.
5137 When ``default-push`` is set, it will be used for push and
5137 When ``default-push`` is set, it will be used for push and
5138 ``default`` will be used for pull; otherwise ``default`` is used
5138 ``default`` will be used for pull; otherwise ``default`` is used
5139 as the fallback for both. When cloning a repository, the clone
5139 as the fallback for both. When cloning a repository, the clone
5140 source is written as ``default`` in ``.hg/hgrc``.
5140 source is written as ``default`` in ``.hg/hgrc``.
5141
5141
5142 .. note::
5142 .. note::
5143
5143
5144 ``default`` and ``default-push`` apply to all inbound (e.g.
5144 ``default`` and ``default-push`` apply to all inbound (e.g.
5145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5146 and :hg:`bundle`) operations.
5146 and :hg:`bundle`) operations.
5147
5147
5148 See :hg:`help urls` for more information.
5148 See :hg:`help urls` for more information.
5149
5149
5150 .. container:: verbose
5150 .. container:: verbose
5151
5151
5152 Template:
5152 Template:
5153
5153
5154 The following keywords are supported. See also :hg:`help templates`.
5154 The following keywords are supported. See also :hg:`help templates`.
5155
5155
5156 :name: String. Symbolic name of the path alias.
5156 :name: String. Symbolic name of the path alias.
5157 :pushurl: String. URL for push operations.
5157 :pushurl: String. URL for push operations.
5158 :url: String. URL or directory path for the other operations.
5158 :url: String. URL or directory path for the other operations.
5159
5159
5160 Returns 0 on success.
5160 Returns 0 on success.
5161 """
5161 """
5162
5162
5163 opts = pycompat.byteskwargs(opts)
5163 opts = pycompat.byteskwargs(opts)
5164 ui.pager(b'paths')
5164 ui.pager(b'paths')
5165 if search:
5165 if search:
5166 pathitems = [
5166 pathitems = [
5167 (name, path)
5167 (name, path)
5168 for name, path in pycompat.iteritems(ui.paths)
5168 for name, path in pycompat.iteritems(ui.paths)
5169 if name == search
5169 if name == search
5170 ]
5170 ]
5171 else:
5171 else:
5172 pathitems = sorted(pycompat.iteritems(ui.paths))
5172 pathitems = sorted(pycompat.iteritems(ui.paths))
5173
5173
5174 fm = ui.formatter(b'paths', opts)
5174 fm = ui.formatter(b'paths', opts)
5175 if fm.isplain():
5175 if fm.isplain():
5176 hidepassword = util.hidepassword
5176 hidepassword = util.hidepassword
5177 else:
5177 else:
5178 hidepassword = bytes
5178 hidepassword = bytes
5179 if ui.quiet:
5179 if ui.quiet:
5180 namefmt = b'%s\n'
5180 namefmt = b'%s\n'
5181 else:
5181 else:
5182 namefmt = b'%s = '
5182 namefmt = b'%s = '
5183 showsubopts = not search and not ui.quiet
5183 showsubopts = not search and not ui.quiet
5184
5184
5185 for name, path in pathitems:
5185 for name, path in pathitems:
5186 fm.startitem()
5186 fm.startitem()
5187 fm.condwrite(not search, b'name', namefmt, name)
5187 fm.condwrite(not search, b'name', namefmt, name)
5188 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5188 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5189 for subopt, value in sorted(path.suboptions.items()):
5189 for subopt, value in sorted(path.suboptions.items()):
5190 assert subopt not in (b'name', b'url')
5190 assert subopt not in (b'name', b'url')
5191 if showsubopts:
5191 if showsubopts:
5192 fm.plain(b'%s:%s = ' % (name, subopt))
5192 fm.plain(b'%s:%s = ' % (name, subopt))
5193 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5193 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5194
5194
5195 fm.end()
5195 fm.end()
5196
5196
5197 if search and not pathitems:
5197 if search and not pathitems:
5198 if not ui.quiet:
5198 if not ui.quiet:
5199 ui.warn(_(b"not found!\n"))
5199 ui.warn(_(b"not found!\n"))
5200 return 1
5200 return 1
5201 else:
5201 else:
5202 return 0
5202 return 0
5203
5203
5204
5204
5205 @command(
5205 @command(
5206 b'phase',
5206 b'phase',
5207 [
5207 [
5208 (b'p', b'public', False, _(b'set changeset phase to public')),
5208 (b'p', b'public', False, _(b'set changeset phase to public')),
5209 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5209 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5210 (b's', b'secret', False, _(b'set changeset phase to secret')),
5210 (b's', b'secret', False, _(b'set changeset phase to secret')),
5211 (b'f', b'force', False, _(b'allow to move boundary backward')),
5211 (b'f', b'force', False, _(b'allow to move boundary backward')),
5212 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5212 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5213 ],
5213 ],
5214 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5214 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5215 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5215 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5216 )
5216 )
5217 def phase(ui, repo, *revs, **opts):
5217 def phase(ui, repo, *revs, **opts):
5218 """set or show the current phase name
5218 """set or show the current phase name
5219
5219
5220 With no argument, show the phase name of the current revision(s).
5220 With no argument, show the phase name of the current revision(s).
5221
5221
5222 With one of -p/--public, -d/--draft or -s/--secret, change the
5222 With one of -p/--public, -d/--draft or -s/--secret, change the
5223 phase value of the specified revisions.
5223 phase value of the specified revisions.
5224
5224
5225 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5225 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5226 lower phase to a higher phase. Phases are ordered as follows::
5226 lower phase to a higher phase. Phases are ordered as follows::
5227
5227
5228 public < draft < secret
5228 public < draft < secret
5229
5229
5230 Returns 0 on success, 1 if some phases could not be changed.
5230 Returns 0 on success, 1 if some phases could not be changed.
5231
5231
5232 (For more information about the phases concept, see :hg:`help phases`.)
5232 (For more information about the phases concept, see :hg:`help phases`.)
5233 """
5233 """
5234 opts = pycompat.byteskwargs(opts)
5234 opts = pycompat.byteskwargs(opts)
5235 # search for a unique phase argument
5235 # search for a unique phase argument
5236 targetphase = None
5236 targetphase = None
5237 for idx, name in enumerate(phases.cmdphasenames):
5237 for idx, name in enumerate(phases.cmdphasenames):
5238 if opts[name]:
5238 if opts[name]:
5239 if targetphase is not None:
5239 if targetphase is not None:
5240 raise error.Abort(_(b'only one phase can be specified'))
5240 raise error.Abort(_(b'only one phase can be specified'))
5241 targetphase = idx
5241 targetphase = idx
5242
5242
5243 # look for specified revision
5243 # look for specified revision
5244 revs = list(revs)
5244 revs = list(revs)
5245 revs.extend(opts[b'rev'])
5245 revs.extend(opts[b'rev'])
5246 if not revs:
5246 if not revs:
5247 # display both parents as the second parent phase can influence
5247 # display both parents as the second parent phase can influence
5248 # the phase of a merge commit
5248 # the phase of a merge commit
5249 revs = [c.rev() for c in repo[None].parents()]
5249 revs = [c.rev() for c in repo[None].parents()]
5250
5250
5251 revs = scmutil.revrange(repo, revs)
5251 revs = scmutil.revrange(repo, revs)
5252
5252
5253 ret = 0
5253 ret = 0
5254 if targetphase is None:
5254 if targetphase is None:
5255 # display
5255 # display
5256 for r in revs:
5256 for r in revs:
5257 ctx = repo[r]
5257 ctx = repo[r]
5258 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5258 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5259 else:
5259 else:
5260 with repo.lock(), repo.transaction(b"phase") as tr:
5260 with repo.lock(), repo.transaction(b"phase") as tr:
5261 # set phase
5261 # set phase
5262 if not revs:
5262 if not revs:
5263 raise error.Abort(_(b'empty revision set'))
5263 raise error.Abort(_(b'empty revision set'))
5264 nodes = [repo[r].node() for r in revs]
5264 nodes = [repo[r].node() for r in revs]
5265 # moving revision from public to draft may hide them
5265 # moving revision from public to draft may hide them
5266 # We have to check result on an unfiltered repository
5266 # We have to check result on an unfiltered repository
5267 unfi = repo.unfiltered()
5267 unfi = repo.unfiltered()
5268 getphase = unfi._phasecache.phase
5268 getphase = unfi._phasecache.phase
5269 olddata = [getphase(unfi, r) for r in unfi]
5269 olddata = [getphase(unfi, r) for r in unfi]
5270 phases.advanceboundary(repo, tr, targetphase, nodes)
5270 phases.advanceboundary(repo, tr, targetphase, nodes)
5271 if opts[b'force']:
5271 if opts[b'force']:
5272 phases.retractboundary(repo, tr, targetphase, nodes)
5272 phases.retractboundary(repo, tr, targetphase, nodes)
5273 getphase = unfi._phasecache.phase
5273 getphase = unfi._phasecache.phase
5274 newdata = [getphase(unfi, r) for r in unfi]
5274 newdata = [getphase(unfi, r) for r in unfi]
5275 changes = sum(newdata[r] != olddata[r] for r in unfi)
5275 changes = sum(newdata[r] != olddata[r] for r in unfi)
5276 cl = unfi.changelog
5276 cl = unfi.changelog
5277 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5277 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5278 if rejected:
5278 if rejected:
5279 ui.warn(
5279 ui.warn(
5280 _(
5280 _(
5281 b'cannot move %i changesets to a higher '
5281 b'cannot move %i changesets to a higher '
5282 b'phase, use --force\n'
5282 b'phase, use --force\n'
5283 )
5283 )
5284 % len(rejected)
5284 % len(rejected)
5285 )
5285 )
5286 ret = 1
5286 ret = 1
5287 if changes:
5287 if changes:
5288 msg = _(b'phase changed for %i changesets\n') % changes
5288 msg = _(b'phase changed for %i changesets\n') % changes
5289 if ret:
5289 if ret:
5290 ui.status(msg)
5290 ui.status(msg)
5291 else:
5291 else:
5292 ui.note(msg)
5292 ui.note(msg)
5293 else:
5293 else:
5294 ui.warn(_(b'no phases changed\n'))
5294 ui.warn(_(b'no phases changed\n'))
5295 return ret
5295 return ret
5296
5296
5297
5297
5298 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5298 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5299 """Run after a changegroup has been added via pull/unbundle
5299 """Run after a changegroup has been added via pull/unbundle
5300
5300
5301 This takes arguments below:
5301 This takes arguments below:
5302
5302
5303 :modheads: change of heads by pull/unbundle
5303 :modheads: change of heads by pull/unbundle
5304 :optupdate: updating working directory is needed or not
5304 :optupdate: updating working directory is needed or not
5305 :checkout: update destination revision (or None to default destination)
5305 :checkout: update destination revision (or None to default destination)
5306 :brev: a name, which might be a bookmark to be activated after updating
5306 :brev: a name, which might be a bookmark to be activated after updating
5307 """
5307 """
5308 if modheads == 0:
5308 if modheads == 0:
5309 return
5309 return
5310 if optupdate:
5310 if optupdate:
5311 try:
5311 try:
5312 return hg.updatetotally(ui, repo, checkout, brev)
5312 return hg.updatetotally(ui, repo, checkout, brev)
5313 except error.UpdateAbort as inst:
5313 except error.UpdateAbort as inst:
5314 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5314 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5315 hint = inst.hint
5315 hint = inst.hint
5316 raise error.UpdateAbort(msg, hint=hint)
5316 raise error.UpdateAbort(msg, hint=hint)
5317 if modheads is not None and modheads > 1:
5317 if modheads is not None and modheads > 1:
5318 currentbranchheads = len(repo.branchheads())
5318 currentbranchheads = len(repo.branchheads())
5319 if currentbranchheads == modheads:
5319 if currentbranchheads == modheads:
5320 ui.status(
5320 ui.status(
5321 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5321 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5322 )
5322 )
5323 elif currentbranchheads > 1:
5323 elif currentbranchheads > 1:
5324 ui.status(
5324 ui.status(
5325 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5325 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5326 )
5326 )
5327 else:
5327 else:
5328 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5328 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5329 elif not ui.configbool(b'commands', b'update.requiredest'):
5329 elif not ui.configbool(b'commands', b'update.requiredest'):
5330 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5330 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5331
5331
5332
5332
5333 @command(
5333 @command(
5334 b'pull',
5334 b'pull',
5335 [
5335 [
5336 (
5336 (
5337 b'u',
5337 b'u',
5338 b'update',
5338 b'update',
5339 None,
5339 None,
5340 _(b'update to new branch head if new descendants were pulled'),
5340 _(b'update to new branch head if new descendants were pulled'),
5341 ),
5341 ),
5342 (
5342 (
5343 b'f',
5343 b'f',
5344 b'force',
5344 b'force',
5345 None,
5345 None,
5346 _(b'run even when remote repository is unrelated'),
5346 _(b'run even when remote repository is unrelated'),
5347 ),
5347 ),
5348 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5348 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5349 (
5349 (
5350 b'r',
5350 b'r',
5351 b'rev',
5351 b'rev',
5352 [],
5352 [],
5353 _(b'a remote changeset intended to be added'),
5353 _(b'a remote changeset intended to be added'),
5354 _(b'REV'),
5354 _(b'REV'),
5355 ),
5355 ),
5356 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5356 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5357 (
5357 (
5358 b'b',
5358 b'b',
5359 b'branch',
5359 b'branch',
5360 [],
5360 [],
5361 _(b'a specific branch you would like to pull'),
5361 _(b'a specific branch you would like to pull'),
5362 _(b'BRANCH'),
5362 _(b'BRANCH'),
5363 ),
5363 ),
5364 ]
5364 ]
5365 + remoteopts,
5365 + remoteopts,
5366 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5366 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5367 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5367 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5368 helpbasic=True,
5368 helpbasic=True,
5369 )
5369 )
5370 def pull(ui, repo, source=b"default", **opts):
5370 def pull(ui, repo, source=b"default", **opts):
5371 """pull changes from the specified source
5371 """pull changes from the specified source
5372
5372
5373 Pull changes from a remote repository to a local one.
5373 Pull changes from a remote repository to a local one.
5374
5374
5375 This finds all changes from the repository at the specified path
5375 This finds all changes from the repository at the specified path
5376 or URL and adds them to a local repository (the current one unless
5376 or URL and adds them to a local repository (the current one unless
5377 -R is specified). By default, this does not update the copy of the
5377 -R is specified). By default, this does not update the copy of the
5378 project in the working directory.
5378 project in the working directory.
5379
5379
5380 When cloning from servers that support it, Mercurial may fetch
5380 When cloning from servers that support it, Mercurial may fetch
5381 pre-generated data. When this is done, hooks operating on incoming
5381 pre-generated data. When this is done, hooks operating on incoming
5382 changesets and changegroups may fire more than once, once for each
5382 changesets and changegroups may fire more than once, once for each
5383 pre-generated bundle and as well as for any additional remaining
5383 pre-generated bundle and as well as for any additional remaining
5384 data. See :hg:`help -e clonebundles` for more.
5384 data. See :hg:`help -e clonebundles` for more.
5385
5385
5386 Use :hg:`incoming` if you want to see what would have been added
5386 Use :hg:`incoming` if you want to see what would have been added
5387 by a pull at the time you issued this command. If you then decide
5387 by a pull at the time you issued this command. If you then decide
5388 to add those changes to the repository, you should use :hg:`pull
5388 to add those changes to the repository, you should use :hg:`pull
5389 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5389 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5390
5390
5391 If SOURCE is omitted, the 'default' path will be used.
5391 If SOURCE is omitted, the 'default' path will be used.
5392 See :hg:`help urls` for more information.
5392 See :hg:`help urls` for more information.
5393
5393
5394 Specifying bookmark as ``.`` is equivalent to specifying the active
5394 Specifying bookmark as ``.`` is equivalent to specifying the active
5395 bookmark's name.
5395 bookmark's name.
5396
5396
5397 Returns 0 on success, 1 if an update had unresolved files.
5397 Returns 0 on success, 1 if an update had unresolved files.
5398 """
5398 """
5399
5399
5400 opts = pycompat.byteskwargs(opts)
5400 opts = pycompat.byteskwargs(opts)
5401 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5401 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5402 b'update'
5402 b'update'
5403 ):
5403 ):
5404 msg = _(b'update destination required by configuration')
5404 msg = _(b'update destination required by configuration')
5405 hint = _(b'use hg pull followed by hg update DEST')
5405 hint = _(b'use hg pull followed by hg update DEST')
5406 raise error.Abort(msg, hint=hint)
5406 raise error.Abort(msg, hint=hint)
5407
5407
5408 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5408 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5409 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5409 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5410 other = hg.peer(repo, opts, source)
5410 other = hg.peer(repo, opts, source)
5411 try:
5411 try:
5412 revs, checkout = hg.addbranchrevs(
5412 revs, checkout = hg.addbranchrevs(
5413 repo, other, branches, opts.get(b'rev')
5413 repo, other, branches, opts.get(b'rev')
5414 )
5414 )
5415
5415
5416 pullopargs = {}
5416 pullopargs = {}
5417
5417
5418 nodes = None
5418 nodes = None
5419 if opts.get(b'bookmark') or revs:
5419 if opts.get(b'bookmark') or revs:
5420 # The list of bookmark used here is the same used to actually update
5420 # The list of bookmark used here is the same used to actually update
5421 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # the bookmark names, to avoid the race from issue 4689 and we do
5422 # all lookup and bookmark queries in one go so they see the same
5422 # all lookup and bookmark queries in one go so they see the same
5423 # version of the server state (issue 4700).
5423 # version of the server state (issue 4700).
5424 nodes = []
5424 nodes = []
5425 fnodes = []
5425 fnodes = []
5426 revs = revs or []
5426 revs = revs or []
5427 if revs and not other.capable(b'lookup'):
5427 if revs and not other.capable(b'lookup'):
5428 err = _(
5428 err = _(
5429 b"other repository doesn't support revision lookup, "
5429 b"other repository doesn't support revision lookup, "
5430 b"so a rev cannot be specified."
5430 b"so a rev cannot be specified."
5431 )
5431 )
5432 raise error.Abort(err)
5432 raise error.Abort(err)
5433 with other.commandexecutor() as e:
5433 with other.commandexecutor() as e:
5434 fremotebookmarks = e.callcommand(
5434 fremotebookmarks = e.callcommand(
5435 b'listkeys', {b'namespace': b'bookmarks'}
5435 b'listkeys', {b'namespace': b'bookmarks'}
5436 )
5436 )
5437 for r in revs:
5437 for r in revs:
5438 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5439 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = fremotebookmarks.result()
5440 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5441 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 pullopargs[b'remotebookmarks'] = remotebookmarks
5442 for b in opts.get(b'bookmark', []):
5442 for b in opts.get(b'bookmark', []):
5443 b = repo._bookmarks.expandname(b)
5443 b = repo._bookmarks.expandname(b)
5444 if b not in remotebookmarks:
5444 if b not in remotebookmarks:
5445 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5445 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5446 nodes.append(remotebookmarks[b])
5446 nodes.append(remotebookmarks[b])
5447 for i, rev in enumerate(revs):
5447 for i, rev in enumerate(revs):
5448 node = fnodes[i].result()
5448 node = fnodes[i].result()
5449 nodes.append(node)
5449 nodes.append(node)
5450 if rev == checkout:
5450 if rev == checkout:
5451 checkout = node
5451 checkout = node
5452
5452
5453 wlock = util.nullcontextmanager()
5453 wlock = util.nullcontextmanager()
5454 if opts.get(b'update'):
5454 if opts.get(b'update'):
5455 wlock = repo.wlock()
5455 wlock = repo.wlock()
5456 with wlock:
5456 with wlock:
5457 pullopargs.update(opts.get(b'opargs', {}))
5457 pullopargs.update(opts.get(b'opargs', {}))
5458 modheads = exchange.pull(
5458 modheads = exchange.pull(
5459 repo,
5459 repo,
5460 other,
5460 other,
5461 heads=nodes,
5461 heads=nodes,
5462 force=opts.get(b'force'),
5462 force=opts.get(b'force'),
5463 bookmarks=opts.get(b'bookmark', ()),
5463 bookmarks=opts.get(b'bookmark', ()),
5464 opargs=pullopargs,
5464 opargs=pullopargs,
5465 confirm=opts.get(b'confirm'),
5465 confirm=opts.get(b'confirm'),
5466 ).cgresult
5466 ).cgresult
5467
5467
5468 # brev is a name, which might be a bookmark to be activated at
5468 # brev is a name, which might be a bookmark to be activated at
5469 # the end of the update. In other words, it is an explicit
5469 # the end of the update. In other words, it is an explicit
5470 # destination of the update
5470 # destination of the update
5471 brev = None
5471 brev = None
5472
5472
5473 if checkout:
5473 if checkout:
5474 checkout = repo.unfiltered().changelog.rev(checkout)
5474 checkout = repo.unfiltered().changelog.rev(checkout)
5475
5475
5476 # order below depends on implementation of
5476 # order below depends on implementation of
5477 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5478 # because 'checkout' is determined without it.
5478 # because 'checkout' is determined without it.
5479 if opts.get(b'rev'):
5479 if opts.get(b'rev'):
5480 brev = opts[b'rev'][0]
5480 brev = opts[b'rev'][0]
5481 elif opts.get(b'branch'):
5481 elif opts.get(b'branch'):
5482 brev = opts[b'branch'][0]
5482 brev = opts[b'branch'][0]
5483 else:
5483 else:
5484 brev = branches[0]
5484 brev = branches[0]
5485 repo._subtoppath = source
5485 repo._subtoppath = source
5486 try:
5486 try:
5487 ret = postincoming(
5487 ret = postincoming(
5488 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 ui, repo, modheads, opts.get(b'update'), checkout, brev
5489 )
5489 )
5490 except error.FilteredRepoLookupError as exc:
5490 except error.FilteredRepoLookupError as exc:
5491 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 msg = _(b'cannot update to target: %s') % exc.args[0]
5492 exc.args = (msg,) + exc.args[1:]
5492 exc.args = (msg,) + exc.args[1:]
5493 raise
5493 raise
5494 finally:
5494 finally:
5495 del repo._subtoppath
5495 del repo._subtoppath
5496
5496
5497 finally:
5497 finally:
5498 other.close()
5498 other.close()
5499 return ret
5499 return ret
5500
5500
5501
5501
5502 @command(
5502 @command(
5503 b'push',
5503 b'push',
5504 [
5504 [
5505 (b'f', b'force', None, _(b'force push')),
5505 (b'f', b'force', None, _(b'force push')),
5506 (
5506 (
5507 b'r',
5507 b'r',
5508 b'rev',
5508 b'rev',
5509 [],
5509 [],
5510 _(b'a changeset intended to be included in the destination'),
5510 _(b'a changeset intended to be included in the destination'),
5511 _(b'REV'),
5511 _(b'REV'),
5512 ),
5512 ),
5513 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5513 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5514 (
5514 (
5515 b'b',
5515 b'b',
5516 b'branch',
5516 b'branch',
5517 [],
5517 [],
5518 _(b'a specific branch you would like to push'),
5518 _(b'a specific branch you would like to push'),
5519 _(b'BRANCH'),
5519 _(b'BRANCH'),
5520 ),
5520 ),
5521 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5521 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5522 (
5522 (
5523 b'',
5523 b'',
5524 b'pushvars',
5524 b'pushvars',
5525 [],
5525 [],
5526 _(b'variables that can be sent to server (ADVANCED)'),
5526 _(b'variables that can be sent to server (ADVANCED)'),
5527 ),
5527 ),
5528 (
5528 (
5529 b'',
5529 b'',
5530 b'publish',
5530 b'publish',
5531 False,
5531 False,
5532 _(b'push the changeset as public (EXPERIMENTAL)'),
5532 _(b'push the changeset as public (EXPERIMENTAL)'),
5533 ),
5533 ),
5534 ]
5534 ]
5535 + remoteopts,
5535 + remoteopts,
5536 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5536 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5537 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5537 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5538 helpbasic=True,
5538 helpbasic=True,
5539 )
5539 )
5540 def push(ui, repo, dest=None, **opts):
5540 def push(ui, repo, dest=None, **opts):
5541 """push changes to the specified destination
5541 """push changes to the specified destination
5542
5542
5543 Push changesets from the local repository to the specified
5543 Push changesets from the local repository to the specified
5544 destination.
5544 destination.
5545
5545
5546 This operation is symmetrical to pull: it is identical to a pull
5546 This operation is symmetrical to pull: it is identical to a pull
5547 in the destination repository from the current one.
5547 in the destination repository from the current one.
5548
5548
5549 By default, push will not allow creation of new heads at the
5549 By default, push will not allow creation of new heads at the
5550 destination, since multiple heads would make it unclear which head
5550 destination, since multiple heads would make it unclear which head
5551 to use. In this situation, it is recommended to pull and merge
5551 to use. In this situation, it is recommended to pull and merge
5552 before pushing.
5552 before pushing.
5553
5553
5554 Use --new-branch if you want to allow push to create a new named
5554 Use --new-branch if you want to allow push to create a new named
5555 branch that is not present at the destination. This allows you to
5555 branch that is not present at the destination. This allows you to
5556 only create a new branch without forcing other changes.
5556 only create a new branch without forcing other changes.
5557
5557
5558 .. note::
5558 .. note::
5559
5559
5560 Extra care should be taken with the -f/--force option,
5560 Extra care should be taken with the -f/--force option,
5561 which will push all new heads on all branches, an action which will
5561 which will push all new heads on all branches, an action which will
5562 almost always cause confusion for collaborators.
5562 almost always cause confusion for collaborators.
5563
5563
5564 If -r/--rev is used, the specified revision and all its ancestors
5564 If -r/--rev is used, the specified revision and all its ancestors
5565 will be pushed to the remote repository.
5565 will be pushed to the remote repository.
5566
5566
5567 If -B/--bookmark is used, the specified bookmarked revision, its
5567 If -B/--bookmark is used, the specified bookmarked revision, its
5568 ancestors, and the bookmark will be pushed to the remote
5568 ancestors, and the bookmark will be pushed to the remote
5569 repository. Specifying ``.`` is equivalent to specifying the active
5569 repository. Specifying ``.`` is equivalent to specifying the active
5570 bookmark's name.
5570 bookmark's name.
5571
5571
5572 Please see :hg:`help urls` for important details about ``ssh://``
5572 Please see :hg:`help urls` for important details about ``ssh://``
5573 URLs. If DESTINATION is omitted, a default path will be used.
5573 URLs. If DESTINATION is omitted, a default path will be used.
5574
5574
5575 .. container:: verbose
5575 .. container:: verbose
5576
5576
5577 The --pushvars option sends strings to the server that become
5577 The --pushvars option sends strings to the server that become
5578 environment variables prepended with ``HG_USERVAR_``. For example,
5578 environment variables prepended with ``HG_USERVAR_``. For example,
5579 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5579 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5580 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5580 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5581
5581
5582 pushvars can provide for user-overridable hooks as well as set debug
5582 pushvars can provide for user-overridable hooks as well as set debug
5583 levels. One example is having a hook that blocks commits containing
5583 levels. One example is having a hook that blocks commits containing
5584 conflict markers, but enables the user to override the hook if the file
5584 conflict markers, but enables the user to override the hook if the file
5585 is using conflict markers for testing purposes or the file format has
5585 is using conflict markers for testing purposes or the file format has
5586 strings that look like conflict markers.
5586 strings that look like conflict markers.
5587
5587
5588 By default, servers will ignore `--pushvars`. To enable it add the
5588 By default, servers will ignore `--pushvars`. To enable it add the
5589 following to your configuration file::
5589 following to your configuration file::
5590
5590
5591 [push]
5591 [push]
5592 pushvars.server = true
5592 pushvars.server = true
5593
5593
5594 Returns 0 if push was successful, 1 if nothing to push.
5594 Returns 0 if push was successful, 1 if nothing to push.
5595 """
5595 """
5596
5596
5597 opts = pycompat.byteskwargs(opts)
5597 opts = pycompat.byteskwargs(opts)
5598 if opts.get(b'bookmark'):
5598 if opts.get(b'bookmark'):
5599 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5599 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5600 for b in opts[b'bookmark']:
5600 for b in opts[b'bookmark']:
5601 # translate -B options to -r so changesets get pushed
5601 # translate -B options to -r so changesets get pushed
5602 b = repo._bookmarks.expandname(b)
5602 b = repo._bookmarks.expandname(b)
5603 if b in repo._bookmarks:
5603 if b in repo._bookmarks:
5604 opts.setdefault(b'rev', []).append(b)
5604 opts.setdefault(b'rev', []).append(b)
5605 else:
5605 else:
5606 # if we try to push a deleted bookmark, translate it to null
5606 # if we try to push a deleted bookmark, translate it to null
5607 # this lets simultaneous -r, -b options continue working
5607 # this lets simultaneous -r, -b options continue working
5608 opts.setdefault(b'rev', []).append(b"null")
5608 opts.setdefault(b'rev', []).append(b"null")
5609
5609
5610 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5610 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5611 if not path:
5611 if not path:
5612 raise error.Abort(
5612 raise error.Abort(
5613 _(b'default repository not configured!'),
5613 _(b'default repository not configured!'),
5614 hint=_(b"see 'hg help config.paths'"),
5614 hint=_(b"see 'hg help config.paths'"),
5615 )
5615 )
5616 dest = path.pushloc or path.loc
5616 dest = path.pushloc or path.loc
5617 branches = (path.branch, opts.get(b'branch') or [])
5617 branches = (path.branch, opts.get(b'branch') or [])
5618 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5618 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5619 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5619 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5620 other = hg.peer(repo, opts, dest)
5620 other = hg.peer(repo, opts, dest)
5621
5621
5622 if revs:
5622 if revs:
5623 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5623 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5624 if not revs:
5624 if not revs:
5625 raise error.Abort(
5625 raise error.Abort(
5626 _(b"specified revisions evaluate to an empty set"),
5626 _(b"specified revisions evaluate to an empty set"),
5627 hint=_(b"use different revision arguments"),
5627 hint=_(b"use different revision arguments"),
5628 )
5628 )
5629 elif path.pushrev:
5629 elif path.pushrev:
5630 # It doesn't make any sense to specify ancestor revisions. So limit
5630 # It doesn't make any sense to specify ancestor revisions. So limit
5631 # to DAG heads to make discovery simpler.
5631 # to DAG heads to make discovery simpler.
5632 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5632 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5633 revs = scmutil.revrange(repo, [expr])
5633 revs = scmutil.revrange(repo, [expr])
5634 revs = [repo[rev].node() for rev in revs]
5634 revs = [repo[rev].node() for rev in revs]
5635 if not revs:
5635 if not revs:
5636 raise error.Abort(
5636 raise error.Abort(
5637 _(b'default push revset for path evaluates to an empty set')
5637 _(b'default push revset for path evaluates to an empty set')
5638 )
5638 )
5639 elif ui.configbool(b'commands', b'push.require-revs'):
5639 elif ui.configbool(b'commands', b'push.require-revs'):
5640 raise error.Abort(
5640 raise error.Abort(
5641 _(b'no revisions specified to push'),
5641 _(b'no revisions specified to push'),
5642 hint=_(b'did you mean "hg push -r ."?'),
5642 hint=_(b'did you mean "hg push -r ."?'),
5643 )
5643 )
5644
5644
5645 repo._subtoppath = dest
5645 repo._subtoppath = dest
5646 try:
5646 try:
5647 # push subrepos depth-first for coherent ordering
5647 # push subrepos depth-first for coherent ordering
5648 c = repo[b'.']
5648 c = repo[b'.']
5649 subs = c.substate # only repos that are committed
5649 subs = c.substate # only repos that are committed
5650 for s in sorted(subs):
5650 for s in sorted(subs):
5651 result = c.sub(s).push(opts)
5651 result = c.sub(s).push(opts)
5652 if result == 0:
5652 if result == 0:
5653 return not result
5653 return not result
5654 finally:
5654 finally:
5655 del repo._subtoppath
5655 del repo._subtoppath
5656
5656
5657 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5657 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5658 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5658 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5659
5659
5660 pushop = exchange.push(
5660 pushop = exchange.push(
5661 repo,
5661 repo,
5662 other,
5662 other,
5663 opts.get(b'force'),
5663 opts.get(b'force'),
5664 revs=revs,
5664 revs=revs,
5665 newbranch=opts.get(b'new_branch'),
5665 newbranch=opts.get(b'new_branch'),
5666 bookmarks=opts.get(b'bookmark', ()),
5666 bookmarks=opts.get(b'bookmark', ()),
5667 publish=opts.get(b'publish'),
5667 publish=opts.get(b'publish'),
5668 opargs=opargs,
5668 opargs=opargs,
5669 )
5669 )
5670
5670
5671 result = not pushop.cgresult
5671 result = not pushop.cgresult
5672
5672
5673 if pushop.bkresult is not None:
5673 if pushop.bkresult is not None:
5674 if pushop.bkresult == 2:
5674 if pushop.bkresult == 2:
5675 result = 2
5675 result = 2
5676 elif not result and pushop.bkresult:
5676 elif not result and pushop.bkresult:
5677 result = 2
5677 result = 2
5678
5678
5679 return result
5679 return result
5680
5680
5681
5681
5682 @command(
5682 @command(
5683 b'recover',
5683 b'recover',
5684 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5684 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5685 helpcategory=command.CATEGORY_MAINTENANCE,
5685 helpcategory=command.CATEGORY_MAINTENANCE,
5686 )
5686 )
5687 def recover(ui, repo, **opts):
5687 def recover(ui, repo, **opts):
5688 """roll back an interrupted transaction
5688 """roll back an interrupted transaction
5689
5689
5690 Recover from an interrupted commit or pull.
5690 Recover from an interrupted commit or pull.
5691
5691
5692 This command tries to fix the repository status after an
5692 This command tries to fix the repository status after an
5693 interrupted operation. It should only be necessary when Mercurial
5693 interrupted operation. It should only be necessary when Mercurial
5694 suggests it.
5694 suggests it.
5695
5695
5696 Returns 0 if successful, 1 if nothing to recover or verify fails.
5696 Returns 0 if successful, 1 if nothing to recover or verify fails.
5697 """
5697 """
5698 ret = repo.recover()
5698 ret = repo.recover()
5699 if ret:
5699 if ret:
5700 if opts['verify']:
5700 if opts['verify']:
5701 return hg.verify(repo)
5701 return hg.verify(repo)
5702 else:
5702 else:
5703 msg = _(
5703 msg = _(
5704 b"(verify step skipped, run `hg verify` to check your "
5704 b"(verify step skipped, run `hg verify` to check your "
5705 b"repository content)\n"
5705 b"repository content)\n"
5706 )
5706 )
5707 ui.warn(msg)
5707 ui.warn(msg)
5708 return 0
5708 return 0
5709 return 1
5709 return 1
5710
5710
5711
5711
5712 @command(
5712 @command(
5713 b'remove|rm',
5713 b'remove|rm',
5714 [
5714 [
5715 (b'A', b'after', None, _(b'record delete for missing files')),
5715 (b'A', b'after', None, _(b'record delete for missing files')),
5716 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5716 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5717 ]
5717 ]
5718 + subrepoopts
5718 + subrepoopts
5719 + walkopts
5719 + walkopts
5720 + dryrunopts,
5720 + dryrunopts,
5721 _(b'[OPTION]... FILE...'),
5721 _(b'[OPTION]... FILE...'),
5722 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5722 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5723 helpbasic=True,
5723 helpbasic=True,
5724 inferrepo=True,
5724 inferrepo=True,
5725 )
5725 )
5726 def remove(ui, repo, *pats, **opts):
5726 def remove(ui, repo, *pats, **opts):
5727 """remove the specified files on the next commit
5727 """remove the specified files on the next commit
5728
5728
5729 Schedule the indicated files for removal from the current branch.
5729 Schedule the indicated files for removal from the current branch.
5730
5730
5731 This command schedules the files to be removed at the next commit.
5731 This command schedules the files to be removed at the next commit.
5732 To undo a remove before that, see :hg:`revert`. To undo added
5732 To undo a remove before that, see :hg:`revert`. To undo added
5733 files, see :hg:`forget`.
5733 files, see :hg:`forget`.
5734
5734
5735 .. container:: verbose
5735 .. container:: verbose
5736
5736
5737 -A/--after can be used to remove only files that have already
5737 -A/--after can be used to remove only files that have already
5738 been deleted, -f/--force can be used to force deletion, and -Af
5738 been deleted, -f/--force can be used to force deletion, and -Af
5739 can be used to remove files from the next revision without
5739 can be used to remove files from the next revision without
5740 deleting them from the working directory.
5740 deleting them from the working directory.
5741
5741
5742 The following table details the behavior of remove for different
5742 The following table details the behavior of remove for different
5743 file states (columns) and option combinations (rows). The file
5743 file states (columns) and option combinations (rows). The file
5744 states are Added [A], Clean [C], Modified [M] and Missing [!]
5744 states are Added [A], Clean [C], Modified [M] and Missing [!]
5745 (as reported by :hg:`status`). The actions are Warn, Remove
5745 (as reported by :hg:`status`). The actions are Warn, Remove
5746 (from branch) and Delete (from disk):
5746 (from branch) and Delete (from disk):
5747
5747
5748 ========= == == == ==
5748 ========= == == == ==
5749 opt/state A C M !
5749 opt/state A C M !
5750 ========= == == == ==
5750 ========= == == == ==
5751 none W RD W R
5751 none W RD W R
5752 -f R RD RD R
5752 -f R RD RD R
5753 -A W W W R
5753 -A W W W R
5754 -Af R R R R
5754 -Af R R R R
5755 ========= == == == ==
5755 ========= == == == ==
5756
5756
5757 .. note::
5757 .. note::
5758
5758
5759 :hg:`remove` never deletes files in Added [A] state from the
5759 :hg:`remove` never deletes files in Added [A] state from the
5760 working directory, not even if ``--force`` is specified.
5760 working directory, not even if ``--force`` is specified.
5761
5761
5762 Returns 0 on success, 1 if any warnings encountered.
5762 Returns 0 on success, 1 if any warnings encountered.
5763 """
5763 """
5764
5764
5765 opts = pycompat.byteskwargs(opts)
5765 opts = pycompat.byteskwargs(opts)
5766 after, force = opts.get(b'after'), opts.get(b'force')
5766 after, force = opts.get(b'after'), opts.get(b'force')
5767 dryrun = opts.get(b'dry_run')
5767 dryrun = opts.get(b'dry_run')
5768 if not pats and not after:
5768 if not pats and not after:
5769 raise error.Abort(_(b'no files specified'))
5769 raise error.Abort(_(b'no files specified'))
5770
5770
5771 m = scmutil.match(repo[None], pats, opts)
5771 m = scmutil.match(repo[None], pats, opts)
5772 subrepos = opts.get(b'subrepos')
5772 subrepos = opts.get(b'subrepos')
5773 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5773 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5774 return cmdutil.remove(
5774 return cmdutil.remove(
5775 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5775 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5776 )
5776 )
5777
5777
5778
5778
5779 @command(
5779 @command(
5780 b'rename|move|mv',
5780 b'rename|move|mv',
5781 [
5781 [
5782 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5782 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5783 (
5783 (
5784 b'',
5784 b'',
5785 b'at-rev',
5785 b'at-rev',
5786 b'',
5786 b'',
5787 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5787 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5788 _(b'REV'),
5788 _(b'REV'),
5789 ),
5789 ),
5790 (
5790 (
5791 b'f',
5791 b'f',
5792 b'force',
5792 b'force',
5793 None,
5793 None,
5794 _(b'forcibly move over an existing managed file'),
5794 _(b'forcibly move over an existing managed file'),
5795 ),
5795 ),
5796 ]
5796 ]
5797 + walkopts
5797 + walkopts
5798 + dryrunopts,
5798 + dryrunopts,
5799 _(b'[OPTION]... SOURCE... DEST'),
5799 _(b'[OPTION]... SOURCE... DEST'),
5800 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5800 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5801 )
5801 )
5802 def rename(ui, repo, *pats, **opts):
5802 def rename(ui, repo, *pats, **opts):
5803 """rename files; equivalent of copy + remove
5803 """rename files; equivalent of copy + remove
5804
5804
5805 Mark dest as copies of sources; mark sources for deletion. If dest
5805 Mark dest as copies of sources; mark sources for deletion. If dest
5806 is a directory, copies are put in that directory. If dest is a
5806 is a directory, copies are put in that directory. If dest is a
5807 file, there can only be one source.
5807 file, there can only be one source.
5808
5808
5809 By default, this command copies the contents of files as they
5809 By default, this command copies the contents of files as they
5810 exist in the working directory. If invoked with -A/--after, the
5810 exist in the working directory. If invoked with -A/--after, the
5811 operation is recorded, but no copying is performed.
5811 operation is recorded, but no copying is performed.
5812
5812
5813 This command takes effect at the next commit. To undo a rename
5813 This command takes effect at the next commit. To undo a rename
5814 before that, see :hg:`revert`.
5814 before that, see :hg:`revert`.
5815
5815
5816 Returns 0 on success, 1 if errors are encountered.
5816 Returns 0 on success, 1 if errors are encountered.
5817 """
5817 """
5818 opts = pycompat.byteskwargs(opts)
5818 opts = pycompat.byteskwargs(opts)
5819 with repo.wlock():
5819 with repo.wlock():
5820 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5820 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5821
5821
5822
5822
5823 @command(
5823 @command(
5824 b'resolve',
5824 b'resolve',
5825 [
5825 [
5826 (b'a', b'all', None, _(b'select all unresolved files')),
5826 (b'a', b'all', None, _(b'select all unresolved files')),
5827 (b'l', b'list', None, _(b'list state of files needing merge')),
5827 (b'l', b'list', None, _(b'list state of files needing merge')),
5828 (b'm', b'mark', None, _(b'mark files as resolved')),
5828 (b'm', b'mark', None, _(b'mark files as resolved')),
5829 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5829 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5830 (b'n', b'no-status', None, _(b'hide status prefix')),
5830 (b'n', b'no-status', None, _(b'hide status prefix')),
5831 (b'', b're-merge', None, _(b're-merge files')),
5831 (b'', b're-merge', None, _(b're-merge files')),
5832 ]
5832 ]
5833 + mergetoolopts
5833 + mergetoolopts
5834 + walkopts
5834 + walkopts
5835 + formatteropts,
5835 + formatteropts,
5836 _(b'[OPTION]... [FILE]...'),
5836 _(b'[OPTION]... [FILE]...'),
5837 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5837 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5838 inferrepo=True,
5838 inferrepo=True,
5839 )
5839 )
5840 def resolve(ui, repo, *pats, **opts):
5840 def resolve(ui, repo, *pats, **opts):
5841 """redo merges or set/view the merge status of files
5841 """redo merges or set/view the merge status of files
5842
5842
5843 Merges with unresolved conflicts are often the result of
5843 Merges with unresolved conflicts are often the result of
5844 non-interactive merging using the ``internal:merge`` configuration
5844 non-interactive merging using the ``internal:merge`` configuration
5845 setting, or a command-line merge tool like ``diff3``. The resolve
5845 setting, or a command-line merge tool like ``diff3``. The resolve
5846 command is used to manage the files involved in a merge, after
5846 command is used to manage the files involved in a merge, after
5847 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5847 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5848 working directory must have two parents). See :hg:`help
5848 working directory must have two parents). See :hg:`help
5849 merge-tools` for information on configuring merge tools.
5849 merge-tools` for information on configuring merge tools.
5850
5850
5851 The resolve command can be used in the following ways:
5851 The resolve command can be used in the following ways:
5852
5852
5853 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5853 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5854 the specified files, discarding any previous merge attempts. Re-merging
5854 the specified files, discarding any previous merge attempts. Re-merging
5855 is not performed for files already marked as resolved. Use ``--all/-a``
5855 is not performed for files already marked as resolved. Use ``--all/-a``
5856 to select all unresolved files. ``--tool`` can be used to specify
5856 to select all unresolved files. ``--tool`` can be used to specify
5857 the merge tool used for the given files. It overrides the HGMERGE
5857 the merge tool used for the given files. It overrides the HGMERGE
5858 environment variable and your configuration files. Previous file
5858 environment variable and your configuration files. Previous file
5859 contents are saved with a ``.orig`` suffix.
5859 contents are saved with a ``.orig`` suffix.
5860
5860
5861 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5861 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5862 (e.g. after having manually fixed-up the files). The default is
5862 (e.g. after having manually fixed-up the files). The default is
5863 to mark all unresolved files.
5863 to mark all unresolved files.
5864
5864
5865 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5865 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5866 default is to mark all resolved files.
5866 default is to mark all resolved files.
5867
5867
5868 - :hg:`resolve -l`: list files which had or still have conflicts.
5868 - :hg:`resolve -l`: list files which had or still have conflicts.
5869 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5869 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5870 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5870 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5871 the list. See :hg:`help filesets` for details.
5871 the list. See :hg:`help filesets` for details.
5872
5872
5873 .. note::
5873 .. note::
5874
5874
5875 Mercurial will not let you commit files with unresolved merge
5875 Mercurial will not let you commit files with unresolved merge
5876 conflicts. You must use :hg:`resolve -m ...` before you can
5876 conflicts. You must use :hg:`resolve -m ...` before you can
5877 commit after a conflicting merge.
5877 commit after a conflicting merge.
5878
5878
5879 .. container:: verbose
5879 .. container:: verbose
5880
5880
5881 Template:
5881 Template:
5882
5882
5883 The following keywords are supported in addition to the common template
5883 The following keywords are supported in addition to the common template
5884 keywords and functions. See also :hg:`help templates`.
5884 keywords and functions. See also :hg:`help templates`.
5885
5885
5886 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5886 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5887 :path: String. Repository-absolute path of the file.
5887 :path: String. Repository-absolute path of the file.
5888
5888
5889 Returns 0 on success, 1 if any files fail a resolve attempt.
5889 Returns 0 on success, 1 if any files fail a resolve attempt.
5890 """
5890 """
5891
5891
5892 opts = pycompat.byteskwargs(opts)
5892 opts = pycompat.byteskwargs(opts)
5893 confirm = ui.configbool(b'commands', b'resolve.confirm')
5893 confirm = ui.configbool(b'commands', b'resolve.confirm')
5894 flaglist = b'all mark unmark list no_status re_merge'.split()
5894 flaglist = b'all mark unmark list no_status re_merge'.split()
5895 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5895 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5896
5896
5897 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5897 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5898 if actioncount > 1:
5898 if actioncount > 1:
5899 raise error.Abort(_(b"too many actions specified"))
5899 raise error.Abort(_(b"too many actions specified"))
5900 elif actioncount == 0 and ui.configbool(
5900 elif actioncount == 0 and ui.configbool(
5901 b'commands', b'resolve.explicit-re-merge'
5901 b'commands', b'resolve.explicit-re-merge'
5902 ):
5902 ):
5903 hint = _(b'use --mark, --unmark, --list or --re-merge')
5903 hint = _(b'use --mark, --unmark, --list or --re-merge')
5904 raise error.Abort(_(b'no action specified'), hint=hint)
5904 raise error.Abort(_(b'no action specified'), hint=hint)
5905 if pats and all:
5905 if pats and all:
5906 raise error.Abort(_(b"can't specify --all and patterns"))
5906 raise error.Abort(_(b"can't specify --all and patterns"))
5907 if not (all or pats or show or mark or unmark):
5907 if not (all or pats or show or mark or unmark):
5908 raise error.Abort(
5908 raise error.Abort(
5909 _(b'no files or directories specified'),
5909 _(b'no files or directories specified'),
5910 hint=b'use --all to re-merge all unresolved files',
5910 hint=b'use --all to re-merge all unresolved files',
5911 )
5911 )
5912
5912
5913 if confirm:
5913 if confirm:
5914 if all:
5914 if all:
5915 if ui.promptchoice(
5915 if ui.promptchoice(
5916 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5916 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5917 ):
5917 ):
5918 raise error.Abort(_(b'user quit'))
5918 raise error.Abort(_(b'user quit'))
5919 if mark and not pats:
5919 if mark and not pats:
5920 if ui.promptchoice(
5920 if ui.promptchoice(
5921 _(
5921 _(
5922 b'mark all unresolved files as resolved (yn)?'
5922 b'mark all unresolved files as resolved (yn)?'
5923 b'$$ &Yes $$ &No'
5923 b'$$ &Yes $$ &No'
5924 )
5924 )
5925 ):
5925 ):
5926 raise error.Abort(_(b'user quit'))
5926 raise error.Abort(_(b'user quit'))
5927 if unmark and not pats:
5927 if unmark and not pats:
5928 if ui.promptchoice(
5928 if ui.promptchoice(
5929 _(
5929 _(
5930 b'mark all resolved files as unresolved (yn)?'
5930 b'mark all resolved files as unresolved (yn)?'
5931 b'$$ &Yes $$ &No'
5931 b'$$ &Yes $$ &No'
5932 )
5932 )
5933 ):
5933 ):
5934 raise error.Abort(_(b'user quit'))
5934 raise error.Abort(_(b'user quit'))
5935
5935
5936 uipathfn = scmutil.getuipathfn(repo)
5936 uipathfn = scmutil.getuipathfn(repo)
5937
5937
5938 if show:
5938 if show:
5939 ui.pager(b'resolve')
5939 ui.pager(b'resolve')
5940 fm = ui.formatter(b'resolve', opts)
5940 fm = ui.formatter(b'resolve', opts)
5941 ms = mergestatemod.mergestate.read(repo)
5941 ms = mergestatemod.mergestate.read(repo)
5942 wctx = repo[None]
5942 wctx = repo[None]
5943 m = scmutil.match(wctx, pats, opts)
5943 m = scmutil.match(wctx, pats, opts)
5944
5944
5945 # Labels and keys based on merge state. Unresolved path conflicts show
5945 # Labels and keys based on merge state. Unresolved path conflicts show
5946 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5946 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5947 # resolved conflicts.
5947 # resolved conflicts.
5948 mergestateinfo = {
5948 mergestateinfo = {
5949 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5949 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5950 b'resolve.unresolved',
5950 b'resolve.unresolved',
5951 b'U',
5951 b'U',
5952 ),
5952 ),
5953 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5953 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5954 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5954 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5955 b'resolve.unresolved',
5955 b'resolve.unresolved',
5956 b'P',
5956 b'P',
5957 ),
5957 ),
5958 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5958 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5959 b'resolve.resolved',
5959 b'resolve.resolved',
5960 b'R',
5960 b'R',
5961 ),
5961 ),
5962 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5962 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5963 b'resolve.driverresolved',
5963 b'resolve.driverresolved',
5964 b'D',
5964 b'D',
5965 ),
5965 ),
5966 }
5966 }
5967
5967
5968 for f in ms:
5968 for f in ms:
5969 if not m(f):
5969 if not m(f):
5970 continue
5970 continue
5971
5971
5972 label, key = mergestateinfo[ms[f]]
5972 label, key = mergestateinfo[ms[f]]
5973 fm.startitem()
5973 fm.startitem()
5974 fm.context(ctx=wctx)
5974 fm.context(ctx=wctx)
5975 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5975 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5976 fm.data(path=f)
5976 fm.data(path=f)
5977 fm.plain(b'%s\n' % uipathfn(f), label=label)
5977 fm.plain(b'%s\n' % uipathfn(f), label=label)
5978 fm.end()
5978 fm.end()
5979 return 0
5979 return 0
5980
5980
5981 with repo.wlock():
5981 with repo.wlock():
5982 ms = mergestatemod.mergestate.read(repo)
5982 ms = mergestatemod.mergestate.read(repo)
5983
5983
5984 if not (ms.active() or repo.dirstate.p2() != nullid):
5984 if not (ms.active() or repo.dirstate.p2() != nullid):
5985 raise error.Abort(
5985 raise error.Abort(
5986 _(b'resolve command not applicable when not merging')
5986 _(b'resolve command not applicable when not merging')
5987 )
5987 )
5988
5988
5989 wctx = repo[None]
5989 wctx = repo[None]
5990
5990
5991 if (
5991 if (
5992 ms.mergedriver
5992 ms.mergedriver
5993 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5993 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5994 ):
5994 ):
5995 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5995 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5996 ms.commit()
5996 ms.commit()
5997 # allow mark and unmark to go through
5997 # allow mark and unmark to go through
5998 if not mark and not unmark and not proceed:
5998 if not mark and not unmark and not proceed:
5999 return 1
5999 return 1
6000
6000
6001 m = scmutil.match(wctx, pats, opts)
6001 m = scmutil.match(wctx, pats, opts)
6002 ret = 0
6002 ret = 0
6003 didwork = False
6003 didwork = False
6004 runconclude = False
6004 runconclude = False
6005
6005
6006 tocomplete = []
6006 tocomplete = []
6007 hasconflictmarkers = []
6007 hasconflictmarkers = []
6008 if mark:
6008 if mark:
6009 markcheck = ui.config(b'commands', b'resolve.mark-check')
6009 markcheck = ui.config(b'commands', b'resolve.mark-check')
6010 if markcheck not in [b'warn', b'abort']:
6010 if markcheck not in [b'warn', b'abort']:
6011 # Treat all invalid / unrecognized values as 'none'.
6011 # Treat all invalid / unrecognized values as 'none'.
6012 markcheck = False
6012 markcheck = False
6013 for f in ms:
6013 for f in ms:
6014 if not m(f):
6014 if not m(f):
6015 continue
6015 continue
6016
6016
6017 didwork = True
6017 didwork = True
6018
6018
6019 # don't let driver-resolved files be marked, and run the conclude
6019 # don't let driver-resolved files be marked, and run the conclude
6020 # step if asked to resolve
6020 # step if asked to resolve
6021 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6021 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6022 exact = m.exact(f)
6022 exact = m.exact(f)
6023 if mark:
6023 if mark:
6024 if exact:
6024 if exact:
6025 ui.warn(
6025 ui.warn(
6026 _(b'not marking %s as it is driver-resolved\n')
6026 _(b'not marking %s as it is driver-resolved\n')
6027 % uipathfn(f)
6027 % uipathfn(f)
6028 )
6028 )
6029 elif unmark:
6029 elif unmark:
6030 if exact:
6030 if exact:
6031 ui.warn(
6031 ui.warn(
6032 _(b'not unmarking %s as it is driver-resolved\n')
6032 _(b'not unmarking %s as it is driver-resolved\n')
6033 % uipathfn(f)
6033 % uipathfn(f)
6034 )
6034 )
6035 else:
6035 else:
6036 runconclude = True
6036 runconclude = True
6037 continue
6037 continue
6038
6038
6039 # path conflicts must be resolved manually
6039 # path conflicts must be resolved manually
6040 if ms[f] in (
6040 if ms[f] in (
6041 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6041 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6042 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6042 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6043 ):
6043 ):
6044 if mark:
6044 if mark:
6045 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6045 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6046 elif unmark:
6046 elif unmark:
6047 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6047 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6048 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6048 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6049 ui.warn(
6049 ui.warn(
6050 _(b'%s: path conflict must be resolved manually\n')
6050 _(b'%s: path conflict must be resolved manually\n')
6051 % uipathfn(f)
6051 % uipathfn(f)
6052 )
6052 )
6053 continue
6053 continue
6054
6054
6055 if mark:
6055 if mark:
6056 if markcheck:
6056 if markcheck:
6057 fdata = repo.wvfs.tryread(f)
6057 fdata = repo.wvfs.tryread(f)
6058 if (
6058 if (
6059 filemerge.hasconflictmarkers(fdata)
6059 filemerge.hasconflictmarkers(fdata)
6060 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6060 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6061 ):
6061 ):
6062 hasconflictmarkers.append(f)
6062 hasconflictmarkers.append(f)
6063 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6063 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6064 elif unmark:
6064 elif unmark:
6065 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6065 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6066 else:
6066 else:
6067 # backup pre-resolve (merge uses .orig for its own purposes)
6067 # backup pre-resolve (merge uses .orig for its own purposes)
6068 a = repo.wjoin(f)
6068 a = repo.wjoin(f)
6069 try:
6069 try:
6070 util.copyfile(a, a + b".resolve")
6070 util.copyfile(a, a + b".resolve")
6071 except (IOError, OSError) as inst:
6071 except (IOError, OSError) as inst:
6072 if inst.errno != errno.ENOENT:
6072 if inst.errno != errno.ENOENT:
6073 raise
6073 raise
6074
6074
6075 try:
6075 try:
6076 # preresolve file
6076 # preresolve file
6077 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6077 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6078 with ui.configoverride(overrides, b'resolve'):
6078 with ui.configoverride(overrides, b'resolve'):
6079 complete, r = ms.preresolve(f, wctx)
6079 complete, r = ms.preresolve(f, wctx)
6080 if not complete:
6080 if not complete:
6081 tocomplete.append(f)
6081 tocomplete.append(f)
6082 elif r:
6082 elif r:
6083 ret = 1
6083 ret = 1
6084 finally:
6084 finally:
6085 ms.commit()
6085 ms.commit()
6086
6086
6087 # replace filemerge's .orig file with our resolve file, but only
6087 # replace filemerge's .orig file with our resolve file, but only
6088 # for merges that are complete
6088 # for merges that are complete
6089 if complete:
6089 if complete:
6090 try:
6090 try:
6091 util.rename(
6091 util.rename(
6092 a + b".resolve", scmutil.backuppath(ui, repo, f)
6092 a + b".resolve", scmutil.backuppath(ui, repo, f)
6093 )
6093 )
6094 except OSError as inst:
6094 except OSError as inst:
6095 if inst.errno != errno.ENOENT:
6095 if inst.errno != errno.ENOENT:
6096 raise
6096 raise
6097
6097
6098 if hasconflictmarkers:
6098 if hasconflictmarkers:
6099 ui.warn(
6099 ui.warn(
6100 _(
6100 _(
6101 b'warning: the following files still have conflict '
6101 b'warning: the following files still have conflict '
6102 b'markers:\n'
6102 b'markers:\n'
6103 )
6103 )
6104 + b''.join(
6104 + b''.join(
6105 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6105 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6106 )
6106 )
6107 )
6107 )
6108 if markcheck == b'abort' and not all and not pats:
6108 if markcheck == b'abort' and not all and not pats:
6109 raise error.Abort(
6109 raise error.Abort(
6110 _(b'conflict markers detected'),
6110 _(b'conflict markers detected'),
6111 hint=_(b'use --all to mark anyway'),
6111 hint=_(b'use --all to mark anyway'),
6112 )
6112 )
6113
6113
6114 for f in tocomplete:
6114 for f in tocomplete:
6115 try:
6115 try:
6116 # resolve file
6116 # resolve file
6117 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6117 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6118 with ui.configoverride(overrides, b'resolve'):
6118 with ui.configoverride(overrides, b'resolve'):
6119 r = ms.resolve(f, wctx)
6119 r = ms.resolve(f, wctx)
6120 if r:
6120 if r:
6121 ret = 1
6121 ret = 1
6122 finally:
6122 finally:
6123 ms.commit()
6123 ms.commit()
6124
6124
6125 # replace filemerge's .orig file with our resolve file
6125 # replace filemerge's .orig file with our resolve file
6126 a = repo.wjoin(f)
6126 a = repo.wjoin(f)
6127 try:
6127 try:
6128 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6128 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6129 except OSError as inst:
6129 except OSError as inst:
6130 if inst.errno != errno.ENOENT:
6130 if inst.errno != errno.ENOENT:
6131 raise
6131 raise
6132
6132
6133 ms.commit()
6133 ms.commit()
6134 branchmerge = repo.dirstate.p2() != nullid
6134 branchmerge = repo.dirstate.p2() != nullid
6135 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6135 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6136
6136
6137 if not didwork and pats:
6137 if not didwork and pats:
6138 hint = None
6138 hint = None
6139 if not any([p for p in pats if p.find(b':') >= 0]):
6139 if not any([p for p in pats if p.find(b':') >= 0]):
6140 pats = [b'path:%s' % p for p in pats]
6140 pats = [b'path:%s' % p for p in pats]
6141 m = scmutil.match(wctx, pats, opts)
6141 m = scmutil.match(wctx, pats, opts)
6142 for f in ms:
6142 for f in ms:
6143 if not m(f):
6143 if not m(f):
6144 continue
6144 continue
6145
6145
6146 def flag(o):
6146 def flag(o):
6147 if o == b're_merge':
6147 if o == b're_merge':
6148 return b'--re-merge '
6148 return b'--re-merge '
6149 return b'-%s ' % o[0:1]
6149 return b'-%s ' % o[0:1]
6150
6150
6151 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6151 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6152 hint = _(b"(try: hg resolve %s%s)\n") % (
6152 hint = _(b"(try: hg resolve %s%s)\n") % (
6153 flags,
6153 flags,
6154 b' '.join(pats),
6154 b' '.join(pats),
6155 )
6155 )
6156 break
6156 break
6157 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6157 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6158 if hint:
6158 if hint:
6159 ui.warn(hint)
6159 ui.warn(hint)
6160 elif ms.mergedriver and ms.mdstate() != b's':
6160 elif ms.mergedriver and ms.mdstate() != b's':
6161 # run conclude step when either a driver-resolved file is requested
6161 # run conclude step when either a driver-resolved file is requested
6162 # or there are no driver-resolved files
6162 # or there are no driver-resolved files
6163 # we can't use 'ret' to determine whether any files are unresolved
6163 # we can't use 'ret' to determine whether any files are unresolved
6164 # because we might not have tried to resolve some
6164 # because we might not have tried to resolve some
6165 if (runconclude or not list(ms.driverresolved())) and not list(
6165 if (runconclude or not list(ms.driverresolved())) and not list(
6166 ms.unresolved()
6166 ms.unresolved()
6167 ):
6167 ):
6168 proceed = mergemod.driverconclude(repo, ms, wctx)
6168 proceed = mergemod.driverconclude(repo, ms, wctx)
6169 ms.commit()
6169 ms.commit()
6170 if not proceed:
6170 if not proceed:
6171 return 1
6171 return 1
6172
6172
6173 # Nudge users into finishing an unfinished operation
6173 # Nudge users into finishing an unfinished operation
6174 unresolvedf = list(ms.unresolved())
6174 unresolvedf = list(ms.unresolved())
6175 driverresolvedf = list(ms.driverresolved())
6175 driverresolvedf = list(ms.driverresolved())
6176 if not unresolvedf and not driverresolvedf:
6176 if not unresolvedf and not driverresolvedf:
6177 ui.status(_(b'(no more unresolved files)\n'))
6177 ui.status(_(b'(no more unresolved files)\n'))
6178 cmdutil.checkafterresolved(repo)
6178 cmdutil.checkafterresolved(repo)
6179 elif not unresolvedf:
6179 elif not unresolvedf:
6180 ui.status(
6180 ui.status(
6181 _(
6181 _(
6182 b'(no more unresolved files -- '
6182 b'(no more unresolved files -- '
6183 b'run "hg resolve --all" to conclude)\n'
6183 b'run "hg resolve --all" to conclude)\n'
6184 )
6184 )
6185 )
6185 )
6186
6186
6187 return ret
6187 return ret
6188
6188
6189
6189
6190 @command(
6190 @command(
6191 b'revert',
6191 b'revert',
6192 [
6192 [
6193 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6193 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6194 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6194 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6195 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6195 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6196 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6196 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6197 (b'i', b'interactive', None, _(b'interactively select the changes')),
6197 (b'i', b'interactive', None, _(b'interactively select the changes')),
6198 ]
6198 ]
6199 + walkopts
6199 + walkopts
6200 + dryrunopts,
6200 + dryrunopts,
6201 _(b'[OPTION]... [-r REV] [NAME]...'),
6201 _(b'[OPTION]... [-r REV] [NAME]...'),
6202 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6202 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6203 )
6203 )
6204 def revert(ui, repo, *pats, **opts):
6204 def revert(ui, repo, *pats, **opts):
6205 """restore files to their checkout state
6205 """restore files to their checkout state
6206
6206
6207 .. note::
6207 .. note::
6208
6208
6209 To check out earlier revisions, you should use :hg:`update REV`.
6209 To check out earlier revisions, you should use :hg:`update REV`.
6210 To cancel an uncommitted merge (and lose your changes),
6210 To cancel an uncommitted merge (and lose your changes),
6211 use :hg:`merge --abort`.
6211 use :hg:`merge --abort`.
6212
6212
6213 With no revision specified, revert the specified files or directories
6213 With no revision specified, revert the specified files or directories
6214 to the contents they had in the parent of the working directory.
6214 to the contents they had in the parent of the working directory.
6215 This restores the contents of files to an unmodified
6215 This restores the contents of files to an unmodified
6216 state and unschedules adds, removes, copies, and renames. If the
6216 state and unschedules adds, removes, copies, and renames. If the
6217 working directory has two parents, you must explicitly specify a
6217 working directory has two parents, you must explicitly specify a
6218 revision.
6218 revision.
6219
6219
6220 Using the -r/--rev or -d/--date options, revert the given files or
6220 Using the -r/--rev or -d/--date options, revert the given files or
6221 directories to their states as of a specific revision. Because
6221 directories to their states as of a specific revision. Because
6222 revert does not change the working directory parents, this will
6222 revert does not change the working directory parents, this will
6223 cause these files to appear modified. This can be helpful to "back
6223 cause these files to appear modified. This can be helpful to "back
6224 out" some or all of an earlier change. See :hg:`backout` for a
6224 out" some or all of an earlier change. See :hg:`backout` for a
6225 related method.
6225 related method.
6226
6226
6227 Modified files are saved with a .orig suffix before reverting.
6227 Modified files are saved with a .orig suffix before reverting.
6228 To disable these backups, use --no-backup. It is possible to store
6228 To disable these backups, use --no-backup. It is possible to store
6229 the backup files in a custom directory relative to the root of the
6229 the backup files in a custom directory relative to the root of the
6230 repository by setting the ``ui.origbackuppath`` configuration
6230 repository by setting the ``ui.origbackuppath`` configuration
6231 option.
6231 option.
6232
6232
6233 See :hg:`help dates` for a list of formats valid for -d/--date.
6233 See :hg:`help dates` for a list of formats valid for -d/--date.
6234
6234
6235 See :hg:`help backout` for a way to reverse the effect of an
6235 See :hg:`help backout` for a way to reverse the effect of an
6236 earlier changeset.
6236 earlier changeset.
6237
6237
6238 Returns 0 on success.
6238 Returns 0 on success.
6239 """
6239 """
6240
6240
6241 opts = pycompat.byteskwargs(opts)
6241 opts = pycompat.byteskwargs(opts)
6242 if opts.get(b"date"):
6242 if opts.get(b"date"):
6243 if opts.get(b"rev"):
6243 if opts.get(b"rev"):
6244 raise error.Abort(_(b"you can't specify a revision and a date"))
6244 raise error.Abort(_(b"you can't specify a revision and a date"))
6245 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6245 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6246
6246
6247 parent, p2 = repo.dirstate.parents()
6247 parent, p2 = repo.dirstate.parents()
6248 if not opts.get(b'rev') and p2 != nullid:
6248 if not opts.get(b'rev') and p2 != nullid:
6249 # revert after merge is a trap for new users (issue2915)
6249 # revert after merge is a trap for new users (issue2915)
6250 raise error.Abort(
6250 raise error.Abort(
6251 _(b'uncommitted merge with no revision specified'),
6251 _(b'uncommitted merge with no revision specified'),
6252 hint=_(b"use 'hg update' or see 'hg help revert'"),
6252 hint=_(b"use 'hg update' or see 'hg help revert'"),
6253 )
6253 )
6254
6254
6255 rev = opts.get(b'rev')
6255 rev = opts.get(b'rev')
6256 if rev:
6256 if rev:
6257 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6257 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6258 ctx = scmutil.revsingle(repo, rev)
6258 ctx = scmutil.revsingle(repo, rev)
6259
6259
6260 if not (
6260 if not (
6261 pats
6261 pats
6262 or opts.get(b'include')
6262 or opts.get(b'include')
6263 or opts.get(b'exclude')
6263 or opts.get(b'exclude')
6264 or opts.get(b'all')
6264 or opts.get(b'all')
6265 or opts.get(b'interactive')
6265 or opts.get(b'interactive')
6266 ):
6266 ):
6267 msg = _(b"no files or directories specified")
6267 msg = _(b"no files or directories specified")
6268 if p2 != nullid:
6268 if p2 != nullid:
6269 hint = _(
6269 hint = _(
6270 b"uncommitted merge, use --all to discard all changes,"
6270 b"uncommitted merge, use --all to discard all changes,"
6271 b" or 'hg update -C .' to abort the merge"
6271 b" or 'hg update -C .' to abort the merge"
6272 )
6272 )
6273 raise error.Abort(msg, hint=hint)
6273 raise error.Abort(msg, hint=hint)
6274 dirty = any(repo.status())
6274 dirty = any(repo.status())
6275 node = ctx.node()
6275 node = ctx.node()
6276 if node != parent:
6276 if node != parent:
6277 if dirty:
6277 if dirty:
6278 hint = (
6278 hint = (
6279 _(
6279 _(
6280 b"uncommitted changes, use --all to discard all"
6280 b"uncommitted changes, use --all to discard all"
6281 b" changes, or 'hg update %d' to update"
6281 b" changes, or 'hg update %d' to update"
6282 )
6282 )
6283 % ctx.rev()
6283 % ctx.rev()
6284 )
6284 )
6285 else:
6285 else:
6286 hint = (
6286 hint = (
6287 _(
6287 _(
6288 b"use --all to revert all files,"
6288 b"use --all to revert all files,"
6289 b" or 'hg update %d' to update"
6289 b" or 'hg update %d' to update"
6290 )
6290 )
6291 % ctx.rev()
6291 % ctx.rev()
6292 )
6292 )
6293 elif dirty:
6293 elif dirty:
6294 hint = _(b"uncommitted changes, use --all to discard all changes")
6294 hint = _(b"uncommitted changes, use --all to discard all changes")
6295 else:
6295 else:
6296 hint = _(b"use --all to revert all files")
6296 hint = _(b"use --all to revert all files")
6297 raise error.Abort(msg, hint=hint)
6297 raise error.Abort(msg, hint=hint)
6298
6298
6299 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6299 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6300
6300
6301
6301
6302 @command(
6302 @command(
6303 b'rollback',
6303 b'rollback',
6304 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6304 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6305 helpcategory=command.CATEGORY_MAINTENANCE,
6305 helpcategory=command.CATEGORY_MAINTENANCE,
6306 )
6306 )
6307 def rollback(ui, repo, **opts):
6307 def rollback(ui, repo, **opts):
6308 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6308 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6309
6309
6310 Please use :hg:`commit --amend` instead of rollback to correct
6310 Please use :hg:`commit --amend` instead of rollback to correct
6311 mistakes in the last commit.
6311 mistakes in the last commit.
6312
6312
6313 This command should be used with care. There is only one level of
6313 This command should be used with care. There is only one level of
6314 rollback, and there is no way to undo a rollback. It will also
6314 rollback, and there is no way to undo a rollback. It will also
6315 restore the dirstate at the time of the last transaction, losing
6315 restore the dirstate at the time of the last transaction, losing
6316 any dirstate changes since that time. This command does not alter
6316 any dirstate changes since that time. This command does not alter
6317 the working directory.
6317 the working directory.
6318
6318
6319 Transactions are used to encapsulate the effects of all commands
6319 Transactions are used to encapsulate the effects of all commands
6320 that create new changesets or propagate existing changesets into a
6320 that create new changesets or propagate existing changesets into a
6321 repository.
6321 repository.
6322
6322
6323 .. container:: verbose
6323 .. container:: verbose
6324
6324
6325 For example, the following commands are transactional, and their
6325 For example, the following commands are transactional, and their
6326 effects can be rolled back:
6326 effects can be rolled back:
6327
6327
6328 - commit
6328 - commit
6329 - import
6329 - import
6330 - pull
6330 - pull
6331 - push (with this repository as the destination)
6331 - push (with this repository as the destination)
6332 - unbundle
6332 - unbundle
6333
6333
6334 To avoid permanent data loss, rollback will refuse to rollback a
6334 To avoid permanent data loss, rollback will refuse to rollback a
6335 commit transaction if it isn't checked out. Use --force to
6335 commit transaction if it isn't checked out. Use --force to
6336 override this protection.
6336 override this protection.
6337
6337
6338 The rollback command can be entirely disabled by setting the
6338 The rollback command can be entirely disabled by setting the
6339 ``ui.rollback`` configuration setting to false. If you're here
6339 ``ui.rollback`` configuration setting to false. If you're here
6340 because you want to use rollback and it's disabled, you can
6340 because you want to use rollback and it's disabled, you can
6341 re-enable the command by setting ``ui.rollback`` to true.
6341 re-enable the command by setting ``ui.rollback`` to true.
6342
6342
6343 This command is not intended for use on public repositories. Once
6343 This command is not intended for use on public repositories. Once
6344 changes are visible for pull by other users, rolling a transaction
6344 changes are visible for pull by other users, rolling a transaction
6345 back locally is ineffective (someone else may already have pulled
6345 back locally is ineffective (someone else may already have pulled
6346 the changes). Furthermore, a race is possible with readers of the
6346 the changes). Furthermore, a race is possible with readers of the
6347 repository; for example an in-progress pull from the repository
6347 repository; for example an in-progress pull from the repository
6348 may fail if a rollback is performed.
6348 may fail if a rollback is performed.
6349
6349
6350 Returns 0 on success, 1 if no rollback data is available.
6350 Returns 0 on success, 1 if no rollback data is available.
6351 """
6351 """
6352 if not ui.configbool(b'ui', b'rollback'):
6352 if not ui.configbool(b'ui', b'rollback'):
6353 raise error.Abort(
6353 raise error.Abort(
6354 _(b'rollback is disabled because it is unsafe'),
6354 _(b'rollback is disabled because it is unsafe'),
6355 hint=b'see `hg help -v rollback` for information',
6355 hint=b'see `hg help -v rollback` for information',
6356 )
6356 )
6357 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6357 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6358
6358
6359
6359
6360 @command(
6360 @command(
6361 b'root',
6361 b'root',
6362 [] + formatteropts,
6362 [] + formatteropts,
6363 intents={INTENT_READONLY},
6363 intents={INTENT_READONLY},
6364 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6364 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6365 )
6365 )
6366 def root(ui, repo, **opts):
6366 def root(ui, repo, **opts):
6367 """print the root (top) of the current working directory
6367 """print the root (top) of the current working directory
6368
6368
6369 Print the root directory of the current repository.
6369 Print the root directory of the current repository.
6370
6370
6371 .. container:: verbose
6371 .. container:: verbose
6372
6372
6373 Template:
6373 Template:
6374
6374
6375 The following keywords are supported in addition to the common template
6375 The following keywords are supported in addition to the common template
6376 keywords and functions. See also :hg:`help templates`.
6376 keywords and functions. See also :hg:`help templates`.
6377
6377
6378 :hgpath: String. Path to the .hg directory.
6378 :hgpath: String. Path to the .hg directory.
6379 :storepath: String. Path to the directory holding versioned data.
6379 :storepath: String. Path to the directory holding versioned data.
6380
6380
6381 Returns 0 on success.
6381 Returns 0 on success.
6382 """
6382 """
6383 opts = pycompat.byteskwargs(opts)
6383 opts = pycompat.byteskwargs(opts)
6384 with ui.formatter(b'root', opts) as fm:
6384 with ui.formatter(b'root', opts) as fm:
6385 fm.startitem()
6385 fm.startitem()
6386 fm.write(b'reporoot', b'%s\n', repo.root)
6386 fm.write(b'reporoot', b'%s\n', repo.root)
6387 fm.data(hgpath=repo.path, storepath=repo.spath)
6387 fm.data(hgpath=repo.path, storepath=repo.spath)
6388
6388
6389
6389
6390 @command(
6390 @command(
6391 b'serve',
6391 b'serve',
6392 [
6392 [
6393 (
6393 (
6394 b'A',
6394 b'A',
6395 b'accesslog',
6395 b'accesslog',
6396 b'',
6396 b'',
6397 _(b'name of access log file to write to'),
6397 _(b'name of access log file to write to'),
6398 _(b'FILE'),
6398 _(b'FILE'),
6399 ),
6399 ),
6400 (b'd', b'daemon', None, _(b'run server in background')),
6400 (b'd', b'daemon', None, _(b'run server in background')),
6401 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6401 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6402 (
6402 (
6403 b'E',
6403 b'E',
6404 b'errorlog',
6404 b'errorlog',
6405 b'',
6405 b'',
6406 _(b'name of error log file to write to'),
6406 _(b'name of error log file to write to'),
6407 _(b'FILE'),
6407 _(b'FILE'),
6408 ),
6408 ),
6409 # use string type, then we can check if something was passed
6409 # use string type, then we can check if something was passed
6410 (
6410 (
6411 b'p',
6411 b'p',
6412 b'port',
6412 b'port',
6413 b'',
6413 b'',
6414 _(b'port to listen on (default: 8000)'),
6414 _(b'port to listen on (default: 8000)'),
6415 _(b'PORT'),
6415 _(b'PORT'),
6416 ),
6416 ),
6417 (
6417 (
6418 b'a',
6418 b'a',
6419 b'address',
6419 b'address',
6420 b'',
6420 b'',
6421 _(b'address to listen on (default: all interfaces)'),
6421 _(b'address to listen on (default: all interfaces)'),
6422 _(b'ADDR'),
6422 _(b'ADDR'),
6423 ),
6423 ),
6424 (
6424 (
6425 b'',
6425 b'',
6426 b'prefix',
6426 b'prefix',
6427 b'',
6427 b'',
6428 _(b'prefix path to serve from (default: server root)'),
6428 _(b'prefix path to serve from (default: server root)'),
6429 _(b'PREFIX'),
6429 _(b'PREFIX'),
6430 ),
6430 ),
6431 (
6431 (
6432 b'n',
6432 b'n',
6433 b'name',
6433 b'name',
6434 b'',
6434 b'',
6435 _(b'name to show in web pages (default: working directory)'),
6435 _(b'name to show in web pages (default: working directory)'),
6436 _(b'NAME'),
6436 _(b'NAME'),
6437 ),
6437 ),
6438 (
6438 (
6439 b'',
6439 b'',
6440 b'web-conf',
6440 b'web-conf',
6441 b'',
6441 b'',
6442 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6442 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6443 _(b'FILE'),
6443 _(b'FILE'),
6444 ),
6444 ),
6445 (
6445 (
6446 b'',
6446 b'',
6447 b'webdir-conf',
6447 b'webdir-conf',
6448 b'',
6448 b'',
6449 _(b'name of the hgweb config file (DEPRECATED)'),
6449 _(b'name of the hgweb config file (DEPRECATED)'),
6450 _(b'FILE'),
6450 _(b'FILE'),
6451 ),
6451 ),
6452 (
6452 (
6453 b'',
6453 b'',
6454 b'pid-file',
6454 b'pid-file',
6455 b'',
6455 b'',
6456 _(b'name of file to write process ID to'),
6456 _(b'name of file to write process ID to'),
6457 _(b'FILE'),
6457 _(b'FILE'),
6458 ),
6458 ),
6459 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6459 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6460 (
6460 (
6461 b'',
6461 b'',
6462 b'cmdserver',
6462 b'cmdserver',
6463 b'',
6463 b'',
6464 _(b'for remote clients (ADVANCED)'),
6464 _(b'for remote clients (ADVANCED)'),
6465 _(b'MODE'),
6465 _(b'MODE'),
6466 ),
6466 ),
6467 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6467 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6468 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6468 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6469 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6469 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6470 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6470 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6471 (b'', b'print-url', None, _(b'start and print only the URL')),
6471 (b'', b'print-url', None, _(b'start and print only the URL')),
6472 ]
6472 ]
6473 + subrepoopts,
6473 + subrepoopts,
6474 _(b'[OPTION]...'),
6474 _(b'[OPTION]...'),
6475 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6475 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6476 helpbasic=True,
6476 helpbasic=True,
6477 optionalrepo=True,
6477 optionalrepo=True,
6478 )
6478 )
6479 def serve(ui, repo, **opts):
6479 def serve(ui, repo, **opts):
6480 """start stand-alone webserver
6480 """start stand-alone webserver
6481
6481
6482 Start a local HTTP repository browser and pull server. You can use
6482 Start a local HTTP repository browser and pull server. You can use
6483 this for ad-hoc sharing and browsing of repositories. It is
6483 this for ad-hoc sharing and browsing of repositories. It is
6484 recommended to use a real web server to serve a repository for
6484 recommended to use a real web server to serve a repository for
6485 longer periods of time.
6485 longer periods of time.
6486
6486
6487 Please note that the server does not implement access control.
6487 Please note that the server does not implement access control.
6488 This means that, by default, anybody can read from the server and
6488 This means that, by default, anybody can read from the server and
6489 nobody can write to it by default. Set the ``web.allow-push``
6489 nobody can write to it by default. Set the ``web.allow-push``
6490 option to ``*`` to allow everybody to push to the server. You
6490 option to ``*`` to allow everybody to push to the server. You
6491 should use a real web server if you need to authenticate users.
6491 should use a real web server if you need to authenticate users.
6492
6492
6493 By default, the server logs accesses to stdout and errors to
6493 By default, the server logs accesses to stdout and errors to
6494 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6494 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6495 files.
6495 files.
6496
6496
6497 To have the server choose a free port number to listen on, specify
6497 To have the server choose a free port number to listen on, specify
6498 a port number of 0; in this case, the server will print the port
6498 a port number of 0; in this case, the server will print the port
6499 number it uses.
6499 number it uses.
6500
6500
6501 Returns 0 on success.
6501 Returns 0 on success.
6502 """
6502 """
6503
6503
6504 opts = pycompat.byteskwargs(opts)
6504 opts = pycompat.byteskwargs(opts)
6505 if opts[b"stdio"] and opts[b"cmdserver"]:
6505 if opts[b"stdio"] and opts[b"cmdserver"]:
6506 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6506 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6507 if opts[b"print_url"] and ui.verbose:
6507 if opts[b"print_url"] and ui.verbose:
6508 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6508 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6509
6509
6510 if opts[b"stdio"]:
6510 if opts[b"stdio"]:
6511 if repo is None:
6511 if repo is None:
6512 raise error.RepoError(
6512 raise error.RepoError(
6513 _(b"there is no Mercurial repository here (.hg not found)")
6513 _(b"there is no Mercurial repository here (.hg not found)")
6514 )
6514 )
6515 s = wireprotoserver.sshserver(ui, repo)
6515 s = wireprotoserver.sshserver(ui, repo)
6516 s.serve_forever()
6516 s.serve_forever()
6517
6517
6518 service = server.createservice(ui, repo, opts)
6518 service = server.createservice(ui, repo, opts)
6519 return server.runservice(opts, initfn=service.init, runfn=service.run)
6519 return server.runservice(opts, initfn=service.init, runfn=service.run)
6520
6520
6521
6521
6522 @command(
6522 @command(
6523 b'shelve',
6523 b'shelve',
6524 [
6524 [
6525 (
6525 (
6526 b'A',
6526 b'A',
6527 b'addremove',
6527 b'addremove',
6528 None,
6528 None,
6529 _(b'mark new/missing files as added/removed before shelving'),
6529 _(b'mark new/missing files as added/removed before shelving'),
6530 ),
6530 ),
6531 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6531 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6532 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6532 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6533 (
6533 (
6534 b'',
6534 b'',
6535 b'date',
6535 b'date',
6536 b'',
6536 b'',
6537 _(b'shelve with the specified commit date'),
6537 _(b'shelve with the specified commit date'),
6538 _(b'DATE'),
6538 _(b'DATE'),
6539 ),
6539 ),
6540 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6540 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6541 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6541 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6542 (
6542 (
6543 b'k',
6543 b'k',
6544 b'keep',
6544 b'keep',
6545 False,
6545 False,
6546 _(b'shelve, but keep changes in the working directory'),
6546 _(b'shelve, but keep changes in the working directory'),
6547 ),
6547 ),
6548 (b'l', b'list', None, _(b'list current shelves')),
6548 (b'l', b'list', None, _(b'list current shelves')),
6549 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6549 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6550 (
6550 (
6551 b'n',
6551 b'n',
6552 b'name',
6552 b'name',
6553 b'',
6553 b'',
6554 _(b'use the given name for the shelved commit'),
6554 _(b'use the given name for the shelved commit'),
6555 _(b'NAME'),
6555 _(b'NAME'),
6556 ),
6556 ),
6557 (
6557 (
6558 b'p',
6558 b'p',
6559 b'patch',
6559 b'patch',
6560 None,
6560 None,
6561 _(
6561 _(
6562 b'output patches for changes (provide the names of the shelved '
6562 b'output patches for changes (provide the names of the shelved '
6563 b'changes as positional arguments)'
6563 b'changes as positional arguments)'
6564 ),
6564 ),
6565 ),
6565 ),
6566 (b'i', b'interactive', None, _(b'interactive mode')),
6566 (b'i', b'interactive', None, _(b'interactive mode')),
6567 (
6567 (
6568 b'',
6568 b'',
6569 b'stat',
6569 b'stat',
6570 None,
6570 None,
6571 _(
6571 _(
6572 b'output diffstat-style summary of changes (provide the names of '
6572 b'output diffstat-style summary of changes (provide the names of '
6573 b'the shelved changes as positional arguments)'
6573 b'the shelved changes as positional arguments)'
6574 ),
6574 ),
6575 ),
6575 ),
6576 ]
6576 ]
6577 + cmdutil.walkopts,
6577 + cmdutil.walkopts,
6578 _(b'hg shelve [OPTION]... [FILE]...'),
6578 _(b'hg shelve [OPTION]... [FILE]...'),
6579 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6579 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6580 )
6580 )
6581 def shelve(ui, repo, *pats, **opts):
6581 def shelve(ui, repo, *pats, **opts):
6582 '''save and set aside changes from the working directory
6582 '''save and set aside changes from the working directory
6583
6583
6584 Shelving takes files that "hg status" reports as not clean, saves
6584 Shelving takes files that "hg status" reports as not clean, saves
6585 the modifications to a bundle (a shelved change), and reverts the
6585 the modifications to a bundle (a shelved change), and reverts the
6586 files so that their state in the working directory becomes clean.
6586 files so that their state in the working directory becomes clean.
6587
6587
6588 To restore these changes to the working directory, using "hg
6588 To restore these changes to the working directory, using "hg
6589 unshelve"; this will work even if you switch to a different
6589 unshelve"; this will work even if you switch to a different
6590 commit.
6590 commit.
6591
6591
6592 When no files are specified, "hg shelve" saves all not-clean
6592 When no files are specified, "hg shelve" saves all not-clean
6593 files. If specific files or directories are named, only changes to
6593 files. If specific files or directories are named, only changes to
6594 those files are shelved.
6594 those files are shelved.
6595
6595
6596 In bare shelve (when no files are specified, without interactive,
6596 In bare shelve (when no files are specified, without interactive,
6597 include and exclude option), shelving remembers information if the
6597 include and exclude option), shelving remembers information if the
6598 working directory was on newly created branch, in other words working
6598 working directory was on newly created branch, in other words working
6599 directory was on different branch than its first parent. In this
6599 directory was on different branch than its first parent. In this
6600 situation unshelving restores branch information to the working directory.
6600 situation unshelving restores branch information to the working directory.
6601
6601
6602 Each shelved change has a name that makes it easier to find later.
6602 Each shelved change has a name that makes it easier to find later.
6603 The name of a shelved change defaults to being based on the active
6603 The name of a shelved change defaults to being based on the active
6604 bookmark, or if there is no active bookmark, the current named
6604 bookmark, or if there is no active bookmark, the current named
6605 branch. To specify a different name, use ``--name``.
6605 branch. To specify a different name, use ``--name``.
6606
6606
6607 To see a list of existing shelved changes, use the ``--list``
6607 To see a list of existing shelved changes, use the ``--list``
6608 option. For each shelved change, this will print its name, age,
6608 option. For each shelved change, this will print its name, age,
6609 and description; use ``--patch`` or ``--stat`` for more details.
6609 and description; use ``--patch`` or ``--stat`` for more details.
6610
6610
6611 To delete specific shelved changes, use ``--delete``. To delete
6611 To delete specific shelved changes, use ``--delete``. To delete
6612 all shelved changes, use ``--cleanup``.
6612 all shelved changes, use ``--cleanup``.
6613 '''
6613 '''
6614 opts = pycompat.byteskwargs(opts)
6614 opts = pycompat.byteskwargs(opts)
6615 allowables = [
6615 allowables = [
6616 (b'addremove', {b'create'}), # 'create' is pseudo action
6616 (b'addremove', {b'create'}), # 'create' is pseudo action
6617 (b'unknown', {b'create'}),
6617 (b'unknown', {b'create'}),
6618 (b'cleanup', {b'cleanup'}),
6618 (b'cleanup', {b'cleanup'}),
6619 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6619 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6620 (b'delete', {b'delete'}),
6620 (b'delete', {b'delete'}),
6621 (b'edit', {b'create'}),
6621 (b'edit', {b'create'}),
6622 (b'keep', {b'create'}),
6622 (b'keep', {b'create'}),
6623 (b'list', {b'list'}),
6623 (b'list', {b'list'}),
6624 (b'message', {b'create'}),
6624 (b'message', {b'create'}),
6625 (b'name', {b'create'}),
6625 (b'name', {b'create'}),
6626 (b'patch', {b'patch', b'list'}),
6626 (b'patch', {b'patch', b'list'}),
6627 (b'stat', {b'stat', b'list'}),
6627 (b'stat', {b'stat', b'list'}),
6628 ]
6628 ]
6629
6629
6630 def checkopt(opt):
6630 def checkopt(opt):
6631 if opts.get(opt):
6631 if opts.get(opt):
6632 for i, allowable in allowables:
6632 for i, allowable in allowables:
6633 if opts[i] and opt not in allowable:
6633 if opts[i] and opt not in allowable:
6634 raise error.Abort(
6634 raise error.Abort(
6635 _(
6635 _(
6636 b"options '--%s' and '--%s' may not be "
6636 b"options '--%s' and '--%s' may not be "
6637 b"used together"
6637 b"used together"
6638 )
6638 )
6639 % (opt, i)
6639 % (opt, i)
6640 )
6640 )
6641 return True
6641 return True
6642
6642
6643 if checkopt(b'cleanup'):
6643 if checkopt(b'cleanup'):
6644 if pats:
6644 if pats:
6645 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6645 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6646 return shelvemod.cleanupcmd(ui, repo)
6646 return shelvemod.cleanupcmd(ui, repo)
6647 elif checkopt(b'delete'):
6647 elif checkopt(b'delete'):
6648 return shelvemod.deletecmd(ui, repo, pats)
6648 return shelvemod.deletecmd(ui, repo, pats)
6649 elif checkopt(b'list'):
6649 elif checkopt(b'list'):
6650 return shelvemod.listcmd(ui, repo, pats, opts)
6650 return shelvemod.listcmd(ui, repo, pats, opts)
6651 elif checkopt(b'patch') or checkopt(b'stat'):
6651 elif checkopt(b'patch') or checkopt(b'stat'):
6652 return shelvemod.patchcmds(ui, repo, pats, opts)
6652 return shelvemod.patchcmds(ui, repo, pats, opts)
6653 else:
6653 else:
6654 return shelvemod.createcmd(ui, repo, pats, opts)
6654 return shelvemod.createcmd(ui, repo, pats, opts)
6655
6655
6656
6656
6657 _NOTTERSE = b'nothing'
6657 _NOTTERSE = b'nothing'
6658
6658
6659
6659
6660 @command(
6660 @command(
6661 b'status|st',
6661 b'status|st',
6662 [
6662 [
6663 (b'A', b'all', None, _(b'show status of all files')),
6663 (b'A', b'all', None, _(b'show status of all files')),
6664 (b'm', b'modified', None, _(b'show only modified files')),
6664 (b'm', b'modified', None, _(b'show only modified files')),
6665 (b'a', b'added', None, _(b'show only added files')),
6665 (b'a', b'added', None, _(b'show only added files')),
6666 (b'r', b'removed', None, _(b'show only removed files')),
6666 (b'r', b'removed', None, _(b'show only removed files')),
6667 (b'd', b'deleted', None, _(b'show only missing files')),
6667 (b'd', b'deleted', None, _(b'show only missing files')),
6668 (b'c', b'clean', None, _(b'show only files without changes')),
6668 (b'c', b'clean', None, _(b'show only files without changes')),
6669 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6669 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6670 (b'i', b'ignored', None, _(b'show only ignored files')),
6670 (b'i', b'ignored', None, _(b'show only ignored files')),
6671 (b'n', b'no-status', None, _(b'hide status prefix')),
6671 (b'n', b'no-status', None, _(b'hide status prefix')),
6672 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6672 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6673 (
6673 (
6674 b'C',
6674 b'C',
6675 b'copies',
6675 b'copies',
6676 None,
6676 None,
6677 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6677 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6678 ),
6678 ),
6679 (
6679 (
6680 b'0',
6680 b'0',
6681 b'print0',
6681 b'print0',
6682 None,
6682 None,
6683 _(b'end filenames with NUL, for use with xargs'),
6683 _(b'end filenames with NUL, for use with xargs'),
6684 ),
6684 ),
6685 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6685 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6686 (
6686 (
6687 b'',
6687 b'',
6688 b'change',
6688 b'change',
6689 b'',
6689 b'',
6690 _(b'list the changed files of a revision'),
6690 _(b'list the changed files of a revision'),
6691 _(b'REV'),
6691 _(b'REV'),
6692 ),
6692 ),
6693 ]
6693 ]
6694 + walkopts
6694 + walkopts
6695 + subrepoopts
6695 + subrepoopts
6696 + formatteropts,
6696 + formatteropts,
6697 _(b'[OPTION]... [FILE]...'),
6697 _(b'[OPTION]... [FILE]...'),
6698 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6698 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6699 helpbasic=True,
6699 helpbasic=True,
6700 inferrepo=True,
6700 inferrepo=True,
6701 intents={INTENT_READONLY},
6701 intents={INTENT_READONLY},
6702 )
6702 )
6703 def status(ui, repo, *pats, **opts):
6703 def status(ui, repo, *pats, **opts):
6704 """show changed files in the working directory
6704 """show changed files in the working directory
6705
6705
6706 Show status of files in the repository. If names are given, only
6706 Show status of files in the repository. If names are given, only
6707 files that match are shown. Files that are clean or ignored or
6707 files that match are shown. Files that are clean or ignored or
6708 the source of a copy/move operation, are not listed unless
6708 the source of a copy/move operation, are not listed unless
6709 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6709 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6710 Unless options described with "show only ..." are given, the
6710 Unless options described with "show only ..." are given, the
6711 options -mardu are used.
6711 options -mardu are used.
6712
6712
6713 Option -q/--quiet hides untracked (unknown and ignored) files
6713 Option -q/--quiet hides untracked (unknown and ignored) files
6714 unless explicitly requested with -u/--unknown or -i/--ignored.
6714 unless explicitly requested with -u/--unknown or -i/--ignored.
6715
6715
6716 .. note::
6716 .. note::
6717
6717
6718 :hg:`status` may appear to disagree with diff if permissions have
6718 :hg:`status` may appear to disagree with diff if permissions have
6719 changed or a merge has occurred. The standard diff format does
6719 changed or a merge has occurred. The standard diff format does
6720 not report permission changes and diff only reports changes
6720 not report permission changes and diff only reports changes
6721 relative to one merge parent.
6721 relative to one merge parent.
6722
6722
6723 If one revision is given, it is used as the base revision.
6723 If one revision is given, it is used as the base revision.
6724 If two revisions are given, the differences between them are
6724 If two revisions are given, the differences between them are
6725 shown. The --change option can also be used as a shortcut to list
6725 shown. The --change option can also be used as a shortcut to list
6726 the changed files of a revision from its first parent.
6726 the changed files of a revision from its first parent.
6727
6727
6728 The codes used to show the status of files are::
6728 The codes used to show the status of files are::
6729
6729
6730 M = modified
6730 M = modified
6731 A = added
6731 A = added
6732 R = removed
6732 R = removed
6733 C = clean
6733 C = clean
6734 ! = missing (deleted by non-hg command, but still tracked)
6734 ! = missing (deleted by non-hg command, but still tracked)
6735 ? = not tracked
6735 ? = not tracked
6736 I = ignored
6736 I = ignored
6737 = origin of the previous file (with --copies)
6737 = origin of the previous file (with --copies)
6738
6738
6739 .. container:: verbose
6739 .. container:: verbose
6740
6740
6741 The -t/--terse option abbreviates the output by showing only the directory
6741 The -t/--terse option abbreviates the output by showing only the directory
6742 name if all the files in it share the same status. The option takes an
6742 name if all the files in it share the same status. The option takes an
6743 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6743 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6744 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6744 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6745 for 'ignored' and 'c' for clean.
6745 for 'ignored' and 'c' for clean.
6746
6746
6747 It abbreviates only those statuses which are passed. Note that clean and
6747 It abbreviates only those statuses which are passed. Note that clean and
6748 ignored files are not displayed with '--terse ic' unless the -c/--clean
6748 ignored files are not displayed with '--terse ic' unless the -c/--clean
6749 and -i/--ignored options are also used.
6749 and -i/--ignored options are also used.
6750
6750
6751 The -v/--verbose option shows information when the repository is in an
6751 The -v/--verbose option shows information when the repository is in an
6752 unfinished merge, shelve, rebase state etc. You can have this behavior
6752 unfinished merge, shelve, rebase state etc. You can have this behavior
6753 turned on by default by enabling the ``commands.status.verbose`` option.
6753 turned on by default by enabling the ``commands.status.verbose`` option.
6754
6754
6755 You can skip displaying some of these states by setting
6755 You can skip displaying some of these states by setting
6756 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6756 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6757 'histedit', 'merge', 'rebase', or 'unshelve'.
6757 'histedit', 'merge', 'rebase', or 'unshelve'.
6758
6758
6759 Template:
6759 Template:
6760
6760
6761 The following keywords are supported in addition to the common template
6761 The following keywords are supported in addition to the common template
6762 keywords and functions. See also :hg:`help templates`.
6762 keywords and functions. See also :hg:`help templates`.
6763
6763
6764 :path: String. Repository-absolute path of the file.
6764 :path: String. Repository-absolute path of the file.
6765 :source: String. Repository-absolute path of the file originated from.
6765 :source: String. Repository-absolute path of the file originated from.
6766 Available if ``--copies`` is specified.
6766 Available if ``--copies`` is specified.
6767 :status: String. Character denoting file's status.
6767 :status: String. Character denoting file's status.
6768
6768
6769 Examples:
6769 Examples:
6770
6770
6771 - show changes in the working directory relative to a
6771 - show changes in the working directory relative to a
6772 changeset::
6772 changeset::
6773
6773
6774 hg status --rev 9353
6774 hg status --rev 9353
6775
6775
6776 - show changes in the working directory relative to the
6776 - show changes in the working directory relative to the
6777 current directory (see :hg:`help patterns` for more information)::
6777 current directory (see :hg:`help patterns` for more information)::
6778
6778
6779 hg status re:
6779 hg status re:
6780
6780
6781 - show all changes including copies in an existing changeset::
6781 - show all changes including copies in an existing changeset::
6782
6782
6783 hg status --copies --change 9353
6783 hg status --copies --change 9353
6784
6784
6785 - get a NUL separated list of added files, suitable for xargs::
6785 - get a NUL separated list of added files, suitable for xargs::
6786
6786
6787 hg status -an0
6787 hg status -an0
6788
6788
6789 - show more information about the repository status, abbreviating
6789 - show more information about the repository status, abbreviating
6790 added, removed, modified, deleted, and untracked paths::
6790 added, removed, modified, deleted, and untracked paths::
6791
6791
6792 hg status -v -t mardu
6792 hg status -v -t mardu
6793
6793
6794 Returns 0 on success.
6794 Returns 0 on success.
6795
6795
6796 """
6796 """
6797
6797
6798 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6798 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6799 opts = pycompat.byteskwargs(opts)
6799 opts = pycompat.byteskwargs(opts)
6800 revs = opts.get(b'rev')
6800 revs = opts.get(b'rev')
6801 change = opts.get(b'change')
6801 change = opts.get(b'change')
6802 terse = opts.get(b'terse')
6802 terse = opts.get(b'terse')
6803 if terse is _NOTTERSE:
6803 if terse is _NOTTERSE:
6804 if revs:
6804 if revs:
6805 terse = b''
6805 terse = b''
6806 else:
6806 else:
6807 terse = ui.config(b'commands', b'status.terse')
6807 terse = ui.config(b'commands', b'status.terse')
6808
6808
6809 if revs and terse:
6809 if revs and terse:
6810 msg = _(b'cannot use --terse with --rev')
6810 msg = _(b'cannot use --terse with --rev')
6811 raise error.Abort(msg)
6811 raise error.Abort(msg)
6812 elif change:
6812 elif change:
6813 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6813 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6814 ctx2 = scmutil.revsingle(repo, change, None)
6814 ctx2 = scmutil.revsingle(repo, change, None)
6815 ctx1 = ctx2.p1()
6815 ctx1 = ctx2.p1()
6816 else:
6816 else:
6817 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6817 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6818 ctx1, ctx2 = scmutil.revpair(repo, revs)
6818 ctx1, ctx2 = scmutil.revpair(repo, revs)
6819
6819
6820 forcerelativevalue = None
6820 forcerelativevalue = None
6821 if ui.hasconfig(b'commands', b'status.relative'):
6821 if ui.hasconfig(b'commands', b'status.relative'):
6822 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6822 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6823 uipathfn = scmutil.getuipathfn(
6823 uipathfn = scmutil.getuipathfn(
6824 repo,
6824 repo,
6825 legacyrelativevalue=bool(pats),
6825 legacyrelativevalue=bool(pats),
6826 forcerelativevalue=forcerelativevalue,
6826 forcerelativevalue=forcerelativevalue,
6827 )
6827 )
6828
6828
6829 if opts.get(b'print0'):
6829 if opts.get(b'print0'):
6830 end = b'\0'
6830 end = b'\0'
6831 else:
6831 else:
6832 end = b'\n'
6832 end = b'\n'
6833 states = b'modified added removed deleted unknown ignored clean'.split()
6833 states = b'modified added removed deleted unknown ignored clean'.split()
6834 show = [k for k in states if opts.get(k)]
6834 show = [k for k in states if opts.get(k)]
6835 if opts.get(b'all'):
6835 if opts.get(b'all'):
6836 show += ui.quiet and (states[:4] + [b'clean']) or states
6836 show += ui.quiet and (states[:4] + [b'clean']) or states
6837
6837
6838 if not show:
6838 if not show:
6839 if ui.quiet:
6839 if ui.quiet:
6840 show = states[:4]
6840 show = states[:4]
6841 else:
6841 else:
6842 show = states[:5]
6842 show = states[:5]
6843
6843
6844 m = scmutil.match(ctx2, pats, opts)
6844 m = scmutil.match(ctx2, pats, opts)
6845 if terse:
6845 if terse:
6846 # we need to compute clean and unknown to terse
6846 # we need to compute clean and unknown to terse
6847 stat = repo.status(
6847 stat = repo.status(
6848 ctx1.node(),
6848 ctx1.node(),
6849 ctx2.node(),
6849 ctx2.node(),
6850 m,
6850 m,
6851 b'ignored' in show or b'i' in terse,
6851 b'ignored' in show or b'i' in terse,
6852 clean=True,
6852 clean=True,
6853 unknown=True,
6853 unknown=True,
6854 listsubrepos=opts.get(b'subrepos'),
6854 listsubrepos=opts.get(b'subrepos'),
6855 )
6855 )
6856
6856
6857 stat = cmdutil.tersedir(stat, terse)
6857 stat = cmdutil.tersedir(stat, terse)
6858 else:
6858 else:
6859 stat = repo.status(
6859 stat = repo.status(
6860 ctx1.node(),
6860 ctx1.node(),
6861 ctx2.node(),
6861 ctx2.node(),
6862 m,
6862 m,
6863 b'ignored' in show,
6863 b'ignored' in show,
6864 b'clean' in show,
6864 b'clean' in show,
6865 b'unknown' in show,
6865 b'unknown' in show,
6866 opts.get(b'subrepos'),
6866 opts.get(b'subrepos'),
6867 )
6867 )
6868
6868
6869 changestates = zip(
6869 changestates = zip(
6870 states,
6870 states,
6871 pycompat.iterbytestr(b'MAR!?IC'),
6871 pycompat.iterbytestr(b'MAR!?IC'),
6872 [getattr(stat, s.decode('utf8')) for s in states],
6872 [getattr(stat, s.decode('utf8')) for s in states],
6873 )
6873 )
6874
6874
6875 copy = {}
6875 copy = {}
6876 if (
6876 if (
6877 opts.get(b'all')
6877 opts.get(b'all')
6878 or opts.get(b'copies')
6878 or opts.get(b'copies')
6879 or ui.configbool(b'ui', b'statuscopies')
6879 or ui.configbool(b'ui', b'statuscopies')
6880 ) and not opts.get(b'no_status'):
6880 ) and not opts.get(b'no_status'):
6881 copy = copies.pathcopies(ctx1, ctx2, m)
6881 copy = copies.pathcopies(ctx1, ctx2, m)
6882
6882
6883 morestatus = None
6883 morestatus = None
6884 if (
6884 if (
6885 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6885 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6886 ) and not ui.plain():
6886 ) and not ui.plain():
6887 morestatus = cmdutil.readmorestatus(repo)
6887 morestatus = cmdutil.readmorestatus(repo)
6888
6888
6889 ui.pager(b'status')
6889 ui.pager(b'status')
6890 fm = ui.formatter(b'status', opts)
6890 fm = ui.formatter(b'status', opts)
6891 fmt = b'%s' + end
6891 fmt = b'%s' + end
6892 showchar = not opts.get(b'no_status')
6892 showchar = not opts.get(b'no_status')
6893
6893
6894 for state, char, files in changestates:
6894 for state, char, files in changestates:
6895 if state in show:
6895 if state in show:
6896 label = b'status.' + state
6896 label = b'status.' + state
6897 for f in files:
6897 for f in files:
6898 fm.startitem()
6898 fm.startitem()
6899 fm.context(ctx=ctx2)
6899 fm.context(ctx=ctx2)
6900 fm.data(itemtype=b'file', path=f)
6900 fm.data(itemtype=b'file', path=f)
6901 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6901 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6902 fm.plain(fmt % uipathfn(f), label=label)
6902 fm.plain(fmt % uipathfn(f), label=label)
6903 if f in copy:
6903 if f in copy:
6904 fm.data(source=copy[f])
6904 fm.data(source=copy[f])
6905 fm.plain(
6905 fm.plain(
6906 (b' %s' + end) % uipathfn(copy[f]),
6906 (b' %s' + end) % uipathfn(copy[f]),
6907 label=b'status.copied',
6907 label=b'status.copied',
6908 )
6908 )
6909 if morestatus:
6909 if morestatus:
6910 morestatus.formatfile(f, fm)
6910 morestatus.formatfile(f, fm)
6911
6911
6912 if morestatus:
6912 if morestatus:
6913 morestatus.formatfooter(fm)
6913 morestatus.formatfooter(fm)
6914 fm.end()
6914 fm.end()
6915
6915
6916
6916
6917 @command(
6917 @command(
6918 b'summary|sum',
6918 b'summary|sum',
6919 [(b'', b'remote', None, _(b'check for push and pull'))],
6919 [(b'', b'remote', None, _(b'check for push and pull'))],
6920 b'[--remote]',
6920 b'[--remote]',
6921 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6921 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6922 helpbasic=True,
6922 helpbasic=True,
6923 intents={INTENT_READONLY},
6923 intents={INTENT_READONLY},
6924 )
6924 )
6925 def summary(ui, repo, **opts):
6925 def summary(ui, repo, **opts):
6926 """summarize working directory state
6926 """summarize working directory state
6927
6927
6928 This generates a brief summary of the working directory state,
6928 This generates a brief summary of the working directory state,
6929 including parents, branch, commit status, phase and available updates.
6929 including parents, branch, commit status, phase and available updates.
6930
6930
6931 With the --remote option, this will check the default paths for
6931 With the --remote option, this will check the default paths for
6932 incoming and outgoing changes. This can be time-consuming.
6932 incoming and outgoing changes. This can be time-consuming.
6933
6933
6934 Returns 0 on success.
6934 Returns 0 on success.
6935 """
6935 """
6936
6936
6937 opts = pycompat.byteskwargs(opts)
6937 opts = pycompat.byteskwargs(opts)
6938 ui.pager(b'summary')
6938 ui.pager(b'summary')
6939 ctx = repo[None]
6939 ctx = repo[None]
6940 parents = ctx.parents()
6940 parents = ctx.parents()
6941 pnode = parents[0].node()
6941 pnode = parents[0].node()
6942 marks = []
6942 marks = []
6943
6943
6944 try:
6944 try:
6945 ms = mergestatemod.mergestate.read(repo)
6945 ms = mergestatemod.mergestate.read(repo)
6946 except error.UnsupportedMergeRecords as e:
6946 except error.UnsupportedMergeRecords as e:
6947 s = b' '.join(e.recordtypes)
6947 s = b' '.join(e.recordtypes)
6948 ui.warn(
6948 ui.warn(
6949 _(b'warning: merge state has unsupported record types: %s\n') % s
6949 _(b'warning: merge state has unsupported record types: %s\n') % s
6950 )
6950 )
6951 unresolved = []
6951 unresolved = []
6952 else:
6952 else:
6953 unresolved = list(ms.unresolved())
6953 unresolved = list(ms.unresolved())
6954
6954
6955 for p in parents:
6955 for p in parents:
6956 # label with log.changeset (instead of log.parent) since this
6956 # label with log.changeset (instead of log.parent) since this
6957 # shows a working directory parent *changeset*:
6957 # shows a working directory parent *changeset*:
6958 # i18n: column positioning for "hg summary"
6958 # i18n: column positioning for "hg summary"
6959 ui.write(
6959 ui.write(
6960 _(b'parent: %d:%s ') % (p.rev(), p),
6960 _(b'parent: %d:%s ') % (p.rev(), p),
6961 label=logcmdutil.changesetlabels(p),
6961 label=logcmdutil.changesetlabels(p),
6962 )
6962 )
6963 ui.write(b' '.join(p.tags()), label=b'log.tag')
6963 ui.write(b' '.join(p.tags()), label=b'log.tag')
6964 if p.bookmarks():
6964 if p.bookmarks():
6965 marks.extend(p.bookmarks())
6965 marks.extend(p.bookmarks())
6966 if p.rev() == -1:
6966 if p.rev() == -1:
6967 if not len(repo):
6967 if not len(repo):
6968 ui.write(_(b' (empty repository)'))
6968 ui.write(_(b' (empty repository)'))
6969 else:
6969 else:
6970 ui.write(_(b' (no revision checked out)'))
6970 ui.write(_(b' (no revision checked out)'))
6971 if p.obsolete():
6971 if p.obsolete():
6972 ui.write(_(b' (obsolete)'))
6972 ui.write(_(b' (obsolete)'))
6973 if p.isunstable():
6973 if p.isunstable():
6974 instabilities = (
6974 instabilities = (
6975 ui.label(instability, b'trouble.%s' % instability)
6975 ui.label(instability, b'trouble.%s' % instability)
6976 for instability in p.instabilities()
6976 for instability in p.instabilities()
6977 )
6977 )
6978 ui.write(b' (' + b', '.join(instabilities) + b')')
6978 ui.write(b' (' + b', '.join(instabilities) + b')')
6979 ui.write(b'\n')
6979 ui.write(b'\n')
6980 if p.description():
6980 if p.description():
6981 ui.status(
6981 ui.status(
6982 b' ' + p.description().splitlines()[0].strip() + b'\n',
6982 b' ' + p.description().splitlines()[0].strip() + b'\n',
6983 label=b'log.summary',
6983 label=b'log.summary',
6984 )
6984 )
6985
6985
6986 branch = ctx.branch()
6986 branch = ctx.branch()
6987 bheads = repo.branchheads(branch)
6987 bheads = repo.branchheads(branch)
6988 # i18n: column positioning for "hg summary"
6988 # i18n: column positioning for "hg summary"
6989 m = _(b'branch: %s\n') % branch
6989 m = _(b'branch: %s\n') % branch
6990 if branch != b'default':
6990 if branch != b'default':
6991 ui.write(m, label=b'log.branch')
6991 ui.write(m, label=b'log.branch')
6992 else:
6992 else:
6993 ui.status(m, label=b'log.branch')
6993 ui.status(m, label=b'log.branch')
6994
6994
6995 if marks:
6995 if marks:
6996 active = repo._activebookmark
6996 active = repo._activebookmark
6997 # i18n: column positioning for "hg summary"
6997 # i18n: column positioning for "hg summary"
6998 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6998 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6999 if active is not None:
6999 if active is not None:
7000 if active in marks:
7000 if active in marks:
7001 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7001 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7002 marks.remove(active)
7002 marks.remove(active)
7003 else:
7003 else:
7004 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7004 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7005 for m in marks:
7005 for m in marks:
7006 ui.write(b' ' + m, label=b'log.bookmark')
7006 ui.write(b' ' + m, label=b'log.bookmark')
7007 ui.write(b'\n', label=b'log.bookmark')
7007 ui.write(b'\n', label=b'log.bookmark')
7008
7008
7009 status = repo.status(unknown=True)
7009 status = repo.status(unknown=True)
7010
7010
7011 c = repo.dirstate.copies()
7011 c = repo.dirstate.copies()
7012 copied, renamed = [], []
7012 copied, renamed = [], []
7013 for d, s in pycompat.iteritems(c):
7013 for d, s in pycompat.iteritems(c):
7014 if s in status.removed:
7014 if s in status.removed:
7015 status.removed.remove(s)
7015 status.removed.remove(s)
7016 renamed.append(d)
7016 renamed.append(d)
7017 else:
7017 else:
7018 copied.append(d)
7018 copied.append(d)
7019 if d in status.added:
7019 if d in status.added:
7020 status.added.remove(d)
7020 status.added.remove(d)
7021
7021
7022 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7022 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7023
7023
7024 labels = [
7024 labels = [
7025 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7025 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7026 (ui.label(_(b'%d added'), b'status.added'), status.added),
7026 (ui.label(_(b'%d added'), b'status.added'), status.added),
7027 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7027 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7028 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7028 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7029 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7029 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7030 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7030 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7031 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7031 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7032 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7032 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7033 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7033 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7034 ]
7034 ]
7035 t = []
7035 t = []
7036 for l, s in labels:
7036 for l, s in labels:
7037 if s:
7037 if s:
7038 t.append(l % len(s))
7038 t.append(l % len(s))
7039
7039
7040 t = b', '.join(t)
7040 t = b', '.join(t)
7041 cleanworkdir = False
7041 cleanworkdir = False
7042
7042
7043 if repo.vfs.exists(b'graftstate'):
7043 if repo.vfs.exists(b'graftstate'):
7044 t += _(b' (graft in progress)')
7044 t += _(b' (graft in progress)')
7045 if repo.vfs.exists(b'updatestate'):
7045 if repo.vfs.exists(b'updatestate'):
7046 t += _(b' (interrupted update)')
7046 t += _(b' (interrupted update)')
7047 elif len(parents) > 1:
7047 elif len(parents) > 1:
7048 t += _(b' (merge)')
7048 t += _(b' (merge)')
7049 elif branch != parents[0].branch():
7049 elif branch != parents[0].branch():
7050 t += _(b' (new branch)')
7050 t += _(b' (new branch)')
7051 elif parents[0].closesbranch() and pnode in repo.branchheads(
7051 elif parents[0].closesbranch() and pnode in repo.branchheads(
7052 branch, closed=True
7052 branch, closed=True
7053 ):
7053 ):
7054 t += _(b' (head closed)')
7054 t += _(b' (head closed)')
7055 elif not (
7055 elif not (
7056 status.modified
7056 status.modified
7057 or status.added
7057 or status.added
7058 or status.removed
7058 or status.removed
7059 or renamed
7059 or renamed
7060 or copied
7060 or copied
7061 or subs
7061 or subs
7062 ):
7062 ):
7063 t += _(b' (clean)')
7063 t += _(b' (clean)')
7064 cleanworkdir = True
7064 cleanworkdir = True
7065 elif pnode not in bheads:
7065 elif pnode not in bheads:
7066 t += _(b' (new branch head)')
7066 t += _(b' (new branch head)')
7067
7067
7068 if parents:
7068 if parents:
7069 pendingphase = max(p.phase() for p in parents)
7069 pendingphase = max(p.phase() for p in parents)
7070 else:
7070 else:
7071 pendingphase = phases.public
7071 pendingphase = phases.public
7072
7072
7073 if pendingphase > phases.newcommitphase(ui):
7073 if pendingphase > phases.newcommitphase(ui):
7074 t += b' (%s)' % phases.phasenames[pendingphase]
7074 t += b' (%s)' % phases.phasenames[pendingphase]
7075
7075
7076 if cleanworkdir:
7076 if cleanworkdir:
7077 # i18n: column positioning for "hg summary"
7077 # i18n: column positioning for "hg summary"
7078 ui.status(_(b'commit: %s\n') % t.strip())
7078 ui.status(_(b'commit: %s\n') % t.strip())
7079 else:
7079 else:
7080 # i18n: column positioning for "hg summary"
7080 # i18n: column positioning for "hg summary"
7081 ui.write(_(b'commit: %s\n') % t.strip())
7081 ui.write(_(b'commit: %s\n') % t.strip())
7082
7082
7083 # all ancestors of branch heads - all ancestors of parent = new csets
7083 # all ancestors of branch heads - all ancestors of parent = new csets
7084 new = len(
7084 new = len(
7085 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7085 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7086 )
7086 )
7087
7087
7088 if new == 0:
7088 if new == 0:
7089 # i18n: column positioning for "hg summary"
7089 # i18n: column positioning for "hg summary"
7090 ui.status(_(b'update: (current)\n'))
7090 ui.status(_(b'update: (current)\n'))
7091 elif pnode not in bheads:
7091 elif pnode not in bheads:
7092 # i18n: column positioning for "hg summary"
7092 # i18n: column positioning for "hg summary"
7093 ui.write(_(b'update: %d new changesets (update)\n') % new)
7093 ui.write(_(b'update: %d new changesets (update)\n') % new)
7094 else:
7094 else:
7095 # i18n: column positioning for "hg summary"
7095 # i18n: column positioning for "hg summary"
7096 ui.write(
7096 ui.write(
7097 _(b'update: %d new changesets, %d branch heads (merge)\n')
7097 _(b'update: %d new changesets, %d branch heads (merge)\n')
7098 % (new, len(bheads))
7098 % (new, len(bheads))
7099 )
7099 )
7100
7100
7101 t = []
7101 t = []
7102 draft = len(repo.revs(b'draft()'))
7102 draft = len(repo.revs(b'draft()'))
7103 if draft:
7103 if draft:
7104 t.append(_(b'%d draft') % draft)
7104 t.append(_(b'%d draft') % draft)
7105 secret = len(repo.revs(b'secret()'))
7105 secret = len(repo.revs(b'secret()'))
7106 if secret:
7106 if secret:
7107 t.append(_(b'%d secret') % secret)
7107 t.append(_(b'%d secret') % secret)
7108
7108
7109 if draft or secret:
7109 if draft or secret:
7110 ui.status(_(b'phases: %s\n') % b', '.join(t))
7110 ui.status(_(b'phases: %s\n') % b', '.join(t))
7111
7111
7112 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7112 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7113 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7113 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7114 numtrouble = len(repo.revs(trouble + b"()"))
7114 numtrouble = len(repo.revs(trouble + b"()"))
7115 # We write all the possibilities to ease translation
7115 # We write all the possibilities to ease translation
7116 troublemsg = {
7116 troublemsg = {
7117 b"orphan": _(b"orphan: %d changesets"),
7117 b"orphan": _(b"orphan: %d changesets"),
7118 b"contentdivergent": _(b"content-divergent: %d changesets"),
7118 b"contentdivergent": _(b"content-divergent: %d changesets"),
7119 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7119 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7120 }
7120 }
7121 if numtrouble > 0:
7121 if numtrouble > 0:
7122 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7122 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7123
7123
7124 cmdutil.summaryhooks(ui, repo)
7124 cmdutil.summaryhooks(ui, repo)
7125
7125
7126 if opts.get(b'remote'):
7126 if opts.get(b'remote'):
7127 needsincoming, needsoutgoing = True, True
7127 needsincoming, needsoutgoing = True, True
7128 else:
7128 else:
7129 needsincoming, needsoutgoing = False, False
7129 needsincoming, needsoutgoing = False, False
7130 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7130 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7131 if i:
7131 if i:
7132 needsincoming = True
7132 needsincoming = True
7133 if o:
7133 if o:
7134 needsoutgoing = True
7134 needsoutgoing = True
7135 if not needsincoming and not needsoutgoing:
7135 if not needsincoming and not needsoutgoing:
7136 return
7136 return
7137
7137
7138 def getincoming():
7138 def getincoming():
7139 source, branches = hg.parseurl(ui.expandpath(b'default'))
7139 source, branches = hg.parseurl(ui.expandpath(b'default'))
7140 sbranch = branches[0]
7140 sbranch = branches[0]
7141 try:
7141 try:
7142 other = hg.peer(repo, {}, source)
7142 other = hg.peer(repo, {}, source)
7143 except error.RepoError:
7143 except error.RepoError:
7144 if opts.get(b'remote'):
7144 if opts.get(b'remote'):
7145 raise
7145 raise
7146 return source, sbranch, None, None, None
7146 return source, sbranch, None, None, None
7147 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7147 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7148 if revs:
7148 if revs:
7149 revs = [other.lookup(rev) for rev in revs]
7149 revs = [other.lookup(rev) for rev in revs]
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7151 repo.ui.pushbuffer()
7151 repo.ui.pushbuffer()
7152 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7152 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7153 repo.ui.popbuffer()
7153 repo.ui.popbuffer()
7154 return source, sbranch, other, commoninc, commoninc[1]
7154 return source, sbranch, other, commoninc, commoninc[1]
7155
7155
7156 if needsincoming:
7156 if needsincoming:
7157 source, sbranch, sother, commoninc, incoming = getincoming()
7157 source, sbranch, sother, commoninc, incoming = getincoming()
7158 else:
7158 else:
7159 source = sbranch = sother = commoninc = incoming = None
7159 source = sbranch = sother = commoninc = incoming = None
7160
7160
7161 def getoutgoing():
7161 def getoutgoing():
7162 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7162 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7163 dbranch = branches[0]
7163 dbranch = branches[0]
7164 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7164 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7165 if source != dest:
7165 if source != dest:
7166 try:
7166 try:
7167 dother = hg.peer(repo, {}, dest)
7167 dother = hg.peer(repo, {}, dest)
7168 except error.RepoError:
7168 except error.RepoError:
7169 if opts.get(b'remote'):
7169 if opts.get(b'remote'):
7170 raise
7170 raise
7171 return dest, dbranch, None, None
7171 return dest, dbranch, None, None
7172 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7172 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7173 elif sother is None:
7173 elif sother is None:
7174 # there is no explicit destination peer, but source one is invalid
7174 # there is no explicit destination peer, but source one is invalid
7175 return dest, dbranch, None, None
7175 return dest, dbranch, None, None
7176 else:
7176 else:
7177 dother = sother
7177 dother = sother
7178 if source != dest or (sbranch is not None and sbranch != dbranch):
7178 if source != dest or (sbranch is not None and sbranch != dbranch):
7179 common = None
7179 common = None
7180 else:
7180 else:
7181 common = commoninc
7181 common = commoninc
7182 if revs:
7182 if revs:
7183 revs = [repo.lookup(rev) for rev in revs]
7183 revs = [repo.lookup(rev) for rev in revs]
7184 repo.ui.pushbuffer()
7184 repo.ui.pushbuffer()
7185 outgoing = discovery.findcommonoutgoing(
7185 outgoing = discovery.findcommonoutgoing(
7186 repo, dother, onlyheads=revs, commoninc=common
7186 repo, dother, onlyheads=revs, commoninc=common
7187 )
7187 )
7188 repo.ui.popbuffer()
7188 repo.ui.popbuffer()
7189 return dest, dbranch, dother, outgoing
7189 return dest, dbranch, dother, outgoing
7190
7190
7191 if needsoutgoing:
7191 if needsoutgoing:
7192 dest, dbranch, dother, outgoing = getoutgoing()
7192 dest, dbranch, dother, outgoing = getoutgoing()
7193 else:
7193 else:
7194 dest = dbranch = dother = outgoing = None
7194 dest = dbranch = dother = outgoing = None
7195
7195
7196 if opts.get(b'remote'):
7196 if opts.get(b'remote'):
7197 t = []
7197 t = []
7198 if incoming:
7198 if incoming:
7199 t.append(_(b'1 or more incoming'))
7199 t.append(_(b'1 or more incoming'))
7200 o = outgoing.missing
7200 o = outgoing.missing
7201 if o:
7201 if o:
7202 t.append(_(b'%d outgoing') % len(o))
7202 t.append(_(b'%d outgoing') % len(o))
7203 other = dother or sother
7203 other = dother or sother
7204 if b'bookmarks' in other.listkeys(b'namespaces'):
7204 if b'bookmarks' in other.listkeys(b'namespaces'):
7205 counts = bookmarks.summary(repo, other)
7205 counts = bookmarks.summary(repo, other)
7206 if counts[0] > 0:
7206 if counts[0] > 0:
7207 t.append(_(b'%d incoming bookmarks') % counts[0])
7207 t.append(_(b'%d incoming bookmarks') % counts[0])
7208 if counts[1] > 0:
7208 if counts[1] > 0:
7209 t.append(_(b'%d outgoing bookmarks') % counts[1])
7209 t.append(_(b'%d outgoing bookmarks') % counts[1])
7210
7210
7211 if t:
7211 if t:
7212 # i18n: column positioning for "hg summary"
7212 # i18n: column positioning for "hg summary"
7213 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7213 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7214 else:
7214 else:
7215 # i18n: column positioning for "hg summary"
7215 # i18n: column positioning for "hg summary"
7216 ui.status(_(b'remote: (synced)\n'))
7216 ui.status(_(b'remote: (synced)\n'))
7217
7217
7218 cmdutil.summaryremotehooks(
7218 cmdutil.summaryremotehooks(
7219 ui,
7219 ui,
7220 repo,
7220 repo,
7221 opts,
7221 opts,
7222 (
7222 (
7223 (source, sbranch, sother, commoninc),
7223 (source, sbranch, sother, commoninc),
7224 (dest, dbranch, dother, outgoing),
7224 (dest, dbranch, dother, outgoing),
7225 ),
7225 ),
7226 )
7226 )
7227
7227
7228
7228
7229 @command(
7229 @command(
7230 b'tag',
7230 b'tag',
7231 [
7231 [
7232 (b'f', b'force', None, _(b'force tag')),
7232 (b'f', b'force', None, _(b'force tag')),
7233 (b'l', b'local', None, _(b'make the tag local')),
7233 (b'l', b'local', None, _(b'make the tag local')),
7234 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7234 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7235 (b'', b'remove', None, _(b'remove a tag')),
7235 (b'', b'remove', None, _(b'remove a tag')),
7236 # -l/--local is already there, commitopts cannot be used
7236 # -l/--local is already there, commitopts cannot be used
7237 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7237 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7238 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7238 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7239 ]
7239 ]
7240 + commitopts2,
7240 + commitopts2,
7241 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7241 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7242 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7242 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7243 )
7243 )
7244 def tag(ui, repo, name1, *names, **opts):
7244 def tag(ui, repo, name1, *names, **opts):
7245 """add one or more tags for the current or given revision
7245 """add one or more tags for the current or given revision
7246
7246
7247 Name a particular revision using <name>.
7247 Name a particular revision using <name>.
7248
7248
7249 Tags are used to name particular revisions of the repository and are
7249 Tags are used to name particular revisions of the repository and are
7250 very useful to compare different revisions, to go back to significant
7250 very useful to compare different revisions, to go back to significant
7251 earlier versions or to mark branch points as releases, etc. Changing
7251 earlier versions or to mark branch points as releases, etc. Changing
7252 an existing tag is normally disallowed; use -f/--force to override.
7252 an existing tag is normally disallowed; use -f/--force to override.
7253
7253
7254 If no revision is given, the parent of the working directory is
7254 If no revision is given, the parent of the working directory is
7255 used.
7255 used.
7256
7256
7257 To facilitate version control, distribution, and merging of tags,
7257 To facilitate version control, distribution, and merging of tags,
7258 they are stored as a file named ".hgtags" which is managed similarly
7258 they are stored as a file named ".hgtags" which is managed similarly
7259 to other project files and can be hand-edited if necessary. This
7259 to other project files and can be hand-edited if necessary. This
7260 also means that tagging creates a new commit. The file
7260 also means that tagging creates a new commit. The file
7261 ".hg/localtags" is used for local tags (not shared among
7261 ".hg/localtags" is used for local tags (not shared among
7262 repositories).
7262 repositories).
7263
7263
7264 Tag commits are usually made at the head of a branch. If the parent
7264 Tag commits are usually made at the head of a branch. If the parent
7265 of the working directory is not a branch head, :hg:`tag` aborts; use
7265 of the working directory is not a branch head, :hg:`tag` aborts; use
7266 -f/--force to force the tag commit to be based on a non-head
7266 -f/--force to force the tag commit to be based on a non-head
7267 changeset.
7267 changeset.
7268
7268
7269 See :hg:`help dates` for a list of formats valid for -d/--date.
7269 See :hg:`help dates` for a list of formats valid for -d/--date.
7270
7270
7271 Since tag names have priority over branch names during revision
7271 Since tag names have priority over branch names during revision
7272 lookup, using an existing branch name as a tag name is discouraged.
7272 lookup, using an existing branch name as a tag name is discouraged.
7273
7273
7274 Returns 0 on success.
7274 Returns 0 on success.
7275 """
7275 """
7276 opts = pycompat.byteskwargs(opts)
7276 opts = pycompat.byteskwargs(opts)
7277 with repo.wlock(), repo.lock():
7277 with repo.wlock(), repo.lock():
7278 rev_ = b"."
7278 rev_ = b"."
7279 names = [t.strip() for t in (name1,) + names]
7279 names = [t.strip() for t in (name1,) + names]
7280 if len(names) != len(set(names)):
7280 if len(names) != len(set(names)):
7281 raise error.Abort(_(b'tag names must be unique'))
7281 raise error.Abort(_(b'tag names must be unique'))
7282 for n in names:
7282 for n in names:
7283 scmutil.checknewlabel(repo, n, b'tag')
7283 scmutil.checknewlabel(repo, n, b'tag')
7284 if not n:
7284 if not n:
7285 raise error.Abort(
7285 raise error.Abort(
7286 _(b'tag names cannot consist entirely of whitespace')
7286 _(b'tag names cannot consist entirely of whitespace')
7287 )
7287 )
7288 if opts.get(b'rev') and opts.get(b'remove'):
7288 if opts.get(b'rev') and opts.get(b'remove'):
7289 raise error.Abort(_(b"--rev and --remove are incompatible"))
7289 raise error.Abort(_(b"--rev and --remove are incompatible"))
7290 if opts.get(b'rev'):
7290 if opts.get(b'rev'):
7291 rev_ = opts[b'rev']
7291 rev_ = opts[b'rev']
7292 message = opts.get(b'message')
7292 message = opts.get(b'message')
7293 if opts.get(b'remove'):
7293 if opts.get(b'remove'):
7294 if opts.get(b'local'):
7294 if opts.get(b'local'):
7295 expectedtype = b'local'
7295 expectedtype = b'local'
7296 else:
7296 else:
7297 expectedtype = b'global'
7297 expectedtype = b'global'
7298
7298
7299 for n in names:
7299 for n in names:
7300 if repo.tagtype(n) == b'global':
7300 if repo.tagtype(n) == b'global':
7301 alltags = tagsmod.findglobaltags(ui, repo)
7301 alltags = tagsmod.findglobaltags(ui, repo)
7302 if alltags[n][0] == nullid:
7302 if alltags[n][0] == nullid:
7303 raise error.Abort(_(b"tag '%s' is already removed") % n)
7303 raise error.Abort(_(b"tag '%s' is already removed") % n)
7304 if not repo.tagtype(n):
7304 if not repo.tagtype(n):
7305 raise error.Abort(_(b"tag '%s' does not exist") % n)
7305 raise error.Abort(_(b"tag '%s' does not exist") % n)
7306 if repo.tagtype(n) != expectedtype:
7306 if repo.tagtype(n) != expectedtype:
7307 if expectedtype == b'global':
7307 if expectedtype == b'global':
7308 raise error.Abort(
7308 raise error.Abort(
7309 _(b"tag '%s' is not a global tag") % n
7309 _(b"tag '%s' is not a global tag") % n
7310 )
7310 )
7311 else:
7311 else:
7312 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7312 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7313 rev_ = b'null'
7313 rev_ = b'null'
7314 if not message:
7314 if not message:
7315 # we don't translate commit messages
7315 # we don't translate commit messages
7316 message = b'Removed tag %s' % b', '.join(names)
7316 message = b'Removed tag %s' % b', '.join(names)
7317 elif not opts.get(b'force'):
7317 elif not opts.get(b'force'):
7318 for n in names:
7318 for n in names:
7319 if n in repo.tags():
7319 if n in repo.tags():
7320 raise error.Abort(
7320 raise error.Abort(
7321 _(b"tag '%s' already exists (use -f to force)") % n
7321 _(b"tag '%s' already exists (use -f to force)") % n
7322 )
7322 )
7323 if not opts.get(b'local'):
7323 if not opts.get(b'local'):
7324 p1, p2 = repo.dirstate.parents()
7324 p1, p2 = repo.dirstate.parents()
7325 if p2 != nullid:
7325 if p2 != nullid:
7326 raise error.Abort(_(b'uncommitted merge'))
7326 raise error.Abort(_(b'uncommitted merge'))
7327 bheads = repo.branchheads()
7327 bheads = repo.branchheads()
7328 if not opts.get(b'force') and bheads and p1 not in bheads:
7328 if not opts.get(b'force') and bheads and p1 not in bheads:
7329 raise error.Abort(
7329 raise error.Abort(
7330 _(
7330 _(
7331 b'working directory is not at a branch head '
7331 b'working directory is not at a branch head '
7332 b'(use -f to force)'
7332 b'(use -f to force)'
7333 )
7333 )
7334 )
7334 )
7335 node = scmutil.revsingle(repo, rev_).node()
7335 node = scmutil.revsingle(repo, rev_).node()
7336
7336
7337 if not message:
7337 if not message:
7338 # we don't translate commit messages
7338 # we don't translate commit messages
7339 message = b'Added tag %s for changeset %s' % (
7339 message = b'Added tag %s for changeset %s' % (
7340 b', '.join(names),
7340 b', '.join(names),
7341 short(node),
7341 short(node),
7342 )
7342 )
7343
7343
7344 date = opts.get(b'date')
7344 date = opts.get(b'date')
7345 if date:
7345 if date:
7346 date = dateutil.parsedate(date)
7346 date = dateutil.parsedate(date)
7347
7347
7348 if opts.get(b'remove'):
7348 if opts.get(b'remove'):
7349 editform = b'tag.remove'
7349 editform = b'tag.remove'
7350 else:
7350 else:
7351 editform = b'tag.add'
7351 editform = b'tag.add'
7352 editor = cmdutil.getcommiteditor(
7352 editor = cmdutil.getcommiteditor(
7353 editform=editform, **pycompat.strkwargs(opts)
7353 editform=editform, **pycompat.strkwargs(opts)
7354 )
7354 )
7355
7355
7356 # don't allow tagging the null rev
7356 # don't allow tagging the null rev
7357 if (
7357 if (
7358 not opts.get(b'remove')
7358 not opts.get(b'remove')
7359 and scmutil.revsingle(repo, rev_).rev() == nullrev
7359 and scmutil.revsingle(repo, rev_).rev() == nullrev
7360 ):
7360 ):
7361 raise error.Abort(_(b"cannot tag null revision"))
7361 raise error.Abort(_(b"cannot tag null revision"))
7362
7362
7363 tagsmod.tag(
7363 tagsmod.tag(
7364 repo,
7364 repo,
7365 names,
7365 names,
7366 node,
7366 node,
7367 message,
7367 message,
7368 opts.get(b'local'),
7368 opts.get(b'local'),
7369 opts.get(b'user'),
7369 opts.get(b'user'),
7370 date,
7370 date,
7371 editor=editor,
7371 editor=editor,
7372 )
7372 )
7373
7373
7374
7374
7375 @command(
7375 @command(
7376 b'tags',
7376 b'tags',
7377 formatteropts,
7377 formatteropts,
7378 b'',
7378 b'',
7379 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7379 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7380 intents={INTENT_READONLY},
7380 intents={INTENT_READONLY},
7381 )
7381 )
7382 def tags(ui, repo, **opts):
7382 def tags(ui, repo, **opts):
7383 """list repository tags
7383 """list repository tags
7384
7384
7385 This lists both regular and local tags. When the -v/--verbose
7385 This lists both regular and local tags. When the -v/--verbose
7386 switch is used, a third column "local" is printed for local tags.
7386 switch is used, a third column "local" is printed for local tags.
7387 When the -q/--quiet switch is used, only the tag name is printed.
7387 When the -q/--quiet switch is used, only the tag name is printed.
7388
7388
7389 .. container:: verbose
7389 .. container:: verbose
7390
7390
7391 Template:
7391 Template:
7392
7392
7393 The following keywords are supported in addition to the common template
7393 The following keywords are supported in addition to the common template
7394 keywords and functions such as ``{tag}``. See also
7394 keywords and functions such as ``{tag}``. See also
7395 :hg:`help templates`.
7395 :hg:`help templates`.
7396
7396
7397 :type: String. ``local`` for local tags.
7397 :type: String. ``local`` for local tags.
7398
7398
7399 Returns 0 on success.
7399 Returns 0 on success.
7400 """
7400 """
7401
7401
7402 opts = pycompat.byteskwargs(opts)
7402 opts = pycompat.byteskwargs(opts)
7403 ui.pager(b'tags')
7403 ui.pager(b'tags')
7404 fm = ui.formatter(b'tags', opts)
7404 fm = ui.formatter(b'tags', opts)
7405 hexfunc = fm.hexfunc
7405 hexfunc = fm.hexfunc
7406
7406
7407 for t, n in reversed(repo.tagslist()):
7407 for t, n in reversed(repo.tagslist()):
7408 hn = hexfunc(n)
7408 hn = hexfunc(n)
7409 label = b'tags.normal'
7409 label = b'tags.normal'
7410 tagtype = b''
7410 tagtype = b''
7411 if repo.tagtype(t) == b'local':
7411 if repo.tagtype(t) == b'local':
7412 label = b'tags.local'
7412 label = b'tags.local'
7413 tagtype = b'local'
7413 tagtype = b'local'
7414
7414
7415 fm.startitem()
7415 fm.startitem()
7416 fm.context(repo=repo)
7416 fm.context(repo=repo)
7417 fm.write(b'tag', b'%s', t, label=label)
7417 fm.write(b'tag', b'%s', t, label=label)
7418 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7418 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7419 fm.condwrite(
7419 fm.condwrite(
7420 not ui.quiet,
7420 not ui.quiet,
7421 b'rev node',
7421 b'rev node',
7422 fmt,
7422 fmt,
7423 repo.changelog.rev(n),
7423 repo.changelog.rev(n),
7424 hn,
7424 hn,
7425 label=label,
7425 label=label,
7426 )
7426 )
7427 fm.condwrite(
7427 fm.condwrite(
7428 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7428 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7429 )
7429 )
7430 fm.plain(b'\n')
7430 fm.plain(b'\n')
7431 fm.end()
7431 fm.end()
7432
7432
7433
7433
7434 @command(
7434 @command(
7435 b'tip',
7435 b'tip',
7436 [
7436 [
7437 (b'p', b'patch', None, _(b'show patch')),
7437 (b'p', b'patch', None, _(b'show patch')),
7438 (b'g', b'git', None, _(b'use git extended diff format')),
7438 (b'g', b'git', None, _(b'use git extended diff format')),
7439 ]
7439 ]
7440 + templateopts,
7440 + templateopts,
7441 _(b'[-p] [-g]'),
7441 _(b'[-p] [-g]'),
7442 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7442 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7443 )
7443 )
7444 def tip(ui, repo, **opts):
7444 def tip(ui, repo, **opts):
7445 """show the tip revision (DEPRECATED)
7445 """show the tip revision (DEPRECATED)
7446
7446
7447 The tip revision (usually just called the tip) is the changeset
7447 The tip revision (usually just called the tip) is the changeset
7448 most recently added to the repository (and therefore the most
7448 most recently added to the repository (and therefore the most
7449 recently changed head).
7449 recently changed head).
7450
7450
7451 If you have just made a commit, that commit will be the tip. If
7451 If you have just made a commit, that commit will be the tip. If
7452 you have just pulled changes from another repository, the tip of
7452 you have just pulled changes from another repository, the tip of
7453 that repository becomes the current tip. The "tip" tag is special
7453 that repository becomes the current tip. The "tip" tag is special
7454 and cannot be renamed or assigned to a different changeset.
7454 and cannot be renamed or assigned to a different changeset.
7455
7455
7456 This command is deprecated, please use :hg:`heads` instead.
7456 This command is deprecated, please use :hg:`heads` instead.
7457
7457
7458 Returns 0 on success.
7458 Returns 0 on success.
7459 """
7459 """
7460 opts = pycompat.byteskwargs(opts)
7460 opts = pycompat.byteskwargs(opts)
7461 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7461 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7462 displayer.show(repo[b'tip'])
7462 displayer.show(repo[b'tip'])
7463 displayer.close()
7463 displayer.close()
7464
7464
7465
7465
7466 @command(
7466 @command(
7467 b'unbundle',
7467 b'unbundle',
7468 [
7468 [
7469 (
7469 (
7470 b'u',
7470 b'u',
7471 b'update',
7471 b'update',
7472 None,
7472 None,
7473 _(b'update to new branch head if changesets were unbundled'),
7473 _(b'update to new branch head if changesets were unbundled'),
7474 )
7474 )
7475 ],
7475 ],
7476 _(b'[-u] FILE...'),
7476 _(b'[-u] FILE...'),
7477 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7477 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7478 )
7478 )
7479 def unbundle(ui, repo, fname1, *fnames, **opts):
7479 def unbundle(ui, repo, fname1, *fnames, **opts):
7480 """apply one or more bundle files
7480 """apply one or more bundle files
7481
7481
7482 Apply one or more bundle files generated by :hg:`bundle`.
7482 Apply one or more bundle files generated by :hg:`bundle`.
7483
7483
7484 Returns 0 on success, 1 if an update has unresolved files.
7484 Returns 0 on success, 1 if an update has unresolved files.
7485 """
7485 """
7486 fnames = (fname1,) + fnames
7486 fnames = (fname1,) + fnames
7487
7487
7488 with repo.lock():
7488 with repo.lock():
7489 for fname in fnames:
7489 for fname in fnames:
7490 f = hg.openpath(ui, fname)
7490 f = hg.openpath(ui, fname)
7491 gen = exchange.readbundle(ui, f, fname)
7491 gen = exchange.readbundle(ui, f, fname)
7492 if isinstance(gen, streamclone.streamcloneapplier):
7492 if isinstance(gen, streamclone.streamcloneapplier):
7493 raise error.Abort(
7493 raise error.Abort(
7494 _(
7494 _(
7495 b'packed bundles cannot be applied with '
7495 b'packed bundles cannot be applied with '
7496 b'"hg unbundle"'
7496 b'"hg unbundle"'
7497 ),
7497 ),
7498 hint=_(b'use "hg debugapplystreamclonebundle"'),
7498 hint=_(b'use "hg debugapplystreamclonebundle"'),
7499 )
7499 )
7500 url = b'bundle:' + fname
7500 url = b'bundle:' + fname
7501 try:
7501 try:
7502 txnname = b'unbundle'
7502 txnname = b'unbundle'
7503 if not isinstance(gen, bundle2.unbundle20):
7503 if not isinstance(gen, bundle2.unbundle20):
7504 txnname = b'unbundle\n%s' % util.hidepassword(url)
7504 txnname = b'unbundle\n%s' % util.hidepassword(url)
7505 with repo.transaction(txnname) as tr:
7505 with repo.transaction(txnname) as tr:
7506 op = bundle2.applybundle(
7506 op = bundle2.applybundle(
7507 repo, gen, tr, source=b'unbundle', url=url
7507 repo, gen, tr, source=b'unbundle', url=url
7508 )
7508 )
7509 except error.BundleUnknownFeatureError as exc:
7509 except error.BundleUnknownFeatureError as exc:
7510 raise error.Abort(
7510 raise error.Abort(
7511 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7511 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7512 hint=_(
7512 hint=_(
7513 b"see https://mercurial-scm.org/"
7513 b"see https://mercurial-scm.org/"
7514 b"wiki/BundleFeature for more "
7514 b"wiki/BundleFeature for more "
7515 b"information"
7515 b"information"
7516 ),
7516 ),
7517 )
7517 )
7518 modheads = bundle2.combinechangegroupresults(op)
7518 modheads = bundle2.combinechangegroupresults(op)
7519
7519
7520 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7520 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7521
7521
7522
7522
7523 @command(
7523 @command(
7524 b'unshelve',
7524 b'unshelve',
7525 [
7525 [
7526 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7526 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7527 (
7527 (
7528 b'c',
7528 b'c',
7529 b'continue',
7529 b'continue',
7530 None,
7530 None,
7531 _(b'continue an incomplete unshelve operation'),
7531 _(b'continue an incomplete unshelve operation'),
7532 ),
7532 ),
7533 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7533 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7534 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7534 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7535 (
7535 (
7536 b'n',
7536 b'n',
7537 b'name',
7537 b'name',
7538 b'',
7538 b'',
7539 _(b'restore shelved change with given name'),
7539 _(b'restore shelved change with given name'),
7540 _(b'NAME'),
7540 _(b'NAME'),
7541 ),
7541 ),
7542 (b't', b'tool', b'', _(b'specify merge tool')),
7542 (b't', b'tool', b'', _(b'specify merge tool')),
7543 (
7543 (
7544 b'',
7544 b'',
7545 b'date',
7545 b'date',
7546 b'',
7546 b'',
7547 _(b'set date for temporary commits (DEPRECATED)'),
7547 _(b'set date for temporary commits (DEPRECATED)'),
7548 _(b'DATE'),
7548 _(b'DATE'),
7549 ),
7549 ),
7550 ],
7550 ],
7551 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7551 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7552 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7552 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7553 )
7553 )
7554 def unshelve(ui, repo, *shelved, **opts):
7554 def unshelve(ui, repo, *shelved, **opts):
7555 """restore a shelved change to the working directory
7555 """restore a shelved change to the working directory
7556
7556
7557 This command accepts an optional name of a shelved change to
7557 This command accepts an optional name of a shelved change to
7558 restore. If none is given, the most recent shelved change is used.
7558 restore. If none is given, the most recent shelved change is used.
7559
7559
7560 If a shelved change is applied successfully, the bundle that
7560 If a shelved change is applied successfully, the bundle that
7561 contains the shelved changes is moved to a backup location
7561 contains the shelved changes is moved to a backup location
7562 (.hg/shelve-backup).
7562 (.hg/shelve-backup).
7563
7563
7564 Since you can restore a shelved change on top of an arbitrary
7564 Since you can restore a shelved change on top of an arbitrary
7565 commit, it is possible that unshelving will result in a conflict
7565 commit, it is possible that unshelving will result in a conflict
7566 between your changes and the commits you are unshelving onto. If
7566 between your changes and the commits you are unshelving onto. If
7567 this occurs, you must resolve the conflict, then use
7567 this occurs, you must resolve the conflict, then use
7568 ``--continue`` to complete the unshelve operation. (The bundle
7568 ``--continue`` to complete the unshelve operation. (The bundle
7569 will not be moved until you successfully complete the unshelve.)
7569 will not be moved until you successfully complete the unshelve.)
7570
7570
7571 (Alternatively, you can use ``--abort`` to abandon an unshelve
7571 (Alternatively, you can use ``--abort`` to abandon an unshelve
7572 that causes a conflict. This reverts the unshelved changes, and
7572 that causes a conflict. This reverts the unshelved changes, and
7573 leaves the bundle in place.)
7573 leaves the bundle in place.)
7574
7574
7575 If bare shelved change (without interactive, include and exclude
7575 If bare shelved change (without interactive, include and exclude
7576 option) was done on newly created branch it would restore branch
7576 option) was done on newly created branch it would restore branch
7577 information to the working directory.
7577 information to the working directory.
7578
7578
7579 After a successful unshelve, the shelved changes are stored in a
7579 After a successful unshelve, the shelved changes are stored in a
7580 backup directory. Only the N most recent backups are kept. N
7580 backup directory. Only the N most recent backups are kept. N
7581 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7581 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7582 configuration option.
7582 configuration option.
7583
7583
7584 .. container:: verbose
7584 .. container:: verbose
7585
7585
7586 Timestamp in seconds is used to decide order of backups. More
7586 Timestamp in seconds is used to decide order of backups. More
7587 than ``maxbackups`` backups are kept, if same timestamp
7587 than ``maxbackups`` backups are kept, if same timestamp
7588 prevents from deciding exact order of them, for safety.
7588 prevents from deciding exact order of them, for safety.
7589
7589
7590 Selected changes can be unshelved with ``--interactive`` flag.
7590 Selected changes can be unshelved with ``--interactive`` flag.
7591 The working directory is updated with the selected changes, and
7591 The working directory is updated with the selected changes, and
7592 only the unselected changes remain shelved.
7592 only the unselected changes remain shelved.
7593 Note: The whole shelve is applied to working directory first before
7593 Note: The whole shelve is applied to working directory first before
7594 running interactively. So, this will bring up all the conflicts between
7594 running interactively. So, this will bring up all the conflicts between
7595 working directory and the shelve, irrespective of which changes will be
7595 working directory and the shelve, irrespective of which changes will be
7596 unshelved.
7596 unshelved.
7597 """
7597 """
7598 with repo.wlock():
7598 with repo.wlock():
7599 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7599 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7600
7600
7601
7601
7602 statemod.addunfinished(
7602 statemod.addunfinished(
7603 b'unshelve',
7603 b'unshelve',
7604 fname=b'shelvedstate',
7604 fname=b'shelvedstate',
7605 continueflag=True,
7605 continueflag=True,
7606 abortfunc=shelvemod.hgabortunshelve,
7606 abortfunc=shelvemod.hgabortunshelve,
7607 continuefunc=shelvemod.hgcontinueunshelve,
7607 continuefunc=shelvemod.hgcontinueunshelve,
7608 cmdmsg=_(b'unshelve already in progress'),
7608 cmdmsg=_(b'unshelve already in progress'),
7609 )
7609 )
7610
7610
7611
7611
7612 @command(
7612 @command(
7613 b'update|up|checkout|co',
7613 b'update|up|checkout|co',
7614 [
7614 [
7615 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7615 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7616 (b'c', b'check', None, _(b'require clean working directory')),
7616 (b'c', b'check', None, _(b'require clean working directory')),
7617 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7617 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7618 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7618 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7619 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7619 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7620 ]
7620 ]
7621 + mergetoolopts,
7621 + mergetoolopts,
7622 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7622 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7623 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7623 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7624 helpbasic=True,
7624 helpbasic=True,
7625 )
7625 )
7626 def update(ui, repo, node=None, **opts):
7626 def update(ui, repo, node=None, **opts):
7627 """update working directory (or switch revisions)
7627 """update working directory (or switch revisions)
7628
7628
7629 Update the repository's working directory to the specified
7629 Update the repository's working directory to the specified
7630 changeset. If no changeset is specified, update to the tip of the
7630 changeset. If no changeset is specified, update to the tip of the
7631 current named branch and move the active bookmark (see :hg:`help
7631 current named branch and move the active bookmark (see :hg:`help
7632 bookmarks`).
7632 bookmarks`).
7633
7633
7634 Update sets the working directory's parent revision to the specified
7634 Update sets the working directory's parent revision to the specified
7635 changeset (see :hg:`help parents`).
7635 changeset (see :hg:`help parents`).
7636
7636
7637 If the changeset is not a descendant or ancestor of the working
7637 If the changeset is not a descendant or ancestor of the working
7638 directory's parent and there are uncommitted changes, the update is
7638 directory's parent and there are uncommitted changes, the update is
7639 aborted. With the -c/--check option, the working directory is checked
7639 aborted. With the -c/--check option, the working directory is checked
7640 for uncommitted changes; if none are found, the working directory is
7640 for uncommitted changes; if none are found, the working directory is
7641 updated to the specified changeset.
7641 updated to the specified changeset.
7642
7642
7643 .. container:: verbose
7643 .. container:: verbose
7644
7644
7645 The -C/--clean, -c/--check, and -m/--merge options control what
7645 The -C/--clean, -c/--check, and -m/--merge options control what
7646 happens if the working directory contains uncommitted changes.
7646 happens if the working directory contains uncommitted changes.
7647 At most of one of them can be specified.
7647 At most of one of them can be specified.
7648
7648
7649 1. If no option is specified, and if
7649 1. If no option is specified, and if
7650 the requested changeset is an ancestor or descendant of
7650 the requested changeset is an ancestor or descendant of
7651 the working directory's parent, the uncommitted changes
7651 the working directory's parent, the uncommitted changes
7652 are merged into the requested changeset and the merged
7652 are merged into the requested changeset and the merged
7653 result is left uncommitted. If the requested changeset is
7653 result is left uncommitted. If the requested changeset is
7654 not an ancestor or descendant (that is, it is on another
7654 not an ancestor or descendant (that is, it is on another
7655 branch), the update is aborted and the uncommitted changes
7655 branch), the update is aborted and the uncommitted changes
7656 are preserved.
7656 are preserved.
7657
7657
7658 2. With the -m/--merge option, the update is allowed even if the
7658 2. With the -m/--merge option, the update is allowed even if the
7659 requested changeset is not an ancestor or descendant of
7659 requested changeset is not an ancestor or descendant of
7660 the working directory's parent.
7660 the working directory's parent.
7661
7661
7662 3. With the -c/--check option, the update is aborted and the
7662 3. With the -c/--check option, the update is aborted and the
7663 uncommitted changes are preserved.
7663 uncommitted changes are preserved.
7664
7664
7665 4. With the -C/--clean option, uncommitted changes are discarded and
7665 4. With the -C/--clean option, uncommitted changes are discarded and
7666 the working directory is updated to the requested changeset.
7666 the working directory is updated to the requested changeset.
7667
7667
7668 To cancel an uncommitted merge (and lose your changes), use
7668 To cancel an uncommitted merge (and lose your changes), use
7669 :hg:`merge --abort`.
7669 :hg:`merge --abort`.
7670
7670
7671 Use null as the changeset to remove the working directory (like
7671 Use null as the changeset to remove the working directory (like
7672 :hg:`clone -U`).
7672 :hg:`clone -U`).
7673
7673
7674 If you want to revert just one file to an older revision, use
7674 If you want to revert just one file to an older revision, use
7675 :hg:`revert [-r REV] NAME`.
7675 :hg:`revert [-r REV] NAME`.
7676
7676
7677 See :hg:`help dates` for a list of formats valid for -d/--date.
7677 See :hg:`help dates` for a list of formats valid for -d/--date.
7678
7678
7679 Returns 0 on success, 1 if there are unresolved files.
7679 Returns 0 on success, 1 if there are unresolved files.
7680 """
7680 """
7681 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7681 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7682 rev = opts.get('rev')
7682 rev = opts.get('rev')
7683 date = opts.get('date')
7683 date = opts.get('date')
7684 clean = opts.get('clean')
7684 clean = opts.get('clean')
7685 check = opts.get('check')
7685 check = opts.get('check')
7686 merge = opts.get('merge')
7686 merge = opts.get('merge')
7687 if rev and node:
7687 if rev and node:
7688 raise error.Abort(_(b"please specify just one revision"))
7688 raise error.Abort(_(b"please specify just one revision"))
7689
7689
7690 if ui.configbool(b'commands', b'update.requiredest'):
7690 if ui.configbool(b'commands', b'update.requiredest'):
7691 if not node and not rev and not date:
7691 if not node and not rev and not date:
7692 raise error.Abort(
7692 raise error.Abort(
7693 _(b'you must specify a destination'),
7693 _(b'you must specify a destination'),
7694 hint=_(b'for example: hg update ".::"'),
7694 hint=_(b'for example: hg update ".::"'),
7695 )
7695 )
7696
7696
7697 if rev is None or rev == b'':
7697 if rev is None or rev == b'':
7698 rev = node
7698 rev = node
7699
7699
7700 if date and rev is not None:
7700 if date and rev is not None:
7701 raise error.Abort(_(b"you can't specify a revision and a date"))
7701 raise error.Abort(_(b"you can't specify a revision and a date"))
7702
7702
7703 updatecheck = None
7703 updatecheck = None
7704 if check:
7704 if check:
7705 updatecheck = b'abort'
7705 updatecheck = b'abort'
7706 elif merge:
7706 elif merge:
7707 updatecheck = b'none'
7707 updatecheck = b'none'
7708
7708
7709 with repo.wlock():
7709 with repo.wlock():
7710 cmdutil.clearunfinished(repo)
7710 cmdutil.clearunfinished(repo)
7711 if date:
7711 if date:
7712 rev = cmdutil.finddate(ui, repo, date)
7712 rev = cmdutil.finddate(ui, repo, date)
7713
7713
7714 # if we defined a bookmark, we have to remember the original name
7714 # if we defined a bookmark, we have to remember the original name
7715 brev = rev
7715 brev = rev
7716 if rev:
7716 if rev:
7717 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7717 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7718 ctx = scmutil.revsingle(repo, rev, default=None)
7718 ctx = scmutil.revsingle(repo, rev, default=None)
7719 rev = ctx.rev()
7719 rev = ctx.rev()
7720 hidden = ctx.hidden()
7720 hidden = ctx.hidden()
7721 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7721 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7722 with ui.configoverride(overrides, b'update'):
7722 with ui.configoverride(overrides, b'update'):
7723 ret = hg.updatetotally(
7723 ret = hg.updatetotally(
7724 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7724 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7725 )
7725 )
7726 if hidden:
7726 if hidden:
7727 ctxstr = ctx.hex()[:12]
7727 ctxstr = ctx.hex()[:12]
7728 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7728 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7729
7729
7730 if ctx.obsolete():
7730 if ctx.obsolete():
7731 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7731 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7732 ui.warn(b"(%s)\n" % obsfatemsg)
7732 ui.warn(b"(%s)\n" % obsfatemsg)
7733 return ret
7733 return ret
7734
7734
7735
7735
7736 @command(
7736 @command(
7737 b'verify',
7737 b'verify',
7738 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7738 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7739 helpcategory=command.CATEGORY_MAINTENANCE,
7739 helpcategory=command.CATEGORY_MAINTENANCE,
7740 )
7740 )
7741 def verify(ui, repo, **opts):
7741 def verify(ui, repo, **opts):
7742 """verify the integrity of the repository
7742 """verify the integrity of the repository
7743
7743
7744 Verify the integrity of the current repository.
7744 Verify the integrity of the current repository.
7745
7745
7746 This will perform an extensive check of the repository's
7746 This will perform an extensive check of the repository's
7747 integrity, validating the hashes and checksums of each entry in
7747 integrity, validating the hashes and checksums of each entry in
7748 the changelog, manifest, and tracked files, as well as the
7748 the changelog, manifest, and tracked files, as well as the
7749 integrity of their crosslinks and indices.
7749 integrity of their crosslinks and indices.
7750
7750
7751 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7751 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7752 for more information about recovery from corruption of the
7752 for more information about recovery from corruption of the
7753 repository.
7753 repository.
7754
7754
7755 Returns 0 on success, 1 if errors are encountered.
7755 Returns 0 on success, 1 if errors are encountered.
7756 """
7756 """
7757 opts = pycompat.byteskwargs(opts)
7757 opts = pycompat.byteskwargs(opts)
7758
7758
7759 level = None
7759 level = None
7760 if opts[b'full']:
7760 if opts[b'full']:
7761 level = verifymod.VERIFY_FULL
7761 level = verifymod.VERIFY_FULL
7762 return hg.verify(repo, level)
7762 return hg.verify(repo, level)
7763
7763
7764
7764
7765 @command(
7765 @command(
7766 b'version',
7766 b'version',
7767 [] + formatteropts,
7767 [] + formatteropts,
7768 helpcategory=command.CATEGORY_HELP,
7768 helpcategory=command.CATEGORY_HELP,
7769 norepo=True,
7769 norepo=True,
7770 intents={INTENT_READONLY},
7770 intents={INTENT_READONLY},
7771 )
7771 )
7772 def version_(ui, **opts):
7772 def version_(ui, **opts):
7773 """output version and copyright information
7773 """output version and copyright information
7774
7774
7775 .. container:: verbose
7775 .. container:: verbose
7776
7776
7777 Template:
7777 Template:
7778
7778
7779 The following keywords are supported. See also :hg:`help templates`.
7779 The following keywords are supported. See also :hg:`help templates`.
7780
7780
7781 :extensions: List of extensions.
7781 :extensions: List of extensions.
7782 :ver: String. Version number.
7782 :ver: String. Version number.
7783
7783
7784 And each entry of ``{extensions}`` provides the following sub-keywords
7784 And each entry of ``{extensions}`` provides the following sub-keywords
7785 in addition to ``{ver}``.
7785 in addition to ``{ver}``.
7786
7786
7787 :bundled: Boolean. True if included in the release.
7787 :bundled: Boolean. True if included in the release.
7788 :name: String. Extension name.
7788 :name: String. Extension name.
7789 """
7789 """
7790 opts = pycompat.byteskwargs(opts)
7790 opts = pycompat.byteskwargs(opts)
7791 if ui.verbose:
7791 if ui.verbose:
7792 ui.pager(b'version')
7792 ui.pager(b'version')
7793 fm = ui.formatter(b"version", opts)
7793 fm = ui.formatter(b"version", opts)
7794 fm.startitem()
7794 fm.startitem()
7795 fm.write(
7795 fm.write(
7796 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7796 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7797 )
7797 )
7798 license = _(
7798 license = _(
7799 b"(see https://mercurial-scm.org for more information)\n"
7799 b"(see https://mercurial-scm.org for more information)\n"
7800 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7800 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7801 b"This is free software; see the source for copying conditions. "
7801 b"This is free software; see the source for copying conditions. "
7802 b"There is NO\nwarranty; "
7802 b"There is NO\nwarranty; "
7803 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7803 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7804 )
7804 )
7805 if not ui.quiet:
7805 if not ui.quiet:
7806 fm.plain(license)
7806 fm.plain(license)
7807
7807
7808 if ui.verbose:
7808 if ui.verbose:
7809 fm.plain(_(b"\nEnabled extensions:\n\n"))
7809 fm.plain(_(b"\nEnabled extensions:\n\n"))
7810 # format names and versions into columns
7810 # format names and versions into columns
7811 names = []
7811 names = []
7812 vers = []
7812 vers = []
7813 isinternals = []
7813 isinternals = []
7814 for name, module in sorted(extensions.extensions()):
7814 for name, module in sorted(extensions.extensions()):
7815 names.append(name)
7815 names.append(name)
7816 vers.append(extensions.moduleversion(module) or None)
7816 vers.append(extensions.moduleversion(module) or None)
7817 isinternals.append(extensions.ismoduleinternal(module))
7817 isinternals.append(extensions.ismoduleinternal(module))
7818 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7818 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7819 if names:
7819 if names:
7820 namefmt = b" %%-%ds " % max(len(n) for n in names)
7820 namefmt = b" %%-%ds " % max(len(n) for n in names)
7821 places = [_(b"external"), _(b"internal")]
7821 places = [_(b"external"), _(b"internal")]
7822 for n, v, p in zip(names, vers, isinternals):
7822 for n, v, p in zip(names, vers, isinternals):
7823 fn.startitem()
7823 fn.startitem()
7824 fn.condwrite(ui.verbose, b"name", namefmt, n)
7824 fn.condwrite(ui.verbose, b"name", namefmt, n)
7825 if ui.verbose:
7825 if ui.verbose:
7826 fn.plain(b"%s " % places[p])
7826 fn.plain(b"%s " % places[p])
7827 fn.data(bundled=p)
7827 fn.data(bundled=p)
7828 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7828 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7829 if ui.verbose:
7829 if ui.verbose:
7830 fn.plain(b"\n")
7830 fn.plain(b"\n")
7831 fn.end()
7831 fn.end()
7832 fm.end()
7832 fm.end()
7833
7833
7834
7834
7835 def loadcmdtable(ui, name, cmdtable):
7835 def loadcmdtable(ui, name, cmdtable):
7836 """Load command functions from specified cmdtable
7836 """Load command functions from specified cmdtable
7837 """
7837 """
7838 overrides = [cmd for cmd in cmdtable if cmd in table]
7838 overrides = [cmd for cmd in cmdtable if cmd in table]
7839 if overrides:
7839 if overrides:
7840 ui.warn(
7840 ui.warn(
7841 _(b"extension '%s' overrides commands: %s\n")
7841 _(b"extension '%s' overrides commands: %s\n")
7842 % (name, b" ".join(overrides))
7842 % (name, b" ".join(overrides))
7843 )
7843 )
7844 table.update(cmdtable)
7844 table.update(cmdtable)
@@ -1,790 +1,815
1 $ hg init t
1 $ hg init t
2 $ cd t
2 $ cd t
3 $ echo import > port
3 $ echo import > port
4 $ hg add port
4 $ hg add port
5 $ hg commit -m 0 -u spam -d '0 0'
5 $ hg commit -m 0 -u spam -d '0 0'
6 $ echo export >> port
6 $ echo export >> port
7 $ hg commit -m 1 -u eggs -d '1 0'
7 $ hg commit -m 1 -u eggs -d '1 0'
8 $ echo export > port
8 $ echo export > port
9 $ echo vaportight >> port
9 $ echo vaportight >> port
10 $ echo 'import/export' >> port
10 $ echo 'import/export' >> port
11 $ hg commit -m 2 -u spam -d '2 0'
11 $ hg commit -m 2 -u spam -d '2 0'
12 $ echo 'import/export' >> port
12 $ echo 'import/export' >> port
13 $ hg commit -m 3 -u eggs -d '3 0'
13 $ hg commit -m 3 -u eggs -d '3 0'
14 $ head -n 3 port > port1
14 $ head -n 3 port > port1
15 $ mv port1 port
15 $ mv port1 port
16 $ hg commit -m 4 -u spam -d '4 0'
16 $ hg commit -m 4 -u spam -d '4 0'
17
17
18 pattern error
18 pattern error
19
19
20 $ hg grep '**test**'
20 $ hg grep '**test**'
21 grep: invalid match pattern: nothing to repeat* (glob)
21 grep: invalid match pattern: nothing to repeat* (glob)
22 [1]
22 [1]
23
23
24 simple
24 simple
25
25
26 $ hg grep -r tip:0 '.*'
26 $ hg grep -r tip:0 '.*'
27 port:4:export
27 port:4:export
28 port:4:vaportight
28 port:4:vaportight
29 port:4:import/export
29 port:4:import/export
30 port:3:export
30 port:3:export
31 port:3:vaportight
31 port:3:vaportight
32 port:3:import/export
32 port:3:import/export
33 port:3:import/export
33 port:3:import/export
34 port:2:export
34 port:2:export
35 port:2:vaportight
35 port:2:vaportight
36 port:2:import/export
36 port:2:import/export
37 port:1:import
37 port:1:import
38 port:1:export
38 port:1:export
39 port:0:import
39 port:0:import
40 $ hg grep -r tip:0 port port
40 $ hg grep -r tip:0 port port
41 port:4:export
41 port:4:export
42 port:4:vaportight
42 port:4:vaportight
43 port:4:import/export
43 port:4:import/export
44 port:3:export
44 port:3:export
45 port:3:vaportight
45 port:3:vaportight
46 port:3:import/export
46 port:3:import/export
47 port:3:import/export
47 port:3:import/export
48 port:2:export
48 port:2:export
49 port:2:vaportight
49 port:2:vaportight
50 port:2:import/export
50 port:2:import/export
51 port:1:import
51 port:1:import
52 port:1:export
52 port:1:export
53 port:0:import
53 port:0:import
54
54
55 simple from subdirectory
55 simple from subdirectory
56
56
57 $ mkdir dir
57 $ mkdir dir
58 $ cd dir
58 $ cd dir
59 $ hg grep -r tip:0 port
59 $ hg grep -r tip:0 port
60 port:4:export
60 port:4:export
61 port:4:vaportight
61 port:4:vaportight
62 port:4:import/export
62 port:4:import/export
63 port:3:export
63 port:3:export
64 port:3:vaportight
64 port:3:vaportight
65 port:3:import/export
65 port:3:import/export
66 port:3:import/export
66 port:3:import/export
67 port:2:export
67 port:2:export
68 port:2:vaportight
68 port:2:vaportight
69 port:2:import/export
69 port:2:import/export
70 port:1:import
70 port:1:import
71 port:1:export
71 port:1:export
72 port:0:import
72 port:0:import
73 $ hg grep -r tip:0 port --config ui.relative-paths=yes
73 $ hg grep -r tip:0 port --config ui.relative-paths=yes
74 ../port:4:export
74 ../port:4:export
75 ../port:4:vaportight
75 ../port:4:vaportight
76 ../port:4:import/export
76 ../port:4:import/export
77 ../port:3:export
77 ../port:3:export
78 ../port:3:vaportight
78 ../port:3:vaportight
79 ../port:3:import/export
79 ../port:3:import/export
80 ../port:3:import/export
80 ../port:3:import/export
81 ../port:2:export
81 ../port:2:export
82 ../port:2:vaportight
82 ../port:2:vaportight
83 ../port:2:import/export
83 ../port:2:import/export
84 ../port:1:import
84 ../port:1:import
85 ../port:1:export
85 ../port:1:export
86 ../port:0:import
86 ../port:0:import
87 $ cd ..
87 $ cd ..
88
88
89 simple with color
89 simple with color
90
90
91 $ hg --config extensions.color= grep --config color.mode=ansi \
91 $ hg --config extensions.color= grep --config color.mode=ansi \
92 > --color=always port port -r tip:0
92 > --color=always port port -r tip:0
93 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
93 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
94 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
94 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
95 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
95 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
96 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
96 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
97 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
97 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
98 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
98 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
99 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
99 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
100 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
100 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
101 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
101 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
102 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
102 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
103 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
103 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
104 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
104 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
105 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m0\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
105 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m0\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
106
106
107 simple templated
107 simple templated
108
108
109 $ hg grep port -r tip:0 \
109 $ hg grep port -r tip:0 \
110 > -T '{path}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
110 > -T '{path}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
111 port:4:914fa752cdea:exPORT
111 port:4:914fa752cdea:exPORT
112 port:4:914fa752cdea:vaPORTight
112 port:4:914fa752cdea:vaPORTight
113 port:4:914fa752cdea:imPORT/exPORT
113 port:4:914fa752cdea:imPORT/exPORT
114 port:3:95040cfd017d:exPORT
114 port:3:95040cfd017d:exPORT
115 port:3:95040cfd017d:vaPORTight
115 port:3:95040cfd017d:vaPORTight
116 port:3:95040cfd017d:imPORT/exPORT
116 port:3:95040cfd017d:imPORT/exPORT
117 port:3:95040cfd017d:imPORT/exPORT
117 port:3:95040cfd017d:imPORT/exPORT
118 port:2:3b325e3481a1:exPORT
118 port:2:3b325e3481a1:exPORT
119 port:2:3b325e3481a1:vaPORTight
119 port:2:3b325e3481a1:vaPORTight
120 port:2:3b325e3481a1:imPORT/exPORT
120 port:2:3b325e3481a1:imPORT/exPORT
121 port:1:8b20f75c1585:imPORT
121 port:1:8b20f75c1585:imPORT
122 port:1:8b20f75c1585:exPORT
122 port:1:8b20f75c1585:exPORT
123 port:0:f31323c92170:imPORT
123 port:0:f31323c92170:imPORT
124
124
125 $ hg grep port -r tip:0 -T '{path}:{rev}:{texts}\n'
125 $ hg grep port -r tip:0 -T '{path}:{rev}:{texts}\n'
126 port:4:export
126 port:4:export
127 port:4:vaportight
127 port:4:vaportight
128 port:4:import/export
128 port:4:import/export
129 port:3:export
129 port:3:export
130 port:3:vaportight
130 port:3:vaportight
131 port:3:import/export
131 port:3:import/export
132 port:3:import/export
132 port:3:import/export
133 port:2:export
133 port:2:export
134 port:2:vaportight
134 port:2:vaportight
135 port:2:import/export
135 port:2:import/export
136 port:1:import
136 port:1:import
137 port:1:export
137 port:1:export
138 port:0:import
138 port:0:import
139
139
140 $ hg grep port -r tip:0 -T '{path}:{tags}:{texts}\n'
140 $ hg grep port -r tip:0 -T '{path}:{tags}:{texts}\n'
141 port:tip:export
141 port:tip:export
142 port:tip:vaportight
142 port:tip:vaportight
143 port:tip:import/export
143 port:tip:import/export
144 port::export
144 port::export
145 port::vaportight
145 port::vaportight
146 port::import/export
146 port::import/export
147 port::import/export
147 port::import/export
148 port::export
148 port::export
149 port::vaportight
149 port::vaportight
150 port::import/export
150 port::import/export
151 port::import
151 port::import
152 port::export
152 port::export
153 port::import
153 port::import
154
154
155 simple JSON (no "change" field)
155 simple JSON (no "change" field)
156
156
157 $ hg grep -r tip:0 -Tjson port
157 $ hg grep -r tip:0 -Tjson port
158 [
158 [
159 {
159 {
160 "date": [4, 0],
160 "date": [4, 0],
161 "lineno": 1,
161 "lineno": 1,
162 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
162 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
163 "path": "port",
163 "path": "port",
164 "rev": 4,
164 "rev": 4,
165 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
165 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
166 "user": "spam"
166 "user": "spam"
167 },
167 },
168 {
168 {
169 "date": [4, 0],
169 "date": [4, 0],
170 "lineno": 2,
170 "lineno": 2,
171 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
171 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
172 "path": "port",
172 "path": "port",
173 "rev": 4,
173 "rev": 4,
174 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
174 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
175 "user": "spam"
175 "user": "spam"
176 },
176 },
177 {
177 {
178 "date": [4, 0],
178 "date": [4, 0],
179 "lineno": 3,
179 "lineno": 3,
180 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
180 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
181 "path": "port",
181 "path": "port",
182 "rev": 4,
182 "rev": 4,
183 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
183 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
184 "user": "spam"
184 "user": "spam"
185 },
185 },
186 {
186 {
187 "date": [3, 0],
187 "date": [3, 0],
188 "lineno": 1,
188 "lineno": 1,
189 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
189 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
190 "path": "port",
190 "path": "port",
191 "rev": 3,
191 "rev": 3,
192 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
192 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
193 "user": "eggs"
193 "user": "eggs"
194 },
194 },
195 {
195 {
196 "date": [3, 0],
196 "date": [3, 0],
197 "lineno": 2,
197 "lineno": 2,
198 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
198 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
199 "path": "port",
199 "path": "port",
200 "rev": 3,
200 "rev": 3,
201 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
201 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
202 "user": "eggs"
202 "user": "eggs"
203 },
203 },
204 {
204 {
205 "date": [3, 0],
205 "date": [3, 0],
206 "lineno": 3,
206 "lineno": 3,
207 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
207 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
208 "path": "port",
208 "path": "port",
209 "rev": 3,
209 "rev": 3,
210 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
210 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
211 "user": "eggs"
211 "user": "eggs"
212 },
212 },
213 {
213 {
214 "date": [3, 0],
214 "date": [3, 0],
215 "lineno": 4,
215 "lineno": 4,
216 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
216 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
217 "path": "port",
217 "path": "port",
218 "rev": 3,
218 "rev": 3,
219 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
219 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
220 "user": "eggs"
220 "user": "eggs"
221 },
221 },
222 {
222 {
223 "date": [2, 0],
223 "date": [2, 0],
224 "lineno": 1,
224 "lineno": 1,
225 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
225 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
226 "path": "port",
226 "path": "port",
227 "rev": 2,
227 "rev": 2,
228 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
228 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
229 "user": "spam"
229 "user": "spam"
230 },
230 },
231 {
231 {
232 "date": [2, 0],
232 "date": [2, 0],
233 "lineno": 2,
233 "lineno": 2,
234 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
234 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
235 "path": "port",
235 "path": "port",
236 "rev": 2,
236 "rev": 2,
237 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
237 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
238 "user": "spam"
238 "user": "spam"
239 },
239 },
240 {
240 {
241 "date": [2, 0],
241 "date": [2, 0],
242 "lineno": 3,
242 "lineno": 3,
243 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
243 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
244 "path": "port",
244 "path": "port",
245 "rev": 2,
245 "rev": 2,
246 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
246 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
247 "user": "spam"
247 "user": "spam"
248 },
248 },
249 {
249 {
250 "date": [1, 0],
250 "date": [1, 0],
251 "lineno": 1,
251 "lineno": 1,
252 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
252 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
253 "path": "port",
253 "path": "port",
254 "rev": 1,
254 "rev": 1,
255 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
255 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
256 "user": "eggs"
256 "user": "eggs"
257 },
257 },
258 {
258 {
259 "date": [1, 0],
259 "date": [1, 0],
260 "lineno": 2,
260 "lineno": 2,
261 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
261 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
262 "path": "port",
262 "path": "port",
263 "rev": 1,
263 "rev": 1,
264 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
264 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
265 "user": "eggs"
265 "user": "eggs"
266 },
266 },
267 {
267 {
268 "date": [0, 0],
268 "date": [0, 0],
269 "lineno": 1,
269 "lineno": 1,
270 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
270 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
271 "path": "port",
271 "path": "port",
272 "rev": 0,
272 "rev": 0,
273 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
273 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
274 "user": "spam"
274 "user": "spam"
275 }
275 }
276 ]
276 ]
277
277
278 simple JSON without matching lines
278 simple JSON without matching lines
279
279
280 $ hg grep -r tip:0 -Tjson -l port
280 $ hg grep -r tip:0 -Tjson -l port
281 [
281 [
282 {
282 {
283 "date": [4, 0],
283 "date": [4, 0],
284 "lineno": 1,
284 "lineno": 1,
285 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
285 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
286 "path": "port",
286 "path": "port",
287 "rev": 4,
287 "rev": 4,
288 "user": "spam"
288 "user": "spam"
289 },
289 },
290 {
290 {
291 "date": [3, 0],
291 "date": [3, 0],
292 "lineno": 1,
292 "lineno": 1,
293 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
293 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
294 "path": "port",
294 "path": "port",
295 "rev": 3,
295 "rev": 3,
296 "user": "eggs"
296 "user": "eggs"
297 },
297 },
298 {
298 {
299 "date": [2, 0],
299 "date": [2, 0],
300 "lineno": 1,
300 "lineno": 1,
301 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
301 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
302 "path": "port",
302 "path": "port",
303 "rev": 2,
303 "rev": 2,
304 "user": "spam"
304 "user": "spam"
305 },
305 },
306 {
306 {
307 "date": [1, 0],
307 "date": [1, 0],
308 "lineno": 1,
308 "lineno": 1,
309 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
309 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
310 "path": "port",
310 "path": "port",
311 "rev": 1,
311 "rev": 1,
312 "user": "eggs"
312 "user": "eggs"
313 },
313 },
314 {
314 {
315 "date": [0, 0],
315 "date": [0, 0],
316 "lineno": 1,
316 "lineno": 1,
317 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
317 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
318 "path": "port",
318 "path": "port",
319 "rev": 0,
319 "rev": 0,
320 "user": "spam"
320 "user": "spam"
321 }
321 }
322 ]
322 ]
323
323
324 diff of each revision for reference
325
326 $ hg log -p -T'== rev: {rev} ==\n'
327 == rev: 4 ==
328 diff -r 95040cfd017d -r 914fa752cdea port
329 --- a/port Thu Jan 01 00:00:03 1970 +0000
330 +++ b/port Thu Jan 01 00:00:04 1970 +0000
331 @@ -1,4 +1,3 @@
332 export
333 vaportight
334 import/export
335 -import/export
336
337 == rev: 3 ==
338 diff -r 3b325e3481a1 -r 95040cfd017d port
339 --- a/port Thu Jan 01 00:00:02 1970 +0000
340 +++ b/port Thu Jan 01 00:00:03 1970 +0000
341 @@ -1,3 +1,4 @@
342 export
343 vaportight
344 import/export
345 +import/export
346
347 == rev: 2 ==
348 diff -r 8b20f75c1585 -r 3b325e3481a1 port
349 --- a/port Thu Jan 01 00:00:01 1970 +0000
350 +++ b/port Thu Jan 01 00:00:02 1970 +0000
351 @@ -1,2 +1,3 @@
352 -import
353 export
354 +vaportight
355 +import/export
356
357 == rev: 1 ==
358 diff -r f31323c92170 -r 8b20f75c1585 port
359 --- a/port Thu Jan 01 00:00:00 1970 +0000
360 +++ b/port Thu Jan 01 00:00:01 1970 +0000
361 @@ -1,1 +1,2 @@
362 import
363 +export
364
365 == rev: 0 ==
366 diff -r 000000000000 -r f31323c92170 port
367 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
368 +++ b/port Thu Jan 01 00:00:00 1970 +0000
369 @@ -0,0 +1,1 @@
370 +import
371
372
324 all
373 all
325
374
326 $ hg grep --traceback --all -nu port port
375 $ hg grep --traceback --all -nu port port
327 port:4:4:-:spam:import/export
376 port:4:4:-:spam:import/export
328 port:3:4:+:eggs:import/export
377 port:3:4:+:eggs:import/export
329 port:2:1:-:spam:import
378 port:2:1:-:spam:import
330 port:2:2:-:spam:export
331 port:2:1:+:spam:export
332 port:2:2:+:spam:vaportight
379 port:2:2:+:spam:vaportight
333 port:2:3:+:spam:import/export
380 port:2:3:+:spam:import/export
334 port:1:2:+:eggs:export
381 port:1:2:+:eggs:export
335 port:0:1:+:spam:import
382 port:0:1:+:spam:import
336
383
337 all JSON
384 all JSON
338
385
339 $ hg grep --all -Tjson port port
386 $ hg grep --all -Tjson port port
340 [
387 [
341 {
388 {
342 "change": "-",
389 "change": "-",
343 "date": [4, 0],
390 "date": [4, 0],
344 "lineno": 4,
391 "lineno": 4,
345 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
392 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
346 "path": "port",
393 "path": "port",
347 "rev": 4,
394 "rev": 4,
348 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
395 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
349 "user": "spam"
396 "user": "spam"
350 },
397 },
351 {
398 {
352 "change": "+",
399 "change": "+",
353 "date": [3, 0],
400 "date": [3, 0],
354 "lineno": 4,
401 "lineno": 4,
355 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
402 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
356 "path": "port",
403 "path": "port",
357 "rev": 3,
404 "rev": 3,
358 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
405 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
359 "user": "eggs"
406 "user": "eggs"
360 },
407 },
361 {
408 {
362 "change": "-",
409 "change": "-",
363 "date": [2, 0],
410 "date": [2, 0],
364 "lineno": 1,
411 "lineno": 1,
365 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
412 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
366 "path": "port",
413 "path": "port",
367 "rev": 2,
414 "rev": 2,
368 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
415 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
369 "user": "spam"
416 "user": "spam"
370 },
417 },
371 {
418 {
372 "change": "-",
373 "date": [2, 0],
374 "lineno": 2,
375 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
376 "path": "port",
377 "rev": 2,
378 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
379 "user": "spam"
380 },
381 {
382 "change": "+",
383 "date": [2, 0],
384 "lineno": 1,
385 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
386 "path": "port",
387 "rev": 2,
388 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
389 "user": "spam"
390 },
391 {
392 "change": "+",
419 "change": "+",
393 "date": [2, 0],
420 "date": [2, 0],
394 "lineno": 2,
421 "lineno": 2,
395 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
422 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
396 "path": "port",
423 "path": "port",
397 "rev": 2,
424 "rev": 2,
398 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
425 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
399 "user": "spam"
426 "user": "spam"
400 },
427 },
401 {
428 {
402 "change": "+",
429 "change": "+",
403 "date": [2, 0],
430 "date": [2, 0],
404 "lineno": 3,
431 "lineno": 3,
405 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
432 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
406 "path": "port",
433 "path": "port",
407 "rev": 2,
434 "rev": 2,
408 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
435 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
409 "user": "spam"
436 "user": "spam"
410 },
437 },
411 {
438 {
412 "change": "+",
439 "change": "+",
413 "date": [1, 0],
440 "date": [1, 0],
414 "lineno": 2,
441 "lineno": 2,
415 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
442 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
416 "path": "port",
443 "path": "port",
417 "rev": 1,
444 "rev": 1,
418 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
445 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
419 "user": "eggs"
446 "user": "eggs"
420 },
447 },
421 {
448 {
422 "change": "+",
449 "change": "+",
423 "date": [0, 0],
450 "date": [0, 0],
424 "lineno": 1,
451 "lineno": 1,
425 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
452 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
426 "path": "port",
453 "path": "port",
427 "rev": 0,
454 "rev": 0,
428 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
455 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
429 "user": "spam"
456 "user": "spam"
430 }
457 }
431 ]
458 ]
432
459
433 other
460 other
434
461
435 $ hg grep -r tip:0 -l port port
462 $ hg grep -r tip:0 -l port port
436 port:4
463 port:4
437 port:3
464 port:3
438 port:2
465 port:2
439 port:1
466 port:1
440 port:0
467 port:0
441 $ hg grep -r tip:0 import port
468 $ hg grep -r tip:0 import port
442 port:4:import/export
469 port:4:import/export
443 port:3:import/export
470 port:3:import/export
444 port:3:import/export
471 port:3:import/export
445 port:2:import/export
472 port:2:import/export
446 port:1:import
473 port:1:import
447 port:0:import
474 port:0:import
448
475
449 $ hg cp port port2
476 $ hg cp port port2
450 $ hg commit -m 4 -u spam -d '5 0'
477 $ hg commit -m 4 -u spam -d '5 0'
451
478
452 follow
479 follow
453
480
454 $ hg grep -r tip:0 --traceback -f 'import\n\Z' port2
481 $ hg grep -r tip:0 --traceback -f 'import\n\Z' port2
455 [1]
482 [1]
456 $ echo deport >> port2
483 $ echo deport >> port2
457 $ hg commit -m 5 -u eggs -d '6 0'
484 $ hg commit -m 5 -u eggs -d '6 0'
458 $ hg grep -f --all -nu port port2
485 $ hg grep -f --all -nu port port2
459 port2:6:4:+:eggs:deport
486 port2:6:4:+:eggs:deport
460 port:4:4:-:spam:import/export
487 port:4:4:-:spam:import/export
461 port:3:4:+:eggs:import/export
488 port:3:4:+:eggs:import/export
462 port:2:1:-:spam:import
489 port:2:1:-:spam:import
463 port:2:2:-:spam:export
464 port:2:1:+:spam:export
465 port:2:2:+:spam:vaportight
490 port:2:2:+:spam:vaportight
466 port:2:3:+:spam:import/export
491 port:2:3:+:spam:import/export
467 port:1:2:+:eggs:export
492 port:1:2:+:eggs:export
468 port:0:1:+:spam:import
493 port:0:1:+:spam:import
469
494
470 $ hg up -q null
495 $ hg up -q null
471 $ hg grep -r 'reverse(:.)' -f port
496 $ hg grep -r 'reverse(:.)' -f port
472 port:0:import
497 port:0:import
473
498
474 Test wdir
499 Test wdir
475 (at least, this shouldn't crash)
500 (at least, this shouldn't crash)
476
501
477 $ hg up -q
502 $ hg up -q
478 $ echo wport >> port2
503 $ echo wport >> port2
479 $ hg stat
504 $ hg stat
480 M port2
505 M port2
481 $ hg grep -r 'wdir()' port
506 $ hg grep -r 'wdir()' port
482 port:2147483647:export
507 port:2147483647:export
483 port:2147483647:vaportight
508 port:2147483647:vaportight
484 port:2147483647:import/export
509 port:2147483647:import/export
485 port2:2147483647:export
510 port2:2147483647:export
486 port2:2147483647:vaportight
511 port2:2147483647:vaportight
487 port2:2147483647:import/export
512 port2:2147483647:import/export
488 port2:2147483647:deport
513 port2:2147483647:deport
489 port2:2147483647:wport
514 port2:2147483647:wport
490
515
491 $ cd ..
516 $ cd ..
492 $ hg init t2
517 $ hg init t2
493 $ cd t2
518 $ cd t2
494 $ hg grep -r tip:0 foobar foo
519 $ hg grep -r tip:0 foobar foo
495 [1]
520 [1]
496 $ hg grep -r tip:0 foobar
521 $ hg grep -r tip:0 foobar
497 [1]
522 [1]
498 $ echo blue >> color
523 $ echo blue >> color
499 $ echo black >> color
524 $ echo black >> color
500 $ hg add color
525 $ hg add color
501 $ hg ci -m 0
526 $ hg ci -m 0
502 $ echo orange >> color
527 $ echo orange >> color
503 $ hg ci -m 1
528 $ hg ci -m 1
504 $ echo black > color
529 $ echo black > color
505 $ hg ci -m 2
530 $ hg ci -m 2
506 $ echo orange >> color
531 $ echo orange >> color
507 $ echo blue >> color
532 $ echo blue >> color
508 $ hg ci -m 3
533 $ hg ci -m 3
509 $ hg grep -r tip:0 orange
534 $ hg grep -r tip:0 orange
510 color:3:orange
535 color:3:orange
511 color:1:orange
536 color:1:orange
512 $ hg grep --all orange
537 $ hg grep --all orange
513 color:3:+:orange
538 color:3:+:orange
514 color:2:-:orange
539 color:2:-:orange
515 color:1:+:orange
540 color:1:+:orange
516 $ hg grep --diff orange --color=debug
541 $ hg grep --diff orange --color=debug
517 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
542 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
518 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange]
543 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange]
519 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
544 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
520
545
521 $ hg grep --diff orange --color=yes
546 $ hg grep --diff orange --color=yes
522 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
547 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
523 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1m-\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
548 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1m-\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
524 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
549 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
525
550
526 $ hg grep --diff orange
551 $ hg grep --diff orange
527 color:3:+:orange
552 color:3:+:orange
528 color:2:-:orange
553 color:2:-:orange
529 color:1:+:orange
554 color:1:+:orange
530
555
531 test substring match: '^' should only match at the beginning
556 test substring match: '^' should only match at the beginning
532
557
533 $ hg grep -r tip:0 '^.' --config extensions.color= --color debug
558 $ hg grep -r tip:0 '^.' --config extensions.color= --color debug
534 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
559 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
535 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
560 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
536 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
561 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
537 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.match|b]lack
562 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.match|b]lack
538 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lue
563 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lue
539 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lack
564 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lack
540 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|o]range
565 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|o]range
541 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lue
566 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lue
542 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lack
567 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lack
543
568
544 match in last "line" without newline
569 match in last "line" without newline
545
570
546 $ "$PYTHON" -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
571 $ "$PYTHON" -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
547 $ hg ci -Amnoeol
572 $ hg ci -Amnoeol
548 adding noeol
573 adding noeol
549 $ hg grep -r tip:0 loop
574 $ hg grep -r tip:0 loop
550 noeol:4:no infinite loop
575 noeol:4:no infinite loop
551
576
552 $ cd ..
577 $ cd ..
553
578
554 Issue685: traceback in grep -r after rename
579 Issue685: traceback in grep -r after rename
555
580
556 Got a traceback when using grep on a single
581 Got a traceback when using grep on a single
557 revision with renamed files.
582 revision with renamed files.
558
583
559 $ hg init issue685
584 $ hg init issue685
560 $ cd issue685
585 $ cd issue685
561 $ echo octarine > color
586 $ echo octarine > color
562 $ hg ci -Amcolor
587 $ hg ci -Amcolor
563 adding color
588 adding color
564 $ hg rename color colour
589 $ hg rename color colour
565 $ hg ci -Am rename
590 $ hg ci -Am rename
566 $ hg grep -r tip:0 octarine
591 $ hg grep -r tip:0 octarine
567 colour:1:octarine
592 colour:1:octarine
568 color:0:octarine
593 color:0:octarine
569
594
570 Used to crash here
595 Used to crash here
571
596
572 $ hg grep -r 1 octarine
597 $ hg grep -r 1 octarine
573 colour:1:octarine
598 colour:1:octarine
574 $ cd ..
599 $ cd ..
575
600
576
601
577 Issue337: test that grep follows parent-child relationships instead
602 Issue337: test that grep follows parent-child relationships instead
578 of just using revision numbers.
603 of just using revision numbers.
579
604
580 $ hg init issue337
605 $ hg init issue337
581 $ cd issue337
606 $ cd issue337
582
607
583 $ echo white > color
608 $ echo white > color
584 $ hg commit -A -m "0 white"
609 $ hg commit -A -m "0 white"
585 adding color
610 adding color
586
611
587 $ echo red > color
612 $ echo red > color
588 $ hg commit -A -m "1 red"
613 $ hg commit -A -m "1 red"
589
614
590 $ hg update 0
615 $ hg update 0
591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
616 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
592 $ echo black > color
617 $ echo black > color
593 $ hg commit -A -m "2 black"
618 $ hg commit -A -m "2 black"
594 created new head
619 created new head
595
620
596 $ hg update --clean 1
621 $ hg update --clean 1
597 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
622 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
598 $ echo blue > color
623 $ echo blue > color
599 $ hg commit -A -m "3 blue"
624 $ hg commit -A -m "3 blue"
600
625
601 $ hg grep --all red
626 $ hg grep --all red
602 color:3:-:red
627 color:3:-:red
603 color:1:+:red
628 color:1:+:red
604
629
605 $ hg grep --diff red
630 $ hg grep --diff red
606 color:3:-:red
631 color:3:-:red
607 color:1:+:red
632 color:1:+:red
608
633
609 Issue3885: test that changing revision order does not alter the
634 Issue3885: test that changing revision order does not alter the
610 revisions printed, just their order.
635 revisions printed, just their order.
611
636
612 $ hg grep --all red -r "all()"
637 $ hg grep --all red -r "all()"
613 color:1:+:red
638 color:1:+:red
614 color:3:-:red
639 color:3:-:red
615
640
616 $ hg grep --all red -r "reverse(all())"
641 $ hg grep --all red -r "reverse(all())"
617 color:3:-:red
642 color:3:-:red
618 color:1:+:red
643 color:1:+:red
619
644
620 $ hg grep --diff red -r "all()"
645 $ hg grep --diff red -r "all()"
621 color:1:+:red
646 color:1:+:red
622 color:3:-:red
647 color:3:-:red
623
648
624 $ hg grep --diff red -r "reverse(all())"
649 $ hg grep --diff red -r "reverse(all())"
625 color:3:-:red
650 color:3:-:red
626 color:1:+:red
651 color:1:+:red
627
652
628 $ cd ..
653 $ cd ..
629
654
630 $ hg init a
655 $ hg init a
631 $ cd a
656 $ cd a
632 $ cp "$TESTDIR/binfile.bin" .
657 $ cp "$TESTDIR/binfile.bin" .
633 $ hg add binfile.bin
658 $ hg add binfile.bin
634 $ hg ci -m 'add binfile.bin'
659 $ hg ci -m 'add binfile.bin'
635 $ hg grep "MaCam" --all
660 $ hg grep "MaCam" --all
636 binfile.bin:0:+: Binary file matches
661 binfile.bin:0:+: Binary file matches
637
662
638 $ hg grep "MaCam" --diff
663 $ hg grep "MaCam" --diff
639 binfile.bin:0:+: Binary file matches
664 binfile.bin:0:+: Binary file matches
640
665
641 $ cd ..
666 $ cd ..
642
667
643 Moved line may not be collected by "grep --diff" since it first filters
668 Moved line may not be collected by "grep --diff" since it first filters
644 the contents to be diffed by the pattern. (i.e.
669 the contents to be diffed by the pattern. (i.e.
645 "diff <(grep pat a) <(grep pat b)", not "diff a b | grep pat".)
670 "diff <(grep pat a) <(grep pat b)", not "diff a b | grep pat".)
646 This is much faster than generating full diff per revision.
671 This is much faster than generating full diff per revision.
647
672
648 $ hg init moved-line
673 $ hg init moved-line
649 $ cd moved-line
674 $ cd moved-line
650 $ cat <<'EOF' > a
675 $ cat <<'EOF' > a
651 > foo
676 > foo
652 > bar
677 > bar
653 > baz
678 > baz
654 > EOF
679 > EOF
655 $ hg ci -Am initial
680 $ hg ci -Am initial
656 adding a
681 adding a
657 $ cat <<'EOF' > a
682 $ cat <<'EOF' > a
658 > bar
683 > bar
659 > baz
684 > baz
660 > foo
685 > foo
661 > EOF
686 > EOF
662 $ hg ci -m reorder
687 $ hg ci -m reorder
663
688
664 $ hg diff -c 1
689 $ hg diff -c 1
665 diff -r a593cc55e81b -r 69789a3b6e80 a
690 diff -r a593cc55e81b -r 69789a3b6e80 a
666 --- a/a Thu Jan 01 00:00:00 1970 +0000
691 --- a/a Thu Jan 01 00:00:00 1970 +0000
667 +++ b/a Thu Jan 01 00:00:00 1970 +0000
692 +++ b/a Thu Jan 01 00:00:00 1970 +0000
668 @@ -1,3 +1,3 @@
693 @@ -1,3 +1,3 @@
669 -foo
694 -foo
670 bar
695 bar
671 baz
696 baz
672 +foo
697 +foo
673
698
674 can't find the move of "foo" at the revision 1:
699 can't find the move of "foo" at the revision 1:
675
700
676 $ hg grep --diff foo -r1
701 $ hg grep --diff foo -r1
677 [1]
702 [1]
678
703
679 "bar" isn't moved at the revisoin 1:
704 "bar" isn't moved at the revisoin 1:
680
705
681 $ hg grep --diff bar -r1
706 $ hg grep --diff bar -r1
682 [1]
707 [1]
683
708
684 $ cd ..
709 $ cd ..
685
710
686 Test for showing working of allfiles flag
711 Test for showing working of allfiles flag
687
712
688 $ hg init sng
713 $ hg init sng
689 $ cd sng
714 $ cd sng
690 $ echo "unmod" >> um
715 $ echo "unmod" >> um
691 $ echo old > old
716 $ echo old > old
692 $ hg ci -q -A -m "adds unmod to um"
717 $ hg ci -q -A -m "adds unmod to um"
693 $ echo "something else" >> new
718 $ echo "something else" >> new
694 $ hg ci -A -m "second commit"
719 $ hg ci -A -m "second commit"
695 adding new
720 adding new
696 $ hg grep -r "." "unmod"
721 $ hg grep -r "." "unmod"
697 um:1:unmod
722 um:1:unmod
698
723
699 Existing tracked files in the working directory are searched by default
724 Existing tracked files in the working directory are searched by default
700
725
701 $ echo modified >> new
726 $ echo modified >> new
702 $ echo 'added' > added; hg add added
727 $ echo 'added' > added; hg add added
703 $ echo 'added, missing' > added-missing; hg add added-missing; rm added-missing
728 $ echo 'added, missing' > added-missing; hg add added-missing; rm added-missing
704 $ echo 'untracked' > untracked
729 $ echo 'untracked' > untracked
705 $ hg rm old
730 $ hg rm old
706 $ hg grep ''
731 $ hg grep ''
707 added:added
732 added:added
708 new:something else
733 new:something else
709 new:modified
734 new:modified
710 um:unmod
735 um:unmod
711
736
712 #if symlink
737 #if symlink
713 Grepping a symlink greps its destination
738 Grepping a symlink greps its destination
714
739
715 $ rm -f added; ln -s symlink-added added
740 $ rm -f added; ln -s symlink-added added
716 $ hg grep '' | grep added
741 $ hg grep '' | grep added
717 added:symlink-added
742 added:symlink-added
718
743
719 But we reject symlinks as directories components of a tracked file as
744 But we reject symlinks as directories components of a tracked file as
720 usual:
745 usual:
721
746
722 $ mkdir dir; touch dir/f; hg add dir/f
747 $ mkdir dir; touch dir/f; hg add dir/f
723 $ rm -rf dir; ln -s / dir
748 $ rm -rf dir; ln -s / dir
724 $ hg grep ''
749 $ hg grep ''
725 abort: path 'dir/f' traverses symbolic link 'dir'
750 abort: path 'dir/f' traverses symbolic link 'dir'
726 [255]
751 [255]
727 #endif
752 #endif
728
753
729 But we can search files from some other revision with -rREV
754 But we can search files from some other revision with -rREV
730
755
731 $ hg grep -r. mod
756 $ hg grep -r. mod
732 um:1:unmod
757 um:1:unmod
733
758
734 $ hg grep --diff mod
759 $ hg grep --diff mod
735 um:0:+:unmod
760 um:0:+:unmod
736
761
737 $ cd ..
762 $ cd ..
738
763
739 Change Default of grep by ui.tweakdefaults, that is, the files not in current
764 Change Default of grep by ui.tweakdefaults, that is, the files not in current
740 working directory should not be grepp-ed on
765 working directory should not be grepp-ed on
741
766
742 $ hg init ab
767 $ hg init ab
743 $ cd ab
768 $ cd ab
744 $ cat <<'EOF' >> .hg/hgrc
769 $ cat <<'EOF' >> .hg/hgrc
745 > [ui]
770 > [ui]
746 > tweakdefaults = True
771 > tweakdefaults = True
747 > EOF
772 > EOF
748 $ echo "some text">>file1
773 $ echo "some text">>file1
749 $ hg add file1
774 $ hg add file1
750 $ hg commit -m "adds file1"
775 $ hg commit -m "adds file1"
751 $ hg mv file1 file2
776 $ hg mv file1 file2
752
777
753 wdir revision is hidden by default:
778 wdir revision is hidden by default:
754
779
755 $ hg grep "some"
780 $ hg grep "some"
756 file2:some text
781 file2:some text
757
782
758 but it should be available in template dict:
783 but it should be available in template dict:
759
784
760 $ hg grep "some" -Tjson
785 $ hg grep "some" -Tjson
761 [
786 [
762 {
787 {
763 "date": [0, 0],
788 "date": [0, 0],
764 "lineno": 1,
789 "lineno": 1,
765 "node": "ffffffffffffffffffffffffffffffffffffffff",
790 "node": "ffffffffffffffffffffffffffffffffffffffff",
766 "path": "file2",
791 "path": "file2",
767 "rev": 2147483647,
792 "rev": 2147483647,
768 "texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}],
793 "texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}],
769 "user": "test"
794 "user": "test"
770 }
795 }
771 ]
796 ]
772
797
773 $ cd ..
798 $ cd ..
774
799
775 test -rMULTIREV
800 test -rMULTIREV
776
801
777 $ cd sng
802 $ cd sng
778 $ hg rm um
803 $ hg rm um
779 $ hg commit -m "deletes um"
804 $ hg commit -m "deletes um"
780 $ hg grep -r "0:2" "unmod"
805 $ hg grep -r "0:2" "unmod"
781 um:0:unmod
806 um:0:unmod
782 um:1:unmod
807 um:1:unmod
783 $ hg grep -r "0:2" "unmod" um
808 $ hg grep -r "0:2" "unmod" um
784 um:0:unmod
809 um:0:unmod
785 um:1:unmod
810 um:1:unmod
786 $ hg grep -r "0:2" "unmod" "glob:**/um" # Check that patterns also work
811 $ hg grep -r "0:2" "unmod" "glob:**/um" # Check that patterns also work
787 um:0:unmod
812 um:0:unmod
788 um:1:unmod
813 um:1:unmod
789 $ cd ..
814 $ cd ..
790
815
General Comments 0
You need to be logged in to leave comments. Login now