##// END OF EJS Templates
dirstate: use `dirstate.change_files` to scope the change in `rename`...
marmoute -
r50930:e356e8b6 default
parent child Browse files
Show More
@@ -1,8005 +1,8016 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@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
8
9 import os
9 import os
10 import re
10 import re
11 import sys
11 import sys
12
12
13 from .i18n import _
13 from .i18n import _
14 from .node import (
14 from .node import (
15 hex,
15 hex,
16 nullrev,
16 nullrev,
17 short,
17 short,
18 wdirrev,
18 wdirrev,
19 )
19 )
20 from .pycompat import open
20 from .pycompat import open
21 from . import (
21 from . import (
22 archival,
22 archival,
23 bookmarks,
23 bookmarks,
24 bundle2,
24 bundle2,
25 bundlecaches,
25 bundlecaches,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 debugcommands as debugcommandsmod,
29 debugcommands as debugcommandsmod,
30 destutil,
30 destutil,
31 dirstateguard,
31 dirstateguard,
32 discovery,
32 discovery,
33 encoding,
33 encoding,
34 error,
34 error,
35 exchange,
35 exchange,
36 extensions,
36 extensions,
37 filemerge,
37 filemerge,
38 formatter,
38 formatter,
39 graphmod,
39 graphmod,
40 grep as grepmod,
40 grep as grepmod,
41 hbisect,
41 hbisect,
42 help,
42 help,
43 hg,
43 hg,
44 logcmdutil,
44 logcmdutil,
45 merge as mergemod,
45 merge as mergemod,
46 mergestate as mergestatemod,
46 mergestate as mergestatemod,
47 narrowspec,
47 narrowspec,
48 obsolete,
48 obsolete,
49 obsutil,
49 obsutil,
50 patch,
50 patch,
51 phases,
51 phases,
52 pycompat,
52 pycompat,
53 rcutil,
53 rcutil,
54 registrar,
54 registrar,
55 requirements,
55 requirements,
56 revsetlang,
56 revsetlang,
57 rewriteutil,
57 rewriteutil,
58 scmutil,
58 scmutil,
59 server,
59 server,
60 shelve as shelvemod,
60 shelve as shelvemod,
61 state as statemod,
61 state as statemod,
62 streamclone,
62 streamclone,
63 tags as tagsmod,
63 tags as tagsmod,
64 ui as uimod,
64 ui as uimod,
65 util,
65 util,
66 verify as verifymod,
66 verify as verifymod,
67 vfs as vfsmod,
67 vfs as vfsmod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 urlutil,
73 urlutil,
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.StateError(_(b'no operation in progress'))
187 raise error.StateError(_(b'no operation in progress'))
188 if not abortstate.abortfunc:
188 if not abortstate.abortfunc:
189 raise error.InputError(
189 raise error.InputError(
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 with repo.wlock(), repo.dirstate.changing_files(repo):
255 with repo.wlock(), repo.dirstate.changing_files(repo):
256 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
256 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
257 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
257 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
258 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
258 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
259 return rejected and 1 or 0
259 return rejected and 1 or 0
260
260
261
261
262 @command(
262 @command(
263 b'addremove',
263 b'addremove',
264 similarityopts + subrepoopts + walkopts + dryrunopts,
264 similarityopts + subrepoopts + walkopts + dryrunopts,
265 _(b'[OPTION]... [FILE]...'),
265 _(b'[OPTION]... [FILE]...'),
266 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
266 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
267 inferrepo=True,
267 inferrepo=True,
268 )
268 )
269 def addremove(ui, repo, *pats, **opts):
269 def addremove(ui, repo, *pats, **opts):
270 """add all new files, delete all missing files
270 """add all new files, delete all missing files
271
271
272 Add all new files and remove all missing files from the
272 Add all new files and remove all missing files from the
273 repository.
273 repository.
274
274
275 Unless names are given, new files are ignored if they match any of
275 Unless names are given, new files are ignored if they match any of
276 the patterns in ``.hgignore``. As with add, these changes take
276 the patterns in ``.hgignore``. As with add, these changes take
277 effect at the next commit.
277 effect at the next commit.
278
278
279 Use the -s/--similarity option to detect renamed files. This
279 Use the -s/--similarity option to detect renamed files. This
280 option takes a percentage between 0 (disabled) and 100 (files must
280 option takes a percentage between 0 (disabled) and 100 (files must
281 be identical) as its parameter. With a parameter greater than 0,
281 be identical) as its parameter. With a parameter greater than 0,
282 this compares every removed file with every added file and records
282 this compares every removed file with every added file and records
283 those similar enough as renames. Detecting renamed files this way
283 those similar enough as renames. Detecting renamed files this way
284 can be expensive. After using this option, :hg:`status -C` can be
284 can be expensive. After using this option, :hg:`status -C` can be
285 used to check which files were identified as moved or renamed. If
285 used to check which files were identified as moved or renamed. If
286 not specified, -s/--similarity defaults to 100 and only renames of
286 not specified, -s/--similarity defaults to 100 and only renames of
287 identical files are detected.
287 identical files are detected.
288
288
289 .. container:: verbose
289 .. container:: verbose
290
290
291 Examples:
291 Examples:
292
292
293 - A number of files (bar.c and foo.c) are new,
293 - A number of files (bar.c and foo.c) are new,
294 while foobar.c has been removed (without using :hg:`remove`)
294 while foobar.c has been removed (without using :hg:`remove`)
295 from the repository::
295 from the repository::
296
296
297 $ ls
297 $ ls
298 bar.c foo.c
298 bar.c foo.c
299 $ hg status
299 $ hg status
300 ! foobar.c
300 ! foobar.c
301 ? bar.c
301 ? bar.c
302 ? foo.c
302 ? foo.c
303 $ hg addremove
303 $ hg addremove
304 adding bar.c
304 adding bar.c
305 adding foo.c
305 adding foo.c
306 removing foobar.c
306 removing foobar.c
307 $ hg status
307 $ hg status
308 A bar.c
308 A bar.c
309 A foo.c
309 A foo.c
310 R foobar.c
310 R foobar.c
311
311
312 - A file foobar.c was moved to foo.c without using :hg:`rename`.
312 - A file foobar.c was moved to foo.c without using :hg:`rename`.
313 Afterwards, it was edited slightly::
313 Afterwards, it was edited slightly::
314
314
315 $ ls
315 $ ls
316 foo.c
316 foo.c
317 $ hg status
317 $ hg status
318 ! foobar.c
318 ! foobar.c
319 ? foo.c
319 ? foo.c
320 $ hg addremove --similarity 90
320 $ hg addremove --similarity 90
321 removing foobar.c
321 removing foobar.c
322 adding foo.c
322 adding foo.c
323 recording removal of foobar.c as rename to foo.c (94% similar)
323 recording removal of foobar.c as rename to foo.c (94% similar)
324 $ hg status -C
324 $ hg status -C
325 A foo.c
325 A foo.c
326 foobar.c
326 foobar.c
327 R foobar.c
327 R foobar.c
328
328
329 Returns 0 if all files are successfully added.
329 Returns 0 if all files are successfully added.
330 """
330 """
331 opts = pycompat.byteskwargs(opts)
331 opts = pycompat.byteskwargs(opts)
332 if not opts.get(b'similarity'):
332 if not opts.get(b'similarity'):
333 opts[b'similarity'] = b'100'
333 opts[b'similarity'] = b'100'
334 with repo.wlock(), repo.dirstate.changing_files(repo):
334 with repo.wlock(), repo.dirstate.changing_files(repo):
335 matcher = scmutil.match(repo[None], pats, opts)
335 matcher = scmutil.match(repo[None], pats, opts)
336 relative = scmutil.anypats(pats, opts)
336 relative = scmutil.anypats(pats, opts)
337 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
337 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
338 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339
339
340
340
341 @command(
341 @command(
342 b'annotate|blame',
342 b'annotate|blame',
343 [
343 [
344 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
344 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 (
345 (
346 b'',
346 b'',
347 b'follow',
347 b'follow',
348 None,
348 None,
349 _(b'follow copies/renames and list the filename (DEPRECATED)'),
349 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 ),
350 ),
351 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
351 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 (b'a', b'text', None, _(b'treat all files as text')),
352 (b'a', b'text', None, _(b'treat all files as text')),
353 (b'u', b'user', None, _(b'list the author (long with -v)')),
353 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 (b'f', b'file', None, _(b'list the filename')),
354 (b'f', b'file', None, _(b'list the filename')),
355 (b'd', b'date', None, _(b'list the date (short with -q)')),
355 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 (b'n', b'number', None, _(b'list the revision number (default)')),
356 (b'n', b'number', None, _(b'list the revision number (default)')),
357 (b'c', b'changeset', None, _(b'list the changeset')),
357 (b'c', b'changeset', None, _(b'list the changeset')),
358 (
358 (
359 b'l',
359 b'l',
360 b'line-number',
360 b'line-number',
361 None,
361 None,
362 _(b'show line number at the first appearance'),
362 _(b'show line number at the first appearance'),
363 ),
363 ),
364 (
364 (
365 b'',
365 b'',
366 b'skip',
366 b'skip',
367 [],
367 [],
368 _(b'revset to not display (EXPERIMENTAL)'),
368 _(b'revset to not display (EXPERIMENTAL)'),
369 _(b'REV'),
369 _(b'REV'),
370 ),
370 ),
371 ]
371 ]
372 + diffwsopts
372 + diffwsopts
373 + walkopts
373 + walkopts
374 + formatteropts,
374 + formatteropts,
375 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
375 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 helpcategory=command.CATEGORY_FILE_CONTENTS,
376 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 helpbasic=True,
377 helpbasic=True,
378 inferrepo=True,
378 inferrepo=True,
379 )
379 )
380 def annotate(ui, repo, *pats, **opts):
380 def annotate(ui, repo, *pats, **opts):
381 """show changeset information by line for each file
381 """show changeset information by line for each file
382
382
383 List changes in files, showing the revision id responsible for
383 List changes in files, showing the revision id responsible for
384 each line.
384 each line.
385
385
386 This command is useful for discovering when a change was made and
386 This command is useful for discovering when a change was made and
387 by whom.
387 by whom.
388
388
389 If you include --file, --user, or --date, the revision number is
389 If you include --file, --user, or --date, the revision number is
390 suppressed unless you also include --number.
390 suppressed unless you also include --number.
391
391
392 Without the -a/--text option, annotate will avoid processing files
392 Without the -a/--text option, annotate will avoid processing files
393 it detects as binary. With -a, annotate will annotate the file
393 it detects as binary. With -a, annotate will annotate the file
394 anyway, although the results will probably be neither useful
394 anyway, although the results will probably be neither useful
395 nor desirable.
395 nor desirable.
396
396
397 .. container:: verbose
397 .. container:: verbose
398
398
399 Template:
399 Template:
400
400
401 The following keywords are supported in addition to the common template
401 The following keywords are supported in addition to the common template
402 keywords and functions. See also :hg:`help templates`.
402 keywords and functions. See also :hg:`help templates`.
403
403
404 :lines: List of lines with annotation data.
404 :lines: List of lines with annotation data.
405 :path: String. Repository-absolute path of the specified file.
405 :path: String. Repository-absolute path of the specified file.
406
406
407 And each entry of ``{lines}`` provides the following sub-keywords in
407 And each entry of ``{lines}`` provides the following sub-keywords in
408 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
408 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409
409
410 :line: String. Line content.
410 :line: String. Line content.
411 :lineno: Integer. Line number at that revision.
411 :lineno: Integer. Line number at that revision.
412 :path: String. Repository-absolute path of the file at that revision.
412 :path: String. Repository-absolute path of the file at that revision.
413
413
414 See :hg:`help templates.operators` for the list expansion syntax.
414 See :hg:`help templates.operators` for the list expansion syntax.
415
415
416 Returns 0 on success.
416 Returns 0 on success.
417 """
417 """
418 opts = pycompat.byteskwargs(opts)
418 opts = pycompat.byteskwargs(opts)
419 if not pats:
419 if not pats:
420 raise error.InputError(
420 raise error.InputError(
421 _(b'at least one filename or pattern is required')
421 _(b'at least one filename or pattern is required')
422 )
422 )
423
423
424 if opts.get(b'follow'):
424 if opts.get(b'follow'):
425 # --follow is deprecated and now just an alias for -f/--file
425 # --follow is deprecated and now just an alias for -f/--file
426 # to mimic the behavior of Mercurial before version 1.5
426 # to mimic the behavior of Mercurial before version 1.5
427 opts[b'file'] = True
427 opts[b'file'] = True
428
428
429 if (
429 if (
430 not opts.get(b'user')
430 not opts.get(b'user')
431 and not opts.get(b'changeset')
431 and not opts.get(b'changeset')
432 and not opts.get(b'date')
432 and not opts.get(b'date')
433 and not opts.get(b'file')
433 and not opts.get(b'file')
434 ):
434 ):
435 opts[b'number'] = True
435 opts[b'number'] = True
436
436
437 linenumber = opts.get(b'line_number') is not None
437 linenumber = opts.get(b'line_number') is not None
438 if (
438 if (
439 linenumber
439 linenumber
440 and (not opts.get(b'changeset'))
440 and (not opts.get(b'changeset'))
441 and (not opts.get(b'number'))
441 and (not opts.get(b'number'))
442 ):
442 ):
443 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
443 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444
444
445 rev = opts.get(b'rev')
445 rev = opts.get(b'rev')
446 if rev:
446 if rev:
447 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
447 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 ctx = logcmdutil.revsingle(repo, rev)
448 ctx = logcmdutil.revsingle(repo, rev)
449
449
450 ui.pager(b'annotate')
450 ui.pager(b'annotate')
451 rootfm = ui.formatter(b'annotate', opts)
451 rootfm = ui.formatter(b'annotate', opts)
452 if ui.debugflag:
452 if ui.debugflag:
453 shorthex = pycompat.identity
453 shorthex = pycompat.identity
454 else:
454 else:
455
455
456 def shorthex(h):
456 def shorthex(h):
457 return h[:12]
457 return h[:12]
458
458
459 if ui.quiet:
459 if ui.quiet:
460 datefunc = dateutil.shortdate
460 datefunc = dateutil.shortdate
461 else:
461 else:
462 datefunc = dateutil.datestr
462 datefunc = dateutil.datestr
463 if ctx.rev() is None:
463 if ctx.rev() is None:
464 if opts.get(b'changeset'):
464 if opts.get(b'changeset'):
465 # omit "+" suffix which is appended to node hex
465 # omit "+" suffix which is appended to node hex
466 def formatrev(rev):
466 def formatrev(rev):
467 if rev == wdirrev:
467 if rev == wdirrev:
468 return b'%d' % ctx.p1().rev()
468 return b'%d' % ctx.p1().rev()
469 else:
469 else:
470 return b'%d' % rev
470 return b'%d' % rev
471
471
472 else:
472 else:
473
473
474 def formatrev(rev):
474 def formatrev(rev):
475 if rev == wdirrev:
475 if rev == wdirrev:
476 return b'%d+' % ctx.p1().rev()
476 return b'%d+' % ctx.p1().rev()
477 else:
477 else:
478 return b'%d ' % rev
478 return b'%d ' % rev
479
479
480 def formathex(h):
480 def formathex(h):
481 if h == repo.nodeconstants.wdirhex:
481 if h == repo.nodeconstants.wdirhex:
482 return b'%s+' % shorthex(hex(ctx.p1().node()))
482 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 else:
483 else:
484 return b'%s ' % shorthex(h)
484 return b'%s ' % shorthex(h)
485
485
486 else:
486 else:
487 formatrev = b'%d'.__mod__
487 formatrev = b'%d'.__mod__
488 formathex = shorthex
488 formathex = shorthex
489
489
490 opmap = [
490 opmap = [
491 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
491 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
492 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
493 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
494 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
495 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
496 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 ]
497 ]
498 opnamemap = {
498 opnamemap = {
499 b'rev': b'number',
499 b'rev': b'number',
500 b'node': b'changeset',
500 b'node': b'changeset',
501 b'path': b'file',
501 b'path': b'file',
502 b'lineno': b'line_number',
502 b'lineno': b'line_number',
503 }
503 }
504
504
505 if rootfm.isplain():
505 if rootfm.isplain():
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return lambda x: fmt(get(x))
508 return lambda x: fmt(get(x))
509
509
510 else:
510 else:
511
511
512 def makefunc(get, fmt):
512 def makefunc(get, fmt):
513 return get
513 return get
514
514
515 datahint = rootfm.datahint()
515 datahint = rootfm.datahint()
516 funcmap = [
516 funcmap = [
517 (makefunc(get, fmt), sep)
517 (makefunc(get, fmt), sep)
518 for fn, sep, get, fmt in opmap
518 for fn, sep, get, fmt in opmap
519 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
519 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 ]
520 ]
521 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
521 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 fields = b' '.join(
522 fields = b' '.join(
523 fn
523 fn
524 for fn, sep, get, fmt in opmap
524 for fn, sep, get, fmt in opmap
525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 )
526 )
527
527
528 def bad(x, y):
528 def bad(x, y):
529 raise error.InputError(b"%s: %s" % (x, y))
529 raise error.InputError(b"%s: %s" % (x, y))
530
530
531 m = scmutil.match(ctx, pats, opts, badfn=bad)
531 m = scmutil.match(ctx, pats, opts, badfn=bad)
532
532
533 follow = not opts.get(b'no_follow')
533 follow = not opts.get(b'no_follow')
534 diffopts = patch.difffeatureopts(
534 diffopts = patch.difffeatureopts(
535 ui, opts, section=b'annotate', whitespace=True
535 ui, opts, section=b'annotate', whitespace=True
536 )
536 )
537 skiprevs = opts.get(b'skip')
537 skiprevs = opts.get(b'skip')
538 if skiprevs:
538 if skiprevs:
539 skiprevs = logcmdutil.revrange(repo, skiprevs)
539 skiprevs = logcmdutil.revrange(repo, skiprevs)
540
540
541 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
541 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 for abs in ctx.walk(m):
542 for abs in ctx.walk(m):
543 fctx = ctx[abs]
543 fctx = ctx[abs]
544 rootfm.startitem()
544 rootfm.startitem()
545 rootfm.data(path=abs)
545 rootfm.data(path=abs)
546 if not opts.get(b'text') and fctx.isbinary():
546 if not opts.get(b'text') and fctx.isbinary():
547 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
547 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 continue
548 continue
549
549
550 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
550 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 lines = fctx.annotate(
551 lines = fctx.annotate(
552 follow=follow, skiprevs=skiprevs, diffopts=diffopts
552 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 )
553 )
554 if not lines:
554 if not lines:
555 fm.end()
555 fm.end()
556 continue
556 continue
557 formats = []
557 formats = []
558 pieces = []
558 pieces = []
559
559
560 for f, sep in funcmap:
560 for f, sep in funcmap:
561 l = [f(n) for n in lines]
561 l = [f(n) for n in lines]
562 if fm.isplain():
562 if fm.isplain():
563 sizes = [encoding.colwidth(x) for x in l]
563 sizes = [encoding.colwidth(x) for x in l]
564 ml = max(sizes)
564 ml = max(sizes)
565 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
565 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 else:
566 else:
567 formats.append([b'%s'] * len(l))
567 formats.append([b'%s'] * len(l))
568 pieces.append(l)
568 pieces.append(l)
569
569
570 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
570 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 fm.startitem()
571 fm.startitem()
572 fm.context(fctx=n.fctx)
572 fm.context(fctx=n.fctx)
573 fm.write(fields, b"".join(f), *p)
573 fm.write(fields, b"".join(f), *p)
574 if n.skip:
574 if n.skip:
575 fmt = b"* %s"
575 fmt = b"* %s"
576 else:
576 else:
577 fmt = b": %s"
577 fmt = b": %s"
578 fm.write(b'line', fmt, n.text)
578 fm.write(b'line', fmt, n.text)
579
579
580 if not lines[-1].text.endswith(b'\n'):
580 if not lines[-1].text.endswith(b'\n'):
581 fm.plain(b'\n')
581 fm.plain(b'\n')
582 fm.end()
582 fm.end()
583
583
584 rootfm.end()
584 rootfm.end()
585
585
586
586
587 @command(
587 @command(
588 b'archive',
588 b'archive',
589 [
589 [
590 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
590 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 (
591 (
592 b'p',
592 b'p',
593 b'prefix',
593 b'prefix',
594 b'',
594 b'',
595 _(b'directory prefix for files in archive'),
595 _(b'directory prefix for files in archive'),
596 _(b'PREFIX'),
596 _(b'PREFIX'),
597 ),
597 ),
598 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
598 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
599 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 ]
600 ]
601 + subrepoopts
601 + subrepoopts
602 + walkopts,
602 + walkopts,
603 _(b'[OPTION]... DEST'),
603 _(b'[OPTION]... DEST'),
604 helpcategory=command.CATEGORY_IMPORT_EXPORT,
604 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 )
605 )
606 def archive(ui, repo, dest, **opts):
606 def archive(ui, repo, dest, **opts):
607 """create an unversioned archive of a repository revision
607 """create an unversioned archive of a repository revision
608
608
609 By default, the revision used is the parent of the working
609 By default, the revision used is the parent of the working
610 directory; use -r/--rev to specify a different revision.
610 directory; use -r/--rev to specify a different revision.
611
611
612 The archive type is automatically detected based on file
612 The archive type is automatically detected based on file
613 extension (to override, use -t/--type).
613 extension (to override, use -t/--type).
614
614
615 .. container:: verbose
615 .. container:: verbose
616
616
617 Examples:
617 Examples:
618
618
619 - create a zip file containing the 1.0 release::
619 - create a zip file containing the 1.0 release::
620
620
621 hg archive -r 1.0 project-1.0.zip
621 hg archive -r 1.0 project-1.0.zip
622
622
623 - create a tarball excluding .hg files::
623 - create a tarball excluding .hg files::
624
624
625 hg archive project.tar.gz -X ".hg*"
625 hg archive project.tar.gz -X ".hg*"
626
626
627 Valid types are:
627 Valid types are:
628
628
629 :``files``: a directory full of files (default)
629 :``files``: a directory full of files (default)
630 :``tar``: tar archive, uncompressed
630 :``tar``: tar archive, uncompressed
631 :``tbz2``: tar archive, compressed using bzip2
631 :``tbz2``: tar archive, compressed using bzip2
632 :``tgz``: tar archive, compressed using gzip
632 :``tgz``: tar archive, compressed using gzip
633 :``txz``: tar archive, compressed using lzma (only in Python 3)
633 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 :``uzip``: zip archive, uncompressed
634 :``uzip``: zip archive, uncompressed
635 :``zip``: zip archive, compressed using deflate
635 :``zip``: zip archive, compressed using deflate
636
636
637 The exact name of the destination archive or directory is given
637 The exact name of the destination archive or directory is given
638 using a format string; see :hg:`help export` for details.
638 using a format string; see :hg:`help export` for details.
639
639
640 Each member added to an archive file has a directory prefix
640 Each member added to an archive file has a directory prefix
641 prepended. Use -p/--prefix to specify a format string for the
641 prepended. Use -p/--prefix to specify a format string for the
642 prefix. The default is the basename of the archive, with suffixes
642 prefix. The default is the basename of the archive, with suffixes
643 removed.
643 removed.
644
644
645 Returns 0 on success.
645 Returns 0 on success.
646 """
646 """
647
647
648 opts = pycompat.byteskwargs(opts)
648 opts = pycompat.byteskwargs(opts)
649 rev = opts.get(b'rev')
649 rev = opts.get(b'rev')
650 if rev:
650 if rev:
651 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
651 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 ctx = logcmdutil.revsingle(repo, rev)
652 ctx = logcmdutil.revsingle(repo, rev)
653 if not ctx:
653 if not ctx:
654 raise error.InputError(
654 raise error.InputError(
655 _(b'no working directory: please specify a revision')
655 _(b'no working directory: please specify a revision')
656 )
656 )
657 node = ctx.node()
657 node = ctx.node()
658 dest = cmdutil.makefilename(ctx, dest)
658 dest = cmdutil.makefilename(ctx, dest)
659 if os.path.realpath(dest) == repo.root:
659 if os.path.realpath(dest) == repo.root:
660 raise error.InputError(_(b'repository root cannot be destination'))
660 raise error.InputError(_(b'repository root cannot be destination'))
661
661
662 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
662 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 prefix = opts.get(b'prefix')
663 prefix = opts.get(b'prefix')
664
664
665 if dest == b'-':
665 if dest == b'-':
666 if kind == b'files':
666 if kind == b'files':
667 raise error.InputError(_(b'cannot archive plain files to stdout'))
667 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 dest = cmdutil.makefileobj(ctx, dest)
668 dest = cmdutil.makefileobj(ctx, dest)
669 if not prefix:
669 if not prefix:
670 prefix = os.path.basename(repo.root) + b'-%h'
670 prefix = os.path.basename(repo.root) + b'-%h'
671
671
672 prefix = cmdutil.makefilename(ctx, prefix)
672 prefix = cmdutil.makefilename(ctx, prefix)
673 match = scmutil.match(ctx, [], opts)
673 match = scmutil.match(ctx, [], opts)
674 archival.archive(
674 archival.archive(
675 repo,
675 repo,
676 dest,
676 dest,
677 node,
677 node,
678 kind,
678 kind,
679 not opts.get(b'no_decode'),
679 not opts.get(b'no_decode'),
680 match,
680 match,
681 prefix,
681 prefix,
682 subrepos=opts.get(b'subrepos'),
682 subrepos=opts.get(b'subrepos'),
683 )
683 )
684
684
685
685
686 @command(
686 @command(
687 b'backout',
687 b'backout',
688 [
688 [
689 (
689 (
690 b'',
690 b'',
691 b'merge',
691 b'merge',
692 None,
692 None,
693 _(b'merge with old dirstate parent after backout'),
693 _(b'merge with old dirstate parent after backout'),
694 ),
694 ),
695 (
695 (
696 b'',
696 b'',
697 b'commit',
697 b'commit',
698 None,
698 None,
699 _(b'commit if no conflicts were encountered (DEPRECATED)'),
699 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 ),
700 ),
701 (b'', b'no-commit', None, _(b'do not commit')),
701 (b'', b'no-commit', None, _(b'do not commit')),
702 (
702 (
703 b'',
703 b'',
704 b'parent',
704 b'parent',
705 b'',
705 b'',
706 _(b'parent to choose when backing out merge (DEPRECATED)'),
706 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 _(b'REV'),
707 _(b'REV'),
708 ),
708 ),
709 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
709 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
710 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 ]
711 ]
712 + mergetoolopts
712 + mergetoolopts
713 + walkopts
713 + walkopts
714 + commitopts
714 + commitopts
715 + commitopts2,
715 + commitopts2,
716 _(b'[OPTION]... [-r] REV'),
716 _(b'[OPTION]... [-r] REV'),
717 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
717 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 )
718 )
719 def backout(ui, repo, node=None, rev=None, **opts):
719 def backout(ui, repo, node=None, rev=None, **opts):
720 """reverse effect of earlier changeset
720 """reverse effect of earlier changeset
721
721
722 Prepare a new changeset with the effect of REV undone in the
722 Prepare a new changeset with the effect of REV undone in the
723 current working directory. If no conflicts were encountered,
723 current working directory. If no conflicts were encountered,
724 it will be committed immediately.
724 it will be committed immediately.
725
725
726 If REV is the parent of the working directory, then this new changeset
726 If REV is the parent of the working directory, then this new changeset
727 is committed automatically (unless --no-commit is specified).
727 is committed automatically (unless --no-commit is specified).
728
728
729 .. note::
729 .. note::
730
730
731 :hg:`backout` cannot be used to fix either an unwanted or
731 :hg:`backout` cannot be used to fix either an unwanted or
732 incorrect merge.
732 incorrect merge.
733
733
734 .. container:: verbose
734 .. container:: verbose
735
735
736 Examples:
736 Examples:
737
737
738 - Reverse the effect of the parent of the working directory.
738 - Reverse the effect of the parent of the working directory.
739 This backout will be committed immediately::
739 This backout will be committed immediately::
740
740
741 hg backout -r .
741 hg backout -r .
742
742
743 - Reverse the effect of previous bad revision 23::
743 - Reverse the effect of previous bad revision 23::
744
744
745 hg backout -r 23
745 hg backout -r 23
746
746
747 - Reverse the effect of previous bad revision 23 and
747 - Reverse the effect of previous bad revision 23 and
748 leave changes uncommitted::
748 leave changes uncommitted::
749
749
750 hg backout -r 23 --no-commit
750 hg backout -r 23 --no-commit
751 hg commit -m "Backout revision 23"
751 hg commit -m "Backout revision 23"
752
752
753 By default, the pending changeset will have one parent,
753 By default, the pending changeset will have one parent,
754 maintaining a linear history. With --merge, the pending
754 maintaining a linear history. With --merge, the pending
755 changeset will instead have two parents: the old parent of the
755 changeset will instead have two parents: the old parent of the
756 working directory and a new child of REV that simply undoes REV.
756 working directory and a new child of REV that simply undoes REV.
757
757
758 Before version 1.7, the behavior without --merge was equivalent
758 Before version 1.7, the behavior without --merge was equivalent
759 to specifying --merge followed by :hg:`update --clean .` to
759 to specifying --merge followed by :hg:`update --clean .` to
760 cancel the merge and leave the child of REV as a head to be
760 cancel the merge and leave the child of REV as a head to be
761 merged separately.
761 merged separately.
762
762
763 See :hg:`help dates` for a list of formats valid for -d/--date.
763 See :hg:`help dates` for a list of formats valid for -d/--date.
764
764
765 See :hg:`help revert` for a way to restore files to the state
765 See :hg:`help revert` for a way to restore files to the state
766 of another revision.
766 of another revision.
767
767
768 Returns 0 on success, 1 if nothing to backout or there are unresolved
768 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 files.
769 files.
770 """
770 """
771 with repo.wlock(), repo.lock():
771 with repo.wlock(), repo.lock():
772 return _dobackout(ui, repo, node, rev, **opts)
772 return _dobackout(ui, repo, node, rev, **opts)
773
773
774
774
775 def _dobackout(ui, repo, node=None, rev=None, **opts):
775 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
776 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 opts = pycompat.byteskwargs(opts)
777 opts = pycompat.byteskwargs(opts)
778
778
779 if rev and node:
779 if rev and node:
780 raise error.InputError(_(b"please specify just one revision"))
780 raise error.InputError(_(b"please specify just one revision"))
781
781
782 if not rev:
782 if not rev:
783 rev = node
783 rev = node
784
784
785 if not rev:
785 if not rev:
786 raise error.InputError(_(b"please specify a revision to backout"))
786 raise error.InputError(_(b"please specify a revision to backout"))
787
787
788 date = opts.get(b'date')
788 date = opts.get(b'date')
789 if date:
789 if date:
790 opts[b'date'] = dateutil.parsedate(date)
790 opts[b'date'] = dateutil.parsedate(date)
791
791
792 cmdutil.checkunfinished(repo)
792 cmdutil.checkunfinished(repo)
793 cmdutil.bailifchanged(repo)
793 cmdutil.bailifchanged(repo)
794 ctx = logcmdutil.revsingle(repo, rev)
794 ctx = logcmdutil.revsingle(repo, rev)
795 node = ctx.node()
795 node = ctx.node()
796
796
797 op1, op2 = repo.dirstate.parents()
797 op1, op2 = repo.dirstate.parents()
798 if not repo.changelog.isancestor(node, op1):
798 if not repo.changelog.isancestor(node, op1):
799 raise error.InputError(
799 raise error.InputError(
800 _(b'cannot backout change that is not an ancestor')
800 _(b'cannot backout change that is not an ancestor')
801 )
801 )
802
802
803 p1, p2 = repo.changelog.parents(node)
803 p1, p2 = repo.changelog.parents(node)
804 if p1 == repo.nullid:
804 if p1 == repo.nullid:
805 raise error.InputError(_(b'cannot backout a change with no parents'))
805 raise error.InputError(_(b'cannot backout a change with no parents'))
806 if p2 != repo.nullid:
806 if p2 != repo.nullid:
807 if not opts.get(b'parent'):
807 if not opts.get(b'parent'):
808 raise error.InputError(_(b'cannot backout a merge changeset'))
808 raise error.InputError(_(b'cannot backout a merge changeset'))
809 p = repo.lookup(opts[b'parent'])
809 p = repo.lookup(opts[b'parent'])
810 if p not in (p1, p2):
810 if p not in (p1, p2):
811 raise error.InputError(
811 raise error.InputError(
812 _(b'%s is not a parent of %s') % (short(p), short(node))
812 _(b'%s is not a parent of %s') % (short(p), short(node))
813 )
813 )
814 parent = p
814 parent = p
815 else:
815 else:
816 if opts.get(b'parent'):
816 if opts.get(b'parent'):
817 raise error.InputError(
817 raise error.InputError(
818 _(b'cannot use --parent on non-merge changeset')
818 _(b'cannot use --parent on non-merge changeset')
819 )
819 )
820 parent = p1
820 parent = p1
821
821
822 # the backout should appear on the same branch
822 # the backout should appear on the same branch
823 branch = repo.dirstate.branch()
823 branch = repo.dirstate.branch()
824 bheads = repo.branchheads(branch)
824 bheads = repo.branchheads(branch)
825 rctx = scmutil.revsingle(repo, hex(parent))
825 rctx = scmutil.revsingle(repo, hex(parent))
826 if not opts.get(b'merge') and op1 != node:
826 if not opts.get(b'merge') and op1 != node:
827 with dirstateguard.dirstateguard(repo, b'backout'):
827 with dirstateguard.dirstateguard(repo, b'backout'):
828 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
828 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 with ui.configoverride(overrides, b'backout'):
829 with ui.configoverride(overrides, b'backout'):
830 stats = mergemod.back_out(ctx, parent=repo[parent])
830 stats = mergemod.back_out(ctx, parent=repo[parent])
831 repo.setparents(op1, op2)
831 repo.setparents(op1, op2)
832 hg._showstats(repo, stats)
832 hg._showstats(repo, stats)
833 if stats.unresolvedcount:
833 if stats.unresolvedcount:
834 repo.ui.status(
834 repo.ui.status(
835 _(b"use 'hg resolve' to retry unresolved file merges\n")
835 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 )
836 )
837 return 1
837 return 1
838 else:
838 else:
839 hg.clean(repo, node, show_stats=False)
839 hg.clean(repo, node, show_stats=False)
840 repo.dirstate.setbranch(branch)
840 repo.dirstate.setbranch(branch)
841 cmdutil.revert(ui, repo, rctx)
841 cmdutil.revert(ui, repo, rctx)
842
842
843 if opts.get(b'no_commit'):
843 if opts.get(b'no_commit'):
844 msg = _(b"changeset %s backed out, don't forget to commit.\n")
844 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 ui.status(msg % short(node))
845 ui.status(msg % short(node))
846 return 0
846 return 0
847
847
848 def commitfunc(ui, repo, message, match, opts):
848 def commitfunc(ui, repo, message, match, opts):
849 editform = b'backout'
849 editform = b'backout'
850 e = cmdutil.getcommiteditor(
850 e = cmdutil.getcommiteditor(
851 editform=editform, **pycompat.strkwargs(opts)
851 editform=editform, **pycompat.strkwargs(opts)
852 )
852 )
853 if not message:
853 if not message:
854 # we don't translate commit messages
854 # we don't translate commit messages
855 message = b"Backed out changeset %s" % short(node)
855 message = b"Backed out changeset %s" % short(node)
856 e = cmdutil.getcommiteditor(edit=True, editform=editform)
856 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 return repo.commit(
857 return repo.commit(
858 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
858 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 )
859 )
860
860
861 # save to detect changes
861 # save to detect changes
862 tip = repo.changelog.tip()
862 tip = repo.changelog.tip()
863
863
864 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
864 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 if not newnode:
865 if not newnode:
866 ui.status(_(b"nothing changed\n"))
866 ui.status(_(b"nothing changed\n"))
867 return 1
867 return 1
868 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
868 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869
869
870 def nice(node):
870 def nice(node):
871 return b'%d:%s' % (repo.changelog.rev(node), short(node))
871 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872
872
873 ui.status(
873 ui.status(
874 _(b'changeset %s backs out changeset %s\n')
874 _(b'changeset %s backs out changeset %s\n')
875 % (nice(newnode), nice(node))
875 % (nice(newnode), nice(node))
876 )
876 )
877 if opts.get(b'merge') and op1 != node:
877 if opts.get(b'merge') and op1 != node:
878 hg.clean(repo, op1, show_stats=False)
878 hg.clean(repo, op1, show_stats=False)
879 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
879 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
880 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 with ui.configoverride(overrides, b'backout'):
881 with ui.configoverride(overrides, b'backout'):
882 return hg.merge(repo[b'tip'])
882 return hg.merge(repo[b'tip'])
883 return 0
883 return 0
884
884
885
885
886 @command(
886 @command(
887 b'bisect',
887 b'bisect',
888 [
888 [
889 (b'r', b'reset', False, _(b'reset bisect state')),
889 (b'r', b'reset', False, _(b'reset bisect state')),
890 (b'g', b'good', False, _(b'mark changeset good')),
890 (b'g', b'good', False, _(b'mark changeset good')),
891 (b'b', b'bad', False, _(b'mark changeset bad')),
891 (b'b', b'bad', False, _(b'mark changeset bad')),
892 (b's', b'skip', False, _(b'skip testing changeset')),
892 (b's', b'skip', False, _(b'skip testing changeset')),
893 (b'e', b'extend', False, _(b'extend the bisect range')),
893 (b'e', b'extend', False, _(b'extend the bisect range')),
894 (
894 (
895 b'c',
895 b'c',
896 b'command',
896 b'command',
897 b'',
897 b'',
898 _(b'use command to check changeset state'),
898 _(b'use command to check changeset state'),
899 _(b'CMD'),
899 _(b'CMD'),
900 ),
900 ),
901 (b'U', b'noupdate', False, _(b'do not update to target')),
901 (b'U', b'noupdate', False, _(b'do not update to target')),
902 ],
902 ],
903 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
903 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
904 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 )
905 )
906 def bisect(
906 def bisect(
907 ui,
907 ui,
908 repo,
908 repo,
909 positional_1=None,
909 positional_1=None,
910 positional_2=None,
910 positional_2=None,
911 command=None,
911 command=None,
912 reset=None,
912 reset=None,
913 good=None,
913 good=None,
914 bad=None,
914 bad=None,
915 skip=None,
915 skip=None,
916 extend=None,
916 extend=None,
917 noupdate=None,
917 noupdate=None,
918 ):
918 ):
919 """subdivision search of changesets
919 """subdivision search of changesets
920
920
921 This command helps to find changesets which introduce problems. To
921 This command helps to find changesets which introduce problems. To
922 use, mark the earliest changeset you know exhibits the problem as
922 use, mark the earliest changeset you know exhibits the problem as
923 bad, then mark the latest changeset which is free from the problem
923 bad, then mark the latest changeset which is free from the problem
924 as good. Bisect will update your working directory to a revision
924 as good. Bisect will update your working directory to a revision
925 for testing (unless the -U/--noupdate option is specified). Once
925 for testing (unless the -U/--noupdate option is specified). Once
926 you have performed tests, mark the working directory as good or
926 you have performed tests, mark the working directory as good or
927 bad, and bisect will either update to another candidate changeset
927 bad, and bisect will either update to another candidate changeset
928 or announce that it has found the bad revision.
928 or announce that it has found the bad revision.
929
929
930 As a shortcut, you can also use the revision argument to mark a
930 As a shortcut, you can also use the revision argument to mark a
931 revision as good or bad without checking it out first.
931 revision as good or bad without checking it out first.
932
932
933 If you supply a command, it will be used for automatic bisection.
933 If you supply a command, it will be used for automatic bisection.
934 The environment variable HG_NODE will contain the ID of the
934 The environment variable HG_NODE will contain the ID of the
935 changeset being tested. The exit status of the command will be
935 changeset being tested. The exit status of the command will be
936 used to mark revisions as good or bad: status 0 means good, 125
936 used to mark revisions as good or bad: status 0 means good, 125
937 means to skip the revision, 127 (command not found) will abort the
937 means to skip the revision, 127 (command not found) will abort the
938 bisection, and any other non-zero exit status means the revision
938 bisection, and any other non-zero exit status means the revision
939 is bad.
939 is bad.
940
940
941 .. container:: verbose
941 .. container:: verbose
942
942
943 Some examples:
943 Some examples:
944
944
945 - start a bisection with known bad revision 34, and good revision 12::
945 - start a bisection with known bad revision 34, and good revision 12::
946
946
947 hg bisect --bad 34
947 hg bisect --bad 34
948 hg bisect --good 12
948 hg bisect --good 12
949
949
950 - advance the current bisection by marking current revision as good or
950 - advance the current bisection by marking current revision as good or
951 bad::
951 bad::
952
952
953 hg bisect --good
953 hg bisect --good
954 hg bisect --bad
954 hg bisect --bad
955
955
956 - mark the current revision, or a known revision, to be skipped (e.g. if
956 - mark the current revision, or a known revision, to be skipped (e.g. if
957 that revision is not usable because of another issue)::
957 that revision is not usable because of another issue)::
958
958
959 hg bisect --skip
959 hg bisect --skip
960 hg bisect --skip 23
960 hg bisect --skip 23
961
961
962 - skip all revisions that do not touch directories ``foo`` or ``bar``::
962 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963
963
964 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
964 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965
965
966 - forget the current bisection::
966 - forget the current bisection::
967
967
968 hg bisect --reset
968 hg bisect --reset
969
969
970 - use 'make && make tests' to automatically find the first broken
970 - use 'make && make tests' to automatically find the first broken
971 revision::
971 revision::
972
972
973 hg bisect --reset
973 hg bisect --reset
974 hg bisect --bad 34
974 hg bisect --bad 34
975 hg bisect --good 12
975 hg bisect --good 12
976 hg bisect --command "make && make tests"
976 hg bisect --command "make && make tests"
977
977
978 - see all changesets whose states are already known in the current
978 - see all changesets whose states are already known in the current
979 bisection::
979 bisection::
980
980
981 hg log -r "bisect(pruned)"
981 hg log -r "bisect(pruned)"
982
982
983 - see the changeset currently being bisected (especially useful
983 - see the changeset currently being bisected (especially useful
984 if running with -U/--noupdate)::
984 if running with -U/--noupdate)::
985
985
986 hg log -r "bisect(current)"
986 hg log -r "bisect(current)"
987
987
988 - see all changesets that took part in the current bisection::
988 - see all changesets that took part in the current bisection::
989
989
990 hg log -r "bisect(range)"
990 hg log -r "bisect(range)"
991
991
992 - you can even get a nice graph::
992 - you can even get a nice graph::
993
993
994 hg log --graph -r "bisect(range)"
994 hg log --graph -r "bisect(range)"
995
995
996 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
996 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997
997
998 Returns 0 on success.
998 Returns 0 on success.
999 """
999 """
1000 rev = []
1000 rev = []
1001 # backward compatibility
1001 # backward compatibility
1002 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1002 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 cmd = positional_1
1004 cmd = positional_1
1005 rev.append(positional_2)
1005 rev.append(positional_2)
1006 if cmd == b"good":
1006 if cmd == b"good":
1007 good = True
1007 good = True
1008 elif cmd == b"bad":
1008 elif cmd == b"bad":
1009 bad = True
1009 bad = True
1010 else:
1010 else:
1011 reset = True
1011 reset = True
1012 elif positional_2:
1012 elif positional_2:
1013 raise error.InputError(_(b'incompatible arguments'))
1013 raise error.InputError(_(b'incompatible arguments'))
1014 elif positional_1 is not None:
1014 elif positional_1 is not None:
1015 rev.append(positional_1)
1015 rev.append(positional_1)
1016
1016
1017 incompatibles = {
1017 incompatibles = {
1018 b'--bad': bad,
1018 b'--bad': bad,
1019 b'--command': bool(command),
1019 b'--command': bool(command),
1020 b'--extend': extend,
1020 b'--extend': extend,
1021 b'--good': good,
1021 b'--good': good,
1022 b'--reset': reset,
1022 b'--reset': reset,
1023 b'--skip': skip,
1023 b'--skip': skip,
1024 }
1024 }
1025
1025
1026 enabled = [x for x in incompatibles if incompatibles[x]]
1026 enabled = [x for x in incompatibles if incompatibles[x]]
1027
1027
1028 if len(enabled) > 1:
1028 if len(enabled) > 1:
1029 raise error.InputError(
1029 raise error.InputError(
1030 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1030 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1031 )
1031 )
1032
1032
1033 if reset:
1033 if reset:
1034 hbisect.resetstate(repo)
1034 hbisect.resetstate(repo)
1035 return
1035 return
1036
1036
1037 state = hbisect.load_state(repo)
1037 state = hbisect.load_state(repo)
1038
1038
1039 if rev:
1039 if rev:
1040 revs = logcmdutil.revrange(repo, rev)
1040 revs = logcmdutil.revrange(repo, rev)
1041 goodnodes = state[b'good']
1041 goodnodes = state[b'good']
1042 badnodes = state[b'bad']
1042 badnodes = state[b'bad']
1043 if goodnodes and badnodes:
1043 if goodnodes and badnodes:
1044 candidates = repo.revs(b'(%ln)::(%ln)', goodnodes, badnodes)
1044 candidates = repo.revs(b'(%ln)::(%ln)', goodnodes, badnodes)
1045 candidates += repo.revs(b'(%ln)::(%ln)', badnodes, goodnodes)
1045 candidates += repo.revs(b'(%ln)::(%ln)', badnodes, goodnodes)
1046 revs = candidates & revs
1046 revs = candidates & revs
1047 nodes = [repo.changelog.node(i) for i in revs]
1047 nodes = [repo.changelog.node(i) for i in revs]
1048 else:
1048 else:
1049 nodes = [repo.lookup(b'.')]
1049 nodes = [repo.lookup(b'.')]
1050
1050
1051 # update state
1051 # update state
1052 if good or bad or skip:
1052 if good or bad or skip:
1053 if good:
1053 if good:
1054 state[b'good'] += nodes
1054 state[b'good'] += nodes
1055 elif bad:
1055 elif bad:
1056 state[b'bad'] += nodes
1056 state[b'bad'] += nodes
1057 elif skip:
1057 elif skip:
1058 state[b'skip'] += nodes
1058 state[b'skip'] += nodes
1059 hbisect.save_state(repo, state)
1059 hbisect.save_state(repo, state)
1060 if not (state[b'good'] and state[b'bad']):
1060 if not (state[b'good'] and state[b'bad']):
1061 return
1061 return
1062
1062
1063 def mayupdate(repo, node, show_stats=True):
1063 def mayupdate(repo, node, show_stats=True):
1064 """common used update sequence"""
1064 """common used update sequence"""
1065 if noupdate:
1065 if noupdate:
1066 return
1066 return
1067 cmdutil.checkunfinished(repo)
1067 cmdutil.checkunfinished(repo)
1068 cmdutil.bailifchanged(repo)
1068 cmdutil.bailifchanged(repo)
1069 return hg.clean(repo, node, show_stats=show_stats)
1069 return hg.clean(repo, node, show_stats=show_stats)
1070
1070
1071 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1071 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1072
1072
1073 if command:
1073 if command:
1074 changesets = 1
1074 changesets = 1
1075 if noupdate:
1075 if noupdate:
1076 try:
1076 try:
1077 node = state[b'current'][0]
1077 node = state[b'current'][0]
1078 except LookupError:
1078 except LookupError:
1079 raise error.StateError(
1079 raise error.StateError(
1080 _(
1080 _(
1081 b'current bisect revision is unknown - '
1081 b'current bisect revision is unknown - '
1082 b'start a new bisect to fix'
1082 b'start a new bisect to fix'
1083 )
1083 )
1084 )
1084 )
1085 else:
1085 else:
1086 node, p2 = repo.dirstate.parents()
1086 node, p2 = repo.dirstate.parents()
1087 if p2 != repo.nullid:
1087 if p2 != repo.nullid:
1088 raise error.StateError(_(b'current bisect revision is a merge'))
1088 raise error.StateError(_(b'current bisect revision is a merge'))
1089 if rev:
1089 if rev:
1090 if not nodes:
1090 if not nodes:
1091 raise error.InputError(_(b'empty revision set'))
1091 raise error.InputError(_(b'empty revision set'))
1092 node = repo[nodes[-1]].node()
1092 node = repo[nodes[-1]].node()
1093 with hbisect.restore_state(repo, state, node):
1093 with hbisect.restore_state(repo, state, node):
1094 while changesets:
1094 while changesets:
1095 # update state
1095 # update state
1096 state[b'current'] = [node]
1096 state[b'current'] = [node]
1097 hbisect.save_state(repo, state)
1097 hbisect.save_state(repo, state)
1098 status = ui.system(
1098 status = ui.system(
1099 command,
1099 command,
1100 environ={b'HG_NODE': hex(node)},
1100 environ={b'HG_NODE': hex(node)},
1101 blockedtag=b'bisect_check',
1101 blockedtag=b'bisect_check',
1102 )
1102 )
1103 if status == 125:
1103 if status == 125:
1104 transition = b"skip"
1104 transition = b"skip"
1105 elif status == 0:
1105 elif status == 0:
1106 transition = b"good"
1106 transition = b"good"
1107 # status < 0 means process was killed
1107 # status < 0 means process was killed
1108 elif status == 127:
1108 elif status == 127:
1109 raise error.Abort(_(b"failed to execute %s") % command)
1109 raise error.Abort(_(b"failed to execute %s") % command)
1110 elif status < 0:
1110 elif status < 0:
1111 raise error.Abort(_(b"%s killed") % command)
1111 raise error.Abort(_(b"%s killed") % command)
1112 else:
1112 else:
1113 transition = b"bad"
1113 transition = b"bad"
1114 state[transition].append(node)
1114 state[transition].append(node)
1115 ctx = repo[node]
1115 ctx = repo[node]
1116 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1116 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1117 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1117 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1118 hbisect.checkstate(state)
1118 hbisect.checkstate(state)
1119 # bisect
1119 # bisect
1120 nodes, changesets, bgood = hbisect.bisect(repo, state)
1120 nodes, changesets, bgood = hbisect.bisect(repo, state)
1121 # update to next check
1121 # update to next check
1122 node = nodes[0]
1122 node = nodes[0]
1123 mayupdate(repo, node, show_stats=False)
1123 mayupdate(repo, node, show_stats=False)
1124 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1124 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1125 return
1125 return
1126
1126
1127 hbisect.checkstate(state)
1127 hbisect.checkstate(state)
1128
1128
1129 # actually bisect
1129 # actually bisect
1130 nodes, changesets, good = hbisect.bisect(repo, state)
1130 nodes, changesets, good = hbisect.bisect(repo, state)
1131 if extend:
1131 if extend:
1132 if not changesets:
1132 if not changesets:
1133 extendctx = hbisect.extendrange(repo, state, nodes, good)
1133 extendctx = hbisect.extendrange(repo, state, nodes, good)
1134 if extendctx is not None:
1134 if extendctx is not None:
1135 ui.write(
1135 ui.write(
1136 _(b"Extending search to changeset %s\n")
1136 _(b"Extending search to changeset %s\n")
1137 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1137 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1138 )
1138 )
1139 state[b'current'] = [extendctx.node()]
1139 state[b'current'] = [extendctx.node()]
1140 hbisect.save_state(repo, state)
1140 hbisect.save_state(repo, state)
1141 return mayupdate(repo, extendctx.node())
1141 return mayupdate(repo, extendctx.node())
1142 raise error.StateError(_(b"nothing to extend"))
1142 raise error.StateError(_(b"nothing to extend"))
1143
1143
1144 if changesets == 0:
1144 if changesets == 0:
1145 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1145 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1146 else:
1146 else:
1147 assert len(nodes) == 1 # only a single node can be tested next
1147 assert len(nodes) == 1 # only a single node can be tested next
1148 node = nodes[0]
1148 node = nodes[0]
1149 # compute the approximate number of remaining tests
1149 # compute the approximate number of remaining tests
1150 tests, size = 0, 2
1150 tests, size = 0, 2
1151 while size <= changesets:
1151 while size <= changesets:
1152 tests, size = tests + 1, size * 2
1152 tests, size = tests + 1, size * 2
1153 rev = repo.changelog.rev(node)
1153 rev = repo.changelog.rev(node)
1154 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1154 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1155 ui.write(
1155 ui.write(
1156 _(
1156 _(
1157 b"Testing changeset %s "
1157 b"Testing changeset %s "
1158 b"(%d changesets remaining, ~%d tests)\n"
1158 b"(%d changesets remaining, ~%d tests)\n"
1159 )
1159 )
1160 % (summary, changesets, tests)
1160 % (summary, changesets, tests)
1161 )
1161 )
1162 state[b'current'] = [node]
1162 state[b'current'] = [node]
1163 hbisect.save_state(repo, state)
1163 hbisect.save_state(repo, state)
1164 return mayupdate(repo, node)
1164 return mayupdate(repo, node)
1165
1165
1166
1166
1167 @command(
1167 @command(
1168 b'bookmarks|bookmark',
1168 b'bookmarks|bookmark',
1169 [
1169 [
1170 (b'f', b'force', False, _(b'force')),
1170 (b'f', b'force', False, _(b'force')),
1171 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1171 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1172 (b'd', b'delete', False, _(b'delete a given bookmark')),
1172 (b'd', b'delete', False, _(b'delete a given bookmark')),
1173 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1173 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1174 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1174 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1175 (b'l', b'list', False, _(b'list existing bookmarks')),
1175 (b'l', b'list', False, _(b'list existing bookmarks')),
1176 ]
1176 ]
1177 + formatteropts,
1177 + formatteropts,
1178 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1178 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1179 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1179 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1180 )
1180 )
1181 def bookmark(ui, repo, *names, **opts):
1181 def bookmark(ui, repo, *names, **opts):
1182 """create a new bookmark or list existing bookmarks
1182 """create a new bookmark or list existing bookmarks
1183
1183
1184 Bookmarks are labels on changesets to help track lines of development.
1184 Bookmarks are labels on changesets to help track lines of development.
1185 Bookmarks are unversioned and can be moved, renamed and deleted.
1185 Bookmarks are unversioned and can be moved, renamed and deleted.
1186 Deleting or moving a bookmark has no effect on the associated changesets.
1186 Deleting or moving a bookmark has no effect on the associated changesets.
1187
1187
1188 Creating or updating to a bookmark causes it to be marked as 'active'.
1188 Creating or updating to a bookmark causes it to be marked as 'active'.
1189 The active bookmark is indicated with a '*'.
1189 The active bookmark is indicated with a '*'.
1190 When a commit is made, the active bookmark will advance to the new commit.
1190 When a commit is made, the active bookmark will advance to the new commit.
1191 A plain :hg:`update` will also advance an active bookmark, if possible.
1191 A plain :hg:`update` will also advance an active bookmark, if possible.
1192 Updating away from a bookmark will cause it to be deactivated.
1192 Updating away from a bookmark will cause it to be deactivated.
1193
1193
1194 Bookmarks can be pushed and pulled between repositories (see
1194 Bookmarks can be pushed and pulled between repositories (see
1195 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1195 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1196 diverged, a new 'divergent bookmark' of the form 'name@path' will
1196 diverged, a new 'divergent bookmark' of the form 'name@path' will
1197 be created. Using :hg:`merge` will resolve the divergence.
1197 be created. Using :hg:`merge` will resolve the divergence.
1198
1198
1199 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1199 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1200 the active bookmark's name.
1200 the active bookmark's name.
1201
1201
1202 A bookmark named '@' has the special property that :hg:`clone` will
1202 A bookmark named '@' has the special property that :hg:`clone` will
1203 check it out by default if it exists.
1203 check it out by default if it exists.
1204
1204
1205 .. container:: verbose
1205 .. container:: verbose
1206
1206
1207 Template:
1207 Template:
1208
1208
1209 The following keywords are supported in addition to the common template
1209 The following keywords are supported in addition to the common template
1210 keywords and functions such as ``{bookmark}``. See also
1210 keywords and functions such as ``{bookmark}``. See also
1211 :hg:`help templates`.
1211 :hg:`help templates`.
1212
1212
1213 :active: Boolean. True if the bookmark is active.
1213 :active: Boolean. True if the bookmark is active.
1214
1214
1215 Examples:
1215 Examples:
1216
1216
1217 - create an active bookmark for a new line of development::
1217 - create an active bookmark for a new line of development::
1218
1218
1219 hg book new-feature
1219 hg book new-feature
1220
1220
1221 - create an inactive bookmark as a place marker::
1221 - create an inactive bookmark as a place marker::
1222
1222
1223 hg book -i reviewed
1223 hg book -i reviewed
1224
1224
1225 - create an inactive bookmark on another changeset::
1225 - create an inactive bookmark on another changeset::
1226
1226
1227 hg book -r .^ tested
1227 hg book -r .^ tested
1228
1228
1229 - rename bookmark turkey to dinner::
1229 - rename bookmark turkey to dinner::
1230
1230
1231 hg book -m turkey dinner
1231 hg book -m turkey dinner
1232
1232
1233 - move the '@' bookmark from another branch::
1233 - move the '@' bookmark from another branch::
1234
1234
1235 hg book -f @
1235 hg book -f @
1236
1236
1237 - print only the active bookmark name::
1237 - print only the active bookmark name::
1238
1238
1239 hg book -ql .
1239 hg book -ql .
1240 """
1240 """
1241 opts = pycompat.byteskwargs(opts)
1241 opts = pycompat.byteskwargs(opts)
1242 force = opts.get(b'force')
1242 force = opts.get(b'force')
1243 rev = opts.get(b'rev')
1243 rev = opts.get(b'rev')
1244 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1244 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1245
1245
1246 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1246 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1247 if action:
1247 if action:
1248 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1248 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1249 elif names or rev:
1249 elif names or rev:
1250 action = b'add'
1250 action = b'add'
1251 elif inactive:
1251 elif inactive:
1252 action = b'inactive' # meaning deactivate
1252 action = b'inactive' # meaning deactivate
1253 else:
1253 else:
1254 action = b'list'
1254 action = b'list'
1255
1255
1256 cmdutil.check_incompatible_arguments(
1256 cmdutil.check_incompatible_arguments(
1257 opts, b'inactive', [b'delete', b'list']
1257 opts, b'inactive', [b'delete', b'list']
1258 )
1258 )
1259 if not names and action in {b'add', b'delete'}:
1259 if not names and action in {b'add', b'delete'}:
1260 raise error.InputError(_(b"bookmark name required"))
1260 raise error.InputError(_(b"bookmark name required"))
1261
1261
1262 if action in {b'add', b'delete', b'rename', b'inactive'}:
1262 if action in {b'add', b'delete', b'rename', b'inactive'}:
1263 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1263 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1264 if action == b'delete':
1264 if action == b'delete':
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 bookmarks.delete(repo, tr, names)
1266 bookmarks.delete(repo, tr, names)
1267 elif action == b'rename':
1267 elif action == b'rename':
1268 if not names:
1268 if not names:
1269 raise error.InputError(_(b"new bookmark name required"))
1269 raise error.InputError(_(b"new bookmark name required"))
1270 elif len(names) > 1:
1270 elif len(names) > 1:
1271 raise error.InputError(
1271 raise error.InputError(
1272 _(b"only one new bookmark name allowed")
1272 _(b"only one new bookmark name allowed")
1273 )
1273 )
1274 oldname = repo._bookmarks.expandname(opts[b'rename'])
1274 oldname = repo._bookmarks.expandname(opts[b'rename'])
1275 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1275 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1276 elif action == b'add':
1276 elif action == b'add':
1277 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1277 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1278 elif action == b'inactive':
1278 elif action == b'inactive':
1279 if len(repo._bookmarks) == 0:
1279 if len(repo._bookmarks) == 0:
1280 ui.status(_(b"no bookmarks set\n"))
1280 ui.status(_(b"no bookmarks set\n"))
1281 elif not repo._activebookmark:
1281 elif not repo._activebookmark:
1282 ui.status(_(b"no active bookmark\n"))
1282 ui.status(_(b"no active bookmark\n"))
1283 else:
1283 else:
1284 bookmarks.deactivate(repo)
1284 bookmarks.deactivate(repo)
1285 elif action == b'list':
1285 elif action == b'list':
1286 names = pycompat.maplist(repo._bookmarks.expandname, names)
1286 names = pycompat.maplist(repo._bookmarks.expandname, names)
1287 with ui.formatter(b'bookmarks', opts) as fm:
1287 with ui.formatter(b'bookmarks', opts) as fm:
1288 bookmarks.printbookmarks(ui, repo, fm, names)
1288 bookmarks.printbookmarks(ui, repo, fm, names)
1289 else:
1289 else:
1290 raise error.ProgrammingError(b'invalid action: %s' % action)
1290 raise error.ProgrammingError(b'invalid action: %s' % action)
1291
1291
1292
1292
1293 @command(
1293 @command(
1294 b'branch',
1294 b'branch',
1295 [
1295 [
1296 (
1296 (
1297 b'f',
1297 b'f',
1298 b'force',
1298 b'force',
1299 None,
1299 None,
1300 _(b'set branch name even if it shadows an existing branch'),
1300 _(b'set branch name even if it shadows an existing branch'),
1301 ),
1301 ),
1302 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1302 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1303 (
1303 (
1304 b'r',
1304 b'r',
1305 b'rev',
1305 b'rev',
1306 [],
1306 [],
1307 _(b'change branches of the given revs (EXPERIMENTAL)'),
1307 _(b'change branches of the given revs (EXPERIMENTAL)'),
1308 ),
1308 ),
1309 ],
1309 ],
1310 _(b'[-fC] [NAME]'),
1310 _(b'[-fC] [NAME]'),
1311 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1311 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1312 )
1312 )
1313 def branch(ui, repo, label=None, **opts):
1313 def branch(ui, repo, label=None, **opts):
1314 """set or show the current branch name
1314 """set or show the current branch name
1315
1315
1316 .. note::
1316 .. note::
1317
1317
1318 Branch names are permanent and global. Use :hg:`bookmark` to create a
1318 Branch names are permanent and global. Use :hg:`bookmark` to create a
1319 light-weight bookmark instead. See :hg:`help glossary` for more
1319 light-weight bookmark instead. See :hg:`help glossary` for more
1320 information about named branches and bookmarks.
1320 information about named branches and bookmarks.
1321
1321
1322 With no argument, show the current branch name. With one argument,
1322 With no argument, show the current branch name. With one argument,
1323 set the working directory branch name (the branch will not exist
1323 set the working directory branch name (the branch will not exist
1324 in the repository until the next commit). Standard practice
1324 in the repository until the next commit). Standard practice
1325 recommends that primary development take place on the 'default'
1325 recommends that primary development take place on the 'default'
1326 branch.
1326 branch.
1327
1327
1328 Unless -f/--force is specified, branch will not let you set a
1328 Unless -f/--force is specified, branch will not let you set a
1329 branch name that already exists.
1329 branch name that already exists.
1330
1330
1331 Use -C/--clean to reset the working directory branch to that of
1331 Use -C/--clean to reset the working directory branch to that of
1332 the parent of the working directory, negating a previous branch
1332 the parent of the working directory, negating a previous branch
1333 change.
1333 change.
1334
1334
1335 Use the command :hg:`update` to switch to an existing branch. Use
1335 Use the command :hg:`update` to switch to an existing branch. Use
1336 :hg:`commit --close-branch` to mark this branch head as closed.
1336 :hg:`commit --close-branch` to mark this branch head as closed.
1337 When all heads of a branch are closed, the branch will be
1337 When all heads of a branch are closed, the branch will be
1338 considered closed.
1338 considered closed.
1339
1339
1340 Returns 0 on success.
1340 Returns 0 on success.
1341 """
1341 """
1342 opts = pycompat.byteskwargs(opts)
1342 opts = pycompat.byteskwargs(opts)
1343 revs = opts.get(b'rev')
1343 revs = opts.get(b'rev')
1344 if label:
1344 if label:
1345 label = label.strip()
1345 label = label.strip()
1346
1346
1347 if not opts.get(b'clean') and not label:
1347 if not opts.get(b'clean') and not label:
1348 if revs:
1348 if revs:
1349 raise error.InputError(
1349 raise error.InputError(
1350 _(b"no branch name specified for the revisions")
1350 _(b"no branch name specified for the revisions")
1351 )
1351 )
1352 ui.write(b"%s\n" % repo.dirstate.branch())
1352 ui.write(b"%s\n" % repo.dirstate.branch())
1353 return
1353 return
1354
1354
1355 with repo.wlock():
1355 with repo.wlock():
1356 if opts.get(b'clean'):
1356 if opts.get(b'clean'):
1357 label = repo[b'.'].branch()
1357 label = repo[b'.'].branch()
1358 repo.dirstate.setbranch(label)
1358 repo.dirstate.setbranch(label)
1359 ui.status(_(b'reset working directory to branch %s\n') % label)
1359 ui.status(_(b'reset working directory to branch %s\n') % label)
1360 elif label:
1360 elif label:
1361
1361
1362 scmutil.checknewlabel(repo, label, b'branch')
1362 scmutil.checknewlabel(repo, label, b'branch')
1363 if revs:
1363 if revs:
1364 return cmdutil.changebranch(ui, repo, revs, label, opts)
1364 return cmdutil.changebranch(ui, repo, revs, label, opts)
1365
1365
1366 if not opts.get(b'force') and label in repo.branchmap():
1366 if not opts.get(b'force') and label in repo.branchmap():
1367 if label not in [p.branch() for p in repo[None].parents()]:
1367 if label not in [p.branch() for p in repo[None].parents()]:
1368 raise error.InputError(
1368 raise error.InputError(
1369 _(b'a branch of the same name already exists'),
1369 _(b'a branch of the same name already exists'),
1370 # i18n: "it" refers to an existing branch
1370 # i18n: "it" refers to an existing branch
1371 hint=_(b"use 'hg update' to switch to it"),
1371 hint=_(b"use 'hg update' to switch to it"),
1372 )
1372 )
1373
1373
1374 repo.dirstate.setbranch(label)
1374 repo.dirstate.setbranch(label)
1375 ui.status(_(b'marked working directory as branch %s\n') % label)
1375 ui.status(_(b'marked working directory as branch %s\n') % label)
1376
1376
1377 # find any open named branches aside from default
1377 # find any open named branches aside from default
1378 for n, h, t, c in repo.branchmap().iterbranches():
1378 for n, h, t, c in repo.branchmap().iterbranches():
1379 if n != b"default" and not c:
1379 if n != b"default" and not c:
1380 return 0
1380 return 0
1381 ui.status(
1381 ui.status(
1382 _(
1382 _(
1383 b'(branches are permanent and global, '
1383 b'(branches are permanent and global, '
1384 b'did you want a bookmark?)\n'
1384 b'did you want a bookmark?)\n'
1385 )
1385 )
1386 )
1386 )
1387
1387
1388
1388
1389 @command(
1389 @command(
1390 b'branches',
1390 b'branches',
1391 [
1391 [
1392 (
1392 (
1393 b'a',
1393 b'a',
1394 b'active',
1394 b'active',
1395 False,
1395 False,
1396 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1396 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1397 ),
1397 ),
1398 (b'c', b'closed', False, _(b'show normal and closed branches')),
1398 (b'c', b'closed', False, _(b'show normal and closed branches')),
1399 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1399 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1400 ]
1400 ]
1401 + formatteropts,
1401 + formatteropts,
1402 _(b'[-c]'),
1402 _(b'[-c]'),
1403 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1403 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1404 intents={INTENT_READONLY},
1404 intents={INTENT_READONLY},
1405 )
1405 )
1406 def branches(ui, repo, active=False, closed=False, **opts):
1406 def branches(ui, repo, active=False, closed=False, **opts):
1407 """list repository named branches
1407 """list repository named branches
1408
1408
1409 List the repository's named branches, indicating which ones are
1409 List the repository's named branches, indicating which ones are
1410 inactive. If -c/--closed is specified, also list branches which have
1410 inactive. If -c/--closed is specified, also list branches which have
1411 been marked closed (see :hg:`commit --close-branch`).
1411 been marked closed (see :hg:`commit --close-branch`).
1412
1412
1413 Use the command :hg:`update` to switch to an existing branch.
1413 Use the command :hg:`update` to switch to an existing branch.
1414
1414
1415 .. container:: verbose
1415 .. container:: verbose
1416
1416
1417 Template:
1417 Template:
1418
1418
1419 The following keywords are supported in addition to the common template
1419 The following keywords are supported in addition to the common template
1420 keywords and functions such as ``{branch}``. See also
1420 keywords and functions such as ``{branch}``. See also
1421 :hg:`help templates`.
1421 :hg:`help templates`.
1422
1422
1423 :active: Boolean. True if the branch is active.
1423 :active: Boolean. True if the branch is active.
1424 :closed: Boolean. True if the branch is closed.
1424 :closed: Boolean. True if the branch is closed.
1425 :current: Boolean. True if it is the current branch.
1425 :current: Boolean. True if it is the current branch.
1426
1426
1427 Returns 0.
1427 Returns 0.
1428 """
1428 """
1429
1429
1430 opts = pycompat.byteskwargs(opts)
1430 opts = pycompat.byteskwargs(opts)
1431 revs = opts.get(b'rev')
1431 revs = opts.get(b'rev')
1432 selectedbranches = None
1432 selectedbranches = None
1433 if revs:
1433 if revs:
1434 revs = logcmdutil.revrange(repo, revs)
1434 revs = logcmdutil.revrange(repo, revs)
1435 getbi = repo.revbranchcache().branchinfo
1435 getbi = repo.revbranchcache().branchinfo
1436 selectedbranches = {getbi(r)[0] for r in revs}
1436 selectedbranches = {getbi(r)[0] for r in revs}
1437
1437
1438 ui.pager(b'branches')
1438 ui.pager(b'branches')
1439 fm = ui.formatter(b'branches', opts)
1439 fm = ui.formatter(b'branches', opts)
1440 hexfunc = fm.hexfunc
1440 hexfunc = fm.hexfunc
1441
1441
1442 allheads = set(repo.heads())
1442 allheads = set(repo.heads())
1443 branches = []
1443 branches = []
1444 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1444 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1445 if selectedbranches is not None and tag not in selectedbranches:
1445 if selectedbranches is not None and tag not in selectedbranches:
1446 continue
1446 continue
1447 isactive = False
1447 isactive = False
1448 if not isclosed:
1448 if not isclosed:
1449 openheads = set(repo.branchmap().iteropen(heads))
1449 openheads = set(repo.branchmap().iteropen(heads))
1450 isactive = bool(openheads & allheads)
1450 isactive = bool(openheads & allheads)
1451 branches.append((tag, repo[tip], isactive, not isclosed))
1451 branches.append((tag, repo[tip], isactive, not isclosed))
1452 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1452 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1453
1453
1454 for tag, ctx, isactive, isopen in branches:
1454 for tag, ctx, isactive, isopen in branches:
1455 if active and not isactive:
1455 if active and not isactive:
1456 continue
1456 continue
1457 if isactive:
1457 if isactive:
1458 label = b'branches.active'
1458 label = b'branches.active'
1459 notice = b''
1459 notice = b''
1460 elif not isopen:
1460 elif not isopen:
1461 if not closed:
1461 if not closed:
1462 continue
1462 continue
1463 label = b'branches.closed'
1463 label = b'branches.closed'
1464 notice = _(b' (closed)')
1464 notice = _(b' (closed)')
1465 else:
1465 else:
1466 label = b'branches.inactive'
1466 label = b'branches.inactive'
1467 notice = _(b' (inactive)')
1467 notice = _(b' (inactive)')
1468 current = tag == repo.dirstate.branch()
1468 current = tag == repo.dirstate.branch()
1469 if current:
1469 if current:
1470 label = b'branches.current'
1470 label = b'branches.current'
1471
1471
1472 fm.startitem()
1472 fm.startitem()
1473 fm.write(b'branch', b'%s', tag, label=label)
1473 fm.write(b'branch', b'%s', tag, label=label)
1474 rev = ctx.rev()
1474 rev = ctx.rev()
1475 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1475 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1476 fmt = b' ' * padsize + b' %d:%s'
1476 fmt = b' ' * padsize + b' %d:%s'
1477 fm.condwrite(
1477 fm.condwrite(
1478 not ui.quiet,
1478 not ui.quiet,
1479 b'rev node',
1479 b'rev node',
1480 fmt,
1480 fmt,
1481 rev,
1481 rev,
1482 hexfunc(ctx.node()),
1482 hexfunc(ctx.node()),
1483 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1483 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1484 )
1484 )
1485 fm.context(ctx=ctx)
1485 fm.context(ctx=ctx)
1486 fm.data(active=isactive, closed=not isopen, current=current)
1486 fm.data(active=isactive, closed=not isopen, current=current)
1487 if not ui.quiet:
1487 if not ui.quiet:
1488 fm.plain(notice)
1488 fm.plain(notice)
1489 fm.plain(b'\n')
1489 fm.plain(b'\n')
1490 fm.end()
1490 fm.end()
1491
1491
1492
1492
1493 @command(
1493 @command(
1494 b'bundle',
1494 b'bundle',
1495 [
1495 [
1496 (
1496 (
1497 b'',
1497 b'',
1498 b'exact',
1498 b'exact',
1499 None,
1499 None,
1500 _(b'compute the base from the revision specified'),
1500 _(b'compute the base from the revision specified'),
1501 ),
1501 ),
1502 (
1502 (
1503 b'f',
1503 b'f',
1504 b'force',
1504 b'force',
1505 None,
1505 None,
1506 _(b'run even when the destination is unrelated'),
1506 _(b'run even when the destination is unrelated'),
1507 ),
1507 ),
1508 (
1508 (
1509 b'r',
1509 b'r',
1510 b'rev',
1510 b'rev',
1511 [],
1511 [],
1512 _(b'a changeset intended to be added to the destination'),
1512 _(b'a changeset intended to be added to the destination'),
1513 _(b'REV'),
1513 _(b'REV'),
1514 ),
1514 ),
1515 (
1515 (
1516 b'b',
1516 b'b',
1517 b'branch',
1517 b'branch',
1518 [],
1518 [],
1519 _(b'a specific branch you would like to bundle'),
1519 _(b'a specific branch you would like to bundle'),
1520 _(b'BRANCH'),
1520 _(b'BRANCH'),
1521 ),
1521 ),
1522 (
1522 (
1523 b'',
1523 b'',
1524 b'base',
1524 b'base',
1525 [],
1525 [],
1526 _(b'a base changeset assumed to be available at the destination'),
1526 _(b'a base changeset assumed to be available at the destination'),
1527 _(b'REV'),
1527 _(b'REV'),
1528 ),
1528 ),
1529 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1529 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1530 (
1530 (
1531 b't',
1531 b't',
1532 b'type',
1532 b'type',
1533 b'bzip2',
1533 b'bzip2',
1534 _(b'bundle compression type to use'),
1534 _(b'bundle compression type to use'),
1535 _(b'TYPE'),
1535 _(b'TYPE'),
1536 ),
1536 ),
1537 ]
1537 ]
1538 + remoteopts,
1538 + remoteopts,
1539 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1539 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1541 )
1541 )
1542 def bundle(ui, repo, fname, *dests, **opts):
1542 def bundle(ui, repo, fname, *dests, **opts):
1543 """create a bundle file
1543 """create a bundle file
1544
1544
1545 Generate a bundle file containing data to be transferred to another
1545 Generate a bundle file containing data to be transferred to another
1546 repository.
1546 repository.
1547
1547
1548 To create a bundle containing all changesets, use -a/--all
1548 To create a bundle containing all changesets, use -a/--all
1549 (or --base null). Otherwise, hg assumes the destination will have
1549 (or --base null). Otherwise, hg assumes the destination will have
1550 all the nodes you specify with --base parameters. Otherwise, hg
1550 all the nodes you specify with --base parameters. Otherwise, hg
1551 will assume the repository has all the nodes in destination, or
1551 will assume the repository has all the nodes in destination, or
1552 default-push/default if no destination is specified, where destination
1552 default-push/default if no destination is specified, where destination
1553 is the repositories you provide through DEST option.
1553 is the repositories you provide through DEST option.
1554
1554
1555 You can change bundle format with the -t/--type option. See
1555 You can change bundle format with the -t/--type option. See
1556 :hg:`help bundlespec` for documentation on this format. By default,
1556 :hg:`help bundlespec` for documentation on this format. By default,
1557 the most appropriate format is used and compression defaults to
1557 the most appropriate format is used and compression defaults to
1558 bzip2.
1558 bzip2.
1559
1559
1560 The bundle file can then be transferred using conventional means
1560 The bundle file can then be transferred using conventional means
1561 and applied to another repository with the unbundle or pull
1561 and applied to another repository with the unbundle or pull
1562 command. This is useful when direct push and pull are not
1562 command. This is useful when direct push and pull are not
1563 available or when exporting an entire repository is undesirable.
1563 available or when exporting an entire repository is undesirable.
1564
1564
1565 Applying bundles preserves all changeset contents including
1565 Applying bundles preserves all changeset contents including
1566 permissions, copy/rename information, and revision history.
1566 permissions, copy/rename information, and revision history.
1567
1567
1568 Returns 0 on success, 1 if no changes found.
1568 Returns 0 on success, 1 if no changes found.
1569 """
1569 """
1570 opts = pycompat.byteskwargs(opts)
1570 opts = pycompat.byteskwargs(opts)
1571
1571
1572 revs = None
1572 revs = None
1573 if b'rev' in opts:
1573 if b'rev' in opts:
1574 revstrings = opts[b'rev']
1574 revstrings = opts[b'rev']
1575 revs = logcmdutil.revrange(repo, revstrings)
1575 revs = logcmdutil.revrange(repo, revstrings)
1576 if revstrings and not revs:
1576 if revstrings and not revs:
1577 raise error.InputError(_(b'no commits to bundle'))
1577 raise error.InputError(_(b'no commits to bundle'))
1578
1578
1579 bundletype = opts.get(b'type', b'bzip2').lower()
1579 bundletype = opts.get(b'type', b'bzip2').lower()
1580 try:
1580 try:
1581 bundlespec = bundlecaches.parsebundlespec(
1581 bundlespec = bundlecaches.parsebundlespec(
1582 repo, bundletype, strict=False
1582 repo, bundletype, strict=False
1583 )
1583 )
1584 except error.UnsupportedBundleSpecification as e:
1584 except error.UnsupportedBundleSpecification as e:
1585 raise error.InputError(
1585 raise error.InputError(
1586 pycompat.bytestr(e),
1586 pycompat.bytestr(e),
1587 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1587 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1588 )
1588 )
1589 cgversion = bundlespec.params[b"cg.version"]
1589 cgversion = bundlespec.params[b"cg.version"]
1590
1590
1591 # Packed bundles are a pseudo bundle format for now.
1591 # Packed bundles are a pseudo bundle format for now.
1592 if cgversion == b's1':
1592 if cgversion == b's1':
1593 raise error.InputError(
1593 raise error.InputError(
1594 _(b'packed bundles cannot be produced by "hg bundle"'),
1594 _(b'packed bundles cannot be produced by "hg bundle"'),
1595 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1595 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1596 )
1596 )
1597
1597
1598 if opts.get(b'all'):
1598 if opts.get(b'all'):
1599 if dests:
1599 if dests:
1600 raise error.InputError(
1600 raise error.InputError(
1601 _(b"--all is incompatible with specifying destinations")
1601 _(b"--all is incompatible with specifying destinations")
1602 )
1602 )
1603 if opts.get(b'base'):
1603 if opts.get(b'base'):
1604 ui.warn(_(b"ignoring --base because --all was specified\n"))
1604 ui.warn(_(b"ignoring --base because --all was specified\n"))
1605 if opts.get(b'exact'):
1605 if opts.get(b'exact'):
1606 ui.warn(_(b"ignoring --exact because --all was specified\n"))
1606 ui.warn(_(b"ignoring --exact because --all was specified\n"))
1607 base = [nullrev]
1607 base = [nullrev]
1608 elif opts.get(b'exact'):
1608 elif opts.get(b'exact'):
1609 if dests:
1609 if dests:
1610 raise error.InputError(
1610 raise error.InputError(
1611 _(b"--exact is incompatible with specifying destinations")
1611 _(b"--exact is incompatible with specifying destinations")
1612 )
1612 )
1613 if opts.get(b'base'):
1613 if opts.get(b'base'):
1614 ui.warn(_(b"ignoring --base because --exact was specified\n"))
1614 ui.warn(_(b"ignoring --base because --exact was specified\n"))
1615 base = repo.revs(b'parents(%ld) - %ld', revs, revs)
1615 base = repo.revs(b'parents(%ld) - %ld', revs, revs)
1616 if not base:
1616 if not base:
1617 base = [nullrev]
1617 base = [nullrev]
1618 else:
1618 else:
1619 base = logcmdutil.revrange(repo, opts.get(b'base'))
1619 base = logcmdutil.revrange(repo, opts.get(b'base'))
1620 if cgversion not in changegroup.supportedoutgoingversions(repo):
1620 if cgversion not in changegroup.supportedoutgoingversions(repo):
1621 raise error.Abort(
1621 raise error.Abort(
1622 _(b"repository does not support bundle version %s") % cgversion
1622 _(b"repository does not support bundle version %s") % cgversion
1623 )
1623 )
1624
1624
1625 if base:
1625 if base:
1626 if dests:
1626 if dests:
1627 raise error.InputError(
1627 raise error.InputError(
1628 _(b"--base is incompatible with specifying destinations")
1628 _(b"--base is incompatible with specifying destinations")
1629 )
1629 )
1630 cl = repo.changelog
1630 cl = repo.changelog
1631 common = [cl.node(rev) for rev in base]
1631 common = [cl.node(rev) for rev in base]
1632 heads = [cl.node(r) for r in revs] if revs else None
1632 heads = [cl.node(r) for r in revs] if revs else None
1633 outgoing = discovery.outgoing(repo, common, heads)
1633 outgoing = discovery.outgoing(repo, common, heads)
1634 missing = outgoing.missing
1634 missing = outgoing.missing
1635 excluded = outgoing.excluded
1635 excluded = outgoing.excluded
1636 else:
1636 else:
1637 missing = set()
1637 missing = set()
1638 excluded = set()
1638 excluded = set()
1639 for path in urlutil.get_push_paths(repo, ui, dests):
1639 for path in urlutil.get_push_paths(repo, ui, dests):
1640 other = hg.peer(repo, opts, path)
1640 other = hg.peer(repo, opts, path)
1641 if revs is not None:
1641 if revs is not None:
1642 hex_revs = [repo[r].hex() for r in revs]
1642 hex_revs = [repo[r].hex() for r in revs]
1643 else:
1643 else:
1644 hex_revs = None
1644 hex_revs = None
1645 branches = (path.branch, [])
1645 branches = (path.branch, [])
1646 head_revs, checkout = hg.addbranchrevs(
1646 head_revs, checkout = hg.addbranchrevs(
1647 repo, repo, branches, hex_revs
1647 repo, repo, branches, hex_revs
1648 )
1648 )
1649 heads = (
1649 heads = (
1650 head_revs
1650 head_revs
1651 and pycompat.maplist(repo.lookup, head_revs)
1651 and pycompat.maplist(repo.lookup, head_revs)
1652 or head_revs
1652 or head_revs
1653 )
1653 )
1654 outgoing = discovery.findcommonoutgoing(
1654 outgoing = discovery.findcommonoutgoing(
1655 repo,
1655 repo,
1656 other,
1656 other,
1657 onlyheads=heads,
1657 onlyheads=heads,
1658 force=opts.get(b'force'),
1658 force=opts.get(b'force'),
1659 portable=True,
1659 portable=True,
1660 )
1660 )
1661 missing.update(outgoing.missing)
1661 missing.update(outgoing.missing)
1662 excluded.update(outgoing.excluded)
1662 excluded.update(outgoing.excluded)
1663
1663
1664 if not missing:
1664 if not missing:
1665 scmutil.nochangesfound(ui, repo, not base and excluded)
1665 scmutil.nochangesfound(ui, repo, not base and excluded)
1666 return 1
1666 return 1
1667
1667
1668 if heads:
1668 if heads:
1669 outgoing = discovery.outgoing(
1669 outgoing = discovery.outgoing(
1670 repo, missingroots=missing, ancestorsof=heads
1670 repo, missingroots=missing, ancestorsof=heads
1671 )
1671 )
1672 else:
1672 else:
1673 outgoing = discovery.outgoing(repo, missingroots=missing)
1673 outgoing = discovery.outgoing(repo, missingroots=missing)
1674 outgoing.excluded = sorted(excluded)
1674 outgoing.excluded = sorted(excluded)
1675
1675
1676 if cgversion == b'01': # bundle1
1676 if cgversion == b'01': # bundle1
1677 bversion = b'HG10' + bundlespec.wirecompression
1677 bversion = b'HG10' + bundlespec.wirecompression
1678 bcompression = None
1678 bcompression = None
1679 elif cgversion in (b'02', b'03'):
1679 elif cgversion in (b'02', b'03'):
1680 bversion = b'HG20'
1680 bversion = b'HG20'
1681 bcompression = bundlespec.wirecompression
1681 bcompression = bundlespec.wirecompression
1682 else:
1682 else:
1683 raise error.ProgrammingError(
1683 raise error.ProgrammingError(
1684 b'bundle: unexpected changegroup version %s' % cgversion
1684 b'bundle: unexpected changegroup version %s' % cgversion
1685 )
1685 )
1686
1686
1687 # TODO compression options should be derived from bundlespec parsing.
1687 # TODO compression options should be derived from bundlespec parsing.
1688 # This is a temporary hack to allow adjusting bundle compression
1688 # This is a temporary hack to allow adjusting bundle compression
1689 # level without a) formalizing the bundlespec changes to declare it
1689 # level without a) formalizing the bundlespec changes to declare it
1690 # b) introducing a command flag.
1690 # b) introducing a command flag.
1691 compopts = {}
1691 compopts = {}
1692 complevel = ui.configint(
1692 complevel = ui.configint(
1693 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1693 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1694 )
1694 )
1695 if complevel is None:
1695 if complevel is None:
1696 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1696 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1697 if complevel is not None:
1697 if complevel is not None:
1698 compopts[b'level'] = complevel
1698 compopts[b'level'] = complevel
1699
1699
1700 compthreads = ui.configint(
1700 compthreads = ui.configint(
1701 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1701 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1702 )
1702 )
1703 if compthreads is None:
1703 if compthreads is None:
1704 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1704 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1705 if compthreads is not None:
1705 if compthreads is not None:
1706 compopts[b'threads'] = compthreads
1706 compopts[b'threads'] = compthreads
1707
1707
1708 # Bundling of obsmarker and phases is optional as not all clients
1708 # Bundling of obsmarker and phases is optional as not all clients
1709 # support the necessary features.
1709 # support the necessary features.
1710 cfg = ui.configbool
1710 cfg = ui.configbool
1711 obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker')
1711 obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker')
1712 bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False)
1712 bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False)
1713 obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory')
1713 obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory')
1714 bundlespec.set_param(
1714 bundlespec.set_param(
1715 b'obsolescence-mandatory', obs_mand_cfg, overwrite=False
1715 b'obsolescence-mandatory', obs_mand_cfg, overwrite=False
1716 )
1716 )
1717 phases_cfg = cfg(b'experimental', b'bundle-phases')
1717 phases_cfg = cfg(b'experimental', b'bundle-phases')
1718 bundlespec.set_param(b'phases', phases_cfg, overwrite=False)
1718 bundlespec.set_param(b'phases', phases_cfg, overwrite=False)
1719
1719
1720 bundle2.writenewbundle(
1720 bundle2.writenewbundle(
1721 ui,
1721 ui,
1722 repo,
1722 repo,
1723 b'bundle',
1723 b'bundle',
1724 fname,
1724 fname,
1725 bversion,
1725 bversion,
1726 outgoing,
1726 outgoing,
1727 bundlespec.params,
1727 bundlespec.params,
1728 compression=bcompression,
1728 compression=bcompression,
1729 compopts=compopts,
1729 compopts=compopts,
1730 )
1730 )
1731
1731
1732
1732
1733 @command(
1733 @command(
1734 b'cat',
1734 b'cat',
1735 [
1735 [
1736 (
1736 (
1737 b'o',
1737 b'o',
1738 b'output',
1738 b'output',
1739 b'',
1739 b'',
1740 _(b'print output to file with formatted name'),
1740 _(b'print output to file with formatted name'),
1741 _(b'FORMAT'),
1741 _(b'FORMAT'),
1742 ),
1742 ),
1743 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1743 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1744 (b'', b'decode', None, _(b'apply any matching decode filter')),
1744 (b'', b'decode', None, _(b'apply any matching decode filter')),
1745 ]
1745 ]
1746 + walkopts
1746 + walkopts
1747 + formatteropts,
1747 + formatteropts,
1748 _(b'[OPTION]... FILE...'),
1748 _(b'[OPTION]... FILE...'),
1749 helpcategory=command.CATEGORY_FILE_CONTENTS,
1749 helpcategory=command.CATEGORY_FILE_CONTENTS,
1750 inferrepo=True,
1750 inferrepo=True,
1751 intents={INTENT_READONLY},
1751 intents={INTENT_READONLY},
1752 )
1752 )
1753 def cat(ui, repo, file1, *pats, **opts):
1753 def cat(ui, repo, file1, *pats, **opts):
1754 """output the current or given revision of files
1754 """output the current or given revision of files
1755
1755
1756 Print the specified files as they were at the given revision. If
1756 Print the specified files as they were at the given revision. If
1757 no revision is given, the parent of the working directory is used.
1757 no revision is given, the parent of the working directory is used.
1758
1758
1759 Output may be to a file, in which case the name of the file is
1759 Output may be to a file, in which case the name of the file is
1760 given using a template string. See :hg:`help templates`. In addition
1760 given using a template string. See :hg:`help templates`. In addition
1761 to the common template keywords, the following formatting rules are
1761 to the common template keywords, the following formatting rules are
1762 supported:
1762 supported:
1763
1763
1764 :``%%``: literal "%" character
1764 :``%%``: literal "%" character
1765 :``%s``: basename of file being printed
1765 :``%s``: basename of file being printed
1766 :``%d``: dirname of file being printed, or '.' if in repository root
1766 :``%d``: dirname of file being printed, or '.' if in repository root
1767 :``%p``: root-relative path name of file being printed
1767 :``%p``: root-relative path name of file being printed
1768 :``%H``: changeset hash (40 hexadecimal digits)
1768 :``%H``: changeset hash (40 hexadecimal digits)
1769 :``%R``: changeset revision number
1769 :``%R``: changeset revision number
1770 :``%h``: short-form changeset hash (12 hexadecimal digits)
1770 :``%h``: short-form changeset hash (12 hexadecimal digits)
1771 :``%r``: zero-padded changeset revision number
1771 :``%r``: zero-padded changeset revision number
1772 :``%b``: basename of the exporting repository
1772 :``%b``: basename of the exporting repository
1773 :``\\``: literal "\\" character
1773 :``\\``: literal "\\" character
1774
1774
1775 .. container:: verbose
1775 .. container:: verbose
1776
1776
1777 Template:
1777 Template:
1778
1778
1779 The following keywords are supported in addition to the common template
1779 The following keywords are supported in addition to the common template
1780 keywords and functions. See also :hg:`help templates`.
1780 keywords and functions. See also :hg:`help templates`.
1781
1781
1782 :data: String. File content.
1782 :data: String. File content.
1783 :path: String. Repository-absolute path of the file.
1783 :path: String. Repository-absolute path of the file.
1784
1784
1785 Returns 0 on success.
1785 Returns 0 on success.
1786 """
1786 """
1787 opts = pycompat.byteskwargs(opts)
1787 opts = pycompat.byteskwargs(opts)
1788 rev = opts.get(b'rev')
1788 rev = opts.get(b'rev')
1789 if rev:
1789 if rev:
1790 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1790 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1791 ctx = logcmdutil.revsingle(repo, rev)
1791 ctx = logcmdutil.revsingle(repo, rev)
1792 m = scmutil.match(ctx, (file1,) + pats, opts)
1792 m = scmutil.match(ctx, (file1,) + pats, opts)
1793 fntemplate = opts.pop(b'output', b'')
1793 fntemplate = opts.pop(b'output', b'')
1794 if cmdutil.isstdiofilename(fntemplate):
1794 if cmdutil.isstdiofilename(fntemplate):
1795 fntemplate = b''
1795 fntemplate = b''
1796
1796
1797 if fntemplate:
1797 if fntemplate:
1798 fm = formatter.nullformatter(ui, b'cat', opts)
1798 fm = formatter.nullformatter(ui, b'cat', opts)
1799 else:
1799 else:
1800 ui.pager(b'cat')
1800 ui.pager(b'cat')
1801 fm = ui.formatter(b'cat', opts)
1801 fm = ui.formatter(b'cat', opts)
1802 with fm:
1802 with fm:
1803 return cmdutil.cat(
1803 return cmdutil.cat(
1804 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1804 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1805 )
1805 )
1806
1806
1807
1807
1808 @command(
1808 @command(
1809 b'clone',
1809 b'clone',
1810 [
1810 [
1811 (
1811 (
1812 b'U',
1812 b'U',
1813 b'noupdate',
1813 b'noupdate',
1814 None,
1814 None,
1815 _(
1815 _(
1816 b'the clone will include an empty working '
1816 b'the clone will include an empty working '
1817 b'directory (only a repository)'
1817 b'directory (only a repository)'
1818 ),
1818 ),
1819 ),
1819 ),
1820 (
1820 (
1821 b'u',
1821 b'u',
1822 b'updaterev',
1822 b'updaterev',
1823 b'',
1823 b'',
1824 _(b'revision, tag, or branch to check out'),
1824 _(b'revision, tag, or branch to check out'),
1825 _(b'REV'),
1825 _(b'REV'),
1826 ),
1826 ),
1827 (
1827 (
1828 b'r',
1828 b'r',
1829 b'rev',
1829 b'rev',
1830 [],
1830 [],
1831 _(
1831 _(
1832 b'do not clone everything, but include this changeset'
1832 b'do not clone everything, but include this changeset'
1833 b' and its ancestors'
1833 b' and its ancestors'
1834 ),
1834 ),
1835 _(b'REV'),
1835 _(b'REV'),
1836 ),
1836 ),
1837 (
1837 (
1838 b'b',
1838 b'b',
1839 b'branch',
1839 b'branch',
1840 [],
1840 [],
1841 _(
1841 _(
1842 b'do not clone everything, but include this branch\'s'
1842 b'do not clone everything, but include this branch\'s'
1843 b' changesets and their ancestors'
1843 b' changesets and their ancestors'
1844 ),
1844 ),
1845 _(b'BRANCH'),
1845 _(b'BRANCH'),
1846 ),
1846 ),
1847 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1847 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1848 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1848 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1849 (b'', b'stream', None, _(b'clone with minimal data processing')),
1849 (b'', b'stream', None, _(b'clone with minimal data processing')),
1850 ]
1850 ]
1851 + remoteopts,
1851 + remoteopts,
1852 _(b'[OPTION]... SOURCE [DEST]'),
1852 _(b'[OPTION]... SOURCE [DEST]'),
1853 helpcategory=command.CATEGORY_REPO_CREATION,
1853 helpcategory=command.CATEGORY_REPO_CREATION,
1854 helpbasic=True,
1854 helpbasic=True,
1855 norepo=True,
1855 norepo=True,
1856 )
1856 )
1857 def clone(ui, source, dest=None, **opts):
1857 def clone(ui, source, dest=None, **opts):
1858 """make a copy of an existing repository
1858 """make a copy of an existing repository
1859
1859
1860 Create a copy of an existing repository in a new directory.
1860 Create a copy of an existing repository in a new directory.
1861
1861
1862 If no destination directory name is specified, it defaults to the
1862 If no destination directory name is specified, it defaults to the
1863 basename of the source.
1863 basename of the source.
1864
1864
1865 The location of the source is added to the new repository's
1865 The location of the source is added to the new repository's
1866 ``.hg/hgrc`` file, as the default to be used for future pulls.
1866 ``.hg/hgrc`` file, as the default to be used for future pulls.
1867
1867
1868 Only local paths and ``ssh://`` URLs are supported as
1868 Only local paths and ``ssh://`` URLs are supported as
1869 destinations. For ``ssh://`` destinations, no working directory or
1869 destinations. For ``ssh://`` destinations, no working directory or
1870 ``.hg/hgrc`` will be created on the remote side.
1870 ``.hg/hgrc`` will be created on the remote side.
1871
1871
1872 If the source repository has a bookmark called '@' set, that
1872 If the source repository has a bookmark called '@' set, that
1873 revision will be checked out in the new repository by default.
1873 revision will be checked out in the new repository by default.
1874
1874
1875 To check out a particular version, use -u/--update, or
1875 To check out a particular version, use -u/--update, or
1876 -U/--noupdate to create a clone with no working directory.
1876 -U/--noupdate to create a clone with no working directory.
1877
1877
1878 To pull only a subset of changesets, specify one or more revisions
1878 To pull only a subset of changesets, specify one or more revisions
1879 identifiers with -r/--rev or branches with -b/--branch. The
1879 identifiers with -r/--rev or branches with -b/--branch. The
1880 resulting clone will contain only the specified changesets and
1880 resulting clone will contain only the specified changesets and
1881 their ancestors. These options (or 'clone src#rev dest') imply
1881 their ancestors. These options (or 'clone src#rev dest') imply
1882 --pull, even for local source repositories.
1882 --pull, even for local source repositories.
1883
1883
1884 In normal clone mode, the remote normalizes repository data into a common
1884 In normal clone mode, the remote normalizes repository data into a common
1885 exchange format and the receiving end translates this data into its local
1885 exchange format and the receiving end translates this data into its local
1886 storage format. --stream activates a different clone mode that essentially
1886 storage format. --stream activates a different clone mode that essentially
1887 copies repository files from the remote with minimal data processing. This
1887 copies repository files from the remote with minimal data processing. This
1888 significantly reduces the CPU cost of a clone both remotely and locally.
1888 significantly reduces the CPU cost of a clone both remotely and locally.
1889 However, it often increases the transferred data size by 30-40%. This can
1889 However, it often increases the transferred data size by 30-40%. This can
1890 result in substantially faster clones where I/O throughput is plentiful,
1890 result in substantially faster clones where I/O throughput is plentiful,
1891 especially for larger repositories. A side-effect of --stream clones is
1891 especially for larger repositories. A side-effect of --stream clones is
1892 that storage settings and requirements on the remote are applied locally:
1892 that storage settings and requirements on the remote are applied locally:
1893 a modern client may inherit legacy or inefficient storage used by the
1893 a modern client may inherit legacy or inefficient storage used by the
1894 remote or a legacy Mercurial client may not be able to clone from a
1894 remote or a legacy Mercurial client may not be able to clone from a
1895 modern Mercurial remote.
1895 modern Mercurial remote.
1896
1896
1897 .. note::
1897 .. note::
1898
1898
1899 Specifying a tag will include the tagged changeset but not the
1899 Specifying a tag will include the tagged changeset but not the
1900 changeset containing the tag.
1900 changeset containing the tag.
1901
1901
1902 .. container:: verbose
1902 .. container:: verbose
1903
1903
1904 For efficiency, hardlinks are used for cloning whenever the
1904 For efficiency, hardlinks are used for cloning whenever the
1905 source and destination are on the same filesystem (note this
1905 source and destination are on the same filesystem (note this
1906 applies only to the repository data, not to the working
1906 applies only to the repository data, not to the working
1907 directory). Some filesystems, such as AFS, implement hardlinking
1907 directory). Some filesystems, such as AFS, implement hardlinking
1908 incorrectly, but do not report errors. In these cases, use the
1908 incorrectly, but do not report errors. In these cases, use the
1909 --pull option to avoid hardlinking.
1909 --pull option to avoid hardlinking.
1910
1910
1911 Mercurial will update the working directory to the first applicable
1911 Mercurial will update the working directory to the first applicable
1912 revision from this list:
1912 revision from this list:
1913
1913
1914 a) null if -U or the source repository has no changesets
1914 a) null if -U or the source repository has no changesets
1915 b) if -u . and the source repository is local, the first parent of
1915 b) if -u . and the source repository is local, the first parent of
1916 the source repository's working directory
1916 the source repository's working directory
1917 c) the changeset specified with -u (if a branch name, this means the
1917 c) the changeset specified with -u (if a branch name, this means the
1918 latest head of that branch)
1918 latest head of that branch)
1919 d) the changeset specified with -r
1919 d) the changeset specified with -r
1920 e) the tipmost head specified with -b
1920 e) the tipmost head specified with -b
1921 f) the tipmost head specified with the url#branch source syntax
1921 f) the tipmost head specified with the url#branch source syntax
1922 g) the revision marked with the '@' bookmark, if present
1922 g) the revision marked with the '@' bookmark, if present
1923 h) the tipmost head of the default branch
1923 h) the tipmost head of the default branch
1924 i) tip
1924 i) tip
1925
1925
1926 When cloning from servers that support it, Mercurial may fetch
1926 When cloning from servers that support it, Mercurial may fetch
1927 pre-generated data from a server-advertised URL or inline from the
1927 pre-generated data from a server-advertised URL or inline from the
1928 same stream. When this is done, hooks operating on incoming changesets
1928 same stream. When this is done, hooks operating on incoming changesets
1929 and changegroups may fire more than once, once for each pre-generated
1929 and changegroups may fire more than once, once for each pre-generated
1930 bundle and as well as for any additional remaining data. In addition,
1930 bundle and as well as for any additional remaining data. In addition,
1931 if an error occurs, the repository may be rolled back to a partial
1931 if an error occurs, the repository may be rolled back to a partial
1932 clone. This behavior may change in future releases.
1932 clone. This behavior may change in future releases.
1933 See :hg:`help -e clonebundles` for more.
1933 See :hg:`help -e clonebundles` for more.
1934
1934
1935 Examples:
1935 Examples:
1936
1936
1937 - clone a remote repository to a new directory named hg/::
1937 - clone a remote repository to a new directory named hg/::
1938
1938
1939 hg clone https://www.mercurial-scm.org/repo/hg/
1939 hg clone https://www.mercurial-scm.org/repo/hg/
1940
1940
1941 - create a lightweight local clone::
1941 - create a lightweight local clone::
1942
1942
1943 hg clone project/ project-feature/
1943 hg clone project/ project-feature/
1944
1944
1945 - clone from an absolute path on an ssh server (note double-slash)::
1945 - clone from an absolute path on an ssh server (note double-slash)::
1946
1946
1947 hg clone ssh://user@server//home/projects/alpha/
1947 hg clone ssh://user@server//home/projects/alpha/
1948
1948
1949 - do a streaming clone while checking out a specified version::
1949 - do a streaming clone while checking out a specified version::
1950
1950
1951 hg clone --stream http://server/repo -u 1.5
1951 hg clone --stream http://server/repo -u 1.5
1952
1952
1953 - create a repository without changesets after a particular revision::
1953 - create a repository without changesets after a particular revision::
1954
1954
1955 hg clone -r 04e544 experimental/ good/
1955 hg clone -r 04e544 experimental/ good/
1956
1956
1957 - clone (and track) a particular named branch::
1957 - clone (and track) a particular named branch::
1958
1958
1959 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1959 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1960
1960
1961 See :hg:`help urls` for details on specifying URLs.
1961 See :hg:`help urls` for details on specifying URLs.
1962
1962
1963 Returns 0 on success.
1963 Returns 0 on success.
1964 """
1964 """
1965 opts = pycompat.byteskwargs(opts)
1965 opts = pycompat.byteskwargs(opts)
1966 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1966 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1967
1967
1968 # --include/--exclude can come from narrow or sparse.
1968 # --include/--exclude can come from narrow or sparse.
1969 includepats, excludepats = None, None
1969 includepats, excludepats = None, None
1970
1970
1971 # hg.clone() differentiates between None and an empty set. So make sure
1971 # hg.clone() differentiates between None and an empty set. So make sure
1972 # patterns are sets if narrow is requested without patterns.
1972 # patterns are sets if narrow is requested without patterns.
1973 if opts.get(b'narrow'):
1973 if opts.get(b'narrow'):
1974 includepats = set()
1974 includepats = set()
1975 excludepats = set()
1975 excludepats = set()
1976
1976
1977 if opts.get(b'include'):
1977 if opts.get(b'include'):
1978 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1978 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1979 if opts.get(b'exclude'):
1979 if opts.get(b'exclude'):
1980 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1980 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1981
1981
1982 r = hg.clone(
1982 r = hg.clone(
1983 ui,
1983 ui,
1984 opts,
1984 opts,
1985 source,
1985 source,
1986 dest,
1986 dest,
1987 pull=opts.get(b'pull'),
1987 pull=opts.get(b'pull'),
1988 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1988 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1989 revs=opts.get(b'rev'),
1989 revs=opts.get(b'rev'),
1990 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1990 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1991 branch=opts.get(b'branch'),
1991 branch=opts.get(b'branch'),
1992 shareopts=opts.get(b'shareopts'),
1992 shareopts=opts.get(b'shareopts'),
1993 storeincludepats=includepats,
1993 storeincludepats=includepats,
1994 storeexcludepats=excludepats,
1994 storeexcludepats=excludepats,
1995 depth=opts.get(b'depth') or None,
1995 depth=opts.get(b'depth') or None,
1996 )
1996 )
1997
1997
1998 return r is None
1998 return r is None
1999
1999
2000
2000
2001 @command(
2001 @command(
2002 b'commit|ci',
2002 b'commit|ci',
2003 [
2003 [
2004 (
2004 (
2005 b'A',
2005 b'A',
2006 b'addremove',
2006 b'addremove',
2007 None,
2007 None,
2008 _(b'mark new/missing files as added/removed before committing'),
2008 _(b'mark new/missing files as added/removed before committing'),
2009 ),
2009 ),
2010 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
2010 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
2011 (b'', b'amend', None, _(b'amend the parent of the working directory')),
2011 (b'', b'amend', None, _(b'amend the parent of the working directory')),
2012 (b's', b'secret', None, _(b'use the secret phase for committing')),
2012 (b's', b'secret', None, _(b'use the secret phase for committing')),
2013 (b'', b'draft', None, _(b'use the draft phase for committing')),
2013 (b'', b'draft', None, _(b'use the draft phase for committing')),
2014 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
2014 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
2015 (
2015 (
2016 b'',
2016 b'',
2017 b'force-close-branch',
2017 b'force-close-branch',
2018 None,
2018 None,
2019 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
2019 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
2020 ),
2020 ),
2021 (b'i', b'interactive', None, _(b'use interactive mode')),
2021 (b'i', b'interactive', None, _(b'use interactive mode')),
2022 ]
2022 ]
2023 + walkopts
2023 + walkopts
2024 + commitopts
2024 + commitopts
2025 + commitopts2
2025 + commitopts2
2026 + subrepoopts,
2026 + subrepoopts,
2027 _(b'[OPTION]... [FILE]...'),
2027 _(b'[OPTION]... [FILE]...'),
2028 helpcategory=command.CATEGORY_COMMITTING,
2028 helpcategory=command.CATEGORY_COMMITTING,
2029 helpbasic=True,
2029 helpbasic=True,
2030 inferrepo=True,
2030 inferrepo=True,
2031 )
2031 )
2032 def commit(ui, repo, *pats, **opts):
2032 def commit(ui, repo, *pats, **opts):
2033 """commit the specified files or all outstanding changes
2033 """commit the specified files or all outstanding changes
2034
2034
2035 Commit changes to the given files into the repository. Unlike a
2035 Commit changes to the given files into the repository. Unlike a
2036 centralized SCM, this operation is a local operation. See
2036 centralized SCM, this operation is a local operation. See
2037 :hg:`push` for a way to actively distribute your changes.
2037 :hg:`push` for a way to actively distribute your changes.
2038
2038
2039 If a list of files is omitted, all changes reported by :hg:`status`
2039 If a list of files is omitted, all changes reported by :hg:`status`
2040 will be committed.
2040 will be committed.
2041
2041
2042 If you are committing the result of a merge, do not provide any
2042 If you are committing the result of a merge, do not provide any
2043 filenames or -I/-X filters.
2043 filenames or -I/-X filters.
2044
2044
2045 If no commit message is specified, Mercurial starts your
2045 If no commit message is specified, Mercurial starts your
2046 configured editor where you can enter a message. In case your
2046 configured editor where you can enter a message. In case your
2047 commit fails, you will find a backup of your message in
2047 commit fails, you will find a backup of your message in
2048 ``.hg/last-message.txt``.
2048 ``.hg/last-message.txt``.
2049
2049
2050 The --close-branch flag can be used to mark the current branch
2050 The --close-branch flag can be used to mark the current branch
2051 head closed. When all heads of a branch are closed, the branch
2051 head closed. When all heads of a branch are closed, the branch
2052 will be considered closed and no longer listed.
2052 will be considered closed and no longer listed.
2053
2053
2054 The --amend flag can be used to amend the parent of the
2054 The --amend flag can be used to amend the parent of the
2055 working directory with a new commit that contains the changes
2055 working directory with a new commit that contains the changes
2056 in the parent in addition to those currently reported by :hg:`status`,
2056 in the parent in addition to those currently reported by :hg:`status`,
2057 if there are any. The old commit is stored in a backup bundle in
2057 if there are any. The old commit is stored in a backup bundle in
2058 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2058 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2059 on how to restore it).
2059 on how to restore it).
2060
2060
2061 Message, user and date are taken from the amended commit unless
2061 Message, user and date are taken from the amended commit unless
2062 specified. When a message isn't specified on the command line,
2062 specified. When a message isn't specified on the command line,
2063 the editor will open with the message of the amended commit.
2063 the editor will open with the message of the amended commit.
2064
2064
2065 It is not possible to amend public changesets (see :hg:`help phases`)
2065 It is not possible to amend public changesets (see :hg:`help phases`)
2066 or changesets that have children.
2066 or changesets that have children.
2067
2067
2068 See :hg:`help dates` for a list of formats valid for -d/--date.
2068 See :hg:`help dates` for a list of formats valid for -d/--date.
2069
2069
2070 Returns 0 on success, 1 if nothing changed.
2070 Returns 0 on success, 1 if nothing changed.
2071
2071
2072 .. container:: verbose
2072 .. container:: verbose
2073
2073
2074 Examples:
2074 Examples:
2075
2075
2076 - commit all files ending in .py::
2076 - commit all files ending in .py::
2077
2077
2078 hg commit --include "set:**.py"
2078 hg commit --include "set:**.py"
2079
2079
2080 - commit all non-binary files::
2080 - commit all non-binary files::
2081
2081
2082 hg commit --exclude "set:binary()"
2082 hg commit --exclude "set:binary()"
2083
2083
2084 - amend the current commit and set the date to now::
2084 - amend the current commit and set the date to now::
2085
2085
2086 hg commit --amend --date now
2086 hg commit --amend --date now
2087 """
2087 """
2088 cmdutil.check_at_most_one_arg(opts, 'draft', 'secret')
2088 cmdutil.check_at_most_one_arg(opts, 'draft', 'secret')
2089 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2089 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2090 with repo.wlock(), repo.lock():
2090 with repo.wlock(), repo.lock():
2091 return _docommit(ui, repo, *pats, **opts)
2091 return _docommit(ui, repo, *pats, **opts)
2092
2092
2093
2093
2094 def _docommit(ui, repo, *pats, **opts):
2094 def _docommit(ui, repo, *pats, **opts):
2095 if opts.get('interactive'):
2095 if opts.get('interactive'):
2096 opts.pop('interactive')
2096 opts.pop('interactive')
2097 ret = cmdutil.dorecord(
2097 ret = cmdutil.dorecord(
2098 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2098 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2099 )
2099 )
2100 # ret can be 0 (no changes to record) or the value returned by
2100 # ret can be 0 (no changes to record) or the value returned by
2101 # commit(), 1 if nothing changed or None on success.
2101 # commit(), 1 if nothing changed or None on success.
2102 return 1 if ret == 0 else ret
2102 return 1 if ret == 0 else ret
2103
2103
2104 if opts.get('subrepos'):
2104 if opts.get('subrepos'):
2105 # Let --subrepos on the command line override config setting.
2105 # Let --subrepos on the command line override config setting.
2106 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2106 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2107
2107
2108 cmdutil.checkunfinished(repo, commit=True)
2108 cmdutil.checkunfinished(repo, commit=True)
2109
2109
2110 branch = repo[None].branch()
2110 branch = repo[None].branch()
2111 bheads = repo.branchheads(branch)
2111 bheads = repo.branchheads(branch)
2112 tip = repo.changelog.tip()
2112 tip = repo.changelog.tip()
2113
2113
2114 extra = {}
2114 extra = {}
2115 if opts.get('close_branch') or opts.get('force_close_branch'):
2115 if opts.get('close_branch') or opts.get('force_close_branch'):
2116 extra[b'close'] = b'1'
2116 extra[b'close'] = b'1'
2117
2117
2118 if repo[b'.'].closesbranch():
2118 if repo[b'.'].closesbranch():
2119 # Not ideal, but let us do an extra status early to prevent early
2119 # Not ideal, but let us do an extra status early to prevent early
2120 # bail out.
2120 # bail out.
2121 matcher = scmutil.match(
2121 matcher = scmutil.match(
2122 repo[None], pats, pycompat.byteskwargs(opts)
2122 repo[None], pats, pycompat.byteskwargs(opts)
2123 )
2123 )
2124 s = repo.status(match=matcher)
2124 s = repo.status(match=matcher)
2125 if s.modified or s.added or s.removed:
2125 if s.modified or s.added or s.removed:
2126 bheads = repo.branchheads(branch, closed=True)
2126 bheads = repo.branchheads(branch, closed=True)
2127 else:
2127 else:
2128 msg = _(b'current revision is already a branch closing head')
2128 msg = _(b'current revision is already a branch closing head')
2129 raise error.InputError(msg)
2129 raise error.InputError(msg)
2130
2130
2131 if not bheads:
2131 if not bheads:
2132 raise error.InputError(
2132 raise error.InputError(
2133 _(b'branch "%s" has no heads to close') % branch
2133 _(b'branch "%s" has no heads to close') % branch
2134 )
2134 )
2135 elif (
2135 elif (
2136 branch == repo[b'.'].branch()
2136 branch == repo[b'.'].branch()
2137 and repo[b'.'].node() not in bheads
2137 and repo[b'.'].node() not in bheads
2138 and not opts.get('force_close_branch')
2138 and not opts.get('force_close_branch')
2139 ):
2139 ):
2140 hint = _(
2140 hint = _(
2141 b'use --force-close-branch to close branch from a non-head'
2141 b'use --force-close-branch to close branch from a non-head'
2142 b' changeset'
2142 b' changeset'
2143 )
2143 )
2144 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2144 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2145 elif opts.get('amend'):
2145 elif opts.get('amend'):
2146 if (
2146 if (
2147 repo[b'.'].p1().branch() != branch
2147 repo[b'.'].p1().branch() != branch
2148 and repo[b'.'].p2().branch() != branch
2148 and repo[b'.'].p2().branch() != branch
2149 ):
2149 ):
2150 raise error.InputError(_(b'can only close branch heads'))
2150 raise error.InputError(_(b'can only close branch heads'))
2151
2151
2152 if opts.get('amend'):
2152 if opts.get('amend'):
2153 if ui.configbool(b'ui', b'commitsubrepos'):
2153 if ui.configbool(b'ui', b'commitsubrepos'):
2154 raise error.InputError(
2154 raise error.InputError(
2155 _(b'cannot amend with ui.commitsubrepos enabled')
2155 _(b'cannot amend with ui.commitsubrepos enabled')
2156 )
2156 )
2157
2157
2158 old = repo[b'.']
2158 old = repo[b'.']
2159 rewriteutil.precheck(repo, [old.rev()], b'amend')
2159 rewriteutil.precheck(repo, [old.rev()], b'amend')
2160
2160
2161 # Currently histedit gets confused if an amend happens while histedit
2161 # Currently histedit gets confused if an amend happens while histedit
2162 # is in progress. Since we have a checkunfinished command, we are
2162 # is in progress. Since we have a checkunfinished command, we are
2163 # temporarily honoring it.
2163 # temporarily honoring it.
2164 #
2164 #
2165 # Note: eventually this guard will be removed. Please do not expect
2165 # Note: eventually this guard will be removed. Please do not expect
2166 # this behavior to remain.
2166 # this behavior to remain.
2167 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2167 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2168 cmdutil.checkunfinished(repo)
2168 cmdutil.checkunfinished(repo)
2169
2169
2170 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2170 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2171 opts = pycompat.byteskwargs(opts)
2171 opts = pycompat.byteskwargs(opts)
2172 if node == old.node():
2172 if node == old.node():
2173 ui.status(_(b"nothing changed\n"))
2173 ui.status(_(b"nothing changed\n"))
2174 return 1
2174 return 1
2175 else:
2175 else:
2176
2176
2177 def commitfunc(ui, repo, message, match, opts):
2177 def commitfunc(ui, repo, message, match, opts):
2178 overrides = {}
2178 overrides = {}
2179 if opts.get(b'secret'):
2179 if opts.get(b'secret'):
2180 overrides[(b'phases', b'new-commit')] = b'secret'
2180 overrides[(b'phases', b'new-commit')] = b'secret'
2181 elif opts.get(b'draft'):
2181 elif opts.get(b'draft'):
2182 overrides[(b'phases', b'new-commit')] = b'draft'
2182 overrides[(b'phases', b'new-commit')] = b'draft'
2183
2183
2184 baseui = repo.baseui
2184 baseui = repo.baseui
2185 with baseui.configoverride(overrides, b'commit'):
2185 with baseui.configoverride(overrides, b'commit'):
2186 with ui.configoverride(overrides, b'commit'):
2186 with ui.configoverride(overrides, b'commit'):
2187 editform = cmdutil.mergeeditform(
2187 editform = cmdutil.mergeeditform(
2188 repo[None], b'commit.normal'
2188 repo[None], b'commit.normal'
2189 )
2189 )
2190 editor = cmdutil.getcommiteditor(
2190 editor = cmdutil.getcommiteditor(
2191 editform=editform, **pycompat.strkwargs(opts)
2191 editform=editform, **pycompat.strkwargs(opts)
2192 )
2192 )
2193 return repo.commit(
2193 return repo.commit(
2194 message,
2194 message,
2195 opts.get(b'user'),
2195 opts.get(b'user'),
2196 opts.get(b'date'),
2196 opts.get(b'date'),
2197 match,
2197 match,
2198 editor=editor,
2198 editor=editor,
2199 extra=extra,
2199 extra=extra,
2200 )
2200 )
2201
2201
2202 opts = pycompat.byteskwargs(opts)
2202 opts = pycompat.byteskwargs(opts)
2203 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2203 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2204
2204
2205 if not node:
2205 if not node:
2206 stat = cmdutil.postcommitstatus(repo, pats, opts)
2206 stat = cmdutil.postcommitstatus(repo, pats, opts)
2207 if stat.deleted:
2207 if stat.deleted:
2208 ui.status(
2208 ui.status(
2209 _(
2209 _(
2210 b"nothing changed (%d missing files, see "
2210 b"nothing changed (%d missing files, see "
2211 b"'hg status')\n"
2211 b"'hg status')\n"
2212 )
2212 )
2213 % len(stat.deleted)
2213 % len(stat.deleted)
2214 )
2214 )
2215 else:
2215 else:
2216 ui.status(_(b"nothing changed\n"))
2216 ui.status(_(b"nothing changed\n"))
2217 return 1
2217 return 1
2218
2218
2219 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2219 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2220
2220
2221 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2221 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2222 status(
2222 status(
2223 ui,
2223 ui,
2224 repo,
2224 repo,
2225 modified=True,
2225 modified=True,
2226 added=True,
2226 added=True,
2227 removed=True,
2227 removed=True,
2228 deleted=True,
2228 deleted=True,
2229 unknown=True,
2229 unknown=True,
2230 subrepos=opts.get(b'subrepos'),
2230 subrepos=opts.get(b'subrepos'),
2231 )
2231 )
2232
2232
2233
2233
2234 @command(
2234 @command(
2235 b'config|showconfig|debugconfig',
2235 b'config|showconfig|debugconfig',
2236 [
2236 [
2237 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2237 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2238 # This is experimental because we need
2238 # This is experimental because we need
2239 # * reasonable behavior around aliases,
2239 # * reasonable behavior around aliases,
2240 # * decide if we display [debug] [experimental] and [devel] section par
2240 # * decide if we display [debug] [experimental] and [devel] section par
2241 # default
2241 # default
2242 # * some way to display "generic" config entry (the one matching
2242 # * some way to display "generic" config entry (the one matching
2243 # regexp,
2243 # regexp,
2244 # * proper display of the different value type
2244 # * proper display of the different value type
2245 # * a better way to handle <DYNAMIC> values (and variable types),
2245 # * a better way to handle <DYNAMIC> values (and variable types),
2246 # * maybe some type information ?
2246 # * maybe some type information ?
2247 (
2247 (
2248 b'',
2248 b'',
2249 b'exp-all-known',
2249 b'exp-all-known',
2250 None,
2250 None,
2251 _(b'show all known config option (EXPERIMENTAL)'),
2251 _(b'show all known config option (EXPERIMENTAL)'),
2252 ),
2252 ),
2253 (b'e', b'edit', None, _(b'edit user config')),
2253 (b'e', b'edit', None, _(b'edit user config')),
2254 (b'l', b'local', None, _(b'edit repository config')),
2254 (b'l', b'local', None, _(b'edit repository config')),
2255 (b'', b'source', None, _(b'show source of configuration value')),
2255 (b'', b'source', None, _(b'show source of configuration value')),
2256 (
2256 (
2257 b'',
2257 b'',
2258 b'shared',
2258 b'shared',
2259 None,
2259 None,
2260 _(b'edit shared source repository config (EXPERIMENTAL)'),
2260 _(b'edit shared source repository config (EXPERIMENTAL)'),
2261 ),
2261 ),
2262 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2262 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2263 (b'g', b'global', None, _(b'edit global config')),
2263 (b'g', b'global', None, _(b'edit global config')),
2264 ]
2264 ]
2265 + formatteropts,
2265 + formatteropts,
2266 _(b'[-u] [NAME]...'),
2266 _(b'[-u] [NAME]...'),
2267 helpcategory=command.CATEGORY_HELP,
2267 helpcategory=command.CATEGORY_HELP,
2268 optionalrepo=True,
2268 optionalrepo=True,
2269 intents={INTENT_READONLY},
2269 intents={INTENT_READONLY},
2270 )
2270 )
2271 def config(ui, repo, *values, **opts):
2271 def config(ui, repo, *values, **opts):
2272 """show combined config settings from all hgrc files
2272 """show combined config settings from all hgrc files
2273
2273
2274 With no arguments, print names and values of all config items.
2274 With no arguments, print names and values of all config items.
2275
2275
2276 With one argument of the form section.name, print just the value
2276 With one argument of the form section.name, print just the value
2277 of that config item.
2277 of that config item.
2278
2278
2279 With multiple arguments, print names and values of all config
2279 With multiple arguments, print names and values of all config
2280 items with matching section names or section.names.
2280 items with matching section names or section.names.
2281
2281
2282 With --edit, start an editor on the user-level config file. With
2282 With --edit, start an editor on the user-level config file. With
2283 --global, edit the system-wide config file. With --local, edit the
2283 --global, edit the system-wide config file. With --local, edit the
2284 repository-level config file.
2284 repository-level config file.
2285
2285
2286 With --source, the source (filename and line number) is printed
2286 With --source, the source (filename and line number) is printed
2287 for each config item.
2287 for each config item.
2288
2288
2289 See :hg:`help config` for more information about config files.
2289 See :hg:`help config` for more information about config files.
2290
2290
2291 .. container:: verbose
2291 .. container:: verbose
2292
2292
2293 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2293 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2294 This file is not shared across shares when in share-safe mode.
2294 This file is not shared across shares when in share-safe mode.
2295
2295
2296 Template:
2296 Template:
2297
2297
2298 The following keywords are supported. See also :hg:`help templates`.
2298 The following keywords are supported. See also :hg:`help templates`.
2299
2299
2300 :name: String. Config name.
2300 :name: String. Config name.
2301 :source: String. Filename and line number where the item is defined.
2301 :source: String. Filename and line number where the item is defined.
2302 :value: String. Config value.
2302 :value: String. Config value.
2303
2303
2304 The --shared flag can be used to edit the config file of shared source
2304 The --shared flag can be used to edit the config file of shared source
2305 repository. It only works when you have shared using the experimental
2305 repository. It only works when you have shared using the experimental
2306 share safe feature.
2306 share safe feature.
2307
2307
2308 Returns 0 on success, 1 if NAME does not exist.
2308 Returns 0 on success, 1 if NAME does not exist.
2309
2309
2310 """
2310 """
2311
2311
2312 opts = pycompat.byteskwargs(opts)
2312 opts = pycompat.byteskwargs(opts)
2313 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2313 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2314 if any(opts.get(o) for o in editopts):
2314 if any(opts.get(o) for o in editopts):
2315 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2315 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2316 if opts.get(b'local'):
2316 if opts.get(b'local'):
2317 if not repo:
2317 if not repo:
2318 raise error.InputError(
2318 raise error.InputError(
2319 _(b"can't use --local outside a repository")
2319 _(b"can't use --local outside a repository")
2320 )
2320 )
2321 paths = [repo.vfs.join(b'hgrc')]
2321 paths = [repo.vfs.join(b'hgrc')]
2322 elif opts.get(b'global'):
2322 elif opts.get(b'global'):
2323 paths = rcutil.systemrcpath()
2323 paths = rcutil.systemrcpath()
2324 elif opts.get(b'shared'):
2324 elif opts.get(b'shared'):
2325 if not repo.shared():
2325 if not repo.shared():
2326 raise error.InputError(
2326 raise error.InputError(
2327 _(b"repository is not shared; can't use --shared")
2327 _(b"repository is not shared; can't use --shared")
2328 )
2328 )
2329 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2329 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2330 raise error.InputError(
2330 raise error.InputError(
2331 _(
2331 _(
2332 b"share safe feature not enabled; "
2332 b"share safe feature not enabled; "
2333 b"unable to edit shared source repository config"
2333 b"unable to edit shared source repository config"
2334 )
2334 )
2335 )
2335 )
2336 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2336 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2337 elif opts.get(b'non_shared'):
2337 elif opts.get(b'non_shared'):
2338 paths = [repo.vfs.join(b'hgrc-not-shared')]
2338 paths = [repo.vfs.join(b'hgrc-not-shared')]
2339 else:
2339 else:
2340 paths = rcutil.userrcpath()
2340 paths = rcutil.userrcpath()
2341
2341
2342 for f in paths:
2342 for f in paths:
2343 if os.path.exists(f):
2343 if os.path.exists(f):
2344 break
2344 break
2345 else:
2345 else:
2346 if opts.get(b'global'):
2346 if opts.get(b'global'):
2347 samplehgrc = uimod.samplehgrcs[b'global']
2347 samplehgrc = uimod.samplehgrcs[b'global']
2348 elif opts.get(b'local'):
2348 elif opts.get(b'local'):
2349 samplehgrc = uimod.samplehgrcs[b'local']
2349 samplehgrc = uimod.samplehgrcs[b'local']
2350 else:
2350 else:
2351 samplehgrc = uimod.samplehgrcs[b'user']
2351 samplehgrc = uimod.samplehgrcs[b'user']
2352
2352
2353 f = paths[0]
2353 f = paths[0]
2354 fp = open(f, b"wb")
2354 fp = open(f, b"wb")
2355 fp.write(util.tonativeeol(samplehgrc))
2355 fp.write(util.tonativeeol(samplehgrc))
2356 fp.close()
2356 fp.close()
2357
2357
2358 editor = ui.geteditor()
2358 editor = ui.geteditor()
2359 ui.system(
2359 ui.system(
2360 b"%s \"%s\"" % (editor, f),
2360 b"%s \"%s\"" % (editor, f),
2361 onerr=error.InputError,
2361 onerr=error.InputError,
2362 errprefix=_(b"edit failed"),
2362 errprefix=_(b"edit failed"),
2363 blockedtag=b'config_edit',
2363 blockedtag=b'config_edit',
2364 )
2364 )
2365 return
2365 return
2366 ui.pager(b'config')
2366 ui.pager(b'config')
2367 fm = ui.formatter(b'config', opts)
2367 fm = ui.formatter(b'config', opts)
2368 for t, f in rcutil.rccomponents():
2368 for t, f in rcutil.rccomponents():
2369 if t == b'path':
2369 if t == b'path':
2370 ui.debug(b'read config from: %s\n' % f)
2370 ui.debug(b'read config from: %s\n' % f)
2371 elif t == b'resource':
2371 elif t == b'resource':
2372 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2372 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2373 elif t == b'items':
2373 elif t == b'items':
2374 # Don't print anything for 'items'.
2374 # Don't print anything for 'items'.
2375 pass
2375 pass
2376 else:
2376 else:
2377 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2377 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2378 untrusted = bool(opts.get(b'untrusted'))
2378 untrusted = bool(opts.get(b'untrusted'))
2379
2379
2380 selsections = selentries = []
2380 selsections = selentries = []
2381 if values:
2381 if values:
2382 selsections = [v for v in values if b'.' not in v]
2382 selsections = [v for v in values if b'.' not in v]
2383 selentries = [v for v in values if b'.' in v]
2383 selentries = [v for v in values if b'.' in v]
2384 uniquesel = len(selentries) == 1 and not selsections
2384 uniquesel = len(selentries) == 1 and not selsections
2385 selsections = set(selsections)
2385 selsections = set(selsections)
2386 selentries = set(selentries)
2386 selentries = set(selentries)
2387
2387
2388 matched = False
2388 matched = False
2389 all_known = opts[b'exp_all_known']
2389 all_known = opts[b'exp_all_known']
2390 show_source = ui.debugflag or opts.get(b'source')
2390 show_source = ui.debugflag or opts.get(b'source')
2391 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2391 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2392 for section, name, value in entries:
2392 for section, name, value in entries:
2393 source = ui.configsource(section, name, untrusted)
2393 source = ui.configsource(section, name, untrusted)
2394 value = pycompat.bytestr(value)
2394 value = pycompat.bytestr(value)
2395 defaultvalue = ui.configdefault(section, name)
2395 defaultvalue = ui.configdefault(section, name)
2396 if fm.isplain():
2396 if fm.isplain():
2397 source = source or b'none'
2397 source = source or b'none'
2398 value = value.replace(b'\n', b'\\n')
2398 value = value.replace(b'\n', b'\\n')
2399 entryname = section + b'.' + name
2399 entryname = section + b'.' + name
2400 if values and not (section in selsections or entryname in selentries):
2400 if values and not (section in selsections or entryname in selentries):
2401 continue
2401 continue
2402 fm.startitem()
2402 fm.startitem()
2403 fm.condwrite(show_source, b'source', b'%s: ', source)
2403 fm.condwrite(show_source, b'source', b'%s: ', source)
2404 if uniquesel:
2404 if uniquesel:
2405 fm.data(name=entryname)
2405 fm.data(name=entryname)
2406 fm.write(b'value', b'%s\n', value)
2406 fm.write(b'value', b'%s\n', value)
2407 else:
2407 else:
2408 fm.write(b'name value', b'%s=%s\n', entryname, value)
2408 fm.write(b'name value', b'%s=%s\n', entryname, value)
2409 if formatter.isprintable(defaultvalue):
2409 if formatter.isprintable(defaultvalue):
2410 fm.data(defaultvalue=defaultvalue)
2410 fm.data(defaultvalue=defaultvalue)
2411 elif isinstance(defaultvalue, list) and all(
2411 elif isinstance(defaultvalue, list) and all(
2412 formatter.isprintable(e) for e in defaultvalue
2412 formatter.isprintable(e) for e in defaultvalue
2413 ):
2413 ):
2414 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2414 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2415 # TODO: no idea how to process unsupported defaultvalue types
2415 # TODO: no idea how to process unsupported defaultvalue types
2416 matched = True
2416 matched = True
2417 fm.end()
2417 fm.end()
2418 if matched:
2418 if matched:
2419 return 0
2419 return 0
2420 return 1
2420 return 1
2421
2421
2422
2422
2423 @command(
2423 @command(
2424 b'continue',
2424 b'continue',
2425 dryrunopts,
2425 dryrunopts,
2426 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2426 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2427 helpbasic=True,
2427 helpbasic=True,
2428 )
2428 )
2429 def continuecmd(ui, repo, **opts):
2429 def continuecmd(ui, repo, **opts):
2430 """resumes an interrupted operation (EXPERIMENTAL)
2430 """resumes an interrupted operation (EXPERIMENTAL)
2431
2431
2432 Finishes a multistep operation like graft, histedit, rebase, merge,
2432 Finishes a multistep operation like graft, histedit, rebase, merge,
2433 and unshelve if they are in an interrupted state.
2433 and unshelve if they are in an interrupted state.
2434
2434
2435 use --dry-run/-n to dry run the command.
2435 use --dry-run/-n to dry run the command.
2436 """
2436 """
2437 dryrun = opts.get('dry_run')
2437 dryrun = opts.get('dry_run')
2438 contstate = cmdutil.getunfinishedstate(repo)
2438 contstate = cmdutil.getunfinishedstate(repo)
2439 if not contstate:
2439 if not contstate:
2440 raise error.StateError(_(b'no operation in progress'))
2440 raise error.StateError(_(b'no operation in progress'))
2441 if not contstate.continuefunc:
2441 if not contstate.continuefunc:
2442 raise error.StateError(
2442 raise error.StateError(
2443 (
2443 (
2444 _(b"%s in progress but does not support 'hg continue'")
2444 _(b"%s in progress but does not support 'hg continue'")
2445 % (contstate._opname)
2445 % (contstate._opname)
2446 ),
2446 ),
2447 hint=contstate.continuemsg(),
2447 hint=contstate.continuemsg(),
2448 )
2448 )
2449 if dryrun:
2449 if dryrun:
2450 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2450 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2451 return
2451 return
2452 return contstate.continuefunc(ui, repo)
2452 return contstate.continuefunc(ui, repo)
2453
2453
2454
2454
2455 @command(
2455 @command(
2456 b'copy|cp',
2456 b'copy|cp',
2457 [
2457 [
2458 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2458 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2459 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2459 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2460 (
2460 (
2461 b'',
2461 b'',
2462 b'at-rev',
2462 b'at-rev',
2463 b'',
2463 b'',
2464 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2464 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2465 _(b'REV'),
2465 _(b'REV'),
2466 ),
2466 ),
2467 (
2467 (
2468 b'f',
2468 b'f',
2469 b'force',
2469 b'force',
2470 None,
2470 None,
2471 _(b'forcibly copy over an existing managed file'),
2471 _(b'forcibly copy over an existing managed file'),
2472 ),
2472 ),
2473 ]
2473 ]
2474 + walkopts
2474 + walkopts
2475 + dryrunopts,
2475 + dryrunopts,
2476 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2476 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2477 helpcategory=command.CATEGORY_FILE_CONTENTS,
2477 helpcategory=command.CATEGORY_FILE_CONTENTS,
2478 )
2478 )
2479 def copy(ui, repo, *pats, **opts):
2479 def copy(ui, repo, *pats, **opts):
2480 """mark files as copied for the next commit
2480 """mark files as copied for the next commit
2481
2481
2482 Mark dest as having copies of source files. If dest is a
2482 Mark dest as having copies of source files. If dest is a
2483 directory, copies are put in that directory. If dest is a file,
2483 directory, copies are put in that directory. If dest is a file,
2484 the source must be a single file.
2484 the source must be a single file.
2485
2485
2486 By default, this command copies the contents of files as they
2486 By default, this command copies the contents of files as they
2487 exist in the working directory. If invoked with -A/--after, the
2487 exist in the working directory. If invoked with -A/--after, the
2488 operation is recorded, but no copying is performed.
2488 operation is recorded, but no copying is performed.
2489
2489
2490 To undo marking a destination file as copied, use --forget. With that
2490 To undo marking a destination file as copied, use --forget. With that
2491 option, all given (positional) arguments are unmarked as copies. The
2491 option, all given (positional) arguments are unmarked as copies. The
2492 destination file(s) will be left in place (still tracked). Note that
2492 destination file(s) will be left in place (still tracked). Note that
2493 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2493 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2494
2494
2495 This command takes effect with the next commit by default.
2495 This command takes effect with the next commit by default.
2496
2496
2497 Returns 0 on success, 1 if errors are encountered.
2497 Returns 0 on success, 1 if errors are encountered.
2498 """
2498 """
2499 opts = pycompat.byteskwargs(opts)
2499 opts = pycompat.byteskwargs(opts)
2500
2500
2501 context = repo.dirstate.changing_files
2501 context = repo.dirstate.changing_files
2502 rev = opts.get(b'at_rev')
2502 rev = opts.get(b'at_rev')
2503 ctx = None
2503 ctx = None
2504 if rev:
2504 if rev:
2505 ctx = logcmdutil.revsingle(repo, rev)
2505 ctx = logcmdutil.revsingle(repo, rev)
2506 if ctx.rev() is not None:
2506 if ctx.rev() is not None:
2507
2507
2508 def context(repo):
2508 def context(repo):
2509 return util.nullcontextmanager()
2509 return util.nullcontextmanager()
2510
2510
2511 opts[b'at_rev'] = ctx.rev()
2511 opts[b'at_rev'] = ctx.rev()
2512 with repo.wlock(), context(repo):
2512 with repo.wlock(), context(repo):
2513 return cmdutil.copy(ui, repo, pats, opts)
2513 return cmdutil.copy(ui, repo, pats, opts)
2514
2514
2515
2515
2516 @command(
2516 @command(
2517 b'debugcommands',
2517 b'debugcommands',
2518 [],
2518 [],
2519 _(b'[COMMAND]'),
2519 _(b'[COMMAND]'),
2520 helpcategory=command.CATEGORY_HELP,
2520 helpcategory=command.CATEGORY_HELP,
2521 norepo=True,
2521 norepo=True,
2522 )
2522 )
2523 def debugcommands(ui, cmd=b'', *args):
2523 def debugcommands(ui, cmd=b'', *args):
2524 """list all available commands and options"""
2524 """list all available commands and options"""
2525 for cmd, vals in sorted(table.items()):
2525 for cmd, vals in sorted(table.items()):
2526 cmd = cmd.split(b'|')[0]
2526 cmd = cmd.split(b'|')[0]
2527 opts = b', '.join([i[1] for i in vals[1]])
2527 opts = b', '.join([i[1] for i in vals[1]])
2528 ui.write(b'%s: %s\n' % (cmd, opts))
2528 ui.write(b'%s: %s\n' % (cmd, opts))
2529
2529
2530
2530
2531 @command(
2531 @command(
2532 b'debugcomplete',
2532 b'debugcomplete',
2533 [(b'o', b'options', None, _(b'show the command options'))],
2533 [(b'o', b'options', None, _(b'show the command options'))],
2534 _(b'[-o] CMD'),
2534 _(b'[-o] CMD'),
2535 helpcategory=command.CATEGORY_HELP,
2535 helpcategory=command.CATEGORY_HELP,
2536 norepo=True,
2536 norepo=True,
2537 )
2537 )
2538 def debugcomplete(ui, cmd=b'', **opts):
2538 def debugcomplete(ui, cmd=b'', **opts):
2539 """returns the completion list associated with the given command"""
2539 """returns the completion list associated with the given command"""
2540
2540
2541 if opts.get('options'):
2541 if opts.get('options'):
2542 options = []
2542 options = []
2543 otables = [globalopts]
2543 otables = [globalopts]
2544 if cmd:
2544 if cmd:
2545 aliases, entry = cmdutil.findcmd(cmd, table, False)
2545 aliases, entry = cmdutil.findcmd(cmd, table, False)
2546 otables.append(entry[1])
2546 otables.append(entry[1])
2547 for t in otables:
2547 for t in otables:
2548 for o in t:
2548 for o in t:
2549 if b"(DEPRECATED)" in o[3]:
2549 if b"(DEPRECATED)" in o[3]:
2550 continue
2550 continue
2551 if o[0]:
2551 if o[0]:
2552 options.append(b'-%s' % o[0])
2552 options.append(b'-%s' % o[0])
2553 options.append(b'--%s' % o[1])
2553 options.append(b'--%s' % o[1])
2554 ui.write(b"%s\n" % b"\n".join(options))
2554 ui.write(b"%s\n" % b"\n".join(options))
2555 return
2555 return
2556
2556
2557 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2557 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2558 if ui.verbose:
2558 if ui.verbose:
2559 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2559 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2560 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2560 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2561
2561
2562
2562
2563 @command(
2563 @command(
2564 b'diff',
2564 b'diff',
2565 [
2565 [
2566 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2566 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2567 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2567 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2568 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2568 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2569 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2569 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2570 ]
2570 ]
2571 + diffopts
2571 + diffopts
2572 + diffopts2
2572 + diffopts2
2573 + walkopts
2573 + walkopts
2574 + subrepoopts,
2574 + subrepoopts,
2575 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2575 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2576 helpcategory=command.CATEGORY_FILE_CONTENTS,
2576 helpcategory=command.CATEGORY_FILE_CONTENTS,
2577 helpbasic=True,
2577 helpbasic=True,
2578 inferrepo=True,
2578 inferrepo=True,
2579 intents={INTENT_READONLY},
2579 intents={INTENT_READONLY},
2580 )
2580 )
2581 def diff(ui, repo, *pats, **opts):
2581 def diff(ui, repo, *pats, **opts):
2582 """diff repository (or selected files)
2582 """diff repository (or selected files)
2583
2583
2584 Show differences between revisions for the specified files.
2584 Show differences between revisions for the specified files.
2585
2585
2586 Differences between files are shown using the unified diff format.
2586 Differences between files are shown using the unified diff format.
2587
2587
2588 .. note::
2588 .. note::
2589
2589
2590 :hg:`diff` may generate unexpected results for merges, as it will
2590 :hg:`diff` may generate unexpected results for merges, as it will
2591 default to comparing against the working directory's first
2591 default to comparing against the working directory's first
2592 parent changeset if no revisions are specified. To diff against the
2592 parent changeset if no revisions are specified. To diff against the
2593 conflict regions, you can use `--config diff.merge=yes`.
2593 conflict regions, you can use `--config diff.merge=yes`.
2594
2594
2595 By default, the working directory files are compared to its first parent. To
2595 By default, the working directory files are compared to its first parent. To
2596 see the differences from another revision, use --from. To see the difference
2596 see the differences from another revision, use --from. To see the difference
2597 to another revision, use --to. For example, :hg:`diff --from .^` will show
2597 to another revision, use --to. For example, :hg:`diff --from .^` will show
2598 the differences from the working copy's grandparent to the working copy,
2598 the differences from the working copy's grandparent to the working copy,
2599 :hg:`diff --to .` will show the diff from the working copy to its parent
2599 :hg:`diff --to .` will show the diff from the working copy to its parent
2600 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2600 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2601 show the diff between those two revisions.
2601 show the diff between those two revisions.
2602
2602
2603 Alternatively you can specify -c/--change with a revision to see the changes
2603 Alternatively you can specify -c/--change with a revision to see the changes
2604 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2604 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2605 equivalent to :hg:`diff --from 42^ --to 42`)
2605 equivalent to :hg:`diff --from 42^ --to 42`)
2606
2606
2607 Without the -a/--text option, diff will avoid generating diffs of
2607 Without the -a/--text option, diff will avoid generating diffs of
2608 files it detects as binary. With -a, diff will generate a diff
2608 files it detects as binary. With -a, diff will generate a diff
2609 anyway, probably with undesirable results.
2609 anyway, probably with undesirable results.
2610
2610
2611 Use the -g/--git option to generate diffs in the git extended diff
2611 Use the -g/--git option to generate diffs in the git extended diff
2612 format. For more information, read :hg:`help diffs`.
2612 format. For more information, read :hg:`help diffs`.
2613
2613
2614 .. container:: verbose
2614 .. container:: verbose
2615
2615
2616 Examples:
2616 Examples:
2617
2617
2618 - compare a file in the current working directory to its parent::
2618 - compare a file in the current working directory to its parent::
2619
2619
2620 hg diff foo.c
2620 hg diff foo.c
2621
2621
2622 - compare two historical versions of a directory, with rename info::
2622 - compare two historical versions of a directory, with rename info::
2623
2623
2624 hg diff --git --from 1.0 --to 1.2 lib/
2624 hg diff --git --from 1.0 --to 1.2 lib/
2625
2625
2626 - get change stats relative to the last change on some date::
2626 - get change stats relative to the last change on some date::
2627
2627
2628 hg diff --stat --from "date('may 2')"
2628 hg diff --stat --from "date('may 2')"
2629
2629
2630 - diff all newly-added files that contain a keyword::
2630 - diff all newly-added files that contain a keyword::
2631
2631
2632 hg diff "set:added() and grep(GNU)"
2632 hg diff "set:added() and grep(GNU)"
2633
2633
2634 - compare a revision and its parents::
2634 - compare a revision and its parents::
2635
2635
2636 hg diff -c 9353 # compare against first parent
2636 hg diff -c 9353 # compare against first parent
2637 hg diff --from 9353^ --to 9353 # same using revset syntax
2637 hg diff --from 9353^ --to 9353 # same using revset syntax
2638 hg diff --from 9353^2 --to 9353 # compare against the second parent
2638 hg diff --from 9353^2 --to 9353 # compare against the second parent
2639
2639
2640 Returns 0 on success.
2640 Returns 0 on success.
2641 """
2641 """
2642
2642
2643 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2643 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2644 opts = pycompat.byteskwargs(opts)
2644 opts = pycompat.byteskwargs(opts)
2645 revs = opts.get(b'rev')
2645 revs = opts.get(b'rev')
2646 change = opts.get(b'change')
2646 change = opts.get(b'change')
2647 from_rev = opts.get(b'from')
2647 from_rev = opts.get(b'from')
2648 to_rev = opts.get(b'to')
2648 to_rev = opts.get(b'to')
2649 stat = opts.get(b'stat')
2649 stat = opts.get(b'stat')
2650 reverse = opts.get(b'reverse')
2650 reverse = opts.get(b'reverse')
2651
2651
2652 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2652 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2653 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2653 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2654 if change:
2654 if change:
2655 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2655 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2656 ctx2 = logcmdutil.revsingle(repo, change, None)
2656 ctx2 = logcmdutil.revsingle(repo, change, None)
2657 ctx1 = logcmdutil.diff_parent(ctx2)
2657 ctx1 = logcmdutil.diff_parent(ctx2)
2658 elif from_rev or to_rev:
2658 elif from_rev or to_rev:
2659 repo = scmutil.unhidehashlikerevs(
2659 repo = scmutil.unhidehashlikerevs(
2660 repo, [from_rev] + [to_rev], b'nowarn'
2660 repo, [from_rev] + [to_rev], b'nowarn'
2661 )
2661 )
2662 ctx1 = logcmdutil.revsingle(repo, from_rev, None)
2662 ctx1 = logcmdutil.revsingle(repo, from_rev, None)
2663 ctx2 = logcmdutil.revsingle(repo, to_rev, None)
2663 ctx2 = logcmdutil.revsingle(repo, to_rev, None)
2664 else:
2664 else:
2665 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2665 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2666 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
2666 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
2667
2667
2668 if reverse:
2668 if reverse:
2669 ctxleft = ctx2
2669 ctxleft = ctx2
2670 ctxright = ctx1
2670 ctxright = ctx1
2671 else:
2671 else:
2672 ctxleft = ctx1
2672 ctxleft = ctx1
2673 ctxright = ctx2
2673 ctxright = ctx2
2674
2674
2675 diffopts = patch.diffallopts(ui, opts)
2675 diffopts = patch.diffallopts(ui, opts)
2676 m = scmutil.match(ctx2, pats, opts)
2676 m = scmutil.match(ctx2, pats, opts)
2677 m = repo.narrowmatch(m)
2677 m = repo.narrowmatch(m)
2678 ui.pager(b'diff')
2678 ui.pager(b'diff')
2679 logcmdutil.diffordiffstat(
2679 logcmdutil.diffordiffstat(
2680 ui,
2680 ui,
2681 repo,
2681 repo,
2682 diffopts,
2682 diffopts,
2683 ctxleft,
2683 ctxleft,
2684 ctxright,
2684 ctxright,
2685 m,
2685 m,
2686 stat=stat,
2686 stat=stat,
2687 listsubrepos=opts.get(b'subrepos'),
2687 listsubrepos=opts.get(b'subrepos'),
2688 root=opts.get(b'root'),
2688 root=opts.get(b'root'),
2689 )
2689 )
2690
2690
2691
2691
2692 @command(
2692 @command(
2693 b'export',
2693 b'export',
2694 [
2694 [
2695 (
2695 (
2696 b'B',
2696 b'B',
2697 b'bookmark',
2697 b'bookmark',
2698 b'',
2698 b'',
2699 _(b'export changes only reachable by given bookmark'),
2699 _(b'export changes only reachable by given bookmark'),
2700 _(b'BOOKMARK'),
2700 _(b'BOOKMARK'),
2701 ),
2701 ),
2702 (
2702 (
2703 b'o',
2703 b'o',
2704 b'output',
2704 b'output',
2705 b'',
2705 b'',
2706 _(b'print output to file with formatted name'),
2706 _(b'print output to file with formatted name'),
2707 _(b'FORMAT'),
2707 _(b'FORMAT'),
2708 ),
2708 ),
2709 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2709 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2710 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2710 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2711 ]
2711 ]
2712 + diffopts
2712 + diffopts
2713 + formatteropts,
2713 + formatteropts,
2714 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2714 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2715 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2715 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2716 helpbasic=True,
2716 helpbasic=True,
2717 intents={INTENT_READONLY},
2717 intents={INTENT_READONLY},
2718 )
2718 )
2719 def export(ui, repo, *changesets, **opts):
2719 def export(ui, repo, *changesets, **opts):
2720 """dump the header and diffs for one or more changesets
2720 """dump the header and diffs for one or more changesets
2721
2721
2722 Print the changeset header and diffs for one or more revisions.
2722 Print the changeset header and diffs for one or more revisions.
2723 If no revision is given, the parent of the working directory is used.
2723 If no revision is given, the parent of the working directory is used.
2724
2724
2725 The information shown in the changeset header is: author, date,
2725 The information shown in the changeset header is: author, date,
2726 branch name (if non-default), changeset hash, parent(s) and commit
2726 branch name (if non-default), changeset hash, parent(s) and commit
2727 comment.
2727 comment.
2728
2728
2729 .. note::
2729 .. note::
2730
2730
2731 :hg:`export` may generate unexpected diff output for merge
2731 :hg:`export` may generate unexpected diff output for merge
2732 changesets, as it will compare the merge changeset against its
2732 changesets, as it will compare the merge changeset against its
2733 first parent only.
2733 first parent only.
2734
2734
2735 Output may be to a file, in which case the name of the file is
2735 Output may be to a file, in which case the name of the file is
2736 given using a template string. See :hg:`help templates`. In addition
2736 given using a template string. See :hg:`help templates`. In addition
2737 to the common template keywords, the following formatting rules are
2737 to the common template keywords, the following formatting rules are
2738 supported:
2738 supported:
2739
2739
2740 :``%%``: literal "%" character
2740 :``%%``: literal "%" character
2741 :``%H``: changeset hash (40 hexadecimal digits)
2741 :``%H``: changeset hash (40 hexadecimal digits)
2742 :``%N``: number of patches being generated
2742 :``%N``: number of patches being generated
2743 :``%R``: changeset revision number
2743 :``%R``: changeset revision number
2744 :``%b``: basename of the exporting repository
2744 :``%b``: basename of the exporting repository
2745 :``%h``: short-form changeset hash (12 hexadecimal digits)
2745 :``%h``: short-form changeset hash (12 hexadecimal digits)
2746 :``%m``: first line of the commit message (only alphanumeric characters)
2746 :``%m``: first line of the commit message (only alphanumeric characters)
2747 :``%n``: zero-padded sequence number, starting at 1
2747 :``%n``: zero-padded sequence number, starting at 1
2748 :``%r``: zero-padded changeset revision number
2748 :``%r``: zero-padded changeset revision number
2749 :``\\``: literal "\\" character
2749 :``\\``: literal "\\" character
2750
2750
2751 Without the -a/--text option, export will avoid generating diffs
2751 Without the -a/--text option, export will avoid generating diffs
2752 of files it detects as binary. With -a, export will generate a
2752 of files it detects as binary. With -a, export will generate a
2753 diff anyway, probably with undesirable results.
2753 diff anyway, probably with undesirable results.
2754
2754
2755 With -B/--bookmark changesets reachable by the given bookmark are
2755 With -B/--bookmark changesets reachable by the given bookmark are
2756 selected.
2756 selected.
2757
2757
2758 Use the -g/--git option to generate diffs in the git extended diff
2758 Use the -g/--git option to generate diffs in the git extended diff
2759 format. See :hg:`help diffs` for more information.
2759 format. See :hg:`help diffs` for more information.
2760
2760
2761 With the --switch-parent option, the diff will be against the
2761 With the --switch-parent option, the diff will be against the
2762 second parent. It can be useful to review a merge.
2762 second parent. It can be useful to review a merge.
2763
2763
2764 .. container:: verbose
2764 .. container:: verbose
2765
2765
2766 Template:
2766 Template:
2767
2767
2768 The following keywords are supported in addition to the common template
2768 The following keywords are supported in addition to the common template
2769 keywords and functions. See also :hg:`help templates`.
2769 keywords and functions. See also :hg:`help templates`.
2770
2770
2771 :diff: String. Diff content.
2771 :diff: String. Diff content.
2772 :parents: List of strings. Parent nodes of the changeset.
2772 :parents: List of strings. Parent nodes of the changeset.
2773
2773
2774 Examples:
2774 Examples:
2775
2775
2776 - use export and import to transplant a bugfix to the current
2776 - use export and import to transplant a bugfix to the current
2777 branch::
2777 branch::
2778
2778
2779 hg export -r 9353 | hg import -
2779 hg export -r 9353 | hg import -
2780
2780
2781 - export all the changesets between two revisions to a file with
2781 - export all the changesets between two revisions to a file with
2782 rename information::
2782 rename information::
2783
2783
2784 hg export --git -r 123:150 > changes.txt
2784 hg export --git -r 123:150 > changes.txt
2785
2785
2786 - split outgoing changes into a series of patches with
2786 - split outgoing changes into a series of patches with
2787 descriptive names::
2787 descriptive names::
2788
2788
2789 hg export -r "outgoing()" -o "%n-%m.patch"
2789 hg export -r "outgoing()" -o "%n-%m.patch"
2790
2790
2791 Returns 0 on success.
2791 Returns 0 on success.
2792 """
2792 """
2793 opts = pycompat.byteskwargs(opts)
2793 opts = pycompat.byteskwargs(opts)
2794 bookmark = opts.get(b'bookmark')
2794 bookmark = opts.get(b'bookmark')
2795 changesets += tuple(opts.get(b'rev', []))
2795 changesets += tuple(opts.get(b'rev', []))
2796
2796
2797 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2797 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2798
2798
2799 if bookmark:
2799 if bookmark:
2800 if bookmark not in repo._bookmarks:
2800 if bookmark not in repo._bookmarks:
2801 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2801 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2802
2802
2803 revs = scmutil.bookmarkrevs(repo, bookmark)
2803 revs = scmutil.bookmarkrevs(repo, bookmark)
2804 else:
2804 else:
2805 if not changesets:
2805 if not changesets:
2806 changesets = [b'.']
2806 changesets = [b'.']
2807
2807
2808 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2808 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2809 revs = logcmdutil.revrange(repo, changesets)
2809 revs = logcmdutil.revrange(repo, changesets)
2810
2810
2811 if not revs:
2811 if not revs:
2812 raise error.InputError(_(b"export requires at least one changeset"))
2812 raise error.InputError(_(b"export requires at least one changeset"))
2813 if len(revs) > 1:
2813 if len(revs) > 1:
2814 ui.note(_(b'exporting patches:\n'))
2814 ui.note(_(b'exporting patches:\n'))
2815 else:
2815 else:
2816 ui.note(_(b'exporting patch:\n'))
2816 ui.note(_(b'exporting patch:\n'))
2817
2817
2818 fntemplate = opts.get(b'output')
2818 fntemplate = opts.get(b'output')
2819 if cmdutil.isstdiofilename(fntemplate):
2819 if cmdutil.isstdiofilename(fntemplate):
2820 fntemplate = b''
2820 fntemplate = b''
2821
2821
2822 if fntemplate:
2822 if fntemplate:
2823 fm = formatter.nullformatter(ui, b'export', opts)
2823 fm = formatter.nullformatter(ui, b'export', opts)
2824 else:
2824 else:
2825 ui.pager(b'export')
2825 ui.pager(b'export')
2826 fm = ui.formatter(b'export', opts)
2826 fm = ui.formatter(b'export', opts)
2827 with fm:
2827 with fm:
2828 cmdutil.export(
2828 cmdutil.export(
2829 repo,
2829 repo,
2830 revs,
2830 revs,
2831 fm,
2831 fm,
2832 fntemplate=fntemplate,
2832 fntemplate=fntemplate,
2833 switch_parent=opts.get(b'switch_parent'),
2833 switch_parent=opts.get(b'switch_parent'),
2834 opts=patch.diffallopts(ui, opts),
2834 opts=patch.diffallopts(ui, opts),
2835 )
2835 )
2836
2836
2837
2837
2838 @command(
2838 @command(
2839 b'files',
2839 b'files',
2840 [
2840 [
2841 (
2841 (
2842 b'r',
2842 b'r',
2843 b'rev',
2843 b'rev',
2844 b'',
2844 b'',
2845 _(b'search the repository as it is in REV'),
2845 _(b'search the repository as it is in REV'),
2846 _(b'REV'),
2846 _(b'REV'),
2847 ),
2847 ),
2848 (
2848 (
2849 b'0',
2849 b'0',
2850 b'print0',
2850 b'print0',
2851 None,
2851 None,
2852 _(b'end filenames with NUL, for use with xargs'),
2852 _(b'end filenames with NUL, for use with xargs'),
2853 ),
2853 ),
2854 ]
2854 ]
2855 + walkopts
2855 + walkopts
2856 + formatteropts
2856 + formatteropts
2857 + subrepoopts,
2857 + subrepoopts,
2858 _(b'[OPTION]... [FILE]...'),
2858 _(b'[OPTION]... [FILE]...'),
2859 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2859 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2860 intents={INTENT_READONLY},
2860 intents={INTENT_READONLY},
2861 )
2861 )
2862 def files(ui, repo, *pats, **opts):
2862 def files(ui, repo, *pats, **opts):
2863 """list tracked files
2863 """list tracked files
2864
2864
2865 Print files under Mercurial control in the working directory or
2865 Print files under Mercurial control in the working directory or
2866 specified revision for given files (excluding removed files).
2866 specified revision for given files (excluding removed files).
2867 Files can be specified as filenames or filesets.
2867 Files can be specified as filenames or filesets.
2868
2868
2869 If no files are given to match, this command prints the names
2869 If no files are given to match, this command prints the names
2870 of all files under Mercurial control.
2870 of all files under Mercurial control.
2871
2871
2872 .. container:: verbose
2872 .. container:: verbose
2873
2873
2874 Template:
2874 Template:
2875
2875
2876 The following keywords are supported in addition to the common template
2876 The following keywords are supported in addition to the common template
2877 keywords and functions. See also :hg:`help templates`.
2877 keywords and functions. See also :hg:`help templates`.
2878
2878
2879 :flags: String. Character denoting file's symlink and executable bits.
2879 :flags: String. Character denoting file's symlink and executable bits.
2880 :path: String. Repository-absolute path of the file.
2880 :path: String. Repository-absolute path of the file.
2881 :size: Integer. Size of the file in bytes.
2881 :size: Integer. Size of the file in bytes.
2882
2882
2883 Examples:
2883 Examples:
2884
2884
2885 - list all files under the current directory::
2885 - list all files under the current directory::
2886
2886
2887 hg files .
2887 hg files .
2888
2888
2889 - shows sizes and flags for current revision::
2889 - shows sizes and flags for current revision::
2890
2890
2891 hg files -vr .
2891 hg files -vr .
2892
2892
2893 - list all files named README::
2893 - list all files named README::
2894
2894
2895 hg files -I "**/README"
2895 hg files -I "**/README"
2896
2896
2897 - list all binary files::
2897 - list all binary files::
2898
2898
2899 hg files "set:binary()"
2899 hg files "set:binary()"
2900
2900
2901 - find files containing a regular expression::
2901 - find files containing a regular expression::
2902
2902
2903 hg files "set:grep('bob')"
2903 hg files "set:grep('bob')"
2904
2904
2905 - search tracked file contents with xargs and grep::
2905 - search tracked file contents with xargs and grep::
2906
2906
2907 hg files -0 | xargs -0 grep foo
2907 hg files -0 | xargs -0 grep foo
2908
2908
2909 See :hg:`help patterns` and :hg:`help filesets` for more information
2909 See :hg:`help patterns` and :hg:`help filesets` for more information
2910 on specifying file patterns.
2910 on specifying file patterns.
2911
2911
2912 Returns 0 if a match is found, 1 otherwise.
2912 Returns 0 if a match is found, 1 otherwise.
2913
2913
2914 """
2914 """
2915
2915
2916 opts = pycompat.byteskwargs(opts)
2916 opts = pycompat.byteskwargs(opts)
2917 rev = opts.get(b'rev')
2917 rev = opts.get(b'rev')
2918 if rev:
2918 if rev:
2919 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2919 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2920 ctx = logcmdutil.revsingle(repo, rev, None)
2920 ctx = logcmdutil.revsingle(repo, rev, None)
2921
2921
2922 end = b'\n'
2922 end = b'\n'
2923 if opts.get(b'print0'):
2923 if opts.get(b'print0'):
2924 end = b'\0'
2924 end = b'\0'
2925 fmt = b'%s' + end
2925 fmt = b'%s' + end
2926
2926
2927 m = scmutil.match(ctx, pats, opts)
2927 m = scmutil.match(ctx, pats, opts)
2928 ui.pager(b'files')
2928 ui.pager(b'files')
2929 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2929 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2930 with ui.formatter(b'files', opts) as fm:
2930 with ui.formatter(b'files', opts) as fm:
2931 return cmdutil.files(
2931 return cmdutil.files(
2932 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2932 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2933 )
2933 )
2934
2934
2935
2935
2936 @command(
2936 @command(
2937 b'forget',
2937 b'forget',
2938 [
2938 [
2939 (b'i', b'interactive', None, _(b'use interactive mode')),
2939 (b'i', b'interactive', None, _(b'use interactive mode')),
2940 ]
2940 ]
2941 + walkopts
2941 + walkopts
2942 + dryrunopts,
2942 + dryrunopts,
2943 _(b'[OPTION]... FILE...'),
2943 _(b'[OPTION]... FILE...'),
2944 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2944 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2945 helpbasic=True,
2945 helpbasic=True,
2946 inferrepo=True,
2946 inferrepo=True,
2947 )
2947 )
2948 def forget(ui, repo, *pats, **opts):
2948 def forget(ui, repo, *pats, **opts):
2949 """forget the specified files on the next commit
2949 """forget the specified files on the next commit
2950
2950
2951 Mark the specified files so they will no longer be tracked
2951 Mark the specified files so they will no longer be tracked
2952 after the next commit.
2952 after the next commit.
2953
2953
2954 This only removes files from the current branch, not from the
2954 This only removes files from the current branch, not from the
2955 entire project history, and it does not delete them from the
2955 entire project history, and it does not delete them from the
2956 working directory.
2956 working directory.
2957
2957
2958 To delete the file from the working directory, see :hg:`remove`.
2958 To delete the file from the working directory, see :hg:`remove`.
2959
2959
2960 To undo a forget before the next commit, see :hg:`add`.
2960 To undo a forget before the next commit, see :hg:`add`.
2961
2961
2962 .. container:: verbose
2962 .. container:: verbose
2963
2963
2964 Examples:
2964 Examples:
2965
2965
2966 - forget newly-added binary files::
2966 - forget newly-added binary files::
2967
2967
2968 hg forget "set:added() and binary()"
2968 hg forget "set:added() and binary()"
2969
2969
2970 - forget files that would be excluded by .hgignore::
2970 - forget files that would be excluded by .hgignore::
2971
2971
2972 hg forget "set:hgignore()"
2972 hg forget "set:hgignore()"
2973
2973
2974 Returns 0 on success.
2974 Returns 0 on success.
2975 """
2975 """
2976
2976
2977 opts = pycompat.byteskwargs(opts)
2977 opts = pycompat.byteskwargs(opts)
2978 if not pats:
2978 if not pats:
2979 raise error.InputError(_(b'no files specified'))
2979 raise error.InputError(_(b'no files specified'))
2980
2980
2981 with repo.wlock(), repo.dirstate.changing_files(repo):
2981 with repo.wlock(), repo.dirstate.changing_files(repo):
2982 m = scmutil.match(repo[None], pats, opts)
2982 m = scmutil.match(repo[None], pats, opts)
2983 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2983 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2984 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2984 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2985 rejected = cmdutil.forget(
2985 rejected = cmdutil.forget(
2986 ui,
2986 ui,
2987 repo,
2987 repo,
2988 m,
2988 m,
2989 prefix=b"",
2989 prefix=b"",
2990 uipathfn=uipathfn,
2990 uipathfn=uipathfn,
2991 explicitonly=False,
2991 explicitonly=False,
2992 dryrun=dryrun,
2992 dryrun=dryrun,
2993 interactive=interactive,
2993 interactive=interactive,
2994 )[0]
2994 )[0]
2995 return rejected and 1 or 0
2995 return rejected and 1 or 0
2996
2996
2997
2997
2998 @command(
2998 @command(
2999 b'graft',
2999 b'graft',
3000 [
3000 [
3001 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
3001 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
3002 (
3002 (
3003 b'',
3003 b'',
3004 b'base',
3004 b'base',
3005 b'',
3005 b'',
3006 _(b'base revision when doing the graft merge (ADVANCED)'),
3006 _(b'base revision when doing the graft merge (ADVANCED)'),
3007 _(b'REV'),
3007 _(b'REV'),
3008 ),
3008 ),
3009 (b'c', b'continue', False, _(b'resume interrupted graft')),
3009 (b'c', b'continue', False, _(b'resume interrupted graft')),
3010 (b'', b'stop', False, _(b'stop interrupted graft')),
3010 (b'', b'stop', False, _(b'stop interrupted graft')),
3011 (b'', b'abort', False, _(b'abort interrupted graft')),
3011 (b'', b'abort', False, _(b'abort interrupted graft')),
3012 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3012 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3013 (b'', b'log', None, _(b'append graft info to log message')),
3013 (b'', b'log', None, _(b'append graft info to log message')),
3014 (
3014 (
3015 b'',
3015 b'',
3016 b'no-commit',
3016 b'no-commit',
3017 None,
3017 None,
3018 _(b"don't commit, just apply the changes in working directory"),
3018 _(b"don't commit, just apply the changes in working directory"),
3019 ),
3019 ),
3020 (b'f', b'force', False, _(b'force graft')),
3020 (b'f', b'force', False, _(b'force graft')),
3021 (
3021 (
3022 b'D',
3022 b'D',
3023 b'currentdate',
3023 b'currentdate',
3024 False,
3024 False,
3025 _(b'record the current date as commit date'),
3025 _(b'record the current date as commit date'),
3026 ),
3026 ),
3027 (
3027 (
3028 b'U',
3028 b'U',
3029 b'currentuser',
3029 b'currentuser',
3030 False,
3030 False,
3031 _(b'record the current user as committer'),
3031 _(b'record the current user as committer'),
3032 ),
3032 ),
3033 ]
3033 ]
3034 + commitopts2
3034 + commitopts2
3035 + mergetoolopts
3035 + mergetoolopts
3036 + dryrunopts,
3036 + dryrunopts,
3037 _(b'[OPTION]... [-r REV]... REV...'),
3037 _(b'[OPTION]... [-r REV]... REV...'),
3038 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
3038 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
3039 )
3039 )
3040 def graft(ui, repo, *revs, **opts):
3040 def graft(ui, repo, *revs, **opts):
3041 """copy changes from other branches onto the current branch
3041 """copy changes from other branches onto the current branch
3042
3042
3043 This command uses Mercurial's merge logic to copy individual
3043 This command uses Mercurial's merge logic to copy individual
3044 changes from other branches without merging branches in the
3044 changes from other branches without merging branches in the
3045 history graph. This is sometimes known as 'backporting' or
3045 history graph. This is sometimes known as 'backporting' or
3046 'cherry-picking'. By default, graft will copy user, date, and
3046 'cherry-picking'. By default, graft will copy user, date, and
3047 description from the source changesets.
3047 description from the source changesets.
3048
3048
3049 Changesets that are ancestors of the current revision, that have
3049 Changesets that are ancestors of the current revision, that have
3050 already been grafted, or that are merges will be skipped.
3050 already been grafted, or that are merges will be skipped.
3051
3051
3052 If --log is specified, log messages will have a comment appended
3052 If --log is specified, log messages will have a comment appended
3053 of the form::
3053 of the form::
3054
3054
3055 (grafted from CHANGESETHASH)
3055 (grafted from CHANGESETHASH)
3056
3056
3057 If --force is specified, revisions will be grafted even if they
3057 If --force is specified, revisions will be grafted even if they
3058 are already ancestors of, or have been grafted to, the destination.
3058 are already ancestors of, or have been grafted to, the destination.
3059 This is useful when the revisions have since been backed out.
3059 This is useful when the revisions have since been backed out.
3060
3060
3061 If a graft merge results in conflicts, the graft process is
3061 If a graft merge results in conflicts, the graft process is
3062 interrupted so that the current merge can be manually resolved.
3062 interrupted so that the current merge can be manually resolved.
3063 Once all conflicts are addressed, the graft process can be
3063 Once all conflicts are addressed, the graft process can be
3064 continued with the -c/--continue option.
3064 continued with the -c/--continue option.
3065
3065
3066 The -c/--continue option reapplies all the earlier options.
3066 The -c/--continue option reapplies all the earlier options.
3067
3067
3068 .. container:: verbose
3068 .. container:: verbose
3069
3069
3070 The --base option exposes more of how graft internally uses merge with a
3070 The --base option exposes more of how graft internally uses merge with a
3071 custom base revision. --base can be used to specify another ancestor than
3071 custom base revision. --base can be used to specify another ancestor than
3072 the first and only parent.
3072 the first and only parent.
3073
3073
3074 The command::
3074 The command::
3075
3075
3076 hg graft -r 345 --base 234
3076 hg graft -r 345 --base 234
3077
3077
3078 is thus pretty much the same as::
3078 is thus pretty much the same as::
3079
3079
3080 hg diff --from 234 --to 345 | hg import
3080 hg diff --from 234 --to 345 | hg import
3081
3081
3082 but using merge to resolve conflicts and track moved files.
3082 but using merge to resolve conflicts and track moved files.
3083
3083
3084 The result of a merge can thus be backported as a single commit by
3084 The result of a merge can thus be backported as a single commit by
3085 specifying one of the merge parents as base, and thus effectively
3085 specifying one of the merge parents as base, and thus effectively
3086 grafting the changes from the other side.
3086 grafting the changes from the other side.
3087
3087
3088 It is also possible to collapse multiple changesets and clean up history
3088 It is also possible to collapse multiple changesets and clean up history
3089 by specifying another ancestor as base, much like rebase --collapse
3089 by specifying another ancestor as base, much like rebase --collapse
3090 --keep.
3090 --keep.
3091
3091
3092 The commit message can be tweaked after the fact using commit --amend .
3092 The commit message can be tweaked after the fact using commit --amend .
3093
3093
3094 For using non-ancestors as the base to backout changes, see the backout
3094 For using non-ancestors as the base to backout changes, see the backout
3095 command and the hidden --parent option.
3095 command and the hidden --parent option.
3096
3096
3097 .. container:: verbose
3097 .. container:: verbose
3098
3098
3099 Examples:
3099 Examples:
3100
3100
3101 - copy a single change to the stable branch and edit its description::
3101 - copy a single change to the stable branch and edit its description::
3102
3102
3103 hg update stable
3103 hg update stable
3104 hg graft --edit 9393
3104 hg graft --edit 9393
3105
3105
3106 - graft a range of changesets with one exception, updating dates::
3106 - graft a range of changesets with one exception, updating dates::
3107
3107
3108 hg graft -D "2085::2093 and not 2091"
3108 hg graft -D "2085::2093 and not 2091"
3109
3109
3110 - continue a graft after resolving conflicts::
3110 - continue a graft after resolving conflicts::
3111
3111
3112 hg graft -c
3112 hg graft -c
3113
3113
3114 - show the source of a grafted changeset::
3114 - show the source of a grafted changeset::
3115
3115
3116 hg log --debug -r .
3116 hg log --debug -r .
3117
3117
3118 - show revisions sorted by date::
3118 - show revisions sorted by date::
3119
3119
3120 hg log -r "sort(all(), date)"
3120 hg log -r "sort(all(), date)"
3121
3121
3122 - backport the result of a merge as a single commit::
3122 - backport the result of a merge as a single commit::
3123
3123
3124 hg graft -r 123 --base 123^
3124 hg graft -r 123 --base 123^
3125
3125
3126 - land a feature branch as one changeset::
3126 - land a feature branch as one changeset::
3127
3127
3128 hg up -cr default
3128 hg up -cr default
3129 hg graft -r featureX --base "ancestor('featureX', 'default')"
3129 hg graft -r featureX --base "ancestor('featureX', 'default')"
3130
3130
3131 See :hg:`help revisions` for more about specifying revisions.
3131 See :hg:`help revisions` for more about specifying revisions.
3132
3132
3133 Returns 0 on successful completion, 1 if there are unresolved files.
3133 Returns 0 on successful completion, 1 if there are unresolved files.
3134 """
3134 """
3135 with repo.wlock():
3135 with repo.wlock():
3136 return _dograft(ui, repo, *revs, **opts)
3136 return _dograft(ui, repo, *revs, **opts)
3137
3137
3138
3138
3139 def _dograft(ui, repo, *revs, **opts):
3139 def _dograft(ui, repo, *revs, **opts):
3140 if revs and opts.get('rev'):
3140 if revs and opts.get('rev'):
3141 ui.warn(
3141 ui.warn(
3142 _(
3142 _(
3143 b'warning: inconsistent use of --rev might give unexpected '
3143 b'warning: inconsistent use of --rev might give unexpected '
3144 b'revision ordering!\n'
3144 b'revision ordering!\n'
3145 )
3145 )
3146 )
3146 )
3147
3147
3148 revs = list(revs)
3148 revs = list(revs)
3149 revs.extend(opts.get('rev'))
3149 revs.extend(opts.get('rev'))
3150 # a dict of data to be stored in state file
3150 # a dict of data to be stored in state file
3151 statedata = {}
3151 statedata = {}
3152 # list of new nodes created by ongoing graft
3152 # list of new nodes created by ongoing graft
3153 statedata[b'newnodes'] = []
3153 statedata[b'newnodes'] = []
3154
3154
3155 cmdutil.resolve_commit_options(ui, opts)
3155 cmdutil.resolve_commit_options(ui, opts)
3156
3156
3157 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3157 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3158
3158
3159 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3159 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3160
3160
3161 cont = False
3161 cont = False
3162 if opts.get('no_commit'):
3162 if opts.get('no_commit'):
3163 cmdutil.check_incompatible_arguments(
3163 cmdutil.check_incompatible_arguments(
3164 opts,
3164 opts,
3165 'no_commit',
3165 'no_commit',
3166 ['edit', 'currentuser', 'currentdate', 'log'],
3166 ['edit', 'currentuser', 'currentdate', 'log'],
3167 )
3167 )
3168
3168
3169 graftstate = statemod.cmdstate(repo, b'graftstate')
3169 graftstate = statemod.cmdstate(repo, b'graftstate')
3170
3170
3171 if opts.get('stop'):
3171 if opts.get('stop'):
3172 cmdutil.check_incompatible_arguments(
3172 cmdutil.check_incompatible_arguments(
3173 opts,
3173 opts,
3174 'stop',
3174 'stop',
3175 [
3175 [
3176 'edit',
3176 'edit',
3177 'log',
3177 'log',
3178 'user',
3178 'user',
3179 'date',
3179 'date',
3180 'currentdate',
3180 'currentdate',
3181 'currentuser',
3181 'currentuser',
3182 'rev',
3182 'rev',
3183 ],
3183 ],
3184 )
3184 )
3185 return _stopgraft(ui, repo, graftstate)
3185 return _stopgraft(ui, repo, graftstate)
3186 elif opts.get('abort'):
3186 elif opts.get('abort'):
3187 cmdutil.check_incompatible_arguments(
3187 cmdutil.check_incompatible_arguments(
3188 opts,
3188 opts,
3189 'abort',
3189 'abort',
3190 [
3190 [
3191 'edit',
3191 'edit',
3192 'log',
3192 'log',
3193 'user',
3193 'user',
3194 'date',
3194 'date',
3195 'currentdate',
3195 'currentdate',
3196 'currentuser',
3196 'currentuser',
3197 'rev',
3197 'rev',
3198 ],
3198 ],
3199 )
3199 )
3200 return cmdutil.abortgraft(ui, repo, graftstate)
3200 return cmdutil.abortgraft(ui, repo, graftstate)
3201 elif opts.get('continue'):
3201 elif opts.get('continue'):
3202 cont = True
3202 cont = True
3203 if revs:
3203 if revs:
3204 raise error.InputError(_(b"can't specify --continue and revisions"))
3204 raise error.InputError(_(b"can't specify --continue and revisions"))
3205 # read in unfinished revisions
3205 # read in unfinished revisions
3206 if graftstate.exists():
3206 if graftstate.exists():
3207 statedata = cmdutil.readgraftstate(repo, graftstate)
3207 statedata = cmdutil.readgraftstate(repo, graftstate)
3208 if statedata.get(b'date'):
3208 if statedata.get(b'date'):
3209 opts['date'] = statedata[b'date']
3209 opts['date'] = statedata[b'date']
3210 if statedata.get(b'user'):
3210 if statedata.get(b'user'):
3211 opts['user'] = statedata[b'user']
3211 opts['user'] = statedata[b'user']
3212 if statedata.get(b'log'):
3212 if statedata.get(b'log'):
3213 opts['log'] = True
3213 opts['log'] = True
3214 if statedata.get(b'no_commit'):
3214 if statedata.get(b'no_commit'):
3215 opts['no_commit'] = statedata.get(b'no_commit')
3215 opts['no_commit'] = statedata.get(b'no_commit')
3216 if statedata.get(b'base'):
3216 if statedata.get(b'base'):
3217 opts['base'] = statedata.get(b'base')
3217 opts['base'] = statedata.get(b'base')
3218 nodes = statedata[b'nodes']
3218 nodes = statedata[b'nodes']
3219 revs = [repo[node].rev() for node in nodes]
3219 revs = [repo[node].rev() for node in nodes]
3220 else:
3220 else:
3221 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3221 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3222 else:
3222 else:
3223 if not revs:
3223 if not revs:
3224 raise error.InputError(_(b'no revisions specified'))
3224 raise error.InputError(_(b'no revisions specified'))
3225 cmdutil.checkunfinished(repo)
3225 cmdutil.checkunfinished(repo)
3226 cmdutil.bailifchanged(repo)
3226 cmdutil.bailifchanged(repo)
3227 revs = logcmdutil.revrange(repo, revs)
3227 revs = logcmdutil.revrange(repo, revs)
3228
3228
3229 skipped = set()
3229 skipped = set()
3230 basectx = None
3230 basectx = None
3231 if opts.get('base'):
3231 if opts.get('base'):
3232 basectx = logcmdutil.revsingle(repo, opts['base'], None)
3232 basectx = logcmdutil.revsingle(repo, opts['base'], None)
3233 if basectx is None:
3233 if basectx is None:
3234 # check for merges
3234 # check for merges
3235 for rev in repo.revs(b'%ld and merge()', revs):
3235 for rev in repo.revs(b'%ld and merge()', revs):
3236 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3236 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3237 skipped.add(rev)
3237 skipped.add(rev)
3238 revs = [r for r in revs if r not in skipped]
3238 revs = [r for r in revs if r not in skipped]
3239 if not revs:
3239 if not revs:
3240 return -1
3240 return -1
3241 if basectx is not None and len(revs) != 1:
3241 if basectx is not None and len(revs) != 1:
3242 raise error.InputError(_(b'only one revision allowed with --base '))
3242 raise error.InputError(_(b'only one revision allowed with --base '))
3243
3243
3244 # Don't check in the --continue case, in effect retaining --force across
3244 # Don't check in the --continue case, in effect retaining --force across
3245 # --continues. That's because without --force, any revisions we decided to
3245 # --continues. That's because without --force, any revisions we decided to
3246 # skip would have been filtered out here, so they wouldn't have made their
3246 # skip would have been filtered out here, so they wouldn't have made their
3247 # way to the graftstate. With --force, any revisions we would have otherwise
3247 # way to the graftstate. With --force, any revisions we would have otherwise
3248 # skipped would not have been filtered out, and if they hadn't been applied
3248 # skipped would not have been filtered out, and if they hadn't been applied
3249 # already, they'd have been in the graftstate.
3249 # already, they'd have been in the graftstate.
3250 if not (cont or opts.get('force')) and basectx is None:
3250 if not (cont or opts.get('force')) and basectx is None:
3251 # check for ancestors of dest branch
3251 # check for ancestors of dest branch
3252 ancestors = repo.revs(b'%ld & (::.)', revs)
3252 ancestors = repo.revs(b'%ld & (::.)', revs)
3253 for rev in ancestors:
3253 for rev in ancestors:
3254 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3254 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3255
3255
3256 revs = [r for r in revs if r not in ancestors]
3256 revs = [r for r in revs if r not in ancestors]
3257
3257
3258 if not revs:
3258 if not revs:
3259 return -1
3259 return -1
3260
3260
3261 # analyze revs for earlier grafts
3261 # analyze revs for earlier grafts
3262 ids = {}
3262 ids = {}
3263 for ctx in repo.set(b"%ld", revs):
3263 for ctx in repo.set(b"%ld", revs):
3264 ids[ctx.hex()] = ctx.rev()
3264 ids[ctx.hex()] = ctx.rev()
3265 n = ctx.extra().get(b'source')
3265 n = ctx.extra().get(b'source')
3266 if n:
3266 if n:
3267 ids[n] = ctx.rev()
3267 ids[n] = ctx.rev()
3268
3268
3269 # check ancestors for earlier grafts
3269 # check ancestors for earlier grafts
3270 ui.debug(b'scanning for duplicate grafts\n')
3270 ui.debug(b'scanning for duplicate grafts\n')
3271
3271
3272 # The only changesets we can be sure doesn't contain grafts of any
3272 # The only changesets we can be sure doesn't contain grafts of any
3273 # revs, are the ones that are common ancestors of *all* revs:
3273 # revs, are the ones that are common ancestors of *all* revs:
3274 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3274 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3275 ctx = repo[rev]
3275 ctx = repo[rev]
3276 n = ctx.extra().get(b'source')
3276 n = ctx.extra().get(b'source')
3277 if n in ids:
3277 if n in ids:
3278 try:
3278 try:
3279 r = repo[n].rev()
3279 r = repo[n].rev()
3280 except error.RepoLookupError:
3280 except error.RepoLookupError:
3281 r = None
3281 r = None
3282 if r in revs:
3282 if r in revs:
3283 ui.warn(
3283 ui.warn(
3284 _(
3284 _(
3285 b'skipping revision %d:%s '
3285 b'skipping revision %d:%s '
3286 b'(already grafted to %d:%s)\n'
3286 b'(already grafted to %d:%s)\n'
3287 )
3287 )
3288 % (r, repo[r], rev, ctx)
3288 % (r, repo[r], rev, ctx)
3289 )
3289 )
3290 revs.remove(r)
3290 revs.remove(r)
3291 elif ids[n] in revs:
3291 elif ids[n] in revs:
3292 if r is None:
3292 if r is None:
3293 ui.warn(
3293 ui.warn(
3294 _(
3294 _(
3295 b'skipping already grafted revision %d:%s '
3295 b'skipping already grafted revision %d:%s '
3296 b'(%d:%s also has unknown origin %s)\n'
3296 b'(%d:%s also has unknown origin %s)\n'
3297 )
3297 )
3298 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3298 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3299 )
3299 )
3300 else:
3300 else:
3301 ui.warn(
3301 ui.warn(
3302 _(
3302 _(
3303 b'skipping already grafted revision %d:%s '
3303 b'skipping already grafted revision %d:%s '
3304 b'(%d:%s also has origin %d:%s)\n'
3304 b'(%d:%s also has origin %d:%s)\n'
3305 )
3305 )
3306 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3306 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3307 )
3307 )
3308 revs.remove(ids[n])
3308 revs.remove(ids[n])
3309 elif ctx.hex() in ids:
3309 elif ctx.hex() in ids:
3310 r = ids[ctx.hex()]
3310 r = ids[ctx.hex()]
3311 if r in revs:
3311 if r in revs:
3312 ui.warn(
3312 ui.warn(
3313 _(
3313 _(
3314 b'skipping already grafted revision %d:%s '
3314 b'skipping already grafted revision %d:%s '
3315 b'(was grafted from %d:%s)\n'
3315 b'(was grafted from %d:%s)\n'
3316 )
3316 )
3317 % (r, repo[r], rev, ctx)
3317 % (r, repo[r], rev, ctx)
3318 )
3318 )
3319 revs.remove(r)
3319 revs.remove(r)
3320 if not revs:
3320 if not revs:
3321 return -1
3321 return -1
3322
3322
3323 if opts.get('no_commit'):
3323 if opts.get('no_commit'):
3324 statedata[b'no_commit'] = True
3324 statedata[b'no_commit'] = True
3325 if opts.get('base'):
3325 if opts.get('base'):
3326 statedata[b'base'] = opts['base']
3326 statedata[b'base'] = opts['base']
3327 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3327 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3328 desc = b'%d:%s "%s"' % (
3328 desc = b'%d:%s "%s"' % (
3329 ctx.rev(),
3329 ctx.rev(),
3330 ctx,
3330 ctx,
3331 ctx.description().split(b'\n', 1)[0],
3331 ctx.description().split(b'\n', 1)[0],
3332 )
3332 )
3333 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3333 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3334 if names:
3334 if names:
3335 desc += b' (%s)' % b' '.join(names)
3335 desc += b' (%s)' % b' '.join(names)
3336 ui.status(_(b'grafting %s\n') % desc)
3336 ui.status(_(b'grafting %s\n') % desc)
3337 if opts.get('dry_run'):
3337 if opts.get('dry_run'):
3338 continue
3338 continue
3339
3339
3340 source = ctx.extra().get(b'source')
3340 source = ctx.extra().get(b'source')
3341 extra = {}
3341 extra = {}
3342 if source:
3342 if source:
3343 extra[b'source'] = source
3343 extra[b'source'] = source
3344 extra[b'intermediate-source'] = ctx.hex()
3344 extra[b'intermediate-source'] = ctx.hex()
3345 else:
3345 else:
3346 extra[b'source'] = ctx.hex()
3346 extra[b'source'] = ctx.hex()
3347 user = ctx.user()
3347 user = ctx.user()
3348 if opts.get('user'):
3348 if opts.get('user'):
3349 user = opts['user']
3349 user = opts['user']
3350 statedata[b'user'] = user
3350 statedata[b'user'] = user
3351 date = ctx.date()
3351 date = ctx.date()
3352 if opts.get('date'):
3352 if opts.get('date'):
3353 date = opts['date']
3353 date = opts['date']
3354 statedata[b'date'] = date
3354 statedata[b'date'] = date
3355 message = ctx.description()
3355 message = ctx.description()
3356 if opts.get('log'):
3356 if opts.get('log'):
3357 message += b'\n(grafted from %s)' % ctx.hex()
3357 message += b'\n(grafted from %s)' % ctx.hex()
3358 statedata[b'log'] = True
3358 statedata[b'log'] = True
3359
3359
3360 # we don't merge the first commit when continuing
3360 # we don't merge the first commit when continuing
3361 if not cont:
3361 if not cont:
3362 # perform the graft merge with p1(rev) as 'ancestor'
3362 # perform the graft merge with p1(rev) as 'ancestor'
3363 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3363 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3364 base = ctx.p1() if basectx is None else basectx
3364 base = ctx.p1() if basectx is None else basectx
3365 with ui.configoverride(overrides, b'graft'):
3365 with ui.configoverride(overrides, b'graft'):
3366 stats = mergemod.graft(
3366 stats = mergemod.graft(
3367 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3367 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3368 )
3368 )
3369 # report any conflicts
3369 # report any conflicts
3370 if stats.unresolvedcount > 0:
3370 if stats.unresolvedcount > 0:
3371 # write out state for --continue
3371 # write out state for --continue
3372 nodes = [repo[rev].hex() for rev in revs[pos:]]
3372 nodes = [repo[rev].hex() for rev in revs[pos:]]
3373 statedata[b'nodes'] = nodes
3373 statedata[b'nodes'] = nodes
3374 stateversion = 1
3374 stateversion = 1
3375 graftstate.save(stateversion, statedata)
3375 graftstate.save(stateversion, statedata)
3376 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3376 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3377 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3377 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3378 return 1
3378 return 1
3379 else:
3379 else:
3380 cont = False
3380 cont = False
3381
3381
3382 # commit if --no-commit is false
3382 # commit if --no-commit is false
3383 if not opts.get('no_commit'):
3383 if not opts.get('no_commit'):
3384 node = repo.commit(
3384 node = repo.commit(
3385 text=message, user=user, date=date, extra=extra, editor=editor
3385 text=message, user=user, date=date, extra=extra, editor=editor
3386 )
3386 )
3387 if node is None:
3387 if node is None:
3388 ui.warn(
3388 ui.warn(
3389 _(b'note: graft of %d:%s created no changes to commit\n')
3389 _(b'note: graft of %d:%s created no changes to commit\n')
3390 % (ctx.rev(), ctx)
3390 % (ctx.rev(), ctx)
3391 )
3391 )
3392 # checking that newnodes exist because old state files won't have it
3392 # checking that newnodes exist because old state files won't have it
3393 elif statedata.get(b'newnodes') is not None:
3393 elif statedata.get(b'newnodes') is not None:
3394 nn = statedata[b'newnodes']
3394 nn = statedata[b'newnodes']
3395 assert isinstance(nn, list) # list of bytes
3395 assert isinstance(nn, list) # list of bytes
3396 nn.append(node)
3396 nn.append(node)
3397
3397
3398 # remove state when we complete successfully
3398 # remove state when we complete successfully
3399 if not opts.get('dry_run'):
3399 if not opts.get('dry_run'):
3400 graftstate.delete()
3400 graftstate.delete()
3401
3401
3402 return 0
3402 return 0
3403
3403
3404
3404
3405 def _stopgraft(ui, repo, graftstate):
3405 def _stopgraft(ui, repo, graftstate):
3406 """stop the interrupted graft"""
3406 """stop the interrupted graft"""
3407 if not graftstate.exists():
3407 if not graftstate.exists():
3408 raise error.StateError(_(b"no interrupted graft found"))
3408 raise error.StateError(_(b"no interrupted graft found"))
3409 pctx = repo[b'.']
3409 pctx = repo[b'.']
3410 mergemod.clean_update(pctx)
3410 mergemod.clean_update(pctx)
3411 graftstate.delete()
3411 graftstate.delete()
3412 ui.status(_(b"stopped the interrupted graft\n"))
3412 ui.status(_(b"stopped the interrupted graft\n"))
3413 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3413 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3414 return 0
3414 return 0
3415
3415
3416
3416
3417 statemod.addunfinished(
3417 statemod.addunfinished(
3418 b'graft',
3418 b'graft',
3419 fname=b'graftstate',
3419 fname=b'graftstate',
3420 clearable=True,
3420 clearable=True,
3421 stopflag=True,
3421 stopflag=True,
3422 continueflag=True,
3422 continueflag=True,
3423 abortfunc=cmdutil.hgabortgraft,
3423 abortfunc=cmdutil.hgabortgraft,
3424 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3424 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3425 )
3425 )
3426
3426
3427
3427
3428 @command(
3428 @command(
3429 b'grep',
3429 b'grep',
3430 [
3430 [
3431 (b'0', b'print0', None, _(b'end fields with NUL')),
3431 (b'0', b'print0', None, _(b'end fields with NUL')),
3432 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3432 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3433 (
3433 (
3434 b'',
3434 b'',
3435 b'diff',
3435 b'diff',
3436 None,
3436 None,
3437 _(
3437 _(
3438 b'search revision differences for when the pattern was added '
3438 b'search revision differences for when the pattern was added '
3439 b'or removed'
3439 b'or removed'
3440 ),
3440 ),
3441 ),
3441 ),
3442 (b'a', b'text', None, _(b'treat all files as text')),
3442 (b'a', b'text', None, _(b'treat all files as text')),
3443 (
3443 (
3444 b'f',
3444 b'f',
3445 b'follow',
3445 b'follow',
3446 None,
3446 None,
3447 _(
3447 _(
3448 b'follow changeset history,'
3448 b'follow changeset history,'
3449 b' or file history across copies and renames'
3449 b' or file history across copies and renames'
3450 ),
3450 ),
3451 ),
3451 ),
3452 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3452 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3453 (
3453 (
3454 b'l',
3454 b'l',
3455 b'files-with-matches',
3455 b'files-with-matches',
3456 None,
3456 None,
3457 _(b'print only filenames and revisions that match'),
3457 _(b'print only filenames and revisions that match'),
3458 ),
3458 ),
3459 (b'n', b'line-number', None, _(b'print matching line numbers')),
3459 (b'n', b'line-number', None, _(b'print matching line numbers')),
3460 (
3460 (
3461 b'r',
3461 b'r',
3462 b'rev',
3462 b'rev',
3463 [],
3463 [],
3464 _(b'search files changed within revision range'),
3464 _(b'search files changed within revision range'),
3465 _(b'REV'),
3465 _(b'REV'),
3466 ),
3466 ),
3467 (
3467 (
3468 b'',
3468 b'',
3469 b'all-files',
3469 b'all-files',
3470 None,
3470 None,
3471 _(
3471 _(
3472 b'include all files in the changeset while grepping (DEPRECATED)'
3472 b'include all files in the changeset while grepping (DEPRECATED)'
3473 ),
3473 ),
3474 ),
3474 ),
3475 (b'u', b'user', None, _(b'list the author (long with -v)')),
3475 (b'u', b'user', None, _(b'list the author (long with -v)')),
3476 (b'd', b'date', None, _(b'list the date (short with -q)')),
3476 (b'd', b'date', None, _(b'list the date (short with -q)')),
3477 ]
3477 ]
3478 + formatteropts
3478 + formatteropts
3479 + walkopts,
3479 + walkopts,
3480 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3480 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3481 helpcategory=command.CATEGORY_FILE_CONTENTS,
3481 helpcategory=command.CATEGORY_FILE_CONTENTS,
3482 inferrepo=True,
3482 inferrepo=True,
3483 intents={INTENT_READONLY},
3483 intents={INTENT_READONLY},
3484 )
3484 )
3485 def grep(ui, repo, pattern, *pats, **opts):
3485 def grep(ui, repo, pattern, *pats, **opts):
3486 """search for a pattern in specified files
3486 """search for a pattern in specified files
3487
3487
3488 Search the working directory or revision history for a regular
3488 Search the working directory or revision history for a regular
3489 expression in the specified files for the entire repository.
3489 expression in the specified files for the entire repository.
3490
3490
3491 By default, grep searches the repository files in the working
3491 By default, grep searches the repository files in the working
3492 directory and prints the files where it finds a match. To specify
3492 directory and prints the files where it finds a match. To specify
3493 historical revisions instead of the working directory, use the
3493 historical revisions instead of the working directory, use the
3494 --rev flag.
3494 --rev flag.
3495
3495
3496 To search instead historical revision differences that contains a
3496 To search instead historical revision differences that contains a
3497 change in match status ("-" for a match that becomes a non-match,
3497 change in match status ("-" for a match that becomes a non-match,
3498 or "+" for a non-match that becomes a match), use the --diff flag.
3498 or "+" for a non-match that becomes a match), use the --diff flag.
3499
3499
3500 PATTERN can be any Python (roughly Perl-compatible) regular
3500 PATTERN can be any Python (roughly Perl-compatible) regular
3501 expression.
3501 expression.
3502
3502
3503 If no FILEs are specified and the --rev flag isn't supplied, all
3503 If no FILEs are specified and the --rev flag isn't supplied, all
3504 files in the working directory are searched. When using the --rev
3504 files in the working directory are searched. When using the --rev
3505 flag and specifying FILEs, use the --follow argument to also
3505 flag and specifying FILEs, use the --follow argument to also
3506 follow the specified FILEs across renames and copies.
3506 follow the specified FILEs across renames and copies.
3507
3507
3508 .. container:: verbose
3508 .. container:: verbose
3509
3509
3510 Template:
3510 Template:
3511
3511
3512 The following keywords are supported in addition to the common template
3512 The following keywords are supported in addition to the common template
3513 keywords and functions. See also :hg:`help templates`.
3513 keywords and functions. See also :hg:`help templates`.
3514
3514
3515 :change: String. Character denoting insertion ``+`` or removal ``-``.
3515 :change: String. Character denoting insertion ``+`` or removal ``-``.
3516 Available if ``--diff`` is specified.
3516 Available if ``--diff`` is specified.
3517 :lineno: Integer. Line number of the match.
3517 :lineno: Integer. Line number of the match.
3518 :path: String. Repository-absolute path of the file.
3518 :path: String. Repository-absolute path of the file.
3519 :texts: List of text chunks.
3519 :texts: List of text chunks.
3520
3520
3521 And each entry of ``{texts}`` provides the following sub-keywords.
3521 And each entry of ``{texts}`` provides the following sub-keywords.
3522
3522
3523 :matched: Boolean. True if the chunk matches the specified pattern.
3523 :matched: Boolean. True if the chunk matches the specified pattern.
3524 :text: String. Chunk content.
3524 :text: String. Chunk content.
3525
3525
3526 See :hg:`help templates.operators` for the list expansion syntax.
3526 See :hg:`help templates.operators` for the list expansion syntax.
3527
3527
3528 Returns 0 if a match is found, 1 otherwise.
3528 Returns 0 if a match is found, 1 otherwise.
3529
3529
3530 """
3530 """
3531 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3531 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3532 opts = pycompat.byteskwargs(opts)
3532 opts = pycompat.byteskwargs(opts)
3533 diff = opts.get(b'all') or opts.get(b'diff')
3533 diff = opts.get(b'all') or opts.get(b'diff')
3534 follow = opts.get(b'follow')
3534 follow = opts.get(b'follow')
3535 if opts.get(b'all_files') is None and not diff:
3535 if opts.get(b'all_files') is None and not diff:
3536 opts[b'all_files'] = True
3536 opts[b'all_files'] = True
3537 plaingrep = (
3537 plaingrep = (
3538 opts.get(b'all_files')
3538 opts.get(b'all_files')
3539 and not opts.get(b'rev')
3539 and not opts.get(b'rev')
3540 and not opts.get(b'follow')
3540 and not opts.get(b'follow')
3541 )
3541 )
3542 all_files = opts.get(b'all_files')
3542 all_files = opts.get(b'all_files')
3543 if plaingrep:
3543 if plaingrep:
3544 opts[b'rev'] = [b'wdir()']
3544 opts[b'rev'] = [b'wdir()']
3545
3545
3546 reflags = re.M
3546 reflags = re.M
3547 if opts.get(b'ignore_case'):
3547 if opts.get(b'ignore_case'):
3548 reflags |= re.I
3548 reflags |= re.I
3549 try:
3549 try:
3550 regexp = util.re.compile(pattern, reflags)
3550 regexp = util.re.compile(pattern, reflags)
3551 except re.error as inst:
3551 except re.error as inst:
3552 ui.warn(
3552 ui.warn(
3553 _(b"grep: invalid match pattern: %s\n")
3553 _(b"grep: invalid match pattern: %s\n")
3554 % stringutil.forcebytestr(inst)
3554 % stringutil.forcebytestr(inst)
3555 )
3555 )
3556 return 1
3556 return 1
3557 sep, eol = b':', b'\n'
3557 sep, eol = b':', b'\n'
3558 if opts.get(b'print0'):
3558 if opts.get(b'print0'):
3559 sep = eol = b'\0'
3559 sep = eol = b'\0'
3560
3560
3561 searcher = grepmod.grepsearcher(
3561 searcher = grepmod.grepsearcher(
3562 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3562 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3563 )
3563 )
3564
3564
3565 getfile = searcher._getfile
3565 getfile = searcher._getfile
3566
3566
3567 uipathfn = scmutil.getuipathfn(repo)
3567 uipathfn = scmutil.getuipathfn(repo)
3568
3568
3569 def display(fm, fn, ctx, pstates, states):
3569 def display(fm, fn, ctx, pstates, states):
3570 rev = scmutil.intrev(ctx)
3570 rev = scmutil.intrev(ctx)
3571 if fm.isplain():
3571 if fm.isplain():
3572 formatuser = ui.shortuser
3572 formatuser = ui.shortuser
3573 else:
3573 else:
3574 formatuser = pycompat.bytestr
3574 formatuser = pycompat.bytestr
3575 if ui.quiet:
3575 if ui.quiet:
3576 datefmt = b'%Y-%m-%d'
3576 datefmt = b'%Y-%m-%d'
3577 else:
3577 else:
3578 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3578 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3579 found = False
3579 found = False
3580
3580
3581 @util.cachefunc
3581 @util.cachefunc
3582 def binary():
3582 def binary():
3583 flog = getfile(fn)
3583 flog = getfile(fn)
3584 try:
3584 try:
3585 return stringutil.binary(flog.read(ctx.filenode(fn)))
3585 return stringutil.binary(flog.read(ctx.filenode(fn)))
3586 except error.WdirUnsupported:
3586 except error.WdirUnsupported:
3587 return ctx[fn].isbinary()
3587 return ctx[fn].isbinary()
3588
3588
3589 fieldnamemap = {b'linenumber': b'lineno'}
3589 fieldnamemap = {b'linenumber': b'lineno'}
3590 if diff:
3590 if diff:
3591 iter = grepmod.difflinestates(pstates, states)
3591 iter = grepmod.difflinestates(pstates, states)
3592 else:
3592 else:
3593 iter = [(b'', l) for l in states]
3593 iter = [(b'', l) for l in states]
3594 for change, l in iter:
3594 for change, l in iter:
3595 fm.startitem()
3595 fm.startitem()
3596 fm.context(ctx=ctx)
3596 fm.context(ctx=ctx)
3597 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3597 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3598 fm.plain(uipathfn(fn), label=b'grep.filename')
3598 fm.plain(uipathfn(fn), label=b'grep.filename')
3599
3599
3600 cols = [
3600 cols = [
3601 (b'rev', b'%d', rev, not plaingrep, b''),
3601 (b'rev', b'%d', rev, not plaingrep, b''),
3602 (
3602 (
3603 b'linenumber',
3603 b'linenumber',
3604 b'%d',
3604 b'%d',
3605 l.linenum,
3605 l.linenum,
3606 opts.get(b'line_number'),
3606 opts.get(b'line_number'),
3607 b'',
3607 b'',
3608 ),
3608 ),
3609 ]
3609 ]
3610 if diff:
3610 if diff:
3611 cols.append(
3611 cols.append(
3612 (
3612 (
3613 b'change',
3613 b'change',
3614 b'%s',
3614 b'%s',
3615 change,
3615 change,
3616 True,
3616 True,
3617 b'grep.inserted '
3617 b'grep.inserted '
3618 if change == b'+'
3618 if change == b'+'
3619 else b'grep.deleted ',
3619 else b'grep.deleted ',
3620 )
3620 )
3621 )
3621 )
3622 cols.extend(
3622 cols.extend(
3623 [
3623 [
3624 (
3624 (
3625 b'user',
3625 b'user',
3626 b'%s',
3626 b'%s',
3627 formatuser(ctx.user()),
3627 formatuser(ctx.user()),
3628 opts.get(b'user'),
3628 opts.get(b'user'),
3629 b'',
3629 b'',
3630 ),
3630 ),
3631 (
3631 (
3632 b'date',
3632 b'date',
3633 b'%s',
3633 b'%s',
3634 fm.formatdate(ctx.date(), datefmt),
3634 fm.formatdate(ctx.date(), datefmt),
3635 opts.get(b'date'),
3635 opts.get(b'date'),
3636 b'',
3636 b'',
3637 ),
3637 ),
3638 ]
3638 ]
3639 )
3639 )
3640 for name, fmt, data, cond, extra_label in cols:
3640 for name, fmt, data, cond, extra_label in cols:
3641 if cond:
3641 if cond:
3642 fm.plain(sep, label=b'grep.sep')
3642 fm.plain(sep, label=b'grep.sep')
3643 field = fieldnamemap.get(name, name)
3643 field = fieldnamemap.get(name, name)
3644 label = extra_label + (b'grep.%s' % name)
3644 label = extra_label + (b'grep.%s' % name)
3645 fm.condwrite(cond, field, fmt, data, label=label)
3645 fm.condwrite(cond, field, fmt, data, label=label)
3646 if not opts.get(b'files_with_matches'):
3646 if not opts.get(b'files_with_matches'):
3647 fm.plain(sep, label=b'grep.sep')
3647 fm.plain(sep, label=b'grep.sep')
3648 if not opts.get(b'text') and binary():
3648 if not opts.get(b'text') and binary():
3649 fm.plain(_(b" Binary file matches"))
3649 fm.plain(_(b" Binary file matches"))
3650 else:
3650 else:
3651 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3651 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3652 fm.plain(eol)
3652 fm.plain(eol)
3653 found = True
3653 found = True
3654 if opts.get(b'files_with_matches'):
3654 if opts.get(b'files_with_matches'):
3655 break
3655 break
3656 return found
3656 return found
3657
3657
3658 def displaymatches(fm, l):
3658 def displaymatches(fm, l):
3659 p = 0
3659 p = 0
3660 for s, e in l.findpos(regexp):
3660 for s, e in l.findpos(regexp):
3661 if p < s:
3661 if p < s:
3662 fm.startitem()
3662 fm.startitem()
3663 fm.write(b'text', b'%s', l.line[p:s])
3663 fm.write(b'text', b'%s', l.line[p:s])
3664 fm.data(matched=False)
3664 fm.data(matched=False)
3665 fm.startitem()
3665 fm.startitem()
3666 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3666 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3667 fm.data(matched=True)
3667 fm.data(matched=True)
3668 p = e
3668 p = e
3669 if p < len(l.line):
3669 if p < len(l.line):
3670 fm.startitem()
3670 fm.startitem()
3671 fm.write(b'text', b'%s', l.line[p:])
3671 fm.write(b'text', b'%s', l.line[p:])
3672 fm.data(matched=False)
3672 fm.data(matched=False)
3673 fm.end()
3673 fm.end()
3674
3674
3675 found = False
3675 found = False
3676
3676
3677 wopts = logcmdutil.walkopts(
3677 wopts = logcmdutil.walkopts(
3678 pats=pats,
3678 pats=pats,
3679 opts=opts,
3679 opts=opts,
3680 revspec=opts[b'rev'],
3680 revspec=opts[b'rev'],
3681 include_pats=opts[b'include'],
3681 include_pats=opts[b'include'],
3682 exclude_pats=opts[b'exclude'],
3682 exclude_pats=opts[b'exclude'],
3683 follow=follow,
3683 follow=follow,
3684 force_changelog_traversal=all_files,
3684 force_changelog_traversal=all_files,
3685 filter_revisions_by_pats=not all_files,
3685 filter_revisions_by_pats=not all_files,
3686 )
3686 )
3687 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3687 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3688
3688
3689 ui.pager(b'grep')
3689 ui.pager(b'grep')
3690 fm = ui.formatter(b'grep', opts)
3690 fm = ui.formatter(b'grep', opts)
3691 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3691 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3692 r = display(fm, fn, ctx, pstates, states)
3692 r = display(fm, fn, ctx, pstates, states)
3693 found = found or r
3693 found = found or r
3694 if r and not diff and not all_files:
3694 if r and not diff and not all_files:
3695 searcher.skipfile(fn, ctx.rev())
3695 searcher.skipfile(fn, ctx.rev())
3696 fm.end()
3696 fm.end()
3697
3697
3698 return not found
3698 return not found
3699
3699
3700
3700
3701 @command(
3701 @command(
3702 b'heads',
3702 b'heads',
3703 [
3703 [
3704 (
3704 (
3705 b'r',
3705 b'r',
3706 b'rev',
3706 b'rev',
3707 b'',
3707 b'',
3708 _(b'show only heads which are descendants of STARTREV'),
3708 _(b'show only heads which are descendants of STARTREV'),
3709 _(b'STARTREV'),
3709 _(b'STARTREV'),
3710 ),
3710 ),
3711 (b't', b'topo', False, _(b'show topological heads only')),
3711 (b't', b'topo', False, _(b'show topological heads only')),
3712 (
3712 (
3713 b'a',
3713 b'a',
3714 b'active',
3714 b'active',
3715 False,
3715 False,
3716 _(b'show active branchheads only (DEPRECATED)'),
3716 _(b'show active branchheads only (DEPRECATED)'),
3717 ),
3717 ),
3718 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3718 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3719 ]
3719 ]
3720 + templateopts,
3720 + templateopts,
3721 _(b'[-ct] [-r STARTREV] [REV]...'),
3721 _(b'[-ct] [-r STARTREV] [REV]...'),
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3723 intents={INTENT_READONLY},
3723 intents={INTENT_READONLY},
3724 )
3724 )
3725 def heads(ui, repo, *branchrevs, **opts):
3725 def heads(ui, repo, *branchrevs, **opts):
3726 """show branch heads
3726 """show branch heads
3727
3727
3728 With no arguments, show all open branch heads in the repository.
3728 With no arguments, show all open branch heads in the repository.
3729 Branch heads are changesets that have no descendants on the
3729 Branch heads are changesets that have no descendants on the
3730 same branch. They are where development generally takes place and
3730 same branch. They are where development generally takes place and
3731 are the usual targets for update and merge operations.
3731 are the usual targets for update and merge operations.
3732
3732
3733 If one or more REVs are given, only open branch heads on the
3733 If one or more REVs are given, only open branch heads on the
3734 branches associated with the specified changesets are shown. This
3734 branches associated with the specified changesets are shown. This
3735 means that you can use :hg:`heads .` to see the heads on the
3735 means that you can use :hg:`heads .` to see the heads on the
3736 currently checked-out branch.
3736 currently checked-out branch.
3737
3737
3738 If -c/--closed is specified, also show branch heads marked closed
3738 If -c/--closed is specified, also show branch heads marked closed
3739 (see :hg:`commit --close-branch`).
3739 (see :hg:`commit --close-branch`).
3740
3740
3741 If STARTREV is specified, only those heads that are descendants of
3741 If STARTREV is specified, only those heads that are descendants of
3742 STARTREV will be displayed.
3742 STARTREV will be displayed.
3743
3743
3744 If -t/--topo is specified, named branch mechanics will be ignored and only
3744 If -t/--topo is specified, named branch mechanics will be ignored and only
3745 topological heads (changesets with no children) will be shown.
3745 topological heads (changesets with no children) will be shown.
3746
3746
3747 Returns 0 if matching heads are found, 1 if not.
3747 Returns 0 if matching heads are found, 1 if not.
3748 """
3748 """
3749
3749
3750 opts = pycompat.byteskwargs(opts)
3750 opts = pycompat.byteskwargs(opts)
3751 start = None
3751 start = None
3752 rev = opts.get(b'rev')
3752 rev = opts.get(b'rev')
3753 if rev:
3753 if rev:
3754 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3754 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3755 start = logcmdutil.revsingle(repo, rev, None).node()
3755 start = logcmdutil.revsingle(repo, rev, None).node()
3756
3756
3757 if opts.get(b'topo'):
3757 if opts.get(b'topo'):
3758 heads = [repo[h] for h in repo.heads(start)]
3758 heads = [repo[h] for h in repo.heads(start)]
3759 else:
3759 else:
3760 heads = []
3760 heads = []
3761 for branch in repo.branchmap():
3761 for branch in repo.branchmap():
3762 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3762 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3763 heads = [repo[h] for h in heads]
3763 heads = [repo[h] for h in heads]
3764
3764
3765 if branchrevs:
3765 if branchrevs:
3766 branches = {
3766 branches = {
3767 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3767 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3768 }
3768 }
3769 heads = [h for h in heads if h.branch() in branches]
3769 heads = [h for h in heads if h.branch() in branches]
3770
3770
3771 if opts.get(b'active') and branchrevs:
3771 if opts.get(b'active') and branchrevs:
3772 dagheads = repo.heads(start)
3772 dagheads = repo.heads(start)
3773 heads = [h for h in heads if h.node() in dagheads]
3773 heads = [h for h in heads if h.node() in dagheads]
3774
3774
3775 if branchrevs:
3775 if branchrevs:
3776 haveheads = {h.branch() for h in heads}
3776 haveheads = {h.branch() for h in heads}
3777 if branches - haveheads:
3777 if branches - haveheads:
3778 headless = b', '.join(b for b in branches - haveheads)
3778 headless = b', '.join(b for b in branches - haveheads)
3779 msg = _(b'no open branch heads found on branches %s')
3779 msg = _(b'no open branch heads found on branches %s')
3780 if opts.get(b'rev'):
3780 if opts.get(b'rev'):
3781 msg += _(b' (started at %s)') % opts[b'rev']
3781 msg += _(b' (started at %s)') % opts[b'rev']
3782 ui.warn((msg + b'\n') % headless)
3782 ui.warn((msg + b'\n') % headless)
3783
3783
3784 if not heads:
3784 if not heads:
3785 return 1
3785 return 1
3786
3786
3787 ui.pager(b'heads')
3787 ui.pager(b'heads')
3788 heads = sorted(heads, key=lambda x: -(x.rev()))
3788 heads = sorted(heads, key=lambda x: -(x.rev()))
3789 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3789 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3790 for ctx in heads:
3790 for ctx in heads:
3791 displayer.show(ctx)
3791 displayer.show(ctx)
3792 displayer.close()
3792 displayer.close()
3793
3793
3794
3794
3795 @command(
3795 @command(
3796 b'help',
3796 b'help',
3797 [
3797 [
3798 (b'e', b'extension', None, _(b'show only help for extensions')),
3798 (b'e', b'extension', None, _(b'show only help for extensions')),
3799 (b'c', b'command', None, _(b'show only help for commands')),
3799 (b'c', b'command', None, _(b'show only help for commands')),
3800 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3800 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3801 (
3801 (
3802 b's',
3802 b's',
3803 b'system',
3803 b'system',
3804 [],
3804 [],
3805 _(b'show help for specific platform(s)'),
3805 _(b'show help for specific platform(s)'),
3806 _(b'PLATFORM'),
3806 _(b'PLATFORM'),
3807 ),
3807 ),
3808 ],
3808 ],
3809 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3809 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3810 helpcategory=command.CATEGORY_HELP,
3810 helpcategory=command.CATEGORY_HELP,
3811 norepo=True,
3811 norepo=True,
3812 intents={INTENT_READONLY},
3812 intents={INTENT_READONLY},
3813 )
3813 )
3814 def help_(ui, name=None, **opts):
3814 def help_(ui, name=None, **opts):
3815 """show help for a given topic or a help overview
3815 """show help for a given topic or a help overview
3816
3816
3817 With no arguments, print a list of commands with short help messages.
3817 With no arguments, print a list of commands with short help messages.
3818
3818
3819 Given a topic, extension, or command name, print help for that
3819 Given a topic, extension, or command name, print help for that
3820 topic.
3820 topic.
3821
3821
3822 Returns 0 if successful.
3822 Returns 0 if successful.
3823 """
3823 """
3824
3824
3825 keep = opts.get('system') or []
3825 keep = opts.get('system') or []
3826 if len(keep) == 0:
3826 if len(keep) == 0:
3827 if pycompat.sysplatform.startswith(b'win'):
3827 if pycompat.sysplatform.startswith(b'win'):
3828 keep.append(b'windows')
3828 keep.append(b'windows')
3829 elif pycompat.sysplatform == b'OpenVMS':
3829 elif pycompat.sysplatform == b'OpenVMS':
3830 keep.append(b'vms')
3830 keep.append(b'vms')
3831 elif pycompat.sysplatform == b'plan9':
3831 elif pycompat.sysplatform == b'plan9':
3832 keep.append(b'plan9')
3832 keep.append(b'plan9')
3833 else:
3833 else:
3834 keep.append(b'unix')
3834 keep.append(b'unix')
3835 keep.append(pycompat.sysplatform.lower())
3835 keep.append(pycompat.sysplatform.lower())
3836 if ui.verbose:
3836 if ui.verbose:
3837 keep.append(b'verbose')
3837 keep.append(b'verbose')
3838
3838
3839 commands = sys.modules[__name__]
3839 commands = sys.modules[__name__]
3840 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3840 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3841 ui.pager(b'help')
3841 ui.pager(b'help')
3842 ui.write(formatted)
3842 ui.write(formatted)
3843
3843
3844
3844
3845 @command(
3845 @command(
3846 b'identify|id',
3846 b'identify|id',
3847 [
3847 [
3848 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3848 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3849 (b'n', b'num', None, _(b'show local revision number')),
3849 (b'n', b'num', None, _(b'show local revision number')),
3850 (b'i', b'id', None, _(b'show global revision id')),
3850 (b'i', b'id', None, _(b'show global revision id')),
3851 (b'b', b'branch', None, _(b'show branch')),
3851 (b'b', b'branch', None, _(b'show branch')),
3852 (b't', b'tags', None, _(b'show tags')),
3852 (b't', b'tags', None, _(b'show tags')),
3853 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3853 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3854 ]
3854 ]
3855 + remoteopts
3855 + remoteopts
3856 + formatteropts,
3856 + formatteropts,
3857 _(b'[-nibtB] [-r REV] [SOURCE]'),
3857 _(b'[-nibtB] [-r REV] [SOURCE]'),
3858 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3858 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3859 optionalrepo=True,
3859 optionalrepo=True,
3860 intents={INTENT_READONLY},
3860 intents={INTENT_READONLY},
3861 )
3861 )
3862 def identify(
3862 def identify(
3863 ui,
3863 ui,
3864 repo,
3864 repo,
3865 source=None,
3865 source=None,
3866 rev=None,
3866 rev=None,
3867 num=None,
3867 num=None,
3868 id=None,
3868 id=None,
3869 branch=None,
3869 branch=None,
3870 tags=None,
3870 tags=None,
3871 bookmarks=None,
3871 bookmarks=None,
3872 **opts
3872 **opts
3873 ):
3873 ):
3874 """identify the working directory or specified revision
3874 """identify the working directory or specified revision
3875
3875
3876 Print a summary identifying the repository state at REV using one or
3876 Print a summary identifying the repository state at REV using one or
3877 two parent hash identifiers, followed by a "+" if the working
3877 two parent hash identifiers, followed by a "+" if the working
3878 directory has uncommitted changes, the branch name (if not default),
3878 directory has uncommitted changes, the branch name (if not default),
3879 a list of tags, and a list of bookmarks.
3879 a list of tags, and a list of bookmarks.
3880
3880
3881 When REV is not given, print a summary of the current state of the
3881 When REV is not given, print a summary of the current state of the
3882 repository including the working directory. Specify -r. to get information
3882 repository including the working directory. Specify -r. to get information
3883 of the working directory parent without scanning uncommitted changes.
3883 of the working directory parent without scanning uncommitted changes.
3884
3884
3885 Specifying a path to a repository root or Mercurial bundle will
3885 Specifying a path to a repository root or Mercurial bundle will
3886 cause lookup to operate on that repository/bundle.
3886 cause lookup to operate on that repository/bundle.
3887
3887
3888 .. container:: verbose
3888 .. container:: verbose
3889
3889
3890 Template:
3890 Template:
3891
3891
3892 The following keywords are supported in addition to the common template
3892 The following keywords are supported in addition to the common template
3893 keywords and functions. See also :hg:`help templates`.
3893 keywords and functions. See also :hg:`help templates`.
3894
3894
3895 :dirty: String. Character ``+`` denoting if the working directory has
3895 :dirty: String. Character ``+`` denoting if the working directory has
3896 uncommitted changes.
3896 uncommitted changes.
3897 :id: String. One or two nodes, optionally followed by ``+``.
3897 :id: String. One or two nodes, optionally followed by ``+``.
3898 :parents: List of strings. Parent nodes of the changeset.
3898 :parents: List of strings. Parent nodes of the changeset.
3899
3899
3900 Examples:
3900 Examples:
3901
3901
3902 - generate a build identifier for the working directory::
3902 - generate a build identifier for the working directory::
3903
3903
3904 hg id --id > build-id.dat
3904 hg id --id > build-id.dat
3905
3905
3906 - find the revision corresponding to a tag::
3906 - find the revision corresponding to a tag::
3907
3907
3908 hg id -n -r 1.3
3908 hg id -n -r 1.3
3909
3909
3910 - check the most recent revision of a remote repository::
3910 - check the most recent revision of a remote repository::
3911
3911
3912 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3912 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3913
3913
3914 See :hg:`log` for generating more information about specific revisions,
3914 See :hg:`log` for generating more information about specific revisions,
3915 including full hash identifiers.
3915 including full hash identifiers.
3916
3916
3917 Returns 0 if successful.
3917 Returns 0 if successful.
3918 """
3918 """
3919
3919
3920 opts = pycompat.byteskwargs(opts)
3920 opts = pycompat.byteskwargs(opts)
3921 if not repo and not source:
3921 if not repo and not source:
3922 raise error.InputError(
3922 raise error.InputError(
3923 _(b"there is no Mercurial repository here (.hg not found)")
3923 _(b"there is no Mercurial repository here (.hg not found)")
3924 )
3924 )
3925
3925
3926 default = not (num or id or branch or tags or bookmarks)
3926 default = not (num or id or branch or tags or bookmarks)
3927 output = []
3927 output = []
3928 revs = []
3928 revs = []
3929
3929
3930 peer = None
3930 peer = None
3931 try:
3931 try:
3932 if source:
3932 if source:
3933 path = urlutil.get_unique_pull_path_obj(b'identify', ui, source)
3933 path = urlutil.get_unique_pull_path_obj(b'identify', ui, source)
3934 # only pass ui when no repo
3934 # only pass ui when no repo
3935 peer = hg.peer(repo or ui, opts, path)
3935 peer = hg.peer(repo or ui, opts, path)
3936 repo = peer.local()
3936 repo = peer.local()
3937 branches = (path.branch, [])
3937 branches = (path.branch, [])
3938 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3938 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3939
3939
3940 fm = ui.formatter(b'identify', opts)
3940 fm = ui.formatter(b'identify', opts)
3941 fm.startitem()
3941 fm.startitem()
3942
3942
3943 if not repo:
3943 if not repo:
3944 if num or branch or tags:
3944 if num or branch or tags:
3945 raise error.InputError(
3945 raise error.InputError(
3946 _(b"can't query remote revision number, branch, or tags")
3946 _(b"can't query remote revision number, branch, or tags")
3947 )
3947 )
3948 if not rev and revs:
3948 if not rev and revs:
3949 rev = revs[0]
3949 rev = revs[0]
3950 if not rev:
3950 if not rev:
3951 rev = b"tip"
3951 rev = b"tip"
3952
3952
3953 remoterev = peer.lookup(rev)
3953 remoterev = peer.lookup(rev)
3954 hexrev = fm.hexfunc(remoterev)
3954 hexrev = fm.hexfunc(remoterev)
3955 if default or id:
3955 if default or id:
3956 output = [hexrev]
3956 output = [hexrev]
3957 fm.data(id=hexrev)
3957 fm.data(id=hexrev)
3958
3958
3959 @util.cachefunc
3959 @util.cachefunc
3960 def getbms():
3960 def getbms():
3961 bms = []
3961 bms = []
3962
3962
3963 if b'bookmarks' in peer.listkeys(b'namespaces'):
3963 if b'bookmarks' in peer.listkeys(b'namespaces'):
3964 hexremoterev = hex(remoterev)
3964 hexremoterev = hex(remoterev)
3965 bms = [
3965 bms = [
3966 bm
3966 bm
3967 for bm, bmr in peer.listkeys(b'bookmarks').items()
3967 for bm, bmr in peer.listkeys(b'bookmarks').items()
3968 if bmr == hexremoterev
3968 if bmr == hexremoterev
3969 ]
3969 ]
3970
3970
3971 return sorted(bms)
3971 return sorted(bms)
3972
3972
3973 if fm.isplain():
3973 if fm.isplain():
3974 if bookmarks:
3974 if bookmarks:
3975 output.extend(getbms())
3975 output.extend(getbms())
3976 elif default and not ui.quiet:
3976 elif default and not ui.quiet:
3977 # multiple bookmarks for a single parent separated by '/'
3977 # multiple bookmarks for a single parent separated by '/'
3978 bm = b'/'.join(getbms())
3978 bm = b'/'.join(getbms())
3979 if bm:
3979 if bm:
3980 output.append(bm)
3980 output.append(bm)
3981 else:
3981 else:
3982 fm.data(node=hex(remoterev))
3982 fm.data(node=hex(remoterev))
3983 if bookmarks or b'bookmarks' in fm.datahint():
3983 if bookmarks or b'bookmarks' in fm.datahint():
3984 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3984 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3985 else:
3985 else:
3986 if rev:
3986 if rev:
3987 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3987 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3988 ctx = logcmdutil.revsingle(repo, rev, None)
3988 ctx = logcmdutil.revsingle(repo, rev, None)
3989
3989
3990 if ctx.rev() is None:
3990 if ctx.rev() is None:
3991 ctx = repo[None]
3991 ctx = repo[None]
3992 parents = ctx.parents()
3992 parents = ctx.parents()
3993 taglist = []
3993 taglist = []
3994 for p in parents:
3994 for p in parents:
3995 taglist.extend(p.tags())
3995 taglist.extend(p.tags())
3996
3996
3997 dirty = b""
3997 dirty = b""
3998 if ctx.dirty(missing=True, merge=False, branch=False):
3998 if ctx.dirty(missing=True, merge=False, branch=False):
3999 dirty = b'+'
3999 dirty = b'+'
4000 fm.data(dirty=dirty)
4000 fm.data(dirty=dirty)
4001
4001
4002 hexoutput = [fm.hexfunc(p.node()) for p in parents]
4002 hexoutput = [fm.hexfunc(p.node()) for p in parents]
4003 if default or id:
4003 if default or id:
4004 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
4004 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
4005 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
4005 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
4006
4006
4007 if num:
4007 if num:
4008 numoutput = [b"%d" % p.rev() for p in parents]
4008 numoutput = [b"%d" % p.rev() for p in parents]
4009 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
4009 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
4010
4010
4011 fm.data(
4011 fm.data(
4012 parents=fm.formatlist(
4012 parents=fm.formatlist(
4013 [fm.hexfunc(p.node()) for p in parents], name=b'node'
4013 [fm.hexfunc(p.node()) for p in parents], name=b'node'
4014 )
4014 )
4015 )
4015 )
4016 else:
4016 else:
4017 hexoutput = fm.hexfunc(ctx.node())
4017 hexoutput = fm.hexfunc(ctx.node())
4018 if default or id:
4018 if default or id:
4019 output = [hexoutput]
4019 output = [hexoutput]
4020 fm.data(id=hexoutput)
4020 fm.data(id=hexoutput)
4021
4021
4022 if num:
4022 if num:
4023 output.append(pycompat.bytestr(ctx.rev()))
4023 output.append(pycompat.bytestr(ctx.rev()))
4024 taglist = ctx.tags()
4024 taglist = ctx.tags()
4025
4025
4026 if default and not ui.quiet:
4026 if default and not ui.quiet:
4027 b = ctx.branch()
4027 b = ctx.branch()
4028 if b != b'default':
4028 if b != b'default':
4029 output.append(b"(%s)" % b)
4029 output.append(b"(%s)" % b)
4030
4030
4031 # multiple tags for a single parent separated by '/'
4031 # multiple tags for a single parent separated by '/'
4032 t = b'/'.join(taglist)
4032 t = b'/'.join(taglist)
4033 if t:
4033 if t:
4034 output.append(t)
4034 output.append(t)
4035
4035
4036 # multiple bookmarks for a single parent separated by '/'
4036 # multiple bookmarks for a single parent separated by '/'
4037 bm = b'/'.join(ctx.bookmarks())
4037 bm = b'/'.join(ctx.bookmarks())
4038 if bm:
4038 if bm:
4039 output.append(bm)
4039 output.append(bm)
4040 else:
4040 else:
4041 if branch:
4041 if branch:
4042 output.append(ctx.branch())
4042 output.append(ctx.branch())
4043
4043
4044 if tags:
4044 if tags:
4045 output.extend(taglist)
4045 output.extend(taglist)
4046
4046
4047 if bookmarks:
4047 if bookmarks:
4048 output.extend(ctx.bookmarks())
4048 output.extend(ctx.bookmarks())
4049
4049
4050 fm.data(node=ctx.hex())
4050 fm.data(node=ctx.hex())
4051 fm.data(branch=ctx.branch())
4051 fm.data(branch=ctx.branch())
4052 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4052 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4053 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4053 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4054 fm.context(ctx=ctx)
4054 fm.context(ctx=ctx)
4055
4055
4056 fm.plain(b"%s\n" % b' '.join(output))
4056 fm.plain(b"%s\n" % b' '.join(output))
4057 fm.end()
4057 fm.end()
4058 finally:
4058 finally:
4059 if peer:
4059 if peer:
4060 peer.close()
4060 peer.close()
4061
4061
4062
4062
4063 @command(
4063 @command(
4064 b'import|patch',
4064 b'import|patch',
4065 [
4065 [
4066 (
4066 (
4067 b'p',
4067 b'p',
4068 b'strip',
4068 b'strip',
4069 1,
4069 1,
4070 _(
4070 _(
4071 b'directory strip option for patch. This has the same '
4071 b'directory strip option for patch. This has the same '
4072 b'meaning as the corresponding patch option'
4072 b'meaning as the corresponding patch option'
4073 ),
4073 ),
4074 _(b'NUM'),
4074 _(b'NUM'),
4075 ),
4075 ),
4076 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4076 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4077 (b'', b'secret', None, _(b'use the secret phase for committing')),
4077 (b'', b'secret', None, _(b'use the secret phase for committing')),
4078 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4078 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4079 (
4079 (
4080 b'f',
4080 b'f',
4081 b'force',
4081 b'force',
4082 None,
4082 None,
4083 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4083 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4084 ),
4084 ),
4085 (
4085 (
4086 b'',
4086 b'',
4087 b'no-commit',
4087 b'no-commit',
4088 None,
4088 None,
4089 _(b"don't commit, just update the working directory"),
4089 _(b"don't commit, just update the working directory"),
4090 ),
4090 ),
4091 (
4091 (
4092 b'',
4092 b'',
4093 b'bypass',
4093 b'bypass',
4094 None,
4094 None,
4095 _(b"apply patch without touching the working directory"),
4095 _(b"apply patch without touching the working directory"),
4096 ),
4096 ),
4097 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4097 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4098 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4098 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4099 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4099 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4100 (
4100 (
4101 b'',
4101 b'',
4102 b'import-branch',
4102 b'import-branch',
4103 None,
4103 None,
4104 _(b'use any branch information in patch (implied by --exact)'),
4104 _(b'use any branch information in patch (implied by --exact)'),
4105 ),
4105 ),
4106 ]
4106 ]
4107 + commitopts
4107 + commitopts
4108 + commitopts2
4108 + commitopts2
4109 + similarityopts,
4109 + similarityopts,
4110 _(b'[OPTION]... PATCH...'),
4110 _(b'[OPTION]... PATCH...'),
4111 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4111 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4112 )
4112 )
4113 def import_(ui, repo, patch1=None, *patches, **opts):
4113 def import_(ui, repo, patch1=None, *patches, **opts):
4114 """import an ordered set of patches
4114 """import an ordered set of patches
4115
4115
4116 Import a list of patches and commit them individually (unless
4116 Import a list of patches and commit them individually (unless
4117 --no-commit is specified).
4117 --no-commit is specified).
4118
4118
4119 To read a patch from standard input (stdin), use "-" as the patch
4119 To read a patch from standard input (stdin), use "-" as the patch
4120 name. If a URL is specified, the patch will be downloaded from
4120 name. If a URL is specified, the patch will be downloaded from
4121 there.
4121 there.
4122
4122
4123 Import first applies changes to the working directory (unless
4123 Import first applies changes to the working directory (unless
4124 --bypass is specified), import will abort if there are outstanding
4124 --bypass is specified), import will abort if there are outstanding
4125 changes.
4125 changes.
4126
4126
4127 Use --bypass to apply and commit patches directly to the
4127 Use --bypass to apply and commit patches directly to the
4128 repository, without affecting the working directory. Without
4128 repository, without affecting the working directory. Without
4129 --exact, patches will be applied on top of the working directory
4129 --exact, patches will be applied on top of the working directory
4130 parent revision.
4130 parent revision.
4131
4131
4132 You can import a patch straight from a mail message. Even patches
4132 You can import a patch straight from a mail message. Even patches
4133 as attachments work (to use the body part, it must have type
4133 as attachments work (to use the body part, it must have type
4134 text/plain or text/x-patch). From and Subject headers of email
4134 text/plain or text/x-patch). From and Subject headers of email
4135 message are used as default committer and commit message. All
4135 message are used as default committer and commit message. All
4136 text/plain body parts before first diff are added to the commit
4136 text/plain body parts before first diff are added to the commit
4137 message.
4137 message.
4138
4138
4139 If the imported patch was generated by :hg:`export`, user and
4139 If the imported patch was generated by :hg:`export`, user and
4140 description from patch override values from message headers and
4140 description from patch override values from message headers and
4141 body. Values given on command line with -m/--message and -u/--user
4141 body. Values given on command line with -m/--message and -u/--user
4142 override these.
4142 override these.
4143
4143
4144 If --exact is specified, import will set the working directory to
4144 If --exact is specified, import will set the working directory to
4145 the parent of each patch before applying it, and will abort if the
4145 the parent of each patch before applying it, and will abort if the
4146 resulting changeset has a different ID than the one recorded in
4146 resulting changeset has a different ID than the one recorded in
4147 the patch. This will guard against various ways that portable
4147 the patch. This will guard against various ways that portable
4148 patch formats and mail systems might fail to transfer Mercurial
4148 patch formats and mail systems might fail to transfer Mercurial
4149 data or metadata. See :hg:`bundle` for lossless transmission.
4149 data or metadata. See :hg:`bundle` for lossless transmission.
4150
4150
4151 Use --partial to ensure a changeset will be created from the patch
4151 Use --partial to ensure a changeset will be created from the patch
4152 even if some hunks fail to apply. Hunks that fail to apply will be
4152 even if some hunks fail to apply. Hunks that fail to apply will be
4153 written to a <target-file>.rej file. Conflicts can then be resolved
4153 written to a <target-file>.rej file. Conflicts can then be resolved
4154 by hand before :hg:`commit --amend` is run to update the created
4154 by hand before :hg:`commit --amend` is run to update the created
4155 changeset. This flag exists to let people import patches that
4155 changeset. This flag exists to let people import patches that
4156 partially apply without losing the associated metadata (author,
4156 partially apply without losing the associated metadata (author,
4157 date, description, ...).
4157 date, description, ...).
4158
4158
4159 .. note::
4159 .. note::
4160
4160
4161 When no hunks apply cleanly, :hg:`import --partial` will create
4161 When no hunks apply cleanly, :hg:`import --partial` will create
4162 an empty changeset, importing only the patch metadata.
4162 an empty changeset, importing only the patch metadata.
4163
4163
4164 With -s/--similarity, hg will attempt to discover renames and
4164 With -s/--similarity, hg will attempt to discover renames and
4165 copies in the patch in the same way as :hg:`addremove`.
4165 copies in the patch in the same way as :hg:`addremove`.
4166
4166
4167 It is possible to use external patch programs to perform the patch
4167 It is possible to use external patch programs to perform the patch
4168 by setting the ``ui.patch`` configuration option. For the default
4168 by setting the ``ui.patch`` configuration option. For the default
4169 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4169 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4170 See :hg:`help config` for more information about configuration
4170 See :hg:`help config` for more information about configuration
4171 files and how to use these options.
4171 files and how to use these options.
4172
4172
4173 See :hg:`help dates` for a list of formats valid for -d/--date.
4173 See :hg:`help dates` for a list of formats valid for -d/--date.
4174
4174
4175 .. container:: verbose
4175 .. container:: verbose
4176
4176
4177 Examples:
4177 Examples:
4178
4178
4179 - import a traditional patch from a website and detect renames::
4179 - import a traditional patch from a website and detect renames::
4180
4180
4181 hg import -s 80 http://example.com/bugfix.patch
4181 hg import -s 80 http://example.com/bugfix.patch
4182
4182
4183 - import a changeset from an hgweb server::
4183 - import a changeset from an hgweb server::
4184
4184
4185 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4185 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4186
4186
4187 - import all the patches in an Unix-style mbox::
4187 - import all the patches in an Unix-style mbox::
4188
4188
4189 hg import incoming-patches.mbox
4189 hg import incoming-patches.mbox
4190
4190
4191 - import patches from stdin::
4191 - import patches from stdin::
4192
4192
4193 hg import -
4193 hg import -
4194
4194
4195 - attempt to exactly restore an exported changeset (not always
4195 - attempt to exactly restore an exported changeset (not always
4196 possible)::
4196 possible)::
4197
4197
4198 hg import --exact proposed-fix.patch
4198 hg import --exact proposed-fix.patch
4199
4199
4200 - use an external tool to apply a patch which is too fuzzy for
4200 - use an external tool to apply a patch which is too fuzzy for
4201 the default internal tool.
4201 the default internal tool.
4202
4202
4203 hg import --config ui.patch="patch --merge" fuzzy.patch
4203 hg import --config ui.patch="patch --merge" fuzzy.patch
4204
4204
4205 - change the default fuzzing from 2 to a less strict 7
4205 - change the default fuzzing from 2 to a less strict 7
4206
4206
4207 hg import --config ui.fuzz=7 fuzz.patch
4207 hg import --config ui.fuzz=7 fuzz.patch
4208
4208
4209 Returns 0 on success, 1 on partial success (see --partial).
4209 Returns 0 on success, 1 on partial success (see --partial).
4210 """
4210 """
4211
4211
4212 cmdutil.check_incompatible_arguments(
4212 cmdutil.check_incompatible_arguments(
4213 opts, 'no_commit', ['bypass', 'secret']
4213 opts, 'no_commit', ['bypass', 'secret']
4214 )
4214 )
4215 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4215 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4216 opts = pycompat.byteskwargs(opts)
4216 opts = pycompat.byteskwargs(opts)
4217 if not patch1:
4217 if not patch1:
4218 raise error.InputError(_(b'need at least one patch to import'))
4218 raise error.InputError(_(b'need at least one patch to import'))
4219
4219
4220 patches = (patch1,) + patches
4220 patches = (patch1,) + patches
4221
4221
4222 date = opts.get(b'date')
4222 date = opts.get(b'date')
4223 if date:
4223 if date:
4224 opts[b'date'] = dateutil.parsedate(date)
4224 opts[b'date'] = dateutil.parsedate(date)
4225
4225
4226 exact = opts.get(b'exact')
4226 exact = opts.get(b'exact')
4227 update = not opts.get(b'bypass')
4227 update = not opts.get(b'bypass')
4228 try:
4228 try:
4229 sim = float(opts.get(b'similarity') or 0)
4229 sim = float(opts.get(b'similarity') or 0)
4230 except ValueError:
4230 except ValueError:
4231 raise error.InputError(_(b'similarity must be a number'))
4231 raise error.InputError(_(b'similarity must be a number'))
4232 if sim < 0 or sim > 100:
4232 if sim < 0 or sim > 100:
4233 raise error.InputError(_(b'similarity must be between 0 and 100'))
4233 raise error.InputError(_(b'similarity must be between 0 and 100'))
4234 if sim and not update:
4234 if sim and not update:
4235 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4235 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4236
4236
4237 base = opts[b"base"]
4237 base = opts[b"base"]
4238 msgs = []
4238 msgs = []
4239 ret = 0
4239 ret = 0
4240
4240
4241 with repo.wlock():
4241 with repo.wlock():
4242 if update:
4242 if update:
4243 cmdutil.checkunfinished(repo)
4243 cmdutil.checkunfinished(repo)
4244 if exact or not opts.get(b'force'):
4244 if exact or not opts.get(b'force'):
4245 cmdutil.bailifchanged(repo)
4245 cmdutil.bailifchanged(repo)
4246
4246
4247 if not opts.get(b'no_commit'):
4247 if not opts.get(b'no_commit'):
4248 lock = repo.lock
4248 lock = repo.lock
4249 tr = lambda: repo.transaction(b'import')
4249 tr = lambda: repo.transaction(b'import')
4250 dsguard = util.nullcontextmanager
4250 dsguard = util.nullcontextmanager
4251 else:
4251 else:
4252 lock = util.nullcontextmanager
4252 lock = util.nullcontextmanager
4253 tr = util.nullcontextmanager
4253 tr = util.nullcontextmanager
4254 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4254 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4255 with lock(), tr(), dsguard():
4255 with lock(), tr(), dsguard():
4256 parents = repo[None].parents()
4256 parents = repo[None].parents()
4257 for patchurl in patches:
4257 for patchurl in patches:
4258 if patchurl == b'-':
4258 if patchurl == b'-':
4259 ui.status(_(b'applying patch from stdin\n'))
4259 ui.status(_(b'applying patch from stdin\n'))
4260 patchfile = ui.fin
4260 patchfile = ui.fin
4261 patchurl = b'stdin' # for error message
4261 patchurl = b'stdin' # for error message
4262 else:
4262 else:
4263 patchurl = os.path.join(base, patchurl)
4263 patchurl = os.path.join(base, patchurl)
4264 ui.status(_(b'applying %s\n') % patchurl)
4264 ui.status(_(b'applying %s\n') % patchurl)
4265 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4265 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4266
4266
4267 haspatch = False
4267 haspatch = False
4268 for hunk in patch.split(patchfile):
4268 for hunk in patch.split(patchfile):
4269 with patch.extract(ui, hunk) as patchdata:
4269 with patch.extract(ui, hunk) as patchdata:
4270 msg, node, rej = cmdutil.tryimportone(
4270 msg, node, rej = cmdutil.tryimportone(
4271 ui, repo, patchdata, parents, opts, msgs, hg.clean
4271 ui, repo, patchdata, parents, opts, msgs, hg.clean
4272 )
4272 )
4273 if msg:
4273 if msg:
4274 haspatch = True
4274 haspatch = True
4275 ui.note(msg + b'\n')
4275 ui.note(msg + b'\n')
4276 if update or exact:
4276 if update or exact:
4277 parents = repo[None].parents()
4277 parents = repo[None].parents()
4278 else:
4278 else:
4279 parents = [repo[node]]
4279 parents = [repo[node]]
4280 if rej:
4280 if rej:
4281 ui.write_err(_(b"patch applied partially\n"))
4281 ui.write_err(_(b"patch applied partially\n"))
4282 ui.write_err(
4282 ui.write_err(
4283 _(
4283 _(
4284 b"(fix the .rej files and run "
4284 b"(fix the .rej files and run "
4285 b"`hg commit --amend`)\n"
4285 b"`hg commit --amend`)\n"
4286 )
4286 )
4287 )
4287 )
4288 ret = 1
4288 ret = 1
4289 break
4289 break
4290
4290
4291 if not haspatch:
4291 if not haspatch:
4292 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4292 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4293
4293
4294 if msgs:
4294 if msgs:
4295 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4295 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4296 return ret
4296 return ret
4297
4297
4298
4298
4299 @command(
4299 @command(
4300 b'incoming|in',
4300 b'incoming|in',
4301 [
4301 [
4302 (
4302 (
4303 b'f',
4303 b'f',
4304 b'force',
4304 b'force',
4305 None,
4305 None,
4306 _(b'run even if remote repository is unrelated'),
4306 _(b'run even if remote repository is unrelated'),
4307 ),
4307 ),
4308 (b'n', b'newest-first', None, _(b'show newest record first')),
4308 (b'n', b'newest-first', None, _(b'show newest record first')),
4309 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4309 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4310 (
4310 (
4311 b'r',
4311 b'r',
4312 b'rev',
4312 b'rev',
4313 [],
4313 [],
4314 _(b'a remote changeset intended to be added'),
4314 _(b'a remote changeset intended to be added'),
4315 _(b'REV'),
4315 _(b'REV'),
4316 ),
4316 ),
4317 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4317 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4318 (
4318 (
4319 b'b',
4319 b'b',
4320 b'branch',
4320 b'branch',
4321 [],
4321 [],
4322 _(b'a specific branch you would like to pull'),
4322 _(b'a specific branch you would like to pull'),
4323 _(b'BRANCH'),
4323 _(b'BRANCH'),
4324 ),
4324 ),
4325 ]
4325 ]
4326 + logopts
4326 + logopts
4327 + remoteopts
4327 + remoteopts
4328 + subrepoopts,
4328 + subrepoopts,
4329 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4329 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4330 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4330 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4331 )
4331 )
4332 def incoming(ui, repo, source=b"default", **opts):
4332 def incoming(ui, repo, source=b"default", **opts):
4333 """show new changesets found in source
4333 """show new changesets found in source
4334
4334
4335 Show new changesets found in the specified path/URL or the default
4335 Show new changesets found in the specified path/URL or the default
4336 pull location. These are the changesets that would have been pulled
4336 pull location. These are the changesets that would have been pulled
4337 by :hg:`pull` at the time you issued this command.
4337 by :hg:`pull` at the time you issued this command.
4338
4338
4339 See pull for valid source format details.
4339 See pull for valid source format details.
4340
4340
4341 .. container:: verbose
4341 .. container:: verbose
4342
4342
4343 With -B/--bookmarks, the result of bookmark comparison between
4343 With -B/--bookmarks, the result of bookmark comparison between
4344 local and remote repositories is displayed. With -v/--verbose,
4344 local and remote repositories is displayed. With -v/--verbose,
4345 status is also displayed for each bookmark like below::
4345 status is also displayed for each bookmark like below::
4346
4346
4347 BM1 01234567890a added
4347 BM1 01234567890a added
4348 BM2 1234567890ab advanced
4348 BM2 1234567890ab advanced
4349 BM3 234567890abc diverged
4349 BM3 234567890abc diverged
4350 BM4 34567890abcd changed
4350 BM4 34567890abcd changed
4351
4351
4352 The action taken locally when pulling depends on the
4352 The action taken locally when pulling depends on the
4353 status of each bookmark:
4353 status of each bookmark:
4354
4354
4355 :``added``: pull will create it
4355 :``added``: pull will create it
4356 :``advanced``: pull will update it
4356 :``advanced``: pull will update it
4357 :``diverged``: pull will create a divergent bookmark
4357 :``diverged``: pull will create a divergent bookmark
4358 :``changed``: result depends on remote changesets
4358 :``changed``: result depends on remote changesets
4359
4359
4360 From the point of view of pulling behavior, bookmark
4360 From the point of view of pulling behavior, bookmark
4361 existing only in the remote repository are treated as ``added``,
4361 existing only in the remote repository are treated as ``added``,
4362 even if it is in fact locally deleted.
4362 even if it is in fact locally deleted.
4363
4363
4364 .. container:: verbose
4364 .. container:: verbose
4365
4365
4366 For remote repository, using --bundle avoids downloading the
4366 For remote repository, using --bundle avoids downloading the
4367 changesets twice if the incoming is followed by a pull.
4367 changesets twice if the incoming is followed by a pull.
4368
4368
4369 Examples:
4369 Examples:
4370
4370
4371 - show incoming changes with patches and full description::
4371 - show incoming changes with patches and full description::
4372
4372
4373 hg incoming -vp
4373 hg incoming -vp
4374
4374
4375 - show incoming changes excluding merges, store a bundle::
4375 - show incoming changes excluding merges, store a bundle::
4376
4376
4377 hg in -vpM --bundle incoming.hg
4377 hg in -vpM --bundle incoming.hg
4378 hg pull incoming.hg
4378 hg pull incoming.hg
4379
4379
4380 - briefly list changes inside a bundle::
4380 - briefly list changes inside a bundle::
4381
4381
4382 hg in changes.hg -T "{desc|firstline}\\n"
4382 hg in changes.hg -T "{desc|firstline}\\n"
4383
4383
4384 Returns 0 if there are incoming changes, 1 otherwise.
4384 Returns 0 if there are incoming changes, 1 otherwise.
4385 """
4385 """
4386 opts = pycompat.byteskwargs(opts)
4386 opts = pycompat.byteskwargs(opts)
4387 if opts.get(b'graph'):
4387 if opts.get(b'graph'):
4388 logcmdutil.checkunsupportedgraphflags([], opts)
4388 logcmdutil.checkunsupportedgraphflags([], opts)
4389
4389
4390 def display(other, chlist, displayer):
4390 def display(other, chlist, displayer):
4391 revdag = logcmdutil.graphrevs(other, chlist, opts)
4391 revdag = logcmdutil.graphrevs(other, chlist, opts)
4392 logcmdutil.displaygraph(
4392 logcmdutil.displaygraph(
4393 ui, repo, revdag, displayer, graphmod.asciiedges
4393 ui, repo, revdag, displayer, graphmod.asciiedges
4394 )
4394 )
4395
4395
4396 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4396 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4397 return 0
4397 return 0
4398
4398
4399 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4399 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4400
4400
4401 if opts.get(b'bookmarks'):
4401 if opts.get(b'bookmarks'):
4402 srcs = urlutil.get_pull_paths(repo, ui, [source])
4402 srcs = urlutil.get_pull_paths(repo, ui, [source])
4403 for path in srcs:
4403 for path in srcs:
4404 # XXX the "branches" options are not used. Should it be used?
4404 # XXX the "branches" options are not used. Should it be used?
4405 other = hg.peer(repo, opts, path)
4405 other = hg.peer(repo, opts, path)
4406 try:
4406 try:
4407 if b'bookmarks' not in other.listkeys(b'namespaces'):
4407 if b'bookmarks' not in other.listkeys(b'namespaces'):
4408 ui.warn(_(b"remote doesn't support bookmarks\n"))
4408 ui.warn(_(b"remote doesn't support bookmarks\n"))
4409 return 0
4409 return 0
4410 ui.pager(b'incoming')
4410 ui.pager(b'incoming')
4411 ui.status(
4411 ui.status(
4412 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
4412 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
4413 )
4413 )
4414 return bookmarks.incoming(
4414 return bookmarks.incoming(
4415 ui, repo, other, mode=path.bookmarks_mode
4415 ui, repo, other, mode=path.bookmarks_mode
4416 )
4416 )
4417 finally:
4417 finally:
4418 other.close()
4418 other.close()
4419
4419
4420 return hg.incoming(ui, repo, source, opts)
4420 return hg.incoming(ui, repo, source, opts)
4421
4421
4422
4422
4423 @command(
4423 @command(
4424 b'init',
4424 b'init',
4425 remoteopts,
4425 remoteopts,
4426 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4426 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4427 helpcategory=command.CATEGORY_REPO_CREATION,
4427 helpcategory=command.CATEGORY_REPO_CREATION,
4428 helpbasic=True,
4428 helpbasic=True,
4429 norepo=True,
4429 norepo=True,
4430 )
4430 )
4431 def init(ui, dest=b".", **opts):
4431 def init(ui, dest=b".", **opts):
4432 """create a new repository in the given directory
4432 """create a new repository in the given directory
4433
4433
4434 Initialize a new repository in the given directory. If the given
4434 Initialize a new repository in the given directory. If the given
4435 directory does not exist, it will be created.
4435 directory does not exist, it will be created.
4436
4436
4437 If no directory is given, the current directory is used.
4437 If no directory is given, the current directory is used.
4438
4438
4439 It is possible to specify an ``ssh://`` URL as the destination.
4439 It is possible to specify an ``ssh://`` URL as the destination.
4440 See :hg:`help urls` for more information.
4440 See :hg:`help urls` for more information.
4441
4441
4442 Returns 0 on success.
4442 Returns 0 on success.
4443 """
4443 """
4444 opts = pycompat.byteskwargs(opts)
4444 opts = pycompat.byteskwargs(opts)
4445 path = urlutil.get_clone_path_obj(ui, dest)
4445 path = urlutil.get_clone_path_obj(ui, dest)
4446 peer = hg.peer(ui, opts, path, create=True)
4446 peer = hg.peer(ui, opts, path, create=True)
4447 peer.close()
4447 peer.close()
4448
4448
4449
4449
4450 @command(
4450 @command(
4451 b'locate',
4451 b'locate',
4452 [
4452 [
4453 (
4453 (
4454 b'r',
4454 b'r',
4455 b'rev',
4455 b'rev',
4456 b'',
4456 b'',
4457 _(b'search the repository as it is in REV'),
4457 _(b'search the repository as it is in REV'),
4458 _(b'REV'),
4458 _(b'REV'),
4459 ),
4459 ),
4460 (
4460 (
4461 b'0',
4461 b'0',
4462 b'print0',
4462 b'print0',
4463 None,
4463 None,
4464 _(b'end filenames with NUL, for use with xargs'),
4464 _(b'end filenames with NUL, for use with xargs'),
4465 ),
4465 ),
4466 (
4466 (
4467 b'f',
4467 b'f',
4468 b'fullpath',
4468 b'fullpath',
4469 None,
4469 None,
4470 _(b'print complete paths from the filesystem root'),
4470 _(b'print complete paths from the filesystem root'),
4471 ),
4471 ),
4472 ]
4472 ]
4473 + walkopts,
4473 + walkopts,
4474 _(b'[OPTION]... [PATTERN]...'),
4474 _(b'[OPTION]... [PATTERN]...'),
4475 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4475 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4476 )
4476 )
4477 def locate(ui, repo, *pats, **opts):
4477 def locate(ui, repo, *pats, **opts):
4478 """locate files matching specific patterns (DEPRECATED)
4478 """locate files matching specific patterns (DEPRECATED)
4479
4479
4480 Print files under Mercurial control in the working directory whose
4480 Print files under Mercurial control in the working directory whose
4481 names match the given patterns.
4481 names match the given patterns.
4482
4482
4483 By default, this command searches all directories in the working
4483 By default, this command searches all directories in the working
4484 directory. To search just the current directory and its
4484 directory. To search just the current directory and its
4485 subdirectories, use "--include .".
4485 subdirectories, use "--include .".
4486
4486
4487 If no patterns are given to match, this command prints the names
4487 If no patterns are given to match, this command prints the names
4488 of all files under Mercurial control in the working directory.
4488 of all files under Mercurial control in the working directory.
4489
4489
4490 If you want to feed the output of this command into the "xargs"
4490 If you want to feed the output of this command into the "xargs"
4491 command, use the -0 option to both this command and "xargs". This
4491 command, use the -0 option to both this command and "xargs". This
4492 will avoid the problem of "xargs" treating single filenames that
4492 will avoid the problem of "xargs" treating single filenames that
4493 contain whitespace as multiple filenames.
4493 contain whitespace as multiple filenames.
4494
4494
4495 See :hg:`help files` for a more versatile command.
4495 See :hg:`help files` for a more versatile command.
4496
4496
4497 Returns 0 if a match is found, 1 otherwise.
4497 Returns 0 if a match is found, 1 otherwise.
4498 """
4498 """
4499 opts = pycompat.byteskwargs(opts)
4499 opts = pycompat.byteskwargs(opts)
4500 if opts.get(b'print0'):
4500 if opts.get(b'print0'):
4501 end = b'\0'
4501 end = b'\0'
4502 else:
4502 else:
4503 end = b'\n'
4503 end = b'\n'
4504 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4504 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4505
4505
4506 ret = 1
4506 ret = 1
4507 m = scmutil.match(
4507 m = scmutil.match(
4508 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4508 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4509 )
4509 )
4510
4510
4511 ui.pager(b'locate')
4511 ui.pager(b'locate')
4512 if ctx.rev() is None:
4512 if ctx.rev() is None:
4513 # When run on the working copy, "locate" includes removed files, so
4513 # When run on the working copy, "locate" includes removed files, so
4514 # we get the list of files from the dirstate.
4514 # we get the list of files from the dirstate.
4515 filesgen = sorted(repo.dirstate.matches(m))
4515 filesgen = sorted(repo.dirstate.matches(m))
4516 else:
4516 else:
4517 filesgen = ctx.matches(m)
4517 filesgen = ctx.matches(m)
4518 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4518 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4519 for abs in filesgen:
4519 for abs in filesgen:
4520 if opts.get(b'fullpath'):
4520 if opts.get(b'fullpath'):
4521 ui.write(repo.wjoin(abs), end)
4521 ui.write(repo.wjoin(abs), end)
4522 else:
4522 else:
4523 ui.write(uipathfn(abs), end)
4523 ui.write(uipathfn(abs), end)
4524 ret = 0
4524 ret = 0
4525
4525
4526 return ret
4526 return ret
4527
4527
4528
4528
4529 @command(
4529 @command(
4530 b'log|history',
4530 b'log|history',
4531 [
4531 [
4532 (
4532 (
4533 b'f',
4533 b'f',
4534 b'follow',
4534 b'follow',
4535 None,
4535 None,
4536 _(
4536 _(
4537 b'follow changeset history, or file history across copies and renames'
4537 b'follow changeset history, or file history across copies and renames'
4538 ),
4538 ),
4539 ),
4539 ),
4540 (
4540 (
4541 b'',
4541 b'',
4542 b'follow-first',
4542 b'follow-first',
4543 None,
4543 None,
4544 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4544 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4545 ),
4545 ),
4546 (
4546 (
4547 b'd',
4547 b'd',
4548 b'date',
4548 b'date',
4549 b'',
4549 b'',
4550 _(b'show revisions matching date spec'),
4550 _(b'show revisions matching date spec'),
4551 _(b'DATE'),
4551 _(b'DATE'),
4552 ),
4552 ),
4553 (b'C', b'copies', None, _(b'show copied files')),
4553 (b'C', b'copies', None, _(b'show copied files')),
4554 (
4554 (
4555 b'k',
4555 b'k',
4556 b'keyword',
4556 b'keyword',
4557 [],
4557 [],
4558 _(b'do case-insensitive search for a given text'),
4558 _(b'do case-insensitive search for a given text'),
4559 _(b'TEXT'),
4559 _(b'TEXT'),
4560 ),
4560 ),
4561 (
4561 (
4562 b'r',
4562 b'r',
4563 b'rev',
4563 b'rev',
4564 [],
4564 [],
4565 _(b'revisions to select or follow from'),
4565 _(b'revisions to select or follow from'),
4566 _(b'REV'),
4566 _(b'REV'),
4567 ),
4567 ),
4568 (
4568 (
4569 b'L',
4569 b'L',
4570 b'line-range',
4570 b'line-range',
4571 [],
4571 [],
4572 _(b'follow line range of specified file (EXPERIMENTAL)'),
4572 _(b'follow line range of specified file (EXPERIMENTAL)'),
4573 _(b'FILE,RANGE'),
4573 _(b'FILE,RANGE'),
4574 ),
4574 ),
4575 (
4575 (
4576 b'',
4576 b'',
4577 b'removed',
4577 b'removed',
4578 None,
4578 None,
4579 _(b'include revisions where files were removed'),
4579 _(b'include revisions where files were removed'),
4580 ),
4580 ),
4581 (
4581 (
4582 b'm',
4582 b'm',
4583 b'only-merges',
4583 b'only-merges',
4584 None,
4584 None,
4585 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4585 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4586 ),
4586 ),
4587 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4587 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4588 (
4588 (
4589 b'',
4589 b'',
4590 b'only-branch',
4590 b'only-branch',
4591 [],
4591 [],
4592 _(
4592 _(
4593 b'show only changesets within the given named branch (DEPRECATED)'
4593 b'show only changesets within the given named branch (DEPRECATED)'
4594 ),
4594 ),
4595 _(b'BRANCH'),
4595 _(b'BRANCH'),
4596 ),
4596 ),
4597 (
4597 (
4598 b'b',
4598 b'b',
4599 b'branch',
4599 b'branch',
4600 [],
4600 [],
4601 _(b'show changesets within the given named branch'),
4601 _(b'show changesets within the given named branch'),
4602 _(b'BRANCH'),
4602 _(b'BRANCH'),
4603 ),
4603 ),
4604 (
4604 (
4605 b'B',
4605 b'B',
4606 b'bookmark',
4606 b'bookmark',
4607 [],
4607 [],
4608 _(b"show changesets within the given bookmark"),
4608 _(b"show changesets within the given bookmark"),
4609 _(b'BOOKMARK'),
4609 _(b'BOOKMARK'),
4610 ),
4610 ),
4611 (
4611 (
4612 b'P',
4612 b'P',
4613 b'prune',
4613 b'prune',
4614 [],
4614 [],
4615 _(b'do not display revision or any of its ancestors'),
4615 _(b'do not display revision or any of its ancestors'),
4616 _(b'REV'),
4616 _(b'REV'),
4617 ),
4617 ),
4618 ]
4618 ]
4619 + logopts
4619 + logopts
4620 + walkopts,
4620 + walkopts,
4621 _(b'[OPTION]... [FILE]'),
4621 _(b'[OPTION]... [FILE]'),
4622 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4622 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4623 helpbasic=True,
4623 helpbasic=True,
4624 inferrepo=True,
4624 inferrepo=True,
4625 intents={INTENT_READONLY},
4625 intents={INTENT_READONLY},
4626 )
4626 )
4627 def log(ui, repo, *pats, **opts):
4627 def log(ui, repo, *pats, **opts):
4628 """show revision history of entire repository or files
4628 """show revision history of entire repository or files
4629
4629
4630 Print the revision history of the specified files or the entire
4630 Print the revision history of the specified files or the entire
4631 project.
4631 project.
4632
4632
4633 If no revision range is specified, the default is ``tip:0`` unless
4633 If no revision range is specified, the default is ``tip:0`` unless
4634 --follow is set.
4634 --follow is set.
4635
4635
4636 File history is shown without following rename or copy history of
4636 File history is shown without following rename or copy history of
4637 files. Use -f/--follow with a filename to follow history across
4637 files. Use -f/--follow with a filename to follow history across
4638 renames and copies. --follow without a filename will only show
4638 renames and copies. --follow without a filename will only show
4639 ancestors of the starting revisions. The starting revisions can be
4639 ancestors of the starting revisions. The starting revisions can be
4640 specified by -r/--rev, which default to the working directory parent.
4640 specified by -r/--rev, which default to the working directory parent.
4641
4641
4642 By default this command prints revision number and changeset id,
4642 By default this command prints revision number and changeset id,
4643 tags, non-trivial parents, user, date and time, and a summary for
4643 tags, non-trivial parents, user, date and time, and a summary for
4644 each commit. When the -v/--verbose switch is used, the list of
4644 each commit. When the -v/--verbose switch is used, the list of
4645 changed files and full commit message are shown.
4645 changed files and full commit message are shown.
4646
4646
4647 With --graph the revisions are shown as an ASCII art DAG with the most
4647 With --graph the revisions are shown as an ASCII art DAG with the most
4648 recent changeset at the top.
4648 recent changeset at the top.
4649 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4649 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4650 involved in an unresolved merge conflict, '_' closes a branch,
4650 involved in an unresolved merge conflict, '_' closes a branch,
4651 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4651 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4652 changeset from the lines below is a parent of the 'o' merge on the same
4652 changeset from the lines below is a parent of the 'o' merge on the same
4653 line.
4653 line.
4654 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4654 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4655 of a '|' indicates one or more revisions in a path are omitted.
4655 of a '|' indicates one or more revisions in a path are omitted.
4656
4656
4657 .. container:: verbose
4657 .. container:: verbose
4658
4658
4659 Use -L/--line-range FILE,M:N options to follow the history of lines
4659 Use -L/--line-range FILE,M:N options to follow the history of lines
4660 from M to N in FILE. With -p/--patch only diff hunks affecting
4660 from M to N in FILE. With -p/--patch only diff hunks affecting
4661 specified line range will be shown. This option requires --follow;
4661 specified line range will be shown. This option requires --follow;
4662 it can be specified multiple times. Currently, this option is not
4662 it can be specified multiple times. Currently, this option is not
4663 compatible with --graph. This option is experimental.
4663 compatible with --graph. This option is experimental.
4664
4664
4665 .. note::
4665 .. note::
4666
4666
4667 :hg:`log --patch` may generate unexpected diff output for merge
4667 :hg:`log --patch` may generate unexpected diff output for merge
4668 changesets, as it will only compare the merge changeset against
4668 changesets, as it will only compare the merge changeset against
4669 its first parent. Also, only files different from BOTH parents
4669 its first parent. Also, only files different from BOTH parents
4670 will appear in files:.
4670 will appear in files:.
4671
4671
4672 .. note::
4672 .. note::
4673
4673
4674 For performance reasons, :hg:`log FILE` may omit duplicate changes
4674 For performance reasons, :hg:`log FILE` may omit duplicate changes
4675 made on branches and will not show removals or mode changes. To
4675 made on branches and will not show removals or mode changes. To
4676 see all such changes, use the --removed switch.
4676 see all such changes, use the --removed switch.
4677
4677
4678 .. container:: verbose
4678 .. container:: verbose
4679
4679
4680 .. note::
4680 .. note::
4681
4681
4682 The history resulting from -L/--line-range options depends on diff
4682 The history resulting from -L/--line-range options depends on diff
4683 options; for instance if white-spaces are ignored, respective changes
4683 options; for instance if white-spaces are ignored, respective changes
4684 with only white-spaces in specified line range will not be listed.
4684 with only white-spaces in specified line range will not be listed.
4685
4685
4686 .. container:: verbose
4686 .. container:: verbose
4687
4687
4688 Some examples:
4688 Some examples:
4689
4689
4690 - changesets with full descriptions and file lists::
4690 - changesets with full descriptions and file lists::
4691
4691
4692 hg log -v
4692 hg log -v
4693
4693
4694 - changesets ancestral to the working directory::
4694 - changesets ancestral to the working directory::
4695
4695
4696 hg log -f
4696 hg log -f
4697
4697
4698 - last 10 commits on the current branch::
4698 - last 10 commits on the current branch::
4699
4699
4700 hg log -l 10 -b .
4700 hg log -l 10 -b .
4701
4701
4702 - changesets showing all modifications of a file, including removals::
4702 - changesets showing all modifications of a file, including removals::
4703
4703
4704 hg log --removed file.c
4704 hg log --removed file.c
4705
4705
4706 - all changesets that touch a directory, with diffs, excluding merges::
4706 - all changesets that touch a directory, with diffs, excluding merges::
4707
4707
4708 hg log -Mp lib/
4708 hg log -Mp lib/
4709
4709
4710 - all revision numbers that match a keyword::
4710 - all revision numbers that match a keyword::
4711
4711
4712 hg log -k bug --template "{rev}\\n"
4712 hg log -k bug --template "{rev}\\n"
4713
4713
4714 - the full hash identifier of the working directory parent::
4714 - the full hash identifier of the working directory parent::
4715
4715
4716 hg log -r . --template "{node}\\n"
4716 hg log -r . --template "{node}\\n"
4717
4717
4718 - list available log templates::
4718 - list available log templates::
4719
4719
4720 hg log -T list
4720 hg log -T list
4721
4721
4722 - check if a given changeset is included in a tagged release::
4722 - check if a given changeset is included in a tagged release::
4723
4723
4724 hg log -r "a21ccf and ancestor(1.9)"
4724 hg log -r "a21ccf and ancestor(1.9)"
4725
4725
4726 - find all changesets by some user in a date range::
4726 - find all changesets by some user in a date range::
4727
4727
4728 hg log -k alice -d "may 2008 to jul 2008"
4728 hg log -k alice -d "may 2008 to jul 2008"
4729
4729
4730 - summary of all changesets after the last tag::
4730 - summary of all changesets after the last tag::
4731
4731
4732 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4732 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4733
4733
4734 - changesets touching lines 13 to 23 for file.c::
4734 - changesets touching lines 13 to 23 for file.c::
4735
4735
4736 hg log -L file.c,13:23
4736 hg log -L file.c,13:23
4737
4737
4738 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4738 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4739 main.c with patch::
4739 main.c with patch::
4740
4740
4741 hg log -L file.c,13:23 -L main.c,2:6 -p
4741 hg log -L file.c,13:23 -L main.c,2:6 -p
4742
4742
4743 See :hg:`help dates` for a list of formats valid for -d/--date.
4743 See :hg:`help dates` for a list of formats valid for -d/--date.
4744
4744
4745 See :hg:`help revisions` for more about specifying and ordering
4745 See :hg:`help revisions` for more about specifying and ordering
4746 revisions.
4746 revisions.
4747
4747
4748 See :hg:`help templates` for more about pre-packaged styles and
4748 See :hg:`help templates` for more about pre-packaged styles and
4749 specifying custom templates. The default template used by the log
4749 specifying custom templates. The default template used by the log
4750 command can be customized via the ``command-templates.log`` configuration
4750 command can be customized via the ``command-templates.log`` configuration
4751 setting.
4751 setting.
4752
4752
4753 Returns 0 on success.
4753 Returns 0 on success.
4754
4754
4755 """
4755 """
4756 opts = pycompat.byteskwargs(opts)
4756 opts = pycompat.byteskwargs(opts)
4757 linerange = opts.get(b'line_range')
4757 linerange = opts.get(b'line_range')
4758
4758
4759 if linerange and not opts.get(b'follow'):
4759 if linerange and not opts.get(b'follow'):
4760 raise error.InputError(_(b'--line-range requires --follow'))
4760 raise error.InputError(_(b'--line-range requires --follow'))
4761
4761
4762 if linerange and pats:
4762 if linerange and pats:
4763 # TODO: take pats as patterns with no line-range filter
4763 # TODO: take pats as patterns with no line-range filter
4764 raise error.InputError(
4764 raise error.InputError(
4765 _(b'FILE arguments are not compatible with --line-range option')
4765 _(b'FILE arguments are not compatible with --line-range option')
4766 )
4766 )
4767
4767
4768 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4768 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4769 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4769 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4770 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4770 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4771 if linerange:
4771 if linerange:
4772 # TODO: should follow file history from logcmdutil._initialrevs(),
4772 # TODO: should follow file history from logcmdutil._initialrevs(),
4773 # then filter the result by logcmdutil._makerevset() and --limit
4773 # then filter the result by logcmdutil._makerevset() and --limit
4774 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4774 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4775
4775
4776 getcopies = None
4776 getcopies = None
4777 if opts.get(b'copies'):
4777 if opts.get(b'copies'):
4778 endrev = None
4778 endrev = None
4779 if revs:
4779 if revs:
4780 endrev = revs.max() + 1
4780 endrev = revs.max() + 1
4781 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4781 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4782
4782
4783 ui.pager(b'log')
4783 ui.pager(b'log')
4784 displayer = logcmdutil.changesetdisplayer(
4784 displayer = logcmdutil.changesetdisplayer(
4785 ui, repo, opts, differ, buffered=True
4785 ui, repo, opts, differ, buffered=True
4786 )
4786 )
4787 if opts.get(b'graph'):
4787 if opts.get(b'graph'):
4788 displayfn = logcmdutil.displaygraphrevs
4788 displayfn = logcmdutil.displaygraphrevs
4789 else:
4789 else:
4790 displayfn = logcmdutil.displayrevs
4790 displayfn = logcmdutil.displayrevs
4791 displayfn(ui, repo, revs, displayer, getcopies)
4791 displayfn(ui, repo, revs, displayer, getcopies)
4792
4792
4793
4793
4794 @command(
4794 @command(
4795 b'manifest',
4795 b'manifest',
4796 [
4796 [
4797 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4797 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4798 (b'', b'all', False, _(b"list files from all revisions")),
4798 (b'', b'all', False, _(b"list files from all revisions")),
4799 ]
4799 ]
4800 + formatteropts,
4800 + formatteropts,
4801 _(b'[-r REV]'),
4801 _(b'[-r REV]'),
4802 helpcategory=command.CATEGORY_MAINTENANCE,
4802 helpcategory=command.CATEGORY_MAINTENANCE,
4803 intents={INTENT_READONLY},
4803 intents={INTENT_READONLY},
4804 )
4804 )
4805 def manifest(ui, repo, node=None, rev=None, **opts):
4805 def manifest(ui, repo, node=None, rev=None, **opts):
4806 """output the current or given revision of the project manifest
4806 """output the current or given revision of the project manifest
4807
4807
4808 Print a list of version controlled files for the given revision.
4808 Print a list of version controlled files for the given revision.
4809 If no revision is given, the first parent of the working directory
4809 If no revision is given, the first parent of the working directory
4810 is used, or the null revision if no revision is checked out.
4810 is used, or the null revision if no revision is checked out.
4811
4811
4812 With -v, print file permissions, symlink and executable bits.
4812 With -v, print file permissions, symlink and executable bits.
4813 With --debug, print file revision hashes.
4813 With --debug, print file revision hashes.
4814
4814
4815 If option --all is specified, the list of all files from all revisions
4815 If option --all is specified, the list of all files from all revisions
4816 is printed. This includes deleted and renamed files.
4816 is printed. This includes deleted and renamed files.
4817
4817
4818 Returns 0 on success.
4818 Returns 0 on success.
4819 """
4819 """
4820 opts = pycompat.byteskwargs(opts)
4820 opts = pycompat.byteskwargs(opts)
4821 fm = ui.formatter(b'manifest', opts)
4821 fm = ui.formatter(b'manifest', opts)
4822
4822
4823 if opts.get(b'all'):
4823 if opts.get(b'all'):
4824 if rev or node:
4824 if rev or node:
4825 raise error.InputError(_(b"can't specify a revision with --all"))
4825 raise error.InputError(_(b"can't specify a revision with --all"))
4826
4826
4827 res = set()
4827 res = set()
4828 for rev in repo:
4828 for rev in repo:
4829 ctx = repo[rev]
4829 ctx = repo[rev]
4830 res |= set(ctx.files())
4830 res |= set(ctx.files())
4831
4831
4832 ui.pager(b'manifest')
4832 ui.pager(b'manifest')
4833 for f in sorted(res):
4833 for f in sorted(res):
4834 fm.startitem()
4834 fm.startitem()
4835 fm.write(b"path", b'%s\n', f)
4835 fm.write(b"path", b'%s\n', f)
4836 fm.end()
4836 fm.end()
4837 return
4837 return
4838
4838
4839 if rev and node:
4839 if rev and node:
4840 raise error.InputError(_(b"please specify just one revision"))
4840 raise error.InputError(_(b"please specify just one revision"))
4841
4841
4842 if not node:
4842 if not node:
4843 node = rev
4843 node = rev
4844
4844
4845 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4845 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4846 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4846 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4847 if node:
4847 if node:
4848 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4848 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4849 ctx = logcmdutil.revsingle(repo, node)
4849 ctx = logcmdutil.revsingle(repo, node)
4850 mf = ctx.manifest()
4850 mf = ctx.manifest()
4851 ui.pager(b'manifest')
4851 ui.pager(b'manifest')
4852 for f in ctx:
4852 for f in ctx:
4853 fm.startitem()
4853 fm.startitem()
4854 fm.context(ctx=ctx)
4854 fm.context(ctx=ctx)
4855 fl = ctx[f].flags()
4855 fl = ctx[f].flags()
4856 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4856 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4857 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4857 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4858 fm.write(b'path', b'%s\n', f)
4858 fm.write(b'path', b'%s\n', f)
4859 fm.end()
4859 fm.end()
4860
4860
4861
4861
4862 @command(
4862 @command(
4863 b'merge',
4863 b'merge',
4864 [
4864 [
4865 (
4865 (
4866 b'f',
4866 b'f',
4867 b'force',
4867 b'force',
4868 None,
4868 None,
4869 _(b'force a merge including outstanding changes (DEPRECATED)'),
4869 _(b'force a merge including outstanding changes (DEPRECATED)'),
4870 ),
4870 ),
4871 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4871 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4872 (
4872 (
4873 b'P',
4873 b'P',
4874 b'preview',
4874 b'preview',
4875 None,
4875 None,
4876 _(b'review revisions to merge (no merge is performed)'),
4876 _(b'review revisions to merge (no merge is performed)'),
4877 ),
4877 ),
4878 (b'', b'abort', None, _(b'abort the ongoing merge')),
4878 (b'', b'abort', None, _(b'abort the ongoing merge')),
4879 ]
4879 ]
4880 + mergetoolopts,
4880 + mergetoolopts,
4881 _(b'[-P] [[-r] REV]'),
4881 _(b'[-P] [[-r] REV]'),
4882 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4882 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4883 helpbasic=True,
4883 helpbasic=True,
4884 )
4884 )
4885 def merge(ui, repo, node=None, **opts):
4885 def merge(ui, repo, node=None, **opts):
4886 """merge another revision into working directory
4886 """merge another revision into working directory
4887
4887
4888 The current working directory is updated with all changes made in
4888 The current working directory is updated with all changes made in
4889 the requested revision since the last common predecessor revision.
4889 the requested revision since the last common predecessor revision.
4890
4890
4891 Files that changed between either parent are marked as changed for
4891 Files that changed between either parent are marked as changed for
4892 the next commit and a commit must be performed before any further
4892 the next commit and a commit must be performed before any further
4893 updates to the repository are allowed. The next commit will have
4893 updates to the repository are allowed. The next commit will have
4894 two parents.
4894 two parents.
4895
4895
4896 ``--tool`` can be used to specify the merge tool used for file
4896 ``--tool`` can be used to specify the merge tool used for file
4897 merges. It overrides the HGMERGE environment variable and your
4897 merges. It overrides the HGMERGE environment variable and your
4898 configuration files. See :hg:`help merge-tools` for options.
4898 configuration files. See :hg:`help merge-tools` for options.
4899
4899
4900 If no revision is specified, the working directory's parent is a
4900 If no revision is specified, the working directory's parent is a
4901 head revision, and the current branch contains exactly one other
4901 head revision, and the current branch contains exactly one other
4902 head, the other head is merged with by default. Otherwise, an
4902 head, the other head is merged with by default. Otherwise, an
4903 explicit revision with which to merge must be provided.
4903 explicit revision with which to merge must be provided.
4904
4904
4905 See :hg:`help resolve` for information on handling file conflicts.
4905 See :hg:`help resolve` for information on handling file conflicts.
4906
4906
4907 To undo an uncommitted merge, use :hg:`merge --abort` which
4907 To undo an uncommitted merge, use :hg:`merge --abort` which
4908 will check out a clean copy of the original merge parent, losing
4908 will check out a clean copy of the original merge parent, losing
4909 all changes.
4909 all changes.
4910
4910
4911 Returns 0 on success, 1 if there are unresolved files.
4911 Returns 0 on success, 1 if there are unresolved files.
4912 """
4912 """
4913
4913
4914 opts = pycompat.byteskwargs(opts)
4914 opts = pycompat.byteskwargs(opts)
4915 abort = opts.get(b'abort')
4915 abort = opts.get(b'abort')
4916 if abort and repo.dirstate.p2() == repo.nullid:
4916 if abort and repo.dirstate.p2() == repo.nullid:
4917 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4917 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4918 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4918 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4919 if abort:
4919 if abort:
4920 state = cmdutil.getunfinishedstate(repo)
4920 state = cmdutil.getunfinishedstate(repo)
4921 if state and state._opname != b'merge':
4921 if state and state._opname != b'merge':
4922 raise error.StateError(
4922 raise error.StateError(
4923 _(b'cannot abort merge with %s in progress') % (state._opname),
4923 _(b'cannot abort merge with %s in progress') % (state._opname),
4924 hint=state.hint(),
4924 hint=state.hint(),
4925 )
4925 )
4926 if node:
4926 if node:
4927 raise error.InputError(_(b"cannot specify a node with --abort"))
4927 raise error.InputError(_(b"cannot specify a node with --abort"))
4928 return hg.abortmerge(repo.ui, repo)
4928 return hg.abortmerge(repo.ui, repo)
4929
4929
4930 if opts.get(b'rev') and node:
4930 if opts.get(b'rev') and node:
4931 raise error.InputError(_(b"please specify just one revision"))
4931 raise error.InputError(_(b"please specify just one revision"))
4932 if not node:
4932 if not node:
4933 node = opts.get(b'rev')
4933 node = opts.get(b'rev')
4934
4934
4935 if node:
4935 if node:
4936 ctx = logcmdutil.revsingle(repo, node)
4936 ctx = logcmdutil.revsingle(repo, node)
4937 else:
4937 else:
4938 if ui.configbool(b'commands', b'merge.require-rev'):
4938 if ui.configbool(b'commands', b'merge.require-rev'):
4939 raise error.InputError(
4939 raise error.InputError(
4940 _(
4940 _(
4941 b'configuration requires specifying revision to merge '
4941 b'configuration requires specifying revision to merge '
4942 b'with'
4942 b'with'
4943 )
4943 )
4944 )
4944 )
4945 ctx = repo[destutil.destmerge(repo)]
4945 ctx = repo[destutil.destmerge(repo)]
4946
4946
4947 if ctx.node() is None:
4947 if ctx.node() is None:
4948 raise error.InputError(
4948 raise error.InputError(
4949 _(b'merging with the working copy has no effect')
4949 _(b'merging with the working copy has no effect')
4950 )
4950 )
4951
4951
4952 if opts.get(b'preview'):
4952 if opts.get(b'preview'):
4953 # find nodes that are ancestors of p2 but not of p1
4953 # find nodes that are ancestors of p2 but not of p1
4954 p1 = repo[b'.'].node()
4954 p1 = repo[b'.'].node()
4955 p2 = ctx.node()
4955 p2 = ctx.node()
4956 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4956 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4957
4957
4958 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4958 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4959 for node in nodes:
4959 for node in nodes:
4960 displayer.show(repo[node])
4960 displayer.show(repo[node])
4961 displayer.close()
4961 displayer.close()
4962 return 0
4962 return 0
4963
4963
4964 # ui.forcemerge is an internal variable, do not document
4964 # ui.forcemerge is an internal variable, do not document
4965 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4965 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4966 with ui.configoverride(overrides, b'merge'):
4966 with ui.configoverride(overrides, b'merge'):
4967 force = opts.get(b'force')
4967 force = opts.get(b'force')
4968 labels = [b'working copy', b'merge rev', b'common ancestor']
4968 labels = [b'working copy', b'merge rev', b'common ancestor']
4969 return hg.merge(ctx, force=force, labels=labels)
4969 return hg.merge(ctx, force=force, labels=labels)
4970
4970
4971
4971
4972 statemod.addunfinished(
4972 statemod.addunfinished(
4973 b'merge',
4973 b'merge',
4974 fname=None,
4974 fname=None,
4975 clearable=True,
4975 clearable=True,
4976 allowcommit=True,
4976 allowcommit=True,
4977 cmdmsg=_(b'outstanding uncommitted merge'),
4977 cmdmsg=_(b'outstanding uncommitted merge'),
4978 abortfunc=hg.abortmerge,
4978 abortfunc=hg.abortmerge,
4979 statushint=_(
4979 statushint=_(
4980 b'To continue: hg commit\nTo abort: hg merge --abort'
4980 b'To continue: hg commit\nTo abort: hg merge --abort'
4981 ),
4981 ),
4982 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4982 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4983 )
4983 )
4984
4984
4985
4985
4986 @command(
4986 @command(
4987 b'outgoing|out',
4987 b'outgoing|out',
4988 [
4988 [
4989 (
4989 (
4990 b'f',
4990 b'f',
4991 b'force',
4991 b'force',
4992 None,
4992 None,
4993 _(b'run even when the destination is unrelated'),
4993 _(b'run even when the destination is unrelated'),
4994 ),
4994 ),
4995 (
4995 (
4996 b'r',
4996 b'r',
4997 b'rev',
4997 b'rev',
4998 [],
4998 [],
4999 _(b'a changeset intended to be included in the destination'),
4999 _(b'a changeset intended to be included in the destination'),
5000 _(b'REV'),
5000 _(b'REV'),
5001 ),
5001 ),
5002 (b'n', b'newest-first', None, _(b'show newest record first')),
5002 (b'n', b'newest-first', None, _(b'show newest record first')),
5003 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
5003 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
5004 (
5004 (
5005 b'b',
5005 b'b',
5006 b'branch',
5006 b'branch',
5007 [],
5007 [],
5008 _(b'a specific branch you would like to push'),
5008 _(b'a specific branch you would like to push'),
5009 _(b'BRANCH'),
5009 _(b'BRANCH'),
5010 ),
5010 ),
5011 ]
5011 ]
5012 + logopts
5012 + logopts
5013 + remoteopts
5013 + remoteopts
5014 + subrepoopts,
5014 + subrepoopts,
5015 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
5015 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
5016 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5016 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5017 )
5017 )
5018 def outgoing(ui, repo, *dests, **opts):
5018 def outgoing(ui, repo, *dests, **opts):
5019 """show changesets not found in the destination
5019 """show changesets not found in the destination
5020
5020
5021 Show changesets not found in the specified destination repository
5021 Show changesets not found in the specified destination repository
5022 or the default push location. These are the changesets that would
5022 or the default push location. These are the changesets that would
5023 be pushed if a push was requested.
5023 be pushed if a push was requested.
5024
5024
5025 See pull for details of valid destination formats.
5025 See pull for details of valid destination formats.
5026
5026
5027 .. container:: verbose
5027 .. container:: verbose
5028
5028
5029 With -B/--bookmarks, the result of bookmark comparison between
5029 With -B/--bookmarks, the result of bookmark comparison between
5030 local and remote repositories is displayed. With -v/--verbose,
5030 local and remote repositories is displayed. With -v/--verbose,
5031 status is also displayed for each bookmark like below::
5031 status is also displayed for each bookmark like below::
5032
5032
5033 BM1 01234567890a added
5033 BM1 01234567890a added
5034 BM2 deleted
5034 BM2 deleted
5035 BM3 234567890abc advanced
5035 BM3 234567890abc advanced
5036 BM4 34567890abcd diverged
5036 BM4 34567890abcd diverged
5037 BM5 4567890abcde changed
5037 BM5 4567890abcde changed
5038
5038
5039 The action taken when pushing depends on the
5039 The action taken when pushing depends on the
5040 status of each bookmark:
5040 status of each bookmark:
5041
5041
5042 :``added``: push with ``-B`` will create it
5042 :``added``: push with ``-B`` will create it
5043 :``deleted``: push with ``-B`` will delete it
5043 :``deleted``: push with ``-B`` will delete it
5044 :``advanced``: push will update it
5044 :``advanced``: push will update it
5045 :``diverged``: push with ``-B`` will update it
5045 :``diverged``: push with ``-B`` will update it
5046 :``changed``: push with ``-B`` will update it
5046 :``changed``: push with ``-B`` will update it
5047
5047
5048 From the point of view of pushing behavior, bookmarks
5048 From the point of view of pushing behavior, bookmarks
5049 existing only in the remote repository are treated as
5049 existing only in the remote repository are treated as
5050 ``deleted``, even if it is in fact added remotely.
5050 ``deleted``, even if it is in fact added remotely.
5051
5051
5052 Returns 0 if there are outgoing changes, 1 otherwise.
5052 Returns 0 if there are outgoing changes, 1 otherwise.
5053 """
5053 """
5054 opts = pycompat.byteskwargs(opts)
5054 opts = pycompat.byteskwargs(opts)
5055 if opts.get(b'bookmarks'):
5055 if opts.get(b'bookmarks'):
5056 for path in urlutil.get_push_paths(repo, ui, dests):
5056 for path in urlutil.get_push_paths(repo, ui, dests):
5057 other = hg.peer(repo, opts, path)
5057 other = hg.peer(repo, opts, path)
5058 try:
5058 try:
5059 if b'bookmarks' not in other.listkeys(b'namespaces'):
5059 if b'bookmarks' not in other.listkeys(b'namespaces'):
5060 ui.warn(_(b"remote doesn't support bookmarks\n"))
5060 ui.warn(_(b"remote doesn't support bookmarks\n"))
5061 return 0
5061 return 0
5062 ui.status(
5062 ui.status(
5063 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
5063 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
5064 )
5064 )
5065 ui.pager(b'outgoing')
5065 ui.pager(b'outgoing')
5066 return bookmarks.outgoing(ui, repo, other)
5066 return bookmarks.outgoing(ui, repo, other)
5067 finally:
5067 finally:
5068 other.close()
5068 other.close()
5069
5069
5070 return hg.outgoing(ui, repo, dests, opts)
5070 return hg.outgoing(ui, repo, dests, opts)
5071
5071
5072
5072
5073 @command(
5073 @command(
5074 b'parents',
5074 b'parents',
5075 [
5075 [
5076 (
5076 (
5077 b'r',
5077 b'r',
5078 b'rev',
5078 b'rev',
5079 b'',
5079 b'',
5080 _(b'show parents of the specified revision'),
5080 _(b'show parents of the specified revision'),
5081 _(b'REV'),
5081 _(b'REV'),
5082 ),
5082 ),
5083 ]
5083 ]
5084 + templateopts,
5084 + templateopts,
5085 _(b'[-r REV] [FILE]'),
5085 _(b'[-r REV] [FILE]'),
5086 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5086 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5087 inferrepo=True,
5087 inferrepo=True,
5088 )
5088 )
5089 def parents(ui, repo, file_=None, **opts):
5089 def parents(ui, repo, file_=None, **opts):
5090 """show the parents of the working directory or revision (DEPRECATED)
5090 """show the parents of the working directory or revision (DEPRECATED)
5091
5091
5092 Print the working directory's parent revisions. If a revision is
5092 Print the working directory's parent revisions. If a revision is
5093 given via -r/--rev, the parent of that revision will be printed.
5093 given via -r/--rev, the parent of that revision will be printed.
5094 If a file argument is given, the revision in which the file was
5094 If a file argument is given, the revision in which the file was
5095 last changed (before the working directory revision or the
5095 last changed (before the working directory revision or the
5096 argument to --rev if given) is printed.
5096 argument to --rev if given) is printed.
5097
5097
5098 This command is equivalent to::
5098 This command is equivalent to::
5099
5099
5100 hg log -r "p1()+p2()" or
5100 hg log -r "p1()+p2()" or
5101 hg log -r "p1(REV)+p2(REV)" or
5101 hg log -r "p1(REV)+p2(REV)" or
5102 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5102 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5103 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5103 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5104
5104
5105 See :hg:`summary` and :hg:`help revsets` for related information.
5105 See :hg:`summary` and :hg:`help revsets` for related information.
5106
5106
5107 Returns 0 on success.
5107 Returns 0 on success.
5108 """
5108 """
5109
5109
5110 opts = pycompat.byteskwargs(opts)
5110 opts = pycompat.byteskwargs(opts)
5111 rev = opts.get(b'rev')
5111 rev = opts.get(b'rev')
5112 if rev:
5112 if rev:
5113 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5113 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5114 ctx = logcmdutil.revsingle(repo, rev, None)
5114 ctx = logcmdutil.revsingle(repo, rev, None)
5115
5115
5116 if file_:
5116 if file_:
5117 m = scmutil.match(ctx, (file_,), opts)
5117 m = scmutil.match(ctx, (file_,), opts)
5118 if m.anypats() or len(m.files()) != 1:
5118 if m.anypats() or len(m.files()) != 1:
5119 raise error.InputError(_(b'can only specify an explicit filename'))
5119 raise error.InputError(_(b'can only specify an explicit filename'))
5120 file_ = m.files()[0]
5120 file_ = m.files()[0]
5121 filenodes = []
5121 filenodes = []
5122 for cp in ctx.parents():
5122 for cp in ctx.parents():
5123 if not cp:
5123 if not cp:
5124 continue
5124 continue
5125 try:
5125 try:
5126 filenodes.append(cp.filenode(file_))
5126 filenodes.append(cp.filenode(file_))
5127 except error.LookupError:
5127 except error.LookupError:
5128 pass
5128 pass
5129 if not filenodes:
5129 if not filenodes:
5130 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5130 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5131 p = []
5131 p = []
5132 for fn in filenodes:
5132 for fn in filenodes:
5133 fctx = repo.filectx(file_, fileid=fn)
5133 fctx = repo.filectx(file_, fileid=fn)
5134 p.append(fctx.node())
5134 p.append(fctx.node())
5135 else:
5135 else:
5136 p = [cp.node() for cp in ctx.parents()]
5136 p = [cp.node() for cp in ctx.parents()]
5137
5137
5138 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5138 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5139 for n in p:
5139 for n in p:
5140 if n != repo.nullid:
5140 if n != repo.nullid:
5141 displayer.show(repo[n])
5141 displayer.show(repo[n])
5142 displayer.close()
5142 displayer.close()
5143
5143
5144
5144
5145 @command(
5145 @command(
5146 b'paths',
5146 b'paths',
5147 formatteropts,
5147 formatteropts,
5148 _(b'[NAME]'),
5148 _(b'[NAME]'),
5149 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5149 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5150 optionalrepo=True,
5150 optionalrepo=True,
5151 intents={INTENT_READONLY},
5151 intents={INTENT_READONLY},
5152 )
5152 )
5153 def paths(ui, repo, search=None, **opts):
5153 def paths(ui, repo, search=None, **opts):
5154 """show aliases for remote repositories
5154 """show aliases for remote repositories
5155
5155
5156 Show definition of symbolic path name NAME. If no name is given,
5156 Show definition of symbolic path name NAME. If no name is given,
5157 show definition of all available names.
5157 show definition of all available names.
5158
5158
5159 Option -q/--quiet suppresses all output when searching for NAME
5159 Option -q/--quiet suppresses all output when searching for NAME
5160 and shows only the path names when listing all definitions.
5160 and shows only the path names when listing all definitions.
5161
5161
5162 Path names are defined in the [paths] section of your
5162 Path names are defined in the [paths] section of your
5163 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5163 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5164 repository, ``.hg/hgrc`` is used, too.
5164 repository, ``.hg/hgrc`` is used, too.
5165
5165
5166 The path names ``default`` and ``default-push`` have a special
5166 The path names ``default`` and ``default-push`` have a special
5167 meaning. When performing a push or pull operation, they are used
5167 meaning. When performing a push or pull operation, they are used
5168 as fallbacks if no location is specified on the command-line.
5168 as fallbacks if no location is specified on the command-line.
5169 When ``default-push`` is set, it will be used for push and
5169 When ``default-push`` is set, it will be used for push and
5170 ``default`` will be used for pull; otherwise ``default`` is used
5170 ``default`` will be used for pull; otherwise ``default`` is used
5171 as the fallback for both. When cloning a repository, the clone
5171 as the fallback for both. When cloning a repository, the clone
5172 source is written as ``default`` in ``.hg/hgrc``.
5172 source is written as ``default`` in ``.hg/hgrc``.
5173
5173
5174 .. note::
5174 .. note::
5175
5175
5176 ``default`` and ``default-push`` apply to all inbound (e.g.
5176 ``default`` and ``default-push`` apply to all inbound (e.g.
5177 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5177 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5178 and :hg:`bundle`) operations.
5178 and :hg:`bundle`) operations.
5179
5179
5180 See :hg:`help urls` for more information.
5180 See :hg:`help urls` for more information.
5181
5181
5182 .. container:: verbose
5182 .. container:: verbose
5183
5183
5184 Template:
5184 Template:
5185
5185
5186 The following keywords are supported. See also :hg:`help templates`.
5186 The following keywords are supported. See also :hg:`help templates`.
5187
5187
5188 :name: String. Symbolic name of the path alias.
5188 :name: String. Symbolic name of the path alias.
5189 :pushurl: String. URL for push operations.
5189 :pushurl: String. URL for push operations.
5190 :url: String. URL or directory path for the other operations.
5190 :url: String. URL or directory path for the other operations.
5191
5191
5192 Returns 0 on success.
5192 Returns 0 on success.
5193 """
5193 """
5194
5194
5195 opts = pycompat.byteskwargs(opts)
5195 opts = pycompat.byteskwargs(opts)
5196
5196
5197 pathitems = urlutil.list_paths(ui, search)
5197 pathitems = urlutil.list_paths(ui, search)
5198 ui.pager(b'paths')
5198 ui.pager(b'paths')
5199
5199
5200 fm = ui.formatter(b'paths', opts)
5200 fm = ui.formatter(b'paths', opts)
5201 if fm.isplain():
5201 if fm.isplain():
5202 hidepassword = urlutil.hidepassword
5202 hidepassword = urlutil.hidepassword
5203 else:
5203 else:
5204 hidepassword = bytes
5204 hidepassword = bytes
5205 if ui.quiet:
5205 if ui.quiet:
5206 namefmt = b'%s\n'
5206 namefmt = b'%s\n'
5207 else:
5207 else:
5208 namefmt = b'%s = '
5208 namefmt = b'%s = '
5209 showsubopts = not search and not ui.quiet
5209 showsubopts = not search and not ui.quiet
5210
5210
5211 for name, path in pathitems:
5211 for name, path in pathitems:
5212 fm.startitem()
5212 fm.startitem()
5213 fm.condwrite(not search, b'name', namefmt, name)
5213 fm.condwrite(not search, b'name', namefmt, name)
5214 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5214 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5215 for subopt, value in sorted(path.suboptions.items()):
5215 for subopt, value in sorted(path.suboptions.items()):
5216 assert subopt not in (b'name', b'url')
5216 assert subopt not in (b'name', b'url')
5217 if showsubopts:
5217 if showsubopts:
5218 fm.plain(b'%s:%s = ' % (name, subopt))
5218 fm.plain(b'%s:%s = ' % (name, subopt))
5219 if isinstance(value, bool):
5219 if isinstance(value, bool):
5220 if value:
5220 if value:
5221 value = b'yes'
5221 value = b'yes'
5222 else:
5222 else:
5223 value = b'no'
5223 value = b'no'
5224 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5224 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5225
5225
5226 fm.end()
5226 fm.end()
5227
5227
5228 if search and not pathitems:
5228 if search and not pathitems:
5229 if not ui.quiet:
5229 if not ui.quiet:
5230 ui.warn(_(b"not found!\n"))
5230 ui.warn(_(b"not found!\n"))
5231 return 1
5231 return 1
5232 else:
5232 else:
5233 return 0
5233 return 0
5234
5234
5235
5235
5236 @command(
5236 @command(
5237 b'phase',
5237 b'phase',
5238 [
5238 [
5239 (b'p', b'public', False, _(b'set changeset phase to public')),
5239 (b'p', b'public', False, _(b'set changeset phase to public')),
5240 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5240 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5241 (b's', b'secret', False, _(b'set changeset phase to secret')),
5241 (b's', b'secret', False, _(b'set changeset phase to secret')),
5242 (b'f', b'force', False, _(b'allow to move boundary backward')),
5242 (b'f', b'force', False, _(b'allow to move boundary backward')),
5243 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5243 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5244 ],
5244 ],
5245 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5245 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5246 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5246 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5247 )
5247 )
5248 def phase(ui, repo, *revs, **opts):
5248 def phase(ui, repo, *revs, **opts):
5249 """set or show the current phase name
5249 """set or show the current phase name
5250
5250
5251 With no argument, show the phase name of the current revision(s).
5251 With no argument, show the phase name of the current revision(s).
5252
5252
5253 With one of -p/--public, -d/--draft or -s/--secret, change the
5253 With one of -p/--public, -d/--draft or -s/--secret, change the
5254 phase value of the specified revisions.
5254 phase value of the specified revisions.
5255
5255
5256 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5256 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5257 lower phase to a higher phase. Phases are ordered as follows::
5257 lower phase to a higher phase. Phases are ordered as follows::
5258
5258
5259 public < draft < secret
5259 public < draft < secret
5260
5260
5261 Returns 0 on success, 1 if some phases could not be changed.
5261 Returns 0 on success, 1 if some phases could not be changed.
5262
5262
5263 (For more information about the phases concept, see :hg:`help phases`.)
5263 (For more information about the phases concept, see :hg:`help phases`.)
5264 """
5264 """
5265 opts = pycompat.byteskwargs(opts)
5265 opts = pycompat.byteskwargs(opts)
5266 # search for a unique phase argument
5266 # search for a unique phase argument
5267 targetphase = None
5267 targetphase = None
5268 for idx, name in enumerate(phases.cmdphasenames):
5268 for idx, name in enumerate(phases.cmdphasenames):
5269 if opts[name]:
5269 if opts[name]:
5270 if targetphase is not None:
5270 if targetphase is not None:
5271 raise error.InputError(_(b'only one phase can be specified'))
5271 raise error.InputError(_(b'only one phase can be specified'))
5272 targetphase = idx
5272 targetphase = idx
5273
5273
5274 # look for specified revision
5274 # look for specified revision
5275 revs = list(revs)
5275 revs = list(revs)
5276 revs.extend(opts[b'rev'])
5276 revs.extend(opts[b'rev'])
5277 if revs:
5277 if revs:
5278 revs = logcmdutil.revrange(repo, revs)
5278 revs = logcmdutil.revrange(repo, revs)
5279 else:
5279 else:
5280 # display both parents as the second parent phase can influence
5280 # display both parents as the second parent phase can influence
5281 # the phase of a merge commit
5281 # the phase of a merge commit
5282 revs = [c.rev() for c in repo[None].parents()]
5282 revs = [c.rev() for c in repo[None].parents()]
5283
5283
5284 ret = 0
5284 ret = 0
5285 if targetphase is None:
5285 if targetphase is None:
5286 # display
5286 # display
5287 for r in revs:
5287 for r in revs:
5288 ctx = repo[r]
5288 ctx = repo[r]
5289 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5289 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5290 else:
5290 else:
5291 with repo.lock(), repo.transaction(b"phase") as tr:
5291 with repo.lock(), repo.transaction(b"phase") as tr:
5292 # set phase
5292 # set phase
5293 if not revs:
5293 if not revs:
5294 raise error.InputError(_(b'empty revision set'))
5294 raise error.InputError(_(b'empty revision set'))
5295 nodes = [repo[r].node() for r in revs]
5295 nodes = [repo[r].node() for r in revs]
5296 # moving revision from public to draft may hide them
5296 # moving revision from public to draft may hide them
5297 # We have to check result on an unfiltered repository
5297 # We have to check result on an unfiltered repository
5298 unfi = repo.unfiltered()
5298 unfi = repo.unfiltered()
5299 getphase = unfi._phasecache.phase
5299 getphase = unfi._phasecache.phase
5300 olddata = [getphase(unfi, r) for r in unfi]
5300 olddata = [getphase(unfi, r) for r in unfi]
5301 phases.advanceboundary(repo, tr, targetphase, nodes)
5301 phases.advanceboundary(repo, tr, targetphase, nodes)
5302 if opts[b'force']:
5302 if opts[b'force']:
5303 phases.retractboundary(repo, tr, targetphase, nodes)
5303 phases.retractboundary(repo, tr, targetphase, nodes)
5304 getphase = unfi._phasecache.phase
5304 getphase = unfi._phasecache.phase
5305 newdata = [getphase(unfi, r) for r in unfi]
5305 newdata = [getphase(unfi, r) for r in unfi]
5306 changes = sum(newdata[r] != olddata[r] for r in unfi)
5306 changes = sum(newdata[r] != olddata[r] for r in unfi)
5307 cl = unfi.changelog
5307 cl = unfi.changelog
5308 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5308 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5309 if rejected:
5309 if rejected:
5310 ui.warn(
5310 ui.warn(
5311 _(
5311 _(
5312 b'cannot move %i changesets to a higher '
5312 b'cannot move %i changesets to a higher '
5313 b'phase, use --force\n'
5313 b'phase, use --force\n'
5314 )
5314 )
5315 % len(rejected)
5315 % len(rejected)
5316 )
5316 )
5317 ret = 1
5317 ret = 1
5318 if changes:
5318 if changes:
5319 msg = _(b'phase changed for %i changesets\n') % changes
5319 msg = _(b'phase changed for %i changesets\n') % changes
5320 if ret:
5320 if ret:
5321 ui.status(msg)
5321 ui.status(msg)
5322 else:
5322 else:
5323 ui.note(msg)
5323 ui.note(msg)
5324 else:
5324 else:
5325 ui.warn(_(b'no phases changed\n'))
5325 ui.warn(_(b'no phases changed\n'))
5326 return ret
5326 return ret
5327
5327
5328
5328
5329 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5329 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5330 """Run after a changegroup has been added via pull/unbundle
5330 """Run after a changegroup has been added via pull/unbundle
5331
5331
5332 This takes arguments below:
5332 This takes arguments below:
5333
5333
5334 :modheads: change of heads by pull/unbundle
5334 :modheads: change of heads by pull/unbundle
5335 :optupdate: updating working directory is needed or not
5335 :optupdate: updating working directory is needed or not
5336 :checkout: update destination revision (or None to default destination)
5336 :checkout: update destination revision (or None to default destination)
5337 :brev: a name, which might be a bookmark to be activated after updating
5337 :brev: a name, which might be a bookmark to be activated after updating
5338
5338
5339 return True if update raise any conflict, False otherwise.
5339 return True if update raise any conflict, False otherwise.
5340 """
5340 """
5341 if modheads == 0:
5341 if modheads == 0:
5342 return False
5342 return False
5343 if optupdate:
5343 if optupdate:
5344 try:
5344 try:
5345 return hg.updatetotally(ui, repo, checkout, brev)
5345 return hg.updatetotally(ui, repo, checkout, brev)
5346 except error.UpdateAbort as inst:
5346 except error.UpdateAbort as inst:
5347 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5347 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5348 hint = inst.hint
5348 hint = inst.hint
5349 raise error.UpdateAbort(msg, hint=hint)
5349 raise error.UpdateAbort(msg, hint=hint)
5350 if modheads is not None and modheads > 1:
5350 if modheads is not None and modheads > 1:
5351 currentbranchheads = len(repo.branchheads())
5351 currentbranchheads = len(repo.branchheads())
5352 if currentbranchheads == modheads:
5352 if currentbranchheads == modheads:
5353 ui.status(
5353 ui.status(
5354 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5354 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5355 )
5355 )
5356 elif currentbranchheads > 1:
5356 elif currentbranchheads > 1:
5357 ui.status(
5357 ui.status(
5358 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5358 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5359 )
5359 )
5360 else:
5360 else:
5361 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5361 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5362 elif not ui.configbool(b'commands', b'update.requiredest'):
5362 elif not ui.configbool(b'commands', b'update.requiredest'):
5363 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5363 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5364 return False
5364 return False
5365
5365
5366
5366
5367 @command(
5367 @command(
5368 b'pull',
5368 b'pull',
5369 [
5369 [
5370 (
5370 (
5371 b'u',
5371 b'u',
5372 b'update',
5372 b'update',
5373 None,
5373 None,
5374 _(b'update to new branch head if new descendants were pulled'),
5374 _(b'update to new branch head if new descendants were pulled'),
5375 ),
5375 ),
5376 (
5376 (
5377 b'f',
5377 b'f',
5378 b'force',
5378 b'force',
5379 None,
5379 None,
5380 _(b'run even when remote repository is unrelated'),
5380 _(b'run even when remote repository is unrelated'),
5381 ),
5381 ),
5382 (
5382 (
5383 b'',
5383 b'',
5384 b'confirm',
5384 b'confirm',
5385 None,
5385 None,
5386 _(b'confirm pull before applying changes'),
5386 _(b'confirm pull before applying changes'),
5387 ),
5387 ),
5388 (
5388 (
5389 b'r',
5389 b'r',
5390 b'rev',
5390 b'rev',
5391 [],
5391 [],
5392 _(b'a remote changeset intended to be added'),
5392 _(b'a remote changeset intended to be added'),
5393 _(b'REV'),
5393 _(b'REV'),
5394 ),
5394 ),
5395 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5395 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5396 (
5396 (
5397 b'b',
5397 b'b',
5398 b'branch',
5398 b'branch',
5399 [],
5399 [],
5400 _(b'a specific branch you would like to pull'),
5400 _(b'a specific branch you would like to pull'),
5401 _(b'BRANCH'),
5401 _(b'BRANCH'),
5402 ),
5402 ),
5403 ]
5403 ]
5404 + remoteopts,
5404 + remoteopts,
5405 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5405 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5406 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5406 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5407 helpbasic=True,
5407 helpbasic=True,
5408 )
5408 )
5409 def pull(ui, repo, *sources, **opts):
5409 def pull(ui, repo, *sources, **opts):
5410 """pull changes from the specified source
5410 """pull changes from the specified source
5411
5411
5412 Pull changes from a remote repository to a local one.
5412 Pull changes from a remote repository to a local one.
5413
5413
5414 This finds all changes from the repository at the specified path
5414 This finds all changes from the repository at the specified path
5415 or URL and adds them to a local repository (the current one unless
5415 or URL and adds them to a local repository (the current one unless
5416 -R is specified). By default, this does not update the copy of the
5416 -R is specified). By default, this does not update the copy of the
5417 project in the working directory.
5417 project in the working directory.
5418
5418
5419 When cloning from servers that support it, Mercurial may fetch
5419 When cloning from servers that support it, Mercurial may fetch
5420 pre-generated data. When this is done, hooks operating on incoming
5420 pre-generated data. When this is done, hooks operating on incoming
5421 changesets and changegroups may fire more than once, once for each
5421 changesets and changegroups may fire more than once, once for each
5422 pre-generated bundle and as well as for any additional remaining
5422 pre-generated bundle and as well as for any additional remaining
5423 data. See :hg:`help -e clonebundles` for more.
5423 data. See :hg:`help -e clonebundles` for more.
5424
5424
5425 Use :hg:`incoming` if you want to see what would have been added
5425 Use :hg:`incoming` if you want to see what would have been added
5426 by a pull at the time you issued this command. If you then decide
5426 by a pull at the time you issued this command. If you then decide
5427 to add those changes to the repository, you should use :hg:`pull
5427 to add those changes to the repository, you should use :hg:`pull
5428 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5428 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5429
5429
5430 If SOURCE is omitted, the 'default' path will be used.
5430 If SOURCE is omitted, the 'default' path will be used.
5431 See :hg:`help urls` for more information.
5431 See :hg:`help urls` for more information.
5432
5432
5433 If multiple sources are specified, they will be pulled sequentially as if
5433 If multiple sources are specified, they will be pulled sequentially as if
5434 the command was run multiple time. If --update is specify and the command
5434 the command was run multiple time. If --update is specify and the command
5435 will stop at the first failed --update.
5435 will stop at the first failed --update.
5436
5436
5437 Specifying bookmark as ``.`` is equivalent to specifying the active
5437 Specifying bookmark as ``.`` is equivalent to specifying the active
5438 bookmark's name.
5438 bookmark's name.
5439
5439
5440 Returns 0 on success, 1 if an update had unresolved files.
5440 Returns 0 on success, 1 if an update had unresolved files.
5441 """
5441 """
5442
5442
5443 opts = pycompat.byteskwargs(opts)
5443 opts = pycompat.byteskwargs(opts)
5444 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5444 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5445 b'update'
5445 b'update'
5446 ):
5446 ):
5447 msg = _(b'update destination required by configuration')
5447 msg = _(b'update destination required by configuration')
5448 hint = _(b'use hg pull followed by hg update DEST')
5448 hint = _(b'use hg pull followed by hg update DEST')
5449 raise error.InputError(msg, hint=hint)
5449 raise error.InputError(msg, hint=hint)
5450
5450
5451 for path in urlutil.get_pull_paths(repo, ui, sources):
5451 for path in urlutil.get_pull_paths(repo, ui, sources):
5452 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc))
5452 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc))
5453 ui.flush()
5453 ui.flush()
5454 other = hg.peer(repo, opts, path)
5454 other = hg.peer(repo, opts, path)
5455 update_conflict = None
5455 update_conflict = None
5456 try:
5456 try:
5457 branches = (path.branch, opts.get(b'branch', []))
5457 branches = (path.branch, opts.get(b'branch', []))
5458 revs, checkout = hg.addbranchrevs(
5458 revs, checkout = hg.addbranchrevs(
5459 repo, other, branches, opts.get(b'rev')
5459 repo, other, branches, opts.get(b'rev')
5460 )
5460 )
5461
5461
5462 pullopargs = {}
5462 pullopargs = {}
5463
5463
5464 nodes = None
5464 nodes = None
5465 if opts.get(b'bookmark') or revs:
5465 if opts.get(b'bookmark') or revs:
5466 # The list of bookmark used here is the same used to actually update
5466 # The list of bookmark used here is the same used to actually update
5467 # the bookmark names, to avoid the race from issue 4689 and we do
5467 # the bookmark names, to avoid the race from issue 4689 and we do
5468 # all lookup and bookmark queries in one go so they see the same
5468 # all lookup and bookmark queries in one go so they see the same
5469 # version of the server state (issue 4700).
5469 # version of the server state (issue 4700).
5470 nodes = []
5470 nodes = []
5471 fnodes = []
5471 fnodes = []
5472 revs = revs or []
5472 revs = revs or []
5473 if revs and not other.capable(b'lookup'):
5473 if revs and not other.capable(b'lookup'):
5474 err = _(
5474 err = _(
5475 b"other repository doesn't support revision lookup, "
5475 b"other repository doesn't support revision lookup, "
5476 b"so a rev cannot be specified."
5476 b"so a rev cannot be specified."
5477 )
5477 )
5478 raise error.Abort(err)
5478 raise error.Abort(err)
5479 with other.commandexecutor() as e:
5479 with other.commandexecutor() as e:
5480 fremotebookmarks = e.callcommand(
5480 fremotebookmarks = e.callcommand(
5481 b'listkeys', {b'namespace': b'bookmarks'}
5481 b'listkeys', {b'namespace': b'bookmarks'}
5482 )
5482 )
5483 for r in revs:
5483 for r in revs:
5484 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5484 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5485 remotebookmarks = fremotebookmarks.result()
5485 remotebookmarks = fremotebookmarks.result()
5486 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5486 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5487 pullopargs[b'remotebookmarks'] = remotebookmarks
5487 pullopargs[b'remotebookmarks'] = remotebookmarks
5488 for b in opts.get(b'bookmark', []):
5488 for b in opts.get(b'bookmark', []):
5489 b = repo._bookmarks.expandname(b)
5489 b = repo._bookmarks.expandname(b)
5490 if b not in remotebookmarks:
5490 if b not in remotebookmarks:
5491 raise error.InputError(
5491 raise error.InputError(
5492 _(b'remote bookmark %s not found!') % b
5492 _(b'remote bookmark %s not found!') % b
5493 )
5493 )
5494 nodes.append(remotebookmarks[b])
5494 nodes.append(remotebookmarks[b])
5495 for i, rev in enumerate(revs):
5495 for i, rev in enumerate(revs):
5496 node = fnodes[i].result()
5496 node = fnodes[i].result()
5497 nodes.append(node)
5497 nodes.append(node)
5498 if rev == checkout:
5498 if rev == checkout:
5499 checkout = node
5499 checkout = node
5500
5500
5501 wlock = util.nullcontextmanager()
5501 wlock = util.nullcontextmanager()
5502 if opts.get(b'update'):
5502 if opts.get(b'update'):
5503 wlock = repo.wlock()
5503 wlock = repo.wlock()
5504 with wlock:
5504 with wlock:
5505 pullopargs.update(opts.get(b'opargs', {}))
5505 pullopargs.update(opts.get(b'opargs', {}))
5506 modheads = exchange.pull(
5506 modheads = exchange.pull(
5507 repo,
5507 repo,
5508 other,
5508 other,
5509 path=path,
5509 path=path,
5510 heads=nodes,
5510 heads=nodes,
5511 force=opts.get(b'force'),
5511 force=opts.get(b'force'),
5512 bookmarks=opts.get(b'bookmark', ()),
5512 bookmarks=opts.get(b'bookmark', ()),
5513 opargs=pullopargs,
5513 opargs=pullopargs,
5514 confirm=opts.get(b'confirm'),
5514 confirm=opts.get(b'confirm'),
5515 ).cgresult
5515 ).cgresult
5516
5516
5517 # brev is a name, which might be a bookmark to be activated at
5517 # brev is a name, which might be a bookmark to be activated at
5518 # the end of the update. In other words, it is an explicit
5518 # the end of the update. In other words, it is an explicit
5519 # destination of the update
5519 # destination of the update
5520 brev = None
5520 brev = None
5521
5521
5522 if checkout:
5522 if checkout:
5523 checkout = repo.unfiltered().changelog.rev(checkout)
5523 checkout = repo.unfiltered().changelog.rev(checkout)
5524
5524
5525 # order below depends on implementation of
5525 # order below depends on implementation of
5526 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5526 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5527 # because 'checkout' is determined without it.
5527 # because 'checkout' is determined without it.
5528 if opts.get(b'rev'):
5528 if opts.get(b'rev'):
5529 brev = opts[b'rev'][0]
5529 brev = opts[b'rev'][0]
5530 elif opts.get(b'branch'):
5530 elif opts.get(b'branch'):
5531 brev = opts[b'branch'][0]
5531 brev = opts[b'branch'][0]
5532 else:
5532 else:
5533 brev = path.branch
5533 brev = path.branch
5534
5534
5535 # XXX path: we are losing the `path` object here. Keeping it
5535 # XXX path: we are losing the `path` object here. Keeping it
5536 # would be valuable. For example as a "variant" as we do
5536 # would be valuable. For example as a "variant" as we do
5537 # for pushes.
5537 # for pushes.
5538 repo._subtoppath = path.loc
5538 repo._subtoppath = path.loc
5539 try:
5539 try:
5540 update_conflict = postincoming(
5540 update_conflict = postincoming(
5541 ui, repo, modheads, opts.get(b'update'), checkout, brev
5541 ui, repo, modheads, opts.get(b'update'), checkout, brev
5542 )
5542 )
5543 except error.FilteredRepoLookupError as exc:
5543 except error.FilteredRepoLookupError as exc:
5544 msg = _(b'cannot update to target: %s') % exc.args[0]
5544 msg = _(b'cannot update to target: %s') % exc.args[0]
5545 exc.args = (msg,) + exc.args[1:]
5545 exc.args = (msg,) + exc.args[1:]
5546 raise
5546 raise
5547 finally:
5547 finally:
5548 del repo._subtoppath
5548 del repo._subtoppath
5549
5549
5550 finally:
5550 finally:
5551 other.close()
5551 other.close()
5552 # skip the remaining pull source if they are some conflict.
5552 # skip the remaining pull source if they are some conflict.
5553 if update_conflict:
5553 if update_conflict:
5554 break
5554 break
5555 if update_conflict:
5555 if update_conflict:
5556 return 1
5556 return 1
5557 else:
5557 else:
5558 return 0
5558 return 0
5559
5559
5560
5560
5561 @command(
5561 @command(
5562 b'purge|clean',
5562 b'purge|clean',
5563 [
5563 [
5564 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5564 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5565 (b'', b'all', None, _(b'purge ignored files too')),
5565 (b'', b'all', None, _(b'purge ignored files too')),
5566 (b'i', b'ignored', None, _(b'purge only ignored files')),
5566 (b'i', b'ignored', None, _(b'purge only ignored files')),
5567 (b'', b'dirs', None, _(b'purge empty directories')),
5567 (b'', b'dirs', None, _(b'purge empty directories')),
5568 (b'', b'files', None, _(b'purge files')),
5568 (b'', b'files', None, _(b'purge files')),
5569 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5569 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5570 (
5570 (
5571 b'0',
5571 b'0',
5572 b'print0',
5572 b'print0',
5573 None,
5573 None,
5574 _(
5574 _(
5575 b'end filenames with NUL, for use with xargs'
5575 b'end filenames with NUL, for use with xargs'
5576 b' (implies -p/--print)'
5576 b' (implies -p/--print)'
5577 ),
5577 ),
5578 ),
5578 ),
5579 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5579 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5580 ]
5580 ]
5581 + cmdutil.walkopts,
5581 + cmdutil.walkopts,
5582 _(b'hg purge [OPTION]... [DIR]...'),
5582 _(b'hg purge [OPTION]... [DIR]...'),
5583 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5583 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5584 )
5584 )
5585 def purge(ui, repo, *dirs, **opts):
5585 def purge(ui, repo, *dirs, **opts):
5586 """removes files not tracked by Mercurial
5586 """removes files not tracked by Mercurial
5587
5587
5588 Delete files not known to Mercurial. This is useful to test local
5588 Delete files not known to Mercurial. This is useful to test local
5589 and uncommitted changes in an otherwise-clean source tree.
5589 and uncommitted changes in an otherwise-clean source tree.
5590
5590
5591 This means that purge will delete the following by default:
5591 This means that purge will delete the following by default:
5592
5592
5593 - Unknown files: files marked with "?" by :hg:`status`
5593 - Unknown files: files marked with "?" by :hg:`status`
5594 - Empty directories: in fact Mercurial ignores directories unless
5594 - Empty directories: in fact Mercurial ignores directories unless
5595 they contain files under source control management
5595 they contain files under source control management
5596
5596
5597 But it will leave untouched:
5597 But it will leave untouched:
5598
5598
5599 - Modified and unmodified tracked files
5599 - Modified and unmodified tracked files
5600 - Ignored files (unless -i or --all is specified)
5600 - Ignored files (unless -i or --all is specified)
5601 - New files added to the repository (with :hg:`add`)
5601 - New files added to the repository (with :hg:`add`)
5602
5602
5603 The --files and --dirs options can be used to direct purge to delete
5603 The --files and --dirs options can be used to direct purge to delete
5604 only files, only directories, or both. If neither option is given,
5604 only files, only directories, or both. If neither option is given,
5605 both will be deleted.
5605 both will be deleted.
5606
5606
5607 If directories are given on the command line, only files in these
5607 If directories are given on the command line, only files in these
5608 directories are considered.
5608 directories are considered.
5609
5609
5610 Be careful with purge, as you could irreversibly delete some files
5610 Be careful with purge, as you could irreversibly delete some files
5611 you forgot to add to the repository. If you only want to print the
5611 you forgot to add to the repository. If you only want to print the
5612 list of files that this program would delete, use the --print
5612 list of files that this program would delete, use the --print
5613 option.
5613 option.
5614 """
5614 """
5615 opts = pycompat.byteskwargs(opts)
5615 opts = pycompat.byteskwargs(opts)
5616 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5616 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5617
5617
5618 act = not opts.get(b'print')
5618 act = not opts.get(b'print')
5619 eol = b'\n'
5619 eol = b'\n'
5620 if opts.get(b'print0'):
5620 if opts.get(b'print0'):
5621 eol = b'\0'
5621 eol = b'\0'
5622 act = False # --print0 implies --print
5622 act = False # --print0 implies --print
5623 if opts.get(b'all', False):
5623 if opts.get(b'all', False):
5624 ignored = True
5624 ignored = True
5625 unknown = True
5625 unknown = True
5626 else:
5626 else:
5627 ignored = opts.get(b'ignored', False)
5627 ignored = opts.get(b'ignored', False)
5628 unknown = not ignored
5628 unknown = not ignored
5629
5629
5630 removefiles = opts.get(b'files')
5630 removefiles = opts.get(b'files')
5631 removedirs = opts.get(b'dirs')
5631 removedirs = opts.get(b'dirs')
5632 confirm = opts.get(b'confirm')
5632 confirm = opts.get(b'confirm')
5633 if confirm is None:
5633 if confirm is None:
5634 try:
5634 try:
5635 extensions.find(b'purge')
5635 extensions.find(b'purge')
5636 confirm = False
5636 confirm = False
5637 except KeyError:
5637 except KeyError:
5638 confirm = True
5638 confirm = True
5639
5639
5640 if not removefiles and not removedirs:
5640 if not removefiles and not removedirs:
5641 removefiles = True
5641 removefiles = True
5642 removedirs = True
5642 removedirs = True
5643
5643
5644 match = scmutil.match(repo[None], dirs, opts)
5644 match = scmutil.match(repo[None], dirs, opts)
5645
5645
5646 paths = mergemod.purge(
5646 paths = mergemod.purge(
5647 repo,
5647 repo,
5648 match,
5648 match,
5649 unknown=unknown,
5649 unknown=unknown,
5650 ignored=ignored,
5650 ignored=ignored,
5651 removeemptydirs=removedirs,
5651 removeemptydirs=removedirs,
5652 removefiles=removefiles,
5652 removefiles=removefiles,
5653 abortonerror=opts.get(b'abort_on_err'),
5653 abortonerror=opts.get(b'abort_on_err'),
5654 noop=not act,
5654 noop=not act,
5655 confirm=confirm,
5655 confirm=confirm,
5656 )
5656 )
5657
5657
5658 for path in paths:
5658 for path in paths:
5659 if not act:
5659 if not act:
5660 ui.write(b'%s%s' % (path, eol))
5660 ui.write(b'%s%s' % (path, eol))
5661
5661
5662
5662
5663 @command(
5663 @command(
5664 b'push',
5664 b'push',
5665 [
5665 [
5666 (b'f', b'force', None, _(b'force push')),
5666 (b'f', b'force', None, _(b'force push')),
5667 (
5667 (
5668 b'r',
5668 b'r',
5669 b'rev',
5669 b'rev',
5670 [],
5670 [],
5671 _(b'a changeset intended to be included in the destination'),
5671 _(b'a changeset intended to be included in the destination'),
5672 _(b'REV'),
5672 _(b'REV'),
5673 ),
5673 ),
5674 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5674 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5675 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5675 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5676 (
5676 (
5677 b'b',
5677 b'b',
5678 b'branch',
5678 b'branch',
5679 [],
5679 [],
5680 _(b'a specific branch you would like to push'),
5680 _(b'a specific branch you would like to push'),
5681 _(b'BRANCH'),
5681 _(b'BRANCH'),
5682 ),
5682 ),
5683 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5683 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5684 (
5684 (
5685 b'',
5685 b'',
5686 b'pushvars',
5686 b'pushvars',
5687 [],
5687 [],
5688 _(b'variables that can be sent to server (ADVANCED)'),
5688 _(b'variables that can be sent to server (ADVANCED)'),
5689 ),
5689 ),
5690 (
5690 (
5691 b'',
5691 b'',
5692 b'publish',
5692 b'publish',
5693 False,
5693 False,
5694 _(b'push the changeset as public (EXPERIMENTAL)'),
5694 _(b'push the changeset as public (EXPERIMENTAL)'),
5695 ),
5695 ),
5696 ]
5696 ]
5697 + remoteopts,
5697 + remoteopts,
5698 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5698 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5699 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5699 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5700 helpbasic=True,
5700 helpbasic=True,
5701 )
5701 )
5702 def push(ui, repo, *dests, **opts):
5702 def push(ui, repo, *dests, **opts):
5703 """push changes to the specified destination
5703 """push changes to the specified destination
5704
5704
5705 Push changesets from the local repository to the specified
5705 Push changesets from the local repository to the specified
5706 destination.
5706 destination.
5707
5707
5708 This operation is symmetrical to pull: it is identical to a pull
5708 This operation is symmetrical to pull: it is identical to a pull
5709 in the destination repository from the current one.
5709 in the destination repository from the current one.
5710
5710
5711 By default, push will not allow creation of new heads at the
5711 By default, push will not allow creation of new heads at the
5712 destination, since multiple heads would make it unclear which head
5712 destination, since multiple heads would make it unclear which head
5713 to use. In this situation, it is recommended to pull and merge
5713 to use. In this situation, it is recommended to pull and merge
5714 before pushing.
5714 before pushing.
5715
5715
5716 Use --new-branch if you want to allow push to create a new named
5716 Use --new-branch if you want to allow push to create a new named
5717 branch that is not present at the destination. This allows you to
5717 branch that is not present at the destination. This allows you to
5718 only create a new branch without forcing other changes.
5718 only create a new branch without forcing other changes.
5719
5719
5720 .. note::
5720 .. note::
5721
5721
5722 Extra care should be taken with the -f/--force option,
5722 Extra care should be taken with the -f/--force option,
5723 which will push all new heads on all branches, an action which will
5723 which will push all new heads on all branches, an action which will
5724 almost always cause confusion for collaborators.
5724 almost always cause confusion for collaborators.
5725
5725
5726 If -r/--rev is used, the specified revision and all its ancestors
5726 If -r/--rev is used, the specified revision and all its ancestors
5727 will be pushed to the remote repository.
5727 will be pushed to the remote repository.
5728
5728
5729 If -B/--bookmark is used, the specified bookmarked revision, its
5729 If -B/--bookmark is used, the specified bookmarked revision, its
5730 ancestors, and the bookmark will be pushed to the remote
5730 ancestors, and the bookmark will be pushed to the remote
5731 repository. Specifying ``.`` is equivalent to specifying the active
5731 repository. Specifying ``.`` is equivalent to specifying the active
5732 bookmark's name. Use the --all-bookmarks option for pushing all
5732 bookmark's name. Use the --all-bookmarks option for pushing all
5733 current bookmarks.
5733 current bookmarks.
5734
5734
5735 Please see :hg:`help urls` for important details about ``ssh://``
5735 Please see :hg:`help urls` for important details about ``ssh://``
5736 URLs. If DESTINATION is omitted, a default path will be used.
5736 URLs. If DESTINATION is omitted, a default path will be used.
5737
5737
5738 When passed multiple destinations, push will process them one after the
5738 When passed multiple destinations, push will process them one after the
5739 other, but stop should an error occur.
5739 other, but stop should an error occur.
5740
5740
5741 .. container:: verbose
5741 .. container:: verbose
5742
5742
5743 The --pushvars option sends strings to the server that become
5743 The --pushvars option sends strings to the server that become
5744 environment variables prepended with ``HG_USERVAR_``. For example,
5744 environment variables prepended with ``HG_USERVAR_``. For example,
5745 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5745 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5746 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5746 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5747
5747
5748 pushvars can provide for user-overridable hooks as well as set debug
5748 pushvars can provide for user-overridable hooks as well as set debug
5749 levels. One example is having a hook that blocks commits containing
5749 levels. One example is having a hook that blocks commits containing
5750 conflict markers, but enables the user to override the hook if the file
5750 conflict markers, but enables the user to override the hook if the file
5751 is using conflict markers for testing purposes or the file format has
5751 is using conflict markers for testing purposes or the file format has
5752 strings that look like conflict markers.
5752 strings that look like conflict markers.
5753
5753
5754 By default, servers will ignore `--pushvars`. To enable it add the
5754 By default, servers will ignore `--pushvars`. To enable it add the
5755 following to your configuration file::
5755 following to your configuration file::
5756
5756
5757 [push]
5757 [push]
5758 pushvars.server = true
5758 pushvars.server = true
5759
5759
5760 Returns 0 if push was successful, 1 if nothing to push.
5760 Returns 0 if push was successful, 1 if nothing to push.
5761 """
5761 """
5762
5762
5763 opts = pycompat.byteskwargs(opts)
5763 opts = pycompat.byteskwargs(opts)
5764
5764
5765 if opts.get(b'all_bookmarks'):
5765 if opts.get(b'all_bookmarks'):
5766 cmdutil.check_incompatible_arguments(
5766 cmdutil.check_incompatible_arguments(
5767 opts,
5767 opts,
5768 b'all_bookmarks',
5768 b'all_bookmarks',
5769 [b'bookmark', b'rev'],
5769 [b'bookmark', b'rev'],
5770 )
5770 )
5771 opts[b'bookmark'] = list(repo._bookmarks)
5771 opts[b'bookmark'] = list(repo._bookmarks)
5772
5772
5773 if opts.get(b'bookmark'):
5773 if opts.get(b'bookmark'):
5774 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5774 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5775 for b in opts[b'bookmark']:
5775 for b in opts[b'bookmark']:
5776 # translate -B options to -r so changesets get pushed
5776 # translate -B options to -r so changesets get pushed
5777 b = repo._bookmarks.expandname(b)
5777 b = repo._bookmarks.expandname(b)
5778 if b in repo._bookmarks:
5778 if b in repo._bookmarks:
5779 opts.setdefault(b'rev', []).append(b)
5779 opts.setdefault(b'rev', []).append(b)
5780 else:
5780 else:
5781 # if we try to push a deleted bookmark, translate it to null
5781 # if we try to push a deleted bookmark, translate it to null
5782 # this lets simultaneous -r, -b options continue working
5782 # this lets simultaneous -r, -b options continue working
5783 opts.setdefault(b'rev', []).append(b"null")
5783 opts.setdefault(b'rev', []).append(b"null")
5784
5784
5785 some_pushed = False
5785 some_pushed = False
5786 result = 0
5786 result = 0
5787 for path in urlutil.get_push_paths(repo, ui, dests):
5787 for path in urlutil.get_push_paths(repo, ui, dests):
5788 dest = path.loc
5788 dest = path.loc
5789 branches = (path.branch, opts.get(b'branch') or [])
5789 branches = (path.branch, opts.get(b'branch') or [])
5790 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5790 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5791 revs, checkout = hg.addbranchrevs(
5791 revs, checkout = hg.addbranchrevs(
5792 repo, repo, branches, opts.get(b'rev')
5792 repo, repo, branches, opts.get(b'rev')
5793 )
5793 )
5794 other = hg.peer(repo, opts, dest)
5794 other = hg.peer(repo, opts, dest)
5795
5795
5796 try:
5796 try:
5797 if revs:
5797 if revs:
5798 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5798 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5799 if not revs:
5799 if not revs:
5800 raise error.InputError(
5800 raise error.InputError(
5801 _(b"specified revisions evaluate to an empty set"),
5801 _(b"specified revisions evaluate to an empty set"),
5802 hint=_(b"use different revision arguments"),
5802 hint=_(b"use different revision arguments"),
5803 )
5803 )
5804 elif path.pushrev:
5804 elif path.pushrev:
5805 # It doesn't make any sense to specify ancestor revisions. So limit
5805 # It doesn't make any sense to specify ancestor revisions. So limit
5806 # to DAG heads to make discovery simpler.
5806 # to DAG heads to make discovery simpler.
5807 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5807 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5808 revs = scmutil.revrange(repo, [expr])
5808 revs = scmutil.revrange(repo, [expr])
5809 revs = [repo[rev].node() for rev in revs]
5809 revs = [repo[rev].node() for rev in revs]
5810 if not revs:
5810 if not revs:
5811 raise error.InputError(
5811 raise error.InputError(
5812 _(
5812 _(
5813 b'default push revset for path evaluates to an empty set'
5813 b'default push revset for path evaluates to an empty set'
5814 )
5814 )
5815 )
5815 )
5816 elif ui.configbool(b'commands', b'push.require-revs'):
5816 elif ui.configbool(b'commands', b'push.require-revs'):
5817 raise error.InputError(
5817 raise error.InputError(
5818 _(b'no revisions specified to push'),
5818 _(b'no revisions specified to push'),
5819 hint=_(b'did you mean "hg push -r ."?'),
5819 hint=_(b'did you mean "hg push -r ."?'),
5820 )
5820 )
5821
5821
5822 repo._subtoppath = dest
5822 repo._subtoppath = dest
5823 try:
5823 try:
5824 # push subrepos depth-first for coherent ordering
5824 # push subrepos depth-first for coherent ordering
5825 c = repo[b'.']
5825 c = repo[b'.']
5826 subs = c.substate # only repos that are committed
5826 subs = c.substate # only repos that are committed
5827 for s in sorted(subs):
5827 for s in sorted(subs):
5828 sub_result = c.sub(s).push(opts)
5828 sub_result = c.sub(s).push(opts)
5829 if sub_result == 0:
5829 if sub_result == 0:
5830 return 1
5830 return 1
5831 finally:
5831 finally:
5832 del repo._subtoppath
5832 del repo._subtoppath
5833
5833
5834 opargs = dict(
5834 opargs = dict(
5835 opts.get(b'opargs', {})
5835 opts.get(b'opargs', {})
5836 ) # copy opargs since we may mutate it
5836 ) # copy opargs since we may mutate it
5837 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5837 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5838
5838
5839 pushop = exchange.push(
5839 pushop = exchange.push(
5840 repo,
5840 repo,
5841 other,
5841 other,
5842 opts.get(b'force'),
5842 opts.get(b'force'),
5843 revs=revs,
5843 revs=revs,
5844 newbranch=opts.get(b'new_branch'),
5844 newbranch=opts.get(b'new_branch'),
5845 bookmarks=opts.get(b'bookmark', ()),
5845 bookmarks=opts.get(b'bookmark', ()),
5846 publish=opts.get(b'publish'),
5846 publish=opts.get(b'publish'),
5847 opargs=opargs,
5847 opargs=opargs,
5848 )
5848 )
5849
5849
5850 if pushop.cgresult == 0:
5850 if pushop.cgresult == 0:
5851 result = 1
5851 result = 1
5852 elif pushop.cgresult is not None:
5852 elif pushop.cgresult is not None:
5853 some_pushed = True
5853 some_pushed = True
5854
5854
5855 if pushop.bkresult is not None:
5855 if pushop.bkresult is not None:
5856 if pushop.bkresult == 2:
5856 if pushop.bkresult == 2:
5857 result = 2
5857 result = 2
5858 elif not result and pushop.bkresult:
5858 elif not result and pushop.bkresult:
5859 result = 2
5859 result = 2
5860
5860
5861 if result:
5861 if result:
5862 break
5862 break
5863
5863
5864 finally:
5864 finally:
5865 other.close()
5865 other.close()
5866 if result == 0 and not some_pushed:
5866 if result == 0 and not some_pushed:
5867 result = 1
5867 result = 1
5868 return result
5868 return result
5869
5869
5870
5870
5871 @command(
5871 @command(
5872 b'recover',
5872 b'recover',
5873 [
5873 [
5874 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5874 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5875 ],
5875 ],
5876 helpcategory=command.CATEGORY_MAINTENANCE,
5876 helpcategory=command.CATEGORY_MAINTENANCE,
5877 )
5877 )
5878 def recover(ui, repo, **opts):
5878 def recover(ui, repo, **opts):
5879 """roll back an interrupted transaction
5879 """roll back an interrupted transaction
5880
5880
5881 Recover from an interrupted commit or pull.
5881 Recover from an interrupted commit or pull.
5882
5882
5883 This command tries to fix the repository status after an
5883 This command tries to fix the repository status after an
5884 interrupted operation. It should only be necessary when Mercurial
5884 interrupted operation. It should only be necessary when Mercurial
5885 suggests it.
5885 suggests it.
5886
5886
5887 Returns 0 if successful, 1 if nothing to recover or verify fails.
5887 Returns 0 if successful, 1 if nothing to recover or verify fails.
5888 """
5888 """
5889 ret = repo.recover()
5889 ret = repo.recover()
5890 if ret:
5890 if ret:
5891 if opts['verify']:
5891 if opts['verify']:
5892 return hg.verify(repo)
5892 return hg.verify(repo)
5893 else:
5893 else:
5894 msg = _(
5894 msg = _(
5895 b"(verify step skipped, run `hg verify` to check your "
5895 b"(verify step skipped, run `hg verify` to check your "
5896 b"repository content)\n"
5896 b"repository content)\n"
5897 )
5897 )
5898 ui.warn(msg)
5898 ui.warn(msg)
5899 return 0
5899 return 0
5900 return 1
5900 return 1
5901
5901
5902
5902
5903 @command(
5903 @command(
5904 b'remove|rm',
5904 b'remove|rm',
5905 [
5905 [
5906 (b'A', b'after', None, _(b'record delete for missing files')),
5906 (b'A', b'after', None, _(b'record delete for missing files')),
5907 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5907 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5908 ]
5908 ]
5909 + subrepoopts
5909 + subrepoopts
5910 + walkopts
5910 + walkopts
5911 + dryrunopts,
5911 + dryrunopts,
5912 _(b'[OPTION]... FILE...'),
5912 _(b'[OPTION]... FILE...'),
5913 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5913 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5914 helpbasic=True,
5914 helpbasic=True,
5915 inferrepo=True,
5915 inferrepo=True,
5916 )
5916 )
5917 def remove(ui, repo, *pats, **opts):
5917 def remove(ui, repo, *pats, **opts):
5918 """remove the specified files on the next commit
5918 """remove the specified files on the next commit
5919
5919
5920 Schedule the indicated files for removal from the current branch.
5920 Schedule the indicated files for removal from the current branch.
5921
5921
5922 This command schedules the files to be removed at the next commit.
5922 This command schedules the files to be removed at the next commit.
5923 To undo a remove before that, see :hg:`revert`. To undo added
5923 To undo a remove before that, see :hg:`revert`. To undo added
5924 files, see :hg:`forget`.
5924 files, see :hg:`forget`.
5925
5925
5926 .. container:: verbose
5926 .. container:: verbose
5927
5927
5928 -A/--after can be used to remove only files that have already
5928 -A/--after can be used to remove only files that have already
5929 been deleted, -f/--force can be used to force deletion, and -Af
5929 been deleted, -f/--force can be used to force deletion, and -Af
5930 can be used to remove files from the next revision without
5930 can be used to remove files from the next revision without
5931 deleting them from the working directory.
5931 deleting them from the working directory.
5932
5932
5933 The following table details the behavior of remove for different
5933 The following table details the behavior of remove for different
5934 file states (columns) and option combinations (rows). The file
5934 file states (columns) and option combinations (rows). The file
5935 states are Added [A], Clean [C], Modified [M] and Missing [!]
5935 states are Added [A], Clean [C], Modified [M] and Missing [!]
5936 (as reported by :hg:`status`). The actions are Warn, Remove
5936 (as reported by :hg:`status`). The actions are Warn, Remove
5937 (from branch) and Delete (from disk):
5937 (from branch) and Delete (from disk):
5938
5938
5939 ========= == == == ==
5939 ========= == == == ==
5940 opt/state A C M !
5940 opt/state A C M !
5941 ========= == == == ==
5941 ========= == == == ==
5942 none W RD W R
5942 none W RD W R
5943 -f R RD RD R
5943 -f R RD RD R
5944 -A W W W R
5944 -A W W W R
5945 -Af R R R R
5945 -Af R R R R
5946 ========= == == == ==
5946 ========= == == == ==
5947
5947
5948 .. note::
5948 .. note::
5949
5949
5950 :hg:`remove` never deletes files in Added [A] state from the
5950 :hg:`remove` never deletes files in Added [A] state from the
5951 working directory, not even if ``--force`` is specified.
5951 working directory, not even if ``--force`` is specified.
5952
5952
5953 Returns 0 on success, 1 if any warnings encountered.
5953 Returns 0 on success, 1 if any warnings encountered.
5954 """
5954 """
5955
5955
5956 opts = pycompat.byteskwargs(opts)
5956 opts = pycompat.byteskwargs(opts)
5957 after, force = opts.get(b'after'), opts.get(b'force')
5957 after, force = opts.get(b'after'), opts.get(b'force')
5958 dryrun = opts.get(b'dry_run')
5958 dryrun = opts.get(b'dry_run')
5959 if not pats and not after:
5959 if not pats and not after:
5960 raise error.InputError(_(b'no files specified'))
5960 raise error.InputError(_(b'no files specified'))
5961
5961
5962 with repo.wlock(), repo.dirstate.changing_files(repo):
5962 with repo.wlock(), repo.dirstate.changing_files(repo):
5963 m = scmutil.match(repo[None], pats, opts)
5963 m = scmutil.match(repo[None], pats, opts)
5964 subrepos = opts.get(b'subrepos')
5964 subrepos = opts.get(b'subrepos')
5965 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5965 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5966 return cmdutil.remove(
5966 return cmdutil.remove(
5967 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5967 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5968 )
5968 )
5969
5969
5970
5970
5971 @command(
5971 @command(
5972 b'rename|move|mv',
5972 b'rename|move|mv',
5973 [
5973 [
5974 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5974 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5975 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5975 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5976 (
5976 (
5977 b'',
5977 b'',
5978 b'at-rev',
5978 b'at-rev',
5979 b'',
5979 b'',
5980 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5980 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5981 _(b'REV'),
5981 _(b'REV'),
5982 ),
5982 ),
5983 (
5983 (
5984 b'f',
5984 b'f',
5985 b'force',
5985 b'force',
5986 None,
5986 None,
5987 _(b'forcibly move over an existing managed file'),
5987 _(b'forcibly move over an existing managed file'),
5988 ),
5988 ),
5989 ]
5989 ]
5990 + walkopts
5990 + walkopts
5991 + dryrunopts,
5991 + dryrunopts,
5992 _(b'[OPTION]... SOURCE... DEST'),
5992 _(b'[OPTION]... SOURCE... DEST'),
5993 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5993 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5994 )
5994 )
5995 def rename(ui, repo, *pats, **opts):
5995 def rename(ui, repo, *pats, **opts):
5996 """rename files; equivalent of copy + remove
5996 """rename files; equivalent of copy + remove
5997
5997
5998 Mark dest as copies of sources; mark sources for deletion. If dest
5998 Mark dest as copies of sources; mark sources for deletion. If dest
5999 is a directory, copies are put in that directory. If dest is a
5999 is a directory, copies are put in that directory. If dest is a
6000 file, there can only be one source.
6000 file, there can only be one source.
6001
6001
6002 By default, this command copies the contents of files as they
6002 By default, this command copies the contents of files as they
6003 exist in the working directory. If invoked with -A/--after, the
6003 exist in the working directory. If invoked with -A/--after, the
6004 operation is recorded, but no copying is performed.
6004 operation is recorded, but no copying is performed.
6005
6005
6006 To undo marking a destination file as renamed, use --forget. With that
6006 To undo marking a destination file as renamed, use --forget. With that
6007 option, all given (positional) arguments are unmarked as renames. The
6007 option, all given (positional) arguments are unmarked as renames. The
6008 destination file(s) will be left in place (still tracked). The source
6008 destination file(s) will be left in place (still tracked). The source
6009 file(s) will not be restored. Note that :hg:`rename --forget` behaves
6009 file(s) will not be restored. Note that :hg:`rename --forget` behaves
6010 the same way as :hg:`copy --forget`.
6010 the same way as :hg:`copy --forget`.
6011
6011
6012 This command takes effect with the next commit by default.
6012 This command takes effect with the next commit by default.
6013
6013
6014 Returns 0 on success, 1 if errors are encountered.
6014 Returns 0 on success, 1 if errors are encountered.
6015 """
6015 """
6016 opts = pycompat.byteskwargs(opts)
6016 opts = pycompat.byteskwargs(opts)
6017 with repo.wlock():
6017 context = repo.dirstate.changing_files
6018 rev = opts.get(b'at_rev')
6019 ctx = None
6020 if rev:
6021 ctx = logcmdutil.revsingle(repo, rev)
6022 if ctx.rev() is not None:
6023
6024 def context(repo):
6025 return util.nullcontextmanager()
6026
6027 opts[b'at_rev'] = ctx.rev()
6028 with repo.wlock(), context(repo):
6018 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6029 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6019
6030
6020
6031
6021 @command(
6032 @command(
6022 b'resolve',
6033 b'resolve',
6023 [
6034 [
6024 (b'a', b'all', None, _(b'select all unresolved files')),
6035 (b'a', b'all', None, _(b'select all unresolved files')),
6025 (b'l', b'list', None, _(b'list state of files needing merge')),
6036 (b'l', b'list', None, _(b'list state of files needing merge')),
6026 (b'm', b'mark', None, _(b'mark files as resolved')),
6037 (b'm', b'mark', None, _(b'mark files as resolved')),
6027 (b'u', b'unmark', None, _(b'mark files as unresolved')),
6038 (b'u', b'unmark', None, _(b'mark files as unresolved')),
6028 (b'n', b'no-status', None, _(b'hide status prefix')),
6039 (b'n', b'no-status', None, _(b'hide status prefix')),
6029 (b'', b're-merge', None, _(b're-merge files')),
6040 (b'', b're-merge', None, _(b're-merge files')),
6030 ]
6041 ]
6031 + mergetoolopts
6042 + mergetoolopts
6032 + walkopts
6043 + walkopts
6033 + formatteropts,
6044 + formatteropts,
6034 _(b'[OPTION]... [FILE]...'),
6045 _(b'[OPTION]... [FILE]...'),
6035 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6046 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6036 inferrepo=True,
6047 inferrepo=True,
6037 )
6048 )
6038 def resolve(ui, repo, *pats, **opts):
6049 def resolve(ui, repo, *pats, **opts):
6039 """redo merges or set/view the merge status of files
6050 """redo merges or set/view the merge status of files
6040
6051
6041 Merges with unresolved conflicts are often the result of
6052 Merges with unresolved conflicts are often the result of
6042 non-interactive merging using the ``internal:merge`` configuration
6053 non-interactive merging using the ``internal:merge`` configuration
6043 setting, or a command-line merge tool like ``diff3``. The resolve
6054 setting, or a command-line merge tool like ``diff3``. The resolve
6044 command is used to manage the files involved in a merge, after
6055 command is used to manage the files involved in a merge, after
6045 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6056 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6046 working directory must have two parents). See :hg:`help
6057 working directory must have two parents). See :hg:`help
6047 merge-tools` for information on configuring merge tools.
6058 merge-tools` for information on configuring merge tools.
6048
6059
6049 The resolve command can be used in the following ways:
6060 The resolve command can be used in the following ways:
6050
6061
6051 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
6062 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
6052 the specified files, discarding any previous merge attempts. Re-merging
6063 the specified files, discarding any previous merge attempts. Re-merging
6053 is not performed for files already marked as resolved. Use ``--all/-a``
6064 is not performed for files already marked as resolved. Use ``--all/-a``
6054 to select all unresolved files. ``--tool`` can be used to specify
6065 to select all unresolved files. ``--tool`` can be used to specify
6055 the merge tool used for the given files. It overrides the HGMERGE
6066 the merge tool used for the given files. It overrides the HGMERGE
6056 environment variable and your configuration files. Previous file
6067 environment variable and your configuration files. Previous file
6057 contents are saved with a ``.orig`` suffix.
6068 contents are saved with a ``.orig`` suffix.
6058
6069
6059 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6070 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6060 (e.g. after having manually fixed-up the files). The default is
6071 (e.g. after having manually fixed-up the files). The default is
6061 to mark all unresolved files.
6072 to mark all unresolved files.
6062
6073
6063 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6074 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6064 default is to mark all resolved files.
6075 default is to mark all resolved files.
6065
6076
6066 - :hg:`resolve -l`: list files which had or still have conflicts.
6077 - :hg:`resolve -l`: list files which had or still have conflicts.
6067 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6078 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6068 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6079 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6069 the list. See :hg:`help filesets` for details.
6080 the list. See :hg:`help filesets` for details.
6070
6081
6071 .. note::
6082 .. note::
6072
6083
6073 Mercurial will not let you commit files with unresolved merge
6084 Mercurial will not let you commit files with unresolved merge
6074 conflicts. You must use :hg:`resolve -m ...` before you can
6085 conflicts. You must use :hg:`resolve -m ...` before you can
6075 commit after a conflicting merge.
6086 commit after a conflicting merge.
6076
6087
6077 .. container:: verbose
6088 .. container:: verbose
6078
6089
6079 Template:
6090 Template:
6080
6091
6081 The following keywords are supported in addition to the common template
6092 The following keywords are supported in addition to the common template
6082 keywords and functions. See also :hg:`help templates`.
6093 keywords and functions. See also :hg:`help templates`.
6083
6094
6084 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6095 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6085 :path: String. Repository-absolute path of the file.
6096 :path: String. Repository-absolute path of the file.
6086
6097
6087 Returns 0 on success, 1 if any files fail a resolve attempt.
6098 Returns 0 on success, 1 if any files fail a resolve attempt.
6088 """
6099 """
6089
6100
6090 opts = pycompat.byteskwargs(opts)
6101 opts = pycompat.byteskwargs(opts)
6091 confirm = ui.configbool(b'commands', b'resolve.confirm')
6102 confirm = ui.configbool(b'commands', b'resolve.confirm')
6092 flaglist = b'all mark unmark list no_status re_merge'.split()
6103 flaglist = b'all mark unmark list no_status re_merge'.split()
6093 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6104 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6094
6105
6095 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6106 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6096 if actioncount > 1:
6107 if actioncount > 1:
6097 raise error.InputError(_(b"too many actions specified"))
6108 raise error.InputError(_(b"too many actions specified"))
6098 elif actioncount == 0 and ui.configbool(
6109 elif actioncount == 0 and ui.configbool(
6099 b'commands', b'resolve.explicit-re-merge'
6110 b'commands', b'resolve.explicit-re-merge'
6100 ):
6111 ):
6101 hint = _(b'use --mark, --unmark, --list or --re-merge')
6112 hint = _(b'use --mark, --unmark, --list or --re-merge')
6102 raise error.InputError(_(b'no action specified'), hint=hint)
6113 raise error.InputError(_(b'no action specified'), hint=hint)
6103 if pats and all:
6114 if pats and all:
6104 raise error.InputError(_(b"can't specify --all and patterns"))
6115 raise error.InputError(_(b"can't specify --all and patterns"))
6105 if not (all or pats or show or mark or unmark):
6116 if not (all or pats or show or mark or unmark):
6106 raise error.InputError(
6117 raise error.InputError(
6107 _(b'no files or directories specified'),
6118 _(b'no files or directories specified'),
6108 hint=b'use --all to re-merge all unresolved files',
6119 hint=b'use --all to re-merge all unresolved files',
6109 )
6120 )
6110
6121
6111 if confirm:
6122 if confirm:
6112 if all:
6123 if all:
6113 if ui.promptchoice(
6124 if ui.promptchoice(
6114 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6125 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6115 ):
6126 ):
6116 raise error.CanceledError(_(b'user quit'))
6127 raise error.CanceledError(_(b'user quit'))
6117 if mark and not pats:
6128 if mark and not pats:
6118 if ui.promptchoice(
6129 if ui.promptchoice(
6119 _(
6130 _(
6120 b'mark all unresolved files as resolved (yn)?'
6131 b'mark all unresolved files as resolved (yn)?'
6121 b'$$ &Yes $$ &No'
6132 b'$$ &Yes $$ &No'
6122 )
6133 )
6123 ):
6134 ):
6124 raise error.CanceledError(_(b'user quit'))
6135 raise error.CanceledError(_(b'user quit'))
6125 if unmark and not pats:
6136 if unmark and not pats:
6126 if ui.promptchoice(
6137 if ui.promptchoice(
6127 _(
6138 _(
6128 b'mark all resolved files as unresolved (yn)?'
6139 b'mark all resolved files as unresolved (yn)?'
6129 b'$$ &Yes $$ &No'
6140 b'$$ &Yes $$ &No'
6130 )
6141 )
6131 ):
6142 ):
6132 raise error.CanceledError(_(b'user quit'))
6143 raise error.CanceledError(_(b'user quit'))
6133
6144
6134 uipathfn = scmutil.getuipathfn(repo)
6145 uipathfn = scmutil.getuipathfn(repo)
6135
6146
6136 if show:
6147 if show:
6137 ui.pager(b'resolve')
6148 ui.pager(b'resolve')
6138 fm = ui.formatter(b'resolve', opts)
6149 fm = ui.formatter(b'resolve', opts)
6139 ms = mergestatemod.mergestate.read(repo)
6150 ms = mergestatemod.mergestate.read(repo)
6140 wctx = repo[None]
6151 wctx = repo[None]
6141 m = scmutil.match(wctx, pats, opts)
6152 m = scmutil.match(wctx, pats, opts)
6142
6153
6143 # Labels and keys based on merge state. Unresolved path conflicts show
6154 # Labels and keys based on merge state. Unresolved path conflicts show
6144 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6155 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6145 # resolved conflicts.
6156 # resolved conflicts.
6146 mergestateinfo = {
6157 mergestateinfo = {
6147 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6158 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6148 b'resolve.unresolved',
6159 b'resolve.unresolved',
6149 b'U',
6160 b'U',
6150 ),
6161 ),
6151 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6162 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6152 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6163 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6153 b'resolve.unresolved',
6164 b'resolve.unresolved',
6154 b'P',
6165 b'P',
6155 ),
6166 ),
6156 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6167 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6157 b'resolve.resolved',
6168 b'resolve.resolved',
6158 b'R',
6169 b'R',
6159 ),
6170 ),
6160 }
6171 }
6161
6172
6162 for f in ms:
6173 for f in ms:
6163 if not m(f):
6174 if not m(f):
6164 continue
6175 continue
6165
6176
6166 label, key = mergestateinfo[ms[f]]
6177 label, key = mergestateinfo[ms[f]]
6167 fm.startitem()
6178 fm.startitem()
6168 fm.context(ctx=wctx)
6179 fm.context(ctx=wctx)
6169 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6180 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6170 fm.data(path=f)
6181 fm.data(path=f)
6171 fm.plain(b'%s\n' % uipathfn(f), label=label)
6182 fm.plain(b'%s\n' % uipathfn(f), label=label)
6172 fm.end()
6183 fm.end()
6173 return 0
6184 return 0
6174
6185
6175 with repo.wlock():
6186 with repo.wlock():
6176 ms = mergestatemod.mergestate.read(repo)
6187 ms = mergestatemod.mergestate.read(repo)
6177
6188
6178 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6189 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6179 raise error.StateError(
6190 raise error.StateError(
6180 _(b'resolve command not applicable when not merging')
6191 _(b'resolve command not applicable when not merging')
6181 )
6192 )
6182
6193
6183 wctx = repo[None]
6194 wctx = repo[None]
6184 m = scmutil.match(wctx, pats, opts)
6195 m = scmutil.match(wctx, pats, opts)
6185 ret = 0
6196 ret = 0
6186 didwork = False
6197 didwork = False
6187
6198
6188 hasconflictmarkers = []
6199 hasconflictmarkers = []
6189 if mark:
6200 if mark:
6190 markcheck = ui.config(b'commands', b'resolve.mark-check')
6201 markcheck = ui.config(b'commands', b'resolve.mark-check')
6191 if markcheck not in [b'warn', b'abort']:
6202 if markcheck not in [b'warn', b'abort']:
6192 # Treat all invalid / unrecognized values as 'none'.
6203 # Treat all invalid / unrecognized values as 'none'.
6193 markcheck = False
6204 markcheck = False
6194 for f in ms:
6205 for f in ms:
6195 if not m(f):
6206 if not m(f):
6196 continue
6207 continue
6197
6208
6198 didwork = True
6209 didwork = True
6199
6210
6200 # path conflicts must be resolved manually
6211 # path conflicts must be resolved manually
6201 if ms[f] in (
6212 if ms[f] in (
6202 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6213 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6203 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6214 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6204 ):
6215 ):
6205 if mark:
6216 if mark:
6206 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6217 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6207 elif unmark:
6218 elif unmark:
6208 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6219 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6209 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6220 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6210 ui.warn(
6221 ui.warn(
6211 _(b'%s: path conflict must be resolved manually\n')
6222 _(b'%s: path conflict must be resolved manually\n')
6212 % uipathfn(f)
6223 % uipathfn(f)
6213 )
6224 )
6214 continue
6225 continue
6215
6226
6216 if mark:
6227 if mark:
6217 if markcheck:
6228 if markcheck:
6218 fdata = repo.wvfs.tryread(f)
6229 fdata = repo.wvfs.tryread(f)
6219 if (
6230 if (
6220 filemerge.hasconflictmarkers(fdata)
6231 filemerge.hasconflictmarkers(fdata)
6221 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6232 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6222 ):
6233 ):
6223 hasconflictmarkers.append(f)
6234 hasconflictmarkers.append(f)
6224 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6235 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6225 elif unmark:
6236 elif unmark:
6226 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6237 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6227 else:
6238 else:
6228 # backup pre-resolve (merge uses .orig for its own purposes)
6239 # backup pre-resolve (merge uses .orig for its own purposes)
6229 a = repo.wjoin(f)
6240 a = repo.wjoin(f)
6230 try:
6241 try:
6231 util.copyfile(a, a + b".resolve")
6242 util.copyfile(a, a + b".resolve")
6232 except FileNotFoundError:
6243 except FileNotFoundError:
6233 pass
6244 pass
6234
6245
6235 try:
6246 try:
6236 # preresolve file
6247 # preresolve file
6237 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6248 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6238 with ui.configoverride(overrides, b'resolve'):
6249 with ui.configoverride(overrides, b'resolve'):
6239 r = ms.resolve(f, wctx)
6250 r = ms.resolve(f, wctx)
6240 if r:
6251 if r:
6241 ret = 1
6252 ret = 1
6242 finally:
6253 finally:
6243 ms.commit()
6254 ms.commit()
6244
6255
6245 # replace filemerge's .orig file with our resolve file
6256 # replace filemerge's .orig file with our resolve file
6246 try:
6257 try:
6247 util.rename(
6258 util.rename(
6248 a + b".resolve", scmutil.backuppath(ui, repo, f)
6259 a + b".resolve", scmutil.backuppath(ui, repo, f)
6249 )
6260 )
6250 except FileNotFoundError:
6261 except FileNotFoundError:
6251 pass
6262 pass
6252
6263
6253 if hasconflictmarkers:
6264 if hasconflictmarkers:
6254 ui.warn(
6265 ui.warn(
6255 _(
6266 _(
6256 b'warning: the following files still have conflict '
6267 b'warning: the following files still have conflict '
6257 b'markers:\n'
6268 b'markers:\n'
6258 )
6269 )
6259 + b''.join(
6270 + b''.join(
6260 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6271 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6261 )
6272 )
6262 )
6273 )
6263 if markcheck == b'abort' and not all and not pats:
6274 if markcheck == b'abort' and not all and not pats:
6264 raise error.StateError(
6275 raise error.StateError(
6265 _(b'conflict markers detected'),
6276 _(b'conflict markers detected'),
6266 hint=_(b'use --all to mark anyway'),
6277 hint=_(b'use --all to mark anyway'),
6267 )
6278 )
6268
6279
6269 ms.commit()
6280 ms.commit()
6270 branchmerge = repo.dirstate.p2() != repo.nullid
6281 branchmerge = repo.dirstate.p2() != repo.nullid
6271 # resolve is not doing a parent change here, however, `record updates`
6282 # resolve is not doing a parent change here, however, `record updates`
6272 # will call some dirstate API that at intended for parent changes call.
6283 # will call some dirstate API that at intended for parent changes call.
6273 # Ideally we would not need this and could implement a lighter version
6284 # Ideally we would not need this and could implement a lighter version
6274 # of the recordupdateslogic that will not have to deal with the part
6285 # of the recordupdateslogic that will not have to deal with the part
6275 # related to parent changes. However this would requires that:
6286 # related to parent changes. However this would requires that:
6276 # - we are sure we passed around enough information at update/merge
6287 # - we are sure we passed around enough information at update/merge
6277 # time to no longer needs it at `hg resolve time`
6288 # time to no longer needs it at `hg resolve time`
6278 # - we are sure we store that information well enough to be able to reuse it
6289 # - we are sure we store that information well enough to be able to reuse it
6279 # - we are the necessary logic to reuse it right.
6290 # - we are the necessary logic to reuse it right.
6280 #
6291 #
6281 # All this should eventually happens, but in the mean time, we use this
6292 # All this should eventually happens, but in the mean time, we use this
6282 # context manager slightly out of the context it should be.
6293 # context manager slightly out of the context it should be.
6283 with repo.dirstate.changing_parents(repo):
6294 with repo.dirstate.changing_parents(repo):
6284 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6295 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6285
6296
6286 if not didwork and pats:
6297 if not didwork and pats:
6287 hint = None
6298 hint = None
6288 if not any([p for p in pats if p.find(b':') >= 0]):
6299 if not any([p for p in pats if p.find(b':') >= 0]):
6289 pats = [b'path:%s' % p for p in pats]
6300 pats = [b'path:%s' % p for p in pats]
6290 m = scmutil.match(wctx, pats, opts)
6301 m = scmutil.match(wctx, pats, opts)
6291 for f in ms:
6302 for f in ms:
6292 if not m(f):
6303 if not m(f):
6293 continue
6304 continue
6294
6305
6295 def flag(o):
6306 def flag(o):
6296 if o == b're_merge':
6307 if o == b're_merge':
6297 return b'--re-merge '
6308 return b'--re-merge '
6298 return b'-%s ' % o[0:1]
6309 return b'-%s ' % o[0:1]
6299
6310
6300 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6311 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6301 hint = _(b"(try: hg resolve %s%s)\n") % (
6312 hint = _(b"(try: hg resolve %s%s)\n") % (
6302 flags,
6313 flags,
6303 b' '.join(pats),
6314 b' '.join(pats),
6304 )
6315 )
6305 break
6316 break
6306 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6317 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6307 if hint:
6318 if hint:
6308 ui.warn(hint)
6319 ui.warn(hint)
6309
6320
6310 unresolvedf = ms.unresolvedcount()
6321 unresolvedf = ms.unresolvedcount()
6311 if not unresolvedf:
6322 if not unresolvedf:
6312 ui.status(_(b'(no more unresolved files)\n'))
6323 ui.status(_(b'(no more unresolved files)\n'))
6313 cmdutil.checkafterresolved(repo)
6324 cmdutil.checkafterresolved(repo)
6314
6325
6315 return ret
6326 return ret
6316
6327
6317
6328
6318 @command(
6329 @command(
6319 b'revert',
6330 b'revert',
6320 [
6331 [
6321 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6332 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6322 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6333 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6323 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6334 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6324 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6335 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6325 (b'i', b'interactive', None, _(b'interactively select the changes')),
6336 (b'i', b'interactive', None, _(b'interactively select the changes')),
6326 ]
6337 ]
6327 + walkopts
6338 + walkopts
6328 + dryrunopts,
6339 + dryrunopts,
6329 _(b'[OPTION]... [-r REV] [NAME]...'),
6340 _(b'[OPTION]... [-r REV] [NAME]...'),
6330 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6341 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6331 )
6342 )
6332 def revert(ui, repo, *pats, **opts):
6343 def revert(ui, repo, *pats, **opts):
6333 """restore files to their checkout state
6344 """restore files to their checkout state
6334
6345
6335 .. note::
6346 .. note::
6336
6347
6337 To check out earlier revisions, you should use :hg:`update REV`.
6348 To check out earlier revisions, you should use :hg:`update REV`.
6338 To cancel an uncommitted merge (and lose your changes),
6349 To cancel an uncommitted merge (and lose your changes),
6339 use :hg:`merge --abort`.
6350 use :hg:`merge --abort`.
6340
6351
6341 With no revision specified, revert the specified files or directories
6352 With no revision specified, revert the specified files or directories
6342 to the contents they had in the parent of the working directory.
6353 to the contents they had in the parent of the working directory.
6343 This restores the contents of files to an unmodified
6354 This restores the contents of files to an unmodified
6344 state and unschedules adds, removes, copies, and renames. If the
6355 state and unschedules adds, removes, copies, and renames. If the
6345 working directory has two parents, you must explicitly specify a
6356 working directory has two parents, you must explicitly specify a
6346 revision.
6357 revision.
6347
6358
6348 Using the -r/--rev or -d/--date options, revert the given files or
6359 Using the -r/--rev or -d/--date options, revert the given files or
6349 directories to their states as of a specific revision. Because
6360 directories to their states as of a specific revision. Because
6350 revert does not change the working directory parents, this will
6361 revert does not change the working directory parents, this will
6351 cause these files to appear modified. This can be helpful to "back
6362 cause these files to appear modified. This can be helpful to "back
6352 out" some or all of an earlier change. See :hg:`backout` for a
6363 out" some or all of an earlier change. See :hg:`backout` for a
6353 related method.
6364 related method.
6354
6365
6355 Modified files are saved with a .orig suffix before reverting.
6366 Modified files are saved with a .orig suffix before reverting.
6356 To disable these backups, use --no-backup. It is possible to store
6367 To disable these backups, use --no-backup. It is possible to store
6357 the backup files in a custom directory relative to the root of the
6368 the backup files in a custom directory relative to the root of the
6358 repository by setting the ``ui.origbackuppath`` configuration
6369 repository by setting the ``ui.origbackuppath`` configuration
6359 option.
6370 option.
6360
6371
6361 See :hg:`help dates` for a list of formats valid for -d/--date.
6372 See :hg:`help dates` for a list of formats valid for -d/--date.
6362
6373
6363 See :hg:`help backout` for a way to reverse the effect of an
6374 See :hg:`help backout` for a way to reverse the effect of an
6364 earlier changeset.
6375 earlier changeset.
6365
6376
6366 Returns 0 on success.
6377 Returns 0 on success.
6367 """
6378 """
6368
6379
6369 opts = pycompat.byteskwargs(opts)
6380 opts = pycompat.byteskwargs(opts)
6370 if opts.get(b"date"):
6381 if opts.get(b"date"):
6371 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6382 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6372 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6383 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6373
6384
6374 parent, p2 = repo.dirstate.parents()
6385 parent, p2 = repo.dirstate.parents()
6375 if not opts.get(b'rev') and p2 != repo.nullid:
6386 if not opts.get(b'rev') and p2 != repo.nullid:
6376 # revert after merge is a trap for new users (issue2915)
6387 # revert after merge is a trap for new users (issue2915)
6377 raise error.InputError(
6388 raise error.InputError(
6378 _(b'uncommitted merge with no revision specified'),
6389 _(b'uncommitted merge with no revision specified'),
6379 hint=_(b"use 'hg update' or see 'hg help revert'"),
6390 hint=_(b"use 'hg update' or see 'hg help revert'"),
6380 )
6391 )
6381
6392
6382 rev = opts.get(b'rev')
6393 rev = opts.get(b'rev')
6383 if rev:
6394 if rev:
6384 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6395 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6385 ctx = logcmdutil.revsingle(repo, rev)
6396 ctx = logcmdutil.revsingle(repo, rev)
6386
6397
6387 if not (
6398 if not (
6388 pats
6399 pats
6389 or opts.get(b'include')
6400 or opts.get(b'include')
6390 or opts.get(b'exclude')
6401 or opts.get(b'exclude')
6391 or opts.get(b'all')
6402 or opts.get(b'all')
6392 or opts.get(b'interactive')
6403 or opts.get(b'interactive')
6393 ):
6404 ):
6394 msg = _(b"no files or directories specified")
6405 msg = _(b"no files or directories specified")
6395 if p2 != repo.nullid:
6406 if p2 != repo.nullid:
6396 hint = _(
6407 hint = _(
6397 b"uncommitted merge, use --all to discard all changes,"
6408 b"uncommitted merge, use --all to discard all changes,"
6398 b" or 'hg update -C .' to abort the merge"
6409 b" or 'hg update -C .' to abort the merge"
6399 )
6410 )
6400 raise error.InputError(msg, hint=hint)
6411 raise error.InputError(msg, hint=hint)
6401 dirty = any(repo.status())
6412 dirty = any(repo.status())
6402 node = ctx.node()
6413 node = ctx.node()
6403 if node != parent:
6414 if node != parent:
6404 if dirty:
6415 if dirty:
6405 hint = (
6416 hint = (
6406 _(
6417 _(
6407 b"uncommitted changes, use --all to discard all"
6418 b"uncommitted changes, use --all to discard all"
6408 b" changes, or 'hg update %d' to update"
6419 b" changes, or 'hg update %d' to update"
6409 )
6420 )
6410 % ctx.rev()
6421 % ctx.rev()
6411 )
6422 )
6412 else:
6423 else:
6413 hint = (
6424 hint = (
6414 _(
6425 _(
6415 b"use --all to revert all files,"
6426 b"use --all to revert all files,"
6416 b" or 'hg update %d' to update"
6427 b" or 'hg update %d' to update"
6417 )
6428 )
6418 % ctx.rev()
6429 % ctx.rev()
6419 )
6430 )
6420 elif dirty:
6431 elif dirty:
6421 hint = _(b"uncommitted changes, use --all to discard all changes")
6432 hint = _(b"uncommitted changes, use --all to discard all changes")
6422 else:
6433 else:
6423 hint = _(b"use --all to revert all files")
6434 hint = _(b"use --all to revert all files")
6424 raise error.InputError(msg, hint=hint)
6435 raise error.InputError(msg, hint=hint)
6425
6436
6426 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6437 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6427
6438
6428
6439
6429 @command(
6440 @command(
6430 b'rollback',
6441 b'rollback',
6431 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6442 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6432 helpcategory=command.CATEGORY_MAINTENANCE,
6443 helpcategory=command.CATEGORY_MAINTENANCE,
6433 )
6444 )
6434 def rollback(ui, repo, **opts):
6445 def rollback(ui, repo, **opts):
6435 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6446 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6436
6447
6437 Please use :hg:`commit --amend` instead of rollback to correct
6448 Please use :hg:`commit --amend` instead of rollback to correct
6438 mistakes in the last commit.
6449 mistakes in the last commit.
6439
6450
6440 This command should be used with care. There is only one level of
6451 This command should be used with care. There is only one level of
6441 rollback, and there is no way to undo a rollback. It will also
6452 rollback, and there is no way to undo a rollback. It will also
6442 restore the dirstate at the time of the last transaction, losing
6453 restore the dirstate at the time of the last transaction, losing
6443 any dirstate changes since that time. This command does not alter
6454 any dirstate changes since that time. This command does not alter
6444 the working directory.
6455 the working directory.
6445
6456
6446 Transactions are used to encapsulate the effects of all commands
6457 Transactions are used to encapsulate the effects of all commands
6447 that create new changesets or propagate existing changesets into a
6458 that create new changesets or propagate existing changesets into a
6448 repository.
6459 repository.
6449
6460
6450 .. container:: verbose
6461 .. container:: verbose
6451
6462
6452 For example, the following commands are transactional, and their
6463 For example, the following commands are transactional, and their
6453 effects can be rolled back:
6464 effects can be rolled back:
6454
6465
6455 - commit
6466 - commit
6456 - import
6467 - import
6457 - pull
6468 - pull
6458 - push (with this repository as the destination)
6469 - push (with this repository as the destination)
6459 - unbundle
6470 - unbundle
6460
6471
6461 To avoid permanent data loss, rollback will refuse to rollback a
6472 To avoid permanent data loss, rollback will refuse to rollback a
6462 commit transaction if it isn't checked out. Use --force to
6473 commit transaction if it isn't checked out. Use --force to
6463 override this protection.
6474 override this protection.
6464
6475
6465 The rollback command can be entirely disabled by setting the
6476 The rollback command can be entirely disabled by setting the
6466 ``ui.rollback`` configuration setting to false. If you're here
6477 ``ui.rollback`` configuration setting to false. If you're here
6467 because you want to use rollback and it's disabled, you can
6478 because you want to use rollback and it's disabled, you can
6468 re-enable the command by setting ``ui.rollback`` to true.
6479 re-enable the command by setting ``ui.rollback`` to true.
6469
6480
6470 This command is not intended for use on public repositories. Once
6481 This command is not intended for use on public repositories. Once
6471 changes are visible for pull by other users, rolling a transaction
6482 changes are visible for pull by other users, rolling a transaction
6472 back locally is ineffective (someone else may already have pulled
6483 back locally is ineffective (someone else may already have pulled
6473 the changes). Furthermore, a race is possible with readers of the
6484 the changes). Furthermore, a race is possible with readers of the
6474 repository; for example an in-progress pull from the repository
6485 repository; for example an in-progress pull from the repository
6475 may fail if a rollback is performed.
6486 may fail if a rollback is performed.
6476
6487
6477 Returns 0 on success, 1 if no rollback data is available.
6488 Returns 0 on success, 1 if no rollback data is available.
6478 """
6489 """
6479 if not ui.configbool(b'ui', b'rollback'):
6490 if not ui.configbool(b'ui', b'rollback'):
6480 raise error.Abort(
6491 raise error.Abort(
6481 _(b'rollback is disabled because it is unsafe'),
6492 _(b'rollback is disabled because it is unsafe'),
6482 hint=b'see `hg help -v rollback` for information',
6493 hint=b'see `hg help -v rollback` for information',
6483 )
6494 )
6484 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6495 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6485
6496
6486
6497
6487 @command(
6498 @command(
6488 b'root',
6499 b'root',
6489 [] + formatteropts,
6500 [] + formatteropts,
6490 intents={INTENT_READONLY},
6501 intents={INTENT_READONLY},
6491 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6502 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6492 )
6503 )
6493 def root(ui, repo, **opts):
6504 def root(ui, repo, **opts):
6494 """print the root (top) of the current working directory
6505 """print the root (top) of the current working directory
6495
6506
6496 Print the root directory of the current repository.
6507 Print the root directory of the current repository.
6497
6508
6498 .. container:: verbose
6509 .. container:: verbose
6499
6510
6500 Template:
6511 Template:
6501
6512
6502 The following keywords are supported in addition to the common template
6513 The following keywords are supported in addition to the common template
6503 keywords and functions. See also :hg:`help templates`.
6514 keywords and functions. See also :hg:`help templates`.
6504
6515
6505 :hgpath: String. Path to the .hg directory.
6516 :hgpath: String. Path to the .hg directory.
6506 :storepath: String. Path to the directory holding versioned data.
6517 :storepath: String. Path to the directory holding versioned data.
6507
6518
6508 Returns 0 on success.
6519 Returns 0 on success.
6509 """
6520 """
6510 opts = pycompat.byteskwargs(opts)
6521 opts = pycompat.byteskwargs(opts)
6511 with ui.formatter(b'root', opts) as fm:
6522 with ui.formatter(b'root', opts) as fm:
6512 fm.startitem()
6523 fm.startitem()
6513 fm.write(b'reporoot', b'%s\n', repo.root)
6524 fm.write(b'reporoot', b'%s\n', repo.root)
6514 fm.data(hgpath=repo.path, storepath=repo.spath)
6525 fm.data(hgpath=repo.path, storepath=repo.spath)
6515
6526
6516
6527
6517 @command(
6528 @command(
6518 b'serve',
6529 b'serve',
6519 [
6530 [
6520 (
6531 (
6521 b'A',
6532 b'A',
6522 b'accesslog',
6533 b'accesslog',
6523 b'',
6534 b'',
6524 _(b'name of access log file to write to'),
6535 _(b'name of access log file to write to'),
6525 _(b'FILE'),
6536 _(b'FILE'),
6526 ),
6537 ),
6527 (b'd', b'daemon', None, _(b'run server in background')),
6538 (b'd', b'daemon', None, _(b'run server in background')),
6528 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6539 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6529 (
6540 (
6530 b'E',
6541 b'E',
6531 b'errorlog',
6542 b'errorlog',
6532 b'',
6543 b'',
6533 _(b'name of error log file to write to'),
6544 _(b'name of error log file to write to'),
6534 _(b'FILE'),
6545 _(b'FILE'),
6535 ),
6546 ),
6536 # use string type, then we can check if something was passed
6547 # use string type, then we can check if something was passed
6537 (
6548 (
6538 b'p',
6549 b'p',
6539 b'port',
6550 b'port',
6540 b'',
6551 b'',
6541 _(b'port to listen on (default: 8000)'),
6552 _(b'port to listen on (default: 8000)'),
6542 _(b'PORT'),
6553 _(b'PORT'),
6543 ),
6554 ),
6544 (
6555 (
6545 b'a',
6556 b'a',
6546 b'address',
6557 b'address',
6547 b'',
6558 b'',
6548 _(b'address to listen on (default: all interfaces)'),
6559 _(b'address to listen on (default: all interfaces)'),
6549 _(b'ADDR'),
6560 _(b'ADDR'),
6550 ),
6561 ),
6551 (
6562 (
6552 b'',
6563 b'',
6553 b'prefix',
6564 b'prefix',
6554 b'',
6565 b'',
6555 _(b'prefix path to serve from (default: server root)'),
6566 _(b'prefix path to serve from (default: server root)'),
6556 _(b'PREFIX'),
6567 _(b'PREFIX'),
6557 ),
6568 ),
6558 (
6569 (
6559 b'n',
6570 b'n',
6560 b'name',
6571 b'name',
6561 b'',
6572 b'',
6562 _(b'name to show in web pages (default: working directory)'),
6573 _(b'name to show in web pages (default: working directory)'),
6563 _(b'NAME'),
6574 _(b'NAME'),
6564 ),
6575 ),
6565 (
6576 (
6566 b'',
6577 b'',
6567 b'web-conf',
6578 b'web-conf',
6568 b'',
6579 b'',
6569 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6580 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6570 _(b'FILE'),
6581 _(b'FILE'),
6571 ),
6582 ),
6572 (
6583 (
6573 b'',
6584 b'',
6574 b'webdir-conf',
6585 b'webdir-conf',
6575 b'',
6586 b'',
6576 _(b'name of the hgweb config file (DEPRECATED)'),
6587 _(b'name of the hgweb config file (DEPRECATED)'),
6577 _(b'FILE'),
6588 _(b'FILE'),
6578 ),
6589 ),
6579 (
6590 (
6580 b'',
6591 b'',
6581 b'pid-file',
6592 b'pid-file',
6582 b'',
6593 b'',
6583 _(b'name of file to write process ID to'),
6594 _(b'name of file to write process ID to'),
6584 _(b'FILE'),
6595 _(b'FILE'),
6585 ),
6596 ),
6586 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6597 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6587 (
6598 (
6588 b'',
6599 b'',
6589 b'cmdserver',
6600 b'cmdserver',
6590 b'',
6601 b'',
6591 _(b'for remote clients (ADVANCED)'),
6602 _(b'for remote clients (ADVANCED)'),
6592 _(b'MODE'),
6603 _(b'MODE'),
6593 ),
6604 ),
6594 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6605 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6595 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6606 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6596 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6607 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6597 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6608 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6598 (b'', b'print-url', None, _(b'start and print only the URL')),
6609 (b'', b'print-url', None, _(b'start and print only the URL')),
6599 ]
6610 ]
6600 + subrepoopts,
6611 + subrepoopts,
6601 _(b'[OPTION]...'),
6612 _(b'[OPTION]...'),
6602 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6613 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6603 helpbasic=True,
6614 helpbasic=True,
6604 optionalrepo=True,
6615 optionalrepo=True,
6605 )
6616 )
6606 def serve(ui, repo, **opts):
6617 def serve(ui, repo, **opts):
6607 """start stand-alone webserver
6618 """start stand-alone webserver
6608
6619
6609 Start a local HTTP repository browser and pull server. You can use
6620 Start a local HTTP repository browser and pull server. You can use
6610 this for ad-hoc sharing and browsing of repositories. It is
6621 this for ad-hoc sharing and browsing of repositories. It is
6611 recommended to use a real web server to serve a repository for
6622 recommended to use a real web server to serve a repository for
6612 longer periods of time.
6623 longer periods of time.
6613
6624
6614 Please note that the server does not implement access control.
6625 Please note that the server does not implement access control.
6615 This means that, by default, anybody can read from the server and
6626 This means that, by default, anybody can read from the server and
6616 nobody can write to it by default. Set the ``web.allow-push``
6627 nobody can write to it by default. Set the ``web.allow-push``
6617 option to ``*`` to allow everybody to push to the server. You
6628 option to ``*`` to allow everybody to push to the server. You
6618 should use a real web server if you need to authenticate users.
6629 should use a real web server if you need to authenticate users.
6619
6630
6620 By default, the server logs accesses to stdout and errors to
6631 By default, the server logs accesses to stdout and errors to
6621 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6632 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6622 files.
6633 files.
6623
6634
6624 To have the server choose a free port number to listen on, specify
6635 To have the server choose a free port number to listen on, specify
6625 a port number of 0; in this case, the server will print the port
6636 a port number of 0; in this case, the server will print the port
6626 number it uses.
6637 number it uses.
6627
6638
6628 Returns 0 on success.
6639 Returns 0 on success.
6629 """
6640 """
6630
6641
6631 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6642 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6632 opts = pycompat.byteskwargs(opts)
6643 opts = pycompat.byteskwargs(opts)
6633 if opts[b"print_url"] and ui.verbose:
6644 if opts[b"print_url"] and ui.verbose:
6634 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6645 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6635
6646
6636 if opts[b"stdio"]:
6647 if opts[b"stdio"]:
6637 if repo is None:
6648 if repo is None:
6638 raise error.RepoError(
6649 raise error.RepoError(
6639 _(b"there is no Mercurial repository here (.hg not found)")
6650 _(b"there is no Mercurial repository here (.hg not found)")
6640 )
6651 )
6641 s = wireprotoserver.sshserver(ui, repo)
6652 s = wireprotoserver.sshserver(ui, repo)
6642 s.serve_forever()
6653 s.serve_forever()
6643 return
6654 return
6644
6655
6645 service = server.createservice(ui, repo, opts)
6656 service = server.createservice(ui, repo, opts)
6646 return server.runservice(opts, initfn=service.init, runfn=service.run)
6657 return server.runservice(opts, initfn=service.init, runfn=service.run)
6647
6658
6648
6659
6649 @command(
6660 @command(
6650 b'shelve',
6661 b'shelve',
6651 [
6662 [
6652 (
6663 (
6653 b'A',
6664 b'A',
6654 b'addremove',
6665 b'addremove',
6655 None,
6666 None,
6656 _(b'mark new/missing files as added/removed before shelving'),
6667 _(b'mark new/missing files as added/removed before shelving'),
6657 ),
6668 ),
6658 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6669 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6659 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6670 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6660 (
6671 (
6661 b'',
6672 b'',
6662 b'date',
6673 b'date',
6663 b'',
6674 b'',
6664 _(b'shelve with the specified commit date'),
6675 _(b'shelve with the specified commit date'),
6665 _(b'DATE'),
6676 _(b'DATE'),
6666 ),
6677 ),
6667 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6678 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6668 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6679 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6669 (
6680 (
6670 b'k',
6681 b'k',
6671 b'keep',
6682 b'keep',
6672 False,
6683 False,
6673 _(b'shelve, but keep changes in the working directory'),
6684 _(b'shelve, but keep changes in the working directory'),
6674 ),
6685 ),
6675 (b'l', b'list', None, _(b'list current shelves')),
6686 (b'l', b'list', None, _(b'list current shelves')),
6676 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6687 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6677 (
6688 (
6678 b'n',
6689 b'n',
6679 b'name',
6690 b'name',
6680 b'',
6691 b'',
6681 _(b'use the given name for the shelved commit'),
6692 _(b'use the given name for the shelved commit'),
6682 _(b'NAME'),
6693 _(b'NAME'),
6683 ),
6694 ),
6684 (
6695 (
6685 b'p',
6696 b'p',
6686 b'patch',
6697 b'patch',
6687 None,
6698 None,
6688 _(
6699 _(
6689 b'output patches for changes (provide the names of the shelved '
6700 b'output patches for changes (provide the names of the shelved '
6690 b'changes as positional arguments)'
6701 b'changes as positional arguments)'
6691 ),
6702 ),
6692 ),
6703 ),
6693 (b'i', b'interactive', None, _(b'interactive mode')),
6704 (b'i', b'interactive', None, _(b'interactive mode')),
6694 (
6705 (
6695 b'',
6706 b'',
6696 b'stat',
6707 b'stat',
6697 None,
6708 None,
6698 _(
6709 _(
6699 b'output diffstat-style summary of changes (provide the names of '
6710 b'output diffstat-style summary of changes (provide the names of '
6700 b'the shelved changes as positional arguments)'
6711 b'the shelved changes as positional arguments)'
6701 ),
6712 ),
6702 ),
6713 ),
6703 ]
6714 ]
6704 + cmdutil.walkopts,
6715 + cmdutil.walkopts,
6705 _(b'hg shelve [OPTION]... [FILE]...'),
6716 _(b'hg shelve [OPTION]... [FILE]...'),
6706 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6717 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6707 )
6718 )
6708 def shelve(ui, repo, *pats, **opts):
6719 def shelve(ui, repo, *pats, **opts):
6709 """save and set aside changes from the working directory
6720 """save and set aside changes from the working directory
6710
6721
6711 Shelving takes files that "hg status" reports as not clean, saves
6722 Shelving takes files that "hg status" reports as not clean, saves
6712 the modifications to a bundle (a shelved change), and reverts the
6723 the modifications to a bundle (a shelved change), and reverts the
6713 files so that their state in the working directory becomes clean.
6724 files so that their state in the working directory becomes clean.
6714
6725
6715 To restore these changes to the working directory, using "hg
6726 To restore these changes to the working directory, using "hg
6716 unshelve"; this will work even if you switch to a different
6727 unshelve"; this will work even if you switch to a different
6717 commit.
6728 commit.
6718
6729
6719 When no files are specified, "hg shelve" saves all not-clean
6730 When no files are specified, "hg shelve" saves all not-clean
6720 files. If specific files or directories are named, only changes to
6731 files. If specific files or directories are named, only changes to
6721 those files are shelved.
6732 those files are shelved.
6722
6733
6723 In bare shelve (when no files are specified, without interactive,
6734 In bare shelve (when no files are specified, without interactive,
6724 include and exclude option), shelving remembers information if the
6735 include and exclude option), shelving remembers information if the
6725 working directory was on newly created branch, in other words working
6736 working directory was on newly created branch, in other words working
6726 directory was on different branch than its first parent. In this
6737 directory was on different branch than its first parent. In this
6727 situation unshelving restores branch information to the working directory.
6738 situation unshelving restores branch information to the working directory.
6728
6739
6729 Each shelved change has a name that makes it easier to find later.
6740 Each shelved change has a name that makes it easier to find later.
6730 The name of a shelved change defaults to being based on the active
6741 The name of a shelved change defaults to being based on the active
6731 bookmark, or if there is no active bookmark, the current named
6742 bookmark, or if there is no active bookmark, the current named
6732 branch. To specify a different name, use ``--name``.
6743 branch. To specify a different name, use ``--name``.
6733
6744
6734 To see a list of existing shelved changes, use the ``--list``
6745 To see a list of existing shelved changes, use the ``--list``
6735 option. For each shelved change, this will print its name, age,
6746 option. For each shelved change, this will print its name, age,
6736 and description; use ``--patch`` or ``--stat`` for more details.
6747 and description; use ``--patch`` or ``--stat`` for more details.
6737
6748
6738 To delete specific shelved changes, use ``--delete``. To delete
6749 To delete specific shelved changes, use ``--delete``. To delete
6739 all shelved changes, use ``--cleanup``.
6750 all shelved changes, use ``--cleanup``.
6740 """
6751 """
6741 opts = pycompat.byteskwargs(opts)
6752 opts = pycompat.byteskwargs(opts)
6742 allowables = [
6753 allowables = [
6743 (b'addremove', {b'create'}), # 'create' is pseudo action
6754 (b'addremove', {b'create'}), # 'create' is pseudo action
6744 (b'unknown', {b'create'}),
6755 (b'unknown', {b'create'}),
6745 (b'cleanup', {b'cleanup'}),
6756 (b'cleanup', {b'cleanup'}),
6746 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6757 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6747 (b'delete', {b'delete'}),
6758 (b'delete', {b'delete'}),
6748 (b'edit', {b'create'}),
6759 (b'edit', {b'create'}),
6749 (b'keep', {b'create'}),
6760 (b'keep', {b'create'}),
6750 (b'list', {b'list'}),
6761 (b'list', {b'list'}),
6751 (b'message', {b'create'}),
6762 (b'message', {b'create'}),
6752 (b'name', {b'create'}),
6763 (b'name', {b'create'}),
6753 (b'patch', {b'patch', b'list'}),
6764 (b'patch', {b'patch', b'list'}),
6754 (b'stat', {b'stat', b'list'}),
6765 (b'stat', {b'stat', b'list'}),
6755 ]
6766 ]
6756
6767
6757 def checkopt(opt):
6768 def checkopt(opt):
6758 if opts.get(opt):
6769 if opts.get(opt):
6759 for i, allowable in allowables:
6770 for i, allowable in allowables:
6760 if opts[i] and opt not in allowable:
6771 if opts[i] and opt not in allowable:
6761 raise error.InputError(
6772 raise error.InputError(
6762 _(
6773 _(
6763 b"options '--%s' and '--%s' may not be "
6774 b"options '--%s' and '--%s' may not be "
6764 b"used together"
6775 b"used together"
6765 )
6776 )
6766 % (opt, i)
6777 % (opt, i)
6767 )
6778 )
6768 return True
6779 return True
6769
6780
6770 if checkopt(b'cleanup'):
6781 if checkopt(b'cleanup'):
6771 if pats:
6782 if pats:
6772 raise error.InputError(
6783 raise error.InputError(
6773 _(b"cannot specify names when using '--cleanup'")
6784 _(b"cannot specify names when using '--cleanup'")
6774 )
6785 )
6775 return shelvemod.cleanupcmd(ui, repo)
6786 return shelvemod.cleanupcmd(ui, repo)
6776 elif checkopt(b'delete'):
6787 elif checkopt(b'delete'):
6777 return shelvemod.deletecmd(ui, repo, pats)
6788 return shelvemod.deletecmd(ui, repo, pats)
6778 elif checkopt(b'list'):
6789 elif checkopt(b'list'):
6779 return shelvemod.listcmd(ui, repo, pats, opts)
6790 return shelvemod.listcmd(ui, repo, pats, opts)
6780 elif checkopt(b'patch') or checkopt(b'stat'):
6791 elif checkopt(b'patch') or checkopt(b'stat'):
6781 return shelvemod.patchcmds(ui, repo, pats, opts)
6792 return shelvemod.patchcmds(ui, repo, pats, opts)
6782 else:
6793 else:
6783 return shelvemod.createcmd(ui, repo, pats, opts)
6794 return shelvemod.createcmd(ui, repo, pats, opts)
6784
6795
6785
6796
6786 _NOTTERSE = b'nothing'
6797 _NOTTERSE = b'nothing'
6787
6798
6788
6799
6789 @command(
6800 @command(
6790 b'status|st',
6801 b'status|st',
6791 [
6802 [
6792 (b'A', b'all', None, _(b'show status of all files')),
6803 (b'A', b'all', None, _(b'show status of all files')),
6793 (b'm', b'modified', None, _(b'show only modified files')),
6804 (b'm', b'modified', None, _(b'show only modified files')),
6794 (b'a', b'added', None, _(b'show only added files')),
6805 (b'a', b'added', None, _(b'show only added files')),
6795 (b'r', b'removed', None, _(b'show only removed files')),
6806 (b'r', b'removed', None, _(b'show only removed files')),
6796 (b'd', b'deleted', None, _(b'show only missing files')),
6807 (b'd', b'deleted', None, _(b'show only missing files')),
6797 (b'c', b'clean', None, _(b'show only files without changes')),
6808 (b'c', b'clean', None, _(b'show only files without changes')),
6798 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6809 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6799 (b'i', b'ignored', None, _(b'show only ignored files')),
6810 (b'i', b'ignored', None, _(b'show only ignored files')),
6800 (b'n', b'no-status', None, _(b'hide status prefix')),
6811 (b'n', b'no-status', None, _(b'hide status prefix')),
6801 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6812 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6802 (
6813 (
6803 b'C',
6814 b'C',
6804 b'copies',
6815 b'copies',
6805 None,
6816 None,
6806 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6817 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6807 ),
6818 ),
6808 (
6819 (
6809 b'0',
6820 b'0',
6810 b'print0',
6821 b'print0',
6811 None,
6822 None,
6812 _(b'end filenames with NUL, for use with xargs'),
6823 _(b'end filenames with NUL, for use with xargs'),
6813 ),
6824 ),
6814 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6825 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6815 (
6826 (
6816 b'',
6827 b'',
6817 b'change',
6828 b'change',
6818 b'',
6829 b'',
6819 _(b'list the changed files of a revision'),
6830 _(b'list the changed files of a revision'),
6820 _(b'REV'),
6831 _(b'REV'),
6821 ),
6832 ),
6822 ]
6833 ]
6823 + walkopts
6834 + walkopts
6824 + subrepoopts
6835 + subrepoopts
6825 + formatteropts,
6836 + formatteropts,
6826 _(b'[OPTION]... [FILE]...'),
6837 _(b'[OPTION]... [FILE]...'),
6827 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6838 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6828 helpbasic=True,
6839 helpbasic=True,
6829 inferrepo=True,
6840 inferrepo=True,
6830 intents={INTENT_READONLY},
6841 intents={INTENT_READONLY},
6831 )
6842 )
6832 def status(ui, repo, *pats, **opts):
6843 def status(ui, repo, *pats, **opts):
6833 """show changed files in the working directory
6844 """show changed files in the working directory
6834
6845
6835 Show status of files in the repository. If names are given, only
6846 Show status of files in the repository. If names are given, only
6836 files that match are shown. Files that are clean or ignored or
6847 files that match are shown. Files that are clean or ignored or
6837 the source of a copy/move operation, are not listed unless
6848 the source of a copy/move operation, are not listed unless
6838 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6849 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6839 Unless options described with "show only ..." are given, the
6850 Unless options described with "show only ..." are given, the
6840 options -mardu are used.
6851 options -mardu are used.
6841
6852
6842 Option -q/--quiet hides untracked (unknown and ignored) files
6853 Option -q/--quiet hides untracked (unknown and ignored) files
6843 unless explicitly requested with -u/--unknown or -i/--ignored.
6854 unless explicitly requested with -u/--unknown or -i/--ignored.
6844
6855
6845 .. note::
6856 .. note::
6846
6857
6847 :hg:`status` may appear to disagree with diff if permissions have
6858 :hg:`status` may appear to disagree with diff if permissions have
6848 changed or a merge has occurred. The standard diff format does
6859 changed or a merge has occurred. The standard diff format does
6849 not report permission changes and diff only reports changes
6860 not report permission changes and diff only reports changes
6850 relative to one merge parent.
6861 relative to one merge parent.
6851
6862
6852 If one revision is given, it is used as the base revision.
6863 If one revision is given, it is used as the base revision.
6853 If two revisions are given, the differences between them are
6864 If two revisions are given, the differences between them are
6854 shown. The --change option can also be used as a shortcut to list
6865 shown. The --change option can also be used as a shortcut to list
6855 the changed files of a revision from its first parent.
6866 the changed files of a revision from its first parent.
6856
6867
6857 The codes used to show the status of files are::
6868 The codes used to show the status of files are::
6858
6869
6859 M = modified
6870 M = modified
6860 A = added
6871 A = added
6861 R = removed
6872 R = removed
6862 C = clean
6873 C = clean
6863 ! = missing (deleted by non-hg command, but still tracked)
6874 ! = missing (deleted by non-hg command, but still tracked)
6864 ? = not tracked
6875 ? = not tracked
6865 I = ignored
6876 I = ignored
6866 = origin of the previous file (with --copies)
6877 = origin of the previous file (with --copies)
6867
6878
6868 .. container:: verbose
6879 .. container:: verbose
6869
6880
6870 The -t/--terse option abbreviates the output by showing only the directory
6881 The -t/--terse option abbreviates the output by showing only the directory
6871 name if all the files in it share the same status. The option takes an
6882 name if all the files in it share the same status. The option takes an
6872 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6883 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6873 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6884 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6874 for 'ignored' and 'c' for clean.
6885 for 'ignored' and 'c' for clean.
6875
6886
6876 It abbreviates only those statuses which are passed. Note that clean and
6887 It abbreviates only those statuses which are passed. Note that clean and
6877 ignored files are not displayed with '--terse ic' unless the -c/--clean
6888 ignored files are not displayed with '--terse ic' unless the -c/--clean
6878 and -i/--ignored options are also used.
6889 and -i/--ignored options are also used.
6879
6890
6880 The -v/--verbose option shows information when the repository is in an
6891 The -v/--verbose option shows information when the repository is in an
6881 unfinished merge, shelve, rebase state etc. You can have this behavior
6892 unfinished merge, shelve, rebase state etc. You can have this behavior
6882 turned on by default by enabling the ``commands.status.verbose`` option.
6893 turned on by default by enabling the ``commands.status.verbose`` option.
6883
6894
6884 You can skip displaying some of these states by setting
6895 You can skip displaying some of these states by setting
6885 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6896 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6886 'histedit', 'merge', 'rebase', or 'unshelve'.
6897 'histedit', 'merge', 'rebase', or 'unshelve'.
6887
6898
6888 Template:
6899 Template:
6889
6900
6890 The following keywords are supported in addition to the common template
6901 The following keywords are supported in addition to the common template
6891 keywords and functions. See also :hg:`help templates`.
6902 keywords and functions. See also :hg:`help templates`.
6892
6903
6893 :path: String. Repository-absolute path of the file.
6904 :path: String. Repository-absolute path of the file.
6894 :source: String. Repository-absolute path of the file originated from.
6905 :source: String. Repository-absolute path of the file originated from.
6895 Available if ``--copies`` is specified.
6906 Available if ``--copies`` is specified.
6896 :status: String. Character denoting file's status.
6907 :status: String. Character denoting file's status.
6897
6908
6898 Examples:
6909 Examples:
6899
6910
6900 - show changes in the working directory relative to a
6911 - show changes in the working directory relative to a
6901 changeset::
6912 changeset::
6902
6913
6903 hg status --rev 9353
6914 hg status --rev 9353
6904
6915
6905 - show changes in the working directory relative to the
6916 - show changes in the working directory relative to the
6906 current directory (see :hg:`help patterns` for more information)::
6917 current directory (see :hg:`help patterns` for more information)::
6907
6918
6908 hg status re:
6919 hg status re:
6909
6920
6910 - show all changes including copies in an existing changeset::
6921 - show all changes including copies in an existing changeset::
6911
6922
6912 hg status --copies --change 9353
6923 hg status --copies --change 9353
6913
6924
6914 - get a NUL separated list of added files, suitable for xargs::
6925 - get a NUL separated list of added files, suitable for xargs::
6915
6926
6916 hg status -an0
6927 hg status -an0
6917
6928
6918 - show more information about the repository status, abbreviating
6929 - show more information about the repository status, abbreviating
6919 added, removed, modified, deleted, and untracked paths::
6930 added, removed, modified, deleted, and untracked paths::
6920
6931
6921 hg status -v -t mardu
6932 hg status -v -t mardu
6922
6933
6923 Returns 0 on success.
6934 Returns 0 on success.
6924
6935
6925 """
6936 """
6926
6937
6927 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6938 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6928 opts = pycompat.byteskwargs(opts)
6939 opts = pycompat.byteskwargs(opts)
6929 revs = opts.get(b'rev', [])
6940 revs = opts.get(b'rev', [])
6930 change = opts.get(b'change', b'')
6941 change = opts.get(b'change', b'')
6931 terse = opts.get(b'terse', _NOTTERSE)
6942 terse = opts.get(b'terse', _NOTTERSE)
6932 if terse is _NOTTERSE:
6943 if terse is _NOTTERSE:
6933 if revs:
6944 if revs:
6934 terse = b''
6945 terse = b''
6935 else:
6946 else:
6936 terse = ui.config(b'commands', b'status.terse')
6947 terse = ui.config(b'commands', b'status.terse')
6937
6948
6938 if revs and terse:
6949 if revs and terse:
6939 msg = _(b'cannot use --terse with --rev')
6950 msg = _(b'cannot use --terse with --rev')
6940 raise error.InputError(msg)
6951 raise error.InputError(msg)
6941 elif change:
6952 elif change:
6942 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6953 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6943 ctx2 = logcmdutil.revsingle(repo, change, None)
6954 ctx2 = logcmdutil.revsingle(repo, change, None)
6944 ctx1 = ctx2.p1()
6955 ctx1 = ctx2.p1()
6945 else:
6956 else:
6946 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6957 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6947 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
6958 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
6948
6959
6949 forcerelativevalue = None
6960 forcerelativevalue = None
6950 if ui.hasconfig(b'commands', b'status.relative'):
6961 if ui.hasconfig(b'commands', b'status.relative'):
6951 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6962 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6952 uipathfn = scmutil.getuipathfn(
6963 uipathfn = scmutil.getuipathfn(
6953 repo,
6964 repo,
6954 legacyrelativevalue=bool(pats),
6965 legacyrelativevalue=bool(pats),
6955 forcerelativevalue=forcerelativevalue,
6966 forcerelativevalue=forcerelativevalue,
6956 )
6967 )
6957
6968
6958 if opts.get(b'print0'):
6969 if opts.get(b'print0'):
6959 end = b'\0'
6970 end = b'\0'
6960 else:
6971 else:
6961 end = b'\n'
6972 end = b'\n'
6962 states = b'modified added removed deleted unknown ignored clean'.split()
6973 states = b'modified added removed deleted unknown ignored clean'.split()
6963 show = [k for k in states if opts.get(k)]
6974 show = [k for k in states if opts.get(k)]
6964 if opts.get(b'all'):
6975 if opts.get(b'all'):
6965 show += ui.quiet and (states[:4] + [b'clean']) or states
6976 show += ui.quiet and (states[:4] + [b'clean']) or states
6966
6977
6967 if not show:
6978 if not show:
6968 if ui.quiet:
6979 if ui.quiet:
6969 show = states[:4]
6980 show = states[:4]
6970 else:
6981 else:
6971 show = states[:5]
6982 show = states[:5]
6972
6983
6973 m = scmutil.match(ctx2, pats, opts)
6984 m = scmutil.match(ctx2, pats, opts)
6974 if terse:
6985 if terse:
6975 # we need to compute clean and unknown to terse
6986 # we need to compute clean and unknown to terse
6976 stat = repo.status(
6987 stat = repo.status(
6977 ctx1.node(),
6988 ctx1.node(),
6978 ctx2.node(),
6989 ctx2.node(),
6979 m,
6990 m,
6980 b'ignored' in show or b'i' in terse,
6991 b'ignored' in show or b'i' in terse,
6981 clean=True,
6992 clean=True,
6982 unknown=True,
6993 unknown=True,
6983 listsubrepos=opts.get(b'subrepos'),
6994 listsubrepos=opts.get(b'subrepos'),
6984 )
6995 )
6985
6996
6986 stat = cmdutil.tersedir(stat, terse)
6997 stat = cmdutil.tersedir(stat, terse)
6987 else:
6998 else:
6988 stat = repo.status(
6999 stat = repo.status(
6989 ctx1.node(),
7000 ctx1.node(),
6990 ctx2.node(),
7001 ctx2.node(),
6991 m,
7002 m,
6992 b'ignored' in show,
7003 b'ignored' in show,
6993 b'clean' in show,
7004 b'clean' in show,
6994 b'unknown' in show,
7005 b'unknown' in show,
6995 opts.get(b'subrepos'),
7006 opts.get(b'subrepos'),
6996 )
7007 )
6997
7008
6998 changestates = zip(
7009 changestates = zip(
6999 states,
7010 states,
7000 pycompat.iterbytestr(b'MAR!?IC'),
7011 pycompat.iterbytestr(b'MAR!?IC'),
7001 [getattr(stat, s.decode('utf8')) for s in states],
7012 [getattr(stat, s.decode('utf8')) for s in states],
7002 )
7013 )
7003
7014
7004 copy = {}
7015 copy = {}
7005 show_copies = ui.configbool(b'ui', b'statuscopies')
7016 show_copies = ui.configbool(b'ui', b'statuscopies')
7006 if opts.get(b'copies') is not None:
7017 if opts.get(b'copies') is not None:
7007 show_copies = opts.get(b'copies')
7018 show_copies = opts.get(b'copies')
7008 show_copies = (show_copies or opts.get(b'all')) and not opts.get(
7019 show_copies = (show_copies or opts.get(b'all')) and not opts.get(
7009 b'no_status'
7020 b'no_status'
7010 )
7021 )
7011 if show_copies:
7022 if show_copies:
7012 copy = copies.pathcopies(ctx1, ctx2, m)
7023 copy = copies.pathcopies(ctx1, ctx2, m)
7013
7024
7014 morestatus = None
7025 morestatus = None
7015 if (
7026 if (
7016 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
7027 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
7017 and not ui.plain()
7028 and not ui.plain()
7018 and not opts.get(b'print0')
7029 and not opts.get(b'print0')
7019 ):
7030 ):
7020 morestatus = cmdutil.readmorestatus(repo)
7031 morestatus = cmdutil.readmorestatus(repo)
7021
7032
7022 ui.pager(b'status')
7033 ui.pager(b'status')
7023 fm = ui.formatter(b'status', opts)
7034 fm = ui.formatter(b'status', opts)
7024 fmt = b'%s' + end
7035 fmt = b'%s' + end
7025 showchar = not opts.get(b'no_status')
7036 showchar = not opts.get(b'no_status')
7026
7037
7027 for state, char, files in changestates:
7038 for state, char, files in changestates:
7028 if state in show:
7039 if state in show:
7029 label = b'status.' + state
7040 label = b'status.' + state
7030 for f in files:
7041 for f in files:
7031 fm.startitem()
7042 fm.startitem()
7032 fm.context(ctx=ctx2)
7043 fm.context(ctx=ctx2)
7033 fm.data(itemtype=b'file', path=f)
7044 fm.data(itemtype=b'file', path=f)
7034 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
7045 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
7035 fm.plain(fmt % uipathfn(f), label=label)
7046 fm.plain(fmt % uipathfn(f), label=label)
7036 if f in copy:
7047 if f in copy:
7037 fm.data(source=copy[f])
7048 fm.data(source=copy[f])
7038 fm.plain(
7049 fm.plain(
7039 (b' %s' + end) % uipathfn(copy[f]),
7050 (b' %s' + end) % uipathfn(copy[f]),
7040 label=b'status.copied',
7051 label=b'status.copied',
7041 )
7052 )
7042 if morestatus:
7053 if morestatus:
7043 morestatus.formatfile(f, fm)
7054 morestatus.formatfile(f, fm)
7044
7055
7045 if morestatus:
7056 if morestatus:
7046 morestatus.formatfooter(fm)
7057 morestatus.formatfooter(fm)
7047 fm.end()
7058 fm.end()
7048
7059
7049
7060
7050 @command(
7061 @command(
7051 b'summary|sum',
7062 b'summary|sum',
7052 [(b'', b'remote', None, _(b'check for push and pull'))],
7063 [(b'', b'remote', None, _(b'check for push and pull'))],
7053 b'[--remote]',
7064 b'[--remote]',
7054 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7065 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7055 helpbasic=True,
7066 helpbasic=True,
7056 intents={INTENT_READONLY},
7067 intents={INTENT_READONLY},
7057 )
7068 )
7058 def summary(ui, repo, **opts):
7069 def summary(ui, repo, **opts):
7059 """summarize working directory state
7070 """summarize working directory state
7060
7071
7061 This generates a brief summary of the working directory state,
7072 This generates a brief summary of the working directory state,
7062 including parents, branch, commit status, phase and available updates.
7073 including parents, branch, commit status, phase and available updates.
7063
7074
7064 With the --remote option, this will check the default paths for
7075 With the --remote option, this will check the default paths for
7065 incoming and outgoing changes. This can be time-consuming.
7076 incoming and outgoing changes. This can be time-consuming.
7066
7077
7067 Returns 0 on success.
7078 Returns 0 on success.
7068 """
7079 """
7069
7080
7070 opts = pycompat.byteskwargs(opts)
7081 opts = pycompat.byteskwargs(opts)
7071 ui.pager(b'summary')
7082 ui.pager(b'summary')
7072 ctx = repo[None]
7083 ctx = repo[None]
7073 parents = ctx.parents()
7084 parents = ctx.parents()
7074 pnode = parents[0].node()
7085 pnode = parents[0].node()
7075 marks = []
7086 marks = []
7076
7087
7077 try:
7088 try:
7078 ms = mergestatemod.mergestate.read(repo)
7089 ms = mergestatemod.mergestate.read(repo)
7079 except error.UnsupportedMergeRecords as e:
7090 except error.UnsupportedMergeRecords as e:
7080 s = b' '.join(e.recordtypes)
7091 s = b' '.join(e.recordtypes)
7081 ui.warn(
7092 ui.warn(
7082 _(b'warning: merge state has unsupported record types: %s\n') % s
7093 _(b'warning: merge state has unsupported record types: %s\n') % s
7083 )
7094 )
7084 unresolved = []
7095 unresolved = []
7085 else:
7096 else:
7086 unresolved = list(ms.unresolved())
7097 unresolved = list(ms.unresolved())
7087
7098
7088 for p in parents:
7099 for p in parents:
7089 # label with log.changeset (instead of log.parent) since this
7100 # label with log.changeset (instead of log.parent) since this
7090 # shows a working directory parent *changeset*:
7101 # shows a working directory parent *changeset*:
7091 # i18n: column positioning for "hg summary"
7102 # i18n: column positioning for "hg summary"
7092 ui.write(
7103 ui.write(
7093 _(b'parent: %d:%s ') % (p.rev(), p),
7104 _(b'parent: %d:%s ') % (p.rev(), p),
7094 label=logcmdutil.changesetlabels(p),
7105 label=logcmdutil.changesetlabels(p),
7095 )
7106 )
7096 ui.write(b' '.join(p.tags()), label=b'log.tag')
7107 ui.write(b' '.join(p.tags()), label=b'log.tag')
7097 if p.bookmarks():
7108 if p.bookmarks():
7098 marks.extend(p.bookmarks())
7109 marks.extend(p.bookmarks())
7099 if p.rev() == -1:
7110 if p.rev() == -1:
7100 if not len(repo):
7111 if not len(repo):
7101 ui.write(_(b' (empty repository)'))
7112 ui.write(_(b' (empty repository)'))
7102 else:
7113 else:
7103 ui.write(_(b' (no revision checked out)'))
7114 ui.write(_(b' (no revision checked out)'))
7104 if p.obsolete():
7115 if p.obsolete():
7105 ui.write(_(b' (obsolete)'))
7116 ui.write(_(b' (obsolete)'))
7106 if p.isunstable():
7117 if p.isunstable():
7107 instabilities = (
7118 instabilities = (
7108 ui.label(instability, b'trouble.%s' % instability)
7119 ui.label(instability, b'trouble.%s' % instability)
7109 for instability in p.instabilities()
7120 for instability in p.instabilities()
7110 )
7121 )
7111 ui.write(b' (' + b', '.join(instabilities) + b')')
7122 ui.write(b' (' + b', '.join(instabilities) + b')')
7112 ui.write(b'\n')
7123 ui.write(b'\n')
7113 if p.description():
7124 if p.description():
7114 ui.status(
7125 ui.status(
7115 b' ' + p.description().splitlines()[0].strip() + b'\n',
7126 b' ' + p.description().splitlines()[0].strip() + b'\n',
7116 label=b'log.summary',
7127 label=b'log.summary',
7117 )
7128 )
7118
7129
7119 branch = ctx.branch()
7130 branch = ctx.branch()
7120 bheads = repo.branchheads(branch)
7131 bheads = repo.branchheads(branch)
7121 # i18n: column positioning for "hg summary"
7132 # i18n: column positioning for "hg summary"
7122 m = _(b'branch: %s\n') % branch
7133 m = _(b'branch: %s\n') % branch
7123 if branch != b'default':
7134 if branch != b'default':
7124 ui.write(m, label=b'log.branch')
7135 ui.write(m, label=b'log.branch')
7125 else:
7136 else:
7126 ui.status(m, label=b'log.branch')
7137 ui.status(m, label=b'log.branch')
7127
7138
7128 if marks:
7139 if marks:
7129 active = repo._activebookmark
7140 active = repo._activebookmark
7130 # i18n: column positioning for "hg summary"
7141 # i18n: column positioning for "hg summary"
7131 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7142 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7132 if active is not None:
7143 if active is not None:
7133 if active in marks:
7144 if active in marks:
7134 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7145 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7135 marks.remove(active)
7146 marks.remove(active)
7136 else:
7147 else:
7137 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7148 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7138 for m in marks:
7149 for m in marks:
7139 ui.write(b' ' + m, label=b'log.bookmark')
7150 ui.write(b' ' + m, label=b'log.bookmark')
7140 ui.write(b'\n', label=b'log.bookmark')
7151 ui.write(b'\n', label=b'log.bookmark')
7141
7152
7142 status = repo.status(unknown=True)
7153 status = repo.status(unknown=True)
7143
7154
7144 c = repo.dirstate.copies()
7155 c = repo.dirstate.copies()
7145 copied, renamed = [], []
7156 copied, renamed = [], []
7146 for d, s in c.items():
7157 for d, s in c.items():
7147 if s in status.removed:
7158 if s in status.removed:
7148 status.removed.remove(s)
7159 status.removed.remove(s)
7149 renamed.append(d)
7160 renamed.append(d)
7150 else:
7161 else:
7151 copied.append(d)
7162 copied.append(d)
7152 if d in status.added:
7163 if d in status.added:
7153 status.added.remove(d)
7164 status.added.remove(d)
7154
7165
7155 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7166 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7156
7167
7157 labels = [
7168 labels = [
7158 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7169 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7159 (ui.label(_(b'%d added'), b'status.added'), status.added),
7170 (ui.label(_(b'%d added'), b'status.added'), status.added),
7160 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7171 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7161 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7172 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7162 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7173 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7163 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7174 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7164 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7175 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7165 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7176 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7166 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7177 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7167 ]
7178 ]
7168 t = []
7179 t = []
7169 for l, s in labels:
7180 for l, s in labels:
7170 if s:
7181 if s:
7171 t.append(l % len(s))
7182 t.append(l % len(s))
7172
7183
7173 t = b', '.join(t)
7184 t = b', '.join(t)
7174 cleanworkdir = False
7185 cleanworkdir = False
7175
7186
7176 if repo.vfs.exists(b'graftstate'):
7187 if repo.vfs.exists(b'graftstate'):
7177 t += _(b' (graft in progress)')
7188 t += _(b' (graft in progress)')
7178 if repo.vfs.exists(b'updatestate'):
7189 if repo.vfs.exists(b'updatestate'):
7179 t += _(b' (interrupted update)')
7190 t += _(b' (interrupted update)')
7180 elif len(parents) > 1:
7191 elif len(parents) > 1:
7181 t += _(b' (merge)')
7192 t += _(b' (merge)')
7182 elif branch != parents[0].branch():
7193 elif branch != parents[0].branch():
7183 t += _(b' (new branch)')
7194 t += _(b' (new branch)')
7184 elif parents[0].closesbranch() and pnode in repo.branchheads(
7195 elif parents[0].closesbranch() and pnode in repo.branchheads(
7185 branch, closed=True
7196 branch, closed=True
7186 ):
7197 ):
7187 t += _(b' (head closed)')
7198 t += _(b' (head closed)')
7188 elif not (
7199 elif not (
7189 status.modified
7200 status.modified
7190 or status.added
7201 or status.added
7191 or status.removed
7202 or status.removed
7192 or renamed
7203 or renamed
7193 or copied
7204 or copied
7194 or subs
7205 or subs
7195 ):
7206 ):
7196 t += _(b' (clean)')
7207 t += _(b' (clean)')
7197 cleanworkdir = True
7208 cleanworkdir = True
7198 elif pnode not in bheads:
7209 elif pnode not in bheads:
7199 t += _(b' (new branch head)')
7210 t += _(b' (new branch head)')
7200
7211
7201 if parents:
7212 if parents:
7202 pendingphase = max(p.phase() for p in parents)
7213 pendingphase = max(p.phase() for p in parents)
7203 else:
7214 else:
7204 pendingphase = phases.public
7215 pendingphase = phases.public
7205
7216
7206 if pendingphase > phases.newcommitphase(ui):
7217 if pendingphase > phases.newcommitphase(ui):
7207 t += b' (%s)' % phases.phasenames[pendingphase]
7218 t += b' (%s)' % phases.phasenames[pendingphase]
7208
7219
7209 if cleanworkdir:
7220 if cleanworkdir:
7210 # i18n: column positioning for "hg summary"
7221 # i18n: column positioning for "hg summary"
7211 ui.status(_(b'commit: %s\n') % t.strip())
7222 ui.status(_(b'commit: %s\n') % t.strip())
7212 else:
7223 else:
7213 # i18n: column positioning for "hg summary"
7224 # i18n: column positioning for "hg summary"
7214 ui.write(_(b'commit: %s\n') % t.strip())
7225 ui.write(_(b'commit: %s\n') % t.strip())
7215
7226
7216 # all ancestors of branch heads - all ancestors of parent = new csets
7227 # all ancestors of branch heads - all ancestors of parent = new csets
7217 new = len(
7228 new = len(
7218 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7229 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7219 )
7230 )
7220
7231
7221 if new == 0:
7232 if new == 0:
7222 # i18n: column positioning for "hg summary"
7233 # i18n: column positioning for "hg summary"
7223 ui.status(_(b'update: (current)\n'))
7234 ui.status(_(b'update: (current)\n'))
7224 elif pnode not in bheads:
7235 elif pnode not in bheads:
7225 # i18n: column positioning for "hg summary"
7236 # i18n: column positioning for "hg summary"
7226 ui.write(_(b'update: %d new changesets (update)\n') % new)
7237 ui.write(_(b'update: %d new changesets (update)\n') % new)
7227 else:
7238 else:
7228 # i18n: column positioning for "hg summary"
7239 # i18n: column positioning for "hg summary"
7229 ui.write(
7240 ui.write(
7230 _(b'update: %d new changesets, %d branch heads (merge)\n')
7241 _(b'update: %d new changesets, %d branch heads (merge)\n')
7231 % (new, len(bheads))
7242 % (new, len(bheads))
7232 )
7243 )
7233
7244
7234 t = []
7245 t = []
7235 draft = len(repo.revs(b'draft()'))
7246 draft = len(repo.revs(b'draft()'))
7236 if draft:
7247 if draft:
7237 t.append(_(b'%d draft') % draft)
7248 t.append(_(b'%d draft') % draft)
7238 secret = len(repo.revs(b'secret()'))
7249 secret = len(repo.revs(b'secret()'))
7239 if secret:
7250 if secret:
7240 t.append(_(b'%d secret') % secret)
7251 t.append(_(b'%d secret') % secret)
7241
7252
7242 if draft or secret:
7253 if draft or secret:
7243 ui.status(_(b'phases: %s\n') % b', '.join(t))
7254 ui.status(_(b'phases: %s\n') % b', '.join(t))
7244
7255
7245 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7256 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7246 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7257 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7247 numtrouble = len(repo.revs(trouble + b"()"))
7258 numtrouble = len(repo.revs(trouble + b"()"))
7248 # We write all the possibilities to ease translation
7259 # We write all the possibilities to ease translation
7249 troublemsg = {
7260 troublemsg = {
7250 b"orphan": _(b"orphan: %d changesets"),
7261 b"orphan": _(b"orphan: %d changesets"),
7251 b"contentdivergent": _(b"content-divergent: %d changesets"),
7262 b"contentdivergent": _(b"content-divergent: %d changesets"),
7252 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7263 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7253 }
7264 }
7254 if numtrouble > 0:
7265 if numtrouble > 0:
7255 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7266 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7256
7267
7257 cmdutil.summaryhooks(ui, repo)
7268 cmdutil.summaryhooks(ui, repo)
7258
7269
7259 if opts.get(b'remote'):
7270 if opts.get(b'remote'):
7260 needsincoming, needsoutgoing = True, True
7271 needsincoming, needsoutgoing = True, True
7261 else:
7272 else:
7262 needsincoming, needsoutgoing = False, False
7273 needsincoming, needsoutgoing = False, False
7263 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7274 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7264 if i:
7275 if i:
7265 needsincoming = True
7276 needsincoming = True
7266 if o:
7277 if o:
7267 needsoutgoing = True
7278 needsoutgoing = True
7268 if not needsincoming and not needsoutgoing:
7279 if not needsincoming and not needsoutgoing:
7269 return
7280 return
7270
7281
7271 def getincoming():
7282 def getincoming():
7272 # XXX We should actually skip this if no default is specified, instead
7283 # XXX We should actually skip this if no default is specified, instead
7273 # of passing "default" which will resolve as "./default/" if no default
7284 # of passing "default" which will resolve as "./default/" if no default
7274 # path is defined.
7285 # path is defined.
7275 path = urlutil.get_unique_pull_path_obj(b'summary', ui, b'default')
7286 path = urlutil.get_unique_pull_path_obj(b'summary', ui, b'default')
7276 sbranch = path.branch
7287 sbranch = path.branch
7277 try:
7288 try:
7278 other = hg.peer(repo, {}, path)
7289 other = hg.peer(repo, {}, path)
7279 except error.RepoError:
7290 except error.RepoError:
7280 if opts.get(b'remote'):
7291 if opts.get(b'remote'):
7281 raise
7292 raise
7282 return path.loc, sbranch, None, None, None
7293 return path.loc, sbranch, None, None, None
7283 branches = (path.branch, [])
7294 branches = (path.branch, [])
7284 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7295 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7285 if revs:
7296 if revs:
7286 revs = [other.lookup(rev) for rev in revs]
7297 revs = [other.lookup(rev) for rev in revs]
7287 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(path.loc))
7298 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(path.loc))
7288 with repo.ui.silent():
7299 with repo.ui.silent():
7289 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7300 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7290 return path.loc, sbranch, other, commoninc, commoninc[1]
7301 return path.loc, sbranch, other, commoninc, commoninc[1]
7291
7302
7292 if needsincoming:
7303 if needsincoming:
7293 source, sbranch, sother, commoninc, incoming = getincoming()
7304 source, sbranch, sother, commoninc, incoming = getincoming()
7294 else:
7305 else:
7295 source = sbranch = sother = commoninc = incoming = None
7306 source = sbranch = sother = commoninc = incoming = None
7296
7307
7297 def getoutgoing():
7308 def getoutgoing():
7298 # XXX We should actually skip this if no default is specified, instead
7309 # XXX We should actually skip this if no default is specified, instead
7299 # of passing "default" which will resolve as "./default/" if no default
7310 # of passing "default" which will resolve as "./default/" if no default
7300 # path is defined.
7311 # path is defined.
7301 d = None
7312 d = None
7302 if b'default-push' in ui.paths:
7313 if b'default-push' in ui.paths:
7303 d = b'default-push'
7314 d = b'default-push'
7304 elif b'default' in ui.paths:
7315 elif b'default' in ui.paths:
7305 d = b'default'
7316 d = b'default'
7306 path = None
7317 path = None
7307 if d is not None:
7318 if d is not None:
7308 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7319 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7309 dest = path.loc
7320 dest = path.loc
7310 dbranch = path.branch
7321 dbranch = path.branch
7311 else:
7322 else:
7312 dest = b'default'
7323 dest = b'default'
7313 dbranch = None
7324 dbranch = None
7314 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7325 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7315 if source != dest:
7326 if source != dest:
7316 try:
7327 try:
7317 dother = hg.peer(repo, {}, path if path is not None else dest)
7328 dother = hg.peer(repo, {}, path if path is not None else dest)
7318 except error.RepoError:
7329 except error.RepoError:
7319 if opts.get(b'remote'):
7330 if opts.get(b'remote'):
7320 raise
7331 raise
7321 return dest, dbranch, None, None
7332 return dest, dbranch, None, None
7322 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7333 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7323 elif sother is None:
7334 elif sother is None:
7324 # there is no explicit destination peer, but source one is invalid
7335 # there is no explicit destination peer, but source one is invalid
7325 return dest, dbranch, None, None
7336 return dest, dbranch, None, None
7326 else:
7337 else:
7327 dother = sother
7338 dother = sother
7328 if source != dest or (sbranch is not None and sbranch != dbranch):
7339 if source != dest or (sbranch is not None and sbranch != dbranch):
7329 common = None
7340 common = None
7330 else:
7341 else:
7331 common = commoninc
7342 common = commoninc
7332 if revs:
7343 if revs:
7333 revs = [repo.lookup(rev) for rev in revs]
7344 revs = [repo.lookup(rev) for rev in revs]
7334 with repo.ui.silent():
7345 with repo.ui.silent():
7335 outgoing = discovery.findcommonoutgoing(
7346 outgoing = discovery.findcommonoutgoing(
7336 repo, dother, onlyheads=revs, commoninc=common
7347 repo, dother, onlyheads=revs, commoninc=common
7337 )
7348 )
7338 return dest, dbranch, dother, outgoing
7349 return dest, dbranch, dother, outgoing
7339
7350
7340 if needsoutgoing:
7351 if needsoutgoing:
7341 dest, dbranch, dother, outgoing = getoutgoing()
7352 dest, dbranch, dother, outgoing = getoutgoing()
7342 else:
7353 else:
7343 dest = dbranch = dother = outgoing = None
7354 dest = dbranch = dother = outgoing = None
7344
7355
7345 if opts.get(b'remote'):
7356 if opts.get(b'remote'):
7346 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7357 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7347 # The former always sets `sother` (or raises an exception if it can't);
7358 # The former always sets `sother` (or raises an exception if it can't);
7348 # the latter always sets `outgoing`.
7359 # the latter always sets `outgoing`.
7349 assert sother is not None
7360 assert sother is not None
7350 assert outgoing is not None
7361 assert outgoing is not None
7351
7362
7352 t = []
7363 t = []
7353 if incoming:
7364 if incoming:
7354 t.append(_(b'1 or more incoming'))
7365 t.append(_(b'1 or more incoming'))
7355 o = outgoing.missing
7366 o = outgoing.missing
7356 if o:
7367 if o:
7357 t.append(_(b'%d outgoing') % len(o))
7368 t.append(_(b'%d outgoing') % len(o))
7358 other = dother or sother
7369 other = dother or sother
7359 if b'bookmarks' in other.listkeys(b'namespaces'):
7370 if b'bookmarks' in other.listkeys(b'namespaces'):
7360 counts = bookmarks.summary(repo, other)
7371 counts = bookmarks.summary(repo, other)
7361 if counts[0] > 0:
7372 if counts[0] > 0:
7362 t.append(_(b'%d incoming bookmarks') % counts[0])
7373 t.append(_(b'%d incoming bookmarks') % counts[0])
7363 if counts[1] > 0:
7374 if counts[1] > 0:
7364 t.append(_(b'%d outgoing bookmarks') % counts[1])
7375 t.append(_(b'%d outgoing bookmarks') % counts[1])
7365
7376
7366 if t:
7377 if t:
7367 # i18n: column positioning for "hg summary"
7378 # i18n: column positioning for "hg summary"
7368 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7379 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7369 else:
7380 else:
7370 # i18n: column positioning for "hg summary"
7381 # i18n: column positioning for "hg summary"
7371 ui.status(_(b'remote: (synced)\n'))
7382 ui.status(_(b'remote: (synced)\n'))
7372
7383
7373 cmdutil.summaryremotehooks(
7384 cmdutil.summaryremotehooks(
7374 ui,
7385 ui,
7375 repo,
7386 repo,
7376 opts,
7387 opts,
7377 (
7388 (
7378 (source, sbranch, sother, commoninc),
7389 (source, sbranch, sother, commoninc),
7379 (dest, dbranch, dother, outgoing),
7390 (dest, dbranch, dother, outgoing),
7380 ),
7391 ),
7381 )
7392 )
7382
7393
7383
7394
7384 @command(
7395 @command(
7385 b'tag',
7396 b'tag',
7386 [
7397 [
7387 (b'f', b'force', None, _(b'force tag')),
7398 (b'f', b'force', None, _(b'force tag')),
7388 (b'l', b'local', None, _(b'make the tag local')),
7399 (b'l', b'local', None, _(b'make the tag local')),
7389 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7400 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7390 (b'', b'remove', None, _(b'remove a tag')),
7401 (b'', b'remove', None, _(b'remove a tag')),
7391 # -l/--local is already there, commitopts cannot be used
7402 # -l/--local is already there, commitopts cannot be used
7392 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7403 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7393 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7404 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7394 ]
7405 ]
7395 + commitopts2,
7406 + commitopts2,
7396 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7407 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7397 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7408 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7398 )
7409 )
7399 def tag(ui, repo, name1, *names, **opts):
7410 def tag(ui, repo, name1, *names, **opts):
7400 """add one or more tags for the current or given revision
7411 """add one or more tags for the current or given revision
7401
7412
7402 Name a particular revision using <name>.
7413 Name a particular revision using <name>.
7403
7414
7404 Tags are used to name particular revisions of the repository and are
7415 Tags are used to name particular revisions of the repository and are
7405 very useful to compare different revisions, to go back to significant
7416 very useful to compare different revisions, to go back to significant
7406 earlier versions or to mark branch points as releases, etc. Changing
7417 earlier versions or to mark branch points as releases, etc. Changing
7407 an existing tag is normally disallowed; use -f/--force to override.
7418 an existing tag is normally disallowed; use -f/--force to override.
7408
7419
7409 If no revision is given, the parent of the working directory is
7420 If no revision is given, the parent of the working directory is
7410 used.
7421 used.
7411
7422
7412 To facilitate version control, distribution, and merging of tags,
7423 To facilitate version control, distribution, and merging of tags,
7413 they are stored as a file named ".hgtags" which is managed similarly
7424 they are stored as a file named ".hgtags" which is managed similarly
7414 to other project files and can be hand-edited if necessary. This
7425 to other project files and can be hand-edited if necessary. This
7415 also means that tagging creates a new commit. The file
7426 also means that tagging creates a new commit. The file
7416 ".hg/localtags" is used for local tags (not shared among
7427 ".hg/localtags" is used for local tags (not shared among
7417 repositories).
7428 repositories).
7418
7429
7419 Tag commits are usually made at the head of a branch. If the parent
7430 Tag commits are usually made at the head of a branch. If the parent
7420 of the working directory is not a branch head, :hg:`tag` aborts; use
7431 of the working directory is not a branch head, :hg:`tag` aborts; use
7421 -f/--force to force the tag commit to be based on a non-head
7432 -f/--force to force the tag commit to be based on a non-head
7422 changeset.
7433 changeset.
7423
7434
7424 See :hg:`help dates` for a list of formats valid for -d/--date.
7435 See :hg:`help dates` for a list of formats valid for -d/--date.
7425
7436
7426 Since tag names have priority over branch names during revision
7437 Since tag names have priority over branch names during revision
7427 lookup, using an existing branch name as a tag name is discouraged.
7438 lookup, using an existing branch name as a tag name is discouraged.
7428
7439
7429 Returns 0 on success.
7440 Returns 0 on success.
7430 """
7441 """
7431 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7442 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7432 opts = pycompat.byteskwargs(opts)
7443 opts = pycompat.byteskwargs(opts)
7433 with repo.wlock(), repo.lock():
7444 with repo.wlock(), repo.lock():
7434 rev_ = b"."
7445 rev_ = b"."
7435 names = [t.strip() for t in (name1,) + names]
7446 names = [t.strip() for t in (name1,) + names]
7436 if len(names) != len(set(names)):
7447 if len(names) != len(set(names)):
7437 raise error.InputError(_(b'tag names must be unique'))
7448 raise error.InputError(_(b'tag names must be unique'))
7438 for n in names:
7449 for n in names:
7439 scmutil.checknewlabel(repo, n, b'tag')
7450 scmutil.checknewlabel(repo, n, b'tag')
7440 if not n:
7451 if not n:
7441 raise error.InputError(
7452 raise error.InputError(
7442 _(b'tag names cannot consist entirely of whitespace')
7453 _(b'tag names cannot consist entirely of whitespace')
7443 )
7454 )
7444 if opts.get(b'rev'):
7455 if opts.get(b'rev'):
7445 rev_ = opts[b'rev']
7456 rev_ = opts[b'rev']
7446 message = opts.get(b'message')
7457 message = opts.get(b'message')
7447 if opts.get(b'remove'):
7458 if opts.get(b'remove'):
7448 if opts.get(b'local'):
7459 if opts.get(b'local'):
7449 expectedtype = b'local'
7460 expectedtype = b'local'
7450 else:
7461 else:
7451 expectedtype = b'global'
7462 expectedtype = b'global'
7452
7463
7453 for n in names:
7464 for n in names:
7454 if repo.tagtype(n) == b'global':
7465 if repo.tagtype(n) == b'global':
7455 alltags = tagsmod.findglobaltags(ui, repo)
7466 alltags = tagsmod.findglobaltags(ui, repo)
7456 if alltags[n][0] == repo.nullid:
7467 if alltags[n][0] == repo.nullid:
7457 raise error.InputError(
7468 raise error.InputError(
7458 _(b"tag '%s' is already removed") % n
7469 _(b"tag '%s' is already removed") % n
7459 )
7470 )
7460 if not repo.tagtype(n):
7471 if not repo.tagtype(n):
7461 raise error.InputError(_(b"tag '%s' does not exist") % n)
7472 raise error.InputError(_(b"tag '%s' does not exist") % n)
7462 if repo.tagtype(n) != expectedtype:
7473 if repo.tagtype(n) != expectedtype:
7463 if expectedtype == b'global':
7474 if expectedtype == b'global':
7464 raise error.InputError(
7475 raise error.InputError(
7465 _(b"tag '%s' is not a global tag") % n
7476 _(b"tag '%s' is not a global tag") % n
7466 )
7477 )
7467 else:
7478 else:
7468 raise error.InputError(
7479 raise error.InputError(
7469 _(b"tag '%s' is not a local tag") % n
7480 _(b"tag '%s' is not a local tag") % n
7470 )
7481 )
7471 rev_ = b'null'
7482 rev_ = b'null'
7472 if not message:
7483 if not message:
7473 # we don't translate commit messages
7484 # we don't translate commit messages
7474 message = b'Removed tag %s' % b', '.join(names)
7485 message = b'Removed tag %s' % b', '.join(names)
7475 elif not opts.get(b'force'):
7486 elif not opts.get(b'force'):
7476 for n in names:
7487 for n in names:
7477 if n in repo.tags():
7488 if n in repo.tags():
7478 raise error.InputError(
7489 raise error.InputError(
7479 _(b"tag '%s' already exists (use -f to force)") % n
7490 _(b"tag '%s' already exists (use -f to force)") % n
7480 )
7491 )
7481 if not opts.get(b'local'):
7492 if not opts.get(b'local'):
7482 p1, p2 = repo.dirstate.parents()
7493 p1, p2 = repo.dirstate.parents()
7483 if p2 != repo.nullid:
7494 if p2 != repo.nullid:
7484 raise error.StateError(_(b'uncommitted merge'))
7495 raise error.StateError(_(b'uncommitted merge'))
7485 bheads = repo.branchheads()
7496 bheads = repo.branchheads()
7486 if not opts.get(b'force') and bheads and p1 not in bheads:
7497 if not opts.get(b'force') and bheads and p1 not in bheads:
7487 raise error.InputError(
7498 raise error.InputError(
7488 _(
7499 _(
7489 b'working directory is not at a branch head '
7500 b'working directory is not at a branch head '
7490 b'(use -f to force)'
7501 b'(use -f to force)'
7491 )
7502 )
7492 )
7503 )
7493 node = logcmdutil.revsingle(repo, rev_).node()
7504 node = logcmdutil.revsingle(repo, rev_).node()
7494
7505
7495 if not message:
7506 if not message:
7496 # we don't translate commit messages
7507 # we don't translate commit messages
7497 message = b'Added tag %s for changeset %s' % (
7508 message = b'Added tag %s for changeset %s' % (
7498 b', '.join(names),
7509 b', '.join(names),
7499 short(node),
7510 short(node),
7500 )
7511 )
7501
7512
7502 date = opts.get(b'date')
7513 date = opts.get(b'date')
7503 if date:
7514 if date:
7504 date = dateutil.parsedate(date)
7515 date = dateutil.parsedate(date)
7505
7516
7506 if opts.get(b'remove'):
7517 if opts.get(b'remove'):
7507 editform = b'tag.remove'
7518 editform = b'tag.remove'
7508 else:
7519 else:
7509 editform = b'tag.add'
7520 editform = b'tag.add'
7510 editor = cmdutil.getcommiteditor(
7521 editor = cmdutil.getcommiteditor(
7511 editform=editform, **pycompat.strkwargs(opts)
7522 editform=editform, **pycompat.strkwargs(opts)
7512 )
7523 )
7513
7524
7514 # don't allow tagging the null rev
7525 # don't allow tagging the null rev
7515 if (
7526 if (
7516 not opts.get(b'remove')
7527 not opts.get(b'remove')
7517 and logcmdutil.revsingle(repo, rev_).rev() == nullrev
7528 and logcmdutil.revsingle(repo, rev_).rev() == nullrev
7518 ):
7529 ):
7519 raise error.InputError(_(b"cannot tag null revision"))
7530 raise error.InputError(_(b"cannot tag null revision"))
7520
7531
7521 tagsmod.tag(
7532 tagsmod.tag(
7522 repo,
7533 repo,
7523 names,
7534 names,
7524 node,
7535 node,
7525 message,
7536 message,
7526 opts.get(b'local'),
7537 opts.get(b'local'),
7527 opts.get(b'user'),
7538 opts.get(b'user'),
7528 date,
7539 date,
7529 editor=editor,
7540 editor=editor,
7530 )
7541 )
7531
7542
7532
7543
7533 @command(
7544 @command(
7534 b'tags',
7545 b'tags',
7535 formatteropts,
7546 formatteropts,
7536 b'',
7547 b'',
7537 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7548 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7538 intents={INTENT_READONLY},
7549 intents={INTENT_READONLY},
7539 )
7550 )
7540 def tags(ui, repo, **opts):
7551 def tags(ui, repo, **opts):
7541 """list repository tags
7552 """list repository tags
7542
7553
7543 This lists both regular and local tags. When the -v/--verbose
7554 This lists both regular and local tags. When the -v/--verbose
7544 switch is used, a third column "local" is printed for local tags.
7555 switch is used, a third column "local" is printed for local tags.
7545 When the -q/--quiet switch is used, only the tag name is printed.
7556 When the -q/--quiet switch is used, only the tag name is printed.
7546
7557
7547 .. container:: verbose
7558 .. container:: verbose
7548
7559
7549 Template:
7560 Template:
7550
7561
7551 The following keywords are supported in addition to the common template
7562 The following keywords are supported in addition to the common template
7552 keywords and functions such as ``{tag}``. See also
7563 keywords and functions such as ``{tag}``. See also
7553 :hg:`help templates`.
7564 :hg:`help templates`.
7554
7565
7555 :type: String. ``local`` for local tags.
7566 :type: String. ``local`` for local tags.
7556
7567
7557 Returns 0 on success.
7568 Returns 0 on success.
7558 """
7569 """
7559
7570
7560 opts = pycompat.byteskwargs(opts)
7571 opts = pycompat.byteskwargs(opts)
7561 ui.pager(b'tags')
7572 ui.pager(b'tags')
7562 fm = ui.formatter(b'tags', opts)
7573 fm = ui.formatter(b'tags', opts)
7563 hexfunc = fm.hexfunc
7574 hexfunc = fm.hexfunc
7564
7575
7565 for t, n in reversed(repo.tagslist()):
7576 for t, n in reversed(repo.tagslist()):
7566 hn = hexfunc(n)
7577 hn = hexfunc(n)
7567 label = b'tags.normal'
7578 label = b'tags.normal'
7568 tagtype = repo.tagtype(t)
7579 tagtype = repo.tagtype(t)
7569 if not tagtype or tagtype == b'global':
7580 if not tagtype or tagtype == b'global':
7570 tagtype = b''
7581 tagtype = b''
7571 else:
7582 else:
7572 label = b'tags.' + tagtype
7583 label = b'tags.' + tagtype
7573
7584
7574 fm.startitem()
7585 fm.startitem()
7575 fm.context(repo=repo)
7586 fm.context(repo=repo)
7576 fm.write(b'tag', b'%s', t, label=label)
7587 fm.write(b'tag', b'%s', t, label=label)
7577 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7588 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7578 fm.condwrite(
7589 fm.condwrite(
7579 not ui.quiet,
7590 not ui.quiet,
7580 b'rev node',
7591 b'rev node',
7581 fmt,
7592 fmt,
7582 repo.changelog.rev(n),
7593 repo.changelog.rev(n),
7583 hn,
7594 hn,
7584 label=label,
7595 label=label,
7585 )
7596 )
7586 fm.condwrite(
7597 fm.condwrite(
7587 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7598 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7588 )
7599 )
7589 fm.plain(b'\n')
7600 fm.plain(b'\n')
7590 fm.end()
7601 fm.end()
7591
7602
7592
7603
7593 @command(
7604 @command(
7594 b'tip',
7605 b'tip',
7595 [
7606 [
7596 (b'p', b'patch', None, _(b'show patch')),
7607 (b'p', b'patch', None, _(b'show patch')),
7597 (b'g', b'git', None, _(b'use git extended diff format')),
7608 (b'g', b'git', None, _(b'use git extended diff format')),
7598 ]
7609 ]
7599 + templateopts,
7610 + templateopts,
7600 _(b'[-p] [-g]'),
7611 _(b'[-p] [-g]'),
7601 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7612 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7602 )
7613 )
7603 def tip(ui, repo, **opts):
7614 def tip(ui, repo, **opts):
7604 """show the tip revision (DEPRECATED)
7615 """show the tip revision (DEPRECATED)
7605
7616
7606 The tip revision (usually just called the tip) is the changeset
7617 The tip revision (usually just called the tip) is the changeset
7607 most recently added to the repository (and therefore the most
7618 most recently added to the repository (and therefore the most
7608 recently changed head).
7619 recently changed head).
7609
7620
7610 If you have just made a commit, that commit will be the tip. If
7621 If you have just made a commit, that commit will be the tip. If
7611 you have just pulled changes from another repository, the tip of
7622 you have just pulled changes from another repository, the tip of
7612 that repository becomes the current tip. The "tip" tag is special
7623 that repository becomes the current tip. The "tip" tag is special
7613 and cannot be renamed or assigned to a different changeset.
7624 and cannot be renamed or assigned to a different changeset.
7614
7625
7615 This command is deprecated, please use :hg:`heads` instead.
7626 This command is deprecated, please use :hg:`heads` instead.
7616
7627
7617 Returns 0 on success.
7628 Returns 0 on success.
7618 """
7629 """
7619 opts = pycompat.byteskwargs(opts)
7630 opts = pycompat.byteskwargs(opts)
7620 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7631 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7621 displayer.show(repo[b'tip'])
7632 displayer.show(repo[b'tip'])
7622 displayer.close()
7633 displayer.close()
7623
7634
7624
7635
7625 @command(
7636 @command(
7626 b'unbundle',
7637 b'unbundle',
7627 [
7638 [
7628 (
7639 (
7629 b'u',
7640 b'u',
7630 b'update',
7641 b'update',
7631 None,
7642 None,
7632 _(b'update to new branch head if changesets were unbundled'),
7643 _(b'update to new branch head if changesets were unbundled'),
7633 )
7644 )
7634 ],
7645 ],
7635 _(b'[-u] FILE...'),
7646 _(b'[-u] FILE...'),
7636 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7647 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7637 )
7648 )
7638 def unbundle(ui, repo, fname1, *fnames, **opts):
7649 def unbundle(ui, repo, fname1, *fnames, **opts):
7639 """apply one or more bundle files
7650 """apply one or more bundle files
7640
7651
7641 Apply one or more bundle files generated by :hg:`bundle`.
7652 Apply one or more bundle files generated by :hg:`bundle`.
7642
7653
7643 Returns 0 on success, 1 if an update has unresolved files.
7654 Returns 0 on success, 1 if an update has unresolved files.
7644 """
7655 """
7645 fnames = (fname1,) + fnames
7656 fnames = (fname1,) + fnames
7646
7657
7647 with repo.lock():
7658 with repo.lock():
7648 for fname in fnames:
7659 for fname in fnames:
7649 f = hg.openpath(ui, fname)
7660 f = hg.openpath(ui, fname)
7650 gen = exchange.readbundle(ui, f, fname)
7661 gen = exchange.readbundle(ui, f, fname)
7651 if isinstance(gen, streamclone.streamcloneapplier):
7662 if isinstance(gen, streamclone.streamcloneapplier):
7652 raise error.InputError(
7663 raise error.InputError(
7653 _(
7664 _(
7654 b'packed bundles cannot be applied with '
7665 b'packed bundles cannot be applied with '
7655 b'"hg unbundle"'
7666 b'"hg unbundle"'
7656 ),
7667 ),
7657 hint=_(b'use "hg debugapplystreamclonebundle"'),
7668 hint=_(b'use "hg debugapplystreamclonebundle"'),
7658 )
7669 )
7659 url = b'bundle:' + fname
7670 url = b'bundle:' + fname
7660 try:
7671 try:
7661 txnname = b'unbundle'
7672 txnname = b'unbundle'
7662 if not isinstance(gen, bundle2.unbundle20):
7673 if not isinstance(gen, bundle2.unbundle20):
7663 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7674 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7664 with repo.transaction(txnname) as tr:
7675 with repo.transaction(txnname) as tr:
7665 op = bundle2.applybundle(
7676 op = bundle2.applybundle(
7666 repo, gen, tr, source=b'unbundle', url=url
7677 repo, gen, tr, source=b'unbundle', url=url
7667 )
7678 )
7668 except error.BundleUnknownFeatureError as exc:
7679 except error.BundleUnknownFeatureError as exc:
7669 raise error.Abort(
7680 raise error.Abort(
7670 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7681 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7671 hint=_(
7682 hint=_(
7672 b"see https://mercurial-scm.org/"
7683 b"see https://mercurial-scm.org/"
7673 b"wiki/BundleFeature for more "
7684 b"wiki/BundleFeature for more "
7674 b"information"
7685 b"information"
7675 ),
7686 ),
7676 )
7687 )
7677 modheads = bundle2.combinechangegroupresults(op)
7688 modheads = bundle2.combinechangegroupresults(op)
7678
7689
7679 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7690 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7680 return 1
7691 return 1
7681 else:
7692 else:
7682 return 0
7693 return 0
7683
7694
7684
7695
7685 @command(
7696 @command(
7686 b'unshelve',
7697 b'unshelve',
7687 [
7698 [
7688 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7699 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7689 (
7700 (
7690 b'c',
7701 b'c',
7691 b'continue',
7702 b'continue',
7692 None,
7703 None,
7693 _(b'continue an incomplete unshelve operation'),
7704 _(b'continue an incomplete unshelve operation'),
7694 ),
7705 ),
7695 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7706 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7696 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7707 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7697 (
7708 (
7698 b'n',
7709 b'n',
7699 b'name',
7710 b'name',
7700 b'',
7711 b'',
7701 _(b'restore shelved change with given name'),
7712 _(b'restore shelved change with given name'),
7702 _(b'NAME'),
7713 _(b'NAME'),
7703 ),
7714 ),
7704 (b't', b'tool', b'', _(b'specify merge tool')),
7715 (b't', b'tool', b'', _(b'specify merge tool')),
7705 (
7716 (
7706 b'',
7717 b'',
7707 b'date',
7718 b'date',
7708 b'',
7719 b'',
7709 _(b'set date for temporary commits (DEPRECATED)'),
7720 _(b'set date for temporary commits (DEPRECATED)'),
7710 _(b'DATE'),
7721 _(b'DATE'),
7711 ),
7722 ),
7712 ],
7723 ],
7713 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7724 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7714 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7725 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7715 )
7726 )
7716 def unshelve(ui, repo, *shelved, **opts):
7727 def unshelve(ui, repo, *shelved, **opts):
7717 """restore a shelved change to the working directory
7728 """restore a shelved change to the working directory
7718
7729
7719 This command accepts an optional name of a shelved change to
7730 This command accepts an optional name of a shelved change to
7720 restore. If none is given, the most recent shelved change is used.
7731 restore. If none is given, the most recent shelved change is used.
7721
7732
7722 If a shelved change is applied successfully, the bundle that
7733 If a shelved change is applied successfully, the bundle that
7723 contains the shelved changes is moved to a backup location
7734 contains the shelved changes is moved to a backup location
7724 (.hg/shelve-backup).
7735 (.hg/shelve-backup).
7725
7736
7726 Since you can restore a shelved change on top of an arbitrary
7737 Since you can restore a shelved change on top of an arbitrary
7727 commit, it is possible that unshelving will result in a conflict
7738 commit, it is possible that unshelving will result in a conflict
7728 between your changes and the commits you are unshelving onto. If
7739 between your changes and the commits you are unshelving onto. If
7729 this occurs, you must resolve the conflict, then use
7740 this occurs, you must resolve the conflict, then use
7730 ``--continue`` to complete the unshelve operation. (The bundle
7741 ``--continue`` to complete the unshelve operation. (The bundle
7731 will not be moved until you successfully complete the unshelve.)
7742 will not be moved until you successfully complete the unshelve.)
7732
7743
7733 (Alternatively, you can use ``--abort`` to abandon an unshelve
7744 (Alternatively, you can use ``--abort`` to abandon an unshelve
7734 that causes a conflict. This reverts the unshelved changes, and
7745 that causes a conflict. This reverts the unshelved changes, and
7735 leaves the bundle in place.)
7746 leaves the bundle in place.)
7736
7747
7737 If bare shelved change (without interactive, include and exclude
7748 If bare shelved change (without interactive, include and exclude
7738 option) was done on newly created branch it would restore branch
7749 option) was done on newly created branch it would restore branch
7739 information to the working directory.
7750 information to the working directory.
7740
7751
7741 After a successful unshelve, the shelved changes are stored in a
7752 After a successful unshelve, the shelved changes are stored in a
7742 backup directory. Only the N most recent backups are kept. N
7753 backup directory. Only the N most recent backups are kept. N
7743 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7754 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7744 configuration option.
7755 configuration option.
7745
7756
7746 .. container:: verbose
7757 .. container:: verbose
7747
7758
7748 Timestamp in seconds is used to decide order of backups. More
7759 Timestamp in seconds is used to decide order of backups. More
7749 than ``maxbackups`` backups are kept, if same timestamp
7760 than ``maxbackups`` backups are kept, if same timestamp
7750 prevents from deciding exact order of them, for safety.
7761 prevents from deciding exact order of them, for safety.
7751
7762
7752 Selected changes can be unshelved with ``--interactive`` flag.
7763 Selected changes can be unshelved with ``--interactive`` flag.
7753 The working directory is updated with the selected changes, and
7764 The working directory is updated with the selected changes, and
7754 only the unselected changes remain shelved.
7765 only the unselected changes remain shelved.
7755 Note: The whole shelve is applied to working directory first before
7766 Note: The whole shelve is applied to working directory first before
7756 running interactively. So, this will bring up all the conflicts between
7767 running interactively. So, this will bring up all the conflicts between
7757 working directory and the shelve, irrespective of which changes will be
7768 working directory and the shelve, irrespective of which changes will be
7758 unshelved.
7769 unshelved.
7759 """
7770 """
7760 with repo.wlock():
7771 with repo.wlock():
7761 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7772 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7762
7773
7763
7774
7764 statemod.addunfinished(
7775 statemod.addunfinished(
7765 b'unshelve',
7776 b'unshelve',
7766 fname=b'shelvedstate',
7777 fname=b'shelvedstate',
7767 continueflag=True,
7778 continueflag=True,
7768 abortfunc=shelvemod.hgabortunshelve,
7779 abortfunc=shelvemod.hgabortunshelve,
7769 continuefunc=shelvemod.hgcontinueunshelve,
7780 continuefunc=shelvemod.hgcontinueunshelve,
7770 cmdmsg=_(b'unshelve already in progress'),
7781 cmdmsg=_(b'unshelve already in progress'),
7771 )
7782 )
7772
7783
7773
7784
7774 @command(
7785 @command(
7775 b'update|up|checkout|co',
7786 b'update|up|checkout|co',
7776 [
7787 [
7777 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7788 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7778 (b'c', b'check', None, _(b'require clean working directory')),
7789 (b'c', b'check', None, _(b'require clean working directory')),
7779 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7790 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7780 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7791 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7781 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7792 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7782 ]
7793 ]
7783 + mergetoolopts,
7794 + mergetoolopts,
7784 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7795 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7785 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7796 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7786 helpbasic=True,
7797 helpbasic=True,
7787 )
7798 )
7788 def update(ui, repo, node=None, **opts):
7799 def update(ui, repo, node=None, **opts):
7789 """update working directory (or switch revisions)
7800 """update working directory (or switch revisions)
7790
7801
7791 Update the repository's working directory to the specified
7802 Update the repository's working directory to the specified
7792 changeset. If no changeset is specified, update to the tip of the
7803 changeset. If no changeset is specified, update to the tip of the
7793 current named branch and move the active bookmark (see :hg:`help
7804 current named branch and move the active bookmark (see :hg:`help
7794 bookmarks`).
7805 bookmarks`).
7795
7806
7796 Update sets the working directory's parent revision to the specified
7807 Update sets the working directory's parent revision to the specified
7797 changeset (see :hg:`help parents`).
7808 changeset (see :hg:`help parents`).
7798
7809
7799 If the changeset is not a descendant or ancestor of the working
7810 If the changeset is not a descendant or ancestor of the working
7800 directory's parent and there are uncommitted changes, the update is
7811 directory's parent and there are uncommitted changes, the update is
7801 aborted. With the -c/--check option, the working directory is checked
7812 aborted. With the -c/--check option, the working directory is checked
7802 for uncommitted changes; if none are found, the working directory is
7813 for uncommitted changes; if none are found, the working directory is
7803 updated to the specified changeset.
7814 updated to the specified changeset.
7804
7815
7805 .. container:: verbose
7816 .. container:: verbose
7806
7817
7807 The -C/--clean, -c/--check, and -m/--merge options control what
7818 The -C/--clean, -c/--check, and -m/--merge options control what
7808 happens if the working directory contains uncommitted changes.
7819 happens if the working directory contains uncommitted changes.
7809 At most of one of them can be specified.
7820 At most of one of them can be specified.
7810
7821
7811 1. If no option is specified, and if
7822 1. If no option is specified, and if
7812 the requested changeset is an ancestor or descendant of
7823 the requested changeset is an ancestor or descendant of
7813 the working directory's parent, the uncommitted changes
7824 the working directory's parent, the uncommitted changes
7814 are merged into the requested changeset and the merged
7825 are merged into the requested changeset and the merged
7815 result is left uncommitted. If the requested changeset is
7826 result is left uncommitted. If the requested changeset is
7816 not an ancestor or descendant (that is, it is on another
7827 not an ancestor or descendant (that is, it is on another
7817 branch), the update is aborted and the uncommitted changes
7828 branch), the update is aborted and the uncommitted changes
7818 are preserved.
7829 are preserved.
7819
7830
7820 2. With the -m/--merge option, the update is allowed even if the
7831 2. With the -m/--merge option, the update is allowed even if the
7821 requested changeset is not an ancestor or descendant of
7832 requested changeset is not an ancestor or descendant of
7822 the working directory's parent.
7833 the working directory's parent.
7823
7834
7824 3. With the -c/--check option, the update is aborted and the
7835 3. With the -c/--check option, the update is aborted and the
7825 uncommitted changes are preserved.
7836 uncommitted changes are preserved.
7826
7837
7827 4. With the -C/--clean option, uncommitted changes are discarded and
7838 4. With the -C/--clean option, uncommitted changes are discarded and
7828 the working directory is updated to the requested changeset.
7839 the working directory is updated to the requested changeset.
7829
7840
7830 To cancel an uncommitted merge (and lose your changes), use
7841 To cancel an uncommitted merge (and lose your changes), use
7831 :hg:`merge --abort`.
7842 :hg:`merge --abort`.
7832
7843
7833 Use null as the changeset to remove the working directory (like
7844 Use null as the changeset to remove the working directory (like
7834 :hg:`clone -U`).
7845 :hg:`clone -U`).
7835
7846
7836 If you want to revert just one file to an older revision, use
7847 If you want to revert just one file to an older revision, use
7837 :hg:`revert [-r REV] NAME`.
7848 :hg:`revert [-r REV] NAME`.
7838
7849
7839 See :hg:`help dates` for a list of formats valid for -d/--date.
7850 See :hg:`help dates` for a list of formats valid for -d/--date.
7840
7851
7841 Returns 0 on success, 1 if there are unresolved files.
7852 Returns 0 on success, 1 if there are unresolved files.
7842 """
7853 """
7843 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7854 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7844 rev = opts.get('rev')
7855 rev = opts.get('rev')
7845 date = opts.get('date')
7856 date = opts.get('date')
7846 clean = opts.get('clean')
7857 clean = opts.get('clean')
7847 check = opts.get('check')
7858 check = opts.get('check')
7848 merge = opts.get('merge')
7859 merge = opts.get('merge')
7849 if rev and node:
7860 if rev and node:
7850 raise error.InputError(_(b"please specify just one revision"))
7861 raise error.InputError(_(b"please specify just one revision"))
7851
7862
7852 if ui.configbool(b'commands', b'update.requiredest'):
7863 if ui.configbool(b'commands', b'update.requiredest'):
7853 if not node and not rev and not date:
7864 if not node and not rev and not date:
7854 raise error.InputError(
7865 raise error.InputError(
7855 _(b'you must specify a destination'),
7866 _(b'you must specify a destination'),
7856 hint=_(b'for example: hg update ".::"'),
7867 hint=_(b'for example: hg update ".::"'),
7857 )
7868 )
7858
7869
7859 if rev is None or rev == b'':
7870 if rev is None or rev == b'':
7860 rev = node
7871 rev = node
7861
7872
7862 if date and rev is not None:
7873 if date and rev is not None:
7863 raise error.InputError(_(b"you can't specify a revision and a date"))
7874 raise error.InputError(_(b"you can't specify a revision and a date"))
7864
7875
7865 updatecheck = None
7876 updatecheck = None
7866 if check or merge is not None and not merge:
7877 if check or merge is not None and not merge:
7867 updatecheck = b'abort'
7878 updatecheck = b'abort'
7868 elif merge or check is not None and not check:
7879 elif merge or check is not None and not check:
7869 updatecheck = b'none'
7880 updatecheck = b'none'
7870
7881
7871 with repo.wlock():
7882 with repo.wlock():
7872 cmdutil.clearunfinished(repo)
7883 cmdutil.clearunfinished(repo)
7873 if date:
7884 if date:
7874 rev = cmdutil.finddate(ui, repo, date)
7885 rev = cmdutil.finddate(ui, repo, date)
7875
7886
7876 # if we defined a bookmark, we have to remember the original name
7887 # if we defined a bookmark, we have to remember the original name
7877 brev = rev
7888 brev = rev
7878 if rev:
7889 if rev:
7879 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7890 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7880 ctx = logcmdutil.revsingle(repo, rev, default=None)
7891 ctx = logcmdutil.revsingle(repo, rev, default=None)
7881 rev = ctx.rev()
7892 rev = ctx.rev()
7882 hidden = ctx.hidden()
7893 hidden = ctx.hidden()
7883 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7894 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7884 with ui.configoverride(overrides, b'update'):
7895 with ui.configoverride(overrides, b'update'):
7885 ret = hg.updatetotally(
7896 ret = hg.updatetotally(
7886 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7897 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7887 )
7898 )
7888 if hidden:
7899 if hidden:
7889 ctxstr = ctx.hex()[:12]
7900 ctxstr = ctx.hex()[:12]
7890 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7901 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7891
7902
7892 if ctx.obsolete():
7903 if ctx.obsolete():
7893 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7904 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7894 ui.warn(b"(%s)\n" % obsfatemsg)
7905 ui.warn(b"(%s)\n" % obsfatemsg)
7895 return ret
7906 return ret
7896
7907
7897
7908
7898 @command(
7909 @command(
7899 b'verify',
7910 b'verify',
7900 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7911 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7901 helpcategory=command.CATEGORY_MAINTENANCE,
7912 helpcategory=command.CATEGORY_MAINTENANCE,
7902 )
7913 )
7903 def verify(ui, repo, **opts):
7914 def verify(ui, repo, **opts):
7904 """verify the integrity of the repository
7915 """verify the integrity of the repository
7905
7916
7906 Verify the integrity of the current repository.
7917 Verify the integrity of the current repository.
7907
7918
7908 This will perform an extensive check of the repository's
7919 This will perform an extensive check of the repository's
7909 integrity, validating the hashes and checksums of each entry in
7920 integrity, validating the hashes and checksums of each entry in
7910 the changelog, manifest, and tracked files, as well as the
7921 the changelog, manifest, and tracked files, as well as the
7911 integrity of their crosslinks and indices.
7922 integrity of their crosslinks and indices.
7912
7923
7913 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7924 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7914 for more information about recovery from corruption of the
7925 for more information about recovery from corruption of the
7915 repository.
7926 repository.
7916
7927
7917 Returns 0 on success, 1 if errors are encountered.
7928 Returns 0 on success, 1 if errors are encountered.
7918 """
7929 """
7919 opts = pycompat.byteskwargs(opts)
7930 opts = pycompat.byteskwargs(opts)
7920
7931
7921 level = None
7932 level = None
7922 if opts[b'full']:
7933 if opts[b'full']:
7923 level = verifymod.VERIFY_FULL
7934 level = verifymod.VERIFY_FULL
7924 return hg.verify(repo, level)
7935 return hg.verify(repo, level)
7925
7936
7926
7937
7927 @command(
7938 @command(
7928 b'version',
7939 b'version',
7929 [] + formatteropts,
7940 [] + formatteropts,
7930 helpcategory=command.CATEGORY_HELP,
7941 helpcategory=command.CATEGORY_HELP,
7931 norepo=True,
7942 norepo=True,
7932 intents={INTENT_READONLY},
7943 intents={INTENT_READONLY},
7933 )
7944 )
7934 def version_(ui, **opts):
7945 def version_(ui, **opts):
7935 """output version and copyright information
7946 """output version and copyright information
7936
7947
7937 .. container:: verbose
7948 .. container:: verbose
7938
7949
7939 Template:
7950 Template:
7940
7951
7941 The following keywords are supported. See also :hg:`help templates`.
7952 The following keywords are supported. See also :hg:`help templates`.
7942
7953
7943 :extensions: List of extensions.
7954 :extensions: List of extensions.
7944 :ver: String. Version number.
7955 :ver: String. Version number.
7945
7956
7946 And each entry of ``{extensions}`` provides the following sub-keywords
7957 And each entry of ``{extensions}`` provides the following sub-keywords
7947 in addition to ``{ver}``.
7958 in addition to ``{ver}``.
7948
7959
7949 :bundled: Boolean. True if included in the release.
7960 :bundled: Boolean. True if included in the release.
7950 :name: String. Extension name.
7961 :name: String. Extension name.
7951 """
7962 """
7952 opts = pycompat.byteskwargs(opts)
7963 opts = pycompat.byteskwargs(opts)
7953 if ui.verbose:
7964 if ui.verbose:
7954 ui.pager(b'version')
7965 ui.pager(b'version')
7955 fm = ui.formatter(b"version", opts)
7966 fm = ui.formatter(b"version", opts)
7956 fm.startitem()
7967 fm.startitem()
7957 fm.write(
7968 fm.write(
7958 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7969 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7959 )
7970 )
7960 license = _(
7971 license = _(
7961 b"(see https://mercurial-scm.org for more information)\n"
7972 b"(see https://mercurial-scm.org for more information)\n"
7962 b"\nCopyright (C) 2005-2023 Olivia Mackall and others\n"
7973 b"\nCopyright (C) 2005-2023 Olivia Mackall and others\n"
7963 b"This is free software; see the source for copying conditions. "
7974 b"This is free software; see the source for copying conditions. "
7964 b"There is NO\nwarranty; "
7975 b"There is NO\nwarranty; "
7965 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7976 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7966 )
7977 )
7967 if not ui.quiet:
7978 if not ui.quiet:
7968 fm.plain(license)
7979 fm.plain(license)
7969
7980
7970 if ui.verbose:
7981 if ui.verbose:
7971 fm.plain(_(b"\nEnabled extensions:\n\n"))
7982 fm.plain(_(b"\nEnabled extensions:\n\n"))
7972 # format names and versions into columns
7983 # format names and versions into columns
7973 names = []
7984 names = []
7974 vers = []
7985 vers = []
7975 isinternals = []
7986 isinternals = []
7976 for name, module in sorted(extensions.extensions()):
7987 for name, module in sorted(extensions.extensions()):
7977 names.append(name)
7988 names.append(name)
7978 vers.append(extensions.moduleversion(module) or None)
7989 vers.append(extensions.moduleversion(module) or None)
7979 isinternals.append(extensions.ismoduleinternal(module))
7990 isinternals.append(extensions.ismoduleinternal(module))
7980 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7991 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7981 if names:
7992 if names:
7982 namefmt = b" %%-%ds " % max(len(n) for n in names)
7993 namefmt = b" %%-%ds " % max(len(n) for n in names)
7983 places = [_(b"external"), _(b"internal")]
7994 places = [_(b"external"), _(b"internal")]
7984 for n, v, p in zip(names, vers, isinternals):
7995 for n, v, p in zip(names, vers, isinternals):
7985 fn.startitem()
7996 fn.startitem()
7986 fn.condwrite(ui.verbose, b"name", namefmt, n)
7997 fn.condwrite(ui.verbose, b"name", namefmt, n)
7987 if ui.verbose:
7998 if ui.verbose:
7988 fn.plain(b"%s " % places[p])
7999 fn.plain(b"%s " % places[p])
7989 fn.data(bundled=p)
8000 fn.data(bundled=p)
7990 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
8001 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7991 if ui.verbose:
8002 if ui.verbose:
7992 fn.plain(b"\n")
8003 fn.plain(b"\n")
7993 fn.end()
8004 fn.end()
7994 fm.end()
8005 fm.end()
7995
8006
7996
8007
7997 def loadcmdtable(ui, name, cmdtable):
8008 def loadcmdtable(ui, name, cmdtable):
7998 """Load command functions from specified cmdtable"""
8009 """Load command functions from specified cmdtable"""
7999 overrides = [cmd for cmd in cmdtable if cmd in table]
8010 overrides = [cmd for cmd in cmdtable if cmd in table]
8000 if overrides:
8011 if overrides:
8001 ui.warn(
8012 ui.warn(
8002 _(b"extension '%s' overrides commands: %s\n")
8013 _(b"extension '%s' overrides commands: %s\n")
8003 % (name, b" ".join(overrides))
8014 % (name, b" ".join(overrides))
8004 )
8015 )
8005 table.update(cmdtable)
8016 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now