##// END OF EJS Templates
pull: flush stdin after the `pull from` message...
marmoute -
r46635:b86608e9 default
parent child Browse files
Show More
@@ -1,7735 +1,7736 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import 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 )
77 )
78
78
79 table = {}
79 table = {}
80 table.update(debugcommandsmod.command._table)
80 table.update(debugcommandsmod.command._table)
81
81
82 command = registrar.command(table)
82 command = registrar.command(table)
83 INTENT_READONLY = registrar.INTENT_READONLY
83 INTENT_READONLY = registrar.INTENT_READONLY
84
84
85 # common command options
85 # common command options
86
86
87 globalopts = [
87 globalopts = [
88 (
88 (
89 b'R',
89 b'R',
90 b'repository',
90 b'repository',
91 b'',
91 b'',
92 _(b'repository root directory or name of overlay bundle file'),
92 _(b'repository root directory or name of overlay bundle file'),
93 _(b'REPO'),
93 _(b'REPO'),
94 ),
94 ),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
96 (
96 (
97 b'y',
97 b'y',
98 b'noninteractive',
98 b'noninteractive',
99 None,
99 None,
100 _(
100 _(
101 b'do not prompt, automatically pick the first choice for all prompts'
101 b'do not prompt, automatically pick the first choice for all prompts'
102 ),
102 ),
103 ),
103 ),
104 (b'q', b'quiet', None, _(b'suppress output')),
104 (b'q', b'quiet', None, _(b'suppress output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
106 (
106 (
107 b'',
107 b'',
108 b'color',
108 b'color',
109 b'',
109 b'',
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
111 # and should not be translated
111 # and should not be translated
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
113 _(b'TYPE'),
113 _(b'TYPE'),
114 ),
114 ),
115 (
115 (
116 b'',
116 b'',
117 b'config',
117 b'config',
118 [],
118 [],
119 _(b'set/override config option (use \'section.name=value\')'),
119 _(b'set/override config option (use \'section.name=value\')'),
120 _(b'CONFIG'),
120 _(b'CONFIG'),
121 ),
121 ),
122 (b'', b'debug', None, _(b'enable debugging output')),
122 (b'', b'debug', None, _(b'enable debugging output')),
123 (b'', b'debugger', None, _(b'start debugger')),
123 (b'', b'debugger', None, _(b'start debugger')),
124 (
124 (
125 b'',
125 b'',
126 b'encoding',
126 b'encoding',
127 encoding.encoding,
127 encoding.encoding,
128 _(b'set the charset encoding'),
128 _(b'set the charset encoding'),
129 _(b'ENCODE'),
129 _(b'ENCODE'),
130 ),
130 ),
131 (
131 (
132 b'',
132 b'',
133 b'encodingmode',
133 b'encodingmode',
134 encoding.encodingmode,
134 encoding.encodingmode,
135 _(b'set the charset encoding mode'),
135 _(b'set the charset encoding mode'),
136 _(b'MODE'),
136 _(b'MODE'),
137 ),
137 ),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
139 (b'', b'time', None, _(b'time how long the command takes')),
139 (b'', b'time', None, _(b'time how long the command takes')),
140 (b'', b'profile', None, _(b'print command execution profile')),
140 (b'', b'profile', None, _(b'print command execution profile')),
141 (b'', b'version', None, _(b'output version information and exit')),
141 (b'', b'version', None, _(b'output version information and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
144 (
144 (
145 b'',
145 b'',
146 b'pager',
146 b'pager',
147 b'auto',
147 b'auto',
148 _(b"when to paginate (boolean, always, auto, or never)"),
148 _(b"when to paginate (boolean, always, auto, or never)"),
149 _(b'TYPE'),
149 _(b'TYPE'),
150 ),
150 ),
151 ]
151 ]
152
152
153 dryrunopts = cmdutil.dryrunopts
153 dryrunopts = cmdutil.dryrunopts
154 remoteopts = cmdutil.remoteopts
154 remoteopts = cmdutil.remoteopts
155 walkopts = cmdutil.walkopts
155 walkopts = cmdutil.walkopts
156 commitopts = cmdutil.commitopts
156 commitopts = cmdutil.commitopts
157 commitopts2 = cmdutil.commitopts2
157 commitopts2 = cmdutil.commitopts2
158 commitopts3 = cmdutil.commitopts3
158 commitopts3 = cmdutil.commitopts3
159 formatteropts = cmdutil.formatteropts
159 formatteropts = cmdutil.formatteropts
160 templateopts = cmdutil.templateopts
160 templateopts = cmdutil.templateopts
161 logopts = cmdutil.logopts
161 logopts = cmdutil.logopts
162 diffopts = cmdutil.diffopts
162 diffopts = cmdutil.diffopts
163 diffwsopts = cmdutil.diffwsopts
163 diffwsopts = cmdutil.diffwsopts
164 diffopts2 = cmdutil.diffopts2
164 diffopts2 = cmdutil.diffopts2
165 mergetoolopts = cmdutil.mergetoolopts
165 mergetoolopts = cmdutil.mergetoolopts
166 similarityopts = cmdutil.similarityopts
166 similarityopts = cmdutil.similarityopts
167 subrepoopts = cmdutil.subrepoopts
167 subrepoopts = cmdutil.subrepoopts
168 debugrevlogopts = cmdutil.debugrevlogopts
168 debugrevlogopts = cmdutil.debugrevlogopts
169
169
170 # Commands start here, listed alphabetically
170 # Commands start here, listed alphabetically
171
171
172
172
173 @command(
173 @command(
174 b'abort',
174 b'abort',
175 dryrunopts,
175 dryrunopts,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
177 helpbasic=True,
177 helpbasic=True,
178 )
178 )
179 def abort(ui, repo, **opts):
179 def abort(ui, repo, **opts):
180 """abort an unfinished operation (EXPERIMENTAL)
180 """abort an unfinished operation (EXPERIMENTAL)
181
181
182 Aborts a multistep operation like graft, histedit, rebase, merge,
182 Aborts a multistep operation like graft, histedit, rebase, merge,
183 and unshelve if they are in an unfinished state.
183 and unshelve if they are in an unfinished state.
184
184
185 use --dry-run/-n to dry run the command.
185 use --dry-run/-n to dry run the command.
186 """
186 """
187 dryrun = opts.get('dry_run')
187 dryrun = opts.get('dry_run')
188 abortstate = cmdutil.getunfinishedstate(repo)
188 abortstate = cmdutil.getunfinishedstate(repo)
189 if not abortstate:
189 if not abortstate:
190 raise error.StateError(_(b'no operation in progress'))
190 raise error.StateError(_(b'no operation in progress'))
191 if not abortstate.abortfunc:
191 if not abortstate.abortfunc:
192 raise error.InputError(
192 raise error.InputError(
193 (
193 (
194 _(b"%s in progress but does not support 'hg abort'")
194 _(b"%s in progress but does not support 'hg abort'")
195 % (abortstate._opname)
195 % (abortstate._opname)
196 ),
196 ),
197 hint=abortstate.hint(),
197 hint=abortstate.hint(),
198 )
198 )
199 if dryrun:
199 if dryrun:
200 ui.status(
200 ui.status(
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
202 )
202 )
203 return
203 return
204 return abortstate.abortfunc(ui, repo)
204 return abortstate.abortfunc(ui, repo)
205
205
206
206
207 @command(
207 @command(
208 b'add',
208 b'add',
209 walkopts + subrepoopts + dryrunopts,
209 walkopts + subrepoopts + dryrunopts,
210 _(b'[OPTION]... [FILE]...'),
210 _(b'[OPTION]... [FILE]...'),
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
212 helpbasic=True,
212 helpbasic=True,
213 inferrepo=True,
213 inferrepo=True,
214 )
214 )
215 def add(ui, repo, *pats, **opts):
215 def add(ui, repo, *pats, **opts):
216 """add the specified files on the next commit
216 """add the specified files on the next commit
217
217
218 Schedule files to be version controlled and added to the
218 Schedule files to be version controlled and added to the
219 repository.
219 repository.
220
220
221 The files will be added to the repository at the next commit. To
221 The files will be added to the repository at the next commit. To
222 undo an add before that, see :hg:`forget`.
222 undo an add before that, see :hg:`forget`.
223
223
224 If no names are given, add all files to the repository (except
224 If no names are given, add all files to the repository (except
225 files matching ``.hgignore``).
225 files matching ``.hgignore``).
226
226
227 .. container:: verbose
227 .. container:: verbose
228
228
229 Examples:
229 Examples:
230
230
231 - New (unknown) files are added
231 - New (unknown) files are added
232 automatically by :hg:`add`::
232 automatically by :hg:`add`::
233
233
234 $ ls
234 $ ls
235 foo.c
235 foo.c
236 $ hg status
236 $ hg status
237 ? foo.c
237 ? foo.c
238 $ hg add
238 $ hg add
239 adding foo.c
239 adding foo.c
240 $ hg status
240 $ hg status
241 A foo.c
241 A foo.c
242
242
243 - Specific files to be added can be specified::
243 - Specific files to be added can be specified::
244
244
245 $ ls
245 $ ls
246 bar.c foo.c
246 bar.c foo.c
247 $ hg status
247 $ hg status
248 ? bar.c
248 ? bar.c
249 ? foo.c
249 ? foo.c
250 $ hg add bar.c
250 $ hg add bar.c
251 $ hg status
251 $ hg status
252 A bar.c
252 A bar.c
253 ? foo.c
253 ? foo.c
254
254
255 Returns 0 if all files are successfully added.
255 Returns 0 if all files are successfully added.
256 """
256 """
257
257
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
261 return rejected and 1 or 0
261 return rejected and 1 or 0
262
262
263
263
264 @command(
264 @command(
265 b'addremove',
265 b'addremove',
266 similarityopts + subrepoopts + walkopts + dryrunopts,
266 similarityopts + subrepoopts + walkopts + dryrunopts,
267 _(b'[OPTION]... [FILE]...'),
267 _(b'[OPTION]... [FILE]...'),
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
269 inferrepo=True,
269 inferrepo=True,
270 )
270 )
271 def addremove(ui, repo, *pats, **opts):
271 def addremove(ui, repo, *pats, **opts):
272 """add all new files, delete all missing files
272 """add all new files, delete all missing files
273
273
274 Add all new files and remove all missing files from the
274 Add all new files and remove all missing files from the
275 repository.
275 repository.
276
276
277 Unless names are given, new files are ignored if they match any of
277 Unless names are given, new files are ignored if they match any of
278 the patterns in ``.hgignore``. As with add, these changes take
278 the patterns in ``.hgignore``. As with add, these changes take
279 effect at the next commit.
279 effect at the next commit.
280
280
281 Use the -s/--similarity option to detect renamed files. This
281 Use the -s/--similarity option to detect renamed files. This
282 option takes a percentage between 0 (disabled) and 100 (files must
282 option takes a percentage between 0 (disabled) and 100 (files must
283 be identical) as its parameter. With a parameter greater than 0,
283 be identical) as its parameter. With a parameter greater than 0,
284 this compares every removed file with every added file and records
284 this compares every removed file with every added file and records
285 those similar enough as renames. Detecting renamed files this way
285 those similar enough as renames. Detecting renamed files this way
286 can be expensive. After using this option, :hg:`status -C` can be
286 can be expensive. After using this option, :hg:`status -C` can be
287 used to check which files were identified as moved or renamed. If
287 used to check which files were identified as moved or renamed. If
288 not specified, -s/--similarity defaults to 100 and only renames of
288 not specified, -s/--similarity defaults to 100 and only renames of
289 identical files are detected.
289 identical files are detected.
290
290
291 .. container:: verbose
291 .. container:: verbose
292
292
293 Examples:
293 Examples:
294
294
295 - A number of files (bar.c and foo.c) are new,
295 - A number of files (bar.c and foo.c) are new,
296 while foobar.c has been removed (without using :hg:`remove`)
296 while foobar.c has been removed (without using :hg:`remove`)
297 from the repository::
297 from the repository::
298
298
299 $ ls
299 $ ls
300 bar.c foo.c
300 bar.c foo.c
301 $ hg status
301 $ hg status
302 ! foobar.c
302 ! foobar.c
303 ? bar.c
303 ? bar.c
304 ? foo.c
304 ? foo.c
305 $ hg addremove
305 $ hg addremove
306 adding bar.c
306 adding bar.c
307 adding foo.c
307 adding foo.c
308 removing foobar.c
308 removing foobar.c
309 $ hg status
309 $ hg status
310 A bar.c
310 A bar.c
311 A foo.c
311 A foo.c
312 R foobar.c
312 R foobar.c
313
313
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 Afterwards, it was edited slightly::
315 Afterwards, it was edited slightly::
316
316
317 $ ls
317 $ ls
318 foo.c
318 foo.c
319 $ hg status
319 $ hg status
320 ! foobar.c
320 ! foobar.c
321 ? foo.c
321 ? foo.c
322 $ hg addremove --similarity 90
322 $ hg addremove --similarity 90
323 removing foobar.c
323 removing foobar.c
324 adding foo.c
324 adding foo.c
325 recording removal of foobar.c as rename to foo.c (94% similar)
325 recording removal of foobar.c as rename to foo.c (94% similar)
326 $ hg status -C
326 $ hg status -C
327 A foo.c
327 A foo.c
328 foobar.c
328 foobar.c
329 R foobar.c
329 R foobar.c
330
330
331 Returns 0 if all files are successfully added.
331 Returns 0 if all files are successfully added.
332 """
332 """
333 opts = pycompat.byteskwargs(opts)
333 opts = pycompat.byteskwargs(opts)
334 if not opts.get(b'similarity'):
334 if not opts.get(b'similarity'):
335 opts[b'similarity'] = b'100'
335 opts[b'similarity'] = b'100'
336 matcher = scmutil.match(repo[None], pats, opts)
336 matcher = scmutil.match(repo[None], pats, opts)
337 relative = scmutil.anypats(pats, opts)
337 relative = scmutil.anypats(pats, opts)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
340
340
341
341
342 @command(
342 @command(
343 b'annotate|blame',
343 b'annotate|blame',
344 [
344 [
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
346 (
346 (
347 b'',
347 b'',
348 b'follow',
348 b'follow',
349 None,
349 None,
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
351 ),
351 ),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
353 (b'a', b'text', None, _(b'treat all files as text')),
353 (b'a', b'text', None, _(b'treat all files as text')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
355 (b'f', b'file', None, _(b'list the filename')),
355 (b'f', b'file', None, _(b'list the filename')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
359 (
359 (
360 b'l',
360 b'l',
361 b'line-number',
361 b'line-number',
362 None,
362 None,
363 _(b'show line number at the first appearance'),
363 _(b'show line number at the first appearance'),
364 ),
364 ),
365 (
365 (
366 b'',
366 b'',
367 b'skip',
367 b'skip',
368 [],
368 [],
369 _(b'revset to not display (EXPERIMENTAL)'),
369 _(b'revset to not display (EXPERIMENTAL)'),
370 _(b'REV'),
370 _(b'REV'),
371 ),
371 ),
372 ]
372 ]
373 + diffwsopts
373 + diffwsopts
374 + walkopts
374 + walkopts
375 + formatteropts,
375 + formatteropts,
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
378 helpbasic=True,
378 helpbasic=True,
379 inferrepo=True,
379 inferrepo=True,
380 )
380 )
381 def annotate(ui, repo, *pats, **opts):
381 def annotate(ui, repo, *pats, **opts):
382 """show changeset information by line for each file
382 """show changeset information by line for each file
383
383
384 List changes in files, showing the revision id responsible for
384 List changes in files, showing the revision id responsible for
385 each line.
385 each line.
386
386
387 This command is useful for discovering when a change was made and
387 This command is useful for discovering when a change was made and
388 by whom.
388 by whom.
389
389
390 If you include --file, --user, or --date, the revision number is
390 If you include --file, --user, or --date, the revision number is
391 suppressed unless you also include --number.
391 suppressed unless you also include --number.
392
392
393 Without the -a/--text option, annotate will avoid processing files
393 Without the -a/--text option, annotate will avoid processing files
394 it detects as binary. With -a, annotate will annotate the file
394 it detects as binary. With -a, annotate will annotate the file
395 anyway, although the results will probably be neither useful
395 anyway, although the results will probably be neither useful
396 nor desirable.
396 nor desirable.
397
397
398 .. container:: verbose
398 .. container:: verbose
399
399
400 Template:
400 Template:
401
401
402 The following keywords are supported in addition to the common template
402 The following keywords are supported in addition to the common template
403 keywords and functions. See also :hg:`help templates`.
403 keywords and functions. See also :hg:`help templates`.
404
404
405 :lines: List of lines with annotation data.
405 :lines: List of lines with annotation data.
406 :path: String. Repository-absolute path of the specified file.
406 :path: String. Repository-absolute path of the specified file.
407
407
408 And each entry of ``{lines}`` provides the following sub-keywords in
408 And each entry of ``{lines}`` provides the following sub-keywords in
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
410
410
411 :line: String. Line content.
411 :line: String. Line content.
412 :lineno: Integer. Line number at that revision.
412 :lineno: Integer. Line number at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
414
414
415 See :hg:`help templates.operators` for the list expansion syntax.
415 See :hg:`help templates.operators` for the list expansion syntax.
416
416
417 Returns 0 on success.
417 Returns 0 on success.
418 """
418 """
419 opts = pycompat.byteskwargs(opts)
419 opts = pycompat.byteskwargs(opts)
420 if not pats:
420 if not pats:
421 raise error.InputError(
421 raise error.InputError(
422 _(b'at least one filename or pattern is required')
422 _(b'at least one filename or pattern is required')
423 )
423 )
424
424
425 if opts.get(b'follow'):
425 if opts.get(b'follow'):
426 # --follow is deprecated and now just an alias for -f/--file
426 # --follow is deprecated and now just an alias for -f/--file
427 # to mimic the behavior of Mercurial before version 1.5
427 # to mimic the behavior of Mercurial before version 1.5
428 opts[b'file'] = True
428 opts[b'file'] = True
429
429
430 if (
430 if (
431 not opts.get(b'user')
431 not opts.get(b'user')
432 and not opts.get(b'changeset')
432 and not opts.get(b'changeset')
433 and not opts.get(b'date')
433 and not opts.get(b'date')
434 and not opts.get(b'file')
434 and not opts.get(b'file')
435 ):
435 ):
436 opts[b'number'] = True
436 opts[b'number'] = True
437
437
438 linenumber = opts.get(b'line_number') is not None
438 linenumber = opts.get(b'line_number') is not None
439 if (
439 if (
440 linenumber
440 linenumber
441 and (not opts.get(b'changeset'))
441 and (not opts.get(b'changeset'))
442 and (not opts.get(b'number'))
442 and (not opts.get(b'number'))
443 ):
443 ):
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
445
445
446 rev = opts.get(b'rev')
446 rev = opts.get(b'rev')
447 if rev:
447 if rev:
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
449 ctx = scmutil.revsingle(repo, rev)
449 ctx = scmutil.revsingle(repo, rev)
450
450
451 ui.pager(b'annotate')
451 ui.pager(b'annotate')
452 rootfm = ui.formatter(b'annotate', opts)
452 rootfm = ui.formatter(b'annotate', opts)
453 if ui.debugflag:
453 if ui.debugflag:
454 shorthex = pycompat.identity
454 shorthex = pycompat.identity
455 else:
455 else:
456
456
457 def shorthex(h):
457 def shorthex(h):
458 return h[:12]
458 return h[:12]
459
459
460 if ui.quiet:
460 if ui.quiet:
461 datefunc = dateutil.shortdate
461 datefunc = dateutil.shortdate
462 else:
462 else:
463 datefunc = dateutil.datestr
463 datefunc = dateutil.datestr
464 if ctx.rev() is None:
464 if ctx.rev() is None:
465 if opts.get(b'changeset'):
465 if opts.get(b'changeset'):
466 # omit "+" suffix which is appended to node hex
466 # omit "+" suffix which is appended to node hex
467 def formatrev(rev):
467 def formatrev(rev):
468 if rev == wdirrev:
468 if rev == wdirrev:
469 return b'%d' % ctx.p1().rev()
469 return b'%d' % ctx.p1().rev()
470 else:
470 else:
471 return b'%d' % rev
471 return b'%d' % rev
472
472
473 else:
473 else:
474
474
475 def formatrev(rev):
475 def formatrev(rev):
476 if rev == wdirrev:
476 if rev == wdirrev:
477 return b'%d+' % ctx.p1().rev()
477 return b'%d+' % ctx.p1().rev()
478 else:
478 else:
479 return b'%d ' % rev
479 return b'%d ' % rev
480
480
481 def formathex(h):
481 def formathex(h):
482 if h == wdirhex:
482 if h == wdirhex:
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
484 else:
484 else:
485 return b'%s ' % shorthex(h)
485 return b'%s ' % shorthex(h)
486
486
487 else:
487 else:
488 formatrev = b'%d'.__mod__
488 formatrev = b'%d'.__mod__
489 formathex = shorthex
489 formathex = shorthex
490
490
491 opmap = [
491 opmap = [
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
498 ]
498 ]
499 opnamemap = {
499 opnamemap = {
500 b'rev': b'number',
500 b'rev': b'number',
501 b'node': b'changeset',
501 b'node': b'changeset',
502 b'path': b'file',
502 b'path': b'file',
503 b'lineno': b'line_number',
503 b'lineno': b'line_number',
504 }
504 }
505
505
506 if rootfm.isplain():
506 if rootfm.isplain():
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return lambda x: fmt(get(x))
509 return lambda x: fmt(get(x))
510
510
511 else:
511 else:
512
512
513 def makefunc(get, fmt):
513 def makefunc(get, fmt):
514 return get
514 return get
515
515
516 datahint = rootfm.datahint()
516 datahint = rootfm.datahint()
517 funcmap = [
517 funcmap = [
518 (makefunc(get, fmt), sep)
518 (makefunc(get, fmt), sep)
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 ]
521 ]
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
523 fields = b' '.join(
523 fields = b' '.join(
524 fn
524 fn
525 for fn, sep, get, fmt in opmap
525 for fn, sep, get, fmt in opmap
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 )
527 )
528
528
529 def bad(x, y):
529 def bad(x, y):
530 raise error.Abort(b"%s: %s" % (x, y))
530 raise error.Abort(b"%s: %s" % (x, y))
531
531
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
533
533
534 follow = not opts.get(b'no_follow')
534 follow = not opts.get(b'no_follow')
535 diffopts = patch.difffeatureopts(
535 diffopts = patch.difffeatureopts(
536 ui, opts, section=b'annotate', whitespace=True
536 ui, opts, section=b'annotate', whitespace=True
537 )
537 )
538 skiprevs = opts.get(b'skip')
538 skiprevs = opts.get(b'skip')
539 if skiprevs:
539 if skiprevs:
540 skiprevs = scmutil.revrange(repo, skiprevs)
540 skiprevs = scmutil.revrange(repo, skiprevs)
541
541
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
543 for abs in ctx.walk(m):
543 for abs in ctx.walk(m):
544 fctx = ctx[abs]
544 fctx = ctx[abs]
545 rootfm.startitem()
545 rootfm.startitem()
546 rootfm.data(path=abs)
546 rootfm.data(path=abs)
547 if not opts.get(b'text') and fctx.isbinary():
547 if not opts.get(b'text') and fctx.isbinary():
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
549 continue
549 continue
550
550
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
552 lines = fctx.annotate(
552 lines = fctx.annotate(
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
554 )
554 )
555 if not lines:
555 if not lines:
556 fm.end()
556 fm.end()
557 continue
557 continue
558 formats = []
558 formats = []
559 pieces = []
559 pieces = []
560
560
561 for f, sep in funcmap:
561 for f, sep in funcmap:
562 l = [f(n) for n in lines]
562 l = [f(n) for n in lines]
563 if fm.isplain():
563 if fm.isplain():
564 sizes = [encoding.colwidth(x) for x in l]
564 sizes = [encoding.colwidth(x) for x in l]
565 ml = max(sizes)
565 ml = max(sizes)
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
567 else:
567 else:
568 formats.append([b'%s'] * len(l))
568 formats.append([b'%s'] * len(l))
569 pieces.append(l)
569 pieces.append(l)
570
570
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
572 fm.startitem()
572 fm.startitem()
573 fm.context(fctx=n.fctx)
573 fm.context(fctx=n.fctx)
574 fm.write(fields, b"".join(f), *p)
574 fm.write(fields, b"".join(f), *p)
575 if n.skip:
575 if n.skip:
576 fmt = b"* %s"
576 fmt = b"* %s"
577 else:
577 else:
578 fmt = b": %s"
578 fmt = b": %s"
579 fm.write(b'line', fmt, n.text)
579 fm.write(b'line', fmt, n.text)
580
580
581 if not lines[-1].text.endswith(b'\n'):
581 if not lines[-1].text.endswith(b'\n'):
582 fm.plain(b'\n')
582 fm.plain(b'\n')
583 fm.end()
583 fm.end()
584
584
585 rootfm.end()
585 rootfm.end()
586
586
587
587
588 @command(
588 @command(
589 b'archive',
589 b'archive',
590 [
590 [
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
592 (
592 (
593 b'p',
593 b'p',
594 b'prefix',
594 b'prefix',
595 b'',
595 b'',
596 _(b'directory prefix for files in archive'),
596 _(b'directory prefix for files in archive'),
597 _(b'PREFIX'),
597 _(b'PREFIX'),
598 ),
598 ),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
601 ]
601 ]
602 + subrepoopts
602 + subrepoopts
603 + walkopts,
603 + walkopts,
604 _(b'[OPTION]... DEST'),
604 _(b'[OPTION]... DEST'),
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
606 )
606 )
607 def archive(ui, repo, dest, **opts):
607 def archive(ui, repo, dest, **opts):
608 """create an unversioned archive of a repository revision
608 """create an unversioned archive of a repository revision
609
609
610 By default, the revision used is the parent of the working
610 By default, the revision used is the parent of the working
611 directory; use -r/--rev to specify a different revision.
611 directory; use -r/--rev to specify a different revision.
612
612
613 The archive type is automatically detected based on file
613 The archive type is automatically detected based on file
614 extension (to override, use -t/--type).
614 extension (to override, use -t/--type).
615
615
616 .. container:: verbose
616 .. container:: verbose
617
617
618 Examples:
618 Examples:
619
619
620 - create a zip file containing the 1.0 release::
620 - create a zip file containing the 1.0 release::
621
621
622 hg archive -r 1.0 project-1.0.zip
622 hg archive -r 1.0 project-1.0.zip
623
623
624 - create a tarball excluding .hg files::
624 - create a tarball excluding .hg files::
625
625
626 hg archive project.tar.gz -X ".hg*"
626 hg archive project.tar.gz -X ".hg*"
627
627
628 Valid types are:
628 Valid types are:
629
629
630 :``files``: a directory full of files (default)
630 :``files``: a directory full of files (default)
631 :``tar``: tar archive, uncompressed
631 :``tar``: tar archive, uncompressed
632 :``tbz2``: tar archive, compressed using bzip2
632 :``tbz2``: tar archive, compressed using bzip2
633 :``tgz``: tar archive, compressed using gzip
633 :``tgz``: tar archive, compressed using gzip
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
635 :``uzip``: zip archive, uncompressed
635 :``uzip``: zip archive, uncompressed
636 :``zip``: zip archive, compressed using deflate
636 :``zip``: zip archive, compressed using deflate
637
637
638 The exact name of the destination archive or directory is given
638 The exact name of the destination archive or directory is given
639 using a format string; see :hg:`help export` for details.
639 using a format string; see :hg:`help export` for details.
640
640
641 Each member added to an archive file has a directory prefix
641 Each member added to an archive file has a directory prefix
642 prepended. Use -p/--prefix to specify a format string for the
642 prepended. Use -p/--prefix to specify a format string for the
643 prefix. The default is the basename of the archive, with suffixes
643 prefix. The default is the basename of the archive, with suffixes
644 removed.
644 removed.
645
645
646 Returns 0 on success.
646 Returns 0 on success.
647 """
647 """
648
648
649 opts = pycompat.byteskwargs(opts)
649 opts = pycompat.byteskwargs(opts)
650 rev = opts.get(b'rev')
650 rev = opts.get(b'rev')
651 if rev:
651 if rev:
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
653 ctx = scmutil.revsingle(repo, rev)
653 ctx = scmutil.revsingle(repo, rev)
654 if not ctx:
654 if not ctx:
655 raise error.InputError(
655 raise error.InputError(
656 _(b'no working directory: please specify a revision')
656 _(b'no working directory: please specify a revision')
657 )
657 )
658 node = ctx.node()
658 node = ctx.node()
659 dest = cmdutil.makefilename(ctx, dest)
659 dest = cmdutil.makefilename(ctx, dest)
660 if os.path.realpath(dest) == repo.root:
660 if os.path.realpath(dest) == repo.root:
661 raise error.InputError(_(b'repository root cannot be destination'))
661 raise error.InputError(_(b'repository root cannot be destination'))
662
662
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
664 prefix = opts.get(b'prefix')
664 prefix = opts.get(b'prefix')
665
665
666 if dest == b'-':
666 if dest == b'-':
667 if kind == b'files':
667 if kind == b'files':
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
669 dest = cmdutil.makefileobj(ctx, dest)
669 dest = cmdutil.makefileobj(ctx, dest)
670 if not prefix:
670 if not prefix:
671 prefix = os.path.basename(repo.root) + b'-%h'
671 prefix = os.path.basename(repo.root) + b'-%h'
672
672
673 prefix = cmdutil.makefilename(ctx, prefix)
673 prefix = cmdutil.makefilename(ctx, prefix)
674 match = scmutil.match(ctx, [], opts)
674 match = scmutil.match(ctx, [], opts)
675 archival.archive(
675 archival.archive(
676 repo,
676 repo,
677 dest,
677 dest,
678 node,
678 node,
679 kind,
679 kind,
680 not opts.get(b'no_decode'),
680 not opts.get(b'no_decode'),
681 match,
681 match,
682 prefix,
682 prefix,
683 subrepos=opts.get(b'subrepos'),
683 subrepos=opts.get(b'subrepos'),
684 )
684 )
685
685
686
686
687 @command(
687 @command(
688 b'backout',
688 b'backout',
689 [
689 [
690 (
690 (
691 b'',
691 b'',
692 b'merge',
692 b'merge',
693 None,
693 None,
694 _(b'merge with old dirstate parent after backout'),
694 _(b'merge with old dirstate parent after backout'),
695 ),
695 ),
696 (
696 (
697 b'',
697 b'',
698 b'commit',
698 b'commit',
699 None,
699 None,
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
701 ),
701 ),
702 (b'', b'no-commit', None, _(b'do not commit')),
702 (b'', b'no-commit', None, _(b'do not commit')),
703 (
703 (
704 b'',
704 b'',
705 b'parent',
705 b'parent',
706 b'',
706 b'',
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
708 _(b'REV'),
708 _(b'REV'),
709 ),
709 ),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
712 ]
712 ]
713 + mergetoolopts
713 + mergetoolopts
714 + walkopts
714 + walkopts
715 + commitopts
715 + commitopts
716 + commitopts2,
716 + commitopts2,
717 _(b'[OPTION]... [-r] REV'),
717 _(b'[OPTION]... [-r] REV'),
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
719 )
719 )
720 def backout(ui, repo, node=None, rev=None, **opts):
720 def backout(ui, repo, node=None, rev=None, **opts):
721 """reverse effect of earlier changeset
721 """reverse effect of earlier changeset
722
722
723 Prepare a new changeset with the effect of REV undone in the
723 Prepare a new changeset with the effect of REV undone in the
724 current working directory. If no conflicts were encountered,
724 current working directory. If no conflicts were encountered,
725 it will be committed immediately.
725 it will be committed immediately.
726
726
727 If REV is the parent of the working directory, then this new changeset
727 If REV is the parent of the working directory, then this new changeset
728 is committed automatically (unless --no-commit is specified).
728 is committed automatically (unless --no-commit is specified).
729
729
730 .. note::
730 .. note::
731
731
732 :hg:`backout` cannot be used to fix either an unwanted or
732 :hg:`backout` cannot be used to fix either an unwanted or
733 incorrect merge.
733 incorrect merge.
734
734
735 .. container:: verbose
735 .. container:: verbose
736
736
737 Examples:
737 Examples:
738
738
739 - Reverse the effect of the parent of the working directory.
739 - Reverse the effect of the parent of the working directory.
740 This backout will be committed immediately::
740 This backout will be committed immediately::
741
741
742 hg backout -r .
742 hg backout -r .
743
743
744 - Reverse the effect of previous bad revision 23::
744 - Reverse the effect of previous bad revision 23::
745
745
746 hg backout -r 23
746 hg backout -r 23
747
747
748 - Reverse the effect of previous bad revision 23 and
748 - Reverse the effect of previous bad revision 23 and
749 leave changes uncommitted::
749 leave changes uncommitted::
750
750
751 hg backout -r 23 --no-commit
751 hg backout -r 23 --no-commit
752 hg commit -m "Backout revision 23"
752 hg commit -m "Backout revision 23"
753
753
754 By default, the pending changeset will have one parent,
754 By default, the pending changeset will have one parent,
755 maintaining a linear history. With --merge, the pending
755 maintaining a linear history. With --merge, the pending
756 changeset will instead have two parents: the old parent of the
756 changeset will instead have two parents: the old parent of the
757 working directory and a new child of REV that simply undoes REV.
757 working directory and a new child of REV that simply undoes REV.
758
758
759 Before version 1.7, the behavior without --merge was equivalent
759 Before version 1.7, the behavior without --merge was equivalent
760 to specifying --merge followed by :hg:`update --clean .` to
760 to specifying --merge followed by :hg:`update --clean .` to
761 cancel the merge and leave the child of REV as a head to be
761 cancel the merge and leave the child of REV as a head to be
762 merged separately.
762 merged separately.
763
763
764 See :hg:`help dates` for a list of formats valid for -d/--date.
764 See :hg:`help dates` for a list of formats valid for -d/--date.
765
765
766 See :hg:`help revert` for a way to restore files to the state
766 See :hg:`help revert` for a way to restore files to the state
767 of another revision.
767 of another revision.
768
768
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
770 files.
770 files.
771 """
771 """
772 with repo.wlock(), repo.lock():
772 with repo.wlock(), repo.lock():
773 return _dobackout(ui, repo, node, rev, **opts)
773 return _dobackout(ui, repo, node, rev, **opts)
774
774
775
775
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
778 opts = pycompat.byteskwargs(opts)
778 opts = pycompat.byteskwargs(opts)
779
779
780 if rev and node:
780 if rev and node:
781 raise error.InputError(_(b"please specify just one revision"))
781 raise error.InputError(_(b"please specify just one revision"))
782
782
783 if not rev:
783 if not rev:
784 rev = node
784 rev = node
785
785
786 if not rev:
786 if not rev:
787 raise error.InputError(_(b"please specify a revision to backout"))
787 raise error.InputError(_(b"please specify a revision to backout"))
788
788
789 date = opts.get(b'date')
789 date = opts.get(b'date')
790 if date:
790 if date:
791 opts[b'date'] = dateutil.parsedate(date)
791 opts[b'date'] = dateutil.parsedate(date)
792
792
793 cmdutil.checkunfinished(repo)
793 cmdutil.checkunfinished(repo)
794 cmdutil.bailifchanged(repo)
794 cmdutil.bailifchanged(repo)
795 ctx = scmutil.revsingle(repo, rev)
795 ctx = scmutil.revsingle(repo, rev)
796 node = ctx.node()
796 node = ctx.node()
797
797
798 op1, op2 = repo.dirstate.parents()
798 op1, op2 = repo.dirstate.parents()
799 if not repo.changelog.isancestor(node, op1):
799 if not repo.changelog.isancestor(node, op1):
800 raise error.InputError(
800 raise error.InputError(
801 _(b'cannot backout change that is not an ancestor')
801 _(b'cannot backout change that is not an ancestor')
802 )
802 )
803
803
804 p1, p2 = repo.changelog.parents(node)
804 p1, p2 = repo.changelog.parents(node)
805 if p1 == nullid:
805 if p1 == nullid:
806 raise error.InputError(_(b'cannot backout a change with no parents'))
806 raise error.InputError(_(b'cannot backout a change with no parents'))
807 if p2 != nullid:
807 if p2 != nullid:
808 if not opts.get(b'parent'):
808 if not opts.get(b'parent'):
809 raise error.InputError(_(b'cannot backout a merge changeset'))
809 raise error.InputError(_(b'cannot backout a merge changeset'))
810 p = repo.lookup(opts[b'parent'])
810 p = repo.lookup(opts[b'parent'])
811 if p not in (p1, p2):
811 if p not in (p1, p2):
812 raise error.InputError(
812 raise error.InputError(
813 _(b'%s is not a parent of %s') % (short(p), short(node))
813 _(b'%s is not a parent of %s') % (short(p), short(node))
814 )
814 )
815 parent = p
815 parent = p
816 else:
816 else:
817 if opts.get(b'parent'):
817 if opts.get(b'parent'):
818 raise error.InputError(
818 raise error.InputError(
819 _(b'cannot use --parent on non-merge changeset')
819 _(b'cannot use --parent on non-merge changeset')
820 )
820 )
821 parent = p1
821 parent = p1
822
822
823 # the backout should appear on the same branch
823 # the backout should appear on the same branch
824 branch = repo.dirstate.branch()
824 branch = repo.dirstate.branch()
825 bheads = repo.branchheads(branch)
825 bheads = repo.branchheads(branch)
826 rctx = scmutil.revsingle(repo, hex(parent))
826 rctx = scmutil.revsingle(repo, hex(parent))
827 if not opts.get(b'merge') and op1 != node:
827 if not opts.get(b'merge') and op1 != node:
828 with dirstateguard.dirstateguard(repo, b'backout'):
828 with dirstateguard.dirstateguard(repo, b'backout'):
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
830 with ui.configoverride(overrides, b'backout'):
830 with ui.configoverride(overrides, b'backout'):
831 stats = mergemod.back_out(ctx, parent=repo[parent])
831 stats = mergemod.back_out(ctx, parent=repo[parent])
832 repo.setparents(op1, op2)
832 repo.setparents(op1, op2)
833 hg._showstats(repo, stats)
833 hg._showstats(repo, stats)
834 if stats.unresolvedcount:
834 if stats.unresolvedcount:
835 repo.ui.status(
835 repo.ui.status(
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
837 )
837 )
838 return 1
838 return 1
839 else:
839 else:
840 hg.clean(repo, node, show_stats=False)
840 hg.clean(repo, node, show_stats=False)
841 repo.dirstate.setbranch(branch)
841 repo.dirstate.setbranch(branch)
842 cmdutil.revert(ui, repo, rctx)
842 cmdutil.revert(ui, repo, rctx)
843
843
844 if opts.get(b'no_commit'):
844 if opts.get(b'no_commit'):
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
846 ui.status(msg % short(node))
846 ui.status(msg % short(node))
847 return 0
847 return 0
848
848
849 def commitfunc(ui, repo, message, match, opts):
849 def commitfunc(ui, repo, message, match, opts):
850 editform = b'backout'
850 editform = b'backout'
851 e = cmdutil.getcommiteditor(
851 e = cmdutil.getcommiteditor(
852 editform=editform, **pycompat.strkwargs(opts)
852 editform=editform, **pycompat.strkwargs(opts)
853 )
853 )
854 if not message:
854 if not message:
855 # we don't translate commit messages
855 # we don't translate commit messages
856 message = b"Backed out changeset %s" % short(node)
856 message = b"Backed out changeset %s" % short(node)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
858 return repo.commit(
858 return repo.commit(
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
860 )
860 )
861
861
862 # save to detect changes
862 # save to detect changes
863 tip = repo.changelog.tip()
863 tip = repo.changelog.tip()
864
864
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
866 if not newnode:
866 if not newnode:
867 ui.status(_(b"nothing changed\n"))
867 ui.status(_(b"nothing changed\n"))
868 return 1
868 return 1
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
870
870
871 def nice(node):
871 def nice(node):
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
873
873
874 ui.status(
874 ui.status(
875 _(b'changeset %s backs out changeset %s\n')
875 _(b'changeset %s backs out changeset %s\n')
876 % (nice(newnode), nice(node))
876 % (nice(newnode), nice(node))
877 )
877 )
878 if opts.get(b'merge') and op1 != node:
878 if opts.get(b'merge') and op1 != node:
879 hg.clean(repo, op1, show_stats=False)
879 hg.clean(repo, op1, show_stats=False)
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
882 with ui.configoverride(overrides, b'backout'):
882 with ui.configoverride(overrides, b'backout'):
883 return hg.merge(repo[b'tip'])
883 return hg.merge(repo[b'tip'])
884 return 0
884 return 0
885
885
886
886
887 @command(
887 @command(
888 b'bisect',
888 b'bisect',
889 [
889 [
890 (b'r', b'reset', False, _(b'reset bisect state')),
890 (b'r', b'reset', False, _(b'reset bisect state')),
891 (b'g', b'good', False, _(b'mark changeset good')),
891 (b'g', b'good', False, _(b'mark changeset good')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
895 (
895 (
896 b'c',
896 b'c',
897 b'command',
897 b'command',
898 b'',
898 b'',
899 _(b'use command to check changeset state'),
899 _(b'use command to check changeset state'),
900 _(b'CMD'),
900 _(b'CMD'),
901 ),
901 ),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
903 ],
903 ],
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
906 )
906 )
907 def bisect(
907 def bisect(
908 ui,
908 ui,
909 repo,
909 repo,
910 positional_1=None,
910 positional_1=None,
911 positional_2=None,
911 positional_2=None,
912 command=None,
912 command=None,
913 reset=None,
913 reset=None,
914 good=None,
914 good=None,
915 bad=None,
915 bad=None,
916 skip=None,
916 skip=None,
917 extend=None,
917 extend=None,
918 noupdate=None,
918 noupdate=None,
919 ):
919 ):
920 """subdivision search of changesets
920 """subdivision search of changesets
921
921
922 This command helps to find changesets which introduce problems. To
922 This command helps to find changesets which introduce problems. To
923 use, mark the earliest changeset you know exhibits the problem as
923 use, mark the earliest changeset you know exhibits the problem as
924 bad, then mark the latest changeset which is free from the problem
924 bad, then mark the latest changeset which is free from the problem
925 as good. Bisect will update your working directory to a revision
925 as good. Bisect will update your working directory to a revision
926 for testing (unless the -U/--noupdate option is specified). Once
926 for testing (unless the -U/--noupdate option is specified). Once
927 you have performed tests, mark the working directory as good or
927 you have performed tests, mark the working directory as good or
928 bad, and bisect will either update to another candidate changeset
928 bad, and bisect will either update to another candidate changeset
929 or announce that it has found the bad revision.
929 or announce that it has found the bad revision.
930
930
931 As a shortcut, you can also use the revision argument to mark a
931 As a shortcut, you can also use the revision argument to mark a
932 revision as good or bad without checking it out first.
932 revision as good or bad without checking it out first.
933
933
934 If you supply a command, it will be used for automatic bisection.
934 If you supply a command, it will be used for automatic bisection.
935 The environment variable HG_NODE will contain the ID of the
935 The environment variable HG_NODE will contain the ID of the
936 changeset being tested. The exit status of the command will be
936 changeset being tested. The exit status of the command will be
937 used to mark revisions as good or bad: status 0 means good, 125
937 used to mark revisions as good or bad: status 0 means good, 125
938 means to skip the revision, 127 (command not found) will abort the
938 means to skip the revision, 127 (command not found) will abort the
939 bisection, and any other non-zero exit status means the revision
939 bisection, and any other non-zero exit status means the revision
940 is bad.
940 is bad.
941
941
942 .. container:: verbose
942 .. container:: verbose
943
943
944 Some examples:
944 Some examples:
945
945
946 - start a bisection with known bad revision 34, and good revision 12::
946 - start a bisection with known bad revision 34, and good revision 12::
947
947
948 hg bisect --bad 34
948 hg bisect --bad 34
949 hg bisect --good 12
949 hg bisect --good 12
950
950
951 - advance the current bisection by marking current revision as good or
951 - advance the current bisection by marking current revision as good or
952 bad::
952 bad::
953
953
954 hg bisect --good
954 hg bisect --good
955 hg bisect --bad
955 hg bisect --bad
956
956
957 - mark the current revision, or a known revision, to be skipped (e.g. if
957 - mark the current revision, or a known revision, to be skipped (e.g. if
958 that revision is not usable because of another issue)::
958 that revision is not usable because of another issue)::
959
959
960 hg bisect --skip
960 hg bisect --skip
961 hg bisect --skip 23
961 hg bisect --skip 23
962
962
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
964
964
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
966
966
967 - forget the current bisection::
967 - forget the current bisection::
968
968
969 hg bisect --reset
969 hg bisect --reset
970
970
971 - use 'make && make tests' to automatically find the first broken
971 - use 'make && make tests' to automatically find the first broken
972 revision::
972 revision::
973
973
974 hg bisect --reset
974 hg bisect --reset
975 hg bisect --bad 34
975 hg bisect --bad 34
976 hg bisect --good 12
976 hg bisect --good 12
977 hg bisect --command "make && make tests"
977 hg bisect --command "make && make tests"
978
978
979 - see all changesets whose states are already known in the current
979 - see all changesets whose states are already known in the current
980 bisection::
980 bisection::
981
981
982 hg log -r "bisect(pruned)"
982 hg log -r "bisect(pruned)"
983
983
984 - see the changeset currently being bisected (especially useful
984 - see the changeset currently being bisected (especially useful
985 if running with -U/--noupdate)::
985 if running with -U/--noupdate)::
986
986
987 hg log -r "bisect(current)"
987 hg log -r "bisect(current)"
988
988
989 - see all changesets that took part in the current bisection::
989 - see all changesets that took part in the current bisection::
990
990
991 hg log -r "bisect(range)"
991 hg log -r "bisect(range)"
992
992
993 - you can even get a nice graph::
993 - you can even get a nice graph::
994
994
995 hg log --graph -r "bisect(range)"
995 hg log --graph -r "bisect(range)"
996
996
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
998
998
999 Returns 0 on success.
999 Returns 0 on success.
1000 """
1000 """
1001 rev = []
1001 rev = []
1002 # backward compatibility
1002 # backward compatibility
1003 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1003 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1004 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1005 cmd = positional_1
1005 cmd = positional_1
1006 rev.append(positional_2)
1006 rev.append(positional_2)
1007 if cmd == b"good":
1007 if cmd == b"good":
1008 good = True
1008 good = True
1009 elif cmd == b"bad":
1009 elif cmd == b"bad":
1010 bad = True
1010 bad = True
1011 else:
1011 else:
1012 reset = True
1012 reset = True
1013 elif positional_2:
1013 elif positional_2:
1014 raise error.InputError(_(b'incompatible arguments'))
1014 raise error.InputError(_(b'incompatible arguments'))
1015 elif positional_1 is not None:
1015 elif positional_1 is not None:
1016 rev.append(positional_1)
1016 rev.append(positional_1)
1017
1017
1018 incompatibles = {
1018 incompatibles = {
1019 b'--bad': bad,
1019 b'--bad': bad,
1020 b'--command': bool(command),
1020 b'--command': bool(command),
1021 b'--extend': extend,
1021 b'--extend': extend,
1022 b'--good': good,
1022 b'--good': good,
1023 b'--reset': reset,
1023 b'--reset': reset,
1024 b'--skip': skip,
1024 b'--skip': skip,
1025 }
1025 }
1026
1026
1027 enabled = [x for x in incompatibles if incompatibles[x]]
1027 enabled = [x for x in incompatibles if incompatibles[x]]
1028
1028
1029 if len(enabled) > 1:
1029 if len(enabled) > 1:
1030 raise error.InputError(
1030 raise error.InputError(
1031 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1031 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1032 )
1032 )
1033
1033
1034 if reset:
1034 if reset:
1035 hbisect.resetstate(repo)
1035 hbisect.resetstate(repo)
1036 return
1036 return
1037
1037
1038 state = hbisect.load_state(repo)
1038 state = hbisect.load_state(repo)
1039
1039
1040 if rev:
1040 if rev:
1041 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1041 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1042 else:
1042 else:
1043 nodes = [repo.lookup(b'.')]
1043 nodes = [repo.lookup(b'.')]
1044
1044
1045 # update state
1045 # update state
1046 if good or bad or skip:
1046 if good or bad or skip:
1047 if good:
1047 if good:
1048 state[b'good'] += nodes
1048 state[b'good'] += nodes
1049 elif bad:
1049 elif bad:
1050 state[b'bad'] += nodes
1050 state[b'bad'] += nodes
1051 elif skip:
1051 elif skip:
1052 state[b'skip'] += nodes
1052 state[b'skip'] += nodes
1053 hbisect.save_state(repo, state)
1053 hbisect.save_state(repo, state)
1054 if not (state[b'good'] and state[b'bad']):
1054 if not (state[b'good'] and state[b'bad']):
1055 return
1055 return
1056
1056
1057 def mayupdate(repo, node, show_stats=True):
1057 def mayupdate(repo, node, show_stats=True):
1058 """common used update sequence"""
1058 """common used update sequence"""
1059 if noupdate:
1059 if noupdate:
1060 return
1060 return
1061 cmdutil.checkunfinished(repo)
1061 cmdutil.checkunfinished(repo)
1062 cmdutil.bailifchanged(repo)
1062 cmdutil.bailifchanged(repo)
1063 return hg.clean(repo, node, show_stats=show_stats)
1063 return hg.clean(repo, node, show_stats=show_stats)
1064
1064
1065 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1065 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1066
1066
1067 if command:
1067 if command:
1068 changesets = 1
1068 changesets = 1
1069 if noupdate:
1069 if noupdate:
1070 try:
1070 try:
1071 node = state[b'current'][0]
1071 node = state[b'current'][0]
1072 except LookupError:
1072 except LookupError:
1073 raise error.StateError(
1073 raise error.StateError(
1074 _(
1074 _(
1075 b'current bisect revision is unknown - '
1075 b'current bisect revision is unknown - '
1076 b'start a new bisect to fix'
1076 b'start a new bisect to fix'
1077 )
1077 )
1078 )
1078 )
1079 else:
1079 else:
1080 node, p2 = repo.dirstate.parents()
1080 node, p2 = repo.dirstate.parents()
1081 if p2 != nullid:
1081 if p2 != nullid:
1082 raise error.StateError(_(b'current bisect revision is a merge'))
1082 raise error.StateError(_(b'current bisect revision is a merge'))
1083 if rev:
1083 if rev:
1084 if not nodes:
1084 if not nodes:
1085 raise error.Abort(_(b'empty revision set'))
1085 raise error.Abort(_(b'empty revision set'))
1086 node = repo[nodes.last()].node()
1086 node = repo[nodes.last()].node()
1087 with hbisect.restore_state(repo, state, node):
1087 with hbisect.restore_state(repo, state, node):
1088 while changesets:
1088 while changesets:
1089 # update state
1089 # update state
1090 state[b'current'] = [node]
1090 state[b'current'] = [node]
1091 hbisect.save_state(repo, state)
1091 hbisect.save_state(repo, state)
1092 status = ui.system(
1092 status = ui.system(
1093 command,
1093 command,
1094 environ={b'HG_NODE': hex(node)},
1094 environ={b'HG_NODE': hex(node)},
1095 blockedtag=b'bisect_check',
1095 blockedtag=b'bisect_check',
1096 )
1096 )
1097 if status == 125:
1097 if status == 125:
1098 transition = b"skip"
1098 transition = b"skip"
1099 elif status == 0:
1099 elif status == 0:
1100 transition = b"good"
1100 transition = b"good"
1101 # status < 0 means process was killed
1101 # status < 0 means process was killed
1102 elif status == 127:
1102 elif status == 127:
1103 raise error.Abort(_(b"failed to execute %s") % command)
1103 raise error.Abort(_(b"failed to execute %s") % command)
1104 elif status < 0:
1104 elif status < 0:
1105 raise error.Abort(_(b"%s killed") % command)
1105 raise error.Abort(_(b"%s killed") % command)
1106 else:
1106 else:
1107 transition = b"bad"
1107 transition = b"bad"
1108 state[transition].append(node)
1108 state[transition].append(node)
1109 ctx = repo[node]
1109 ctx = repo[node]
1110 ui.status(
1110 ui.status(
1111 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1111 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1112 )
1112 )
1113 hbisect.checkstate(state)
1113 hbisect.checkstate(state)
1114 # bisect
1114 # bisect
1115 nodes, changesets, bgood = hbisect.bisect(repo, state)
1115 nodes, changesets, bgood = hbisect.bisect(repo, state)
1116 # update to next check
1116 # update to next check
1117 node = nodes[0]
1117 node = nodes[0]
1118 mayupdate(repo, node, show_stats=False)
1118 mayupdate(repo, node, show_stats=False)
1119 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1119 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1120 return
1120 return
1121
1121
1122 hbisect.checkstate(state)
1122 hbisect.checkstate(state)
1123
1123
1124 # actually bisect
1124 # actually bisect
1125 nodes, changesets, good = hbisect.bisect(repo, state)
1125 nodes, changesets, good = hbisect.bisect(repo, state)
1126 if extend:
1126 if extend:
1127 if not changesets:
1127 if not changesets:
1128 extendnode = hbisect.extendrange(repo, state, nodes, good)
1128 extendnode = hbisect.extendrange(repo, state, nodes, good)
1129 if extendnode is not None:
1129 if extendnode is not None:
1130 ui.write(
1130 ui.write(
1131 _(b"Extending search to changeset %d:%s\n")
1131 _(b"Extending search to changeset %d:%s\n")
1132 % (extendnode.rev(), extendnode)
1132 % (extendnode.rev(), extendnode)
1133 )
1133 )
1134 state[b'current'] = [extendnode.node()]
1134 state[b'current'] = [extendnode.node()]
1135 hbisect.save_state(repo, state)
1135 hbisect.save_state(repo, state)
1136 return mayupdate(repo, extendnode.node())
1136 return mayupdate(repo, extendnode.node())
1137 raise error.StateError(_(b"nothing to extend"))
1137 raise error.StateError(_(b"nothing to extend"))
1138
1138
1139 if changesets == 0:
1139 if changesets == 0:
1140 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1140 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1141 else:
1141 else:
1142 assert len(nodes) == 1 # only a single node can be tested next
1142 assert len(nodes) == 1 # only a single node can be tested next
1143 node = nodes[0]
1143 node = nodes[0]
1144 # compute the approximate number of remaining tests
1144 # compute the approximate number of remaining tests
1145 tests, size = 0, 2
1145 tests, size = 0, 2
1146 while size <= changesets:
1146 while size <= changesets:
1147 tests, size = tests + 1, size * 2
1147 tests, size = tests + 1, size * 2
1148 rev = repo.changelog.rev(node)
1148 rev = repo.changelog.rev(node)
1149 ui.write(
1149 ui.write(
1150 _(
1150 _(
1151 b"Testing changeset %d:%s "
1151 b"Testing changeset %d:%s "
1152 b"(%d changesets remaining, ~%d tests)\n"
1152 b"(%d changesets remaining, ~%d tests)\n"
1153 )
1153 )
1154 % (rev, short(node), changesets, tests)
1154 % (rev, short(node), changesets, tests)
1155 )
1155 )
1156 state[b'current'] = [node]
1156 state[b'current'] = [node]
1157 hbisect.save_state(repo, state)
1157 hbisect.save_state(repo, state)
1158 return mayupdate(repo, node)
1158 return mayupdate(repo, node)
1159
1159
1160
1160
1161 @command(
1161 @command(
1162 b'bookmarks|bookmark',
1162 b'bookmarks|bookmark',
1163 [
1163 [
1164 (b'f', b'force', False, _(b'force')),
1164 (b'f', b'force', False, _(b'force')),
1165 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1165 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1166 (b'd', b'delete', False, _(b'delete a given bookmark')),
1166 (b'd', b'delete', False, _(b'delete a given bookmark')),
1167 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1167 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1168 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1168 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1169 (b'l', b'list', False, _(b'list existing bookmarks')),
1169 (b'l', b'list', False, _(b'list existing bookmarks')),
1170 ]
1170 ]
1171 + formatteropts,
1171 + formatteropts,
1172 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1172 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1173 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1173 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1174 )
1174 )
1175 def bookmark(ui, repo, *names, **opts):
1175 def bookmark(ui, repo, *names, **opts):
1176 """create a new bookmark or list existing bookmarks
1176 """create a new bookmark or list existing bookmarks
1177
1177
1178 Bookmarks are labels on changesets to help track lines of development.
1178 Bookmarks are labels on changesets to help track lines of development.
1179 Bookmarks are unversioned and can be moved, renamed and deleted.
1179 Bookmarks are unversioned and can be moved, renamed and deleted.
1180 Deleting or moving a bookmark has no effect on the associated changesets.
1180 Deleting or moving a bookmark has no effect on the associated changesets.
1181
1181
1182 Creating or updating to a bookmark causes it to be marked as 'active'.
1182 Creating or updating to a bookmark causes it to be marked as 'active'.
1183 The active bookmark is indicated with a '*'.
1183 The active bookmark is indicated with a '*'.
1184 When a commit is made, the active bookmark will advance to the new commit.
1184 When a commit is made, the active bookmark will advance to the new commit.
1185 A plain :hg:`update` will also advance an active bookmark, if possible.
1185 A plain :hg:`update` will also advance an active bookmark, if possible.
1186 Updating away from a bookmark will cause it to be deactivated.
1186 Updating away from a bookmark will cause it to be deactivated.
1187
1187
1188 Bookmarks can be pushed and pulled between repositories (see
1188 Bookmarks can be pushed and pulled between repositories (see
1189 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1189 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1190 diverged, a new 'divergent bookmark' of the form 'name@path' will
1190 diverged, a new 'divergent bookmark' of the form 'name@path' will
1191 be created. Using :hg:`merge` will resolve the divergence.
1191 be created. Using :hg:`merge` will resolve the divergence.
1192
1192
1193 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1193 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1194 the active bookmark's name.
1194 the active bookmark's name.
1195
1195
1196 A bookmark named '@' has the special property that :hg:`clone` will
1196 A bookmark named '@' has the special property that :hg:`clone` will
1197 check it out by default if it exists.
1197 check it out by default if it exists.
1198
1198
1199 .. container:: verbose
1199 .. container:: verbose
1200
1200
1201 Template:
1201 Template:
1202
1202
1203 The following keywords are supported in addition to the common template
1203 The following keywords are supported in addition to the common template
1204 keywords and functions such as ``{bookmark}``. See also
1204 keywords and functions such as ``{bookmark}``. See also
1205 :hg:`help templates`.
1205 :hg:`help templates`.
1206
1206
1207 :active: Boolean. True if the bookmark is active.
1207 :active: Boolean. True if the bookmark is active.
1208
1208
1209 Examples:
1209 Examples:
1210
1210
1211 - create an active bookmark for a new line of development::
1211 - create an active bookmark for a new line of development::
1212
1212
1213 hg book new-feature
1213 hg book new-feature
1214
1214
1215 - create an inactive bookmark as a place marker::
1215 - create an inactive bookmark as a place marker::
1216
1216
1217 hg book -i reviewed
1217 hg book -i reviewed
1218
1218
1219 - create an inactive bookmark on another changeset::
1219 - create an inactive bookmark on another changeset::
1220
1220
1221 hg book -r .^ tested
1221 hg book -r .^ tested
1222
1222
1223 - rename bookmark turkey to dinner::
1223 - rename bookmark turkey to dinner::
1224
1224
1225 hg book -m turkey dinner
1225 hg book -m turkey dinner
1226
1226
1227 - move the '@' bookmark from another branch::
1227 - move the '@' bookmark from another branch::
1228
1228
1229 hg book -f @
1229 hg book -f @
1230
1230
1231 - print only the active bookmark name::
1231 - print only the active bookmark name::
1232
1232
1233 hg book -ql .
1233 hg book -ql .
1234 """
1234 """
1235 opts = pycompat.byteskwargs(opts)
1235 opts = pycompat.byteskwargs(opts)
1236 force = opts.get(b'force')
1236 force = opts.get(b'force')
1237 rev = opts.get(b'rev')
1237 rev = opts.get(b'rev')
1238 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1238 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1239
1239
1240 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1240 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1241 if action:
1241 if action:
1242 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1242 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1243 elif names or rev:
1243 elif names or rev:
1244 action = b'add'
1244 action = b'add'
1245 elif inactive:
1245 elif inactive:
1246 action = b'inactive' # meaning deactivate
1246 action = b'inactive' # meaning deactivate
1247 else:
1247 else:
1248 action = b'list'
1248 action = b'list'
1249
1249
1250 cmdutil.check_incompatible_arguments(
1250 cmdutil.check_incompatible_arguments(
1251 opts, b'inactive', [b'delete', b'list']
1251 opts, b'inactive', [b'delete', b'list']
1252 )
1252 )
1253 if not names and action in {b'add', b'delete'}:
1253 if not names and action in {b'add', b'delete'}:
1254 raise error.InputError(_(b"bookmark name required"))
1254 raise error.InputError(_(b"bookmark name required"))
1255
1255
1256 if action in {b'add', b'delete', b'rename', b'inactive'}:
1256 if action in {b'add', b'delete', b'rename', b'inactive'}:
1257 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1257 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1258 if action == b'delete':
1258 if action == b'delete':
1259 names = pycompat.maplist(repo._bookmarks.expandname, names)
1259 names = pycompat.maplist(repo._bookmarks.expandname, names)
1260 bookmarks.delete(repo, tr, names)
1260 bookmarks.delete(repo, tr, names)
1261 elif action == b'rename':
1261 elif action == b'rename':
1262 if not names:
1262 if not names:
1263 raise error.InputError(_(b"new bookmark name required"))
1263 raise error.InputError(_(b"new bookmark name required"))
1264 elif len(names) > 1:
1264 elif len(names) > 1:
1265 raise error.InputError(
1265 raise error.InputError(
1266 _(b"only one new bookmark name allowed")
1266 _(b"only one new bookmark name allowed")
1267 )
1267 )
1268 oldname = repo._bookmarks.expandname(opts[b'rename'])
1268 oldname = repo._bookmarks.expandname(opts[b'rename'])
1269 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1269 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1270 elif action == b'add':
1270 elif action == b'add':
1271 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1271 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1272 elif action == b'inactive':
1272 elif action == b'inactive':
1273 if len(repo._bookmarks) == 0:
1273 if len(repo._bookmarks) == 0:
1274 ui.status(_(b"no bookmarks set\n"))
1274 ui.status(_(b"no bookmarks set\n"))
1275 elif not repo._activebookmark:
1275 elif not repo._activebookmark:
1276 ui.status(_(b"no active bookmark\n"))
1276 ui.status(_(b"no active bookmark\n"))
1277 else:
1277 else:
1278 bookmarks.deactivate(repo)
1278 bookmarks.deactivate(repo)
1279 elif action == b'list':
1279 elif action == b'list':
1280 names = pycompat.maplist(repo._bookmarks.expandname, names)
1280 names = pycompat.maplist(repo._bookmarks.expandname, names)
1281 with ui.formatter(b'bookmarks', opts) as fm:
1281 with ui.formatter(b'bookmarks', opts) as fm:
1282 bookmarks.printbookmarks(ui, repo, fm, names)
1282 bookmarks.printbookmarks(ui, repo, fm, names)
1283 else:
1283 else:
1284 raise error.ProgrammingError(b'invalid action: %s' % action)
1284 raise error.ProgrammingError(b'invalid action: %s' % action)
1285
1285
1286
1286
1287 @command(
1287 @command(
1288 b'branch',
1288 b'branch',
1289 [
1289 [
1290 (
1290 (
1291 b'f',
1291 b'f',
1292 b'force',
1292 b'force',
1293 None,
1293 None,
1294 _(b'set branch name even if it shadows an existing branch'),
1294 _(b'set branch name even if it shadows an existing branch'),
1295 ),
1295 ),
1296 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1296 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1297 (
1297 (
1298 b'r',
1298 b'r',
1299 b'rev',
1299 b'rev',
1300 [],
1300 [],
1301 _(b'change branches of the given revs (EXPERIMENTAL)'),
1301 _(b'change branches of the given revs (EXPERIMENTAL)'),
1302 ),
1302 ),
1303 ],
1303 ],
1304 _(b'[-fC] [NAME]'),
1304 _(b'[-fC] [NAME]'),
1305 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1305 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1306 )
1306 )
1307 def branch(ui, repo, label=None, **opts):
1307 def branch(ui, repo, label=None, **opts):
1308 """set or show the current branch name
1308 """set or show the current branch name
1309
1309
1310 .. note::
1310 .. note::
1311
1311
1312 Branch names are permanent and global. Use :hg:`bookmark` to create a
1312 Branch names are permanent and global. Use :hg:`bookmark` to create a
1313 light-weight bookmark instead. See :hg:`help glossary` for more
1313 light-weight bookmark instead. See :hg:`help glossary` for more
1314 information about named branches and bookmarks.
1314 information about named branches and bookmarks.
1315
1315
1316 With no argument, show the current branch name. With one argument,
1316 With no argument, show the current branch name. With one argument,
1317 set the working directory branch name (the branch will not exist
1317 set the working directory branch name (the branch will not exist
1318 in the repository until the next commit). Standard practice
1318 in the repository until the next commit). Standard practice
1319 recommends that primary development take place on the 'default'
1319 recommends that primary development take place on the 'default'
1320 branch.
1320 branch.
1321
1321
1322 Unless -f/--force is specified, branch will not let you set a
1322 Unless -f/--force is specified, branch will not let you set a
1323 branch name that already exists.
1323 branch name that already exists.
1324
1324
1325 Use -C/--clean to reset the working directory branch to that of
1325 Use -C/--clean to reset the working directory branch to that of
1326 the parent of the working directory, negating a previous branch
1326 the parent of the working directory, negating a previous branch
1327 change.
1327 change.
1328
1328
1329 Use the command :hg:`update` to switch to an existing branch. Use
1329 Use the command :hg:`update` to switch to an existing branch. Use
1330 :hg:`commit --close-branch` to mark this branch head as closed.
1330 :hg:`commit --close-branch` to mark this branch head as closed.
1331 When all heads of a branch are closed, the branch will be
1331 When all heads of a branch are closed, the branch will be
1332 considered closed.
1332 considered closed.
1333
1333
1334 Returns 0 on success.
1334 Returns 0 on success.
1335 """
1335 """
1336 opts = pycompat.byteskwargs(opts)
1336 opts = pycompat.byteskwargs(opts)
1337 revs = opts.get(b'rev')
1337 revs = opts.get(b'rev')
1338 if label:
1338 if label:
1339 label = label.strip()
1339 label = label.strip()
1340
1340
1341 if not opts.get(b'clean') and not label:
1341 if not opts.get(b'clean') and not label:
1342 if revs:
1342 if revs:
1343 raise error.InputError(
1343 raise error.InputError(
1344 _(b"no branch name specified for the revisions")
1344 _(b"no branch name specified for the revisions")
1345 )
1345 )
1346 ui.write(b"%s\n" % repo.dirstate.branch())
1346 ui.write(b"%s\n" % repo.dirstate.branch())
1347 return
1347 return
1348
1348
1349 with repo.wlock():
1349 with repo.wlock():
1350 if opts.get(b'clean'):
1350 if opts.get(b'clean'):
1351 label = repo[b'.'].branch()
1351 label = repo[b'.'].branch()
1352 repo.dirstate.setbranch(label)
1352 repo.dirstate.setbranch(label)
1353 ui.status(_(b'reset working directory to branch %s\n') % label)
1353 ui.status(_(b'reset working directory to branch %s\n') % label)
1354 elif label:
1354 elif label:
1355
1355
1356 scmutil.checknewlabel(repo, label, b'branch')
1356 scmutil.checknewlabel(repo, label, b'branch')
1357 if revs:
1357 if revs:
1358 return cmdutil.changebranch(ui, repo, revs, label, opts)
1358 return cmdutil.changebranch(ui, repo, revs, label, opts)
1359
1359
1360 if not opts.get(b'force') and label in repo.branchmap():
1360 if not opts.get(b'force') and label in repo.branchmap():
1361 if label not in [p.branch() for p in repo[None].parents()]:
1361 if label not in [p.branch() for p in repo[None].parents()]:
1362 raise error.InputError(
1362 raise error.InputError(
1363 _(b'a branch of the same name already exists'),
1363 _(b'a branch of the same name already exists'),
1364 # i18n: "it" refers to an existing branch
1364 # i18n: "it" refers to an existing branch
1365 hint=_(b"use 'hg update' to switch to it"),
1365 hint=_(b"use 'hg update' to switch to it"),
1366 )
1366 )
1367
1367
1368 repo.dirstate.setbranch(label)
1368 repo.dirstate.setbranch(label)
1369 ui.status(_(b'marked working directory as branch %s\n') % label)
1369 ui.status(_(b'marked working directory as branch %s\n') % label)
1370
1370
1371 # find any open named branches aside from default
1371 # find any open named branches aside from default
1372 for n, h, t, c in repo.branchmap().iterbranches():
1372 for n, h, t, c in repo.branchmap().iterbranches():
1373 if n != b"default" and not c:
1373 if n != b"default" and not c:
1374 return 0
1374 return 0
1375 ui.status(
1375 ui.status(
1376 _(
1376 _(
1377 b'(branches are permanent and global, '
1377 b'(branches are permanent and global, '
1378 b'did you want a bookmark?)\n'
1378 b'did you want a bookmark?)\n'
1379 )
1379 )
1380 )
1380 )
1381
1381
1382
1382
1383 @command(
1383 @command(
1384 b'branches',
1384 b'branches',
1385 [
1385 [
1386 (
1386 (
1387 b'a',
1387 b'a',
1388 b'active',
1388 b'active',
1389 False,
1389 False,
1390 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1390 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1391 ),
1391 ),
1392 (b'c', b'closed', False, _(b'show normal and closed branches')),
1392 (b'c', b'closed', False, _(b'show normal and closed branches')),
1393 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1393 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1394 ]
1394 ]
1395 + formatteropts,
1395 + formatteropts,
1396 _(b'[-c]'),
1396 _(b'[-c]'),
1397 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1397 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1398 intents={INTENT_READONLY},
1398 intents={INTENT_READONLY},
1399 )
1399 )
1400 def branches(ui, repo, active=False, closed=False, **opts):
1400 def branches(ui, repo, active=False, closed=False, **opts):
1401 """list repository named branches
1401 """list repository named branches
1402
1402
1403 List the repository's named branches, indicating which ones are
1403 List the repository's named branches, indicating which ones are
1404 inactive. If -c/--closed is specified, also list branches which have
1404 inactive. If -c/--closed is specified, also list branches which have
1405 been marked closed (see :hg:`commit --close-branch`).
1405 been marked closed (see :hg:`commit --close-branch`).
1406
1406
1407 Use the command :hg:`update` to switch to an existing branch.
1407 Use the command :hg:`update` to switch to an existing branch.
1408
1408
1409 .. container:: verbose
1409 .. container:: verbose
1410
1410
1411 Template:
1411 Template:
1412
1412
1413 The following keywords are supported in addition to the common template
1413 The following keywords are supported in addition to the common template
1414 keywords and functions such as ``{branch}``. See also
1414 keywords and functions such as ``{branch}``. See also
1415 :hg:`help templates`.
1415 :hg:`help templates`.
1416
1416
1417 :active: Boolean. True if the branch is active.
1417 :active: Boolean. True if the branch is active.
1418 :closed: Boolean. True if the branch is closed.
1418 :closed: Boolean. True if the branch is closed.
1419 :current: Boolean. True if it is the current branch.
1419 :current: Boolean. True if it is the current branch.
1420
1420
1421 Returns 0.
1421 Returns 0.
1422 """
1422 """
1423
1423
1424 opts = pycompat.byteskwargs(opts)
1424 opts = pycompat.byteskwargs(opts)
1425 revs = opts.get(b'rev')
1425 revs = opts.get(b'rev')
1426 selectedbranches = None
1426 selectedbranches = None
1427 if revs:
1427 if revs:
1428 revs = scmutil.revrange(repo, revs)
1428 revs = scmutil.revrange(repo, revs)
1429 getbi = repo.revbranchcache().branchinfo
1429 getbi = repo.revbranchcache().branchinfo
1430 selectedbranches = {getbi(r)[0] for r in revs}
1430 selectedbranches = {getbi(r)[0] for r in revs}
1431
1431
1432 ui.pager(b'branches')
1432 ui.pager(b'branches')
1433 fm = ui.formatter(b'branches', opts)
1433 fm = ui.formatter(b'branches', opts)
1434 hexfunc = fm.hexfunc
1434 hexfunc = fm.hexfunc
1435
1435
1436 allheads = set(repo.heads())
1436 allheads = set(repo.heads())
1437 branches = []
1437 branches = []
1438 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1438 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1439 if selectedbranches is not None and tag not in selectedbranches:
1439 if selectedbranches is not None and tag not in selectedbranches:
1440 continue
1440 continue
1441 isactive = False
1441 isactive = False
1442 if not isclosed:
1442 if not isclosed:
1443 openheads = set(repo.branchmap().iteropen(heads))
1443 openheads = set(repo.branchmap().iteropen(heads))
1444 isactive = bool(openheads & allheads)
1444 isactive = bool(openheads & allheads)
1445 branches.append((tag, repo[tip], isactive, not isclosed))
1445 branches.append((tag, repo[tip], isactive, not isclosed))
1446 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1446 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1447
1447
1448 for tag, ctx, isactive, isopen in branches:
1448 for tag, ctx, isactive, isopen in branches:
1449 if active and not isactive:
1449 if active and not isactive:
1450 continue
1450 continue
1451 if isactive:
1451 if isactive:
1452 label = b'branches.active'
1452 label = b'branches.active'
1453 notice = b''
1453 notice = b''
1454 elif not isopen:
1454 elif not isopen:
1455 if not closed:
1455 if not closed:
1456 continue
1456 continue
1457 label = b'branches.closed'
1457 label = b'branches.closed'
1458 notice = _(b' (closed)')
1458 notice = _(b' (closed)')
1459 else:
1459 else:
1460 label = b'branches.inactive'
1460 label = b'branches.inactive'
1461 notice = _(b' (inactive)')
1461 notice = _(b' (inactive)')
1462 current = tag == repo.dirstate.branch()
1462 current = tag == repo.dirstate.branch()
1463 if current:
1463 if current:
1464 label = b'branches.current'
1464 label = b'branches.current'
1465
1465
1466 fm.startitem()
1466 fm.startitem()
1467 fm.write(b'branch', b'%s', tag, label=label)
1467 fm.write(b'branch', b'%s', tag, label=label)
1468 rev = ctx.rev()
1468 rev = ctx.rev()
1469 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1469 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1470 fmt = b' ' * padsize + b' %d:%s'
1470 fmt = b' ' * padsize + b' %d:%s'
1471 fm.condwrite(
1471 fm.condwrite(
1472 not ui.quiet,
1472 not ui.quiet,
1473 b'rev node',
1473 b'rev node',
1474 fmt,
1474 fmt,
1475 rev,
1475 rev,
1476 hexfunc(ctx.node()),
1476 hexfunc(ctx.node()),
1477 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1477 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1478 )
1478 )
1479 fm.context(ctx=ctx)
1479 fm.context(ctx=ctx)
1480 fm.data(active=isactive, closed=not isopen, current=current)
1480 fm.data(active=isactive, closed=not isopen, current=current)
1481 if not ui.quiet:
1481 if not ui.quiet:
1482 fm.plain(notice)
1482 fm.plain(notice)
1483 fm.plain(b'\n')
1483 fm.plain(b'\n')
1484 fm.end()
1484 fm.end()
1485
1485
1486
1486
1487 @command(
1487 @command(
1488 b'bundle',
1488 b'bundle',
1489 [
1489 [
1490 (
1490 (
1491 b'f',
1491 b'f',
1492 b'force',
1492 b'force',
1493 None,
1493 None,
1494 _(b'run even when the destination is unrelated'),
1494 _(b'run even when the destination is unrelated'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'r',
1497 b'r',
1498 b'rev',
1498 b'rev',
1499 [],
1499 [],
1500 _(b'a changeset intended to be added to the destination'),
1500 _(b'a changeset intended to be added to the destination'),
1501 _(b'REV'),
1501 _(b'REV'),
1502 ),
1502 ),
1503 (
1503 (
1504 b'b',
1504 b'b',
1505 b'branch',
1505 b'branch',
1506 [],
1506 [],
1507 _(b'a specific branch you would like to bundle'),
1507 _(b'a specific branch you would like to bundle'),
1508 _(b'BRANCH'),
1508 _(b'BRANCH'),
1509 ),
1509 ),
1510 (
1510 (
1511 b'',
1511 b'',
1512 b'base',
1512 b'base',
1513 [],
1513 [],
1514 _(b'a base changeset assumed to be available at the destination'),
1514 _(b'a base changeset assumed to be available at the destination'),
1515 _(b'REV'),
1515 _(b'REV'),
1516 ),
1516 ),
1517 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1517 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1518 (
1518 (
1519 b't',
1519 b't',
1520 b'type',
1520 b'type',
1521 b'bzip2',
1521 b'bzip2',
1522 _(b'bundle compression type to use'),
1522 _(b'bundle compression type to use'),
1523 _(b'TYPE'),
1523 _(b'TYPE'),
1524 ),
1524 ),
1525 ]
1525 ]
1526 + remoteopts,
1526 + remoteopts,
1527 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1527 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1528 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1528 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1529 )
1529 )
1530 def bundle(ui, repo, fname, dest=None, **opts):
1530 def bundle(ui, repo, fname, dest=None, **opts):
1531 """create a bundle file
1531 """create a bundle file
1532
1532
1533 Generate a bundle file containing data to be transferred to another
1533 Generate a bundle file containing data to be transferred to another
1534 repository.
1534 repository.
1535
1535
1536 To create a bundle containing all changesets, use -a/--all
1536 To create a bundle containing all changesets, use -a/--all
1537 (or --base null). Otherwise, hg assumes the destination will have
1537 (or --base null). Otherwise, hg assumes the destination will have
1538 all the nodes you specify with --base parameters. Otherwise, hg
1538 all the nodes you specify with --base parameters. Otherwise, hg
1539 will assume the repository has all the nodes in destination, or
1539 will assume the repository has all the nodes in destination, or
1540 default-push/default if no destination is specified, where destination
1540 default-push/default if no destination is specified, where destination
1541 is the repository you provide through DEST option.
1541 is the repository you provide through DEST option.
1542
1542
1543 You can change bundle format with the -t/--type option. See
1543 You can change bundle format with the -t/--type option. See
1544 :hg:`help bundlespec` for documentation on this format. By default,
1544 :hg:`help bundlespec` for documentation on this format. By default,
1545 the most appropriate format is used and compression defaults to
1545 the most appropriate format is used and compression defaults to
1546 bzip2.
1546 bzip2.
1547
1547
1548 The bundle file can then be transferred using conventional means
1548 The bundle file can then be transferred using conventional means
1549 and applied to another repository with the unbundle or pull
1549 and applied to another repository with the unbundle or pull
1550 command. This is useful when direct push and pull are not
1550 command. This is useful when direct push and pull are not
1551 available or when exporting an entire repository is undesirable.
1551 available or when exporting an entire repository is undesirable.
1552
1552
1553 Applying bundles preserves all changeset contents including
1553 Applying bundles preserves all changeset contents including
1554 permissions, copy/rename information, and revision history.
1554 permissions, copy/rename information, and revision history.
1555
1555
1556 Returns 0 on success, 1 if no changes found.
1556 Returns 0 on success, 1 if no changes found.
1557 """
1557 """
1558 opts = pycompat.byteskwargs(opts)
1558 opts = pycompat.byteskwargs(opts)
1559 revs = None
1559 revs = None
1560 if b'rev' in opts:
1560 if b'rev' in opts:
1561 revstrings = opts[b'rev']
1561 revstrings = opts[b'rev']
1562 revs = scmutil.revrange(repo, revstrings)
1562 revs = scmutil.revrange(repo, revstrings)
1563 if revstrings and not revs:
1563 if revstrings and not revs:
1564 raise error.InputError(_(b'no commits to bundle'))
1564 raise error.InputError(_(b'no commits to bundle'))
1565
1565
1566 bundletype = opts.get(b'type', b'bzip2').lower()
1566 bundletype = opts.get(b'type', b'bzip2').lower()
1567 try:
1567 try:
1568 bundlespec = bundlecaches.parsebundlespec(
1568 bundlespec = bundlecaches.parsebundlespec(
1569 repo, bundletype, strict=False
1569 repo, bundletype, strict=False
1570 )
1570 )
1571 except error.UnsupportedBundleSpecification as e:
1571 except error.UnsupportedBundleSpecification as e:
1572 raise error.InputError(
1572 raise error.InputError(
1573 pycompat.bytestr(e),
1573 pycompat.bytestr(e),
1574 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1574 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1575 )
1575 )
1576 cgversion = bundlespec.contentopts[b"cg.version"]
1576 cgversion = bundlespec.contentopts[b"cg.version"]
1577
1577
1578 # Packed bundles are a pseudo bundle format for now.
1578 # Packed bundles are a pseudo bundle format for now.
1579 if cgversion == b's1':
1579 if cgversion == b's1':
1580 raise error.InputError(
1580 raise error.InputError(
1581 _(b'packed bundles cannot be produced by "hg bundle"'),
1581 _(b'packed bundles cannot be produced by "hg bundle"'),
1582 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1582 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1583 )
1583 )
1584
1584
1585 if opts.get(b'all'):
1585 if opts.get(b'all'):
1586 if dest:
1586 if dest:
1587 raise error.InputError(
1587 raise error.InputError(
1588 _(b"--all is incompatible with specifying a destination")
1588 _(b"--all is incompatible with specifying a destination")
1589 )
1589 )
1590 if opts.get(b'base'):
1590 if opts.get(b'base'):
1591 ui.warn(_(b"ignoring --base because --all was specified\n"))
1591 ui.warn(_(b"ignoring --base because --all was specified\n"))
1592 base = [nullrev]
1592 base = [nullrev]
1593 else:
1593 else:
1594 base = scmutil.revrange(repo, opts.get(b'base'))
1594 base = scmutil.revrange(repo, opts.get(b'base'))
1595 if cgversion not in changegroup.supportedoutgoingversions(repo):
1595 if cgversion not in changegroup.supportedoutgoingversions(repo):
1596 raise error.Abort(
1596 raise error.Abort(
1597 _(b"repository does not support bundle version %s") % cgversion
1597 _(b"repository does not support bundle version %s") % cgversion
1598 )
1598 )
1599
1599
1600 if base:
1600 if base:
1601 if dest:
1601 if dest:
1602 raise error.InputError(
1602 raise error.InputError(
1603 _(b"--base is incompatible with specifying a destination")
1603 _(b"--base is incompatible with specifying a destination")
1604 )
1604 )
1605 common = [repo[rev].node() for rev in base]
1605 common = [repo[rev].node() for rev in base]
1606 heads = [repo[r].node() for r in revs] if revs else None
1606 heads = [repo[r].node() for r in revs] if revs else None
1607 outgoing = discovery.outgoing(repo, common, heads)
1607 outgoing = discovery.outgoing(repo, common, heads)
1608 else:
1608 else:
1609 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1609 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1610 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1610 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1611 other = hg.peer(repo, opts, dest)
1611 other = hg.peer(repo, opts, dest)
1612 revs = [repo[r].hex() for r in revs]
1612 revs = [repo[r].hex() for r in revs]
1613 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1613 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1614 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1614 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1615 outgoing = discovery.findcommonoutgoing(
1615 outgoing = discovery.findcommonoutgoing(
1616 repo,
1616 repo,
1617 other,
1617 other,
1618 onlyheads=heads,
1618 onlyheads=heads,
1619 force=opts.get(b'force'),
1619 force=opts.get(b'force'),
1620 portable=True,
1620 portable=True,
1621 )
1621 )
1622
1622
1623 if not outgoing.missing:
1623 if not outgoing.missing:
1624 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1624 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1625 return 1
1625 return 1
1626
1626
1627 if cgversion == b'01': # bundle1
1627 if cgversion == b'01': # bundle1
1628 bversion = b'HG10' + bundlespec.wirecompression
1628 bversion = b'HG10' + bundlespec.wirecompression
1629 bcompression = None
1629 bcompression = None
1630 elif cgversion in (b'02', b'03'):
1630 elif cgversion in (b'02', b'03'):
1631 bversion = b'HG20'
1631 bversion = b'HG20'
1632 bcompression = bundlespec.wirecompression
1632 bcompression = bundlespec.wirecompression
1633 else:
1633 else:
1634 raise error.ProgrammingError(
1634 raise error.ProgrammingError(
1635 b'bundle: unexpected changegroup version %s' % cgversion
1635 b'bundle: unexpected changegroup version %s' % cgversion
1636 )
1636 )
1637
1637
1638 # TODO compression options should be derived from bundlespec parsing.
1638 # TODO compression options should be derived from bundlespec parsing.
1639 # This is a temporary hack to allow adjusting bundle compression
1639 # This is a temporary hack to allow adjusting bundle compression
1640 # level without a) formalizing the bundlespec changes to declare it
1640 # level without a) formalizing the bundlespec changes to declare it
1641 # b) introducing a command flag.
1641 # b) introducing a command flag.
1642 compopts = {}
1642 compopts = {}
1643 complevel = ui.configint(
1643 complevel = ui.configint(
1644 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1644 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1645 )
1645 )
1646 if complevel is None:
1646 if complevel is None:
1647 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1647 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1648 if complevel is not None:
1648 if complevel is not None:
1649 compopts[b'level'] = complevel
1649 compopts[b'level'] = complevel
1650
1650
1651 # Allow overriding the bundling of obsmarker in phases through
1651 # Allow overriding the bundling of obsmarker in phases through
1652 # configuration while we don't have a bundle version that include them
1652 # configuration while we don't have a bundle version that include them
1653 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1653 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1654 bundlespec.contentopts[b'obsolescence'] = True
1654 bundlespec.contentopts[b'obsolescence'] = True
1655 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1655 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1656 bundlespec.contentopts[b'phases'] = True
1656 bundlespec.contentopts[b'phases'] = True
1657
1657
1658 bundle2.writenewbundle(
1658 bundle2.writenewbundle(
1659 ui,
1659 ui,
1660 repo,
1660 repo,
1661 b'bundle',
1661 b'bundle',
1662 fname,
1662 fname,
1663 bversion,
1663 bversion,
1664 outgoing,
1664 outgoing,
1665 bundlespec.contentopts,
1665 bundlespec.contentopts,
1666 compression=bcompression,
1666 compression=bcompression,
1667 compopts=compopts,
1667 compopts=compopts,
1668 )
1668 )
1669
1669
1670
1670
1671 @command(
1671 @command(
1672 b'cat',
1672 b'cat',
1673 [
1673 [
1674 (
1674 (
1675 b'o',
1675 b'o',
1676 b'output',
1676 b'output',
1677 b'',
1677 b'',
1678 _(b'print output to file with formatted name'),
1678 _(b'print output to file with formatted name'),
1679 _(b'FORMAT'),
1679 _(b'FORMAT'),
1680 ),
1680 ),
1681 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1681 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1682 (b'', b'decode', None, _(b'apply any matching decode filter')),
1682 (b'', b'decode', None, _(b'apply any matching decode filter')),
1683 ]
1683 ]
1684 + walkopts
1684 + walkopts
1685 + formatteropts,
1685 + formatteropts,
1686 _(b'[OPTION]... FILE...'),
1686 _(b'[OPTION]... FILE...'),
1687 helpcategory=command.CATEGORY_FILE_CONTENTS,
1687 helpcategory=command.CATEGORY_FILE_CONTENTS,
1688 inferrepo=True,
1688 inferrepo=True,
1689 intents={INTENT_READONLY},
1689 intents={INTENT_READONLY},
1690 )
1690 )
1691 def cat(ui, repo, file1, *pats, **opts):
1691 def cat(ui, repo, file1, *pats, **opts):
1692 """output the current or given revision of files
1692 """output the current or given revision of files
1693
1693
1694 Print the specified files as they were at the given revision. If
1694 Print the specified files as they were at the given revision. If
1695 no revision is given, the parent of the working directory is used.
1695 no revision is given, the parent of the working directory is used.
1696
1696
1697 Output may be to a file, in which case the name of the file is
1697 Output may be to a file, in which case the name of the file is
1698 given using a template string. See :hg:`help templates`. In addition
1698 given using a template string. See :hg:`help templates`. In addition
1699 to the common template keywords, the following formatting rules are
1699 to the common template keywords, the following formatting rules are
1700 supported:
1700 supported:
1701
1701
1702 :``%%``: literal "%" character
1702 :``%%``: literal "%" character
1703 :``%s``: basename of file being printed
1703 :``%s``: basename of file being printed
1704 :``%d``: dirname of file being printed, or '.' if in repository root
1704 :``%d``: dirname of file being printed, or '.' if in repository root
1705 :``%p``: root-relative path name of file being printed
1705 :``%p``: root-relative path name of file being printed
1706 :``%H``: changeset hash (40 hexadecimal digits)
1706 :``%H``: changeset hash (40 hexadecimal digits)
1707 :``%R``: changeset revision number
1707 :``%R``: changeset revision number
1708 :``%h``: short-form changeset hash (12 hexadecimal digits)
1708 :``%h``: short-form changeset hash (12 hexadecimal digits)
1709 :``%r``: zero-padded changeset revision number
1709 :``%r``: zero-padded changeset revision number
1710 :``%b``: basename of the exporting repository
1710 :``%b``: basename of the exporting repository
1711 :``\\``: literal "\\" character
1711 :``\\``: literal "\\" character
1712
1712
1713 .. container:: verbose
1713 .. container:: verbose
1714
1714
1715 Template:
1715 Template:
1716
1716
1717 The following keywords are supported in addition to the common template
1717 The following keywords are supported in addition to the common template
1718 keywords and functions. See also :hg:`help templates`.
1718 keywords and functions. See also :hg:`help templates`.
1719
1719
1720 :data: String. File content.
1720 :data: String. File content.
1721 :path: String. Repository-absolute path of the file.
1721 :path: String. Repository-absolute path of the file.
1722
1722
1723 Returns 0 on success.
1723 Returns 0 on success.
1724 """
1724 """
1725 opts = pycompat.byteskwargs(opts)
1725 opts = pycompat.byteskwargs(opts)
1726 rev = opts.get(b'rev')
1726 rev = opts.get(b'rev')
1727 if rev:
1727 if rev:
1728 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1728 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1729 ctx = scmutil.revsingle(repo, rev)
1729 ctx = scmutil.revsingle(repo, rev)
1730 m = scmutil.match(ctx, (file1,) + pats, opts)
1730 m = scmutil.match(ctx, (file1,) + pats, opts)
1731 fntemplate = opts.pop(b'output', b'')
1731 fntemplate = opts.pop(b'output', b'')
1732 if cmdutil.isstdiofilename(fntemplate):
1732 if cmdutil.isstdiofilename(fntemplate):
1733 fntemplate = b''
1733 fntemplate = b''
1734
1734
1735 if fntemplate:
1735 if fntemplate:
1736 fm = formatter.nullformatter(ui, b'cat', opts)
1736 fm = formatter.nullformatter(ui, b'cat', opts)
1737 else:
1737 else:
1738 ui.pager(b'cat')
1738 ui.pager(b'cat')
1739 fm = ui.formatter(b'cat', opts)
1739 fm = ui.formatter(b'cat', opts)
1740 with fm:
1740 with fm:
1741 return cmdutil.cat(
1741 return cmdutil.cat(
1742 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1742 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1743 )
1743 )
1744
1744
1745
1745
1746 @command(
1746 @command(
1747 b'clone',
1747 b'clone',
1748 [
1748 [
1749 (
1749 (
1750 b'U',
1750 b'U',
1751 b'noupdate',
1751 b'noupdate',
1752 None,
1752 None,
1753 _(
1753 _(
1754 b'the clone will include an empty working '
1754 b'the clone will include an empty working '
1755 b'directory (only a repository)'
1755 b'directory (only a repository)'
1756 ),
1756 ),
1757 ),
1757 ),
1758 (
1758 (
1759 b'u',
1759 b'u',
1760 b'updaterev',
1760 b'updaterev',
1761 b'',
1761 b'',
1762 _(b'revision, tag, or branch to check out'),
1762 _(b'revision, tag, or branch to check out'),
1763 _(b'REV'),
1763 _(b'REV'),
1764 ),
1764 ),
1765 (
1765 (
1766 b'r',
1766 b'r',
1767 b'rev',
1767 b'rev',
1768 [],
1768 [],
1769 _(
1769 _(
1770 b'do not clone everything, but include this changeset'
1770 b'do not clone everything, but include this changeset'
1771 b' and its ancestors'
1771 b' and its ancestors'
1772 ),
1772 ),
1773 _(b'REV'),
1773 _(b'REV'),
1774 ),
1774 ),
1775 (
1775 (
1776 b'b',
1776 b'b',
1777 b'branch',
1777 b'branch',
1778 [],
1778 [],
1779 _(
1779 _(
1780 b'do not clone everything, but include this branch\'s'
1780 b'do not clone everything, but include this branch\'s'
1781 b' changesets and their ancestors'
1781 b' changesets and their ancestors'
1782 ),
1782 ),
1783 _(b'BRANCH'),
1783 _(b'BRANCH'),
1784 ),
1784 ),
1785 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1785 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1786 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1786 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1787 (b'', b'stream', None, _(b'clone with minimal data processing')),
1787 (b'', b'stream', None, _(b'clone with minimal data processing')),
1788 ]
1788 ]
1789 + remoteopts,
1789 + remoteopts,
1790 _(b'[OPTION]... SOURCE [DEST]'),
1790 _(b'[OPTION]... SOURCE [DEST]'),
1791 helpcategory=command.CATEGORY_REPO_CREATION,
1791 helpcategory=command.CATEGORY_REPO_CREATION,
1792 helpbasic=True,
1792 helpbasic=True,
1793 norepo=True,
1793 norepo=True,
1794 )
1794 )
1795 def clone(ui, source, dest=None, **opts):
1795 def clone(ui, source, dest=None, **opts):
1796 """make a copy of an existing repository
1796 """make a copy of an existing repository
1797
1797
1798 Create a copy of an existing repository in a new directory.
1798 Create a copy of an existing repository in a new directory.
1799
1799
1800 If no destination directory name is specified, it defaults to the
1800 If no destination directory name is specified, it defaults to the
1801 basename of the source.
1801 basename of the source.
1802
1802
1803 The location of the source is added to the new repository's
1803 The location of the source is added to the new repository's
1804 ``.hg/hgrc`` file, as the default to be used for future pulls.
1804 ``.hg/hgrc`` file, as the default to be used for future pulls.
1805
1805
1806 Only local paths and ``ssh://`` URLs are supported as
1806 Only local paths and ``ssh://`` URLs are supported as
1807 destinations. For ``ssh://`` destinations, no working directory or
1807 destinations. For ``ssh://`` destinations, no working directory or
1808 ``.hg/hgrc`` will be created on the remote side.
1808 ``.hg/hgrc`` will be created on the remote side.
1809
1809
1810 If the source repository has a bookmark called '@' set, that
1810 If the source repository has a bookmark called '@' set, that
1811 revision will be checked out in the new repository by default.
1811 revision will be checked out in the new repository by default.
1812
1812
1813 To check out a particular version, use -u/--update, or
1813 To check out a particular version, use -u/--update, or
1814 -U/--noupdate to create a clone with no working directory.
1814 -U/--noupdate to create a clone with no working directory.
1815
1815
1816 To pull only a subset of changesets, specify one or more revisions
1816 To pull only a subset of changesets, specify one or more revisions
1817 identifiers with -r/--rev or branches with -b/--branch. The
1817 identifiers with -r/--rev or branches with -b/--branch. The
1818 resulting clone will contain only the specified changesets and
1818 resulting clone will contain only the specified changesets and
1819 their ancestors. These options (or 'clone src#rev dest') imply
1819 their ancestors. These options (or 'clone src#rev dest') imply
1820 --pull, even for local source repositories.
1820 --pull, even for local source repositories.
1821
1821
1822 In normal clone mode, the remote normalizes repository data into a common
1822 In normal clone mode, the remote normalizes repository data into a common
1823 exchange format and the receiving end translates this data into its local
1823 exchange format and the receiving end translates this data into its local
1824 storage format. --stream activates a different clone mode that essentially
1824 storage format. --stream activates a different clone mode that essentially
1825 copies repository files from the remote with minimal data processing. This
1825 copies repository files from the remote with minimal data processing. This
1826 significantly reduces the CPU cost of a clone both remotely and locally.
1826 significantly reduces the CPU cost of a clone both remotely and locally.
1827 However, it often increases the transferred data size by 30-40%. This can
1827 However, it often increases the transferred data size by 30-40%. This can
1828 result in substantially faster clones where I/O throughput is plentiful,
1828 result in substantially faster clones where I/O throughput is plentiful,
1829 especially for larger repositories. A side-effect of --stream clones is
1829 especially for larger repositories. A side-effect of --stream clones is
1830 that storage settings and requirements on the remote are applied locally:
1830 that storage settings and requirements on the remote are applied locally:
1831 a modern client may inherit legacy or inefficient storage used by the
1831 a modern client may inherit legacy or inefficient storage used by the
1832 remote or a legacy Mercurial client may not be able to clone from a
1832 remote or a legacy Mercurial client may not be able to clone from a
1833 modern Mercurial remote.
1833 modern Mercurial remote.
1834
1834
1835 .. note::
1835 .. note::
1836
1836
1837 Specifying a tag will include the tagged changeset but not the
1837 Specifying a tag will include the tagged changeset but not the
1838 changeset containing the tag.
1838 changeset containing the tag.
1839
1839
1840 .. container:: verbose
1840 .. container:: verbose
1841
1841
1842 For efficiency, hardlinks are used for cloning whenever the
1842 For efficiency, hardlinks are used for cloning whenever the
1843 source and destination are on the same filesystem (note this
1843 source and destination are on the same filesystem (note this
1844 applies only to the repository data, not to the working
1844 applies only to the repository data, not to the working
1845 directory). Some filesystems, such as AFS, implement hardlinking
1845 directory). Some filesystems, such as AFS, implement hardlinking
1846 incorrectly, but do not report errors. In these cases, use the
1846 incorrectly, but do not report errors. In these cases, use the
1847 --pull option to avoid hardlinking.
1847 --pull option to avoid hardlinking.
1848
1848
1849 Mercurial will update the working directory to the first applicable
1849 Mercurial will update the working directory to the first applicable
1850 revision from this list:
1850 revision from this list:
1851
1851
1852 a) null if -U or the source repository has no changesets
1852 a) null if -U or the source repository has no changesets
1853 b) if -u . and the source repository is local, the first parent of
1853 b) if -u . and the source repository is local, the first parent of
1854 the source repository's working directory
1854 the source repository's working directory
1855 c) the changeset specified with -u (if a branch name, this means the
1855 c) the changeset specified with -u (if a branch name, this means the
1856 latest head of that branch)
1856 latest head of that branch)
1857 d) the changeset specified with -r
1857 d) the changeset specified with -r
1858 e) the tipmost head specified with -b
1858 e) the tipmost head specified with -b
1859 f) the tipmost head specified with the url#branch source syntax
1859 f) the tipmost head specified with the url#branch source syntax
1860 g) the revision marked with the '@' bookmark, if present
1860 g) the revision marked with the '@' bookmark, if present
1861 h) the tipmost head of the default branch
1861 h) the tipmost head of the default branch
1862 i) tip
1862 i) tip
1863
1863
1864 When cloning from servers that support it, Mercurial may fetch
1864 When cloning from servers that support it, Mercurial may fetch
1865 pre-generated data from a server-advertised URL or inline from the
1865 pre-generated data from a server-advertised URL or inline from the
1866 same stream. When this is done, hooks operating on incoming changesets
1866 same stream. When this is done, hooks operating on incoming changesets
1867 and changegroups may fire more than once, once for each pre-generated
1867 and changegroups may fire more than once, once for each pre-generated
1868 bundle and as well as for any additional remaining data. In addition,
1868 bundle and as well as for any additional remaining data. In addition,
1869 if an error occurs, the repository may be rolled back to a partial
1869 if an error occurs, the repository may be rolled back to a partial
1870 clone. This behavior may change in future releases.
1870 clone. This behavior may change in future releases.
1871 See :hg:`help -e clonebundles` for more.
1871 See :hg:`help -e clonebundles` for more.
1872
1872
1873 Examples:
1873 Examples:
1874
1874
1875 - clone a remote repository to a new directory named hg/::
1875 - clone a remote repository to a new directory named hg/::
1876
1876
1877 hg clone https://www.mercurial-scm.org/repo/hg/
1877 hg clone https://www.mercurial-scm.org/repo/hg/
1878
1878
1879 - create a lightweight local clone::
1879 - create a lightweight local clone::
1880
1880
1881 hg clone project/ project-feature/
1881 hg clone project/ project-feature/
1882
1882
1883 - clone from an absolute path on an ssh server (note double-slash)::
1883 - clone from an absolute path on an ssh server (note double-slash)::
1884
1884
1885 hg clone ssh://user@server//home/projects/alpha/
1885 hg clone ssh://user@server//home/projects/alpha/
1886
1886
1887 - do a streaming clone while checking out a specified version::
1887 - do a streaming clone while checking out a specified version::
1888
1888
1889 hg clone --stream http://server/repo -u 1.5
1889 hg clone --stream http://server/repo -u 1.5
1890
1890
1891 - create a repository without changesets after a particular revision::
1891 - create a repository without changesets after a particular revision::
1892
1892
1893 hg clone -r 04e544 experimental/ good/
1893 hg clone -r 04e544 experimental/ good/
1894
1894
1895 - clone (and track) a particular named branch::
1895 - clone (and track) a particular named branch::
1896
1896
1897 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1897 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1898
1898
1899 See :hg:`help urls` for details on specifying URLs.
1899 See :hg:`help urls` for details on specifying URLs.
1900
1900
1901 Returns 0 on success.
1901 Returns 0 on success.
1902 """
1902 """
1903 opts = pycompat.byteskwargs(opts)
1903 opts = pycompat.byteskwargs(opts)
1904 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1904 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1905
1905
1906 # --include/--exclude can come from narrow or sparse.
1906 # --include/--exclude can come from narrow or sparse.
1907 includepats, excludepats = None, None
1907 includepats, excludepats = None, None
1908
1908
1909 # hg.clone() differentiates between None and an empty set. So make sure
1909 # hg.clone() differentiates between None and an empty set. So make sure
1910 # patterns are sets if narrow is requested without patterns.
1910 # patterns are sets if narrow is requested without patterns.
1911 if opts.get(b'narrow'):
1911 if opts.get(b'narrow'):
1912 includepats = set()
1912 includepats = set()
1913 excludepats = set()
1913 excludepats = set()
1914
1914
1915 if opts.get(b'include'):
1915 if opts.get(b'include'):
1916 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1916 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1917 if opts.get(b'exclude'):
1917 if opts.get(b'exclude'):
1918 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1918 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1919
1919
1920 r = hg.clone(
1920 r = hg.clone(
1921 ui,
1921 ui,
1922 opts,
1922 opts,
1923 source,
1923 source,
1924 dest,
1924 dest,
1925 pull=opts.get(b'pull'),
1925 pull=opts.get(b'pull'),
1926 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1926 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1927 revs=opts.get(b'rev'),
1927 revs=opts.get(b'rev'),
1928 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1928 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1929 branch=opts.get(b'branch'),
1929 branch=opts.get(b'branch'),
1930 shareopts=opts.get(b'shareopts'),
1930 shareopts=opts.get(b'shareopts'),
1931 storeincludepats=includepats,
1931 storeincludepats=includepats,
1932 storeexcludepats=excludepats,
1932 storeexcludepats=excludepats,
1933 depth=opts.get(b'depth') or None,
1933 depth=opts.get(b'depth') or None,
1934 )
1934 )
1935
1935
1936 return r is None
1936 return r is None
1937
1937
1938
1938
1939 @command(
1939 @command(
1940 b'commit|ci',
1940 b'commit|ci',
1941 [
1941 [
1942 (
1942 (
1943 b'A',
1943 b'A',
1944 b'addremove',
1944 b'addremove',
1945 None,
1945 None,
1946 _(b'mark new/missing files as added/removed before committing'),
1946 _(b'mark new/missing files as added/removed before committing'),
1947 ),
1947 ),
1948 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1948 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1949 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1949 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1950 (b's', b'secret', None, _(b'use the secret phase for committing')),
1950 (b's', b'secret', None, _(b'use the secret phase for committing')),
1951 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1951 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1952 (
1952 (
1953 b'',
1953 b'',
1954 b'force-close-branch',
1954 b'force-close-branch',
1955 None,
1955 None,
1956 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1956 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1957 ),
1957 ),
1958 (b'i', b'interactive', None, _(b'use interactive mode')),
1958 (b'i', b'interactive', None, _(b'use interactive mode')),
1959 ]
1959 ]
1960 + walkopts
1960 + walkopts
1961 + commitopts
1961 + commitopts
1962 + commitopts2
1962 + commitopts2
1963 + subrepoopts,
1963 + subrepoopts,
1964 _(b'[OPTION]... [FILE]...'),
1964 _(b'[OPTION]... [FILE]...'),
1965 helpcategory=command.CATEGORY_COMMITTING,
1965 helpcategory=command.CATEGORY_COMMITTING,
1966 helpbasic=True,
1966 helpbasic=True,
1967 inferrepo=True,
1967 inferrepo=True,
1968 )
1968 )
1969 def commit(ui, repo, *pats, **opts):
1969 def commit(ui, repo, *pats, **opts):
1970 """commit the specified files or all outstanding changes
1970 """commit the specified files or all outstanding changes
1971
1971
1972 Commit changes to the given files into the repository. Unlike a
1972 Commit changes to the given files into the repository. Unlike a
1973 centralized SCM, this operation is a local operation. See
1973 centralized SCM, this operation is a local operation. See
1974 :hg:`push` for a way to actively distribute your changes.
1974 :hg:`push` for a way to actively distribute your changes.
1975
1975
1976 If a list of files is omitted, all changes reported by :hg:`status`
1976 If a list of files is omitted, all changes reported by :hg:`status`
1977 will be committed.
1977 will be committed.
1978
1978
1979 If you are committing the result of a merge, do not provide any
1979 If you are committing the result of a merge, do not provide any
1980 filenames or -I/-X filters.
1980 filenames or -I/-X filters.
1981
1981
1982 If no commit message is specified, Mercurial starts your
1982 If no commit message is specified, Mercurial starts your
1983 configured editor where you can enter a message. In case your
1983 configured editor where you can enter a message. In case your
1984 commit fails, you will find a backup of your message in
1984 commit fails, you will find a backup of your message in
1985 ``.hg/last-message.txt``.
1985 ``.hg/last-message.txt``.
1986
1986
1987 The --close-branch flag can be used to mark the current branch
1987 The --close-branch flag can be used to mark the current branch
1988 head closed. When all heads of a branch are closed, the branch
1988 head closed. When all heads of a branch are closed, the branch
1989 will be considered closed and no longer listed.
1989 will be considered closed and no longer listed.
1990
1990
1991 The --amend flag can be used to amend the parent of the
1991 The --amend flag can be used to amend the parent of the
1992 working directory with a new commit that contains the changes
1992 working directory with a new commit that contains the changes
1993 in the parent in addition to those currently reported by :hg:`status`,
1993 in the parent in addition to those currently reported by :hg:`status`,
1994 if there are any. The old commit is stored in a backup bundle in
1994 if there are any. The old commit is stored in a backup bundle in
1995 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1995 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1996 on how to restore it).
1996 on how to restore it).
1997
1997
1998 Message, user and date are taken from the amended commit unless
1998 Message, user and date are taken from the amended commit unless
1999 specified. When a message isn't specified on the command line,
1999 specified. When a message isn't specified on the command line,
2000 the editor will open with the message of the amended commit.
2000 the editor will open with the message of the amended commit.
2001
2001
2002 It is not possible to amend public changesets (see :hg:`help phases`)
2002 It is not possible to amend public changesets (see :hg:`help phases`)
2003 or changesets that have children.
2003 or changesets that have children.
2004
2004
2005 See :hg:`help dates` for a list of formats valid for -d/--date.
2005 See :hg:`help dates` for a list of formats valid for -d/--date.
2006
2006
2007 Returns 0 on success, 1 if nothing changed.
2007 Returns 0 on success, 1 if nothing changed.
2008
2008
2009 .. container:: verbose
2009 .. container:: verbose
2010
2010
2011 Examples:
2011 Examples:
2012
2012
2013 - commit all files ending in .py::
2013 - commit all files ending in .py::
2014
2014
2015 hg commit --include "set:**.py"
2015 hg commit --include "set:**.py"
2016
2016
2017 - commit all non-binary files::
2017 - commit all non-binary files::
2018
2018
2019 hg commit --exclude "set:binary()"
2019 hg commit --exclude "set:binary()"
2020
2020
2021 - amend the current commit and set the date to now::
2021 - amend the current commit and set the date to now::
2022
2022
2023 hg commit --amend --date now
2023 hg commit --amend --date now
2024 """
2024 """
2025 with repo.wlock(), repo.lock():
2025 with repo.wlock(), repo.lock():
2026 return _docommit(ui, repo, *pats, **opts)
2026 return _docommit(ui, repo, *pats, **opts)
2027
2027
2028
2028
2029 def _docommit(ui, repo, *pats, **opts):
2029 def _docommit(ui, repo, *pats, **opts):
2030 if opts.get('interactive'):
2030 if opts.get('interactive'):
2031 opts.pop('interactive')
2031 opts.pop('interactive')
2032 ret = cmdutil.dorecord(
2032 ret = cmdutil.dorecord(
2033 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2033 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2034 )
2034 )
2035 # ret can be 0 (no changes to record) or the value returned by
2035 # ret can be 0 (no changes to record) or the value returned by
2036 # commit(), 1 if nothing changed or None on success.
2036 # commit(), 1 if nothing changed or None on success.
2037 return 1 if ret == 0 else ret
2037 return 1 if ret == 0 else ret
2038
2038
2039 opts = pycompat.byteskwargs(opts)
2039 opts = pycompat.byteskwargs(opts)
2040 if opts.get(b'subrepos'):
2040 if opts.get(b'subrepos'):
2041 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2041 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2042 # Let --subrepos on the command line override config setting.
2042 # Let --subrepos on the command line override config setting.
2043 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2043 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2044
2044
2045 cmdutil.checkunfinished(repo, commit=True)
2045 cmdutil.checkunfinished(repo, commit=True)
2046
2046
2047 branch = repo[None].branch()
2047 branch = repo[None].branch()
2048 bheads = repo.branchheads(branch)
2048 bheads = repo.branchheads(branch)
2049 tip = repo.changelog.tip()
2049 tip = repo.changelog.tip()
2050
2050
2051 extra = {}
2051 extra = {}
2052 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2052 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2053 extra[b'close'] = b'1'
2053 extra[b'close'] = b'1'
2054
2054
2055 if repo[b'.'].closesbranch():
2055 if repo[b'.'].closesbranch():
2056 raise error.InputError(
2056 raise error.InputError(
2057 _(b'current revision is already a branch closing head')
2057 _(b'current revision is already a branch closing head')
2058 )
2058 )
2059 elif not bheads:
2059 elif not bheads:
2060 raise error.InputError(
2060 raise error.InputError(
2061 _(b'branch "%s" has no heads to close') % branch
2061 _(b'branch "%s" has no heads to close') % branch
2062 )
2062 )
2063 elif (
2063 elif (
2064 branch == repo[b'.'].branch()
2064 branch == repo[b'.'].branch()
2065 and repo[b'.'].node() not in bheads
2065 and repo[b'.'].node() not in bheads
2066 and not opts.get(b'force_close_branch')
2066 and not opts.get(b'force_close_branch')
2067 ):
2067 ):
2068 hint = _(
2068 hint = _(
2069 b'use --force-close-branch to close branch from a non-head'
2069 b'use --force-close-branch to close branch from a non-head'
2070 b' changeset'
2070 b' changeset'
2071 )
2071 )
2072 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2072 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2073 elif opts.get(b'amend'):
2073 elif opts.get(b'amend'):
2074 if (
2074 if (
2075 repo[b'.'].p1().branch() != branch
2075 repo[b'.'].p1().branch() != branch
2076 and repo[b'.'].p2().branch() != branch
2076 and repo[b'.'].p2().branch() != branch
2077 ):
2077 ):
2078 raise error.InputError(_(b'can only close branch heads'))
2078 raise error.InputError(_(b'can only close branch heads'))
2079
2079
2080 if opts.get(b'amend'):
2080 if opts.get(b'amend'):
2081 if ui.configbool(b'ui', b'commitsubrepos'):
2081 if ui.configbool(b'ui', b'commitsubrepos'):
2082 raise error.InputError(
2082 raise error.InputError(
2083 _(b'cannot amend with ui.commitsubrepos enabled')
2083 _(b'cannot amend with ui.commitsubrepos enabled')
2084 )
2084 )
2085
2085
2086 old = repo[b'.']
2086 old = repo[b'.']
2087 rewriteutil.precheck(repo, [old.rev()], b'amend')
2087 rewriteutil.precheck(repo, [old.rev()], b'amend')
2088
2088
2089 # Currently histedit gets confused if an amend happens while histedit
2089 # Currently histedit gets confused if an amend happens while histedit
2090 # is in progress. Since we have a checkunfinished command, we are
2090 # is in progress. Since we have a checkunfinished command, we are
2091 # temporarily honoring it.
2091 # temporarily honoring it.
2092 #
2092 #
2093 # Note: eventually this guard will be removed. Please do not expect
2093 # Note: eventually this guard will be removed. Please do not expect
2094 # this behavior to remain.
2094 # this behavior to remain.
2095 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2095 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2096 cmdutil.checkunfinished(repo)
2096 cmdutil.checkunfinished(repo)
2097
2097
2098 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2098 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2099 if node == old.node():
2099 if node == old.node():
2100 ui.status(_(b"nothing changed\n"))
2100 ui.status(_(b"nothing changed\n"))
2101 return 1
2101 return 1
2102 else:
2102 else:
2103
2103
2104 def commitfunc(ui, repo, message, match, opts):
2104 def commitfunc(ui, repo, message, match, opts):
2105 overrides = {}
2105 overrides = {}
2106 if opts.get(b'secret'):
2106 if opts.get(b'secret'):
2107 overrides[(b'phases', b'new-commit')] = b'secret'
2107 overrides[(b'phases', b'new-commit')] = b'secret'
2108
2108
2109 baseui = repo.baseui
2109 baseui = repo.baseui
2110 with baseui.configoverride(overrides, b'commit'):
2110 with baseui.configoverride(overrides, b'commit'):
2111 with ui.configoverride(overrides, b'commit'):
2111 with ui.configoverride(overrides, b'commit'):
2112 editform = cmdutil.mergeeditform(
2112 editform = cmdutil.mergeeditform(
2113 repo[None], b'commit.normal'
2113 repo[None], b'commit.normal'
2114 )
2114 )
2115 editor = cmdutil.getcommiteditor(
2115 editor = cmdutil.getcommiteditor(
2116 editform=editform, **pycompat.strkwargs(opts)
2116 editform=editform, **pycompat.strkwargs(opts)
2117 )
2117 )
2118 return repo.commit(
2118 return repo.commit(
2119 message,
2119 message,
2120 opts.get(b'user'),
2120 opts.get(b'user'),
2121 opts.get(b'date'),
2121 opts.get(b'date'),
2122 match,
2122 match,
2123 editor=editor,
2123 editor=editor,
2124 extra=extra,
2124 extra=extra,
2125 )
2125 )
2126
2126
2127 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2127 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2128
2128
2129 if not node:
2129 if not node:
2130 stat = cmdutil.postcommitstatus(repo, pats, opts)
2130 stat = cmdutil.postcommitstatus(repo, pats, opts)
2131 if stat.deleted:
2131 if stat.deleted:
2132 ui.status(
2132 ui.status(
2133 _(
2133 _(
2134 b"nothing changed (%d missing files, see "
2134 b"nothing changed (%d missing files, see "
2135 b"'hg status')\n"
2135 b"'hg status')\n"
2136 )
2136 )
2137 % len(stat.deleted)
2137 % len(stat.deleted)
2138 )
2138 )
2139 else:
2139 else:
2140 ui.status(_(b"nothing changed\n"))
2140 ui.status(_(b"nothing changed\n"))
2141 return 1
2141 return 1
2142
2142
2143 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2143 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2144
2144
2145 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2145 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2146 status(
2146 status(
2147 ui,
2147 ui,
2148 repo,
2148 repo,
2149 modified=True,
2149 modified=True,
2150 added=True,
2150 added=True,
2151 removed=True,
2151 removed=True,
2152 deleted=True,
2152 deleted=True,
2153 unknown=True,
2153 unknown=True,
2154 subrepos=opts.get(b'subrepos'),
2154 subrepos=opts.get(b'subrepos'),
2155 )
2155 )
2156
2156
2157
2157
2158 @command(
2158 @command(
2159 b'config|showconfig|debugconfig',
2159 b'config|showconfig|debugconfig',
2160 [
2160 [
2161 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2161 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2162 (b'e', b'edit', None, _(b'edit user config')),
2162 (b'e', b'edit', None, _(b'edit user config')),
2163 (b'l', b'local', None, _(b'edit repository config')),
2163 (b'l', b'local', None, _(b'edit repository config')),
2164 (
2164 (
2165 b'',
2165 b'',
2166 b'shared',
2166 b'shared',
2167 None,
2167 None,
2168 _(b'edit shared source repository config (EXPERIMENTAL)'),
2168 _(b'edit shared source repository config (EXPERIMENTAL)'),
2169 ),
2169 ),
2170 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2170 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2171 (b'g', b'global', None, _(b'edit global config')),
2171 (b'g', b'global', None, _(b'edit global config')),
2172 ]
2172 ]
2173 + formatteropts,
2173 + formatteropts,
2174 _(b'[-u] [NAME]...'),
2174 _(b'[-u] [NAME]...'),
2175 helpcategory=command.CATEGORY_HELP,
2175 helpcategory=command.CATEGORY_HELP,
2176 optionalrepo=True,
2176 optionalrepo=True,
2177 intents={INTENT_READONLY},
2177 intents={INTENT_READONLY},
2178 )
2178 )
2179 def config(ui, repo, *values, **opts):
2179 def config(ui, repo, *values, **opts):
2180 """show combined config settings from all hgrc files
2180 """show combined config settings from all hgrc files
2181
2181
2182 With no arguments, print names and values of all config items.
2182 With no arguments, print names and values of all config items.
2183
2183
2184 With one argument of the form section.name, print just the value
2184 With one argument of the form section.name, print just the value
2185 of that config item.
2185 of that config item.
2186
2186
2187 With multiple arguments, print names and values of all config
2187 With multiple arguments, print names and values of all config
2188 items with matching section names or section.names.
2188 items with matching section names or section.names.
2189
2189
2190 With --edit, start an editor on the user-level config file. With
2190 With --edit, start an editor on the user-level config file. With
2191 --global, edit the system-wide config file. With --local, edit the
2191 --global, edit the system-wide config file. With --local, edit the
2192 repository-level config file.
2192 repository-level config file.
2193
2193
2194 With --debug, the source (filename and line number) is printed
2194 With --debug, the source (filename and line number) is printed
2195 for each config item.
2195 for each config item.
2196
2196
2197 See :hg:`help config` for more information about config files.
2197 See :hg:`help config` for more information about config files.
2198
2198
2199 .. container:: verbose
2199 .. container:: verbose
2200
2200
2201 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2201 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2202 This file is not shared across shares when in share-safe mode.
2202 This file is not shared across shares when in share-safe mode.
2203
2203
2204 Template:
2204 Template:
2205
2205
2206 The following keywords are supported. See also :hg:`help templates`.
2206 The following keywords are supported. See also :hg:`help templates`.
2207
2207
2208 :name: String. Config name.
2208 :name: String. Config name.
2209 :source: String. Filename and line number where the item is defined.
2209 :source: String. Filename and line number where the item is defined.
2210 :value: String. Config value.
2210 :value: String. Config value.
2211
2211
2212 The --shared flag can be used to edit the config file of shared source
2212 The --shared flag can be used to edit the config file of shared source
2213 repository. It only works when you have shared using the experimental
2213 repository. It only works when you have shared using the experimental
2214 share safe feature.
2214 share safe feature.
2215
2215
2216 Returns 0 on success, 1 if NAME does not exist.
2216 Returns 0 on success, 1 if NAME does not exist.
2217
2217
2218 """
2218 """
2219
2219
2220 opts = pycompat.byteskwargs(opts)
2220 opts = pycompat.byteskwargs(opts)
2221 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2221 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2222 if any(opts.get(o) for o in editopts):
2222 if any(opts.get(o) for o in editopts):
2223 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2223 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2224 if opts.get(b'local'):
2224 if opts.get(b'local'):
2225 if not repo:
2225 if not repo:
2226 raise error.InputError(
2226 raise error.InputError(
2227 _(b"can't use --local outside a repository")
2227 _(b"can't use --local outside a repository")
2228 )
2228 )
2229 paths = [repo.vfs.join(b'hgrc')]
2229 paths = [repo.vfs.join(b'hgrc')]
2230 elif opts.get(b'global'):
2230 elif opts.get(b'global'):
2231 paths = rcutil.systemrcpath()
2231 paths = rcutil.systemrcpath()
2232 elif opts.get(b'shared'):
2232 elif opts.get(b'shared'):
2233 if not repo.shared():
2233 if not repo.shared():
2234 raise error.InputError(
2234 raise error.InputError(
2235 _(b"repository is not shared; can't use --shared")
2235 _(b"repository is not shared; can't use --shared")
2236 )
2236 )
2237 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2237 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2238 raise error.InputError(
2238 raise error.InputError(
2239 _(
2239 _(
2240 b"share safe feature not enabled; "
2240 b"share safe feature not enabled; "
2241 b"unable to edit shared source repository config"
2241 b"unable to edit shared source repository config"
2242 )
2242 )
2243 )
2243 )
2244 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2244 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2245 elif opts.get(b'non_shared'):
2245 elif opts.get(b'non_shared'):
2246 paths = [repo.vfs.join(b'hgrc-not-shared')]
2246 paths = [repo.vfs.join(b'hgrc-not-shared')]
2247 else:
2247 else:
2248 paths = rcutil.userrcpath()
2248 paths = rcutil.userrcpath()
2249
2249
2250 for f in paths:
2250 for f in paths:
2251 if os.path.exists(f):
2251 if os.path.exists(f):
2252 break
2252 break
2253 else:
2253 else:
2254 if opts.get(b'global'):
2254 if opts.get(b'global'):
2255 samplehgrc = uimod.samplehgrcs[b'global']
2255 samplehgrc = uimod.samplehgrcs[b'global']
2256 elif opts.get(b'local'):
2256 elif opts.get(b'local'):
2257 samplehgrc = uimod.samplehgrcs[b'local']
2257 samplehgrc = uimod.samplehgrcs[b'local']
2258 else:
2258 else:
2259 samplehgrc = uimod.samplehgrcs[b'user']
2259 samplehgrc = uimod.samplehgrcs[b'user']
2260
2260
2261 f = paths[0]
2261 f = paths[0]
2262 fp = open(f, b"wb")
2262 fp = open(f, b"wb")
2263 fp.write(util.tonativeeol(samplehgrc))
2263 fp.write(util.tonativeeol(samplehgrc))
2264 fp.close()
2264 fp.close()
2265
2265
2266 editor = ui.geteditor()
2266 editor = ui.geteditor()
2267 ui.system(
2267 ui.system(
2268 b"%s \"%s\"" % (editor, f),
2268 b"%s \"%s\"" % (editor, f),
2269 onerr=error.InputError,
2269 onerr=error.InputError,
2270 errprefix=_(b"edit failed"),
2270 errprefix=_(b"edit failed"),
2271 blockedtag=b'config_edit',
2271 blockedtag=b'config_edit',
2272 )
2272 )
2273 return
2273 return
2274 ui.pager(b'config')
2274 ui.pager(b'config')
2275 fm = ui.formatter(b'config', opts)
2275 fm = ui.formatter(b'config', opts)
2276 for t, f in rcutil.rccomponents():
2276 for t, f in rcutil.rccomponents():
2277 if t == b'path':
2277 if t == b'path':
2278 ui.debug(b'read config from: %s\n' % f)
2278 ui.debug(b'read config from: %s\n' % f)
2279 elif t == b'resource':
2279 elif t == b'resource':
2280 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2280 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2281 elif t == b'items':
2281 elif t == b'items':
2282 # Don't print anything for 'items'.
2282 # Don't print anything for 'items'.
2283 pass
2283 pass
2284 else:
2284 else:
2285 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2285 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2286 untrusted = bool(opts.get(b'untrusted'))
2286 untrusted = bool(opts.get(b'untrusted'))
2287
2287
2288 selsections = selentries = []
2288 selsections = selentries = []
2289 if values:
2289 if values:
2290 selsections = [v for v in values if b'.' not in v]
2290 selsections = [v for v in values if b'.' not in v]
2291 selentries = [v for v in values if b'.' in v]
2291 selentries = [v for v in values if b'.' in v]
2292 uniquesel = len(selentries) == 1 and not selsections
2292 uniquesel = len(selentries) == 1 and not selsections
2293 selsections = set(selsections)
2293 selsections = set(selsections)
2294 selentries = set(selentries)
2294 selentries = set(selentries)
2295
2295
2296 matched = False
2296 matched = False
2297 for section, name, value in ui.walkconfig(untrusted=untrusted):
2297 for section, name, value in ui.walkconfig(untrusted=untrusted):
2298 source = ui.configsource(section, name, untrusted)
2298 source = ui.configsource(section, name, untrusted)
2299 value = pycompat.bytestr(value)
2299 value = pycompat.bytestr(value)
2300 defaultvalue = ui.configdefault(section, name)
2300 defaultvalue = ui.configdefault(section, name)
2301 if fm.isplain():
2301 if fm.isplain():
2302 source = source or b'none'
2302 source = source or b'none'
2303 value = value.replace(b'\n', b'\\n')
2303 value = value.replace(b'\n', b'\\n')
2304 entryname = section + b'.' + name
2304 entryname = section + b'.' + name
2305 if values and not (section in selsections or entryname in selentries):
2305 if values and not (section in selsections or entryname in selentries):
2306 continue
2306 continue
2307 fm.startitem()
2307 fm.startitem()
2308 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2308 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2309 if uniquesel:
2309 if uniquesel:
2310 fm.data(name=entryname)
2310 fm.data(name=entryname)
2311 fm.write(b'value', b'%s\n', value)
2311 fm.write(b'value', b'%s\n', value)
2312 else:
2312 else:
2313 fm.write(b'name value', b'%s=%s\n', entryname, value)
2313 fm.write(b'name value', b'%s=%s\n', entryname, value)
2314 if formatter.isprintable(defaultvalue):
2314 if formatter.isprintable(defaultvalue):
2315 fm.data(defaultvalue=defaultvalue)
2315 fm.data(defaultvalue=defaultvalue)
2316 elif isinstance(defaultvalue, list) and all(
2316 elif isinstance(defaultvalue, list) and all(
2317 formatter.isprintable(e) for e in defaultvalue
2317 formatter.isprintable(e) for e in defaultvalue
2318 ):
2318 ):
2319 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2319 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2320 # TODO: no idea how to process unsupported defaultvalue types
2320 # TODO: no idea how to process unsupported defaultvalue types
2321 matched = True
2321 matched = True
2322 fm.end()
2322 fm.end()
2323 if matched:
2323 if matched:
2324 return 0
2324 return 0
2325 return 1
2325 return 1
2326
2326
2327
2327
2328 @command(
2328 @command(
2329 b'continue',
2329 b'continue',
2330 dryrunopts,
2330 dryrunopts,
2331 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2331 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2332 helpbasic=True,
2332 helpbasic=True,
2333 )
2333 )
2334 def continuecmd(ui, repo, **opts):
2334 def continuecmd(ui, repo, **opts):
2335 """resumes an interrupted operation (EXPERIMENTAL)
2335 """resumes an interrupted operation (EXPERIMENTAL)
2336
2336
2337 Finishes a multistep operation like graft, histedit, rebase, merge,
2337 Finishes a multistep operation like graft, histedit, rebase, merge,
2338 and unshelve if they are in an interrupted state.
2338 and unshelve if they are in an interrupted state.
2339
2339
2340 use --dry-run/-n to dry run the command.
2340 use --dry-run/-n to dry run the command.
2341 """
2341 """
2342 dryrun = opts.get('dry_run')
2342 dryrun = opts.get('dry_run')
2343 contstate = cmdutil.getunfinishedstate(repo)
2343 contstate = cmdutil.getunfinishedstate(repo)
2344 if not contstate:
2344 if not contstate:
2345 raise error.StateError(_(b'no operation in progress'))
2345 raise error.StateError(_(b'no operation in progress'))
2346 if not contstate.continuefunc:
2346 if not contstate.continuefunc:
2347 raise error.StateError(
2347 raise error.StateError(
2348 (
2348 (
2349 _(b"%s in progress but does not support 'hg continue'")
2349 _(b"%s in progress but does not support 'hg continue'")
2350 % (contstate._opname)
2350 % (contstate._opname)
2351 ),
2351 ),
2352 hint=contstate.continuemsg(),
2352 hint=contstate.continuemsg(),
2353 )
2353 )
2354 if dryrun:
2354 if dryrun:
2355 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2355 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2356 return
2356 return
2357 return contstate.continuefunc(ui, repo)
2357 return contstate.continuefunc(ui, repo)
2358
2358
2359
2359
2360 @command(
2360 @command(
2361 b'copy|cp',
2361 b'copy|cp',
2362 [
2362 [
2363 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2363 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2364 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2364 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2365 (
2365 (
2366 b'',
2366 b'',
2367 b'at-rev',
2367 b'at-rev',
2368 b'',
2368 b'',
2369 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2369 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2370 _(b'REV'),
2370 _(b'REV'),
2371 ),
2371 ),
2372 (
2372 (
2373 b'f',
2373 b'f',
2374 b'force',
2374 b'force',
2375 None,
2375 None,
2376 _(b'forcibly copy over an existing managed file'),
2376 _(b'forcibly copy over an existing managed file'),
2377 ),
2377 ),
2378 ]
2378 ]
2379 + walkopts
2379 + walkopts
2380 + dryrunopts,
2380 + dryrunopts,
2381 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2381 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2382 helpcategory=command.CATEGORY_FILE_CONTENTS,
2382 helpcategory=command.CATEGORY_FILE_CONTENTS,
2383 )
2383 )
2384 def copy(ui, repo, *pats, **opts):
2384 def copy(ui, repo, *pats, **opts):
2385 """mark files as copied for the next commit
2385 """mark files as copied for the next commit
2386
2386
2387 Mark dest as having copies of source files. If dest is a
2387 Mark dest as having copies of source files. If dest is a
2388 directory, copies are put in that directory. If dest is a file,
2388 directory, copies are put in that directory. If dest is a file,
2389 the source must be a single file.
2389 the source must be a single file.
2390
2390
2391 By default, this command copies the contents of files as they
2391 By default, this command copies the contents of files as they
2392 exist in the working directory. If invoked with -A/--after, the
2392 exist in the working directory. If invoked with -A/--after, the
2393 operation is recorded, but no copying is performed.
2393 operation is recorded, but no copying is performed.
2394
2394
2395 To undo marking a destination file as copied, use --forget. With that
2395 To undo marking a destination file as copied, use --forget. With that
2396 option, all given (positional) arguments are unmarked as copies. The
2396 option, all given (positional) arguments are unmarked as copies. The
2397 destination file(s) will be left in place (still tracked).
2397 destination file(s) will be left in place (still tracked).
2398
2398
2399 This command takes effect with the next commit by default.
2399 This command takes effect with the next commit by default.
2400
2400
2401 Returns 0 on success, 1 if errors are encountered.
2401 Returns 0 on success, 1 if errors are encountered.
2402 """
2402 """
2403 opts = pycompat.byteskwargs(opts)
2403 opts = pycompat.byteskwargs(opts)
2404 with repo.wlock():
2404 with repo.wlock():
2405 return cmdutil.copy(ui, repo, pats, opts)
2405 return cmdutil.copy(ui, repo, pats, opts)
2406
2406
2407
2407
2408 @command(
2408 @command(
2409 b'debugcommands',
2409 b'debugcommands',
2410 [],
2410 [],
2411 _(b'[COMMAND]'),
2411 _(b'[COMMAND]'),
2412 helpcategory=command.CATEGORY_HELP,
2412 helpcategory=command.CATEGORY_HELP,
2413 norepo=True,
2413 norepo=True,
2414 )
2414 )
2415 def debugcommands(ui, cmd=b'', *args):
2415 def debugcommands(ui, cmd=b'', *args):
2416 """list all available commands and options"""
2416 """list all available commands and options"""
2417 for cmd, vals in sorted(pycompat.iteritems(table)):
2417 for cmd, vals in sorted(pycompat.iteritems(table)):
2418 cmd = cmd.split(b'|')[0]
2418 cmd = cmd.split(b'|')[0]
2419 opts = b', '.join([i[1] for i in vals[1]])
2419 opts = b', '.join([i[1] for i in vals[1]])
2420 ui.write(b'%s: %s\n' % (cmd, opts))
2420 ui.write(b'%s: %s\n' % (cmd, opts))
2421
2421
2422
2422
2423 @command(
2423 @command(
2424 b'debugcomplete',
2424 b'debugcomplete',
2425 [(b'o', b'options', None, _(b'show the command options'))],
2425 [(b'o', b'options', None, _(b'show the command options'))],
2426 _(b'[-o] CMD'),
2426 _(b'[-o] CMD'),
2427 helpcategory=command.CATEGORY_HELP,
2427 helpcategory=command.CATEGORY_HELP,
2428 norepo=True,
2428 norepo=True,
2429 )
2429 )
2430 def debugcomplete(ui, cmd=b'', **opts):
2430 def debugcomplete(ui, cmd=b'', **opts):
2431 """returns the completion list associated with the given command"""
2431 """returns the completion list associated with the given command"""
2432
2432
2433 if opts.get('options'):
2433 if opts.get('options'):
2434 options = []
2434 options = []
2435 otables = [globalopts]
2435 otables = [globalopts]
2436 if cmd:
2436 if cmd:
2437 aliases, entry = cmdutil.findcmd(cmd, table, False)
2437 aliases, entry = cmdutil.findcmd(cmd, table, False)
2438 otables.append(entry[1])
2438 otables.append(entry[1])
2439 for t in otables:
2439 for t in otables:
2440 for o in t:
2440 for o in t:
2441 if b"(DEPRECATED)" in o[3]:
2441 if b"(DEPRECATED)" in o[3]:
2442 continue
2442 continue
2443 if o[0]:
2443 if o[0]:
2444 options.append(b'-%s' % o[0])
2444 options.append(b'-%s' % o[0])
2445 options.append(b'--%s' % o[1])
2445 options.append(b'--%s' % o[1])
2446 ui.write(b"%s\n" % b"\n".join(options))
2446 ui.write(b"%s\n" % b"\n".join(options))
2447 return
2447 return
2448
2448
2449 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2449 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2450 if ui.verbose:
2450 if ui.verbose:
2451 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2451 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2452 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2452 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2453
2453
2454
2454
2455 @command(
2455 @command(
2456 b'diff',
2456 b'diff',
2457 [
2457 [
2458 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2458 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2459 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2459 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2460 ]
2460 ]
2461 + diffopts
2461 + diffopts
2462 + diffopts2
2462 + diffopts2
2463 + walkopts
2463 + walkopts
2464 + subrepoopts,
2464 + subrepoopts,
2465 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2465 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2466 helpcategory=command.CATEGORY_FILE_CONTENTS,
2466 helpcategory=command.CATEGORY_FILE_CONTENTS,
2467 helpbasic=True,
2467 helpbasic=True,
2468 inferrepo=True,
2468 inferrepo=True,
2469 intents={INTENT_READONLY},
2469 intents={INTENT_READONLY},
2470 )
2470 )
2471 def diff(ui, repo, *pats, **opts):
2471 def diff(ui, repo, *pats, **opts):
2472 """diff repository (or selected files)
2472 """diff repository (or selected files)
2473
2473
2474 Show differences between revisions for the specified files.
2474 Show differences between revisions for the specified files.
2475
2475
2476 Differences between files are shown using the unified diff format.
2476 Differences between files are shown using the unified diff format.
2477
2477
2478 .. note::
2478 .. note::
2479
2479
2480 :hg:`diff` may generate unexpected results for merges, as it will
2480 :hg:`diff` may generate unexpected results for merges, as it will
2481 default to comparing against the working directory's first
2481 default to comparing against the working directory's first
2482 parent changeset if no revisions are specified.
2482 parent changeset if no revisions are specified.
2483
2483
2484 When two revision arguments are given, then changes are shown
2484 When two revision arguments are given, then changes are shown
2485 between those revisions. If only one revision is specified then
2485 between those revisions. If only one revision is specified then
2486 that revision is compared to the working directory, and, when no
2486 that revision is compared to the working directory, and, when no
2487 revisions are specified, the working directory files are compared
2487 revisions are specified, the working directory files are compared
2488 to its first parent.
2488 to its first parent.
2489
2489
2490 Alternatively you can specify -c/--change with a revision to see
2490 Alternatively you can specify -c/--change with a revision to see
2491 the changes in that changeset relative to its first parent.
2491 the changes in that changeset relative to its first parent.
2492
2492
2493 Without the -a/--text option, diff will avoid generating diffs of
2493 Without the -a/--text option, diff will avoid generating diffs of
2494 files it detects as binary. With -a, diff will generate a diff
2494 files it detects as binary. With -a, diff will generate a diff
2495 anyway, probably with undesirable results.
2495 anyway, probably with undesirable results.
2496
2496
2497 Use the -g/--git option to generate diffs in the git extended diff
2497 Use the -g/--git option to generate diffs in the git extended diff
2498 format. For more information, read :hg:`help diffs`.
2498 format. For more information, read :hg:`help diffs`.
2499
2499
2500 .. container:: verbose
2500 .. container:: verbose
2501
2501
2502 Examples:
2502 Examples:
2503
2503
2504 - compare a file in the current working directory to its parent::
2504 - compare a file in the current working directory to its parent::
2505
2505
2506 hg diff foo.c
2506 hg diff foo.c
2507
2507
2508 - compare two historical versions of a directory, with rename info::
2508 - compare two historical versions of a directory, with rename info::
2509
2509
2510 hg diff --git -r 1.0:1.2 lib/
2510 hg diff --git -r 1.0:1.2 lib/
2511
2511
2512 - get change stats relative to the last change on some date::
2512 - get change stats relative to the last change on some date::
2513
2513
2514 hg diff --stat -r "date('may 2')"
2514 hg diff --stat -r "date('may 2')"
2515
2515
2516 - diff all newly-added files that contain a keyword::
2516 - diff all newly-added files that contain a keyword::
2517
2517
2518 hg diff "set:added() and grep(GNU)"
2518 hg diff "set:added() and grep(GNU)"
2519
2519
2520 - compare a revision and its parents::
2520 - compare a revision and its parents::
2521
2521
2522 hg diff -c 9353 # compare against first parent
2522 hg diff -c 9353 # compare against first parent
2523 hg diff -r 9353^:9353 # same using revset syntax
2523 hg diff -r 9353^:9353 # same using revset syntax
2524 hg diff -r 9353^2:9353 # compare against the second parent
2524 hg diff -r 9353^2:9353 # compare against the second parent
2525
2525
2526 Returns 0 on success.
2526 Returns 0 on success.
2527 """
2527 """
2528
2528
2529 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2529 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2530 opts = pycompat.byteskwargs(opts)
2530 opts = pycompat.byteskwargs(opts)
2531 revs = opts.get(b'rev')
2531 revs = opts.get(b'rev')
2532 change = opts.get(b'change')
2532 change = opts.get(b'change')
2533 stat = opts.get(b'stat')
2533 stat = opts.get(b'stat')
2534 reverse = opts.get(b'reverse')
2534 reverse = opts.get(b'reverse')
2535
2535
2536 if change:
2536 if change:
2537 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2537 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2538 ctx2 = scmutil.revsingle(repo, change, None)
2538 ctx2 = scmutil.revsingle(repo, change, None)
2539 ctx1 = ctx2.p1()
2539 ctx1 = ctx2.p1()
2540 else:
2540 else:
2541 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2541 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2542 ctx1, ctx2 = scmutil.revpair(repo, revs)
2542 ctx1, ctx2 = scmutil.revpair(repo, revs)
2543
2543
2544 if reverse:
2544 if reverse:
2545 ctxleft = ctx2
2545 ctxleft = ctx2
2546 ctxright = ctx1
2546 ctxright = ctx1
2547 else:
2547 else:
2548 ctxleft = ctx1
2548 ctxleft = ctx1
2549 ctxright = ctx2
2549 ctxright = ctx2
2550
2550
2551 diffopts = patch.diffallopts(ui, opts)
2551 diffopts = patch.diffallopts(ui, opts)
2552 m = scmutil.match(ctx2, pats, opts)
2552 m = scmutil.match(ctx2, pats, opts)
2553 m = repo.narrowmatch(m)
2553 m = repo.narrowmatch(m)
2554 ui.pager(b'diff')
2554 ui.pager(b'diff')
2555 logcmdutil.diffordiffstat(
2555 logcmdutil.diffordiffstat(
2556 ui,
2556 ui,
2557 repo,
2557 repo,
2558 diffopts,
2558 diffopts,
2559 ctxleft,
2559 ctxleft,
2560 ctxright,
2560 ctxright,
2561 m,
2561 m,
2562 stat=stat,
2562 stat=stat,
2563 listsubrepos=opts.get(b'subrepos'),
2563 listsubrepos=opts.get(b'subrepos'),
2564 root=opts.get(b'root'),
2564 root=opts.get(b'root'),
2565 )
2565 )
2566
2566
2567
2567
2568 @command(
2568 @command(
2569 b'export',
2569 b'export',
2570 [
2570 [
2571 (
2571 (
2572 b'B',
2572 b'B',
2573 b'bookmark',
2573 b'bookmark',
2574 b'',
2574 b'',
2575 _(b'export changes only reachable by given bookmark'),
2575 _(b'export changes only reachable by given bookmark'),
2576 _(b'BOOKMARK'),
2576 _(b'BOOKMARK'),
2577 ),
2577 ),
2578 (
2578 (
2579 b'o',
2579 b'o',
2580 b'output',
2580 b'output',
2581 b'',
2581 b'',
2582 _(b'print output to file with formatted name'),
2582 _(b'print output to file with formatted name'),
2583 _(b'FORMAT'),
2583 _(b'FORMAT'),
2584 ),
2584 ),
2585 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2585 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2586 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2586 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2587 ]
2587 ]
2588 + diffopts
2588 + diffopts
2589 + formatteropts,
2589 + formatteropts,
2590 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2590 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2591 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2591 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2592 helpbasic=True,
2592 helpbasic=True,
2593 intents={INTENT_READONLY},
2593 intents={INTENT_READONLY},
2594 )
2594 )
2595 def export(ui, repo, *changesets, **opts):
2595 def export(ui, repo, *changesets, **opts):
2596 """dump the header and diffs for one or more changesets
2596 """dump the header and diffs for one or more changesets
2597
2597
2598 Print the changeset header and diffs for one or more revisions.
2598 Print the changeset header and diffs for one or more revisions.
2599 If no revision is given, the parent of the working directory is used.
2599 If no revision is given, the parent of the working directory is used.
2600
2600
2601 The information shown in the changeset header is: author, date,
2601 The information shown in the changeset header is: author, date,
2602 branch name (if non-default), changeset hash, parent(s) and commit
2602 branch name (if non-default), changeset hash, parent(s) and commit
2603 comment.
2603 comment.
2604
2604
2605 .. note::
2605 .. note::
2606
2606
2607 :hg:`export` may generate unexpected diff output for merge
2607 :hg:`export` may generate unexpected diff output for merge
2608 changesets, as it will compare the merge changeset against its
2608 changesets, as it will compare the merge changeset against its
2609 first parent only.
2609 first parent only.
2610
2610
2611 Output may be to a file, in which case the name of the file is
2611 Output may be to a file, in which case the name of the file is
2612 given using a template string. See :hg:`help templates`. In addition
2612 given using a template string. See :hg:`help templates`. In addition
2613 to the common template keywords, the following formatting rules are
2613 to the common template keywords, the following formatting rules are
2614 supported:
2614 supported:
2615
2615
2616 :``%%``: literal "%" character
2616 :``%%``: literal "%" character
2617 :``%H``: changeset hash (40 hexadecimal digits)
2617 :``%H``: changeset hash (40 hexadecimal digits)
2618 :``%N``: number of patches being generated
2618 :``%N``: number of patches being generated
2619 :``%R``: changeset revision number
2619 :``%R``: changeset revision number
2620 :``%b``: basename of the exporting repository
2620 :``%b``: basename of the exporting repository
2621 :``%h``: short-form changeset hash (12 hexadecimal digits)
2621 :``%h``: short-form changeset hash (12 hexadecimal digits)
2622 :``%m``: first line of the commit message (only alphanumeric characters)
2622 :``%m``: first line of the commit message (only alphanumeric characters)
2623 :``%n``: zero-padded sequence number, starting at 1
2623 :``%n``: zero-padded sequence number, starting at 1
2624 :``%r``: zero-padded changeset revision number
2624 :``%r``: zero-padded changeset revision number
2625 :``\\``: literal "\\" character
2625 :``\\``: literal "\\" character
2626
2626
2627 Without the -a/--text option, export will avoid generating diffs
2627 Without the -a/--text option, export will avoid generating diffs
2628 of files it detects as binary. With -a, export will generate a
2628 of files it detects as binary. With -a, export will generate a
2629 diff anyway, probably with undesirable results.
2629 diff anyway, probably with undesirable results.
2630
2630
2631 With -B/--bookmark changesets reachable by the given bookmark are
2631 With -B/--bookmark changesets reachable by the given bookmark are
2632 selected.
2632 selected.
2633
2633
2634 Use the -g/--git option to generate diffs in the git extended diff
2634 Use the -g/--git option to generate diffs in the git extended diff
2635 format. See :hg:`help diffs` for more information.
2635 format. See :hg:`help diffs` for more information.
2636
2636
2637 With the --switch-parent option, the diff will be against the
2637 With the --switch-parent option, the diff will be against the
2638 second parent. It can be useful to review a merge.
2638 second parent. It can be useful to review a merge.
2639
2639
2640 .. container:: verbose
2640 .. container:: verbose
2641
2641
2642 Template:
2642 Template:
2643
2643
2644 The following keywords are supported in addition to the common template
2644 The following keywords are supported in addition to the common template
2645 keywords and functions. See also :hg:`help templates`.
2645 keywords and functions. See also :hg:`help templates`.
2646
2646
2647 :diff: String. Diff content.
2647 :diff: String. Diff content.
2648 :parents: List of strings. Parent nodes of the changeset.
2648 :parents: List of strings. Parent nodes of the changeset.
2649
2649
2650 Examples:
2650 Examples:
2651
2651
2652 - use export and import to transplant a bugfix to the current
2652 - use export and import to transplant a bugfix to the current
2653 branch::
2653 branch::
2654
2654
2655 hg export -r 9353 | hg import -
2655 hg export -r 9353 | hg import -
2656
2656
2657 - export all the changesets between two revisions to a file with
2657 - export all the changesets between two revisions to a file with
2658 rename information::
2658 rename information::
2659
2659
2660 hg export --git -r 123:150 > changes.txt
2660 hg export --git -r 123:150 > changes.txt
2661
2661
2662 - split outgoing changes into a series of patches with
2662 - split outgoing changes into a series of patches with
2663 descriptive names::
2663 descriptive names::
2664
2664
2665 hg export -r "outgoing()" -o "%n-%m.patch"
2665 hg export -r "outgoing()" -o "%n-%m.patch"
2666
2666
2667 Returns 0 on success.
2667 Returns 0 on success.
2668 """
2668 """
2669 opts = pycompat.byteskwargs(opts)
2669 opts = pycompat.byteskwargs(opts)
2670 bookmark = opts.get(b'bookmark')
2670 bookmark = opts.get(b'bookmark')
2671 changesets += tuple(opts.get(b'rev', []))
2671 changesets += tuple(opts.get(b'rev', []))
2672
2672
2673 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2673 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2674
2674
2675 if bookmark:
2675 if bookmark:
2676 if bookmark not in repo._bookmarks:
2676 if bookmark not in repo._bookmarks:
2677 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2677 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2678
2678
2679 revs = scmutil.bookmarkrevs(repo, bookmark)
2679 revs = scmutil.bookmarkrevs(repo, bookmark)
2680 else:
2680 else:
2681 if not changesets:
2681 if not changesets:
2682 changesets = [b'.']
2682 changesets = [b'.']
2683
2683
2684 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2684 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2685 revs = scmutil.revrange(repo, changesets)
2685 revs = scmutil.revrange(repo, changesets)
2686
2686
2687 if not revs:
2687 if not revs:
2688 raise error.InputError(_(b"export requires at least one changeset"))
2688 raise error.InputError(_(b"export requires at least one changeset"))
2689 if len(revs) > 1:
2689 if len(revs) > 1:
2690 ui.note(_(b'exporting patches:\n'))
2690 ui.note(_(b'exporting patches:\n'))
2691 else:
2691 else:
2692 ui.note(_(b'exporting patch:\n'))
2692 ui.note(_(b'exporting patch:\n'))
2693
2693
2694 fntemplate = opts.get(b'output')
2694 fntemplate = opts.get(b'output')
2695 if cmdutil.isstdiofilename(fntemplate):
2695 if cmdutil.isstdiofilename(fntemplate):
2696 fntemplate = b''
2696 fntemplate = b''
2697
2697
2698 if fntemplate:
2698 if fntemplate:
2699 fm = formatter.nullformatter(ui, b'export', opts)
2699 fm = formatter.nullformatter(ui, b'export', opts)
2700 else:
2700 else:
2701 ui.pager(b'export')
2701 ui.pager(b'export')
2702 fm = ui.formatter(b'export', opts)
2702 fm = ui.formatter(b'export', opts)
2703 with fm:
2703 with fm:
2704 cmdutil.export(
2704 cmdutil.export(
2705 repo,
2705 repo,
2706 revs,
2706 revs,
2707 fm,
2707 fm,
2708 fntemplate=fntemplate,
2708 fntemplate=fntemplate,
2709 switch_parent=opts.get(b'switch_parent'),
2709 switch_parent=opts.get(b'switch_parent'),
2710 opts=patch.diffallopts(ui, opts),
2710 opts=patch.diffallopts(ui, opts),
2711 )
2711 )
2712
2712
2713
2713
2714 @command(
2714 @command(
2715 b'files',
2715 b'files',
2716 [
2716 [
2717 (
2717 (
2718 b'r',
2718 b'r',
2719 b'rev',
2719 b'rev',
2720 b'',
2720 b'',
2721 _(b'search the repository as it is in REV'),
2721 _(b'search the repository as it is in REV'),
2722 _(b'REV'),
2722 _(b'REV'),
2723 ),
2723 ),
2724 (
2724 (
2725 b'0',
2725 b'0',
2726 b'print0',
2726 b'print0',
2727 None,
2727 None,
2728 _(b'end filenames with NUL, for use with xargs'),
2728 _(b'end filenames with NUL, for use with xargs'),
2729 ),
2729 ),
2730 ]
2730 ]
2731 + walkopts
2731 + walkopts
2732 + formatteropts
2732 + formatteropts
2733 + subrepoopts,
2733 + subrepoopts,
2734 _(b'[OPTION]... [FILE]...'),
2734 _(b'[OPTION]... [FILE]...'),
2735 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2735 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2736 intents={INTENT_READONLY},
2736 intents={INTENT_READONLY},
2737 )
2737 )
2738 def files(ui, repo, *pats, **opts):
2738 def files(ui, repo, *pats, **opts):
2739 """list tracked files
2739 """list tracked files
2740
2740
2741 Print files under Mercurial control in the working directory or
2741 Print files under Mercurial control in the working directory or
2742 specified revision for given files (excluding removed files).
2742 specified revision for given files (excluding removed files).
2743 Files can be specified as filenames or filesets.
2743 Files can be specified as filenames or filesets.
2744
2744
2745 If no files are given to match, this command prints the names
2745 If no files are given to match, this command prints the names
2746 of all files under Mercurial control.
2746 of all files under Mercurial control.
2747
2747
2748 .. container:: verbose
2748 .. container:: verbose
2749
2749
2750 Template:
2750 Template:
2751
2751
2752 The following keywords are supported in addition to the common template
2752 The following keywords are supported in addition to the common template
2753 keywords and functions. See also :hg:`help templates`.
2753 keywords and functions. See also :hg:`help templates`.
2754
2754
2755 :flags: String. Character denoting file's symlink and executable bits.
2755 :flags: String. Character denoting file's symlink and executable bits.
2756 :path: String. Repository-absolute path of the file.
2756 :path: String. Repository-absolute path of the file.
2757 :size: Integer. Size of the file in bytes.
2757 :size: Integer. Size of the file in bytes.
2758
2758
2759 Examples:
2759 Examples:
2760
2760
2761 - list all files under the current directory::
2761 - list all files under the current directory::
2762
2762
2763 hg files .
2763 hg files .
2764
2764
2765 - shows sizes and flags for current revision::
2765 - shows sizes and flags for current revision::
2766
2766
2767 hg files -vr .
2767 hg files -vr .
2768
2768
2769 - list all files named README::
2769 - list all files named README::
2770
2770
2771 hg files -I "**/README"
2771 hg files -I "**/README"
2772
2772
2773 - list all binary files::
2773 - list all binary files::
2774
2774
2775 hg files "set:binary()"
2775 hg files "set:binary()"
2776
2776
2777 - find files containing a regular expression::
2777 - find files containing a regular expression::
2778
2778
2779 hg files "set:grep('bob')"
2779 hg files "set:grep('bob')"
2780
2780
2781 - search tracked file contents with xargs and grep::
2781 - search tracked file contents with xargs and grep::
2782
2782
2783 hg files -0 | xargs -0 grep foo
2783 hg files -0 | xargs -0 grep foo
2784
2784
2785 See :hg:`help patterns` and :hg:`help filesets` for more information
2785 See :hg:`help patterns` and :hg:`help filesets` for more information
2786 on specifying file patterns.
2786 on specifying file patterns.
2787
2787
2788 Returns 0 if a match is found, 1 otherwise.
2788 Returns 0 if a match is found, 1 otherwise.
2789
2789
2790 """
2790 """
2791
2791
2792 opts = pycompat.byteskwargs(opts)
2792 opts = pycompat.byteskwargs(opts)
2793 rev = opts.get(b'rev')
2793 rev = opts.get(b'rev')
2794 if rev:
2794 if rev:
2795 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2795 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2796 ctx = scmutil.revsingle(repo, rev, None)
2796 ctx = scmutil.revsingle(repo, rev, None)
2797
2797
2798 end = b'\n'
2798 end = b'\n'
2799 if opts.get(b'print0'):
2799 if opts.get(b'print0'):
2800 end = b'\0'
2800 end = b'\0'
2801 fmt = b'%s' + end
2801 fmt = b'%s' + end
2802
2802
2803 m = scmutil.match(ctx, pats, opts)
2803 m = scmutil.match(ctx, pats, opts)
2804 ui.pager(b'files')
2804 ui.pager(b'files')
2805 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2805 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2806 with ui.formatter(b'files', opts) as fm:
2806 with ui.formatter(b'files', opts) as fm:
2807 return cmdutil.files(
2807 return cmdutil.files(
2808 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2808 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2809 )
2809 )
2810
2810
2811
2811
2812 @command(
2812 @command(
2813 b'forget',
2813 b'forget',
2814 [
2814 [
2815 (b'i', b'interactive', None, _(b'use interactive mode')),
2815 (b'i', b'interactive', None, _(b'use interactive mode')),
2816 ]
2816 ]
2817 + walkopts
2817 + walkopts
2818 + dryrunopts,
2818 + dryrunopts,
2819 _(b'[OPTION]... FILE...'),
2819 _(b'[OPTION]... FILE...'),
2820 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2820 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2821 helpbasic=True,
2821 helpbasic=True,
2822 inferrepo=True,
2822 inferrepo=True,
2823 )
2823 )
2824 def forget(ui, repo, *pats, **opts):
2824 def forget(ui, repo, *pats, **opts):
2825 """forget the specified files on the next commit
2825 """forget the specified files on the next commit
2826
2826
2827 Mark the specified files so they will no longer be tracked
2827 Mark the specified files so they will no longer be tracked
2828 after the next commit.
2828 after the next commit.
2829
2829
2830 This only removes files from the current branch, not from the
2830 This only removes files from the current branch, not from the
2831 entire project history, and it does not delete them from the
2831 entire project history, and it does not delete them from the
2832 working directory.
2832 working directory.
2833
2833
2834 To delete the file from the working directory, see :hg:`remove`.
2834 To delete the file from the working directory, see :hg:`remove`.
2835
2835
2836 To undo a forget before the next commit, see :hg:`add`.
2836 To undo a forget before the next commit, see :hg:`add`.
2837
2837
2838 .. container:: verbose
2838 .. container:: verbose
2839
2839
2840 Examples:
2840 Examples:
2841
2841
2842 - forget newly-added binary files::
2842 - forget newly-added binary files::
2843
2843
2844 hg forget "set:added() and binary()"
2844 hg forget "set:added() and binary()"
2845
2845
2846 - forget files that would be excluded by .hgignore::
2846 - forget files that would be excluded by .hgignore::
2847
2847
2848 hg forget "set:hgignore()"
2848 hg forget "set:hgignore()"
2849
2849
2850 Returns 0 on success.
2850 Returns 0 on success.
2851 """
2851 """
2852
2852
2853 opts = pycompat.byteskwargs(opts)
2853 opts = pycompat.byteskwargs(opts)
2854 if not pats:
2854 if not pats:
2855 raise error.InputError(_(b'no files specified'))
2855 raise error.InputError(_(b'no files specified'))
2856
2856
2857 m = scmutil.match(repo[None], pats, opts)
2857 m = scmutil.match(repo[None], pats, opts)
2858 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2858 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2859 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2859 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2860 rejected = cmdutil.forget(
2860 rejected = cmdutil.forget(
2861 ui,
2861 ui,
2862 repo,
2862 repo,
2863 m,
2863 m,
2864 prefix=b"",
2864 prefix=b"",
2865 uipathfn=uipathfn,
2865 uipathfn=uipathfn,
2866 explicitonly=False,
2866 explicitonly=False,
2867 dryrun=dryrun,
2867 dryrun=dryrun,
2868 interactive=interactive,
2868 interactive=interactive,
2869 )[0]
2869 )[0]
2870 return rejected and 1 or 0
2870 return rejected and 1 or 0
2871
2871
2872
2872
2873 @command(
2873 @command(
2874 b'graft',
2874 b'graft',
2875 [
2875 [
2876 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2876 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2877 (
2877 (
2878 b'',
2878 b'',
2879 b'base',
2879 b'base',
2880 b'',
2880 b'',
2881 _(b'base revision when doing the graft merge (ADVANCED)'),
2881 _(b'base revision when doing the graft merge (ADVANCED)'),
2882 _(b'REV'),
2882 _(b'REV'),
2883 ),
2883 ),
2884 (b'c', b'continue', False, _(b'resume interrupted graft')),
2884 (b'c', b'continue', False, _(b'resume interrupted graft')),
2885 (b'', b'stop', False, _(b'stop interrupted graft')),
2885 (b'', b'stop', False, _(b'stop interrupted graft')),
2886 (b'', b'abort', False, _(b'abort interrupted graft')),
2886 (b'', b'abort', False, _(b'abort interrupted graft')),
2887 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2887 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2888 (b'', b'log', None, _(b'append graft info to log message')),
2888 (b'', b'log', None, _(b'append graft info to log message')),
2889 (
2889 (
2890 b'',
2890 b'',
2891 b'no-commit',
2891 b'no-commit',
2892 None,
2892 None,
2893 _(b"don't commit, just apply the changes in working directory"),
2893 _(b"don't commit, just apply the changes in working directory"),
2894 ),
2894 ),
2895 (b'f', b'force', False, _(b'force graft')),
2895 (b'f', b'force', False, _(b'force graft')),
2896 (
2896 (
2897 b'D',
2897 b'D',
2898 b'currentdate',
2898 b'currentdate',
2899 False,
2899 False,
2900 _(b'record the current date as commit date'),
2900 _(b'record the current date as commit date'),
2901 ),
2901 ),
2902 (
2902 (
2903 b'U',
2903 b'U',
2904 b'currentuser',
2904 b'currentuser',
2905 False,
2905 False,
2906 _(b'record the current user as committer'),
2906 _(b'record the current user as committer'),
2907 ),
2907 ),
2908 ]
2908 ]
2909 + commitopts2
2909 + commitopts2
2910 + mergetoolopts
2910 + mergetoolopts
2911 + dryrunopts,
2911 + dryrunopts,
2912 _(b'[OPTION]... [-r REV]... REV...'),
2912 _(b'[OPTION]... [-r REV]... REV...'),
2913 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2913 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2914 )
2914 )
2915 def graft(ui, repo, *revs, **opts):
2915 def graft(ui, repo, *revs, **opts):
2916 """copy changes from other branches onto the current branch
2916 """copy changes from other branches onto the current branch
2917
2917
2918 This command uses Mercurial's merge logic to copy individual
2918 This command uses Mercurial's merge logic to copy individual
2919 changes from other branches without merging branches in the
2919 changes from other branches without merging branches in the
2920 history graph. This is sometimes known as 'backporting' or
2920 history graph. This is sometimes known as 'backporting' or
2921 'cherry-picking'. By default, graft will copy user, date, and
2921 'cherry-picking'. By default, graft will copy user, date, and
2922 description from the source changesets.
2922 description from the source changesets.
2923
2923
2924 Changesets that are ancestors of the current revision, that have
2924 Changesets that are ancestors of the current revision, that have
2925 already been grafted, or that are merges will be skipped.
2925 already been grafted, or that are merges will be skipped.
2926
2926
2927 If --log is specified, log messages will have a comment appended
2927 If --log is specified, log messages will have a comment appended
2928 of the form::
2928 of the form::
2929
2929
2930 (grafted from CHANGESETHASH)
2930 (grafted from CHANGESETHASH)
2931
2931
2932 If --force is specified, revisions will be grafted even if they
2932 If --force is specified, revisions will be grafted even if they
2933 are already ancestors of, or have been grafted to, the destination.
2933 are already ancestors of, or have been grafted to, the destination.
2934 This is useful when the revisions have since been backed out.
2934 This is useful when the revisions have since been backed out.
2935
2935
2936 If a graft merge results in conflicts, the graft process is
2936 If a graft merge results in conflicts, the graft process is
2937 interrupted so that the current merge can be manually resolved.
2937 interrupted so that the current merge can be manually resolved.
2938 Once all conflicts are addressed, the graft process can be
2938 Once all conflicts are addressed, the graft process can be
2939 continued with the -c/--continue option.
2939 continued with the -c/--continue option.
2940
2940
2941 The -c/--continue option reapplies all the earlier options.
2941 The -c/--continue option reapplies all the earlier options.
2942
2942
2943 .. container:: verbose
2943 .. container:: verbose
2944
2944
2945 The --base option exposes more of how graft internally uses merge with a
2945 The --base option exposes more of how graft internally uses merge with a
2946 custom base revision. --base can be used to specify another ancestor than
2946 custom base revision. --base can be used to specify another ancestor than
2947 the first and only parent.
2947 the first and only parent.
2948
2948
2949 The command::
2949 The command::
2950
2950
2951 hg graft -r 345 --base 234
2951 hg graft -r 345 --base 234
2952
2952
2953 is thus pretty much the same as::
2953 is thus pretty much the same as::
2954
2954
2955 hg diff -r 234 -r 345 | hg import
2955 hg diff -r 234 -r 345 | hg import
2956
2956
2957 but using merge to resolve conflicts and track moved files.
2957 but using merge to resolve conflicts and track moved files.
2958
2958
2959 The result of a merge can thus be backported as a single commit by
2959 The result of a merge can thus be backported as a single commit by
2960 specifying one of the merge parents as base, and thus effectively
2960 specifying one of the merge parents as base, and thus effectively
2961 grafting the changes from the other side.
2961 grafting the changes from the other side.
2962
2962
2963 It is also possible to collapse multiple changesets and clean up history
2963 It is also possible to collapse multiple changesets and clean up history
2964 by specifying another ancestor as base, much like rebase --collapse
2964 by specifying another ancestor as base, much like rebase --collapse
2965 --keep.
2965 --keep.
2966
2966
2967 The commit message can be tweaked after the fact using commit --amend .
2967 The commit message can be tweaked after the fact using commit --amend .
2968
2968
2969 For using non-ancestors as the base to backout changes, see the backout
2969 For using non-ancestors as the base to backout changes, see the backout
2970 command and the hidden --parent option.
2970 command and the hidden --parent option.
2971
2971
2972 .. container:: verbose
2972 .. container:: verbose
2973
2973
2974 Examples:
2974 Examples:
2975
2975
2976 - copy a single change to the stable branch and edit its description::
2976 - copy a single change to the stable branch and edit its description::
2977
2977
2978 hg update stable
2978 hg update stable
2979 hg graft --edit 9393
2979 hg graft --edit 9393
2980
2980
2981 - graft a range of changesets with one exception, updating dates::
2981 - graft a range of changesets with one exception, updating dates::
2982
2982
2983 hg graft -D "2085::2093 and not 2091"
2983 hg graft -D "2085::2093 and not 2091"
2984
2984
2985 - continue a graft after resolving conflicts::
2985 - continue a graft after resolving conflicts::
2986
2986
2987 hg graft -c
2987 hg graft -c
2988
2988
2989 - show the source of a grafted changeset::
2989 - show the source of a grafted changeset::
2990
2990
2991 hg log --debug -r .
2991 hg log --debug -r .
2992
2992
2993 - show revisions sorted by date::
2993 - show revisions sorted by date::
2994
2994
2995 hg log -r "sort(all(), date)"
2995 hg log -r "sort(all(), date)"
2996
2996
2997 - backport the result of a merge as a single commit::
2997 - backport the result of a merge as a single commit::
2998
2998
2999 hg graft -r 123 --base 123^
2999 hg graft -r 123 --base 123^
3000
3000
3001 - land a feature branch as one changeset::
3001 - land a feature branch as one changeset::
3002
3002
3003 hg up -cr default
3003 hg up -cr default
3004 hg graft -r featureX --base "ancestor('featureX', 'default')"
3004 hg graft -r featureX --base "ancestor('featureX', 'default')"
3005
3005
3006 See :hg:`help revisions` for more about specifying revisions.
3006 See :hg:`help revisions` for more about specifying revisions.
3007
3007
3008 Returns 0 on successful completion, 1 if there are unresolved files.
3008 Returns 0 on successful completion, 1 if there are unresolved files.
3009 """
3009 """
3010 with repo.wlock():
3010 with repo.wlock():
3011 return _dograft(ui, repo, *revs, **opts)
3011 return _dograft(ui, repo, *revs, **opts)
3012
3012
3013
3013
3014 def _dograft(ui, repo, *revs, **opts):
3014 def _dograft(ui, repo, *revs, **opts):
3015 opts = pycompat.byteskwargs(opts)
3015 opts = pycompat.byteskwargs(opts)
3016 if revs and opts.get(b'rev'):
3016 if revs and opts.get(b'rev'):
3017 ui.warn(
3017 ui.warn(
3018 _(
3018 _(
3019 b'warning: inconsistent use of --rev might give unexpected '
3019 b'warning: inconsistent use of --rev might give unexpected '
3020 b'revision ordering!\n'
3020 b'revision ordering!\n'
3021 )
3021 )
3022 )
3022 )
3023
3023
3024 revs = list(revs)
3024 revs = list(revs)
3025 revs.extend(opts.get(b'rev'))
3025 revs.extend(opts.get(b'rev'))
3026 # a dict of data to be stored in state file
3026 # a dict of data to be stored in state file
3027 statedata = {}
3027 statedata = {}
3028 # list of new nodes created by ongoing graft
3028 # list of new nodes created by ongoing graft
3029 statedata[b'newnodes'] = []
3029 statedata[b'newnodes'] = []
3030
3030
3031 cmdutil.resolvecommitoptions(ui, opts)
3031 cmdutil.resolvecommitoptions(ui, opts)
3032
3032
3033 editor = cmdutil.getcommiteditor(
3033 editor = cmdutil.getcommiteditor(
3034 editform=b'graft', **pycompat.strkwargs(opts)
3034 editform=b'graft', **pycompat.strkwargs(opts)
3035 )
3035 )
3036
3036
3037 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3037 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3038
3038
3039 cont = False
3039 cont = False
3040 if opts.get(b'no_commit'):
3040 if opts.get(b'no_commit'):
3041 cmdutil.check_incompatible_arguments(
3041 cmdutil.check_incompatible_arguments(
3042 opts,
3042 opts,
3043 b'no_commit',
3043 b'no_commit',
3044 [b'edit', b'currentuser', b'currentdate', b'log'],
3044 [b'edit', b'currentuser', b'currentdate', b'log'],
3045 )
3045 )
3046
3046
3047 graftstate = statemod.cmdstate(repo, b'graftstate')
3047 graftstate = statemod.cmdstate(repo, b'graftstate')
3048
3048
3049 if opts.get(b'stop'):
3049 if opts.get(b'stop'):
3050 cmdutil.check_incompatible_arguments(
3050 cmdutil.check_incompatible_arguments(
3051 opts,
3051 opts,
3052 b'stop',
3052 b'stop',
3053 [
3053 [
3054 b'edit',
3054 b'edit',
3055 b'log',
3055 b'log',
3056 b'user',
3056 b'user',
3057 b'date',
3057 b'date',
3058 b'currentdate',
3058 b'currentdate',
3059 b'currentuser',
3059 b'currentuser',
3060 b'rev',
3060 b'rev',
3061 ],
3061 ],
3062 )
3062 )
3063 return _stopgraft(ui, repo, graftstate)
3063 return _stopgraft(ui, repo, graftstate)
3064 elif opts.get(b'abort'):
3064 elif opts.get(b'abort'):
3065 cmdutil.check_incompatible_arguments(
3065 cmdutil.check_incompatible_arguments(
3066 opts,
3066 opts,
3067 b'abort',
3067 b'abort',
3068 [
3068 [
3069 b'edit',
3069 b'edit',
3070 b'log',
3070 b'log',
3071 b'user',
3071 b'user',
3072 b'date',
3072 b'date',
3073 b'currentdate',
3073 b'currentdate',
3074 b'currentuser',
3074 b'currentuser',
3075 b'rev',
3075 b'rev',
3076 ],
3076 ],
3077 )
3077 )
3078 return cmdutil.abortgraft(ui, repo, graftstate)
3078 return cmdutil.abortgraft(ui, repo, graftstate)
3079 elif opts.get(b'continue'):
3079 elif opts.get(b'continue'):
3080 cont = True
3080 cont = True
3081 if revs:
3081 if revs:
3082 raise error.InputError(_(b"can't specify --continue and revisions"))
3082 raise error.InputError(_(b"can't specify --continue and revisions"))
3083 # read in unfinished revisions
3083 # read in unfinished revisions
3084 if graftstate.exists():
3084 if graftstate.exists():
3085 statedata = cmdutil.readgraftstate(repo, graftstate)
3085 statedata = cmdutil.readgraftstate(repo, graftstate)
3086 if statedata.get(b'date'):
3086 if statedata.get(b'date'):
3087 opts[b'date'] = statedata[b'date']
3087 opts[b'date'] = statedata[b'date']
3088 if statedata.get(b'user'):
3088 if statedata.get(b'user'):
3089 opts[b'user'] = statedata[b'user']
3089 opts[b'user'] = statedata[b'user']
3090 if statedata.get(b'log'):
3090 if statedata.get(b'log'):
3091 opts[b'log'] = True
3091 opts[b'log'] = True
3092 if statedata.get(b'no_commit'):
3092 if statedata.get(b'no_commit'):
3093 opts[b'no_commit'] = statedata.get(b'no_commit')
3093 opts[b'no_commit'] = statedata.get(b'no_commit')
3094 if statedata.get(b'base'):
3094 if statedata.get(b'base'):
3095 opts[b'base'] = statedata.get(b'base')
3095 opts[b'base'] = statedata.get(b'base')
3096 nodes = statedata[b'nodes']
3096 nodes = statedata[b'nodes']
3097 revs = [repo[node].rev() for node in nodes]
3097 revs = [repo[node].rev() for node in nodes]
3098 else:
3098 else:
3099 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3099 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3100 else:
3100 else:
3101 if not revs:
3101 if not revs:
3102 raise error.InputError(_(b'no revisions specified'))
3102 raise error.InputError(_(b'no revisions specified'))
3103 cmdutil.checkunfinished(repo)
3103 cmdutil.checkunfinished(repo)
3104 cmdutil.bailifchanged(repo)
3104 cmdutil.bailifchanged(repo)
3105 revs = scmutil.revrange(repo, revs)
3105 revs = scmutil.revrange(repo, revs)
3106
3106
3107 skipped = set()
3107 skipped = set()
3108 basectx = None
3108 basectx = None
3109 if opts.get(b'base'):
3109 if opts.get(b'base'):
3110 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3110 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3111 if basectx is None:
3111 if basectx is None:
3112 # check for merges
3112 # check for merges
3113 for rev in repo.revs(b'%ld and merge()', revs):
3113 for rev in repo.revs(b'%ld and merge()', revs):
3114 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3114 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3115 skipped.add(rev)
3115 skipped.add(rev)
3116 revs = [r for r in revs if r not in skipped]
3116 revs = [r for r in revs if r not in skipped]
3117 if not revs:
3117 if not revs:
3118 return -1
3118 return -1
3119 if basectx is not None and len(revs) != 1:
3119 if basectx is not None and len(revs) != 1:
3120 raise error.InputError(_(b'only one revision allowed with --base '))
3120 raise error.InputError(_(b'only one revision allowed with --base '))
3121
3121
3122 # Don't check in the --continue case, in effect retaining --force across
3122 # Don't check in the --continue case, in effect retaining --force across
3123 # --continues. That's because without --force, any revisions we decided to
3123 # --continues. That's because without --force, any revisions we decided to
3124 # skip would have been filtered out here, so they wouldn't have made their
3124 # skip would have been filtered out here, so they wouldn't have made their
3125 # way to the graftstate. With --force, any revisions we would have otherwise
3125 # way to the graftstate. With --force, any revisions we would have otherwise
3126 # skipped would not have been filtered out, and if they hadn't been applied
3126 # skipped would not have been filtered out, and if they hadn't been applied
3127 # already, they'd have been in the graftstate.
3127 # already, they'd have been in the graftstate.
3128 if not (cont or opts.get(b'force')) and basectx is None:
3128 if not (cont or opts.get(b'force')) and basectx is None:
3129 # check for ancestors of dest branch
3129 # check for ancestors of dest branch
3130 ancestors = repo.revs(b'%ld & (::.)', revs)
3130 ancestors = repo.revs(b'%ld & (::.)', revs)
3131 for rev in ancestors:
3131 for rev in ancestors:
3132 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3132 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3133
3133
3134 revs = [r for r in revs if r not in ancestors]
3134 revs = [r for r in revs if r not in ancestors]
3135
3135
3136 if not revs:
3136 if not revs:
3137 return -1
3137 return -1
3138
3138
3139 # analyze revs for earlier grafts
3139 # analyze revs for earlier grafts
3140 ids = {}
3140 ids = {}
3141 for ctx in repo.set(b"%ld", revs):
3141 for ctx in repo.set(b"%ld", revs):
3142 ids[ctx.hex()] = ctx.rev()
3142 ids[ctx.hex()] = ctx.rev()
3143 n = ctx.extra().get(b'source')
3143 n = ctx.extra().get(b'source')
3144 if n:
3144 if n:
3145 ids[n] = ctx.rev()
3145 ids[n] = ctx.rev()
3146
3146
3147 # check ancestors for earlier grafts
3147 # check ancestors for earlier grafts
3148 ui.debug(b'scanning for duplicate grafts\n')
3148 ui.debug(b'scanning for duplicate grafts\n')
3149
3149
3150 # The only changesets we can be sure doesn't contain grafts of any
3150 # The only changesets we can be sure doesn't contain grafts of any
3151 # revs, are the ones that are common ancestors of *all* revs:
3151 # revs, are the ones that are common ancestors of *all* revs:
3152 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3152 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3153 ctx = repo[rev]
3153 ctx = repo[rev]
3154 n = ctx.extra().get(b'source')
3154 n = ctx.extra().get(b'source')
3155 if n in ids:
3155 if n in ids:
3156 try:
3156 try:
3157 r = repo[n].rev()
3157 r = repo[n].rev()
3158 except error.RepoLookupError:
3158 except error.RepoLookupError:
3159 r = None
3159 r = None
3160 if r in revs:
3160 if r in revs:
3161 ui.warn(
3161 ui.warn(
3162 _(
3162 _(
3163 b'skipping revision %d:%s '
3163 b'skipping revision %d:%s '
3164 b'(already grafted to %d:%s)\n'
3164 b'(already grafted to %d:%s)\n'
3165 )
3165 )
3166 % (r, repo[r], rev, ctx)
3166 % (r, repo[r], rev, ctx)
3167 )
3167 )
3168 revs.remove(r)
3168 revs.remove(r)
3169 elif ids[n] in revs:
3169 elif ids[n] in revs:
3170 if r is None:
3170 if r is None:
3171 ui.warn(
3171 ui.warn(
3172 _(
3172 _(
3173 b'skipping already grafted revision %d:%s '
3173 b'skipping already grafted revision %d:%s '
3174 b'(%d:%s also has unknown origin %s)\n'
3174 b'(%d:%s also has unknown origin %s)\n'
3175 )
3175 )
3176 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3176 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3177 )
3177 )
3178 else:
3178 else:
3179 ui.warn(
3179 ui.warn(
3180 _(
3180 _(
3181 b'skipping already grafted revision %d:%s '
3181 b'skipping already grafted revision %d:%s '
3182 b'(%d:%s also has origin %d:%s)\n'
3182 b'(%d:%s also has origin %d:%s)\n'
3183 )
3183 )
3184 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3184 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3185 )
3185 )
3186 revs.remove(ids[n])
3186 revs.remove(ids[n])
3187 elif ctx.hex() in ids:
3187 elif ctx.hex() in ids:
3188 r = ids[ctx.hex()]
3188 r = ids[ctx.hex()]
3189 if r in revs:
3189 if r in revs:
3190 ui.warn(
3190 ui.warn(
3191 _(
3191 _(
3192 b'skipping already grafted revision %d:%s '
3192 b'skipping already grafted revision %d:%s '
3193 b'(was grafted from %d:%s)\n'
3193 b'(was grafted from %d:%s)\n'
3194 )
3194 )
3195 % (r, repo[r], rev, ctx)
3195 % (r, repo[r], rev, ctx)
3196 )
3196 )
3197 revs.remove(r)
3197 revs.remove(r)
3198 if not revs:
3198 if not revs:
3199 return -1
3199 return -1
3200
3200
3201 if opts.get(b'no_commit'):
3201 if opts.get(b'no_commit'):
3202 statedata[b'no_commit'] = True
3202 statedata[b'no_commit'] = True
3203 if opts.get(b'base'):
3203 if opts.get(b'base'):
3204 statedata[b'base'] = opts[b'base']
3204 statedata[b'base'] = opts[b'base']
3205 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3205 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3206 desc = b'%d:%s "%s"' % (
3206 desc = b'%d:%s "%s"' % (
3207 ctx.rev(),
3207 ctx.rev(),
3208 ctx,
3208 ctx,
3209 ctx.description().split(b'\n', 1)[0],
3209 ctx.description().split(b'\n', 1)[0],
3210 )
3210 )
3211 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3211 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3212 if names:
3212 if names:
3213 desc += b' (%s)' % b' '.join(names)
3213 desc += b' (%s)' % b' '.join(names)
3214 ui.status(_(b'grafting %s\n') % desc)
3214 ui.status(_(b'grafting %s\n') % desc)
3215 if opts.get(b'dry_run'):
3215 if opts.get(b'dry_run'):
3216 continue
3216 continue
3217
3217
3218 source = ctx.extra().get(b'source')
3218 source = ctx.extra().get(b'source')
3219 extra = {}
3219 extra = {}
3220 if source:
3220 if source:
3221 extra[b'source'] = source
3221 extra[b'source'] = source
3222 extra[b'intermediate-source'] = ctx.hex()
3222 extra[b'intermediate-source'] = ctx.hex()
3223 else:
3223 else:
3224 extra[b'source'] = ctx.hex()
3224 extra[b'source'] = ctx.hex()
3225 user = ctx.user()
3225 user = ctx.user()
3226 if opts.get(b'user'):
3226 if opts.get(b'user'):
3227 user = opts[b'user']
3227 user = opts[b'user']
3228 statedata[b'user'] = user
3228 statedata[b'user'] = user
3229 date = ctx.date()
3229 date = ctx.date()
3230 if opts.get(b'date'):
3230 if opts.get(b'date'):
3231 date = opts[b'date']
3231 date = opts[b'date']
3232 statedata[b'date'] = date
3232 statedata[b'date'] = date
3233 message = ctx.description()
3233 message = ctx.description()
3234 if opts.get(b'log'):
3234 if opts.get(b'log'):
3235 message += b'\n(grafted from %s)' % ctx.hex()
3235 message += b'\n(grafted from %s)' % ctx.hex()
3236 statedata[b'log'] = True
3236 statedata[b'log'] = True
3237
3237
3238 # we don't merge the first commit when continuing
3238 # we don't merge the first commit when continuing
3239 if not cont:
3239 if not cont:
3240 # perform the graft merge with p1(rev) as 'ancestor'
3240 # perform the graft merge with p1(rev) as 'ancestor'
3241 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3241 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3242 base = ctx.p1() if basectx is None else basectx
3242 base = ctx.p1() if basectx is None else basectx
3243 with ui.configoverride(overrides, b'graft'):
3243 with ui.configoverride(overrides, b'graft'):
3244 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3244 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3245 # report any conflicts
3245 # report any conflicts
3246 if stats.unresolvedcount > 0:
3246 if stats.unresolvedcount > 0:
3247 # write out state for --continue
3247 # write out state for --continue
3248 nodes = [repo[rev].hex() for rev in revs[pos:]]
3248 nodes = [repo[rev].hex() for rev in revs[pos:]]
3249 statedata[b'nodes'] = nodes
3249 statedata[b'nodes'] = nodes
3250 stateversion = 1
3250 stateversion = 1
3251 graftstate.save(stateversion, statedata)
3251 graftstate.save(stateversion, statedata)
3252 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3252 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3253 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3253 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3254 return 1
3254 return 1
3255 else:
3255 else:
3256 cont = False
3256 cont = False
3257
3257
3258 # commit if --no-commit is false
3258 # commit if --no-commit is false
3259 if not opts.get(b'no_commit'):
3259 if not opts.get(b'no_commit'):
3260 node = repo.commit(
3260 node = repo.commit(
3261 text=message, user=user, date=date, extra=extra, editor=editor
3261 text=message, user=user, date=date, extra=extra, editor=editor
3262 )
3262 )
3263 if node is None:
3263 if node is None:
3264 ui.warn(
3264 ui.warn(
3265 _(b'note: graft of %d:%s created no changes to commit\n')
3265 _(b'note: graft of %d:%s created no changes to commit\n')
3266 % (ctx.rev(), ctx)
3266 % (ctx.rev(), ctx)
3267 )
3267 )
3268 # checking that newnodes exist because old state files won't have it
3268 # checking that newnodes exist because old state files won't have it
3269 elif statedata.get(b'newnodes') is not None:
3269 elif statedata.get(b'newnodes') is not None:
3270 statedata[b'newnodes'].append(node)
3270 statedata[b'newnodes'].append(node)
3271
3271
3272 # remove state when we complete successfully
3272 # remove state when we complete successfully
3273 if not opts.get(b'dry_run'):
3273 if not opts.get(b'dry_run'):
3274 graftstate.delete()
3274 graftstate.delete()
3275
3275
3276 return 0
3276 return 0
3277
3277
3278
3278
3279 def _stopgraft(ui, repo, graftstate):
3279 def _stopgraft(ui, repo, graftstate):
3280 """stop the interrupted graft"""
3280 """stop the interrupted graft"""
3281 if not graftstate.exists():
3281 if not graftstate.exists():
3282 raise error.StateError(_(b"no interrupted graft found"))
3282 raise error.StateError(_(b"no interrupted graft found"))
3283 pctx = repo[b'.']
3283 pctx = repo[b'.']
3284 mergemod.clean_update(pctx)
3284 mergemod.clean_update(pctx)
3285 graftstate.delete()
3285 graftstate.delete()
3286 ui.status(_(b"stopped the interrupted graft\n"))
3286 ui.status(_(b"stopped the interrupted graft\n"))
3287 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3287 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3288 return 0
3288 return 0
3289
3289
3290
3290
3291 statemod.addunfinished(
3291 statemod.addunfinished(
3292 b'graft',
3292 b'graft',
3293 fname=b'graftstate',
3293 fname=b'graftstate',
3294 clearable=True,
3294 clearable=True,
3295 stopflag=True,
3295 stopflag=True,
3296 continueflag=True,
3296 continueflag=True,
3297 abortfunc=cmdutil.hgabortgraft,
3297 abortfunc=cmdutil.hgabortgraft,
3298 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3298 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3299 )
3299 )
3300
3300
3301
3301
3302 @command(
3302 @command(
3303 b'grep',
3303 b'grep',
3304 [
3304 [
3305 (b'0', b'print0', None, _(b'end fields with NUL')),
3305 (b'0', b'print0', None, _(b'end fields with NUL')),
3306 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3306 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3307 (
3307 (
3308 b'',
3308 b'',
3309 b'diff',
3309 b'diff',
3310 None,
3310 None,
3311 _(
3311 _(
3312 b'search revision differences for when the pattern was added '
3312 b'search revision differences for when the pattern was added '
3313 b'or removed'
3313 b'or removed'
3314 ),
3314 ),
3315 ),
3315 ),
3316 (b'a', b'text', None, _(b'treat all files as text')),
3316 (b'a', b'text', None, _(b'treat all files as text')),
3317 (
3317 (
3318 b'f',
3318 b'f',
3319 b'follow',
3319 b'follow',
3320 None,
3320 None,
3321 _(
3321 _(
3322 b'follow changeset history,'
3322 b'follow changeset history,'
3323 b' or file history across copies and renames'
3323 b' or file history across copies and renames'
3324 ),
3324 ),
3325 ),
3325 ),
3326 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3326 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3327 (
3327 (
3328 b'l',
3328 b'l',
3329 b'files-with-matches',
3329 b'files-with-matches',
3330 None,
3330 None,
3331 _(b'print only filenames and revisions that match'),
3331 _(b'print only filenames and revisions that match'),
3332 ),
3332 ),
3333 (b'n', b'line-number', None, _(b'print matching line numbers')),
3333 (b'n', b'line-number', None, _(b'print matching line numbers')),
3334 (
3334 (
3335 b'r',
3335 b'r',
3336 b'rev',
3336 b'rev',
3337 [],
3337 [],
3338 _(b'search files changed within revision range'),
3338 _(b'search files changed within revision range'),
3339 _(b'REV'),
3339 _(b'REV'),
3340 ),
3340 ),
3341 (
3341 (
3342 b'',
3342 b'',
3343 b'all-files',
3343 b'all-files',
3344 None,
3344 None,
3345 _(
3345 _(
3346 b'include all files in the changeset while grepping (DEPRECATED)'
3346 b'include all files in the changeset while grepping (DEPRECATED)'
3347 ),
3347 ),
3348 ),
3348 ),
3349 (b'u', b'user', None, _(b'list the author (long with -v)')),
3349 (b'u', b'user', None, _(b'list the author (long with -v)')),
3350 (b'd', b'date', None, _(b'list the date (short with -q)')),
3350 (b'd', b'date', None, _(b'list the date (short with -q)')),
3351 ]
3351 ]
3352 + formatteropts
3352 + formatteropts
3353 + walkopts,
3353 + walkopts,
3354 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3354 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3355 helpcategory=command.CATEGORY_FILE_CONTENTS,
3355 helpcategory=command.CATEGORY_FILE_CONTENTS,
3356 inferrepo=True,
3356 inferrepo=True,
3357 intents={INTENT_READONLY},
3357 intents={INTENT_READONLY},
3358 )
3358 )
3359 def grep(ui, repo, pattern, *pats, **opts):
3359 def grep(ui, repo, pattern, *pats, **opts):
3360 """search for a pattern in specified files
3360 """search for a pattern in specified files
3361
3361
3362 Search the working directory or revision history for a regular
3362 Search the working directory or revision history for a regular
3363 expression in the specified files for the entire repository.
3363 expression in the specified files for the entire repository.
3364
3364
3365 By default, grep searches the repository files in the working
3365 By default, grep searches the repository files in the working
3366 directory and prints the files where it finds a match. To specify
3366 directory and prints the files where it finds a match. To specify
3367 historical revisions instead of the working directory, use the
3367 historical revisions instead of the working directory, use the
3368 --rev flag.
3368 --rev flag.
3369
3369
3370 To search instead historical revision differences that contains a
3370 To search instead historical revision differences that contains a
3371 change in match status ("-" for a match that becomes a non-match,
3371 change in match status ("-" for a match that becomes a non-match,
3372 or "+" for a non-match that becomes a match), use the --diff flag.
3372 or "+" for a non-match that becomes a match), use the --diff flag.
3373
3373
3374 PATTERN can be any Python (roughly Perl-compatible) regular
3374 PATTERN can be any Python (roughly Perl-compatible) regular
3375 expression.
3375 expression.
3376
3376
3377 If no FILEs are specified and the --rev flag isn't supplied, all
3377 If no FILEs are specified and the --rev flag isn't supplied, all
3378 files in the working directory are searched. When using the --rev
3378 files in the working directory are searched. When using the --rev
3379 flag and specifying FILEs, use the --follow argument to also
3379 flag and specifying FILEs, use the --follow argument to also
3380 follow the specified FILEs across renames and copies.
3380 follow the specified FILEs across renames and copies.
3381
3381
3382 .. container:: verbose
3382 .. container:: verbose
3383
3383
3384 Template:
3384 Template:
3385
3385
3386 The following keywords are supported in addition to the common template
3386 The following keywords are supported in addition to the common template
3387 keywords and functions. See also :hg:`help templates`.
3387 keywords and functions. See also :hg:`help templates`.
3388
3388
3389 :change: String. Character denoting insertion ``+`` or removal ``-``.
3389 :change: String. Character denoting insertion ``+`` or removal ``-``.
3390 Available if ``--diff`` is specified.
3390 Available if ``--diff`` is specified.
3391 :lineno: Integer. Line number of the match.
3391 :lineno: Integer. Line number of the match.
3392 :path: String. Repository-absolute path of the file.
3392 :path: String. Repository-absolute path of the file.
3393 :texts: List of text chunks.
3393 :texts: List of text chunks.
3394
3394
3395 And each entry of ``{texts}`` provides the following sub-keywords.
3395 And each entry of ``{texts}`` provides the following sub-keywords.
3396
3396
3397 :matched: Boolean. True if the chunk matches the specified pattern.
3397 :matched: Boolean. True if the chunk matches the specified pattern.
3398 :text: String. Chunk content.
3398 :text: String. Chunk content.
3399
3399
3400 See :hg:`help templates.operators` for the list expansion syntax.
3400 See :hg:`help templates.operators` for the list expansion syntax.
3401
3401
3402 Returns 0 if a match is found, 1 otherwise.
3402 Returns 0 if a match is found, 1 otherwise.
3403
3403
3404 """
3404 """
3405 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3405 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3406 opts = pycompat.byteskwargs(opts)
3406 opts = pycompat.byteskwargs(opts)
3407 diff = opts.get(b'all') or opts.get(b'diff')
3407 diff = opts.get(b'all') or opts.get(b'diff')
3408 follow = opts.get(b'follow')
3408 follow = opts.get(b'follow')
3409 if opts.get(b'all_files') is None and not diff:
3409 if opts.get(b'all_files') is None and not diff:
3410 opts[b'all_files'] = True
3410 opts[b'all_files'] = True
3411 plaingrep = (
3411 plaingrep = (
3412 opts.get(b'all_files')
3412 opts.get(b'all_files')
3413 and not opts.get(b'rev')
3413 and not opts.get(b'rev')
3414 and not opts.get(b'follow')
3414 and not opts.get(b'follow')
3415 )
3415 )
3416 all_files = opts.get(b'all_files')
3416 all_files = opts.get(b'all_files')
3417 if plaingrep:
3417 if plaingrep:
3418 opts[b'rev'] = [b'wdir()']
3418 opts[b'rev'] = [b'wdir()']
3419
3419
3420 reflags = re.M
3420 reflags = re.M
3421 if opts.get(b'ignore_case'):
3421 if opts.get(b'ignore_case'):
3422 reflags |= re.I
3422 reflags |= re.I
3423 try:
3423 try:
3424 regexp = util.re.compile(pattern, reflags)
3424 regexp = util.re.compile(pattern, reflags)
3425 except re.error as inst:
3425 except re.error as inst:
3426 ui.warn(
3426 ui.warn(
3427 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3427 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3428 )
3428 )
3429 return 1
3429 return 1
3430 sep, eol = b':', b'\n'
3430 sep, eol = b':', b'\n'
3431 if opts.get(b'print0'):
3431 if opts.get(b'print0'):
3432 sep = eol = b'\0'
3432 sep = eol = b'\0'
3433
3433
3434 searcher = grepmod.grepsearcher(
3434 searcher = grepmod.grepsearcher(
3435 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3435 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3436 )
3436 )
3437
3437
3438 getfile = searcher._getfile
3438 getfile = searcher._getfile
3439
3439
3440 uipathfn = scmutil.getuipathfn(repo)
3440 uipathfn = scmutil.getuipathfn(repo)
3441
3441
3442 def display(fm, fn, ctx, pstates, states):
3442 def display(fm, fn, ctx, pstates, states):
3443 rev = scmutil.intrev(ctx)
3443 rev = scmutil.intrev(ctx)
3444 if fm.isplain():
3444 if fm.isplain():
3445 formatuser = ui.shortuser
3445 formatuser = ui.shortuser
3446 else:
3446 else:
3447 formatuser = pycompat.bytestr
3447 formatuser = pycompat.bytestr
3448 if ui.quiet:
3448 if ui.quiet:
3449 datefmt = b'%Y-%m-%d'
3449 datefmt = b'%Y-%m-%d'
3450 else:
3450 else:
3451 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3451 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3452 found = False
3452 found = False
3453
3453
3454 @util.cachefunc
3454 @util.cachefunc
3455 def binary():
3455 def binary():
3456 flog = getfile(fn)
3456 flog = getfile(fn)
3457 try:
3457 try:
3458 return stringutil.binary(flog.read(ctx.filenode(fn)))
3458 return stringutil.binary(flog.read(ctx.filenode(fn)))
3459 except error.WdirUnsupported:
3459 except error.WdirUnsupported:
3460 return ctx[fn].isbinary()
3460 return ctx[fn].isbinary()
3461
3461
3462 fieldnamemap = {b'linenumber': b'lineno'}
3462 fieldnamemap = {b'linenumber': b'lineno'}
3463 if diff:
3463 if diff:
3464 iter = grepmod.difflinestates(pstates, states)
3464 iter = grepmod.difflinestates(pstates, states)
3465 else:
3465 else:
3466 iter = [(b'', l) for l in states]
3466 iter = [(b'', l) for l in states]
3467 for change, l in iter:
3467 for change, l in iter:
3468 fm.startitem()
3468 fm.startitem()
3469 fm.context(ctx=ctx)
3469 fm.context(ctx=ctx)
3470 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3470 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3471 fm.plain(uipathfn(fn), label=b'grep.filename')
3471 fm.plain(uipathfn(fn), label=b'grep.filename')
3472
3472
3473 cols = [
3473 cols = [
3474 (b'rev', b'%d', rev, not plaingrep, b''),
3474 (b'rev', b'%d', rev, not plaingrep, b''),
3475 (
3475 (
3476 b'linenumber',
3476 b'linenumber',
3477 b'%d',
3477 b'%d',
3478 l.linenum,
3478 l.linenum,
3479 opts.get(b'line_number'),
3479 opts.get(b'line_number'),
3480 b'',
3480 b'',
3481 ),
3481 ),
3482 ]
3482 ]
3483 if diff:
3483 if diff:
3484 cols.append(
3484 cols.append(
3485 (
3485 (
3486 b'change',
3486 b'change',
3487 b'%s',
3487 b'%s',
3488 change,
3488 change,
3489 True,
3489 True,
3490 b'grep.inserted '
3490 b'grep.inserted '
3491 if change == b'+'
3491 if change == b'+'
3492 else b'grep.deleted ',
3492 else b'grep.deleted ',
3493 )
3493 )
3494 )
3494 )
3495 cols.extend(
3495 cols.extend(
3496 [
3496 [
3497 (
3497 (
3498 b'user',
3498 b'user',
3499 b'%s',
3499 b'%s',
3500 formatuser(ctx.user()),
3500 formatuser(ctx.user()),
3501 opts.get(b'user'),
3501 opts.get(b'user'),
3502 b'',
3502 b'',
3503 ),
3503 ),
3504 (
3504 (
3505 b'date',
3505 b'date',
3506 b'%s',
3506 b'%s',
3507 fm.formatdate(ctx.date(), datefmt),
3507 fm.formatdate(ctx.date(), datefmt),
3508 opts.get(b'date'),
3508 opts.get(b'date'),
3509 b'',
3509 b'',
3510 ),
3510 ),
3511 ]
3511 ]
3512 )
3512 )
3513 for name, fmt, data, cond, extra_label in cols:
3513 for name, fmt, data, cond, extra_label in cols:
3514 if cond:
3514 if cond:
3515 fm.plain(sep, label=b'grep.sep')
3515 fm.plain(sep, label=b'grep.sep')
3516 field = fieldnamemap.get(name, name)
3516 field = fieldnamemap.get(name, name)
3517 label = extra_label + (b'grep.%s' % name)
3517 label = extra_label + (b'grep.%s' % name)
3518 fm.condwrite(cond, field, fmt, data, label=label)
3518 fm.condwrite(cond, field, fmt, data, label=label)
3519 if not opts.get(b'files_with_matches'):
3519 if not opts.get(b'files_with_matches'):
3520 fm.plain(sep, label=b'grep.sep')
3520 fm.plain(sep, label=b'grep.sep')
3521 if not opts.get(b'text') and binary():
3521 if not opts.get(b'text') and binary():
3522 fm.plain(_(b" Binary file matches"))
3522 fm.plain(_(b" Binary file matches"))
3523 else:
3523 else:
3524 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3524 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3525 fm.plain(eol)
3525 fm.plain(eol)
3526 found = True
3526 found = True
3527 if opts.get(b'files_with_matches'):
3527 if opts.get(b'files_with_matches'):
3528 break
3528 break
3529 return found
3529 return found
3530
3530
3531 def displaymatches(fm, l):
3531 def displaymatches(fm, l):
3532 p = 0
3532 p = 0
3533 for s, e in l.findpos(regexp):
3533 for s, e in l.findpos(regexp):
3534 if p < s:
3534 if p < s:
3535 fm.startitem()
3535 fm.startitem()
3536 fm.write(b'text', b'%s', l.line[p:s])
3536 fm.write(b'text', b'%s', l.line[p:s])
3537 fm.data(matched=False)
3537 fm.data(matched=False)
3538 fm.startitem()
3538 fm.startitem()
3539 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3539 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3540 fm.data(matched=True)
3540 fm.data(matched=True)
3541 p = e
3541 p = e
3542 if p < len(l.line):
3542 if p < len(l.line):
3543 fm.startitem()
3543 fm.startitem()
3544 fm.write(b'text', b'%s', l.line[p:])
3544 fm.write(b'text', b'%s', l.line[p:])
3545 fm.data(matched=False)
3545 fm.data(matched=False)
3546 fm.end()
3546 fm.end()
3547
3547
3548 found = False
3548 found = False
3549
3549
3550 wopts = logcmdutil.walkopts(
3550 wopts = logcmdutil.walkopts(
3551 pats=pats,
3551 pats=pats,
3552 opts=opts,
3552 opts=opts,
3553 revspec=opts[b'rev'],
3553 revspec=opts[b'rev'],
3554 include_pats=opts[b'include'],
3554 include_pats=opts[b'include'],
3555 exclude_pats=opts[b'exclude'],
3555 exclude_pats=opts[b'exclude'],
3556 follow=follow,
3556 follow=follow,
3557 force_changelog_traversal=all_files,
3557 force_changelog_traversal=all_files,
3558 filter_revisions_by_pats=not all_files,
3558 filter_revisions_by_pats=not all_files,
3559 )
3559 )
3560 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3560 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3561
3561
3562 ui.pager(b'grep')
3562 ui.pager(b'grep')
3563 fm = ui.formatter(b'grep', opts)
3563 fm = ui.formatter(b'grep', opts)
3564 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3564 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3565 r = display(fm, fn, ctx, pstates, states)
3565 r = display(fm, fn, ctx, pstates, states)
3566 found = found or r
3566 found = found or r
3567 if r and not diff and not all_files:
3567 if r and not diff and not all_files:
3568 searcher.skipfile(fn, ctx.rev())
3568 searcher.skipfile(fn, ctx.rev())
3569 fm.end()
3569 fm.end()
3570
3570
3571 return not found
3571 return not found
3572
3572
3573
3573
3574 @command(
3574 @command(
3575 b'heads',
3575 b'heads',
3576 [
3576 [
3577 (
3577 (
3578 b'r',
3578 b'r',
3579 b'rev',
3579 b'rev',
3580 b'',
3580 b'',
3581 _(b'show only heads which are descendants of STARTREV'),
3581 _(b'show only heads which are descendants of STARTREV'),
3582 _(b'STARTREV'),
3582 _(b'STARTREV'),
3583 ),
3583 ),
3584 (b't', b'topo', False, _(b'show topological heads only')),
3584 (b't', b'topo', False, _(b'show topological heads only')),
3585 (
3585 (
3586 b'a',
3586 b'a',
3587 b'active',
3587 b'active',
3588 False,
3588 False,
3589 _(b'show active branchheads only (DEPRECATED)'),
3589 _(b'show active branchheads only (DEPRECATED)'),
3590 ),
3590 ),
3591 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3591 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3592 ]
3592 ]
3593 + templateopts,
3593 + templateopts,
3594 _(b'[-ct] [-r STARTREV] [REV]...'),
3594 _(b'[-ct] [-r STARTREV] [REV]...'),
3595 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3595 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3596 intents={INTENT_READONLY},
3596 intents={INTENT_READONLY},
3597 )
3597 )
3598 def heads(ui, repo, *branchrevs, **opts):
3598 def heads(ui, repo, *branchrevs, **opts):
3599 """show branch heads
3599 """show branch heads
3600
3600
3601 With no arguments, show all open branch heads in the repository.
3601 With no arguments, show all open branch heads in the repository.
3602 Branch heads are changesets that have no descendants on the
3602 Branch heads are changesets that have no descendants on the
3603 same branch. They are where development generally takes place and
3603 same branch. They are where development generally takes place and
3604 are the usual targets for update and merge operations.
3604 are the usual targets for update and merge operations.
3605
3605
3606 If one or more REVs are given, only open branch heads on the
3606 If one or more REVs are given, only open branch heads on the
3607 branches associated with the specified changesets are shown. This
3607 branches associated with the specified changesets are shown. This
3608 means that you can use :hg:`heads .` to see the heads on the
3608 means that you can use :hg:`heads .` to see the heads on the
3609 currently checked-out branch.
3609 currently checked-out branch.
3610
3610
3611 If -c/--closed is specified, also show branch heads marked closed
3611 If -c/--closed is specified, also show branch heads marked closed
3612 (see :hg:`commit --close-branch`).
3612 (see :hg:`commit --close-branch`).
3613
3613
3614 If STARTREV is specified, only those heads that are descendants of
3614 If STARTREV is specified, only those heads that are descendants of
3615 STARTREV will be displayed.
3615 STARTREV will be displayed.
3616
3616
3617 If -t/--topo is specified, named branch mechanics will be ignored and only
3617 If -t/--topo is specified, named branch mechanics will be ignored and only
3618 topological heads (changesets with no children) will be shown.
3618 topological heads (changesets with no children) will be shown.
3619
3619
3620 Returns 0 if matching heads are found, 1 if not.
3620 Returns 0 if matching heads are found, 1 if not.
3621 """
3621 """
3622
3622
3623 opts = pycompat.byteskwargs(opts)
3623 opts = pycompat.byteskwargs(opts)
3624 start = None
3624 start = None
3625 rev = opts.get(b'rev')
3625 rev = opts.get(b'rev')
3626 if rev:
3626 if rev:
3627 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3627 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3628 start = scmutil.revsingle(repo, rev, None).node()
3628 start = scmutil.revsingle(repo, rev, None).node()
3629
3629
3630 if opts.get(b'topo'):
3630 if opts.get(b'topo'):
3631 heads = [repo[h] for h in repo.heads(start)]
3631 heads = [repo[h] for h in repo.heads(start)]
3632 else:
3632 else:
3633 heads = []
3633 heads = []
3634 for branch in repo.branchmap():
3634 for branch in repo.branchmap():
3635 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3635 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3636 heads = [repo[h] for h in heads]
3636 heads = [repo[h] for h in heads]
3637
3637
3638 if branchrevs:
3638 if branchrevs:
3639 branches = {
3639 branches = {
3640 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3640 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3641 }
3641 }
3642 heads = [h for h in heads if h.branch() in branches]
3642 heads = [h for h in heads if h.branch() in branches]
3643
3643
3644 if opts.get(b'active') and branchrevs:
3644 if opts.get(b'active') and branchrevs:
3645 dagheads = repo.heads(start)
3645 dagheads = repo.heads(start)
3646 heads = [h for h in heads if h.node() in dagheads]
3646 heads = [h for h in heads if h.node() in dagheads]
3647
3647
3648 if branchrevs:
3648 if branchrevs:
3649 haveheads = {h.branch() for h in heads}
3649 haveheads = {h.branch() for h in heads}
3650 if branches - haveheads:
3650 if branches - haveheads:
3651 headless = b', '.join(b for b in branches - haveheads)
3651 headless = b', '.join(b for b in branches - haveheads)
3652 msg = _(b'no open branch heads found on branches %s')
3652 msg = _(b'no open branch heads found on branches %s')
3653 if opts.get(b'rev'):
3653 if opts.get(b'rev'):
3654 msg += _(b' (started at %s)') % opts[b'rev']
3654 msg += _(b' (started at %s)') % opts[b'rev']
3655 ui.warn((msg + b'\n') % headless)
3655 ui.warn((msg + b'\n') % headless)
3656
3656
3657 if not heads:
3657 if not heads:
3658 return 1
3658 return 1
3659
3659
3660 ui.pager(b'heads')
3660 ui.pager(b'heads')
3661 heads = sorted(heads, key=lambda x: -(x.rev()))
3661 heads = sorted(heads, key=lambda x: -(x.rev()))
3662 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3662 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3663 for ctx in heads:
3663 for ctx in heads:
3664 displayer.show(ctx)
3664 displayer.show(ctx)
3665 displayer.close()
3665 displayer.close()
3666
3666
3667
3667
3668 @command(
3668 @command(
3669 b'help',
3669 b'help',
3670 [
3670 [
3671 (b'e', b'extension', None, _(b'show only help for extensions')),
3671 (b'e', b'extension', None, _(b'show only help for extensions')),
3672 (b'c', b'command', None, _(b'show only help for commands')),
3672 (b'c', b'command', None, _(b'show only help for commands')),
3673 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3673 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3674 (
3674 (
3675 b's',
3675 b's',
3676 b'system',
3676 b'system',
3677 [],
3677 [],
3678 _(b'show help for specific platform(s)'),
3678 _(b'show help for specific platform(s)'),
3679 _(b'PLATFORM'),
3679 _(b'PLATFORM'),
3680 ),
3680 ),
3681 ],
3681 ],
3682 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3682 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3683 helpcategory=command.CATEGORY_HELP,
3683 helpcategory=command.CATEGORY_HELP,
3684 norepo=True,
3684 norepo=True,
3685 intents={INTENT_READONLY},
3685 intents={INTENT_READONLY},
3686 )
3686 )
3687 def help_(ui, name=None, **opts):
3687 def help_(ui, name=None, **opts):
3688 """show help for a given topic or a help overview
3688 """show help for a given topic or a help overview
3689
3689
3690 With no arguments, print a list of commands with short help messages.
3690 With no arguments, print a list of commands with short help messages.
3691
3691
3692 Given a topic, extension, or command name, print help for that
3692 Given a topic, extension, or command name, print help for that
3693 topic.
3693 topic.
3694
3694
3695 Returns 0 if successful.
3695 Returns 0 if successful.
3696 """
3696 """
3697
3697
3698 keep = opts.get('system') or []
3698 keep = opts.get('system') or []
3699 if len(keep) == 0:
3699 if len(keep) == 0:
3700 if pycompat.sysplatform.startswith(b'win'):
3700 if pycompat.sysplatform.startswith(b'win'):
3701 keep.append(b'windows')
3701 keep.append(b'windows')
3702 elif pycompat.sysplatform == b'OpenVMS':
3702 elif pycompat.sysplatform == b'OpenVMS':
3703 keep.append(b'vms')
3703 keep.append(b'vms')
3704 elif pycompat.sysplatform == b'plan9':
3704 elif pycompat.sysplatform == b'plan9':
3705 keep.append(b'plan9')
3705 keep.append(b'plan9')
3706 else:
3706 else:
3707 keep.append(b'unix')
3707 keep.append(b'unix')
3708 keep.append(pycompat.sysplatform.lower())
3708 keep.append(pycompat.sysplatform.lower())
3709 if ui.verbose:
3709 if ui.verbose:
3710 keep.append(b'verbose')
3710 keep.append(b'verbose')
3711
3711
3712 commands = sys.modules[__name__]
3712 commands = sys.modules[__name__]
3713 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3713 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3714 ui.pager(b'help')
3714 ui.pager(b'help')
3715 ui.write(formatted)
3715 ui.write(formatted)
3716
3716
3717
3717
3718 @command(
3718 @command(
3719 b'identify|id',
3719 b'identify|id',
3720 [
3720 [
3721 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3721 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3722 (b'n', b'num', None, _(b'show local revision number')),
3722 (b'n', b'num', None, _(b'show local revision number')),
3723 (b'i', b'id', None, _(b'show global revision id')),
3723 (b'i', b'id', None, _(b'show global revision id')),
3724 (b'b', b'branch', None, _(b'show branch')),
3724 (b'b', b'branch', None, _(b'show branch')),
3725 (b't', b'tags', None, _(b'show tags')),
3725 (b't', b'tags', None, _(b'show tags')),
3726 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3726 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3727 ]
3727 ]
3728 + remoteopts
3728 + remoteopts
3729 + formatteropts,
3729 + formatteropts,
3730 _(b'[-nibtB] [-r REV] [SOURCE]'),
3730 _(b'[-nibtB] [-r REV] [SOURCE]'),
3731 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3731 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3732 optionalrepo=True,
3732 optionalrepo=True,
3733 intents={INTENT_READONLY},
3733 intents={INTENT_READONLY},
3734 )
3734 )
3735 def identify(
3735 def identify(
3736 ui,
3736 ui,
3737 repo,
3737 repo,
3738 source=None,
3738 source=None,
3739 rev=None,
3739 rev=None,
3740 num=None,
3740 num=None,
3741 id=None,
3741 id=None,
3742 branch=None,
3742 branch=None,
3743 tags=None,
3743 tags=None,
3744 bookmarks=None,
3744 bookmarks=None,
3745 **opts
3745 **opts
3746 ):
3746 ):
3747 """identify the working directory or specified revision
3747 """identify the working directory or specified revision
3748
3748
3749 Print a summary identifying the repository state at REV using one or
3749 Print a summary identifying the repository state at REV using one or
3750 two parent hash identifiers, followed by a "+" if the working
3750 two parent hash identifiers, followed by a "+" if the working
3751 directory has uncommitted changes, the branch name (if not default),
3751 directory has uncommitted changes, the branch name (if not default),
3752 a list of tags, and a list of bookmarks.
3752 a list of tags, and a list of bookmarks.
3753
3753
3754 When REV is not given, print a summary of the current state of the
3754 When REV is not given, print a summary of the current state of the
3755 repository including the working directory. Specify -r. to get information
3755 repository including the working directory. Specify -r. to get information
3756 of the working directory parent without scanning uncommitted changes.
3756 of the working directory parent without scanning uncommitted changes.
3757
3757
3758 Specifying a path to a repository root or Mercurial bundle will
3758 Specifying a path to a repository root or Mercurial bundle will
3759 cause lookup to operate on that repository/bundle.
3759 cause lookup to operate on that repository/bundle.
3760
3760
3761 .. container:: verbose
3761 .. container:: verbose
3762
3762
3763 Template:
3763 Template:
3764
3764
3765 The following keywords are supported in addition to the common template
3765 The following keywords are supported in addition to the common template
3766 keywords and functions. See also :hg:`help templates`.
3766 keywords and functions. See also :hg:`help templates`.
3767
3767
3768 :dirty: String. Character ``+`` denoting if the working directory has
3768 :dirty: String. Character ``+`` denoting if the working directory has
3769 uncommitted changes.
3769 uncommitted changes.
3770 :id: String. One or two nodes, optionally followed by ``+``.
3770 :id: String. One or two nodes, optionally followed by ``+``.
3771 :parents: List of strings. Parent nodes of the changeset.
3771 :parents: List of strings. Parent nodes of the changeset.
3772
3772
3773 Examples:
3773 Examples:
3774
3774
3775 - generate a build identifier for the working directory::
3775 - generate a build identifier for the working directory::
3776
3776
3777 hg id --id > build-id.dat
3777 hg id --id > build-id.dat
3778
3778
3779 - find the revision corresponding to a tag::
3779 - find the revision corresponding to a tag::
3780
3780
3781 hg id -n -r 1.3
3781 hg id -n -r 1.3
3782
3782
3783 - check the most recent revision of a remote repository::
3783 - check the most recent revision of a remote repository::
3784
3784
3785 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3785 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3786
3786
3787 See :hg:`log` for generating more information about specific revisions,
3787 See :hg:`log` for generating more information about specific revisions,
3788 including full hash identifiers.
3788 including full hash identifiers.
3789
3789
3790 Returns 0 if successful.
3790 Returns 0 if successful.
3791 """
3791 """
3792
3792
3793 opts = pycompat.byteskwargs(opts)
3793 opts = pycompat.byteskwargs(opts)
3794 if not repo and not source:
3794 if not repo and not source:
3795 raise error.InputError(
3795 raise error.InputError(
3796 _(b"there is no Mercurial repository here (.hg not found)")
3796 _(b"there is no Mercurial repository here (.hg not found)")
3797 )
3797 )
3798
3798
3799 default = not (num or id or branch or tags or bookmarks)
3799 default = not (num or id or branch or tags or bookmarks)
3800 output = []
3800 output = []
3801 revs = []
3801 revs = []
3802
3802
3803 if source:
3803 if source:
3804 source, branches = hg.parseurl(ui.expandpath(source))
3804 source, branches = hg.parseurl(ui.expandpath(source))
3805 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3805 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3806 repo = peer.local()
3806 repo = peer.local()
3807 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3807 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3808
3808
3809 fm = ui.formatter(b'identify', opts)
3809 fm = ui.formatter(b'identify', opts)
3810 fm.startitem()
3810 fm.startitem()
3811
3811
3812 if not repo:
3812 if not repo:
3813 if num or branch or tags:
3813 if num or branch or tags:
3814 raise error.InputError(
3814 raise error.InputError(
3815 _(b"can't query remote revision number, branch, or tags")
3815 _(b"can't query remote revision number, branch, or tags")
3816 )
3816 )
3817 if not rev and revs:
3817 if not rev and revs:
3818 rev = revs[0]
3818 rev = revs[0]
3819 if not rev:
3819 if not rev:
3820 rev = b"tip"
3820 rev = b"tip"
3821
3821
3822 remoterev = peer.lookup(rev)
3822 remoterev = peer.lookup(rev)
3823 hexrev = fm.hexfunc(remoterev)
3823 hexrev = fm.hexfunc(remoterev)
3824 if default or id:
3824 if default or id:
3825 output = [hexrev]
3825 output = [hexrev]
3826 fm.data(id=hexrev)
3826 fm.data(id=hexrev)
3827
3827
3828 @util.cachefunc
3828 @util.cachefunc
3829 def getbms():
3829 def getbms():
3830 bms = []
3830 bms = []
3831
3831
3832 if b'bookmarks' in peer.listkeys(b'namespaces'):
3832 if b'bookmarks' in peer.listkeys(b'namespaces'):
3833 hexremoterev = hex(remoterev)
3833 hexremoterev = hex(remoterev)
3834 bms = [
3834 bms = [
3835 bm
3835 bm
3836 for bm, bmr in pycompat.iteritems(
3836 for bm, bmr in pycompat.iteritems(
3837 peer.listkeys(b'bookmarks')
3837 peer.listkeys(b'bookmarks')
3838 )
3838 )
3839 if bmr == hexremoterev
3839 if bmr == hexremoterev
3840 ]
3840 ]
3841
3841
3842 return sorted(bms)
3842 return sorted(bms)
3843
3843
3844 if fm.isplain():
3844 if fm.isplain():
3845 if bookmarks:
3845 if bookmarks:
3846 output.extend(getbms())
3846 output.extend(getbms())
3847 elif default and not ui.quiet:
3847 elif default and not ui.quiet:
3848 # multiple bookmarks for a single parent separated by '/'
3848 # multiple bookmarks for a single parent separated by '/'
3849 bm = b'/'.join(getbms())
3849 bm = b'/'.join(getbms())
3850 if bm:
3850 if bm:
3851 output.append(bm)
3851 output.append(bm)
3852 else:
3852 else:
3853 fm.data(node=hex(remoterev))
3853 fm.data(node=hex(remoterev))
3854 if bookmarks or b'bookmarks' in fm.datahint():
3854 if bookmarks or b'bookmarks' in fm.datahint():
3855 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3855 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3856 else:
3856 else:
3857 if rev:
3857 if rev:
3858 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3858 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3859 ctx = scmutil.revsingle(repo, rev, None)
3859 ctx = scmutil.revsingle(repo, rev, None)
3860
3860
3861 if ctx.rev() is None:
3861 if ctx.rev() is None:
3862 ctx = repo[None]
3862 ctx = repo[None]
3863 parents = ctx.parents()
3863 parents = ctx.parents()
3864 taglist = []
3864 taglist = []
3865 for p in parents:
3865 for p in parents:
3866 taglist.extend(p.tags())
3866 taglist.extend(p.tags())
3867
3867
3868 dirty = b""
3868 dirty = b""
3869 if ctx.dirty(missing=True, merge=False, branch=False):
3869 if ctx.dirty(missing=True, merge=False, branch=False):
3870 dirty = b'+'
3870 dirty = b'+'
3871 fm.data(dirty=dirty)
3871 fm.data(dirty=dirty)
3872
3872
3873 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3873 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3874 if default or id:
3874 if default or id:
3875 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3875 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3876 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3876 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3877
3877
3878 if num:
3878 if num:
3879 numoutput = [b"%d" % p.rev() for p in parents]
3879 numoutput = [b"%d" % p.rev() for p in parents]
3880 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3880 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3881
3881
3882 fm.data(
3882 fm.data(
3883 parents=fm.formatlist(
3883 parents=fm.formatlist(
3884 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3884 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3885 )
3885 )
3886 )
3886 )
3887 else:
3887 else:
3888 hexoutput = fm.hexfunc(ctx.node())
3888 hexoutput = fm.hexfunc(ctx.node())
3889 if default or id:
3889 if default or id:
3890 output = [hexoutput]
3890 output = [hexoutput]
3891 fm.data(id=hexoutput)
3891 fm.data(id=hexoutput)
3892
3892
3893 if num:
3893 if num:
3894 output.append(pycompat.bytestr(ctx.rev()))
3894 output.append(pycompat.bytestr(ctx.rev()))
3895 taglist = ctx.tags()
3895 taglist = ctx.tags()
3896
3896
3897 if default and not ui.quiet:
3897 if default and not ui.quiet:
3898 b = ctx.branch()
3898 b = ctx.branch()
3899 if b != b'default':
3899 if b != b'default':
3900 output.append(b"(%s)" % b)
3900 output.append(b"(%s)" % b)
3901
3901
3902 # multiple tags for a single parent separated by '/'
3902 # multiple tags for a single parent separated by '/'
3903 t = b'/'.join(taglist)
3903 t = b'/'.join(taglist)
3904 if t:
3904 if t:
3905 output.append(t)
3905 output.append(t)
3906
3906
3907 # multiple bookmarks for a single parent separated by '/'
3907 # multiple bookmarks for a single parent separated by '/'
3908 bm = b'/'.join(ctx.bookmarks())
3908 bm = b'/'.join(ctx.bookmarks())
3909 if bm:
3909 if bm:
3910 output.append(bm)
3910 output.append(bm)
3911 else:
3911 else:
3912 if branch:
3912 if branch:
3913 output.append(ctx.branch())
3913 output.append(ctx.branch())
3914
3914
3915 if tags:
3915 if tags:
3916 output.extend(taglist)
3916 output.extend(taglist)
3917
3917
3918 if bookmarks:
3918 if bookmarks:
3919 output.extend(ctx.bookmarks())
3919 output.extend(ctx.bookmarks())
3920
3920
3921 fm.data(node=ctx.hex())
3921 fm.data(node=ctx.hex())
3922 fm.data(branch=ctx.branch())
3922 fm.data(branch=ctx.branch())
3923 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3923 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3924 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3924 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3925 fm.context(ctx=ctx)
3925 fm.context(ctx=ctx)
3926
3926
3927 fm.plain(b"%s\n" % b' '.join(output))
3927 fm.plain(b"%s\n" % b' '.join(output))
3928 fm.end()
3928 fm.end()
3929
3929
3930
3930
3931 @command(
3931 @command(
3932 b'import|patch',
3932 b'import|patch',
3933 [
3933 [
3934 (
3934 (
3935 b'p',
3935 b'p',
3936 b'strip',
3936 b'strip',
3937 1,
3937 1,
3938 _(
3938 _(
3939 b'directory strip option for patch. This has the same '
3939 b'directory strip option for patch. This has the same '
3940 b'meaning as the corresponding patch option'
3940 b'meaning as the corresponding patch option'
3941 ),
3941 ),
3942 _(b'NUM'),
3942 _(b'NUM'),
3943 ),
3943 ),
3944 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3944 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3945 (b'', b'secret', None, _(b'use the secret phase for committing')),
3945 (b'', b'secret', None, _(b'use the secret phase for committing')),
3946 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3946 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3947 (
3947 (
3948 b'f',
3948 b'f',
3949 b'force',
3949 b'force',
3950 None,
3950 None,
3951 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3951 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3952 ),
3952 ),
3953 (
3953 (
3954 b'',
3954 b'',
3955 b'no-commit',
3955 b'no-commit',
3956 None,
3956 None,
3957 _(b"don't commit, just update the working directory"),
3957 _(b"don't commit, just update the working directory"),
3958 ),
3958 ),
3959 (
3959 (
3960 b'',
3960 b'',
3961 b'bypass',
3961 b'bypass',
3962 None,
3962 None,
3963 _(b"apply patch without touching the working directory"),
3963 _(b"apply patch without touching the working directory"),
3964 ),
3964 ),
3965 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3965 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3966 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3966 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3967 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3967 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3968 (
3968 (
3969 b'',
3969 b'',
3970 b'import-branch',
3970 b'import-branch',
3971 None,
3971 None,
3972 _(b'use any branch information in patch (implied by --exact)'),
3972 _(b'use any branch information in patch (implied by --exact)'),
3973 ),
3973 ),
3974 ]
3974 ]
3975 + commitopts
3975 + commitopts
3976 + commitopts2
3976 + commitopts2
3977 + similarityopts,
3977 + similarityopts,
3978 _(b'[OPTION]... PATCH...'),
3978 _(b'[OPTION]... PATCH...'),
3979 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3979 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3980 )
3980 )
3981 def import_(ui, repo, patch1=None, *patches, **opts):
3981 def import_(ui, repo, patch1=None, *patches, **opts):
3982 """import an ordered set of patches
3982 """import an ordered set of patches
3983
3983
3984 Import a list of patches and commit them individually (unless
3984 Import a list of patches and commit them individually (unless
3985 --no-commit is specified).
3985 --no-commit is specified).
3986
3986
3987 To read a patch from standard input (stdin), use "-" as the patch
3987 To read a patch from standard input (stdin), use "-" as the patch
3988 name. If a URL is specified, the patch will be downloaded from
3988 name. If a URL is specified, the patch will be downloaded from
3989 there.
3989 there.
3990
3990
3991 Import first applies changes to the working directory (unless
3991 Import first applies changes to the working directory (unless
3992 --bypass is specified), import will abort if there are outstanding
3992 --bypass is specified), import will abort if there are outstanding
3993 changes.
3993 changes.
3994
3994
3995 Use --bypass to apply and commit patches directly to the
3995 Use --bypass to apply and commit patches directly to the
3996 repository, without affecting the working directory. Without
3996 repository, without affecting the working directory. Without
3997 --exact, patches will be applied on top of the working directory
3997 --exact, patches will be applied on top of the working directory
3998 parent revision.
3998 parent revision.
3999
3999
4000 You can import a patch straight from a mail message. Even patches
4000 You can import a patch straight from a mail message. Even patches
4001 as attachments work (to use the body part, it must have type
4001 as attachments work (to use the body part, it must have type
4002 text/plain or text/x-patch). From and Subject headers of email
4002 text/plain or text/x-patch). From and Subject headers of email
4003 message are used as default committer and commit message. All
4003 message are used as default committer and commit message. All
4004 text/plain body parts before first diff are added to the commit
4004 text/plain body parts before first diff are added to the commit
4005 message.
4005 message.
4006
4006
4007 If the imported patch was generated by :hg:`export`, user and
4007 If the imported patch was generated by :hg:`export`, user and
4008 description from patch override values from message headers and
4008 description from patch override values from message headers and
4009 body. Values given on command line with -m/--message and -u/--user
4009 body. Values given on command line with -m/--message and -u/--user
4010 override these.
4010 override these.
4011
4011
4012 If --exact is specified, import will set the working directory to
4012 If --exact is specified, import will set the working directory to
4013 the parent of each patch before applying it, and will abort if the
4013 the parent of each patch before applying it, and will abort if the
4014 resulting changeset has a different ID than the one recorded in
4014 resulting changeset has a different ID than the one recorded in
4015 the patch. This will guard against various ways that portable
4015 the patch. This will guard against various ways that portable
4016 patch formats and mail systems might fail to transfer Mercurial
4016 patch formats and mail systems might fail to transfer Mercurial
4017 data or metadata. See :hg:`bundle` for lossless transmission.
4017 data or metadata. See :hg:`bundle` for lossless transmission.
4018
4018
4019 Use --partial to ensure a changeset will be created from the patch
4019 Use --partial to ensure a changeset will be created from the patch
4020 even if some hunks fail to apply. Hunks that fail to apply will be
4020 even if some hunks fail to apply. Hunks that fail to apply will be
4021 written to a <target-file>.rej file. Conflicts can then be resolved
4021 written to a <target-file>.rej file. Conflicts can then be resolved
4022 by hand before :hg:`commit --amend` is run to update the created
4022 by hand before :hg:`commit --amend` is run to update the created
4023 changeset. This flag exists to let people import patches that
4023 changeset. This flag exists to let people import patches that
4024 partially apply without losing the associated metadata (author,
4024 partially apply without losing the associated metadata (author,
4025 date, description, ...).
4025 date, description, ...).
4026
4026
4027 .. note::
4027 .. note::
4028
4028
4029 When no hunks apply cleanly, :hg:`import --partial` will create
4029 When no hunks apply cleanly, :hg:`import --partial` will create
4030 an empty changeset, importing only the patch metadata.
4030 an empty changeset, importing only the patch metadata.
4031
4031
4032 With -s/--similarity, hg will attempt to discover renames and
4032 With -s/--similarity, hg will attempt to discover renames and
4033 copies in the patch in the same way as :hg:`addremove`.
4033 copies in the patch in the same way as :hg:`addremove`.
4034
4034
4035 It is possible to use external patch programs to perform the patch
4035 It is possible to use external patch programs to perform the patch
4036 by setting the ``ui.patch`` configuration option. For the default
4036 by setting the ``ui.patch`` configuration option. For the default
4037 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4037 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4038 See :hg:`help config` for more information about configuration
4038 See :hg:`help config` for more information about configuration
4039 files and how to use these options.
4039 files and how to use these options.
4040
4040
4041 See :hg:`help dates` for a list of formats valid for -d/--date.
4041 See :hg:`help dates` for a list of formats valid for -d/--date.
4042
4042
4043 .. container:: verbose
4043 .. container:: verbose
4044
4044
4045 Examples:
4045 Examples:
4046
4046
4047 - import a traditional patch from a website and detect renames::
4047 - import a traditional patch from a website and detect renames::
4048
4048
4049 hg import -s 80 http://example.com/bugfix.patch
4049 hg import -s 80 http://example.com/bugfix.patch
4050
4050
4051 - import a changeset from an hgweb server::
4051 - import a changeset from an hgweb server::
4052
4052
4053 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4053 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4054
4054
4055 - import all the patches in an Unix-style mbox::
4055 - import all the patches in an Unix-style mbox::
4056
4056
4057 hg import incoming-patches.mbox
4057 hg import incoming-patches.mbox
4058
4058
4059 - import patches from stdin::
4059 - import patches from stdin::
4060
4060
4061 hg import -
4061 hg import -
4062
4062
4063 - attempt to exactly restore an exported changeset (not always
4063 - attempt to exactly restore an exported changeset (not always
4064 possible)::
4064 possible)::
4065
4065
4066 hg import --exact proposed-fix.patch
4066 hg import --exact proposed-fix.patch
4067
4067
4068 - use an external tool to apply a patch which is too fuzzy for
4068 - use an external tool to apply a patch which is too fuzzy for
4069 the default internal tool.
4069 the default internal tool.
4070
4070
4071 hg import --config ui.patch="patch --merge" fuzzy.patch
4071 hg import --config ui.patch="patch --merge" fuzzy.patch
4072
4072
4073 - change the default fuzzing from 2 to a less strict 7
4073 - change the default fuzzing from 2 to a less strict 7
4074
4074
4075 hg import --config ui.fuzz=7 fuzz.patch
4075 hg import --config ui.fuzz=7 fuzz.patch
4076
4076
4077 Returns 0 on success, 1 on partial success (see --partial).
4077 Returns 0 on success, 1 on partial success (see --partial).
4078 """
4078 """
4079
4079
4080 cmdutil.check_incompatible_arguments(
4080 cmdutil.check_incompatible_arguments(
4081 opts, 'no_commit', ['bypass', 'secret']
4081 opts, 'no_commit', ['bypass', 'secret']
4082 )
4082 )
4083 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4083 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4084 opts = pycompat.byteskwargs(opts)
4084 opts = pycompat.byteskwargs(opts)
4085 if not patch1:
4085 if not patch1:
4086 raise error.InputError(_(b'need at least one patch to import'))
4086 raise error.InputError(_(b'need at least one patch to import'))
4087
4087
4088 patches = (patch1,) + patches
4088 patches = (patch1,) + patches
4089
4089
4090 date = opts.get(b'date')
4090 date = opts.get(b'date')
4091 if date:
4091 if date:
4092 opts[b'date'] = dateutil.parsedate(date)
4092 opts[b'date'] = dateutil.parsedate(date)
4093
4093
4094 exact = opts.get(b'exact')
4094 exact = opts.get(b'exact')
4095 update = not opts.get(b'bypass')
4095 update = not opts.get(b'bypass')
4096 try:
4096 try:
4097 sim = float(opts.get(b'similarity') or 0)
4097 sim = float(opts.get(b'similarity') or 0)
4098 except ValueError:
4098 except ValueError:
4099 raise error.InputError(_(b'similarity must be a number'))
4099 raise error.InputError(_(b'similarity must be a number'))
4100 if sim < 0 or sim > 100:
4100 if sim < 0 or sim > 100:
4101 raise error.InputError(_(b'similarity must be between 0 and 100'))
4101 raise error.InputError(_(b'similarity must be between 0 and 100'))
4102 if sim and not update:
4102 if sim and not update:
4103 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4103 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4104
4104
4105 base = opts[b"base"]
4105 base = opts[b"base"]
4106 msgs = []
4106 msgs = []
4107 ret = 0
4107 ret = 0
4108
4108
4109 with repo.wlock():
4109 with repo.wlock():
4110 if update:
4110 if update:
4111 cmdutil.checkunfinished(repo)
4111 cmdutil.checkunfinished(repo)
4112 if exact or not opts.get(b'force'):
4112 if exact or not opts.get(b'force'):
4113 cmdutil.bailifchanged(repo)
4113 cmdutil.bailifchanged(repo)
4114
4114
4115 if not opts.get(b'no_commit'):
4115 if not opts.get(b'no_commit'):
4116 lock = repo.lock
4116 lock = repo.lock
4117 tr = lambda: repo.transaction(b'import')
4117 tr = lambda: repo.transaction(b'import')
4118 dsguard = util.nullcontextmanager
4118 dsguard = util.nullcontextmanager
4119 else:
4119 else:
4120 lock = util.nullcontextmanager
4120 lock = util.nullcontextmanager
4121 tr = util.nullcontextmanager
4121 tr = util.nullcontextmanager
4122 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4122 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4123 with lock(), tr(), dsguard():
4123 with lock(), tr(), dsguard():
4124 parents = repo[None].parents()
4124 parents = repo[None].parents()
4125 for patchurl in patches:
4125 for patchurl in patches:
4126 if patchurl == b'-':
4126 if patchurl == b'-':
4127 ui.status(_(b'applying patch from stdin\n'))
4127 ui.status(_(b'applying patch from stdin\n'))
4128 patchfile = ui.fin
4128 patchfile = ui.fin
4129 patchurl = b'stdin' # for error message
4129 patchurl = b'stdin' # for error message
4130 else:
4130 else:
4131 patchurl = os.path.join(base, patchurl)
4131 patchurl = os.path.join(base, patchurl)
4132 ui.status(_(b'applying %s\n') % patchurl)
4132 ui.status(_(b'applying %s\n') % patchurl)
4133 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4133 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4134
4134
4135 haspatch = False
4135 haspatch = False
4136 for hunk in patch.split(patchfile):
4136 for hunk in patch.split(patchfile):
4137 with patch.extract(ui, hunk) as patchdata:
4137 with patch.extract(ui, hunk) as patchdata:
4138 msg, node, rej = cmdutil.tryimportone(
4138 msg, node, rej = cmdutil.tryimportone(
4139 ui, repo, patchdata, parents, opts, msgs, hg.clean
4139 ui, repo, patchdata, parents, opts, msgs, hg.clean
4140 )
4140 )
4141 if msg:
4141 if msg:
4142 haspatch = True
4142 haspatch = True
4143 ui.note(msg + b'\n')
4143 ui.note(msg + b'\n')
4144 if update or exact:
4144 if update or exact:
4145 parents = repo[None].parents()
4145 parents = repo[None].parents()
4146 else:
4146 else:
4147 parents = [repo[node]]
4147 parents = [repo[node]]
4148 if rej:
4148 if rej:
4149 ui.write_err(_(b"patch applied partially\n"))
4149 ui.write_err(_(b"patch applied partially\n"))
4150 ui.write_err(
4150 ui.write_err(
4151 _(
4151 _(
4152 b"(fix the .rej files and run "
4152 b"(fix the .rej files and run "
4153 b"`hg commit --amend`)\n"
4153 b"`hg commit --amend`)\n"
4154 )
4154 )
4155 )
4155 )
4156 ret = 1
4156 ret = 1
4157 break
4157 break
4158
4158
4159 if not haspatch:
4159 if not haspatch:
4160 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4160 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4161
4161
4162 if msgs:
4162 if msgs:
4163 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4163 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4164 return ret
4164 return ret
4165
4165
4166
4166
4167 @command(
4167 @command(
4168 b'incoming|in',
4168 b'incoming|in',
4169 [
4169 [
4170 (
4170 (
4171 b'f',
4171 b'f',
4172 b'force',
4172 b'force',
4173 None,
4173 None,
4174 _(b'run even if remote repository is unrelated'),
4174 _(b'run even if remote repository is unrelated'),
4175 ),
4175 ),
4176 (b'n', b'newest-first', None, _(b'show newest record first')),
4176 (b'n', b'newest-first', None, _(b'show newest record first')),
4177 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4177 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4178 (
4178 (
4179 b'r',
4179 b'r',
4180 b'rev',
4180 b'rev',
4181 [],
4181 [],
4182 _(b'a remote changeset intended to be added'),
4182 _(b'a remote changeset intended to be added'),
4183 _(b'REV'),
4183 _(b'REV'),
4184 ),
4184 ),
4185 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4185 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4186 (
4186 (
4187 b'b',
4187 b'b',
4188 b'branch',
4188 b'branch',
4189 [],
4189 [],
4190 _(b'a specific branch you would like to pull'),
4190 _(b'a specific branch you would like to pull'),
4191 _(b'BRANCH'),
4191 _(b'BRANCH'),
4192 ),
4192 ),
4193 ]
4193 ]
4194 + logopts
4194 + logopts
4195 + remoteopts
4195 + remoteopts
4196 + subrepoopts,
4196 + subrepoopts,
4197 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4197 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4198 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4198 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4199 )
4199 )
4200 def incoming(ui, repo, source=b"default", **opts):
4200 def incoming(ui, repo, source=b"default", **opts):
4201 """show new changesets found in source
4201 """show new changesets found in source
4202
4202
4203 Show new changesets found in the specified path/URL or the default
4203 Show new changesets found in the specified path/URL or the default
4204 pull location. These are the changesets that would have been pulled
4204 pull location. These are the changesets that would have been pulled
4205 by :hg:`pull` at the time you issued this command.
4205 by :hg:`pull` at the time you issued this command.
4206
4206
4207 See pull for valid source format details.
4207 See pull for valid source format details.
4208
4208
4209 .. container:: verbose
4209 .. container:: verbose
4210
4210
4211 With -B/--bookmarks, the result of bookmark comparison between
4211 With -B/--bookmarks, the result of bookmark comparison between
4212 local and remote repositories is displayed. With -v/--verbose,
4212 local and remote repositories is displayed. With -v/--verbose,
4213 status is also displayed for each bookmark like below::
4213 status is also displayed for each bookmark like below::
4214
4214
4215 BM1 01234567890a added
4215 BM1 01234567890a added
4216 BM2 1234567890ab advanced
4216 BM2 1234567890ab advanced
4217 BM3 234567890abc diverged
4217 BM3 234567890abc diverged
4218 BM4 34567890abcd changed
4218 BM4 34567890abcd changed
4219
4219
4220 The action taken locally when pulling depends on the
4220 The action taken locally when pulling depends on the
4221 status of each bookmark:
4221 status of each bookmark:
4222
4222
4223 :``added``: pull will create it
4223 :``added``: pull will create it
4224 :``advanced``: pull will update it
4224 :``advanced``: pull will update it
4225 :``diverged``: pull will create a divergent bookmark
4225 :``diverged``: pull will create a divergent bookmark
4226 :``changed``: result depends on remote changesets
4226 :``changed``: result depends on remote changesets
4227
4227
4228 From the point of view of pulling behavior, bookmark
4228 From the point of view of pulling behavior, bookmark
4229 existing only in the remote repository are treated as ``added``,
4229 existing only in the remote repository are treated as ``added``,
4230 even if it is in fact locally deleted.
4230 even if it is in fact locally deleted.
4231
4231
4232 .. container:: verbose
4232 .. container:: verbose
4233
4233
4234 For remote repository, using --bundle avoids downloading the
4234 For remote repository, using --bundle avoids downloading the
4235 changesets twice if the incoming is followed by a pull.
4235 changesets twice if the incoming is followed by a pull.
4236
4236
4237 Examples:
4237 Examples:
4238
4238
4239 - show incoming changes with patches and full description::
4239 - show incoming changes with patches and full description::
4240
4240
4241 hg incoming -vp
4241 hg incoming -vp
4242
4242
4243 - show incoming changes excluding merges, store a bundle::
4243 - show incoming changes excluding merges, store a bundle::
4244
4244
4245 hg in -vpM --bundle incoming.hg
4245 hg in -vpM --bundle incoming.hg
4246 hg pull incoming.hg
4246 hg pull incoming.hg
4247
4247
4248 - briefly list changes inside a bundle::
4248 - briefly list changes inside a bundle::
4249
4249
4250 hg in changes.hg -T "{desc|firstline}\\n"
4250 hg in changes.hg -T "{desc|firstline}\\n"
4251
4251
4252 Returns 0 if there are incoming changes, 1 otherwise.
4252 Returns 0 if there are incoming changes, 1 otherwise.
4253 """
4253 """
4254 opts = pycompat.byteskwargs(opts)
4254 opts = pycompat.byteskwargs(opts)
4255 if opts.get(b'graph'):
4255 if opts.get(b'graph'):
4256 logcmdutil.checkunsupportedgraphflags([], opts)
4256 logcmdutil.checkunsupportedgraphflags([], opts)
4257
4257
4258 def display(other, chlist, displayer):
4258 def display(other, chlist, displayer):
4259 revdag = logcmdutil.graphrevs(other, chlist, opts)
4259 revdag = logcmdutil.graphrevs(other, chlist, opts)
4260 logcmdutil.displaygraph(
4260 logcmdutil.displaygraph(
4261 ui, repo, revdag, displayer, graphmod.asciiedges
4261 ui, repo, revdag, displayer, graphmod.asciiedges
4262 )
4262 )
4263
4263
4264 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4264 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4265 return 0
4265 return 0
4266
4266
4267 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4267 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4268
4268
4269 if opts.get(b'bookmarks'):
4269 if opts.get(b'bookmarks'):
4270 source, branches = hg.parseurl(
4270 source, branches = hg.parseurl(
4271 ui.expandpath(source), opts.get(b'branch')
4271 ui.expandpath(source), opts.get(b'branch')
4272 )
4272 )
4273 other = hg.peer(repo, opts, source)
4273 other = hg.peer(repo, opts, source)
4274 if b'bookmarks' not in other.listkeys(b'namespaces'):
4274 if b'bookmarks' not in other.listkeys(b'namespaces'):
4275 ui.warn(_(b"remote doesn't support bookmarks\n"))
4275 ui.warn(_(b"remote doesn't support bookmarks\n"))
4276 return 0
4276 return 0
4277 ui.pager(b'incoming')
4277 ui.pager(b'incoming')
4278 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4278 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4279 return bookmarks.incoming(ui, repo, other)
4279 return bookmarks.incoming(ui, repo, other)
4280
4280
4281 repo._subtoppath = ui.expandpath(source)
4281 repo._subtoppath = ui.expandpath(source)
4282 try:
4282 try:
4283 return hg.incoming(ui, repo, source, opts)
4283 return hg.incoming(ui, repo, source, opts)
4284 finally:
4284 finally:
4285 del repo._subtoppath
4285 del repo._subtoppath
4286
4286
4287
4287
4288 @command(
4288 @command(
4289 b'init',
4289 b'init',
4290 remoteopts,
4290 remoteopts,
4291 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4291 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4292 helpcategory=command.CATEGORY_REPO_CREATION,
4292 helpcategory=command.CATEGORY_REPO_CREATION,
4293 helpbasic=True,
4293 helpbasic=True,
4294 norepo=True,
4294 norepo=True,
4295 )
4295 )
4296 def init(ui, dest=b".", **opts):
4296 def init(ui, dest=b".", **opts):
4297 """create a new repository in the given directory
4297 """create a new repository in the given directory
4298
4298
4299 Initialize a new repository in the given directory. If the given
4299 Initialize a new repository in the given directory. If the given
4300 directory does not exist, it will be created.
4300 directory does not exist, it will be created.
4301
4301
4302 If no directory is given, the current directory is used.
4302 If no directory is given, the current directory is used.
4303
4303
4304 It is possible to specify an ``ssh://`` URL as the destination.
4304 It is possible to specify an ``ssh://`` URL as the destination.
4305 See :hg:`help urls` for more information.
4305 See :hg:`help urls` for more information.
4306
4306
4307 Returns 0 on success.
4307 Returns 0 on success.
4308 """
4308 """
4309 opts = pycompat.byteskwargs(opts)
4309 opts = pycompat.byteskwargs(opts)
4310 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4310 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4311
4311
4312
4312
4313 @command(
4313 @command(
4314 b'locate',
4314 b'locate',
4315 [
4315 [
4316 (
4316 (
4317 b'r',
4317 b'r',
4318 b'rev',
4318 b'rev',
4319 b'',
4319 b'',
4320 _(b'search the repository as it is in REV'),
4320 _(b'search the repository as it is in REV'),
4321 _(b'REV'),
4321 _(b'REV'),
4322 ),
4322 ),
4323 (
4323 (
4324 b'0',
4324 b'0',
4325 b'print0',
4325 b'print0',
4326 None,
4326 None,
4327 _(b'end filenames with NUL, for use with xargs'),
4327 _(b'end filenames with NUL, for use with xargs'),
4328 ),
4328 ),
4329 (
4329 (
4330 b'f',
4330 b'f',
4331 b'fullpath',
4331 b'fullpath',
4332 None,
4332 None,
4333 _(b'print complete paths from the filesystem root'),
4333 _(b'print complete paths from the filesystem root'),
4334 ),
4334 ),
4335 ]
4335 ]
4336 + walkopts,
4336 + walkopts,
4337 _(b'[OPTION]... [PATTERN]...'),
4337 _(b'[OPTION]... [PATTERN]...'),
4338 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4338 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4339 )
4339 )
4340 def locate(ui, repo, *pats, **opts):
4340 def locate(ui, repo, *pats, **opts):
4341 """locate files matching specific patterns (DEPRECATED)
4341 """locate files matching specific patterns (DEPRECATED)
4342
4342
4343 Print files under Mercurial control in the working directory whose
4343 Print files under Mercurial control in the working directory whose
4344 names match the given patterns.
4344 names match the given patterns.
4345
4345
4346 By default, this command searches all directories in the working
4346 By default, this command searches all directories in the working
4347 directory. To search just the current directory and its
4347 directory. To search just the current directory and its
4348 subdirectories, use "--include .".
4348 subdirectories, use "--include .".
4349
4349
4350 If no patterns are given to match, this command prints the names
4350 If no patterns are given to match, this command prints the names
4351 of all files under Mercurial control in the working directory.
4351 of all files under Mercurial control in the working directory.
4352
4352
4353 If you want to feed the output of this command into the "xargs"
4353 If you want to feed the output of this command into the "xargs"
4354 command, use the -0 option to both this command and "xargs". This
4354 command, use the -0 option to both this command and "xargs". This
4355 will avoid the problem of "xargs" treating single filenames that
4355 will avoid the problem of "xargs" treating single filenames that
4356 contain whitespace as multiple filenames.
4356 contain whitespace as multiple filenames.
4357
4357
4358 See :hg:`help files` for a more versatile command.
4358 See :hg:`help files` for a more versatile command.
4359
4359
4360 Returns 0 if a match is found, 1 otherwise.
4360 Returns 0 if a match is found, 1 otherwise.
4361 """
4361 """
4362 opts = pycompat.byteskwargs(opts)
4362 opts = pycompat.byteskwargs(opts)
4363 if opts.get(b'print0'):
4363 if opts.get(b'print0'):
4364 end = b'\0'
4364 end = b'\0'
4365 else:
4365 else:
4366 end = b'\n'
4366 end = b'\n'
4367 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4367 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4368
4368
4369 ret = 1
4369 ret = 1
4370 m = scmutil.match(
4370 m = scmutil.match(
4371 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4371 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4372 )
4372 )
4373
4373
4374 ui.pager(b'locate')
4374 ui.pager(b'locate')
4375 if ctx.rev() is None:
4375 if ctx.rev() is None:
4376 # When run on the working copy, "locate" includes removed files, so
4376 # When run on the working copy, "locate" includes removed files, so
4377 # we get the list of files from the dirstate.
4377 # we get the list of files from the dirstate.
4378 filesgen = sorted(repo.dirstate.matches(m))
4378 filesgen = sorted(repo.dirstate.matches(m))
4379 else:
4379 else:
4380 filesgen = ctx.matches(m)
4380 filesgen = ctx.matches(m)
4381 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4381 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4382 for abs in filesgen:
4382 for abs in filesgen:
4383 if opts.get(b'fullpath'):
4383 if opts.get(b'fullpath'):
4384 ui.write(repo.wjoin(abs), end)
4384 ui.write(repo.wjoin(abs), end)
4385 else:
4385 else:
4386 ui.write(uipathfn(abs), end)
4386 ui.write(uipathfn(abs), end)
4387 ret = 0
4387 ret = 0
4388
4388
4389 return ret
4389 return ret
4390
4390
4391
4391
4392 @command(
4392 @command(
4393 b'log|history',
4393 b'log|history',
4394 [
4394 [
4395 (
4395 (
4396 b'f',
4396 b'f',
4397 b'follow',
4397 b'follow',
4398 None,
4398 None,
4399 _(
4399 _(
4400 b'follow changeset history, or file history across copies and renames'
4400 b'follow changeset history, or file history across copies and renames'
4401 ),
4401 ),
4402 ),
4402 ),
4403 (
4403 (
4404 b'',
4404 b'',
4405 b'follow-first',
4405 b'follow-first',
4406 None,
4406 None,
4407 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4407 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4408 ),
4408 ),
4409 (
4409 (
4410 b'd',
4410 b'd',
4411 b'date',
4411 b'date',
4412 b'',
4412 b'',
4413 _(b'show revisions matching date spec'),
4413 _(b'show revisions matching date spec'),
4414 _(b'DATE'),
4414 _(b'DATE'),
4415 ),
4415 ),
4416 (b'C', b'copies', None, _(b'show copied files')),
4416 (b'C', b'copies', None, _(b'show copied files')),
4417 (
4417 (
4418 b'k',
4418 b'k',
4419 b'keyword',
4419 b'keyword',
4420 [],
4420 [],
4421 _(b'do case-insensitive search for a given text'),
4421 _(b'do case-insensitive search for a given text'),
4422 _(b'TEXT'),
4422 _(b'TEXT'),
4423 ),
4423 ),
4424 (
4424 (
4425 b'r',
4425 b'r',
4426 b'rev',
4426 b'rev',
4427 [],
4427 [],
4428 _(b'show the specified revision or revset'),
4428 _(b'show the specified revision or revset'),
4429 _(b'REV'),
4429 _(b'REV'),
4430 ),
4430 ),
4431 (
4431 (
4432 b'L',
4432 b'L',
4433 b'line-range',
4433 b'line-range',
4434 [],
4434 [],
4435 _(b'follow line range of specified file (EXPERIMENTAL)'),
4435 _(b'follow line range of specified file (EXPERIMENTAL)'),
4436 _(b'FILE,RANGE'),
4436 _(b'FILE,RANGE'),
4437 ),
4437 ),
4438 (
4438 (
4439 b'',
4439 b'',
4440 b'removed',
4440 b'removed',
4441 None,
4441 None,
4442 _(b'include revisions where files were removed'),
4442 _(b'include revisions where files were removed'),
4443 ),
4443 ),
4444 (
4444 (
4445 b'm',
4445 b'm',
4446 b'only-merges',
4446 b'only-merges',
4447 None,
4447 None,
4448 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4448 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4449 ),
4449 ),
4450 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4450 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4451 (
4451 (
4452 b'',
4452 b'',
4453 b'only-branch',
4453 b'only-branch',
4454 [],
4454 [],
4455 _(
4455 _(
4456 b'show only changesets within the given named branch (DEPRECATED)'
4456 b'show only changesets within the given named branch (DEPRECATED)'
4457 ),
4457 ),
4458 _(b'BRANCH'),
4458 _(b'BRANCH'),
4459 ),
4459 ),
4460 (
4460 (
4461 b'b',
4461 b'b',
4462 b'branch',
4462 b'branch',
4463 [],
4463 [],
4464 _(b'show changesets within the given named branch'),
4464 _(b'show changesets within the given named branch'),
4465 _(b'BRANCH'),
4465 _(b'BRANCH'),
4466 ),
4466 ),
4467 (
4467 (
4468 b'B',
4468 b'B',
4469 b'bookmark',
4469 b'bookmark',
4470 [],
4470 [],
4471 _(b"show changesets within the given bookmark"),
4471 _(b"show changesets within the given bookmark"),
4472 _(b'BOOKMARK'),
4472 _(b'BOOKMARK'),
4473 ),
4473 ),
4474 (
4474 (
4475 b'P',
4475 b'P',
4476 b'prune',
4476 b'prune',
4477 [],
4477 [],
4478 _(b'do not display revision or any of its ancestors'),
4478 _(b'do not display revision or any of its ancestors'),
4479 _(b'REV'),
4479 _(b'REV'),
4480 ),
4480 ),
4481 ]
4481 ]
4482 + logopts
4482 + logopts
4483 + walkopts,
4483 + walkopts,
4484 _(b'[OPTION]... [FILE]'),
4484 _(b'[OPTION]... [FILE]'),
4485 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4485 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4486 helpbasic=True,
4486 helpbasic=True,
4487 inferrepo=True,
4487 inferrepo=True,
4488 intents={INTENT_READONLY},
4488 intents={INTENT_READONLY},
4489 )
4489 )
4490 def log(ui, repo, *pats, **opts):
4490 def log(ui, repo, *pats, **opts):
4491 """show revision history of entire repository or files
4491 """show revision history of entire repository or files
4492
4492
4493 Print the revision history of the specified files or the entire
4493 Print the revision history of the specified files or the entire
4494 project.
4494 project.
4495
4495
4496 If no revision range is specified, the default is ``tip:0`` unless
4496 If no revision range is specified, the default is ``tip:0`` unless
4497 --follow is set, in which case the working directory parent is
4497 --follow is set, in which case the working directory parent is
4498 used as the starting revision.
4498 used as the starting revision.
4499
4499
4500 File history is shown without following rename or copy history of
4500 File history is shown without following rename or copy history of
4501 files. Use -f/--follow with a filename to follow history across
4501 files. Use -f/--follow with a filename to follow history across
4502 renames and copies. --follow without a filename will only show
4502 renames and copies. --follow without a filename will only show
4503 ancestors of the starting revision.
4503 ancestors of the starting revision.
4504
4504
4505 By default this command prints revision number and changeset id,
4505 By default this command prints revision number and changeset id,
4506 tags, non-trivial parents, user, date and time, and a summary for
4506 tags, non-trivial parents, user, date and time, and a summary for
4507 each commit. When the -v/--verbose switch is used, the list of
4507 each commit. When the -v/--verbose switch is used, the list of
4508 changed files and full commit message are shown.
4508 changed files and full commit message are shown.
4509
4509
4510 With --graph the revisions are shown as an ASCII art DAG with the most
4510 With --graph the revisions are shown as an ASCII art DAG with the most
4511 recent changeset at the top.
4511 recent changeset at the top.
4512 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4512 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4513 involved in an unresolved merge conflict, '_' closes a branch,
4513 involved in an unresolved merge conflict, '_' closes a branch,
4514 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4514 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4515 changeset from the lines below is a parent of the 'o' merge on the same
4515 changeset from the lines below is a parent of the 'o' merge on the same
4516 line.
4516 line.
4517 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4517 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4518 of a '|' indicates one or more revisions in a path are omitted.
4518 of a '|' indicates one or more revisions in a path are omitted.
4519
4519
4520 .. container:: verbose
4520 .. container:: verbose
4521
4521
4522 Use -L/--line-range FILE,M:N options to follow the history of lines
4522 Use -L/--line-range FILE,M:N options to follow the history of lines
4523 from M to N in FILE. With -p/--patch only diff hunks affecting
4523 from M to N in FILE. With -p/--patch only diff hunks affecting
4524 specified line range will be shown. This option requires --follow;
4524 specified line range will be shown. This option requires --follow;
4525 it can be specified multiple times. Currently, this option is not
4525 it can be specified multiple times. Currently, this option is not
4526 compatible with --graph. This option is experimental.
4526 compatible with --graph. This option is experimental.
4527
4527
4528 .. note::
4528 .. note::
4529
4529
4530 :hg:`log --patch` may generate unexpected diff output for merge
4530 :hg:`log --patch` may generate unexpected diff output for merge
4531 changesets, as it will only compare the merge changeset against
4531 changesets, as it will only compare the merge changeset against
4532 its first parent. Also, only files different from BOTH parents
4532 its first parent. Also, only files different from BOTH parents
4533 will appear in files:.
4533 will appear in files:.
4534
4534
4535 .. note::
4535 .. note::
4536
4536
4537 For performance reasons, :hg:`log FILE` may omit duplicate changes
4537 For performance reasons, :hg:`log FILE` may omit duplicate changes
4538 made on branches and will not show removals or mode changes. To
4538 made on branches and will not show removals or mode changes. To
4539 see all such changes, use the --removed switch.
4539 see all such changes, use the --removed switch.
4540
4540
4541 .. container:: verbose
4541 .. container:: verbose
4542
4542
4543 .. note::
4543 .. note::
4544
4544
4545 The history resulting from -L/--line-range options depends on diff
4545 The history resulting from -L/--line-range options depends on diff
4546 options; for instance if white-spaces are ignored, respective changes
4546 options; for instance if white-spaces are ignored, respective changes
4547 with only white-spaces in specified line range will not be listed.
4547 with only white-spaces in specified line range will not be listed.
4548
4548
4549 .. container:: verbose
4549 .. container:: verbose
4550
4550
4551 Some examples:
4551 Some examples:
4552
4552
4553 - changesets with full descriptions and file lists::
4553 - changesets with full descriptions and file lists::
4554
4554
4555 hg log -v
4555 hg log -v
4556
4556
4557 - changesets ancestral to the working directory::
4557 - changesets ancestral to the working directory::
4558
4558
4559 hg log -f
4559 hg log -f
4560
4560
4561 - last 10 commits on the current branch::
4561 - last 10 commits on the current branch::
4562
4562
4563 hg log -l 10 -b .
4563 hg log -l 10 -b .
4564
4564
4565 - changesets showing all modifications of a file, including removals::
4565 - changesets showing all modifications of a file, including removals::
4566
4566
4567 hg log --removed file.c
4567 hg log --removed file.c
4568
4568
4569 - all changesets that touch a directory, with diffs, excluding merges::
4569 - all changesets that touch a directory, with diffs, excluding merges::
4570
4570
4571 hg log -Mp lib/
4571 hg log -Mp lib/
4572
4572
4573 - all revision numbers that match a keyword::
4573 - all revision numbers that match a keyword::
4574
4574
4575 hg log -k bug --template "{rev}\\n"
4575 hg log -k bug --template "{rev}\\n"
4576
4576
4577 - the full hash identifier of the working directory parent::
4577 - the full hash identifier of the working directory parent::
4578
4578
4579 hg log -r . --template "{node}\\n"
4579 hg log -r . --template "{node}\\n"
4580
4580
4581 - list available log templates::
4581 - list available log templates::
4582
4582
4583 hg log -T list
4583 hg log -T list
4584
4584
4585 - check if a given changeset is included in a tagged release::
4585 - check if a given changeset is included in a tagged release::
4586
4586
4587 hg log -r "a21ccf and ancestor(1.9)"
4587 hg log -r "a21ccf and ancestor(1.9)"
4588
4588
4589 - find all changesets by some user in a date range::
4589 - find all changesets by some user in a date range::
4590
4590
4591 hg log -k alice -d "may 2008 to jul 2008"
4591 hg log -k alice -d "may 2008 to jul 2008"
4592
4592
4593 - summary of all changesets after the last tag::
4593 - summary of all changesets after the last tag::
4594
4594
4595 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4595 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4596
4596
4597 - changesets touching lines 13 to 23 for file.c::
4597 - changesets touching lines 13 to 23 for file.c::
4598
4598
4599 hg log -L file.c,13:23
4599 hg log -L file.c,13:23
4600
4600
4601 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4601 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4602 main.c with patch::
4602 main.c with patch::
4603
4603
4604 hg log -L file.c,13:23 -L main.c,2:6 -p
4604 hg log -L file.c,13:23 -L main.c,2:6 -p
4605
4605
4606 See :hg:`help dates` for a list of formats valid for -d/--date.
4606 See :hg:`help dates` for a list of formats valid for -d/--date.
4607
4607
4608 See :hg:`help revisions` for more about specifying and ordering
4608 See :hg:`help revisions` for more about specifying and ordering
4609 revisions.
4609 revisions.
4610
4610
4611 See :hg:`help templates` for more about pre-packaged styles and
4611 See :hg:`help templates` for more about pre-packaged styles and
4612 specifying custom templates. The default template used by the log
4612 specifying custom templates. The default template used by the log
4613 command can be customized via the ``command-templates.log`` configuration
4613 command can be customized via the ``command-templates.log`` configuration
4614 setting.
4614 setting.
4615
4615
4616 Returns 0 on success.
4616 Returns 0 on success.
4617
4617
4618 """
4618 """
4619 opts = pycompat.byteskwargs(opts)
4619 opts = pycompat.byteskwargs(opts)
4620 linerange = opts.get(b'line_range')
4620 linerange = opts.get(b'line_range')
4621
4621
4622 if linerange and not opts.get(b'follow'):
4622 if linerange and not opts.get(b'follow'):
4623 raise error.InputError(_(b'--line-range requires --follow'))
4623 raise error.InputError(_(b'--line-range requires --follow'))
4624
4624
4625 if linerange and pats:
4625 if linerange and pats:
4626 # TODO: take pats as patterns with no line-range filter
4626 # TODO: take pats as patterns with no line-range filter
4627 raise error.InputError(
4627 raise error.InputError(
4628 _(b'FILE arguments are not compatible with --line-range option')
4628 _(b'FILE arguments are not compatible with --line-range option')
4629 )
4629 )
4630
4630
4631 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4631 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4632 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4632 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4633 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4633 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4634 if linerange:
4634 if linerange:
4635 # TODO: should follow file history from logcmdutil._initialrevs(),
4635 # TODO: should follow file history from logcmdutil._initialrevs(),
4636 # then filter the result by logcmdutil._makerevset() and --limit
4636 # then filter the result by logcmdutil._makerevset() and --limit
4637 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4637 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4638
4638
4639 if opts.get(b'bookmark'):
4639 if opts.get(b'bookmark'):
4640 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
4640 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
4641 bookmarks = opts.get(b'bookmark')
4641 bookmarks = opts.get(b'bookmark')
4642 bookmark = bookmarks[0]
4642 bookmark = bookmarks[0]
4643 revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)
4643 revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)
4644
4644
4645 getcopies = None
4645 getcopies = None
4646 if opts.get(b'copies'):
4646 if opts.get(b'copies'):
4647 endrev = None
4647 endrev = None
4648 if revs:
4648 if revs:
4649 endrev = revs.max() + 1
4649 endrev = revs.max() + 1
4650 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4650 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4651
4651
4652 ui.pager(b'log')
4652 ui.pager(b'log')
4653 displayer = logcmdutil.changesetdisplayer(
4653 displayer = logcmdutil.changesetdisplayer(
4654 ui, repo, opts, differ, buffered=True
4654 ui, repo, opts, differ, buffered=True
4655 )
4655 )
4656 if opts.get(b'graph'):
4656 if opts.get(b'graph'):
4657 displayfn = logcmdutil.displaygraphrevs
4657 displayfn = logcmdutil.displaygraphrevs
4658 else:
4658 else:
4659 displayfn = logcmdutil.displayrevs
4659 displayfn = logcmdutil.displayrevs
4660 displayfn(ui, repo, revs, displayer, getcopies)
4660 displayfn(ui, repo, revs, displayer, getcopies)
4661
4661
4662
4662
4663 @command(
4663 @command(
4664 b'manifest',
4664 b'manifest',
4665 [
4665 [
4666 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4666 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4667 (b'', b'all', False, _(b"list files from all revisions")),
4667 (b'', b'all', False, _(b"list files from all revisions")),
4668 ]
4668 ]
4669 + formatteropts,
4669 + formatteropts,
4670 _(b'[-r REV]'),
4670 _(b'[-r REV]'),
4671 helpcategory=command.CATEGORY_MAINTENANCE,
4671 helpcategory=command.CATEGORY_MAINTENANCE,
4672 intents={INTENT_READONLY},
4672 intents={INTENT_READONLY},
4673 )
4673 )
4674 def manifest(ui, repo, node=None, rev=None, **opts):
4674 def manifest(ui, repo, node=None, rev=None, **opts):
4675 """output the current or given revision of the project manifest
4675 """output the current or given revision of the project manifest
4676
4676
4677 Print a list of version controlled files for the given revision.
4677 Print a list of version controlled files for the given revision.
4678 If no revision is given, the first parent of the working directory
4678 If no revision is given, the first parent of the working directory
4679 is used, or the null revision if no revision is checked out.
4679 is used, or the null revision if no revision is checked out.
4680
4680
4681 With -v, print file permissions, symlink and executable bits.
4681 With -v, print file permissions, symlink and executable bits.
4682 With --debug, print file revision hashes.
4682 With --debug, print file revision hashes.
4683
4683
4684 If option --all is specified, the list of all files from all revisions
4684 If option --all is specified, the list of all files from all revisions
4685 is printed. This includes deleted and renamed files.
4685 is printed. This includes deleted and renamed files.
4686
4686
4687 Returns 0 on success.
4687 Returns 0 on success.
4688 """
4688 """
4689 opts = pycompat.byteskwargs(opts)
4689 opts = pycompat.byteskwargs(opts)
4690 fm = ui.formatter(b'manifest', opts)
4690 fm = ui.formatter(b'manifest', opts)
4691
4691
4692 if opts.get(b'all'):
4692 if opts.get(b'all'):
4693 if rev or node:
4693 if rev or node:
4694 raise error.InputError(_(b"can't specify a revision with --all"))
4694 raise error.InputError(_(b"can't specify a revision with --all"))
4695
4695
4696 res = set()
4696 res = set()
4697 for rev in repo:
4697 for rev in repo:
4698 ctx = repo[rev]
4698 ctx = repo[rev]
4699 res |= set(ctx.files())
4699 res |= set(ctx.files())
4700
4700
4701 ui.pager(b'manifest')
4701 ui.pager(b'manifest')
4702 for f in sorted(res):
4702 for f in sorted(res):
4703 fm.startitem()
4703 fm.startitem()
4704 fm.write(b"path", b'%s\n', f)
4704 fm.write(b"path", b'%s\n', f)
4705 fm.end()
4705 fm.end()
4706 return
4706 return
4707
4707
4708 if rev and node:
4708 if rev and node:
4709 raise error.InputError(_(b"please specify just one revision"))
4709 raise error.InputError(_(b"please specify just one revision"))
4710
4710
4711 if not node:
4711 if not node:
4712 node = rev
4712 node = rev
4713
4713
4714 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4714 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4715 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4715 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4716 if node:
4716 if node:
4717 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4717 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4718 ctx = scmutil.revsingle(repo, node)
4718 ctx = scmutil.revsingle(repo, node)
4719 mf = ctx.manifest()
4719 mf = ctx.manifest()
4720 ui.pager(b'manifest')
4720 ui.pager(b'manifest')
4721 for f in ctx:
4721 for f in ctx:
4722 fm.startitem()
4722 fm.startitem()
4723 fm.context(ctx=ctx)
4723 fm.context(ctx=ctx)
4724 fl = ctx[f].flags()
4724 fl = ctx[f].flags()
4725 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4725 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4726 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4726 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4727 fm.write(b'path', b'%s\n', f)
4727 fm.write(b'path', b'%s\n', f)
4728 fm.end()
4728 fm.end()
4729
4729
4730
4730
4731 @command(
4731 @command(
4732 b'merge',
4732 b'merge',
4733 [
4733 [
4734 (
4734 (
4735 b'f',
4735 b'f',
4736 b'force',
4736 b'force',
4737 None,
4737 None,
4738 _(b'force a merge including outstanding changes (DEPRECATED)'),
4738 _(b'force a merge including outstanding changes (DEPRECATED)'),
4739 ),
4739 ),
4740 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4740 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4741 (
4741 (
4742 b'P',
4742 b'P',
4743 b'preview',
4743 b'preview',
4744 None,
4744 None,
4745 _(b'review revisions to merge (no merge is performed)'),
4745 _(b'review revisions to merge (no merge is performed)'),
4746 ),
4746 ),
4747 (b'', b'abort', None, _(b'abort the ongoing merge')),
4747 (b'', b'abort', None, _(b'abort the ongoing merge')),
4748 ]
4748 ]
4749 + mergetoolopts,
4749 + mergetoolopts,
4750 _(b'[-P] [[-r] REV]'),
4750 _(b'[-P] [[-r] REV]'),
4751 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4751 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4752 helpbasic=True,
4752 helpbasic=True,
4753 )
4753 )
4754 def merge(ui, repo, node=None, **opts):
4754 def merge(ui, repo, node=None, **opts):
4755 """merge another revision into working directory
4755 """merge another revision into working directory
4756
4756
4757 The current working directory is updated with all changes made in
4757 The current working directory is updated with all changes made in
4758 the requested revision since the last common predecessor revision.
4758 the requested revision since the last common predecessor revision.
4759
4759
4760 Files that changed between either parent are marked as changed for
4760 Files that changed between either parent are marked as changed for
4761 the next commit and a commit must be performed before any further
4761 the next commit and a commit must be performed before any further
4762 updates to the repository are allowed. The next commit will have
4762 updates to the repository are allowed. The next commit will have
4763 two parents.
4763 two parents.
4764
4764
4765 ``--tool`` can be used to specify the merge tool used for file
4765 ``--tool`` can be used to specify the merge tool used for file
4766 merges. It overrides the HGMERGE environment variable and your
4766 merges. It overrides the HGMERGE environment variable and your
4767 configuration files. See :hg:`help merge-tools` for options.
4767 configuration files. See :hg:`help merge-tools` for options.
4768
4768
4769 If no revision is specified, the working directory's parent is a
4769 If no revision is specified, the working directory's parent is a
4770 head revision, and the current branch contains exactly one other
4770 head revision, and the current branch contains exactly one other
4771 head, the other head is merged with by default. Otherwise, an
4771 head, the other head is merged with by default. Otherwise, an
4772 explicit revision with which to merge must be provided.
4772 explicit revision with which to merge must be provided.
4773
4773
4774 See :hg:`help resolve` for information on handling file conflicts.
4774 See :hg:`help resolve` for information on handling file conflicts.
4775
4775
4776 To undo an uncommitted merge, use :hg:`merge --abort` which
4776 To undo an uncommitted merge, use :hg:`merge --abort` which
4777 will check out a clean copy of the original merge parent, losing
4777 will check out a clean copy of the original merge parent, losing
4778 all changes.
4778 all changes.
4779
4779
4780 Returns 0 on success, 1 if there are unresolved files.
4780 Returns 0 on success, 1 if there are unresolved files.
4781 """
4781 """
4782
4782
4783 opts = pycompat.byteskwargs(opts)
4783 opts = pycompat.byteskwargs(opts)
4784 abort = opts.get(b'abort')
4784 abort = opts.get(b'abort')
4785 if abort and repo.dirstate.p2() == nullid:
4785 if abort and repo.dirstate.p2() == nullid:
4786 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4786 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4787 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4787 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4788 if abort:
4788 if abort:
4789 state = cmdutil.getunfinishedstate(repo)
4789 state = cmdutil.getunfinishedstate(repo)
4790 if state and state._opname != b'merge':
4790 if state and state._opname != b'merge':
4791 raise error.StateError(
4791 raise error.StateError(
4792 _(b'cannot abort merge with %s in progress') % (state._opname),
4792 _(b'cannot abort merge with %s in progress') % (state._opname),
4793 hint=state.hint(),
4793 hint=state.hint(),
4794 )
4794 )
4795 if node:
4795 if node:
4796 raise error.InputError(_(b"cannot specify a node with --abort"))
4796 raise error.InputError(_(b"cannot specify a node with --abort"))
4797 return hg.abortmerge(repo.ui, repo)
4797 return hg.abortmerge(repo.ui, repo)
4798
4798
4799 if opts.get(b'rev') and node:
4799 if opts.get(b'rev') and node:
4800 raise error.InputError(_(b"please specify just one revision"))
4800 raise error.InputError(_(b"please specify just one revision"))
4801 if not node:
4801 if not node:
4802 node = opts.get(b'rev')
4802 node = opts.get(b'rev')
4803
4803
4804 if node:
4804 if node:
4805 ctx = scmutil.revsingle(repo, node)
4805 ctx = scmutil.revsingle(repo, node)
4806 else:
4806 else:
4807 if ui.configbool(b'commands', b'merge.require-rev'):
4807 if ui.configbool(b'commands', b'merge.require-rev'):
4808 raise error.InputError(
4808 raise error.InputError(
4809 _(
4809 _(
4810 b'configuration requires specifying revision to merge '
4810 b'configuration requires specifying revision to merge '
4811 b'with'
4811 b'with'
4812 )
4812 )
4813 )
4813 )
4814 ctx = repo[destutil.destmerge(repo)]
4814 ctx = repo[destutil.destmerge(repo)]
4815
4815
4816 if ctx.node() is None:
4816 if ctx.node() is None:
4817 raise error.InputError(
4817 raise error.InputError(
4818 _(b'merging with the working copy has no effect')
4818 _(b'merging with the working copy has no effect')
4819 )
4819 )
4820
4820
4821 if opts.get(b'preview'):
4821 if opts.get(b'preview'):
4822 # find nodes that are ancestors of p2 but not of p1
4822 # find nodes that are ancestors of p2 but not of p1
4823 p1 = repo[b'.'].node()
4823 p1 = repo[b'.'].node()
4824 p2 = ctx.node()
4824 p2 = ctx.node()
4825 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4825 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4826
4826
4827 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4827 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4828 for node in nodes:
4828 for node in nodes:
4829 displayer.show(repo[node])
4829 displayer.show(repo[node])
4830 displayer.close()
4830 displayer.close()
4831 return 0
4831 return 0
4832
4832
4833 # ui.forcemerge is an internal variable, do not document
4833 # ui.forcemerge is an internal variable, do not document
4834 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4834 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4835 with ui.configoverride(overrides, b'merge'):
4835 with ui.configoverride(overrides, b'merge'):
4836 force = opts.get(b'force')
4836 force = opts.get(b'force')
4837 labels = [b'working copy', b'merge rev']
4837 labels = [b'working copy', b'merge rev']
4838 return hg.merge(ctx, force=force, labels=labels)
4838 return hg.merge(ctx, force=force, labels=labels)
4839
4839
4840
4840
4841 statemod.addunfinished(
4841 statemod.addunfinished(
4842 b'merge',
4842 b'merge',
4843 fname=None,
4843 fname=None,
4844 clearable=True,
4844 clearable=True,
4845 allowcommit=True,
4845 allowcommit=True,
4846 cmdmsg=_(b'outstanding uncommitted merge'),
4846 cmdmsg=_(b'outstanding uncommitted merge'),
4847 abortfunc=hg.abortmerge,
4847 abortfunc=hg.abortmerge,
4848 statushint=_(
4848 statushint=_(
4849 b'To continue: hg commit\nTo abort: hg merge --abort'
4849 b'To continue: hg commit\nTo abort: hg merge --abort'
4850 ),
4850 ),
4851 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4851 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4852 )
4852 )
4853
4853
4854
4854
4855 @command(
4855 @command(
4856 b'outgoing|out',
4856 b'outgoing|out',
4857 [
4857 [
4858 (
4858 (
4859 b'f',
4859 b'f',
4860 b'force',
4860 b'force',
4861 None,
4861 None,
4862 _(b'run even when the destination is unrelated'),
4862 _(b'run even when the destination is unrelated'),
4863 ),
4863 ),
4864 (
4864 (
4865 b'r',
4865 b'r',
4866 b'rev',
4866 b'rev',
4867 [],
4867 [],
4868 _(b'a changeset intended to be included in the destination'),
4868 _(b'a changeset intended to be included in the destination'),
4869 _(b'REV'),
4869 _(b'REV'),
4870 ),
4870 ),
4871 (b'n', b'newest-first', None, _(b'show newest record first')),
4871 (b'n', b'newest-first', None, _(b'show newest record first')),
4872 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4872 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4873 (
4873 (
4874 b'b',
4874 b'b',
4875 b'branch',
4875 b'branch',
4876 [],
4876 [],
4877 _(b'a specific branch you would like to push'),
4877 _(b'a specific branch you would like to push'),
4878 _(b'BRANCH'),
4878 _(b'BRANCH'),
4879 ),
4879 ),
4880 ]
4880 ]
4881 + logopts
4881 + logopts
4882 + remoteopts
4882 + remoteopts
4883 + subrepoopts,
4883 + subrepoopts,
4884 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4884 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4885 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4885 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4886 )
4886 )
4887 def outgoing(ui, repo, dest=None, **opts):
4887 def outgoing(ui, repo, dest=None, **opts):
4888 """show changesets not found in the destination
4888 """show changesets not found in the destination
4889
4889
4890 Show changesets not found in the specified destination repository
4890 Show changesets not found in the specified destination repository
4891 or the default push location. These are the changesets that would
4891 or the default push location. These are the changesets that would
4892 be pushed if a push was requested.
4892 be pushed if a push was requested.
4893
4893
4894 See pull for details of valid destination formats.
4894 See pull for details of valid destination formats.
4895
4895
4896 .. container:: verbose
4896 .. container:: verbose
4897
4897
4898 With -B/--bookmarks, the result of bookmark comparison between
4898 With -B/--bookmarks, the result of bookmark comparison between
4899 local and remote repositories is displayed. With -v/--verbose,
4899 local and remote repositories is displayed. With -v/--verbose,
4900 status is also displayed for each bookmark like below::
4900 status is also displayed for each bookmark like below::
4901
4901
4902 BM1 01234567890a added
4902 BM1 01234567890a added
4903 BM2 deleted
4903 BM2 deleted
4904 BM3 234567890abc advanced
4904 BM3 234567890abc advanced
4905 BM4 34567890abcd diverged
4905 BM4 34567890abcd diverged
4906 BM5 4567890abcde changed
4906 BM5 4567890abcde changed
4907
4907
4908 The action taken when pushing depends on the
4908 The action taken when pushing depends on the
4909 status of each bookmark:
4909 status of each bookmark:
4910
4910
4911 :``added``: push with ``-B`` will create it
4911 :``added``: push with ``-B`` will create it
4912 :``deleted``: push with ``-B`` will delete it
4912 :``deleted``: push with ``-B`` will delete it
4913 :``advanced``: push will update it
4913 :``advanced``: push will update it
4914 :``diverged``: push with ``-B`` will update it
4914 :``diverged``: push with ``-B`` will update it
4915 :``changed``: push with ``-B`` will update it
4915 :``changed``: push with ``-B`` will update it
4916
4916
4917 From the point of view of pushing behavior, bookmarks
4917 From the point of view of pushing behavior, bookmarks
4918 existing only in the remote repository are treated as
4918 existing only in the remote repository are treated as
4919 ``deleted``, even if it is in fact added remotely.
4919 ``deleted``, even if it is in fact added remotely.
4920
4920
4921 Returns 0 if there are outgoing changes, 1 otherwise.
4921 Returns 0 if there are outgoing changes, 1 otherwise.
4922 """
4922 """
4923 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4923 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4924 # style URLs, so don't overwrite dest.
4924 # style URLs, so don't overwrite dest.
4925 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4925 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4926 if not path:
4926 if not path:
4927 raise error.ConfigError(
4927 raise error.ConfigError(
4928 _(b'default repository not configured!'),
4928 _(b'default repository not configured!'),
4929 hint=_(b"see 'hg help config.paths'"),
4929 hint=_(b"see 'hg help config.paths'"),
4930 )
4930 )
4931
4931
4932 opts = pycompat.byteskwargs(opts)
4932 opts = pycompat.byteskwargs(opts)
4933 if opts.get(b'graph'):
4933 if opts.get(b'graph'):
4934 logcmdutil.checkunsupportedgraphflags([], opts)
4934 logcmdutil.checkunsupportedgraphflags([], opts)
4935 o, other = hg._outgoing(ui, repo, dest, opts)
4935 o, other = hg._outgoing(ui, repo, dest, opts)
4936 if not o:
4936 if not o:
4937 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4937 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4938 return
4938 return
4939
4939
4940 revdag = logcmdutil.graphrevs(repo, o, opts)
4940 revdag = logcmdutil.graphrevs(repo, o, opts)
4941 ui.pager(b'outgoing')
4941 ui.pager(b'outgoing')
4942 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4942 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4943 logcmdutil.displaygraph(
4943 logcmdutil.displaygraph(
4944 ui, repo, revdag, displayer, graphmod.asciiedges
4944 ui, repo, revdag, displayer, graphmod.asciiedges
4945 )
4945 )
4946 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4946 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4947 return 0
4947 return 0
4948
4948
4949 if opts.get(b'bookmarks'):
4949 if opts.get(b'bookmarks'):
4950 dest = path.pushloc or path.loc
4950 dest = path.pushloc or path.loc
4951 other = hg.peer(repo, opts, dest)
4951 other = hg.peer(repo, opts, dest)
4952 if b'bookmarks' not in other.listkeys(b'namespaces'):
4952 if b'bookmarks' not in other.listkeys(b'namespaces'):
4953 ui.warn(_(b"remote doesn't support bookmarks\n"))
4953 ui.warn(_(b"remote doesn't support bookmarks\n"))
4954 return 0
4954 return 0
4955 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4955 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4956 ui.pager(b'outgoing')
4956 ui.pager(b'outgoing')
4957 return bookmarks.outgoing(ui, repo, other)
4957 return bookmarks.outgoing(ui, repo, other)
4958
4958
4959 repo._subtoppath = path.pushloc or path.loc
4959 repo._subtoppath = path.pushloc or path.loc
4960 try:
4960 try:
4961 return hg.outgoing(ui, repo, dest, opts)
4961 return hg.outgoing(ui, repo, dest, opts)
4962 finally:
4962 finally:
4963 del repo._subtoppath
4963 del repo._subtoppath
4964
4964
4965
4965
4966 @command(
4966 @command(
4967 b'parents',
4967 b'parents',
4968 [
4968 [
4969 (
4969 (
4970 b'r',
4970 b'r',
4971 b'rev',
4971 b'rev',
4972 b'',
4972 b'',
4973 _(b'show parents of the specified revision'),
4973 _(b'show parents of the specified revision'),
4974 _(b'REV'),
4974 _(b'REV'),
4975 ),
4975 ),
4976 ]
4976 ]
4977 + templateopts,
4977 + templateopts,
4978 _(b'[-r REV] [FILE]'),
4978 _(b'[-r REV] [FILE]'),
4979 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4979 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4980 inferrepo=True,
4980 inferrepo=True,
4981 )
4981 )
4982 def parents(ui, repo, file_=None, **opts):
4982 def parents(ui, repo, file_=None, **opts):
4983 """show the parents of the working directory or revision (DEPRECATED)
4983 """show the parents of the working directory or revision (DEPRECATED)
4984
4984
4985 Print the working directory's parent revisions. If a revision is
4985 Print the working directory's parent revisions. If a revision is
4986 given via -r/--rev, the parent of that revision will be printed.
4986 given via -r/--rev, the parent of that revision will be printed.
4987 If a file argument is given, the revision in which the file was
4987 If a file argument is given, the revision in which the file was
4988 last changed (before the working directory revision or the
4988 last changed (before the working directory revision or the
4989 argument to --rev if given) is printed.
4989 argument to --rev if given) is printed.
4990
4990
4991 This command is equivalent to::
4991 This command is equivalent to::
4992
4992
4993 hg log -r "p1()+p2()" or
4993 hg log -r "p1()+p2()" or
4994 hg log -r "p1(REV)+p2(REV)" or
4994 hg log -r "p1(REV)+p2(REV)" or
4995 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4995 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4996 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4996 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4997
4997
4998 See :hg:`summary` and :hg:`help revsets` for related information.
4998 See :hg:`summary` and :hg:`help revsets` for related information.
4999
4999
5000 Returns 0 on success.
5000 Returns 0 on success.
5001 """
5001 """
5002
5002
5003 opts = pycompat.byteskwargs(opts)
5003 opts = pycompat.byteskwargs(opts)
5004 rev = opts.get(b'rev')
5004 rev = opts.get(b'rev')
5005 if rev:
5005 if rev:
5006 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5006 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5007 ctx = scmutil.revsingle(repo, rev, None)
5007 ctx = scmutil.revsingle(repo, rev, None)
5008
5008
5009 if file_:
5009 if file_:
5010 m = scmutil.match(ctx, (file_,), opts)
5010 m = scmutil.match(ctx, (file_,), opts)
5011 if m.anypats() or len(m.files()) != 1:
5011 if m.anypats() or len(m.files()) != 1:
5012 raise error.InputError(_(b'can only specify an explicit filename'))
5012 raise error.InputError(_(b'can only specify an explicit filename'))
5013 file_ = m.files()[0]
5013 file_ = m.files()[0]
5014 filenodes = []
5014 filenodes = []
5015 for cp in ctx.parents():
5015 for cp in ctx.parents():
5016 if not cp:
5016 if not cp:
5017 continue
5017 continue
5018 try:
5018 try:
5019 filenodes.append(cp.filenode(file_))
5019 filenodes.append(cp.filenode(file_))
5020 except error.LookupError:
5020 except error.LookupError:
5021 pass
5021 pass
5022 if not filenodes:
5022 if not filenodes:
5023 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5023 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5024 p = []
5024 p = []
5025 for fn in filenodes:
5025 for fn in filenodes:
5026 fctx = repo.filectx(file_, fileid=fn)
5026 fctx = repo.filectx(file_, fileid=fn)
5027 p.append(fctx.node())
5027 p.append(fctx.node())
5028 else:
5028 else:
5029 p = [cp.node() for cp in ctx.parents()]
5029 p = [cp.node() for cp in ctx.parents()]
5030
5030
5031 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5031 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5032 for n in p:
5032 for n in p:
5033 if n != nullid:
5033 if n != nullid:
5034 displayer.show(repo[n])
5034 displayer.show(repo[n])
5035 displayer.close()
5035 displayer.close()
5036
5036
5037
5037
5038 @command(
5038 @command(
5039 b'paths',
5039 b'paths',
5040 formatteropts,
5040 formatteropts,
5041 _(b'[NAME]'),
5041 _(b'[NAME]'),
5042 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5042 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5043 optionalrepo=True,
5043 optionalrepo=True,
5044 intents={INTENT_READONLY},
5044 intents={INTENT_READONLY},
5045 )
5045 )
5046 def paths(ui, repo, search=None, **opts):
5046 def paths(ui, repo, search=None, **opts):
5047 """show aliases for remote repositories
5047 """show aliases for remote repositories
5048
5048
5049 Show definition of symbolic path name NAME. If no name is given,
5049 Show definition of symbolic path name NAME. If no name is given,
5050 show definition of all available names.
5050 show definition of all available names.
5051
5051
5052 Option -q/--quiet suppresses all output when searching for NAME
5052 Option -q/--quiet suppresses all output when searching for NAME
5053 and shows only the path names when listing all definitions.
5053 and shows only the path names when listing all definitions.
5054
5054
5055 Path names are defined in the [paths] section of your
5055 Path names are defined in the [paths] section of your
5056 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5056 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5057 repository, ``.hg/hgrc`` is used, too.
5057 repository, ``.hg/hgrc`` is used, too.
5058
5058
5059 The path names ``default`` and ``default-push`` have a special
5059 The path names ``default`` and ``default-push`` have a special
5060 meaning. When performing a push or pull operation, they are used
5060 meaning. When performing a push or pull operation, they are used
5061 as fallbacks if no location is specified on the command-line.
5061 as fallbacks if no location is specified on the command-line.
5062 When ``default-push`` is set, it will be used for push and
5062 When ``default-push`` is set, it will be used for push and
5063 ``default`` will be used for pull; otherwise ``default`` is used
5063 ``default`` will be used for pull; otherwise ``default`` is used
5064 as the fallback for both. When cloning a repository, the clone
5064 as the fallback for both. When cloning a repository, the clone
5065 source is written as ``default`` in ``.hg/hgrc``.
5065 source is written as ``default`` in ``.hg/hgrc``.
5066
5066
5067 .. note::
5067 .. note::
5068
5068
5069 ``default`` and ``default-push`` apply to all inbound (e.g.
5069 ``default`` and ``default-push`` apply to all inbound (e.g.
5070 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5070 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5071 and :hg:`bundle`) operations.
5071 and :hg:`bundle`) operations.
5072
5072
5073 See :hg:`help urls` for more information.
5073 See :hg:`help urls` for more information.
5074
5074
5075 .. container:: verbose
5075 .. container:: verbose
5076
5076
5077 Template:
5077 Template:
5078
5078
5079 The following keywords are supported. See also :hg:`help templates`.
5079 The following keywords are supported. See also :hg:`help templates`.
5080
5080
5081 :name: String. Symbolic name of the path alias.
5081 :name: String. Symbolic name of the path alias.
5082 :pushurl: String. URL for push operations.
5082 :pushurl: String. URL for push operations.
5083 :url: String. URL or directory path for the other operations.
5083 :url: String. URL or directory path for the other operations.
5084
5084
5085 Returns 0 on success.
5085 Returns 0 on success.
5086 """
5086 """
5087
5087
5088 opts = pycompat.byteskwargs(opts)
5088 opts = pycompat.byteskwargs(opts)
5089 ui.pager(b'paths')
5089 ui.pager(b'paths')
5090 if search:
5090 if search:
5091 pathitems = [
5091 pathitems = [
5092 (name, path)
5092 (name, path)
5093 for name, path in pycompat.iteritems(ui.paths)
5093 for name, path in pycompat.iteritems(ui.paths)
5094 if name == search
5094 if name == search
5095 ]
5095 ]
5096 else:
5096 else:
5097 pathitems = sorted(pycompat.iteritems(ui.paths))
5097 pathitems = sorted(pycompat.iteritems(ui.paths))
5098
5098
5099 fm = ui.formatter(b'paths', opts)
5099 fm = ui.formatter(b'paths', opts)
5100 if fm.isplain():
5100 if fm.isplain():
5101 hidepassword = util.hidepassword
5101 hidepassword = util.hidepassword
5102 else:
5102 else:
5103 hidepassword = bytes
5103 hidepassword = bytes
5104 if ui.quiet:
5104 if ui.quiet:
5105 namefmt = b'%s\n'
5105 namefmt = b'%s\n'
5106 else:
5106 else:
5107 namefmt = b'%s = '
5107 namefmt = b'%s = '
5108 showsubopts = not search and not ui.quiet
5108 showsubopts = not search and not ui.quiet
5109
5109
5110 for name, path in pathitems:
5110 for name, path in pathitems:
5111 fm.startitem()
5111 fm.startitem()
5112 fm.condwrite(not search, b'name', namefmt, name)
5112 fm.condwrite(not search, b'name', namefmt, name)
5113 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5113 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5114 for subopt, value in sorted(path.suboptions.items()):
5114 for subopt, value in sorted(path.suboptions.items()):
5115 assert subopt not in (b'name', b'url')
5115 assert subopt not in (b'name', b'url')
5116 if showsubopts:
5116 if showsubopts:
5117 fm.plain(b'%s:%s = ' % (name, subopt))
5117 fm.plain(b'%s:%s = ' % (name, subopt))
5118 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5118 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5119
5119
5120 fm.end()
5120 fm.end()
5121
5121
5122 if search and not pathitems:
5122 if search and not pathitems:
5123 if not ui.quiet:
5123 if not ui.quiet:
5124 ui.warn(_(b"not found!\n"))
5124 ui.warn(_(b"not found!\n"))
5125 return 1
5125 return 1
5126 else:
5126 else:
5127 return 0
5127 return 0
5128
5128
5129
5129
5130 @command(
5130 @command(
5131 b'phase',
5131 b'phase',
5132 [
5132 [
5133 (b'p', b'public', False, _(b'set changeset phase to public')),
5133 (b'p', b'public', False, _(b'set changeset phase to public')),
5134 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5134 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5135 (b's', b'secret', False, _(b'set changeset phase to secret')),
5135 (b's', b'secret', False, _(b'set changeset phase to secret')),
5136 (b'f', b'force', False, _(b'allow to move boundary backward')),
5136 (b'f', b'force', False, _(b'allow to move boundary backward')),
5137 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5137 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5138 ],
5138 ],
5139 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5139 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5140 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5140 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5141 )
5141 )
5142 def phase(ui, repo, *revs, **opts):
5142 def phase(ui, repo, *revs, **opts):
5143 """set or show the current phase name
5143 """set or show the current phase name
5144
5144
5145 With no argument, show the phase name of the current revision(s).
5145 With no argument, show the phase name of the current revision(s).
5146
5146
5147 With one of -p/--public, -d/--draft or -s/--secret, change the
5147 With one of -p/--public, -d/--draft or -s/--secret, change the
5148 phase value of the specified revisions.
5148 phase value of the specified revisions.
5149
5149
5150 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5150 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5151 lower phase to a higher phase. Phases are ordered as follows::
5151 lower phase to a higher phase. Phases are ordered as follows::
5152
5152
5153 public < draft < secret
5153 public < draft < secret
5154
5154
5155 Returns 0 on success, 1 if some phases could not be changed.
5155 Returns 0 on success, 1 if some phases could not be changed.
5156
5156
5157 (For more information about the phases concept, see :hg:`help phases`.)
5157 (For more information about the phases concept, see :hg:`help phases`.)
5158 """
5158 """
5159 opts = pycompat.byteskwargs(opts)
5159 opts = pycompat.byteskwargs(opts)
5160 # search for a unique phase argument
5160 # search for a unique phase argument
5161 targetphase = None
5161 targetphase = None
5162 for idx, name in enumerate(phases.cmdphasenames):
5162 for idx, name in enumerate(phases.cmdphasenames):
5163 if opts[name]:
5163 if opts[name]:
5164 if targetphase is not None:
5164 if targetphase is not None:
5165 raise error.InputError(_(b'only one phase can be specified'))
5165 raise error.InputError(_(b'only one phase can be specified'))
5166 targetphase = idx
5166 targetphase = idx
5167
5167
5168 # look for specified revision
5168 # look for specified revision
5169 revs = list(revs)
5169 revs = list(revs)
5170 revs.extend(opts[b'rev'])
5170 revs.extend(opts[b'rev'])
5171 if not revs:
5171 if not revs:
5172 # display both parents as the second parent phase can influence
5172 # display both parents as the second parent phase can influence
5173 # the phase of a merge commit
5173 # the phase of a merge commit
5174 revs = [c.rev() for c in repo[None].parents()]
5174 revs = [c.rev() for c in repo[None].parents()]
5175
5175
5176 revs = scmutil.revrange(repo, revs)
5176 revs = scmutil.revrange(repo, revs)
5177
5177
5178 ret = 0
5178 ret = 0
5179 if targetphase is None:
5179 if targetphase is None:
5180 # display
5180 # display
5181 for r in revs:
5181 for r in revs:
5182 ctx = repo[r]
5182 ctx = repo[r]
5183 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5183 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5184 else:
5184 else:
5185 with repo.lock(), repo.transaction(b"phase") as tr:
5185 with repo.lock(), repo.transaction(b"phase") as tr:
5186 # set phase
5186 # set phase
5187 if not revs:
5187 if not revs:
5188 raise error.InputError(_(b'empty revision set'))
5188 raise error.InputError(_(b'empty revision set'))
5189 nodes = [repo[r].node() for r in revs]
5189 nodes = [repo[r].node() for r in revs]
5190 # moving revision from public to draft may hide them
5190 # moving revision from public to draft may hide them
5191 # We have to check result on an unfiltered repository
5191 # We have to check result on an unfiltered repository
5192 unfi = repo.unfiltered()
5192 unfi = repo.unfiltered()
5193 getphase = unfi._phasecache.phase
5193 getphase = unfi._phasecache.phase
5194 olddata = [getphase(unfi, r) for r in unfi]
5194 olddata = [getphase(unfi, r) for r in unfi]
5195 phases.advanceboundary(repo, tr, targetphase, nodes)
5195 phases.advanceboundary(repo, tr, targetphase, nodes)
5196 if opts[b'force']:
5196 if opts[b'force']:
5197 phases.retractboundary(repo, tr, targetphase, nodes)
5197 phases.retractboundary(repo, tr, targetphase, nodes)
5198 getphase = unfi._phasecache.phase
5198 getphase = unfi._phasecache.phase
5199 newdata = [getphase(unfi, r) for r in unfi]
5199 newdata = [getphase(unfi, r) for r in unfi]
5200 changes = sum(newdata[r] != olddata[r] for r in unfi)
5200 changes = sum(newdata[r] != olddata[r] for r in unfi)
5201 cl = unfi.changelog
5201 cl = unfi.changelog
5202 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5202 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5203 if rejected:
5203 if rejected:
5204 ui.warn(
5204 ui.warn(
5205 _(
5205 _(
5206 b'cannot move %i changesets to a higher '
5206 b'cannot move %i changesets to a higher '
5207 b'phase, use --force\n'
5207 b'phase, use --force\n'
5208 )
5208 )
5209 % len(rejected)
5209 % len(rejected)
5210 )
5210 )
5211 ret = 1
5211 ret = 1
5212 if changes:
5212 if changes:
5213 msg = _(b'phase changed for %i changesets\n') % changes
5213 msg = _(b'phase changed for %i changesets\n') % changes
5214 if ret:
5214 if ret:
5215 ui.status(msg)
5215 ui.status(msg)
5216 else:
5216 else:
5217 ui.note(msg)
5217 ui.note(msg)
5218 else:
5218 else:
5219 ui.warn(_(b'no phases changed\n'))
5219 ui.warn(_(b'no phases changed\n'))
5220 return ret
5220 return ret
5221
5221
5222
5222
5223 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5223 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5224 """Run after a changegroup has been added via pull/unbundle
5224 """Run after a changegroup has been added via pull/unbundle
5225
5225
5226 This takes arguments below:
5226 This takes arguments below:
5227
5227
5228 :modheads: change of heads by pull/unbundle
5228 :modheads: change of heads by pull/unbundle
5229 :optupdate: updating working directory is needed or not
5229 :optupdate: updating working directory is needed or not
5230 :checkout: update destination revision (or None to default destination)
5230 :checkout: update destination revision (or None to default destination)
5231 :brev: a name, which might be a bookmark to be activated after updating
5231 :brev: a name, which might be a bookmark to be activated after updating
5232 """
5232 """
5233 if modheads == 0:
5233 if modheads == 0:
5234 return
5234 return
5235 if optupdate:
5235 if optupdate:
5236 try:
5236 try:
5237 return hg.updatetotally(ui, repo, checkout, brev)
5237 return hg.updatetotally(ui, repo, checkout, brev)
5238 except error.UpdateAbort as inst:
5238 except error.UpdateAbort as inst:
5239 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5239 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5240 hint = inst.hint
5240 hint = inst.hint
5241 raise error.UpdateAbort(msg, hint=hint)
5241 raise error.UpdateAbort(msg, hint=hint)
5242 if modheads is not None and modheads > 1:
5242 if modheads is not None and modheads > 1:
5243 currentbranchheads = len(repo.branchheads())
5243 currentbranchheads = len(repo.branchheads())
5244 if currentbranchheads == modheads:
5244 if currentbranchheads == modheads:
5245 ui.status(
5245 ui.status(
5246 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5246 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5247 )
5247 )
5248 elif currentbranchheads > 1:
5248 elif currentbranchheads > 1:
5249 ui.status(
5249 ui.status(
5250 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5250 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5251 )
5251 )
5252 else:
5252 else:
5253 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5253 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5254 elif not ui.configbool(b'commands', b'update.requiredest'):
5254 elif not ui.configbool(b'commands', b'update.requiredest'):
5255 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5255 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5256
5256
5257
5257
5258 @command(
5258 @command(
5259 b'pull',
5259 b'pull',
5260 [
5260 [
5261 (
5261 (
5262 b'u',
5262 b'u',
5263 b'update',
5263 b'update',
5264 None,
5264 None,
5265 _(b'update to new branch head if new descendants were pulled'),
5265 _(b'update to new branch head if new descendants were pulled'),
5266 ),
5266 ),
5267 (
5267 (
5268 b'f',
5268 b'f',
5269 b'force',
5269 b'force',
5270 None,
5270 None,
5271 _(b'run even when remote repository is unrelated'),
5271 _(b'run even when remote repository is unrelated'),
5272 ),
5272 ),
5273 (
5273 (
5274 b'',
5274 b'',
5275 b'confirm',
5275 b'confirm',
5276 None,
5276 None,
5277 _(b'confirm pull before applying changes'),
5277 _(b'confirm pull before applying changes'),
5278 ),
5278 ),
5279 (
5279 (
5280 b'r',
5280 b'r',
5281 b'rev',
5281 b'rev',
5282 [],
5282 [],
5283 _(b'a remote changeset intended to be added'),
5283 _(b'a remote changeset intended to be added'),
5284 _(b'REV'),
5284 _(b'REV'),
5285 ),
5285 ),
5286 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5286 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5287 (
5287 (
5288 b'b',
5288 b'b',
5289 b'branch',
5289 b'branch',
5290 [],
5290 [],
5291 _(b'a specific branch you would like to pull'),
5291 _(b'a specific branch you would like to pull'),
5292 _(b'BRANCH'),
5292 _(b'BRANCH'),
5293 ),
5293 ),
5294 ]
5294 ]
5295 + remoteopts,
5295 + remoteopts,
5296 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5296 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5297 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5297 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5298 helpbasic=True,
5298 helpbasic=True,
5299 )
5299 )
5300 def pull(ui, repo, source=b"default", **opts):
5300 def pull(ui, repo, source=b"default", **opts):
5301 """pull changes from the specified source
5301 """pull changes from the specified source
5302
5302
5303 Pull changes from a remote repository to a local one.
5303 Pull changes from a remote repository to a local one.
5304
5304
5305 This finds all changes from the repository at the specified path
5305 This finds all changes from the repository at the specified path
5306 or URL and adds them to a local repository (the current one unless
5306 or URL and adds them to a local repository (the current one unless
5307 -R is specified). By default, this does not update the copy of the
5307 -R is specified). By default, this does not update the copy of the
5308 project in the working directory.
5308 project in the working directory.
5309
5309
5310 When cloning from servers that support it, Mercurial may fetch
5310 When cloning from servers that support it, Mercurial may fetch
5311 pre-generated data. When this is done, hooks operating on incoming
5311 pre-generated data. When this is done, hooks operating on incoming
5312 changesets and changegroups may fire more than once, once for each
5312 changesets and changegroups may fire more than once, once for each
5313 pre-generated bundle and as well as for any additional remaining
5313 pre-generated bundle and as well as for any additional remaining
5314 data. See :hg:`help -e clonebundles` for more.
5314 data. See :hg:`help -e clonebundles` for more.
5315
5315
5316 Use :hg:`incoming` if you want to see what would have been added
5316 Use :hg:`incoming` if you want to see what would have been added
5317 by a pull at the time you issued this command. If you then decide
5317 by a pull at the time you issued this command. If you then decide
5318 to add those changes to the repository, you should use :hg:`pull
5318 to add those changes to the repository, you should use :hg:`pull
5319 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5319 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5320
5320
5321 If SOURCE is omitted, the 'default' path will be used.
5321 If SOURCE is omitted, the 'default' path will be used.
5322 See :hg:`help urls` for more information.
5322 See :hg:`help urls` for more information.
5323
5323
5324 Specifying bookmark as ``.`` is equivalent to specifying the active
5324 Specifying bookmark as ``.`` is equivalent to specifying the active
5325 bookmark's name.
5325 bookmark's name.
5326
5326
5327 Returns 0 on success, 1 if an update had unresolved files.
5327 Returns 0 on success, 1 if an update had unresolved files.
5328 """
5328 """
5329
5329
5330 opts = pycompat.byteskwargs(opts)
5330 opts = pycompat.byteskwargs(opts)
5331 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5331 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5332 b'update'
5332 b'update'
5333 ):
5333 ):
5334 msg = _(b'update destination required by configuration')
5334 msg = _(b'update destination required by configuration')
5335 hint = _(b'use hg pull followed by hg update DEST')
5335 hint = _(b'use hg pull followed by hg update DEST')
5336 raise error.InputError(msg, hint=hint)
5336 raise error.InputError(msg, hint=hint)
5337
5337
5338 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5338 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5339 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5339 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5340 ui.flush()
5340 other = hg.peer(repo, opts, source)
5341 other = hg.peer(repo, opts, source)
5341 try:
5342 try:
5342 revs, checkout = hg.addbranchrevs(
5343 revs, checkout = hg.addbranchrevs(
5343 repo, other, branches, opts.get(b'rev')
5344 repo, other, branches, opts.get(b'rev')
5344 )
5345 )
5345
5346
5346 pullopargs = {}
5347 pullopargs = {}
5347
5348
5348 nodes = None
5349 nodes = None
5349 if opts.get(b'bookmark') or revs:
5350 if opts.get(b'bookmark') or revs:
5350 # The list of bookmark used here is the same used to actually update
5351 # The list of bookmark used here is the same used to actually update
5351 # the bookmark names, to avoid the race from issue 4689 and we do
5352 # the bookmark names, to avoid the race from issue 4689 and we do
5352 # all lookup and bookmark queries in one go so they see the same
5353 # all lookup and bookmark queries in one go so they see the same
5353 # version of the server state (issue 4700).
5354 # version of the server state (issue 4700).
5354 nodes = []
5355 nodes = []
5355 fnodes = []
5356 fnodes = []
5356 revs = revs or []
5357 revs = revs or []
5357 if revs and not other.capable(b'lookup'):
5358 if revs and not other.capable(b'lookup'):
5358 err = _(
5359 err = _(
5359 b"other repository doesn't support revision lookup, "
5360 b"other repository doesn't support revision lookup, "
5360 b"so a rev cannot be specified."
5361 b"so a rev cannot be specified."
5361 )
5362 )
5362 raise error.Abort(err)
5363 raise error.Abort(err)
5363 with other.commandexecutor() as e:
5364 with other.commandexecutor() as e:
5364 fremotebookmarks = e.callcommand(
5365 fremotebookmarks = e.callcommand(
5365 b'listkeys', {b'namespace': b'bookmarks'}
5366 b'listkeys', {b'namespace': b'bookmarks'}
5366 )
5367 )
5367 for r in revs:
5368 for r in revs:
5368 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5369 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5369 remotebookmarks = fremotebookmarks.result()
5370 remotebookmarks = fremotebookmarks.result()
5370 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5371 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5371 pullopargs[b'remotebookmarks'] = remotebookmarks
5372 pullopargs[b'remotebookmarks'] = remotebookmarks
5372 for b in opts.get(b'bookmark', []):
5373 for b in opts.get(b'bookmark', []):
5373 b = repo._bookmarks.expandname(b)
5374 b = repo._bookmarks.expandname(b)
5374 if b not in remotebookmarks:
5375 if b not in remotebookmarks:
5375 raise error.InputError(
5376 raise error.InputError(
5376 _(b'remote bookmark %s not found!') % b
5377 _(b'remote bookmark %s not found!') % b
5377 )
5378 )
5378 nodes.append(remotebookmarks[b])
5379 nodes.append(remotebookmarks[b])
5379 for i, rev in enumerate(revs):
5380 for i, rev in enumerate(revs):
5380 node = fnodes[i].result()
5381 node = fnodes[i].result()
5381 nodes.append(node)
5382 nodes.append(node)
5382 if rev == checkout:
5383 if rev == checkout:
5383 checkout = node
5384 checkout = node
5384
5385
5385 wlock = util.nullcontextmanager()
5386 wlock = util.nullcontextmanager()
5386 if opts.get(b'update'):
5387 if opts.get(b'update'):
5387 wlock = repo.wlock()
5388 wlock = repo.wlock()
5388 with wlock:
5389 with wlock:
5389 pullopargs.update(opts.get(b'opargs', {}))
5390 pullopargs.update(opts.get(b'opargs', {}))
5390 modheads = exchange.pull(
5391 modheads = exchange.pull(
5391 repo,
5392 repo,
5392 other,
5393 other,
5393 heads=nodes,
5394 heads=nodes,
5394 force=opts.get(b'force'),
5395 force=opts.get(b'force'),
5395 bookmarks=opts.get(b'bookmark', ()),
5396 bookmarks=opts.get(b'bookmark', ()),
5396 opargs=pullopargs,
5397 opargs=pullopargs,
5397 confirm=opts.get(b'confirm'),
5398 confirm=opts.get(b'confirm'),
5398 ).cgresult
5399 ).cgresult
5399
5400
5400 # brev is a name, which might be a bookmark to be activated at
5401 # brev is a name, which might be a bookmark to be activated at
5401 # the end of the update. In other words, it is an explicit
5402 # the end of the update. In other words, it is an explicit
5402 # destination of the update
5403 # destination of the update
5403 brev = None
5404 brev = None
5404
5405
5405 if checkout:
5406 if checkout:
5406 checkout = repo.unfiltered().changelog.rev(checkout)
5407 checkout = repo.unfiltered().changelog.rev(checkout)
5407
5408
5408 # order below depends on implementation of
5409 # order below depends on implementation of
5409 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5410 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5410 # because 'checkout' is determined without it.
5411 # because 'checkout' is determined without it.
5411 if opts.get(b'rev'):
5412 if opts.get(b'rev'):
5412 brev = opts[b'rev'][0]
5413 brev = opts[b'rev'][0]
5413 elif opts.get(b'branch'):
5414 elif opts.get(b'branch'):
5414 brev = opts[b'branch'][0]
5415 brev = opts[b'branch'][0]
5415 else:
5416 else:
5416 brev = branches[0]
5417 brev = branches[0]
5417 repo._subtoppath = source
5418 repo._subtoppath = source
5418 try:
5419 try:
5419 ret = postincoming(
5420 ret = postincoming(
5420 ui, repo, modheads, opts.get(b'update'), checkout, brev
5421 ui, repo, modheads, opts.get(b'update'), checkout, brev
5421 )
5422 )
5422 except error.FilteredRepoLookupError as exc:
5423 except error.FilteredRepoLookupError as exc:
5423 msg = _(b'cannot update to target: %s') % exc.args[0]
5424 msg = _(b'cannot update to target: %s') % exc.args[0]
5424 exc.args = (msg,) + exc.args[1:]
5425 exc.args = (msg,) + exc.args[1:]
5425 raise
5426 raise
5426 finally:
5427 finally:
5427 del repo._subtoppath
5428 del repo._subtoppath
5428
5429
5429 finally:
5430 finally:
5430 other.close()
5431 other.close()
5431 return ret
5432 return ret
5432
5433
5433
5434
5434 @command(
5435 @command(
5435 b'push',
5436 b'push',
5436 [
5437 [
5437 (b'f', b'force', None, _(b'force push')),
5438 (b'f', b'force', None, _(b'force push')),
5438 (
5439 (
5439 b'r',
5440 b'r',
5440 b'rev',
5441 b'rev',
5441 [],
5442 [],
5442 _(b'a changeset intended to be included in the destination'),
5443 _(b'a changeset intended to be included in the destination'),
5443 _(b'REV'),
5444 _(b'REV'),
5444 ),
5445 ),
5445 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5446 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5446 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5447 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5447 (
5448 (
5448 b'b',
5449 b'b',
5449 b'branch',
5450 b'branch',
5450 [],
5451 [],
5451 _(b'a specific branch you would like to push'),
5452 _(b'a specific branch you would like to push'),
5452 _(b'BRANCH'),
5453 _(b'BRANCH'),
5453 ),
5454 ),
5454 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5455 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5455 (
5456 (
5456 b'',
5457 b'',
5457 b'pushvars',
5458 b'pushvars',
5458 [],
5459 [],
5459 _(b'variables that can be sent to server (ADVANCED)'),
5460 _(b'variables that can be sent to server (ADVANCED)'),
5460 ),
5461 ),
5461 (
5462 (
5462 b'',
5463 b'',
5463 b'publish',
5464 b'publish',
5464 False,
5465 False,
5465 _(b'push the changeset as public (EXPERIMENTAL)'),
5466 _(b'push the changeset as public (EXPERIMENTAL)'),
5466 ),
5467 ),
5467 ]
5468 ]
5468 + remoteopts,
5469 + remoteopts,
5469 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5470 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5470 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5471 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5471 helpbasic=True,
5472 helpbasic=True,
5472 )
5473 )
5473 def push(ui, repo, dest=None, **opts):
5474 def push(ui, repo, dest=None, **opts):
5474 """push changes to the specified destination
5475 """push changes to the specified destination
5475
5476
5476 Push changesets from the local repository to the specified
5477 Push changesets from the local repository to the specified
5477 destination.
5478 destination.
5478
5479
5479 This operation is symmetrical to pull: it is identical to a pull
5480 This operation is symmetrical to pull: it is identical to a pull
5480 in the destination repository from the current one.
5481 in the destination repository from the current one.
5481
5482
5482 By default, push will not allow creation of new heads at the
5483 By default, push will not allow creation of new heads at the
5483 destination, since multiple heads would make it unclear which head
5484 destination, since multiple heads would make it unclear which head
5484 to use. In this situation, it is recommended to pull and merge
5485 to use. In this situation, it is recommended to pull and merge
5485 before pushing.
5486 before pushing.
5486
5487
5487 Use --new-branch if you want to allow push to create a new named
5488 Use --new-branch if you want to allow push to create a new named
5488 branch that is not present at the destination. This allows you to
5489 branch that is not present at the destination. This allows you to
5489 only create a new branch without forcing other changes.
5490 only create a new branch without forcing other changes.
5490
5491
5491 .. note::
5492 .. note::
5492
5493
5493 Extra care should be taken with the -f/--force option,
5494 Extra care should be taken with the -f/--force option,
5494 which will push all new heads on all branches, an action which will
5495 which will push all new heads on all branches, an action which will
5495 almost always cause confusion for collaborators.
5496 almost always cause confusion for collaborators.
5496
5497
5497 If -r/--rev is used, the specified revision and all its ancestors
5498 If -r/--rev is used, the specified revision and all its ancestors
5498 will be pushed to the remote repository.
5499 will be pushed to the remote repository.
5499
5500
5500 If -B/--bookmark is used, the specified bookmarked revision, its
5501 If -B/--bookmark is used, the specified bookmarked revision, its
5501 ancestors, and the bookmark will be pushed to the remote
5502 ancestors, and the bookmark will be pushed to the remote
5502 repository. Specifying ``.`` is equivalent to specifying the active
5503 repository. Specifying ``.`` is equivalent to specifying the active
5503 bookmark's name. Use the --all-bookmarks option for pushing all
5504 bookmark's name. Use the --all-bookmarks option for pushing all
5504 current bookmarks.
5505 current bookmarks.
5505
5506
5506 Please see :hg:`help urls` for important details about ``ssh://``
5507 Please see :hg:`help urls` for important details about ``ssh://``
5507 URLs. If DESTINATION is omitted, a default path will be used.
5508 URLs. If DESTINATION is omitted, a default path will be used.
5508
5509
5509 .. container:: verbose
5510 .. container:: verbose
5510
5511
5511 The --pushvars option sends strings to the server that become
5512 The --pushvars option sends strings to the server that become
5512 environment variables prepended with ``HG_USERVAR_``. For example,
5513 environment variables prepended with ``HG_USERVAR_``. For example,
5513 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5514 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5514 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5515 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5515
5516
5516 pushvars can provide for user-overridable hooks as well as set debug
5517 pushvars can provide for user-overridable hooks as well as set debug
5517 levels. One example is having a hook that blocks commits containing
5518 levels. One example is having a hook that blocks commits containing
5518 conflict markers, but enables the user to override the hook if the file
5519 conflict markers, but enables the user to override the hook if the file
5519 is using conflict markers for testing purposes or the file format has
5520 is using conflict markers for testing purposes or the file format has
5520 strings that look like conflict markers.
5521 strings that look like conflict markers.
5521
5522
5522 By default, servers will ignore `--pushvars`. To enable it add the
5523 By default, servers will ignore `--pushvars`. To enable it add the
5523 following to your configuration file::
5524 following to your configuration file::
5524
5525
5525 [push]
5526 [push]
5526 pushvars.server = true
5527 pushvars.server = true
5527
5528
5528 Returns 0 if push was successful, 1 if nothing to push.
5529 Returns 0 if push was successful, 1 if nothing to push.
5529 """
5530 """
5530
5531
5531 opts = pycompat.byteskwargs(opts)
5532 opts = pycompat.byteskwargs(opts)
5532
5533
5533 if opts.get(b'all_bookmarks'):
5534 if opts.get(b'all_bookmarks'):
5534 cmdutil.check_incompatible_arguments(
5535 cmdutil.check_incompatible_arguments(
5535 opts,
5536 opts,
5536 b'all_bookmarks',
5537 b'all_bookmarks',
5537 [b'bookmark', b'rev'],
5538 [b'bookmark', b'rev'],
5538 )
5539 )
5539 opts[b'bookmark'] = list(repo._bookmarks)
5540 opts[b'bookmark'] = list(repo._bookmarks)
5540
5541
5541 if opts.get(b'bookmark'):
5542 if opts.get(b'bookmark'):
5542 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5543 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5543 for b in opts[b'bookmark']:
5544 for b in opts[b'bookmark']:
5544 # translate -B options to -r so changesets get pushed
5545 # translate -B options to -r so changesets get pushed
5545 b = repo._bookmarks.expandname(b)
5546 b = repo._bookmarks.expandname(b)
5546 if b in repo._bookmarks:
5547 if b in repo._bookmarks:
5547 opts.setdefault(b'rev', []).append(b)
5548 opts.setdefault(b'rev', []).append(b)
5548 else:
5549 else:
5549 # if we try to push a deleted bookmark, translate it to null
5550 # if we try to push a deleted bookmark, translate it to null
5550 # this lets simultaneous -r, -b options continue working
5551 # this lets simultaneous -r, -b options continue working
5551 opts.setdefault(b'rev', []).append(b"null")
5552 opts.setdefault(b'rev', []).append(b"null")
5552
5553
5553 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5554 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5554 if not path:
5555 if not path:
5555 raise error.ConfigError(
5556 raise error.ConfigError(
5556 _(b'default repository not configured!'),
5557 _(b'default repository not configured!'),
5557 hint=_(b"see 'hg help config.paths'"),
5558 hint=_(b"see 'hg help config.paths'"),
5558 )
5559 )
5559 dest = path.pushloc or path.loc
5560 dest = path.pushloc or path.loc
5560 branches = (path.branch, opts.get(b'branch') or [])
5561 branches = (path.branch, opts.get(b'branch') or [])
5561 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5562 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5562 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5563 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5563 other = hg.peer(repo, opts, dest)
5564 other = hg.peer(repo, opts, dest)
5564
5565
5565 if revs:
5566 if revs:
5566 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5567 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5567 if not revs:
5568 if not revs:
5568 raise error.InputError(
5569 raise error.InputError(
5569 _(b"specified revisions evaluate to an empty set"),
5570 _(b"specified revisions evaluate to an empty set"),
5570 hint=_(b"use different revision arguments"),
5571 hint=_(b"use different revision arguments"),
5571 )
5572 )
5572 elif path.pushrev:
5573 elif path.pushrev:
5573 # It doesn't make any sense to specify ancestor revisions. So limit
5574 # It doesn't make any sense to specify ancestor revisions. So limit
5574 # to DAG heads to make discovery simpler.
5575 # to DAG heads to make discovery simpler.
5575 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5576 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5576 revs = scmutil.revrange(repo, [expr])
5577 revs = scmutil.revrange(repo, [expr])
5577 revs = [repo[rev].node() for rev in revs]
5578 revs = [repo[rev].node() for rev in revs]
5578 if not revs:
5579 if not revs:
5579 raise error.InputError(
5580 raise error.InputError(
5580 _(b'default push revset for path evaluates to an empty set')
5581 _(b'default push revset for path evaluates to an empty set')
5581 )
5582 )
5582 elif ui.configbool(b'commands', b'push.require-revs'):
5583 elif ui.configbool(b'commands', b'push.require-revs'):
5583 raise error.InputError(
5584 raise error.InputError(
5584 _(b'no revisions specified to push'),
5585 _(b'no revisions specified to push'),
5585 hint=_(b'did you mean "hg push -r ."?'),
5586 hint=_(b'did you mean "hg push -r ."?'),
5586 )
5587 )
5587
5588
5588 repo._subtoppath = dest
5589 repo._subtoppath = dest
5589 try:
5590 try:
5590 # push subrepos depth-first for coherent ordering
5591 # push subrepos depth-first for coherent ordering
5591 c = repo[b'.']
5592 c = repo[b'.']
5592 subs = c.substate # only repos that are committed
5593 subs = c.substate # only repos that are committed
5593 for s in sorted(subs):
5594 for s in sorted(subs):
5594 result = c.sub(s).push(opts)
5595 result = c.sub(s).push(opts)
5595 if result == 0:
5596 if result == 0:
5596 return not result
5597 return not result
5597 finally:
5598 finally:
5598 del repo._subtoppath
5599 del repo._subtoppath
5599
5600
5600 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5601 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5601 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5602 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5602
5603
5603 pushop = exchange.push(
5604 pushop = exchange.push(
5604 repo,
5605 repo,
5605 other,
5606 other,
5606 opts.get(b'force'),
5607 opts.get(b'force'),
5607 revs=revs,
5608 revs=revs,
5608 newbranch=opts.get(b'new_branch'),
5609 newbranch=opts.get(b'new_branch'),
5609 bookmarks=opts.get(b'bookmark', ()),
5610 bookmarks=opts.get(b'bookmark', ()),
5610 publish=opts.get(b'publish'),
5611 publish=opts.get(b'publish'),
5611 opargs=opargs,
5612 opargs=opargs,
5612 )
5613 )
5613
5614
5614 result = not pushop.cgresult
5615 result = not pushop.cgresult
5615
5616
5616 if pushop.bkresult is not None:
5617 if pushop.bkresult is not None:
5617 if pushop.bkresult == 2:
5618 if pushop.bkresult == 2:
5618 result = 2
5619 result = 2
5619 elif not result and pushop.bkresult:
5620 elif not result and pushop.bkresult:
5620 result = 2
5621 result = 2
5621
5622
5622 return result
5623 return result
5623
5624
5624
5625
5625 @command(
5626 @command(
5626 b'recover',
5627 b'recover',
5627 [
5628 [
5628 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5629 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5629 ],
5630 ],
5630 helpcategory=command.CATEGORY_MAINTENANCE,
5631 helpcategory=command.CATEGORY_MAINTENANCE,
5631 )
5632 )
5632 def recover(ui, repo, **opts):
5633 def recover(ui, repo, **opts):
5633 """roll back an interrupted transaction
5634 """roll back an interrupted transaction
5634
5635
5635 Recover from an interrupted commit or pull.
5636 Recover from an interrupted commit or pull.
5636
5637
5637 This command tries to fix the repository status after an
5638 This command tries to fix the repository status after an
5638 interrupted operation. It should only be necessary when Mercurial
5639 interrupted operation. It should only be necessary when Mercurial
5639 suggests it.
5640 suggests it.
5640
5641
5641 Returns 0 if successful, 1 if nothing to recover or verify fails.
5642 Returns 0 if successful, 1 if nothing to recover or verify fails.
5642 """
5643 """
5643 ret = repo.recover()
5644 ret = repo.recover()
5644 if ret:
5645 if ret:
5645 if opts['verify']:
5646 if opts['verify']:
5646 return hg.verify(repo)
5647 return hg.verify(repo)
5647 else:
5648 else:
5648 msg = _(
5649 msg = _(
5649 b"(verify step skipped, run `hg verify` to check your "
5650 b"(verify step skipped, run `hg verify` to check your "
5650 b"repository content)\n"
5651 b"repository content)\n"
5651 )
5652 )
5652 ui.warn(msg)
5653 ui.warn(msg)
5653 return 0
5654 return 0
5654 return 1
5655 return 1
5655
5656
5656
5657
5657 @command(
5658 @command(
5658 b'remove|rm',
5659 b'remove|rm',
5659 [
5660 [
5660 (b'A', b'after', None, _(b'record delete for missing files')),
5661 (b'A', b'after', None, _(b'record delete for missing files')),
5661 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5662 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5662 ]
5663 ]
5663 + subrepoopts
5664 + subrepoopts
5664 + walkopts
5665 + walkopts
5665 + dryrunopts,
5666 + dryrunopts,
5666 _(b'[OPTION]... FILE...'),
5667 _(b'[OPTION]... FILE...'),
5667 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5668 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5668 helpbasic=True,
5669 helpbasic=True,
5669 inferrepo=True,
5670 inferrepo=True,
5670 )
5671 )
5671 def remove(ui, repo, *pats, **opts):
5672 def remove(ui, repo, *pats, **opts):
5672 """remove the specified files on the next commit
5673 """remove the specified files on the next commit
5673
5674
5674 Schedule the indicated files for removal from the current branch.
5675 Schedule the indicated files for removal from the current branch.
5675
5676
5676 This command schedules the files to be removed at the next commit.
5677 This command schedules the files to be removed at the next commit.
5677 To undo a remove before that, see :hg:`revert`. To undo added
5678 To undo a remove before that, see :hg:`revert`. To undo added
5678 files, see :hg:`forget`.
5679 files, see :hg:`forget`.
5679
5680
5680 .. container:: verbose
5681 .. container:: verbose
5681
5682
5682 -A/--after can be used to remove only files that have already
5683 -A/--after can be used to remove only files that have already
5683 been deleted, -f/--force can be used to force deletion, and -Af
5684 been deleted, -f/--force can be used to force deletion, and -Af
5684 can be used to remove files from the next revision without
5685 can be used to remove files from the next revision without
5685 deleting them from the working directory.
5686 deleting them from the working directory.
5686
5687
5687 The following table details the behavior of remove for different
5688 The following table details the behavior of remove for different
5688 file states (columns) and option combinations (rows). The file
5689 file states (columns) and option combinations (rows). The file
5689 states are Added [A], Clean [C], Modified [M] and Missing [!]
5690 states are Added [A], Clean [C], Modified [M] and Missing [!]
5690 (as reported by :hg:`status`). The actions are Warn, Remove
5691 (as reported by :hg:`status`). The actions are Warn, Remove
5691 (from branch) and Delete (from disk):
5692 (from branch) and Delete (from disk):
5692
5693
5693 ========= == == == ==
5694 ========= == == == ==
5694 opt/state A C M !
5695 opt/state A C M !
5695 ========= == == == ==
5696 ========= == == == ==
5696 none W RD W R
5697 none W RD W R
5697 -f R RD RD R
5698 -f R RD RD R
5698 -A W W W R
5699 -A W W W R
5699 -Af R R R R
5700 -Af R R R R
5700 ========= == == == ==
5701 ========= == == == ==
5701
5702
5702 .. note::
5703 .. note::
5703
5704
5704 :hg:`remove` never deletes files in Added [A] state from the
5705 :hg:`remove` never deletes files in Added [A] state from the
5705 working directory, not even if ``--force`` is specified.
5706 working directory, not even if ``--force`` is specified.
5706
5707
5707 Returns 0 on success, 1 if any warnings encountered.
5708 Returns 0 on success, 1 if any warnings encountered.
5708 """
5709 """
5709
5710
5710 opts = pycompat.byteskwargs(opts)
5711 opts = pycompat.byteskwargs(opts)
5711 after, force = opts.get(b'after'), opts.get(b'force')
5712 after, force = opts.get(b'after'), opts.get(b'force')
5712 dryrun = opts.get(b'dry_run')
5713 dryrun = opts.get(b'dry_run')
5713 if not pats and not after:
5714 if not pats and not after:
5714 raise error.InputError(_(b'no files specified'))
5715 raise error.InputError(_(b'no files specified'))
5715
5716
5716 m = scmutil.match(repo[None], pats, opts)
5717 m = scmutil.match(repo[None], pats, opts)
5717 subrepos = opts.get(b'subrepos')
5718 subrepos = opts.get(b'subrepos')
5718 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5719 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5719 return cmdutil.remove(
5720 return cmdutil.remove(
5720 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5721 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5721 )
5722 )
5722
5723
5723
5724
5724 @command(
5725 @command(
5725 b'rename|move|mv',
5726 b'rename|move|mv',
5726 [
5727 [
5727 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5728 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5728 (
5729 (
5729 b'',
5730 b'',
5730 b'at-rev',
5731 b'at-rev',
5731 b'',
5732 b'',
5732 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5733 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5733 _(b'REV'),
5734 _(b'REV'),
5734 ),
5735 ),
5735 (
5736 (
5736 b'f',
5737 b'f',
5737 b'force',
5738 b'force',
5738 None,
5739 None,
5739 _(b'forcibly move over an existing managed file'),
5740 _(b'forcibly move over an existing managed file'),
5740 ),
5741 ),
5741 ]
5742 ]
5742 + walkopts
5743 + walkopts
5743 + dryrunopts,
5744 + dryrunopts,
5744 _(b'[OPTION]... SOURCE... DEST'),
5745 _(b'[OPTION]... SOURCE... DEST'),
5745 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5746 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5746 )
5747 )
5747 def rename(ui, repo, *pats, **opts):
5748 def rename(ui, repo, *pats, **opts):
5748 """rename files; equivalent of copy + remove
5749 """rename files; equivalent of copy + remove
5749
5750
5750 Mark dest as copies of sources; mark sources for deletion. If dest
5751 Mark dest as copies of sources; mark sources for deletion. If dest
5751 is a directory, copies are put in that directory. If dest is a
5752 is a directory, copies are put in that directory. If dest is a
5752 file, there can only be one source.
5753 file, there can only be one source.
5753
5754
5754 By default, this command copies the contents of files as they
5755 By default, this command copies the contents of files as they
5755 exist in the working directory. If invoked with -A/--after, the
5756 exist in the working directory. If invoked with -A/--after, the
5756 operation is recorded, but no copying is performed.
5757 operation is recorded, but no copying is performed.
5757
5758
5758 This command takes effect at the next commit. To undo a rename
5759 This command takes effect at the next commit. To undo a rename
5759 before that, see :hg:`revert`.
5760 before that, see :hg:`revert`.
5760
5761
5761 Returns 0 on success, 1 if errors are encountered.
5762 Returns 0 on success, 1 if errors are encountered.
5762 """
5763 """
5763 opts = pycompat.byteskwargs(opts)
5764 opts = pycompat.byteskwargs(opts)
5764 with repo.wlock():
5765 with repo.wlock():
5765 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5766 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5766
5767
5767
5768
5768 @command(
5769 @command(
5769 b'resolve',
5770 b'resolve',
5770 [
5771 [
5771 (b'a', b'all', None, _(b'select all unresolved files')),
5772 (b'a', b'all', None, _(b'select all unresolved files')),
5772 (b'l', b'list', None, _(b'list state of files needing merge')),
5773 (b'l', b'list', None, _(b'list state of files needing merge')),
5773 (b'm', b'mark', None, _(b'mark files as resolved')),
5774 (b'm', b'mark', None, _(b'mark files as resolved')),
5774 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5775 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5775 (b'n', b'no-status', None, _(b'hide status prefix')),
5776 (b'n', b'no-status', None, _(b'hide status prefix')),
5776 (b'', b're-merge', None, _(b're-merge files')),
5777 (b'', b're-merge', None, _(b're-merge files')),
5777 ]
5778 ]
5778 + mergetoolopts
5779 + mergetoolopts
5779 + walkopts
5780 + walkopts
5780 + formatteropts,
5781 + formatteropts,
5781 _(b'[OPTION]... [FILE]...'),
5782 _(b'[OPTION]... [FILE]...'),
5782 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5783 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5783 inferrepo=True,
5784 inferrepo=True,
5784 )
5785 )
5785 def resolve(ui, repo, *pats, **opts):
5786 def resolve(ui, repo, *pats, **opts):
5786 """redo merges or set/view the merge status of files
5787 """redo merges or set/view the merge status of files
5787
5788
5788 Merges with unresolved conflicts are often the result of
5789 Merges with unresolved conflicts are often the result of
5789 non-interactive merging using the ``internal:merge`` configuration
5790 non-interactive merging using the ``internal:merge`` configuration
5790 setting, or a command-line merge tool like ``diff3``. The resolve
5791 setting, or a command-line merge tool like ``diff3``. The resolve
5791 command is used to manage the files involved in a merge, after
5792 command is used to manage the files involved in a merge, after
5792 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5793 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5793 working directory must have two parents). See :hg:`help
5794 working directory must have two parents). See :hg:`help
5794 merge-tools` for information on configuring merge tools.
5795 merge-tools` for information on configuring merge tools.
5795
5796
5796 The resolve command can be used in the following ways:
5797 The resolve command can be used in the following ways:
5797
5798
5798 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5799 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5799 the specified files, discarding any previous merge attempts. Re-merging
5800 the specified files, discarding any previous merge attempts. Re-merging
5800 is not performed for files already marked as resolved. Use ``--all/-a``
5801 is not performed for files already marked as resolved. Use ``--all/-a``
5801 to select all unresolved files. ``--tool`` can be used to specify
5802 to select all unresolved files. ``--tool`` can be used to specify
5802 the merge tool used for the given files. It overrides the HGMERGE
5803 the merge tool used for the given files. It overrides the HGMERGE
5803 environment variable and your configuration files. Previous file
5804 environment variable and your configuration files. Previous file
5804 contents are saved with a ``.orig`` suffix.
5805 contents are saved with a ``.orig`` suffix.
5805
5806
5806 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5807 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5807 (e.g. after having manually fixed-up the files). The default is
5808 (e.g. after having manually fixed-up the files). The default is
5808 to mark all unresolved files.
5809 to mark all unresolved files.
5809
5810
5810 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5811 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5811 default is to mark all resolved files.
5812 default is to mark all resolved files.
5812
5813
5813 - :hg:`resolve -l`: list files which had or still have conflicts.
5814 - :hg:`resolve -l`: list files which had or still have conflicts.
5814 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5815 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5815 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5816 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5816 the list. See :hg:`help filesets` for details.
5817 the list. See :hg:`help filesets` for details.
5817
5818
5818 .. note::
5819 .. note::
5819
5820
5820 Mercurial will not let you commit files with unresolved merge
5821 Mercurial will not let you commit files with unresolved merge
5821 conflicts. You must use :hg:`resolve -m ...` before you can
5822 conflicts. You must use :hg:`resolve -m ...` before you can
5822 commit after a conflicting merge.
5823 commit after a conflicting merge.
5823
5824
5824 .. container:: verbose
5825 .. container:: verbose
5825
5826
5826 Template:
5827 Template:
5827
5828
5828 The following keywords are supported in addition to the common template
5829 The following keywords are supported in addition to the common template
5829 keywords and functions. See also :hg:`help templates`.
5830 keywords and functions. See also :hg:`help templates`.
5830
5831
5831 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5832 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5832 :path: String. Repository-absolute path of the file.
5833 :path: String. Repository-absolute path of the file.
5833
5834
5834 Returns 0 on success, 1 if any files fail a resolve attempt.
5835 Returns 0 on success, 1 if any files fail a resolve attempt.
5835 """
5836 """
5836
5837
5837 opts = pycompat.byteskwargs(opts)
5838 opts = pycompat.byteskwargs(opts)
5838 confirm = ui.configbool(b'commands', b'resolve.confirm')
5839 confirm = ui.configbool(b'commands', b'resolve.confirm')
5839 flaglist = b'all mark unmark list no_status re_merge'.split()
5840 flaglist = b'all mark unmark list no_status re_merge'.split()
5840 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5841 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5841
5842
5842 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5843 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5843 if actioncount > 1:
5844 if actioncount > 1:
5844 raise error.InputError(_(b"too many actions specified"))
5845 raise error.InputError(_(b"too many actions specified"))
5845 elif actioncount == 0 and ui.configbool(
5846 elif actioncount == 0 and ui.configbool(
5846 b'commands', b'resolve.explicit-re-merge'
5847 b'commands', b'resolve.explicit-re-merge'
5847 ):
5848 ):
5848 hint = _(b'use --mark, --unmark, --list or --re-merge')
5849 hint = _(b'use --mark, --unmark, --list or --re-merge')
5849 raise error.InputError(_(b'no action specified'), hint=hint)
5850 raise error.InputError(_(b'no action specified'), hint=hint)
5850 if pats and all:
5851 if pats and all:
5851 raise error.InputError(_(b"can't specify --all and patterns"))
5852 raise error.InputError(_(b"can't specify --all and patterns"))
5852 if not (all or pats or show or mark or unmark):
5853 if not (all or pats or show or mark or unmark):
5853 raise error.InputError(
5854 raise error.InputError(
5854 _(b'no files or directories specified'),
5855 _(b'no files or directories specified'),
5855 hint=b'use --all to re-merge all unresolved files',
5856 hint=b'use --all to re-merge all unresolved files',
5856 )
5857 )
5857
5858
5858 if confirm:
5859 if confirm:
5859 if all:
5860 if all:
5860 if ui.promptchoice(
5861 if ui.promptchoice(
5861 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5862 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5862 ):
5863 ):
5863 raise error.CanceledError(_(b'user quit'))
5864 raise error.CanceledError(_(b'user quit'))
5864 if mark and not pats:
5865 if mark and not pats:
5865 if ui.promptchoice(
5866 if ui.promptchoice(
5866 _(
5867 _(
5867 b'mark all unresolved files as resolved (yn)?'
5868 b'mark all unresolved files as resolved (yn)?'
5868 b'$$ &Yes $$ &No'
5869 b'$$ &Yes $$ &No'
5869 )
5870 )
5870 ):
5871 ):
5871 raise error.CanceledError(_(b'user quit'))
5872 raise error.CanceledError(_(b'user quit'))
5872 if unmark and not pats:
5873 if unmark and not pats:
5873 if ui.promptchoice(
5874 if ui.promptchoice(
5874 _(
5875 _(
5875 b'mark all resolved files as unresolved (yn)?'
5876 b'mark all resolved files as unresolved (yn)?'
5876 b'$$ &Yes $$ &No'
5877 b'$$ &Yes $$ &No'
5877 )
5878 )
5878 ):
5879 ):
5879 raise error.CanceledError(_(b'user quit'))
5880 raise error.CanceledError(_(b'user quit'))
5880
5881
5881 uipathfn = scmutil.getuipathfn(repo)
5882 uipathfn = scmutil.getuipathfn(repo)
5882
5883
5883 if show:
5884 if show:
5884 ui.pager(b'resolve')
5885 ui.pager(b'resolve')
5885 fm = ui.formatter(b'resolve', opts)
5886 fm = ui.formatter(b'resolve', opts)
5886 ms = mergestatemod.mergestate.read(repo)
5887 ms = mergestatemod.mergestate.read(repo)
5887 wctx = repo[None]
5888 wctx = repo[None]
5888 m = scmutil.match(wctx, pats, opts)
5889 m = scmutil.match(wctx, pats, opts)
5889
5890
5890 # Labels and keys based on merge state. Unresolved path conflicts show
5891 # Labels and keys based on merge state. Unresolved path conflicts show
5891 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5892 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5892 # resolved conflicts.
5893 # resolved conflicts.
5893 mergestateinfo = {
5894 mergestateinfo = {
5894 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5895 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5895 b'resolve.unresolved',
5896 b'resolve.unresolved',
5896 b'U',
5897 b'U',
5897 ),
5898 ),
5898 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5899 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5899 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5900 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5900 b'resolve.unresolved',
5901 b'resolve.unresolved',
5901 b'P',
5902 b'P',
5902 ),
5903 ),
5903 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5904 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5904 b'resolve.resolved',
5905 b'resolve.resolved',
5905 b'R',
5906 b'R',
5906 ),
5907 ),
5907 }
5908 }
5908
5909
5909 for f in ms:
5910 for f in ms:
5910 if not m(f):
5911 if not m(f):
5911 continue
5912 continue
5912
5913
5913 label, key = mergestateinfo[ms[f]]
5914 label, key = mergestateinfo[ms[f]]
5914 fm.startitem()
5915 fm.startitem()
5915 fm.context(ctx=wctx)
5916 fm.context(ctx=wctx)
5916 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5917 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5917 fm.data(path=f)
5918 fm.data(path=f)
5918 fm.plain(b'%s\n' % uipathfn(f), label=label)
5919 fm.plain(b'%s\n' % uipathfn(f), label=label)
5919 fm.end()
5920 fm.end()
5920 return 0
5921 return 0
5921
5922
5922 with repo.wlock():
5923 with repo.wlock():
5923 ms = mergestatemod.mergestate.read(repo)
5924 ms = mergestatemod.mergestate.read(repo)
5924
5925
5925 if not (ms.active() or repo.dirstate.p2() != nullid):
5926 if not (ms.active() or repo.dirstate.p2() != nullid):
5926 raise error.StateError(
5927 raise error.StateError(
5927 _(b'resolve command not applicable when not merging')
5928 _(b'resolve command not applicable when not merging')
5928 )
5929 )
5929
5930
5930 wctx = repo[None]
5931 wctx = repo[None]
5931 m = scmutil.match(wctx, pats, opts)
5932 m = scmutil.match(wctx, pats, opts)
5932 ret = 0
5933 ret = 0
5933 didwork = False
5934 didwork = False
5934
5935
5935 tocomplete = []
5936 tocomplete = []
5936 hasconflictmarkers = []
5937 hasconflictmarkers = []
5937 if mark:
5938 if mark:
5938 markcheck = ui.config(b'commands', b'resolve.mark-check')
5939 markcheck = ui.config(b'commands', b'resolve.mark-check')
5939 if markcheck not in [b'warn', b'abort']:
5940 if markcheck not in [b'warn', b'abort']:
5940 # Treat all invalid / unrecognized values as 'none'.
5941 # Treat all invalid / unrecognized values as 'none'.
5941 markcheck = False
5942 markcheck = False
5942 for f in ms:
5943 for f in ms:
5943 if not m(f):
5944 if not m(f):
5944 continue
5945 continue
5945
5946
5946 didwork = True
5947 didwork = True
5947
5948
5948 # path conflicts must be resolved manually
5949 # path conflicts must be resolved manually
5949 if ms[f] in (
5950 if ms[f] in (
5950 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5951 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5951 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5952 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5952 ):
5953 ):
5953 if mark:
5954 if mark:
5954 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5955 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5955 elif unmark:
5956 elif unmark:
5956 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5957 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5957 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5958 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5958 ui.warn(
5959 ui.warn(
5959 _(b'%s: path conflict must be resolved manually\n')
5960 _(b'%s: path conflict must be resolved manually\n')
5960 % uipathfn(f)
5961 % uipathfn(f)
5961 )
5962 )
5962 continue
5963 continue
5963
5964
5964 if mark:
5965 if mark:
5965 if markcheck:
5966 if markcheck:
5966 fdata = repo.wvfs.tryread(f)
5967 fdata = repo.wvfs.tryread(f)
5967 if (
5968 if (
5968 filemerge.hasconflictmarkers(fdata)
5969 filemerge.hasconflictmarkers(fdata)
5969 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5970 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5970 ):
5971 ):
5971 hasconflictmarkers.append(f)
5972 hasconflictmarkers.append(f)
5972 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5973 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5973 elif unmark:
5974 elif unmark:
5974 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5975 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5975 else:
5976 else:
5976 # backup pre-resolve (merge uses .orig for its own purposes)
5977 # backup pre-resolve (merge uses .orig for its own purposes)
5977 a = repo.wjoin(f)
5978 a = repo.wjoin(f)
5978 try:
5979 try:
5979 util.copyfile(a, a + b".resolve")
5980 util.copyfile(a, a + b".resolve")
5980 except (IOError, OSError) as inst:
5981 except (IOError, OSError) as inst:
5981 if inst.errno != errno.ENOENT:
5982 if inst.errno != errno.ENOENT:
5982 raise
5983 raise
5983
5984
5984 try:
5985 try:
5985 # preresolve file
5986 # preresolve file
5986 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5987 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5987 with ui.configoverride(overrides, b'resolve'):
5988 with ui.configoverride(overrides, b'resolve'):
5988 complete, r = ms.preresolve(f, wctx)
5989 complete, r = ms.preresolve(f, wctx)
5989 if not complete:
5990 if not complete:
5990 tocomplete.append(f)
5991 tocomplete.append(f)
5991 elif r:
5992 elif r:
5992 ret = 1
5993 ret = 1
5993 finally:
5994 finally:
5994 ms.commit()
5995 ms.commit()
5995
5996
5996 # replace filemerge's .orig file with our resolve file, but only
5997 # replace filemerge's .orig file with our resolve file, but only
5997 # for merges that are complete
5998 # for merges that are complete
5998 if complete:
5999 if complete:
5999 try:
6000 try:
6000 util.rename(
6001 util.rename(
6001 a + b".resolve", scmutil.backuppath(ui, repo, f)
6002 a + b".resolve", scmutil.backuppath(ui, repo, f)
6002 )
6003 )
6003 except OSError as inst:
6004 except OSError as inst:
6004 if inst.errno != errno.ENOENT:
6005 if inst.errno != errno.ENOENT:
6005 raise
6006 raise
6006
6007
6007 if hasconflictmarkers:
6008 if hasconflictmarkers:
6008 ui.warn(
6009 ui.warn(
6009 _(
6010 _(
6010 b'warning: the following files still have conflict '
6011 b'warning: the following files still have conflict '
6011 b'markers:\n'
6012 b'markers:\n'
6012 )
6013 )
6013 + b''.join(
6014 + b''.join(
6014 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6015 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6015 )
6016 )
6016 )
6017 )
6017 if markcheck == b'abort' and not all and not pats:
6018 if markcheck == b'abort' and not all and not pats:
6018 raise error.StateError(
6019 raise error.StateError(
6019 _(b'conflict markers detected'),
6020 _(b'conflict markers detected'),
6020 hint=_(b'use --all to mark anyway'),
6021 hint=_(b'use --all to mark anyway'),
6021 )
6022 )
6022
6023
6023 for f in tocomplete:
6024 for f in tocomplete:
6024 try:
6025 try:
6025 # resolve file
6026 # resolve file
6026 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6027 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6027 with ui.configoverride(overrides, b'resolve'):
6028 with ui.configoverride(overrides, b'resolve'):
6028 r = ms.resolve(f, wctx)
6029 r = ms.resolve(f, wctx)
6029 if r:
6030 if r:
6030 ret = 1
6031 ret = 1
6031 finally:
6032 finally:
6032 ms.commit()
6033 ms.commit()
6033
6034
6034 # replace filemerge's .orig file with our resolve file
6035 # replace filemerge's .orig file with our resolve file
6035 a = repo.wjoin(f)
6036 a = repo.wjoin(f)
6036 try:
6037 try:
6037 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6038 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6038 except OSError as inst:
6039 except OSError as inst:
6039 if inst.errno != errno.ENOENT:
6040 if inst.errno != errno.ENOENT:
6040 raise
6041 raise
6041
6042
6042 ms.commit()
6043 ms.commit()
6043 branchmerge = repo.dirstate.p2() != nullid
6044 branchmerge = repo.dirstate.p2() != nullid
6044 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6045 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6045
6046
6046 if not didwork and pats:
6047 if not didwork and pats:
6047 hint = None
6048 hint = None
6048 if not any([p for p in pats if p.find(b':') >= 0]):
6049 if not any([p for p in pats if p.find(b':') >= 0]):
6049 pats = [b'path:%s' % p for p in pats]
6050 pats = [b'path:%s' % p for p in pats]
6050 m = scmutil.match(wctx, pats, opts)
6051 m = scmutil.match(wctx, pats, opts)
6051 for f in ms:
6052 for f in ms:
6052 if not m(f):
6053 if not m(f):
6053 continue
6054 continue
6054
6055
6055 def flag(o):
6056 def flag(o):
6056 if o == b're_merge':
6057 if o == b're_merge':
6057 return b'--re-merge '
6058 return b'--re-merge '
6058 return b'-%s ' % o[0:1]
6059 return b'-%s ' % o[0:1]
6059
6060
6060 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6061 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6061 hint = _(b"(try: hg resolve %s%s)\n") % (
6062 hint = _(b"(try: hg resolve %s%s)\n") % (
6062 flags,
6063 flags,
6063 b' '.join(pats),
6064 b' '.join(pats),
6064 )
6065 )
6065 break
6066 break
6066 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6067 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6067 if hint:
6068 if hint:
6068 ui.warn(hint)
6069 ui.warn(hint)
6069
6070
6070 unresolvedf = list(ms.unresolved())
6071 unresolvedf = list(ms.unresolved())
6071 if not unresolvedf:
6072 if not unresolvedf:
6072 ui.status(_(b'(no more unresolved files)\n'))
6073 ui.status(_(b'(no more unresolved files)\n'))
6073 cmdutil.checkafterresolved(repo)
6074 cmdutil.checkafterresolved(repo)
6074
6075
6075 return ret
6076 return ret
6076
6077
6077
6078
6078 @command(
6079 @command(
6079 b'revert',
6080 b'revert',
6080 [
6081 [
6081 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6082 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6082 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6083 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6083 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6084 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6084 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6085 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6085 (b'i', b'interactive', None, _(b'interactively select the changes')),
6086 (b'i', b'interactive', None, _(b'interactively select the changes')),
6086 ]
6087 ]
6087 + walkopts
6088 + walkopts
6088 + dryrunopts,
6089 + dryrunopts,
6089 _(b'[OPTION]... [-r REV] [NAME]...'),
6090 _(b'[OPTION]... [-r REV] [NAME]...'),
6090 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6091 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6091 )
6092 )
6092 def revert(ui, repo, *pats, **opts):
6093 def revert(ui, repo, *pats, **opts):
6093 """restore files to their checkout state
6094 """restore files to their checkout state
6094
6095
6095 .. note::
6096 .. note::
6096
6097
6097 To check out earlier revisions, you should use :hg:`update REV`.
6098 To check out earlier revisions, you should use :hg:`update REV`.
6098 To cancel an uncommitted merge (and lose your changes),
6099 To cancel an uncommitted merge (and lose your changes),
6099 use :hg:`merge --abort`.
6100 use :hg:`merge --abort`.
6100
6101
6101 With no revision specified, revert the specified files or directories
6102 With no revision specified, revert the specified files or directories
6102 to the contents they had in the parent of the working directory.
6103 to the contents they had in the parent of the working directory.
6103 This restores the contents of files to an unmodified
6104 This restores the contents of files to an unmodified
6104 state and unschedules adds, removes, copies, and renames. If the
6105 state and unschedules adds, removes, copies, and renames. If the
6105 working directory has two parents, you must explicitly specify a
6106 working directory has two parents, you must explicitly specify a
6106 revision.
6107 revision.
6107
6108
6108 Using the -r/--rev or -d/--date options, revert the given files or
6109 Using the -r/--rev or -d/--date options, revert the given files or
6109 directories to their states as of a specific revision. Because
6110 directories to their states as of a specific revision. Because
6110 revert does not change the working directory parents, this will
6111 revert does not change the working directory parents, this will
6111 cause these files to appear modified. This can be helpful to "back
6112 cause these files to appear modified. This can be helpful to "back
6112 out" some or all of an earlier change. See :hg:`backout` for a
6113 out" some or all of an earlier change. See :hg:`backout` for a
6113 related method.
6114 related method.
6114
6115
6115 Modified files are saved with a .orig suffix before reverting.
6116 Modified files are saved with a .orig suffix before reverting.
6116 To disable these backups, use --no-backup. It is possible to store
6117 To disable these backups, use --no-backup. It is possible to store
6117 the backup files in a custom directory relative to the root of the
6118 the backup files in a custom directory relative to the root of the
6118 repository by setting the ``ui.origbackuppath`` configuration
6119 repository by setting the ``ui.origbackuppath`` configuration
6119 option.
6120 option.
6120
6121
6121 See :hg:`help dates` for a list of formats valid for -d/--date.
6122 See :hg:`help dates` for a list of formats valid for -d/--date.
6122
6123
6123 See :hg:`help backout` for a way to reverse the effect of an
6124 See :hg:`help backout` for a way to reverse the effect of an
6124 earlier changeset.
6125 earlier changeset.
6125
6126
6126 Returns 0 on success.
6127 Returns 0 on success.
6127 """
6128 """
6128
6129
6129 opts = pycompat.byteskwargs(opts)
6130 opts = pycompat.byteskwargs(opts)
6130 if opts.get(b"date"):
6131 if opts.get(b"date"):
6131 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6132 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6132 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6133 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6133
6134
6134 parent, p2 = repo.dirstate.parents()
6135 parent, p2 = repo.dirstate.parents()
6135 if not opts.get(b'rev') and p2 != nullid:
6136 if not opts.get(b'rev') and p2 != nullid:
6136 # revert after merge is a trap for new users (issue2915)
6137 # revert after merge is a trap for new users (issue2915)
6137 raise error.InputError(
6138 raise error.InputError(
6138 _(b'uncommitted merge with no revision specified'),
6139 _(b'uncommitted merge with no revision specified'),
6139 hint=_(b"use 'hg update' or see 'hg help revert'"),
6140 hint=_(b"use 'hg update' or see 'hg help revert'"),
6140 )
6141 )
6141
6142
6142 rev = opts.get(b'rev')
6143 rev = opts.get(b'rev')
6143 if rev:
6144 if rev:
6144 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6145 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6145 ctx = scmutil.revsingle(repo, rev)
6146 ctx = scmutil.revsingle(repo, rev)
6146
6147
6147 if not (
6148 if not (
6148 pats
6149 pats
6149 or opts.get(b'include')
6150 or opts.get(b'include')
6150 or opts.get(b'exclude')
6151 or opts.get(b'exclude')
6151 or opts.get(b'all')
6152 or opts.get(b'all')
6152 or opts.get(b'interactive')
6153 or opts.get(b'interactive')
6153 ):
6154 ):
6154 msg = _(b"no files or directories specified")
6155 msg = _(b"no files or directories specified")
6155 if p2 != nullid:
6156 if p2 != nullid:
6156 hint = _(
6157 hint = _(
6157 b"uncommitted merge, use --all to discard all changes,"
6158 b"uncommitted merge, use --all to discard all changes,"
6158 b" or 'hg update -C .' to abort the merge"
6159 b" or 'hg update -C .' to abort the merge"
6159 )
6160 )
6160 raise error.InputError(msg, hint=hint)
6161 raise error.InputError(msg, hint=hint)
6161 dirty = any(repo.status())
6162 dirty = any(repo.status())
6162 node = ctx.node()
6163 node = ctx.node()
6163 if node != parent:
6164 if node != parent:
6164 if dirty:
6165 if dirty:
6165 hint = (
6166 hint = (
6166 _(
6167 _(
6167 b"uncommitted changes, use --all to discard all"
6168 b"uncommitted changes, use --all to discard all"
6168 b" changes, or 'hg update %d' to update"
6169 b" changes, or 'hg update %d' to update"
6169 )
6170 )
6170 % ctx.rev()
6171 % ctx.rev()
6171 )
6172 )
6172 else:
6173 else:
6173 hint = (
6174 hint = (
6174 _(
6175 _(
6175 b"use --all to revert all files,"
6176 b"use --all to revert all files,"
6176 b" or 'hg update %d' to update"
6177 b" or 'hg update %d' to update"
6177 )
6178 )
6178 % ctx.rev()
6179 % ctx.rev()
6179 )
6180 )
6180 elif dirty:
6181 elif dirty:
6181 hint = _(b"uncommitted changes, use --all to discard all changes")
6182 hint = _(b"uncommitted changes, use --all to discard all changes")
6182 else:
6183 else:
6183 hint = _(b"use --all to revert all files")
6184 hint = _(b"use --all to revert all files")
6184 raise error.InputError(msg, hint=hint)
6185 raise error.InputError(msg, hint=hint)
6185
6186
6186 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6187 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6187
6188
6188
6189
6189 @command(
6190 @command(
6190 b'rollback',
6191 b'rollback',
6191 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6192 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6192 helpcategory=command.CATEGORY_MAINTENANCE,
6193 helpcategory=command.CATEGORY_MAINTENANCE,
6193 )
6194 )
6194 def rollback(ui, repo, **opts):
6195 def rollback(ui, repo, **opts):
6195 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6196 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6196
6197
6197 Please use :hg:`commit --amend` instead of rollback to correct
6198 Please use :hg:`commit --amend` instead of rollback to correct
6198 mistakes in the last commit.
6199 mistakes in the last commit.
6199
6200
6200 This command should be used with care. There is only one level of
6201 This command should be used with care. There is only one level of
6201 rollback, and there is no way to undo a rollback. It will also
6202 rollback, and there is no way to undo a rollback. It will also
6202 restore the dirstate at the time of the last transaction, losing
6203 restore the dirstate at the time of the last transaction, losing
6203 any dirstate changes since that time. This command does not alter
6204 any dirstate changes since that time. This command does not alter
6204 the working directory.
6205 the working directory.
6205
6206
6206 Transactions are used to encapsulate the effects of all commands
6207 Transactions are used to encapsulate the effects of all commands
6207 that create new changesets or propagate existing changesets into a
6208 that create new changesets or propagate existing changesets into a
6208 repository.
6209 repository.
6209
6210
6210 .. container:: verbose
6211 .. container:: verbose
6211
6212
6212 For example, the following commands are transactional, and their
6213 For example, the following commands are transactional, and their
6213 effects can be rolled back:
6214 effects can be rolled back:
6214
6215
6215 - commit
6216 - commit
6216 - import
6217 - import
6217 - pull
6218 - pull
6218 - push (with this repository as the destination)
6219 - push (with this repository as the destination)
6219 - unbundle
6220 - unbundle
6220
6221
6221 To avoid permanent data loss, rollback will refuse to rollback a
6222 To avoid permanent data loss, rollback will refuse to rollback a
6222 commit transaction if it isn't checked out. Use --force to
6223 commit transaction if it isn't checked out. Use --force to
6223 override this protection.
6224 override this protection.
6224
6225
6225 The rollback command can be entirely disabled by setting the
6226 The rollback command can be entirely disabled by setting the
6226 ``ui.rollback`` configuration setting to false. If you're here
6227 ``ui.rollback`` configuration setting to false. If you're here
6227 because you want to use rollback and it's disabled, you can
6228 because you want to use rollback and it's disabled, you can
6228 re-enable the command by setting ``ui.rollback`` to true.
6229 re-enable the command by setting ``ui.rollback`` to true.
6229
6230
6230 This command is not intended for use on public repositories. Once
6231 This command is not intended for use on public repositories. Once
6231 changes are visible for pull by other users, rolling a transaction
6232 changes are visible for pull by other users, rolling a transaction
6232 back locally is ineffective (someone else may already have pulled
6233 back locally is ineffective (someone else may already have pulled
6233 the changes). Furthermore, a race is possible with readers of the
6234 the changes). Furthermore, a race is possible with readers of the
6234 repository; for example an in-progress pull from the repository
6235 repository; for example an in-progress pull from the repository
6235 may fail if a rollback is performed.
6236 may fail if a rollback is performed.
6236
6237
6237 Returns 0 on success, 1 if no rollback data is available.
6238 Returns 0 on success, 1 if no rollback data is available.
6238 """
6239 """
6239 if not ui.configbool(b'ui', b'rollback'):
6240 if not ui.configbool(b'ui', b'rollback'):
6240 raise error.Abort(
6241 raise error.Abort(
6241 _(b'rollback is disabled because it is unsafe'),
6242 _(b'rollback is disabled because it is unsafe'),
6242 hint=b'see `hg help -v rollback` for information',
6243 hint=b'see `hg help -v rollback` for information',
6243 )
6244 )
6244 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6245 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6245
6246
6246
6247
6247 @command(
6248 @command(
6248 b'root',
6249 b'root',
6249 [] + formatteropts,
6250 [] + formatteropts,
6250 intents={INTENT_READONLY},
6251 intents={INTENT_READONLY},
6251 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6252 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6252 )
6253 )
6253 def root(ui, repo, **opts):
6254 def root(ui, repo, **opts):
6254 """print the root (top) of the current working directory
6255 """print the root (top) of the current working directory
6255
6256
6256 Print the root directory of the current repository.
6257 Print the root directory of the current repository.
6257
6258
6258 .. container:: verbose
6259 .. container:: verbose
6259
6260
6260 Template:
6261 Template:
6261
6262
6262 The following keywords are supported in addition to the common template
6263 The following keywords are supported in addition to the common template
6263 keywords and functions. See also :hg:`help templates`.
6264 keywords and functions. See also :hg:`help templates`.
6264
6265
6265 :hgpath: String. Path to the .hg directory.
6266 :hgpath: String. Path to the .hg directory.
6266 :storepath: String. Path to the directory holding versioned data.
6267 :storepath: String. Path to the directory holding versioned data.
6267
6268
6268 Returns 0 on success.
6269 Returns 0 on success.
6269 """
6270 """
6270 opts = pycompat.byteskwargs(opts)
6271 opts = pycompat.byteskwargs(opts)
6271 with ui.formatter(b'root', opts) as fm:
6272 with ui.formatter(b'root', opts) as fm:
6272 fm.startitem()
6273 fm.startitem()
6273 fm.write(b'reporoot', b'%s\n', repo.root)
6274 fm.write(b'reporoot', b'%s\n', repo.root)
6274 fm.data(hgpath=repo.path, storepath=repo.spath)
6275 fm.data(hgpath=repo.path, storepath=repo.spath)
6275
6276
6276
6277
6277 @command(
6278 @command(
6278 b'serve',
6279 b'serve',
6279 [
6280 [
6280 (
6281 (
6281 b'A',
6282 b'A',
6282 b'accesslog',
6283 b'accesslog',
6283 b'',
6284 b'',
6284 _(b'name of access log file to write to'),
6285 _(b'name of access log file to write to'),
6285 _(b'FILE'),
6286 _(b'FILE'),
6286 ),
6287 ),
6287 (b'd', b'daemon', None, _(b'run server in background')),
6288 (b'd', b'daemon', None, _(b'run server in background')),
6288 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6289 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6289 (
6290 (
6290 b'E',
6291 b'E',
6291 b'errorlog',
6292 b'errorlog',
6292 b'',
6293 b'',
6293 _(b'name of error log file to write to'),
6294 _(b'name of error log file to write to'),
6294 _(b'FILE'),
6295 _(b'FILE'),
6295 ),
6296 ),
6296 # use string type, then we can check if something was passed
6297 # use string type, then we can check if something was passed
6297 (
6298 (
6298 b'p',
6299 b'p',
6299 b'port',
6300 b'port',
6300 b'',
6301 b'',
6301 _(b'port to listen on (default: 8000)'),
6302 _(b'port to listen on (default: 8000)'),
6302 _(b'PORT'),
6303 _(b'PORT'),
6303 ),
6304 ),
6304 (
6305 (
6305 b'a',
6306 b'a',
6306 b'address',
6307 b'address',
6307 b'',
6308 b'',
6308 _(b'address to listen on (default: all interfaces)'),
6309 _(b'address to listen on (default: all interfaces)'),
6309 _(b'ADDR'),
6310 _(b'ADDR'),
6310 ),
6311 ),
6311 (
6312 (
6312 b'',
6313 b'',
6313 b'prefix',
6314 b'prefix',
6314 b'',
6315 b'',
6315 _(b'prefix path to serve from (default: server root)'),
6316 _(b'prefix path to serve from (default: server root)'),
6316 _(b'PREFIX'),
6317 _(b'PREFIX'),
6317 ),
6318 ),
6318 (
6319 (
6319 b'n',
6320 b'n',
6320 b'name',
6321 b'name',
6321 b'',
6322 b'',
6322 _(b'name to show in web pages (default: working directory)'),
6323 _(b'name to show in web pages (default: working directory)'),
6323 _(b'NAME'),
6324 _(b'NAME'),
6324 ),
6325 ),
6325 (
6326 (
6326 b'',
6327 b'',
6327 b'web-conf',
6328 b'web-conf',
6328 b'',
6329 b'',
6329 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6330 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6330 _(b'FILE'),
6331 _(b'FILE'),
6331 ),
6332 ),
6332 (
6333 (
6333 b'',
6334 b'',
6334 b'webdir-conf',
6335 b'webdir-conf',
6335 b'',
6336 b'',
6336 _(b'name of the hgweb config file (DEPRECATED)'),
6337 _(b'name of the hgweb config file (DEPRECATED)'),
6337 _(b'FILE'),
6338 _(b'FILE'),
6338 ),
6339 ),
6339 (
6340 (
6340 b'',
6341 b'',
6341 b'pid-file',
6342 b'pid-file',
6342 b'',
6343 b'',
6343 _(b'name of file to write process ID to'),
6344 _(b'name of file to write process ID to'),
6344 _(b'FILE'),
6345 _(b'FILE'),
6345 ),
6346 ),
6346 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6347 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6347 (
6348 (
6348 b'',
6349 b'',
6349 b'cmdserver',
6350 b'cmdserver',
6350 b'',
6351 b'',
6351 _(b'for remote clients (ADVANCED)'),
6352 _(b'for remote clients (ADVANCED)'),
6352 _(b'MODE'),
6353 _(b'MODE'),
6353 ),
6354 ),
6354 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6355 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6355 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6356 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6356 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6357 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6357 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6358 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6358 (b'', b'print-url', None, _(b'start and print only the URL')),
6359 (b'', b'print-url', None, _(b'start and print only the URL')),
6359 ]
6360 ]
6360 + subrepoopts,
6361 + subrepoopts,
6361 _(b'[OPTION]...'),
6362 _(b'[OPTION]...'),
6362 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6363 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6363 helpbasic=True,
6364 helpbasic=True,
6364 optionalrepo=True,
6365 optionalrepo=True,
6365 )
6366 )
6366 def serve(ui, repo, **opts):
6367 def serve(ui, repo, **opts):
6367 """start stand-alone webserver
6368 """start stand-alone webserver
6368
6369
6369 Start a local HTTP repository browser and pull server. You can use
6370 Start a local HTTP repository browser and pull server. You can use
6370 this for ad-hoc sharing and browsing of repositories. It is
6371 this for ad-hoc sharing and browsing of repositories. It is
6371 recommended to use a real web server to serve a repository for
6372 recommended to use a real web server to serve a repository for
6372 longer periods of time.
6373 longer periods of time.
6373
6374
6374 Please note that the server does not implement access control.
6375 Please note that the server does not implement access control.
6375 This means that, by default, anybody can read from the server and
6376 This means that, by default, anybody can read from the server and
6376 nobody can write to it by default. Set the ``web.allow-push``
6377 nobody can write to it by default. Set the ``web.allow-push``
6377 option to ``*`` to allow everybody to push to the server. You
6378 option to ``*`` to allow everybody to push to the server. You
6378 should use a real web server if you need to authenticate users.
6379 should use a real web server if you need to authenticate users.
6379
6380
6380 By default, the server logs accesses to stdout and errors to
6381 By default, the server logs accesses to stdout and errors to
6381 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6382 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6382 files.
6383 files.
6383
6384
6384 To have the server choose a free port number to listen on, specify
6385 To have the server choose a free port number to listen on, specify
6385 a port number of 0; in this case, the server will print the port
6386 a port number of 0; in this case, the server will print the port
6386 number it uses.
6387 number it uses.
6387
6388
6388 Returns 0 on success.
6389 Returns 0 on success.
6389 """
6390 """
6390
6391
6391 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6392 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6392 opts = pycompat.byteskwargs(opts)
6393 opts = pycompat.byteskwargs(opts)
6393 if opts[b"print_url"] and ui.verbose:
6394 if opts[b"print_url"] and ui.verbose:
6394 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6395 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6395
6396
6396 if opts[b"stdio"]:
6397 if opts[b"stdio"]:
6397 if repo is None:
6398 if repo is None:
6398 raise error.RepoError(
6399 raise error.RepoError(
6399 _(b"there is no Mercurial repository here (.hg not found)")
6400 _(b"there is no Mercurial repository here (.hg not found)")
6400 )
6401 )
6401 s = wireprotoserver.sshserver(ui, repo)
6402 s = wireprotoserver.sshserver(ui, repo)
6402 s.serve_forever()
6403 s.serve_forever()
6403 return
6404 return
6404
6405
6405 service = server.createservice(ui, repo, opts)
6406 service = server.createservice(ui, repo, opts)
6406 return server.runservice(opts, initfn=service.init, runfn=service.run)
6407 return server.runservice(opts, initfn=service.init, runfn=service.run)
6407
6408
6408
6409
6409 @command(
6410 @command(
6410 b'shelve',
6411 b'shelve',
6411 [
6412 [
6412 (
6413 (
6413 b'A',
6414 b'A',
6414 b'addremove',
6415 b'addremove',
6415 None,
6416 None,
6416 _(b'mark new/missing files as added/removed before shelving'),
6417 _(b'mark new/missing files as added/removed before shelving'),
6417 ),
6418 ),
6418 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6419 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6419 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6420 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6420 (
6421 (
6421 b'',
6422 b'',
6422 b'date',
6423 b'date',
6423 b'',
6424 b'',
6424 _(b'shelve with the specified commit date'),
6425 _(b'shelve with the specified commit date'),
6425 _(b'DATE'),
6426 _(b'DATE'),
6426 ),
6427 ),
6427 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6428 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6428 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6429 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6429 (
6430 (
6430 b'k',
6431 b'k',
6431 b'keep',
6432 b'keep',
6432 False,
6433 False,
6433 _(b'shelve, but keep changes in the working directory'),
6434 _(b'shelve, but keep changes in the working directory'),
6434 ),
6435 ),
6435 (b'l', b'list', None, _(b'list current shelves')),
6436 (b'l', b'list', None, _(b'list current shelves')),
6436 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6437 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6437 (
6438 (
6438 b'n',
6439 b'n',
6439 b'name',
6440 b'name',
6440 b'',
6441 b'',
6441 _(b'use the given name for the shelved commit'),
6442 _(b'use the given name for the shelved commit'),
6442 _(b'NAME'),
6443 _(b'NAME'),
6443 ),
6444 ),
6444 (
6445 (
6445 b'p',
6446 b'p',
6446 b'patch',
6447 b'patch',
6447 None,
6448 None,
6448 _(
6449 _(
6449 b'output patches for changes (provide the names of the shelved '
6450 b'output patches for changes (provide the names of the shelved '
6450 b'changes as positional arguments)'
6451 b'changes as positional arguments)'
6451 ),
6452 ),
6452 ),
6453 ),
6453 (b'i', b'interactive', None, _(b'interactive mode')),
6454 (b'i', b'interactive', None, _(b'interactive mode')),
6454 (
6455 (
6455 b'',
6456 b'',
6456 b'stat',
6457 b'stat',
6457 None,
6458 None,
6458 _(
6459 _(
6459 b'output diffstat-style summary of changes (provide the names of '
6460 b'output diffstat-style summary of changes (provide the names of '
6460 b'the shelved changes as positional arguments)'
6461 b'the shelved changes as positional arguments)'
6461 ),
6462 ),
6462 ),
6463 ),
6463 ]
6464 ]
6464 + cmdutil.walkopts,
6465 + cmdutil.walkopts,
6465 _(b'hg shelve [OPTION]... [FILE]...'),
6466 _(b'hg shelve [OPTION]... [FILE]...'),
6466 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6467 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6467 )
6468 )
6468 def shelve(ui, repo, *pats, **opts):
6469 def shelve(ui, repo, *pats, **opts):
6469 """save and set aside changes from the working directory
6470 """save and set aside changes from the working directory
6470
6471
6471 Shelving takes files that "hg status" reports as not clean, saves
6472 Shelving takes files that "hg status" reports as not clean, saves
6472 the modifications to a bundle (a shelved change), and reverts the
6473 the modifications to a bundle (a shelved change), and reverts the
6473 files so that their state in the working directory becomes clean.
6474 files so that their state in the working directory becomes clean.
6474
6475
6475 To restore these changes to the working directory, using "hg
6476 To restore these changes to the working directory, using "hg
6476 unshelve"; this will work even if you switch to a different
6477 unshelve"; this will work even if you switch to a different
6477 commit.
6478 commit.
6478
6479
6479 When no files are specified, "hg shelve" saves all not-clean
6480 When no files are specified, "hg shelve" saves all not-clean
6480 files. If specific files or directories are named, only changes to
6481 files. If specific files or directories are named, only changes to
6481 those files are shelved.
6482 those files are shelved.
6482
6483
6483 In bare shelve (when no files are specified, without interactive,
6484 In bare shelve (when no files are specified, without interactive,
6484 include and exclude option), shelving remembers information if the
6485 include and exclude option), shelving remembers information if the
6485 working directory was on newly created branch, in other words working
6486 working directory was on newly created branch, in other words working
6486 directory was on different branch than its first parent. In this
6487 directory was on different branch than its first parent. In this
6487 situation unshelving restores branch information to the working directory.
6488 situation unshelving restores branch information to the working directory.
6488
6489
6489 Each shelved change has a name that makes it easier to find later.
6490 Each shelved change has a name that makes it easier to find later.
6490 The name of a shelved change defaults to being based on the active
6491 The name of a shelved change defaults to being based on the active
6491 bookmark, or if there is no active bookmark, the current named
6492 bookmark, or if there is no active bookmark, the current named
6492 branch. To specify a different name, use ``--name``.
6493 branch. To specify a different name, use ``--name``.
6493
6494
6494 To see a list of existing shelved changes, use the ``--list``
6495 To see a list of existing shelved changes, use the ``--list``
6495 option. For each shelved change, this will print its name, age,
6496 option. For each shelved change, this will print its name, age,
6496 and description; use ``--patch`` or ``--stat`` for more details.
6497 and description; use ``--patch`` or ``--stat`` for more details.
6497
6498
6498 To delete specific shelved changes, use ``--delete``. To delete
6499 To delete specific shelved changes, use ``--delete``. To delete
6499 all shelved changes, use ``--cleanup``.
6500 all shelved changes, use ``--cleanup``.
6500 """
6501 """
6501 opts = pycompat.byteskwargs(opts)
6502 opts = pycompat.byteskwargs(opts)
6502 allowables = [
6503 allowables = [
6503 (b'addremove', {b'create'}), # 'create' is pseudo action
6504 (b'addremove', {b'create'}), # 'create' is pseudo action
6504 (b'unknown', {b'create'}),
6505 (b'unknown', {b'create'}),
6505 (b'cleanup', {b'cleanup'}),
6506 (b'cleanup', {b'cleanup'}),
6506 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6507 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6507 (b'delete', {b'delete'}),
6508 (b'delete', {b'delete'}),
6508 (b'edit', {b'create'}),
6509 (b'edit', {b'create'}),
6509 (b'keep', {b'create'}),
6510 (b'keep', {b'create'}),
6510 (b'list', {b'list'}),
6511 (b'list', {b'list'}),
6511 (b'message', {b'create'}),
6512 (b'message', {b'create'}),
6512 (b'name', {b'create'}),
6513 (b'name', {b'create'}),
6513 (b'patch', {b'patch', b'list'}),
6514 (b'patch', {b'patch', b'list'}),
6514 (b'stat', {b'stat', b'list'}),
6515 (b'stat', {b'stat', b'list'}),
6515 ]
6516 ]
6516
6517
6517 def checkopt(opt):
6518 def checkopt(opt):
6518 if opts.get(opt):
6519 if opts.get(opt):
6519 for i, allowable in allowables:
6520 for i, allowable in allowables:
6520 if opts[i] and opt not in allowable:
6521 if opts[i] and opt not in allowable:
6521 raise error.InputError(
6522 raise error.InputError(
6522 _(
6523 _(
6523 b"options '--%s' and '--%s' may not be "
6524 b"options '--%s' and '--%s' may not be "
6524 b"used together"
6525 b"used together"
6525 )
6526 )
6526 % (opt, i)
6527 % (opt, i)
6527 )
6528 )
6528 return True
6529 return True
6529
6530
6530 if checkopt(b'cleanup'):
6531 if checkopt(b'cleanup'):
6531 if pats:
6532 if pats:
6532 raise error.InputError(
6533 raise error.InputError(
6533 _(b"cannot specify names when using '--cleanup'")
6534 _(b"cannot specify names when using '--cleanup'")
6534 )
6535 )
6535 return shelvemod.cleanupcmd(ui, repo)
6536 return shelvemod.cleanupcmd(ui, repo)
6536 elif checkopt(b'delete'):
6537 elif checkopt(b'delete'):
6537 return shelvemod.deletecmd(ui, repo, pats)
6538 return shelvemod.deletecmd(ui, repo, pats)
6538 elif checkopt(b'list'):
6539 elif checkopt(b'list'):
6539 return shelvemod.listcmd(ui, repo, pats, opts)
6540 return shelvemod.listcmd(ui, repo, pats, opts)
6540 elif checkopt(b'patch') or checkopt(b'stat'):
6541 elif checkopt(b'patch') or checkopt(b'stat'):
6541 return shelvemod.patchcmds(ui, repo, pats, opts)
6542 return shelvemod.patchcmds(ui, repo, pats, opts)
6542 else:
6543 else:
6543 return shelvemod.createcmd(ui, repo, pats, opts)
6544 return shelvemod.createcmd(ui, repo, pats, opts)
6544
6545
6545
6546
6546 _NOTTERSE = b'nothing'
6547 _NOTTERSE = b'nothing'
6547
6548
6548
6549
6549 @command(
6550 @command(
6550 b'status|st',
6551 b'status|st',
6551 [
6552 [
6552 (b'A', b'all', None, _(b'show status of all files')),
6553 (b'A', b'all', None, _(b'show status of all files')),
6553 (b'm', b'modified', None, _(b'show only modified files')),
6554 (b'm', b'modified', None, _(b'show only modified files')),
6554 (b'a', b'added', None, _(b'show only added files')),
6555 (b'a', b'added', None, _(b'show only added files')),
6555 (b'r', b'removed', None, _(b'show only removed files')),
6556 (b'r', b'removed', None, _(b'show only removed files')),
6556 (b'd', b'deleted', None, _(b'show only missing files')),
6557 (b'd', b'deleted', None, _(b'show only missing files')),
6557 (b'c', b'clean', None, _(b'show only files without changes')),
6558 (b'c', b'clean', None, _(b'show only files without changes')),
6558 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6559 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6559 (b'i', b'ignored', None, _(b'show only ignored files')),
6560 (b'i', b'ignored', None, _(b'show only ignored files')),
6560 (b'n', b'no-status', None, _(b'hide status prefix')),
6561 (b'n', b'no-status', None, _(b'hide status prefix')),
6561 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6562 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6562 (
6563 (
6563 b'C',
6564 b'C',
6564 b'copies',
6565 b'copies',
6565 None,
6566 None,
6566 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6567 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6567 ),
6568 ),
6568 (
6569 (
6569 b'0',
6570 b'0',
6570 b'print0',
6571 b'print0',
6571 None,
6572 None,
6572 _(b'end filenames with NUL, for use with xargs'),
6573 _(b'end filenames with NUL, for use with xargs'),
6573 ),
6574 ),
6574 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6575 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6575 (
6576 (
6576 b'',
6577 b'',
6577 b'change',
6578 b'change',
6578 b'',
6579 b'',
6579 _(b'list the changed files of a revision'),
6580 _(b'list the changed files of a revision'),
6580 _(b'REV'),
6581 _(b'REV'),
6581 ),
6582 ),
6582 ]
6583 ]
6583 + walkopts
6584 + walkopts
6584 + subrepoopts
6585 + subrepoopts
6585 + formatteropts,
6586 + formatteropts,
6586 _(b'[OPTION]... [FILE]...'),
6587 _(b'[OPTION]... [FILE]...'),
6587 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6588 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6588 helpbasic=True,
6589 helpbasic=True,
6589 inferrepo=True,
6590 inferrepo=True,
6590 intents={INTENT_READONLY},
6591 intents={INTENT_READONLY},
6591 )
6592 )
6592 def status(ui, repo, *pats, **opts):
6593 def status(ui, repo, *pats, **opts):
6593 """show changed files in the working directory
6594 """show changed files in the working directory
6594
6595
6595 Show status of files in the repository. If names are given, only
6596 Show status of files in the repository. If names are given, only
6596 files that match are shown. Files that are clean or ignored or
6597 files that match are shown. Files that are clean or ignored or
6597 the source of a copy/move operation, are not listed unless
6598 the source of a copy/move operation, are not listed unless
6598 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6599 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6599 Unless options described with "show only ..." are given, the
6600 Unless options described with "show only ..." are given, the
6600 options -mardu are used.
6601 options -mardu are used.
6601
6602
6602 Option -q/--quiet hides untracked (unknown and ignored) files
6603 Option -q/--quiet hides untracked (unknown and ignored) files
6603 unless explicitly requested with -u/--unknown or -i/--ignored.
6604 unless explicitly requested with -u/--unknown or -i/--ignored.
6604
6605
6605 .. note::
6606 .. note::
6606
6607
6607 :hg:`status` may appear to disagree with diff if permissions have
6608 :hg:`status` may appear to disagree with diff if permissions have
6608 changed or a merge has occurred. The standard diff format does
6609 changed or a merge has occurred. The standard diff format does
6609 not report permission changes and diff only reports changes
6610 not report permission changes and diff only reports changes
6610 relative to one merge parent.
6611 relative to one merge parent.
6611
6612
6612 If one revision is given, it is used as the base revision.
6613 If one revision is given, it is used as the base revision.
6613 If two revisions are given, the differences between them are
6614 If two revisions are given, the differences between them are
6614 shown. The --change option can also be used as a shortcut to list
6615 shown. The --change option can also be used as a shortcut to list
6615 the changed files of a revision from its first parent.
6616 the changed files of a revision from its first parent.
6616
6617
6617 The codes used to show the status of files are::
6618 The codes used to show the status of files are::
6618
6619
6619 M = modified
6620 M = modified
6620 A = added
6621 A = added
6621 R = removed
6622 R = removed
6622 C = clean
6623 C = clean
6623 ! = missing (deleted by non-hg command, but still tracked)
6624 ! = missing (deleted by non-hg command, but still tracked)
6624 ? = not tracked
6625 ? = not tracked
6625 I = ignored
6626 I = ignored
6626 = origin of the previous file (with --copies)
6627 = origin of the previous file (with --copies)
6627
6628
6628 .. container:: verbose
6629 .. container:: verbose
6629
6630
6630 The -t/--terse option abbreviates the output by showing only the directory
6631 The -t/--terse option abbreviates the output by showing only the directory
6631 name if all the files in it share the same status. The option takes an
6632 name if all the files in it share the same status. The option takes an
6632 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6633 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6633 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6634 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6634 for 'ignored' and 'c' for clean.
6635 for 'ignored' and 'c' for clean.
6635
6636
6636 It abbreviates only those statuses which are passed. Note that clean and
6637 It abbreviates only those statuses which are passed. Note that clean and
6637 ignored files are not displayed with '--terse ic' unless the -c/--clean
6638 ignored files are not displayed with '--terse ic' unless the -c/--clean
6638 and -i/--ignored options are also used.
6639 and -i/--ignored options are also used.
6639
6640
6640 The -v/--verbose option shows information when the repository is in an
6641 The -v/--verbose option shows information when the repository is in an
6641 unfinished merge, shelve, rebase state etc. You can have this behavior
6642 unfinished merge, shelve, rebase state etc. You can have this behavior
6642 turned on by default by enabling the ``commands.status.verbose`` option.
6643 turned on by default by enabling the ``commands.status.verbose`` option.
6643
6644
6644 You can skip displaying some of these states by setting
6645 You can skip displaying some of these states by setting
6645 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6646 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6646 'histedit', 'merge', 'rebase', or 'unshelve'.
6647 'histedit', 'merge', 'rebase', or 'unshelve'.
6647
6648
6648 Template:
6649 Template:
6649
6650
6650 The following keywords are supported in addition to the common template
6651 The following keywords are supported in addition to the common template
6651 keywords and functions. See also :hg:`help templates`.
6652 keywords and functions. See also :hg:`help templates`.
6652
6653
6653 :path: String. Repository-absolute path of the file.
6654 :path: String. Repository-absolute path of the file.
6654 :source: String. Repository-absolute path of the file originated from.
6655 :source: String. Repository-absolute path of the file originated from.
6655 Available if ``--copies`` is specified.
6656 Available if ``--copies`` is specified.
6656 :status: String. Character denoting file's status.
6657 :status: String. Character denoting file's status.
6657
6658
6658 Examples:
6659 Examples:
6659
6660
6660 - show changes in the working directory relative to a
6661 - show changes in the working directory relative to a
6661 changeset::
6662 changeset::
6662
6663
6663 hg status --rev 9353
6664 hg status --rev 9353
6664
6665
6665 - show changes in the working directory relative to the
6666 - show changes in the working directory relative to the
6666 current directory (see :hg:`help patterns` for more information)::
6667 current directory (see :hg:`help patterns` for more information)::
6667
6668
6668 hg status re:
6669 hg status re:
6669
6670
6670 - show all changes including copies in an existing changeset::
6671 - show all changes including copies in an existing changeset::
6671
6672
6672 hg status --copies --change 9353
6673 hg status --copies --change 9353
6673
6674
6674 - get a NUL separated list of added files, suitable for xargs::
6675 - get a NUL separated list of added files, suitable for xargs::
6675
6676
6676 hg status -an0
6677 hg status -an0
6677
6678
6678 - show more information about the repository status, abbreviating
6679 - show more information about the repository status, abbreviating
6679 added, removed, modified, deleted, and untracked paths::
6680 added, removed, modified, deleted, and untracked paths::
6680
6681
6681 hg status -v -t mardu
6682 hg status -v -t mardu
6682
6683
6683 Returns 0 on success.
6684 Returns 0 on success.
6684
6685
6685 """
6686 """
6686
6687
6687 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6688 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6688 opts = pycompat.byteskwargs(opts)
6689 opts = pycompat.byteskwargs(opts)
6689 revs = opts.get(b'rev')
6690 revs = opts.get(b'rev')
6690 change = opts.get(b'change')
6691 change = opts.get(b'change')
6691 terse = opts.get(b'terse')
6692 terse = opts.get(b'terse')
6692 if terse is _NOTTERSE:
6693 if terse is _NOTTERSE:
6693 if revs:
6694 if revs:
6694 terse = b''
6695 terse = b''
6695 else:
6696 else:
6696 terse = ui.config(b'commands', b'status.terse')
6697 terse = ui.config(b'commands', b'status.terse')
6697
6698
6698 if revs and terse:
6699 if revs and terse:
6699 msg = _(b'cannot use --terse with --rev')
6700 msg = _(b'cannot use --terse with --rev')
6700 raise error.InputError(msg)
6701 raise error.InputError(msg)
6701 elif change:
6702 elif change:
6702 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6703 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6703 ctx2 = scmutil.revsingle(repo, change, None)
6704 ctx2 = scmutil.revsingle(repo, change, None)
6704 ctx1 = ctx2.p1()
6705 ctx1 = ctx2.p1()
6705 else:
6706 else:
6706 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6707 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6707 ctx1, ctx2 = scmutil.revpair(repo, revs)
6708 ctx1, ctx2 = scmutil.revpair(repo, revs)
6708
6709
6709 forcerelativevalue = None
6710 forcerelativevalue = None
6710 if ui.hasconfig(b'commands', b'status.relative'):
6711 if ui.hasconfig(b'commands', b'status.relative'):
6711 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6712 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6712 uipathfn = scmutil.getuipathfn(
6713 uipathfn = scmutil.getuipathfn(
6713 repo,
6714 repo,
6714 legacyrelativevalue=bool(pats),
6715 legacyrelativevalue=bool(pats),
6715 forcerelativevalue=forcerelativevalue,
6716 forcerelativevalue=forcerelativevalue,
6716 )
6717 )
6717
6718
6718 if opts.get(b'print0'):
6719 if opts.get(b'print0'):
6719 end = b'\0'
6720 end = b'\0'
6720 else:
6721 else:
6721 end = b'\n'
6722 end = b'\n'
6722 states = b'modified added removed deleted unknown ignored clean'.split()
6723 states = b'modified added removed deleted unknown ignored clean'.split()
6723 show = [k for k in states if opts.get(k)]
6724 show = [k for k in states if opts.get(k)]
6724 if opts.get(b'all'):
6725 if opts.get(b'all'):
6725 show += ui.quiet and (states[:4] + [b'clean']) or states
6726 show += ui.quiet and (states[:4] + [b'clean']) or states
6726
6727
6727 if not show:
6728 if not show:
6728 if ui.quiet:
6729 if ui.quiet:
6729 show = states[:4]
6730 show = states[:4]
6730 else:
6731 else:
6731 show = states[:5]
6732 show = states[:5]
6732
6733
6733 m = scmutil.match(ctx2, pats, opts)
6734 m = scmutil.match(ctx2, pats, opts)
6734 if terse:
6735 if terse:
6735 # we need to compute clean and unknown to terse
6736 # we need to compute clean and unknown to terse
6736 stat = repo.status(
6737 stat = repo.status(
6737 ctx1.node(),
6738 ctx1.node(),
6738 ctx2.node(),
6739 ctx2.node(),
6739 m,
6740 m,
6740 b'ignored' in show or b'i' in terse,
6741 b'ignored' in show or b'i' in terse,
6741 clean=True,
6742 clean=True,
6742 unknown=True,
6743 unknown=True,
6743 listsubrepos=opts.get(b'subrepos'),
6744 listsubrepos=opts.get(b'subrepos'),
6744 )
6745 )
6745
6746
6746 stat = cmdutil.tersedir(stat, terse)
6747 stat = cmdutil.tersedir(stat, terse)
6747 else:
6748 else:
6748 stat = repo.status(
6749 stat = repo.status(
6749 ctx1.node(),
6750 ctx1.node(),
6750 ctx2.node(),
6751 ctx2.node(),
6751 m,
6752 m,
6752 b'ignored' in show,
6753 b'ignored' in show,
6753 b'clean' in show,
6754 b'clean' in show,
6754 b'unknown' in show,
6755 b'unknown' in show,
6755 opts.get(b'subrepos'),
6756 opts.get(b'subrepos'),
6756 )
6757 )
6757
6758
6758 changestates = zip(
6759 changestates = zip(
6759 states,
6760 states,
6760 pycompat.iterbytestr(b'MAR!?IC'),
6761 pycompat.iterbytestr(b'MAR!?IC'),
6761 [getattr(stat, s.decode('utf8')) for s in states],
6762 [getattr(stat, s.decode('utf8')) for s in states],
6762 )
6763 )
6763
6764
6764 copy = {}
6765 copy = {}
6765 if (
6766 if (
6766 opts.get(b'all')
6767 opts.get(b'all')
6767 or opts.get(b'copies')
6768 or opts.get(b'copies')
6768 or ui.configbool(b'ui', b'statuscopies')
6769 or ui.configbool(b'ui', b'statuscopies')
6769 ) and not opts.get(b'no_status'):
6770 ) and not opts.get(b'no_status'):
6770 copy = copies.pathcopies(ctx1, ctx2, m)
6771 copy = copies.pathcopies(ctx1, ctx2, m)
6771
6772
6772 morestatus = None
6773 morestatus = None
6773 if (
6774 if (
6774 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6775 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6775 ) and not ui.plain():
6776 ) and not ui.plain():
6776 morestatus = cmdutil.readmorestatus(repo)
6777 morestatus = cmdutil.readmorestatus(repo)
6777
6778
6778 ui.pager(b'status')
6779 ui.pager(b'status')
6779 fm = ui.formatter(b'status', opts)
6780 fm = ui.formatter(b'status', opts)
6780 fmt = b'%s' + end
6781 fmt = b'%s' + end
6781 showchar = not opts.get(b'no_status')
6782 showchar = not opts.get(b'no_status')
6782
6783
6783 for state, char, files in changestates:
6784 for state, char, files in changestates:
6784 if state in show:
6785 if state in show:
6785 label = b'status.' + state
6786 label = b'status.' + state
6786 for f in files:
6787 for f in files:
6787 fm.startitem()
6788 fm.startitem()
6788 fm.context(ctx=ctx2)
6789 fm.context(ctx=ctx2)
6789 fm.data(itemtype=b'file', path=f)
6790 fm.data(itemtype=b'file', path=f)
6790 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6791 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6791 fm.plain(fmt % uipathfn(f), label=label)
6792 fm.plain(fmt % uipathfn(f), label=label)
6792 if f in copy:
6793 if f in copy:
6793 fm.data(source=copy[f])
6794 fm.data(source=copy[f])
6794 fm.plain(
6795 fm.plain(
6795 (b' %s' + end) % uipathfn(copy[f]),
6796 (b' %s' + end) % uipathfn(copy[f]),
6796 label=b'status.copied',
6797 label=b'status.copied',
6797 )
6798 )
6798 if morestatus:
6799 if morestatus:
6799 morestatus.formatfile(f, fm)
6800 morestatus.formatfile(f, fm)
6800
6801
6801 if morestatus:
6802 if morestatus:
6802 morestatus.formatfooter(fm)
6803 morestatus.formatfooter(fm)
6803 fm.end()
6804 fm.end()
6804
6805
6805
6806
6806 @command(
6807 @command(
6807 b'summary|sum',
6808 b'summary|sum',
6808 [(b'', b'remote', None, _(b'check for push and pull'))],
6809 [(b'', b'remote', None, _(b'check for push and pull'))],
6809 b'[--remote]',
6810 b'[--remote]',
6810 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6811 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6811 helpbasic=True,
6812 helpbasic=True,
6812 intents={INTENT_READONLY},
6813 intents={INTENT_READONLY},
6813 )
6814 )
6814 def summary(ui, repo, **opts):
6815 def summary(ui, repo, **opts):
6815 """summarize working directory state
6816 """summarize working directory state
6816
6817
6817 This generates a brief summary of the working directory state,
6818 This generates a brief summary of the working directory state,
6818 including parents, branch, commit status, phase and available updates.
6819 including parents, branch, commit status, phase and available updates.
6819
6820
6820 With the --remote option, this will check the default paths for
6821 With the --remote option, this will check the default paths for
6821 incoming and outgoing changes. This can be time-consuming.
6822 incoming and outgoing changes. This can be time-consuming.
6822
6823
6823 Returns 0 on success.
6824 Returns 0 on success.
6824 """
6825 """
6825
6826
6826 opts = pycompat.byteskwargs(opts)
6827 opts = pycompat.byteskwargs(opts)
6827 ui.pager(b'summary')
6828 ui.pager(b'summary')
6828 ctx = repo[None]
6829 ctx = repo[None]
6829 parents = ctx.parents()
6830 parents = ctx.parents()
6830 pnode = parents[0].node()
6831 pnode = parents[0].node()
6831 marks = []
6832 marks = []
6832
6833
6833 try:
6834 try:
6834 ms = mergestatemod.mergestate.read(repo)
6835 ms = mergestatemod.mergestate.read(repo)
6835 except error.UnsupportedMergeRecords as e:
6836 except error.UnsupportedMergeRecords as e:
6836 s = b' '.join(e.recordtypes)
6837 s = b' '.join(e.recordtypes)
6837 ui.warn(
6838 ui.warn(
6838 _(b'warning: merge state has unsupported record types: %s\n') % s
6839 _(b'warning: merge state has unsupported record types: %s\n') % s
6839 )
6840 )
6840 unresolved = []
6841 unresolved = []
6841 else:
6842 else:
6842 unresolved = list(ms.unresolved())
6843 unresolved = list(ms.unresolved())
6843
6844
6844 for p in parents:
6845 for p in parents:
6845 # label with log.changeset (instead of log.parent) since this
6846 # label with log.changeset (instead of log.parent) since this
6846 # shows a working directory parent *changeset*:
6847 # shows a working directory parent *changeset*:
6847 # i18n: column positioning for "hg summary"
6848 # i18n: column positioning for "hg summary"
6848 ui.write(
6849 ui.write(
6849 _(b'parent: %d:%s ') % (p.rev(), p),
6850 _(b'parent: %d:%s ') % (p.rev(), p),
6850 label=logcmdutil.changesetlabels(p),
6851 label=logcmdutil.changesetlabels(p),
6851 )
6852 )
6852 ui.write(b' '.join(p.tags()), label=b'log.tag')
6853 ui.write(b' '.join(p.tags()), label=b'log.tag')
6853 if p.bookmarks():
6854 if p.bookmarks():
6854 marks.extend(p.bookmarks())
6855 marks.extend(p.bookmarks())
6855 if p.rev() == -1:
6856 if p.rev() == -1:
6856 if not len(repo):
6857 if not len(repo):
6857 ui.write(_(b' (empty repository)'))
6858 ui.write(_(b' (empty repository)'))
6858 else:
6859 else:
6859 ui.write(_(b' (no revision checked out)'))
6860 ui.write(_(b' (no revision checked out)'))
6860 if p.obsolete():
6861 if p.obsolete():
6861 ui.write(_(b' (obsolete)'))
6862 ui.write(_(b' (obsolete)'))
6862 if p.isunstable():
6863 if p.isunstable():
6863 instabilities = (
6864 instabilities = (
6864 ui.label(instability, b'trouble.%s' % instability)
6865 ui.label(instability, b'trouble.%s' % instability)
6865 for instability in p.instabilities()
6866 for instability in p.instabilities()
6866 )
6867 )
6867 ui.write(b' (' + b', '.join(instabilities) + b')')
6868 ui.write(b' (' + b', '.join(instabilities) + b')')
6868 ui.write(b'\n')
6869 ui.write(b'\n')
6869 if p.description():
6870 if p.description():
6870 ui.status(
6871 ui.status(
6871 b' ' + p.description().splitlines()[0].strip() + b'\n',
6872 b' ' + p.description().splitlines()[0].strip() + b'\n',
6872 label=b'log.summary',
6873 label=b'log.summary',
6873 )
6874 )
6874
6875
6875 branch = ctx.branch()
6876 branch = ctx.branch()
6876 bheads = repo.branchheads(branch)
6877 bheads = repo.branchheads(branch)
6877 # i18n: column positioning for "hg summary"
6878 # i18n: column positioning for "hg summary"
6878 m = _(b'branch: %s\n') % branch
6879 m = _(b'branch: %s\n') % branch
6879 if branch != b'default':
6880 if branch != b'default':
6880 ui.write(m, label=b'log.branch')
6881 ui.write(m, label=b'log.branch')
6881 else:
6882 else:
6882 ui.status(m, label=b'log.branch')
6883 ui.status(m, label=b'log.branch')
6883
6884
6884 if marks:
6885 if marks:
6885 active = repo._activebookmark
6886 active = repo._activebookmark
6886 # i18n: column positioning for "hg summary"
6887 # i18n: column positioning for "hg summary"
6887 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6888 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6888 if active is not None:
6889 if active is not None:
6889 if active in marks:
6890 if active in marks:
6890 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6891 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6891 marks.remove(active)
6892 marks.remove(active)
6892 else:
6893 else:
6893 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6894 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6894 for m in marks:
6895 for m in marks:
6895 ui.write(b' ' + m, label=b'log.bookmark')
6896 ui.write(b' ' + m, label=b'log.bookmark')
6896 ui.write(b'\n', label=b'log.bookmark')
6897 ui.write(b'\n', label=b'log.bookmark')
6897
6898
6898 status = repo.status(unknown=True)
6899 status = repo.status(unknown=True)
6899
6900
6900 c = repo.dirstate.copies()
6901 c = repo.dirstate.copies()
6901 copied, renamed = [], []
6902 copied, renamed = [], []
6902 for d, s in pycompat.iteritems(c):
6903 for d, s in pycompat.iteritems(c):
6903 if s in status.removed:
6904 if s in status.removed:
6904 status.removed.remove(s)
6905 status.removed.remove(s)
6905 renamed.append(d)
6906 renamed.append(d)
6906 else:
6907 else:
6907 copied.append(d)
6908 copied.append(d)
6908 if d in status.added:
6909 if d in status.added:
6909 status.added.remove(d)
6910 status.added.remove(d)
6910
6911
6911 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6912 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6912
6913
6913 labels = [
6914 labels = [
6914 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6915 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6915 (ui.label(_(b'%d added'), b'status.added'), status.added),
6916 (ui.label(_(b'%d added'), b'status.added'), status.added),
6916 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6917 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6917 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6918 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6918 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6919 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6919 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6920 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6920 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6921 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6921 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6922 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6922 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6923 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6923 ]
6924 ]
6924 t = []
6925 t = []
6925 for l, s in labels:
6926 for l, s in labels:
6926 if s:
6927 if s:
6927 t.append(l % len(s))
6928 t.append(l % len(s))
6928
6929
6929 t = b', '.join(t)
6930 t = b', '.join(t)
6930 cleanworkdir = False
6931 cleanworkdir = False
6931
6932
6932 if repo.vfs.exists(b'graftstate'):
6933 if repo.vfs.exists(b'graftstate'):
6933 t += _(b' (graft in progress)')
6934 t += _(b' (graft in progress)')
6934 if repo.vfs.exists(b'updatestate'):
6935 if repo.vfs.exists(b'updatestate'):
6935 t += _(b' (interrupted update)')
6936 t += _(b' (interrupted update)')
6936 elif len(parents) > 1:
6937 elif len(parents) > 1:
6937 t += _(b' (merge)')
6938 t += _(b' (merge)')
6938 elif branch != parents[0].branch():
6939 elif branch != parents[0].branch():
6939 t += _(b' (new branch)')
6940 t += _(b' (new branch)')
6940 elif parents[0].closesbranch() and pnode in repo.branchheads(
6941 elif parents[0].closesbranch() and pnode in repo.branchheads(
6941 branch, closed=True
6942 branch, closed=True
6942 ):
6943 ):
6943 t += _(b' (head closed)')
6944 t += _(b' (head closed)')
6944 elif not (
6945 elif not (
6945 status.modified
6946 status.modified
6946 or status.added
6947 or status.added
6947 or status.removed
6948 or status.removed
6948 or renamed
6949 or renamed
6949 or copied
6950 or copied
6950 or subs
6951 or subs
6951 ):
6952 ):
6952 t += _(b' (clean)')
6953 t += _(b' (clean)')
6953 cleanworkdir = True
6954 cleanworkdir = True
6954 elif pnode not in bheads:
6955 elif pnode not in bheads:
6955 t += _(b' (new branch head)')
6956 t += _(b' (new branch head)')
6956
6957
6957 if parents:
6958 if parents:
6958 pendingphase = max(p.phase() for p in parents)
6959 pendingphase = max(p.phase() for p in parents)
6959 else:
6960 else:
6960 pendingphase = phases.public
6961 pendingphase = phases.public
6961
6962
6962 if pendingphase > phases.newcommitphase(ui):
6963 if pendingphase > phases.newcommitphase(ui):
6963 t += b' (%s)' % phases.phasenames[pendingphase]
6964 t += b' (%s)' % phases.phasenames[pendingphase]
6964
6965
6965 if cleanworkdir:
6966 if cleanworkdir:
6966 # i18n: column positioning for "hg summary"
6967 # i18n: column positioning for "hg summary"
6967 ui.status(_(b'commit: %s\n') % t.strip())
6968 ui.status(_(b'commit: %s\n') % t.strip())
6968 else:
6969 else:
6969 # i18n: column positioning for "hg summary"
6970 # i18n: column positioning for "hg summary"
6970 ui.write(_(b'commit: %s\n') % t.strip())
6971 ui.write(_(b'commit: %s\n') % t.strip())
6971
6972
6972 # all ancestors of branch heads - all ancestors of parent = new csets
6973 # all ancestors of branch heads - all ancestors of parent = new csets
6973 new = len(
6974 new = len(
6974 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6975 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6975 )
6976 )
6976
6977
6977 if new == 0:
6978 if new == 0:
6978 # i18n: column positioning for "hg summary"
6979 # i18n: column positioning for "hg summary"
6979 ui.status(_(b'update: (current)\n'))
6980 ui.status(_(b'update: (current)\n'))
6980 elif pnode not in bheads:
6981 elif pnode not in bheads:
6981 # i18n: column positioning for "hg summary"
6982 # i18n: column positioning for "hg summary"
6982 ui.write(_(b'update: %d new changesets (update)\n') % new)
6983 ui.write(_(b'update: %d new changesets (update)\n') % new)
6983 else:
6984 else:
6984 # i18n: column positioning for "hg summary"
6985 # i18n: column positioning for "hg summary"
6985 ui.write(
6986 ui.write(
6986 _(b'update: %d new changesets, %d branch heads (merge)\n')
6987 _(b'update: %d new changesets, %d branch heads (merge)\n')
6987 % (new, len(bheads))
6988 % (new, len(bheads))
6988 )
6989 )
6989
6990
6990 t = []
6991 t = []
6991 draft = len(repo.revs(b'draft()'))
6992 draft = len(repo.revs(b'draft()'))
6992 if draft:
6993 if draft:
6993 t.append(_(b'%d draft') % draft)
6994 t.append(_(b'%d draft') % draft)
6994 secret = len(repo.revs(b'secret()'))
6995 secret = len(repo.revs(b'secret()'))
6995 if secret:
6996 if secret:
6996 t.append(_(b'%d secret') % secret)
6997 t.append(_(b'%d secret') % secret)
6997
6998
6998 if draft or secret:
6999 if draft or secret:
6999 ui.status(_(b'phases: %s\n') % b', '.join(t))
7000 ui.status(_(b'phases: %s\n') % b', '.join(t))
7000
7001
7001 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7002 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7002 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7003 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7003 numtrouble = len(repo.revs(trouble + b"()"))
7004 numtrouble = len(repo.revs(trouble + b"()"))
7004 # We write all the possibilities to ease translation
7005 # We write all the possibilities to ease translation
7005 troublemsg = {
7006 troublemsg = {
7006 b"orphan": _(b"orphan: %d changesets"),
7007 b"orphan": _(b"orphan: %d changesets"),
7007 b"contentdivergent": _(b"content-divergent: %d changesets"),
7008 b"contentdivergent": _(b"content-divergent: %d changesets"),
7008 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7009 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7009 }
7010 }
7010 if numtrouble > 0:
7011 if numtrouble > 0:
7011 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7012 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7012
7013
7013 cmdutil.summaryhooks(ui, repo)
7014 cmdutil.summaryhooks(ui, repo)
7014
7015
7015 if opts.get(b'remote'):
7016 if opts.get(b'remote'):
7016 needsincoming, needsoutgoing = True, True
7017 needsincoming, needsoutgoing = True, True
7017 else:
7018 else:
7018 needsincoming, needsoutgoing = False, False
7019 needsincoming, needsoutgoing = False, False
7019 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7020 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7020 if i:
7021 if i:
7021 needsincoming = True
7022 needsincoming = True
7022 if o:
7023 if o:
7023 needsoutgoing = True
7024 needsoutgoing = True
7024 if not needsincoming and not needsoutgoing:
7025 if not needsincoming and not needsoutgoing:
7025 return
7026 return
7026
7027
7027 def getincoming():
7028 def getincoming():
7028 source, branches = hg.parseurl(ui.expandpath(b'default'))
7029 source, branches = hg.parseurl(ui.expandpath(b'default'))
7029 sbranch = branches[0]
7030 sbranch = branches[0]
7030 try:
7031 try:
7031 other = hg.peer(repo, {}, source)
7032 other = hg.peer(repo, {}, source)
7032 except error.RepoError:
7033 except error.RepoError:
7033 if opts.get(b'remote'):
7034 if opts.get(b'remote'):
7034 raise
7035 raise
7035 return source, sbranch, None, None, None
7036 return source, sbranch, None, None, None
7036 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7037 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7037 if revs:
7038 if revs:
7038 revs = [other.lookup(rev) for rev in revs]
7039 revs = [other.lookup(rev) for rev in revs]
7039 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7040 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7040 repo.ui.pushbuffer()
7041 repo.ui.pushbuffer()
7041 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7042 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7042 repo.ui.popbuffer()
7043 repo.ui.popbuffer()
7043 return source, sbranch, other, commoninc, commoninc[1]
7044 return source, sbranch, other, commoninc, commoninc[1]
7044
7045
7045 if needsincoming:
7046 if needsincoming:
7046 source, sbranch, sother, commoninc, incoming = getincoming()
7047 source, sbranch, sother, commoninc, incoming = getincoming()
7047 else:
7048 else:
7048 source = sbranch = sother = commoninc = incoming = None
7049 source = sbranch = sother = commoninc = incoming = None
7049
7050
7050 def getoutgoing():
7051 def getoutgoing():
7051 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7052 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7052 dbranch = branches[0]
7053 dbranch = branches[0]
7053 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7054 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7054 if source != dest:
7055 if source != dest:
7055 try:
7056 try:
7056 dother = hg.peer(repo, {}, dest)
7057 dother = hg.peer(repo, {}, dest)
7057 except error.RepoError:
7058 except error.RepoError:
7058 if opts.get(b'remote'):
7059 if opts.get(b'remote'):
7059 raise
7060 raise
7060 return dest, dbranch, None, None
7061 return dest, dbranch, None, None
7061 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7062 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7062 elif sother is None:
7063 elif sother is None:
7063 # there is no explicit destination peer, but source one is invalid
7064 # there is no explicit destination peer, but source one is invalid
7064 return dest, dbranch, None, None
7065 return dest, dbranch, None, None
7065 else:
7066 else:
7066 dother = sother
7067 dother = sother
7067 if source != dest or (sbranch is not None and sbranch != dbranch):
7068 if source != dest or (sbranch is not None and sbranch != dbranch):
7068 common = None
7069 common = None
7069 else:
7070 else:
7070 common = commoninc
7071 common = commoninc
7071 if revs:
7072 if revs:
7072 revs = [repo.lookup(rev) for rev in revs]
7073 revs = [repo.lookup(rev) for rev in revs]
7073 repo.ui.pushbuffer()
7074 repo.ui.pushbuffer()
7074 outgoing = discovery.findcommonoutgoing(
7075 outgoing = discovery.findcommonoutgoing(
7075 repo, dother, onlyheads=revs, commoninc=common
7076 repo, dother, onlyheads=revs, commoninc=common
7076 )
7077 )
7077 repo.ui.popbuffer()
7078 repo.ui.popbuffer()
7078 return dest, dbranch, dother, outgoing
7079 return dest, dbranch, dother, outgoing
7079
7080
7080 if needsoutgoing:
7081 if needsoutgoing:
7081 dest, dbranch, dother, outgoing = getoutgoing()
7082 dest, dbranch, dother, outgoing = getoutgoing()
7082 else:
7083 else:
7083 dest = dbranch = dother = outgoing = None
7084 dest = dbranch = dother = outgoing = None
7084
7085
7085 if opts.get(b'remote'):
7086 if opts.get(b'remote'):
7086 t = []
7087 t = []
7087 if incoming:
7088 if incoming:
7088 t.append(_(b'1 or more incoming'))
7089 t.append(_(b'1 or more incoming'))
7089 o = outgoing.missing
7090 o = outgoing.missing
7090 if o:
7091 if o:
7091 t.append(_(b'%d outgoing') % len(o))
7092 t.append(_(b'%d outgoing') % len(o))
7092 other = dother or sother
7093 other = dother or sother
7093 if b'bookmarks' in other.listkeys(b'namespaces'):
7094 if b'bookmarks' in other.listkeys(b'namespaces'):
7094 counts = bookmarks.summary(repo, other)
7095 counts = bookmarks.summary(repo, other)
7095 if counts[0] > 0:
7096 if counts[0] > 0:
7096 t.append(_(b'%d incoming bookmarks') % counts[0])
7097 t.append(_(b'%d incoming bookmarks') % counts[0])
7097 if counts[1] > 0:
7098 if counts[1] > 0:
7098 t.append(_(b'%d outgoing bookmarks') % counts[1])
7099 t.append(_(b'%d outgoing bookmarks') % counts[1])
7099
7100
7100 if t:
7101 if t:
7101 # i18n: column positioning for "hg summary"
7102 # i18n: column positioning for "hg summary"
7102 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7103 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7103 else:
7104 else:
7104 # i18n: column positioning for "hg summary"
7105 # i18n: column positioning for "hg summary"
7105 ui.status(_(b'remote: (synced)\n'))
7106 ui.status(_(b'remote: (synced)\n'))
7106
7107
7107 cmdutil.summaryremotehooks(
7108 cmdutil.summaryremotehooks(
7108 ui,
7109 ui,
7109 repo,
7110 repo,
7110 opts,
7111 opts,
7111 (
7112 (
7112 (source, sbranch, sother, commoninc),
7113 (source, sbranch, sother, commoninc),
7113 (dest, dbranch, dother, outgoing),
7114 (dest, dbranch, dother, outgoing),
7114 ),
7115 ),
7115 )
7116 )
7116
7117
7117
7118
7118 @command(
7119 @command(
7119 b'tag',
7120 b'tag',
7120 [
7121 [
7121 (b'f', b'force', None, _(b'force tag')),
7122 (b'f', b'force', None, _(b'force tag')),
7122 (b'l', b'local', None, _(b'make the tag local')),
7123 (b'l', b'local', None, _(b'make the tag local')),
7123 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7124 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7124 (b'', b'remove', None, _(b'remove a tag')),
7125 (b'', b'remove', None, _(b'remove a tag')),
7125 # -l/--local is already there, commitopts cannot be used
7126 # -l/--local is already there, commitopts cannot be used
7126 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7127 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7127 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7128 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7128 ]
7129 ]
7129 + commitopts2,
7130 + commitopts2,
7130 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7131 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7131 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7132 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7132 )
7133 )
7133 def tag(ui, repo, name1, *names, **opts):
7134 def tag(ui, repo, name1, *names, **opts):
7134 """add one or more tags for the current or given revision
7135 """add one or more tags for the current or given revision
7135
7136
7136 Name a particular revision using <name>.
7137 Name a particular revision using <name>.
7137
7138
7138 Tags are used to name particular revisions of the repository and are
7139 Tags are used to name particular revisions of the repository and are
7139 very useful to compare different revisions, to go back to significant
7140 very useful to compare different revisions, to go back to significant
7140 earlier versions or to mark branch points as releases, etc. Changing
7141 earlier versions or to mark branch points as releases, etc. Changing
7141 an existing tag is normally disallowed; use -f/--force to override.
7142 an existing tag is normally disallowed; use -f/--force to override.
7142
7143
7143 If no revision is given, the parent of the working directory is
7144 If no revision is given, the parent of the working directory is
7144 used.
7145 used.
7145
7146
7146 To facilitate version control, distribution, and merging of tags,
7147 To facilitate version control, distribution, and merging of tags,
7147 they are stored as a file named ".hgtags" which is managed similarly
7148 they are stored as a file named ".hgtags" which is managed similarly
7148 to other project files and can be hand-edited if necessary. This
7149 to other project files and can be hand-edited if necessary. This
7149 also means that tagging creates a new commit. The file
7150 also means that tagging creates a new commit. The file
7150 ".hg/localtags" is used for local tags (not shared among
7151 ".hg/localtags" is used for local tags (not shared among
7151 repositories).
7152 repositories).
7152
7153
7153 Tag commits are usually made at the head of a branch. If the parent
7154 Tag commits are usually made at the head of a branch. If the parent
7154 of the working directory is not a branch head, :hg:`tag` aborts; use
7155 of the working directory is not a branch head, :hg:`tag` aborts; use
7155 -f/--force to force the tag commit to be based on a non-head
7156 -f/--force to force the tag commit to be based on a non-head
7156 changeset.
7157 changeset.
7157
7158
7158 See :hg:`help dates` for a list of formats valid for -d/--date.
7159 See :hg:`help dates` for a list of formats valid for -d/--date.
7159
7160
7160 Since tag names have priority over branch names during revision
7161 Since tag names have priority over branch names during revision
7161 lookup, using an existing branch name as a tag name is discouraged.
7162 lookup, using an existing branch name as a tag name is discouraged.
7162
7163
7163 Returns 0 on success.
7164 Returns 0 on success.
7164 """
7165 """
7165 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7166 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7166 opts = pycompat.byteskwargs(opts)
7167 opts = pycompat.byteskwargs(opts)
7167 with repo.wlock(), repo.lock():
7168 with repo.wlock(), repo.lock():
7168 rev_ = b"."
7169 rev_ = b"."
7169 names = [t.strip() for t in (name1,) + names]
7170 names = [t.strip() for t in (name1,) + names]
7170 if len(names) != len(set(names)):
7171 if len(names) != len(set(names)):
7171 raise error.InputError(_(b'tag names must be unique'))
7172 raise error.InputError(_(b'tag names must be unique'))
7172 for n in names:
7173 for n in names:
7173 scmutil.checknewlabel(repo, n, b'tag')
7174 scmutil.checknewlabel(repo, n, b'tag')
7174 if not n:
7175 if not n:
7175 raise error.InputError(
7176 raise error.InputError(
7176 _(b'tag names cannot consist entirely of whitespace')
7177 _(b'tag names cannot consist entirely of whitespace')
7177 )
7178 )
7178 if opts.get(b'rev'):
7179 if opts.get(b'rev'):
7179 rev_ = opts[b'rev']
7180 rev_ = opts[b'rev']
7180 message = opts.get(b'message')
7181 message = opts.get(b'message')
7181 if opts.get(b'remove'):
7182 if opts.get(b'remove'):
7182 if opts.get(b'local'):
7183 if opts.get(b'local'):
7183 expectedtype = b'local'
7184 expectedtype = b'local'
7184 else:
7185 else:
7185 expectedtype = b'global'
7186 expectedtype = b'global'
7186
7187
7187 for n in names:
7188 for n in names:
7188 if repo.tagtype(n) == b'global':
7189 if repo.tagtype(n) == b'global':
7189 alltags = tagsmod.findglobaltags(ui, repo)
7190 alltags = tagsmod.findglobaltags(ui, repo)
7190 if alltags[n][0] == nullid:
7191 if alltags[n][0] == nullid:
7191 raise error.InputError(
7192 raise error.InputError(
7192 _(b"tag '%s' is already removed") % n
7193 _(b"tag '%s' is already removed") % n
7193 )
7194 )
7194 if not repo.tagtype(n):
7195 if not repo.tagtype(n):
7195 raise error.InputError(_(b"tag '%s' does not exist") % n)
7196 raise error.InputError(_(b"tag '%s' does not exist") % n)
7196 if repo.tagtype(n) != expectedtype:
7197 if repo.tagtype(n) != expectedtype:
7197 if expectedtype == b'global':
7198 if expectedtype == b'global':
7198 raise error.InputError(
7199 raise error.InputError(
7199 _(b"tag '%s' is not a global tag") % n
7200 _(b"tag '%s' is not a global tag") % n
7200 )
7201 )
7201 else:
7202 else:
7202 raise error.InputError(
7203 raise error.InputError(
7203 _(b"tag '%s' is not a local tag") % n
7204 _(b"tag '%s' is not a local tag") % n
7204 )
7205 )
7205 rev_ = b'null'
7206 rev_ = b'null'
7206 if not message:
7207 if not message:
7207 # we don't translate commit messages
7208 # we don't translate commit messages
7208 message = b'Removed tag %s' % b', '.join(names)
7209 message = b'Removed tag %s' % b', '.join(names)
7209 elif not opts.get(b'force'):
7210 elif not opts.get(b'force'):
7210 for n in names:
7211 for n in names:
7211 if n in repo.tags():
7212 if n in repo.tags():
7212 raise error.InputError(
7213 raise error.InputError(
7213 _(b"tag '%s' already exists (use -f to force)") % n
7214 _(b"tag '%s' already exists (use -f to force)") % n
7214 )
7215 )
7215 if not opts.get(b'local'):
7216 if not opts.get(b'local'):
7216 p1, p2 = repo.dirstate.parents()
7217 p1, p2 = repo.dirstate.parents()
7217 if p2 != nullid:
7218 if p2 != nullid:
7218 raise error.StateError(_(b'uncommitted merge'))
7219 raise error.StateError(_(b'uncommitted merge'))
7219 bheads = repo.branchheads()
7220 bheads = repo.branchheads()
7220 if not opts.get(b'force') and bheads and p1 not in bheads:
7221 if not opts.get(b'force') and bheads and p1 not in bheads:
7221 raise error.InputError(
7222 raise error.InputError(
7222 _(
7223 _(
7223 b'working directory is not at a branch head '
7224 b'working directory is not at a branch head '
7224 b'(use -f to force)'
7225 b'(use -f to force)'
7225 )
7226 )
7226 )
7227 )
7227 node = scmutil.revsingle(repo, rev_).node()
7228 node = scmutil.revsingle(repo, rev_).node()
7228
7229
7229 if not message:
7230 if not message:
7230 # we don't translate commit messages
7231 # we don't translate commit messages
7231 message = b'Added tag %s for changeset %s' % (
7232 message = b'Added tag %s for changeset %s' % (
7232 b', '.join(names),
7233 b', '.join(names),
7233 short(node),
7234 short(node),
7234 )
7235 )
7235
7236
7236 date = opts.get(b'date')
7237 date = opts.get(b'date')
7237 if date:
7238 if date:
7238 date = dateutil.parsedate(date)
7239 date = dateutil.parsedate(date)
7239
7240
7240 if opts.get(b'remove'):
7241 if opts.get(b'remove'):
7241 editform = b'tag.remove'
7242 editform = b'tag.remove'
7242 else:
7243 else:
7243 editform = b'tag.add'
7244 editform = b'tag.add'
7244 editor = cmdutil.getcommiteditor(
7245 editor = cmdutil.getcommiteditor(
7245 editform=editform, **pycompat.strkwargs(opts)
7246 editform=editform, **pycompat.strkwargs(opts)
7246 )
7247 )
7247
7248
7248 # don't allow tagging the null rev
7249 # don't allow tagging the null rev
7249 if (
7250 if (
7250 not opts.get(b'remove')
7251 not opts.get(b'remove')
7251 and scmutil.revsingle(repo, rev_).rev() == nullrev
7252 and scmutil.revsingle(repo, rev_).rev() == nullrev
7252 ):
7253 ):
7253 raise error.InputError(_(b"cannot tag null revision"))
7254 raise error.InputError(_(b"cannot tag null revision"))
7254
7255
7255 tagsmod.tag(
7256 tagsmod.tag(
7256 repo,
7257 repo,
7257 names,
7258 names,
7258 node,
7259 node,
7259 message,
7260 message,
7260 opts.get(b'local'),
7261 opts.get(b'local'),
7261 opts.get(b'user'),
7262 opts.get(b'user'),
7262 date,
7263 date,
7263 editor=editor,
7264 editor=editor,
7264 )
7265 )
7265
7266
7266
7267
7267 @command(
7268 @command(
7268 b'tags',
7269 b'tags',
7269 formatteropts,
7270 formatteropts,
7270 b'',
7271 b'',
7271 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7272 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7272 intents={INTENT_READONLY},
7273 intents={INTENT_READONLY},
7273 )
7274 )
7274 def tags(ui, repo, **opts):
7275 def tags(ui, repo, **opts):
7275 """list repository tags
7276 """list repository tags
7276
7277
7277 This lists both regular and local tags. When the -v/--verbose
7278 This lists both regular and local tags. When the -v/--verbose
7278 switch is used, a third column "local" is printed for local tags.
7279 switch is used, a third column "local" is printed for local tags.
7279 When the -q/--quiet switch is used, only the tag name is printed.
7280 When the -q/--quiet switch is used, only the tag name is printed.
7280
7281
7281 .. container:: verbose
7282 .. container:: verbose
7282
7283
7283 Template:
7284 Template:
7284
7285
7285 The following keywords are supported in addition to the common template
7286 The following keywords are supported in addition to the common template
7286 keywords and functions such as ``{tag}``. See also
7287 keywords and functions such as ``{tag}``. See also
7287 :hg:`help templates`.
7288 :hg:`help templates`.
7288
7289
7289 :type: String. ``local`` for local tags.
7290 :type: String. ``local`` for local tags.
7290
7291
7291 Returns 0 on success.
7292 Returns 0 on success.
7292 """
7293 """
7293
7294
7294 opts = pycompat.byteskwargs(opts)
7295 opts = pycompat.byteskwargs(opts)
7295 ui.pager(b'tags')
7296 ui.pager(b'tags')
7296 fm = ui.formatter(b'tags', opts)
7297 fm = ui.formatter(b'tags', opts)
7297 hexfunc = fm.hexfunc
7298 hexfunc = fm.hexfunc
7298
7299
7299 for t, n in reversed(repo.tagslist()):
7300 for t, n in reversed(repo.tagslist()):
7300 hn = hexfunc(n)
7301 hn = hexfunc(n)
7301 label = b'tags.normal'
7302 label = b'tags.normal'
7302 tagtype = b''
7303 tagtype = b''
7303 if repo.tagtype(t) == b'local':
7304 if repo.tagtype(t) == b'local':
7304 label = b'tags.local'
7305 label = b'tags.local'
7305 tagtype = b'local'
7306 tagtype = b'local'
7306
7307
7307 fm.startitem()
7308 fm.startitem()
7308 fm.context(repo=repo)
7309 fm.context(repo=repo)
7309 fm.write(b'tag', b'%s', t, label=label)
7310 fm.write(b'tag', b'%s', t, label=label)
7310 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7311 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7311 fm.condwrite(
7312 fm.condwrite(
7312 not ui.quiet,
7313 not ui.quiet,
7313 b'rev node',
7314 b'rev node',
7314 fmt,
7315 fmt,
7315 repo.changelog.rev(n),
7316 repo.changelog.rev(n),
7316 hn,
7317 hn,
7317 label=label,
7318 label=label,
7318 )
7319 )
7319 fm.condwrite(
7320 fm.condwrite(
7320 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7321 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7321 )
7322 )
7322 fm.plain(b'\n')
7323 fm.plain(b'\n')
7323 fm.end()
7324 fm.end()
7324
7325
7325
7326
7326 @command(
7327 @command(
7327 b'tip',
7328 b'tip',
7328 [
7329 [
7329 (b'p', b'patch', None, _(b'show patch')),
7330 (b'p', b'patch', None, _(b'show patch')),
7330 (b'g', b'git', None, _(b'use git extended diff format')),
7331 (b'g', b'git', None, _(b'use git extended diff format')),
7331 ]
7332 ]
7332 + templateopts,
7333 + templateopts,
7333 _(b'[-p] [-g]'),
7334 _(b'[-p] [-g]'),
7334 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7335 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7335 )
7336 )
7336 def tip(ui, repo, **opts):
7337 def tip(ui, repo, **opts):
7337 """show the tip revision (DEPRECATED)
7338 """show the tip revision (DEPRECATED)
7338
7339
7339 The tip revision (usually just called the tip) is the changeset
7340 The tip revision (usually just called the tip) is the changeset
7340 most recently added to the repository (and therefore the most
7341 most recently added to the repository (and therefore the most
7341 recently changed head).
7342 recently changed head).
7342
7343
7343 If you have just made a commit, that commit will be the tip. If
7344 If you have just made a commit, that commit will be the tip. If
7344 you have just pulled changes from another repository, the tip of
7345 you have just pulled changes from another repository, the tip of
7345 that repository becomes the current tip. The "tip" tag is special
7346 that repository becomes the current tip. The "tip" tag is special
7346 and cannot be renamed or assigned to a different changeset.
7347 and cannot be renamed or assigned to a different changeset.
7347
7348
7348 This command is deprecated, please use :hg:`heads` instead.
7349 This command is deprecated, please use :hg:`heads` instead.
7349
7350
7350 Returns 0 on success.
7351 Returns 0 on success.
7351 """
7352 """
7352 opts = pycompat.byteskwargs(opts)
7353 opts = pycompat.byteskwargs(opts)
7353 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7354 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7354 displayer.show(repo[b'tip'])
7355 displayer.show(repo[b'tip'])
7355 displayer.close()
7356 displayer.close()
7356
7357
7357
7358
7358 @command(
7359 @command(
7359 b'unbundle',
7360 b'unbundle',
7360 [
7361 [
7361 (
7362 (
7362 b'u',
7363 b'u',
7363 b'update',
7364 b'update',
7364 None,
7365 None,
7365 _(b'update to new branch head if changesets were unbundled'),
7366 _(b'update to new branch head if changesets were unbundled'),
7366 )
7367 )
7367 ],
7368 ],
7368 _(b'[-u] FILE...'),
7369 _(b'[-u] FILE...'),
7369 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7370 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7370 )
7371 )
7371 def unbundle(ui, repo, fname1, *fnames, **opts):
7372 def unbundle(ui, repo, fname1, *fnames, **opts):
7372 """apply one or more bundle files
7373 """apply one or more bundle files
7373
7374
7374 Apply one or more bundle files generated by :hg:`bundle`.
7375 Apply one or more bundle files generated by :hg:`bundle`.
7375
7376
7376 Returns 0 on success, 1 if an update has unresolved files.
7377 Returns 0 on success, 1 if an update has unresolved files.
7377 """
7378 """
7378 fnames = (fname1,) + fnames
7379 fnames = (fname1,) + fnames
7379
7380
7380 with repo.lock():
7381 with repo.lock():
7381 for fname in fnames:
7382 for fname in fnames:
7382 f = hg.openpath(ui, fname)
7383 f = hg.openpath(ui, fname)
7383 gen = exchange.readbundle(ui, f, fname)
7384 gen = exchange.readbundle(ui, f, fname)
7384 if isinstance(gen, streamclone.streamcloneapplier):
7385 if isinstance(gen, streamclone.streamcloneapplier):
7385 raise error.InputError(
7386 raise error.InputError(
7386 _(
7387 _(
7387 b'packed bundles cannot be applied with '
7388 b'packed bundles cannot be applied with '
7388 b'"hg unbundle"'
7389 b'"hg unbundle"'
7389 ),
7390 ),
7390 hint=_(b'use "hg debugapplystreamclonebundle"'),
7391 hint=_(b'use "hg debugapplystreamclonebundle"'),
7391 )
7392 )
7392 url = b'bundle:' + fname
7393 url = b'bundle:' + fname
7393 try:
7394 try:
7394 txnname = b'unbundle'
7395 txnname = b'unbundle'
7395 if not isinstance(gen, bundle2.unbundle20):
7396 if not isinstance(gen, bundle2.unbundle20):
7396 txnname = b'unbundle\n%s' % util.hidepassword(url)
7397 txnname = b'unbundle\n%s' % util.hidepassword(url)
7397 with repo.transaction(txnname) as tr:
7398 with repo.transaction(txnname) as tr:
7398 op = bundle2.applybundle(
7399 op = bundle2.applybundle(
7399 repo, gen, tr, source=b'unbundle', url=url
7400 repo, gen, tr, source=b'unbundle', url=url
7400 )
7401 )
7401 except error.BundleUnknownFeatureError as exc:
7402 except error.BundleUnknownFeatureError as exc:
7402 raise error.Abort(
7403 raise error.Abort(
7403 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7404 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7404 hint=_(
7405 hint=_(
7405 b"see https://mercurial-scm.org/"
7406 b"see https://mercurial-scm.org/"
7406 b"wiki/BundleFeature for more "
7407 b"wiki/BundleFeature for more "
7407 b"information"
7408 b"information"
7408 ),
7409 ),
7409 )
7410 )
7410 modheads = bundle2.combinechangegroupresults(op)
7411 modheads = bundle2.combinechangegroupresults(op)
7411
7412
7412 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7413 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7413
7414
7414
7415
7415 @command(
7416 @command(
7416 b'unshelve',
7417 b'unshelve',
7417 [
7418 [
7418 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7419 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7419 (
7420 (
7420 b'c',
7421 b'c',
7421 b'continue',
7422 b'continue',
7422 None,
7423 None,
7423 _(b'continue an incomplete unshelve operation'),
7424 _(b'continue an incomplete unshelve operation'),
7424 ),
7425 ),
7425 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7426 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7426 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7427 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7427 (
7428 (
7428 b'n',
7429 b'n',
7429 b'name',
7430 b'name',
7430 b'',
7431 b'',
7431 _(b'restore shelved change with given name'),
7432 _(b'restore shelved change with given name'),
7432 _(b'NAME'),
7433 _(b'NAME'),
7433 ),
7434 ),
7434 (b't', b'tool', b'', _(b'specify merge tool')),
7435 (b't', b'tool', b'', _(b'specify merge tool')),
7435 (
7436 (
7436 b'',
7437 b'',
7437 b'date',
7438 b'date',
7438 b'',
7439 b'',
7439 _(b'set date for temporary commits (DEPRECATED)'),
7440 _(b'set date for temporary commits (DEPRECATED)'),
7440 _(b'DATE'),
7441 _(b'DATE'),
7441 ),
7442 ),
7442 ],
7443 ],
7443 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7444 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7444 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7445 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7445 )
7446 )
7446 def unshelve(ui, repo, *shelved, **opts):
7447 def unshelve(ui, repo, *shelved, **opts):
7447 """restore a shelved change to the working directory
7448 """restore a shelved change to the working directory
7448
7449
7449 This command accepts an optional name of a shelved change to
7450 This command accepts an optional name of a shelved change to
7450 restore. If none is given, the most recent shelved change is used.
7451 restore. If none is given, the most recent shelved change is used.
7451
7452
7452 If a shelved change is applied successfully, the bundle that
7453 If a shelved change is applied successfully, the bundle that
7453 contains the shelved changes is moved to a backup location
7454 contains the shelved changes is moved to a backup location
7454 (.hg/shelve-backup).
7455 (.hg/shelve-backup).
7455
7456
7456 Since you can restore a shelved change on top of an arbitrary
7457 Since you can restore a shelved change on top of an arbitrary
7457 commit, it is possible that unshelving will result in a conflict
7458 commit, it is possible that unshelving will result in a conflict
7458 between your changes and the commits you are unshelving onto. If
7459 between your changes and the commits you are unshelving onto. If
7459 this occurs, you must resolve the conflict, then use
7460 this occurs, you must resolve the conflict, then use
7460 ``--continue`` to complete the unshelve operation. (The bundle
7461 ``--continue`` to complete the unshelve operation. (The bundle
7461 will not be moved until you successfully complete the unshelve.)
7462 will not be moved until you successfully complete the unshelve.)
7462
7463
7463 (Alternatively, you can use ``--abort`` to abandon an unshelve
7464 (Alternatively, you can use ``--abort`` to abandon an unshelve
7464 that causes a conflict. This reverts the unshelved changes, and
7465 that causes a conflict. This reverts the unshelved changes, and
7465 leaves the bundle in place.)
7466 leaves the bundle in place.)
7466
7467
7467 If bare shelved change (without interactive, include and exclude
7468 If bare shelved change (without interactive, include and exclude
7468 option) was done on newly created branch it would restore branch
7469 option) was done on newly created branch it would restore branch
7469 information to the working directory.
7470 information to the working directory.
7470
7471
7471 After a successful unshelve, the shelved changes are stored in a
7472 After a successful unshelve, the shelved changes are stored in a
7472 backup directory. Only the N most recent backups are kept. N
7473 backup directory. Only the N most recent backups are kept. N
7473 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7474 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7474 configuration option.
7475 configuration option.
7475
7476
7476 .. container:: verbose
7477 .. container:: verbose
7477
7478
7478 Timestamp in seconds is used to decide order of backups. More
7479 Timestamp in seconds is used to decide order of backups. More
7479 than ``maxbackups`` backups are kept, if same timestamp
7480 than ``maxbackups`` backups are kept, if same timestamp
7480 prevents from deciding exact order of them, for safety.
7481 prevents from deciding exact order of them, for safety.
7481
7482
7482 Selected changes can be unshelved with ``--interactive`` flag.
7483 Selected changes can be unshelved with ``--interactive`` flag.
7483 The working directory is updated with the selected changes, and
7484 The working directory is updated with the selected changes, and
7484 only the unselected changes remain shelved.
7485 only the unselected changes remain shelved.
7485 Note: The whole shelve is applied to working directory first before
7486 Note: The whole shelve is applied to working directory first before
7486 running interactively. So, this will bring up all the conflicts between
7487 running interactively. So, this will bring up all the conflicts between
7487 working directory and the shelve, irrespective of which changes will be
7488 working directory and the shelve, irrespective of which changes will be
7488 unshelved.
7489 unshelved.
7489 """
7490 """
7490 with repo.wlock():
7491 with repo.wlock():
7491 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7492 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7492
7493
7493
7494
7494 statemod.addunfinished(
7495 statemod.addunfinished(
7495 b'unshelve',
7496 b'unshelve',
7496 fname=b'shelvedstate',
7497 fname=b'shelvedstate',
7497 continueflag=True,
7498 continueflag=True,
7498 abortfunc=shelvemod.hgabortunshelve,
7499 abortfunc=shelvemod.hgabortunshelve,
7499 continuefunc=shelvemod.hgcontinueunshelve,
7500 continuefunc=shelvemod.hgcontinueunshelve,
7500 cmdmsg=_(b'unshelve already in progress'),
7501 cmdmsg=_(b'unshelve already in progress'),
7501 )
7502 )
7502
7503
7503
7504
7504 @command(
7505 @command(
7505 b'update|up|checkout|co',
7506 b'update|up|checkout|co',
7506 [
7507 [
7507 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7508 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7508 (b'c', b'check', None, _(b'require clean working directory')),
7509 (b'c', b'check', None, _(b'require clean working directory')),
7509 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7510 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7510 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7511 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7511 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7512 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7512 ]
7513 ]
7513 + mergetoolopts,
7514 + mergetoolopts,
7514 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7515 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7515 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7516 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7516 helpbasic=True,
7517 helpbasic=True,
7517 )
7518 )
7518 def update(ui, repo, node=None, **opts):
7519 def update(ui, repo, node=None, **opts):
7519 """update working directory (or switch revisions)
7520 """update working directory (or switch revisions)
7520
7521
7521 Update the repository's working directory to the specified
7522 Update the repository's working directory to the specified
7522 changeset. If no changeset is specified, update to the tip of the
7523 changeset. If no changeset is specified, update to the tip of the
7523 current named branch and move the active bookmark (see :hg:`help
7524 current named branch and move the active bookmark (see :hg:`help
7524 bookmarks`).
7525 bookmarks`).
7525
7526
7526 Update sets the working directory's parent revision to the specified
7527 Update sets the working directory's parent revision to the specified
7527 changeset (see :hg:`help parents`).
7528 changeset (see :hg:`help parents`).
7528
7529
7529 If the changeset is not a descendant or ancestor of the working
7530 If the changeset is not a descendant or ancestor of the working
7530 directory's parent and there are uncommitted changes, the update is
7531 directory's parent and there are uncommitted changes, the update is
7531 aborted. With the -c/--check option, the working directory is checked
7532 aborted. With the -c/--check option, the working directory is checked
7532 for uncommitted changes; if none are found, the working directory is
7533 for uncommitted changes; if none are found, the working directory is
7533 updated to the specified changeset.
7534 updated to the specified changeset.
7534
7535
7535 .. container:: verbose
7536 .. container:: verbose
7536
7537
7537 The -C/--clean, -c/--check, and -m/--merge options control what
7538 The -C/--clean, -c/--check, and -m/--merge options control what
7538 happens if the working directory contains uncommitted changes.
7539 happens if the working directory contains uncommitted changes.
7539 At most of one of them can be specified.
7540 At most of one of them can be specified.
7540
7541
7541 1. If no option is specified, and if
7542 1. If no option is specified, and if
7542 the requested changeset is an ancestor or descendant of
7543 the requested changeset is an ancestor or descendant of
7543 the working directory's parent, the uncommitted changes
7544 the working directory's parent, the uncommitted changes
7544 are merged into the requested changeset and the merged
7545 are merged into the requested changeset and the merged
7545 result is left uncommitted. If the requested changeset is
7546 result is left uncommitted. If the requested changeset is
7546 not an ancestor or descendant (that is, it is on another
7547 not an ancestor or descendant (that is, it is on another
7547 branch), the update is aborted and the uncommitted changes
7548 branch), the update is aborted and the uncommitted changes
7548 are preserved.
7549 are preserved.
7549
7550
7550 2. With the -m/--merge option, the update is allowed even if the
7551 2. With the -m/--merge option, the update is allowed even if the
7551 requested changeset is not an ancestor or descendant of
7552 requested changeset is not an ancestor or descendant of
7552 the working directory's parent.
7553 the working directory's parent.
7553
7554
7554 3. With the -c/--check option, the update is aborted and the
7555 3. With the -c/--check option, the update is aborted and the
7555 uncommitted changes are preserved.
7556 uncommitted changes are preserved.
7556
7557
7557 4. With the -C/--clean option, uncommitted changes are discarded and
7558 4. With the -C/--clean option, uncommitted changes are discarded and
7558 the working directory is updated to the requested changeset.
7559 the working directory is updated to the requested changeset.
7559
7560
7560 To cancel an uncommitted merge (and lose your changes), use
7561 To cancel an uncommitted merge (and lose your changes), use
7561 :hg:`merge --abort`.
7562 :hg:`merge --abort`.
7562
7563
7563 Use null as the changeset to remove the working directory (like
7564 Use null as the changeset to remove the working directory (like
7564 :hg:`clone -U`).
7565 :hg:`clone -U`).
7565
7566
7566 If you want to revert just one file to an older revision, use
7567 If you want to revert just one file to an older revision, use
7567 :hg:`revert [-r REV] NAME`.
7568 :hg:`revert [-r REV] NAME`.
7568
7569
7569 See :hg:`help dates` for a list of formats valid for -d/--date.
7570 See :hg:`help dates` for a list of formats valid for -d/--date.
7570
7571
7571 Returns 0 on success, 1 if there are unresolved files.
7572 Returns 0 on success, 1 if there are unresolved files.
7572 """
7573 """
7573 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7574 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7574 rev = opts.get('rev')
7575 rev = opts.get('rev')
7575 date = opts.get('date')
7576 date = opts.get('date')
7576 clean = opts.get('clean')
7577 clean = opts.get('clean')
7577 check = opts.get('check')
7578 check = opts.get('check')
7578 merge = opts.get('merge')
7579 merge = opts.get('merge')
7579 if rev and node:
7580 if rev and node:
7580 raise error.InputError(_(b"please specify just one revision"))
7581 raise error.InputError(_(b"please specify just one revision"))
7581
7582
7582 if ui.configbool(b'commands', b'update.requiredest'):
7583 if ui.configbool(b'commands', b'update.requiredest'):
7583 if not node and not rev and not date:
7584 if not node and not rev and not date:
7584 raise error.InputError(
7585 raise error.InputError(
7585 _(b'you must specify a destination'),
7586 _(b'you must specify a destination'),
7586 hint=_(b'for example: hg update ".::"'),
7587 hint=_(b'for example: hg update ".::"'),
7587 )
7588 )
7588
7589
7589 if rev is None or rev == b'':
7590 if rev is None or rev == b'':
7590 rev = node
7591 rev = node
7591
7592
7592 if date and rev is not None:
7593 if date and rev is not None:
7593 raise error.InputError(_(b"you can't specify a revision and a date"))
7594 raise error.InputError(_(b"you can't specify a revision and a date"))
7594
7595
7595 updatecheck = None
7596 updatecheck = None
7596 if check:
7597 if check:
7597 updatecheck = b'abort'
7598 updatecheck = b'abort'
7598 elif merge:
7599 elif merge:
7599 updatecheck = b'none'
7600 updatecheck = b'none'
7600
7601
7601 with repo.wlock():
7602 with repo.wlock():
7602 cmdutil.clearunfinished(repo)
7603 cmdutil.clearunfinished(repo)
7603 if date:
7604 if date:
7604 rev = cmdutil.finddate(ui, repo, date)
7605 rev = cmdutil.finddate(ui, repo, date)
7605
7606
7606 # if we defined a bookmark, we have to remember the original name
7607 # if we defined a bookmark, we have to remember the original name
7607 brev = rev
7608 brev = rev
7608 if rev:
7609 if rev:
7609 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7610 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7610 ctx = scmutil.revsingle(repo, rev, default=None)
7611 ctx = scmutil.revsingle(repo, rev, default=None)
7611 rev = ctx.rev()
7612 rev = ctx.rev()
7612 hidden = ctx.hidden()
7613 hidden = ctx.hidden()
7613 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7614 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7614 with ui.configoverride(overrides, b'update'):
7615 with ui.configoverride(overrides, b'update'):
7615 ret = hg.updatetotally(
7616 ret = hg.updatetotally(
7616 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7617 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7617 )
7618 )
7618 if hidden:
7619 if hidden:
7619 ctxstr = ctx.hex()[:12]
7620 ctxstr = ctx.hex()[:12]
7620 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7621 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7621
7622
7622 if ctx.obsolete():
7623 if ctx.obsolete():
7623 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7624 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7624 ui.warn(b"(%s)\n" % obsfatemsg)
7625 ui.warn(b"(%s)\n" % obsfatemsg)
7625 return ret
7626 return ret
7626
7627
7627
7628
7628 @command(
7629 @command(
7629 b'verify',
7630 b'verify',
7630 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7631 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7631 helpcategory=command.CATEGORY_MAINTENANCE,
7632 helpcategory=command.CATEGORY_MAINTENANCE,
7632 )
7633 )
7633 def verify(ui, repo, **opts):
7634 def verify(ui, repo, **opts):
7634 """verify the integrity of the repository
7635 """verify the integrity of the repository
7635
7636
7636 Verify the integrity of the current repository.
7637 Verify the integrity of the current repository.
7637
7638
7638 This will perform an extensive check of the repository's
7639 This will perform an extensive check of the repository's
7639 integrity, validating the hashes and checksums of each entry in
7640 integrity, validating the hashes and checksums of each entry in
7640 the changelog, manifest, and tracked files, as well as the
7641 the changelog, manifest, and tracked files, as well as the
7641 integrity of their crosslinks and indices.
7642 integrity of their crosslinks and indices.
7642
7643
7643 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7644 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7644 for more information about recovery from corruption of the
7645 for more information about recovery from corruption of the
7645 repository.
7646 repository.
7646
7647
7647 Returns 0 on success, 1 if errors are encountered.
7648 Returns 0 on success, 1 if errors are encountered.
7648 """
7649 """
7649 opts = pycompat.byteskwargs(opts)
7650 opts = pycompat.byteskwargs(opts)
7650
7651
7651 level = None
7652 level = None
7652 if opts[b'full']:
7653 if opts[b'full']:
7653 level = verifymod.VERIFY_FULL
7654 level = verifymod.VERIFY_FULL
7654 return hg.verify(repo, level)
7655 return hg.verify(repo, level)
7655
7656
7656
7657
7657 @command(
7658 @command(
7658 b'version',
7659 b'version',
7659 [] + formatteropts,
7660 [] + formatteropts,
7660 helpcategory=command.CATEGORY_HELP,
7661 helpcategory=command.CATEGORY_HELP,
7661 norepo=True,
7662 norepo=True,
7662 intents={INTENT_READONLY},
7663 intents={INTENT_READONLY},
7663 )
7664 )
7664 def version_(ui, **opts):
7665 def version_(ui, **opts):
7665 """output version and copyright information
7666 """output version and copyright information
7666
7667
7667 .. container:: verbose
7668 .. container:: verbose
7668
7669
7669 Template:
7670 Template:
7670
7671
7671 The following keywords are supported. See also :hg:`help templates`.
7672 The following keywords are supported. See also :hg:`help templates`.
7672
7673
7673 :extensions: List of extensions.
7674 :extensions: List of extensions.
7674 :ver: String. Version number.
7675 :ver: String. Version number.
7675
7676
7676 And each entry of ``{extensions}`` provides the following sub-keywords
7677 And each entry of ``{extensions}`` provides the following sub-keywords
7677 in addition to ``{ver}``.
7678 in addition to ``{ver}``.
7678
7679
7679 :bundled: Boolean. True if included in the release.
7680 :bundled: Boolean. True if included in the release.
7680 :name: String. Extension name.
7681 :name: String. Extension name.
7681 """
7682 """
7682 opts = pycompat.byteskwargs(opts)
7683 opts = pycompat.byteskwargs(opts)
7683 if ui.verbose:
7684 if ui.verbose:
7684 ui.pager(b'version')
7685 ui.pager(b'version')
7685 fm = ui.formatter(b"version", opts)
7686 fm = ui.formatter(b"version", opts)
7686 fm.startitem()
7687 fm.startitem()
7687 fm.write(
7688 fm.write(
7688 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7689 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7689 )
7690 )
7690 license = _(
7691 license = _(
7691 b"(see https://mercurial-scm.org for more information)\n"
7692 b"(see https://mercurial-scm.org for more information)\n"
7692 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7693 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7693 b"This is free software; see the source for copying conditions. "
7694 b"This is free software; see the source for copying conditions. "
7694 b"There is NO\nwarranty; "
7695 b"There is NO\nwarranty; "
7695 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7696 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7696 )
7697 )
7697 if not ui.quiet:
7698 if not ui.quiet:
7698 fm.plain(license)
7699 fm.plain(license)
7699
7700
7700 if ui.verbose:
7701 if ui.verbose:
7701 fm.plain(_(b"\nEnabled extensions:\n\n"))
7702 fm.plain(_(b"\nEnabled extensions:\n\n"))
7702 # format names and versions into columns
7703 # format names and versions into columns
7703 names = []
7704 names = []
7704 vers = []
7705 vers = []
7705 isinternals = []
7706 isinternals = []
7706 for name, module in sorted(extensions.extensions()):
7707 for name, module in sorted(extensions.extensions()):
7707 names.append(name)
7708 names.append(name)
7708 vers.append(extensions.moduleversion(module) or None)
7709 vers.append(extensions.moduleversion(module) or None)
7709 isinternals.append(extensions.ismoduleinternal(module))
7710 isinternals.append(extensions.ismoduleinternal(module))
7710 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7711 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7711 if names:
7712 if names:
7712 namefmt = b" %%-%ds " % max(len(n) for n in names)
7713 namefmt = b" %%-%ds " % max(len(n) for n in names)
7713 places = [_(b"external"), _(b"internal")]
7714 places = [_(b"external"), _(b"internal")]
7714 for n, v, p in zip(names, vers, isinternals):
7715 for n, v, p in zip(names, vers, isinternals):
7715 fn.startitem()
7716 fn.startitem()
7716 fn.condwrite(ui.verbose, b"name", namefmt, n)
7717 fn.condwrite(ui.verbose, b"name", namefmt, n)
7717 if ui.verbose:
7718 if ui.verbose:
7718 fn.plain(b"%s " % places[p])
7719 fn.plain(b"%s " % places[p])
7719 fn.data(bundled=p)
7720 fn.data(bundled=p)
7720 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7721 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7721 if ui.verbose:
7722 if ui.verbose:
7722 fn.plain(b"\n")
7723 fn.plain(b"\n")
7723 fn.end()
7724 fn.end()
7724 fm.end()
7725 fm.end()
7725
7726
7726
7727
7727 def loadcmdtable(ui, name, cmdtable):
7728 def loadcmdtable(ui, name, cmdtable):
7728 """Load command functions from specified cmdtable"""
7729 """Load command functions from specified cmdtable"""
7729 overrides = [cmd for cmd in cmdtable if cmd in table]
7730 overrides = [cmd for cmd in cmdtable if cmd in table]
7730 if overrides:
7731 if overrides:
7731 ui.warn(
7732 ui.warn(
7732 _(b"extension '%s' overrides commands: %s\n")
7733 _(b"extension '%s' overrides commands: %s\n")
7733 % (name, b" ".join(overrides))
7734 % (name, b" ".join(overrides))
7734 )
7735 )
7735 table.update(cmdtable)
7736 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now