##// END OF EJS Templates
init: use `get_clone_path` when suitable...
marmoute -
r47714:82366464 default
parent child Browse files
Show More
@@ -1,7931 +1,7932 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 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import sys
13 import sys
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 wdirhex,
21 wdirhex,
22 wdirrev,
22 wdirrev,
23 )
23 )
24 from .pycompat import open
24 from .pycompat import open
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 bundlecaches,
29 bundlecaches,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 grep as grepmod,
44 grep as grepmod,
45 hbisect,
45 hbisect,
46 help,
46 help,
47 hg,
47 hg,
48 logcmdutil,
48 logcmdutil,
49 merge as mergemod,
49 merge as mergemod,
50 mergestate as mergestatemod,
50 mergestate as mergestatemod,
51 narrowspec,
51 narrowspec,
52 obsolete,
52 obsolete,
53 obsutil,
53 obsutil,
54 patch,
54 patch,
55 phases,
55 phases,
56 pycompat,
56 pycompat,
57 rcutil,
57 rcutil,
58 registrar,
58 registrar,
59 requirements,
59 requirements,
60 revsetlang,
60 revsetlang,
61 rewriteutil,
61 rewriteutil,
62 scmutil,
62 scmutil,
63 server,
63 server,
64 shelve as shelvemod,
64 shelve as shelvemod,
65 state as statemod,
65 state as statemod,
66 streamclone,
66 streamclone,
67 tags as tagsmod,
67 tags as tagsmod,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 verify as verifymod,
70 verify as verifymod,
71 vfs as vfsmod,
71 vfs as vfsmod,
72 wireprotoserver,
72 wireprotoserver,
73 )
73 )
74 from .utils import (
74 from .utils import (
75 dateutil,
75 dateutil,
76 stringutil,
76 stringutil,
77 urlutil,
77 urlutil,
78 )
78 )
79
79
80 if pycompat.TYPE_CHECKING:
80 if pycompat.TYPE_CHECKING:
81 from typing import (
81 from typing import (
82 List,
82 List,
83 )
83 )
84
84
85
85
86 table = {}
86 table = {}
87 table.update(debugcommandsmod.command._table)
87 table.update(debugcommandsmod.command._table)
88
88
89 command = registrar.command(table)
89 command = registrar.command(table)
90 INTENT_READONLY = registrar.INTENT_READONLY
90 INTENT_READONLY = registrar.INTENT_READONLY
91
91
92 # common command options
92 # common command options
93
93
94 globalopts = [
94 globalopts = [
95 (
95 (
96 b'R',
96 b'R',
97 b'repository',
97 b'repository',
98 b'',
98 b'',
99 _(b'repository root directory or name of overlay bundle file'),
99 _(b'repository root directory or name of overlay bundle file'),
100 _(b'REPO'),
100 _(b'REPO'),
101 ),
101 ),
102 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
102 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
103 (
103 (
104 b'y',
104 b'y',
105 b'noninteractive',
105 b'noninteractive',
106 None,
106 None,
107 _(
107 _(
108 b'do not prompt, automatically pick the first choice for all prompts'
108 b'do not prompt, automatically pick the first choice for all prompts'
109 ),
109 ),
110 ),
110 ),
111 (b'q', b'quiet', None, _(b'suppress output')),
111 (b'q', b'quiet', None, _(b'suppress output')),
112 (b'v', b'verbose', None, _(b'enable additional output')),
112 (b'v', b'verbose', None, _(b'enable additional output')),
113 (
113 (
114 b'',
114 b'',
115 b'color',
115 b'color',
116 b'',
116 b'',
117 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
117 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
118 # and should not be translated
118 # and should not be translated
119 _(b"when to colorize (boolean, always, auto, never, or debug)"),
119 _(b"when to colorize (boolean, always, auto, never, or debug)"),
120 _(b'TYPE'),
120 _(b'TYPE'),
121 ),
121 ),
122 (
122 (
123 b'',
123 b'',
124 b'config',
124 b'config',
125 [],
125 [],
126 _(b'set/override config option (use \'section.name=value\')'),
126 _(b'set/override config option (use \'section.name=value\')'),
127 _(b'CONFIG'),
127 _(b'CONFIG'),
128 ),
128 ),
129 (b'', b'debug', None, _(b'enable debugging output')),
129 (b'', b'debug', None, _(b'enable debugging output')),
130 (b'', b'debugger', None, _(b'start debugger')),
130 (b'', b'debugger', None, _(b'start debugger')),
131 (
131 (
132 b'',
132 b'',
133 b'encoding',
133 b'encoding',
134 encoding.encoding,
134 encoding.encoding,
135 _(b'set the charset encoding'),
135 _(b'set the charset encoding'),
136 _(b'ENCODE'),
136 _(b'ENCODE'),
137 ),
137 ),
138 (
138 (
139 b'',
139 b'',
140 b'encodingmode',
140 b'encodingmode',
141 encoding.encodingmode,
141 encoding.encodingmode,
142 _(b'set the charset encoding mode'),
142 _(b'set the charset encoding mode'),
143 _(b'MODE'),
143 _(b'MODE'),
144 ),
144 ),
145 (b'', b'traceback', None, _(b'always print a traceback on exception')),
145 (b'', b'traceback', None, _(b'always print a traceback on exception')),
146 (b'', b'time', None, _(b'time how long the command takes')),
146 (b'', b'time', None, _(b'time how long the command takes')),
147 (b'', b'profile', None, _(b'print command execution profile')),
147 (b'', b'profile', None, _(b'print command execution profile')),
148 (b'', b'version', None, _(b'output version information and exit')),
148 (b'', b'version', None, _(b'output version information and exit')),
149 (b'h', b'help', None, _(b'display help and exit')),
149 (b'h', b'help', None, _(b'display help and exit')),
150 (b'', b'hidden', False, _(b'consider hidden changesets')),
150 (b'', b'hidden', False, _(b'consider hidden changesets')),
151 (
151 (
152 b'',
152 b'',
153 b'pager',
153 b'pager',
154 b'auto',
154 b'auto',
155 _(b"when to paginate (boolean, always, auto, or never)"),
155 _(b"when to paginate (boolean, always, auto, or never)"),
156 _(b'TYPE'),
156 _(b'TYPE'),
157 ),
157 ),
158 ]
158 ]
159
159
160 dryrunopts = cmdutil.dryrunopts
160 dryrunopts = cmdutil.dryrunopts
161 remoteopts = cmdutil.remoteopts
161 remoteopts = cmdutil.remoteopts
162 walkopts = cmdutil.walkopts
162 walkopts = cmdutil.walkopts
163 commitopts = cmdutil.commitopts
163 commitopts = cmdutil.commitopts
164 commitopts2 = cmdutil.commitopts2
164 commitopts2 = cmdutil.commitopts2
165 commitopts3 = cmdutil.commitopts3
165 commitopts3 = cmdutil.commitopts3
166 formatteropts = cmdutil.formatteropts
166 formatteropts = cmdutil.formatteropts
167 templateopts = cmdutil.templateopts
167 templateopts = cmdutil.templateopts
168 logopts = cmdutil.logopts
168 logopts = cmdutil.logopts
169 diffopts = cmdutil.diffopts
169 diffopts = cmdutil.diffopts
170 diffwsopts = cmdutil.diffwsopts
170 diffwsopts = cmdutil.diffwsopts
171 diffopts2 = cmdutil.diffopts2
171 diffopts2 = cmdutil.diffopts2
172 mergetoolopts = cmdutil.mergetoolopts
172 mergetoolopts = cmdutil.mergetoolopts
173 similarityopts = cmdutil.similarityopts
173 similarityopts = cmdutil.similarityopts
174 subrepoopts = cmdutil.subrepoopts
174 subrepoopts = cmdutil.subrepoopts
175 debugrevlogopts = cmdutil.debugrevlogopts
175 debugrevlogopts = cmdutil.debugrevlogopts
176
176
177 # Commands start here, listed alphabetically
177 # Commands start here, listed alphabetically
178
178
179
179
180 @command(
180 @command(
181 b'abort',
181 b'abort',
182 dryrunopts,
182 dryrunopts,
183 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
183 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
184 helpbasic=True,
184 helpbasic=True,
185 )
185 )
186 def abort(ui, repo, **opts):
186 def abort(ui, repo, **opts):
187 """abort an unfinished operation (EXPERIMENTAL)
187 """abort an unfinished operation (EXPERIMENTAL)
188
188
189 Aborts a multistep operation like graft, histedit, rebase, merge,
189 Aborts a multistep operation like graft, histedit, rebase, merge,
190 and unshelve if they are in an unfinished state.
190 and unshelve if they are in an unfinished state.
191
191
192 use --dry-run/-n to dry run the command.
192 use --dry-run/-n to dry run the command.
193 """
193 """
194 dryrun = opts.get('dry_run')
194 dryrun = opts.get('dry_run')
195 abortstate = cmdutil.getunfinishedstate(repo)
195 abortstate = cmdutil.getunfinishedstate(repo)
196 if not abortstate:
196 if not abortstate:
197 raise error.StateError(_(b'no operation in progress'))
197 raise error.StateError(_(b'no operation in progress'))
198 if not abortstate.abortfunc:
198 if not abortstate.abortfunc:
199 raise error.InputError(
199 raise error.InputError(
200 (
200 (
201 _(b"%s in progress but does not support 'hg abort'")
201 _(b"%s in progress but does not support 'hg abort'")
202 % (abortstate._opname)
202 % (abortstate._opname)
203 ),
203 ),
204 hint=abortstate.hint(),
204 hint=abortstate.hint(),
205 )
205 )
206 if dryrun:
206 if dryrun:
207 ui.status(
207 ui.status(
208 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
208 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
209 )
209 )
210 return
210 return
211 return abortstate.abortfunc(ui, repo)
211 return abortstate.abortfunc(ui, repo)
212
212
213
213
214 @command(
214 @command(
215 b'add',
215 b'add',
216 walkopts + subrepoopts + dryrunopts,
216 walkopts + subrepoopts + dryrunopts,
217 _(b'[OPTION]... [FILE]...'),
217 _(b'[OPTION]... [FILE]...'),
218 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
218 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
219 helpbasic=True,
219 helpbasic=True,
220 inferrepo=True,
220 inferrepo=True,
221 )
221 )
222 def add(ui, repo, *pats, **opts):
222 def add(ui, repo, *pats, **opts):
223 """add the specified files on the next commit
223 """add the specified files on the next commit
224
224
225 Schedule files to be version controlled and added to the
225 Schedule files to be version controlled and added to the
226 repository.
226 repository.
227
227
228 The files will be added to the repository at the next commit. To
228 The files will be added to the repository at the next commit. To
229 undo an add before that, see :hg:`forget`.
229 undo an add before that, see :hg:`forget`.
230
230
231 If no names are given, add all files to the repository (except
231 If no names are given, add all files to the repository (except
232 files matching ``.hgignore``).
232 files matching ``.hgignore``).
233
233
234 .. container:: verbose
234 .. container:: verbose
235
235
236 Examples:
236 Examples:
237
237
238 - New (unknown) files are added
238 - New (unknown) files are added
239 automatically by :hg:`add`::
239 automatically by :hg:`add`::
240
240
241 $ ls
241 $ ls
242 foo.c
242 foo.c
243 $ hg status
243 $ hg status
244 ? foo.c
244 ? foo.c
245 $ hg add
245 $ hg add
246 adding foo.c
246 adding foo.c
247 $ hg status
247 $ hg status
248 A foo.c
248 A foo.c
249
249
250 - Specific files to be added can be specified::
250 - Specific files to be added can be specified::
251
251
252 $ ls
252 $ ls
253 bar.c foo.c
253 bar.c foo.c
254 $ hg status
254 $ hg status
255 ? bar.c
255 ? bar.c
256 ? foo.c
256 ? foo.c
257 $ hg add bar.c
257 $ hg add bar.c
258 $ hg status
258 $ hg status
259 A bar.c
259 A bar.c
260 ? foo.c
260 ? foo.c
261
261
262 Returns 0 if all files are successfully added.
262 Returns 0 if all files are successfully added.
263 """
263 """
264
264
265 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
265 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
266 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
266 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
267 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
267 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
268 return rejected and 1 or 0
268 return rejected and 1 or 0
269
269
270
270
271 @command(
271 @command(
272 b'addremove',
272 b'addremove',
273 similarityopts + subrepoopts + walkopts + dryrunopts,
273 similarityopts + subrepoopts + walkopts + dryrunopts,
274 _(b'[OPTION]... [FILE]...'),
274 _(b'[OPTION]... [FILE]...'),
275 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
275 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
276 inferrepo=True,
276 inferrepo=True,
277 )
277 )
278 def addremove(ui, repo, *pats, **opts):
278 def addremove(ui, repo, *pats, **opts):
279 """add all new files, delete all missing files
279 """add all new files, delete all missing files
280
280
281 Add all new files and remove all missing files from the
281 Add all new files and remove all missing files from the
282 repository.
282 repository.
283
283
284 Unless names are given, new files are ignored if they match any of
284 Unless names are given, new files are ignored if they match any of
285 the patterns in ``.hgignore``. As with add, these changes take
285 the patterns in ``.hgignore``. As with add, these changes take
286 effect at the next commit.
286 effect at the next commit.
287
287
288 Use the -s/--similarity option to detect renamed files. This
288 Use the -s/--similarity option to detect renamed files. This
289 option takes a percentage between 0 (disabled) and 100 (files must
289 option takes a percentage between 0 (disabled) and 100 (files must
290 be identical) as its parameter. With a parameter greater than 0,
290 be identical) as its parameter. With a parameter greater than 0,
291 this compares every removed file with every added file and records
291 this compares every removed file with every added file and records
292 those similar enough as renames. Detecting renamed files this way
292 those similar enough as renames. Detecting renamed files this way
293 can be expensive. After using this option, :hg:`status -C` can be
293 can be expensive. After using this option, :hg:`status -C` can be
294 used to check which files were identified as moved or renamed. If
294 used to check which files were identified as moved or renamed. If
295 not specified, -s/--similarity defaults to 100 and only renames of
295 not specified, -s/--similarity defaults to 100 and only renames of
296 identical files are detected.
296 identical files are detected.
297
297
298 .. container:: verbose
298 .. container:: verbose
299
299
300 Examples:
300 Examples:
301
301
302 - A number of files (bar.c and foo.c) are new,
302 - A number of files (bar.c and foo.c) are new,
303 while foobar.c has been removed (without using :hg:`remove`)
303 while foobar.c has been removed (without using :hg:`remove`)
304 from the repository::
304 from the repository::
305
305
306 $ ls
306 $ ls
307 bar.c foo.c
307 bar.c foo.c
308 $ hg status
308 $ hg status
309 ! foobar.c
309 ! foobar.c
310 ? bar.c
310 ? bar.c
311 ? foo.c
311 ? foo.c
312 $ hg addremove
312 $ hg addremove
313 adding bar.c
313 adding bar.c
314 adding foo.c
314 adding foo.c
315 removing foobar.c
315 removing foobar.c
316 $ hg status
316 $ hg status
317 A bar.c
317 A bar.c
318 A foo.c
318 A foo.c
319 R foobar.c
319 R foobar.c
320
320
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 Afterwards, it was edited slightly::
322 Afterwards, it was edited slightly::
323
323
324 $ ls
324 $ ls
325 foo.c
325 foo.c
326 $ hg status
326 $ hg status
327 ! foobar.c
327 ! foobar.c
328 ? foo.c
328 ? foo.c
329 $ hg addremove --similarity 90
329 $ hg addremove --similarity 90
330 removing foobar.c
330 removing foobar.c
331 adding foo.c
331 adding foo.c
332 recording removal of foobar.c as rename to foo.c (94% similar)
332 recording removal of foobar.c as rename to foo.c (94% similar)
333 $ hg status -C
333 $ hg status -C
334 A foo.c
334 A foo.c
335 foobar.c
335 foobar.c
336 R foobar.c
336 R foobar.c
337
337
338 Returns 0 if all files are successfully added.
338 Returns 0 if all files are successfully added.
339 """
339 """
340 opts = pycompat.byteskwargs(opts)
340 opts = pycompat.byteskwargs(opts)
341 if not opts.get(b'similarity'):
341 if not opts.get(b'similarity'):
342 opts[b'similarity'] = b'100'
342 opts[b'similarity'] = b'100'
343 matcher = scmutil.match(repo[None], pats, opts)
343 matcher = scmutil.match(repo[None], pats, opts)
344 relative = scmutil.anypats(pats, opts)
344 relative = scmutil.anypats(pats, opts)
345 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
345 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
346 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
346 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
347
347
348
348
349 @command(
349 @command(
350 b'annotate|blame',
350 b'annotate|blame',
351 [
351 [
352 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
352 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
353 (
353 (
354 b'',
354 b'',
355 b'follow',
355 b'follow',
356 None,
356 None,
357 _(b'follow copies/renames and list the filename (DEPRECATED)'),
357 _(b'follow copies/renames and list the filename (DEPRECATED)'),
358 ),
358 ),
359 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
359 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
360 (b'a', b'text', None, _(b'treat all files as text')),
360 (b'a', b'text', None, _(b'treat all files as text')),
361 (b'u', b'user', None, _(b'list the author (long with -v)')),
361 (b'u', b'user', None, _(b'list the author (long with -v)')),
362 (b'f', b'file', None, _(b'list the filename')),
362 (b'f', b'file', None, _(b'list the filename')),
363 (b'd', b'date', None, _(b'list the date (short with -q)')),
363 (b'd', b'date', None, _(b'list the date (short with -q)')),
364 (b'n', b'number', None, _(b'list the revision number (default)')),
364 (b'n', b'number', None, _(b'list the revision number (default)')),
365 (b'c', b'changeset', None, _(b'list the changeset')),
365 (b'c', b'changeset', None, _(b'list the changeset')),
366 (
366 (
367 b'l',
367 b'l',
368 b'line-number',
368 b'line-number',
369 None,
369 None,
370 _(b'show line number at the first appearance'),
370 _(b'show line number at the first appearance'),
371 ),
371 ),
372 (
372 (
373 b'',
373 b'',
374 b'skip',
374 b'skip',
375 [],
375 [],
376 _(b'revset to not display (EXPERIMENTAL)'),
376 _(b'revset to not display (EXPERIMENTAL)'),
377 _(b'REV'),
377 _(b'REV'),
378 ),
378 ),
379 ]
379 ]
380 + diffwsopts
380 + diffwsopts
381 + walkopts
381 + walkopts
382 + formatteropts,
382 + formatteropts,
383 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
383 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
384 helpcategory=command.CATEGORY_FILE_CONTENTS,
384 helpcategory=command.CATEGORY_FILE_CONTENTS,
385 helpbasic=True,
385 helpbasic=True,
386 inferrepo=True,
386 inferrepo=True,
387 )
387 )
388 def annotate(ui, repo, *pats, **opts):
388 def annotate(ui, repo, *pats, **opts):
389 """show changeset information by line for each file
389 """show changeset information by line for each file
390
390
391 List changes in files, showing the revision id responsible for
391 List changes in files, showing the revision id responsible for
392 each line.
392 each line.
393
393
394 This command is useful for discovering when a change was made and
394 This command is useful for discovering when a change was made and
395 by whom.
395 by whom.
396
396
397 If you include --file, --user, or --date, the revision number is
397 If you include --file, --user, or --date, the revision number is
398 suppressed unless you also include --number.
398 suppressed unless you also include --number.
399
399
400 Without the -a/--text option, annotate will avoid processing files
400 Without the -a/--text option, annotate will avoid processing files
401 it detects as binary. With -a, annotate will annotate the file
401 it detects as binary. With -a, annotate will annotate the file
402 anyway, although the results will probably be neither useful
402 anyway, although the results will probably be neither useful
403 nor desirable.
403 nor desirable.
404
404
405 .. container:: verbose
405 .. container:: verbose
406
406
407 Template:
407 Template:
408
408
409 The following keywords are supported in addition to the common template
409 The following keywords are supported in addition to the common template
410 keywords and functions. See also :hg:`help templates`.
410 keywords and functions. See also :hg:`help templates`.
411
411
412 :lines: List of lines with annotation data.
412 :lines: List of lines with annotation data.
413 :path: String. Repository-absolute path of the specified file.
413 :path: String. Repository-absolute path of the specified file.
414
414
415 And each entry of ``{lines}`` provides the following sub-keywords in
415 And each entry of ``{lines}`` provides the following sub-keywords in
416 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
416 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
417
417
418 :line: String. Line content.
418 :line: String. Line content.
419 :lineno: Integer. Line number at that revision.
419 :lineno: Integer. Line number at that revision.
420 :path: String. Repository-absolute path of the file at that revision.
420 :path: String. Repository-absolute path of the file at that revision.
421
421
422 See :hg:`help templates.operators` for the list expansion syntax.
422 See :hg:`help templates.operators` for the list expansion syntax.
423
423
424 Returns 0 on success.
424 Returns 0 on success.
425 """
425 """
426 opts = pycompat.byteskwargs(opts)
426 opts = pycompat.byteskwargs(opts)
427 if not pats:
427 if not pats:
428 raise error.InputError(
428 raise error.InputError(
429 _(b'at least one filename or pattern is required')
429 _(b'at least one filename or pattern is required')
430 )
430 )
431
431
432 if opts.get(b'follow'):
432 if opts.get(b'follow'):
433 # --follow is deprecated and now just an alias for -f/--file
433 # --follow is deprecated and now just an alias for -f/--file
434 # to mimic the behavior of Mercurial before version 1.5
434 # to mimic the behavior of Mercurial before version 1.5
435 opts[b'file'] = True
435 opts[b'file'] = True
436
436
437 if (
437 if (
438 not opts.get(b'user')
438 not opts.get(b'user')
439 and not opts.get(b'changeset')
439 and not opts.get(b'changeset')
440 and not opts.get(b'date')
440 and not opts.get(b'date')
441 and not opts.get(b'file')
441 and not opts.get(b'file')
442 ):
442 ):
443 opts[b'number'] = True
443 opts[b'number'] = True
444
444
445 linenumber = opts.get(b'line_number') is not None
445 linenumber = opts.get(b'line_number') is not None
446 if (
446 if (
447 linenumber
447 linenumber
448 and (not opts.get(b'changeset'))
448 and (not opts.get(b'changeset'))
449 and (not opts.get(b'number'))
449 and (not opts.get(b'number'))
450 ):
450 ):
451 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
451 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
452
452
453 rev = opts.get(b'rev')
453 rev = opts.get(b'rev')
454 if rev:
454 if rev:
455 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
455 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
456 ctx = scmutil.revsingle(repo, rev)
456 ctx = scmutil.revsingle(repo, rev)
457
457
458 ui.pager(b'annotate')
458 ui.pager(b'annotate')
459 rootfm = ui.formatter(b'annotate', opts)
459 rootfm = ui.formatter(b'annotate', opts)
460 if ui.debugflag:
460 if ui.debugflag:
461 shorthex = pycompat.identity
461 shorthex = pycompat.identity
462 else:
462 else:
463
463
464 def shorthex(h):
464 def shorthex(h):
465 return h[:12]
465 return h[:12]
466
466
467 if ui.quiet:
467 if ui.quiet:
468 datefunc = dateutil.shortdate
468 datefunc = dateutil.shortdate
469 else:
469 else:
470 datefunc = dateutil.datestr
470 datefunc = dateutil.datestr
471 if ctx.rev() is None:
471 if ctx.rev() is None:
472 if opts.get(b'changeset'):
472 if opts.get(b'changeset'):
473 # omit "+" suffix which is appended to node hex
473 # omit "+" suffix which is appended to node hex
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 else:
480 else:
481
481
482 def formatrev(rev):
482 def formatrev(rev):
483 if rev == wdirrev:
483 if rev == wdirrev:
484 return b'%d+' % ctx.p1().rev()
484 return b'%d+' % ctx.p1().rev()
485 else:
485 else:
486 return b'%d ' % rev
486 return b'%d ' % rev
487
487
488 def formathex(h):
488 def formathex(h):
489 if h == wdirhex:
489 if h == wdirhex:
490 return b'%s+' % shorthex(hex(ctx.p1().node()))
490 return b'%s+' % shorthex(hex(ctx.p1().node()))
491 else:
491 else:
492 return b'%s ' % shorthex(h)
492 return b'%s ' % shorthex(h)
493
493
494 else:
494 else:
495 formatrev = b'%d'.__mod__
495 formatrev = b'%d'.__mod__
496 formathex = shorthex
496 formathex = shorthex
497
497
498 opmap = [
498 opmap = [
499 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
499 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
500 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
500 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
501 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
501 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
502 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
502 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
503 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
503 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
504 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
504 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
505 ]
505 ]
506 opnamemap = {
506 opnamemap = {
507 b'rev': b'number',
507 b'rev': b'number',
508 b'node': b'changeset',
508 b'node': b'changeset',
509 b'path': b'file',
509 b'path': b'file',
510 b'lineno': b'line_number',
510 b'lineno': b'line_number',
511 }
511 }
512
512
513 if rootfm.isplain():
513 if rootfm.isplain():
514
514
515 def makefunc(get, fmt):
515 def makefunc(get, fmt):
516 return lambda x: fmt(get(x))
516 return lambda x: fmt(get(x))
517
517
518 else:
518 else:
519
519
520 def makefunc(get, fmt):
520 def makefunc(get, fmt):
521 return get
521 return get
522
522
523 datahint = rootfm.datahint()
523 datahint = rootfm.datahint()
524 funcmap = [
524 funcmap = [
525 (makefunc(get, fmt), sep)
525 (makefunc(get, fmt), sep)
526 for fn, sep, get, fmt in opmap
526 for fn, sep, get, fmt in opmap
527 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
528 ]
528 ]
529 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
529 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
530 fields = b' '.join(
530 fields = b' '.join(
531 fn
531 fn
532 for fn, sep, get, fmt in opmap
532 for fn, sep, get, fmt in opmap
533 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
533 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
534 )
534 )
535
535
536 def bad(x, y):
536 def bad(x, y):
537 raise error.Abort(b"%s: %s" % (x, y))
537 raise error.Abort(b"%s: %s" % (x, y))
538
538
539 m = scmutil.match(ctx, pats, opts, badfn=bad)
539 m = scmutil.match(ctx, pats, opts, badfn=bad)
540
540
541 follow = not opts.get(b'no_follow')
541 follow = not opts.get(b'no_follow')
542 diffopts = patch.difffeatureopts(
542 diffopts = patch.difffeatureopts(
543 ui, opts, section=b'annotate', whitespace=True
543 ui, opts, section=b'annotate', whitespace=True
544 )
544 )
545 skiprevs = opts.get(b'skip')
545 skiprevs = opts.get(b'skip')
546 if skiprevs:
546 if skiprevs:
547 skiprevs = scmutil.revrange(repo, skiprevs)
547 skiprevs = scmutil.revrange(repo, skiprevs)
548
548
549 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
549 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
550 for abs in ctx.walk(m):
550 for abs in ctx.walk(m):
551 fctx = ctx[abs]
551 fctx = ctx[abs]
552 rootfm.startitem()
552 rootfm.startitem()
553 rootfm.data(path=abs)
553 rootfm.data(path=abs)
554 if not opts.get(b'text') and fctx.isbinary():
554 if not opts.get(b'text') and fctx.isbinary():
555 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
555 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
556 continue
556 continue
557
557
558 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
558 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
559 lines = fctx.annotate(
559 lines = fctx.annotate(
560 follow=follow, skiprevs=skiprevs, diffopts=diffopts
560 follow=follow, skiprevs=skiprevs, diffopts=diffopts
561 )
561 )
562 if not lines:
562 if not lines:
563 fm.end()
563 fm.end()
564 continue
564 continue
565 formats = []
565 formats = []
566 pieces = []
566 pieces = []
567
567
568 for f, sep in funcmap:
568 for f, sep in funcmap:
569 l = [f(n) for n in lines]
569 l = [f(n) for n in lines]
570 if fm.isplain():
570 if fm.isplain():
571 sizes = [encoding.colwidth(x) for x in l]
571 sizes = [encoding.colwidth(x) for x in l]
572 ml = max(sizes)
572 ml = max(sizes)
573 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
573 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
574 else:
574 else:
575 formats.append([b'%s'] * len(l))
575 formats.append([b'%s'] * len(l))
576 pieces.append(l)
576 pieces.append(l)
577
577
578 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
578 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
579 fm.startitem()
579 fm.startitem()
580 fm.context(fctx=n.fctx)
580 fm.context(fctx=n.fctx)
581 fm.write(fields, b"".join(f), *p)
581 fm.write(fields, b"".join(f), *p)
582 if n.skip:
582 if n.skip:
583 fmt = b"* %s"
583 fmt = b"* %s"
584 else:
584 else:
585 fmt = b": %s"
585 fmt = b": %s"
586 fm.write(b'line', fmt, n.text)
586 fm.write(b'line', fmt, n.text)
587
587
588 if not lines[-1].text.endswith(b'\n'):
588 if not lines[-1].text.endswith(b'\n'):
589 fm.plain(b'\n')
589 fm.plain(b'\n')
590 fm.end()
590 fm.end()
591
591
592 rootfm.end()
592 rootfm.end()
593
593
594
594
595 @command(
595 @command(
596 b'archive',
596 b'archive',
597 [
597 [
598 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
598 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
599 (
599 (
600 b'p',
600 b'p',
601 b'prefix',
601 b'prefix',
602 b'',
602 b'',
603 _(b'directory prefix for files in archive'),
603 _(b'directory prefix for files in archive'),
604 _(b'PREFIX'),
604 _(b'PREFIX'),
605 ),
605 ),
606 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
606 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
607 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
607 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
608 ]
608 ]
609 + subrepoopts
609 + subrepoopts
610 + walkopts,
610 + walkopts,
611 _(b'[OPTION]... DEST'),
611 _(b'[OPTION]... DEST'),
612 helpcategory=command.CATEGORY_IMPORT_EXPORT,
612 helpcategory=command.CATEGORY_IMPORT_EXPORT,
613 )
613 )
614 def archive(ui, repo, dest, **opts):
614 def archive(ui, repo, dest, **opts):
615 """create an unversioned archive of a repository revision
615 """create an unversioned archive of a repository revision
616
616
617 By default, the revision used is the parent of the working
617 By default, the revision used is the parent of the working
618 directory; use -r/--rev to specify a different revision.
618 directory; use -r/--rev to specify a different revision.
619
619
620 The archive type is automatically detected based on file
620 The archive type is automatically detected based on file
621 extension (to override, use -t/--type).
621 extension (to override, use -t/--type).
622
622
623 .. container:: verbose
623 .. container:: verbose
624
624
625 Examples:
625 Examples:
626
626
627 - create a zip file containing the 1.0 release::
627 - create a zip file containing the 1.0 release::
628
628
629 hg archive -r 1.0 project-1.0.zip
629 hg archive -r 1.0 project-1.0.zip
630
630
631 - create a tarball excluding .hg files::
631 - create a tarball excluding .hg files::
632
632
633 hg archive project.tar.gz -X ".hg*"
633 hg archive project.tar.gz -X ".hg*"
634
634
635 Valid types are:
635 Valid types are:
636
636
637 :``files``: a directory full of files (default)
637 :``files``: a directory full of files (default)
638 :``tar``: tar archive, uncompressed
638 :``tar``: tar archive, uncompressed
639 :``tbz2``: tar archive, compressed using bzip2
639 :``tbz2``: tar archive, compressed using bzip2
640 :``tgz``: tar archive, compressed using gzip
640 :``tgz``: tar archive, compressed using gzip
641 :``txz``: tar archive, compressed using lzma (only in Python 3)
641 :``txz``: tar archive, compressed using lzma (only in Python 3)
642 :``uzip``: zip archive, uncompressed
642 :``uzip``: zip archive, uncompressed
643 :``zip``: zip archive, compressed using deflate
643 :``zip``: zip archive, compressed using deflate
644
644
645 The exact name of the destination archive or directory is given
645 The exact name of the destination archive or directory is given
646 using a format string; see :hg:`help export` for details.
646 using a format string; see :hg:`help export` for details.
647
647
648 Each member added to an archive file has a directory prefix
648 Each member added to an archive file has a directory prefix
649 prepended. Use -p/--prefix to specify a format string for the
649 prepended. Use -p/--prefix to specify a format string for the
650 prefix. The default is the basename of the archive, with suffixes
650 prefix. The default is the basename of the archive, with suffixes
651 removed.
651 removed.
652
652
653 Returns 0 on success.
653 Returns 0 on success.
654 """
654 """
655
655
656 opts = pycompat.byteskwargs(opts)
656 opts = pycompat.byteskwargs(opts)
657 rev = opts.get(b'rev')
657 rev = opts.get(b'rev')
658 if rev:
658 if rev:
659 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
659 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
660 ctx = scmutil.revsingle(repo, rev)
660 ctx = scmutil.revsingle(repo, rev)
661 if not ctx:
661 if not ctx:
662 raise error.InputError(
662 raise error.InputError(
663 _(b'no working directory: please specify a revision')
663 _(b'no working directory: please specify a revision')
664 )
664 )
665 node = ctx.node()
665 node = ctx.node()
666 dest = cmdutil.makefilename(ctx, dest)
666 dest = cmdutil.makefilename(ctx, dest)
667 if os.path.realpath(dest) == repo.root:
667 if os.path.realpath(dest) == repo.root:
668 raise error.InputError(_(b'repository root cannot be destination'))
668 raise error.InputError(_(b'repository root cannot be destination'))
669
669
670 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
670 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
671 prefix = opts.get(b'prefix')
671 prefix = opts.get(b'prefix')
672
672
673 if dest == b'-':
673 if dest == b'-':
674 if kind == b'files':
674 if kind == b'files':
675 raise error.InputError(_(b'cannot archive plain files to stdout'))
675 raise error.InputError(_(b'cannot archive plain files to stdout'))
676 dest = cmdutil.makefileobj(ctx, dest)
676 dest = cmdutil.makefileobj(ctx, dest)
677 if not prefix:
677 if not prefix:
678 prefix = os.path.basename(repo.root) + b'-%h'
678 prefix = os.path.basename(repo.root) + b'-%h'
679
679
680 prefix = cmdutil.makefilename(ctx, prefix)
680 prefix = cmdutil.makefilename(ctx, prefix)
681 match = scmutil.match(ctx, [], opts)
681 match = scmutil.match(ctx, [], opts)
682 archival.archive(
682 archival.archive(
683 repo,
683 repo,
684 dest,
684 dest,
685 node,
685 node,
686 kind,
686 kind,
687 not opts.get(b'no_decode'),
687 not opts.get(b'no_decode'),
688 match,
688 match,
689 prefix,
689 prefix,
690 subrepos=opts.get(b'subrepos'),
690 subrepos=opts.get(b'subrepos'),
691 )
691 )
692
692
693
693
694 @command(
694 @command(
695 b'backout',
695 b'backout',
696 [
696 [
697 (
697 (
698 b'',
698 b'',
699 b'merge',
699 b'merge',
700 None,
700 None,
701 _(b'merge with old dirstate parent after backout'),
701 _(b'merge with old dirstate parent after backout'),
702 ),
702 ),
703 (
703 (
704 b'',
704 b'',
705 b'commit',
705 b'commit',
706 None,
706 None,
707 _(b'commit if no conflicts were encountered (DEPRECATED)'),
707 _(b'commit if no conflicts were encountered (DEPRECATED)'),
708 ),
708 ),
709 (b'', b'no-commit', None, _(b'do not commit')),
709 (b'', b'no-commit', None, _(b'do not commit')),
710 (
710 (
711 b'',
711 b'',
712 b'parent',
712 b'parent',
713 b'',
713 b'',
714 _(b'parent to choose when backing out merge (DEPRECATED)'),
714 _(b'parent to choose when backing out merge (DEPRECATED)'),
715 _(b'REV'),
715 _(b'REV'),
716 ),
716 ),
717 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
717 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
719 ]
719 ]
720 + mergetoolopts
720 + mergetoolopts
721 + walkopts
721 + walkopts
722 + commitopts
722 + commitopts
723 + commitopts2,
723 + commitopts2,
724 _(b'[OPTION]... [-r] REV'),
724 _(b'[OPTION]... [-r] REV'),
725 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
725 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
726 )
726 )
727 def backout(ui, repo, node=None, rev=None, **opts):
727 def backout(ui, repo, node=None, rev=None, **opts):
728 """reverse effect of earlier changeset
728 """reverse effect of earlier changeset
729
729
730 Prepare a new changeset with the effect of REV undone in the
730 Prepare a new changeset with the effect of REV undone in the
731 current working directory. If no conflicts were encountered,
731 current working directory. If no conflicts were encountered,
732 it will be committed immediately.
732 it will be committed immediately.
733
733
734 If REV is the parent of the working directory, then this new changeset
734 If REV is the parent of the working directory, then this new changeset
735 is committed automatically (unless --no-commit is specified).
735 is committed automatically (unless --no-commit is specified).
736
736
737 .. note::
737 .. note::
738
738
739 :hg:`backout` cannot be used to fix either an unwanted or
739 :hg:`backout` cannot be used to fix either an unwanted or
740 incorrect merge.
740 incorrect merge.
741
741
742 .. container:: verbose
742 .. container:: verbose
743
743
744 Examples:
744 Examples:
745
745
746 - Reverse the effect of the parent of the working directory.
746 - Reverse the effect of the parent of the working directory.
747 This backout will be committed immediately::
747 This backout will be committed immediately::
748
748
749 hg backout -r .
749 hg backout -r .
750
750
751 - Reverse the effect of previous bad revision 23::
751 - Reverse the effect of previous bad revision 23::
752
752
753 hg backout -r 23
753 hg backout -r 23
754
754
755 - Reverse the effect of previous bad revision 23 and
755 - Reverse the effect of previous bad revision 23 and
756 leave changes uncommitted::
756 leave changes uncommitted::
757
757
758 hg backout -r 23 --no-commit
758 hg backout -r 23 --no-commit
759 hg commit -m "Backout revision 23"
759 hg commit -m "Backout revision 23"
760
760
761 By default, the pending changeset will have one parent,
761 By default, the pending changeset will have one parent,
762 maintaining a linear history. With --merge, the pending
762 maintaining a linear history. With --merge, the pending
763 changeset will instead have two parents: the old parent of the
763 changeset will instead have two parents: the old parent of the
764 working directory and a new child of REV that simply undoes REV.
764 working directory and a new child of REV that simply undoes REV.
765
765
766 Before version 1.7, the behavior without --merge was equivalent
766 Before version 1.7, the behavior without --merge was equivalent
767 to specifying --merge followed by :hg:`update --clean .` to
767 to specifying --merge followed by :hg:`update --clean .` to
768 cancel the merge and leave the child of REV as a head to be
768 cancel the merge and leave the child of REV as a head to be
769 merged separately.
769 merged separately.
770
770
771 See :hg:`help dates` for a list of formats valid for -d/--date.
771 See :hg:`help dates` for a list of formats valid for -d/--date.
772
772
773 See :hg:`help revert` for a way to restore files to the state
773 See :hg:`help revert` for a way to restore files to the state
774 of another revision.
774 of another revision.
775
775
776 Returns 0 on success, 1 if nothing to backout or there are unresolved
776 Returns 0 on success, 1 if nothing to backout or there are unresolved
777 files.
777 files.
778 """
778 """
779 with repo.wlock(), repo.lock():
779 with repo.wlock(), repo.lock():
780 return _dobackout(ui, repo, node, rev, **opts)
780 return _dobackout(ui, repo, node, rev, **opts)
781
781
782
782
783 def _dobackout(ui, repo, node=None, rev=None, **opts):
783 def _dobackout(ui, repo, node=None, rev=None, **opts):
784 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
784 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
785 opts = pycompat.byteskwargs(opts)
785 opts = pycompat.byteskwargs(opts)
786
786
787 if rev and node:
787 if rev and node:
788 raise error.InputError(_(b"please specify just one revision"))
788 raise error.InputError(_(b"please specify just one revision"))
789
789
790 if not rev:
790 if not rev:
791 rev = node
791 rev = node
792
792
793 if not rev:
793 if not rev:
794 raise error.InputError(_(b"please specify a revision to backout"))
794 raise error.InputError(_(b"please specify a revision to backout"))
795
795
796 date = opts.get(b'date')
796 date = opts.get(b'date')
797 if date:
797 if date:
798 opts[b'date'] = dateutil.parsedate(date)
798 opts[b'date'] = dateutil.parsedate(date)
799
799
800 cmdutil.checkunfinished(repo)
800 cmdutil.checkunfinished(repo)
801 cmdutil.bailifchanged(repo)
801 cmdutil.bailifchanged(repo)
802 ctx = scmutil.revsingle(repo, rev)
802 ctx = scmutil.revsingle(repo, rev)
803 node = ctx.node()
803 node = ctx.node()
804
804
805 op1, op2 = repo.dirstate.parents()
805 op1, op2 = repo.dirstate.parents()
806 if not repo.changelog.isancestor(node, op1):
806 if not repo.changelog.isancestor(node, op1):
807 raise error.InputError(
807 raise error.InputError(
808 _(b'cannot backout change that is not an ancestor')
808 _(b'cannot backout change that is not an ancestor')
809 )
809 )
810
810
811 p1, p2 = repo.changelog.parents(node)
811 p1, p2 = repo.changelog.parents(node)
812 if p1 == nullid:
812 if p1 == nullid:
813 raise error.InputError(_(b'cannot backout a change with no parents'))
813 raise error.InputError(_(b'cannot backout a change with no parents'))
814 if p2 != nullid:
814 if p2 != nullid:
815 if not opts.get(b'parent'):
815 if not opts.get(b'parent'):
816 raise error.InputError(_(b'cannot backout a merge changeset'))
816 raise error.InputError(_(b'cannot backout a merge changeset'))
817 p = repo.lookup(opts[b'parent'])
817 p = repo.lookup(opts[b'parent'])
818 if p not in (p1, p2):
818 if p not in (p1, p2):
819 raise error.InputError(
819 raise error.InputError(
820 _(b'%s is not a parent of %s') % (short(p), short(node))
820 _(b'%s is not a parent of %s') % (short(p), short(node))
821 )
821 )
822 parent = p
822 parent = p
823 else:
823 else:
824 if opts.get(b'parent'):
824 if opts.get(b'parent'):
825 raise error.InputError(
825 raise error.InputError(
826 _(b'cannot use --parent on non-merge changeset')
826 _(b'cannot use --parent on non-merge changeset')
827 )
827 )
828 parent = p1
828 parent = p1
829
829
830 # the backout should appear on the same branch
830 # the backout should appear on the same branch
831 branch = repo.dirstate.branch()
831 branch = repo.dirstate.branch()
832 bheads = repo.branchheads(branch)
832 bheads = repo.branchheads(branch)
833 rctx = scmutil.revsingle(repo, hex(parent))
833 rctx = scmutil.revsingle(repo, hex(parent))
834 if not opts.get(b'merge') and op1 != node:
834 if not opts.get(b'merge') and op1 != node:
835 with dirstateguard.dirstateguard(repo, b'backout'):
835 with dirstateguard.dirstateguard(repo, b'backout'):
836 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
836 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
837 with ui.configoverride(overrides, b'backout'):
837 with ui.configoverride(overrides, b'backout'):
838 stats = mergemod.back_out(ctx, parent=repo[parent])
838 stats = mergemod.back_out(ctx, parent=repo[parent])
839 repo.setparents(op1, op2)
839 repo.setparents(op1, op2)
840 hg._showstats(repo, stats)
840 hg._showstats(repo, stats)
841 if stats.unresolvedcount:
841 if stats.unresolvedcount:
842 repo.ui.status(
842 repo.ui.status(
843 _(b"use 'hg resolve' to retry unresolved file merges\n")
843 _(b"use 'hg resolve' to retry unresolved file merges\n")
844 )
844 )
845 return 1
845 return 1
846 else:
846 else:
847 hg.clean(repo, node, show_stats=False)
847 hg.clean(repo, node, show_stats=False)
848 repo.dirstate.setbranch(branch)
848 repo.dirstate.setbranch(branch)
849 cmdutil.revert(ui, repo, rctx)
849 cmdutil.revert(ui, repo, rctx)
850
850
851 if opts.get(b'no_commit'):
851 if opts.get(b'no_commit'):
852 msg = _(b"changeset %s backed out, don't forget to commit.\n")
852 msg = _(b"changeset %s backed out, don't forget to commit.\n")
853 ui.status(msg % short(node))
853 ui.status(msg % short(node))
854 return 0
854 return 0
855
855
856 def commitfunc(ui, repo, message, match, opts):
856 def commitfunc(ui, repo, message, match, opts):
857 editform = b'backout'
857 editform = b'backout'
858 e = cmdutil.getcommiteditor(
858 e = cmdutil.getcommiteditor(
859 editform=editform, **pycompat.strkwargs(opts)
859 editform=editform, **pycompat.strkwargs(opts)
860 )
860 )
861 if not message:
861 if not message:
862 # we don't translate commit messages
862 # we don't translate commit messages
863 message = b"Backed out changeset %s" % short(node)
863 message = b"Backed out changeset %s" % short(node)
864 e = cmdutil.getcommiteditor(edit=True, editform=editform)
864 e = cmdutil.getcommiteditor(edit=True, editform=editform)
865 return repo.commit(
865 return repo.commit(
866 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
866 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
867 )
867 )
868
868
869 # save to detect changes
869 # save to detect changes
870 tip = repo.changelog.tip()
870 tip = repo.changelog.tip()
871
871
872 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
872 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
873 if not newnode:
873 if not newnode:
874 ui.status(_(b"nothing changed\n"))
874 ui.status(_(b"nothing changed\n"))
875 return 1
875 return 1
876 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
876 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
877
877
878 def nice(node):
878 def nice(node):
879 return b'%d:%s' % (repo.changelog.rev(node), short(node))
879 return b'%d:%s' % (repo.changelog.rev(node), short(node))
880
880
881 ui.status(
881 ui.status(
882 _(b'changeset %s backs out changeset %s\n')
882 _(b'changeset %s backs out changeset %s\n')
883 % (nice(newnode), nice(node))
883 % (nice(newnode), nice(node))
884 )
884 )
885 if opts.get(b'merge') and op1 != node:
885 if opts.get(b'merge') and op1 != node:
886 hg.clean(repo, op1, show_stats=False)
886 hg.clean(repo, op1, show_stats=False)
887 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
887 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
888 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
888 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
889 with ui.configoverride(overrides, b'backout'):
889 with ui.configoverride(overrides, b'backout'):
890 return hg.merge(repo[b'tip'])
890 return hg.merge(repo[b'tip'])
891 return 0
891 return 0
892
892
893
893
894 @command(
894 @command(
895 b'bisect',
895 b'bisect',
896 [
896 [
897 (b'r', b'reset', False, _(b'reset bisect state')),
897 (b'r', b'reset', False, _(b'reset bisect state')),
898 (b'g', b'good', False, _(b'mark changeset good')),
898 (b'g', b'good', False, _(b'mark changeset good')),
899 (b'b', b'bad', False, _(b'mark changeset bad')),
899 (b'b', b'bad', False, _(b'mark changeset bad')),
900 (b's', b'skip', False, _(b'skip testing changeset')),
900 (b's', b'skip', False, _(b'skip testing changeset')),
901 (b'e', b'extend', False, _(b'extend the bisect range')),
901 (b'e', b'extend', False, _(b'extend the bisect range')),
902 (
902 (
903 b'c',
903 b'c',
904 b'command',
904 b'command',
905 b'',
905 b'',
906 _(b'use command to check changeset state'),
906 _(b'use command to check changeset state'),
907 _(b'CMD'),
907 _(b'CMD'),
908 ),
908 ),
909 (b'U', b'noupdate', False, _(b'do not update to target')),
909 (b'U', b'noupdate', False, _(b'do not update to target')),
910 ],
910 ],
911 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
911 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
912 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
912 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
913 )
913 )
914 def bisect(
914 def bisect(
915 ui,
915 ui,
916 repo,
916 repo,
917 positional_1=None,
917 positional_1=None,
918 positional_2=None,
918 positional_2=None,
919 command=None,
919 command=None,
920 reset=None,
920 reset=None,
921 good=None,
921 good=None,
922 bad=None,
922 bad=None,
923 skip=None,
923 skip=None,
924 extend=None,
924 extend=None,
925 noupdate=None,
925 noupdate=None,
926 ):
926 ):
927 """subdivision search of changesets
927 """subdivision search of changesets
928
928
929 This command helps to find changesets which introduce problems. To
929 This command helps to find changesets which introduce problems. To
930 use, mark the earliest changeset you know exhibits the problem as
930 use, mark the earliest changeset you know exhibits the problem as
931 bad, then mark the latest changeset which is free from the problem
931 bad, then mark the latest changeset which is free from the problem
932 as good. Bisect will update your working directory to a revision
932 as good. Bisect will update your working directory to a revision
933 for testing (unless the -U/--noupdate option is specified). Once
933 for testing (unless the -U/--noupdate option is specified). Once
934 you have performed tests, mark the working directory as good or
934 you have performed tests, mark the working directory as good or
935 bad, and bisect will either update to another candidate changeset
935 bad, and bisect will either update to another candidate changeset
936 or announce that it has found the bad revision.
936 or announce that it has found the bad revision.
937
937
938 As a shortcut, you can also use the revision argument to mark a
938 As a shortcut, you can also use the revision argument to mark a
939 revision as good or bad without checking it out first.
939 revision as good or bad without checking it out first.
940
940
941 If you supply a command, it will be used for automatic bisection.
941 If you supply a command, it will be used for automatic bisection.
942 The environment variable HG_NODE will contain the ID of the
942 The environment variable HG_NODE will contain the ID of the
943 changeset being tested. The exit status of the command will be
943 changeset being tested. The exit status of the command will be
944 used to mark revisions as good or bad: status 0 means good, 125
944 used to mark revisions as good or bad: status 0 means good, 125
945 means to skip the revision, 127 (command not found) will abort the
945 means to skip the revision, 127 (command not found) will abort the
946 bisection, and any other non-zero exit status means the revision
946 bisection, and any other non-zero exit status means the revision
947 is bad.
947 is bad.
948
948
949 .. container:: verbose
949 .. container:: verbose
950
950
951 Some examples:
951 Some examples:
952
952
953 - start a bisection with known bad revision 34, and good revision 12::
953 - start a bisection with known bad revision 34, and good revision 12::
954
954
955 hg bisect --bad 34
955 hg bisect --bad 34
956 hg bisect --good 12
956 hg bisect --good 12
957
957
958 - advance the current bisection by marking current revision as good or
958 - advance the current bisection by marking current revision as good or
959 bad::
959 bad::
960
960
961 hg bisect --good
961 hg bisect --good
962 hg bisect --bad
962 hg bisect --bad
963
963
964 - mark the current revision, or a known revision, to be skipped (e.g. if
964 - mark the current revision, or a known revision, to be skipped (e.g. if
965 that revision is not usable because of another issue)::
965 that revision is not usable because of another issue)::
966
966
967 hg bisect --skip
967 hg bisect --skip
968 hg bisect --skip 23
968 hg bisect --skip 23
969
969
970 - skip all revisions that do not touch directories ``foo`` or ``bar``::
970 - skip all revisions that do not touch directories ``foo`` or ``bar``::
971
971
972 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
972 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
973
973
974 - forget the current bisection::
974 - forget the current bisection::
975
975
976 hg bisect --reset
976 hg bisect --reset
977
977
978 - use 'make && make tests' to automatically find the first broken
978 - use 'make && make tests' to automatically find the first broken
979 revision::
979 revision::
980
980
981 hg bisect --reset
981 hg bisect --reset
982 hg bisect --bad 34
982 hg bisect --bad 34
983 hg bisect --good 12
983 hg bisect --good 12
984 hg bisect --command "make && make tests"
984 hg bisect --command "make && make tests"
985
985
986 - see all changesets whose states are already known in the current
986 - see all changesets whose states are already known in the current
987 bisection::
987 bisection::
988
988
989 hg log -r "bisect(pruned)"
989 hg log -r "bisect(pruned)"
990
990
991 - see the changeset currently being bisected (especially useful
991 - see the changeset currently being bisected (especially useful
992 if running with -U/--noupdate)::
992 if running with -U/--noupdate)::
993
993
994 hg log -r "bisect(current)"
994 hg log -r "bisect(current)"
995
995
996 - see all changesets that took part in the current bisection::
996 - see all changesets that took part in the current bisection::
997
997
998 hg log -r "bisect(range)"
998 hg log -r "bisect(range)"
999
999
1000 - you can even get a nice graph::
1000 - you can even get a nice graph::
1001
1001
1002 hg log --graph -r "bisect(range)"
1002 hg log --graph -r "bisect(range)"
1003
1003
1004 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1004 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1005
1005
1006 Returns 0 on success.
1006 Returns 0 on success.
1007 """
1007 """
1008 rev = []
1008 rev = []
1009 # backward compatibility
1009 # backward compatibility
1010 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1010 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1011 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1011 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1012 cmd = positional_1
1012 cmd = positional_1
1013 rev.append(positional_2)
1013 rev.append(positional_2)
1014 if cmd == b"good":
1014 if cmd == b"good":
1015 good = True
1015 good = True
1016 elif cmd == b"bad":
1016 elif cmd == b"bad":
1017 bad = True
1017 bad = True
1018 else:
1018 else:
1019 reset = True
1019 reset = True
1020 elif positional_2:
1020 elif positional_2:
1021 raise error.InputError(_(b'incompatible arguments'))
1021 raise error.InputError(_(b'incompatible arguments'))
1022 elif positional_1 is not None:
1022 elif positional_1 is not None:
1023 rev.append(positional_1)
1023 rev.append(positional_1)
1024
1024
1025 incompatibles = {
1025 incompatibles = {
1026 b'--bad': bad,
1026 b'--bad': bad,
1027 b'--command': bool(command),
1027 b'--command': bool(command),
1028 b'--extend': extend,
1028 b'--extend': extend,
1029 b'--good': good,
1029 b'--good': good,
1030 b'--reset': reset,
1030 b'--reset': reset,
1031 b'--skip': skip,
1031 b'--skip': skip,
1032 }
1032 }
1033
1033
1034 enabled = [x for x in incompatibles if incompatibles[x]]
1034 enabled = [x for x in incompatibles if incompatibles[x]]
1035
1035
1036 if len(enabled) > 1:
1036 if len(enabled) > 1:
1037 raise error.InputError(
1037 raise error.InputError(
1038 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1038 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1039 )
1039 )
1040
1040
1041 if reset:
1041 if reset:
1042 hbisect.resetstate(repo)
1042 hbisect.resetstate(repo)
1043 return
1043 return
1044
1044
1045 state = hbisect.load_state(repo)
1045 state = hbisect.load_state(repo)
1046
1046
1047 if rev:
1047 if rev:
1048 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1048 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1049 else:
1049 else:
1050 nodes = [repo.lookup(b'.')]
1050 nodes = [repo.lookup(b'.')]
1051
1051
1052 # update state
1052 # update state
1053 if good or bad or skip:
1053 if good or bad or skip:
1054 if good:
1054 if good:
1055 state[b'good'] += nodes
1055 state[b'good'] += nodes
1056 elif bad:
1056 elif bad:
1057 state[b'bad'] += nodes
1057 state[b'bad'] += nodes
1058 elif skip:
1058 elif skip:
1059 state[b'skip'] += nodes
1059 state[b'skip'] += nodes
1060 hbisect.save_state(repo, state)
1060 hbisect.save_state(repo, state)
1061 if not (state[b'good'] and state[b'bad']):
1061 if not (state[b'good'] and state[b'bad']):
1062 return
1062 return
1063
1063
1064 def mayupdate(repo, node, show_stats=True):
1064 def mayupdate(repo, node, show_stats=True):
1065 """common used update sequence"""
1065 """common used update sequence"""
1066 if noupdate:
1066 if noupdate:
1067 return
1067 return
1068 cmdutil.checkunfinished(repo)
1068 cmdutil.checkunfinished(repo)
1069 cmdutil.bailifchanged(repo)
1069 cmdutil.bailifchanged(repo)
1070 return hg.clean(repo, node, show_stats=show_stats)
1070 return hg.clean(repo, node, show_stats=show_stats)
1071
1071
1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1073
1073
1074 if command:
1074 if command:
1075 changesets = 1
1075 changesets = 1
1076 if noupdate:
1076 if noupdate:
1077 try:
1077 try:
1078 node = state[b'current'][0]
1078 node = state[b'current'][0]
1079 except LookupError:
1079 except LookupError:
1080 raise error.StateError(
1080 raise error.StateError(
1081 _(
1081 _(
1082 b'current bisect revision is unknown - '
1082 b'current bisect revision is unknown - '
1083 b'start a new bisect to fix'
1083 b'start a new bisect to fix'
1084 )
1084 )
1085 )
1085 )
1086 else:
1086 else:
1087 node, p2 = repo.dirstate.parents()
1087 node, p2 = repo.dirstate.parents()
1088 if p2 != nullid:
1088 if p2 != nullid:
1089 raise error.StateError(_(b'current bisect revision is a merge'))
1089 raise error.StateError(_(b'current bisect revision is a merge'))
1090 if rev:
1090 if rev:
1091 if not nodes:
1091 if not nodes:
1092 raise error.Abort(_(b'empty revision set'))
1092 raise error.Abort(_(b'empty revision set'))
1093 node = repo[nodes[-1]].node()
1093 node = repo[nodes[-1]].node()
1094 with hbisect.restore_state(repo, state, node):
1094 with hbisect.restore_state(repo, state, node):
1095 while changesets:
1095 while changesets:
1096 # update state
1096 # update state
1097 state[b'current'] = [node]
1097 state[b'current'] = [node]
1098 hbisect.save_state(repo, state)
1098 hbisect.save_state(repo, state)
1099 status = ui.system(
1099 status = ui.system(
1100 command,
1100 command,
1101 environ={b'HG_NODE': hex(node)},
1101 environ={b'HG_NODE': hex(node)},
1102 blockedtag=b'bisect_check',
1102 blockedtag=b'bisect_check',
1103 )
1103 )
1104 if status == 125:
1104 if status == 125:
1105 transition = b"skip"
1105 transition = b"skip"
1106 elif status == 0:
1106 elif status == 0:
1107 transition = b"good"
1107 transition = b"good"
1108 # status < 0 means process was killed
1108 # status < 0 means process was killed
1109 elif status == 127:
1109 elif status == 127:
1110 raise error.Abort(_(b"failed to execute %s") % command)
1110 raise error.Abort(_(b"failed to execute %s") % command)
1111 elif status < 0:
1111 elif status < 0:
1112 raise error.Abort(_(b"%s killed") % command)
1112 raise error.Abort(_(b"%s killed") % command)
1113 else:
1113 else:
1114 transition = b"bad"
1114 transition = b"bad"
1115 state[transition].append(node)
1115 state[transition].append(node)
1116 ctx = repo[node]
1116 ctx = repo[node]
1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1119 hbisect.checkstate(state)
1119 hbisect.checkstate(state)
1120 # bisect
1120 # bisect
1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1122 # update to next check
1122 # update to next check
1123 node = nodes[0]
1123 node = nodes[0]
1124 mayupdate(repo, node, show_stats=False)
1124 mayupdate(repo, node, show_stats=False)
1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1126 return
1126 return
1127
1127
1128 hbisect.checkstate(state)
1128 hbisect.checkstate(state)
1129
1129
1130 # actually bisect
1130 # actually bisect
1131 nodes, changesets, good = hbisect.bisect(repo, state)
1131 nodes, changesets, good = hbisect.bisect(repo, state)
1132 if extend:
1132 if extend:
1133 if not changesets:
1133 if not changesets:
1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1135 if extendctx is not None:
1135 if extendctx is not None:
1136 ui.write(
1136 ui.write(
1137 _(b"Extending search to changeset %s\n")
1137 _(b"Extending search to changeset %s\n")
1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1139 )
1139 )
1140 state[b'current'] = [extendctx.node()]
1140 state[b'current'] = [extendctx.node()]
1141 hbisect.save_state(repo, state)
1141 hbisect.save_state(repo, state)
1142 return mayupdate(repo, extendctx.node())
1142 return mayupdate(repo, extendctx.node())
1143 raise error.StateError(_(b"nothing to extend"))
1143 raise error.StateError(_(b"nothing to extend"))
1144
1144
1145 if changesets == 0:
1145 if changesets == 0:
1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1147 else:
1147 else:
1148 assert len(nodes) == 1 # only a single node can be tested next
1148 assert len(nodes) == 1 # only a single node can be tested next
1149 node = nodes[0]
1149 node = nodes[0]
1150 # compute the approximate number of remaining tests
1150 # compute the approximate number of remaining tests
1151 tests, size = 0, 2
1151 tests, size = 0, 2
1152 while size <= changesets:
1152 while size <= changesets:
1153 tests, size = tests + 1, size * 2
1153 tests, size = tests + 1, size * 2
1154 rev = repo.changelog.rev(node)
1154 rev = repo.changelog.rev(node)
1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1156 ui.write(
1156 ui.write(
1157 _(
1157 _(
1158 b"Testing changeset %s "
1158 b"Testing changeset %s "
1159 b"(%d changesets remaining, ~%d tests)\n"
1159 b"(%d changesets remaining, ~%d tests)\n"
1160 )
1160 )
1161 % (summary, changesets, tests)
1161 % (summary, changesets, tests)
1162 )
1162 )
1163 state[b'current'] = [node]
1163 state[b'current'] = [node]
1164 hbisect.save_state(repo, state)
1164 hbisect.save_state(repo, state)
1165 return mayupdate(repo, node)
1165 return mayupdate(repo, node)
1166
1166
1167
1167
1168 @command(
1168 @command(
1169 b'bookmarks|bookmark',
1169 b'bookmarks|bookmark',
1170 [
1170 [
1171 (b'f', b'force', False, _(b'force')),
1171 (b'f', b'force', False, _(b'force')),
1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1177 ]
1177 ]
1178 + formatteropts,
1178 + formatteropts,
1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1181 )
1181 )
1182 def bookmark(ui, repo, *names, **opts):
1182 def bookmark(ui, repo, *names, **opts):
1183 """create a new bookmark or list existing bookmarks
1183 """create a new bookmark or list existing bookmarks
1184
1184
1185 Bookmarks are labels on changesets to help track lines of development.
1185 Bookmarks are labels on changesets to help track lines of development.
1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1187 Deleting or moving a bookmark has no effect on the associated changesets.
1187 Deleting or moving a bookmark has no effect on the associated changesets.
1188
1188
1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1190 The active bookmark is indicated with a '*'.
1190 The active bookmark is indicated with a '*'.
1191 When a commit is made, the active bookmark will advance to the new commit.
1191 When a commit is made, the active bookmark will advance to the new commit.
1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1193 Updating away from a bookmark will cause it to be deactivated.
1193 Updating away from a bookmark will cause it to be deactivated.
1194
1194
1195 Bookmarks can be pushed and pulled between repositories (see
1195 Bookmarks can be pushed and pulled between repositories (see
1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1198 be created. Using :hg:`merge` will resolve the divergence.
1198 be created. Using :hg:`merge` will resolve the divergence.
1199
1199
1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1201 the active bookmark's name.
1201 the active bookmark's name.
1202
1202
1203 A bookmark named '@' has the special property that :hg:`clone` will
1203 A bookmark named '@' has the special property that :hg:`clone` will
1204 check it out by default if it exists.
1204 check it out by default if it exists.
1205
1205
1206 .. container:: verbose
1206 .. container:: verbose
1207
1207
1208 Template:
1208 Template:
1209
1209
1210 The following keywords are supported in addition to the common template
1210 The following keywords are supported in addition to the common template
1211 keywords and functions such as ``{bookmark}``. See also
1211 keywords and functions such as ``{bookmark}``. See also
1212 :hg:`help templates`.
1212 :hg:`help templates`.
1213
1213
1214 :active: Boolean. True if the bookmark is active.
1214 :active: Boolean. True if the bookmark is active.
1215
1215
1216 Examples:
1216 Examples:
1217
1217
1218 - create an active bookmark for a new line of development::
1218 - create an active bookmark for a new line of development::
1219
1219
1220 hg book new-feature
1220 hg book new-feature
1221
1221
1222 - create an inactive bookmark as a place marker::
1222 - create an inactive bookmark as a place marker::
1223
1223
1224 hg book -i reviewed
1224 hg book -i reviewed
1225
1225
1226 - create an inactive bookmark on another changeset::
1226 - create an inactive bookmark on another changeset::
1227
1227
1228 hg book -r .^ tested
1228 hg book -r .^ tested
1229
1229
1230 - rename bookmark turkey to dinner::
1230 - rename bookmark turkey to dinner::
1231
1231
1232 hg book -m turkey dinner
1232 hg book -m turkey dinner
1233
1233
1234 - move the '@' bookmark from another branch::
1234 - move the '@' bookmark from another branch::
1235
1235
1236 hg book -f @
1236 hg book -f @
1237
1237
1238 - print only the active bookmark name::
1238 - print only the active bookmark name::
1239
1239
1240 hg book -ql .
1240 hg book -ql .
1241 """
1241 """
1242 opts = pycompat.byteskwargs(opts)
1242 opts = pycompat.byteskwargs(opts)
1243 force = opts.get(b'force')
1243 force = opts.get(b'force')
1244 rev = opts.get(b'rev')
1244 rev = opts.get(b'rev')
1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1246
1246
1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1248 if action:
1248 if action:
1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1250 elif names or rev:
1250 elif names or rev:
1251 action = b'add'
1251 action = b'add'
1252 elif inactive:
1252 elif inactive:
1253 action = b'inactive' # meaning deactivate
1253 action = b'inactive' # meaning deactivate
1254 else:
1254 else:
1255 action = b'list'
1255 action = b'list'
1256
1256
1257 cmdutil.check_incompatible_arguments(
1257 cmdutil.check_incompatible_arguments(
1258 opts, b'inactive', [b'delete', b'list']
1258 opts, b'inactive', [b'delete', b'list']
1259 )
1259 )
1260 if not names and action in {b'add', b'delete'}:
1260 if not names and action in {b'add', b'delete'}:
1261 raise error.InputError(_(b"bookmark name required"))
1261 raise error.InputError(_(b"bookmark name required"))
1262
1262
1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1265 if action == b'delete':
1265 if action == b'delete':
1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 bookmarks.delete(repo, tr, names)
1267 bookmarks.delete(repo, tr, names)
1268 elif action == b'rename':
1268 elif action == b'rename':
1269 if not names:
1269 if not names:
1270 raise error.InputError(_(b"new bookmark name required"))
1270 raise error.InputError(_(b"new bookmark name required"))
1271 elif len(names) > 1:
1271 elif len(names) > 1:
1272 raise error.InputError(
1272 raise error.InputError(
1273 _(b"only one new bookmark name allowed")
1273 _(b"only one new bookmark name allowed")
1274 )
1274 )
1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1277 elif action == b'add':
1277 elif action == b'add':
1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1279 elif action == b'inactive':
1279 elif action == b'inactive':
1280 if len(repo._bookmarks) == 0:
1280 if len(repo._bookmarks) == 0:
1281 ui.status(_(b"no bookmarks set\n"))
1281 ui.status(_(b"no bookmarks set\n"))
1282 elif not repo._activebookmark:
1282 elif not repo._activebookmark:
1283 ui.status(_(b"no active bookmark\n"))
1283 ui.status(_(b"no active bookmark\n"))
1284 else:
1284 else:
1285 bookmarks.deactivate(repo)
1285 bookmarks.deactivate(repo)
1286 elif action == b'list':
1286 elif action == b'list':
1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1288 with ui.formatter(b'bookmarks', opts) as fm:
1288 with ui.formatter(b'bookmarks', opts) as fm:
1289 bookmarks.printbookmarks(ui, repo, fm, names)
1289 bookmarks.printbookmarks(ui, repo, fm, names)
1290 else:
1290 else:
1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1292
1292
1293
1293
1294 @command(
1294 @command(
1295 b'branch',
1295 b'branch',
1296 [
1296 [
1297 (
1297 (
1298 b'f',
1298 b'f',
1299 b'force',
1299 b'force',
1300 None,
1300 None,
1301 _(b'set branch name even if it shadows an existing branch'),
1301 _(b'set branch name even if it shadows an existing branch'),
1302 ),
1302 ),
1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1304 (
1304 (
1305 b'r',
1305 b'r',
1306 b'rev',
1306 b'rev',
1307 [],
1307 [],
1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1309 ),
1309 ),
1310 ],
1310 ],
1311 _(b'[-fC] [NAME]'),
1311 _(b'[-fC] [NAME]'),
1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1313 )
1313 )
1314 def branch(ui, repo, label=None, **opts):
1314 def branch(ui, repo, label=None, **opts):
1315 """set or show the current branch name
1315 """set or show the current branch name
1316
1316
1317 .. note::
1317 .. note::
1318
1318
1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1320 light-weight bookmark instead. See :hg:`help glossary` for more
1320 light-weight bookmark instead. See :hg:`help glossary` for more
1321 information about named branches and bookmarks.
1321 information about named branches and bookmarks.
1322
1322
1323 With no argument, show the current branch name. With one argument,
1323 With no argument, show the current branch name. With one argument,
1324 set the working directory branch name (the branch will not exist
1324 set the working directory branch name (the branch will not exist
1325 in the repository until the next commit). Standard practice
1325 in the repository until the next commit). Standard practice
1326 recommends that primary development take place on the 'default'
1326 recommends that primary development take place on the 'default'
1327 branch.
1327 branch.
1328
1328
1329 Unless -f/--force is specified, branch will not let you set a
1329 Unless -f/--force is specified, branch will not let you set a
1330 branch name that already exists.
1330 branch name that already exists.
1331
1331
1332 Use -C/--clean to reset the working directory branch to that of
1332 Use -C/--clean to reset the working directory branch to that of
1333 the parent of the working directory, negating a previous branch
1333 the parent of the working directory, negating a previous branch
1334 change.
1334 change.
1335
1335
1336 Use the command :hg:`update` to switch to an existing branch. Use
1336 Use the command :hg:`update` to switch to an existing branch. Use
1337 :hg:`commit --close-branch` to mark this branch head as closed.
1337 :hg:`commit --close-branch` to mark this branch head as closed.
1338 When all heads of a branch are closed, the branch will be
1338 When all heads of a branch are closed, the branch will be
1339 considered closed.
1339 considered closed.
1340
1340
1341 Returns 0 on success.
1341 Returns 0 on success.
1342 """
1342 """
1343 opts = pycompat.byteskwargs(opts)
1343 opts = pycompat.byteskwargs(opts)
1344 revs = opts.get(b'rev')
1344 revs = opts.get(b'rev')
1345 if label:
1345 if label:
1346 label = label.strip()
1346 label = label.strip()
1347
1347
1348 if not opts.get(b'clean') and not label:
1348 if not opts.get(b'clean') and not label:
1349 if revs:
1349 if revs:
1350 raise error.InputError(
1350 raise error.InputError(
1351 _(b"no branch name specified for the revisions")
1351 _(b"no branch name specified for the revisions")
1352 )
1352 )
1353 ui.write(b"%s\n" % repo.dirstate.branch())
1353 ui.write(b"%s\n" % repo.dirstate.branch())
1354 return
1354 return
1355
1355
1356 with repo.wlock():
1356 with repo.wlock():
1357 if opts.get(b'clean'):
1357 if opts.get(b'clean'):
1358 label = repo[b'.'].branch()
1358 label = repo[b'.'].branch()
1359 repo.dirstate.setbranch(label)
1359 repo.dirstate.setbranch(label)
1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1361 elif label:
1361 elif label:
1362
1362
1363 scmutil.checknewlabel(repo, label, b'branch')
1363 scmutil.checknewlabel(repo, label, b'branch')
1364 if revs:
1364 if revs:
1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1366
1366
1367 if not opts.get(b'force') and label in repo.branchmap():
1367 if not opts.get(b'force') and label in repo.branchmap():
1368 if label not in [p.branch() for p in repo[None].parents()]:
1368 if label not in [p.branch() for p in repo[None].parents()]:
1369 raise error.InputError(
1369 raise error.InputError(
1370 _(b'a branch of the same name already exists'),
1370 _(b'a branch of the same name already exists'),
1371 # i18n: "it" refers to an existing branch
1371 # i18n: "it" refers to an existing branch
1372 hint=_(b"use 'hg update' to switch to it"),
1372 hint=_(b"use 'hg update' to switch to it"),
1373 )
1373 )
1374
1374
1375 repo.dirstate.setbranch(label)
1375 repo.dirstate.setbranch(label)
1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1377
1377
1378 # find any open named branches aside from default
1378 # find any open named branches aside from default
1379 for n, h, t, c in repo.branchmap().iterbranches():
1379 for n, h, t, c in repo.branchmap().iterbranches():
1380 if n != b"default" and not c:
1380 if n != b"default" and not c:
1381 return 0
1381 return 0
1382 ui.status(
1382 ui.status(
1383 _(
1383 _(
1384 b'(branches are permanent and global, '
1384 b'(branches are permanent and global, '
1385 b'did you want a bookmark?)\n'
1385 b'did you want a bookmark?)\n'
1386 )
1386 )
1387 )
1387 )
1388
1388
1389
1389
1390 @command(
1390 @command(
1391 b'branches',
1391 b'branches',
1392 [
1392 [
1393 (
1393 (
1394 b'a',
1394 b'a',
1395 b'active',
1395 b'active',
1396 False,
1396 False,
1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1398 ),
1398 ),
1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1401 ]
1401 ]
1402 + formatteropts,
1402 + formatteropts,
1403 _(b'[-c]'),
1403 _(b'[-c]'),
1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1405 intents={INTENT_READONLY},
1405 intents={INTENT_READONLY},
1406 )
1406 )
1407 def branches(ui, repo, active=False, closed=False, **opts):
1407 def branches(ui, repo, active=False, closed=False, **opts):
1408 """list repository named branches
1408 """list repository named branches
1409
1409
1410 List the repository's named branches, indicating which ones are
1410 List the repository's named branches, indicating which ones are
1411 inactive. If -c/--closed is specified, also list branches which have
1411 inactive. If -c/--closed is specified, also list branches which have
1412 been marked closed (see :hg:`commit --close-branch`).
1412 been marked closed (see :hg:`commit --close-branch`).
1413
1413
1414 Use the command :hg:`update` to switch to an existing branch.
1414 Use the command :hg:`update` to switch to an existing branch.
1415
1415
1416 .. container:: verbose
1416 .. container:: verbose
1417
1417
1418 Template:
1418 Template:
1419
1419
1420 The following keywords are supported in addition to the common template
1420 The following keywords are supported in addition to the common template
1421 keywords and functions such as ``{branch}``. See also
1421 keywords and functions such as ``{branch}``. See also
1422 :hg:`help templates`.
1422 :hg:`help templates`.
1423
1423
1424 :active: Boolean. True if the branch is active.
1424 :active: Boolean. True if the branch is active.
1425 :closed: Boolean. True if the branch is closed.
1425 :closed: Boolean. True if the branch is closed.
1426 :current: Boolean. True if it is the current branch.
1426 :current: Boolean. True if it is the current branch.
1427
1427
1428 Returns 0.
1428 Returns 0.
1429 """
1429 """
1430
1430
1431 opts = pycompat.byteskwargs(opts)
1431 opts = pycompat.byteskwargs(opts)
1432 revs = opts.get(b'rev')
1432 revs = opts.get(b'rev')
1433 selectedbranches = None
1433 selectedbranches = None
1434 if revs:
1434 if revs:
1435 revs = scmutil.revrange(repo, revs)
1435 revs = scmutil.revrange(repo, revs)
1436 getbi = repo.revbranchcache().branchinfo
1436 getbi = repo.revbranchcache().branchinfo
1437 selectedbranches = {getbi(r)[0] for r in revs}
1437 selectedbranches = {getbi(r)[0] for r in revs}
1438
1438
1439 ui.pager(b'branches')
1439 ui.pager(b'branches')
1440 fm = ui.formatter(b'branches', opts)
1440 fm = ui.formatter(b'branches', opts)
1441 hexfunc = fm.hexfunc
1441 hexfunc = fm.hexfunc
1442
1442
1443 allheads = set(repo.heads())
1443 allheads = set(repo.heads())
1444 branches = []
1444 branches = []
1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1446 if selectedbranches is not None and tag not in selectedbranches:
1446 if selectedbranches is not None and tag not in selectedbranches:
1447 continue
1447 continue
1448 isactive = False
1448 isactive = False
1449 if not isclosed:
1449 if not isclosed:
1450 openheads = set(repo.branchmap().iteropen(heads))
1450 openheads = set(repo.branchmap().iteropen(heads))
1451 isactive = bool(openheads & allheads)
1451 isactive = bool(openheads & allheads)
1452 branches.append((tag, repo[tip], isactive, not isclosed))
1452 branches.append((tag, repo[tip], isactive, not isclosed))
1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1454
1454
1455 for tag, ctx, isactive, isopen in branches:
1455 for tag, ctx, isactive, isopen in branches:
1456 if active and not isactive:
1456 if active and not isactive:
1457 continue
1457 continue
1458 if isactive:
1458 if isactive:
1459 label = b'branches.active'
1459 label = b'branches.active'
1460 notice = b''
1460 notice = b''
1461 elif not isopen:
1461 elif not isopen:
1462 if not closed:
1462 if not closed:
1463 continue
1463 continue
1464 label = b'branches.closed'
1464 label = b'branches.closed'
1465 notice = _(b' (closed)')
1465 notice = _(b' (closed)')
1466 else:
1466 else:
1467 label = b'branches.inactive'
1467 label = b'branches.inactive'
1468 notice = _(b' (inactive)')
1468 notice = _(b' (inactive)')
1469 current = tag == repo.dirstate.branch()
1469 current = tag == repo.dirstate.branch()
1470 if current:
1470 if current:
1471 label = b'branches.current'
1471 label = b'branches.current'
1472
1472
1473 fm.startitem()
1473 fm.startitem()
1474 fm.write(b'branch', b'%s', tag, label=label)
1474 fm.write(b'branch', b'%s', tag, label=label)
1475 rev = ctx.rev()
1475 rev = ctx.rev()
1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1477 fmt = b' ' * padsize + b' %d:%s'
1477 fmt = b' ' * padsize + b' %d:%s'
1478 fm.condwrite(
1478 fm.condwrite(
1479 not ui.quiet,
1479 not ui.quiet,
1480 b'rev node',
1480 b'rev node',
1481 fmt,
1481 fmt,
1482 rev,
1482 rev,
1483 hexfunc(ctx.node()),
1483 hexfunc(ctx.node()),
1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1485 )
1485 )
1486 fm.context(ctx=ctx)
1486 fm.context(ctx=ctx)
1487 fm.data(active=isactive, closed=not isopen, current=current)
1487 fm.data(active=isactive, closed=not isopen, current=current)
1488 if not ui.quiet:
1488 if not ui.quiet:
1489 fm.plain(notice)
1489 fm.plain(notice)
1490 fm.plain(b'\n')
1490 fm.plain(b'\n')
1491 fm.end()
1491 fm.end()
1492
1492
1493
1493
1494 @command(
1494 @command(
1495 b'bundle',
1495 b'bundle',
1496 [
1496 [
1497 (
1497 (
1498 b'f',
1498 b'f',
1499 b'force',
1499 b'force',
1500 None,
1500 None,
1501 _(b'run even when the destination is unrelated'),
1501 _(b'run even when the destination is unrelated'),
1502 ),
1502 ),
1503 (
1503 (
1504 b'r',
1504 b'r',
1505 b'rev',
1505 b'rev',
1506 [],
1506 [],
1507 _(b'a changeset intended to be added to the destination'),
1507 _(b'a changeset intended to be added to the destination'),
1508 _(b'REV'),
1508 _(b'REV'),
1509 ),
1509 ),
1510 (
1510 (
1511 b'b',
1511 b'b',
1512 b'branch',
1512 b'branch',
1513 [],
1513 [],
1514 _(b'a specific branch you would like to bundle'),
1514 _(b'a specific branch you would like to bundle'),
1515 _(b'BRANCH'),
1515 _(b'BRANCH'),
1516 ),
1516 ),
1517 (
1517 (
1518 b'',
1518 b'',
1519 b'base',
1519 b'base',
1520 [],
1520 [],
1521 _(b'a base changeset assumed to be available at the destination'),
1521 _(b'a base changeset assumed to be available at the destination'),
1522 _(b'REV'),
1522 _(b'REV'),
1523 ),
1523 ),
1524 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1524 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1525 (
1525 (
1526 b't',
1526 b't',
1527 b'type',
1527 b'type',
1528 b'bzip2',
1528 b'bzip2',
1529 _(b'bundle compression type to use'),
1529 _(b'bundle compression type to use'),
1530 _(b'TYPE'),
1530 _(b'TYPE'),
1531 ),
1531 ),
1532 ]
1532 ]
1533 + remoteopts,
1533 + remoteopts,
1534 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1534 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1535 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1535 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1536 )
1536 )
1537 def bundle(ui, repo, fname, *dests, **opts):
1537 def bundle(ui, repo, fname, *dests, **opts):
1538 """create a bundle file
1538 """create a bundle file
1539
1539
1540 Generate a bundle file containing data to be transferred to another
1540 Generate a bundle file containing data to be transferred to another
1541 repository.
1541 repository.
1542
1542
1543 To create a bundle containing all changesets, use -a/--all
1543 To create a bundle containing all changesets, use -a/--all
1544 (or --base null). Otherwise, hg assumes the destination will have
1544 (or --base null). Otherwise, hg assumes the destination will have
1545 all the nodes you specify with --base parameters. Otherwise, hg
1545 all the nodes you specify with --base parameters. Otherwise, hg
1546 will assume the repository has all the nodes in destination, or
1546 will assume the repository has all the nodes in destination, or
1547 default-push/default if no destination is specified, where destination
1547 default-push/default if no destination is specified, where destination
1548 is the repositories you provide through DEST option.
1548 is the repositories you provide through DEST option.
1549
1549
1550 You can change bundle format with the -t/--type option. See
1550 You can change bundle format with the -t/--type option. See
1551 :hg:`help bundlespec` for documentation on this format. By default,
1551 :hg:`help bundlespec` for documentation on this format. By default,
1552 the most appropriate format is used and compression defaults to
1552 the most appropriate format is used and compression defaults to
1553 bzip2.
1553 bzip2.
1554
1554
1555 The bundle file can then be transferred using conventional means
1555 The bundle file can then be transferred using conventional means
1556 and applied to another repository with the unbundle or pull
1556 and applied to another repository with the unbundle or pull
1557 command. This is useful when direct push and pull are not
1557 command. This is useful when direct push and pull are not
1558 available or when exporting an entire repository is undesirable.
1558 available or when exporting an entire repository is undesirable.
1559
1559
1560 Applying bundles preserves all changeset contents including
1560 Applying bundles preserves all changeset contents including
1561 permissions, copy/rename information, and revision history.
1561 permissions, copy/rename information, and revision history.
1562
1562
1563 Returns 0 on success, 1 if no changes found.
1563 Returns 0 on success, 1 if no changes found.
1564 """
1564 """
1565 opts = pycompat.byteskwargs(opts)
1565 opts = pycompat.byteskwargs(opts)
1566 revs = None
1566 revs = None
1567 if b'rev' in opts:
1567 if b'rev' in opts:
1568 revstrings = opts[b'rev']
1568 revstrings = opts[b'rev']
1569 revs = scmutil.revrange(repo, revstrings)
1569 revs = scmutil.revrange(repo, revstrings)
1570 if revstrings and not revs:
1570 if revstrings and not revs:
1571 raise error.InputError(_(b'no commits to bundle'))
1571 raise error.InputError(_(b'no commits to bundle'))
1572
1572
1573 bundletype = opts.get(b'type', b'bzip2').lower()
1573 bundletype = opts.get(b'type', b'bzip2').lower()
1574 try:
1574 try:
1575 bundlespec = bundlecaches.parsebundlespec(
1575 bundlespec = bundlecaches.parsebundlespec(
1576 repo, bundletype, strict=False
1576 repo, bundletype, strict=False
1577 )
1577 )
1578 except error.UnsupportedBundleSpecification as e:
1578 except error.UnsupportedBundleSpecification as e:
1579 raise error.InputError(
1579 raise error.InputError(
1580 pycompat.bytestr(e),
1580 pycompat.bytestr(e),
1581 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1581 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1582 )
1582 )
1583 cgversion = bundlespec.contentopts[b"cg.version"]
1583 cgversion = bundlespec.contentopts[b"cg.version"]
1584
1584
1585 # Packed bundles are a pseudo bundle format for now.
1585 # Packed bundles are a pseudo bundle format for now.
1586 if cgversion == b's1':
1586 if cgversion == b's1':
1587 raise error.InputError(
1587 raise error.InputError(
1588 _(b'packed bundles cannot be produced by "hg bundle"'),
1588 _(b'packed bundles cannot be produced by "hg bundle"'),
1589 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1589 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1590 )
1590 )
1591
1591
1592 if opts.get(b'all'):
1592 if opts.get(b'all'):
1593 if dests:
1593 if dests:
1594 raise error.InputError(
1594 raise error.InputError(
1595 _(b"--all is incompatible with specifying destinations")
1595 _(b"--all is incompatible with specifying destinations")
1596 )
1596 )
1597 if opts.get(b'base'):
1597 if opts.get(b'base'):
1598 ui.warn(_(b"ignoring --base because --all was specified\n"))
1598 ui.warn(_(b"ignoring --base because --all was specified\n"))
1599 base = [nullrev]
1599 base = [nullrev]
1600 else:
1600 else:
1601 base = scmutil.revrange(repo, opts.get(b'base'))
1601 base = scmutil.revrange(repo, opts.get(b'base'))
1602 if cgversion not in changegroup.supportedoutgoingversions(repo):
1602 if cgversion not in changegroup.supportedoutgoingversions(repo):
1603 raise error.Abort(
1603 raise error.Abort(
1604 _(b"repository does not support bundle version %s") % cgversion
1604 _(b"repository does not support bundle version %s") % cgversion
1605 )
1605 )
1606
1606
1607 if base:
1607 if base:
1608 if dests:
1608 if dests:
1609 raise error.InputError(
1609 raise error.InputError(
1610 _(b"--base is incompatible with specifying destinations")
1610 _(b"--base is incompatible with specifying destinations")
1611 )
1611 )
1612 common = [repo[rev].node() for rev in base]
1612 common = [repo[rev].node() for rev in base]
1613 heads = [repo[r].node() for r in revs] if revs else None
1613 heads = [repo[r].node() for r in revs] if revs else None
1614 outgoing = discovery.outgoing(repo, common, heads)
1614 outgoing = discovery.outgoing(repo, common, heads)
1615 missing = outgoing.missing
1615 missing = outgoing.missing
1616 excluded = outgoing.excluded
1616 excluded = outgoing.excluded
1617 else:
1617 else:
1618 missing = set()
1618 missing = set()
1619 excluded = set()
1619 excluded = set()
1620 for path in urlutil.get_push_paths(repo, ui, dests):
1620 for path in urlutil.get_push_paths(repo, ui, dests):
1621 other = hg.peer(repo, opts, path.rawloc)
1621 other = hg.peer(repo, opts, path.rawloc)
1622 if revs is not None:
1622 if revs is not None:
1623 hex_revs = [repo[r].hex() for r in revs]
1623 hex_revs = [repo[r].hex() for r in revs]
1624 else:
1624 else:
1625 hex_revs = None
1625 hex_revs = None
1626 branches = (path.branch, [])
1626 branches = (path.branch, [])
1627 head_revs, checkout = hg.addbranchrevs(
1627 head_revs, checkout = hg.addbranchrevs(
1628 repo, repo, branches, hex_revs
1628 repo, repo, branches, hex_revs
1629 )
1629 )
1630 heads = (
1630 heads = (
1631 head_revs
1631 head_revs
1632 and pycompat.maplist(repo.lookup, head_revs)
1632 and pycompat.maplist(repo.lookup, head_revs)
1633 or head_revs
1633 or head_revs
1634 )
1634 )
1635 outgoing = discovery.findcommonoutgoing(
1635 outgoing = discovery.findcommonoutgoing(
1636 repo,
1636 repo,
1637 other,
1637 other,
1638 onlyheads=heads,
1638 onlyheads=heads,
1639 force=opts.get(b'force'),
1639 force=opts.get(b'force'),
1640 portable=True,
1640 portable=True,
1641 )
1641 )
1642 missing.update(outgoing.missing)
1642 missing.update(outgoing.missing)
1643 excluded.update(outgoing.excluded)
1643 excluded.update(outgoing.excluded)
1644
1644
1645 if not missing:
1645 if not missing:
1646 scmutil.nochangesfound(ui, repo, not base and excluded)
1646 scmutil.nochangesfound(ui, repo, not base and excluded)
1647 return 1
1647 return 1
1648
1648
1649 if heads:
1649 if heads:
1650 outgoing = discovery.outgoing(
1650 outgoing = discovery.outgoing(
1651 repo, missingroots=missing, ancestorsof=heads
1651 repo, missingroots=missing, ancestorsof=heads
1652 )
1652 )
1653 else:
1653 else:
1654 outgoing = discovery.outgoing(repo, missingroots=missing)
1654 outgoing = discovery.outgoing(repo, missingroots=missing)
1655 outgoing.excluded = sorted(excluded)
1655 outgoing.excluded = sorted(excluded)
1656
1656
1657 if cgversion == b'01': # bundle1
1657 if cgversion == b'01': # bundle1
1658 bversion = b'HG10' + bundlespec.wirecompression
1658 bversion = b'HG10' + bundlespec.wirecompression
1659 bcompression = None
1659 bcompression = None
1660 elif cgversion in (b'02', b'03'):
1660 elif cgversion in (b'02', b'03'):
1661 bversion = b'HG20'
1661 bversion = b'HG20'
1662 bcompression = bundlespec.wirecompression
1662 bcompression = bundlespec.wirecompression
1663 else:
1663 else:
1664 raise error.ProgrammingError(
1664 raise error.ProgrammingError(
1665 b'bundle: unexpected changegroup version %s' % cgversion
1665 b'bundle: unexpected changegroup version %s' % cgversion
1666 )
1666 )
1667
1667
1668 # TODO compression options should be derived from bundlespec parsing.
1668 # TODO compression options should be derived from bundlespec parsing.
1669 # This is a temporary hack to allow adjusting bundle compression
1669 # This is a temporary hack to allow adjusting bundle compression
1670 # level without a) formalizing the bundlespec changes to declare it
1670 # level without a) formalizing the bundlespec changes to declare it
1671 # b) introducing a command flag.
1671 # b) introducing a command flag.
1672 compopts = {}
1672 compopts = {}
1673 complevel = ui.configint(
1673 complevel = ui.configint(
1674 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1674 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1675 )
1675 )
1676 if complevel is None:
1676 if complevel is None:
1677 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1677 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1678 if complevel is not None:
1678 if complevel is not None:
1679 compopts[b'level'] = complevel
1679 compopts[b'level'] = complevel
1680
1680
1681 compthreads = ui.configint(
1681 compthreads = ui.configint(
1682 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1682 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1683 )
1683 )
1684 if compthreads is None:
1684 if compthreads is None:
1685 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1685 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1686 if compthreads is not None:
1686 if compthreads is not None:
1687 compopts[b'threads'] = compthreads
1687 compopts[b'threads'] = compthreads
1688
1688
1689 # Bundling of obsmarker and phases is optional as not all clients
1689 # Bundling of obsmarker and phases is optional as not all clients
1690 # support the necessary features.
1690 # support the necessary features.
1691 cfg = ui.configbool
1691 cfg = ui.configbool
1692 contentopts = {
1692 contentopts = {
1693 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1693 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1694 b'obsolescence-mandatory': cfg(
1694 b'obsolescence-mandatory': cfg(
1695 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1695 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1696 ),
1696 ),
1697 b'phases': cfg(b'experimental', b'bundle-phases'),
1697 b'phases': cfg(b'experimental', b'bundle-phases'),
1698 }
1698 }
1699 bundlespec.contentopts.update(contentopts)
1699 bundlespec.contentopts.update(contentopts)
1700
1700
1701 bundle2.writenewbundle(
1701 bundle2.writenewbundle(
1702 ui,
1702 ui,
1703 repo,
1703 repo,
1704 b'bundle',
1704 b'bundle',
1705 fname,
1705 fname,
1706 bversion,
1706 bversion,
1707 outgoing,
1707 outgoing,
1708 bundlespec.contentopts,
1708 bundlespec.contentopts,
1709 compression=bcompression,
1709 compression=bcompression,
1710 compopts=compopts,
1710 compopts=compopts,
1711 )
1711 )
1712
1712
1713
1713
1714 @command(
1714 @command(
1715 b'cat',
1715 b'cat',
1716 [
1716 [
1717 (
1717 (
1718 b'o',
1718 b'o',
1719 b'output',
1719 b'output',
1720 b'',
1720 b'',
1721 _(b'print output to file with formatted name'),
1721 _(b'print output to file with formatted name'),
1722 _(b'FORMAT'),
1722 _(b'FORMAT'),
1723 ),
1723 ),
1724 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1724 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1725 (b'', b'decode', None, _(b'apply any matching decode filter')),
1725 (b'', b'decode', None, _(b'apply any matching decode filter')),
1726 ]
1726 ]
1727 + walkopts
1727 + walkopts
1728 + formatteropts,
1728 + formatteropts,
1729 _(b'[OPTION]... FILE...'),
1729 _(b'[OPTION]... FILE...'),
1730 helpcategory=command.CATEGORY_FILE_CONTENTS,
1730 helpcategory=command.CATEGORY_FILE_CONTENTS,
1731 inferrepo=True,
1731 inferrepo=True,
1732 intents={INTENT_READONLY},
1732 intents={INTENT_READONLY},
1733 )
1733 )
1734 def cat(ui, repo, file1, *pats, **opts):
1734 def cat(ui, repo, file1, *pats, **opts):
1735 """output the current or given revision of files
1735 """output the current or given revision of files
1736
1736
1737 Print the specified files as they were at the given revision. If
1737 Print the specified files as they were at the given revision. If
1738 no revision is given, the parent of the working directory is used.
1738 no revision is given, the parent of the working directory is used.
1739
1739
1740 Output may be to a file, in which case the name of the file is
1740 Output may be to a file, in which case the name of the file is
1741 given using a template string. See :hg:`help templates`. In addition
1741 given using a template string. See :hg:`help templates`. In addition
1742 to the common template keywords, the following formatting rules are
1742 to the common template keywords, the following formatting rules are
1743 supported:
1743 supported:
1744
1744
1745 :``%%``: literal "%" character
1745 :``%%``: literal "%" character
1746 :``%s``: basename of file being printed
1746 :``%s``: basename of file being printed
1747 :``%d``: dirname of file being printed, or '.' if in repository root
1747 :``%d``: dirname of file being printed, or '.' if in repository root
1748 :``%p``: root-relative path name of file being printed
1748 :``%p``: root-relative path name of file being printed
1749 :``%H``: changeset hash (40 hexadecimal digits)
1749 :``%H``: changeset hash (40 hexadecimal digits)
1750 :``%R``: changeset revision number
1750 :``%R``: changeset revision number
1751 :``%h``: short-form changeset hash (12 hexadecimal digits)
1751 :``%h``: short-form changeset hash (12 hexadecimal digits)
1752 :``%r``: zero-padded changeset revision number
1752 :``%r``: zero-padded changeset revision number
1753 :``%b``: basename of the exporting repository
1753 :``%b``: basename of the exporting repository
1754 :``\\``: literal "\\" character
1754 :``\\``: literal "\\" character
1755
1755
1756 .. container:: verbose
1756 .. container:: verbose
1757
1757
1758 Template:
1758 Template:
1759
1759
1760 The following keywords are supported in addition to the common template
1760 The following keywords are supported in addition to the common template
1761 keywords and functions. See also :hg:`help templates`.
1761 keywords and functions. See also :hg:`help templates`.
1762
1762
1763 :data: String. File content.
1763 :data: String. File content.
1764 :path: String. Repository-absolute path of the file.
1764 :path: String. Repository-absolute path of the file.
1765
1765
1766 Returns 0 on success.
1766 Returns 0 on success.
1767 """
1767 """
1768 opts = pycompat.byteskwargs(opts)
1768 opts = pycompat.byteskwargs(opts)
1769 rev = opts.get(b'rev')
1769 rev = opts.get(b'rev')
1770 if rev:
1770 if rev:
1771 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1771 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1772 ctx = scmutil.revsingle(repo, rev)
1772 ctx = scmutil.revsingle(repo, rev)
1773 m = scmutil.match(ctx, (file1,) + pats, opts)
1773 m = scmutil.match(ctx, (file1,) + pats, opts)
1774 fntemplate = opts.pop(b'output', b'')
1774 fntemplate = opts.pop(b'output', b'')
1775 if cmdutil.isstdiofilename(fntemplate):
1775 if cmdutil.isstdiofilename(fntemplate):
1776 fntemplate = b''
1776 fntemplate = b''
1777
1777
1778 if fntemplate:
1778 if fntemplate:
1779 fm = formatter.nullformatter(ui, b'cat', opts)
1779 fm = formatter.nullformatter(ui, b'cat', opts)
1780 else:
1780 else:
1781 ui.pager(b'cat')
1781 ui.pager(b'cat')
1782 fm = ui.formatter(b'cat', opts)
1782 fm = ui.formatter(b'cat', opts)
1783 with fm:
1783 with fm:
1784 return cmdutil.cat(
1784 return cmdutil.cat(
1785 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1785 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1786 )
1786 )
1787
1787
1788
1788
1789 @command(
1789 @command(
1790 b'clone',
1790 b'clone',
1791 [
1791 [
1792 (
1792 (
1793 b'U',
1793 b'U',
1794 b'noupdate',
1794 b'noupdate',
1795 None,
1795 None,
1796 _(
1796 _(
1797 b'the clone will include an empty working '
1797 b'the clone will include an empty working '
1798 b'directory (only a repository)'
1798 b'directory (only a repository)'
1799 ),
1799 ),
1800 ),
1800 ),
1801 (
1801 (
1802 b'u',
1802 b'u',
1803 b'updaterev',
1803 b'updaterev',
1804 b'',
1804 b'',
1805 _(b'revision, tag, or branch to check out'),
1805 _(b'revision, tag, or branch to check out'),
1806 _(b'REV'),
1806 _(b'REV'),
1807 ),
1807 ),
1808 (
1808 (
1809 b'r',
1809 b'r',
1810 b'rev',
1810 b'rev',
1811 [],
1811 [],
1812 _(
1812 _(
1813 b'do not clone everything, but include this changeset'
1813 b'do not clone everything, but include this changeset'
1814 b' and its ancestors'
1814 b' and its ancestors'
1815 ),
1815 ),
1816 _(b'REV'),
1816 _(b'REV'),
1817 ),
1817 ),
1818 (
1818 (
1819 b'b',
1819 b'b',
1820 b'branch',
1820 b'branch',
1821 [],
1821 [],
1822 _(
1822 _(
1823 b'do not clone everything, but include this branch\'s'
1823 b'do not clone everything, but include this branch\'s'
1824 b' changesets and their ancestors'
1824 b' changesets and their ancestors'
1825 ),
1825 ),
1826 _(b'BRANCH'),
1826 _(b'BRANCH'),
1827 ),
1827 ),
1828 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1828 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1829 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1829 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1830 (b'', b'stream', None, _(b'clone with minimal data processing')),
1830 (b'', b'stream', None, _(b'clone with minimal data processing')),
1831 ]
1831 ]
1832 + remoteopts,
1832 + remoteopts,
1833 _(b'[OPTION]... SOURCE [DEST]'),
1833 _(b'[OPTION]... SOURCE [DEST]'),
1834 helpcategory=command.CATEGORY_REPO_CREATION,
1834 helpcategory=command.CATEGORY_REPO_CREATION,
1835 helpbasic=True,
1835 helpbasic=True,
1836 norepo=True,
1836 norepo=True,
1837 )
1837 )
1838 def clone(ui, source, dest=None, **opts):
1838 def clone(ui, source, dest=None, **opts):
1839 """make a copy of an existing repository
1839 """make a copy of an existing repository
1840
1840
1841 Create a copy of an existing repository in a new directory.
1841 Create a copy of an existing repository in a new directory.
1842
1842
1843 If no destination directory name is specified, it defaults to the
1843 If no destination directory name is specified, it defaults to the
1844 basename of the source.
1844 basename of the source.
1845
1845
1846 The location of the source is added to the new repository's
1846 The location of the source is added to the new repository's
1847 ``.hg/hgrc`` file, as the default to be used for future pulls.
1847 ``.hg/hgrc`` file, as the default to be used for future pulls.
1848
1848
1849 Only local paths and ``ssh://`` URLs are supported as
1849 Only local paths and ``ssh://`` URLs are supported as
1850 destinations. For ``ssh://`` destinations, no working directory or
1850 destinations. For ``ssh://`` destinations, no working directory or
1851 ``.hg/hgrc`` will be created on the remote side.
1851 ``.hg/hgrc`` will be created on the remote side.
1852
1852
1853 If the source repository has a bookmark called '@' set, that
1853 If the source repository has a bookmark called '@' set, that
1854 revision will be checked out in the new repository by default.
1854 revision will be checked out in the new repository by default.
1855
1855
1856 To check out a particular version, use -u/--update, or
1856 To check out a particular version, use -u/--update, or
1857 -U/--noupdate to create a clone with no working directory.
1857 -U/--noupdate to create a clone with no working directory.
1858
1858
1859 To pull only a subset of changesets, specify one or more revisions
1859 To pull only a subset of changesets, specify one or more revisions
1860 identifiers with -r/--rev or branches with -b/--branch. The
1860 identifiers with -r/--rev or branches with -b/--branch. The
1861 resulting clone will contain only the specified changesets and
1861 resulting clone will contain only the specified changesets and
1862 their ancestors. These options (or 'clone src#rev dest') imply
1862 their ancestors. These options (or 'clone src#rev dest') imply
1863 --pull, even for local source repositories.
1863 --pull, even for local source repositories.
1864
1864
1865 In normal clone mode, the remote normalizes repository data into a common
1865 In normal clone mode, the remote normalizes repository data into a common
1866 exchange format and the receiving end translates this data into its local
1866 exchange format and the receiving end translates this data into its local
1867 storage format. --stream activates a different clone mode that essentially
1867 storage format. --stream activates a different clone mode that essentially
1868 copies repository files from the remote with minimal data processing. This
1868 copies repository files from the remote with minimal data processing. This
1869 significantly reduces the CPU cost of a clone both remotely and locally.
1869 significantly reduces the CPU cost of a clone both remotely and locally.
1870 However, it often increases the transferred data size by 30-40%. This can
1870 However, it often increases the transferred data size by 30-40%. This can
1871 result in substantially faster clones where I/O throughput is plentiful,
1871 result in substantially faster clones where I/O throughput is plentiful,
1872 especially for larger repositories. A side-effect of --stream clones is
1872 especially for larger repositories. A side-effect of --stream clones is
1873 that storage settings and requirements on the remote are applied locally:
1873 that storage settings and requirements on the remote are applied locally:
1874 a modern client may inherit legacy or inefficient storage used by the
1874 a modern client may inherit legacy or inefficient storage used by the
1875 remote or a legacy Mercurial client may not be able to clone from a
1875 remote or a legacy Mercurial client may not be able to clone from a
1876 modern Mercurial remote.
1876 modern Mercurial remote.
1877
1877
1878 .. note::
1878 .. note::
1879
1879
1880 Specifying a tag will include the tagged changeset but not the
1880 Specifying a tag will include the tagged changeset but not the
1881 changeset containing the tag.
1881 changeset containing the tag.
1882
1882
1883 .. container:: verbose
1883 .. container:: verbose
1884
1884
1885 For efficiency, hardlinks are used for cloning whenever the
1885 For efficiency, hardlinks are used for cloning whenever the
1886 source and destination are on the same filesystem (note this
1886 source and destination are on the same filesystem (note this
1887 applies only to the repository data, not to the working
1887 applies only to the repository data, not to the working
1888 directory). Some filesystems, such as AFS, implement hardlinking
1888 directory). Some filesystems, such as AFS, implement hardlinking
1889 incorrectly, but do not report errors. In these cases, use the
1889 incorrectly, but do not report errors. In these cases, use the
1890 --pull option to avoid hardlinking.
1890 --pull option to avoid hardlinking.
1891
1891
1892 Mercurial will update the working directory to the first applicable
1892 Mercurial will update the working directory to the first applicable
1893 revision from this list:
1893 revision from this list:
1894
1894
1895 a) null if -U or the source repository has no changesets
1895 a) null if -U or the source repository has no changesets
1896 b) if -u . and the source repository is local, the first parent of
1896 b) if -u . and the source repository is local, the first parent of
1897 the source repository's working directory
1897 the source repository's working directory
1898 c) the changeset specified with -u (if a branch name, this means the
1898 c) the changeset specified with -u (if a branch name, this means the
1899 latest head of that branch)
1899 latest head of that branch)
1900 d) the changeset specified with -r
1900 d) the changeset specified with -r
1901 e) the tipmost head specified with -b
1901 e) the tipmost head specified with -b
1902 f) the tipmost head specified with the url#branch source syntax
1902 f) the tipmost head specified with the url#branch source syntax
1903 g) the revision marked with the '@' bookmark, if present
1903 g) the revision marked with the '@' bookmark, if present
1904 h) the tipmost head of the default branch
1904 h) the tipmost head of the default branch
1905 i) tip
1905 i) tip
1906
1906
1907 When cloning from servers that support it, Mercurial may fetch
1907 When cloning from servers that support it, Mercurial may fetch
1908 pre-generated data from a server-advertised URL or inline from the
1908 pre-generated data from a server-advertised URL or inline from the
1909 same stream. When this is done, hooks operating on incoming changesets
1909 same stream. When this is done, hooks operating on incoming changesets
1910 and changegroups may fire more than once, once for each pre-generated
1910 and changegroups may fire more than once, once for each pre-generated
1911 bundle and as well as for any additional remaining data. In addition,
1911 bundle and as well as for any additional remaining data. In addition,
1912 if an error occurs, the repository may be rolled back to a partial
1912 if an error occurs, the repository may be rolled back to a partial
1913 clone. This behavior may change in future releases.
1913 clone. This behavior may change in future releases.
1914 See :hg:`help -e clonebundles` for more.
1914 See :hg:`help -e clonebundles` for more.
1915
1915
1916 Examples:
1916 Examples:
1917
1917
1918 - clone a remote repository to a new directory named hg/::
1918 - clone a remote repository to a new directory named hg/::
1919
1919
1920 hg clone https://www.mercurial-scm.org/repo/hg/
1920 hg clone https://www.mercurial-scm.org/repo/hg/
1921
1921
1922 - create a lightweight local clone::
1922 - create a lightweight local clone::
1923
1923
1924 hg clone project/ project-feature/
1924 hg clone project/ project-feature/
1925
1925
1926 - clone from an absolute path on an ssh server (note double-slash)::
1926 - clone from an absolute path on an ssh server (note double-slash)::
1927
1927
1928 hg clone ssh://user@server//home/projects/alpha/
1928 hg clone ssh://user@server//home/projects/alpha/
1929
1929
1930 - do a streaming clone while checking out a specified version::
1930 - do a streaming clone while checking out a specified version::
1931
1931
1932 hg clone --stream http://server/repo -u 1.5
1932 hg clone --stream http://server/repo -u 1.5
1933
1933
1934 - create a repository without changesets after a particular revision::
1934 - create a repository without changesets after a particular revision::
1935
1935
1936 hg clone -r 04e544 experimental/ good/
1936 hg clone -r 04e544 experimental/ good/
1937
1937
1938 - clone (and track) a particular named branch::
1938 - clone (and track) a particular named branch::
1939
1939
1940 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1940 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1941
1941
1942 See :hg:`help urls` for details on specifying URLs.
1942 See :hg:`help urls` for details on specifying URLs.
1943
1943
1944 Returns 0 on success.
1944 Returns 0 on success.
1945 """
1945 """
1946 opts = pycompat.byteskwargs(opts)
1946 opts = pycompat.byteskwargs(opts)
1947 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1947 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1948
1948
1949 # --include/--exclude can come from narrow or sparse.
1949 # --include/--exclude can come from narrow or sparse.
1950 includepats, excludepats = None, None
1950 includepats, excludepats = None, None
1951
1951
1952 # hg.clone() differentiates between None and an empty set. So make sure
1952 # hg.clone() differentiates between None and an empty set. So make sure
1953 # patterns are sets if narrow is requested without patterns.
1953 # patterns are sets if narrow is requested without patterns.
1954 if opts.get(b'narrow'):
1954 if opts.get(b'narrow'):
1955 includepats = set()
1955 includepats = set()
1956 excludepats = set()
1956 excludepats = set()
1957
1957
1958 if opts.get(b'include'):
1958 if opts.get(b'include'):
1959 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1959 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1960 if opts.get(b'exclude'):
1960 if opts.get(b'exclude'):
1961 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1961 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1962
1962
1963 r = hg.clone(
1963 r = hg.clone(
1964 ui,
1964 ui,
1965 opts,
1965 opts,
1966 source,
1966 source,
1967 dest,
1967 dest,
1968 pull=opts.get(b'pull'),
1968 pull=opts.get(b'pull'),
1969 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1969 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1970 revs=opts.get(b'rev'),
1970 revs=opts.get(b'rev'),
1971 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1971 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1972 branch=opts.get(b'branch'),
1972 branch=opts.get(b'branch'),
1973 shareopts=opts.get(b'shareopts'),
1973 shareopts=opts.get(b'shareopts'),
1974 storeincludepats=includepats,
1974 storeincludepats=includepats,
1975 storeexcludepats=excludepats,
1975 storeexcludepats=excludepats,
1976 depth=opts.get(b'depth') or None,
1976 depth=opts.get(b'depth') or None,
1977 )
1977 )
1978
1978
1979 return r is None
1979 return r is None
1980
1980
1981
1981
1982 @command(
1982 @command(
1983 b'commit|ci',
1983 b'commit|ci',
1984 [
1984 [
1985 (
1985 (
1986 b'A',
1986 b'A',
1987 b'addremove',
1987 b'addremove',
1988 None,
1988 None,
1989 _(b'mark new/missing files as added/removed before committing'),
1989 _(b'mark new/missing files as added/removed before committing'),
1990 ),
1990 ),
1991 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1991 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1992 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1992 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1993 (b's', b'secret', None, _(b'use the secret phase for committing')),
1993 (b's', b'secret', None, _(b'use the secret phase for committing')),
1994 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1994 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1995 (
1995 (
1996 b'',
1996 b'',
1997 b'force-close-branch',
1997 b'force-close-branch',
1998 None,
1998 None,
1999 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1999 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
2000 ),
2000 ),
2001 (b'i', b'interactive', None, _(b'use interactive mode')),
2001 (b'i', b'interactive', None, _(b'use interactive mode')),
2002 ]
2002 ]
2003 + walkopts
2003 + walkopts
2004 + commitopts
2004 + commitopts
2005 + commitopts2
2005 + commitopts2
2006 + subrepoopts,
2006 + subrepoopts,
2007 _(b'[OPTION]... [FILE]...'),
2007 _(b'[OPTION]... [FILE]...'),
2008 helpcategory=command.CATEGORY_COMMITTING,
2008 helpcategory=command.CATEGORY_COMMITTING,
2009 helpbasic=True,
2009 helpbasic=True,
2010 inferrepo=True,
2010 inferrepo=True,
2011 )
2011 )
2012 def commit(ui, repo, *pats, **opts):
2012 def commit(ui, repo, *pats, **opts):
2013 """commit the specified files or all outstanding changes
2013 """commit the specified files or all outstanding changes
2014
2014
2015 Commit changes to the given files into the repository. Unlike a
2015 Commit changes to the given files into the repository. Unlike a
2016 centralized SCM, this operation is a local operation. See
2016 centralized SCM, this operation is a local operation. See
2017 :hg:`push` for a way to actively distribute your changes.
2017 :hg:`push` for a way to actively distribute your changes.
2018
2018
2019 If a list of files is omitted, all changes reported by :hg:`status`
2019 If a list of files is omitted, all changes reported by :hg:`status`
2020 will be committed.
2020 will be committed.
2021
2021
2022 If you are committing the result of a merge, do not provide any
2022 If you are committing the result of a merge, do not provide any
2023 filenames or -I/-X filters.
2023 filenames or -I/-X filters.
2024
2024
2025 If no commit message is specified, Mercurial starts your
2025 If no commit message is specified, Mercurial starts your
2026 configured editor where you can enter a message. In case your
2026 configured editor where you can enter a message. In case your
2027 commit fails, you will find a backup of your message in
2027 commit fails, you will find a backup of your message in
2028 ``.hg/last-message.txt``.
2028 ``.hg/last-message.txt``.
2029
2029
2030 The --close-branch flag can be used to mark the current branch
2030 The --close-branch flag can be used to mark the current branch
2031 head closed. When all heads of a branch are closed, the branch
2031 head closed. When all heads of a branch are closed, the branch
2032 will be considered closed and no longer listed.
2032 will be considered closed and no longer listed.
2033
2033
2034 The --amend flag can be used to amend the parent of the
2034 The --amend flag can be used to amend the parent of the
2035 working directory with a new commit that contains the changes
2035 working directory with a new commit that contains the changes
2036 in the parent in addition to those currently reported by :hg:`status`,
2036 in the parent in addition to those currently reported by :hg:`status`,
2037 if there are any. The old commit is stored in a backup bundle in
2037 if there are any. The old commit is stored in a backup bundle in
2038 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2038 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2039 on how to restore it).
2039 on how to restore it).
2040
2040
2041 Message, user and date are taken from the amended commit unless
2041 Message, user and date are taken from the amended commit unless
2042 specified. When a message isn't specified on the command line,
2042 specified. When a message isn't specified on the command line,
2043 the editor will open with the message of the amended commit.
2043 the editor will open with the message of the amended commit.
2044
2044
2045 It is not possible to amend public changesets (see :hg:`help phases`)
2045 It is not possible to amend public changesets (see :hg:`help phases`)
2046 or changesets that have children.
2046 or changesets that have children.
2047
2047
2048 See :hg:`help dates` for a list of formats valid for -d/--date.
2048 See :hg:`help dates` for a list of formats valid for -d/--date.
2049
2049
2050 Returns 0 on success, 1 if nothing changed.
2050 Returns 0 on success, 1 if nothing changed.
2051
2051
2052 .. container:: verbose
2052 .. container:: verbose
2053
2053
2054 Examples:
2054 Examples:
2055
2055
2056 - commit all files ending in .py::
2056 - commit all files ending in .py::
2057
2057
2058 hg commit --include "set:**.py"
2058 hg commit --include "set:**.py"
2059
2059
2060 - commit all non-binary files::
2060 - commit all non-binary files::
2061
2061
2062 hg commit --exclude "set:binary()"
2062 hg commit --exclude "set:binary()"
2063
2063
2064 - amend the current commit and set the date to now::
2064 - amend the current commit and set the date to now::
2065
2065
2066 hg commit --amend --date now
2066 hg commit --amend --date now
2067 """
2067 """
2068 with repo.wlock(), repo.lock():
2068 with repo.wlock(), repo.lock():
2069 return _docommit(ui, repo, *pats, **opts)
2069 return _docommit(ui, repo, *pats, **opts)
2070
2070
2071
2071
2072 def _docommit(ui, repo, *pats, **opts):
2072 def _docommit(ui, repo, *pats, **opts):
2073 if opts.get('interactive'):
2073 if opts.get('interactive'):
2074 opts.pop('interactive')
2074 opts.pop('interactive')
2075 ret = cmdutil.dorecord(
2075 ret = cmdutil.dorecord(
2076 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2076 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2077 )
2077 )
2078 # ret can be 0 (no changes to record) or the value returned by
2078 # ret can be 0 (no changes to record) or the value returned by
2079 # commit(), 1 if nothing changed or None on success.
2079 # commit(), 1 if nothing changed or None on success.
2080 return 1 if ret == 0 else ret
2080 return 1 if ret == 0 else ret
2081
2081
2082 opts = pycompat.byteskwargs(opts)
2082 opts = pycompat.byteskwargs(opts)
2083 if opts.get(b'subrepos'):
2083 if opts.get(b'subrepos'):
2084 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2084 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2085 # Let --subrepos on the command line override config setting.
2085 # Let --subrepos on the command line override config setting.
2086 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2086 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2087
2087
2088 cmdutil.checkunfinished(repo, commit=True)
2088 cmdutil.checkunfinished(repo, commit=True)
2089
2089
2090 branch = repo[None].branch()
2090 branch = repo[None].branch()
2091 bheads = repo.branchheads(branch)
2091 bheads = repo.branchheads(branch)
2092 tip = repo.changelog.tip()
2092 tip = repo.changelog.tip()
2093
2093
2094 extra = {}
2094 extra = {}
2095 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2095 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2096 extra[b'close'] = b'1'
2096 extra[b'close'] = b'1'
2097
2097
2098 if repo[b'.'].closesbranch():
2098 if repo[b'.'].closesbranch():
2099 raise error.InputError(
2099 raise error.InputError(
2100 _(b'current revision is already a branch closing head')
2100 _(b'current revision is already a branch closing head')
2101 )
2101 )
2102 elif not bheads:
2102 elif not bheads:
2103 raise error.InputError(
2103 raise error.InputError(
2104 _(b'branch "%s" has no heads to close') % branch
2104 _(b'branch "%s" has no heads to close') % branch
2105 )
2105 )
2106 elif (
2106 elif (
2107 branch == repo[b'.'].branch()
2107 branch == repo[b'.'].branch()
2108 and repo[b'.'].node() not in bheads
2108 and repo[b'.'].node() not in bheads
2109 and not opts.get(b'force_close_branch')
2109 and not opts.get(b'force_close_branch')
2110 ):
2110 ):
2111 hint = _(
2111 hint = _(
2112 b'use --force-close-branch to close branch from a non-head'
2112 b'use --force-close-branch to close branch from a non-head'
2113 b' changeset'
2113 b' changeset'
2114 )
2114 )
2115 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2115 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2116 elif opts.get(b'amend'):
2116 elif opts.get(b'amend'):
2117 if (
2117 if (
2118 repo[b'.'].p1().branch() != branch
2118 repo[b'.'].p1().branch() != branch
2119 and repo[b'.'].p2().branch() != branch
2119 and repo[b'.'].p2().branch() != branch
2120 ):
2120 ):
2121 raise error.InputError(_(b'can only close branch heads'))
2121 raise error.InputError(_(b'can only close branch heads'))
2122
2122
2123 if opts.get(b'amend'):
2123 if opts.get(b'amend'):
2124 if ui.configbool(b'ui', b'commitsubrepos'):
2124 if ui.configbool(b'ui', b'commitsubrepos'):
2125 raise error.InputError(
2125 raise error.InputError(
2126 _(b'cannot amend with ui.commitsubrepos enabled')
2126 _(b'cannot amend with ui.commitsubrepos enabled')
2127 )
2127 )
2128
2128
2129 old = repo[b'.']
2129 old = repo[b'.']
2130 rewriteutil.precheck(repo, [old.rev()], b'amend')
2130 rewriteutil.precheck(repo, [old.rev()], b'amend')
2131
2131
2132 # Currently histedit gets confused if an amend happens while histedit
2132 # Currently histedit gets confused if an amend happens while histedit
2133 # is in progress. Since we have a checkunfinished command, we are
2133 # is in progress. Since we have a checkunfinished command, we are
2134 # temporarily honoring it.
2134 # temporarily honoring it.
2135 #
2135 #
2136 # Note: eventually this guard will be removed. Please do not expect
2136 # Note: eventually this guard will be removed. Please do not expect
2137 # this behavior to remain.
2137 # this behavior to remain.
2138 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2138 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2139 cmdutil.checkunfinished(repo)
2139 cmdutil.checkunfinished(repo)
2140
2140
2141 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2141 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2142 if node == old.node():
2142 if node == old.node():
2143 ui.status(_(b"nothing changed\n"))
2143 ui.status(_(b"nothing changed\n"))
2144 return 1
2144 return 1
2145 else:
2145 else:
2146
2146
2147 def commitfunc(ui, repo, message, match, opts):
2147 def commitfunc(ui, repo, message, match, opts):
2148 overrides = {}
2148 overrides = {}
2149 if opts.get(b'secret'):
2149 if opts.get(b'secret'):
2150 overrides[(b'phases', b'new-commit')] = b'secret'
2150 overrides[(b'phases', b'new-commit')] = b'secret'
2151
2151
2152 baseui = repo.baseui
2152 baseui = repo.baseui
2153 with baseui.configoverride(overrides, b'commit'):
2153 with baseui.configoverride(overrides, b'commit'):
2154 with ui.configoverride(overrides, b'commit'):
2154 with ui.configoverride(overrides, b'commit'):
2155 editform = cmdutil.mergeeditform(
2155 editform = cmdutil.mergeeditform(
2156 repo[None], b'commit.normal'
2156 repo[None], b'commit.normal'
2157 )
2157 )
2158 editor = cmdutil.getcommiteditor(
2158 editor = cmdutil.getcommiteditor(
2159 editform=editform, **pycompat.strkwargs(opts)
2159 editform=editform, **pycompat.strkwargs(opts)
2160 )
2160 )
2161 return repo.commit(
2161 return repo.commit(
2162 message,
2162 message,
2163 opts.get(b'user'),
2163 opts.get(b'user'),
2164 opts.get(b'date'),
2164 opts.get(b'date'),
2165 match,
2165 match,
2166 editor=editor,
2166 editor=editor,
2167 extra=extra,
2167 extra=extra,
2168 )
2168 )
2169
2169
2170 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2170 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2171
2171
2172 if not node:
2172 if not node:
2173 stat = cmdutil.postcommitstatus(repo, pats, opts)
2173 stat = cmdutil.postcommitstatus(repo, pats, opts)
2174 if stat.deleted:
2174 if stat.deleted:
2175 ui.status(
2175 ui.status(
2176 _(
2176 _(
2177 b"nothing changed (%d missing files, see "
2177 b"nothing changed (%d missing files, see "
2178 b"'hg status')\n"
2178 b"'hg status')\n"
2179 )
2179 )
2180 % len(stat.deleted)
2180 % len(stat.deleted)
2181 )
2181 )
2182 else:
2182 else:
2183 ui.status(_(b"nothing changed\n"))
2183 ui.status(_(b"nothing changed\n"))
2184 return 1
2184 return 1
2185
2185
2186 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2186 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2187
2187
2188 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2188 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2189 status(
2189 status(
2190 ui,
2190 ui,
2191 repo,
2191 repo,
2192 modified=True,
2192 modified=True,
2193 added=True,
2193 added=True,
2194 removed=True,
2194 removed=True,
2195 deleted=True,
2195 deleted=True,
2196 unknown=True,
2196 unknown=True,
2197 subrepos=opts.get(b'subrepos'),
2197 subrepos=opts.get(b'subrepos'),
2198 )
2198 )
2199
2199
2200
2200
2201 @command(
2201 @command(
2202 b'config|showconfig|debugconfig',
2202 b'config|showconfig|debugconfig',
2203 [
2203 [
2204 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2204 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2205 (b'e', b'edit', None, _(b'edit user config')),
2205 (b'e', b'edit', None, _(b'edit user config')),
2206 (b'l', b'local', None, _(b'edit repository config')),
2206 (b'l', b'local', None, _(b'edit repository config')),
2207 (
2207 (
2208 b'',
2208 b'',
2209 b'shared',
2209 b'shared',
2210 None,
2210 None,
2211 _(b'edit shared source repository config (EXPERIMENTAL)'),
2211 _(b'edit shared source repository config (EXPERIMENTAL)'),
2212 ),
2212 ),
2213 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2213 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2214 (b'g', b'global', None, _(b'edit global config')),
2214 (b'g', b'global', None, _(b'edit global config')),
2215 ]
2215 ]
2216 + formatteropts,
2216 + formatteropts,
2217 _(b'[-u] [NAME]...'),
2217 _(b'[-u] [NAME]...'),
2218 helpcategory=command.CATEGORY_HELP,
2218 helpcategory=command.CATEGORY_HELP,
2219 optionalrepo=True,
2219 optionalrepo=True,
2220 intents={INTENT_READONLY},
2220 intents={INTENT_READONLY},
2221 )
2221 )
2222 def config(ui, repo, *values, **opts):
2222 def config(ui, repo, *values, **opts):
2223 """show combined config settings from all hgrc files
2223 """show combined config settings from all hgrc files
2224
2224
2225 With no arguments, print names and values of all config items.
2225 With no arguments, print names and values of all config items.
2226
2226
2227 With one argument of the form section.name, print just the value
2227 With one argument of the form section.name, print just the value
2228 of that config item.
2228 of that config item.
2229
2229
2230 With multiple arguments, print names and values of all config
2230 With multiple arguments, print names and values of all config
2231 items with matching section names or section.names.
2231 items with matching section names or section.names.
2232
2232
2233 With --edit, start an editor on the user-level config file. With
2233 With --edit, start an editor on the user-level config file. With
2234 --global, edit the system-wide config file. With --local, edit the
2234 --global, edit the system-wide config file. With --local, edit the
2235 repository-level config file.
2235 repository-level config file.
2236
2236
2237 With --debug, the source (filename and line number) is printed
2237 With --debug, the source (filename and line number) is printed
2238 for each config item.
2238 for each config item.
2239
2239
2240 See :hg:`help config` for more information about config files.
2240 See :hg:`help config` for more information about config files.
2241
2241
2242 .. container:: verbose
2242 .. container:: verbose
2243
2243
2244 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2244 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2245 This file is not shared across shares when in share-safe mode.
2245 This file is not shared across shares when in share-safe mode.
2246
2246
2247 Template:
2247 Template:
2248
2248
2249 The following keywords are supported. See also :hg:`help templates`.
2249 The following keywords are supported. See also :hg:`help templates`.
2250
2250
2251 :name: String. Config name.
2251 :name: String. Config name.
2252 :source: String. Filename and line number where the item is defined.
2252 :source: String. Filename and line number where the item is defined.
2253 :value: String. Config value.
2253 :value: String. Config value.
2254
2254
2255 The --shared flag can be used to edit the config file of shared source
2255 The --shared flag can be used to edit the config file of shared source
2256 repository. It only works when you have shared using the experimental
2256 repository. It only works when you have shared using the experimental
2257 share safe feature.
2257 share safe feature.
2258
2258
2259 Returns 0 on success, 1 if NAME does not exist.
2259 Returns 0 on success, 1 if NAME does not exist.
2260
2260
2261 """
2261 """
2262
2262
2263 opts = pycompat.byteskwargs(opts)
2263 opts = pycompat.byteskwargs(opts)
2264 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2264 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2265 if any(opts.get(o) for o in editopts):
2265 if any(opts.get(o) for o in editopts):
2266 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2266 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2267 if opts.get(b'local'):
2267 if opts.get(b'local'):
2268 if not repo:
2268 if not repo:
2269 raise error.InputError(
2269 raise error.InputError(
2270 _(b"can't use --local outside a repository")
2270 _(b"can't use --local outside a repository")
2271 )
2271 )
2272 paths = [repo.vfs.join(b'hgrc')]
2272 paths = [repo.vfs.join(b'hgrc')]
2273 elif opts.get(b'global'):
2273 elif opts.get(b'global'):
2274 paths = rcutil.systemrcpath()
2274 paths = rcutil.systemrcpath()
2275 elif opts.get(b'shared'):
2275 elif opts.get(b'shared'):
2276 if not repo.shared():
2276 if not repo.shared():
2277 raise error.InputError(
2277 raise error.InputError(
2278 _(b"repository is not shared; can't use --shared")
2278 _(b"repository is not shared; can't use --shared")
2279 )
2279 )
2280 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2280 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2281 raise error.InputError(
2281 raise error.InputError(
2282 _(
2282 _(
2283 b"share safe feature not enabled; "
2283 b"share safe feature not enabled; "
2284 b"unable to edit shared source repository config"
2284 b"unable to edit shared source repository config"
2285 )
2285 )
2286 )
2286 )
2287 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2287 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2288 elif opts.get(b'non_shared'):
2288 elif opts.get(b'non_shared'):
2289 paths = [repo.vfs.join(b'hgrc-not-shared')]
2289 paths = [repo.vfs.join(b'hgrc-not-shared')]
2290 else:
2290 else:
2291 paths = rcutil.userrcpath()
2291 paths = rcutil.userrcpath()
2292
2292
2293 for f in paths:
2293 for f in paths:
2294 if os.path.exists(f):
2294 if os.path.exists(f):
2295 break
2295 break
2296 else:
2296 else:
2297 if opts.get(b'global'):
2297 if opts.get(b'global'):
2298 samplehgrc = uimod.samplehgrcs[b'global']
2298 samplehgrc = uimod.samplehgrcs[b'global']
2299 elif opts.get(b'local'):
2299 elif opts.get(b'local'):
2300 samplehgrc = uimod.samplehgrcs[b'local']
2300 samplehgrc = uimod.samplehgrcs[b'local']
2301 else:
2301 else:
2302 samplehgrc = uimod.samplehgrcs[b'user']
2302 samplehgrc = uimod.samplehgrcs[b'user']
2303
2303
2304 f = paths[0]
2304 f = paths[0]
2305 fp = open(f, b"wb")
2305 fp = open(f, b"wb")
2306 fp.write(util.tonativeeol(samplehgrc))
2306 fp.write(util.tonativeeol(samplehgrc))
2307 fp.close()
2307 fp.close()
2308
2308
2309 editor = ui.geteditor()
2309 editor = ui.geteditor()
2310 ui.system(
2310 ui.system(
2311 b"%s \"%s\"" % (editor, f),
2311 b"%s \"%s\"" % (editor, f),
2312 onerr=error.InputError,
2312 onerr=error.InputError,
2313 errprefix=_(b"edit failed"),
2313 errprefix=_(b"edit failed"),
2314 blockedtag=b'config_edit',
2314 blockedtag=b'config_edit',
2315 )
2315 )
2316 return
2316 return
2317 ui.pager(b'config')
2317 ui.pager(b'config')
2318 fm = ui.formatter(b'config', opts)
2318 fm = ui.formatter(b'config', opts)
2319 for t, f in rcutil.rccomponents():
2319 for t, f in rcutil.rccomponents():
2320 if t == b'path':
2320 if t == b'path':
2321 ui.debug(b'read config from: %s\n' % f)
2321 ui.debug(b'read config from: %s\n' % f)
2322 elif t == b'resource':
2322 elif t == b'resource':
2323 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2323 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2324 elif t == b'items':
2324 elif t == b'items':
2325 # Don't print anything for 'items'.
2325 # Don't print anything for 'items'.
2326 pass
2326 pass
2327 else:
2327 else:
2328 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2328 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2329 untrusted = bool(opts.get(b'untrusted'))
2329 untrusted = bool(opts.get(b'untrusted'))
2330
2330
2331 selsections = selentries = []
2331 selsections = selentries = []
2332 if values:
2332 if values:
2333 selsections = [v for v in values if b'.' not in v]
2333 selsections = [v for v in values if b'.' not in v]
2334 selentries = [v for v in values if b'.' in v]
2334 selentries = [v for v in values if b'.' in v]
2335 uniquesel = len(selentries) == 1 and not selsections
2335 uniquesel = len(selentries) == 1 and not selsections
2336 selsections = set(selsections)
2336 selsections = set(selsections)
2337 selentries = set(selentries)
2337 selentries = set(selentries)
2338
2338
2339 matched = False
2339 matched = False
2340 for section, name, value in ui.walkconfig(untrusted=untrusted):
2340 for section, name, value in ui.walkconfig(untrusted=untrusted):
2341 source = ui.configsource(section, name, untrusted)
2341 source = ui.configsource(section, name, untrusted)
2342 value = pycompat.bytestr(value)
2342 value = pycompat.bytestr(value)
2343 defaultvalue = ui.configdefault(section, name)
2343 defaultvalue = ui.configdefault(section, name)
2344 if fm.isplain():
2344 if fm.isplain():
2345 source = source or b'none'
2345 source = source or b'none'
2346 value = value.replace(b'\n', b'\\n')
2346 value = value.replace(b'\n', b'\\n')
2347 entryname = section + b'.' + name
2347 entryname = section + b'.' + name
2348 if values and not (section in selsections or entryname in selentries):
2348 if values and not (section in selsections or entryname in selentries):
2349 continue
2349 continue
2350 fm.startitem()
2350 fm.startitem()
2351 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2351 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2352 if uniquesel:
2352 if uniquesel:
2353 fm.data(name=entryname)
2353 fm.data(name=entryname)
2354 fm.write(b'value', b'%s\n', value)
2354 fm.write(b'value', b'%s\n', value)
2355 else:
2355 else:
2356 fm.write(b'name value', b'%s=%s\n', entryname, value)
2356 fm.write(b'name value', b'%s=%s\n', entryname, value)
2357 if formatter.isprintable(defaultvalue):
2357 if formatter.isprintable(defaultvalue):
2358 fm.data(defaultvalue=defaultvalue)
2358 fm.data(defaultvalue=defaultvalue)
2359 elif isinstance(defaultvalue, list) and all(
2359 elif isinstance(defaultvalue, list) and all(
2360 formatter.isprintable(e) for e in defaultvalue
2360 formatter.isprintable(e) for e in defaultvalue
2361 ):
2361 ):
2362 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2362 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2363 # TODO: no idea how to process unsupported defaultvalue types
2363 # TODO: no idea how to process unsupported defaultvalue types
2364 matched = True
2364 matched = True
2365 fm.end()
2365 fm.end()
2366 if matched:
2366 if matched:
2367 return 0
2367 return 0
2368 return 1
2368 return 1
2369
2369
2370
2370
2371 @command(
2371 @command(
2372 b'continue',
2372 b'continue',
2373 dryrunopts,
2373 dryrunopts,
2374 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2374 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2375 helpbasic=True,
2375 helpbasic=True,
2376 )
2376 )
2377 def continuecmd(ui, repo, **opts):
2377 def continuecmd(ui, repo, **opts):
2378 """resumes an interrupted operation (EXPERIMENTAL)
2378 """resumes an interrupted operation (EXPERIMENTAL)
2379
2379
2380 Finishes a multistep operation like graft, histedit, rebase, merge,
2380 Finishes a multistep operation like graft, histedit, rebase, merge,
2381 and unshelve if they are in an interrupted state.
2381 and unshelve if they are in an interrupted state.
2382
2382
2383 use --dry-run/-n to dry run the command.
2383 use --dry-run/-n to dry run the command.
2384 """
2384 """
2385 dryrun = opts.get('dry_run')
2385 dryrun = opts.get('dry_run')
2386 contstate = cmdutil.getunfinishedstate(repo)
2386 contstate = cmdutil.getunfinishedstate(repo)
2387 if not contstate:
2387 if not contstate:
2388 raise error.StateError(_(b'no operation in progress'))
2388 raise error.StateError(_(b'no operation in progress'))
2389 if not contstate.continuefunc:
2389 if not contstate.continuefunc:
2390 raise error.StateError(
2390 raise error.StateError(
2391 (
2391 (
2392 _(b"%s in progress but does not support 'hg continue'")
2392 _(b"%s in progress but does not support 'hg continue'")
2393 % (contstate._opname)
2393 % (contstate._opname)
2394 ),
2394 ),
2395 hint=contstate.continuemsg(),
2395 hint=contstate.continuemsg(),
2396 )
2396 )
2397 if dryrun:
2397 if dryrun:
2398 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2398 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2399 return
2399 return
2400 return contstate.continuefunc(ui, repo)
2400 return contstate.continuefunc(ui, repo)
2401
2401
2402
2402
2403 @command(
2403 @command(
2404 b'copy|cp',
2404 b'copy|cp',
2405 [
2405 [
2406 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2406 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2407 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2407 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2408 (
2408 (
2409 b'',
2409 b'',
2410 b'at-rev',
2410 b'at-rev',
2411 b'',
2411 b'',
2412 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2412 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2413 _(b'REV'),
2413 _(b'REV'),
2414 ),
2414 ),
2415 (
2415 (
2416 b'f',
2416 b'f',
2417 b'force',
2417 b'force',
2418 None,
2418 None,
2419 _(b'forcibly copy over an existing managed file'),
2419 _(b'forcibly copy over an existing managed file'),
2420 ),
2420 ),
2421 ]
2421 ]
2422 + walkopts
2422 + walkopts
2423 + dryrunopts,
2423 + dryrunopts,
2424 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2424 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2425 helpcategory=command.CATEGORY_FILE_CONTENTS,
2425 helpcategory=command.CATEGORY_FILE_CONTENTS,
2426 )
2426 )
2427 def copy(ui, repo, *pats, **opts):
2427 def copy(ui, repo, *pats, **opts):
2428 """mark files as copied for the next commit
2428 """mark files as copied for the next commit
2429
2429
2430 Mark dest as having copies of source files. If dest is a
2430 Mark dest as having copies of source files. If dest is a
2431 directory, copies are put in that directory. If dest is a file,
2431 directory, copies are put in that directory. If dest is a file,
2432 the source must be a single file.
2432 the source must be a single file.
2433
2433
2434 By default, this command copies the contents of files as they
2434 By default, this command copies the contents of files as they
2435 exist in the working directory. If invoked with -A/--after, the
2435 exist in the working directory. If invoked with -A/--after, the
2436 operation is recorded, but no copying is performed.
2436 operation is recorded, but no copying is performed.
2437
2437
2438 To undo marking a destination file as copied, use --forget. With that
2438 To undo marking a destination file as copied, use --forget. With that
2439 option, all given (positional) arguments are unmarked as copies. The
2439 option, all given (positional) arguments are unmarked as copies. The
2440 destination file(s) will be left in place (still tracked). Note that
2440 destination file(s) will be left in place (still tracked). Note that
2441 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2441 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2442
2442
2443 This command takes effect with the next commit by default.
2443 This command takes effect with the next commit by default.
2444
2444
2445 Returns 0 on success, 1 if errors are encountered.
2445 Returns 0 on success, 1 if errors are encountered.
2446 """
2446 """
2447 opts = pycompat.byteskwargs(opts)
2447 opts = pycompat.byteskwargs(opts)
2448 with repo.wlock():
2448 with repo.wlock():
2449 return cmdutil.copy(ui, repo, pats, opts)
2449 return cmdutil.copy(ui, repo, pats, opts)
2450
2450
2451
2451
2452 @command(
2452 @command(
2453 b'debugcommands',
2453 b'debugcommands',
2454 [],
2454 [],
2455 _(b'[COMMAND]'),
2455 _(b'[COMMAND]'),
2456 helpcategory=command.CATEGORY_HELP,
2456 helpcategory=command.CATEGORY_HELP,
2457 norepo=True,
2457 norepo=True,
2458 )
2458 )
2459 def debugcommands(ui, cmd=b'', *args):
2459 def debugcommands(ui, cmd=b'', *args):
2460 """list all available commands and options"""
2460 """list all available commands and options"""
2461 for cmd, vals in sorted(pycompat.iteritems(table)):
2461 for cmd, vals in sorted(pycompat.iteritems(table)):
2462 cmd = cmd.split(b'|')[0]
2462 cmd = cmd.split(b'|')[0]
2463 opts = b', '.join([i[1] for i in vals[1]])
2463 opts = b', '.join([i[1] for i in vals[1]])
2464 ui.write(b'%s: %s\n' % (cmd, opts))
2464 ui.write(b'%s: %s\n' % (cmd, opts))
2465
2465
2466
2466
2467 @command(
2467 @command(
2468 b'debugcomplete',
2468 b'debugcomplete',
2469 [(b'o', b'options', None, _(b'show the command options'))],
2469 [(b'o', b'options', None, _(b'show the command options'))],
2470 _(b'[-o] CMD'),
2470 _(b'[-o] CMD'),
2471 helpcategory=command.CATEGORY_HELP,
2471 helpcategory=command.CATEGORY_HELP,
2472 norepo=True,
2472 norepo=True,
2473 )
2473 )
2474 def debugcomplete(ui, cmd=b'', **opts):
2474 def debugcomplete(ui, cmd=b'', **opts):
2475 """returns the completion list associated with the given command"""
2475 """returns the completion list associated with the given command"""
2476
2476
2477 if opts.get('options'):
2477 if opts.get('options'):
2478 options = []
2478 options = []
2479 otables = [globalopts]
2479 otables = [globalopts]
2480 if cmd:
2480 if cmd:
2481 aliases, entry = cmdutil.findcmd(cmd, table, False)
2481 aliases, entry = cmdutil.findcmd(cmd, table, False)
2482 otables.append(entry[1])
2482 otables.append(entry[1])
2483 for t in otables:
2483 for t in otables:
2484 for o in t:
2484 for o in t:
2485 if b"(DEPRECATED)" in o[3]:
2485 if b"(DEPRECATED)" in o[3]:
2486 continue
2486 continue
2487 if o[0]:
2487 if o[0]:
2488 options.append(b'-%s' % o[0])
2488 options.append(b'-%s' % o[0])
2489 options.append(b'--%s' % o[1])
2489 options.append(b'--%s' % o[1])
2490 ui.write(b"%s\n" % b"\n".join(options))
2490 ui.write(b"%s\n" % b"\n".join(options))
2491 return
2491 return
2492
2492
2493 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2493 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2494 if ui.verbose:
2494 if ui.verbose:
2495 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2495 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2496 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2496 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2497
2497
2498
2498
2499 @command(
2499 @command(
2500 b'diff',
2500 b'diff',
2501 [
2501 [
2502 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2502 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2503 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2503 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2504 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2504 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2505 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2505 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2506 ]
2506 ]
2507 + diffopts
2507 + diffopts
2508 + diffopts2
2508 + diffopts2
2509 + walkopts
2509 + walkopts
2510 + subrepoopts,
2510 + subrepoopts,
2511 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2511 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2512 helpcategory=command.CATEGORY_FILE_CONTENTS,
2512 helpcategory=command.CATEGORY_FILE_CONTENTS,
2513 helpbasic=True,
2513 helpbasic=True,
2514 inferrepo=True,
2514 inferrepo=True,
2515 intents={INTENT_READONLY},
2515 intents={INTENT_READONLY},
2516 )
2516 )
2517 def diff(ui, repo, *pats, **opts):
2517 def diff(ui, repo, *pats, **opts):
2518 """diff repository (or selected files)
2518 """diff repository (or selected files)
2519
2519
2520 Show differences between revisions for the specified files.
2520 Show differences between revisions for the specified files.
2521
2521
2522 Differences between files are shown using the unified diff format.
2522 Differences between files are shown using the unified diff format.
2523
2523
2524 .. note::
2524 .. note::
2525
2525
2526 :hg:`diff` may generate unexpected results for merges, as it will
2526 :hg:`diff` may generate unexpected results for merges, as it will
2527 default to comparing against the working directory's first
2527 default to comparing against the working directory's first
2528 parent changeset if no revisions are specified.
2528 parent changeset if no revisions are specified.
2529
2529
2530 By default, the working directory files are compared to its first parent. To
2530 By default, the working directory files are compared to its first parent. To
2531 see the differences from another revision, use --from. To see the difference
2531 see the differences from another revision, use --from. To see the difference
2532 to another revision, use --to. For example, :hg:`diff --from .^` will show
2532 to another revision, use --to. For example, :hg:`diff --from .^` will show
2533 the differences from the working copy's grandparent to the working copy,
2533 the differences from the working copy's grandparent to the working copy,
2534 :hg:`diff --to .` will show the diff from the working copy to its parent
2534 :hg:`diff --to .` will show the diff from the working copy to its parent
2535 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2535 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2536 show the diff between those two revisions.
2536 show the diff between those two revisions.
2537
2537
2538 Alternatively you can specify -c/--change with a revision to see the changes
2538 Alternatively you can specify -c/--change with a revision to see the changes
2539 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2539 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2540 equivalent to :hg:`diff --from 42^ --to 42`)
2540 equivalent to :hg:`diff --from 42^ --to 42`)
2541
2541
2542 Without the -a/--text option, diff will avoid generating diffs of
2542 Without the -a/--text option, diff will avoid generating diffs of
2543 files it detects as binary. With -a, diff will generate a diff
2543 files it detects as binary. With -a, diff will generate a diff
2544 anyway, probably with undesirable results.
2544 anyway, probably with undesirable results.
2545
2545
2546 Use the -g/--git option to generate diffs in the git extended diff
2546 Use the -g/--git option to generate diffs in the git extended diff
2547 format. For more information, read :hg:`help diffs`.
2547 format. For more information, read :hg:`help diffs`.
2548
2548
2549 .. container:: verbose
2549 .. container:: verbose
2550
2550
2551 Examples:
2551 Examples:
2552
2552
2553 - compare a file in the current working directory to its parent::
2553 - compare a file in the current working directory to its parent::
2554
2554
2555 hg diff foo.c
2555 hg diff foo.c
2556
2556
2557 - compare two historical versions of a directory, with rename info::
2557 - compare two historical versions of a directory, with rename info::
2558
2558
2559 hg diff --git --from 1.0 --to 1.2 lib/
2559 hg diff --git --from 1.0 --to 1.2 lib/
2560
2560
2561 - get change stats relative to the last change on some date::
2561 - get change stats relative to the last change on some date::
2562
2562
2563 hg diff --stat --from "date('may 2')"
2563 hg diff --stat --from "date('may 2')"
2564
2564
2565 - diff all newly-added files that contain a keyword::
2565 - diff all newly-added files that contain a keyword::
2566
2566
2567 hg diff "set:added() and grep(GNU)"
2567 hg diff "set:added() and grep(GNU)"
2568
2568
2569 - compare a revision and its parents::
2569 - compare a revision and its parents::
2570
2570
2571 hg diff -c 9353 # compare against first parent
2571 hg diff -c 9353 # compare against first parent
2572 hg diff --from 9353^ --to 9353 # same using revset syntax
2572 hg diff --from 9353^ --to 9353 # same using revset syntax
2573 hg diff --from 9353^2 --to 9353 # compare against the second parent
2573 hg diff --from 9353^2 --to 9353 # compare against the second parent
2574
2574
2575 Returns 0 on success.
2575 Returns 0 on success.
2576 """
2576 """
2577
2577
2578 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2578 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2579 opts = pycompat.byteskwargs(opts)
2579 opts = pycompat.byteskwargs(opts)
2580 revs = opts.get(b'rev')
2580 revs = opts.get(b'rev')
2581 change = opts.get(b'change')
2581 change = opts.get(b'change')
2582 from_rev = opts.get(b'from')
2582 from_rev = opts.get(b'from')
2583 to_rev = opts.get(b'to')
2583 to_rev = opts.get(b'to')
2584 stat = opts.get(b'stat')
2584 stat = opts.get(b'stat')
2585 reverse = opts.get(b'reverse')
2585 reverse = opts.get(b'reverse')
2586
2586
2587 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2587 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2588 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2588 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2589 if change:
2589 if change:
2590 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2590 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2591 ctx2 = scmutil.revsingle(repo, change, None)
2591 ctx2 = scmutil.revsingle(repo, change, None)
2592 ctx1 = logcmdutil.diff_parent(ctx2)
2592 ctx1 = logcmdutil.diff_parent(ctx2)
2593 elif from_rev or to_rev:
2593 elif from_rev or to_rev:
2594 repo = scmutil.unhidehashlikerevs(
2594 repo = scmutil.unhidehashlikerevs(
2595 repo, [from_rev] + [to_rev], b'nowarn'
2595 repo, [from_rev] + [to_rev], b'nowarn'
2596 )
2596 )
2597 ctx1 = scmutil.revsingle(repo, from_rev, None)
2597 ctx1 = scmutil.revsingle(repo, from_rev, None)
2598 ctx2 = scmutil.revsingle(repo, to_rev, None)
2598 ctx2 = scmutil.revsingle(repo, to_rev, None)
2599 else:
2599 else:
2600 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2600 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2601 ctx1, ctx2 = scmutil.revpair(repo, revs)
2601 ctx1, ctx2 = scmutil.revpair(repo, revs)
2602
2602
2603 if reverse:
2603 if reverse:
2604 ctxleft = ctx2
2604 ctxleft = ctx2
2605 ctxright = ctx1
2605 ctxright = ctx1
2606 else:
2606 else:
2607 ctxleft = ctx1
2607 ctxleft = ctx1
2608 ctxright = ctx2
2608 ctxright = ctx2
2609
2609
2610 diffopts = patch.diffallopts(ui, opts)
2610 diffopts = patch.diffallopts(ui, opts)
2611 m = scmutil.match(ctx2, pats, opts)
2611 m = scmutil.match(ctx2, pats, opts)
2612 m = repo.narrowmatch(m)
2612 m = repo.narrowmatch(m)
2613 ui.pager(b'diff')
2613 ui.pager(b'diff')
2614 logcmdutil.diffordiffstat(
2614 logcmdutil.diffordiffstat(
2615 ui,
2615 ui,
2616 repo,
2616 repo,
2617 diffopts,
2617 diffopts,
2618 ctxleft,
2618 ctxleft,
2619 ctxright,
2619 ctxright,
2620 m,
2620 m,
2621 stat=stat,
2621 stat=stat,
2622 listsubrepos=opts.get(b'subrepos'),
2622 listsubrepos=opts.get(b'subrepos'),
2623 root=opts.get(b'root'),
2623 root=opts.get(b'root'),
2624 )
2624 )
2625
2625
2626
2626
2627 @command(
2627 @command(
2628 b'export',
2628 b'export',
2629 [
2629 [
2630 (
2630 (
2631 b'B',
2631 b'B',
2632 b'bookmark',
2632 b'bookmark',
2633 b'',
2633 b'',
2634 _(b'export changes only reachable by given bookmark'),
2634 _(b'export changes only reachable by given bookmark'),
2635 _(b'BOOKMARK'),
2635 _(b'BOOKMARK'),
2636 ),
2636 ),
2637 (
2637 (
2638 b'o',
2638 b'o',
2639 b'output',
2639 b'output',
2640 b'',
2640 b'',
2641 _(b'print output to file with formatted name'),
2641 _(b'print output to file with formatted name'),
2642 _(b'FORMAT'),
2642 _(b'FORMAT'),
2643 ),
2643 ),
2644 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2644 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2645 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2645 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2646 ]
2646 ]
2647 + diffopts
2647 + diffopts
2648 + formatteropts,
2648 + formatteropts,
2649 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2649 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2650 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2650 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2651 helpbasic=True,
2651 helpbasic=True,
2652 intents={INTENT_READONLY},
2652 intents={INTENT_READONLY},
2653 )
2653 )
2654 def export(ui, repo, *changesets, **opts):
2654 def export(ui, repo, *changesets, **opts):
2655 """dump the header and diffs for one or more changesets
2655 """dump the header and diffs for one or more changesets
2656
2656
2657 Print the changeset header and diffs for one or more revisions.
2657 Print the changeset header and diffs for one or more revisions.
2658 If no revision is given, the parent of the working directory is used.
2658 If no revision is given, the parent of the working directory is used.
2659
2659
2660 The information shown in the changeset header is: author, date,
2660 The information shown in the changeset header is: author, date,
2661 branch name (if non-default), changeset hash, parent(s) and commit
2661 branch name (if non-default), changeset hash, parent(s) and commit
2662 comment.
2662 comment.
2663
2663
2664 .. note::
2664 .. note::
2665
2665
2666 :hg:`export` may generate unexpected diff output for merge
2666 :hg:`export` may generate unexpected diff output for merge
2667 changesets, as it will compare the merge changeset against its
2667 changesets, as it will compare the merge changeset against its
2668 first parent only.
2668 first parent only.
2669
2669
2670 Output may be to a file, in which case the name of the file is
2670 Output may be to a file, in which case the name of the file is
2671 given using a template string. See :hg:`help templates`. In addition
2671 given using a template string. See :hg:`help templates`. In addition
2672 to the common template keywords, the following formatting rules are
2672 to the common template keywords, the following formatting rules are
2673 supported:
2673 supported:
2674
2674
2675 :``%%``: literal "%" character
2675 :``%%``: literal "%" character
2676 :``%H``: changeset hash (40 hexadecimal digits)
2676 :``%H``: changeset hash (40 hexadecimal digits)
2677 :``%N``: number of patches being generated
2677 :``%N``: number of patches being generated
2678 :``%R``: changeset revision number
2678 :``%R``: changeset revision number
2679 :``%b``: basename of the exporting repository
2679 :``%b``: basename of the exporting repository
2680 :``%h``: short-form changeset hash (12 hexadecimal digits)
2680 :``%h``: short-form changeset hash (12 hexadecimal digits)
2681 :``%m``: first line of the commit message (only alphanumeric characters)
2681 :``%m``: first line of the commit message (only alphanumeric characters)
2682 :``%n``: zero-padded sequence number, starting at 1
2682 :``%n``: zero-padded sequence number, starting at 1
2683 :``%r``: zero-padded changeset revision number
2683 :``%r``: zero-padded changeset revision number
2684 :``\\``: literal "\\" character
2684 :``\\``: literal "\\" character
2685
2685
2686 Without the -a/--text option, export will avoid generating diffs
2686 Without the -a/--text option, export will avoid generating diffs
2687 of files it detects as binary. With -a, export will generate a
2687 of files it detects as binary. With -a, export will generate a
2688 diff anyway, probably with undesirable results.
2688 diff anyway, probably with undesirable results.
2689
2689
2690 With -B/--bookmark changesets reachable by the given bookmark are
2690 With -B/--bookmark changesets reachable by the given bookmark are
2691 selected.
2691 selected.
2692
2692
2693 Use the -g/--git option to generate diffs in the git extended diff
2693 Use the -g/--git option to generate diffs in the git extended diff
2694 format. See :hg:`help diffs` for more information.
2694 format. See :hg:`help diffs` for more information.
2695
2695
2696 With the --switch-parent option, the diff will be against the
2696 With the --switch-parent option, the diff will be against the
2697 second parent. It can be useful to review a merge.
2697 second parent. It can be useful to review a merge.
2698
2698
2699 .. container:: verbose
2699 .. container:: verbose
2700
2700
2701 Template:
2701 Template:
2702
2702
2703 The following keywords are supported in addition to the common template
2703 The following keywords are supported in addition to the common template
2704 keywords and functions. See also :hg:`help templates`.
2704 keywords and functions. See also :hg:`help templates`.
2705
2705
2706 :diff: String. Diff content.
2706 :diff: String. Diff content.
2707 :parents: List of strings. Parent nodes of the changeset.
2707 :parents: List of strings. Parent nodes of the changeset.
2708
2708
2709 Examples:
2709 Examples:
2710
2710
2711 - use export and import to transplant a bugfix to the current
2711 - use export and import to transplant a bugfix to the current
2712 branch::
2712 branch::
2713
2713
2714 hg export -r 9353 | hg import -
2714 hg export -r 9353 | hg import -
2715
2715
2716 - export all the changesets between two revisions to a file with
2716 - export all the changesets between two revisions to a file with
2717 rename information::
2717 rename information::
2718
2718
2719 hg export --git -r 123:150 > changes.txt
2719 hg export --git -r 123:150 > changes.txt
2720
2720
2721 - split outgoing changes into a series of patches with
2721 - split outgoing changes into a series of patches with
2722 descriptive names::
2722 descriptive names::
2723
2723
2724 hg export -r "outgoing()" -o "%n-%m.patch"
2724 hg export -r "outgoing()" -o "%n-%m.patch"
2725
2725
2726 Returns 0 on success.
2726 Returns 0 on success.
2727 """
2727 """
2728 opts = pycompat.byteskwargs(opts)
2728 opts = pycompat.byteskwargs(opts)
2729 bookmark = opts.get(b'bookmark')
2729 bookmark = opts.get(b'bookmark')
2730 changesets += tuple(opts.get(b'rev', []))
2730 changesets += tuple(opts.get(b'rev', []))
2731
2731
2732 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2732 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2733
2733
2734 if bookmark:
2734 if bookmark:
2735 if bookmark not in repo._bookmarks:
2735 if bookmark not in repo._bookmarks:
2736 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2736 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2737
2737
2738 revs = scmutil.bookmarkrevs(repo, bookmark)
2738 revs = scmutil.bookmarkrevs(repo, bookmark)
2739 else:
2739 else:
2740 if not changesets:
2740 if not changesets:
2741 changesets = [b'.']
2741 changesets = [b'.']
2742
2742
2743 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2743 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2744 revs = scmutil.revrange(repo, changesets)
2744 revs = scmutil.revrange(repo, changesets)
2745
2745
2746 if not revs:
2746 if not revs:
2747 raise error.InputError(_(b"export requires at least one changeset"))
2747 raise error.InputError(_(b"export requires at least one changeset"))
2748 if len(revs) > 1:
2748 if len(revs) > 1:
2749 ui.note(_(b'exporting patches:\n'))
2749 ui.note(_(b'exporting patches:\n'))
2750 else:
2750 else:
2751 ui.note(_(b'exporting patch:\n'))
2751 ui.note(_(b'exporting patch:\n'))
2752
2752
2753 fntemplate = opts.get(b'output')
2753 fntemplate = opts.get(b'output')
2754 if cmdutil.isstdiofilename(fntemplate):
2754 if cmdutil.isstdiofilename(fntemplate):
2755 fntemplate = b''
2755 fntemplate = b''
2756
2756
2757 if fntemplate:
2757 if fntemplate:
2758 fm = formatter.nullformatter(ui, b'export', opts)
2758 fm = formatter.nullformatter(ui, b'export', opts)
2759 else:
2759 else:
2760 ui.pager(b'export')
2760 ui.pager(b'export')
2761 fm = ui.formatter(b'export', opts)
2761 fm = ui.formatter(b'export', opts)
2762 with fm:
2762 with fm:
2763 cmdutil.export(
2763 cmdutil.export(
2764 repo,
2764 repo,
2765 revs,
2765 revs,
2766 fm,
2766 fm,
2767 fntemplate=fntemplate,
2767 fntemplate=fntemplate,
2768 switch_parent=opts.get(b'switch_parent'),
2768 switch_parent=opts.get(b'switch_parent'),
2769 opts=patch.diffallopts(ui, opts),
2769 opts=patch.diffallopts(ui, opts),
2770 )
2770 )
2771
2771
2772
2772
2773 @command(
2773 @command(
2774 b'files',
2774 b'files',
2775 [
2775 [
2776 (
2776 (
2777 b'r',
2777 b'r',
2778 b'rev',
2778 b'rev',
2779 b'',
2779 b'',
2780 _(b'search the repository as it is in REV'),
2780 _(b'search the repository as it is in REV'),
2781 _(b'REV'),
2781 _(b'REV'),
2782 ),
2782 ),
2783 (
2783 (
2784 b'0',
2784 b'0',
2785 b'print0',
2785 b'print0',
2786 None,
2786 None,
2787 _(b'end filenames with NUL, for use with xargs'),
2787 _(b'end filenames with NUL, for use with xargs'),
2788 ),
2788 ),
2789 ]
2789 ]
2790 + walkopts
2790 + walkopts
2791 + formatteropts
2791 + formatteropts
2792 + subrepoopts,
2792 + subrepoopts,
2793 _(b'[OPTION]... [FILE]...'),
2793 _(b'[OPTION]... [FILE]...'),
2794 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2794 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2795 intents={INTENT_READONLY},
2795 intents={INTENT_READONLY},
2796 )
2796 )
2797 def files(ui, repo, *pats, **opts):
2797 def files(ui, repo, *pats, **opts):
2798 """list tracked files
2798 """list tracked files
2799
2799
2800 Print files under Mercurial control in the working directory or
2800 Print files under Mercurial control in the working directory or
2801 specified revision for given files (excluding removed files).
2801 specified revision for given files (excluding removed files).
2802 Files can be specified as filenames or filesets.
2802 Files can be specified as filenames or filesets.
2803
2803
2804 If no files are given to match, this command prints the names
2804 If no files are given to match, this command prints the names
2805 of all files under Mercurial control.
2805 of all files under Mercurial control.
2806
2806
2807 .. container:: verbose
2807 .. container:: verbose
2808
2808
2809 Template:
2809 Template:
2810
2810
2811 The following keywords are supported in addition to the common template
2811 The following keywords are supported in addition to the common template
2812 keywords and functions. See also :hg:`help templates`.
2812 keywords and functions. See also :hg:`help templates`.
2813
2813
2814 :flags: String. Character denoting file's symlink and executable bits.
2814 :flags: String. Character denoting file's symlink and executable bits.
2815 :path: String. Repository-absolute path of the file.
2815 :path: String. Repository-absolute path of the file.
2816 :size: Integer. Size of the file in bytes.
2816 :size: Integer. Size of the file in bytes.
2817
2817
2818 Examples:
2818 Examples:
2819
2819
2820 - list all files under the current directory::
2820 - list all files under the current directory::
2821
2821
2822 hg files .
2822 hg files .
2823
2823
2824 - shows sizes and flags for current revision::
2824 - shows sizes and flags for current revision::
2825
2825
2826 hg files -vr .
2826 hg files -vr .
2827
2827
2828 - list all files named README::
2828 - list all files named README::
2829
2829
2830 hg files -I "**/README"
2830 hg files -I "**/README"
2831
2831
2832 - list all binary files::
2832 - list all binary files::
2833
2833
2834 hg files "set:binary()"
2834 hg files "set:binary()"
2835
2835
2836 - find files containing a regular expression::
2836 - find files containing a regular expression::
2837
2837
2838 hg files "set:grep('bob')"
2838 hg files "set:grep('bob')"
2839
2839
2840 - search tracked file contents with xargs and grep::
2840 - search tracked file contents with xargs and grep::
2841
2841
2842 hg files -0 | xargs -0 grep foo
2842 hg files -0 | xargs -0 grep foo
2843
2843
2844 See :hg:`help patterns` and :hg:`help filesets` for more information
2844 See :hg:`help patterns` and :hg:`help filesets` for more information
2845 on specifying file patterns.
2845 on specifying file patterns.
2846
2846
2847 Returns 0 if a match is found, 1 otherwise.
2847 Returns 0 if a match is found, 1 otherwise.
2848
2848
2849 """
2849 """
2850
2850
2851 opts = pycompat.byteskwargs(opts)
2851 opts = pycompat.byteskwargs(opts)
2852 rev = opts.get(b'rev')
2852 rev = opts.get(b'rev')
2853 if rev:
2853 if rev:
2854 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2854 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2855 ctx = scmutil.revsingle(repo, rev, None)
2855 ctx = scmutil.revsingle(repo, rev, None)
2856
2856
2857 end = b'\n'
2857 end = b'\n'
2858 if opts.get(b'print0'):
2858 if opts.get(b'print0'):
2859 end = b'\0'
2859 end = b'\0'
2860 fmt = b'%s' + end
2860 fmt = b'%s' + end
2861
2861
2862 m = scmutil.match(ctx, pats, opts)
2862 m = scmutil.match(ctx, pats, opts)
2863 ui.pager(b'files')
2863 ui.pager(b'files')
2864 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2864 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2865 with ui.formatter(b'files', opts) as fm:
2865 with ui.formatter(b'files', opts) as fm:
2866 return cmdutil.files(
2866 return cmdutil.files(
2867 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2867 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2868 )
2868 )
2869
2869
2870
2870
2871 @command(
2871 @command(
2872 b'forget',
2872 b'forget',
2873 [
2873 [
2874 (b'i', b'interactive', None, _(b'use interactive mode')),
2874 (b'i', b'interactive', None, _(b'use interactive mode')),
2875 ]
2875 ]
2876 + walkopts
2876 + walkopts
2877 + dryrunopts,
2877 + dryrunopts,
2878 _(b'[OPTION]... FILE...'),
2878 _(b'[OPTION]... FILE...'),
2879 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2879 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2880 helpbasic=True,
2880 helpbasic=True,
2881 inferrepo=True,
2881 inferrepo=True,
2882 )
2882 )
2883 def forget(ui, repo, *pats, **opts):
2883 def forget(ui, repo, *pats, **opts):
2884 """forget the specified files on the next commit
2884 """forget the specified files on the next commit
2885
2885
2886 Mark the specified files so they will no longer be tracked
2886 Mark the specified files so they will no longer be tracked
2887 after the next commit.
2887 after the next commit.
2888
2888
2889 This only removes files from the current branch, not from the
2889 This only removes files from the current branch, not from the
2890 entire project history, and it does not delete them from the
2890 entire project history, and it does not delete them from the
2891 working directory.
2891 working directory.
2892
2892
2893 To delete the file from the working directory, see :hg:`remove`.
2893 To delete the file from the working directory, see :hg:`remove`.
2894
2894
2895 To undo a forget before the next commit, see :hg:`add`.
2895 To undo a forget before the next commit, see :hg:`add`.
2896
2896
2897 .. container:: verbose
2897 .. container:: verbose
2898
2898
2899 Examples:
2899 Examples:
2900
2900
2901 - forget newly-added binary files::
2901 - forget newly-added binary files::
2902
2902
2903 hg forget "set:added() and binary()"
2903 hg forget "set:added() and binary()"
2904
2904
2905 - forget files that would be excluded by .hgignore::
2905 - forget files that would be excluded by .hgignore::
2906
2906
2907 hg forget "set:hgignore()"
2907 hg forget "set:hgignore()"
2908
2908
2909 Returns 0 on success.
2909 Returns 0 on success.
2910 """
2910 """
2911
2911
2912 opts = pycompat.byteskwargs(opts)
2912 opts = pycompat.byteskwargs(opts)
2913 if not pats:
2913 if not pats:
2914 raise error.InputError(_(b'no files specified'))
2914 raise error.InputError(_(b'no files specified'))
2915
2915
2916 m = scmutil.match(repo[None], pats, opts)
2916 m = scmutil.match(repo[None], pats, opts)
2917 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2917 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2918 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2918 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2919 rejected = cmdutil.forget(
2919 rejected = cmdutil.forget(
2920 ui,
2920 ui,
2921 repo,
2921 repo,
2922 m,
2922 m,
2923 prefix=b"",
2923 prefix=b"",
2924 uipathfn=uipathfn,
2924 uipathfn=uipathfn,
2925 explicitonly=False,
2925 explicitonly=False,
2926 dryrun=dryrun,
2926 dryrun=dryrun,
2927 interactive=interactive,
2927 interactive=interactive,
2928 )[0]
2928 )[0]
2929 return rejected and 1 or 0
2929 return rejected and 1 or 0
2930
2930
2931
2931
2932 @command(
2932 @command(
2933 b'graft',
2933 b'graft',
2934 [
2934 [
2935 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2935 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2936 (
2936 (
2937 b'',
2937 b'',
2938 b'base',
2938 b'base',
2939 b'',
2939 b'',
2940 _(b'base revision when doing the graft merge (ADVANCED)'),
2940 _(b'base revision when doing the graft merge (ADVANCED)'),
2941 _(b'REV'),
2941 _(b'REV'),
2942 ),
2942 ),
2943 (b'c', b'continue', False, _(b'resume interrupted graft')),
2943 (b'c', b'continue', False, _(b'resume interrupted graft')),
2944 (b'', b'stop', False, _(b'stop interrupted graft')),
2944 (b'', b'stop', False, _(b'stop interrupted graft')),
2945 (b'', b'abort', False, _(b'abort interrupted graft')),
2945 (b'', b'abort', False, _(b'abort interrupted graft')),
2946 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2946 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2947 (b'', b'log', None, _(b'append graft info to log message')),
2947 (b'', b'log', None, _(b'append graft info to log message')),
2948 (
2948 (
2949 b'',
2949 b'',
2950 b'no-commit',
2950 b'no-commit',
2951 None,
2951 None,
2952 _(b"don't commit, just apply the changes in working directory"),
2952 _(b"don't commit, just apply the changes in working directory"),
2953 ),
2953 ),
2954 (b'f', b'force', False, _(b'force graft')),
2954 (b'f', b'force', False, _(b'force graft')),
2955 (
2955 (
2956 b'D',
2956 b'D',
2957 b'currentdate',
2957 b'currentdate',
2958 False,
2958 False,
2959 _(b'record the current date as commit date'),
2959 _(b'record the current date as commit date'),
2960 ),
2960 ),
2961 (
2961 (
2962 b'U',
2962 b'U',
2963 b'currentuser',
2963 b'currentuser',
2964 False,
2964 False,
2965 _(b'record the current user as committer'),
2965 _(b'record the current user as committer'),
2966 ),
2966 ),
2967 ]
2967 ]
2968 + commitopts2
2968 + commitopts2
2969 + mergetoolopts
2969 + mergetoolopts
2970 + dryrunopts,
2970 + dryrunopts,
2971 _(b'[OPTION]... [-r REV]... REV...'),
2971 _(b'[OPTION]... [-r REV]... REV...'),
2972 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2972 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2973 )
2973 )
2974 def graft(ui, repo, *revs, **opts):
2974 def graft(ui, repo, *revs, **opts):
2975 """copy changes from other branches onto the current branch
2975 """copy changes from other branches onto the current branch
2976
2976
2977 This command uses Mercurial's merge logic to copy individual
2977 This command uses Mercurial's merge logic to copy individual
2978 changes from other branches without merging branches in the
2978 changes from other branches without merging branches in the
2979 history graph. This is sometimes known as 'backporting' or
2979 history graph. This is sometimes known as 'backporting' or
2980 'cherry-picking'. By default, graft will copy user, date, and
2980 'cherry-picking'. By default, graft will copy user, date, and
2981 description from the source changesets.
2981 description from the source changesets.
2982
2982
2983 Changesets that are ancestors of the current revision, that have
2983 Changesets that are ancestors of the current revision, that have
2984 already been grafted, or that are merges will be skipped.
2984 already been grafted, or that are merges will be skipped.
2985
2985
2986 If --log is specified, log messages will have a comment appended
2986 If --log is specified, log messages will have a comment appended
2987 of the form::
2987 of the form::
2988
2988
2989 (grafted from CHANGESETHASH)
2989 (grafted from CHANGESETHASH)
2990
2990
2991 If --force is specified, revisions will be grafted even if they
2991 If --force is specified, revisions will be grafted even if they
2992 are already ancestors of, or have been grafted to, the destination.
2992 are already ancestors of, or have been grafted to, the destination.
2993 This is useful when the revisions have since been backed out.
2993 This is useful when the revisions have since been backed out.
2994
2994
2995 If a graft merge results in conflicts, the graft process is
2995 If a graft merge results in conflicts, the graft process is
2996 interrupted so that the current merge can be manually resolved.
2996 interrupted so that the current merge can be manually resolved.
2997 Once all conflicts are addressed, the graft process can be
2997 Once all conflicts are addressed, the graft process can be
2998 continued with the -c/--continue option.
2998 continued with the -c/--continue option.
2999
2999
3000 The -c/--continue option reapplies all the earlier options.
3000 The -c/--continue option reapplies all the earlier options.
3001
3001
3002 .. container:: verbose
3002 .. container:: verbose
3003
3003
3004 The --base option exposes more of how graft internally uses merge with a
3004 The --base option exposes more of how graft internally uses merge with a
3005 custom base revision. --base can be used to specify another ancestor than
3005 custom base revision. --base can be used to specify another ancestor than
3006 the first and only parent.
3006 the first and only parent.
3007
3007
3008 The command::
3008 The command::
3009
3009
3010 hg graft -r 345 --base 234
3010 hg graft -r 345 --base 234
3011
3011
3012 is thus pretty much the same as::
3012 is thus pretty much the same as::
3013
3013
3014 hg diff --from 234 --to 345 | hg import
3014 hg diff --from 234 --to 345 | hg import
3015
3015
3016 but using merge to resolve conflicts and track moved files.
3016 but using merge to resolve conflicts and track moved files.
3017
3017
3018 The result of a merge can thus be backported as a single commit by
3018 The result of a merge can thus be backported as a single commit by
3019 specifying one of the merge parents as base, and thus effectively
3019 specifying one of the merge parents as base, and thus effectively
3020 grafting the changes from the other side.
3020 grafting the changes from the other side.
3021
3021
3022 It is also possible to collapse multiple changesets and clean up history
3022 It is also possible to collapse multiple changesets and clean up history
3023 by specifying another ancestor as base, much like rebase --collapse
3023 by specifying another ancestor as base, much like rebase --collapse
3024 --keep.
3024 --keep.
3025
3025
3026 The commit message can be tweaked after the fact using commit --amend .
3026 The commit message can be tweaked after the fact using commit --amend .
3027
3027
3028 For using non-ancestors as the base to backout changes, see the backout
3028 For using non-ancestors as the base to backout changes, see the backout
3029 command and the hidden --parent option.
3029 command and the hidden --parent option.
3030
3030
3031 .. container:: verbose
3031 .. container:: verbose
3032
3032
3033 Examples:
3033 Examples:
3034
3034
3035 - copy a single change to the stable branch and edit its description::
3035 - copy a single change to the stable branch and edit its description::
3036
3036
3037 hg update stable
3037 hg update stable
3038 hg graft --edit 9393
3038 hg graft --edit 9393
3039
3039
3040 - graft a range of changesets with one exception, updating dates::
3040 - graft a range of changesets with one exception, updating dates::
3041
3041
3042 hg graft -D "2085::2093 and not 2091"
3042 hg graft -D "2085::2093 and not 2091"
3043
3043
3044 - continue a graft after resolving conflicts::
3044 - continue a graft after resolving conflicts::
3045
3045
3046 hg graft -c
3046 hg graft -c
3047
3047
3048 - show the source of a grafted changeset::
3048 - show the source of a grafted changeset::
3049
3049
3050 hg log --debug -r .
3050 hg log --debug -r .
3051
3051
3052 - show revisions sorted by date::
3052 - show revisions sorted by date::
3053
3053
3054 hg log -r "sort(all(), date)"
3054 hg log -r "sort(all(), date)"
3055
3055
3056 - backport the result of a merge as a single commit::
3056 - backport the result of a merge as a single commit::
3057
3057
3058 hg graft -r 123 --base 123^
3058 hg graft -r 123 --base 123^
3059
3059
3060 - land a feature branch as one changeset::
3060 - land a feature branch as one changeset::
3061
3061
3062 hg up -cr default
3062 hg up -cr default
3063 hg graft -r featureX --base "ancestor('featureX', 'default')"
3063 hg graft -r featureX --base "ancestor('featureX', 'default')"
3064
3064
3065 See :hg:`help revisions` for more about specifying revisions.
3065 See :hg:`help revisions` for more about specifying revisions.
3066
3066
3067 Returns 0 on successful completion, 1 if there are unresolved files.
3067 Returns 0 on successful completion, 1 if there are unresolved files.
3068 """
3068 """
3069 with repo.wlock():
3069 with repo.wlock():
3070 return _dograft(ui, repo, *revs, **opts)
3070 return _dograft(ui, repo, *revs, **opts)
3071
3071
3072
3072
3073 def _dograft(ui, repo, *revs, **opts):
3073 def _dograft(ui, repo, *revs, **opts):
3074 opts = pycompat.byteskwargs(opts)
3074 opts = pycompat.byteskwargs(opts)
3075 if revs and opts.get(b'rev'):
3075 if revs and opts.get(b'rev'):
3076 ui.warn(
3076 ui.warn(
3077 _(
3077 _(
3078 b'warning: inconsistent use of --rev might give unexpected '
3078 b'warning: inconsistent use of --rev might give unexpected '
3079 b'revision ordering!\n'
3079 b'revision ordering!\n'
3080 )
3080 )
3081 )
3081 )
3082
3082
3083 revs = list(revs)
3083 revs = list(revs)
3084 revs.extend(opts.get(b'rev'))
3084 revs.extend(opts.get(b'rev'))
3085 # a dict of data to be stored in state file
3085 # a dict of data to be stored in state file
3086 statedata = {}
3086 statedata = {}
3087 # list of new nodes created by ongoing graft
3087 # list of new nodes created by ongoing graft
3088 statedata[b'newnodes'] = []
3088 statedata[b'newnodes'] = []
3089
3089
3090 cmdutil.resolvecommitoptions(ui, opts)
3090 cmdutil.resolvecommitoptions(ui, opts)
3091
3091
3092 editor = cmdutil.getcommiteditor(
3092 editor = cmdutil.getcommiteditor(
3093 editform=b'graft', **pycompat.strkwargs(opts)
3093 editform=b'graft', **pycompat.strkwargs(opts)
3094 )
3094 )
3095
3095
3096 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3096 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3097
3097
3098 cont = False
3098 cont = False
3099 if opts.get(b'no_commit'):
3099 if opts.get(b'no_commit'):
3100 cmdutil.check_incompatible_arguments(
3100 cmdutil.check_incompatible_arguments(
3101 opts,
3101 opts,
3102 b'no_commit',
3102 b'no_commit',
3103 [b'edit', b'currentuser', b'currentdate', b'log'],
3103 [b'edit', b'currentuser', b'currentdate', b'log'],
3104 )
3104 )
3105
3105
3106 graftstate = statemod.cmdstate(repo, b'graftstate')
3106 graftstate = statemod.cmdstate(repo, b'graftstate')
3107
3107
3108 if opts.get(b'stop'):
3108 if opts.get(b'stop'):
3109 cmdutil.check_incompatible_arguments(
3109 cmdutil.check_incompatible_arguments(
3110 opts,
3110 opts,
3111 b'stop',
3111 b'stop',
3112 [
3112 [
3113 b'edit',
3113 b'edit',
3114 b'log',
3114 b'log',
3115 b'user',
3115 b'user',
3116 b'date',
3116 b'date',
3117 b'currentdate',
3117 b'currentdate',
3118 b'currentuser',
3118 b'currentuser',
3119 b'rev',
3119 b'rev',
3120 ],
3120 ],
3121 )
3121 )
3122 return _stopgraft(ui, repo, graftstate)
3122 return _stopgraft(ui, repo, graftstate)
3123 elif opts.get(b'abort'):
3123 elif opts.get(b'abort'):
3124 cmdutil.check_incompatible_arguments(
3124 cmdutil.check_incompatible_arguments(
3125 opts,
3125 opts,
3126 b'abort',
3126 b'abort',
3127 [
3127 [
3128 b'edit',
3128 b'edit',
3129 b'log',
3129 b'log',
3130 b'user',
3130 b'user',
3131 b'date',
3131 b'date',
3132 b'currentdate',
3132 b'currentdate',
3133 b'currentuser',
3133 b'currentuser',
3134 b'rev',
3134 b'rev',
3135 ],
3135 ],
3136 )
3136 )
3137 return cmdutil.abortgraft(ui, repo, graftstate)
3137 return cmdutil.abortgraft(ui, repo, graftstate)
3138 elif opts.get(b'continue'):
3138 elif opts.get(b'continue'):
3139 cont = True
3139 cont = True
3140 if revs:
3140 if revs:
3141 raise error.InputError(_(b"can't specify --continue and revisions"))
3141 raise error.InputError(_(b"can't specify --continue and revisions"))
3142 # read in unfinished revisions
3142 # read in unfinished revisions
3143 if graftstate.exists():
3143 if graftstate.exists():
3144 statedata = cmdutil.readgraftstate(repo, graftstate)
3144 statedata = cmdutil.readgraftstate(repo, graftstate)
3145 if statedata.get(b'date'):
3145 if statedata.get(b'date'):
3146 opts[b'date'] = statedata[b'date']
3146 opts[b'date'] = statedata[b'date']
3147 if statedata.get(b'user'):
3147 if statedata.get(b'user'):
3148 opts[b'user'] = statedata[b'user']
3148 opts[b'user'] = statedata[b'user']
3149 if statedata.get(b'log'):
3149 if statedata.get(b'log'):
3150 opts[b'log'] = True
3150 opts[b'log'] = True
3151 if statedata.get(b'no_commit'):
3151 if statedata.get(b'no_commit'):
3152 opts[b'no_commit'] = statedata.get(b'no_commit')
3152 opts[b'no_commit'] = statedata.get(b'no_commit')
3153 if statedata.get(b'base'):
3153 if statedata.get(b'base'):
3154 opts[b'base'] = statedata.get(b'base')
3154 opts[b'base'] = statedata.get(b'base')
3155 nodes = statedata[b'nodes']
3155 nodes = statedata[b'nodes']
3156 revs = [repo[node].rev() for node in nodes]
3156 revs = [repo[node].rev() for node in nodes]
3157 else:
3157 else:
3158 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3158 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3159 else:
3159 else:
3160 if not revs:
3160 if not revs:
3161 raise error.InputError(_(b'no revisions specified'))
3161 raise error.InputError(_(b'no revisions specified'))
3162 cmdutil.checkunfinished(repo)
3162 cmdutil.checkunfinished(repo)
3163 cmdutil.bailifchanged(repo)
3163 cmdutil.bailifchanged(repo)
3164 revs = scmutil.revrange(repo, revs)
3164 revs = scmutil.revrange(repo, revs)
3165
3165
3166 skipped = set()
3166 skipped = set()
3167 basectx = None
3167 basectx = None
3168 if opts.get(b'base'):
3168 if opts.get(b'base'):
3169 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3169 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3170 if basectx is None:
3170 if basectx is None:
3171 # check for merges
3171 # check for merges
3172 for rev in repo.revs(b'%ld and merge()', revs):
3172 for rev in repo.revs(b'%ld and merge()', revs):
3173 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3173 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3174 skipped.add(rev)
3174 skipped.add(rev)
3175 revs = [r for r in revs if r not in skipped]
3175 revs = [r for r in revs if r not in skipped]
3176 if not revs:
3176 if not revs:
3177 return -1
3177 return -1
3178 if basectx is not None and len(revs) != 1:
3178 if basectx is not None and len(revs) != 1:
3179 raise error.InputError(_(b'only one revision allowed with --base '))
3179 raise error.InputError(_(b'only one revision allowed with --base '))
3180
3180
3181 # Don't check in the --continue case, in effect retaining --force across
3181 # Don't check in the --continue case, in effect retaining --force across
3182 # --continues. That's because without --force, any revisions we decided to
3182 # --continues. That's because without --force, any revisions we decided to
3183 # skip would have been filtered out here, so they wouldn't have made their
3183 # skip would have been filtered out here, so they wouldn't have made their
3184 # way to the graftstate. With --force, any revisions we would have otherwise
3184 # way to the graftstate. With --force, any revisions we would have otherwise
3185 # skipped would not have been filtered out, and if they hadn't been applied
3185 # skipped would not have been filtered out, and if they hadn't been applied
3186 # already, they'd have been in the graftstate.
3186 # already, they'd have been in the graftstate.
3187 if not (cont or opts.get(b'force')) and basectx is None:
3187 if not (cont or opts.get(b'force')) and basectx is None:
3188 # check for ancestors of dest branch
3188 # check for ancestors of dest branch
3189 ancestors = repo.revs(b'%ld & (::.)', revs)
3189 ancestors = repo.revs(b'%ld & (::.)', revs)
3190 for rev in ancestors:
3190 for rev in ancestors:
3191 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3191 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3192
3192
3193 revs = [r for r in revs if r not in ancestors]
3193 revs = [r for r in revs if r not in ancestors]
3194
3194
3195 if not revs:
3195 if not revs:
3196 return -1
3196 return -1
3197
3197
3198 # analyze revs for earlier grafts
3198 # analyze revs for earlier grafts
3199 ids = {}
3199 ids = {}
3200 for ctx in repo.set(b"%ld", revs):
3200 for ctx in repo.set(b"%ld", revs):
3201 ids[ctx.hex()] = ctx.rev()
3201 ids[ctx.hex()] = ctx.rev()
3202 n = ctx.extra().get(b'source')
3202 n = ctx.extra().get(b'source')
3203 if n:
3203 if n:
3204 ids[n] = ctx.rev()
3204 ids[n] = ctx.rev()
3205
3205
3206 # check ancestors for earlier grafts
3206 # check ancestors for earlier grafts
3207 ui.debug(b'scanning for duplicate grafts\n')
3207 ui.debug(b'scanning for duplicate grafts\n')
3208
3208
3209 # The only changesets we can be sure doesn't contain grafts of any
3209 # The only changesets we can be sure doesn't contain grafts of any
3210 # revs, are the ones that are common ancestors of *all* revs:
3210 # revs, are the ones that are common ancestors of *all* revs:
3211 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3211 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3212 ctx = repo[rev]
3212 ctx = repo[rev]
3213 n = ctx.extra().get(b'source')
3213 n = ctx.extra().get(b'source')
3214 if n in ids:
3214 if n in ids:
3215 try:
3215 try:
3216 r = repo[n].rev()
3216 r = repo[n].rev()
3217 except error.RepoLookupError:
3217 except error.RepoLookupError:
3218 r = None
3218 r = None
3219 if r in revs:
3219 if r in revs:
3220 ui.warn(
3220 ui.warn(
3221 _(
3221 _(
3222 b'skipping revision %d:%s '
3222 b'skipping revision %d:%s '
3223 b'(already grafted to %d:%s)\n'
3223 b'(already grafted to %d:%s)\n'
3224 )
3224 )
3225 % (r, repo[r], rev, ctx)
3225 % (r, repo[r], rev, ctx)
3226 )
3226 )
3227 revs.remove(r)
3227 revs.remove(r)
3228 elif ids[n] in revs:
3228 elif ids[n] in revs:
3229 if r is None:
3229 if r is None:
3230 ui.warn(
3230 ui.warn(
3231 _(
3231 _(
3232 b'skipping already grafted revision %d:%s '
3232 b'skipping already grafted revision %d:%s '
3233 b'(%d:%s also has unknown origin %s)\n'
3233 b'(%d:%s also has unknown origin %s)\n'
3234 )
3234 )
3235 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3235 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3236 )
3236 )
3237 else:
3237 else:
3238 ui.warn(
3238 ui.warn(
3239 _(
3239 _(
3240 b'skipping already grafted revision %d:%s '
3240 b'skipping already grafted revision %d:%s '
3241 b'(%d:%s also has origin %d:%s)\n'
3241 b'(%d:%s also has origin %d:%s)\n'
3242 )
3242 )
3243 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3243 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3244 )
3244 )
3245 revs.remove(ids[n])
3245 revs.remove(ids[n])
3246 elif ctx.hex() in ids:
3246 elif ctx.hex() in ids:
3247 r = ids[ctx.hex()]
3247 r = ids[ctx.hex()]
3248 if r in revs:
3248 if r in revs:
3249 ui.warn(
3249 ui.warn(
3250 _(
3250 _(
3251 b'skipping already grafted revision %d:%s '
3251 b'skipping already grafted revision %d:%s '
3252 b'(was grafted from %d:%s)\n'
3252 b'(was grafted from %d:%s)\n'
3253 )
3253 )
3254 % (r, repo[r], rev, ctx)
3254 % (r, repo[r], rev, ctx)
3255 )
3255 )
3256 revs.remove(r)
3256 revs.remove(r)
3257 if not revs:
3257 if not revs:
3258 return -1
3258 return -1
3259
3259
3260 if opts.get(b'no_commit'):
3260 if opts.get(b'no_commit'):
3261 statedata[b'no_commit'] = True
3261 statedata[b'no_commit'] = True
3262 if opts.get(b'base'):
3262 if opts.get(b'base'):
3263 statedata[b'base'] = opts[b'base']
3263 statedata[b'base'] = opts[b'base']
3264 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3264 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3265 desc = b'%d:%s "%s"' % (
3265 desc = b'%d:%s "%s"' % (
3266 ctx.rev(),
3266 ctx.rev(),
3267 ctx,
3267 ctx,
3268 ctx.description().split(b'\n', 1)[0],
3268 ctx.description().split(b'\n', 1)[0],
3269 )
3269 )
3270 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3270 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3271 if names:
3271 if names:
3272 desc += b' (%s)' % b' '.join(names)
3272 desc += b' (%s)' % b' '.join(names)
3273 ui.status(_(b'grafting %s\n') % desc)
3273 ui.status(_(b'grafting %s\n') % desc)
3274 if opts.get(b'dry_run'):
3274 if opts.get(b'dry_run'):
3275 continue
3275 continue
3276
3276
3277 source = ctx.extra().get(b'source')
3277 source = ctx.extra().get(b'source')
3278 extra = {}
3278 extra = {}
3279 if source:
3279 if source:
3280 extra[b'source'] = source
3280 extra[b'source'] = source
3281 extra[b'intermediate-source'] = ctx.hex()
3281 extra[b'intermediate-source'] = ctx.hex()
3282 else:
3282 else:
3283 extra[b'source'] = ctx.hex()
3283 extra[b'source'] = ctx.hex()
3284 user = ctx.user()
3284 user = ctx.user()
3285 if opts.get(b'user'):
3285 if opts.get(b'user'):
3286 user = opts[b'user']
3286 user = opts[b'user']
3287 statedata[b'user'] = user
3287 statedata[b'user'] = user
3288 date = ctx.date()
3288 date = ctx.date()
3289 if opts.get(b'date'):
3289 if opts.get(b'date'):
3290 date = opts[b'date']
3290 date = opts[b'date']
3291 statedata[b'date'] = date
3291 statedata[b'date'] = date
3292 message = ctx.description()
3292 message = ctx.description()
3293 if opts.get(b'log'):
3293 if opts.get(b'log'):
3294 message += b'\n(grafted from %s)' % ctx.hex()
3294 message += b'\n(grafted from %s)' % ctx.hex()
3295 statedata[b'log'] = True
3295 statedata[b'log'] = True
3296
3296
3297 # we don't merge the first commit when continuing
3297 # we don't merge the first commit when continuing
3298 if not cont:
3298 if not cont:
3299 # perform the graft merge with p1(rev) as 'ancestor'
3299 # perform the graft merge with p1(rev) as 'ancestor'
3300 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3300 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3301 base = ctx.p1() if basectx is None else basectx
3301 base = ctx.p1() if basectx is None else basectx
3302 with ui.configoverride(overrides, b'graft'):
3302 with ui.configoverride(overrides, b'graft'):
3303 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3303 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3304 # report any conflicts
3304 # report any conflicts
3305 if stats.unresolvedcount > 0:
3305 if stats.unresolvedcount > 0:
3306 # write out state for --continue
3306 # write out state for --continue
3307 nodes = [repo[rev].hex() for rev in revs[pos:]]
3307 nodes = [repo[rev].hex() for rev in revs[pos:]]
3308 statedata[b'nodes'] = nodes
3308 statedata[b'nodes'] = nodes
3309 stateversion = 1
3309 stateversion = 1
3310 graftstate.save(stateversion, statedata)
3310 graftstate.save(stateversion, statedata)
3311 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3311 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3312 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3312 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3313 return 1
3313 return 1
3314 else:
3314 else:
3315 cont = False
3315 cont = False
3316
3316
3317 # commit if --no-commit is false
3317 # commit if --no-commit is false
3318 if not opts.get(b'no_commit'):
3318 if not opts.get(b'no_commit'):
3319 node = repo.commit(
3319 node = repo.commit(
3320 text=message, user=user, date=date, extra=extra, editor=editor
3320 text=message, user=user, date=date, extra=extra, editor=editor
3321 )
3321 )
3322 if node is None:
3322 if node is None:
3323 ui.warn(
3323 ui.warn(
3324 _(b'note: graft of %d:%s created no changes to commit\n')
3324 _(b'note: graft of %d:%s created no changes to commit\n')
3325 % (ctx.rev(), ctx)
3325 % (ctx.rev(), ctx)
3326 )
3326 )
3327 # checking that newnodes exist because old state files won't have it
3327 # checking that newnodes exist because old state files won't have it
3328 elif statedata.get(b'newnodes') is not None:
3328 elif statedata.get(b'newnodes') is not None:
3329 nn = statedata[b'newnodes'] # type: List[bytes]
3329 nn = statedata[b'newnodes'] # type: List[bytes]
3330 nn.append(node)
3330 nn.append(node)
3331
3331
3332 # remove state when we complete successfully
3332 # remove state when we complete successfully
3333 if not opts.get(b'dry_run'):
3333 if not opts.get(b'dry_run'):
3334 graftstate.delete()
3334 graftstate.delete()
3335
3335
3336 return 0
3336 return 0
3337
3337
3338
3338
3339 def _stopgraft(ui, repo, graftstate):
3339 def _stopgraft(ui, repo, graftstate):
3340 """stop the interrupted graft"""
3340 """stop the interrupted graft"""
3341 if not graftstate.exists():
3341 if not graftstate.exists():
3342 raise error.StateError(_(b"no interrupted graft found"))
3342 raise error.StateError(_(b"no interrupted graft found"))
3343 pctx = repo[b'.']
3343 pctx = repo[b'.']
3344 mergemod.clean_update(pctx)
3344 mergemod.clean_update(pctx)
3345 graftstate.delete()
3345 graftstate.delete()
3346 ui.status(_(b"stopped the interrupted graft\n"))
3346 ui.status(_(b"stopped the interrupted graft\n"))
3347 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3347 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3348 return 0
3348 return 0
3349
3349
3350
3350
3351 statemod.addunfinished(
3351 statemod.addunfinished(
3352 b'graft',
3352 b'graft',
3353 fname=b'graftstate',
3353 fname=b'graftstate',
3354 clearable=True,
3354 clearable=True,
3355 stopflag=True,
3355 stopflag=True,
3356 continueflag=True,
3356 continueflag=True,
3357 abortfunc=cmdutil.hgabortgraft,
3357 abortfunc=cmdutil.hgabortgraft,
3358 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3358 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3359 )
3359 )
3360
3360
3361
3361
3362 @command(
3362 @command(
3363 b'grep',
3363 b'grep',
3364 [
3364 [
3365 (b'0', b'print0', None, _(b'end fields with NUL')),
3365 (b'0', b'print0', None, _(b'end fields with NUL')),
3366 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3366 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3367 (
3367 (
3368 b'',
3368 b'',
3369 b'diff',
3369 b'diff',
3370 None,
3370 None,
3371 _(
3371 _(
3372 b'search revision differences for when the pattern was added '
3372 b'search revision differences for when the pattern was added '
3373 b'or removed'
3373 b'or removed'
3374 ),
3374 ),
3375 ),
3375 ),
3376 (b'a', b'text', None, _(b'treat all files as text')),
3376 (b'a', b'text', None, _(b'treat all files as text')),
3377 (
3377 (
3378 b'f',
3378 b'f',
3379 b'follow',
3379 b'follow',
3380 None,
3380 None,
3381 _(
3381 _(
3382 b'follow changeset history,'
3382 b'follow changeset history,'
3383 b' or file history across copies and renames'
3383 b' or file history across copies and renames'
3384 ),
3384 ),
3385 ),
3385 ),
3386 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3386 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3387 (
3387 (
3388 b'l',
3388 b'l',
3389 b'files-with-matches',
3389 b'files-with-matches',
3390 None,
3390 None,
3391 _(b'print only filenames and revisions that match'),
3391 _(b'print only filenames and revisions that match'),
3392 ),
3392 ),
3393 (b'n', b'line-number', None, _(b'print matching line numbers')),
3393 (b'n', b'line-number', None, _(b'print matching line numbers')),
3394 (
3394 (
3395 b'r',
3395 b'r',
3396 b'rev',
3396 b'rev',
3397 [],
3397 [],
3398 _(b'search files changed within revision range'),
3398 _(b'search files changed within revision range'),
3399 _(b'REV'),
3399 _(b'REV'),
3400 ),
3400 ),
3401 (
3401 (
3402 b'',
3402 b'',
3403 b'all-files',
3403 b'all-files',
3404 None,
3404 None,
3405 _(
3405 _(
3406 b'include all files in the changeset while grepping (DEPRECATED)'
3406 b'include all files in the changeset while grepping (DEPRECATED)'
3407 ),
3407 ),
3408 ),
3408 ),
3409 (b'u', b'user', None, _(b'list the author (long with -v)')),
3409 (b'u', b'user', None, _(b'list the author (long with -v)')),
3410 (b'd', b'date', None, _(b'list the date (short with -q)')),
3410 (b'd', b'date', None, _(b'list the date (short with -q)')),
3411 ]
3411 ]
3412 + formatteropts
3412 + formatteropts
3413 + walkopts,
3413 + walkopts,
3414 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3414 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3415 helpcategory=command.CATEGORY_FILE_CONTENTS,
3415 helpcategory=command.CATEGORY_FILE_CONTENTS,
3416 inferrepo=True,
3416 inferrepo=True,
3417 intents={INTENT_READONLY},
3417 intents={INTENT_READONLY},
3418 )
3418 )
3419 def grep(ui, repo, pattern, *pats, **opts):
3419 def grep(ui, repo, pattern, *pats, **opts):
3420 """search for a pattern in specified files
3420 """search for a pattern in specified files
3421
3421
3422 Search the working directory or revision history for a regular
3422 Search the working directory or revision history for a regular
3423 expression in the specified files for the entire repository.
3423 expression in the specified files for the entire repository.
3424
3424
3425 By default, grep searches the repository files in the working
3425 By default, grep searches the repository files in the working
3426 directory and prints the files where it finds a match. To specify
3426 directory and prints the files where it finds a match. To specify
3427 historical revisions instead of the working directory, use the
3427 historical revisions instead of the working directory, use the
3428 --rev flag.
3428 --rev flag.
3429
3429
3430 To search instead historical revision differences that contains a
3430 To search instead historical revision differences that contains a
3431 change in match status ("-" for a match that becomes a non-match,
3431 change in match status ("-" for a match that becomes a non-match,
3432 or "+" for a non-match that becomes a match), use the --diff flag.
3432 or "+" for a non-match that becomes a match), use the --diff flag.
3433
3433
3434 PATTERN can be any Python (roughly Perl-compatible) regular
3434 PATTERN can be any Python (roughly Perl-compatible) regular
3435 expression.
3435 expression.
3436
3436
3437 If no FILEs are specified and the --rev flag isn't supplied, all
3437 If no FILEs are specified and the --rev flag isn't supplied, all
3438 files in the working directory are searched. When using the --rev
3438 files in the working directory are searched. When using the --rev
3439 flag and specifying FILEs, use the --follow argument to also
3439 flag and specifying FILEs, use the --follow argument to also
3440 follow the specified FILEs across renames and copies.
3440 follow the specified FILEs across renames and copies.
3441
3441
3442 .. container:: verbose
3442 .. container:: verbose
3443
3443
3444 Template:
3444 Template:
3445
3445
3446 The following keywords are supported in addition to the common template
3446 The following keywords are supported in addition to the common template
3447 keywords and functions. See also :hg:`help templates`.
3447 keywords and functions. See also :hg:`help templates`.
3448
3448
3449 :change: String. Character denoting insertion ``+`` or removal ``-``.
3449 :change: String. Character denoting insertion ``+`` or removal ``-``.
3450 Available if ``--diff`` is specified.
3450 Available if ``--diff`` is specified.
3451 :lineno: Integer. Line number of the match.
3451 :lineno: Integer. Line number of the match.
3452 :path: String. Repository-absolute path of the file.
3452 :path: String. Repository-absolute path of the file.
3453 :texts: List of text chunks.
3453 :texts: List of text chunks.
3454
3454
3455 And each entry of ``{texts}`` provides the following sub-keywords.
3455 And each entry of ``{texts}`` provides the following sub-keywords.
3456
3456
3457 :matched: Boolean. True if the chunk matches the specified pattern.
3457 :matched: Boolean. True if the chunk matches the specified pattern.
3458 :text: String. Chunk content.
3458 :text: String. Chunk content.
3459
3459
3460 See :hg:`help templates.operators` for the list expansion syntax.
3460 See :hg:`help templates.operators` for the list expansion syntax.
3461
3461
3462 Returns 0 if a match is found, 1 otherwise.
3462 Returns 0 if a match is found, 1 otherwise.
3463
3463
3464 """
3464 """
3465 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3465 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3466 opts = pycompat.byteskwargs(opts)
3466 opts = pycompat.byteskwargs(opts)
3467 diff = opts.get(b'all') or opts.get(b'diff')
3467 diff = opts.get(b'all') or opts.get(b'diff')
3468 follow = opts.get(b'follow')
3468 follow = opts.get(b'follow')
3469 if opts.get(b'all_files') is None and not diff:
3469 if opts.get(b'all_files') is None and not diff:
3470 opts[b'all_files'] = True
3470 opts[b'all_files'] = True
3471 plaingrep = (
3471 plaingrep = (
3472 opts.get(b'all_files')
3472 opts.get(b'all_files')
3473 and not opts.get(b'rev')
3473 and not opts.get(b'rev')
3474 and not opts.get(b'follow')
3474 and not opts.get(b'follow')
3475 )
3475 )
3476 all_files = opts.get(b'all_files')
3476 all_files = opts.get(b'all_files')
3477 if plaingrep:
3477 if plaingrep:
3478 opts[b'rev'] = [b'wdir()']
3478 opts[b'rev'] = [b'wdir()']
3479
3479
3480 reflags = re.M
3480 reflags = re.M
3481 if opts.get(b'ignore_case'):
3481 if opts.get(b'ignore_case'):
3482 reflags |= re.I
3482 reflags |= re.I
3483 try:
3483 try:
3484 regexp = util.re.compile(pattern, reflags)
3484 regexp = util.re.compile(pattern, reflags)
3485 except re.error as inst:
3485 except re.error as inst:
3486 ui.warn(
3486 ui.warn(
3487 _(b"grep: invalid match pattern: %s\n")
3487 _(b"grep: invalid match pattern: %s\n")
3488 % stringutil.forcebytestr(inst)
3488 % stringutil.forcebytestr(inst)
3489 )
3489 )
3490 return 1
3490 return 1
3491 sep, eol = b':', b'\n'
3491 sep, eol = b':', b'\n'
3492 if opts.get(b'print0'):
3492 if opts.get(b'print0'):
3493 sep = eol = b'\0'
3493 sep = eol = b'\0'
3494
3494
3495 searcher = grepmod.grepsearcher(
3495 searcher = grepmod.grepsearcher(
3496 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3496 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3497 )
3497 )
3498
3498
3499 getfile = searcher._getfile
3499 getfile = searcher._getfile
3500
3500
3501 uipathfn = scmutil.getuipathfn(repo)
3501 uipathfn = scmutil.getuipathfn(repo)
3502
3502
3503 def display(fm, fn, ctx, pstates, states):
3503 def display(fm, fn, ctx, pstates, states):
3504 rev = scmutil.intrev(ctx)
3504 rev = scmutil.intrev(ctx)
3505 if fm.isplain():
3505 if fm.isplain():
3506 formatuser = ui.shortuser
3506 formatuser = ui.shortuser
3507 else:
3507 else:
3508 formatuser = pycompat.bytestr
3508 formatuser = pycompat.bytestr
3509 if ui.quiet:
3509 if ui.quiet:
3510 datefmt = b'%Y-%m-%d'
3510 datefmt = b'%Y-%m-%d'
3511 else:
3511 else:
3512 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3512 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3513 found = False
3513 found = False
3514
3514
3515 @util.cachefunc
3515 @util.cachefunc
3516 def binary():
3516 def binary():
3517 flog = getfile(fn)
3517 flog = getfile(fn)
3518 try:
3518 try:
3519 return stringutil.binary(flog.read(ctx.filenode(fn)))
3519 return stringutil.binary(flog.read(ctx.filenode(fn)))
3520 except error.WdirUnsupported:
3520 except error.WdirUnsupported:
3521 return ctx[fn].isbinary()
3521 return ctx[fn].isbinary()
3522
3522
3523 fieldnamemap = {b'linenumber': b'lineno'}
3523 fieldnamemap = {b'linenumber': b'lineno'}
3524 if diff:
3524 if diff:
3525 iter = grepmod.difflinestates(pstates, states)
3525 iter = grepmod.difflinestates(pstates, states)
3526 else:
3526 else:
3527 iter = [(b'', l) for l in states]
3527 iter = [(b'', l) for l in states]
3528 for change, l in iter:
3528 for change, l in iter:
3529 fm.startitem()
3529 fm.startitem()
3530 fm.context(ctx=ctx)
3530 fm.context(ctx=ctx)
3531 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3531 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3532 fm.plain(uipathfn(fn), label=b'grep.filename')
3532 fm.plain(uipathfn(fn), label=b'grep.filename')
3533
3533
3534 cols = [
3534 cols = [
3535 (b'rev', b'%d', rev, not plaingrep, b''),
3535 (b'rev', b'%d', rev, not plaingrep, b''),
3536 (
3536 (
3537 b'linenumber',
3537 b'linenumber',
3538 b'%d',
3538 b'%d',
3539 l.linenum,
3539 l.linenum,
3540 opts.get(b'line_number'),
3540 opts.get(b'line_number'),
3541 b'',
3541 b'',
3542 ),
3542 ),
3543 ]
3543 ]
3544 if diff:
3544 if diff:
3545 cols.append(
3545 cols.append(
3546 (
3546 (
3547 b'change',
3547 b'change',
3548 b'%s',
3548 b'%s',
3549 change,
3549 change,
3550 True,
3550 True,
3551 b'grep.inserted '
3551 b'grep.inserted '
3552 if change == b'+'
3552 if change == b'+'
3553 else b'grep.deleted ',
3553 else b'grep.deleted ',
3554 )
3554 )
3555 )
3555 )
3556 cols.extend(
3556 cols.extend(
3557 [
3557 [
3558 (
3558 (
3559 b'user',
3559 b'user',
3560 b'%s',
3560 b'%s',
3561 formatuser(ctx.user()),
3561 formatuser(ctx.user()),
3562 opts.get(b'user'),
3562 opts.get(b'user'),
3563 b'',
3563 b'',
3564 ),
3564 ),
3565 (
3565 (
3566 b'date',
3566 b'date',
3567 b'%s',
3567 b'%s',
3568 fm.formatdate(ctx.date(), datefmt),
3568 fm.formatdate(ctx.date(), datefmt),
3569 opts.get(b'date'),
3569 opts.get(b'date'),
3570 b'',
3570 b'',
3571 ),
3571 ),
3572 ]
3572 ]
3573 )
3573 )
3574 for name, fmt, data, cond, extra_label in cols:
3574 for name, fmt, data, cond, extra_label in cols:
3575 if cond:
3575 if cond:
3576 fm.plain(sep, label=b'grep.sep')
3576 fm.plain(sep, label=b'grep.sep')
3577 field = fieldnamemap.get(name, name)
3577 field = fieldnamemap.get(name, name)
3578 label = extra_label + (b'grep.%s' % name)
3578 label = extra_label + (b'grep.%s' % name)
3579 fm.condwrite(cond, field, fmt, data, label=label)
3579 fm.condwrite(cond, field, fmt, data, label=label)
3580 if not opts.get(b'files_with_matches'):
3580 if not opts.get(b'files_with_matches'):
3581 fm.plain(sep, label=b'grep.sep')
3581 fm.plain(sep, label=b'grep.sep')
3582 if not opts.get(b'text') and binary():
3582 if not opts.get(b'text') and binary():
3583 fm.plain(_(b" Binary file matches"))
3583 fm.plain(_(b" Binary file matches"))
3584 else:
3584 else:
3585 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3585 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3586 fm.plain(eol)
3586 fm.plain(eol)
3587 found = True
3587 found = True
3588 if opts.get(b'files_with_matches'):
3588 if opts.get(b'files_with_matches'):
3589 break
3589 break
3590 return found
3590 return found
3591
3591
3592 def displaymatches(fm, l):
3592 def displaymatches(fm, l):
3593 p = 0
3593 p = 0
3594 for s, e in l.findpos(regexp):
3594 for s, e in l.findpos(regexp):
3595 if p < s:
3595 if p < s:
3596 fm.startitem()
3596 fm.startitem()
3597 fm.write(b'text', b'%s', l.line[p:s])
3597 fm.write(b'text', b'%s', l.line[p:s])
3598 fm.data(matched=False)
3598 fm.data(matched=False)
3599 fm.startitem()
3599 fm.startitem()
3600 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3600 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3601 fm.data(matched=True)
3601 fm.data(matched=True)
3602 p = e
3602 p = e
3603 if p < len(l.line):
3603 if p < len(l.line):
3604 fm.startitem()
3604 fm.startitem()
3605 fm.write(b'text', b'%s', l.line[p:])
3605 fm.write(b'text', b'%s', l.line[p:])
3606 fm.data(matched=False)
3606 fm.data(matched=False)
3607 fm.end()
3607 fm.end()
3608
3608
3609 found = False
3609 found = False
3610
3610
3611 wopts = logcmdutil.walkopts(
3611 wopts = logcmdutil.walkopts(
3612 pats=pats,
3612 pats=pats,
3613 opts=opts,
3613 opts=opts,
3614 revspec=opts[b'rev'],
3614 revspec=opts[b'rev'],
3615 include_pats=opts[b'include'],
3615 include_pats=opts[b'include'],
3616 exclude_pats=opts[b'exclude'],
3616 exclude_pats=opts[b'exclude'],
3617 follow=follow,
3617 follow=follow,
3618 force_changelog_traversal=all_files,
3618 force_changelog_traversal=all_files,
3619 filter_revisions_by_pats=not all_files,
3619 filter_revisions_by_pats=not all_files,
3620 )
3620 )
3621 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3621 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3622
3622
3623 ui.pager(b'grep')
3623 ui.pager(b'grep')
3624 fm = ui.formatter(b'grep', opts)
3624 fm = ui.formatter(b'grep', opts)
3625 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3625 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3626 r = display(fm, fn, ctx, pstates, states)
3626 r = display(fm, fn, ctx, pstates, states)
3627 found = found or r
3627 found = found or r
3628 if r and not diff and not all_files:
3628 if r and not diff and not all_files:
3629 searcher.skipfile(fn, ctx.rev())
3629 searcher.skipfile(fn, ctx.rev())
3630 fm.end()
3630 fm.end()
3631
3631
3632 return not found
3632 return not found
3633
3633
3634
3634
3635 @command(
3635 @command(
3636 b'heads',
3636 b'heads',
3637 [
3637 [
3638 (
3638 (
3639 b'r',
3639 b'r',
3640 b'rev',
3640 b'rev',
3641 b'',
3641 b'',
3642 _(b'show only heads which are descendants of STARTREV'),
3642 _(b'show only heads which are descendants of STARTREV'),
3643 _(b'STARTREV'),
3643 _(b'STARTREV'),
3644 ),
3644 ),
3645 (b't', b'topo', False, _(b'show topological heads only')),
3645 (b't', b'topo', False, _(b'show topological heads only')),
3646 (
3646 (
3647 b'a',
3647 b'a',
3648 b'active',
3648 b'active',
3649 False,
3649 False,
3650 _(b'show active branchheads only (DEPRECATED)'),
3650 _(b'show active branchheads only (DEPRECATED)'),
3651 ),
3651 ),
3652 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3652 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3653 ]
3653 ]
3654 + templateopts,
3654 + templateopts,
3655 _(b'[-ct] [-r STARTREV] [REV]...'),
3655 _(b'[-ct] [-r STARTREV] [REV]...'),
3656 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3656 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3657 intents={INTENT_READONLY},
3657 intents={INTENT_READONLY},
3658 )
3658 )
3659 def heads(ui, repo, *branchrevs, **opts):
3659 def heads(ui, repo, *branchrevs, **opts):
3660 """show branch heads
3660 """show branch heads
3661
3661
3662 With no arguments, show all open branch heads in the repository.
3662 With no arguments, show all open branch heads in the repository.
3663 Branch heads are changesets that have no descendants on the
3663 Branch heads are changesets that have no descendants on the
3664 same branch. They are where development generally takes place and
3664 same branch. They are where development generally takes place and
3665 are the usual targets for update and merge operations.
3665 are the usual targets for update and merge operations.
3666
3666
3667 If one or more REVs are given, only open branch heads on the
3667 If one or more REVs are given, only open branch heads on the
3668 branches associated with the specified changesets are shown. This
3668 branches associated with the specified changesets are shown. This
3669 means that you can use :hg:`heads .` to see the heads on the
3669 means that you can use :hg:`heads .` to see the heads on the
3670 currently checked-out branch.
3670 currently checked-out branch.
3671
3671
3672 If -c/--closed is specified, also show branch heads marked closed
3672 If -c/--closed is specified, also show branch heads marked closed
3673 (see :hg:`commit --close-branch`).
3673 (see :hg:`commit --close-branch`).
3674
3674
3675 If STARTREV is specified, only those heads that are descendants of
3675 If STARTREV is specified, only those heads that are descendants of
3676 STARTREV will be displayed.
3676 STARTREV will be displayed.
3677
3677
3678 If -t/--topo is specified, named branch mechanics will be ignored and only
3678 If -t/--topo is specified, named branch mechanics will be ignored and only
3679 topological heads (changesets with no children) will be shown.
3679 topological heads (changesets with no children) will be shown.
3680
3680
3681 Returns 0 if matching heads are found, 1 if not.
3681 Returns 0 if matching heads are found, 1 if not.
3682 """
3682 """
3683
3683
3684 opts = pycompat.byteskwargs(opts)
3684 opts = pycompat.byteskwargs(opts)
3685 start = None
3685 start = None
3686 rev = opts.get(b'rev')
3686 rev = opts.get(b'rev')
3687 if rev:
3687 if rev:
3688 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3688 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3689 start = scmutil.revsingle(repo, rev, None).node()
3689 start = scmutil.revsingle(repo, rev, None).node()
3690
3690
3691 if opts.get(b'topo'):
3691 if opts.get(b'topo'):
3692 heads = [repo[h] for h in repo.heads(start)]
3692 heads = [repo[h] for h in repo.heads(start)]
3693 else:
3693 else:
3694 heads = []
3694 heads = []
3695 for branch in repo.branchmap():
3695 for branch in repo.branchmap():
3696 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3696 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3697 heads = [repo[h] for h in heads]
3697 heads = [repo[h] for h in heads]
3698
3698
3699 if branchrevs:
3699 if branchrevs:
3700 branches = {
3700 branches = {
3701 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3701 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3702 }
3702 }
3703 heads = [h for h in heads if h.branch() in branches]
3703 heads = [h for h in heads if h.branch() in branches]
3704
3704
3705 if opts.get(b'active') and branchrevs:
3705 if opts.get(b'active') and branchrevs:
3706 dagheads = repo.heads(start)
3706 dagheads = repo.heads(start)
3707 heads = [h for h in heads if h.node() in dagheads]
3707 heads = [h for h in heads if h.node() in dagheads]
3708
3708
3709 if branchrevs:
3709 if branchrevs:
3710 haveheads = {h.branch() for h in heads}
3710 haveheads = {h.branch() for h in heads}
3711 if branches - haveheads:
3711 if branches - haveheads:
3712 headless = b', '.join(b for b in branches - haveheads)
3712 headless = b', '.join(b for b in branches - haveheads)
3713 msg = _(b'no open branch heads found on branches %s')
3713 msg = _(b'no open branch heads found on branches %s')
3714 if opts.get(b'rev'):
3714 if opts.get(b'rev'):
3715 msg += _(b' (started at %s)') % opts[b'rev']
3715 msg += _(b' (started at %s)') % opts[b'rev']
3716 ui.warn((msg + b'\n') % headless)
3716 ui.warn((msg + b'\n') % headless)
3717
3717
3718 if not heads:
3718 if not heads:
3719 return 1
3719 return 1
3720
3720
3721 ui.pager(b'heads')
3721 ui.pager(b'heads')
3722 heads = sorted(heads, key=lambda x: -(x.rev()))
3722 heads = sorted(heads, key=lambda x: -(x.rev()))
3723 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3723 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3724 for ctx in heads:
3724 for ctx in heads:
3725 displayer.show(ctx)
3725 displayer.show(ctx)
3726 displayer.close()
3726 displayer.close()
3727
3727
3728
3728
3729 @command(
3729 @command(
3730 b'help',
3730 b'help',
3731 [
3731 [
3732 (b'e', b'extension', None, _(b'show only help for extensions')),
3732 (b'e', b'extension', None, _(b'show only help for extensions')),
3733 (b'c', b'command', None, _(b'show only help for commands')),
3733 (b'c', b'command', None, _(b'show only help for commands')),
3734 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3734 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3735 (
3735 (
3736 b's',
3736 b's',
3737 b'system',
3737 b'system',
3738 [],
3738 [],
3739 _(b'show help for specific platform(s)'),
3739 _(b'show help for specific platform(s)'),
3740 _(b'PLATFORM'),
3740 _(b'PLATFORM'),
3741 ),
3741 ),
3742 ],
3742 ],
3743 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3743 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3744 helpcategory=command.CATEGORY_HELP,
3744 helpcategory=command.CATEGORY_HELP,
3745 norepo=True,
3745 norepo=True,
3746 intents={INTENT_READONLY},
3746 intents={INTENT_READONLY},
3747 )
3747 )
3748 def help_(ui, name=None, **opts):
3748 def help_(ui, name=None, **opts):
3749 """show help for a given topic or a help overview
3749 """show help for a given topic or a help overview
3750
3750
3751 With no arguments, print a list of commands with short help messages.
3751 With no arguments, print a list of commands with short help messages.
3752
3752
3753 Given a topic, extension, or command name, print help for that
3753 Given a topic, extension, or command name, print help for that
3754 topic.
3754 topic.
3755
3755
3756 Returns 0 if successful.
3756 Returns 0 if successful.
3757 """
3757 """
3758
3758
3759 keep = opts.get('system') or []
3759 keep = opts.get('system') or []
3760 if len(keep) == 0:
3760 if len(keep) == 0:
3761 if pycompat.sysplatform.startswith(b'win'):
3761 if pycompat.sysplatform.startswith(b'win'):
3762 keep.append(b'windows')
3762 keep.append(b'windows')
3763 elif pycompat.sysplatform == b'OpenVMS':
3763 elif pycompat.sysplatform == b'OpenVMS':
3764 keep.append(b'vms')
3764 keep.append(b'vms')
3765 elif pycompat.sysplatform == b'plan9':
3765 elif pycompat.sysplatform == b'plan9':
3766 keep.append(b'plan9')
3766 keep.append(b'plan9')
3767 else:
3767 else:
3768 keep.append(b'unix')
3768 keep.append(b'unix')
3769 keep.append(pycompat.sysplatform.lower())
3769 keep.append(pycompat.sysplatform.lower())
3770 if ui.verbose:
3770 if ui.verbose:
3771 keep.append(b'verbose')
3771 keep.append(b'verbose')
3772
3772
3773 commands = sys.modules[__name__]
3773 commands = sys.modules[__name__]
3774 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3774 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3775 ui.pager(b'help')
3775 ui.pager(b'help')
3776 ui.write(formatted)
3776 ui.write(formatted)
3777
3777
3778
3778
3779 @command(
3779 @command(
3780 b'identify|id',
3780 b'identify|id',
3781 [
3781 [
3782 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3782 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3783 (b'n', b'num', None, _(b'show local revision number')),
3783 (b'n', b'num', None, _(b'show local revision number')),
3784 (b'i', b'id', None, _(b'show global revision id')),
3784 (b'i', b'id', None, _(b'show global revision id')),
3785 (b'b', b'branch', None, _(b'show branch')),
3785 (b'b', b'branch', None, _(b'show branch')),
3786 (b't', b'tags', None, _(b'show tags')),
3786 (b't', b'tags', None, _(b'show tags')),
3787 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3787 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3788 ]
3788 ]
3789 + remoteopts
3789 + remoteopts
3790 + formatteropts,
3790 + formatteropts,
3791 _(b'[-nibtB] [-r REV] [SOURCE]'),
3791 _(b'[-nibtB] [-r REV] [SOURCE]'),
3792 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3792 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3793 optionalrepo=True,
3793 optionalrepo=True,
3794 intents={INTENT_READONLY},
3794 intents={INTENT_READONLY},
3795 )
3795 )
3796 def identify(
3796 def identify(
3797 ui,
3797 ui,
3798 repo,
3798 repo,
3799 source=None,
3799 source=None,
3800 rev=None,
3800 rev=None,
3801 num=None,
3801 num=None,
3802 id=None,
3802 id=None,
3803 branch=None,
3803 branch=None,
3804 tags=None,
3804 tags=None,
3805 bookmarks=None,
3805 bookmarks=None,
3806 **opts
3806 **opts
3807 ):
3807 ):
3808 """identify the working directory or specified revision
3808 """identify the working directory or specified revision
3809
3809
3810 Print a summary identifying the repository state at REV using one or
3810 Print a summary identifying the repository state at REV using one or
3811 two parent hash identifiers, followed by a "+" if the working
3811 two parent hash identifiers, followed by a "+" if the working
3812 directory has uncommitted changes, the branch name (if not default),
3812 directory has uncommitted changes, the branch name (if not default),
3813 a list of tags, and a list of bookmarks.
3813 a list of tags, and a list of bookmarks.
3814
3814
3815 When REV is not given, print a summary of the current state of the
3815 When REV is not given, print a summary of the current state of the
3816 repository including the working directory. Specify -r. to get information
3816 repository including the working directory. Specify -r. to get information
3817 of the working directory parent without scanning uncommitted changes.
3817 of the working directory parent without scanning uncommitted changes.
3818
3818
3819 Specifying a path to a repository root or Mercurial bundle will
3819 Specifying a path to a repository root or Mercurial bundle will
3820 cause lookup to operate on that repository/bundle.
3820 cause lookup to operate on that repository/bundle.
3821
3821
3822 .. container:: verbose
3822 .. container:: verbose
3823
3823
3824 Template:
3824 Template:
3825
3825
3826 The following keywords are supported in addition to the common template
3826 The following keywords are supported in addition to the common template
3827 keywords and functions. See also :hg:`help templates`.
3827 keywords and functions. See also :hg:`help templates`.
3828
3828
3829 :dirty: String. Character ``+`` denoting if the working directory has
3829 :dirty: String. Character ``+`` denoting if the working directory has
3830 uncommitted changes.
3830 uncommitted changes.
3831 :id: String. One or two nodes, optionally followed by ``+``.
3831 :id: String. One or two nodes, optionally followed by ``+``.
3832 :parents: List of strings. Parent nodes of the changeset.
3832 :parents: List of strings. Parent nodes of the changeset.
3833
3833
3834 Examples:
3834 Examples:
3835
3835
3836 - generate a build identifier for the working directory::
3836 - generate a build identifier for the working directory::
3837
3837
3838 hg id --id > build-id.dat
3838 hg id --id > build-id.dat
3839
3839
3840 - find the revision corresponding to a tag::
3840 - find the revision corresponding to a tag::
3841
3841
3842 hg id -n -r 1.3
3842 hg id -n -r 1.3
3843
3843
3844 - check the most recent revision of a remote repository::
3844 - check the most recent revision of a remote repository::
3845
3845
3846 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3846 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3847
3847
3848 See :hg:`log` for generating more information about specific revisions,
3848 See :hg:`log` for generating more information about specific revisions,
3849 including full hash identifiers.
3849 including full hash identifiers.
3850
3850
3851 Returns 0 if successful.
3851 Returns 0 if successful.
3852 """
3852 """
3853
3853
3854 opts = pycompat.byteskwargs(opts)
3854 opts = pycompat.byteskwargs(opts)
3855 if not repo and not source:
3855 if not repo and not source:
3856 raise error.InputError(
3856 raise error.InputError(
3857 _(b"there is no Mercurial repository here (.hg not found)")
3857 _(b"there is no Mercurial repository here (.hg not found)")
3858 )
3858 )
3859
3859
3860 default = not (num or id or branch or tags or bookmarks)
3860 default = not (num or id or branch or tags or bookmarks)
3861 output = []
3861 output = []
3862 revs = []
3862 revs = []
3863
3863
3864 peer = None
3864 peer = None
3865 try:
3865 try:
3866 if source:
3866 if source:
3867 source, branches = urlutil.get_unique_pull_path(
3867 source, branches = urlutil.get_unique_pull_path(
3868 b'identify', repo, ui, source
3868 b'identify', repo, ui, source
3869 )
3869 )
3870 # only pass ui when no repo
3870 # only pass ui when no repo
3871 peer = hg.peer(repo or ui, opts, source)
3871 peer = hg.peer(repo or ui, opts, source)
3872 repo = peer.local()
3872 repo = peer.local()
3873 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3873 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3874
3874
3875 fm = ui.formatter(b'identify', opts)
3875 fm = ui.formatter(b'identify', opts)
3876 fm.startitem()
3876 fm.startitem()
3877
3877
3878 if not repo:
3878 if not repo:
3879 if num or branch or tags:
3879 if num or branch or tags:
3880 raise error.InputError(
3880 raise error.InputError(
3881 _(b"can't query remote revision number, branch, or tags")
3881 _(b"can't query remote revision number, branch, or tags")
3882 )
3882 )
3883 if not rev and revs:
3883 if not rev and revs:
3884 rev = revs[0]
3884 rev = revs[0]
3885 if not rev:
3885 if not rev:
3886 rev = b"tip"
3886 rev = b"tip"
3887
3887
3888 remoterev = peer.lookup(rev)
3888 remoterev = peer.lookup(rev)
3889 hexrev = fm.hexfunc(remoterev)
3889 hexrev = fm.hexfunc(remoterev)
3890 if default or id:
3890 if default or id:
3891 output = [hexrev]
3891 output = [hexrev]
3892 fm.data(id=hexrev)
3892 fm.data(id=hexrev)
3893
3893
3894 @util.cachefunc
3894 @util.cachefunc
3895 def getbms():
3895 def getbms():
3896 bms = []
3896 bms = []
3897
3897
3898 if b'bookmarks' in peer.listkeys(b'namespaces'):
3898 if b'bookmarks' in peer.listkeys(b'namespaces'):
3899 hexremoterev = hex(remoterev)
3899 hexremoterev = hex(remoterev)
3900 bms = [
3900 bms = [
3901 bm
3901 bm
3902 for bm, bmr in pycompat.iteritems(
3902 for bm, bmr in pycompat.iteritems(
3903 peer.listkeys(b'bookmarks')
3903 peer.listkeys(b'bookmarks')
3904 )
3904 )
3905 if bmr == hexremoterev
3905 if bmr == hexremoterev
3906 ]
3906 ]
3907
3907
3908 return sorted(bms)
3908 return sorted(bms)
3909
3909
3910 if fm.isplain():
3910 if fm.isplain():
3911 if bookmarks:
3911 if bookmarks:
3912 output.extend(getbms())
3912 output.extend(getbms())
3913 elif default and not ui.quiet:
3913 elif default and not ui.quiet:
3914 # multiple bookmarks for a single parent separated by '/'
3914 # multiple bookmarks for a single parent separated by '/'
3915 bm = b'/'.join(getbms())
3915 bm = b'/'.join(getbms())
3916 if bm:
3916 if bm:
3917 output.append(bm)
3917 output.append(bm)
3918 else:
3918 else:
3919 fm.data(node=hex(remoterev))
3919 fm.data(node=hex(remoterev))
3920 if bookmarks or b'bookmarks' in fm.datahint():
3920 if bookmarks or b'bookmarks' in fm.datahint():
3921 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3921 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3922 else:
3922 else:
3923 if rev:
3923 if rev:
3924 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3924 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3925 ctx = scmutil.revsingle(repo, rev, None)
3925 ctx = scmutil.revsingle(repo, rev, None)
3926
3926
3927 if ctx.rev() is None:
3927 if ctx.rev() is None:
3928 ctx = repo[None]
3928 ctx = repo[None]
3929 parents = ctx.parents()
3929 parents = ctx.parents()
3930 taglist = []
3930 taglist = []
3931 for p in parents:
3931 for p in parents:
3932 taglist.extend(p.tags())
3932 taglist.extend(p.tags())
3933
3933
3934 dirty = b""
3934 dirty = b""
3935 if ctx.dirty(missing=True, merge=False, branch=False):
3935 if ctx.dirty(missing=True, merge=False, branch=False):
3936 dirty = b'+'
3936 dirty = b'+'
3937 fm.data(dirty=dirty)
3937 fm.data(dirty=dirty)
3938
3938
3939 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3939 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3940 if default or id:
3940 if default or id:
3941 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3941 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3942 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3942 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3943
3943
3944 if num:
3944 if num:
3945 numoutput = [b"%d" % p.rev() for p in parents]
3945 numoutput = [b"%d" % p.rev() for p in parents]
3946 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3946 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3947
3947
3948 fm.data(
3948 fm.data(
3949 parents=fm.formatlist(
3949 parents=fm.formatlist(
3950 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3950 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3951 )
3951 )
3952 )
3952 )
3953 else:
3953 else:
3954 hexoutput = fm.hexfunc(ctx.node())
3954 hexoutput = fm.hexfunc(ctx.node())
3955 if default or id:
3955 if default or id:
3956 output = [hexoutput]
3956 output = [hexoutput]
3957 fm.data(id=hexoutput)
3957 fm.data(id=hexoutput)
3958
3958
3959 if num:
3959 if num:
3960 output.append(pycompat.bytestr(ctx.rev()))
3960 output.append(pycompat.bytestr(ctx.rev()))
3961 taglist = ctx.tags()
3961 taglist = ctx.tags()
3962
3962
3963 if default and not ui.quiet:
3963 if default and not ui.quiet:
3964 b = ctx.branch()
3964 b = ctx.branch()
3965 if b != b'default':
3965 if b != b'default':
3966 output.append(b"(%s)" % b)
3966 output.append(b"(%s)" % b)
3967
3967
3968 # multiple tags for a single parent separated by '/'
3968 # multiple tags for a single parent separated by '/'
3969 t = b'/'.join(taglist)
3969 t = b'/'.join(taglist)
3970 if t:
3970 if t:
3971 output.append(t)
3971 output.append(t)
3972
3972
3973 # multiple bookmarks for a single parent separated by '/'
3973 # multiple bookmarks for a single parent separated by '/'
3974 bm = b'/'.join(ctx.bookmarks())
3974 bm = b'/'.join(ctx.bookmarks())
3975 if bm:
3975 if bm:
3976 output.append(bm)
3976 output.append(bm)
3977 else:
3977 else:
3978 if branch:
3978 if branch:
3979 output.append(ctx.branch())
3979 output.append(ctx.branch())
3980
3980
3981 if tags:
3981 if tags:
3982 output.extend(taglist)
3982 output.extend(taglist)
3983
3983
3984 if bookmarks:
3984 if bookmarks:
3985 output.extend(ctx.bookmarks())
3985 output.extend(ctx.bookmarks())
3986
3986
3987 fm.data(node=ctx.hex())
3987 fm.data(node=ctx.hex())
3988 fm.data(branch=ctx.branch())
3988 fm.data(branch=ctx.branch())
3989 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3989 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3990 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3990 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3991 fm.context(ctx=ctx)
3991 fm.context(ctx=ctx)
3992
3992
3993 fm.plain(b"%s\n" % b' '.join(output))
3993 fm.plain(b"%s\n" % b' '.join(output))
3994 fm.end()
3994 fm.end()
3995 finally:
3995 finally:
3996 if peer:
3996 if peer:
3997 peer.close()
3997 peer.close()
3998
3998
3999
3999
4000 @command(
4000 @command(
4001 b'import|patch',
4001 b'import|patch',
4002 [
4002 [
4003 (
4003 (
4004 b'p',
4004 b'p',
4005 b'strip',
4005 b'strip',
4006 1,
4006 1,
4007 _(
4007 _(
4008 b'directory strip option for patch. This has the same '
4008 b'directory strip option for patch. This has the same '
4009 b'meaning as the corresponding patch option'
4009 b'meaning as the corresponding patch option'
4010 ),
4010 ),
4011 _(b'NUM'),
4011 _(b'NUM'),
4012 ),
4012 ),
4013 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4013 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4014 (b'', b'secret', None, _(b'use the secret phase for committing')),
4014 (b'', b'secret', None, _(b'use the secret phase for committing')),
4015 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4015 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4016 (
4016 (
4017 b'f',
4017 b'f',
4018 b'force',
4018 b'force',
4019 None,
4019 None,
4020 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4020 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4021 ),
4021 ),
4022 (
4022 (
4023 b'',
4023 b'',
4024 b'no-commit',
4024 b'no-commit',
4025 None,
4025 None,
4026 _(b"don't commit, just update the working directory"),
4026 _(b"don't commit, just update the working directory"),
4027 ),
4027 ),
4028 (
4028 (
4029 b'',
4029 b'',
4030 b'bypass',
4030 b'bypass',
4031 None,
4031 None,
4032 _(b"apply patch without touching the working directory"),
4032 _(b"apply patch without touching the working directory"),
4033 ),
4033 ),
4034 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4034 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4035 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4035 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4036 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4036 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4037 (
4037 (
4038 b'',
4038 b'',
4039 b'import-branch',
4039 b'import-branch',
4040 None,
4040 None,
4041 _(b'use any branch information in patch (implied by --exact)'),
4041 _(b'use any branch information in patch (implied by --exact)'),
4042 ),
4042 ),
4043 ]
4043 ]
4044 + commitopts
4044 + commitopts
4045 + commitopts2
4045 + commitopts2
4046 + similarityopts,
4046 + similarityopts,
4047 _(b'[OPTION]... PATCH...'),
4047 _(b'[OPTION]... PATCH...'),
4048 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4048 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4049 )
4049 )
4050 def import_(ui, repo, patch1=None, *patches, **opts):
4050 def import_(ui, repo, patch1=None, *patches, **opts):
4051 """import an ordered set of patches
4051 """import an ordered set of patches
4052
4052
4053 Import a list of patches and commit them individually (unless
4053 Import a list of patches and commit them individually (unless
4054 --no-commit is specified).
4054 --no-commit is specified).
4055
4055
4056 To read a patch from standard input (stdin), use "-" as the patch
4056 To read a patch from standard input (stdin), use "-" as the patch
4057 name. If a URL is specified, the patch will be downloaded from
4057 name. If a URL is specified, the patch will be downloaded from
4058 there.
4058 there.
4059
4059
4060 Import first applies changes to the working directory (unless
4060 Import first applies changes to the working directory (unless
4061 --bypass is specified), import will abort if there are outstanding
4061 --bypass is specified), import will abort if there are outstanding
4062 changes.
4062 changes.
4063
4063
4064 Use --bypass to apply and commit patches directly to the
4064 Use --bypass to apply and commit patches directly to the
4065 repository, without affecting the working directory. Without
4065 repository, without affecting the working directory. Without
4066 --exact, patches will be applied on top of the working directory
4066 --exact, patches will be applied on top of the working directory
4067 parent revision.
4067 parent revision.
4068
4068
4069 You can import a patch straight from a mail message. Even patches
4069 You can import a patch straight from a mail message. Even patches
4070 as attachments work (to use the body part, it must have type
4070 as attachments work (to use the body part, it must have type
4071 text/plain or text/x-patch). From and Subject headers of email
4071 text/plain or text/x-patch). From and Subject headers of email
4072 message are used as default committer and commit message. All
4072 message are used as default committer and commit message. All
4073 text/plain body parts before first diff are added to the commit
4073 text/plain body parts before first diff are added to the commit
4074 message.
4074 message.
4075
4075
4076 If the imported patch was generated by :hg:`export`, user and
4076 If the imported patch was generated by :hg:`export`, user and
4077 description from patch override values from message headers and
4077 description from patch override values from message headers and
4078 body. Values given on command line with -m/--message and -u/--user
4078 body. Values given on command line with -m/--message and -u/--user
4079 override these.
4079 override these.
4080
4080
4081 If --exact is specified, import will set the working directory to
4081 If --exact is specified, import will set the working directory to
4082 the parent of each patch before applying it, and will abort if the
4082 the parent of each patch before applying it, and will abort if the
4083 resulting changeset has a different ID than the one recorded in
4083 resulting changeset has a different ID than the one recorded in
4084 the patch. This will guard against various ways that portable
4084 the patch. This will guard against various ways that portable
4085 patch formats and mail systems might fail to transfer Mercurial
4085 patch formats and mail systems might fail to transfer Mercurial
4086 data or metadata. See :hg:`bundle` for lossless transmission.
4086 data or metadata. See :hg:`bundle` for lossless transmission.
4087
4087
4088 Use --partial to ensure a changeset will be created from the patch
4088 Use --partial to ensure a changeset will be created from the patch
4089 even if some hunks fail to apply. Hunks that fail to apply will be
4089 even if some hunks fail to apply. Hunks that fail to apply will be
4090 written to a <target-file>.rej file. Conflicts can then be resolved
4090 written to a <target-file>.rej file. Conflicts can then be resolved
4091 by hand before :hg:`commit --amend` is run to update the created
4091 by hand before :hg:`commit --amend` is run to update the created
4092 changeset. This flag exists to let people import patches that
4092 changeset. This flag exists to let people import patches that
4093 partially apply without losing the associated metadata (author,
4093 partially apply without losing the associated metadata (author,
4094 date, description, ...).
4094 date, description, ...).
4095
4095
4096 .. note::
4096 .. note::
4097
4097
4098 When no hunks apply cleanly, :hg:`import --partial` will create
4098 When no hunks apply cleanly, :hg:`import --partial` will create
4099 an empty changeset, importing only the patch metadata.
4099 an empty changeset, importing only the patch metadata.
4100
4100
4101 With -s/--similarity, hg will attempt to discover renames and
4101 With -s/--similarity, hg will attempt to discover renames and
4102 copies in the patch in the same way as :hg:`addremove`.
4102 copies in the patch in the same way as :hg:`addremove`.
4103
4103
4104 It is possible to use external patch programs to perform the patch
4104 It is possible to use external patch programs to perform the patch
4105 by setting the ``ui.patch`` configuration option. For the default
4105 by setting the ``ui.patch`` configuration option. For the default
4106 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4106 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4107 See :hg:`help config` for more information about configuration
4107 See :hg:`help config` for more information about configuration
4108 files and how to use these options.
4108 files and how to use these options.
4109
4109
4110 See :hg:`help dates` for a list of formats valid for -d/--date.
4110 See :hg:`help dates` for a list of formats valid for -d/--date.
4111
4111
4112 .. container:: verbose
4112 .. container:: verbose
4113
4113
4114 Examples:
4114 Examples:
4115
4115
4116 - import a traditional patch from a website and detect renames::
4116 - import a traditional patch from a website and detect renames::
4117
4117
4118 hg import -s 80 http://example.com/bugfix.patch
4118 hg import -s 80 http://example.com/bugfix.patch
4119
4119
4120 - import a changeset from an hgweb server::
4120 - import a changeset from an hgweb server::
4121
4121
4122 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4122 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4123
4123
4124 - import all the patches in an Unix-style mbox::
4124 - import all the patches in an Unix-style mbox::
4125
4125
4126 hg import incoming-patches.mbox
4126 hg import incoming-patches.mbox
4127
4127
4128 - import patches from stdin::
4128 - import patches from stdin::
4129
4129
4130 hg import -
4130 hg import -
4131
4131
4132 - attempt to exactly restore an exported changeset (not always
4132 - attempt to exactly restore an exported changeset (not always
4133 possible)::
4133 possible)::
4134
4134
4135 hg import --exact proposed-fix.patch
4135 hg import --exact proposed-fix.patch
4136
4136
4137 - use an external tool to apply a patch which is too fuzzy for
4137 - use an external tool to apply a patch which is too fuzzy for
4138 the default internal tool.
4138 the default internal tool.
4139
4139
4140 hg import --config ui.patch="patch --merge" fuzzy.patch
4140 hg import --config ui.patch="patch --merge" fuzzy.patch
4141
4141
4142 - change the default fuzzing from 2 to a less strict 7
4142 - change the default fuzzing from 2 to a less strict 7
4143
4143
4144 hg import --config ui.fuzz=7 fuzz.patch
4144 hg import --config ui.fuzz=7 fuzz.patch
4145
4145
4146 Returns 0 on success, 1 on partial success (see --partial).
4146 Returns 0 on success, 1 on partial success (see --partial).
4147 """
4147 """
4148
4148
4149 cmdutil.check_incompatible_arguments(
4149 cmdutil.check_incompatible_arguments(
4150 opts, 'no_commit', ['bypass', 'secret']
4150 opts, 'no_commit', ['bypass', 'secret']
4151 )
4151 )
4152 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4152 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4153 opts = pycompat.byteskwargs(opts)
4153 opts = pycompat.byteskwargs(opts)
4154 if not patch1:
4154 if not patch1:
4155 raise error.InputError(_(b'need at least one patch to import'))
4155 raise error.InputError(_(b'need at least one patch to import'))
4156
4156
4157 patches = (patch1,) + patches
4157 patches = (patch1,) + patches
4158
4158
4159 date = opts.get(b'date')
4159 date = opts.get(b'date')
4160 if date:
4160 if date:
4161 opts[b'date'] = dateutil.parsedate(date)
4161 opts[b'date'] = dateutil.parsedate(date)
4162
4162
4163 exact = opts.get(b'exact')
4163 exact = opts.get(b'exact')
4164 update = not opts.get(b'bypass')
4164 update = not opts.get(b'bypass')
4165 try:
4165 try:
4166 sim = float(opts.get(b'similarity') or 0)
4166 sim = float(opts.get(b'similarity') or 0)
4167 except ValueError:
4167 except ValueError:
4168 raise error.InputError(_(b'similarity must be a number'))
4168 raise error.InputError(_(b'similarity must be a number'))
4169 if sim < 0 or sim > 100:
4169 if sim < 0 or sim > 100:
4170 raise error.InputError(_(b'similarity must be between 0 and 100'))
4170 raise error.InputError(_(b'similarity must be between 0 and 100'))
4171 if sim and not update:
4171 if sim and not update:
4172 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4172 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4173
4173
4174 base = opts[b"base"]
4174 base = opts[b"base"]
4175 msgs = []
4175 msgs = []
4176 ret = 0
4176 ret = 0
4177
4177
4178 with repo.wlock():
4178 with repo.wlock():
4179 if update:
4179 if update:
4180 cmdutil.checkunfinished(repo)
4180 cmdutil.checkunfinished(repo)
4181 if exact or not opts.get(b'force'):
4181 if exact or not opts.get(b'force'):
4182 cmdutil.bailifchanged(repo)
4182 cmdutil.bailifchanged(repo)
4183
4183
4184 if not opts.get(b'no_commit'):
4184 if not opts.get(b'no_commit'):
4185 lock = repo.lock
4185 lock = repo.lock
4186 tr = lambda: repo.transaction(b'import')
4186 tr = lambda: repo.transaction(b'import')
4187 dsguard = util.nullcontextmanager
4187 dsguard = util.nullcontextmanager
4188 else:
4188 else:
4189 lock = util.nullcontextmanager
4189 lock = util.nullcontextmanager
4190 tr = util.nullcontextmanager
4190 tr = util.nullcontextmanager
4191 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4191 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4192 with lock(), tr(), dsguard():
4192 with lock(), tr(), dsguard():
4193 parents = repo[None].parents()
4193 parents = repo[None].parents()
4194 for patchurl in patches:
4194 for patchurl in patches:
4195 if patchurl == b'-':
4195 if patchurl == b'-':
4196 ui.status(_(b'applying patch from stdin\n'))
4196 ui.status(_(b'applying patch from stdin\n'))
4197 patchfile = ui.fin
4197 patchfile = ui.fin
4198 patchurl = b'stdin' # for error message
4198 patchurl = b'stdin' # for error message
4199 else:
4199 else:
4200 patchurl = os.path.join(base, patchurl)
4200 patchurl = os.path.join(base, patchurl)
4201 ui.status(_(b'applying %s\n') % patchurl)
4201 ui.status(_(b'applying %s\n') % patchurl)
4202 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4202 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4203
4203
4204 haspatch = False
4204 haspatch = False
4205 for hunk in patch.split(patchfile):
4205 for hunk in patch.split(patchfile):
4206 with patch.extract(ui, hunk) as patchdata:
4206 with patch.extract(ui, hunk) as patchdata:
4207 msg, node, rej = cmdutil.tryimportone(
4207 msg, node, rej = cmdutil.tryimportone(
4208 ui, repo, patchdata, parents, opts, msgs, hg.clean
4208 ui, repo, patchdata, parents, opts, msgs, hg.clean
4209 )
4209 )
4210 if msg:
4210 if msg:
4211 haspatch = True
4211 haspatch = True
4212 ui.note(msg + b'\n')
4212 ui.note(msg + b'\n')
4213 if update or exact:
4213 if update or exact:
4214 parents = repo[None].parents()
4214 parents = repo[None].parents()
4215 else:
4215 else:
4216 parents = [repo[node]]
4216 parents = [repo[node]]
4217 if rej:
4217 if rej:
4218 ui.write_err(_(b"patch applied partially\n"))
4218 ui.write_err(_(b"patch applied partially\n"))
4219 ui.write_err(
4219 ui.write_err(
4220 _(
4220 _(
4221 b"(fix the .rej files and run "
4221 b"(fix the .rej files and run "
4222 b"`hg commit --amend`)\n"
4222 b"`hg commit --amend`)\n"
4223 )
4223 )
4224 )
4224 )
4225 ret = 1
4225 ret = 1
4226 break
4226 break
4227
4227
4228 if not haspatch:
4228 if not haspatch:
4229 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4229 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4230
4230
4231 if msgs:
4231 if msgs:
4232 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4232 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4233 return ret
4233 return ret
4234
4234
4235
4235
4236 @command(
4236 @command(
4237 b'incoming|in',
4237 b'incoming|in',
4238 [
4238 [
4239 (
4239 (
4240 b'f',
4240 b'f',
4241 b'force',
4241 b'force',
4242 None,
4242 None,
4243 _(b'run even if remote repository is unrelated'),
4243 _(b'run even if remote repository is unrelated'),
4244 ),
4244 ),
4245 (b'n', b'newest-first', None, _(b'show newest record first')),
4245 (b'n', b'newest-first', None, _(b'show newest record first')),
4246 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4246 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4247 (
4247 (
4248 b'r',
4248 b'r',
4249 b'rev',
4249 b'rev',
4250 [],
4250 [],
4251 _(b'a remote changeset intended to be added'),
4251 _(b'a remote changeset intended to be added'),
4252 _(b'REV'),
4252 _(b'REV'),
4253 ),
4253 ),
4254 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4254 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4255 (
4255 (
4256 b'b',
4256 b'b',
4257 b'branch',
4257 b'branch',
4258 [],
4258 [],
4259 _(b'a specific branch you would like to pull'),
4259 _(b'a specific branch you would like to pull'),
4260 _(b'BRANCH'),
4260 _(b'BRANCH'),
4261 ),
4261 ),
4262 ]
4262 ]
4263 + logopts
4263 + logopts
4264 + remoteopts
4264 + remoteopts
4265 + subrepoopts,
4265 + subrepoopts,
4266 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4266 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4267 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4267 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4268 )
4268 )
4269 def incoming(ui, repo, source=b"default", **opts):
4269 def incoming(ui, repo, source=b"default", **opts):
4270 """show new changesets found in source
4270 """show new changesets found in source
4271
4271
4272 Show new changesets found in the specified path/URL or the default
4272 Show new changesets found in the specified path/URL or the default
4273 pull location. These are the changesets that would have been pulled
4273 pull location. These are the changesets that would have been pulled
4274 by :hg:`pull` at the time you issued this command.
4274 by :hg:`pull` at the time you issued this command.
4275
4275
4276 See pull for valid source format details.
4276 See pull for valid source format details.
4277
4277
4278 .. container:: verbose
4278 .. container:: verbose
4279
4279
4280 With -B/--bookmarks, the result of bookmark comparison between
4280 With -B/--bookmarks, the result of bookmark comparison between
4281 local and remote repositories is displayed. With -v/--verbose,
4281 local and remote repositories is displayed. With -v/--verbose,
4282 status is also displayed for each bookmark like below::
4282 status is also displayed for each bookmark like below::
4283
4283
4284 BM1 01234567890a added
4284 BM1 01234567890a added
4285 BM2 1234567890ab advanced
4285 BM2 1234567890ab advanced
4286 BM3 234567890abc diverged
4286 BM3 234567890abc diverged
4287 BM4 34567890abcd changed
4287 BM4 34567890abcd changed
4288
4288
4289 The action taken locally when pulling depends on the
4289 The action taken locally when pulling depends on the
4290 status of each bookmark:
4290 status of each bookmark:
4291
4291
4292 :``added``: pull will create it
4292 :``added``: pull will create it
4293 :``advanced``: pull will update it
4293 :``advanced``: pull will update it
4294 :``diverged``: pull will create a divergent bookmark
4294 :``diverged``: pull will create a divergent bookmark
4295 :``changed``: result depends on remote changesets
4295 :``changed``: result depends on remote changesets
4296
4296
4297 From the point of view of pulling behavior, bookmark
4297 From the point of view of pulling behavior, bookmark
4298 existing only in the remote repository are treated as ``added``,
4298 existing only in the remote repository are treated as ``added``,
4299 even if it is in fact locally deleted.
4299 even if it is in fact locally deleted.
4300
4300
4301 .. container:: verbose
4301 .. container:: verbose
4302
4302
4303 For remote repository, using --bundle avoids downloading the
4303 For remote repository, using --bundle avoids downloading the
4304 changesets twice if the incoming is followed by a pull.
4304 changesets twice if the incoming is followed by a pull.
4305
4305
4306 Examples:
4306 Examples:
4307
4307
4308 - show incoming changes with patches and full description::
4308 - show incoming changes with patches and full description::
4309
4309
4310 hg incoming -vp
4310 hg incoming -vp
4311
4311
4312 - show incoming changes excluding merges, store a bundle::
4312 - show incoming changes excluding merges, store a bundle::
4313
4313
4314 hg in -vpM --bundle incoming.hg
4314 hg in -vpM --bundle incoming.hg
4315 hg pull incoming.hg
4315 hg pull incoming.hg
4316
4316
4317 - briefly list changes inside a bundle::
4317 - briefly list changes inside a bundle::
4318
4318
4319 hg in changes.hg -T "{desc|firstline}\\n"
4319 hg in changes.hg -T "{desc|firstline}\\n"
4320
4320
4321 Returns 0 if there are incoming changes, 1 otherwise.
4321 Returns 0 if there are incoming changes, 1 otherwise.
4322 """
4322 """
4323 opts = pycompat.byteskwargs(opts)
4323 opts = pycompat.byteskwargs(opts)
4324 if opts.get(b'graph'):
4324 if opts.get(b'graph'):
4325 logcmdutil.checkunsupportedgraphflags([], opts)
4325 logcmdutil.checkunsupportedgraphflags([], opts)
4326
4326
4327 def display(other, chlist, displayer):
4327 def display(other, chlist, displayer):
4328 revdag = logcmdutil.graphrevs(other, chlist, opts)
4328 revdag = logcmdutil.graphrevs(other, chlist, opts)
4329 logcmdutil.displaygraph(
4329 logcmdutil.displaygraph(
4330 ui, repo, revdag, displayer, graphmod.asciiedges
4330 ui, repo, revdag, displayer, graphmod.asciiedges
4331 )
4331 )
4332
4332
4333 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4333 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4334 return 0
4334 return 0
4335
4335
4336 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4336 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4337
4337
4338 if opts.get(b'bookmarks'):
4338 if opts.get(b'bookmarks'):
4339 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4339 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4340 for source, branches in srcs:
4340 for source, branches in srcs:
4341 other = hg.peer(repo, opts, source)
4341 other = hg.peer(repo, opts, source)
4342 try:
4342 try:
4343 if b'bookmarks' not in other.listkeys(b'namespaces'):
4343 if b'bookmarks' not in other.listkeys(b'namespaces'):
4344 ui.warn(_(b"remote doesn't support bookmarks\n"))
4344 ui.warn(_(b"remote doesn't support bookmarks\n"))
4345 return 0
4345 return 0
4346 ui.pager(b'incoming')
4346 ui.pager(b'incoming')
4347 ui.status(
4347 ui.status(
4348 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4348 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4349 )
4349 )
4350 return bookmarks.incoming(ui, repo, other)
4350 return bookmarks.incoming(ui, repo, other)
4351 finally:
4351 finally:
4352 other.close()
4352 other.close()
4353
4353
4354 return hg.incoming(ui, repo, source, opts)
4354 return hg.incoming(ui, repo, source, opts)
4355
4355
4356
4356
4357 @command(
4357 @command(
4358 b'init',
4358 b'init',
4359 remoteopts,
4359 remoteopts,
4360 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4360 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4361 helpcategory=command.CATEGORY_REPO_CREATION,
4361 helpcategory=command.CATEGORY_REPO_CREATION,
4362 helpbasic=True,
4362 helpbasic=True,
4363 norepo=True,
4363 norepo=True,
4364 )
4364 )
4365 def init(ui, dest=b".", **opts):
4365 def init(ui, dest=b".", **opts):
4366 """create a new repository in the given directory
4366 """create a new repository in the given directory
4367
4367
4368 Initialize a new repository in the given directory. If the given
4368 Initialize a new repository in the given directory. If the given
4369 directory does not exist, it will be created.
4369 directory does not exist, it will be created.
4370
4370
4371 If no directory is given, the current directory is used.
4371 If no directory is given, the current directory is used.
4372
4372
4373 It is possible to specify an ``ssh://`` URL as the destination.
4373 It is possible to specify an ``ssh://`` URL as the destination.
4374 See :hg:`help urls` for more information.
4374 See :hg:`help urls` for more information.
4375
4375
4376 Returns 0 on success.
4376 Returns 0 on success.
4377 """
4377 """
4378 opts = pycompat.byteskwargs(opts)
4378 opts = pycompat.byteskwargs(opts)
4379 peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
4379 path = urlutil.get_clone_path(ui, dest)[1]
4380 peer = hg.peer(ui, opts, path, create=True)
4380 peer.close()
4381 peer.close()
4381
4382
4382
4383
4383 @command(
4384 @command(
4384 b'locate',
4385 b'locate',
4385 [
4386 [
4386 (
4387 (
4387 b'r',
4388 b'r',
4388 b'rev',
4389 b'rev',
4389 b'',
4390 b'',
4390 _(b'search the repository as it is in REV'),
4391 _(b'search the repository as it is in REV'),
4391 _(b'REV'),
4392 _(b'REV'),
4392 ),
4393 ),
4393 (
4394 (
4394 b'0',
4395 b'0',
4395 b'print0',
4396 b'print0',
4396 None,
4397 None,
4397 _(b'end filenames with NUL, for use with xargs'),
4398 _(b'end filenames with NUL, for use with xargs'),
4398 ),
4399 ),
4399 (
4400 (
4400 b'f',
4401 b'f',
4401 b'fullpath',
4402 b'fullpath',
4402 None,
4403 None,
4403 _(b'print complete paths from the filesystem root'),
4404 _(b'print complete paths from the filesystem root'),
4404 ),
4405 ),
4405 ]
4406 ]
4406 + walkopts,
4407 + walkopts,
4407 _(b'[OPTION]... [PATTERN]...'),
4408 _(b'[OPTION]... [PATTERN]...'),
4408 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4409 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4409 )
4410 )
4410 def locate(ui, repo, *pats, **opts):
4411 def locate(ui, repo, *pats, **opts):
4411 """locate files matching specific patterns (DEPRECATED)
4412 """locate files matching specific patterns (DEPRECATED)
4412
4413
4413 Print files under Mercurial control in the working directory whose
4414 Print files under Mercurial control in the working directory whose
4414 names match the given patterns.
4415 names match the given patterns.
4415
4416
4416 By default, this command searches all directories in the working
4417 By default, this command searches all directories in the working
4417 directory. To search just the current directory and its
4418 directory. To search just the current directory and its
4418 subdirectories, use "--include .".
4419 subdirectories, use "--include .".
4419
4420
4420 If no patterns are given to match, this command prints the names
4421 If no patterns are given to match, this command prints the names
4421 of all files under Mercurial control in the working directory.
4422 of all files under Mercurial control in the working directory.
4422
4423
4423 If you want to feed the output of this command into the "xargs"
4424 If you want to feed the output of this command into the "xargs"
4424 command, use the -0 option to both this command and "xargs". This
4425 command, use the -0 option to both this command and "xargs". This
4425 will avoid the problem of "xargs" treating single filenames that
4426 will avoid the problem of "xargs" treating single filenames that
4426 contain whitespace as multiple filenames.
4427 contain whitespace as multiple filenames.
4427
4428
4428 See :hg:`help files` for a more versatile command.
4429 See :hg:`help files` for a more versatile command.
4429
4430
4430 Returns 0 if a match is found, 1 otherwise.
4431 Returns 0 if a match is found, 1 otherwise.
4431 """
4432 """
4432 opts = pycompat.byteskwargs(opts)
4433 opts = pycompat.byteskwargs(opts)
4433 if opts.get(b'print0'):
4434 if opts.get(b'print0'):
4434 end = b'\0'
4435 end = b'\0'
4435 else:
4436 else:
4436 end = b'\n'
4437 end = b'\n'
4437 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4438 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4438
4439
4439 ret = 1
4440 ret = 1
4440 m = scmutil.match(
4441 m = scmutil.match(
4441 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4442 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4442 )
4443 )
4443
4444
4444 ui.pager(b'locate')
4445 ui.pager(b'locate')
4445 if ctx.rev() is None:
4446 if ctx.rev() is None:
4446 # When run on the working copy, "locate" includes removed files, so
4447 # When run on the working copy, "locate" includes removed files, so
4447 # we get the list of files from the dirstate.
4448 # we get the list of files from the dirstate.
4448 filesgen = sorted(repo.dirstate.matches(m))
4449 filesgen = sorted(repo.dirstate.matches(m))
4449 else:
4450 else:
4450 filesgen = ctx.matches(m)
4451 filesgen = ctx.matches(m)
4451 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4452 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4452 for abs in filesgen:
4453 for abs in filesgen:
4453 if opts.get(b'fullpath'):
4454 if opts.get(b'fullpath'):
4454 ui.write(repo.wjoin(abs), end)
4455 ui.write(repo.wjoin(abs), end)
4455 else:
4456 else:
4456 ui.write(uipathfn(abs), end)
4457 ui.write(uipathfn(abs), end)
4457 ret = 0
4458 ret = 0
4458
4459
4459 return ret
4460 return ret
4460
4461
4461
4462
4462 @command(
4463 @command(
4463 b'log|history',
4464 b'log|history',
4464 [
4465 [
4465 (
4466 (
4466 b'f',
4467 b'f',
4467 b'follow',
4468 b'follow',
4468 None,
4469 None,
4469 _(
4470 _(
4470 b'follow changeset history, or file history across copies and renames'
4471 b'follow changeset history, or file history across copies and renames'
4471 ),
4472 ),
4472 ),
4473 ),
4473 (
4474 (
4474 b'',
4475 b'',
4475 b'follow-first',
4476 b'follow-first',
4476 None,
4477 None,
4477 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4478 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4478 ),
4479 ),
4479 (
4480 (
4480 b'd',
4481 b'd',
4481 b'date',
4482 b'date',
4482 b'',
4483 b'',
4483 _(b'show revisions matching date spec'),
4484 _(b'show revisions matching date spec'),
4484 _(b'DATE'),
4485 _(b'DATE'),
4485 ),
4486 ),
4486 (b'C', b'copies', None, _(b'show copied files')),
4487 (b'C', b'copies', None, _(b'show copied files')),
4487 (
4488 (
4488 b'k',
4489 b'k',
4489 b'keyword',
4490 b'keyword',
4490 [],
4491 [],
4491 _(b'do case-insensitive search for a given text'),
4492 _(b'do case-insensitive search for a given text'),
4492 _(b'TEXT'),
4493 _(b'TEXT'),
4493 ),
4494 ),
4494 (
4495 (
4495 b'r',
4496 b'r',
4496 b'rev',
4497 b'rev',
4497 [],
4498 [],
4498 _(b'revisions to select or follow from'),
4499 _(b'revisions to select or follow from'),
4499 _(b'REV'),
4500 _(b'REV'),
4500 ),
4501 ),
4501 (
4502 (
4502 b'L',
4503 b'L',
4503 b'line-range',
4504 b'line-range',
4504 [],
4505 [],
4505 _(b'follow line range of specified file (EXPERIMENTAL)'),
4506 _(b'follow line range of specified file (EXPERIMENTAL)'),
4506 _(b'FILE,RANGE'),
4507 _(b'FILE,RANGE'),
4507 ),
4508 ),
4508 (
4509 (
4509 b'',
4510 b'',
4510 b'removed',
4511 b'removed',
4511 None,
4512 None,
4512 _(b'include revisions where files were removed'),
4513 _(b'include revisions where files were removed'),
4513 ),
4514 ),
4514 (
4515 (
4515 b'm',
4516 b'm',
4516 b'only-merges',
4517 b'only-merges',
4517 None,
4518 None,
4518 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4519 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4519 ),
4520 ),
4520 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4521 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4521 (
4522 (
4522 b'',
4523 b'',
4523 b'only-branch',
4524 b'only-branch',
4524 [],
4525 [],
4525 _(
4526 _(
4526 b'show only changesets within the given named branch (DEPRECATED)'
4527 b'show only changesets within the given named branch (DEPRECATED)'
4527 ),
4528 ),
4528 _(b'BRANCH'),
4529 _(b'BRANCH'),
4529 ),
4530 ),
4530 (
4531 (
4531 b'b',
4532 b'b',
4532 b'branch',
4533 b'branch',
4533 [],
4534 [],
4534 _(b'show changesets within the given named branch'),
4535 _(b'show changesets within the given named branch'),
4535 _(b'BRANCH'),
4536 _(b'BRANCH'),
4536 ),
4537 ),
4537 (
4538 (
4538 b'B',
4539 b'B',
4539 b'bookmark',
4540 b'bookmark',
4540 [],
4541 [],
4541 _(b"show changesets within the given bookmark"),
4542 _(b"show changesets within the given bookmark"),
4542 _(b'BOOKMARK'),
4543 _(b'BOOKMARK'),
4543 ),
4544 ),
4544 (
4545 (
4545 b'P',
4546 b'P',
4546 b'prune',
4547 b'prune',
4547 [],
4548 [],
4548 _(b'do not display revision or any of its ancestors'),
4549 _(b'do not display revision or any of its ancestors'),
4549 _(b'REV'),
4550 _(b'REV'),
4550 ),
4551 ),
4551 ]
4552 ]
4552 + logopts
4553 + logopts
4553 + walkopts,
4554 + walkopts,
4554 _(b'[OPTION]... [FILE]'),
4555 _(b'[OPTION]... [FILE]'),
4555 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4556 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4556 helpbasic=True,
4557 helpbasic=True,
4557 inferrepo=True,
4558 inferrepo=True,
4558 intents={INTENT_READONLY},
4559 intents={INTENT_READONLY},
4559 )
4560 )
4560 def log(ui, repo, *pats, **opts):
4561 def log(ui, repo, *pats, **opts):
4561 """show revision history of entire repository or files
4562 """show revision history of entire repository or files
4562
4563
4563 Print the revision history of the specified files or the entire
4564 Print the revision history of the specified files or the entire
4564 project.
4565 project.
4565
4566
4566 If no revision range is specified, the default is ``tip:0`` unless
4567 If no revision range is specified, the default is ``tip:0`` unless
4567 --follow is set.
4568 --follow is set.
4568
4569
4569 File history is shown without following rename or copy history of
4570 File history is shown without following rename or copy history of
4570 files. Use -f/--follow with a filename to follow history across
4571 files. Use -f/--follow with a filename to follow history across
4571 renames and copies. --follow without a filename will only show
4572 renames and copies. --follow without a filename will only show
4572 ancestors of the starting revisions. The starting revisions can be
4573 ancestors of the starting revisions. The starting revisions can be
4573 specified by -r/--rev, which default to the working directory parent.
4574 specified by -r/--rev, which default to the working directory parent.
4574
4575
4575 By default this command prints revision number and changeset id,
4576 By default this command prints revision number and changeset id,
4576 tags, non-trivial parents, user, date and time, and a summary for
4577 tags, non-trivial parents, user, date and time, and a summary for
4577 each commit. When the -v/--verbose switch is used, the list of
4578 each commit. When the -v/--verbose switch is used, the list of
4578 changed files and full commit message are shown.
4579 changed files and full commit message are shown.
4579
4580
4580 With --graph the revisions are shown as an ASCII art DAG with the most
4581 With --graph the revisions are shown as an ASCII art DAG with the most
4581 recent changeset at the top.
4582 recent changeset at the top.
4582 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4583 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4583 involved in an unresolved merge conflict, '_' closes a branch,
4584 involved in an unresolved merge conflict, '_' closes a branch,
4584 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4585 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4585 changeset from the lines below is a parent of the 'o' merge on the same
4586 changeset from the lines below is a parent of the 'o' merge on the same
4586 line.
4587 line.
4587 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4588 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4588 of a '|' indicates one or more revisions in a path are omitted.
4589 of a '|' indicates one or more revisions in a path are omitted.
4589
4590
4590 .. container:: verbose
4591 .. container:: verbose
4591
4592
4592 Use -L/--line-range FILE,M:N options to follow the history of lines
4593 Use -L/--line-range FILE,M:N options to follow the history of lines
4593 from M to N in FILE. With -p/--patch only diff hunks affecting
4594 from M to N in FILE. With -p/--patch only diff hunks affecting
4594 specified line range will be shown. This option requires --follow;
4595 specified line range will be shown. This option requires --follow;
4595 it can be specified multiple times. Currently, this option is not
4596 it can be specified multiple times. Currently, this option is not
4596 compatible with --graph. This option is experimental.
4597 compatible with --graph. This option is experimental.
4597
4598
4598 .. note::
4599 .. note::
4599
4600
4600 :hg:`log --patch` may generate unexpected diff output for merge
4601 :hg:`log --patch` may generate unexpected diff output for merge
4601 changesets, as it will only compare the merge changeset against
4602 changesets, as it will only compare the merge changeset against
4602 its first parent. Also, only files different from BOTH parents
4603 its first parent. Also, only files different from BOTH parents
4603 will appear in files:.
4604 will appear in files:.
4604
4605
4605 .. note::
4606 .. note::
4606
4607
4607 For performance reasons, :hg:`log FILE` may omit duplicate changes
4608 For performance reasons, :hg:`log FILE` may omit duplicate changes
4608 made on branches and will not show removals or mode changes. To
4609 made on branches and will not show removals or mode changes. To
4609 see all such changes, use the --removed switch.
4610 see all such changes, use the --removed switch.
4610
4611
4611 .. container:: verbose
4612 .. container:: verbose
4612
4613
4613 .. note::
4614 .. note::
4614
4615
4615 The history resulting from -L/--line-range options depends on diff
4616 The history resulting from -L/--line-range options depends on diff
4616 options; for instance if white-spaces are ignored, respective changes
4617 options; for instance if white-spaces are ignored, respective changes
4617 with only white-spaces in specified line range will not be listed.
4618 with only white-spaces in specified line range will not be listed.
4618
4619
4619 .. container:: verbose
4620 .. container:: verbose
4620
4621
4621 Some examples:
4622 Some examples:
4622
4623
4623 - changesets with full descriptions and file lists::
4624 - changesets with full descriptions and file lists::
4624
4625
4625 hg log -v
4626 hg log -v
4626
4627
4627 - changesets ancestral to the working directory::
4628 - changesets ancestral to the working directory::
4628
4629
4629 hg log -f
4630 hg log -f
4630
4631
4631 - last 10 commits on the current branch::
4632 - last 10 commits on the current branch::
4632
4633
4633 hg log -l 10 -b .
4634 hg log -l 10 -b .
4634
4635
4635 - changesets showing all modifications of a file, including removals::
4636 - changesets showing all modifications of a file, including removals::
4636
4637
4637 hg log --removed file.c
4638 hg log --removed file.c
4638
4639
4639 - all changesets that touch a directory, with diffs, excluding merges::
4640 - all changesets that touch a directory, with diffs, excluding merges::
4640
4641
4641 hg log -Mp lib/
4642 hg log -Mp lib/
4642
4643
4643 - all revision numbers that match a keyword::
4644 - all revision numbers that match a keyword::
4644
4645
4645 hg log -k bug --template "{rev}\\n"
4646 hg log -k bug --template "{rev}\\n"
4646
4647
4647 - the full hash identifier of the working directory parent::
4648 - the full hash identifier of the working directory parent::
4648
4649
4649 hg log -r . --template "{node}\\n"
4650 hg log -r . --template "{node}\\n"
4650
4651
4651 - list available log templates::
4652 - list available log templates::
4652
4653
4653 hg log -T list
4654 hg log -T list
4654
4655
4655 - check if a given changeset is included in a tagged release::
4656 - check if a given changeset is included in a tagged release::
4656
4657
4657 hg log -r "a21ccf and ancestor(1.9)"
4658 hg log -r "a21ccf and ancestor(1.9)"
4658
4659
4659 - find all changesets by some user in a date range::
4660 - find all changesets by some user in a date range::
4660
4661
4661 hg log -k alice -d "may 2008 to jul 2008"
4662 hg log -k alice -d "may 2008 to jul 2008"
4662
4663
4663 - summary of all changesets after the last tag::
4664 - summary of all changesets after the last tag::
4664
4665
4665 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4666 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4666
4667
4667 - changesets touching lines 13 to 23 for file.c::
4668 - changesets touching lines 13 to 23 for file.c::
4668
4669
4669 hg log -L file.c,13:23
4670 hg log -L file.c,13:23
4670
4671
4671 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4672 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4672 main.c with patch::
4673 main.c with patch::
4673
4674
4674 hg log -L file.c,13:23 -L main.c,2:6 -p
4675 hg log -L file.c,13:23 -L main.c,2:6 -p
4675
4676
4676 See :hg:`help dates` for a list of formats valid for -d/--date.
4677 See :hg:`help dates` for a list of formats valid for -d/--date.
4677
4678
4678 See :hg:`help revisions` for more about specifying and ordering
4679 See :hg:`help revisions` for more about specifying and ordering
4679 revisions.
4680 revisions.
4680
4681
4681 See :hg:`help templates` for more about pre-packaged styles and
4682 See :hg:`help templates` for more about pre-packaged styles and
4682 specifying custom templates. The default template used by the log
4683 specifying custom templates. The default template used by the log
4683 command can be customized via the ``command-templates.log`` configuration
4684 command can be customized via the ``command-templates.log`` configuration
4684 setting.
4685 setting.
4685
4686
4686 Returns 0 on success.
4687 Returns 0 on success.
4687
4688
4688 """
4689 """
4689 opts = pycompat.byteskwargs(opts)
4690 opts = pycompat.byteskwargs(opts)
4690 linerange = opts.get(b'line_range')
4691 linerange = opts.get(b'line_range')
4691
4692
4692 if linerange and not opts.get(b'follow'):
4693 if linerange and not opts.get(b'follow'):
4693 raise error.InputError(_(b'--line-range requires --follow'))
4694 raise error.InputError(_(b'--line-range requires --follow'))
4694
4695
4695 if linerange and pats:
4696 if linerange and pats:
4696 # TODO: take pats as patterns with no line-range filter
4697 # TODO: take pats as patterns with no line-range filter
4697 raise error.InputError(
4698 raise error.InputError(
4698 _(b'FILE arguments are not compatible with --line-range option')
4699 _(b'FILE arguments are not compatible with --line-range option')
4699 )
4700 )
4700
4701
4701 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4702 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4702 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4703 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4703 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4704 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4704 if linerange:
4705 if linerange:
4705 # TODO: should follow file history from logcmdutil._initialrevs(),
4706 # TODO: should follow file history from logcmdutil._initialrevs(),
4706 # then filter the result by logcmdutil._makerevset() and --limit
4707 # then filter the result by logcmdutil._makerevset() and --limit
4707 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4708 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4708
4709
4709 getcopies = None
4710 getcopies = None
4710 if opts.get(b'copies'):
4711 if opts.get(b'copies'):
4711 endrev = None
4712 endrev = None
4712 if revs:
4713 if revs:
4713 endrev = revs.max() + 1
4714 endrev = revs.max() + 1
4714 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4715 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4715
4716
4716 ui.pager(b'log')
4717 ui.pager(b'log')
4717 displayer = logcmdutil.changesetdisplayer(
4718 displayer = logcmdutil.changesetdisplayer(
4718 ui, repo, opts, differ, buffered=True
4719 ui, repo, opts, differ, buffered=True
4719 )
4720 )
4720 if opts.get(b'graph'):
4721 if opts.get(b'graph'):
4721 displayfn = logcmdutil.displaygraphrevs
4722 displayfn = logcmdutil.displaygraphrevs
4722 else:
4723 else:
4723 displayfn = logcmdutil.displayrevs
4724 displayfn = logcmdutil.displayrevs
4724 displayfn(ui, repo, revs, displayer, getcopies)
4725 displayfn(ui, repo, revs, displayer, getcopies)
4725
4726
4726
4727
4727 @command(
4728 @command(
4728 b'manifest',
4729 b'manifest',
4729 [
4730 [
4730 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4731 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4731 (b'', b'all', False, _(b"list files from all revisions")),
4732 (b'', b'all', False, _(b"list files from all revisions")),
4732 ]
4733 ]
4733 + formatteropts,
4734 + formatteropts,
4734 _(b'[-r REV]'),
4735 _(b'[-r REV]'),
4735 helpcategory=command.CATEGORY_MAINTENANCE,
4736 helpcategory=command.CATEGORY_MAINTENANCE,
4736 intents={INTENT_READONLY},
4737 intents={INTENT_READONLY},
4737 )
4738 )
4738 def manifest(ui, repo, node=None, rev=None, **opts):
4739 def manifest(ui, repo, node=None, rev=None, **opts):
4739 """output the current or given revision of the project manifest
4740 """output the current or given revision of the project manifest
4740
4741
4741 Print a list of version controlled files for the given revision.
4742 Print a list of version controlled files for the given revision.
4742 If no revision is given, the first parent of the working directory
4743 If no revision is given, the first parent of the working directory
4743 is used, or the null revision if no revision is checked out.
4744 is used, or the null revision if no revision is checked out.
4744
4745
4745 With -v, print file permissions, symlink and executable bits.
4746 With -v, print file permissions, symlink and executable bits.
4746 With --debug, print file revision hashes.
4747 With --debug, print file revision hashes.
4747
4748
4748 If option --all is specified, the list of all files from all revisions
4749 If option --all is specified, the list of all files from all revisions
4749 is printed. This includes deleted and renamed files.
4750 is printed. This includes deleted and renamed files.
4750
4751
4751 Returns 0 on success.
4752 Returns 0 on success.
4752 """
4753 """
4753 opts = pycompat.byteskwargs(opts)
4754 opts = pycompat.byteskwargs(opts)
4754 fm = ui.formatter(b'manifest', opts)
4755 fm = ui.formatter(b'manifest', opts)
4755
4756
4756 if opts.get(b'all'):
4757 if opts.get(b'all'):
4757 if rev or node:
4758 if rev or node:
4758 raise error.InputError(_(b"can't specify a revision with --all"))
4759 raise error.InputError(_(b"can't specify a revision with --all"))
4759
4760
4760 res = set()
4761 res = set()
4761 for rev in repo:
4762 for rev in repo:
4762 ctx = repo[rev]
4763 ctx = repo[rev]
4763 res |= set(ctx.files())
4764 res |= set(ctx.files())
4764
4765
4765 ui.pager(b'manifest')
4766 ui.pager(b'manifest')
4766 for f in sorted(res):
4767 for f in sorted(res):
4767 fm.startitem()
4768 fm.startitem()
4768 fm.write(b"path", b'%s\n', f)
4769 fm.write(b"path", b'%s\n', f)
4769 fm.end()
4770 fm.end()
4770 return
4771 return
4771
4772
4772 if rev and node:
4773 if rev and node:
4773 raise error.InputError(_(b"please specify just one revision"))
4774 raise error.InputError(_(b"please specify just one revision"))
4774
4775
4775 if not node:
4776 if not node:
4776 node = rev
4777 node = rev
4777
4778
4778 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4779 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4779 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4780 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4780 if node:
4781 if node:
4781 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4782 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4782 ctx = scmutil.revsingle(repo, node)
4783 ctx = scmutil.revsingle(repo, node)
4783 mf = ctx.manifest()
4784 mf = ctx.manifest()
4784 ui.pager(b'manifest')
4785 ui.pager(b'manifest')
4785 for f in ctx:
4786 for f in ctx:
4786 fm.startitem()
4787 fm.startitem()
4787 fm.context(ctx=ctx)
4788 fm.context(ctx=ctx)
4788 fl = ctx[f].flags()
4789 fl = ctx[f].flags()
4789 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4790 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4790 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4791 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4791 fm.write(b'path', b'%s\n', f)
4792 fm.write(b'path', b'%s\n', f)
4792 fm.end()
4793 fm.end()
4793
4794
4794
4795
4795 @command(
4796 @command(
4796 b'merge',
4797 b'merge',
4797 [
4798 [
4798 (
4799 (
4799 b'f',
4800 b'f',
4800 b'force',
4801 b'force',
4801 None,
4802 None,
4802 _(b'force a merge including outstanding changes (DEPRECATED)'),
4803 _(b'force a merge including outstanding changes (DEPRECATED)'),
4803 ),
4804 ),
4804 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4805 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4805 (
4806 (
4806 b'P',
4807 b'P',
4807 b'preview',
4808 b'preview',
4808 None,
4809 None,
4809 _(b'review revisions to merge (no merge is performed)'),
4810 _(b'review revisions to merge (no merge is performed)'),
4810 ),
4811 ),
4811 (b'', b'abort', None, _(b'abort the ongoing merge')),
4812 (b'', b'abort', None, _(b'abort the ongoing merge')),
4812 ]
4813 ]
4813 + mergetoolopts,
4814 + mergetoolopts,
4814 _(b'[-P] [[-r] REV]'),
4815 _(b'[-P] [[-r] REV]'),
4815 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4816 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4816 helpbasic=True,
4817 helpbasic=True,
4817 )
4818 )
4818 def merge(ui, repo, node=None, **opts):
4819 def merge(ui, repo, node=None, **opts):
4819 """merge another revision into working directory
4820 """merge another revision into working directory
4820
4821
4821 The current working directory is updated with all changes made in
4822 The current working directory is updated with all changes made in
4822 the requested revision since the last common predecessor revision.
4823 the requested revision since the last common predecessor revision.
4823
4824
4824 Files that changed between either parent are marked as changed for
4825 Files that changed between either parent are marked as changed for
4825 the next commit and a commit must be performed before any further
4826 the next commit and a commit must be performed before any further
4826 updates to the repository are allowed. The next commit will have
4827 updates to the repository are allowed. The next commit will have
4827 two parents.
4828 two parents.
4828
4829
4829 ``--tool`` can be used to specify the merge tool used for file
4830 ``--tool`` can be used to specify the merge tool used for file
4830 merges. It overrides the HGMERGE environment variable and your
4831 merges. It overrides the HGMERGE environment variable and your
4831 configuration files. See :hg:`help merge-tools` for options.
4832 configuration files. See :hg:`help merge-tools` for options.
4832
4833
4833 If no revision is specified, the working directory's parent is a
4834 If no revision is specified, the working directory's parent is a
4834 head revision, and the current branch contains exactly one other
4835 head revision, and the current branch contains exactly one other
4835 head, the other head is merged with by default. Otherwise, an
4836 head, the other head is merged with by default. Otherwise, an
4836 explicit revision with which to merge must be provided.
4837 explicit revision with which to merge must be provided.
4837
4838
4838 See :hg:`help resolve` for information on handling file conflicts.
4839 See :hg:`help resolve` for information on handling file conflicts.
4839
4840
4840 To undo an uncommitted merge, use :hg:`merge --abort` which
4841 To undo an uncommitted merge, use :hg:`merge --abort` which
4841 will check out a clean copy of the original merge parent, losing
4842 will check out a clean copy of the original merge parent, losing
4842 all changes.
4843 all changes.
4843
4844
4844 Returns 0 on success, 1 if there are unresolved files.
4845 Returns 0 on success, 1 if there are unresolved files.
4845 """
4846 """
4846
4847
4847 opts = pycompat.byteskwargs(opts)
4848 opts = pycompat.byteskwargs(opts)
4848 abort = opts.get(b'abort')
4849 abort = opts.get(b'abort')
4849 if abort and repo.dirstate.p2() == nullid:
4850 if abort and repo.dirstate.p2() == nullid:
4850 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4851 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4851 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4852 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4852 if abort:
4853 if abort:
4853 state = cmdutil.getunfinishedstate(repo)
4854 state = cmdutil.getunfinishedstate(repo)
4854 if state and state._opname != b'merge':
4855 if state and state._opname != b'merge':
4855 raise error.StateError(
4856 raise error.StateError(
4856 _(b'cannot abort merge with %s in progress') % (state._opname),
4857 _(b'cannot abort merge with %s in progress') % (state._opname),
4857 hint=state.hint(),
4858 hint=state.hint(),
4858 )
4859 )
4859 if node:
4860 if node:
4860 raise error.InputError(_(b"cannot specify a node with --abort"))
4861 raise error.InputError(_(b"cannot specify a node with --abort"))
4861 return hg.abortmerge(repo.ui, repo)
4862 return hg.abortmerge(repo.ui, repo)
4862
4863
4863 if opts.get(b'rev') and node:
4864 if opts.get(b'rev') and node:
4864 raise error.InputError(_(b"please specify just one revision"))
4865 raise error.InputError(_(b"please specify just one revision"))
4865 if not node:
4866 if not node:
4866 node = opts.get(b'rev')
4867 node = opts.get(b'rev')
4867
4868
4868 if node:
4869 if node:
4869 ctx = scmutil.revsingle(repo, node)
4870 ctx = scmutil.revsingle(repo, node)
4870 else:
4871 else:
4871 if ui.configbool(b'commands', b'merge.require-rev'):
4872 if ui.configbool(b'commands', b'merge.require-rev'):
4872 raise error.InputError(
4873 raise error.InputError(
4873 _(
4874 _(
4874 b'configuration requires specifying revision to merge '
4875 b'configuration requires specifying revision to merge '
4875 b'with'
4876 b'with'
4876 )
4877 )
4877 )
4878 )
4878 ctx = repo[destutil.destmerge(repo)]
4879 ctx = repo[destutil.destmerge(repo)]
4879
4880
4880 if ctx.node() is None:
4881 if ctx.node() is None:
4881 raise error.InputError(
4882 raise error.InputError(
4882 _(b'merging with the working copy has no effect')
4883 _(b'merging with the working copy has no effect')
4883 )
4884 )
4884
4885
4885 if opts.get(b'preview'):
4886 if opts.get(b'preview'):
4886 # find nodes that are ancestors of p2 but not of p1
4887 # find nodes that are ancestors of p2 but not of p1
4887 p1 = repo[b'.'].node()
4888 p1 = repo[b'.'].node()
4888 p2 = ctx.node()
4889 p2 = ctx.node()
4889 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4890 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4890
4891
4891 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4892 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4892 for node in nodes:
4893 for node in nodes:
4893 displayer.show(repo[node])
4894 displayer.show(repo[node])
4894 displayer.close()
4895 displayer.close()
4895 return 0
4896 return 0
4896
4897
4897 # ui.forcemerge is an internal variable, do not document
4898 # ui.forcemerge is an internal variable, do not document
4898 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4899 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4899 with ui.configoverride(overrides, b'merge'):
4900 with ui.configoverride(overrides, b'merge'):
4900 force = opts.get(b'force')
4901 force = opts.get(b'force')
4901 labels = [b'working copy', b'merge rev']
4902 labels = [b'working copy', b'merge rev']
4902 return hg.merge(ctx, force=force, labels=labels)
4903 return hg.merge(ctx, force=force, labels=labels)
4903
4904
4904
4905
4905 statemod.addunfinished(
4906 statemod.addunfinished(
4906 b'merge',
4907 b'merge',
4907 fname=None,
4908 fname=None,
4908 clearable=True,
4909 clearable=True,
4909 allowcommit=True,
4910 allowcommit=True,
4910 cmdmsg=_(b'outstanding uncommitted merge'),
4911 cmdmsg=_(b'outstanding uncommitted merge'),
4911 abortfunc=hg.abortmerge,
4912 abortfunc=hg.abortmerge,
4912 statushint=_(
4913 statushint=_(
4913 b'To continue: hg commit\nTo abort: hg merge --abort'
4914 b'To continue: hg commit\nTo abort: hg merge --abort'
4914 ),
4915 ),
4915 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4916 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4916 )
4917 )
4917
4918
4918
4919
4919 @command(
4920 @command(
4920 b'outgoing|out',
4921 b'outgoing|out',
4921 [
4922 [
4922 (
4923 (
4923 b'f',
4924 b'f',
4924 b'force',
4925 b'force',
4925 None,
4926 None,
4926 _(b'run even when the destination is unrelated'),
4927 _(b'run even when the destination is unrelated'),
4927 ),
4928 ),
4928 (
4929 (
4929 b'r',
4930 b'r',
4930 b'rev',
4931 b'rev',
4931 [],
4932 [],
4932 _(b'a changeset intended to be included in the destination'),
4933 _(b'a changeset intended to be included in the destination'),
4933 _(b'REV'),
4934 _(b'REV'),
4934 ),
4935 ),
4935 (b'n', b'newest-first', None, _(b'show newest record first')),
4936 (b'n', b'newest-first', None, _(b'show newest record first')),
4936 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4937 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4937 (
4938 (
4938 b'b',
4939 b'b',
4939 b'branch',
4940 b'branch',
4940 [],
4941 [],
4941 _(b'a specific branch you would like to push'),
4942 _(b'a specific branch you would like to push'),
4942 _(b'BRANCH'),
4943 _(b'BRANCH'),
4943 ),
4944 ),
4944 ]
4945 ]
4945 + logopts
4946 + logopts
4946 + remoteopts
4947 + remoteopts
4947 + subrepoopts,
4948 + subrepoopts,
4948 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4949 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4949 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4950 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4950 )
4951 )
4951 def outgoing(ui, repo, *dests, **opts):
4952 def outgoing(ui, repo, *dests, **opts):
4952 """show changesets not found in the destination
4953 """show changesets not found in the destination
4953
4954
4954 Show changesets not found in the specified destination repository
4955 Show changesets not found in the specified destination repository
4955 or the default push location. These are the changesets that would
4956 or the default push location. These are the changesets that would
4956 be pushed if a push was requested.
4957 be pushed if a push was requested.
4957
4958
4958 See pull for details of valid destination formats.
4959 See pull for details of valid destination formats.
4959
4960
4960 .. container:: verbose
4961 .. container:: verbose
4961
4962
4962 With -B/--bookmarks, the result of bookmark comparison between
4963 With -B/--bookmarks, the result of bookmark comparison between
4963 local and remote repositories is displayed. With -v/--verbose,
4964 local and remote repositories is displayed. With -v/--verbose,
4964 status is also displayed for each bookmark like below::
4965 status is also displayed for each bookmark like below::
4965
4966
4966 BM1 01234567890a added
4967 BM1 01234567890a added
4967 BM2 deleted
4968 BM2 deleted
4968 BM3 234567890abc advanced
4969 BM3 234567890abc advanced
4969 BM4 34567890abcd diverged
4970 BM4 34567890abcd diverged
4970 BM5 4567890abcde changed
4971 BM5 4567890abcde changed
4971
4972
4972 The action taken when pushing depends on the
4973 The action taken when pushing depends on the
4973 status of each bookmark:
4974 status of each bookmark:
4974
4975
4975 :``added``: push with ``-B`` will create it
4976 :``added``: push with ``-B`` will create it
4976 :``deleted``: push with ``-B`` will delete it
4977 :``deleted``: push with ``-B`` will delete it
4977 :``advanced``: push will update it
4978 :``advanced``: push will update it
4978 :``diverged``: push with ``-B`` will update it
4979 :``diverged``: push with ``-B`` will update it
4979 :``changed``: push with ``-B`` will update it
4980 :``changed``: push with ``-B`` will update it
4980
4981
4981 From the point of view of pushing behavior, bookmarks
4982 From the point of view of pushing behavior, bookmarks
4982 existing only in the remote repository are treated as
4983 existing only in the remote repository are treated as
4983 ``deleted``, even if it is in fact added remotely.
4984 ``deleted``, even if it is in fact added remotely.
4984
4985
4985 Returns 0 if there are outgoing changes, 1 otherwise.
4986 Returns 0 if there are outgoing changes, 1 otherwise.
4986 """
4987 """
4987 opts = pycompat.byteskwargs(opts)
4988 opts = pycompat.byteskwargs(opts)
4988 if opts.get(b'bookmarks'):
4989 if opts.get(b'bookmarks'):
4989 for path in urlutil.get_push_paths(repo, ui, dests):
4990 for path in urlutil.get_push_paths(repo, ui, dests):
4990 dest = path.pushloc or path.loc
4991 dest = path.pushloc or path.loc
4991 other = hg.peer(repo, opts, dest)
4992 other = hg.peer(repo, opts, dest)
4992 try:
4993 try:
4993 if b'bookmarks' not in other.listkeys(b'namespaces'):
4994 if b'bookmarks' not in other.listkeys(b'namespaces'):
4994 ui.warn(_(b"remote doesn't support bookmarks\n"))
4995 ui.warn(_(b"remote doesn't support bookmarks\n"))
4995 return 0
4996 return 0
4996 ui.status(
4997 ui.status(
4997 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
4998 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
4998 )
4999 )
4999 ui.pager(b'outgoing')
5000 ui.pager(b'outgoing')
5000 return bookmarks.outgoing(ui, repo, other)
5001 return bookmarks.outgoing(ui, repo, other)
5001 finally:
5002 finally:
5002 other.close()
5003 other.close()
5003
5004
5004 return hg.outgoing(ui, repo, dests, opts)
5005 return hg.outgoing(ui, repo, dests, opts)
5005
5006
5006
5007
5007 @command(
5008 @command(
5008 b'parents',
5009 b'parents',
5009 [
5010 [
5010 (
5011 (
5011 b'r',
5012 b'r',
5012 b'rev',
5013 b'rev',
5013 b'',
5014 b'',
5014 _(b'show parents of the specified revision'),
5015 _(b'show parents of the specified revision'),
5015 _(b'REV'),
5016 _(b'REV'),
5016 ),
5017 ),
5017 ]
5018 ]
5018 + templateopts,
5019 + templateopts,
5019 _(b'[-r REV] [FILE]'),
5020 _(b'[-r REV] [FILE]'),
5020 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5021 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5021 inferrepo=True,
5022 inferrepo=True,
5022 )
5023 )
5023 def parents(ui, repo, file_=None, **opts):
5024 def parents(ui, repo, file_=None, **opts):
5024 """show the parents of the working directory or revision (DEPRECATED)
5025 """show the parents of the working directory or revision (DEPRECATED)
5025
5026
5026 Print the working directory's parent revisions. If a revision is
5027 Print the working directory's parent revisions. If a revision is
5027 given via -r/--rev, the parent of that revision will be printed.
5028 given via -r/--rev, the parent of that revision will be printed.
5028 If a file argument is given, the revision in which the file was
5029 If a file argument is given, the revision in which the file was
5029 last changed (before the working directory revision or the
5030 last changed (before the working directory revision or the
5030 argument to --rev if given) is printed.
5031 argument to --rev if given) is printed.
5031
5032
5032 This command is equivalent to::
5033 This command is equivalent to::
5033
5034
5034 hg log -r "p1()+p2()" or
5035 hg log -r "p1()+p2()" or
5035 hg log -r "p1(REV)+p2(REV)" or
5036 hg log -r "p1(REV)+p2(REV)" or
5036 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5037 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5037 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5038 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5038
5039
5039 See :hg:`summary` and :hg:`help revsets` for related information.
5040 See :hg:`summary` and :hg:`help revsets` for related information.
5040
5041
5041 Returns 0 on success.
5042 Returns 0 on success.
5042 """
5043 """
5043
5044
5044 opts = pycompat.byteskwargs(opts)
5045 opts = pycompat.byteskwargs(opts)
5045 rev = opts.get(b'rev')
5046 rev = opts.get(b'rev')
5046 if rev:
5047 if rev:
5047 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5048 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5048 ctx = scmutil.revsingle(repo, rev, None)
5049 ctx = scmutil.revsingle(repo, rev, None)
5049
5050
5050 if file_:
5051 if file_:
5051 m = scmutil.match(ctx, (file_,), opts)
5052 m = scmutil.match(ctx, (file_,), opts)
5052 if m.anypats() or len(m.files()) != 1:
5053 if m.anypats() or len(m.files()) != 1:
5053 raise error.InputError(_(b'can only specify an explicit filename'))
5054 raise error.InputError(_(b'can only specify an explicit filename'))
5054 file_ = m.files()[0]
5055 file_ = m.files()[0]
5055 filenodes = []
5056 filenodes = []
5056 for cp in ctx.parents():
5057 for cp in ctx.parents():
5057 if not cp:
5058 if not cp:
5058 continue
5059 continue
5059 try:
5060 try:
5060 filenodes.append(cp.filenode(file_))
5061 filenodes.append(cp.filenode(file_))
5061 except error.LookupError:
5062 except error.LookupError:
5062 pass
5063 pass
5063 if not filenodes:
5064 if not filenodes:
5064 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5065 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5065 p = []
5066 p = []
5066 for fn in filenodes:
5067 for fn in filenodes:
5067 fctx = repo.filectx(file_, fileid=fn)
5068 fctx = repo.filectx(file_, fileid=fn)
5068 p.append(fctx.node())
5069 p.append(fctx.node())
5069 else:
5070 else:
5070 p = [cp.node() for cp in ctx.parents()]
5071 p = [cp.node() for cp in ctx.parents()]
5071
5072
5072 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5073 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5073 for n in p:
5074 for n in p:
5074 if n != nullid:
5075 if n != nullid:
5075 displayer.show(repo[n])
5076 displayer.show(repo[n])
5076 displayer.close()
5077 displayer.close()
5077
5078
5078
5079
5079 @command(
5080 @command(
5080 b'paths',
5081 b'paths',
5081 formatteropts,
5082 formatteropts,
5082 _(b'[NAME]'),
5083 _(b'[NAME]'),
5083 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5084 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5084 optionalrepo=True,
5085 optionalrepo=True,
5085 intents={INTENT_READONLY},
5086 intents={INTENT_READONLY},
5086 )
5087 )
5087 def paths(ui, repo, search=None, **opts):
5088 def paths(ui, repo, search=None, **opts):
5088 """show aliases for remote repositories
5089 """show aliases for remote repositories
5089
5090
5090 Show definition of symbolic path name NAME. If no name is given,
5091 Show definition of symbolic path name NAME. If no name is given,
5091 show definition of all available names.
5092 show definition of all available names.
5092
5093
5093 Option -q/--quiet suppresses all output when searching for NAME
5094 Option -q/--quiet suppresses all output when searching for NAME
5094 and shows only the path names when listing all definitions.
5095 and shows only the path names when listing all definitions.
5095
5096
5096 Path names are defined in the [paths] section of your
5097 Path names are defined in the [paths] section of your
5097 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5098 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5098 repository, ``.hg/hgrc`` is used, too.
5099 repository, ``.hg/hgrc`` is used, too.
5099
5100
5100 The path names ``default`` and ``default-push`` have a special
5101 The path names ``default`` and ``default-push`` have a special
5101 meaning. When performing a push or pull operation, they are used
5102 meaning. When performing a push or pull operation, they are used
5102 as fallbacks if no location is specified on the command-line.
5103 as fallbacks if no location is specified on the command-line.
5103 When ``default-push`` is set, it will be used for push and
5104 When ``default-push`` is set, it will be used for push and
5104 ``default`` will be used for pull; otherwise ``default`` is used
5105 ``default`` will be used for pull; otherwise ``default`` is used
5105 as the fallback for both. When cloning a repository, the clone
5106 as the fallback for both. When cloning a repository, the clone
5106 source is written as ``default`` in ``.hg/hgrc``.
5107 source is written as ``default`` in ``.hg/hgrc``.
5107
5108
5108 .. note::
5109 .. note::
5109
5110
5110 ``default`` and ``default-push`` apply to all inbound (e.g.
5111 ``default`` and ``default-push`` apply to all inbound (e.g.
5111 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5112 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5112 and :hg:`bundle`) operations.
5113 and :hg:`bundle`) operations.
5113
5114
5114 See :hg:`help urls` for more information.
5115 See :hg:`help urls` for more information.
5115
5116
5116 .. container:: verbose
5117 .. container:: verbose
5117
5118
5118 Template:
5119 Template:
5119
5120
5120 The following keywords are supported. See also :hg:`help templates`.
5121 The following keywords are supported. See also :hg:`help templates`.
5121
5122
5122 :name: String. Symbolic name of the path alias.
5123 :name: String. Symbolic name of the path alias.
5123 :pushurl: String. URL for push operations.
5124 :pushurl: String. URL for push operations.
5124 :url: String. URL or directory path for the other operations.
5125 :url: String. URL or directory path for the other operations.
5125
5126
5126 Returns 0 on success.
5127 Returns 0 on success.
5127 """
5128 """
5128
5129
5129 opts = pycompat.byteskwargs(opts)
5130 opts = pycompat.byteskwargs(opts)
5130 ui.pager(b'paths')
5131 ui.pager(b'paths')
5131 if search:
5132 if search:
5132 pathitems = [
5133 pathitems = [
5133 (name, path)
5134 (name, path)
5134 for name, path in pycompat.iteritems(ui.paths)
5135 for name, path in pycompat.iteritems(ui.paths)
5135 if name == search
5136 if name == search
5136 ]
5137 ]
5137 else:
5138 else:
5138 pathitems = sorted(pycompat.iteritems(ui.paths))
5139 pathitems = sorted(pycompat.iteritems(ui.paths))
5139
5140
5140 fm = ui.formatter(b'paths', opts)
5141 fm = ui.formatter(b'paths', opts)
5141 if fm.isplain():
5142 if fm.isplain():
5142 hidepassword = urlutil.hidepassword
5143 hidepassword = urlutil.hidepassword
5143 else:
5144 else:
5144 hidepassword = bytes
5145 hidepassword = bytes
5145 if ui.quiet:
5146 if ui.quiet:
5146 namefmt = b'%s\n'
5147 namefmt = b'%s\n'
5147 else:
5148 else:
5148 namefmt = b'%s = '
5149 namefmt = b'%s = '
5149 showsubopts = not search and not ui.quiet
5150 showsubopts = not search and not ui.quiet
5150
5151
5151 for name, path in pathitems:
5152 for name, path in pathitems:
5152 fm.startitem()
5153 fm.startitem()
5153 fm.condwrite(not search, b'name', namefmt, name)
5154 fm.condwrite(not search, b'name', namefmt, name)
5154 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5155 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5155 for subopt, value in sorted(path.suboptions.items()):
5156 for subopt, value in sorted(path.suboptions.items()):
5156 assert subopt not in (b'name', b'url')
5157 assert subopt not in (b'name', b'url')
5157 if showsubopts:
5158 if showsubopts:
5158 fm.plain(b'%s:%s = ' % (name, subopt))
5159 fm.plain(b'%s:%s = ' % (name, subopt))
5159 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5160 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5160
5161
5161 fm.end()
5162 fm.end()
5162
5163
5163 if search and not pathitems:
5164 if search and not pathitems:
5164 if not ui.quiet:
5165 if not ui.quiet:
5165 ui.warn(_(b"not found!\n"))
5166 ui.warn(_(b"not found!\n"))
5166 return 1
5167 return 1
5167 else:
5168 else:
5168 return 0
5169 return 0
5169
5170
5170
5171
5171 @command(
5172 @command(
5172 b'phase',
5173 b'phase',
5173 [
5174 [
5174 (b'p', b'public', False, _(b'set changeset phase to public')),
5175 (b'p', b'public', False, _(b'set changeset phase to public')),
5175 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5176 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5176 (b's', b'secret', False, _(b'set changeset phase to secret')),
5177 (b's', b'secret', False, _(b'set changeset phase to secret')),
5177 (b'f', b'force', False, _(b'allow to move boundary backward')),
5178 (b'f', b'force', False, _(b'allow to move boundary backward')),
5178 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5179 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5179 ],
5180 ],
5180 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5181 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5181 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5182 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5182 )
5183 )
5183 def phase(ui, repo, *revs, **opts):
5184 def phase(ui, repo, *revs, **opts):
5184 """set or show the current phase name
5185 """set or show the current phase name
5185
5186
5186 With no argument, show the phase name of the current revision(s).
5187 With no argument, show the phase name of the current revision(s).
5187
5188
5188 With one of -p/--public, -d/--draft or -s/--secret, change the
5189 With one of -p/--public, -d/--draft or -s/--secret, change the
5189 phase value of the specified revisions.
5190 phase value of the specified revisions.
5190
5191
5191 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5192 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5192 lower phase to a higher phase. Phases are ordered as follows::
5193 lower phase to a higher phase. Phases are ordered as follows::
5193
5194
5194 public < draft < secret
5195 public < draft < secret
5195
5196
5196 Returns 0 on success, 1 if some phases could not be changed.
5197 Returns 0 on success, 1 if some phases could not be changed.
5197
5198
5198 (For more information about the phases concept, see :hg:`help phases`.)
5199 (For more information about the phases concept, see :hg:`help phases`.)
5199 """
5200 """
5200 opts = pycompat.byteskwargs(opts)
5201 opts = pycompat.byteskwargs(opts)
5201 # search for a unique phase argument
5202 # search for a unique phase argument
5202 targetphase = None
5203 targetphase = None
5203 for idx, name in enumerate(phases.cmdphasenames):
5204 for idx, name in enumerate(phases.cmdphasenames):
5204 if opts[name]:
5205 if opts[name]:
5205 if targetphase is not None:
5206 if targetphase is not None:
5206 raise error.InputError(_(b'only one phase can be specified'))
5207 raise error.InputError(_(b'only one phase can be specified'))
5207 targetphase = idx
5208 targetphase = idx
5208
5209
5209 # look for specified revision
5210 # look for specified revision
5210 revs = list(revs)
5211 revs = list(revs)
5211 revs.extend(opts[b'rev'])
5212 revs.extend(opts[b'rev'])
5212 if not revs:
5213 if not revs:
5213 # display both parents as the second parent phase can influence
5214 # display both parents as the second parent phase can influence
5214 # the phase of a merge commit
5215 # the phase of a merge commit
5215 revs = [c.rev() for c in repo[None].parents()]
5216 revs = [c.rev() for c in repo[None].parents()]
5216
5217
5217 revs = scmutil.revrange(repo, revs)
5218 revs = scmutil.revrange(repo, revs)
5218
5219
5219 ret = 0
5220 ret = 0
5220 if targetphase is None:
5221 if targetphase is None:
5221 # display
5222 # display
5222 for r in revs:
5223 for r in revs:
5223 ctx = repo[r]
5224 ctx = repo[r]
5224 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5225 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5225 else:
5226 else:
5226 with repo.lock(), repo.transaction(b"phase") as tr:
5227 with repo.lock(), repo.transaction(b"phase") as tr:
5227 # set phase
5228 # set phase
5228 if not revs:
5229 if not revs:
5229 raise error.InputError(_(b'empty revision set'))
5230 raise error.InputError(_(b'empty revision set'))
5230 nodes = [repo[r].node() for r in revs]
5231 nodes = [repo[r].node() for r in revs]
5231 # moving revision from public to draft may hide them
5232 # moving revision from public to draft may hide them
5232 # We have to check result on an unfiltered repository
5233 # We have to check result on an unfiltered repository
5233 unfi = repo.unfiltered()
5234 unfi = repo.unfiltered()
5234 getphase = unfi._phasecache.phase
5235 getphase = unfi._phasecache.phase
5235 olddata = [getphase(unfi, r) for r in unfi]
5236 olddata = [getphase(unfi, r) for r in unfi]
5236 phases.advanceboundary(repo, tr, targetphase, nodes)
5237 phases.advanceboundary(repo, tr, targetphase, nodes)
5237 if opts[b'force']:
5238 if opts[b'force']:
5238 phases.retractboundary(repo, tr, targetphase, nodes)
5239 phases.retractboundary(repo, tr, targetphase, nodes)
5239 getphase = unfi._phasecache.phase
5240 getphase = unfi._phasecache.phase
5240 newdata = [getphase(unfi, r) for r in unfi]
5241 newdata = [getphase(unfi, r) for r in unfi]
5241 changes = sum(newdata[r] != olddata[r] for r in unfi)
5242 changes = sum(newdata[r] != olddata[r] for r in unfi)
5242 cl = unfi.changelog
5243 cl = unfi.changelog
5243 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5244 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5244 if rejected:
5245 if rejected:
5245 ui.warn(
5246 ui.warn(
5246 _(
5247 _(
5247 b'cannot move %i changesets to a higher '
5248 b'cannot move %i changesets to a higher '
5248 b'phase, use --force\n'
5249 b'phase, use --force\n'
5249 )
5250 )
5250 % len(rejected)
5251 % len(rejected)
5251 )
5252 )
5252 ret = 1
5253 ret = 1
5253 if changes:
5254 if changes:
5254 msg = _(b'phase changed for %i changesets\n') % changes
5255 msg = _(b'phase changed for %i changesets\n') % changes
5255 if ret:
5256 if ret:
5256 ui.status(msg)
5257 ui.status(msg)
5257 else:
5258 else:
5258 ui.note(msg)
5259 ui.note(msg)
5259 else:
5260 else:
5260 ui.warn(_(b'no phases changed\n'))
5261 ui.warn(_(b'no phases changed\n'))
5261 return ret
5262 return ret
5262
5263
5263
5264
5264 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5265 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5265 """Run after a changegroup has been added via pull/unbundle
5266 """Run after a changegroup has been added via pull/unbundle
5266
5267
5267 This takes arguments below:
5268 This takes arguments below:
5268
5269
5269 :modheads: change of heads by pull/unbundle
5270 :modheads: change of heads by pull/unbundle
5270 :optupdate: updating working directory is needed or not
5271 :optupdate: updating working directory is needed or not
5271 :checkout: update destination revision (or None to default destination)
5272 :checkout: update destination revision (or None to default destination)
5272 :brev: a name, which might be a bookmark to be activated after updating
5273 :brev: a name, which might be a bookmark to be activated after updating
5273
5274
5274 return True if update raise any conflict, False otherwise.
5275 return True if update raise any conflict, False otherwise.
5275 """
5276 """
5276 if modheads == 0:
5277 if modheads == 0:
5277 return False
5278 return False
5278 if optupdate:
5279 if optupdate:
5279 try:
5280 try:
5280 return hg.updatetotally(ui, repo, checkout, brev)
5281 return hg.updatetotally(ui, repo, checkout, brev)
5281 except error.UpdateAbort as inst:
5282 except error.UpdateAbort as inst:
5282 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5283 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5283 hint = inst.hint
5284 hint = inst.hint
5284 raise error.UpdateAbort(msg, hint=hint)
5285 raise error.UpdateAbort(msg, hint=hint)
5285 if modheads is not None and modheads > 1:
5286 if modheads is not None and modheads > 1:
5286 currentbranchheads = len(repo.branchheads())
5287 currentbranchheads = len(repo.branchheads())
5287 if currentbranchheads == modheads:
5288 if currentbranchheads == modheads:
5288 ui.status(
5289 ui.status(
5289 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5290 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5290 )
5291 )
5291 elif currentbranchheads > 1:
5292 elif currentbranchheads > 1:
5292 ui.status(
5293 ui.status(
5293 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5294 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5294 )
5295 )
5295 else:
5296 else:
5296 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5297 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5297 elif not ui.configbool(b'commands', b'update.requiredest'):
5298 elif not ui.configbool(b'commands', b'update.requiredest'):
5298 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5299 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5299 return False
5300 return False
5300
5301
5301
5302
5302 @command(
5303 @command(
5303 b'pull',
5304 b'pull',
5304 [
5305 [
5305 (
5306 (
5306 b'u',
5307 b'u',
5307 b'update',
5308 b'update',
5308 None,
5309 None,
5309 _(b'update to new branch head if new descendants were pulled'),
5310 _(b'update to new branch head if new descendants were pulled'),
5310 ),
5311 ),
5311 (
5312 (
5312 b'f',
5313 b'f',
5313 b'force',
5314 b'force',
5314 None,
5315 None,
5315 _(b'run even when remote repository is unrelated'),
5316 _(b'run even when remote repository is unrelated'),
5316 ),
5317 ),
5317 (
5318 (
5318 b'',
5319 b'',
5319 b'confirm',
5320 b'confirm',
5320 None,
5321 None,
5321 _(b'confirm pull before applying changes'),
5322 _(b'confirm pull before applying changes'),
5322 ),
5323 ),
5323 (
5324 (
5324 b'r',
5325 b'r',
5325 b'rev',
5326 b'rev',
5326 [],
5327 [],
5327 _(b'a remote changeset intended to be added'),
5328 _(b'a remote changeset intended to be added'),
5328 _(b'REV'),
5329 _(b'REV'),
5329 ),
5330 ),
5330 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5331 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5331 (
5332 (
5332 b'b',
5333 b'b',
5333 b'branch',
5334 b'branch',
5334 [],
5335 [],
5335 _(b'a specific branch you would like to pull'),
5336 _(b'a specific branch you would like to pull'),
5336 _(b'BRANCH'),
5337 _(b'BRANCH'),
5337 ),
5338 ),
5338 ]
5339 ]
5339 + remoteopts,
5340 + remoteopts,
5340 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5341 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5341 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5342 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5342 helpbasic=True,
5343 helpbasic=True,
5343 )
5344 )
5344 def pull(ui, repo, *sources, **opts):
5345 def pull(ui, repo, *sources, **opts):
5345 """pull changes from the specified source
5346 """pull changes from the specified source
5346
5347
5347 Pull changes from a remote repository to a local one.
5348 Pull changes from a remote repository to a local one.
5348
5349
5349 This finds all changes from the repository at the specified path
5350 This finds all changes from the repository at the specified path
5350 or URL and adds them to a local repository (the current one unless
5351 or URL and adds them to a local repository (the current one unless
5351 -R is specified). By default, this does not update the copy of the
5352 -R is specified). By default, this does not update the copy of the
5352 project in the working directory.
5353 project in the working directory.
5353
5354
5354 When cloning from servers that support it, Mercurial may fetch
5355 When cloning from servers that support it, Mercurial may fetch
5355 pre-generated data. When this is done, hooks operating on incoming
5356 pre-generated data. When this is done, hooks operating on incoming
5356 changesets and changegroups may fire more than once, once for each
5357 changesets and changegroups may fire more than once, once for each
5357 pre-generated bundle and as well as for any additional remaining
5358 pre-generated bundle and as well as for any additional remaining
5358 data. See :hg:`help -e clonebundles` for more.
5359 data. See :hg:`help -e clonebundles` for more.
5359
5360
5360 Use :hg:`incoming` if you want to see what would have been added
5361 Use :hg:`incoming` if you want to see what would have been added
5361 by a pull at the time you issued this command. If you then decide
5362 by a pull at the time you issued this command. If you then decide
5362 to add those changes to the repository, you should use :hg:`pull
5363 to add those changes to the repository, you should use :hg:`pull
5363 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5364 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5364
5365
5365 If SOURCE is omitted, the 'default' path will be used.
5366 If SOURCE is omitted, the 'default' path will be used.
5366 See :hg:`help urls` for more information.
5367 See :hg:`help urls` for more information.
5367
5368
5368 If multiple sources are specified, they will be pulled sequentially as if
5369 If multiple sources are specified, they will be pulled sequentially as if
5369 the command was run multiple time. If --update is specify and the command
5370 the command was run multiple time. If --update is specify and the command
5370 will stop at the first failed --update.
5371 will stop at the first failed --update.
5371
5372
5372 Specifying bookmark as ``.`` is equivalent to specifying the active
5373 Specifying bookmark as ``.`` is equivalent to specifying the active
5373 bookmark's name.
5374 bookmark's name.
5374
5375
5375 Returns 0 on success, 1 if an update had unresolved files.
5376 Returns 0 on success, 1 if an update had unresolved files.
5376 """
5377 """
5377
5378
5378 opts = pycompat.byteskwargs(opts)
5379 opts = pycompat.byteskwargs(opts)
5379 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5380 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5380 b'update'
5381 b'update'
5381 ):
5382 ):
5382 msg = _(b'update destination required by configuration')
5383 msg = _(b'update destination required by configuration')
5383 hint = _(b'use hg pull followed by hg update DEST')
5384 hint = _(b'use hg pull followed by hg update DEST')
5384 raise error.InputError(msg, hint=hint)
5385 raise error.InputError(msg, hint=hint)
5385
5386
5386 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5387 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5387 for source, branches in sources:
5388 for source, branches in sources:
5388 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5389 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5389 ui.flush()
5390 ui.flush()
5390 other = hg.peer(repo, opts, source)
5391 other = hg.peer(repo, opts, source)
5391 update_conflict = None
5392 update_conflict = None
5392 try:
5393 try:
5393 revs, checkout = hg.addbranchrevs(
5394 revs, checkout = hg.addbranchrevs(
5394 repo, other, branches, opts.get(b'rev')
5395 repo, other, branches, opts.get(b'rev')
5395 )
5396 )
5396
5397
5397 pullopargs = {}
5398 pullopargs = {}
5398
5399
5399 nodes = None
5400 nodes = None
5400 if opts.get(b'bookmark') or revs:
5401 if opts.get(b'bookmark') or revs:
5401 # The list of bookmark used here is the same used to actually update
5402 # The list of bookmark used here is the same used to actually update
5402 # the bookmark names, to avoid the race from issue 4689 and we do
5403 # the bookmark names, to avoid the race from issue 4689 and we do
5403 # all lookup and bookmark queries in one go so they see the same
5404 # all lookup and bookmark queries in one go so they see the same
5404 # version of the server state (issue 4700).
5405 # version of the server state (issue 4700).
5405 nodes = []
5406 nodes = []
5406 fnodes = []
5407 fnodes = []
5407 revs = revs or []
5408 revs = revs or []
5408 if revs and not other.capable(b'lookup'):
5409 if revs and not other.capable(b'lookup'):
5409 err = _(
5410 err = _(
5410 b"other repository doesn't support revision lookup, "
5411 b"other repository doesn't support revision lookup, "
5411 b"so a rev cannot be specified."
5412 b"so a rev cannot be specified."
5412 )
5413 )
5413 raise error.Abort(err)
5414 raise error.Abort(err)
5414 with other.commandexecutor() as e:
5415 with other.commandexecutor() as e:
5415 fremotebookmarks = e.callcommand(
5416 fremotebookmarks = e.callcommand(
5416 b'listkeys', {b'namespace': b'bookmarks'}
5417 b'listkeys', {b'namespace': b'bookmarks'}
5417 )
5418 )
5418 for r in revs:
5419 for r in revs:
5419 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5420 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5420 remotebookmarks = fremotebookmarks.result()
5421 remotebookmarks = fremotebookmarks.result()
5421 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5422 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5422 pullopargs[b'remotebookmarks'] = remotebookmarks
5423 pullopargs[b'remotebookmarks'] = remotebookmarks
5423 for b in opts.get(b'bookmark', []):
5424 for b in opts.get(b'bookmark', []):
5424 b = repo._bookmarks.expandname(b)
5425 b = repo._bookmarks.expandname(b)
5425 if b not in remotebookmarks:
5426 if b not in remotebookmarks:
5426 raise error.InputError(
5427 raise error.InputError(
5427 _(b'remote bookmark %s not found!') % b
5428 _(b'remote bookmark %s not found!') % b
5428 )
5429 )
5429 nodes.append(remotebookmarks[b])
5430 nodes.append(remotebookmarks[b])
5430 for i, rev in enumerate(revs):
5431 for i, rev in enumerate(revs):
5431 node = fnodes[i].result()
5432 node = fnodes[i].result()
5432 nodes.append(node)
5433 nodes.append(node)
5433 if rev == checkout:
5434 if rev == checkout:
5434 checkout = node
5435 checkout = node
5435
5436
5436 wlock = util.nullcontextmanager()
5437 wlock = util.nullcontextmanager()
5437 if opts.get(b'update'):
5438 if opts.get(b'update'):
5438 wlock = repo.wlock()
5439 wlock = repo.wlock()
5439 with wlock:
5440 with wlock:
5440 pullopargs.update(opts.get(b'opargs', {}))
5441 pullopargs.update(opts.get(b'opargs', {}))
5441 modheads = exchange.pull(
5442 modheads = exchange.pull(
5442 repo,
5443 repo,
5443 other,
5444 other,
5444 heads=nodes,
5445 heads=nodes,
5445 force=opts.get(b'force'),
5446 force=opts.get(b'force'),
5446 bookmarks=opts.get(b'bookmark', ()),
5447 bookmarks=opts.get(b'bookmark', ()),
5447 opargs=pullopargs,
5448 opargs=pullopargs,
5448 confirm=opts.get(b'confirm'),
5449 confirm=opts.get(b'confirm'),
5449 ).cgresult
5450 ).cgresult
5450
5451
5451 # brev is a name, which might be a bookmark to be activated at
5452 # brev is a name, which might be a bookmark to be activated at
5452 # the end of the update. In other words, it is an explicit
5453 # the end of the update. In other words, it is an explicit
5453 # destination of the update
5454 # destination of the update
5454 brev = None
5455 brev = None
5455
5456
5456 if checkout:
5457 if checkout:
5457 checkout = repo.unfiltered().changelog.rev(checkout)
5458 checkout = repo.unfiltered().changelog.rev(checkout)
5458
5459
5459 # order below depends on implementation of
5460 # order below depends on implementation of
5460 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5461 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5461 # because 'checkout' is determined without it.
5462 # because 'checkout' is determined without it.
5462 if opts.get(b'rev'):
5463 if opts.get(b'rev'):
5463 brev = opts[b'rev'][0]
5464 brev = opts[b'rev'][0]
5464 elif opts.get(b'branch'):
5465 elif opts.get(b'branch'):
5465 brev = opts[b'branch'][0]
5466 brev = opts[b'branch'][0]
5466 else:
5467 else:
5467 brev = branches[0]
5468 brev = branches[0]
5468 repo._subtoppath = source
5469 repo._subtoppath = source
5469 try:
5470 try:
5470 update_conflict = postincoming(
5471 update_conflict = postincoming(
5471 ui, repo, modheads, opts.get(b'update'), checkout, brev
5472 ui, repo, modheads, opts.get(b'update'), checkout, brev
5472 )
5473 )
5473 except error.FilteredRepoLookupError as exc:
5474 except error.FilteredRepoLookupError as exc:
5474 msg = _(b'cannot update to target: %s') % exc.args[0]
5475 msg = _(b'cannot update to target: %s') % exc.args[0]
5475 exc.args = (msg,) + exc.args[1:]
5476 exc.args = (msg,) + exc.args[1:]
5476 raise
5477 raise
5477 finally:
5478 finally:
5478 del repo._subtoppath
5479 del repo._subtoppath
5479
5480
5480 finally:
5481 finally:
5481 other.close()
5482 other.close()
5482 # skip the remaining pull source if they are some conflict.
5483 # skip the remaining pull source if they are some conflict.
5483 if update_conflict:
5484 if update_conflict:
5484 break
5485 break
5485 if update_conflict:
5486 if update_conflict:
5486 return 1
5487 return 1
5487 else:
5488 else:
5488 return 0
5489 return 0
5489
5490
5490
5491
5491 @command(
5492 @command(
5492 b'purge|clean',
5493 b'purge|clean',
5493 [
5494 [
5494 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5495 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5495 (b'', b'all', None, _(b'purge ignored files too')),
5496 (b'', b'all', None, _(b'purge ignored files too')),
5496 (b'i', b'ignored', None, _(b'purge only ignored files')),
5497 (b'i', b'ignored', None, _(b'purge only ignored files')),
5497 (b'', b'dirs', None, _(b'purge empty directories')),
5498 (b'', b'dirs', None, _(b'purge empty directories')),
5498 (b'', b'files', None, _(b'purge files')),
5499 (b'', b'files', None, _(b'purge files')),
5499 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5500 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5500 (
5501 (
5501 b'0',
5502 b'0',
5502 b'print0',
5503 b'print0',
5503 None,
5504 None,
5504 _(
5505 _(
5505 b'end filenames with NUL, for use with xargs'
5506 b'end filenames with NUL, for use with xargs'
5506 b' (implies -p/--print)'
5507 b' (implies -p/--print)'
5507 ),
5508 ),
5508 ),
5509 ),
5509 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5510 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5510 ]
5511 ]
5511 + cmdutil.walkopts,
5512 + cmdutil.walkopts,
5512 _(b'hg purge [OPTION]... [DIR]...'),
5513 _(b'hg purge [OPTION]... [DIR]...'),
5513 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5514 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5514 )
5515 )
5515 def purge(ui, repo, *dirs, **opts):
5516 def purge(ui, repo, *dirs, **opts):
5516 """removes files not tracked by Mercurial
5517 """removes files not tracked by Mercurial
5517
5518
5518 Delete files not known to Mercurial. This is useful to test local
5519 Delete files not known to Mercurial. This is useful to test local
5519 and uncommitted changes in an otherwise-clean source tree.
5520 and uncommitted changes in an otherwise-clean source tree.
5520
5521
5521 This means that purge will delete the following by default:
5522 This means that purge will delete the following by default:
5522
5523
5523 - Unknown files: files marked with "?" by :hg:`status`
5524 - Unknown files: files marked with "?" by :hg:`status`
5524 - Empty directories: in fact Mercurial ignores directories unless
5525 - Empty directories: in fact Mercurial ignores directories unless
5525 they contain files under source control management
5526 they contain files under source control management
5526
5527
5527 But it will leave untouched:
5528 But it will leave untouched:
5528
5529
5529 - Modified and unmodified tracked files
5530 - Modified and unmodified tracked files
5530 - Ignored files (unless -i or --all is specified)
5531 - Ignored files (unless -i or --all is specified)
5531 - New files added to the repository (with :hg:`add`)
5532 - New files added to the repository (with :hg:`add`)
5532
5533
5533 The --files and --dirs options can be used to direct purge to delete
5534 The --files and --dirs options can be used to direct purge to delete
5534 only files, only directories, or both. If neither option is given,
5535 only files, only directories, or both. If neither option is given,
5535 both will be deleted.
5536 both will be deleted.
5536
5537
5537 If directories are given on the command line, only files in these
5538 If directories are given on the command line, only files in these
5538 directories are considered.
5539 directories are considered.
5539
5540
5540 Be careful with purge, as you could irreversibly delete some files
5541 Be careful with purge, as you could irreversibly delete some files
5541 you forgot to add to the repository. If you only want to print the
5542 you forgot to add to the repository. If you only want to print the
5542 list of files that this program would delete, use the --print
5543 list of files that this program would delete, use the --print
5543 option.
5544 option.
5544 """
5545 """
5545 opts = pycompat.byteskwargs(opts)
5546 opts = pycompat.byteskwargs(opts)
5546 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5547 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5547
5548
5548 act = not opts.get(b'print')
5549 act = not opts.get(b'print')
5549 eol = b'\n'
5550 eol = b'\n'
5550 if opts.get(b'print0'):
5551 if opts.get(b'print0'):
5551 eol = b'\0'
5552 eol = b'\0'
5552 act = False # --print0 implies --print
5553 act = False # --print0 implies --print
5553 if opts.get(b'all', False):
5554 if opts.get(b'all', False):
5554 ignored = True
5555 ignored = True
5555 unknown = True
5556 unknown = True
5556 else:
5557 else:
5557 ignored = opts.get(b'ignored', False)
5558 ignored = opts.get(b'ignored', False)
5558 unknown = not ignored
5559 unknown = not ignored
5559
5560
5560 removefiles = opts.get(b'files')
5561 removefiles = opts.get(b'files')
5561 removedirs = opts.get(b'dirs')
5562 removedirs = opts.get(b'dirs')
5562 confirm = opts.get(b'confirm')
5563 confirm = opts.get(b'confirm')
5563 if confirm is None:
5564 if confirm is None:
5564 try:
5565 try:
5565 extensions.find(b'purge')
5566 extensions.find(b'purge')
5566 confirm = False
5567 confirm = False
5567 except KeyError:
5568 except KeyError:
5568 confirm = True
5569 confirm = True
5569
5570
5570 if not removefiles and not removedirs:
5571 if not removefiles and not removedirs:
5571 removefiles = True
5572 removefiles = True
5572 removedirs = True
5573 removedirs = True
5573
5574
5574 match = scmutil.match(repo[None], dirs, opts)
5575 match = scmutil.match(repo[None], dirs, opts)
5575
5576
5576 paths = mergemod.purge(
5577 paths = mergemod.purge(
5577 repo,
5578 repo,
5578 match,
5579 match,
5579 unknown=unknown,
5580 unknown=unknown,
5580 ignored=ignored,
5581 ignored=ignored,
5581 removeemptydirs=removedirs,
5582 removeemptydirs=removedirs,
5582 removefiles=removefiles,
5583 removefiles=removefiles,
5583 abortonerror=opts.get(b'abort_on_err'),
5584 abortonerror=opts.get(b'abort_on_err'),
5584 noop=not act,
5585 noop=not act,
5585 confirm=confirm,
5586 confirm=confirm,
5586 )
5587 )
5587
5588
5588 for path in paths:
5589 for path in paths:
5589 if not act:
5590 if not act:
5590 ui.write(b'%s%s' % (path, eol))
5591 ui.write(b'%s%s' % (path, eol))
5591
5592
5592
5593
5593 @command(
5594 @command(
5594 b'push',
5595 b'push',
5595 [
5596 [
5596 (b'f', b'force', None, _(b'force push')),
5597 (b'f', b'force', None, _(b'force push')),
5597 (
5598 (
5598 b'r',
5599 b'r',
5599 b'rev',
5600 b'rev',
5600 [],
5601 [],
5601 _(b'a changeset intended to be included in the destination'),
5602 _(b'a changeset intended to be included in the destination'),
5602 _(b'REV'),
5603 _(b'REV'),
5603 ),
5604 ),
5604 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5605 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5605 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5606 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5606 (
5607 (
5607 b'b',
5608 b'b',
5608 b'branch',
5609 b'branch',
5609 [],
5610 [],
5610 _(b'a specific branch you would like to push'),
5611 _(b'a specific branch you would like to push'),
5611 _(b'BRANCH'),
5612 _(b'BRANCH'),
5612 ),
5613 ),
5613 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5614 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5614 (
5615 (
5615 b'',
5616 b'',
5616 b'pushvars',
5617 b'pushvars',
5617 [],
5618 [],
5618 _(b'variables that can be sent to server (ADVANCED)'),
5619 _(b'variables that can be sent to server (ADVANCED)'),
5619 ),
5620 ),
5620 (
5621 (
5621 b'',
5622 b'',
5622 b'publish',
5623 b'publish',
5623 False,
5624 False,
5624 _(b'push the changeset as public (EXPERIMENTAL)'),
5625 _(b'push the changeset as public (EXPERIMENTAL)'),
5625 ),
5626 ),
5626 ]
5627 ]
5627 + remoteopts,
5628 + remoteopts,
5628 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5629 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5629 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5630 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5630 helpbasic=True,
5631 helpbasic=True,
5631 )
5632 )
5632 def push(ui, repo, *dests, **opts):
5633 def push(ui, repo, *dests, **opts):
5633 """push changes to the specified destination
5634 """push changes to the specified destination
5634
5635
5635 Push changesets from the local repository to the specified
5636 Push changesets from the local repository to the specified
5636 destination.
5637 destination.
5637
5638
5638 This operation is symmetrical to pull: it is identical to a pull
5639 This operation is symmetrical to pull: it is identical to a pull
5639 in the destination repository from the current one.
5640 in the destination repository from the current one.
5640
5641
5641 By default, push will not allow creation of new heads at the
5642 By default, push will not allow creation of new heads at the
5642 destination, since multiple heads would make it unclear which head
5643 destination, since multiple heads would make it unclear which head
5643 to use. In this situation, it is recommended to pull and merge
5644 to use. In this situation, it is recommended to pull and merge
5644 before pushing.
5645 before pushing.
5645
5646
5646 Use --new-branch if you want to allow push to create a new named
5647 Use --new-branch if you want to allow push to create a new named
5647 branch that is not present at the destination. This allows you to
5648 branch that is not present at the destination. This allows you to
5648 only create a new branch without forcing other changes.
5649 only create a new branch without forcing other changes.
5649
5650
5650 .. note::
5651 .. note::
5651
5652
5652 Extra care should be taken with the -f/--force option,
5653 Extra care should be taken with the -f/--force option,
5653 which will push all new heads on all branches, an action which will
5654 which will push all new heads on all branches, an action which will
5654 almost always cause confusion for collaborators.
5655 almost always cause confusion for collaborators.
5655
5656
5656 If -r/--rev is used, the specified revision and all its ancestors
5657 If -r/--rev is used, the specified revision and all its ancestors
5657 will be pushed to the remote repository.
5658 will be pushed to the remote repository.
5658
5659
5659 If -B/--bookmark is used, the specified bookmarked revision, its
5660 If -B/--bookmark is used, the specified bookmarked revision, its
5660 ancestors, and the bookmark will be pushed to the remote
5661 ancestors, and the bookmark will be pushed to the remote
5661 repository. Specifying ``.`` is equivalent to specifying the active
5662 repository. Specifying ``.`` is equivalent to specifying the active
5662 bookmark's name. Use the --all-bookmarks option for pushing all
5663 bookmark's name. Use the --all-bookmarks option for pushing all
5663 current bookmarks.
5664 current bookmarks.
5664
5665
5665 Please see :hg:`help urls` for important details about ``ssh://``
5666 Please see :hg:`help urls` for important details about ``ssh://``
5666 URLs. If DESTINATION is omitted, a default path will be used.
5667 URLs. If DESTINATION is omitted, a default path will be used.
5667
5668
5668 When passed multiple destinations, push will process them one after the
5669 When passed multiple destinations, push will process them one after the
5669 other, but stop should an error occur.
5670 other, but stop should an error occur.
5670
5671
5671 .. container:: verbose
5672 .. container:: verbose
5672
5673
5673 The --pushvars option sends strings to the server that become
5674 The --pushvars option sends strings to the server that become
5674 environment variables prepended with ``HG_USERVAR_``. For example,
5675 environment variables prepended with ``HG_USERVAR_``. For example,
5675 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5676 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5676 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5677 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5677
5678
5678 pushvars can provide for user-overridable hooks as well as set debug
5679 pushvars can provide for user-overridable hooks as well as set debug
5679 levels. One example is having a hook that blocks commits containing
5680 levels. One example is having a hook that blocks commits containing
5680 conflict markers, but enables the user to override the hook if the file
5681 conflict markers, but enables the user to override the hook if the file
5681 is using conflict markers for testing purposes or the file format has
5682 is using conflict markers for testing purposes or the file format has
5682 strings that look like conflict markers.
5683 strings that look like conflict markers.
5683
5684
5684 By default, servers will ignore `--pushvars`. To enable it add the
5685 By default, servers will ignore `--pushvars`. To enable it add the
5685 following to your configuration file::
5686 following to your configuration file::
5686
5687
5687 [push]
5688 [push]
5688 pushvars.server = true
5689 pushvars.server = true
5689
5690
5690 Returns 0 if push was successful, 1 if nothing to push.
5691 Returns 0 if push was successful, 1 if nothing to push.
5691 """
5692 """
5692
5693
5693 opts = pycompat.byteskwargs(opts)
5694 opts = pycompat.byteskwargs(opts)
5694
5695
5695 if opts.get(b'all_bookmarks'):
5696 if opts.get(b'all_bookmarks'):
5696 cmdutil.check_incompatible_arguments(
5697 cmdutil.check_incompatible_arguments(
5697 opts,
5698 opts,
5698 b'all_bookmarks',
5699 b'all_bookmarks',
5699 [b'bookmark', b'rev'],
5700 [b'bookmark', b'rev'],
5700 )
5701 )
5701 opts[b'bookmark'] = list(repo._bookmarks)
5702 opts[b'bookmark'] = list(repo._bookmarks)
5702
5703
5703 if opts.get(b'bookmark'):
5704 if opts.get(b'bookmark'):
5704 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5705 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5705 for b in opts[b'bookmark']:
5706 for b in opts[b'bookmark']:
5706 # translate -B options to -r so changesets get pushed
5707 # translate -B options to -r so changesets get pushed
5707 b = repo._bookmarks.expandname(b)
5708 b = repo._bookmarks.expandname(b)
5708 if b in repo._bookmarks:
5709 if b in repo._bookmarks:
5709 opts.setdefault(b'rev', []).append(b)
5710 opts.setdefault(b'rev', []).append(b)
5710 else:
5711 else:
5711 # if we try to push a deleted bookmark, translate it to null
5712 # if we try to push a deleted bookmark, translate it to null
5712 # this lets simultaneous -r, -b options continue working
5713 # this lets simultaneous -r, -b options continue working
5713 opts.setdefault(b'rev', []).append(b"null")
5714 opts.setdefault(b'rev', []).append(b"null")
5714
5715
5715 some_pushed = False
5716 some_pushed = False
5716 result = 0
5717 result = 0
5717 for path in urlutil.get_push_paths(repo, ui, dests):
5718 for path in urlutil.get_push_paths(repo, ui, dests):
5718 dest = path.pushloc or path.loc
5719 dest = path.pushloc or path.loc
5719 branches = (path.branch, opts.get(b'branch') or [])
5720 branches = (path.branch, opts.get(b'branch') or [])
5720 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5721 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5721 revs, checkout = hg.addbranchrevs(
5722 revs, checkout = hg.addbranchrevs(
5722 repo, repo, branches, opts.get(b'rev')
5723 repo, repo, branches, opts.get(b'rev')
5723 )
5724 )
5724 other = hg.peer(repo, opts, dest)
5725 other = hg.peer(repo, opts, dest)
5725
5726
5726 try:
5727 try:
5727 if revs:
5728 if revs:
5728 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5729 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5729 if not revs:
5730 if not revs:
5730 raise error.InputError(
5731 raise error.InputError(
5731 _(b"specified revisions evaluate to an empty set"),
5732 _(b"specified revisions evaluate to an empty set"),
5732 hint=_(b"use different revision arguments"),
5733 hint=_(b"use different revision arguments"),
5733 )
5734 )
5734 elif path.pushrev:
5735 elif path.pushrev:
5735 # It doesn't make any sense to specify ancestor revisions. So limit
5736 # It doesn't make any sense to specify ancestor revisions. So limit
5736 # to DAG heads to make discovery simpler.
5737 # to DAG heads to make discovery simpler.
5737 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5738 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5738 revs = scmutil.revrange(repo, [expr])
5739 revs = scmutil.revrange(repo, [expr])
5739 revs = [repo[rev].node() for rev in revs]
5740 revs = [repo[rev].node() for rev in revs]
5740 if not revs:
5741 if not revs:
5741 raise error.InputError(
5742 raise error.InputError(
5742 _(
5743 _(
5743 b'default push revset for path evaluates to an empty set'
5744 b'default push revset for path evaluates to an empty set'
5744 )
5745 )
5745 )
5746 )
5746 elif ui.configbool(b'commands', b'push.require-revs'):
5747 elif ui.configbool(b'commands', b'push.require-revs'):
5747 raise error.InputError(
5748 raise error.InputError(
5748 _(b'no revisions specified to push'),
5749 _(b'no revisions specified to push'),
5749 hint=_(b'did you mean "hg push -r ."?'),
5750 hint=_(b'did you mean "hg push -r ."?'),
5750 )
5751 )
5751
5752
5752 repo._subtoppath = dest
5753 repo._subtoppath = dest
5753 try:
5754 try:
5754 # push subrepos depth-first for coherent ordering
5755 # push subrepos depth-first for coherent ordering
5755 c = repo[b'.']
5756 c = repo[b'.']
5756 subs = c.substate # only repos that are committed
5757 subs = c.substate # only repos that are committed
5757 for s in sorted(subs):
5758 for s in sorted(subs):
5758 sub_result = c.sub(s).push(opts)
5759 sub_result = c.sub(s).push(opts)
5759 if sub_result == 0:
5760 if sub_result == 0:
5760 return 1
5761 return 1
5761 finally:
5762 finally:
5762 del repo._subtoppath
5763 del repo._subtoppath
5763
5764
5764 opargs = dict(
5765 opargs = dict(
5765 opts.get(b'opargs', {})
5766 opts.get(b'opargs', {})
5766 ) # copy opargs since we may mutate it
5767 ) # copy opargs since we may mutate it
5767 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5768 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5768
5769
5769 pushop = exchange.push(
5770 pushop = exchange.push(
5770 repo,
5771 repo,
5771 other,
5772 other,
5772 opts.get(b'force'),
5773 opts.get(b'force'),
5773 revs=revs,
5774 revs=revs,
5774 newbranch=opts.get(b'new_branch'),
5775 newbranch=opts.get(b'new_branch'),
5775 bookmarks=opts.get(b'bookmark', ()),
5776 bookmarks=opts.get(b'bookmark', ()),
5776 publish=opts.get(b'publish'),
5777 publish=opts.get(b'publish'),
5777 opargs=opargs,
5778 opargs=opargs,
5778 )
5779 )
5779
5780
5780 if pushop.cgresult == 0:
5781 if pushop.cgresult == 0:
5781 result = 1
5782 result = 1
5782 elif pushop.cgresult is not None:
5783 elif pushop.cgresult is not None:
5783 some_pushed = True
5784 some_pushed = True
5784
5785
5785 if pushop.bkresult is not None:
5786 if pushop.bkresult is not None:
5786 if pushop.bkresult == 2:
5787 if pushop.bkresult == 2:
5787 result = 2
5788 result = 2
5788 elif not result and pushop.bkresult:
5789 elif not result and pushop.bkresult:
5789 result = 2
5790 result = 2
5790
5791
5791 if result:
5792 if result:
5792 break
5793 break
5793
5794
5794 finally:
5795 finally:
5795 other.close()
5796 other.close()
5796 if result == 0 and not some_pushed:
5797 if result == 0 and not some_pushed:
5797 result = 1
5798 result = 1
5798 return result
5799 return result
5799
5800
5800
5801
5801 @command(
5802 @command(
5802 b'recover',
5803 b'recover',
5803 [
5804 [
5804 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5805 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5805 ],
5806 ],
5806 helpcategory=command.CATEGORY_MAINTENANCE,
5807 helpcategory=command.CATEGORY_MAINTENANCE,
5807 )
5808 )
5808 def recover(ui, repo, **opts):
5809 def recover(ui, repo, **opts):
5809 """roll back an interrupted transaction
5810 """roll back an interrupted transaction
5810
5811
5811 Recover from an interrupted commit or pull.
5812 Recover from an interrupted commit or pull.
5812
5813
5813 This command tries to fix the repository status after an
5814 This command tries to fix the repository status after an
5814 interrupted operation. It should only be necessary when Mercurial
5815 interrupted operation. It should only be necessary when Mercurial
5815 suggests it.
5816 suggests it.
5816
5817
5817 Returns 0 if successful, 1 if nothing to recover or verify fails.
5818 Returns 0 if successful, 1 if nothing to recover or verify fails.
5818 """
5819 """
5819 ret = repo.recover()
5820 ret = repo.recover()
5820 if ret:
5821 if ret:
5821 if opts['verify']:
5822 if opts['verify']:
5822 return hg.verify(repo)
5823 return hg.verify(repo)
5823 else:
5824 else:
5824 msg = _(
5825 msg = _(
5825 b"(verify step skipped, run `hg verify` to check your "
5826 b"(verify step skipped, run `hg verify` to check your "
5826 b"repository content)\n"
5827 b"repository content)\n"
5827 )
5828 )
5828 ui.warn(msg)
5829 ui.warn(msg)
5829 return 0
5830 return 0
5830 return 1
5831 return 1
5831
5832
5832
5833
5833 @command(
5834 @command(
5834 b'remove|rm',
5835 b'remove|rm',
5835 [
5836 [
5836 (b'A', b'after', None, _(b'record delete for missing files')),
5837 (b'A', b'after', None, _(b'record delete for missing files')),
5837 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5838 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5838 ]
5839 ]
5839 + subrepoopts
5840 + subrepoopts
5840 + walkopts
5841 + walkopts
5841 + dryrunopts,
5842 + dryrunopts,
5842 _(b'[OPTION]... FILE...'),
5843 _(b'[OPTION]... FILE...'),
5843 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5844 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5844 helpbasic=True,
5845 helpbasic=True,
5845 inferrepo=True,
5846 inferrepo=True,
5846 )
5847 )
5847 def remove(ui, repo, *pats, **opts):
5848 def remove(ui, repo, *pats, **opts):
5848 """remove the specified files on the next commit
5849 """remove the specified files on the next commit
5849
5850
5850 Schedule the indicated files for removal from the current branch.
5851 Schedule the indicated files for removal from the current branch.
5851
5852
5852 This command schedules the files to be removed at the next commit.
5853 This command schedules the files to be removed at the next commit.
5853 To undo a remove before that, see :hg:`revert`. To undo added
5854 To undo a remove before that, see :hg:`revert`. To undo added
5854 files, see :hg:`forget`.
5855 files, see :hg:`forget`.
5855
5856
5856 .. container:: verbose
5857 .. container:: verbose
5857
5858
5858 -A/--after can be used to remove only files that have already
5859 -A/--after can be used to remove only files that have already
5859 been deleted, -f/--force can be used to force deletion, and -Af
5860 been deleted, -f/--force can be used to force deletion, and -Af
5860 can be used to remove files from the next revision without
5861 can be used to remove files from the next revision without
5861 deleting them from the working directory.
5862 deleting them from the working directory.
5862
5863
5863 The following table details the behavior of remove for different
5864 The following table details the behavior of remove for different
5864 file states (columns) and option combinations (rows). The file
5865 file states (columns) and option combinations (rows). The file
5865 states are Added [A], Clean [C], Modified [M] and Missing [!]
5866 states are Added [A], Clean [C], Modified [M] and Missing [!]
5866 (as reported by :hg:`status`). The actions are Warn, Remove
5867 (as reported by :hg:`status`). The actions are Warn, Remove
5867 (from branch) and Delete (from disk):
5868 (from branch) and Delete (from disk):
5868
5869
5869 ========= == == == ==
5870 ========= == == == ==
5870 opt/state A C M !
5871 opt/state A C M !
5871 ========= == == == ==
5872 ========= == == == ==
5872 none W RD W R
5873 none W RD W R
5873 -f R RD RD R
5874 -f R RD RD R
5874 -A W W W R
5875 -A W W W R
5875 -Af R R R R
5876 -Af R R R R
5876 ========= == == == ==
5877 ========= == == == ==
5877
5878
5878 .. note::
5879 .. note::
5879
5880
5880 :hg:`remove` never deletes files in Added [A] state from the
5881 :hg:`remove` never deletes files in Added [A] state from the
5881 working directory, not even if ``--force`` is specified.
5882 working directory, not even if ``--force`` is specified.
5882
5883
5883 Returns 0 on success, 1 if any warnings encountered.
5884 Returns 0 on success, 1 if any warnings encountered.
5884 """
5885 """
5885
5886
5886 opts = pycompat.byteskwargs(opts)
5887 opts = pycompat.byteskwargs(opts)
5887 after, force = opts.get(b'after'), opts.get(b'force')
5888 after, force = opts.get(b'after'), opts.get(b'force')
5888 dryrun = opts.get(b'dry_run')
5889 dryrun = opts.get(b'dry_run')
5889 if not pats and not after:
5890 if not pats and not after:
5890 raise error.InputError(_(b'no files specified'))
5891 raise error.InputError(_(b'no files specified'))
5891
5892
5892 m = scmutil.match(repo[None], pats, opts)
5893 m = scmutil.match(repo[None], pats, opts)
5893 subrepos = opts.get(b'subrepos')
5894 subrepos = opts.get(b'subrepos')
5894 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5895 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5895 return cmdutil.remove(
5896 return cmdutil.remove(
5896 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5897 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5897 )
5898 )
5898
5899
5899
5900
5900 @command(
5901 @command(
5901 b'rename|move|mv',
5902 b'rename|move|mv',
5902 [
5903 [
5903 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5904 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5904 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5905 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5905 (
5906 (
5906 b'',
5907 b'',
5907 b'at-rev',
5908 b'at-rev',
5908 b'',
5909 b'',
5909 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5910 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5910 _(b'REV'),
5911 _(b'REV'),
5911 ),
5912 ),
5912 (
5913 (
5913 b'f',
5914 b'f',
5914 b'force',
5915 b'force',
5915 None,
5916 None,
5916 _(b'forcibly move over an existing managed file'),
5917 _(b'forcibly move over an existing managed file'),
5917 ),
5918 ),
5918 ]
5919 ]
5919 + walkopts
5920 + walkopts
5920 + dryrunopts,
5921 + dryrunopts,
5921 _(b'[OPTION]... SOURCE... DEST'),
5922 _(b'[OPTION]... SOURCE... DEST'),
5922 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5923 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5923 )
5924 )
5924 def rename(ui, repo, *pats, **opts):
5925 def rename(ui, repo, *pats, **opts):
5925 """rename files; equivalent of copy + remove
5926 """rename files; equivalent of copy + remove
5926
5927
5927 Mark dest as copies of sources; mark sources for deletion. If dest
5928 Mark dest as copies of sources; mark sources for deletion. If dest
5928 is a directory, copies are put in that directory. If dest is a
5929 is a directory, copies are put in that directory. If dest is a
5929 file, there can only be one source.
5930 file, there can only be one source.
5930
5931
5931 By default, this command copies the contents of files as they
5932 By default, this command copies the contents of files as they
5932 exist in the working directory. If invoked with -A/--after, the
5933 exist in the working directory. If invoked with -A/--after, the
5933 operation is recorded, but no copying is performed.
5934 operation is recorded, but no copying is performed.
5934
5935
5935 To undo marking a destination file as renamed, use --forget. With that
5936 To undo marking a destination file as renamed, use --forget. With that
5936 option, all given (positional) arguments are unmarked as renames. The
5937 option, all given (positional) arguments are unmarked as renames. The
5937 destination file(s) will be left in place (still tracked). The source
5938 destination file(s) will be left in place (still tracked). The source
5938 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5939 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5939 the same way as :hg:`copy --forget`.
5940 the same way as :hg:`copy --forget`.
5940
5941
5941 This command takes effect with the next commit by default.
5942 This command takes effect with the next commit by default.
5942
5943
5943 Returns 0 on success, 1 if errors are encountered.
5944 Returns 0 on success, 1 if errors are encountered.
5944 """
5945 """
5945 opts = pycompat.byteskwargs(opts)
5946 opts = pycompat.byteskwargs(opts)
5946 with repo.wlock():
5947 with repo.wlock():
5947 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5948 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5948
5949
5949
5950
5950 @command(
5951 @command(
5951 b'resolve',
5952 b'resolve',
5952 [
5953 [
5953 (b'a', b'all', None, _(b'select all unresolved files')),
5954 (b'a', b'all', None, _(b'select all unresolved files')),
5954 (b'l', b'list', None, _(b'list state of files needing merge')),
5955 (b'l', b'list', None, _(b'list state of files needing merge')),
5955 (b'm', b'mark', None, _(b'mark files as resolved')),
5956 (b'm', b'mark', None, _(b'mark files as resolved')),
5956 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5957 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5957 (b'n', b'no-status', None, _(b'hide status prefix')),
5958 (b'n', b'no-status', None, _(b'hide status prefix')),
5958 (b'', b're-merge', None, _(b're-merge files')),
5959 (b'', b're-merge', None, _(b're-merge files')),
5959 ]
5960 ]
5960 + mergetoolopts
5961 + mergetoolopts
5961 + walkopts
5962 + walkopts
5962 + formatteropts,
5963 + formatteropts,
5963 _(b'[OPTION]... [FILE]...'),
5964 _(b'[OPTION]... [FILE]...'),
5964 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5965 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5965 inferrepo=True,
5966 inferrepo=True,
5966 )
5967 )
5967 def resolve(ui, repo, *pats, **opts):
5968 def resolve(ui, repo, *pats, **opts):
5968 """redo merges or set/view the merge status of files
5969 """redo merges or set/view the merge status of files
5969
5970
5970 Merges with unresolved conflicts are often the result of
5971 Merges with unresolved conflicts are often the result of
5971 non-interactive merging using the ``internal:merge`` configuration
5972 non-interactive merging using the ``internal:merge`` configuration
5972 setting, or a command-line merge tool like ``diff3``. The resolve
5973 setting, or a command-line merge tool like ``diff3``. The resolve
5973 command is used to manage the files involved in a merge, after
5974 command is used to manage the files involved in a merge, after
5974 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5975 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5975 working directory must have two parents). See :hg:`help
5976 working directory must have two parents). See :hg:`help
5976 merge-tools` for information on configuring merge tools.
5977 merge-tools` for information on configuring merge tools.
5977
5978
5978 The resolve command can be used in the following ways:
5979 The resolve command can be used in the following ways:
5979
5980
5980 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5981 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5981 the specified files, discarding any previous merge attempts. Re-merging
5982 the specified files, discarding any previous merge attempts. Re-merging
5982 is not performed for files already marked as resolved. Use ``--all/-a``
5983 is not performed for files already marked as resolved. Use ``--all/-a``
5983 to select all unresolved files. ``--tool`` can be used to specify
5984 to select all unresolved files. ``--tool`` can be used to specify
5984 the merge tool used for the given files. It overrides the HGMERGE
5985 the merge tool used for the given files. It overrides the HGMERGE
5985 environment variable and your configuration files. Previous file
5986 environment variable and your configuration files. Previous file
5986 contents are saved with a ``.orig`` suffix.
5987 contents are saved with a ``.orig`` suffix.
5987
5988
5988 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5989 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5989 (e.g. after having manually fixed-up the files). The default is
5990 (e.g. after having manually fixed-up the files). The default is
5990 to mark all unresolved files.
5991 to mark all unresolved files.
5991
5992
5992 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5993 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5993 default is to mark all resolved files.
5994 default is to mark all resolved files.
5994
5995
5995 - :hg:`resolve -l`: list files which had or still have conflicts.
5996 - :hg:`resolve -l`: list files which had or still have conflicts.
5996 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5997 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5997 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5998 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5998 the list. See :hg:`help filesets` for details.
5999 the list. See :hg:`help filesets` for details.
5999
6000
6000 .. note::
6001 .. note::
6001
6002
6002 Mercurial will not let you commit files with unresolved merge
6003 Mercurial will not let you commit files with unresolved merge
6003 conflicts. You must use :hg:`resolve -m ...` before you can
6004 conflicts. You must use :hg:`resolve -m ...` before you can
6004 commit after a conflicting merge.
6005 commit after a conflicting merge.
6005
6006
6006 .. container:: verbose
6007 .. container:: verbose
6007
6008
6008 Template:
6009 Template:
6009
6010
6010 The following keywords are supported in addition to the common template
6011 The following keywords are supported in addition to the common template
6011 keywords and functions. See also :hg:`help templates`.
6012 keywords and functions. See also :hg:`help templates`.
6012
6013
6013 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6014 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6014 :path: String. Repository-absolute path of the file.
6015 :path: String. Repository-absolute path of the file.
6015
6016
6016 Returns 0 on success, 1 if any files fail a resolve attempt.
6017 Returns 0 on success, 1 if any files fail a resolve attempt.
6017 """
6018 """
6018
6019
6019 opts = pycompat.byteskwargs(opts)
6020 opts = pycompat.byteskwargs(opts)
6020 confirm = ui.configbool(b'commands', b'resolve.confirm')
6021 confirm = ui.configbool(b'commands', b'resolve.confirm')
6021 flaglist = b'all mark unmark list no_status re_merge'.split()
6022 flaglist = b'all mark unmark list no_status re_merge'.split()
6022 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6023 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6023
6024
6024 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6025 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6025 if actioncount > 1:
6026 if actioncount > 1:
6026 raise error.InputError(_(b"too many actions specified"))
6027 raise error.InputError(_(b"too many actions specified"))
6027 elif actioncount == 0 and ui.configbool(
6028 elif actioncount == 0 and ui.configbool(
6028 b'commands', b'resolve.explicit-re-merge'
6029 b'commands', b'resolve.explicit-re-merge'
6029 ):
6030 ):
6030 hint = _(b'use --mark, --unmark, --list or --re-merge')
6031 hint = _(b'use --mark, --unmark, --list or --re-merge')
6031 raise error.InputError(_(b'no action specified'), hint=hint)
6032 raise error.InputError(_(b'no action specified'), hint=hint)
6032 if pats and all:
6033 if pats and all:
6033 raise error.InputError(_(b"can't specify --all and patterns"))
6034 raise error.InputError(_(b"can't specify --all and patterns"))
6034 if not (all or pats or show or mark or unmark):
6035 if not (all or pats or show or mark or unmark):
6035 raise error.InputError(
6036 raise error.InputError(
6036 _(b'no files or directories specified'),
6037 _(b'no files or directories specified'),
6037 hint=b'use --all to re-merge all unresolved files',
6038 hint=b'use --all to re-merge all unresolved files',
6038 )
6039 )
6039
6040
6040 if confirm:
6041 if confirm:
6041 if all:
6042 if all:
6042 if ui.promptchoice(
6043 if ui.promptchoice(
6043 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6044 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6044 ):
6045 ):
6045 raise error.CanceledError(_(b'user quit'))
6046 raise error.CanceledError(_(b'user quit'))
6046 if mark and not pats:
6047 if mark and not pats:
6047 if ui.promptchoice(
6048 if ui.promptchoice(
6048 _(
6049 _(
6049 b'mark all unresolved files as resolved (yn)?'
6050 b'mark all unresolved files as resolved (yn)?'
6050 b'$$ &Yes $$ &No'
6051 b'$$ &Yes $$ &No'
6051 )
6052 )
6052 ):
6053 ):
6053 raise error.CanceledError(_(b'user quit'))
6054 raise error.CanceledError(_(b'user quit'))
6054 if unmark and not pats:
6055 if unmark and not pats:
6055 if ui.promptchoice(
6056 if ui.promptchoice(
6056 _(
6057 _(
6057 b'mark all resolved files as unresolved (yn)?'
6058 b'mark all resolved files as unresolved (yn)?'
6058 b'$$ &Yes $$ &No'
6059 b'$$ &Yes $$ &No'
6059 )
6060 )
6060 ):
6061 ):
6061 raise error.CanceledError(_(b'user quit'))
6062 raise error.CanceledError(_(b'user quit'))
6062
6063
6063 uipathfn = scmutil.getuipathfn(repo)
6064 uipathfn = scmutil.getuipathfn(repo)
6064
6065
6065 if show:
6066 if show:
6066 ui.pager(b'resolve')
6067 ui.pager(b'resolve')
6067 fm = ui.formatter(b'resolve', opts)
6068 fm = ui.formatter(b'resolve', opts)
6068 ms = mergestatemod.mergestate.read(repo)
6069 ms = mergestatemod.mergestate.read(repo)
6069 wctx = repo[None]
6070 wctx = repo[None]
6070 m = scmutil.match(wctx, pats, opts)
6071 m = scmutil.match(wctx, pats, opts)
6071
6072
6072 # Labels and keys based on merge state. Unresolved path conflicts show
6073 # Labels and keys based on merge state. Unresolved path conflicts show
6073 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6074 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6074 # resolved conflicts.
6075 # resolved conflicts.
6075 mergestateinfo = {
6076 mergestateinfo = {
6076 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6077 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6077 b'resolve.unresolved',
6078 b'resolve.unresolved',
6078 b'U',
6079 b'U',
6079 ),
6080 ),
6080 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6081 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6081 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6082 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6082 b'resolve.unresolved',
6083 b'resolve.unresolved',
6083 b'P',
6084 b'P',
6084 ),
6085 ),
6085 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6086 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6086 b'resolve.resolved',
6087 b'resolve.resolved',
6087 b'R',
6088 b'R',
6088 ),
6089 ),
6089 }
6090 }
6090
6091
6091 for f in ms:
6092 for f in ms:
6092 if not m(f):
6093 if not m(f):
6093 continue
6094 continue
6094
6095
6095 label, key = mergestateinfo[ms[f]]
6096 label, key = mergestateinfo[ms[f]]
6096 fm.startitem()
6097 fm.startitem()
6097 fm.context(ctx=wctx)
6098 fm.context(ctx=wctx)
6098 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6099 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6099 fm.data(path=f)
6100 fm.data(path=f)
6100 fm.plain(b'%s\n' % uipathfn(f), label=label)
6101 fm.plain(b'%s\n' % uipathfn(f), label=label)
6101 fm.end()
6102 fm.end()
6102 return 0
6103 return 0
6103
6104
6104 with repo.wlock():
6105 with repo.wlock():
6105 ms = mergestatemod.mergestate.read(repo)
6106 ms = mergestatemod.mergestate.read(repo)
6106
6107
6107 if not (ms.active() or repo.dirstate.p2() != nullid):
6108 if not (ms.active() or repo.dirstate.p2() != nullid):
6108 raise error.StateError(
6109 raise error.StateError(
6109 _(b'resolve command not applicable when not merging')
6110 _(b'resolve command not applicable when not merging')
6110 )
6111 )
6111
6112
6112 wctx = repo[None]
6113 wctx = repo[None]
6113 m = scmutil.match(wctx, pats, opts)
6114 m = scmutil.match(wctx, pats, opts)
6114 ret = 0
6115 ret = 0
6115 didwork = False
6116 didwork = False
6116
6117
6117 tocomplete = []
6118 tocomplete = []
6118 hasconflictmarkers = []
6119 hasconflictmarkers = []
6119 if mark:
6120 if mark:
6120 markcheck = ui.config(b'commands', b'resolve.mark-check')
6121 markcheck = ui.config(b'commands', b'resolve.mark-check')
6121 if markcheck not in [b'warn', b'abort']:
6122 if markcheck not in [b'warn', b'abort']:
6122 # Treat all invalid / unrecognized values as 'none'.
6123 # Treat all invalid / unrecognized values as 'none'.
6123 markcheck = False
6124 markcheck = False
6124 for f in ms:
6125 for f in ms:
6125 if not m(f):
6126 if not m(f):
6126 continue
6127 continue
6127
6128
6128 didwork = True
6129 didwork = True
6129
6130
6130 # path conflicts must be resolved manually
6131 # path conflicts must be resolved manually
6131 if ms[f] in (
6132 if ms[f] in (
6132 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6133 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6133 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6134 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6134 ):
6135 ):
6135 if mark:
6136 if mark:
6136 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6137 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6137 elif unmark:
6138 elif unmark:
6138 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6139 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6139 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6140 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6140 ui.warn(
6141 ui.warn(
6141 _(b'%s: path conflict must be resolved manually\n')
6142 _(b'%s: path conflict must be resolved manually\n')
6142 % uipathfn(f)
6143 % uipathfn(f)
6143 )
6144 )
6144 continue
6145 continue
6145
6146
6146 if mark:
6147 if mark:
6147 if markcheck:
6148 if markcheck:
6148 fdata = repo.wvfs.tryread(f)
6149 fdata = repo.wvfs.tryread(f)
6149 if (
6150 if (
6150 filemerge.hasconflictmarkers(fdata)
6151 filemerge.hasconflictmarkers(fdata)
6151 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6152 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6152 ):
6153 ):
6153 hasconflictmarkers.append(f)
6154 hasconflictmarkers.append(f)
6154 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6155 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6155 elif unmark:
6156 elif unmark:
6156 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6157 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6157 else:
6158 else:
6158 # backup pre-resolve (merge uses .orig for its own purposes)
6159 # backup pre-resolve (merge uses .orig for its own purposes)
6159 a = repo.wjoin(f)
6160 a = repo.wjoin(f)
6160 try:
6161 try:
6161 util.copyfile(a, a + b".resolve")
6162 util.copyfile(a, a + b".resolve")
6162 except (IOError, OSError) as inst:
6163 except (IOError, OSError) as inst:
6163 if inst.errno != errno.ENOENT:
6164 if inst.errno != errno.ENOENT:
6164 raise
6165 raise
6165
6166
6166 try:
6167 try:
6167 # preresolve file
6168 # preresolve file
6168 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6169 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6169 with ui.configoverride(overrides, b'resolve'):
6170 with ui.configoverride(overrides, b'resolve'):
6170 complete, r = ms.preresolve(f, wctx)
6171 complete, r = ms.preresolve(f, wctx)
6171 if not complete:
6172 if not complete:
6172 tocomplete.append(f)
6173 tocomplete.append(f)
6173 elif r:
6174 elif r:
6174 ret = 1
6175 ret = 1
6175 finally:
6176 finally:
6176 ms.commit()
6177 ms.commit()
6177
6178
6178 # replace filemerge's .orig file with our resolve file, but only
6179 # replace filemerge's .orig file with our resolve file, but only
6179 # for merges that are complete
6180 # for merges that are complete
6180 if complete:
6181 if complete:
6181 try:
6182 try:
6182 util.rename(
6183 util.rename(
6183 a + b".resolve", scmutil.backuppath(ui, repo, f)
6184 a + b".resolve", scmutil.backuppath(ui, repo, f)
6184 )
6185 )
6185 except OSError as inst:
6186 except OSError as inst:
6186 if inst.errno != errno.ENOENT:
6187 if inst.errno != errno.ENOENT:
6187 raise
6188 raise
6188
6189
6189 if hasconflictmarkers:
6190 if hasconflictmarkers:
6190 ui.warn(
6191 ui.warn(
6191 _(
6192 _(
6192 b'warning: the following files still have conflict '
6193 b'warning: the following files still have conflict '
6193 b'markers:\n'
6194 b'markers:\n'
6194 )
6195 )
6195 + b''.join(
6196 + b''.join(
6196 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6197 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6197 )
6198 )
6198 )
6199 )
6199 if markcheck == b'abort' and not all and not pats:
6200 if markcheck == b'abort' and not all and not pats:
6200 raise error.StateError(
6201 raise error.StateError(
6201 _(b'conflict markers detected'),
6202 _(b'conflict markers detected'),
6202 hint=_(b'use --all to mark anyway'),
6203 hint=_(b'use --all to mark anyway'),
6203 )
6204 )
6204
6205
6205 for f in tocomplete:
6206 for f in tocomplete:
6206 try:
6207 try:
6207 # resolve file
6208 # resolve file
6208 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6209 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6209 with ui.configoverride(overrides, b'resolve'):
6210 with ui.configoverride(overrides, b'resolve'):
6210 r = ms.resolve(f, wctx)
6211 r = ms.resolve(f, wctx)
6211 if r:
6212 if r:
6212 ret = 1
6213 ret = 1
6213 finally:
6214 finally:
6214 ms.commit()
6215 ms.commit()
6215
6216
6216 # replace filemerge's .orig file with our resolve file
6217 # replace filemerge's .orig file with our resolve file
6217 a = repo.wjoin(f)
6218 a = repo.wjoin(f)
6218 try:
6219 try:
6219 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6220 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6220 except OSError as inst:
6221 except OSError as inst:
6221 if inst.errno != errno.ENOENT:
6222 if inst.errno != errno.ENOENT:
6222 raise
6223 raise
6223
6224
6224 ms.commit()
6225 ms.commit()
6225 branchmerge = repo.dirstate.p2() != nullid
6226 branchmerge = repo.dirstate.p2() != nullid
6226 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6227 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6227
6228
6228 if not didwork and pats:
6229 if not didwork and pats:
6229 hint = None
6230 hint = None
6230 if not any([p for p in pats if p.find(b':') >= 0]):
6231 if not any([p for p in pats if p.find(b':') >= 0]):
6231 pats = [b'path:%s' % p for p in pats]
6232 pats = [b'path:%s' % p for p in pats]
6232 m = scmutil.match(wctx, pats, opts)
6233 m = scmutil.match(wctx, pats, opts)
6233 for f in ms:
6234 for f in ms:
6234 if not m(f):
6235 if not m(f):
6235 continue
6236 continue
6236
6237
6237 def flag(o):
6238 def flag(o):
6238 if o == b're_merge':
6239 if o == b're_merge':
6239 return b'--re-merge '
6240 return b'--re-merge '
6240 return b'-%s ' % o[0:1]
6241 return b'-%s ' % o[0:1]
6241
6242
6242 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6243 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6243 hint = _(b"(try: hg resolve %s%s)\n") % (
6244 hint = _(b"(try: hg resolve %s%s)\n") % (
6244 flags,
6245 flags,
6245 b' '.join(pats),
6246 b' '.join(pats),
6246 )
6247 )
6247 break
6248 break
6248 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6249 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6249 if hint:
6250 if hint:
6250 ui.warn(hint)
6251 ui.warn(hint)
6251
6252
6252 unresolvedf = ms.unresolvedcount()
6253 unresolvedf = ms.unresolvedcount()
6253 if not unresolvedf:
6254 if not unresolvedf:
6254 ui.status(_(b'(no more unresolved files)\n'))
6255 ui.status(_(b'(no more unresolved files)\n'))
6255 cmdutil.checkafterresolved(repo)
6256 cmdutil.checkafterresolved(repo)
6256
6257
6257 return ret
6258 return ret
6258
6259
6259
6260
6260 @command(
6261 @command(
6261 b'revert',
6262 b'revert',
6262 [
6263 [
6263 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6264 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6264 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6265 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6265 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6266 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6266 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6267 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6267 (b'i', b'interactive', None, _(b'interactively select the changes')),
6268 (b'i', b'interactive', None, _(b'interactively select the changes')),
6268 ]
6269 ]
6269 + walkopts
6270 + walkopts
6270 + dryrunopts,
6271 + dryrunopts,
6271 _(b'[OPTION]... [-r REV] [NAME]...'),
6272 _(b'[OPTION]... [-r REV] [NAME]...'),
6272 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6273 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6273 )
6274 )
6274 def revert(ui, repo, *pats, **opts):
6275 def revert(ui, repo, *pats, **opts):
6275 """restore files to their checkout state
6276 """restore files to their checkout state
6276
6277
6277 .. note::
6278 .. note::
6278
6279
6279 To check out earlier revisions, you should use :hg:`update REV`.
6280 To check out earlier revisions, you should use :hg:`update REV`.
6280 To cancel an uncommitted merge (and lose your changes),
6281 To cancel an uncommitted merge (and lose your changes),
6281 use :hg:`merge --abort`.
6282 use :hg:`merge --abort`.
6282
6283
6283 With no revision specified, revert the specified files or directories
6284 With no revision specified, revert the specified files or directories
6284 to the contents they had in the parent of the working directory.
6285 to the contents they had in the parent of the working directory.
6285 This restores the contents of files to an unmodified
6286 This restores the contents of files to an unmodified
6286 state and unschedules adds, removes, copies, and renames. If the
6287 state and unschedules adds, removes, copies, and renames. If the
6287 working directory has two parents, you must explicitly specify a
6288 working directory has two parents, you must explicitly specify a
6288 revision.
6289 revision.
6289
6290
6290 Using the -r/--rev or -d/--date options, revert the given files or
6291 Using the -r/--rev or -d/--date options, revert the given files or
6291 directories to their states as of a specific revision. Because
6292 directories to their states as of a specific revision. Because
6292 revert does not change the working directory parents, this will
6293 revert does not change the working directory parents, this will
6293 cause these files to appear modified. This can be helpful to "back
6294 cause these files to appear modified. This can be helpful to "back
6294 out" some or all of an earlier change. See :hg:`backout` for a
6295 out" some or all of an earlier change. See :hg:`backout` for a
6295 related method.
6296 related method.
6296
6297
6297 Modified files are saved with a .orig suffix before reverting.
6298 Modified files are saved with a .orig suffix before reverting.
6298 To disable these backups, use --no-backup. It is possible to store
6299 To disable these backups, use --no-backup. It is possible to store
6299 the backup files in a custom directory relative to the root of the
6300 the backup files in a custom directory relative to the root of the
6300 repository by setting the ``ui.origbackuppath`` configuration
6301 repository by setting the ``ui.origbackuppath`` configuration
6301 option.
6302 option.
6302
6303
6303 See :hg:`help dates` for a list of formats valid for -d/--date.
6304 See :hg:`help dates` for a list of formats valid for -d/--date.
6304
6305
6305 See :hg:`help backout` for a way to reverse the effect of an
6306 See :hg:`help backout` for a way to reverse the effect of an
6306 earlier changeset.
6307 earlier changeset.
6307
6308
6308 Returns 0 on success.
6309 Returns 0 on success.
6309 """
6310 """
6310
6311
6311 opts = pycompat.byteskwargs(opts)
6312 opts = pycompat.byteskwargs(opts)
6312 if opts.get(b"date"):
6313 if opts.get(b"date"):
6313 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6314 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6314 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6315 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6315
6316
6316 parent, p2 = repo.dirstate.parents()
6317 parent, p2 = repo.dirstate.parents()
6317 if not opts.get(b'rev') and p2 != nullid:
6318 if not opts.get(b'rev') and p2 != nullid:
6318 # revert after merge is a trap for new users (issue2915)
6319 # revert after merge is a trap for new users (issue2915)
6319 raise error.InputError(
6320 raise error.InputError(
6320 _(b'uncommitted merge with no revision specified'),
6321 _(b'uncommitted merge with no revision specified'),
6321 hint=_(b"use 'hg update' or see 'hg help revert'"),
6322 hint=_(b"use 'hg update' or see 'hg help revert'"),
6322 )
6323 )
6323
6324
6324 rev = opts.get(b'rev')
6325 rev = opts.get(b'rev')
6325 if rev:
6326 if rev:
6326 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6327 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6327 ctx = scmutil.revsingle(repo, rev)
6328 ctx = scmutil.revsingle(repo, rev)
6328
6329
6329 if not (
6330 if not (
6330 pats
6331 pats
6331 or opts.get(b'include')
6332 or opts.get(b'include')
6332 or opts.get(b'exclude')
6333 or opts.get(b'exclude')
6333 or opts.get(b'all')
6334 or opts.get(b'all')
6334 or opts.get(b'interactive')
6335 or opts.get(b'interactive')
6335 ):
6336 ):
6336 msg = _(b"no files or directories specified")
6337 msg = _(b"no files or directories specified")
6337 if p2 != nullid:
6338 if p2 != nullid:
6338 hint = _(
6339 hint = _(
6339 b"uncommitted merge, use --all to discard all changes,"
6340 b"uncommitted merge, use --all to discard all changes,"
6340 b" or 'hg update -C .' to abort the merge"
6341 b" or 'hg update -C .' to abort the merge"
6341 )
6342 )
6342 raise error.InputError(msg, hint=hint)
6343 raise error.InputError(msg, hint=hint)
6343 dirty = any(repo.status())
6344 dirty = any(repo.status())
6344 node = ctx.node()
6345 node = ctx.node()
6345 if node != parent:
6346 if node != parent:
6346 if dirty:
6347 if dirty:
6347 hint = (
6348 hint = (
6348 _(
6349 _(
6349 b"uncommitted changes, use --all to discard all"
6350 b"uncommitted changes, use --all to discard all"
6350 b" changes, or 'hg update %d' to update"
6351 b" changes, or 'hg update %d' to update"
6351 )
6352 )
6352 % ctx.rev()
6353 % ctx.rev()
6353 )
6354 )
6354 else:
6355 else:
6355 hint = (
6356 hint = (
6356 _(
6357 _(
6357 b"use --all to revert all files,"
6358 b"use --all to revert all files,"
6358 b" or 'hg update %d' to update"
6359 b" or 'hg update %d' to update"
6359 )
6360 )
6360 % ctx.rev()
6361 % ctx.rev()
6361 )
6362 )
6362 elif dirty:
6363 elif dirty:
6363 hint = _(b"uncommitted changes, use --all to discard all changes")
6364 hint = _(b"uncommitted changes, use --all to discard all changes")
6364 else:
6365 else:
6365 hint = _(b"use --all to revert all files")
6366 hint = _(b"use --all to revert all files")
6366 raise error.InputError(msg, hint=hint)
6367 raise error.InputError(msg, hint=hint)
6367
6368
6368 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6369 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6369
6370
6370
6371
6371 @command(
6372 @command(
6372 b'rollback',
6373 b'rollback',
6373 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6374 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6374 helpcategory=command.CATEGORY_MAINTENANCE,
6375 helpcategory=command.CATEGORY_MAINTENANCE,
6375 )
6376 )
6376 def rollback(ui, repo, **opts):
6377 def rollback(ui, repo, **opts):
6377 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6378 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6378
6379
6379 Please use :hg:`commit --amend` instead of rollback to correct
6380 Please use :hg:`commit --amend` instead of rollback to correct
6380 mistakes in the last commit.
6381 mistakes in the last commit.
6381
6382
6382 This command should be used with care. There is only one level of
6383 This command should be used with care. There is only one level of
6383 rollback, and there is no way to undo a rollback. It will also
6384 rollback, and there is no way to undo a rollback. It will also
6384 restore the dirstate at the time of the last transaction, losing
6385 restore the dirstate at the time of the last transaction, losing
6385 any dirstate changes since that time. This command does not alter
6386 any dirstate changes since that time. This command does not alter
6386 the working directory.
6387 the working directory.
6387
6388
6388 Transactions are used to encapsulate the effects of all commands
6389 Transactions are used to encapsulate the effects of all commands
6389 that create new changesets or propagate existing changesets into a
6390 that create new changesets or propagate existing changesets into a
6390 repository.
6391 repository.
6391
6392
6392 .. container:: verbose
6393 .. container:: verbose
6393
6394
6394 For example, the following commands are transactional, and their
6395 For example, the following commands are transactional, and their
6395 effects can be rolled back:
6396 effects can be rolled back:
6396
6397
6397 - commit
6398 - commit
6398 - import
6399 - import
6399 - pull
6400 - pull
6400 - push (with this repository as the destination)
6401 - push (with this repository as the destination)
6401 - unbundle
6402 - unbundle
6402
6403
6403 To avoid permanent data loss, rollback will refuse to rollback a
6404 To avoid permanent data loss, rollback will refuse to rollback a
6404 commit transaction if it isn't checked out. Use --force to
6405 commit transaction if it isn't checked out. Use --force to
6405 override this protection.
6406 override this protection.
6406
6407
6407 The rollback command can be entirely disabled by setting the
6408 The rollback command can be entirely disabled by setting the
6408 ``ui.rollback`` configuration setting to false. If you're here
6409 ``ui.rollback`` configuration setting to false. If you're here
6409 because you want to use rollback and it's disabled, you can
6410 because you want to use rollback and it's disabled, you can
6410 re-enable the command by setting ``ui.rollback`` to true.
6411 re-enable the command by setting ``ui.rollback`` to true.
6411
6412
6412 This command is not intended for use on public repositories. Once
6413 This command is not intended for use on public repositories. Once
6413 changes are visible for pull by other users, rolling a transaction
6414 changes are visible for pull by other users, rolling a transaction
6414 back locally is ineffective (someone else may already have pulled
6415 back locally is ineffective (someone else may already have pulled
6415 the changes). Furthermore, a race is possible with readers of the
6416 the changes). Furthermore, a race is possible with readers of the
6416 repository; for example an in-progress pull from the repository
6417 repository; for example an in-progress pull from the repository
6417 may fail if a rollback is performed.
6418 may fail if a rollback is performed.
6418
6419
6419 Returns 0 on success, 1 if no rollback data is available.
6420 Returns 0 on success, 1 if no rollback data is available.
6420 """
6421 """
6421 if not ui.configbool(b'ui', b'rollback'):
6422 if not ui.configbool(b'ui', b'rollback'):
6422 raise error.Abort(
6423 raise error.Abort(
6423 _(b'rollback is disabled because it is unsafe'),
6424 _(b'rollback is disabled because it is unsafe'),
6424 hint=b'see `hg help -v rollback` for information',
6425 hint=b'see `hg help -v rollback` for information',
6425 )
6426 )
6426 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6427 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6427
6428
6428
6429
6429 @command(
6430 @command(
6430 b'root',
6431 b'root',
6431 [] + formatteropts,
6432 [] + formatteropts,
6432 intents={INTENT_READONLY},
6433 intents={INTENT_READONLY},
6433 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6434 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6434 )
6435 )
6435 def root(ui, repo, **opts):
6436 def root(ui, repo, **opts):
6436 """print the root (top) of the current working directory
6437 """print the root (top) of the current working directory
6437
6438
6438 Print the root directory of the current repository.
6439 Print the root directory of the current repository.
6439
6440
6440 .. container:: verbose
6441 .. container:: verbose
6441
6442
6442 Template:
6443 Template:
6443
6444
6444 The following keywords are supported in addition to the common template
6445 The following keywords are supported in addition to the common template
6445 keywords and functions. See also :hg:`help templates`.
6446 keywords and functions. See also :hg:`help templates`.
6446
6447
6447 :hgpath: String. Path to the .hg directory.
6448 :hgpath: String. Path to the .hg directory.
6448 :storepath: String. Path to the directory holding versioned data.
6449 :storepath: String. Path to the directory holding versioned data.
6449
6450
6450 Returns 0 on success.
6451 Returns 0 on success.
6451 """
6452 """
6452 opts = pycompat.byteskwargs(opts)
6453 opts = pycompat.byteskwargs(opts)
6453 with ui.formatter(b'root', opts) as fm:
6454 with ui.formatter(b'root', opts) as fm:
6454 fm.startitem()
6455 fm.startitem()
6455 fm.write(b'reporoot', b'%s\n', repo.root)
6456 fm.write(b'reporoot', b'%s\n', repo.root)
6456 fm.data(hgpath=repo.path, storepath=repo.spath)
6457 fm.data(hgpath=repo.path, storepath=repo.spath)
6457
6458
6458
6459
6459 @command(
6460 @command(
6460 b'serve',
6461 b'serve',
6461 [
6462 [
6462 (
6463 (
6463 b'A',
6464 b'A',
6464 b'accesslog',
6465 b'accesslog',
6465 b'',
6466 b'',
6466 _(b'name of access log file to write to'),
6467 _(b'name of access log file to write to'),
6467 _(b'FILE'),
6468 _(b'FILE'),
6468 ),
6469 ),
6469 (b'd', b'daemon', None, _(b'run server in background')),
6470 (b'd', b'daemon', None, _(b'run server in background')),
6470 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6471 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6471 (
6472 (
6472 b'E',
6473 b'E',
6473 b'errorlog',
6474 b'errorlog',
6474 b'',
6475 b'',
6475 _(b'name of error log file to write to'),
6476 _(b'name of error log file to write to'),
6476 _(b'FILE'),
6477 _(b'FILE'),
6477 ),
6478 ),
6478 # use string type, then we can check if something was passed
6479 # use string type, then we can check if something was passed
6479 (
6480 (
6480 b'p',
6481 b'p',
6481 b'port',
6482 b'port',
6482 b'',
6483 b'',
6483 _(b'port to listen on (default: 8000)'),
6484 _(b'port to listen on (default: 8000)'),
6484 _(b'PORT'),
6485 _(b'PORT'),
6485 ),
6486 ),
6486 (
6487 (
6487 b'a',
6488 b'a',
6488 b'address',
6489 b'address',
6489 b'',
6490 b'',
6490 _(b'address to listen on (default: all interfaces)'),
6491 _(b'address to listen on (default: all interfaces)'),
6491 _(b'ADDR'),
6492 _(b'ADDR'),
6492 ),
6493 ),
6493 (
6494 (
6494 b'',
6495 b'',
6495 b'prefix',
6496 b'prefix',
6496 b'',
6497 b'',
6497 _(b'prefix path to serve from (default: server root)'),
6498 _(b'prefix path to serve from (default: server root)'),
6498 _(b'PREFIX'),
6499 _(b'PREFIX'),
6499 ),
6500 ),
6500 (
6501 (
6501 b'n',
6502 b'n',
6502 b'name',
6503 b'name',
6503 b'',
6504 b'',
6504 _(b'name to show in web pages (default: working directory)'),
6505 _(b'name to show in web pages (default: working directory)'),
6505 _(b'NAME'),
6506 _(b'NAME'),
6506 ),
6507 ),
6507 (
6508 (
6508 b'',
6509 b'',
6509 b'web-conf',
6510 b'web-conf',
6510 b'',
6511 b'',
6511 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6512 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6512 _(b'FILE'),
6513 _(b'FILE'),
6513 ),
6514 ),
6514 (
6515 (
6515 b'',
6516 b'',
6516 b'webdir-conf',
6517 b'webdir-conf',
6517 b'',
6518 b'',
6518 _(b'name of the hgweb config file (DEPRECATED)'),
6519 _(b'name of the hgweb config file (DEPRECATED)'),
6519 _(b'FILE'),
6520 _(b'FILE'),
6520 ),
6521 ),
6521 (
6522 (
6522 b'',
6523 b'',
6523 b'pid-file',
6524 b'pid-file',
6524 b'',
6525 b'',
6525 _(b'name of file to write process ID to'),
6526 _(b'name of file to write process ID to'),
6526 _(b'FILE'),
6527 _(b'FILE'),
6527 ),
6528 ),
6528 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6529 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6529 (
6530 (
6530 b'',
6531 b'',
6531 b'cmdserver',
6532 b'cmdserver',
6532 b'',
6533 b'',
6533 _(b'for remote clients (ADVANCED)'),
6534 _(b'for remote clients (ADVANCED)'),
6534 _(b'MODE'),
6535 _(b'MODE'),
6535 ),
6536 ),
6536 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6537 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6537 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6538 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6538 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6539 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6539 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6540 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6540 (b'', b'print-url', None, _(b'start and print only the URL')),
6541 (b'', b'print-url', None, _(b'start and print only the URL')),
6541 ]
6542 ]
6542 + subrepoopts,
6543 + subrepoopts,
6543 _(b'[OPTION]...'),
6544 _(b'[OPTION]...'),
6544 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6545 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6545 helpbasic=True,
6546 helpbasic=True,
6546 optionalrepo=True,
6547 optionalrepo=True,
6547 )
6548 )
6548 def serve(ui, repo, **opts):
6549 def serve(ui, repo, **opts):
6549 """start stand-alone webserver
6550 """start stand-alone webserver
6550
6551
6551 Start a local HTTP repository browser and pull server. You can use
6552 Start a local HTTP repository browser and pull server. You can use
6552 this for ad-hoc sharing and browsing of repositories. It is
6553 this for ad-hoc sharing and browsing of repositories. It is
6553 recommended to use a real web server to serve a repository for
6554 recommended to use a real web server to serve a repository for
6554 longer periods of time.
6555 longer periods of time.
6555
6556
6556 Please note that the server does not implement access control.
6557 Please note that the server does not implement access control.
6557 This means that, by default, anybody can read from the server and
6558 This means that, by default, anybody can read from the server and
6558 nobody can write to it by default. Set the ``web.allow-push``
6559 nobody can write to it by default. Set the ``web.allow-push``
6559 option to ``*`` to allow everybody to push to the server. You
6560 option to ``*`` to allow everybody to push to the server. You
6560 should use a real web server if you need to authenticate users.
6561 should use a real web server if you need to authenticate users.
6561
6562
6562 By default, the server logs accesses to stdout and errors to
6563 By default, the server logs accesses to stdout and errors to
6563 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6564 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6564 files.
6565 files.
6565
6566
6566 To have the server choose a free port number to listen on, specify
6567 To have the server choose a free port number to listen on, specify
6567 a port number of 0; in this case, the server will print the port
6568 a port number of 0; in this case, the server will print the port
6568 number it uses.
6569 number it uses.
6569
6570
6570 Returns 0 on success.
6571 Returns 0 on success.
6571 """
6572 """
6572
6573
6573 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6574 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6574 opts = pycompat.byteskwargs(opts)
6575 opts = pycompat.byteskwargs(opts)
6575 if opts[b"print_url"] and ui.verbose:
6576 if opts[b"print_url"] and ui.verbose:
6576 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6577 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6577
6578
6578 if opts[b"stdio"]:
6579 if opts[b"stdio"]:
6579 if repo is None:
6580 if repo is None:
6580 raise error.RepoError(
6581 raise error.RepoError(
6581 _(b"there is no Mercurial repository here (.hg not found)")
6582 _(b"there is no Mercurial repository here (.hg not found)")
6582 )
6583 )
6583 s = wireprotoserver.sshserver(ui, repo)
6584 s = wireprotoserver.sshserver(ui, repo)
6584 s.serve_forever()
6585 s.serve_forever()
6585 return
6586 return
6586
6587
6587 service = server.createservice(ui, repo, opts)
6588 service = server.createservice(ui, repo, opts)
6588 return server.runservice(opts, initfn=service.init, runfn=service.run)
6589 return server.runservice(opts, initfn=service.init, runfn=service.run)
6589
6590
6590
6591
6591 @command(
6592 @command(
6592 b'shelve',
6593 b'shelve',
6593 [
6594 [
6594 (
6595 (
6595 b'A',
6596 b'A',
6596 b'addremove',
6597 b'addremove',
6597 None,
6598 None,
6598 _(b'mark new/missing files as added/removed before shelving'),
6599 _(b'mark new/missing files as added/removed before shelving'),
6599 ),
6600 ),
6600 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6601 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6601 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6602 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6602 (
6603 (
6603 b'',
6604 b'',
6604 b'date',
6605 b'date',
6605 b'',
6606 b'',
6606 _(b'shelve with the specified commit date'),
6607 _(b'shelve with the specified commit date'),
6607 _(b'DATE'),
6608 _(b'DATE'),
6608 ),
6609 ),
6609 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6610 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6610 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6611 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6611 (
6612 (
6612 b'k',
6613 b'k',
6613 b'keep',
6614 b'keep',
6614 False,
6615 False,
6615 _(b'shelve, but keep changes in the working directory'),
6616 _(b'shelve, but keep changes in the working directory'),
6616 ),
6617 ),
6617 (b'l', b'list', None, _(b'list current shelves')),
6618 (b'l', b'list', None, _(b'list current shelves')),
6618 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6619 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6619 (
6620 (
6620 b'n',
6621 b'n',
6621 b'name',
6622 b'name',
6622 b'',
6623 b'',
6623 _(b'use the given name for the shelved commit'),
6624 _(b'use the given name for the shelved commit'),
6624 _(b'NAME'),
6625 _(b'NAME'),
6625 ),
6626 ),
6626 (
6627 (
6627 b'p',
6628 b'p',
6628 b'patch',
6629 b'patch',
6629 None,
6630 None,
6630 _(
6631 _(
6631 b'output patches for changes (provide the names of the shelved '
6632 b'output patches for changes (provide the names of the shelved '
6632 b'changes as positional arguments)'
6633 b'changes as positional arguments)'
6633 ),
6634 ),
6634 ),
6635 ),
6635 (b'i', b'interactive', None, _(b'interactive mode')),
6636 (b'i', b'interactive', None, _(b'interactive mode')),
6636 (
6637 (
6637 b'',
6638 b'',
6638 b'stat',
6639 b'stat',
6639 None,
6640 None,
6640 _(
6641 _(
6641 b'output diffstat-style summary of changes (provide the names of '
6642 b'output diffstat-style summary of changes (provide the names of '
6642 b'the shelved changes as positional arguments)'
6643 b'the shelved changes as positional arguments)'
6643 ),
6644 ),
6644 ),
6645 ),
6645 ]
6646 ]
6646 + cmdutil.walkopts,
6647 + cmdutil.walkopts,
6647 _(b'hg shelve [OPTION]... [FILE]...'),
6648 _(b'hg shelve [OPTION]... [FILE]...'),
6648 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6649 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6649 )
6650 )
6650 def shelve(ui, repo, *pats, **opts):
6651 def shelve(ui, repo, *pats, **opts):
6651 """save and set aside changes from the working directory
6652 """save and set aside changes from the working directory
6652
6653
6653 Shelving takes files that "hg status" reports as not clean, saves
6654 Shelving takes files that "hg status" reports as not clean, saves
6654 the modifications to a bundle (a shelved change), and reverts the
6655 the modifications to a bundle (a shelved change), and reverts the
6655 files so that their state in the working directory becomes clean.
6656 files so that their state in the working directory becomes clean.
6656
6657
6657 To restore these changes to the working directory, using "hg
6658 To restore these changes to the working directory, using "hg
6658 unshelve"; this will work even if you switch to a different
6659 unshelve"; this will work even if you switch to a different
6659 commit.
6660 commit.
6660
6661
6661 When no files are specified, "hg shelve" saves all not-clean
6662 When no files are specified, "hg shelve" saves all not-clean
6662 files. If specific files or directories are named, only changes to
6663 files. If specific files or directories are named, only changes to
6663 those files are shelved.
6664 those files are shelved.
6664
6665
6665 In bare shelve (when no files are specified, without interactive,
6666 In bare shelve (when no files are specified, without interactive,
6666 include and exclude option), shelving remembers information if the
6667 include and exclude option), shelving remembers information if the
6667 working directory was on newly created branch, in other words working
6668 working directory was on newly created branch, in other words working
6668 directory was on different branch than its first parent. In this
6669 directory was on different branch than its first parent. In this
6669 situation unshelving restores branch information to the working directory.
6670 situation unshelving restores branch information to the working directory.
6670
6671
6671 Each shelved change has a name that makes it easier to find later.
6672 Each shelved change has a name that makes it easier to find later.
6672 The name of a shelved change defaults to being based on the active
6673 The name of a shelved change defaults to being based on the active
6673 bookmark, or if there is no active bookmark, the current named
6674 bookmark, or if there is no active bookmark, the current named
6674 branch. To specify a different name, use ``--name``.
6675 branch. To specify a different name, use ``--name``.
6675
6676
6676 To see a list of existing shelved changes, use the ``--list``
6677 To see a list of existing shelved changes, use the ``--list``
6677 option. For each shelved change, this will print its name, age,
6678 option. For each shelved change, this will print its name, age,
6678 and description; use ``--patch`` or ``--stat`` for more details.
6679 and description; use ``--patch`` or ``--stat`` for more details.
6679
6680
6680 To delete specific shelved changes, use ``--delete``. To delete
6681 To delete specific shelved changes, use ``--delete``. To delete
6681 all shelved changes, use ``--cleanup``.
6682 all shelved changes, use ``--cleanup``.
6682 """
6683 """
6683 opts = pycompat.byteskwargs(opts)
6684 opts = pycompat.byteskwargs(opts)
6684 allowables = [
6685 allowables = [
6685 (b'addremove', {b'create'}), # 'create' is pseudo action
6686 (b'addremove', {b'create'}), # 'create' is pseudo action
6686 (b'unknown', {b'create'}),
6687 (b'unknown', {b'create'}),
6687 (b'cleanup', {b'cleanup'}),
6688 (b'cleanup', {b'cleanup'}),
6688 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6689 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6689 (b'delete', {b'delete'}),
6690 (b'delete', {b'delete'}),
6690 (b'edit', {b'create'}),
6691 (b'edit', {b'create'}),
6691 (b'keep', {b'create'}),
6692 (b'keep', {b'create'}),
6692 (b'list', {b'list'}),
6693 (b'list', {b'list'}),
6693 (b'message', {b'create'}),
6694 (b'message', {b'create'}),
6694 (b'name', {b'create'}),
6695 (b'name', {b'create'}),
6695 (b'patch', {b'patch', b'list'}),
6696 (b'patch', {b'patch', b'list'}),
6696 (b'stat', {b'stat', b'list'}),
6697 (b'stat', {b'stat', b'list'}),
6697 ]
6698 ]
6698
6699
6699 def checkopt(opt):
6700 def checkopt(opt):
6700 if opts.get(opt):
6701 if opts.get(opt):
6701 for i, allowable in allowables:
6702 for i, allowable in allowables:
6702 if opts[i] and opt not in allowable:
6703 if opts[i] and opt not in allowable:
6703 raise error.InputError(
6704 raise error.InputError(
6704 _(
6705 _(
6705 b"options '--%s' and '--%s' may not be "
6706 b"options '--%s' and '--%s' may not be "
6706 b"used together"
6707 b"used together"
6707 )
6708 )
6708 % (opt, i)
6709 % (opt, i)
6709 )
6710 )
6710 return True
6711 return True
6711
6712
6712 if checkopt(b'cleanup'):
6713 if checkopt(b'cleanup'):
6713 if pats:
6714 if pats:
6714 raise error.InputError(
6715 raise error.InputError(
6715 _(b"cannot specify names when using '--cleanup'")
6716 _(b"cannot specify names when using '--cleanup'")
6716 )
6717 )
6717 return shelvemod.cleanupcmd(ui, repo)
6718 return shelvemod.cleanupcmd(ui, repo)
6718 elif checkopt(b'delete'):
6719 elif checkopt(b'delete'):
6719 return shelvemod.deletecmd(ui, repo, pats)
6720 return shelvemod.deletecmd(ui, repo, pats)
6720 elif checkopt(b'list'):
6721 elif checkopt(b'list'):
6721 return shelvemod.listcmd(ui, repo, pats, opts)
6722 return shelvemod.listcmd(ui, repo, pats, opts)
6722 elif checkopt(b'patch') or checkopt(b'stat'):
6723 elif checkopt(b'patch') or checkopt(b'stat'):
6723 return shelvemod.patchcmds(ui, repo, pats, opts)
6724 return shelvemod.patchcmds(ui, repo, pats, opts)
6724 else:
6725 else:
6725 return shelvemod.createcmd(ui, repo, pats, opts)
6726 return shelvemod.createcmd(ui, repo, pats, opts)
6726
6727
6727
6728
6728 _NOTTERSE = b'nothing'
6729 _NOTTERSE = b'nothing'
6729
6730
6730
6731
6731 @command(
6732 @command(
6732 b'status|st',
6733 b'status|st',
6733 [
6734 [
6734 (b'A', b'all', None, _(b'show status of all files')),
6735 (b'A', b'all', None, _(b'show status of all files')),
6735 (b'm', b'modified', None, _(b'show only modified files')),
6736 (b'm', b'modified', None, _(b'show only modified files')),
6736 (b'a', b'added', None, _(b'show only added files')),
6737 (b'a', b'added', None, _(b'show only added files')),
6737 (b'r', b'removed', None, _(b'show only removed files')),
6738 (b'r', b'removed', None, _(b'show only removed files')),
6738 (b'd', b'deleted', None, _(b'show only missing files')),
6739 (b'd', b'deleted', None, _(b'show only missing files')),
6739 (b'c', b'clean', None, _(b'show only files without changes')),
6740 (b'c', b'clean', None, _(b'show only files without changes')),
6740 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6741 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6741 (b'i', b'ignored', None, _(b'show only ignored files')),
6742 (b'i', b'ignored', None, _(b'show only ignored files')),
6742 (b'n', b'no-status', None, _(b'hide status prefix')),
6743 (b'n', b'no-status', None, _(b'hide status prefix')),
6743 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6744 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6744 (
6745 (
6745 b'C',
6746 b'C',
6746 b'copies',
6747 b'copies',
6747 None,
6748 None,
6748 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6749 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6749 ),
6750 ),
6750 (
6751 (
6751 b'0',
6752 b'0',
6752 b'print0',
6753 b'print0',
6753 None,
6754 None,
6754 _(b'end filenames with NUL, for use with xargs'),
6755 _(b'end filenames with NUL, for use with xargs'),
6755 ),
6756 ),
6756 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6757 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6757 (
6758 (
6758 b'',
6759 b'',
6759 b'change',
6760 b'change',
6760 b'',
6761 b'',
6761 _(b'list the changed files of a revision'),
6762 _(b'list the changed files of a revision'),
6762 _(b'REV'),
6763 _(b'REV'),
6763 ),
6764 ),
6764 ]
6765 ]
6765 + walkopts
6766 + walkopts
6766 + subrepoopts
6767 + subrepoopts
6767 + formatteropts,
6768 + formatteropts,
6768 _(b'[OPTION]... [FILE]...'),
6769 _(b'[OPTION]... [FILE]...'),
6769 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6770 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6770 helpbasic=True,
6771 helpbasic=True,
6771 inferrepo=True,
6772 inferrepo=True,
6772 intents={INTENT_READONLY},
6773 intents={INTENT_READONLY},
6773 )
6774 )
6774 def status(ui, repo, *pats, **opts):
6775 def status(ui, repo, *pats, **opts):
6775 """show changed files in the working directory
6776 """show changed files in the working directory
6776
6777
6777 Show status of files in the repository. If names are given, only
6778 Show status of files in the repository. If names are given, only
6778 files that match are shown. Files that are clean or ignored or
6779 files that match are shown. Files that are clean or ignored or
6779 the source of a copy/move operation, are not listed unless
6780 the source of a copy/move operation, are not listed unless
6780 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6781 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6781 Unless options described with "show only ..." are given, the
6782 Unless options described with "show only ..." are given, the
6782 options -mardu are used.
6783 options -mardu are used.
6783
6784
6784 Option -q/--quiet hides untracked (unknown and ignored) files
6785 Option -q/--quiet hides untracked (unknown and ignored) files
6785 unless explicitly requested with -u/--unknown or -i/--ignored.
6786 unless explicitly requested with -u/--unknown or -i/--ignored.
6786
6787
6787 .. note::
6788 .. note::
6788
6789
6789 :hg:`status` may appear to disagree with diff if permissions have
6790 :hg:`status` may appear to disagree with diff if permissions have
6790 changed or a merge has occurred. The standard diff format does
6791 changed or a merge has occurred. The standard diff format does
6791 not report permission changes and diff only reports changes
6792 not report permission changes and diff only reports changes
6792 relative to one merge parent.
6793 relative to one merge parent.
6793
6794
6794 If one revision is given, it is used as the base revision.
6795 If one revision is given, it is used as the base revision.
6795 If two revisions are given, the differences between them are
6796 If two revisions are given, the differences between them are
6796 shown. The --change option can also be used as a shortcut to list
6797 shown. The --change option can also be used as a shortcut to list
6797 the changed files of a revision from its first parent.
6798 the changed files of a revision from its first parent.
6798
6799
6799 The codes used to show the status of files are::
6800 The codes used to show the status of files are::
6800
6801
6801 M = modified
6802 M = modified
6802 A = added
6803 A = added
6803 R = removed
6804 R = removed
6804 C = clean
6805 C = clean
6805 ! = missing (deleted by non-hg command, but still tracked)
6806 ! = missing (deleted by non-hg command, but still tracked)
6806 ? = not tracked
6807 ? = not tracked
6807 I = ignored
6808 I = ignored
6808 = origin of the previous file (with --copies)
6809 = origin of the previous file (with --copies)
6809
6810
6810 .. container:: verbose
6811 .. container:: verbose
6811
6812
6812 The -t/--terse option abbreviates the output by showing only the directory
6813 The -t/--terse option abbreviates the output by showing only the directory
6813 name if all the files in it share the same status. The option takes an
6814 name if all the files in it share the same status. The option takes an
6814 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6815 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6815 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6816 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6816 for 'ignored' and 'c' for clean.
6817 for 'ignored' and 'c' for clean.
6817
6818
6818 It abbreviates only those statuses which are passed. Note that clean and
6819 It abbreviates only those statuses which are passed. Note that clean and
6819 ignored files are not displayed with '--terse ic' unless the -c/--clean
6820 ignored files are not displayed with '--terse ic' unless the -c/--clean
6820 and -i/--ignored options are also used.
6821 and -i/--ignored options are also used.
6821
6822
6822 The -v/--verbose option shows information when the repository is in an
6823 The -v/--verbose option shows information when the repository is in an
6823 unfinished merge, shelve, rebase state etc. You can have this behavior
6824 unfinished merge, shelve, rebase state etc. You can have this behavior
6824 turned on by default by enabling the ``commands.status.verbose`` option.
6825 turned on by default by enabling the ``commands.status.verbose`` option.
6825
6826
6826 You can skip displaying some of these states by setting
6827 You can skip displaying some of these states by setting
6827 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6828 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6828 'histedit', 'merge', 'rebase', or 'unshelve'.
6829 'histedit', 'merge', 'rebase', or 'unshelve'.
6829
6830
6830 Template:
6831 Template:
6831
6832
6832 The following keywords are supported in addition to the common template
6833 The following keywords are supported in addition to the common template
6833 keywords and functions. See also :hg:`help templates`.
6834 keywords and functions. See also :hg:`help templates`.
6834
6835
6835 :path: String. Repository-absolute path of the file.
6836 :path: String. Repository-absolute path of the file.
6836 :source: String. Repository-absolute path of the file originated from.
6837 :source: String. Repository-absolute path of the file originated from.
6837 Available if ``--copies`` is specified.
6838 Available if ``--copies`` is specified.
6838 :status: String. Character denoting file's status.
6839 :status: String. Character denoting file's status.
6839
6840
6840 Examples:
6841 Examples:
6841
6842
6842 - show changes in the working directory relative to a
6843 - show changes in the working directory relative to a
6843 changeset::
6844 changeset::
6844
6845
6845 hg status --rev 9353
6846 hg status --rev 9353
6846
6847
6847 - show changes in the working directory relative to the
6848 - show changes in the working directory relative to the
6848 current directory (see :hg:`help patterns` for more information)::
6849 current directory (see :hg:`help patterns` for more information)::
6849
6850
6850 hg status re:
6851 hg status re:
6851
6852
6852 - show all changes including copies in an existing changeset::
6853 - show all changes including copies in an existing changeset::
6853
6854
6854 hg status --copies --change 9353
6855 hg status --copies --change 9353
6855
6856
6856 - get a NUL separated list of added files, suitable for xargs::
6857 - get a NUL separated list of added files, suitable for xargs::
6857
6858
6858 hg status -an0
6859 hg status -an0
6859
6860
6860 - show more information about the repository status, abbreviating
6861 - show more information about the repository status, abbreviating
6861 added, removed, modified, deleted, and untracked paths::
6862 added, removed, modified, deleted, and untracked paths::
6862
6863
6863 hg status -v -t mardu
6864 hg status -v -t mardu
6864
6865
6865 Returns 0 on success.
6866 Returns 0 on success.
6866
6867
6867 """
6868 """
6868
6869
6869 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6870 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6870 opts = pycompat.byteskwargs(opts)
6871 opts = pycompat.byteskwargs(opts)
6871 revs = opts.get(b'rev')
6872 revs = opts.get(b'rev')
6872 change = opts.get(b'change')
6873 change = opts.get(b'change')
6873 terse = opts.get(b'terse')
6874 terse = opts.get(b'terse')
6874 if terse is _NOTTERSE:
6875 if terse is _NOTTERSE:
6875 if revs:
6876 if revs:
6876 terse = b''
6877 terse = b''
6877 else:
6878 else:
6878 terse = ui.config(b'commands', b'status.terse')
6879 terse = ui.config(b'commands', b'status.terse')
6879
6880
6880 if revs and terse:
6881 if revs and terse:
6881 msg = _(b'cannot use --terse with --rev')
6882 msg = _(b'cannot use --terse with --rev')
6882 raise error.InputError(msg)
6883 raise error.InputError(msg)
6883 elif change:
6884 elif change:
6884 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6885 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6885 ctx2 = scmutil.revsingle(repo, change, None)
6886 ctx2 = scmutil.revsingle(repo, change, None)
6886 ctx1 = ctx2.p1()
6887 ctx1 = ctx2.p1()
6887 else:
6888 else:
6888 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6889 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6889 ctx1, ctx2 = scmutil.revpair(repo, revs)
6890 ctx1, ctx2 = scmutil.revpair(repo, revs)
6890
6891
6891 forcerelativevalue = None
6892 forcerelativevalue = None
6892 if ui.hasconfig(b'commands', b'status.relative'):
6893 if ui.hasconfig(b'commands', b'status.relative'):
6893 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6894 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6894 uipathfn = scmutil.getuipathfn(
6895 uipathfn = scmutil.getuipathfn(
6895 repo,
6896 repo,
6896 legacyrelativevalue=bool(pats),
6897 legacyrelativevalue=bool(pats),
6897 forcerelativevalue=forcerelativevalue,
6898 forcerelativevalue=forcerelativevalue,
6898 )
6899 )
6899
6900
6900 if opts.get(b'print0'):
6901 if opts.get(b'print0'):
6901 end = b'\0'
6902 end = b'\0'
6902 else:
6903 else:
6903 end = b'\n'
6904 end = b'\n'
6904 states = b'modified added removed deleted unknown ignored clean'.split()
6905 states = b'modified added removed deleted unknown ignored clean'.split()
6905 show = [k for k in states if opts.get(k)]
6906 show = [k for k in states if opts.get(k)]
6906 if opts.get(b'all'):
6907 if opts.get(b'all'):
6907 show += ui.quiet and (states[:4] + [b'clean']) or states
6908 show += ui.quiet and (states[:4] + [b'clean']) or states
6908
6909
6909 if not show:
6910 if not show:
6910 if ui.quiet:
6911 if ui.quiet:
6911 show = states[:4]
6912 show = states[:4]
6912 else:
6913 else:
6913 show = states[:5]
6914 show = states[:5]
6914
6915
6915 m = scmutil.match(ctx2, pats, opts)
6916 m = scmutil.match(ctx2, pats, opts)
6916 if terse:
6917 if terse:
6917 # we need to compute clean and unknown to terse
6918 # we need to compute clean and unknown to terse
6918 stat = repo.status(
6919 stat = repo.status(
6919 ctx1.node(),
6920 ctx1.node(),
6920 ctx2.node(),
6921 ctx2.node(),
6921 m,
6922 m,
6922 b'ignored' in show or b'i' in terse,
6923 b'ignored' in show or b'i' in terse,
6923 clean=True,
6924 clean=True,
6924 unknown=True,
6925 unknown=True,
6925 listsubrepos=opts.get(b'subrepos'),
6926 listsubrepos=opts.get(b'subrepos'),
6926 )
6927 )
6927
6928
6928 stat = cmdutil.tersedir(stat, terse)
6929 stat = cmdutil.tersedir(stat, terse)
6929 else:
6930 else:
6930 stat = repo.status(
6931 stat = repo.status(
6931 ctx1.node(),
6932 ctx1.node(),
6932 ctx2.node(),
6933 ctx2.node(),
6933 m,
6934 m,
6934 b'ignored' in show,
6935 b'ignored' in show,
6935 b'clean' in show,
6936 b'clean' in show,
6936 b'unknown' in show,
6937 b'unknown' in show,
6937 opts.get(b'subrepos'),
6938 opts.get(b'subrepos'),
6938 )
6939 )
6939
6940
6940 changestates = zip(
6941 changestates = zip(
6941 states,
6942 states,
6942 pycompat.iterbytestr(b'MAR!?IC'),
6943 pycompat.iterbytestr(b'MAR!?IC'),
6943 [getattr(stat, s.decode('utf8')) for s in states],
6944 [getattr(stat, s.decode('utf8')) for s in states],
6944 )
6945 )
6945
6946
6946 copy = {}
6947 copy = {}
6947 if (
6948 if (
6948 opts.get(b'all')
6949 opts.get(b'all')
6949 or opts.get(b'copies')
6950 or opts.get(b'copies')
6950 or ui.configbool(b'ui', b'statuscopies')
6951 or ui.configbool(b'ui', b'statuscopies')
6951 ) and not opts.get(b'no_status'):
6952 ) and not opts.get(b'no_status'):
6952 copy = copies.pathcopies(ctx1, ctx2, m)
6953 copy = copies.pathcopies(ctx1, ctx2, m)
6953
6954
6954 morestatus = None
6955 morestatus = None
6955 if (
6956 if (
6956 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6957 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6957 and not ui.plain()
6958 and not ui.plain()
6958 and not opts.get(b'print0')
6959 and not opts.get(b'print0')
6959 ):
6960 ):
6960 morestatus = cmdutil.readmorestatus(repo)
6961 morestatus = cmdutil.readmorestatus(repo)
6961
6962
6962 ui.pager(b'status')
6963 ui.pager(b'status')
6963 fm = ui.formatter(b'status', opts)
6964 fm = ui.formatter(b'status', opts)
6964 fmt = b'%s' + end
6965 fmt = b'%s' + end
6965 showchar = not opts.get(b'no_status')
6966 showchar = not opts.get(b'no_status')
6966
6967
6967 for state, char, files in changestates:
6968 for state, char, files in changestates:
6968 if state in show:
6969 if state in show:
6969 label = b'status.' + state
6970 label = b'status.' + state
6970 for f in files:
6971 for f in files:
6971 fm.startitem()
6972 fm.startitem()
6972 fm.context(ctx=ctx2)
6973 fm.context(ctx=ctx2)
6973 fm.data(itemtype=b'file', path=f)
6974 fm.data(itemtype=b'file', path=f)
6974 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6975 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6975 fm.plain(fmt % uipathfn(f), label=label)
6976 fm.plain(fmt % uipathfn(f), label=label)
6976 if f in copy:
6977 if f in copy:
6977 fm.data(source=copy[f])
6978 fm.data(source=copy[f])
6978 fm.plain(
6979 fm.plain(
6979 (b' %s' + end) % uipathfn(copy[f]),
6980 (b' %s' + end) % uipathfn(copy[f]),
6980 label=b'status.copied',
6981 label=b'status.copied',
6981 )
6982 )
6982 if morestatus:
6983 if morestatus:
6983 morestatus.formatfile(f, fm)
6984 morestatus.formatfile(f, fm)
6984
6985
6985 if morestatus:
6986 if morestatus:
6986 morestatus.formatfooter(fm)
6987 morestatus.formatfooter(fm)
6987 fm.end()
6988 fm.end()
6988
6989
6989
6990
6990 @command(
6991 @command(
6991 b'summary|sum',
6992 b'summary|sum',
6992 [(b'', b'remote', None, _(b'check for push and pull'))],
6993 [(b'', b'remote', None, _(b'check for push and pull'))],
6993 b'[--remote]',
6994 b'[--remote]',
6994 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6995 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6995 helpbasic=True,
6996 helpbasic=True,
6996 intents={INTENT_READONLY},
6997 intents={INTENT_READONLY},
6997 )
6998 )
6998 def summary(ui, repo, **opts):
6999 def summary(ui, repo, **opts):
6999 """summarize working directory state
7000 """summarize working directory state
7000
7001
7001 This generates a brief summary of the working directory state,
7002 This generates a brief summary of the working directory state,
7002 including parents, branch, commit status, phase and available updates.
7003 including parents, branch, commit status, phase and available updates.
7003
7004
7004 With the --remote option, this will check the default paths for
7005 With the --remote option, this will check the default paths for
7005 incoming and outgoing changes. This can be time-consuming.
7006 incoming and outgoing changes. This can be time-consuming.
7006
7007
7007 Returns 0 on success.
7008 Returns 0 on success.
7008 """
7009 """
7009
7010
7010 opts = pycompat.byteskwargs(opts)
7011 opts = pycompat.byteskwargs(opts)
7011 ui.pager(b'summary')
7012 ui.pager(b'summary')
7012 ctx = repo[None]
7013 ctx = repo[None]
7013 parents = ctx.parents()
7014 parents = ctx.parents()
7014 pnode = parents[0].node()
7015 pnode = parents[0].node()
7015 marks = []
7016 marks = []
7016
7017
7017 try:
7018 try:
7018 ms = mergestatemod.mergestate.read(repo)
7019 ms = mergestatemod.mergestate.read(repo)
7019 except error.UnsupportedMergeRecords as e:
7020 except error.UnsupportedMergeRecords as e:
7020 s = b' '.join(e.recordtypes)
7021 s = b' '.join(e.recordtypes)
7021 ui.warn(
7022 ui.warn(
7022 _(b'warning: merge state has unsupported record types: %s\n') % s
7023 _(b'warning: merge state has unsupported record types: %s\n') % s
7023 )
7024 )
7024 unresolved = []
7025 unresolved = []
7025 else:
7026 else:
7026 unresolved = list(ms.unresolved())
7027 unresolved = list(ms.unresolved())
7027
7028
7028 for p in parents:
7029 for p in parents:
7029 # label with log.changeset (instead of log.parent) since this
7030 # label with log.changeset (instead of log.parent) since this
7030 # shows a working directory parent *changeset*:
7031 # shows a working directory parent *changeset*:
7031 # i18n: column positioning for "hg summary"
7032 # i18n: column positioning for "hg summary"
7032 ui.write(
7033 ui.write(
7033 _(b'parent: %d:%s ') % (p.rev(), p),
7034 _(b'parent: %d:%s ') % (p.rev(), p),
7034 label=logcmdutil.changesetlabels(p),
7035 label=logcmdutil.changesetlabels(p),
7035 )
7036 )
7036 ui.write(b' '.join(p.tags()), label=b'log.tag')
7037 ui.write(b' '.join(p.tags()), label=b'log.tag')
7037 if p.bookmarks():
7038 if p.bookmarks():
7038 marks.extend(p.bookmarks())
7039 marks.extend(p.bookmarks())
7039 if p.rev() == -1:
7040 if p.rev() == -1:
7040 if not len(repo):
7041 if not len(repo):
7041 ui.write(_(b' (empty repository)'))
7042 ui.write(_(b' (empty repository)'))
7042 else:
7043 else:
7043 ui.write(_(b' (no revision checked out)'))
7044 ui.write(_(b' (no revision checked out)'))
7044 if p.obsolete():
7045 if p.obsolete():
7045 ui.write(_(b' (obsolete)'))
7046 ui.write(_(b' (obsolete)'))
7046 if p.isunstable():
7047 if p.isunstable():
7047 instabilities = (
7048 instabilities = (
7048 ui.label(instability, b'trouble.%s' % instability)
7049 ui.label(instability, b'trouble.%s' % instability)
7049 for instability in p.instabilities()
7050 for instability in p.instabilities()
7050 )
7051 )
7051 ui.write(b' (' + b', '.join(instabilities) + b')')
7052 ui.write(b' (' + b', '.join(instabilities) + b')')
7052 ui.write(b'\n')
7053 ui.write(b'\n')
7053 if p.description():
7054 if p.description():
7054 ui.status(
7055 ui.status(
7055 b' ' + p.description().splitlines()[0].strip() + b'\n',
7056 b' ' + p.description().splitlines()[0].strip() + b'\n',
7056 label=b'log.summary',
7057 label=b'log.summary',
7057 )
7058 )
7058
7059
7059 branch = ctx.branch()
7060 branch = ctx.branch()
7060 bheads = repo.branchheads(branch)
7061 bheads = repo.branchheads(branch)
7061 # i18n: column positioning for "hg summary"
7062 # i18n: column positioning for "hg summary"
7062 m = _(b'branch: %s\n') % branch
7063 m = _(b'branch: %s\n') % branch
7063 if branch != b'default':
7064 if branch != b'default':
7064 ui.write(m, label=b'log.branch')
7065 ui.write(m, label=b'log.branch')
7065 else:
7066 else:
7066 ui.status(m, label=b'log.branch')
7067 ui.status(m, label=b'log.branch')
7067
7068
7068 if marks:
7069 if marks:
7069 active = repo._activebookmark
7070 active = repo._activebookmark
7070 # i18n: column positioning for "hg summary"
7071 # i18n: column positioning for "hg summary"
7071 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7072 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7072 if active is not None:
7073 if active is not None:
7073 if active in marks:
7074 if active in marks:
7074 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7075 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7075 marks.remove(active)
7076 marks.remove(active)
7076 else:
7077 else:
7077 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7078 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7078 for m in marks:
7079 for m in marks:
7079 ui.write(b' ' + m, label=b'log.bookmark')
7080 ui.write(b' ' + m, label=b'log.bookmark')
7080 ui.write(b'\n', label=b'log.bookmark')
7081 ui.write(b'\n', label=b'log.bookmark')
7081
7082
7082 status = repo.status(unknown=True)
7083 status = repo.status(unknown=True)
7083
7084
7084 c = repo.dirstate.copies()
7085 c = repo.dirstate.copies()
7085 copied, renamed = [], []
7086 copied, renamed = [], []
7086 for d, s in pycompat.iteritems(c):
7087 for d, s in pycompat.iteritems(c):
7087 if s in status.removed:
7088 if s in status.removed:
7088 status.removed.remove(s)
7089 status.removed.remove(s)
7089 renamed.append(d)
7090 renamed.append(d)
7090 else:
7091 else:
7091 copied.append(d)
7092 copied.append(d)
7092 if d in status.added:
7093 if d in status.added:
7093 status.added.remove(d)
7094 status.added.remove(d)
7094
7095
7095 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7096 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7096
7097
7097 labels = [
7098 labels = [
7098 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7099 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7099 (ui.label(_(b'%d added'), b'status.added'), status.added),
7100 (ui.label(_(b'%d added'), b'status.added'), status.added),
7100 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7101 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7101 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7102 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7102 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7103 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7103 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7104 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7104 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7105 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7105 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7106 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7106 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7107 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7107 ]
7108 ]
7108 t = []
7109 t = []
7109 for l, s in labels:
7110 for l, s in labels:
7110 if s:
7111 if s:
7111 t.append(l % len(s))
7112 t.append(l % len(s))
7112
7113
7113 t = b', '.join(t)
7114 t = b', '.join(t)
7114 cleanworkdir = False
7115 cleanworkdir = False
7115
7116
7116 if repo.vfs.exists(b'graftstate'):
7117 if repo.vfs.exists(b'graftstate'):
7117 t += _(b' (graft in progress)')
7118 t += _(b' (graft in progress)')
7118 if repo.vfs.exists(b'updatestate'):
7119 if repo.vfs.exists(b'updatestate'):
7119 t += _(b' (interrupted update)')
7120 t += _(b' (interrupted update)')
7120 elif len(parents) > 1:
7121 elif len(parents) > 1:
7121 t += _(b' (merge)')
7122 t += _(b' (merge)')
7122 elif branch != parents[0].branch():
7123 elif branch != parents[0].branch():
7123 t += _(b' (new branch)')
7124 t += _(b' (new branch)')
7124 elif parents[0].closesbranch() and pnode in repo.branchheads(
7125 elif parents[0].closesbranch() and pnode in repo.branchheads(
7125 branch, closed=True
7126 branch, closed=True
7126 ):
7127 ):
7127 t += _(b' (head closed)')
7128 t += _(b' (head closed)')
7128 elif not (
7129 elif not (
7129 status.modified
7130 status.modified
7130 or status.added
7131 or status.added
7131 or status.removed
7132 or status.removed
7132 or renamed
7133 or renamed
7133 or copied
7134 or copied
7134 or subs
7135 or subs
7135 ):
7136 ):
7136 t += _(b' (clean)')
7137 t += _(b' (clean)')
7137 cleanworkdir = True
7138 cleanworkdir = True
7138 elif pnode not in bheads:
7139 elif pnode not in bheads:
7139 t += _(b' (new branch head)')
7140 t += _(b' (new branch head)')
7140
7141
7141 if parents:
7142 if parents:
7142 pendingphase = max(p.phase() for p in parents)
7143 pendingphase = max(p.phase() for p in parents)
7143 else:
7144 else:
7144 pendingphase = phases.public
7145 pendingphase = phases.public
7145
7146
7146 if pendingphase > phases.newcommitphase(ui):
7147 if pendingphase > phases.newcommitphase(ui):
7147 t += b' (%s)' % phases.phasenames[pendingphase]
7148 t += b' (%s)' % phases.phasenames[pendingphase]
7148
7149
7149 if cleanworkdir:
7150 if cleanworkdir:
7150 # i18n: column positioning for "hg summary"
7151 # i18n: column positioning for "hg summary"
7151 ui.status(_(b'commit: %s\n') % t.strip())
7152 ui.status(_(b'commit: %s\n') % t.strip())
7152 else:
7153 else:
7153 # i18n: column positioning for "hg summary"
7154 # i18n: column positioning for "hg summary"
7154 ui.write(_(b'commit: %s\n') % t.strip())
7155 ui.write(_(b'commit: %s\n') % t.strip())
7155
7156
7156 # all ancestors of branch heads - all ancestors of parent = new csets
7157 # all ancestors of branch heads - all ancestors of parent = new csets
7157 new = len(
7158 new = len(
7158 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7159 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7159 )
7160 )
7160
7161
7161 if new == 0:
7162 if new == 0:
7162 # i18n: column positioning for "hg summary"
7163 # i18n: column positioning for "hg summary"
7163 ui.status(_(b'update: (current)\n'))
7164 ui.status(_(b'update: (current)\n'))
7164 elif pnode not in bheads:
7165 elif pnode not in bheads:
7165 # i18n: column positioning for "hg summary"
7166 # i18n: column positioning for "hg summary"
7166 ui.write(_(b'update: %d new changesets (update)\n') % new)
7167 ui.write(_(b'update: %d new changesets (update)\n') % new)
7167 else:
7168 else:
7168 # i18n: column positioning for "hg summary"
7169 # i18n: column positioning for "hg summary"
7169 ui.write(
7170 ui.write(
7170 _(b'update: %d new changesets, %d branch heads (merge)\n')
7171 _(b'update: %d new changesets, %d branch heads (merge)\n')
7171 % (new, len(bheads))
7172 % (new, len(bheads))
7172 )
7173 )
7173
7174
7174 t = []
7175 t = []
7175 draft = len(repo.revs(b'draft()'))
7176 draft = len(repo.revs(b'draft()'))
7176 if draft:
7177 if draft:
7177 t.append(_(b'%d draft') % draft)
7178 t.append(_(b'%d draft') % draft)
7178 secret = len(repo.revs(b'secret()'))
7179 secret = len(repo.revs(b'secret()'))
7179 if secret:
7180 if secret:
7180 t.append(_(b'%d secret') % secret)
7181 t.append(_(b'%d secret') % secret)
7181
7182
7182 if draft or secret:
7183 if draft or secret:
7183 ui.status(_(b'phases: %s\n') % b', '.join(t))
7184 ui.status(_(b'phases: %s\n') % b', '.join(t))
7184
7185
7185 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7186 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7186 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7187 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7187 numtrouble = len(repo.revs(trouble + b"()"))
7188 numtrouble = len(repo.revs(trouble + b"()"))
7188 # We write all the possibilities to ease translation
7189 # We write all the possibilities to ease translation
7189 troublemsg = {
7190 troublemsg = {
7190 b"orphan": _(b"orphan: %d changesets"),
7191 b"orphan": _(b"orphan: %d changesets"),
7191 b"contentdivergent": _(b"content-divergent: %d changesets"),
7192 b"contentdivergent": _(b"content-divergent: %d changesets"),
7192 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7193 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7193 }
7194 }
7194 if numtrouble > 0:
7195 if numtrouble > 0:
7195 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7196 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7196
7197
7197 cmdutil.summaryhooks(ui, repo)
7198 cmdutil.summaryhooks(ui, repo)
7198
7199
7199 if opts.get(b'remote'):
7200 if opts.get(b'remote'):
7200 needsincoming, needsoutgoing = True, True
7201 needsincoming, needsoutgoing = True, True
7201 else:
7202 else:
7202 needsincoming, needsoutgoing = False, False
7203 needsincoming, needsoutgoing = False, False
7203 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7204 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7204 if i:
7205 if i:
7205 needsincoming = True
7206 needsincoming = True
7206 if o:
7207 if o:
7207 needsoutgoing = True
7208 needsoutgoing = True
7208 if not needsincoming and not needsoutgoing:
7209 if not needsincoming and not needsoutgoing:
7209 return
7210 return
7210
7211
7211 def getincoming():
7212 def getincoming():
7212 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7213 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7213 sbranch = branches[0]
7214 sbranch = branches[0]
7214 try:
7215 try:
7215 other = hg.peer(repo, {}, source)
7216 other = hg.peer(repo, {}, source)
7216 except error.RepoError:
7217 except error.RepoError:
7217 if opts.get(b'remote'):
7218 if opts.get(b'remote'):
7218 raise
7219 raise
7219 return source, sbranch, None, None, None
7220 return source, sbranch, None, None, None
7220 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7221 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7221 if revs:
7222 if revs:
7222 revs = [other.lookup(rev) for rev in revs]
7223 revs = [other.lookup(rev) for rev in revs]
7223 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7224 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7224 repo.ui.pushbuffer()
7225 repo.ui.pushbuffer()
7225 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7226 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7226 repo.ui.popbuffer()
7227 repo.ui.popbuffer()
7227 return source, sbranch, other, commoninc, commoninc[1]
7228 return source, sbranch, other, commoninc, commoninc[1]
7228
7229
7229 if needsincoming:
7230 if needsincoming:
7230 source, sbranch, sother, commoninc, incoming = getincoming()
7231 source, sbranch, sother, commoninc, incoming = getincoming()
7231 else:
7232 else:
7232 source = sbranch = sother = commoninc = incoming = None
7233 source = sbranch = sother = commoninc = incoming = None
7233
7234
7234 def getoutgoing():
7235 def getoutgoing():
7235 dest, branches = urlutil.parseurl(
7236 dest, branches = urlutil.parseurl(
7236 ui.expandpath(b'default-push', b'default')
7237 ui.expandpath(b'default-push', b'default')
7237 )
7238 )
7238 dbranch = branches[0]
7239 dbranch = branches[0]
7239 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7240 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7240 if source != dest:
7241 if source != dest:
7241 try:
7242 try:
7242 dother = hg.peer(repo, {}, dest)
7243 dother = hg.peer(repo, {}, dest)
7243 except error.RepoError:
7244 except error.RepoError:
7244 if opts.get(b'remote'):
7245 if opts.get(b'remote'):
7245 raise
7246 raise
7246 return dest, dbranch, None, None
7247 return dest, dbranch, None, None
7247 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7248 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7248 elif sother is None:
7249 elif sother is None:
7249 # there is no explicit destination peer, but source one is invalid
7250 # there is no explicit destination peer, but source one is invalid
7250 return dest, dbranch, None, None
7251 return dest, dbranch, None, None
7251 else:
7252 else:
7252 dother = sother
7253 dother = sother
7253 if source != dest or (sbranch is not None and sbranch != dbranch):
7254 if source != dest or (sbranch is not None and sbranch != dbranch):
7254 common = None
7255 common = None
7255 else:
7256 else:
7256 common = commoninc
7257 common = commoninc
7257 if revs:
7258 if revs:
7258 revs = [repo.lookup(rev) for rev in revs]
7259 revs = [repo.lookup(rev) for rev in revs]
7259 repo.ui.pushbuffer()
7260 repo.ui.pushbuffer()
7260 outgoing = discovery.findcommonoutgoing(
7261 outgoing = discovery.findcommonoutgoing(
7261 repo, dother, onlyheads=revs, commoninc=common
7262 repo, dother, onlyheads=revs, commoninc=common
7262 )
7263 )
7263 repo.ui.popbuffer()
7264 repo.ui.popbuffer()
7264 return dest, dbranch, dother, outgoing
7265 return dest, dbranch, dother, outgoing
7265
7266
7266 if needsoutgoing:
7267 if needsoutgoing:
7267 dest, dbranch, dother, outgoing = getoutgoing()
7268 dest, dbranch, dother, outgoing = getoutgoing()
7268 else:
7269 else:
7269 dest = dbranch = dother = outgoing = None
7270 dest = dbranch = dother = outgoing = None
7270
7271
7271 if opts.get(b'remote'):
7272 if opts.get(b'remote'):
7272 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7273 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7273 # The former always sets `sother` (or raises an exception if it can't);
7274 # The former always sets `sother` (or raises an exception if it can't);
7274 # the latter always sets `outgoing`.
7275 # the latter always sets `outgoing`.
7275 assert sother is not None
7276 assert sother is not None
7276 assert outgoing is not None
7277 assert outgoing is not None
7277
7278
7278 t = []
7279 t = []
7279 if incoming:
7280 if incoming:
7280 t.append(_(b'1 or more incoming'))
7281 t.append(_(b'1 or more incoming'))
7281 o = outgoing.missing
7282 o = outgoing.missing
7282 if o:
7283 if o:
7283 t.append(_(b'%d outgoing') % len(o))
7284 t.append(_(b'%d outgoing') % len(o))
7284 other = dother or sother
7285 other = dother or sother
7285 if b'bookmarks' in other.listkeys(b'namespaces'):
7286 if b'bookmarks' in other.listkeys(b'namespaces'):
7286 counts = bookmarks.summary(repo, other)
7287 counts = bookmarks.summary(repo, other)
7287 if counts[0] > 0:
7288 if counts[0] > 0:
7288 t.append(_(b'%d incoming bookmarks') % counts[0])
7289 t.append(_(b'%d incoming bookmarks') % counts[0])
7289 if counts[1] > 0:
7290 if counts[1] > 0:
7290 t.append(_(b'%d outgoing bookmarks') % counts[1])
7291 t.append(_(b'%d outgoing bookmarks') % counts[1])
7291
7292
7292 if t:
7293 if t:
7293 # i18n: column positioning for "hg summary"
7294 # i18n: column positioning for "hg summary"
7294 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7295 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7295 else:
7296 else:
7296 # i18n: column positioning for "hg summary"
7297 # i18n: column positioning for "hg summary"
7297 ui.status(_(b'remote: (synced)\n'))
7298 ui.status(_(b'remote: (synced)\n'))
7298
7299
7299 cmdutil.summaryremotehooks(
7300 cmdutil.summaryremotehooks(
7300 ui,
7301 ui,
7301 repo,
7302 repo,
7302 opts,
7303 opts,
7303 (
7304 (
7304 (source, sbranch, sother, commoninc),
7305 (source, sbranch, sother, commoninc),
7305 (dest, dbranch, dother, outgoing),
7306 (dest, dbranch, dother, outgoing),
7306 ),
7307 ),
7307 )
7308 )
7308
7309
7309
7310
7310 @command(
7311 @command(
7311 b'tag',
7312 b'tag',
7312 [
7313 [
7313 (b'f', b'force', None, _(b'force tag')),
7314 (b'f', b'force', None, _(b'force tag')),
7314 (b'l', b'local', None, _(b'make the tag local')),
7315 (b'l', b'local', None, _(b'make the tag local')),
7315 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7316 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7316 (b'', b'remove', None, _(b'remove a tag')),
7317 (b'', b'remove', None, _(b'remove a tag')),
7317 # -l/--local is already there, commitopts cannot be used
7318 # -l/--local is already there, commitopts cannot be used
7318 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7319 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7319 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7320 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7320 ]
7321 ]
7321 + commitopts2,
7322 + commitopts2,
7322 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7323 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7323 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7324 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7324 )
7325 )
7325 def tag(ui, repo, name1, *names, **opts):
7326 def tag(ui, repo, name1, *names, **opts):
7326 """add one or more tags for the current or given revision
7327 """add one or more tags for the current or given revision
7327
7328
7328 Name a particular revision using <name>.
7329 Name a particular revision using <name>.
7329
7330
7330 Tags are used to name particular revisions of the repository and are
7331 Tags are used to name particular revisions of the repository and are
7331 very useful to compare different revisions, to go back to significant
7332 very useful to compare different revisions, to go back to significant
7332 earlier versions or to mark branch points as releases, etc. Changing
7333 earlier versions or to mark branch points as releases, etc. Changing
7333 an existing tag is normally disallowed; use -f/--force to override.
7334 an existing tag is normally disallowed; use -f/--force to override.
7334
7335
7335 If no revision is given, the parent of the working directory is
7336 If no revision is given, the parent of the working directory is
7336 used.
7337 used.
7337
7338
7338 To facilitate version control, distribution, and merging of tags,
7339 To facilitate version control, distribution, and merging of tags,
7339 they are stored as a file named ".hgtags" which is managed similarly
7340 they are stored as a file named ".hgtags" which is managed similarly
7340 to other project files and can be hand-edited if necessary. This
7341 to other project files and can be hand-edited if necessary. This
7341 also means that tagging creates a new commit. The file
7342 also means that tagging creates a new commit. The file
7342 ".hg/localtags" is used for local tags (not shared among
7343 ".hg/localtags" is used for local tags (not shared among
7343 repositories).
7344 repositories).
7344
7345
7345 Tag commits are usually made at the head of a branch. If the parent
7346 Tag commits are usually made at the head of a branch. If the parent
7346 of the working directory is not a branch head, :hg:`tag` aborts; use
7347 of the working directory is not a branch head, :hg:`tag` aborts; use
7347 -f/--force to force the tag commit to be based on a non-head
7348 -f/--force to force the tag commit to be based on a non-head
7348 changeset.
7349 changeset.
7349
7350
7350 See :hg:`help dates` for a list of formats valid for -d/--date.
7351 See :hg:`help dates` for a list of formats valid for -d/--date.
7351
7352
7352 Since tag names have priority over branch names during revision
7353 Since tag names have priority over branch names during revision
7353 lookup, using an existing branch name as a tag name is discouraged.
7354 lookup, using an existing branch name as a tag name is discouraged.
7354
7355
7355 Returns 0 on success.
7356 Returns 0 on success.
7356 """
7357 """
7357 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7358 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7358 opts = pycompat.byteskwargs(opts)
7359 opts = pycompat.byteskwargs(opts)
7359 with repo.wlock(), repo.lock():
7360 with repo.wlock(), repo.lock():
7360 rev_ = b"."
7361 rev_ = b"."
7361 names = [t.strip() for t in (name1,) + names]
7362 names = [t.strip() for t in (name1,) + names]
7362 if len(names) != len(set(names)):
7363 if len(names) != len(set(names)):
7363 raise error.InputError(_(b'tag names must be unique'))
7364 raise error.InputError(_(b'tag names must be unique'))
7364 for n in names:
7365 for n in names:
7365 scmutil.checknewlabel(repo, n, b'tag')
7366 scmutil.checknewlabel(repo, n, b'tag')
7366 if not n:
7367 if not n:
7367 raise error.InputError(
7368 raise error.InputError(
7368 _(b'tag names cannot consist entirely of whitespace')
7369 _(b'tag names cannot consist entirely of whitespace')
7369 )
7370 )
7370 if opts.get(b'rev'):
7371 if opts.get(b'rev'):
7371 rev_ = opts[b'rev']
7372 rev_ = opts[b'rev']
7372 message = opts.get(b'message')
7373 message = opts.get(b'message')
7373 if opts.get(b'remove'):
7374 if opts.get(b'remove'):
7374 if opts.get(b'local'):
7375 if opts.get(b'local'):
7375 expectedtype = b'local'
7376 expectedtype = b'local'
7376 else:
7377 else:
7377 expectedtype = b'global'
7378 expectedtype = b'global'
7378
7379
7379 for n in names:
7380 for n in names:
7380 if repo.tagtype(n) == b'global':
7381 if repo.tagtype(n) == b'global':
7381 alltags = tagsmod.findglobaltags(ui, repo)
7382 alltags = tagsmod.findglobaltags(ui, repo)
7382 if alltags[n][0] == nullid:
7383 if alltags[n][0] == nullid:
7383 raise error.InputError(
7384 raise error.InputError(
7384 _(b"tag '%s' is already removed") % n
7385 _(b"tag '%s' is already removed") % n
7385 )
7386 )
7386 if not repo.tagtype(n):
7387 if not repo.tagtype(n):
7387 raise error.InputError(_(b"tag '%s' does not exist") % n)
7388 raise error.InputError(_(b"tag '%s' does not exist") % n)
7388 if repo.tagtype(n) != expectedtype:
7389 if repo.tagtype(n) != expectedtype:
7389 if expectedtype == b'global':
7390 if expectedtype == b'global':
7390 raise error.InputError(
7391 raise error.InputError(
7391 _(b"tag '%s' is not a global tag") % n
7392 _(b"tag '%s' is not a global tag") % n
7392 )
7393 )
7393 else:
7394 else:
7394 raise error.InputError(
7395 raise error.InputError(
7395 _(b"tag '%s' is not a local tag") % n
7396 _(b"tag '%s' is not a local tag") % n
7396 )
7397 )
7397 rev_ = b'null'
7398 rev_ = b'null'
7398 if not message:
7399 if not message:
7399 # we don't translate commit messages
7400 # we don't translate commit messages
7400 message = b'Removed tag %s' % b', '.join(names)
7401 message = b'Removed tag %s' % b', '.join(names)
7401 elif not opts.get(b'force'):
7402 elif not opts.get(b'force'):
7402 for n in names:
7403 for n in names:
7403 if n in repo.tags():
7404 if n in repo.tags():
7404 raise error.InputError(
7405 raise error.InputError(
7405 _(b"tag '%s' already exists (use -f to force)") % n
7406 _(b"tag '%s' already exists (use -f to force)") % n
7406 )
7407 )
7407 if not opts.get(b'local'):
7408 if not opts.get(b'local'):
7408 p1, p2 = repo.dirstate.parents()
7409 p1, p2 = repo.dirstate.parents()
7409 if p2 != nullid:
7410 if p2 != nullid:
7410 raise error.StateError(_(b'uncommitted merge'))
7411 raise error.StateError(_(b'uncommitted merge'))
7411 bheads = repo.branchheads()
7412 bheads = repo.branchheads()
7412 if not opts.get(b'force') and bheads and p1 not in bheads:
7413 if not opts.get(b'force') and bheads and p1 not in bheads:
7413 raise error.InputError(
7414 raise error.InputError(
7414 _(
7415 _(
7415 b'working directory is not at a branch head '
7416 b'working directory is not at a branch head '
7416 b'(use -f to force)'
7417 b'(use -f to force)'
7417 )
7418 )
7418 )
7419 )
7419 node = scmutil.revsingle(repo, rev_).node()
7420 node = scmutil.revsingle(repo, rev_).node()
7420
7421
7421 if not message:
7422 if not message:
7422 # we don't translate commit messages
7423 # we don't translate commit messages
7423 message = b'Added tag %s for changeset %s' % (
7424 message = b'Added tag %s for changeset %s' % (
7424 b', '.join(names),
7425 b', '.join(names),
7425 short(node),
7426 short(node),
7426 )
7427 )
7427
7428
7428 date = opts.get(b'date')
7429 date = opts.get(b'date')
7429 if date:
7430 if date:
7430 date = dateutil.parsedate(date)
7431 date = dateutil.parsedate(date)
7431
7432
7432 if opts.get(b'remove'):
7433 if opts.get(b'remove'):
7433 editform = b'tag.remove'
7434 editform = b'tag.remove'
7434 else:
7435 else:
7435 editform = b'tag.add'
7436 editform = b'tag.add'
7436 editor = cmdutil.getcommiteditor(
7437 editor = cmdutil.getcommiteditor(
7437 editform=editform, **pycompat.strkwargs(opts)
7438 editform=editform, **pycompat.strkwargs(opts)
7438 )
7439 )
7439
7440
7440 # don't allow tagging the null rev
7441 # don't allow tagging the null rev
7441 if (
7442 if (
7442 not opts.get(b'remove')
7443 not opts.get(b'remove')
7443 and scmutil.revsingle(repo, rev_).rev() == nullrev
7444 and scmutil.revsingle(repo, rev_).rev() == nullrev
7444 ):
7445 ):
7445 raise error.InputError(_(b"cannot tag null revision"))
7446 raise error.InputError(_(b"cannot tag null revision"))
7446
7447
7447 tagsmod.tag(
7448 tagsmod.tag(
7448 repo,
7449 repo,
7449 names,
7450 names,
7450 node,
7451 node,
7451 message,
7452 message,
7452 opts.get(b'local'),
7453 opts.get(b'local'),
7453 opts.get(b'user'),
7454 opts.get(b'user'),
7454 date,
7455 date,
7455 editor=editor,
7456 editor=editor,
7456 )
7457 )
7457
7458
7458
7459
7459 @command(
7460 @command(
7460 b'tags',
7461 b'tags',
7461 formatteropts,
7462 formatteropts,
7462 b'',
7463 b'',
7463 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7464 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7464 intents={INTENT_READONLY},
7465 intents={INTENT_READONLY},
7465 )
7466 )
7466 def tags(ui, repo, **opts):
7467 def tags(ui, repo, **opts):
7467 """list repository tags
7468 """list repository tags
7468
7469
7469 This lists both regular and local tags. When the -v/--verbose
7470 This lists both regular and local tags. When the -v/--verbose
7470 switch is used, a third column "local" is printed for local tags.
7471 switch is used, a third column "local" is printed for local tags.
7471 When the -q/--quiet switch is used, only the tag name is printed.
7472 When the -q/--quiet switch is used, only the tag name is printed.
7472
7473
7473 .. container:: verbose
7474 .. container:: verbose
7474
7475
7475 Template:
7476 Template:
7476
7477
7477 The following keywords are supported in addition to the common template
7478 The following keywords are supported in addition to the common template
7478 keywords and functions such as ``{tag}``. See also
7479 keywords and functions such as ``{tag}``. See also
7479 :hg:`help templates`.
7480 :hg:`help templates`.
7480
7481
7481 :type: String. ``local`` for local tags.
7482 :type: String. ``local`` for local tags.
7482
7483
7483 Returns 0 on success.
7484 Returns 0 on success.
7484 """
7485 """
7485
7486
7486 opts = pycompat.byteskwargs(opts)
7487 opts = pycompat.byteskwargs(opts)
7487 ui.pager(b'tags')
7488 ui.pager(b'tags')
7488 fm = ui.formatter(b'tags', opts)
7489 fm = ui.formatter(b'tags', opts)
7489 hexfunc = fm.hexfunc
7490 hexfunc = fm.hexfunc
7490
7491
7491 for t, n in reversed(repo.tagslist()):
7492 for t, n in reversed(repo.tagslist()):
7492 hn = hexfunc(n)
7493 hn = hexfunc(n)
7493 label = b'tags.normal'
7494 label = b'tags.normal'
7494 tagtype = repo.tagtype(t)
7495 tagtype = repo.tagtype(t)
7495 if not tagtype or tagtype == b'global':
7496 if not tagtype or tagtype == b'global':
7496 tagtype = b''
7497 tagtype = b''
7497 else:
7498 else:
7498 label = b'tags.' + tagtype
7499 label = b'tags.' + tagtype
7499
7500
7500 fm.startitem()
7501 fm.startitem()
7501 fm.context(repo=repo)
7502 fm.context(repo=repo)
7502 fm.write(b'tag', b'%s', t, label=label)
7503 fm.write(b'tag', b'%s', t, label=label)
7503 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7504 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7504 fm.condwrite(
7505 fm.condwrite(
7505 not ui.quiet,
7506 not ui.quiet,
7506 b'rev node',
7507 b'rev node',
7507 fmt,
7508 fmt,
7508 repo.changelog.rev(n),
7509 repo.changelog.rev(n),
7509 hn,
7510 hn,
7510 label=label,
7511 label=label,
7511 )
7512 )
7512 fm.condwrite(
7513 fm.condwrite(
7513 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7514 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7514 )
7515 )
7515 fm.plain(b'\n')
7516 fm.plain(b'\n')
7516 fm.end()
7517 fm.end()
7517
7518
7518
7519
7519 @command(
7520 @command(
7520 b'tip',
7521 b'tip',
7521 [
7522 [
7522 (b'p', b'patch', None, _(b'show patch')),
7523 (b'p', b'patch', None, _(b'show patch')),
7523 (b'g', b'git', None, _(b'use git extended diff format')),
7524 (b'g', b'git', None, _(b'use git extended diff format')),
7524 ]
7525 ]
7525 + templateopts,
7526 + templateopts,
7526 _(b'[-p] [-g]'),
7527 _(b'[-p] [-g]'),
7527 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7528 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7528 )
7529 )
7529 def tip(ui, repo, **opts):
7530 def tip(ui, repo, **opts):
7530 """show the tip revision (DEPRECATED)
7531 """show the tip revision (DEPRECATED)
7531
7532
7532 The tip revision (usually just called the tip) is the changeset
7533 The tip revision (usually just called the tip) is the changeset
7533 most recently added to the repository (and therefore the most
7534 most recently added to the repository (and therefore the most
7534 recently changed head).
7535 recently changed head).
7535
7536
7536 If you have just made a commit, that commit will be the tip. If
7537 If you have just made a commit, that commit will be the tip. If
7537 you have just pulled changes from another repository, the tip of
7538 you have just pulled changes from another repository, the tip of
7538 that repository becomes the current tip. The "tip" tag is special
7539 that repository becomes the current tip. The "tip" tag is special
7539 and cannot be renamed or assigned to a different changeset.
7540 and cannot be renamed or assigned to a different changeset.
7540
7541
7541 This command is deprecated, please use :hg:`heads` instead.
7542 This command is deprecated, please use :hg:`heads` instead.
7542
7543
7543 Returns 0 on success.
7544 Returns 0 on success.
7544 """
7545 """
7545 opts = pycompat.byteskwargs(opts)
7546 opts = pycompat.byteskwargs(opts)
7546 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7547 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7547 displayer.show(repo[b'tip'])
7548 displayer.show(repo[b'tip'])
7548 displayer.close()
7549 displayer.close()
7549
7550
7550
7551
7551 @command(
7552 @command(
7552 b'unbundle',
7553 b'unbundle',
7553 [
7554 [
7554 (
7555 (
7555 b'u',
7556 b'u',
7556 b'update',
7557 b'update',
7557 None,
7558 None,
7558 _(b'update to new branch head if changesets were unbundled'),
7559 _(b'update to new branch head if changesets were unbundled'),
7559 )
7560 )
7560 ],
7561 ],
7561 _(b'[-u] FILE...'),
7562 _(b'[-u] FILE...'),
7562 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7563 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7563 )
7564 )
7564 def unbundle(ui, repo, fname1, *fnames, **opts):
7565 def unbundle(ui, repo, fname1, *fnames, **opts):
7565 """apply one or more bundle files
7566 """apply one or more bundle files
7566
7567
7567 Apply one or more bundle files generated by :hg:`bundle`.
7568 Apply one or more bundle files generated by :hg:`bundle`.
7568
7569
7569 Returns 0 on success, 1 if an update has unresolved files.
7570 Returns 0 on success, 1 if an update has unresolved files.
7570 """
7571 """
7571 fnames = (fname1,) + fnames
7572 fnames = (fname1,) + fnames
7572
7573
7573 with repo.lock():
7574 with repo.lock():
7574 for fname in fnames:
7575 for fname in fnames:
7575 f = hg.openpath(ui, fname)
7576 f = hg.openpath(ui, fname)
7576 gen = exchange.readbundle(ui, f, fname)
7577 gen = exchange.readbundle(ui, f, fname)
7577 if isinstance(gen, streamclone.streamcloneapplier):
7578 if isinstance(gen, streamclone.streamcloneapplier):
7578 raise error.InputError(
7579 raise error.InputError(
7579 _(
7580 _(
7580 b'packed bundles cannot be applied with '
7581 b'packed bundles cannot be applied with '
7581 b'"hg unbundle"'
7582 b'"hg unbundle"'
7582 ),
7583 ),
7583 hint=_(b'use "hg debugapplystreamclonebundle"'),
7584 hint=_(b'use "hg debugapplystreamclonebundle"'),
7584 )
7585 )
7585 url = b'bundle:' + fname
7586 url = b'bundle:' + fname
7586 try:
7587 try:
7587 txnname = b'unbundle'
7588 txnname = b'unbundle'
7588 if not isinstance(gen, bundle2.unbundle20):
7589 if not isinstance(gen, bundle2.unbundle20):
7589 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7590 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7590 with repo.transaction(txnname) as tr:
7591 with repo.transaction(txnname) as tr:
7591 op = bundle2.applybundle(
7592 op = bundle2.applybundle(
7592 repo, gen, tr, source=b'unbundle', url=url
7593 repo, gen, tr, source=b'unbundle', url=url
7593 )
7594 )
7594 except error.BundleUnknownFeatureError as exc:
7595 except error.BundleUnknownFeatureError as exc:
7595 raise error.Abort(
7596 raise error.Abort(
7596 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7597 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7597 hint=_(
7598 hint=_(
7598 b"see https://mercurial-scm.org/"
7599 b"see https://mercurial-scm.org/"
7599 b"wiki/BundleFeature for more "
7600 b"wiki/BundleFeature for more "
7600 b"information"
7601 b"information"
7601 ),
7602 ),
7602 )
7603 )
7603 modheads = bundle2.combinechangegroupresults(op)
7604 modheads = bundle2.combinechangegroupresults(op)
7604
7605
7605 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7606 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7606 return 1
7607 return 1
7607 else:
7608 else:
7608 return 0
7609 return 0
7609
7610
7610
7611
7611 @command(
7612 @command(
7612 b'unshelve',
7613 b'unshelve',
7613 [
7614 [
7614 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7615 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7615 (
7616 (
7616 b'c',
7617 b'c',
7617 b'continue',
7618 b'continue',
7618 None,
7619 None,
7619 _(b'continue an incomplete unshelve operation'),
7620 _(b'continue an incomplete unshelve operation'),
7620 ),
7621 ),
7621 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7622 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7622 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7623 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7623 (
7624 (
7624 b'n',
7625 b'n',
7625 b'name',
7626 b'name',
7626 b'',
7627 b'',
7627 _(b'restore shelved change with given name'),
7628 _(b'restore shelved change with given name'),
7628 _(b'NAME'),
7629 _(b'NAME'),
7629 ),
7630 ),
7630 (b't', b'tool', b'', _(b'specify merge tool')),
7631 (b't', b'tool', b'', _(b'specify merge tool')),
7631 (
7632 (
7632 b'',
7633 b'',
7633 b'date',
7634 b'date',
7634 b'',
7635 b'',
7635 _(b'set date for temporary commits (DEPRECATED)'),
7636 _(b'set date for temporary commits (DEPRECATED)'),
7636 _(b'DATE'),
7637 _(b'DATE'),
7637 ),
7638 ),
7638 ],
7639 ],
7639 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7640 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7640 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7641 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7641 )
7642 )
7642 def unshelve(ui, repo, *shelved, **opts):
7643 def unshelve(ui, repo, *shelved, **opts):
7643 """restore a shelved change to the working directory
7644 """restore a shelved change to the working directory
7644
7645
7645 This command accepts an optional name of a shelved change to
7646 This command accepts an optional name of a shelved change to
7646 restore. If none is given, the most recent shelved change is used.
7647 restore. If none is given, the most recent shelved change is used.
7647
7648
7648 If a shelved change is applied successfully, the bundle that
7649 If a shelved change is applied successfully, the bundle that
7649 contains the shelved changes is moved to a backup location
7650 contains the shelved changes is moved to a backup location
7650 (.hg/shelve-backup).
7651 (.hg/shelve-backup).
7651
7652
7652 Since you can restore a shelved change on top of an arbitrary
7653 Since you can restore a shelved change on top of an arbitrary
7653 commit, it is possible that unshelving will result in a conflict
7654 commit, it is possible that unshelving will result in a conflict
7654 between your changes and the commits you are unshelving onto. If
7655 between your changes and the commits you are unshelving onto. If
7655 this occurs, you must resolve the conflict, then use
7656 this occurs, you must resolve the conflict, then use
7656 ``--continue`` to complete the unshelve operation. (The bundle
7657 ``--continue`` to complete the unshelve operation. (The bundle
7657 will not be moved until you successfully complete the unshelve.)
7658 will not be moved until you successfully complete the unshelve.)
7658
7659
7659 (Alternatively, you can use ``--abort`` to abandon an unshelve
7660 (Alternatively, you can use ``--abort`` to abandon an unshelve
7660 that causes a conflict. This reverts the unshelved changes, and
7661 that causes a conflict. This reverts the unshelved changes, and
7661 leaves the bundle in place.)
7662 leaves the bundle in place.)
7662
7663
7663 If bare shelved change (without interactive, include and exclude
7664 If bare shelved change (without interactive, include and exclude
7664 option) was done on newly created branch it would restore branch
7665 option) was done on newly created branch it would restore branch
7665 information to the working directory.
7666 information to the working directory.
7666
7667
7667 After a successful unshelve, the shelved changes are stored in a
7668 After a successful unshelve, the shelved changes are stored in a
7668 backup directory. Only the N most recent backups are kept. N
7669 backup directory. Only the N most recent backups are kept. N
7669 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7670 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7670 configuration option.
7671 configuration option.
7671
7672
7672 .. container:: verbose
7673 .. container:: verbose
7673
7674
7674 Timestamp in seconds is used to decide order of backups. More
7675 Timestamp in seconds is used to decide order of backups. More
7675 than ``maxbackups`` backups are kept, if same timestamp
7676 than ``maxbackups`` backups are kept, if same timestamp
7676 prevents from deciding exact order of them, for safety.
7677 prevents from deciding exact order of them, for safety.
7677
7678
7678 Selected changes can be unshelved with ``--interactive`` flag.
7679 Selected changes can be unshelved with ``--interactive`` flag.
7679 The working directory is updated with the selected changes, and
7680 The working directory is updated with the selected changes, and
7680 only the unselected changes remain shelved.
7681 only the unselected changes remain shelved.
7681 Note: The whole shelve is applied to working directory first before
7682 Note: The whole shelve is applied to working directory first before
7682 running interactively. So, this will bring up all the conflicts between
7683 running interactively. So, this will bring up all the conflicts between
7683 working directory and the shelve, irrespective of which changes will be
7684 working directory and the shelve, irrespective of which changes will be
7684 unshelved.
7685 unshelved.
7685 """
7686 """
7686 with repo.wlock():
7687 with repo.wlock():
7687 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7688 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7688
7689
7689
7690
7690 statemod.addunfinished(
7691 statemod.addunfinished(
7691 b'unshelve',
7692 b'unshelve',
7692 fname=b'shelvedstate',
7693 fname=b'shelvedstate',
7693 continueflag=True,
7694 continueflag=True,
7694 abortfunc=shelvemod.hgabortunshelve,
7695 abortfunc=shelvemod.hgabortunshelve,
7695 continuefunc=shelvemod.hgcontinueunshelve,
7696 continuefunc=shelvemod.hgcontinueunshelve,
7696 cmdmsg=_(b'unshelve already in progress'),
7697 cmdmsg=_(b'unshelve already in progress'),
7697 )
7698 )
7698
7699
7699
7700
7700 @command(
7701 @command(
7701 b'update|up|checkout|co',
7702 b'update|up|checkout|co',
7702 [
7703 [
7703 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7704 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7704 (b'c', b'check', None, _(b'require clean working directory')),
7705 (b'c', b'check', None, _(b'require clean working directory')),
7705 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7706 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7706 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7707 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7707 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7708 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7708 ]
7709 ]
7709 + mergetoolopts,
7710 + mergetoolopts,
7710 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7711 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7711 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7712 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7712 helpbasic=True,
7713 helpbasic=True,
7713 )
7714 )
7714 def update(ui, repo, node=None, **opts):
7715 def update(ui, repo, node=None, **opts):
7715 """update working directory (or switch revisions)
7716 """update working directory (or switch revisions)
7716
7717
7717 Update the repository's working directory to the specified
7718 Update the repository's working directory to the specified
7718 changeset. If no changeset is specified, update to the tip of the
7719 changeset. If no changeset is specified, update to the tip of the
7719 current named branch and move the active bookmark (see :hg:`help
7720 current named branch and move the active bookmark (see :hg:`help
7720 bookmarks`).
7721 bookmarks`).
7721
7722
7722 Update sets the working directory's parent revision to the specified
7723 Update sets the working directory's parent revision to the specified
7723 changeset (see :hg:`help parents`).
7724 changeset (see :hg:`help parents`).
7724
7725
7725 If the changeset is not a descendant or ancestor of the working
7726 If the changeset is not a descendant or ancestor of the working
7726 directory's parent and there are uncommitted changes, the update is
7727 directory's parent and there are uncommitted changes, the update is
7727 aborted. With the -c/--check option, the working directory is checked
7728 aborted. With the -c/--check option, the working directory is checked
7728 for uncommitted changes; if none are found, the working directory is
7729 for uncommitted changes; if none are found, the working directory is
7729 updated to the specified changeset.
7730 updated to the specified changeset.
7730
7731
7731 .. container:: verbose
7732 .. container:: verbose
7732
7733
7733 The -C/--clean, -c/--check, and -m/--merge options control what
7734 The -C/--clean, -c/--check, and -m/--merge options control what
7734 happens if the working directory contains uncommitted changes.
7735 happens if the working directory contains uncommitted changes.
7735 At most of one of them can be specified.
7736 At most of one of them can be specified.
7736
7737
7737 1. If no option is specified, and if
7738 1. If no option is specified, and if
7738 the requested changeset is an ancestor or descendant of
7739 the requested changeset is an ancestor or descendant of
7739 the working directory's parent, the uncommitted changes
7740 the working directory's parent, the uncommitted changes
7740 are merged into the requested changeset and the merged
7741 are merged into the requested changeset and the merged
7741 result is left uncommitted. If the requested changeset is
7742 result is left uncommitted. If the requested changeset is
7742 not an ancestor or descendant (that is, it is on another
7743 not an ancestor or descendant (that is, it is on another
7743 branch), the update is aborted and the uncommitted changes
7744 branch), the update is aborted and the uncommitted changes
7744 are preserved.
7745 are preserved.
7745
7746
7746 2. With the -m/--merge option, the update is allowed even if the
7747 2. With the -m/--merge option, the update is allowed even if the
7747 requested changeset is not an ancestor or descendant of
7748 requested changeset is not an ancestor or descendant of
7748 the working directory's parent.
7749 the working directory's parent.
7749
7750
7750 3. With the -c/--check option, the update is aborted and the
7751 3. With the -c/--check option, the update is aborted and the
7751 uncommitted changes are preserved.
7752 uncommitted changes are preserved.
7752
7753
7753 4. With the -C/--clean option, uncommitted changes are discarded and
7754 4. With the -C/--clean option, uncommitted changes are discarded and
7754 the working directory is updated to the requested changeset.
7755 the working directory is updated to the requested changeset.
7755
7756
7756 To cancel an uncommitted merge (and lose your changes), use
7757 To cancel an uncommitted merge (and lose your changes), use
7757 :hg:`merge --abort`.
7758 :hg:`merge --abort`.
7758
7759
7759 Use null as the changeset to remove the working directory (like
7760 Use null as the changeset to remove the working directory (like
7760 :hg:`clone -U`).
7761 :hg:`clone -U`).
7761
7762
7762 If you want to revert just one file to an older revision, use
7763 If you want to revert just one file to an older revision, use
7763 :hg:`revert [-r REV] NAME`.
7764 :hg:`revert [-r REV] NAME`.
7764
7765
7765 See :hg:`help dates` for a list of formats valid for -d/--date.
7766 See :hg:`help dates` for a list of formats valid for -d/--date.
7766
7767
7767 Returns 0 on success, 1 if there are unresolved files.
7768 Returns 0 on success, 1 if there are unresolved files.
7768 """
7769 """
7769 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7770 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7770 rev = opts.get('rev')
7771 rev = opts.get('rev')
7771 date = opts.get('date')
7772 date = opts.get('date')
7772 clean = opts.get('clean')
7773 clean = opts.get('clean')
7773 check = opts.get('check')
7774 check = opts.get('check')
7774 merge = opts.get('merge')
7775 merge = opts.get('merge')
7775 if rev and node:
7776 if rev and node:
7776 raise error.InputError(_(b"please specify just one revision"))
7777 raise error.InputError(_(b"please specify just one revision"))
7777
7778
7778 if ui.configbool(b'commands', b'update.requiredest'):
7779 if ui.configbool(b'commands', b'update.requiredest'):
7779 if not node and not rev and not date:
7780 if not node and not rev and not date:
7780 raise error.InputError(
7781 raise error.InputError(
7781 _(b'you must specify a destination'),
7782 _(b'you must specify a destination'),
7782 hint=_(b'for example: hg update ".::"'),
7783 hint=_(b'for example: hg update ".::"'),
7783 )
7784 )
7784
7785
7785 if rev is None or rev == b'':
7786 if rev is None or rev == b'':
7786 rev = node
7787 rev = node
7787
7788
7788 if date and rev is not None:
7789 if date and rev is not None:
7789 raise error.InputError(_(b"you can't specify a revision and a date"))
7790 raise error.InputError(_(b"you can't specify a revision and a date"))
7790
7791
7791 updatecheck = None
7792 updatecheck = None
7792 if check:
7793 if check:
7793 updatecheck = b'abort'
7794 updatecheck = b'abort'
7794 elif merge:
7795 elif merge:
7795 updatecheck = b'none'
7796 updatecheck = b'none'
7796
7797
7797 with repo.wlock():
7798 with repo.wlock():
7798 cmdutil.clearunfinished(repo)
7799 cmdutil.clearunfinished(repo)
7799 if date:
7800 if date:
7800 rev = cmdutil.finddate(ui, repo, date)
7801 rev = cmdutil.finddate(ui, repo, date)
7801
7802
7802 # if we defined a bookmark, we have to remember the original name
7803 # if we defined a bookmark, we have to remember the original name
7803 brev = rev
7804 brev = rev
7804 if rev:
7805 if rev:
7805 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7806 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7806 ctx = scmutil.revsingle(repo, rev, default=None)
7807 ctx = scmutil.revsingle(repo, rev, default=None)
7807 rev = ctx.rev()
7808 rev = ctx.rev()
7808 hidden = ctx.hidden()
7809 hidden = ctx.hidden()
7809 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7810 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7810 with ui.configoverride(overrides, b'update'):
7811 with ui.configoverride(overrides, b'update'):
7811 ret = hg.updatetotally(
7812 ret = hg.updatetotally(
7812 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7813 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7813 )
7814 )
7814 if hidden:
7815 if hidden:
7815 ctxstr = ctx.hex()[:12]
7816 ctxstr = ctx.hex()[:12]
7816 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7817 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7817
7818
7818 if ctx.obsolete():
7819 if ctx.obsolete():
7819 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7820 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7820 ui.warn(b"(%s)\n" % obsfatemsg)
7821 ui.warn(b"(%s)\n" % obsfatemsg)
7821 return ret
7822 return ret
7822
7823
7823
7824
7824 @command(
7825 @command(
7825 b'verify',
7826 b'verify',
7826 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7827 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7827 helpcategory=command.CATEGORY_MAINTENANCE,
7828 helpcategory=command.CATEGORY_MAINTENANCE,
7828 )
7829 )
7829 def verify(ui, repo, **opts):
7830 def verify(ui, repo, **opts):
7830 """verify the integrity of the repository
7831 """verify the integrity of the repository
7831
7832
7832 Verify the integrity of the current repository.
7833 Verify the integrity of the current repository.
7833
7834
7834 This will perform an extensive check of the repository's
7835 This will perform an extensive check of the repository's
7835 integrity, validating the hashes and checksums of each entry in
7836 integrity, validating the hashes and checksums of each entry in
7836 the changelog, manifest, and tracked files, as well as the
7837 the changelog, manifest, and tracked files, as well as the
7837 integrity of their crosslinks and indices.
7838 integrity of their crosslinks and indices.
7838
7839
7839 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7840 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7840 for more information about recovery from corruption of the
7841 for more information about recovery from corruption of the
7841 repository.
7842 repository.
7842
7843
7843 Returns 0 on success, 1 if errors are encountered.
7844 Returns 0 on success, 1 if errors are encountered.
7844 """
7845 """
7845 opts = pycompat.byteskwargs(opts)
7846 opts = pycompat.byteskwargs(opts)
7846
7847
7847 level = None
7848 level = None
7848 if opts[b'full']:
7849 if opts[b'full']:
7849 level = verifymod.VERIFY_FULL
7850 level = verifymod.VERIFY_FULL
7850 return hg.verify(repo, level)
7851 return hg.verify(repo, level)
7851
7852
7852
7853
7853 @command(
7854 @command(
7854 b'version',
7855 b'version',
7855 [] + formatteropts,
7856 [] + formatteropts,
7856 helpcategory=command.CATEGORY_HELP,
7857 helpcategory=command.CATEGORY_HELP,
7857 norepo=True,
7858 norepo=True,
7858 intents={INTENT_READONLY},
7859 intents={INTENT_READONLY},
7859 )
7860 )
7860 def version_(ui, **opts):
7861 def version_(ui, **opts):
7861 """output version and copyright information
7862 """output version and copyright information
7862
7863
7863 .. container:: verbose
7864 .. container:: verbose
7864
7865
7865 Template:
7866 Template:
7866
7867
7867 The following keywords are supported. See also :hg:`help templates`.
7868 The following keywords are supported. See also :hg:`help templates`.
7868
7869
7869 :extensions: List of extensions.
7870 :extensions: List of extensions.
7870 :ver: String. Version number.
7871 :ver: String. Version number.
7871
7872
7872 And each entry of ``{extensions}`` provides the following sub-keywords
7873 And each entry of ``{extensions}`` provides the following sub-keywords
7873 in addition to ``{ver}``.
7874 in addition to ``{ver}``.
7874
7875
7875 :bundled: Boolean. True if included in the release.
7876 :bundled: Boolean. True if included in the release.
7876 :name: String. Extension name.
7877 :name: String. Extension name.
7877 """
7878 """
7878 opts = pycompat.byteskwargs(opts)
7879 opts = pycompat.byteskwargs(opts)
7879 if ui.verbose:
7880 if ui.verbose:
7880 ui.pager(b'version')
7881 ui.pager(b'version')
7881 fm = ui.formatter(b"version", opts)
7882 fm = ui.formatter(b"version", opts)
7882 fm.startitem()
7883 fm.startitem()
7883 fm.write(
7884 fm.write(
7884 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7885 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7885 )
7886 )
7886 license = _(
7887 license = _(
7887 b"(see https://mercurial-scm.org for more information)\n"
7888 b"(see https://mercurial-scm.org for more information)\n"
7888 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7889 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7889 b"This is free software; see the source for copying conditions. "
7890 b"This is free software; see the source for copying conditions. "
7890 b"There is NO\nwarranty; "
7891 b"There is NO\nwarranty; "
7891 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7892 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7892 )
7893 )
7893 if not ui.quiet:
7894 if not ui.quiet:
7894 fm.plain(license)
7895 fm.plain(license)
7895
7896
7896 if ui.verbose:
7897 if ui.verbose:
7897 fm.plain(_(b"\nEnabled extensions:\n\n"))
7898 fm.plain(_(b"\nEnabled extensions:\n\n"))
7898 # format names and versions into columns
7899 # format names and versions into columns
7899 names = []
7900 names = []
7900 vers = []
7901 vers = []
7901 isinternals = []
7902 isinternals = []
7902 for name, module in sorted(extensions.extensions()):
7903 for name, module in sorted(extensions.extensions()):
7903 names.append(name)
7904 names.append(name)
7904 vers.append(extensions.moduleversion(module) or None)
7905 vers.append(extensions.moduleversion(module) or None)
7905 isinternals.append(extensions.ismoduleinternal(module))
7906 isinternals.append(extensions.ismoduleinternal(module))
7906 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7907 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7907 if names:
7908 if names:
7908 namefmt = b" %%-%ds " % max(len(n) for n in names)
7909 namefmt = b" %%-%ds " % max(len(n) for n in names)
7909 places = [_(b"external"), _(b"internal")]
7910 places = [_(b"external"), _(b"internal")]
7910 for n, v, p in zip(names, vers, isinternals):
7911 for n, v, p in zip(names, vers, isinternals):
7911 fn.startitem()
7912 fn.startitem()
7912 fn.condwrite(ui.verbose, b"name", namefmt, n)
7913 fn.condwrite(ui.verbose, b"name", namefmt, n)
7913 if ui.verbose:
7914 if ui.verbose:
7914 fn.plain(b"%s " % places[p])
7915 fn.plain(b"%s " % places[p])
7915 fn.data(bundled=p)
7916 fn.data(bundled=p)
7916 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7917 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7917 if ui.verbose:
7918 if ui.verbose:
7918 fn.plain(b"\n")
7919 fn.plain(b"\n")
7919 fn.end()
7920 fn.end()
7920 fm.end()
7921 fm.end()
7921
7922
7922
7923
7923 def loadcmdtable(ui, name, cmdtable):
7924 def loadcmdtable(ui, name, cmdtable):
7924 """Load command functions from specified cmdtable"""
7925 """Load command functions from specified cmdtable"""
7925 overrides = [cmd for cmd in cmdtable if cmd in table]
7926 overrides = [cmd for cmd in cmdtable if cmd in table]
7926 if overrides:
7927 if overrides:
7927 ui.warn(
7928 ui.warn(
7928 _(b"extension '%s' overrides commands: %s\n")
7929 _(b"extension '%s' overrides commands: %s\n")
7929 % (name, b" ".join(overrides))
7930 % (name, b" ".join(overrides))
7930 )
7931 )
7931 table.update(cmdtable)
7932 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now