##// END OF EJS Templates
commands: use any() instead of `if a or b or c`...
marmoute -
r45680:44d5233e default
parent child Browse files
Show More
@@ -1,7842 +1,7843 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 difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 mergestate as mergestatemod,
49 mergestate as mergestatemod,
50 narrowspec,
50 narrowspec,
51 obsolete,
51 obsolete,
52 obsutil,
52 obsutil,
53 patch,
53 patch,
54 phases,
54 phases,
55 pycompat,
55 pycompat,
56 rcutil,
56 rcutil,
57 registrar,
57 registrar,
58 revsetlang,
58 revsetlang,
59 rewriteutil,
59 rewriteutil,
60 scmutil,
60 scmutil,
61 server,
61 server,
62 shelve as shelvemod,
62 shelve as shelvemod,
63 state as statemod,
63 state as statemod,
64 streamclone,
64 streamclone,
65 tags as tagsmod,
65 tags as tagsmod,
66 ui as uimod,
66 ui as uimod,
67 util,
67 util,
68 verify as verifymod,
68 verify as verifymod,
69 wireprotoserver,
69 wireprotoserver,
70 )
70 )
71 from .utils import (
71 from .utils import (
72 dateutil,
72 dateutil,
73 stringutil,
73 stringutil,
74 )
74 )
75
75
76 table = {}
76 table = {}
77 table.update(debugcommandsmod.command._table)
77 table.update(debugcommandsmod.command._table)
78
78
79 command = registrar.command(table)
79 command = registrar.command(table)
80 INTENT_READONLY = registrar.INTENT_READONLY
80 INTENT_READONLY = registrar.INTENT_READONLY
81
81
82 # common command options
82 # common command options
83
83
84 globalopts = [
84 globalopts = [
85 (
85 (
86 b'R',
86 b'R',
87 b'repository',
87 b'repository',
88 b'',
88 b'',
89 _(b'repository root directory or name of overlay bundle file'),
89 _(b'repository root directory or name of overlay bundle file'),
90 _(b'REPO'),
90 _(b'REPO'),
91 ),
91 ),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
93 (
93 (
94 b'y',
94 b'y',
95 b'noninteractive',
95 b'noninteractive',
96 None,
96 None,
97 _(
97 _(
98 b'do not prompt, automatically pick the first choice for all prompts'
98 b'do not prompt, automatically pick the first choice for all prompts'
99 ),
99 ),
100 ),
100 ),
101 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'q', b'quiet', None, _(b'suppress output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
103 (
103 (
104 b'',
104 b'',
105 b'color',
105 b'color',
106 b'',
106 b'',
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
108 # and should not be translated
108 # and should not be translated
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
110 _(b'TYPE'),
110 _(b'TYPE'),
111 ),
111 ),
112 (
112 (
113 b'',
113 b'',
114 b'config',
114 b'config',
115 [],
115 [],
116 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'set/override config option (use \'section.name=value\')'),
117 _(b'CONFIG'),
117 _(b'CONFIG'),
118 ),
118 ),
119 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debug', None, _(b'enable debugging output')),
120 (b'', b'debugger', None, _(b'start debugger')),
120 (b'', b'debugger', None, _(b'start debugger')),
121 (
121 (
122 b'',
122 b'',
123 b'encoding',
123 b'encoding',
124 encoding.encoding,
124 encoding.encoding,
125 _(b'set the charset encoding'),
125 _(b'set the charset encoding'),
126 _(b'ENCODE'),
126 _(b'ENCODE'),
127 ),
127 ),
128 (
128 (
129 b'',
129 b'',
130 b'encodingmode',
130 b'encodingmode',
131 encoding.encodingmode,
131 encoding.encodingmode,
132 _(b'set the charset encoding mode'),
132 _(b'set the charset encoding mode'),
133 _(b'MODE'),
133 _(b'MODE'),
134 ),
134 ),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
136 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'time', None, _(b'time how long the command takes')),
137 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'profile', None, _(b'print command execution profile')),
138 (b'', b'version', None, _(b'output version information and exit')),
138 (b'', b'version', None, _(b'output version information and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
141 (
141 (
142 b'',
142 b'',
143 b'pager',
143 b'pager',
144 b'auto',
144 b'auto',
145 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b"when to paginate (boolean, always, auto, or never)"),
146 _(b'TYPE'),
146 _(b'TYPE'),
147 ),
147 ),
148 ]
148 ]
149
149
150 dryrunopts = cmdutil.dryrunopts
150 dryrunopts = cmdutil.dryrunopts
151 remoteopts = cmdutil.remoteopts
151 remoteopts = cmdutil.remoteopts
152 walkopts = cmdutil.walkopts
152 walkopts = cmdutil.walkopts
153 commitopts = cmdutil.commitopts
153 commitopts = cmdutil.commitopts
154 commitopts2 = cmdutil.commitopts2
154 commitopts2 = cmdutil.commitopts2
155 commitopts3 = cmdutil.commitopts3
155 commitopts3 = cmdutil.commitopts3
156 formatteropts = cmdutil.formatteropts
156 formatteropts = cmdutil.formatteropts
157 templateopts = cmdutil.templateopts
157 templateopts = cmdutil.templateopts
158 logopts = cmdutil.logopts
158 logopts = cmdutil.logopts
159 diffopts = cmdutil.diffopts
159 diffopts = cmdutil.diffopts
160 diffwsopts = cmdutil.diffwsopts
160 diffwsopts = cmdutil.diffwsopts
161 diffopts2 = cmdutil.diffopts2
161 diffopts2 = cmdutil.diffopts2
162 mergetoolopts = cmdutil.mergetoolopts
162 mergetoolopts = cmdutil.mergetoolopts
163 similarityopts = cmdutil.similarityopts
163 similarityopts = cmdutil.similarityopts
164 subrepoopts = cmdutil.subrepoopts
164 subrepoopts = cmdutil.subrepoopts
165 debugrevlogopts = cmdutil.debugrevlogopts
165 debugrevlogopts = cmdutil.debugrevlogopts
166
166
167 # Commands start here, listed alphabetically
167 # Commands start here, listed alphabetically
168
168
169
169
170 @command(
170 @command(
171 b'abort',
171 b'abort',
172 dryrunopts,
172 dryrunopts,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
174 helpbasic=True,
174 helpbasic=True,
175 )
175 )
176 def abort(ui, repo, **opts):
176 def abort(ui, repo, **opts):
177 """abort an unfinished operation (EXPERIMENTAL)
177 """abort an unfinished operation (EXPERIMENTAL)
178
178
179 Aborts a multistep operation like graft, histedit, rebase, merge,
179 Aborts a multistep operation like graft, histedit, rebase, merge,
180 and unshelve if they are in an unfinished state.
180 and unshelve if they are in an unfinished state.
181
181
182 use --dry-run/-n to dry run the command.
182 use --dry-run/-n to dry run the command.
183 """
183 """
184 dryrun = opts.get('dry_run')
184 dryrun = opts.get('dry_run')
185 abortstate = cmdutil.getunfinishedstate(repo)
185 abortstate = cmdutil.getunfinishedstate(repo)
186 if not abortstate:
186 if not abortstate:
187 raise error.Abort(_(b'no operation in progress'))
187 raise error.Abort(_(b'no operation in progress'))
188 if not abortstate.abortfunc:
188 if not abortstate.abortfunc:
189 raise error.Abort(
189 raise error.Abort(
190 (
190 (
191 _(b"%s in progress but does not support 'hg abort'")
191 _(b"%s in progress but does not support 'hg abort'")
192 % (abortstate._opname)
192 % (abortstate._opname)
193 ),
193 ),
194 hint=abortstate.hint(),
194 hint=abortstate.hint(),
195 )
195 )
196 if dryrun:
196 if dryrun:
197 ui.status(
197 ui.status(
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
199 )
199 )
200 return
200 return
201 return abortstate.abortfunc(ui, repo)
201 return abortstate.abortfunc(ui, repo)
202
202
203
203
204 @command(
204 @command(
205 b'add',
205 b'add',
206 walkopts + subrepoopts + dryrunopts,
206 walkopts + subrepoopts + dryrunopts,
207 _(b'[OPTION]... [FILE]...'),
207 _(b'[OPTION]... [FILE]...'),
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
209 helpbasic=True,
209 helpbasic=True,
210 inferrepo=True,
210 inferrepo=True,
211 )
211 )
212 def add(ui, repo, *pats, **opts):
212 def add(ui, repo, *pats, **opts):
213 """add the specified files on the next commit
213 """add the specified files on the next commit
214
214
215 Schedule files to be version controlled and added to the
215 Schedule files to be version controlled and added to the
216 repository.
216 repository.
217
217
218 The files will be added to the repository at the next commit. To
218 The files will be added to the repository at the next commit. To
219 undo an add before that, see :hg:`forget`.
219 undo an add before that, see :hg:`forget`.
220
220
221 If no names are given, add all files to the repository (except
221 If no names are given, add all files to the repository (except
222 files matching ``.hgignore``).
222 files matching ``.hgignore``).
223
223
224 .. container:: verbose
224 .. container:: verbose
225
225
226 Examples:
226 Examples:
227
227
228 - New (unknown) files are added
228 - New (unknown) files are added
229 automatically by :hg:`add`::
229 automatically by :hg:`add`::
230
230
231 $ ls
231 $ ls
232 foo.c
232 foo.c
233 $ hg status
233 $ hg status
234 ? foo.c
234 ? foo.c
235 $ hg add
235 $ hg add
236 adding foo.c
236 adding foo.c
237 $ hg status
237 $ hg status
238 A foo.c
238 A foo.c
239
239
240 - Specific files to be added can be specified::
240 - Specific files to be added can be specified::
241
241
242 $ ls
242 $ ls
243 bar.c foo.c
243 bar.c foo.c
244 $ hg status
244 $ hg status
245 ? bar.c
245 ? bar.c
246 ? foo.c
246 ? foo.c
247 $ hg add bar.c
247 $ hg add bar.c
248 $ hg status
248 $ hg status
249 A bar.c
249 A bar.c
250 ? foo.c
250 ? foo.c
251
251
252 Returns 0 if all files are successfully added.
252 Returns 0 if all files are successfully added.
253 """
253 """
254
254
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
258 return rejected and 1 or 0
258 return rejected and 1 or 0
259
259
260
260
261 @command(
261 @command(
262 b'addremove',
262 b'addremove',
263 similarityopts + subrepoopts + walkopts + dryrunopts,
263 similarityopts + subrepoopts + walkopts + dryrunopts,
264 _(b'[OPTION]... [FILE]...'),
264 _(b'[OPTION]... [FILE]...'),
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
266 inferrepo=True,
266 inferrepo=True,
267 )
267 )
268 def addremove(ui, repo, *pats, **opts):
268 def addremove(ui, repo, *pats, **opts):
269 """add all new files, delete all missing files
269 """add all new files, delete all missing files
270
270
271 Add all new files and remove all missing files from the
271 Add all new files and remove all missing files from the
272 repository.
272 repository.
273
273
274 Unless names are given, new files are ignored if they match any of
274 Unless names are given, new files are ignored if they match any of
275 the patterns in ``.hgignore``. As with add, these changes take
275 the patterns in ``.hgignore``. As with add, these changes take
276 effect at the next commit.
276 effect at the next commit.
277
277
278 Use the -s/--similarity option to detect renamed files. This
278 Use the -s/--similarity option to detect renamed files. This
279 option takes a percentage between 0 (disabled) and 100 (files must
279 option takes a percentage between 0 (disabled) and 100 (files must
280 be identical) as its parameter. With a parameter greater than 0,
280 be identical) as its parameter. With a parameter greater than 0,
281 this compares every removed file with every added file and records
281 this compares every removed file with every added file and records
282 those similar enough as renames. Detecting renamed files this way
282 those similar enough as renames. Detecting renamed files this way
283 can be expensive. After using this option, :hg:`status -C` can be
283 can be expensive. After using this option, :hg:`status -C` can be
284 used to check which files were identified as moved or renamed. If
284 used to check which files were identified as moved or renamed. If
285 not specified, -s/--similarity defaults to 100 and only renames of
285 not specified, -s/--similarity defaults to 100 and only renames of
286 identical files are detected.
286 identical files are detected.
287
287
288 .. container:: verbose
288 .. container:: verbose
289
289
290 Examples:
290 Examples:
291
291
292 - A number of files (bar.c and foo.c) are new,
292 - A number of files (bar.c and foo.c) are new,
293 while foobar.c has been removed (without using :hg:`remove`)
293 while foobar.c has been removed (without using :hg:`remove`)
294 from the repository::
294 from the repository::
295
295
296 $ ls
296 $ ls
297 bar.c foo.c
297 bar.c foo.c
298 $ hg status
298 $ hg status
299 ! foobar.c
299 ! foobar.c
300 ? bar.c
300 ? bar.c
301 ? foo.c
301 ? foo.c
302 $ hg addremove
302 $ hg addremove
303 adding bar.c
303 adding bar.c
304 adding foo.c
304 adding foo.c
305 removing foobar.c
305 removing foobar.c
306 $ hg status
306 $ hg status
307 A bar.c
307 A bar.c
308 A foo.c
308 A foo.c
309 R foobar.c
309 R foobar.c
310
310
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
312 Afterwards, it was edited slightly::
312 Afterwards, it was edited slightly::
313
313
314 $ ls
314 $ ls
315 foo.c
315 foo.c
316 $ hg status
316 $ hg status
317 ! foobar.c
317 ! foobar.c
318 ? foo.c
318 ? foo.c
319 $ hg addremove --similarity 90
319 $ hg addremove --similarity 90
320 removing foobar.c
320 removing foobar.c
321 adding foo.c
321 adding foo.c
322 recording removal of foobar.c as rename to foo.c (94% similar)
322 recording removal of foobar.c as rename to foo.c (94% similar)
323 $ hg status -C
323 $ hg status -C
324 A foo.c
324 A foo.c
325 foobar.c
325 foobar.c
326 R foobar.c
326 R foobar.c
327
327
328 Returns 0 if all files are successfully added.
328 Returns 0 if all files are successfully added.
329 """
329 """
330 opts = pycompat.byteskwargs(opts)
330 opts = pycompat.byteskwargs(opts)
331 if not opts.get(b'similarity'):
331 if not opts.get(b'similarity'):
332 opts[b'similarity'] = b'100'
332 opts[b'similarity'] = b'100'
333 matcher = scmutil.match(repo[None], pats, opts)
333 matcher = scmutil.match(repo[None], pats, opts)
334 relative = scmutil.anypats(pats, opts)
334 relative = scmutil.anypats(pats, opts)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
337
337
338
338
339 @command(
339 @command(
340 b'annotate|blame',
340 b'annotate|blame',
341 [
341 [
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
343 (
343 (
344 b'',
344 b'',
345 b'follow',
345 b'follow',
346 None,
346 None,
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
348 ),
348 ),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
350 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'a', b'text', None, _(b'treat all files as text')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
352 (b'f', b'file', None, _(b'list the filename')),
352 (b'f', b'file', None, _(b'list the filename')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
356 (
356 (
357 b'l',
357 b'l',
358 b'line-number',
358 b'line-number',
359 None,
359 None,
360 _(b'show line number at the first appearance'),
360 _(b'show line number at the first appearance'),
361 ),
361 ),
362 (
362 (
363 b'',
363 b'',
364 b'skip',
364 b'skip',
365 [],
365 [],
366 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'revset to not display (EXPERIMENTAL)'),
367 _(b'REV'),
367 _(b'REV'),
368 ),
368 ),
369 ]
369 ]
370 + diffwsopts
370 + diffwsopts
371 + walkopts
371 + walkopts
372 + formatteropts,
372 + formatteropts,
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
375 helpbasic=True,
375 helpbasic=True,
376 inferrepo=True,
376 inferrepo=True,
377 )
377 )
378 def annotate(ui, repo, *pats, **opts):
378 def annotate(ui, repo, *pats, **opts):
379 """show changeset information by line for each file
379 """show changeset information by line for each file
380
380
381 List changes in files, showing the revision id responsible for
381 List changes in files, showing the revision id responsible for
382 each line.
382 each line.
383
383
384 This command is useful for discovering when a change was made and
384 This command is useful for discovering when a change was made and
385 by whom.
385 by whom.
386
386
387 If you include --file, --user, or --date, the revision number is
387 If you include --file, --user, or --date, the revision number is
388 suppressed unless you also include --number.
388 suppressed unless you also include --number.
389
389
390 Without the -a/--text option, annotate will avoid processing files
390 Without the -a/--text option, annotate will avoid processing files
391 it detects as binary. With -a, annotate will annotate the file
391 it detects as binary. With -a, annotate will annotate the file
392 anyway, although the results will probably be neither useful
392 anyway, although the results will probably be neither useful
393 nor desirable.
393 nor desirable.
394
394
395 .. container:: verbose
395 .. container:: verbose
396
396
397 Template:
397 Template:
398
398
399 The following keywords are supported in addition to the common template
399 The following keywords are supported in addition to the common template
400 keywords and functions. See also :hg:`help templates`.
400 keywords and functions. See also :hg:`help templates`.
401
401
402 :lines: List of lines with annotation data.
402 :lines: List of lines with annotation data.
403 :path: String. Repository-absolute path of the specified file.
403 :path: String. Repository-absolute path of the specified file.
404
404
405 And each entry of ``{lines}`` provides the following sub-keywords in
405 And each entry of ``{lines}`` provides the following sub-keywords in
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
407
407
408 :line: String. Line content.
408 :line: String. Line content.
409 :lineno: Integer. Line number at that revision.
409 :lineno: Integer. Line number at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
411
411
412 See :hg:`help templates.operators` for the list expansion syntax.
412 See :hg:`help templates.operators` for the list expansion syntax.
413
413
414 Returns 0 on success.
414 Returns 0 on success.
415 """
415 """
416 opts = pycompat.byteskwargs(opts)
416 opts = pycompat.byteskwargs(opts)
417 if not pats:
417 if not pats:
418 raise error.Abort(_(b'at least one filename or pattern is required'))
418 raise error.Abort(_(b'at least one filename or pattern is required'))
419
419
420 if opts.get(b'follow'):
420 if opts.get(b'follow'):
421 # --follow is deprecated and now just an alias for -f/--file
421 # --follow is deprecated and now just an alias for -f/--file
422 # to mimic the behavior of Mercurial before version 1.5
422 # to mimic the behavior of Mercurial before version 1.5
423 opts[b'file'] = True
423 opts[b'file'] = True
424
424
425 if (
425 if (
426 not opts.get(b'user')
426 not opts.get(b'user')
427 and not opts.get(b'changeset')
427 and not opts.get(b'changeset')
428 and not opts.get(b'date')
428 and not opts.get(b'date')
429 and not opts.get(b'file')
429 and not opts.get(b'file')
430 ):
430 ):
431 opts[b'number'] = True
431 opts[b'number'] = True
432
432
433 linenumber = opts.get(b'line_number') is not None
433 linenumber = opts.get(b'line_number') is not None
434 if (
434 if (
435 linenumber
435 linenumber
436 and (not opts.get(b'changeset'))
436 and (not opts.get(b'changeset'))
437 and (not opts.get(b'number'))
437 and (not opts.get(b'number'))
438 ):
438 ):
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
440
440
441 rev = opts.get(b'rev')
441 rev = opts.get(b'rev')
442 if rev:
442 if rev:
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
444 ctx = scmutil.revsingle(repo, rev)
444 ctx = scmutil.revsingle(repo, rev)
445
445
446 ui.pager(b'annotate')
446 ui.pager(b'annotate')
447 rootfm = ui.formatter(b'annotate', opts)
447 rootfm = ui.formatter(b'annotate', opts)
448 if ui.debugflag:
448 if ui.debugflag:
449 shorthex = pycompat.identity
449 shorthex = pycompat.identity
450 else:
450 else:
451
451
452 def shorthex(h):
452 def shorthex(h):
453 return h[:12]
453 return h[:12]
454
454
455 if ui.quiet:
455 if ui.quiet:
456 datefunc = dateutil.shortdate
456 datefunc = dateutil.shortdate
457 else:
457 else:
458 datefunc = dateutil.datestr
458 datefunc = dateutil.datestr
459 if ctx.rev() is None:
459 if ctx.rev() is None:
460 if opts.get(b'changeset'):
460 if opts.get(b'changeset'):
461 # omit "+" suffix which is appended to node hex
461 # omit "+" suffix which is appended to node hex
462 def formatrev(rev):
462 def formatrev(rev):
463 if rev == wdirrev:
463 if rev == wdirrev:
464 return b'%d' % ctx.p1().rev()
464 return b'%d' % ctx.p1().rev()
465 else:
465 else:
466 return b'%d' % rev
466 return b'%d' % rev
467
467
468 else:
468 else:
469
469
470 def formatrev(rev):
470 def formatrev(rev):
471 if rev == wdirrev:
471 if rev == wdirrev:
472 return b'%d+' % ctx.p1().rev()
472 return b'%d+' % ctx.p1().rev()
473 else:
473 else:
474 return b'%d ' % rev
474 return b'%d ' % rev
475
475
476 def formathex(h):
476 def formathex(h):
477 if h == wdirhex:
477 if h == wdirhex:
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
479 else:
479 else:
480 return b'%s ' % shorthex(h)
480 return b'%s ' % shorthex(h)
481
481
482 else:
482 else:
483 formatrev = b'%d'.__mod__
483 formatrev = b'%d'.__mod__
484 formathex = shorthex
484 formathex = shorthex
485
485
486 opmap = [
486 opmap = [
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
493 ]
493 ]
494 opnamemap = {
494 opnamemap = {
495 b'rev': b'number',
495 b'rev': b'number',
496 b'node': b'changeset',
496 b'node': b'changeset',
497 b'path': b'file',
497 b'path': b'file',
498 b'lineno': b'line_number',
498 b'lineno': b'line_number',
499 }
499 }
500
500
501 if rootfm.isplain():
501 if rootfm.isplain():
502
502
503 def makefunc(get, fmt):
503 def makefunc(get, fmt):
504 return lambda x: fmt(get(x))
504 return lambda x: fmt(get(x))
505
505
506 else:
506 else:
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return get
509 return get
510
510
511 datahint = rootfm.datahint()
511 datahint = rootfm.datahint()
512 funcmap = [
512 funcmap = [
513 (makefunc(get, fmt), sep)
513 (makefunc(get, fmt), sep)
514 for fn, sep, get, fmt in opmap
514 for fn, sep, get, fmt in opmap
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
516 ]
516 ]
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
518 fields = b' '.join(
518 fields = b' '.join(
519 fn
519 fn
520 for fn, sep, get, fmt in opmap
520 for fn, sep, get, fmt in opmap
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
522 )
522 )
523
523
524 def bad(x, y):
524 def bad(x, y):
525 raise error.Abort(b"%s: %s" % (x, y))
525 raise error.Abort(b"%s: %s" % (x, y))
526
526
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
528
528
529 follow = not opts.get(b'no_follow')
529 follow = not opts.get(b'no_follow')
530 diffopts = patch.difffeatureopts(
530 diffopts = patch.difffeatureopts(
531 ui, opts, section=b'annotate', whitespace=True
531 ui, opts, section=b'annotate', whitespace=True
532 )
532 )
533 skiprevs = opts.get(b'skip')
533 skiprevs = opts.get(b'skip')
534 if skiprevs:
534 if skiprevs:
535 skiprevs = scmutil.revrange(repo, skiprevs)
535 skiprevs = scmutil.revrange(repo, skiprevs)
536
536
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
538 for abs in ctx.walk(m):
538 for abs in ctx.walk(m):
539 fctx = ctx[abs]
539 fctx = ctx[abs]
540 rootfm.startitem()
540 rootfm.startitem()
541 rootfm.data(path=abs)
541 rootfm.data(path=abs)
542 if not opts.get(b'text') and fctx.isbinary():
542 if not opts.get(b'text') and fctx.isbinary():
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
544 continue
544 continue
545
545
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
547 lines = fctx.annotate(
547 lines = fctx.annotate(
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
549 )
549 )
550 if not lines:
550 if not lines:
551 fm.end()
551 fm.end()
552 continue
552 continue
553 formats = []
553 formats = []
554 pieces = []
554 pieces = []
555
555
556 for f, sep in funcmap:
556 for f, sep in funcmap:
557 l = [f(n) for n in lines]
557 l = [f(n) for n in lines]
558 if fm.isplain():
558 if fm.isplain():
559 sizes = [encoding.colwidth(x) for x in l]
559 sizes = [encoding.colwidth(x) for x in l]
560 ml = max(sizes)
560 ml = max(sizes)
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
562 else:
562 else:
563 formats.append([b'%s'] * len(l))
563 formats.append([b'%s'] * len(l))
564 pieces.append(l)
564 pieces.append(l)
565
565
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
567 fm.startitem()
567 fm.startitem()
568 fm.context(fctx=n.fctx)
568 fm.context(fctx=n.fctx)
569 fm.write(fields, b"".join(f), *p)
569 fm.write(fields, b"".join(f), *p)
570 if n.skip:
570 if n.skip:
571 fmt = b"* %s"
571 fmt = b"* %s"
572 else:
572 else:
573 fmt = b": %s"
573 fmt = b": %s"
574 fm.write(b'line', fmt, n.text)
574 fm.write(b'line', fmt, n.text)
575
575
576 if not lines[-1].text.endswith(b'\n'):
576 if not lines[-1].text.endswith(b'\n'):
577 fm.plain(b'\n')
577 fm.plain(b'\n')
578 fm.end()
578 fm.end()
579
579
580 rootfm.end()
580 rootfm.end()
581
581
582
582
583 @command(
583 @command(
584 b'archive',
584 b'archive',
585 [
585 [
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
587 (
587 (
588 b'p',
588 b'p',
589 b'prefix',
589 b'prefix',
590 b'',
590 b'',
591 _(b'directory prefix for files in archive'),
591 _(b'directory prefix for files in archive'),
592 _(b'PREFIX'),
592 _(b'PREFIX'),
593 ),
593 ),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
596 ]
596 ]
597 + subrepoopts
597 + subrepoopts
598 + walkopts,
598 + walkopts,
599 _(b'[OPTION]... DEST'),
599 _(b'[OPTION]... DEST'),
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
601 )
601 )
602 def archive(ui, repo, dest, **opts):
602 def archive(ui, repo, dest, **opts):
603 '''create an unversioned archive of a repository revision
603 '''create an unversioned archive of a repository revision
604
604
605 By default, the revision used is the parent of the working
605 By default, the revision used is the parent of the working
606 directory; use -r/--rev to specify a different revision.
606 directory; use -r/--rev to specify a different revision.
607
607
608 The archive type is automatically detected based on file
608 The archive type is automatically detected based on file
609 extension (to override, use -t/--type).
609 extension (to override, use -t/--type).
610
610
611 .. container:: verbose
611 .. container:: verbose
612
612
613 Examples:
613 Examples:
614
614
615 - create a zip file containing the 1.0 release::
615 - create a zip file containing the 1.0 release::
616
616
617 hg archive -r 1.0 project-1.0.zip
617 hg archive -r 1.0 project-1.0.zip
618
618
619 - create a tarball excluding .hg files::
619 - create a tarball excluding .hg files::
620
620
621 hg archive project.tar.gz -X ".hg*"
621 hg archive project.tar.gz -X ".hg*"
622
622
623 Valid types are:
623 Valid types are:
624
624
625 :``files``: a directory full of files (default)
625 :``files``: a directory full of files (default)
626 :``tar``: tar archive, uncompressed
626 :``tar``: tar archive, uncompressed
627 :``tbz2``: tar archive, compressed using bzip2
627 :``tbz2``: tar archive, compressed using bzip2
628 :``tgz``: tar archive, compressed using gzip
628 :``tgz``: tar archive, compressed using gzip
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
630 :``uzip``: zip archive, uncompressed
630 :``uzip``: zip archive, uncompressed
631 :``zip``: zip archive, compressed using deflate
631 :``zip``: zip archive, compressed using deflate
632
632
633 The exact name of the destination archive or directory is given
633 The exact name of the destination archive or directory is given
634 using a format string; see :hg:`help export` for details.
634 using a format string; see :hg:`help export` for details.
635
635
636 Each member added to an archive file has a directory prefix
636 Each member added to an archive file has a directory prefix
637 prepended. Use -p/--prefix to specify a format string for the
637 prepended. Use -p/--prefix to specify a format string for the
638 prefix. The default is the basename of the archive, with suffixes
638 prefix. The default is the basename of the archive, with suffixes
639 removed.
639 removed.
640
640
641 Returns 0 on success.
641 Returns 0 on success.
642 '''
642 '''
643
643
644 opts = pycompat.byteskwargs(opts)
644 opts = pycompat.byteskwargs(opts)
645 rev = opts.get(b'rev')
645 rev = opts.get(b'rev')
646 if rev:
646 if rev:
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
648 ctx = scmutil.revsingle(repo, rev)
648 ctx = scmutil.revsingle(repo, rev)
649 if not ctx:
649 if not ctx:
650 raise error.Abort(_(b'no working directory: please specify a revision'))
650 raise error.Abort(_(b'no working directory: please specify a revision'))
651 node = ctx.node()
651 node = ctx.node()
652 dest = cmdutil.makefilename(ctx, dest)
652 dest = cmdutil.makefilename(ctx, dest)
653 if os.path.realpath(dest) == repo.root:
653 if os.path.realpath(dest) == repo.root:
654 raise error.Abort(_(b'repository root cannot be destination'))
654 raise error.Abort(_(b'repository root cannot be destination'))
655
655
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
657 prefix = opts.get(b'prefix')
657 prefix = opts.get(b'prefix')
658
658
659 if dest == b'-':
659 if dest == b'-':
660 if kind == b'files':
660 if kind == b'files':
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
662 dest = cmdutil.makefileobj(ctx, dest)
662 dest = cmdutil.makefileobj(ctx, dest)
663 if not prefix:
663 if not prefix:
664 prefix = os.path.basename(repo.root) + b'-%h'
664 prefix = os.path.basename(repo.root) + b'-%h'
665
665
666 prefix = cmdutil.makefilename(ctx, prefix)
666 prefix = cmdutil.makefilename(ctx, prefix)
667 match = scmutil.match(ctx, [], opts)
667 match = scmutil.match(ctx, [], opts)
668 archival.archive(
668 archival.archive(
669 repo,
669 repo,
670 dest,
670 dest,
671 node,
671 node,
672 kind,
672 kind,
673 not opts.get(b'no_decode'),
673 not opts.get(b'no_decode'),
674 match,
674 match,
675 prefix,
675 prefix,
676 subrepos=opts.get(b'subrepos'),
676 subrepos=opts.get(b'subrepos'),
677 )
677 )
678
678
679
679
680 @command(
680 @command(
681 b'backout',
681 b'backout',
682 [
682 [
683 (
683 (
684 b'',
684 b'',
685 b'merge',
685 b'merge',
686 None,
686 None,
687 _(b'merge with old dirstate parent after backout'),
687 _(b'merge with old dirstate parent after backout'),
688 ),
688 ),
689 (
689 (
690 b'',
690 b'',
691 b'commit',
691 b'commit',
692 None,
692 None,
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
694 ),
694 ),
695 (b'', b'no-commit', None, _(b'do not commit')),
695 (b'', b'no-commit', None, _(b'do not commit')),
696 (
696 (
697 b'',
697 b'',
698 b'parent',
698 b'parent',
699 b'',
699 b'',
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
701 _(b'REV'),
701 _(b'REV'),
702 ),
702 ),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
705 ]
705 ]
706 + mergetoolopts
706 + mergetoolopts
707 + walkopts
707 + walkopts
708 + commitopts
708 + commitopts
709 + commitopts2,
709 + commitopts2,
710 _(b'[OPTION]... [-r] REV'),
710 _(b'[OPTION]... [-r] REV'),
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
712 )
712 )
713 def backout(ui, repo, node=None, rev=None, **opts):
713 def backout(ui, repo, node=None, rev=None, **opts):
714 '''reverse effect of earlier changeset
714 '''reverse effect of earlier changeset
715
715
716 Prepare a new changeset with the effect of REV undone in the
716 Prepare a new changeset with the effect of REV undone in the
717 current working directory. If no conflicts were encountered,
717 current working directory. If no conflicts were encountered,
718 it will be committed immediately.
718 it will be committed immediately.
719
719
720 If REV is the parent of the working directory, then this new changeset
720 If REV is the parent of the working directory, then this new changeset
721 is committed automatically (unless --no-commit is specified).
721 is committed automatically (unless --no-commit is specified).
722
722
723 .. note::
723 .. note::
724
724
725 :hg:`backout` cannot be used to fix either an unwanted or
725 :hg:`backout` cannot be used to fix either an unwanted or
726 incorrect merge.
726 incorrect merge.
727
727
728 .. container:: verbose
728 .. container:: verbose
729
729
730 Examples:
730 Examples:
731
731
732 - Reverse the effect of the parent of the working directory.
732 - Reverse the effect of the parent of the working directory.
733 This backout will be committed immediately::
733 This backout will be committed immediately::
734
734
735 hg backout -r .
735 hg backout -r .
736
736
737 - Reverse the effect of previous bad revision 23::
737 - Reverse the effect of previous bad revision 23::
738
738
739 hg backout -r 23
739 hg backout -r 23
740
740
741 - Reverse the effect of previous bad revision 23 and
741 - Reverse the effect of previous bad revision 23 and
742 leave changes uncommitted::
742 leave changes uncommitted::
743
743
744 hg backout -r 23 --no-commit
744 hg backout -r 23 --no-commit
745 hg commit -m "Backout revision 23"
745 hg commit -m "Backout revision 23"
746
746
747 By default, the pending changeset will have one parent,
747 By default, the pending changeset will have one parent,
748 maintaining a linear history. With --merge, the pending
748 maintaining a linear history. With --merge, the pending
749 changeset will instead have two parents: the old parent of the
749 changeset will instead have two parents: the old parent of the
750 working directory and a new child of REV that simply undoes REV.
750 working directory and a new child of REV that simply undoes REV.
751
751
752 Before version 1.7, the behavior without --merge was equivalent
752 Before version 1.7, the behavior without --merge was equivalent
753 to specifying --merge followed by :hg:`update --clean .` to
753 to specifying --merge followed by :hg:`update --clean .` to
754 cancel the merge and leave the child of REV as a head to be
754 cancel the merge and leave the child of REV as a head to be
755 merged separately.
755 merged separately.
756
756
757 See :hg:`help dates` for a list of formats valid for -d/--date.
757 See :hg:`help dates` for a list of formats valid for -d/--date.
758
758
759 See :hg:`help revert` for a way to restore files to the state
759 See :hg:`help revert` for a way to restore files to the state
760 of another revision.
760 of another revision.
761
761
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
763 files.
763 files.
764 '''
764 '''
765 with repo.wlock(), repo.lock():
765 with repo.wlock(), repo.lock():
766 return _dobackout(ui, repo, node, rev, **opts)
766 return _dobackout(ui, repo, node, rev, **opts)
767
767
768
768
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
770 opts = pycompat.byteskwargs(opts)
770 opts = pycompat.byteskwargs(opts)
771 if opts.get(b'commit') and opts.get(b'no_commit'):
771 if opts.get(b'commit') and opts.get(b'no_commit'):
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
773 if opts.get(b'merge') and opts.get(b'no_commit'):
773 if opts.get(b'merge') and opts.get(b'no_commit'):
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
775
775
776 if rev and node:
776 if rev and node:
777 raise error.Abort(_(b"please specify just one revision"))
777 raise error.Abort(_(b"please specify just one revision"))
778
778
779 if not rev:
779 if not rev:
780 rev = node
780 rev = node
781
781
782 if not rev:
782 if not rev:
783 raise error.Abort(_(b"please specify a revision to backout"))
783 raise error.Abort(_(b"please specify a revision to backout"))
784
784
785 date = opts.get(b'date')
785 date = opts.get(b'date')
786 if date:
786 if date:
787 opts[b'date'] = dateutil.parsedate(date)
787 opts[b'date'] = dateutil.parsedate(date)
788
788
789 cmdutil.checkunfinished(repo)
789 cmdutil.checkunfinished(repo)
790 cmdutil.bailifchanged(repo)
790 cmdutil.bailifchanged(repo)
791 node = scmutil.revsingle(repo, rev).node()
791 node = scmutil.revsingle(repo, rev).node()
792
792
793 op1, op2 = repo.dirstate.parents()
793 op1, op2 = repo.dirstate.parents()
794 if not repo.changelog.isancestor(node, op1):
794 if not repo.changelog.isancestor(node, op1):
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
796
796
797 p1, p2 = repo.changelog.parents(node)
797 p1, p2 = repo.changelog.parents(node)
798 if p1 == nullid:
798 if p1 == nullid:
799 raise error.Abort(_(b'cannot backout a change with no parents'))
799 raise error.Abort(_(b'cannot backout a change with no parents'))
800 if p2 != nullid:
800 if p2 != nullid:
801 if not opts.get(b'parent'):
801 if not opts.get(b'parent'):
802 raise error.Abort(_(b'cannot backout a merge changeset'))
802 raise error.Abort(_(b'cannot backout a merge changeset'))
803 p = repo.lookup(opts[b'parent'])
803 p = repo.lookup(opts[b'parent'])
804 if p not in (p1, p2):
804 if p not in (p1, p2):
805 raise error.Abort(
805 raise error.Abort(
806 _(b'%s is not a parent of %s') % (short(p), short(node))
806 _(b'%s is not a parent of %s') % (short(p), short(node))
807 )
807 )
808 parent = p
808 parent = p
809 else:
809 else:
810 if opts.get(b'parent'):
810 if opts.get(b'parent'):
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
812 parent = p1
812 parent = p1
813
813
814 # the backout should appear on the same branch
814 # the backout should appear on the same branch
815 branch = repo.dirstate.branch()
815 branch = repo.dirstate.branch()
816 bheads = repo.branchheads(branch)
816 bheads = repo.branchheads(branch)
817 rctx = scmutil.revsingle(repo, hex(parent))
817 rctx = scmutil.revsingle(repo, hex(parent))
818 if not opts.get(b'merge') and op1 != node:
818 if not opts.get(b'merge') and op1 != node:
819 with dirstateguard.dirstateguard(repo, b'backout'):
819 with dirstateguard.dirstateguard(repo, b'backout'):
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
821 with ui.configoverride(overrides, b'backout'):
821 with ui.configoverride(overrides, b'backout'):
822 stats = mergemod.update(
822 stats = mergemod.update(
823 repo,
823 repo,
824 parent,
824 parent,
825 branchmerge=True,
825 branchmerge=True,
826 force=True,
826 force=True,
827 ancestor=node,
827 ancestor=node,
828 mergeancestor=False,
828 mergeancestor=False,
829 )
829 )
830 repo.setparents(op1, op2)
830 repo.setparents(op1, op2)
831 hg._showstats(repo, stats)
831 hg._showstats(repo, stats)
832 if stats.unresolvedcount:
832 if stats.unresolvedcount:
833 repo.ui.status(
833 repo.ui.status(
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
835 )
835 )
836 return 1
836 return 1
837 else:
837 else:
838 hg.clean(repo, node, show_stats=False)
838 hg.clean(repo, node, show_stats=False)
839 repo.dirstate.setbranch(branch)
839 repo.dirstate.setbranch(branch)
840 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
841
841
842 if opts.get(b'no_commit'):
842 if opts.get(b'no_commit'):
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
844 ui.status(msg % short(node))
844 ui.status(msg % short(node))
845 return 0
845 return 0
846
846
847 def commitfunc(ui, repo, message, match, opts):
847 def commitfunc(ui, repo, message, match, opts):
848 editform = b'backout'
848 editform = b'backout'
849 e = cmdutil.getcommiteditor(
849 e = cmdutil.getcommiteditor(
850 editform=editform, **pycompat.strkwargs(opts)
850 editform=editform, **pycompat.strkwargs(opts)
851 )
851 )
852 if not message:
852 if not message:
853 # we don't translate commit messages
853 # we don't translate commit messages
854 message = b"Backed out changeset %s" % short(node)
854 message = b"Backed out changeset %s" % short(node)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
856 return repo.commit(
856 return repo.commit(
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
858 )
858 )
859
859
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
861 if not newnode:
861 if not newnode:
862 ui.status(_(b"nothing changed\n"))
862 ui.status(_(b"nothing changed\n"))
863 return 1
863 return 1
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
865
865
866 def nice(node):
866 def nice(node):
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
868
868
869 ui.status(
869 ui.status(
870 _(b'changeset %s backs out changeset %s\n')
870 _(b'changeset %s backs out changeset %s\n')
871 % (nice(repo.changelog.tip()), nice(node))
871 % (nice(repo.changelog.tip()), nice(node))
872 )
872 )
873 if opts.get(b'merge') and op1 != node:
873 if opts.get(b'merge') and op1 != node:
874 hg.clean(repo, op1, show_stats=False)
874 hg.clean(repo, op1, show_stats=False)
875 ui.status(
875 ui.status(
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
877 )
877 )
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
879 with ui.configoverride(overrides, b'backout'):
879 with ui.configoverride(overrides, b'backout'):
880 return hg.merge(repo[b'tip'])
880 return hg.merge(repo[b'tip'])
881 return 0
881 return 0
882
882
883
883
884 @command(
884 @command(
885 b'bisect',
885 b'bisect',
886 [
886 [
887 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'r', b'reset', False, _(b'reset bisect state')),
888 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'g', b'good', False, _(b'mark changeset good')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
892 (
892 (
893 b'c',
893 b'c',
894 b'command',
894 b'command',
895 b'',
895 b'',
896 _(b'use command to check changeset state'),
896 _(b'use command to check changeset state'),
897 _(b'CMD'),
897 _(b'CMD'),
898 ),
898 ),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
900 ],
900 ],
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
903 )
903 )
904 def bisect(
904 def bisect(
905 ui,
905 ui,
906 repo,
906 repo,
907 rev=None,
907 rev=None,
908 extra=None,
908 extra=None,
909 command=None,
909 command=None,
910 reset=None,
910 reset=None,
911 good=None,
911 good=None,
912 bad=None,
912 bad=None,
913 skip=None,
913 skip=None,
914 extend=None,
914 extend=None,
915 noupdate=None,
915 noupdate=None,
916 ):
916 ):
917 """subdivision search of changesets
917 """subdivision search of changesets
918
918
919 This command helps to find changesets which introduce problems. To
919 This command helps to find changesets which introduce problems. To
920 use, mark the earliest changeset you know exhibits the problem as
920 use, mark the earliest changeset you know exhibits the problem as
921 bad, then mark the latest changeset which is free from the problem
921 bad, then mark the latest changeset which is free from the problem
922 as good. Bisect will update your working directory to a revision
922 as good. Bisect will update your working directory to a revision
923 for testing (unless the -U/--noupdate option is specified). Once
923 for testing (unless the -U/--noupdate option is specified). Once
924 you have performed tests, mark the working directory as good or
924 you have performed tests, mark the working directory as good or
925 bad, and bisect will either update to another candidate changeset
925 bad, and bisect will either update to another candidate changeset
926 or announce that it has found the bad revision.
926 or announce that it has found the bad revision.
927
927
928 As a shortcut, you can also use the revision argument to mark a
928 As a shortcut, you can also use the revision argument to mark a
929 revision as good or bad without checking it out first.
929 revision as good or bad without checking it out first.
930
930
931 If you supply a command, it will be used for automatic bisection.
931 If you supply a command, it will be used for automatic bisection.
932 The environment variable HG_NODE will contain the ID of the
932 The environment variable HG_NODE will contain the ID of the
933 changeset being tested. The exit status of the command will be
933 changeset being tested. The exit status of the command will be
934 used to mark revisions as good or bad: status 0 means good, 125
934 used to mark revisions as good or bad: status 0 means good, 125
935 means to skip the revision, 127 (command not found) will abort the
935 means to skip the revision, 127 (command not found) will abort the
936 bisection, and any other non-zero exit status means the revision
936 bisection, and any other non-zero exit status means the revision
937 is bad.
937 is bad.
938
938
939 .. container:: verbose
939 .. container:: verbose
940
940
941 Some examples:
941 Some examples:
942
942
943 - start a bisection with known bad revision 34, and good revision 12::
943 - start a bisection with known bad revision 34, and good revision 12::
944
944
945 hg bisect --bad 34
945 hg bisect --bad 34
946 hg bisect --good 12
946 hg bisect --good 12
947
947
948 - advance the current bisection by marking current revision as good or
948 - advance the current bisection by marking current revision as good or
949 bad::
949 bad::
950
950
951 hg bisect --good
951 hg bisect --good
952 hg bisect --bad
952 hg bisect --bad
953
953
954 - mark the current revision, or a known revision, to be skipped (e.g. if
954 - mark the current revision, or a known revision, to be skipped (e.g. if
955 that revision is not usable because of another issue)::
955 that revision is not usable because of another issue)::
956
956
957 hg bisect --skip
957 hg bisect --skip
958 hg bisect --skip 23
958 hg bisect --skip 23
959
959
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
961
961
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
963
963
964 - forget the current bisection::
964 - forget the current bisection::
965
965
966 hg bisect --reset
966 hg bisect --reset
967
967
968 - use 'make && make tests' to automatically find the first broken
968 - use 'make && make tests' to automatically find the first broken
969 revision::
969 revision::
970
970
971 hg bisect --reset
971 hg bisect --reset
972 hg bisect --bad 34
972 hg bisect --bad 34
973 hg bisect --good 12
973 hg bisect --good 12
974 hg bisect --command "make && make tests"
974 hg bisect --command "make && make tests"
975
975
976 - see all changesets whose states are already known in the current
976 - see all changesets whose states are already known in the current
977 bisection::
977 bisection::
978
978
979 hg log -r "bisect(pruned)"
979 hg log -r "bisect(pruned)"
980
980
981 - see the changeset currently being bisected (especially useful
981 - see the changeset currently being bisected (especially useful
982 if running with -U/--noupdate)::
982 if running with -U/--noupdate)::
983
983
984 hg log -r "bisect(current)"
984 hg log -r "bisect(current)"
985
985
986 - see all changesets that took part in the current bisection::
986 - see all changesets that took part in the current bisection::
987
987
988 hg log -r "bisect(range)"
988 hg log -r "bisect(range)"
989
989
990 - you can even get a nice graph::
990 - you can even get a nice graph::
991
991
992 hg log --graph -r "bisect(range)"
992 hg log --graph -r "bisect(range)"
993
993
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
995
995
996 Returns 0 on success.
996 Returns 0 on success.
997 """
997 """
998 # backward compatibility
998 # backward compatibility
999 if rev in b"good bad reset init".split():
999 if rev in b"good bad reset init".split():
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1001 cmd, rev, extra = rev, extra, None
1001 cmd, rev, extra = rev, extra, None
1002 if cmd == b"good":
1002 if cmd == b"good":
1003 good = True
1003 good = True
1004 elif cmd == b"bad":
1004 elif cmd == b"bad":
1005 bad = True
1005 bad = True
1006 else:
1006 else:
1007 reset = True
1007 reset = True
1008 elif extra:
1008 elif extra:
1009 raise error.Abort(_(b'incompatible arguments'))
1009 raise error.Abort(_(b'incompatible arguments'))
1010
1010
1011 incompatibles = {
1011 incompatibles = {
1012 b'--bad': bad,
1012 b'--bad': bad,
1013 b'--command': bool(command),
1013 b'--command': bool(command),
1014 b'--extend': extend,
1014 b'--extend': extend,
1015 b'--good': good,
1015 b'--good': good,
1016 b'--reset': reset,
1016 b'--reset': reset,
1017 b'--skip': skip,
1017 b'--skip': skip,
1018 }
1018 }
1019
1019
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1021
1021
1022 if len(enabled) > 1:
1022 if len(enabled) > 1:
1023 raise error.Abort(
1023 raise error.Abort(
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1025 )
1025 )
1026
1026
1027 if reset:
1027 if reset:
1028 hbisect.resetstate(repo)
1028 hbisect.resetstate(repo)
1029 return
1029 return
1030
1030
1031 state = hbisect.load_state(repo)
1031 state = hbisect.load_state(repo)
1032
1032
1033 # update state
1033 # update state
1034 if good or bad or skip:
1034 if good or bad or skip:
1035 if rev:
1035 if rev:
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1037 else:
1037 else:
1038 nodes = [repo.lookup(b'.')]
1038 nodes = [repo.lookup(b'.')]
1039 if good:
1039 if good:
1040 state[b'good'] += nodes
1040 state[b'good'] += nodes
1041 elif bad:
1041 elif bad:
1042 state[b'bad'] += nodes
1042 state[b'bad'] += nodes
1043 elif skip:
1043 elif skip:
1044 state[b'skip'] += nodes
1044 state[b'skip'] += nodes
1045 hbisect.save_state(repo, state)
1045 hbisect.save_state(repo, state)
1046 if not (state[b'good'] and state[b'bad']):
1046 if not (state[b'good'] and state[b'bad']):
1047 return
1047 return
1048
1048
1049 def mayupdate(repo, node, show_stats=True):
1049 def mayupdate(repo, node, show_stats=True):
1050 """common used update sequence"""
1050 """common used update sequence"""
1051 if noupdate:
1051 if noupdate:
1052 return
1052 return
1053 cmdutil.checkunfinished(repo)
1053 cmdutil.checkunfinished(repo)
1054 cmdutil.bailifchanged(repo)
1054 cmdutil.bailifchanged(repo)
1055 return hg.clean(repo, node, show_stats=show_stats)
1055 return hg.clean(repo, node, show_stats=show_stats)
1056
1056
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1058
1058
1059 if command:
1059 if command:
1060 changesets = 1
1060 changesets = 1
1061 if noupdate:
1061 if noupdate:
1062 try:
1062 try:
1063 node = state[b'current'][0]
1063 node = state[b'current'][0]
1064 except LookupError:
1064 except LookupError:
1065 raise error.Abort(
1065 raise error.Abort(
1066 _(
1066 _(
1067 b'current bisect revision is unknown - '
1067 b'current bisect revision is unknown - '
1068 b'start a new bisect to fix'
1068 b'start a new bisect to fix'
1069 )
1069 )
1070 )
1070 )
1071 else:
1071 else:
1072 node, p2 = repo.dirstate.parents()
1072 node, p2 = repo.dirstate.parents()
1073 if p2 != nullid:
1073 if p2 != nullid:
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1075 if rev:
1075 if rev:
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1077 with hbisect.restore_state(repo, state, node):
1077 with hbisect.restore_state(repo, state, node):
1078 while changesets:
1078 while changesets:
1079 # update state
1079 # update state
1080 state[b'current'] = [node]
1080 state[b'current'] = [node]
1081 hbisect.save_state(repo, state)
1081 hbisect.save_state(repo, state)
1082 status = ui.system(
1082 status = ui.system(
1083 command,
1083 command,
1084 environ={b'HG_NODE': hex(node)},
1084 environ={b'HG_NODE': hex(node)},
1085 blockedtag=b'bisect_check',
1085 blockedtag=b'bisect_check',
1086 )
1086 )
1087 if status == 125:
1087 if status == 125:
1088 transition = b"skip"
1088 transition = b"skip"
1089 elif status == 0:
1089 elif status == 0:
1090 transition = b"good"
1090 transition = b"good"
1091 # status < 0 means process was killed
1091 # status < 0 means process was killed
1092 elif status == 127:
1092 elif status == 127:
1093 raise error.Abort(_(b"failed to execute %s") % command)
1093 raise error.Abort(_(b"failed to execute %s") % command)
1094 elif status < 0:
1094 elif status < 0:
1095 raise error.Abort(_(b"%s killed") % command)
1095 raise error.Abort(_(b"%s killed") % command)
1096 else:
1096 else:
1097 transition = b"bad"
1097 transition = b"bad"
1098 state[transition].append(node)
1098 state[transition].append(node)
1099 ctx = repo[node]
1099 ctx = repo[node]
1100 ui.status(
1100 ui.status(
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1102 )
1102 )
1103 hbisect.checkstate(state)
1103 hbisect.checkstate(state)
1104 # bisect
1104 # bisect
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1106 # update to next check
1106 # update to next check
1107 node = nodes[0]
1107 node = nodes[0]
1108 mayupdate(repo, node, show_stats=False)
1108 mayupdate(repo, node, show_stats=False)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1110 return
1110 return
1111
1111
1112 hbisect.checkstate(state)
1112 hbisect.checkstate(state)
1113
1113
1114 # actually bisect
1114 # actually bisect
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1116 if extend:
1116 if extend:
1117 if not changesets:
1117 if not changesets:
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1119 if extendnode is not None:
1119 if extendnode is not None:
1120 ui.write(
1120 ui.write(
1121 _(b"Extending search to changeset %d:%s\n")
1121 _(b"Extending search to changeset %d:%s\n")
1122 % (extendnode.rev(), extendnode)
1122 % (extendnode.rev(), extendnode)
1123 )
1123 )
1124 state[b'current'] = [extendnode.node()]
1124 state[b'current'] = [extendnode.node()]
1125 hbisect.save_state(repo, state)
1125 hbisect.save_state(repo, state)
1126 return mayupdate(repo, extendnode.node())
1126 return mayupdate(repo, extendnode.node())
1127 raise error.Abort(_(b"nothing to extend"))
1127 raise error.Abort(_(b"nothing to extend"))
1128
1128
1129 if changesets == 0:
1129 if changesets == 0:
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1131 else:
1131 else:
1132 assert len(nodes) == 1 # only a single node can be tested next
1132 assert len(nodes) == 1 # only a single node can be tested next
1133 node = nodes[0]
1133 node = nodes[0]
1134 # compute the approximate number of remaining tests
1134 # compute the approximate number of remaining tests
1135 tests, size = 0, 2
1135 tests, size = 0, 2
1136 while size <= changesets:
1136 while size <= changesets:
1137 tests, size = tests + 1, size * 2
1137 tests, size = tests + 1, size * 2
1138 rev = repo.changelog.rev(node)
1138 rev = repo.changelog.rev(node)
1139 ui.write(
1139 ui.write(
1140 _(
1140 _(
1141 b"Testing changeset %d:%s "
1141 b"Testing changeset %d:%s "
1142 b"(%d changesets remaining, ~%d tests)\n"
1142 b"(%d changesets remaining, ~%d tests)\n"
1143 )
1143 )
1144 % (rev, short(node), changesets, tests)
1144 % (rev, short(node), changesets, tests)
1145 )
1145 )
1146 state[b'current'] = [node]
1146 state[b'current'] = [node]
1147 hbisect.save_state(repo, state)
1147 hbisect.save_state(repo, state)
1148 return mayupdate(repo, node)
1148 return mayupdate(repo, node)
1149
1149
1150
1150
1151 @command(
1151 @command(
1152 b'bookmarks|bookmark',
1152 b'bookmarks|bookmark',
1153 [
1153 [
1154 (b'f', b'force', False, _(b'force')),
1154 (b'f', b'force', False, _(b'force')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1160 ]
1160 ]
1161 + formatteropts,
1161 + formatteropts,
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1164 )
1164 )
1165 def bookmark(ui, repo, *names, **opts):
1165 def bookmark(ui, repo, *names, **opts):
1166 '''create a new bookmark or list existing bookmarks
1166 '''create a new bookmark or list existing bookmarks
1167
1167
1168 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are labels on changesets to help track lines of development.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1171
1171
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1173 The active bookmark is indicated with a '*'.
1173 The active bookmark is indicated with a '*'.
1174 When a commit is made, the active bookmark will advance to the new commit.
1174 When a commit is made, the active bookmark will advance to the new commit.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1176 Updating away from a bookmark will cause it to be deactivated.
1176 Updating away from a bookmark will cause it to be deactivated.
1177
1177
1178 Bookmarks can be pushed and pulled between repositories (see
1178 Bookmarks can be pushed and pulled between repositories (see
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1181 be created. Using :hg:`merge` will resolve the divergence.
1181 be created. Using :hg:`merge` will resolve the divergence.
1182
1182
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1184 the active bookmark's name.
1184 the active bookmark's name.
1185
1185
1186 A bookmark named '@' has the special property that :hg:`clone` will
1186 A bookmark named '@' has the special property that :hg:`clone` will
1187 check it out by default if it exists.
1187 check it out by default if it exists.
1188
1188
1189 .. container:: verbose
1189 .. container:: verbose
1190
1190
1191 Template:
1191 Template:
1192
1192
1193 The following keywords are supported in addition to the common template
1193 The following keywords are supported in addition to the common template
1194 keywords and functions such as ``{bookmark}``. See also
1194 keywords and functions such as ``{bookmark}``. See also
1195 :hg:`help templates`.
1195 :hg:`help templates`.
1196
1196
1197 :active: Boolean. True if the bookmark is active.
1197 :active: Boolean. True if the bookmark is active.
1198
1198
1199 Examples:
1199 Examples:
1200
1200
1201 - create an active bookmark for a new line of development::
1201 - create an active bookmark for a new line of development::
1202
1202
1203 hg book new-feature
1203 hg book new-feature
1204
1204
1205 - create an inactive bookmark as a place marker::
1205 - create an inactive bookmark as a place marker::
1206
1206
1207 hg book -i reviewed
1207 hg book -i reviewed
1208
1208
1209 - create an inactive bookmark on another changeset::
1209 - create an inactive bookmark on another changeset::
1210
1210
1211 hg book -r .^ tested
1211 hg book -r .^ tested
1212
1212
1213 - rename bookmark turkey to dinner::
1213 - rename bookmark turkey to dinner::
1214
1214
1215 hg book -m turkey dinner
1215 hg book -m turkey dinner
1216
1216
1217 - move the '@' bookmark from another branch::
1217 - move the '@' bookmark from another branch::
1218
1218
1219 hg book -f @
1219 hg book -f @
1220
1220
1221 - print only the active bookmark name::
1221 - print only the active bookmark name::
1222
1222
1223 hg book -ql .
1223 hg book -ql .
1224 '''
1224 '''
1225 opts = pycompat.byteskwargs(opts)
1225 opts = pycompat.byteskwargs(opts)
1226 force = opts.get(b'force')
1226 force = opts.get(b'force')
1227 rev = opts.get(b'rev')
1227 rev = opts.get(b'rev')
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1229
1229
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1231 if action:
1231 if action:
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1233 elif names or rev:
1233 elif names or rev:
1234 action = b'add'
1234 action = b'add'
1235 elif inactive:
1235 elif inactive:
1236 action = b'inactive' # meaning deactivate
1236 action = b'inactive' # meaning deactivate
1237 else:
1237 else:
1238 action = b'list'
1238 action = b'list'
1239
1239
1240 cmdutil.check_incompatible_arguments(
1240 cmdutil.check_incompatible_arguments(
1241 opts, b'inactive', [b'delete', b'list']
1241 opts, b'inactive', [b'delete', b'list']
1242 )
1242 )
1243 if not names and action in {b'add', b'delete'}:
1243 if not names and action in {b'add', b'delete'}:
1244 raise error.Abort(_(b"bookmark name required"))
1244 raise error.Abort(_(b"bookmark name required"))
1245
1245
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1248 if action == b'delete':
1248 if action == b'delete':
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1250 bookmarks.delete(repo, tr, names)
1250 bookmarks.delete(repo, tr, names)
1251 elif action == b'rename':
1251 elif action == b'rename':
1252 if not names:
1252 if not names:
1253 raise error.Abort(_(b"new bookmark name required"))
1253 raise error.Abort(_(b"new bookmark name required"))
1254 elif len(names) > 1:
1254 elif len(names) > 1:
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1258 elif action == b'add':
1258 elif action == b'add':
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1260 elif action == b'inactive':
1260 elif action == b'inactive':
1261 if len(repo._bookmarks) == 0:
1261 if len(repo._bookmarks) == 0:
1262 ui.status(_(b"no bookmarks set\n"))
1262 ui.status(_(b"no bookmarks set\n"))
1263 elif not repo._activebookmark:
1263 elif not repo._activebookmark:
1264 ui.status(_(b"no active bookmark\n"))
1264 ui.status(_(b"no active bookmark\n"))
1265 else:
1265 else:
1266 bookmarks.deactivate(repo)
1266 bookmarks.deactivate(repo)
1267 elif action == b'list':
1267 elif action == b'list':
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1269 with ui.formatter(b'bookmarks', opts) as fm:
1269 with ui.formatter(b'bookmarks', opts) as fm:
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1271 else:
1271 else:
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1273
1273
1274
1274
1275 @command(
1275 @command(
1276 b'branch',
1276 b'branch',
1277 [
1277 [
1278 (
1278 (
1279 b'f',
1279 b'f',
1280 b'force',
1280 b'force',
1281 None,
1281 None,
1282 _(b'set branch name even if it shadows an existing branch'),
1282 _(b'set branch name even if it shadows an existing branch'),
1283 ),
1283 ),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1285 (
1285 (
1286 b'r',
1286 b'r',
1287 b'rev',
1287 b'rev',
1288 [],
1288 [],
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1290 ),
1290 ),
1291 ],
1291 ],
1292 _(b'[-fC] [NAME]'),
1292 _(b'[-fC] [NAME]'),
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1294 )
1294 )
1295 def branch(ui, repo, label=None, **opts):
1295 def branch(ui, repo, label=None, **opts):
1296 """set or show the current branch name
1296 """set or show the current branch name
1297
1297
1298 .. note::
1298 .. note::
1299
1299
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1302 information about named branches and bookmarks.
1302 information about named branches and bookmarks.
1303
1303
1304 With no argument, show the current branch name. With one argument,
1304 With no argument, show the current branch name. With one argument,
1305 set the working directory branch name (the branch will not exist
1305 set the working directory branch name (the branch will not exist
1306 in the repository until the next commit). Standard practice
1306 in the repository until the next commit). Standard practice
1307 recommends that primary development take place on the 'default'
1307 recommends that primary development take place on the 'default'
1308 branch.
1308 branch.
1309
1309
1310 Unless -f/--force is specified, branch will not let you set a
1310 Unless -f/--force is specified, branch will not let you set a
1311 branch name that already exists.
1311 branch name that already exists.
1312
1312
1313 Use -C/--clean to reset the working directory branch to that of
1313 Use -C/--clean to reset the working directory branch to that of
1314 the parent of the working directory, negating a previous branch
1314 the parent of the working directory, negating a previous branch
1315 change.
1315 change.
1316
1316
1317 Use the command :hg:`update` to switch to an existing branch. Use
1317 Use the command :hg:`update` to switch to an existing branch. Use
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1319 When all heads of a branch are closed, the branch will be
1319 When all heads of a branch are closed, the branch will be
1320 considered closed.
1320 considered closed.
1321
1321
1322 Returns 0 on success.
1322 Returns 0 on success.
1323 """
1323 """
1324 opts = pycompat.byteskwargs(opts)
1324 opts = pycompat.byteskwargs(opts)
1325 revs = opts.get(b'rev')
1325 revs = opts.get(b'rev')
1326 if label:
1326 if label:
1327 label = label.strip()
1327 label = label.strip()
1328
1328
1329 if not opts.get(b'clean') and not label:
1329 if not opts.get(b'clean') and not label:
1330 if revs:
1330 if revs:
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1333 return
1333 return
1334
1334
1335 with repo.wlock():
1335 with repo.wlock():
1336 if opts.get(b'clean'):
1336 if opts.get(b'clean'):
1337 label = repo[b'.'].branch()
1337 label = repo[b'.'].branch()
1338 repo.dirstate.setbranch(label)
1338 repo.dirstate.setbranch(label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1340 elif label:
1340 elif label:
1341
1341
1342 scmutil.checknewlabel(repo, label, b'branch')
1342 scmutil.checknewlabel(repo, label, b'branch')
1343 if revs:
1343 if revs:
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1345
1345
1346 if not opts.get(b'force') and label in repo.branchmap():
1346 if not opts.get(b'force') and label in repo.branchmap():
1347 if label not in [p.branch() for p in repo[None].parents()]:
1347 if label not in [p.branch() for p in repo[None].parents()]:
1348 raise error.Abort(
1348 raise error.Abort(
1349 _(b'a branch of the same name already exists'),
1349 _(b'a branch of the same name already exists'),
1350 # i18n: "it" refers to an existing branch
1350 # i18n: "it" refers to an existing branch
1351 hint=_(b"use 'hg update' to switch to it"),
1351 hint=_(b"use 'hg update' to switch to it"),
1352 )
1352 )
1353
1353
1354 repo.dirstate.setbranch(label)
1354 repo.dirstate.setbranch(label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1356
1356
1357 # find any open named branches aside from default
1357 # find any open named branches aside from default
1358 for n, h, t, c in repo.branchmap().iterbranches():
1358 for n, h, t, c in repo.branchmap().iterbranches():
1359 if n != b"default" and not c:
1359 if n != b"default" and not c:
1360 return 0
1360 return 0
1361 ui.status(
1361 ui.status(
1362 _(
1362 _(
1363 b'(branches are permanent and global, '
1363 b'(branches are permanent and global, '
1364 b'did you want a bookmark?)\n'
1364 b'did you want a bookmark?)\n'
1365 )
1365 )
1366 )
1366 )
1367
1367
1368
1368
1369 @command(
1369 @command(
1370 b'branches',
1370 b'branches',
1371 [
1371 [
1372 (
1372 (
1373 b'a',
1373 b'a',
1374 b'active',
1374 b'active',
1375 False,
1375 False,
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1377 ),
1377 ),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1380 ]
1380 ]
1381 + formatteropts,
1381 + formatteropts,
1382 _(b'[-c]'),
1382 _(b'[-c]'),
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1384 intents={INTENT_READONLY},
1384 intents={INTENT_READONLY},
1385 )
1385 )
1386 def branches(ui, repo, active=False, closed=False, **opts):
1386 def branches(ui, repo, active=False, closed=False, **opts):
1387 """list repository named branches
1387 """list repository named branches
1388
1388
1389 List the repository's named branches, indicating which ones are
1389 List the repository's named branches, indicating which ones are
1390 inactive. If -c/--closed is specified, also list branches which have
1390 inactive. If -c/--closed is specified, also list branches which have
1391 been marked closed (see :hg:`commit --close-branch`).
1391 been marked closed (see :hg:`commit --close-branch`).
1392
1392
1393 Use the command :hg:`update` to switch to an existing branch.
1393 Use the command :hg:`update` to switch to an existing branch.
1394
1394
1395 .. container:: verbose
1395 .. container:: verbose
1396
1396
1397 Template:
1397 Template:
1398
1398
1399 The following keywords are supported in addition to the common template
1399 The following keywords are supported in addition to the common template
1400 keywords and functions such as ``{branch}``. See also
1400 keywords and functions such as ``{branch}``. See also
1401 :hg:`help templates`.
1401 :hg:`help templates`.
1402
1402
1403 :active: Boolean. True if the branch is active.
1403 :active: Boolean. True if the branch is active.
1404 :closed: Boolean. True if the branch is closed.
1404 :closed: Boolean. True if the branch is closed.
1405 :current: Boolean. True if it is the current branch.
1405 :current: Boolean. True if it is the current branch.
1406
1406
1407 Returns 0.
1407 Returns 0.
1408 """
1408 """
1409
1409
1410 opts = pycompat.byteskwargs(opts)
1410 opts = pycompat.byteskwargs(opts)
1411 revs = opts.get(b'rev')
1411 revs = opts.get(b'rev')
1412 selectedbranches = None
1412 selectedbranches = None
1413 if revs:
1413 if revs:
1414 revs = scmutil.revrange(repo, revs)
1414 revs = scmutil.revrange(repo, revs)
1415 getbi = repo.revbranchcache().branchinfo
1415 getbi = repo.revbranchcache().branchinfo
1416 selectedbranches = {getbi(r)[0] for r in revs}
1416 selectedbranches = {getbi(r)[0] for r in revs}
1417
1417
1418 ui.pager(b'branches')
1418 ui.pager(b'branches')
1419 fm = ui.formatter(b'branches', opts)
1419 fm = ui.formatter(b'branches', opts)
1420 hexfunc = fm.hexfunc
1420 hexfunc = fm.hexfunc
1421
1421
1422 allheads = set(repo.heads())
1422 allheads = set(repo.heads())
1423 branches = []
1423 branches = []
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1425 if selectedbranches is not None and tag not in selectedbranches:
1425 if selectedbranches is not None and tag not in selectedbranches:
1426 continue
1426 continue
1427 isactive = False
1427 isactive = False
1428 if not isclosed:
1428 if not isclosed:
1429 openheads = set(repo.branchmap().iteropen(heads))
1429 openheads = set(repo.branchmap().iteropen(heads))
1430 isactive = bool(openheads & allheads)
1430 isactive = bool(openheads & allheads)
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1433
1433
1434 for tag, ctx, isactive, isopen in branches:
1434 for tag, ctx, isactive, isopen in branches:
1435 if active and not isactive:
1435 if active and not isactive:
1436 continue
1436 continue
1437 if isactive:
1437 if isactive:
1438 label = b'branches.active'
1438 label = b'branches.active'
1439 notice = b''
1439 notice = b''
1440 elif not isopen:
1440 elif not isopen:
1441 if not closed:
1441 if not closed:
1442 continue
1442 continue
1443 label = b'branches.closed'
1443 label = b'branches.closed'
1444 notice = _(b' (closed)')
1444 notice = _(b' (closed)')
1445 else:
1445 else:
1446 label = b'branches.inactive'
1446 label = b'branches.inactive'
1447 notice = _(b' (inactive)')
1447 notice = _(b' (inactive)')
1448 current = tag == repo.dirstate.branch()
1448 current = tag == repo.dirstate.branch()
1449 if current:
1449 if current:
1450 label = b'branches.current'
1450 label = b'branches.current'
1451
1451
1452 fm.startitem()
1452 fm.startitem()
1453 fm.write(b'branch', b'%s', tag, label=label)
1453 fm.write(b'branch', b'%s', tag, label=label)
1454 rev = ctx.rev()
1454 rev = ctx.rev()
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1456 fmt = b' ' * padsize + b' %d:%s'
1456 fmt = b' ' * padsize + b' %d:%s'
1457 fm.condwrite(
1457 fm.condwrite(
1458 not ui.quiet,
1458 not ui.quiet,
1459 b'rev node',
1459 b'rev node',
1460 fmt,
1460 fmt,
1461 rev,
1461 rev,
1462 hexfunc(ctx.node()),
1462 hexfunc(ctx.node()),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1464 )
1464 )
1465 fm.context(ctx=ctx)
1465 fm.context(ctx=ctx)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1467 if not ui.quiet:
1467 if not ui.quiet:
1468 fm.plain(notice)
1468 fm.plain(notice)
1469 fm.plain(b'\n')
1469 fm.plain(b'\n')
1470 fm.end()
1470 fm.end()
1471
1471
1472
1472
1473 @command(
1473 @command(
1474 b'bundle',
1474 b'bundle',
1475 [
1475 [
1476 (
1476 (
1477 b'f',
1477 b'f',
1478 b'force',
1478 b'force',
1479 None,
1479 None,
1480 _(b'run even when the destination is unrelated'),
1480 _(b'run even when the destination is unrelated'),
1481 ),
1481 ),
1482 (
1482 (
1483 b'r',
1483 b'r',
1484 b'rev',
1484 b'rev',
1485 [],
1485 [],
1486 _(b'a changeset intended to be added to the destination'),
1486 _(b'a changeset intended to be added to the destination'),
1487 _(b'REV'),
1487 _(b'REV'),
1488 ),
1488 ),
1489 (
1489 (
1490 b'b',
1490 b'b',
1491 b'branch',
1491 b'branch',
1492 [],
1492 [],
1493 _(b'a specific branch you would like to bundle'),
1493 _(b'a specific branch you would like to bundle'),
1494 _(b'BRANCH'),
1494 _(b'BRANCH'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'',
1497 b'',
1498 b'base',
1498 b'base',
1499 [],
1499 [],
1500 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'a base changeset assumed to be available at the destination'),
1501 _(b'REV'),
1501 _(b'REV'),
1502 ),
1502 ),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1504 (
1504 (
1505 b't',
1505 b't',
1506 b'type',
1506 b'type',
1507 b'bzip2',
1507 b'bzip2',
1508 _(b'bundle compression type to use'),
1508 _(b'bundle compression type to use'),
1509 _(b'TYPE'),
1509 _(b'TYPE'),
1510 ),
1510 ),
1511 ]
1511 ]
1512 + remoteopts,
1512 + remoteopts,
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1515 )
1515 )
1516 def bundle(ui, repo, fname, dest=None, **opts):
1516 def bundle(ui, repo, fname, dest=None, **opts):
1517 """create a bundle file
1517 """create a bundle file
1518
1518
1519 Generate a bundle file containing data to be transferred to another
1519 Generate a bundle file containing data to be transferred to another
1520 repository.
1520 repository.
1521
1521
1522 To create a bundle containing all changesets, use -a/--all
1522 To create a bundle containing all changesets, use -a/--all
1523 (or --base null). Otherwise, hg assumes the destination will have
1523 (or --base null). Otherwise, hg assumes the destination will have
1524 all the nodes you specify with --base parameters. Otherwise, hg
1524 all the nodes you specify with --base parameters. Otherwise, hg
1525 will assume the repository has all the nodes in destination, or
1525 will assume the repository has all the nodes in destination, or
1526 default-push/default if no destination is specified, where destination
1526 default-push/default if no destination is specified, where destination
1527 is the repository you provide through DEST option.
1527 is the repository you provide through DEST option.
1528
1528
1529 You can change bundle format with the -t/--type option. See
1529 You can change bundle format with the -t/--type option. See
1530 :hg:`help bundlespec` for documentation on this format. By default,
1530 :hg:`help bundlespec` for documentation on this format. By default,
1531 the most appropriate format is used and compression defaults to
1531 the most appropriate format is used and compression defaults to
1532 bzip2.
1532 bzip2.
1533
1533
1534 The bundle file can then be transferred using conventional means
1534 The bundle file can then be transferred using conventional means
1535 and applied to another repository with the unbundle or pull
1535 and applied to another repository with the unbundle or pull
1536 command. This is useful when direct push and pull are not
1536 command. This is useful when direct push and pull are not
1537 available or when exporting an entire repository is undesirable.
1537 available or when exporting an entire repository is undesirable.
1538
1538
1539 Applying bundles preserves all changeset contents including
1539 Applying bundles preserves all changeset contents including
1540 permissions, copy/rename information, and revision history.
1540 permissions, copy/rename information, and revision history.
1541
1541
1542 Returns 0 on success, 1 if no changes found.
1542 Returns 0 on success, 1 if no changes found.
1543 """
1543 """
1544 opts = pycompat.byteskwargs(opts)
1544 opts = pycompat.byteskwargs(opts)
1545 revs = None
1545 revs = None
1546 if b'rev' in opts:
1546 if b'rev' in opts:
1547 revstrings = opts[b'rev']
1547 revstrings = opts[b'rev']
1548 revs = scmutil.revrange(repo, revstrings)
1548 revs = scmutil.revrange(repo, revstrings)
1549 if revstrings and not revs:
1549 if revstrings and not revs:
1550 raise error.Abort(_(b'no commits to bundle'))
1550 raise error.Abort(_(b'no commits to bundle'))
1551
1551
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1553 try:
1553 try:
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1555 except error.UnsupportedBundleSpecification as e:
1555 except error.UnsupportedBundleSpecification as e:
1556 raise error.Abort(
1556 raise error.Abort(
1557 pycompat.bytestr(e),
1557 pycompat.bytestr(e),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1559 )
1559 )
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1561
1561
1562 # Packed bundles are a pseudo bundle format for now.
1562 # Packed bundles are a pseudo bundle format for now.
1563 if cgversion == b's1':
1563 if cgversion == b's1':
1564 raise error.Abort(
1564 raise error.Abort(
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1567 )
1567 )
1568
1568
1569 if opts.get(b'all'):
1569 if opts.get(b'all'):
1570 if dest:
1570 if dest:
1571 raise error.Abort(
1571 raise error.Abort(
1572 _(b"--all is incompatible with specifying a destination")
1572 _(b"--all is incompatible with specifying a destination")
1573 )
1573 )
1574 if opts.get(b'base'):
1574 if opts.get(b'base'):
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1576 base = [nullrev]
1576 base = [nullrev]
1577 else:
1577 else:
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1580 raise error.Abort(
1580 raise error.Abort(
1581 _(b"repository does not support bundle version %s") % cgversion
1581 _(b"repository does not support bundle version %s") % cgversion
1582 )
1582 )
1583
1583
1584 if base:
1584 if base:
1585 if dest:
1585 if dest:
1586 raise error.Abort(
1586 raise error.Abort(
1587 _(b"--base is incompatible with specifying a destination")
1587 _(b"--base is incompatible with specifying a destination")
1588 )
1588 )
1589 common = [repo[rev].node() for rev in base]
1589 common = [repo[rev].node() for rev in base]
1590 heads = [repo[r].node() for r in revs] if revs else None
1590 heads = [repo[r].node() for r in revs] if revs else None
1591 outgoing = discovery.outgoing(repo, common, heads)
1591 outgoing = discovery.outgoing(repo, common, heads)
1592 else:
1592 else:
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1595 other = hg.peer(repo, opts, dest)
1595 other = hg.peer(repo, opts, dest)
1596 revs = [repo[r].hex() for r in revs]
1596 revs = [repo[r].hex() for r in revs]
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1599 outgoing = discovery.findcommonoutgoing(
1599 outgoing = discovery.findcommonoutgoing(
1600 repo,
1600 repo,
1601 other,
1601 other,
1602 onlyheads=heads,
1602 onlyheads=heads,
1603 force=opts.get(b'force'),
1603 force=opts.get(b'force'),
1604 portable=True,
1604 portable=True,
1605 )
1605 )
1606
1606
1607 if not outgoing.missing:
1607 if not outgoing.missing:
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1609 return 1
1609 return 1
1610
1610
1611 if cgversion == b'01': # bundle1
1611 if cgversion == b'01': # bundle1
1612 bversion = b'HG10' + bundlespec.wirecompression
1612 bversion = b'HG10' + bundlespec.wirecompression
1613 bcompression = None
1613 bcompression = None
1614 elif cgversion in (b'02', b'03'):
1614 elif cgversion in (b'02', b'03'):
1615 bversion = b'HG20'
1615 bversion = b'HG20'
1616 bcompression = bundlespec.wirecompression
1616 bcompression = bundlespec.wirecompression
1617 else:
1617 else:
1618 raise error.ProgrammingError(
1618 raise error.ProgrammingError(
1619 b'bundle: unexpected changegroup version %s' % cgversion
1619 b'bundle: unexpected changegroup version %s' % cgversion
1620 )
1620 )
1621
1621
1622 # TODO compression options should be derived from bundlespec parsing.
1622 # TODO compression options should be derived from bundlespec parsing.
1623 # This is a temporary hack to allow adjusting bundle compression
1623 # This is a temporary hack to allow adjusting bundle compression
1624 # level without a) formalizing the bundlespec changes to declare it
1624 # level without a) formalizing the bundlespec changes to declare it
1625 # b) introducing a command flag.
1625 # b) introducing a command flag.
1626 compopts = {}
1626 compopts = {}
1627 complevel = ui.configint(
1627 complevel = ui.configint(
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1629 )
1629 )
1630 if complevel is None:
1630 if complevel is None:
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1632 if complevel is not None:
1632 if complevel is not None:
1633 compopts[b'level'] = complevel
1633 compopts[b'level'] = complevel
1634
1634
1635 # Allow overriding the bundling of obsmarker in phases through
1635 # Allow overriding the bundling of obsmarker in phases through
1636 # configuration while we don't have a bundle version that include them
1636 # configuration while we don't have a bundle version that include them
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1638 bundlespec.contentopts[b'obsolescence'] = True
1638 bundlespec.contentopts[b'obsolescence'] = True
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1640 bundlespec.contentopts[b'phases'] = True
1640 bundlespec.contentopts[b'phases'] = True
1641
1641
1642 bundle2.writenewbundle(
1642 bundle2.writenewbundle(
1643 ui,
1643 ui,
1644 repo,
1644 repo,
1645 b'bundle',
1645 b'bundle',
1646 fname,
1646 fname,
1647 bversion,
1647 bversion,
1648 outgoing,
1648 outgoing,
1649 bundlespec.contentopts,
1649 bundlespec.contentopts,
1650 compression=bcompression,
1650 compression=bcompression,
1651 compopts=compopts,
1651 compopts=compopts,
1652 )
1652 )
1653
1653
1654
1654
1655 @command(
1655 @command(
1656 b'cat',
1656 b'cat',
1657 [
1657 [
1658 (
1658 (
1659 b'o',
1659 b'o',
1660 b'output',
1660 b'output',
1661 b'',
1661 b'',
1662 _(b'print output to file with formatted name'),
1662 _(b'print output to file with formatted name'),
1663 _(b'FORMAT'),
1663 _(b'FORMAT'),
1664 ),
1664 ),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1667 ]
1667 ]
1668 + walkopts
1668 + walkopts
1669 + formatteropts,
1669 + formatteropts,
1670 _(b'[OPTION]... FILE...'),
1670 _(b'[OPTION]... FILE...'),
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1672 inferrepo=True,
1672 inferrepo=True,
1673 intents={INTENT_READONLY},
1673 intents={INTENT_READONLY},
1674 )
1674 )
1675 def cat(ui, repo, file1, *pats, **opts):
1675 def cat(ui, repo, file1, *pats, **opts):
1676 """output the current or given revision of files
1676 """output the current or given revision of files
1677
1677
1678 Print the specified files as they were at the given revision. If
1678 Print the specified files as they were at the given revision. If
1679 no revision is given, the parent of the working directory is used.
1679 no revision is given, the parent of the working directory is used.
1680
1680
1681 Output may be to a file, in which case the name of the file is
1681 Output may be to a file, in which case the name of the file is
1682 given using a template string. See :hg:`help templates`. In addition
1682 given using a template string. See :hg:`help templates`. In addition
1683 to the common template keywords, the following formatting rules are
1683 to the common template keywords, the following formatting rules are
1684 supported:
1684 supported:
1685
1685
1686 :``%%``: literal "%" character
1686 :``%%``: literal "%" character
1687 :``%s``: basename of file being printed
1687 :``%s``: basename of file being printed
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1689 :``%p``: root-relative path name of file being printed
1689 :``%p``: root-relative path name of file being printed
1690 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%H``: changeset hash (40 hexadecimal digits)
1691 :``%R``: changeset revision number
1691 :``%R``: changeset revision number
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1693 :``%r``: zero-padded changeset revision number
1693 :``%r``: zero-padded changeset revision number
1694 :``%b``: basename of the exporting repository
1694 :``%b``: basename of the exporting repository
1695 :``\\``: literal "\\" character
1695 :``\\``: literal "\\" character
1696
1696
1697 .. container:: verbose
1697 .. container:: verbose
1698
1698
1699 Template:
1699 Template:
1700
1700
1701 The following keywords are supported in addition to the common template
1701 The following keywords are supported in addition to the common template
1702 keywords and functions. See also :hg:`help templates`.
1702 keywords and functions. See also :hg:`help templates`.
1703
1703
1704 :data: String. File content.
1704 :data: String. File content.
1705 :path: String. Repository-absolute path of the file.
1705 :path: String. Repository-absolute path of the file.
1706
1706
1707 Returns 0 on success.
1707 Returns 0 on success.
1708 """
1708 """
1709 opts = pycompat.byteskwargs(opts)
1709 opts = pycompat.byteskwargs(opts)
1710 rev = opts.get(b'rev')
1710 rev = opts.get(b'rev')
1711 if rev:
1711 if rev:
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1713 ctx = scmutil.revsingle(repo, rev)
1713 ctx = scmutil.revsingle(repo, rev)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1715 fntemplate = opts.pop(b'output', b'')
1715 fntemplate = opts.pop(b'output', b'')
1716 if cmdutil.isstdiofilename(fntemplate):
1716 if cmdutil.isstdiofilename(fntemplate):
1717 fntemplate = b''
1717 fntemplate = b''
1718
1718
1719 if fntemplate:
1719 if fntemplate:
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1721 else:
1721 else:
1722 ui.pager(b'cat')
1722 ui.pager(b'cat')
1723 fm = ui.formatter(b'cat', opts)
1723 fm = ui.formatter(b'cat', opts)
1724 with fm:
1724 with fm:
1725 return cmdutil.cat(
1725 return cmdutil.cat(
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1727 )
1727 )
1728
1728
1729
1729
1730 @command(
1730 @command(
1731 b'clone',
1731 b'clone',
1732 [
1732 [
1733 (
1733 (
1734 b'U',
1734 b'U',
1735 b'noupdate',
1735 b'noupdate',
1736 None,
1736 None,
1737 _(
1737 _(
1738 b'the clone will include an empty working '
1738 b'the clone will include an empty working '
1739 b'directory (only a repository)'
1739 b'directory (only a repository)'
1740 ),
1740 ),
1741 ),
1741 ),
1742 (
1742 (
1743 b'u',
1743 b'u',
1744 b'updaterev',
1744 b'updaterev',
1745 b'',
1745 b'',
1746 _(b'revision, tag, or branch to check out'),
1746 _(b'revision, tag, or branch to check out'),
1747 _(b'REV'),
1747 _(b'REV'),
1748 ),
1748 ),
1749 (
1749 (
1750 b'r',
1750 b'r',
1751 b'rev',
1751 b'rev',
1752 [],
1752 [],
1753 _(
1753 _(
1754 b'do not clone everything, but include this changeset'
1754 b'do not clone everything, but include this changeset'
1755 b' and its ancestors'
1755 b' and its ancestors'
1756 ),
1756 ),
1757 _(b'REV'),
1757 _(b'REV'),
1758 ),
1758 ),
1759 (
1759 (
1760 b'b',
1760 b'b',
1761 b'branch',
1761 b'branch',
1762 [],
1762 [],
1763 _(
1763 _(
1764 b'do not clone everything, but include this branch\'s'
1764 b'do not clone everything, but include this branch\'s'
1765 b' changesets and their ancestors'
1765 b' changesets and their ancestors'
1766 ),
1766 ),
1767 _(b'BRANCH'),
1767 _(b'BRANCH'),
1768 ),
1768 ),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1772 ]
1772 ]
1773 + remoteopts,
1773 + remoteopts,
1774 _(b'[OPTION]... SOURCE [DEST]'),
1774 _(b'[OPTION]... SOURCE [DEST]'),
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1776 helpbasic=True,
1776 helpbasic=True,
1777 norepo=True,
1777 norepo=True,
1778 )
1778 )
1779 def clone(ui, source, dest=None, **opts):
1779 def clone(ui, source, dest=None, **opts):
1780 """make a copy of an existing repository
1780 """make a copy of an existing repository
1781
1781
1782 Create a copy of an existing repository in a new directory.
1782 Create a copy of an existing repository in a new directory.
1783
1783
1784 If no destination directory name is specified, it defaults to the
1784 If no destination directory name is specified, it defaults to the
1785 basename of the source.
1785 basename of the source.
1786
1786
1787 The location of the source is added to the new repository's
1787 The location of the source is added to the new repository's
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1789
1789
1790 Only local paths and ``ssh://`` URLs are supported as
1790 Only local paths and ``ssh://`` URLs are supported as
1791 destinations. For ``ssh://`` destinations, no working directory or
1791 destinations. For ``ssh://`` destinations, no working directory or
1792 ``.hg/hgrc`` will be created on the remote side.
1792 ``.hg/hgrc`` will be created on the remote side.
1793
1793
1794 If the source repository has a bookmark called '@' set, that
1794 If the source repository has a bookmark called '@' set, that
1795 revision will be checked out in the new repository by default.
1795 revision will be checked out in the new repository by default.
1796
1796
1797 To check out a particular version, use -u/--update, or
1797 To check out a particular version, use -u/--update, or
1798 -U/--noupdate to create a clone with no working directory.
1798 -U/--noupdate to create a clone with no working directory.
1799
1799
1800 To pull only a subset of changesets, specify one or more revisions
1800 To pull only a subset of changesets, specify one or more revisions
1801 identifiers with -r/--rev or branches with -b/--branch. The
1801 identifiers with -r/--rev or branches with -b/--branch. The
1802 resulting clone will contain only the specified changesets and
1802 resulting clone will contain only the specified changesets and
1803 their ancestors. These options (or 'clone src#rev dest') imply
1803 their ancestors. These options (or 'clone src#rev dest') imply
1804 --pull, even for local source repositories.
1804 --pull, even for local source repositories.
1805
1805
1806 In normal clone mode, the remote normalizes repository data into a common
1806 In normal clone mode, the remote normalizes repository data into a common
1807 exchange format and the receiving end translates this data into its local
1807 exchange format and the receiving end translates this data into its local
1808 storage format. --stream activates a different clone mode that essentially
1808 storage format. --stream activates a different clone mode that essentially
1809 copies repository files from the remote with minimal data processing. This
1809 copies repository files from the remote with minimal data processing. This
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1811 However, it often increases the transferred data size by 30-40%. This can
1811 However, it often increases the transferred data size by 30-40%. This can
1812 result in substantially faster clones where I/O throughput is plentiful,
1812 result in substantially faster clones where I/O throughput is plentiful,
1813 especially for larger repositories. A side-effect of --stream clones is
1813 especially for larger repositories. A side-effect of --stream clones is
1814 that storage settings and requirements on the remote are applied locally:
1814 that storage settings and requirements on the remote are applied locally:
1815 a modern client may inherit legacy or inefficient storage used by the
1815 a modern client may inherit legacy or inefficient storage used by the
1816 remote or a legacy Mercurial client may not be able to clone from a
1816 remote or a legacy Mercurial client may not be able to clone from a
1817 modern Mercurial remote.
1817 modern Mercurial remote.
1818
1818
1819 .. note::
1819 .. note::
1820
1820
1821 Specifying a tag will include the tagged changeset but not the
1821 Specifying a tag will include the tagged changeset but not the
1822 changeset containing the tag.
1822 changeset containing the tag.
1823
1823
1824 .. container:: verbose
1824 .. container:: verbose
1825
1825
1826 For efficiency, hardlinks are used for cloning whenever the
1826 For efficiency, hardlinks are used for cloning whenever the
1827 source and destination are on the same filesystem (note this
1827 source and destination are on the same filesystem (note this
1828 applies only to the repository data, not to the working
1828 applies only to the repository data, not to the working
1829 directory). Some filesystems, such as AFS, implement hardlinking
1829 directory). Some filesystems, such as AFS, implement hardlinking
1830 incorrectly, but do not report errors. In these cases, use the
1830 incorrectly, but do not report errors. In these cases, use the
1831 --pull option to avoid hardlinking.
1831 --pull option to avoid hardlinking.
1832
1832
1833 Mercurial will update the working directory to the first applicable
1833 Mercurial will update the working directory to the first applicable
1834 revision from this list:
1834 revision from this list:
1835
1835
1836 a) null if -U or the source repository has no changesets
1836 a) null if -U or the source repository has no changesets
1837 b) if -u . and the source repository is local, the first parent of
1837 b) if -u . and the source repository is local, the first parent of
1838 the source repository's working directory
1838 the source repository's working directory
1839 c) the changeset specified with -u (if a branch name, this means the
1839 c) the changeset specified with -u (if a branch name, this means the
1840 latest head of that branch)
1840 latest head of that branch)
1841 d) the changeset specified with -r
1841 d) the changeset specified with -r
1842 e) the tipmost head specified with -b
1842 e) the tipmost head specified with -b
1843 f) the tipmost head specified with the url#branch source syntax
1843 f) the tipmost head specified with the url#branch source syntax
1844 g) the revision marked with the '@' bookmark, if present
1844 g) the revision marked with the '@' bookmark, if present
1845 h) the tipmost head of the default branch
1845 h) the tipmost head of the default branch
1846 i) tip
1846 i) tip
1847
1847
1848 When cloning from servers that support it, Mercurial may fetch
1848 When cloning from servers that support it, Mercurial may fetch
1849 pre-generated data from a server-advertised URL or inline from the
1849 pre-generated data from a server-advertised URL or inline from the
1850 same stream. When this is done, hooks operating on incoming changesets
1850 same stream. When this is done, hooks operating on incoming changesets
1851 and changegroups may fire more than once, once for each pre-generated
1851 and changegroups may fire more than once, once for each pre-generated
1852 bundle and as well as for any additional remaining data. In addition,
1852 bundle and as well as for any additional remaining data. In addition,
1853 if an error occurs, the repository may be rolled back to a partial
1853 if an error occurs, the repository may be rolled back to a partial
1854 clone. This behavior may change in future releases.
1854 clone. This behavior may change in future releases.
1855 See :hg:`help -e clonebundles` for more.
1855 See :hg:`help -e clonebundles` for more.
1856
1856
1857 Examples:
1857 Examples:
1858
1858
1859 - clone a remote repository to a new directory named hg/::
1859 - clone a remote repository to a new directory named hg/::
1860
1860
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1862
1862
1863 - create a lightweight local clone::
1863 - create a lightweight local clone::
1864
1864
1865 hg clone project/ project-feature/
1865 hg clone project/ project-feature/
1866
1866
1867 - clone from an absolute path on an ssh server (note double-slash)::
1867 - clone from an absolute path on an ssh server (note double-slash)::
1868
1868
1869 hg clone ssh://user@server//home/projects/alpha/
1869 hg clone ssh://user@server//home/projects/alpha/
1870
1870
1871 - do a streaming clone while checking out a specified version::
1871 - do a streaming clone while checking out a specified version::
1872
1872
1873 hg clone --stream http://server/repo -u 1.5
1873 hg clone --stream http://server/repo -u 1.5
1874
1874
1875 - create a repository without changesets after a particular revision::
1875 - create a repository without changesets after a particular revision::
1876
1876
1877 hg clone -r 04e544 experimental/ good/
1877 hg clone -r 04e544 experimental/ good/
1878
1878
1879 - clone (and track) a particular named branch::
1879 - clone (and track) a particular named branch::
1880
1880
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1882
1882
1883 See :hg:`help urls` for details on specifying URLs.
1883 See :hg:`help urls` for details on specifying URLs.
1884
1884
1885 Returns 0 on success.
1885 Returns 0 on success.
1886 """
1886 """
1887 opts = pycompat.byteskwargs(opts)
1887 opts = pycompat.byteskwargs(opts)
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1889
1889
1890 # --include/--exclude can come from narrow or sparse.
1890 # --include/--exclude can come from narrow or sparse.
1891 includepats, excludepats = None, None
1891 includepats, excludepats = None, None
1892
1892
1893 # hg.clone() differentiates between None and an empty set. So make sure
1893 # hg.clone() differentiates between None and an empty set. So make sure
1894 # patterns are sets if narrow is requested without patterns.
1894 # patterns are sets if narrow is requested without patterns.
1895 if opts.get(b'narrow'):
1895 if opts.get(b'narrow'):
1896 includepats = set()
1896 includepats = set()
1897 excludepats = set()
1897 excludepats = set()
1898
1898
1899 if opts.get(b'include'):
1899 if opts.get(b'include'):
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1901 if opts.get(b'exclude'):
1901 if opts.get(b'exclude'):
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1903
1903
1904 r = hg.clone(
1904 r = hg.clone(
1905 ui,
1905 ui,
1906 opts,
1906 opts,
1907 source,
1907 source,
1908 dest,
1908 dest,
1909 pull=opts.get(b'pull'),
1909 pull=opts.get(b'pull'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1911 revs=opts.get(b'rev'),
1911 revs=opts.get(b'rev'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1913 branch=opts.get(b'branch'),
1913 branch=opts.get(b'branch'),
1914 shareopts=opts.get(b'shareopts'),
1914 shareopts=opts.get(b'shareopts'),
1915 storeincludepats=includepats,
1915 storeincludepats=includepats,
1916 storeexcludepats=excludepats,
1916 storeexcludepats=excludepats,
1917 depth=opts.get(b'depth') or None,
1917 depth=opts.get(b'depth') or None,
1918 )
1918 )
1919
1919
1920 return r is None
1920 return r is None
1921
1921
1922
1922
1923 @command(
1923 @command(
1924 b'commit|ci',
1924 b'commit|ci',
1925 [
1925 [
1926 (
1926 (
1927 b'A',
1927 b'A',
1928 b'addremove',
1928 b'addremove',
1929 None,
1929 None,
1930 _(b'mark new/missing files as added/removed before committing'),
1930 _(b'mark new/missing files as added/removed before committing'),
1931 ),
1931 ),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1936 (
1936 (
1937 b'',
1937 b'',
1938 b'force-close-branch',
1938 b'force-close-branch',
1939 None,
1939 None,
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1941 ),
1941 ),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1943 ]
1943 ]
1944 + walkopts
1944 + walkopts
1945 + commitopts
1945 + commitopts
1946 + commitopts2
1946 + commitopts2
1947 + subrepoopts,
1947 + subrepoopts,
1948 _(b'[OPTION]... [FILE]...'),
1948 _(b'[OPTION]... [FILE]...'),
1949 helpcategory=command.CATEGORY_COMMITTING,
1949 helpcategory=command.CATEGORY_COMMITTING,
1950 helpbasic=True,
1950 helpbasic=True,
1951 inferrepo=True,
1951 inferrepo=True,
1952 )
1952 )
1953 def commit(ui, repo, *pats, **opts):
1953 def commit(ui, repo, *pats, **opts):
1954 """commit the specified files or all outstanding changes
1954 """commit the specified files or all outstanding changes
1955
1955
1956 Commit changes to the given files into the repository. Unlike a
1956 Commit changes to the given files into the repository. Unlike a
1957 centralized SCM, this operation is a local operation. See
1957 centralized SCM, this operation is a local operation. See
1958 :hg:`push` for a way to actively distribute your changes.
1958 :hg:`push` for a way to actively distribute your changes.
1959
1959
1960 If a list of files is omitted, all changes reported by :hg:`status`
1960 If a list of files is omitted, all changes reported by :hg:`status`
1961 will be committed.
1961 will be committed.
1962
1962
1963 If you are committing the result of a merge, do not provide any
1963 If you are committing the result of a merge, do not provide any
1964 filenames or -I/-X filters.
1964 filenames or -I/-X filters.
1965
1965
1966 If no commit message is specified, Mercurial starts your
1966 If no commit message is specified, Mercurial starts your
1967 configured editor where you can enter a message. In case your
1967 configured editor where you can enter a message. In case your
1968 commit fails, you will find a backup of your message in
1968 commit fails, you will find a backup of your message in
1969 ``.hg/last-message.txt``.
1969 ``.hg/last-message.txt``.
1970
1970
1971 The --close-branch flag can be used to mark the current branch
1971 The --close-branch flag can be used to mark the current branch
1972 head closed. When all heads of a branch are closed, the branch
1972 head closed. When all heads of a branch are closed, the branch
1973 will be considered closed and no longer listed.
1973 will be considered closed and no longer listed.
1974
1974
1975 The --amend flag can be used to amend the parent of the
1975 The --amend flag can be used to amend the parent of the
1976 working directory with a new commit that contains the changes
1976 working directory with a new commit that contains the changes
1977 in the parent in addition to those currently reported by :hg:`status`,
1977 in the parent in addition to those currently reported by :hg:`status`,
1978 if there are any. The old commit is stored in a backup bundle in
1978 if there are any. The old commit is stored in a backup bundle in
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1980 on how to restore it).
1980 on how to restore it).
1981
1981
1982 Message, user and date are taken from the amended commit unless
1982 Message, user and date are taken from the amended commit unless
1983 specified. When a message isn't specified on the command line,
1983 specified. When a message isn't specified on the command line,
1984 the editor will open with the message of the amended commit.
1984 the editor will open with the message of the amended commit.
1985
1985
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1987 or changesets that have children.
1987 or changesets that have children.
1988
1988
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1990
1990
1991 Returns 0 on success, 1 if nothing changed.
1991 Returns 0 on success, 1 if nothing changed.
1992
1992
1993 .. container:: verbose
1993 .. container:: verbose
1994
1994
1995 Examples:
1995 Examples:
1996
1996
1997 - commit all files ending in .py::
1997 - commit all files ending in .py::
1998
1998
1999 hg commit --include "set:**.py"
1999 hg commit --include "set:**.py"
2000
2000
2001 - commit all non-binary files::
2001 - commit all non-binary files::
2002
2002
2003 hg commit --exclude "set:binary()"
2003 hg commit --exclude "set:binary()"
2004
2004
2005 - amend the current commit and set the date to now::
2005 - amend the current commit and set the date to now::
2006
2006
2007 hg commit --amend --date now
2007 hg commit --amend --date now
2008 """
2008 """
2009 with repo.wlock(), repo.lock():
2009 with repo.wlock(), repo.lock():
2010 return _docommit(ui, repo, *pats, **opts)
2010 return _docommit(ui, repo, *pats, **opts)
2011
2011
2012
2012
2013 def _docommit(ui, repo, *pats, **opts):
2013 def _docommit(ui, repo, *pats, **opts):
2014 if opts.get('interactive'):
2014 if opts.get('interactive'):
2015 opts.pop('interactive')
2015 opts.pop('interactive')
2016 ret = cmdutil.dorecord(
2016 ret = cmdutil.dorecord(
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2018 )
2018 )
2019 # ret can be 0 (no changes to record) or the value returned by
2019 # ret can be 0 (no changes to record) or the value returned by
2020 # commit(), 1 if nothing changed or None on success.
2020 # commit(), 1 if nothing changed or None on success.
2021 return 1 if ret == 0 else ret
2021 return 1 if ret == 0 else ret
2022
2022
2023 opts = pycompat.byteskwargs(opts)
2023 opts = pycompat.byteskwargs(opts)
2024 if opts.get(b'subrepos'):
2024 if opts.get(b'subrepos'):
2025 if opts.get(b'amend'):
2025 if opts.get(b'amend'):
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2027 # Let --subrepos on the command line override config setting.
2027 # Let --subrepos on the command line override config setting.
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2029
2029
2030 cmdutil.checkunfinished(repo, commit=True)
2030 cmdutil.checkunfinished(repo, commit=True)
2031
2031
2032 branch = repo[None].branch()
2032 branch = repo[None].branch()
2033 bheads = repo.branchheads(branch)
2033 bheads = repo.branchheads(branch)
2034
2034
2035 extra = {}
2035 extra = {}
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2037 extra[b'close'] = b'1'
2037 extra[b'close'] = b'1'
2038
2038
2039 if repo[b'.'].closesbranch():
2039 if repo[b'.'].closesbranch():
2040 raise error.Abort(
2040 raise error.Abort(
2041 _(b'current revision is already a branch closing head')
2041 _(b'current revision is already a branch closing head')
2042 )
2042 )
2043 elif not bheads:
2043 elif not bheads:
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2045 elif (
2045 elif (
2046 branch == repo[b'.'].branch()
2046 branch == repo[b'.'].branch()
2047 and repo[b'.'].node() not in bheads
2047 and repo[b'.'].node() not in bheads
2048 and not opts.get(b'force_close_branch')
2048 and not opts.get(b'force_close_branch')
2049 ):
2049 ):
2050 hint = _(
2050 hint = _(
2051 b'use --force-close-branch to close branch from a non-head'
2051 b'use --force-close-branch to close branch from a non-head'
2052 b' changeset'
2052 b' changeset'
2053 )
2053 )
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2055 elif opts.get(b'amend'):
2055 elif opts.get(b'amend'):
2056 if (
2056 if (
2057 repo[b'.'].p1().branch() != branch
2057 repo[b'.'].p1().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2059 ):
2059 ):
2060 raise error.Abort(_(b'can only close branch heads'))
2060 raise error.Abort(_(b'can only close branch heads'))
2061
2061
2062 if opts.get(b'amend'):
2062 if opts.get(b'amend'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2065
2065
2066 old = repo[b'.']
2066 old = repo[b'.']
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2068
2068
2069 # Currently histedit gets confused if an amend happens while histedit
2069 # Currently histedit gets confused if an amend happens while histedit
2070 # is in progress. Since we have a checkunfinished command, we are
2070 # is in progress. Since we have a checkunfinished command, we are
2071 # temporarily honoring it.
2071 # temporarily honoring it.
2072 #
2072 #
2073 # Note: eventually this guard will be removed. Please do not expect
2073 # Note: eventually this guard will be removed. Please do not expect
2074 # this behavior to remain.
2074 # this behavior to remain.
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2076 cmdutil.checkunfinished(repo)
2076 cmdutil.checkunfinished(repo)
2077
2077
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2079 if node == old.node():
2079 if node == old.node():
2080 ui.status(_(b"nothing changed\n"))
2080 ui.status(_(b"nothing changed\n"))
2081 return 1
2081 return 1
2082 else:
2082 else:
2083
2083
2084 def commitfunc(ui, repo, message, match, opts):
2084 def commitfunc(ui, repo, message, match, opts):
2085 overrides = {}
2085 overrides = {}
2086 if opts.get(b'secret'):
2086 if opts.get(b'secret'):
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2088
2088
2089 baseui = repo.baseui
2089 baseui = repo.baseui
2090 with baseui.configoverride(overrides, b'commit'):
2090 with baseui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2092 editform = cmdutil.mergeeditform(
2092 editform = cmdutil.mergeeditform(
2093 repo[None], b'commit.normal'
2093 repo[None], b'commit.normal'
2094 )
2094 )
2095 editor = cmdutil.getcommiteditor(
2095 editor = cmdutil.getcommiteditor(
2096 editform=editform, **pycompat.strkwargs(opts)
2096 editform=editform, **pycompat.strkwargs(opts)
2097 )
2097 )
2098 return repo.commit(
2098 return repo.commit(
2099 message,
2099 message,
2100 opts.get(b'user'),
2100 opts.get(b'user'),
2101 opts.get(b'date'),
2101 opts.get(b'date'),
2102 match,
2102 match,
2103 editor=editor,
2103 editor=editor,
2104 extra=extra,
2104 extra=extra,
2105 )
2105 )
2106
2106
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2108
2108
2109 if not node:
2109 if not node:
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2111 if stat.deleted:
2111 if stat.deleted:
2112 ui.status(
2112 ui.status(
2113 _(
2113 _(
2114 b"nothing changed (%d missing files, see "
2114 b"nothing changed (%d missing files, see "
2115 b"'hg status')\n"
2115 b"'hg status')\n"
2116 )
2116 )
2117 % len(stat.deleted)
2117 % len(stat.deleted)
2118 )
2118 )
2119 else:
2119 else:
2120 ui.status(_(b"nothing changed\n"))
2120 ui.status(_(b"nothing changed\n"))
2121 return 1
2121 return 1
2122
2122
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2124
2124
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2126 status(
2126 status(
2127 ui,
2127 ui,
2128 repo,
2128 repo,
2129 modified=True,
2129 modified=True,
2130 added=True,
2130 added=True,
2131 removed=True,
2131 removed=True,
2132 deleted=True,
2132 deleted=True,
2133 unknown=True,
2133 unknown=True,
2134 subrepos=opts.get(b'subrepos'),
2134 subrepos=opts.get(b'subrepos'),
2135 )
2135 )
2136
2136
2137
2137
2138 @command(
2138 @command(
2139 b'config|showconfig|debugconfig',
2139 b'config|showconfig|debugconfig',
2140 [
2140 [
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2145 ]
2145 ]
2146 + formatteropts,
2146 + formatteropts,
2147 _(b'[-u] [NAME]...'),
2147 _(b'[-u] [NAME]...'),
2148 helpcategory=command.CATEGORY_HELP,
2148 helpcategory=command.CATEGORY_HELP,
2149 optionalrepo=True,
2149 optionalrepo=True,
2150 intents={INTENT_READONLY},
2150 intents={INTENT_READONLY},
2151 )
2151 )
2152 def config(ui, repo, *values, **opts):
2152 def config(ui, repo, *values, **opts):
2153 """show combined config settings from all hgrc files
2153 """show combined config settings from all hgrc files
2154
2154
2155 With no arguments, print names and values of all config items.
2155 With no arguments, print names and values of all config items.
2156
2156
2157 With one argument of the form section.name, print just the value
2157 With one argument of the form section.name, print just the value
2158 of that config item.
2158 of that config item.
2159
2159
2160 With multiple arguments, print names and values of all config
2160 With multiple arguments, print names and values of all config
2161 items with matching section names or section.names.
2161 items with matching section names or section.names.
2162
2162
2163 With --edit, start an editor on the user-level config file. With
2163 With --edit, start an editor on the user-level config file. With
2164 --global, edit the system-wide config file. With --local, edit the
2164 --global, edit the system-wide config file. With --local, edit the
2165 repository-level config file.
2165 repository-level config file.
2166
2166
2167 With --debug, the source (filename and line number) is printed
2167 With --debug, the source (filename and line number) is printed
2168 for each config item.
2168 for each config item.
2169
2169
2170 See :hg:`help config` for more information about config files.
2170 See :hg:`help config` for more information about config files.
2171
2171
2172 .. container:: verbose
2172 .. container:: verbose
2173
2173
2174 Template:
2174 Template:
2175
2175
2176 The following keywords are supported. See also :hg:`help templates`.
2176 The following keywords are supported. See also :hg:`help templates`.
2177
2177
2178 :name: String. Config name.
2178 :name: String. Config name.
2179 :source: String. Filename and line number where the item is defined.
2179 :source: String. Filename and line number where the item is defined.
2180 :value: String. Config value.
2180 :value: String. Config value.
2181
2181
2182 Returns 0 on success, 1 if NAME does not exist.
2182 Returns 0 on success, 1 if NAME does not exist.
2183
2183
2184 """
2184 """
2185
2185
2186 opts = pycompat.byteskwargs(opts)
2186 opts = pycompat.byteskwargs(opts)
2187 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 editopts = (b'edit', b'local', b'global')
2188 if any(opts.get(o) for o in editopts):
2188 if opts.get(b'local') and opts.get(b'global'):
2189 if opts.get(b'local') and opts.get(b'global'):
2189 raise error.Abort(_(b"can't use --local and --global together"))
2190 raise error.Abort(_(b"can't use --local and --global together"))
2190
2191
2191 if opts.get(b'local'):
2192 if opts.get(b'local'):
2192 if not repo:
2193 if not repo:
2193 raise error.Abort(_(b"can't use --local outside a repository"))
2194 raise error.Abort(_(b"can't use --local outside a repository"))
2194 paths = [repo.vfs.join(b'hgrc')]
2195 paths = [repo.vfs.join(b'hgrc')]
2195 elif opts.get(b'global'):
2196 elif opts.get(b'global'):
2196 paths = rcutil.systemrcpath()
2197 paths = rcutil.systemrcpath()
2197 else:
2198 else:
2198 paths = rcutil.userrcpath()
2199 paths = rcutil.userrcpath()
2199
2200
2200 for f in paths:
2201 for f in paths:
2201 if os.path.exists(f):
2202 if os.path.exists(f):
2202 break
2203 break
2203 else:
2204 else:
2204 if opts.get(b'global'):
2205 if opts.get(b'global'):
2205 samplehgrc = uimod.samplehgrcs[b'global']
2206 samplehgrc = uimod.samplehgrcs[b'global']
2206 elif opts.get(b'local'):
2207 elif opts.get(b'local'):
2207 samplehgrc = uimod.samplehgrcs[b'local']
2208 samplehgrc = uimod.samplehgrcs[b'local']
2208 else:
2209 else:
2209 samplehgrc = uimod.samplehgrcs[b'user']
2210 samplehgrc = uimod.samplehgrcs[b'user']
2210
2211
2211 f = paths[0]
2212 f = paths[0]
2212 fp = open(f, b"wb")
2213 fp = open(f, b"wb")
2213 fp.write(util.tonativeeol(samplehgrc))
2214 fp.write(util.tonativeeol(samplehgrc))
2214 fp.close()
2215 fp.close()
2215
2216
2216 editor = ui.geteditor()
2217 editor = ui.geteditor()
2217 ui.system(
2218 ui.system(
2218 b"%s \"%s\"" % (editor, f),
2219 b"%s \"%s\"" % (editor, f),
2219 onerr=error.Abort,
2220 onerr=error.Abort,
2220 errprefix=_(b"edit failed"),
2221 errprefix=_(b"edit failed"),
2221 blockedtag=b'config_edit',
2222 blockedtag=b'config_edit',
2222 )
2223 )
2223 return
2224 return
2224 ui.pager(b'config')
2225 ui.pager(b'config')
2225 fm = ui.formatter(b'config', opts)
2226 fm = ui.formatter(b'config', opts)
2226 for t, f in rcutil.rccomponents():
2227 for t, f in rcutil.rccomponents():
2227 if t == b'path':
2228 if t == b'path':
2228 ui.debug(b'read config from: %s\n' % f)
2229 ui.debug(b'read config from: %s\n' % f)
2229 elif t == b'resource':
2230 elif t == b'resource':
2230 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2231 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2231 elif t == b'items':
2232 elif t == b'items':
2232 # Don't print anything for 'items'.
2233 # Don't print anything for 'items'.
2233 pass
2234 pass
2234 else:
2235 else:
2235 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2236 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2236 untrusted = bool(opts.get(b'untrusted'))
2237 untrusted = bool(opts.get(b'untrusted'))
2237
2238
2238 selsections = selentries = []
2239 selsections = selentries = []
2239 if values:
2240 if values:
2240 selsections = [v for v in values if b'.' not in v]
2241 selsections = [v for v in values if b'.' not in v]
2241 selentries = [v for v in values if b'.' in v]
2242 selentries = [v for v in values if b'.' in v]
2242 uniquesel = len(selentries) == 1 and not selsections
2243 uniquesel = len(selentries) == 1 and not selsections
2243 selsections = set(selsections)
2244 selsections = set(selsections)
2244 selentries = set(selentries)
2245 selentries = set(selentries)
2245
2246
2246 matched = False
2247 matched = False
2247 for section, name, value in ui.walkconfig(untrusted=untrusted):
2248 for section, name, value in ui.walkconfig(untrusted=untrusted):
2248 source = ui.configsource(section, name, untrusted)
2249 source = ui.configsource(section, name, untrusted)
2249 value = pycompat.bytestr(value)
2250 value = pycompat.bytestr(value)
2250 defaultvalue = ui.configdefault(section, name)
2251 defaultvalue = ui.configdefault(section, name)
2251 if fm.isplain():
2252 if fm.isplain():
2252 source = source or b'none'
2253 source = source or b'none'
2253 value = value.replace(b'\n', b'\\n')
2254 value = value.replace(b'\n', b'\\n')
2254 entryname = section + b'.' + name
2255 entryname = section + b'.' + name
2255 if values and not (section in selsections or entryname in selentries):
2256 if values and not (section in selsections or entryname in selentries):
2256 continue
2257 continue
2257 fm.startitem()
2258 fm.startitem()
2258 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2259 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2259 if uniquesel:
2260 if uniquesel:
2260 fm.data(name=entryname)
2261 fm.data(name=entryname)
2261 fm.write(b'value', b'%s\n', value)
2262 fm.write(b'value', b'%s\n', value)
2262 else:
2263 else:
2263 fm.write(b'name value', b'%s=%s\n', entryname, value)
2264 fm.write(b'name value', b'%s=%s\n', entryname, value)
2264 if formatter.isprintable(defaultvalue):
2265 if formatter.isprintable(defaultvalue):
2265 fm.data(defaultvalue=defaultvalue)
2266 fm.data(defaultvalue=defaultvalue)
2266 elif isinstance(defaultvalue, list) and all(
2267 elif isinstance(defaultvalue, list) and all(
2267 formatter.isprintable(e) for e in defaultvalue
2268 formatter.isprintable(e) for e in defaultvalue
2268 ):
2269 ):
2269 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2270 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2270 # TODO: no idea how to process unsupported defaultvalue types
2271 # TODO: no idea how to process unsupported defaultvalue types
2271 matched = True
2272 matched = True
2272 fm.end()
2273 fm.end()
2273 if matched:
2274 if matched:
2274 return 0
2275 return 0
2275 return 1
2276 return 1
2276
2277
2277
2278
2278 @command(
2279 @command(
2279 b'continue',
2280 b'continue',
2280 dryrunopts,
2281 dryrunopts,
2281 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2282 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2282 helpbasic=True,
2283 helpbasic=True,
2283 )
2284 )
2284 def continuecmd(ui, repo, **opts):
2285 def continuecmd(ui, repo, **opts):
2285 """resumes an interrupted operation (EXPERIMENTAL)
2286 """resumes an interrupted operation (EXPERIMENTAL)
2286
2287
2287 Finishes a multistep operation like graft, histedit, rebase, merge,
2288 Finishes a multistep operation like graft, histedit, rebase, merge,
2288 and unshelve if they are in an interrupted state.
2289 and unshelve if they are in an interrupted state.
2289
2290
2290 use --dry-run/-n to dry run the command.
2291 use --dry-run/-n to dry run the command.
2291 """
2292 """
2292 dryrun = opts.get('dry_run')
2293 dryrun = opts.get('dry_run')
2293 contstate = cmdutil.getunfinishedstate(repo)
2294 contstate = cmdutil.getunfinishedstate(repo)
2294 if not contstate:
2295 if not contstate:
2295 raise error.Abort(_(b'no operation in progress'))
2296 raise error.Abort(_(b'no operation in progress'))
2296 if not contstate.continuefunc:
2297 if not contstate.continuefunc:
2297 raise error.Abort(
2298 raise error.Abort(
2298 (
2299 (
2299 _(b"%s in progress but does not support 'hg continue'")
2300 _(b"%s in progress but does not support 'hg continue'")
2300 % (contstate._opname)
2301 % (contstate._opname)
2301 ),
2302 ),
2302 hint=contstate.continuemsg(),
2303 hint=contstate.continuemsg(),
2303 )
2304 )
2304 if dryrun:
2305 if dryrun:
2305 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2306 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2306 return
2307 return
2307 return contstate.continuefunc(ui, repo)
2308 return contstate.continuefunc(ui, repo)
2308
2309
2309
2310
2310 @command(
2311 @command(
2311 b'copy|cp',
2312 b'copy|cp',
2312 [
2313 [
2313 (b'', b'forget', None, _(b'unmark a file as copied')),
2314 (b'', b'forget', None, _(b'unmark a file as copied')),
2314 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2315 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2315 (
2316 (
2316 b'',
2317 b'',
2317 b'at-rev',
2318 b'at-rev',
2318 b'',
2319 b'',
2319 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2320 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2320 _(b'REV'),
2321 _(b'REV'),
2321 ),
2322 ),
2322 (
2323 (
2323 b'f',
2324 b'f',
2324 b'force',
2325 b'force',
2325 None,
2326 None,
2326 _(b'forcibly copy over an existing managed file'),
2327 _(b'forcibly copy over an existing managed file'),
2327 ),
2328 ),
2328 ]
2329 ]
2329 + walkopts
2330 + walkopts
2330 + dryrunopts,
2331 + dryrunopts,
2331 _(b'[OPTION]... SOURCE... DEST'),
2332 _(b'[OPTION]... SOURCE... DEST'),
2332 helpcategory=command.CATEGORY_FILE_CONTENTS,
2333 helpcategory=command.CATEGORY_FILE_CONTENTS,
2333 )
2334 )
2334 def copy(ui, repo, *pats, **opts):
2335 def copy(ui, repo, *pats, **opts):
2335 """mark files as copied for the next commit
2336 """mark files as copied for the next commit
2336
2337
2337 Mark dest as having copies of source files. If dest is a
2338 Mark dest as having copies of source files. If dest is a
2338 directory, copies are put in that directory. If dest is a file,
2339 directory, copies are put in that directory. If dest is a file,
2339 the source must be a single file.
2340 the source must be a single file.
2340
2341
2341 By default, this command copies the contents of files as they
2342 By default, this command copies the contents of files as they
2342 exist in the working directory. If invoked with -A/--after, the
2343 exist in the working directory. If invoked with -A/--after, the
2343 operation is recorded, but no copying is performed.
2344 operation is recorded, but no copying is performed.
2344
2345
2345 To undo marking a file as copied, use --forget. With that option,
2346 To undo marking a file as copied, use --forget. With that option,
2346 all given (positional) arguments are unmarked as copies. The destination
2347 all given (positional) arguments are unmarked as copies. The destination
2347 file(s) will be left in place (still tracked).
2348 file(s) will be left in place (still tracked).
2348
2349
2349 This command takes effect with the next commit by default.
2350 This command takes effect with the next commit by default.
2350
2351
2351 Returns 0 on success, 1 if errors are encountered.
2352 Returns 0 on success, 1 if errors are encountered.
2352 """
2353 """
2353 opts = pycompat.byteskwargs(opts)
2354 opts = pycompat.byteskwargs(opts)
2354 with repo.wlock():
2355 with repo.wlock():
2355 return cmdutil.copy(ui, repo, pats, opts)
2356 return cmdutil.copy(ui, repo, pats, opts)
2356
2357
2357
2358
2358 @command(
2359 @command(
2359 b'debugcommands',
2360 b'debugcommands',
2360 [],
2361 [],
2361 _(b'[COMMAND]'),
2362 _(b'[COMMAND]'),
2362 helpcategory=command.CATEGORY_HELP,
2363 helpcategory=command.CATEGORY_HELP,
2363 norepo=True,
2364 norepo=True,
2364 )
2365 )
2365 def debugcommands(ui, cmd=b'', *args):
2366 def debugcommands(ui, cmd=b'', *args):
2366 """list all available commands and options"""
2367 """list all available commands and options"""
2367 for cmd, vals in sorted(pycompat.iteritems(table)):
2368 for cmd, vals in sorted(pycompat.iteritems(table)):
2368 cmd = cmd.split(b'|')[0]
2369 cmd = cmd.split(b'|')[0]
2369 opts = b', '.join([i[1] for i in vals[1]])
2370 opts = b', '.join([i[1] for i in vals[1]])
2370 ui.write(b'%s: %s\n' % (cmd, opts))
2371 ui.write(b'%s: %s\n' % (cmd, opts))
2371
2372
2372
2373
2373 @command(
2374 @command(
2374 b'debugcomplete',
2375 b'debugcomplete',
2375 [(b'o', b'options', None, _(b'show the command options'))],
2376 [(b'o', b'options', None, _(b'show the command options'))],
2376 _(b'[-o] CMD'),
2377 _(b'[-o] CMD'),
2377 helpcategory=command.CATEGORY_HELP,
2378 helpcategory=command.CATEGORY_HELP,
2378 norepo=True,
2379 norepo=True,
2379 )
2380 )
2380 def debugcomplete(ui, cmd=b'', **opts):
2381 def debugcomplete(ui, cmd=b'', **opts):
2381 """returns the completion list associated with the given command"""
2382 """returns the completion list associated with the given command"""
2382
2383
2383 if opts.get('options'):
2384 if opts.get('options'):
2384 options = []
2385 options = []
2385 otables = [globalopts]
2386 otables = [globalopts]
2386 if cmd:
2387 if cmd:
2387 aliases, entry = cmdutil.findcmd(cmd, table, False)
2388 aliases, entry = cmdutil.findcmd(cmd, table, False)
2388 otables.append(entry[1])
2389 otables.append(entry[1])
2389 for t in otables:
2390 for t in otables:
2390 for o in t:
2391 for o in t:
2391 if b"(DEPRECATED)" in o[3]:
2392 if b"(DEPRECATED)" in o[3]:
2392 continue
2393 continue
2393 if o[0]:
2394 if o[0]:
2394 options.append(b'-%s' % o[0])
2395 options.append(b'-%s' % o[0])
2395 options.append(b'--%s' % o[1])
2396 options.append(b'--%s' % o[1])
2396 ui.write(b"%s\n" % b"\n".join(options))
2397 ui.write(b"%s\n" % b"\n".join(options))
2397 return
2398 return
2398
2399
2399 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2400 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2400 if ui.verbose:
2401 if ui.verbose:
2401 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2402 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2402 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2403 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2403
2404
2404
2405
2405 @command(
2406 @command(
2406 b'diff',
2407 b'diff',
2407 [
2408 [
2408 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2409 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2409 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2410 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2410 ]
2411 ]
2411 + diffopts
2412 + diffopts
2412 + diffopts2
2413 + diffopts2
2413 + walkopts
2414 + walkopts
2414 + subrepoopts,
2415 + subrepoopts,
2415 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2416 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2416 helpcategory=command.CATEGORY_FILE_CONTENTS,
2417 helpcategory=command.CATEGORY_FILE_CONTENTS,
2417 helpbasic=True,
2418 helpbasic=True,
2418 inferrepo=True,
2419 inferrepo=True,
2419 intents={INTENT_READONLY},
2420 intents={INTENT_READONLY},
2420 )
2421 )
2421 def diff(ui, repo, *pats, **opts):
2422 def diff(ui, repo, *pats, **opts):
2422 """diff repository (or selected files)
2423 """diff repository (or selected files)
2423
2424
2424 Show differences between revisions for the specified files.
2425 Show differences between revisions for the specified files.
2425
2426
2426 Differences between files are shown using the unified diff format.
2427 Differences between files are shown using the unified diff format.
2427
2428
2428 .. note::
2429 .. note::
2429
2430
2430 :hg:`diff` may generate unexpected results for merges, as it will
2431 :hg:`diff` may generate unexpected results for merges, as it will
2431 default to comparing against the working directory's first
2432 default to comparing against the working directory's first
2432 parent changeset if no revisions are specified.
2433 parent changeset if no revisions are specified.
2433
2434
2434 When two revision arguments are given, then changes are shown
2435 When two revision arguments are given, then changes are shown
2435 between those revisions. If only one revision is specified then
2436 between those revisions. If only one revision is specified then
2436 that revision is compared to the working directory, and, when no
2437 that revision is compared to the working directory, and, when no
2437 revisions are specified, the working directory files are compared
2438 revisions are specified, the working directory files are compared
2438 to its first parent.
2439 to its first parent.
2439
2440
2440 Alternatively you can specify -c/--change with a revision to see
2441 Alternatively you can specify -c/--change with a revision to see
2441 the changes in that changeset relative to its first parent.
2442 the changes in that changeset relative to its first parent.
2442
2443
2443 Without the -a/--text option, diff will avoid generating diffs of
2444 Without the -a/--text option, diff will avoid generating diffs of
2444 files it detects as binary. With -a, diff will generate a diff
2445 files it detects as binary. With -a, diff will generate a diff
2445 anyway, probably with undesirable results.
2446 anyway, probably with undesirable results.
2446
2447
2447 Use the -g/--git option to generate diffs in the git extended diff
2448 Use the -g/--git option to generate diffs in the git extended diff
2448 format. For more information, read :hg:`help diffs`.
2449 format. For more information, read :hg:`help diffs`.
2449
2450
2450 .. container:: verbose
2451 .. container:: verbose
2451
2452
2452 Examples:
2453 Examples:
2453
2454
2454 - compare a file in the current working directory to its parent::
2455 - compare a file in the current working directory to its parent::
2455
2456
2456 hg diff foo.c
2457 hg diff foo.c
2457
2458
2458 - compare two historical versions of a directory, with rename info::
2459 - compare two historical versions of a directory, with rename info::
2459
2460
2460 hg diff --git -r 1.0:1.2 lib/
2461 hg diff --git -r 1.0:1.2 lib/
2461
2462
2462 - get change stats relative to the last change on some date::
2463 - get change stats relative to the last change on some date::
2463
2464
2464 hg diff --stat -r "date('may 2')"
2465 hg diff --stat -r "date('may 2')"
2465
2466
2466 - diff all newly-added files that contain a keyword::
2467 - diff all newly-added files that contain a keyword::
2467
2468
2468 hg diff "set:added() and grep(GNU)"
2469 hg diff "set:added() and grep(GNU)"
2469
2470
2470 - compare a revision and its parents::
2471 - compare a revision and its parents::
2471
2472
2472 hg diff -c 9353 # compare against first parent
2473 hg diff -c 9353 # compare against first parent
2473 hg diff -r 9353^:9353 # same using revset syntax
2474 hg diff -r 9353^:9353 # same using revset syntax
2474 hg diff -r 9353^2:9353 # compare against the second parent
2475 hg diff -r 9353^2:9353 # compare against the second parent
2475
2476
2476 Returns 0 on success.
2477 Returns 0 on success.
2477 """
2478 """
2478
2479
2479 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2480 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2480 opts = pycompat.byteskwargs(opts)
2481 opts = pycompat.byteskwargs(opts)
2481 revs = opts.get(b'rev')
2482 revs = opts.get(b'rev')
2482 change = opts.get(b'change')
2483 change = opts.get(b'change')
2483 stat = opts.get(b'stat')
2484 stat = opts.get(b'stat')
2484 reverse = opts.get(b'reverse')
2485 reverse = opts.get(b'reverse')
2485
2486
2486 if change:
2487 if change:
2487 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2488 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2488 ctx2 = scmutil.revsingle(repo, change, None)
2489 ctx2 = scmutil.revsingle(repo, change, None)
2489 ctx1 = ctx2.p1()
2490 ctx1 = ctx2.p1()
2490 else:
2491 else:
2491 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2492 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2492 ctx1, ctx2 = scmutil.revpair(repo, revs)
2493 ctx1, ctx2 = scmutil.revpair(repo, revs)
2493
2494
2494 if reverse:
2495 if reverse:
2495 ctxleft = ctx2
2496 ctxleft = ctx2
2496 ctxright = ctx1
2497 ctxright = ctx1
2497 else:
2498 else:
2498 ctxleft = ctx1
2499 ctxleft = ctx1
2499 ctxright = ctx2
2500 ctxright = ctx2
2500
2501
2501 diffopts = patch.diffallopts(ui, opts)
2502 diffopts = patch.diffallopts(ui, opts)
2502 m = scmutil.match(ctx2, pats, opts)
2503 m = scmutil.match(ctx2, pats, opts)
2503 m = repo.narrowmatch(m)
2504 m = repo.narrowmatch(m)
2504 ui.pager(b'diff')
2505 ui.pager(b'diff')
2505 logcmdutil.diffordiffstat(
2506 logcmdutil.diffordiffstat(
2506 ui,
2507 ui,
2507 repo,
2508 repo,
2508 diffopts,
2509 diffopts,
2509 ctxleft,
2510 ctxleft,
2510 ctxright,
2511 ctxright,
2511 m,
2512 m,
2512 stat=stat,
2513 stat=stat,
2513 listsubrepos=opts.get(b'subrepos'),
2514 listsubrepos=opts.get(b'subrepos'),
2514 root=opts.get(b'root'),
2515 root=opts.get(b'root'),
2515 )
2516 )
2516
2517
2517
2518
2518 @command(
2519 @command(
2519 b'export',
2520 b'export',
2520 [
2521 [
2521 (
2522 (
2522 b'B',
2523 b'B',
2523 b'bookmark',
2524 b'bookmark',
2524 b'',
2525 b'',
2525 _(b'export changes only reachable by given bookmark'),
2526 _(b'export changes only reachable by given bookmark'),
2526 _(b'BOOKMARK'),
2527 _(b'BOOKMARK'),
2527 ),
2528 ),
2528 (
2529 (
2529 b'o',
2530 b'o',
2530 b'output',
2531 b'output',
2531 b'',
2532 b'',
2532 _(b'print output to file with formatted name'),
2533 _(b'print output to file with formatted name'),
2533 _(b'FORMAT'),
2534 _(b'FORMAT'),
2534 ),
2535 ),
2535 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2536 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2536 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2537 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2537 ]
2538 ]
2538 + diffopts
2539 + diffopts
2539 + formatteropts,
2540 + formatteropts,
2540 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2541 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2541 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2542 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2542 helpbasic=True,
2543 helpbasic=True,
2543 intents={INTENT_READONLY},
2544 intents={INTENT_READONLY},
2544 )
2545 )
2545 def export(ui, repo, *changesets, **opts):
2546 def export(ui, repo, *changesets, **opts):
2546 """dump the header and diffs for one or more changesets
2547 """dump the header and diffs for one or more changesets
2547
2548
2548 Print the changeset header and diffs for one or more revisions.
2549 Print the changeset header and diffs for one or more revisions.
2549 If no revision is given, the parent of the working directory is used.
2550 If no revision is given, the parent of the working directory is used.
2550
2551
2551 The information shown in the changeset header is: author, date,
2552 The information shown in the changeset header is: author, date,
2552 branch name (if non-default), changeset hash, parent(s) and commit
2553 branch name (if non-default), changeset hash, parent(s) and commit
2553 comment.
2554 comment.
2554
2555
2555 .. note::
2556 .. note::
2556
2557
2557 :hg:`export` may generate unexpected diff output for merge
2558 :hg:`export` may generate unexpected diff output for merge
2558 changesets, as it will compare the merge changeset against its
2559 changesets, as it will compare the merge changeset against its
2559 first parent only.
2560 first parent only.
2560
2561
2561 Output may be to a file, in which case the name of the file is
2562 Output may be to a file, in which case the name of the file is
2562 given using a template string. See :hg:`help templates`. In addition
2563 given using a template string. See :hg:`help templates`. In addition
2563 to the common template keywords, the following formatting rules are
2564 to the common template keywords, the following formatting rules are
2564 supported:
2565 supported:
2565
2566
2566 :``%%``: literal "%" character
2567 :``%%``: literal "%" character
2567 :``%H``: changeset hash (40 hexadecimal digits)
2568 :``%H``: changeset hash (40 hexadecimal digits)
2568 :``%N``: number of patches being generated
2569 :``%N``: number of patches being generated
2569 :``%R``: changeset revision number
2570 :``%R``: changeset revision number
2570 :``%b``: basename of the exporting repository
2571 :``%b``: basename of the exporting repository
2571 :``%h``: short-form changeset hash (12 hexadecimal digits)
2572 :``%h``: short-form changeset hash (12 hexadecimal digits)
2572 :``%m``: first line of the commit message (only alphanumeric characters)
2573 :``%m``: first line of the commit message (only alphanumeric characters)
2573 :``%n``: zero-padded sequence number, starting at 1
2574 :``%n``: zero-padded sequence number, starting at 1
2574 :``%r``: zero-padded changeset revision number
2575 :``%r``: zero-padded changeset revision number
2575 :``\\``: literal "\\" character
2576 :``\\``: literal "\\" character
2576
2577
2577 Without the -a/--text option, export will avoid generating diffs
2578 Without the -a/--text option, export will avoid generating diffs
2578 of files it detects as binary. With -a, export will generate a
2579 of files it detects as binary. With -a, export will generate a
2579 diff anyway, probably with undesirable results.
2580 diff anyway, probably with undesirable results.
2580
2581
2581 With -B/--bookmark changesets reachable by the given bookmark are
2582 With -B/--bookmark changesets reachable by the given bookmark are
2582 selected.
2583 selected.
2583
2584
2584 Use the -g/--git option to generate diffs in the git extended diff
2585 Use the -g/--git option to generate diffs in the git extended diff
2585 format. See :hg:`help diffs` for more information.
2586 format. See :hg:`help diffs` for more information.
2586
2587
2587 With the --switch-parent option, the diff will be against the
2588 With the --switch-parent option, the diff will be against the
2588 second parent. It can be useful to review a merge.
2589 second parent. It can be useful to review a merge.
2589
2590
2590 .. container:: verbose
2591 .. container:: verbose
2591
2592
2592 Template:
2593 Template:
2593
2594
2594 The following keywords are supported in addition to the common template
2595 The following keywords are supported in addition to the common template
2595 keywords and functions. See also :hg:`help templates`.
2596 keywords and functions. See also :hg:`help templates`.
2596
2597
2597 :diff: String. Diff content.
2598 :diff: String. Diff content.
2598 :parents: List of strings. Parent nodes of the changeset.
2599 :parents: List of strings. Parent nodes of the changeset.
2599
2600
2600 Examples:
2601 Examples:
2601
2602
2602 - use export and import to transplant a bugfix to the current
2603 - use export and import to transplant a bugfix to the current
2603 branch::
2604 branch::
2604
2605
2605 hg export -r 9353 | hg import -
2606 hg export -r 9353 | hg import -
2606
2607
2607 - export all the changesets between two revisions to a file with
2608 - export all the changesets between two revisions to a file with
2608 rename information::
2609 rename information::
2609
2610
2610 hg export --git -r 123:150 > changes.txt
2611 hg export --git -r 123:150 > changes.txt
2611
2612
2612 - split outgoing changes into a series of patches with
2613 - split outgoing changes into a series of patches with
2613 descriptive names::
2614 descriptive names::
2614
2615
2615 hg export -r "outgoing()" -o "%n-%m.patch"
2616 hg export -r "outgoing()" -o "%n-%m.patch"
2616
2617
2617 Returns 0 on success.
2618 Returns 0 on success.
2618 """
2619 """
2619 opts = pycompat.byteskwargs(opts)
2620 opts = pycompat.byteskwargs(opts)
2620 bookmark = opts.get(b'bookmark')
2621 bookmark = opts.get(b'bookmark')
2621 changesets += tuple(opts.get(b'rev', []))
2622 changesets += tuple(opts.get(b'rev', []))
2622
2623
2623 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2624 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2624
2625
2625 if bookmark:
2626 if bookmark:
2626 if bookmark not in repo._bookmarks:
2627 if bookmark not in repo._bookmarks:
2627 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2628 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2628
2629
2629 revs = scmutil.bookmarkrevs(repo, bookmark)
2630 revs = scmutil.bookmarkrevs(repo, bookmark)
2630 else:
2631 else:
2631 if not changesets:
2632 if not changesets:
2632 changesets = [b'.']
2633 changesets = [b'.']
2633
2634
2634 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2635 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2635 revs = scmutil.revrange(repo, changesets)
2636 revs = scmutil.revrange(repo, changesets)
2636
2637
2637 if not revs:
2638 if not revs:
2638 raise error.Abort(_(b"export requires at least one changeset"))
2639 raise error.Abort(_(b"export requires at least one changeset"))
2639 if len(revs) > 1:
2640 if len(revs) > 1:
2640 ui.note(_(b'exporting patches:\n'))
2641 ui.note(_(b'exporting patches:\n'))
2641 else:
2642 else:
2642 ui.note(_(b'exporting patch:\n'))
2643 ui.note(_(b'exporting patch:\n'))
2643
2644
2644 fntemplate = opts.get(b'output')
2645 fntemplate = opts.get(b'output')
2645 if cmdutil.isstdiofilename(fntemplate):
2646 if cmdutil.isstdiofilename(fntemplate):
2646 fntemplate = b''
2647 fntemplate = b''
2647
2648
2648 if fntemplate:
2649 if fntemplate:
2649 fm = formatter.nullformatter(ui, b'export', opts)
2650 fm = formatter.nullformatter(ui, b'export', opts)
2650 else:
2651 else:
2651 ui.pager(b'export')
2652 ui.pager(b'export')
2652 fm = ui.formatter(b'export', opts)
2653 fm = ui.formatter(b'export', opts)
2653 with fm:
2654 with fm:
2654 cmdutil.export(
2655 cmdutil.export(
2655 repo,
2656 repo,
2656 revs,
2657 revs,
2657 fm,
2658 fm,
2658 fntemplate=fntemplate,
2659 fntemplate=fntemplate,
2659 switch_parent=opts.get(b'switch_parent'),
2660 switch_parent=opts.get(b'switch_parent'),
2660 opts=patch.diffallopts(ui, opts),
2661 opts=patch.diffallopts(ui, opts),
2661 )
2662 )
2662
2663
2663
2664
2664 @command(
2665 @command(
2665 b'files',
2666 b'files',
2666 [
2667 [
2667 (
2668 (
2668 b'r',
2669 b'r',
2669 b'rev',
2670 b'rev',
2670 b'',
2671 b'',
2671 _(b'search the repository as it is in REV'),
2672 _(b'search the repository as it is in REV'),
2672 _(b'REV'),
2673 _(b'REV'),
2673 ),
2674 ),
2674 (
2675 (
2675 b'0',
2676 b'0',
2676 b'print0',
2677 b'print0',
2677 None,
2678 None,
2678 _(b'end filenames with NUL, for use with xargs'),
2679 _(b'end filenames with NUL, for use with xargs'),
2679 ),
2680 ),
2680 ]
2681 ]
2681 + walkopts
2682 + walkopts
2682 + formatteropts
2683 + formatteropts
2683 + subrepoopts,
2684 + subrepoopts,
2684 _(b'[OPTION]... [FILE]...'),
2685 _(b'[OPTION]... [FILE]...'),
2685 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2686 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2686 intents={INTENT_READONLY},
2687 intents={INTENT_READONLY},
2687 )
2688 )
2688 def files(ui, repo, *pats, **opts):
2689 def files(ui, repo, *pats, **opts):
2689 """list tracked files
2690 """list tracked files
2690
2691
2691 Print files under Mercurial control in the working directory or
2692 Print files under Mercurial control in the working directory or
2692 specified revision for given files (excluding removed files).
2693 specified revision for given files (excluding removed files).
2693 Files can be specified as filenames or filesets.
2694 Files can be specified as filenames or filesets.
2694
2695
2695 If no files are given to match, this command prints the names
2696 If no files are given to match, this command prints the names
2696 of all files under Mercurial control.
2697 of all files under Mercurial control.
2697
2698
2698 .. container:: verbose
2699 .. container:: verbose
2699
2700
2700 Template:
2701 Template:
2701
2702
2702 The following keywords are supported in addition to the common template
2703 The following keywords are supported in addition to the common template
2703 keywords and functions. See also :hg:`help templates`.
2704 keywords and functions. See also :hg:`help templates`.
2704
2705
2705 :flags: String. Character denoting file's symlink and executable bits.
2706 :flags: String. Character denoting file's symlink and executable bits.
2706 :path: String. Repository-absolute path of the file.
2707 :path: String. Repository-absolute path of the file.
2707 :size: Integer. Size of the file in bytes.
2708 :size: Integer. Size of the file in bytes.
2708
2709
2709 Examples:
2710 Examples:
2710
2711
2711 - list all files under the current directory::
2712 - list all files under the current directory::
2712
2713
2713 hg files .
2714 hg files .
2714
2715
2715 - shows sizes and flags for current revision::
2716 - shows sizes and flags for current revision::
2716
2717
2717 hg files -vr .
2718 hg files -vr .
2718
2719
2719 - list all files named README::
2720 - list all files named README::
2720
2721
2721 hg files -I "**/README"
2722 hg files -I "**/README"
2722
2723
2723 - list all binary files::
2724 - list all binary files::
2724
2725
2725 hg files "set:binary()"
2726 hg files "set:binary()"
2726
2727
2727 - find files containing a regular expression::
2728 - find files containing a regular expression::
2728
2729
2729 hg files "set:grep('bob')"
2730 hg files "set:grep('bob')"
2730
2731
2731 - search tracked file contents with xargs and grep::
2732 - search tracked file contents with xargs and grep::
2732
2733
2733 hg files -0 | xargs -0 grep foo
2734 hg files -0 | xargs -0 grep foo
2734
2735
2735 See :hg:`help patterns` and :hg:`help filesets` for more information
2736 See :hg:`help patterns` and :hg:`help filesets` for more information
2736 on specifying file patterns.
2737 on specifying file patterns.
2737
2738
2738 Returns 0 if a match is found, 1 otherwise.
2739 Returns 0 if a match is found, 1 otherwise.
2739
2740
2740 """
2741 """
2741
2742
2742 opts = pycompat.byteskwargs(opts)
2743 opts = pycompat.byteskwargs(opts)
2743 rev = opts.get(b'rev')
2744 rev = opts.get(b'rev')
2744 if rev:
2745 if rev:
2745 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2746 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2746 ctx = scmutil.revsingle(repo, rev, None)
2747 ctx = scmutil.revsingle(repo, rev, None)
2747
2748
2748 end = b'\n'
2749 end = b'\n'
2749 if opts.get(b'print0'):
2750 if opts.get(b'print0'):
2750 end = b'\0'
2751 end = b'\0'
2751 fmt = b'%s' + end
2752 fmt = b'%s' + end
2752
2753
2753 m = scmutil.match(ctx, pats, opts)
2754 m = scmutil.match(ctx, pats, opts)
2754 ui.pager(b'files')
2755 ui.pager(b'files')
2755 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2756 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2756 with ui.formatter(b'files', opts) as fm:
2757 with ui.formatter(b'files', opts) as fm:
2757 return cmdutil.files(
2758 return cmdutil.files(
2758 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2759 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2759 )
2760 )
2760
2761
2761
2762
2762 @command(
2763 @command(
2763 b'forget',
2764 b'forget',
2764 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2765 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2765 + walkopts
2766 + walkopts
2766 + dryrunopts,
2767 + dryrunopts,
2767 _(b'[OPTION]... FILE...'),
2768 _(b'[OPTION]... FILE...'),
2768 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2769 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2769 helpbasic=True,
2770 helpbasic=True,
2770 inferrepo=True,
2771 inferrepo=True,
2771 )
2772 )
2772 def forget(ui, repo, *pats, **opts):
2773 def forget(ui, repo, *pats, **opts):
2773 """forget the specified files on the next commit
2774 """forget the specified files on the next commit
2774
2775
2775 Mark the specified files so they will no longer be tracked
2776 Mark the specified files so they will no longer be tracked
2776 after the next commit.
2777 after the next commit.
2777
2778
2778 This only removes files from the current branch, not from the
2779 This only removes files from the current branch, not from the
2779 entire project history, and it does not delete them from the
2780 entire project history, and it does not delete them from the
2780 working directory.
2781 working directory.
2781
2782
2782 To delete the file from the working directory, see :hg:`remove`.
2783 To delete the file from the working directory, see :hg:`remove`.
2783
2784
2784 To undo a forget before the next commit, see :hg:`add`.
2785 To undo a forget before the next commit, see :hg:`add`.
2785
2786
2786 .. container:: verbose
2787 .. container:: verbose
2787
2788
2788 Examples:
2789 Examples:
2789
2790
2790 - forget newly-added binary files::
2791 - forget newly-added binary files::
2791
2792
2792 hg forget "set:added() and binary()"
2793 hg forget "set:added() and binary()"
2793
2794
2794 - forget files that would be excluded by .hgignore::
2795 - forget files that would be excluded by .hgignore::
2795
2796
2796 hg forget "set:hgignore()"
2797 hg forget "set:hgignore()"
2797
2798
2798 Returns 0 on success.
2799 Returns 0 on success.
2799 """
2800 """
2800
2801
2801 opts = pycompat.byteskwargs(opts)
2802 opts = pycompat.byteskwargs(opts)
2802 if not pats:
2803 if not pats:
2803 raise error.Abort(_(b'no files specified'))
2804 raise error.Abort(_(b'no files specified'))
2804
2805
2805 m = scmutil.match(repo[None], pats, opts)
2806 m = scmutil.match(repo[None], pats, opts)
2806 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2807 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2807 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2808 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2808 rejected = cmdutil.forget(
2809 rejected = cmdutil.forget(
2809 ui,
2810 ui,
2810 repo,
2811 repo,
2811 m,
2812 m,
2812 prefix=b"",
2813 prefix=b"",
2813 uipathfn=uipathfn,
2814 uipathfn=uipathfn,
2814 explicitonly=False,
2815 explicitonly=False,
2815 dryrun=dryrun,
2816 dryrun=dryrun,
2816 interactive=interactive,
2817 interactive=interactive,
2817 )[0]
2818 )[0]
2818 return rejected and 1 or 0
2819 return rejected and 1 or 0
2819
2820
2820
2821
2821 @command(
2822 @command(
2822 b'graft',
2823 b'graft',
2823 [
2824 [
2824 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2825 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2825 (
2826 (
2826 b'',
2827 b'',
2827 b'base',
2828 b'base',
2828 b'',
2829 b'',
2829 _(b'base revision when doing the graft merge (ADVANCED)'),
2830 _(b'base revision when doing the graft merge (ADVANCED)'),
2830 _(b'REV'),
2831 _(b'REV'),
2831 ),
2832 ),
2832 (b'c', b'continue', False, _(b'resume interrupted graft')),
2833 (b'c', b'continue', False, _(b'resume interrupted graft')),
2833 (b'', b'stop', False, _(b'stop interrupted graft')),
2834 (b'', b'stop', False, _(b'stop interrupted graft')),
2834 (b'', b'abort', False, _(b'abort interrupted graft')),
2835 (b'', b'abort', False, _(b'abort interrupted graft')),
2835 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2836 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2836 (b'', b'log', None, _(b'append graft info to log message')),
2837 (b'', b'log', None, _(b'append graft info to log message')),
2837 (
2838 (
2838 b'',
2839 b'',
2839 b'no-commit',
2840 b'no-commit',
2840 None,
2841 None,
2841 _(b"don't commit, just apply the changes in working directory"),
2842 _(b"don't commit, just apply the changes in working directory"),
2842 ),
2843 ),
2843 (b'f', b'force', False, _(b'force graft')),
2844 (b'f', b'force', False, _(b'force graft')),
2844 (
2845 (
2845 b'D',
2846 b'D',
2846 b'currentdate',
2847 b'currentdate',
2847 False,
2848 False,
2848 _(b'record the current date as commit date'),
2849 _(b'record the current date as commit date'),
2849 ),
2850 ),
2850 (
2851 (
2851 b'U',
2852 b'U',
2852 b'currentuser',
2853 b'currentuser',
2853 False,
2854 False,
2854 _(b'record the current user as committer'),
2855 _(b'record the current user as committer'),
2855 ),
2856 ),
2856 ]
2857 ]
2857 + commitopts2
2858 + commitopts2
2858 + mergetoolopts
2859 + mergetoolopts
2859 + dryrunopts,
2860 + dryrunopts,
2860 _(b'[OPTION]... [-r REV]... REV...'),
2861 _(b'[OPTION]... [-r REV]... REV...'),
2861 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2862 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2862 )
2863 )
2863 def graft(ui, repo, *revs, **opts):
2864 def graft(ui, repo, *revs, **opts):
2864 '''copy changes from other branches onto the current branch
2865 '''copy changes from other branches onto the current branch
2865
2866
2866 This command uses Mercurial's merge logic to copy individual
2867 This command uses Mercurial's merge logic to copy individual
2867 changes from other branches without merging branches in the
2868 changes from other branches without merging branches in the
2868 history graph. This is sometimes known as 'backporting' or
2869 history graph. This is sometimes known as 'backporting' or
2869 'cherry-picking'. By default, graft will copy user, date, and
2870 'cherry-picking'. By default, graft will copy user, date, and
2870 description from the source changesets.
2871 description from the source changesets.
2871
2872
2872 Changesets that are ancestors of the current revision, that have
2873 Changesets that are ancestors of the current revision, that have
2873 already been grafted, or that are merges will be skipped.
2874 already been grafted, or that are merges will be skipped.
2874
2875
2875 If --log is specified, log messages will have a comment appended
2876 If --log is specified, log messages will have a comment appended
2876 of the form::
2877 of the form::
2877
2878
2878 (grafted from CHANGESETHASH)
2879 (grafted from CHANGESETHASH)
2879
2880
2880 If --force is specified, revisions will be grafted even if they
2881 If --force is specified, revisions will be grafted even if they
2881 are already ancestors of, or have been grafted to, the destination.
2882 are already ancestors of, or have been grafted to, the destination.
2882 This is useful when the revisions have since been backed out.
2883 This is useful when the revisions have since been backed out.
2883
2884
2884 If a graft merge results in conflicts, the graft process is
2885 If a graft merge results in conflicts, the graft process is
2885 interrupted so that the current merge can be manually resolved.
2886 interrupted so that the current merge can be manually resolved.
2886 Once all conflicts are addressed, the graft process can be
2887 Once all conflicts are addressed, the graft process can be
2887 continued with the -c/--continue option.
2888 continued with the -c/--continue option.
2888
2889
2889 The -c/--continue option reapplies all the earlier options.
2890 The -c/--continue option reapplies all the earlier options.
2890
2891
2891 .. container:: verbose
2892 .. container:: verbose
2892
2893
2893 The --base option exposes more of how graft internally uses merge with a
2894 The --base option exposes more of how graft internally uses merge with a
2894 custom base revision. --base can be used to specify another ancestor than
2895 custom base revision. --base can be used to specify another ancestor than
2895 the first and only parent.
2896 the first and only parent.
2896
2897
2897 The command::
2898 The command::
2898
2899
2899 hg graft -r 345 --base 234
2900 hg graft -r 345 --base 234
2900
2901
2901 is thus pretty much the same as::
2902 is thus pretty much the same as::
2902
2903
2903 hg diff -r 234 -r 345 | hg import
2904 hg diff -r 234 -r 345 | hg import
2904
2905
2905 but using merge to resolve conflicts and track moved files.
2906 but using merge to resolve conflicts and track moved files.
2906
2907
2907 The result of a merge can thus be backported as a single commit by
2908 The result of a merge can thus be backported as a single commit by
2908 specifying one of the merge parents as base, and thus effectively
2909 specifying one of the merge parents as base, and thus effectively
2909 grafting the changes from the other side.
2910 grafting the changes from the other side.
2910
2911
2911 It is also possible to collapse multiple changesets and clean up history
2912 It is also possible to collapse multiple changesets and clean up history
2912 by specifying another ancestor as base, much like rebase --collapse
2913 by specifying another ancestor as base, much like rebase --collapse
2913 --keep.
2914 --keep.
2914
2915
2915 The commit message can be tweaked after the fact using commit --amend .
2916 The commit message can be tweaked after the fact using commit --amend .
2916
2917
2917 For using non-ancestors as the base to backout changes, see the backout
2918 For using non-ancestors as the base to backout changes, see the backout
2918 command and the hidden --parent option.
2919 command and the hidden --parent option.
2919
2920
2920 .. container:: verbose
2921 .. container:: verbose
2921
2922
2922 Examples:
2923 Examples:
2923
2924
2924 - copy a single change to the stable branch and edit its description::
2925 - copy a single change to the stable branch and edit its description::
2925
2926
2926 hg update stable
2927 hg update stable
2927 hg graft --edit 9393
2928 hg graft --edit 9393
2928
2929
2929 - graft a range of changesets with one exception, updating dates::
2930 - graft a range of changesets with one exception, updating dates::
2930
2931
2931 hg graft -D "2085::2093 and not 2091"
2932 hg graft -D "2085::2093 and not 2091"
2932
2933
2933 - continue a graft after resolving conflicts::
2934 - continue a graft after resolving conflicts::
2934
2935
2935 hg graft -c
2936 hg graft -c
2936
2937
2937 - show the source of a grafted changeset::
2938 - show the source of a grafted changeset::
2938
2939
2939 hg log --debug -r .
2940 hg log --debug -r .
2940
2941
2941 - show revisions sorted by date::
2942 - show revisions sorted by date::
2942
2943
2943 hg log -r "sort(all(), date)"
2944 hg log -r "sort(all(), date)"
2944
2945
2945 - backport the result of a merge as a single commit::
2946 - backport the result of a merge as a single commit::
2946
2947
2947 hg graft -r 123 --base 123^
2948 hg graft -r 123 --base 123^
2948
2949
2949 - land a feature branch as one changeset::
2950 - land a feature branch as one changeset::
2950
2951
2951 hg up -cr default
2952 hg up -cr default
2952 hg graft -r featureX --base "ancestor('featureX', 'default')"
2953 hg graft -r featureX --base "ancestor('featureX', 'default')"
2953
2954
2954 See :hg:`help revisions` for more about specifying revisions.
2955 See :hg:`help revisions` for more about specifying revisions.
2955
2956
2956 Returns 0 on successful completion, 1 if there are unresolved files.
2957 Returns 0 on successful completion, 1 if there are unresolved files.
2957 '''
2958 '''
2958 with repo.wlock():
2959 with repo.wlock():
2959 return _dograft(ui, repo, *revs, **opts)
2960 return _dograft(ui, repo, *revs, **opts)
2960
2961
2961
2962
2962 def _dograft(ui, repo, *revs, **opts):
2963 def _dograft(ui, repo, *revs, **opts):
2963 opts = pycompat.byteskwargs(opts)
2964 opts = pycompat.byteskwargs(opts)
2964 if revs and opts.get(b'rev'):
2965 if revs and opts.get(b'rev'):
2965 ui.warn(
2966 ui.warn(
2966 _(
2967 _(
2967 b'warning: inconsistent use of --rev might give unexpected '
2968 b'warning: inconsistent use of --rev might give unexpected '
2968 b'revision ordering!\n'
2969 b'revision ordering!\n'
2969 )
2970 )
2970 )
2971 )
2971
2972
2972 revs = list(revs)
2973 revs = list(revs)
2973 revs.extend(opts.get(b'rev'))
2974 revs.extend(opts.get(b'rev'))
2974 # a dict of data to be stored in state file
2975 # a dict of data to be stored in state file
2975 statedata = {}
2976 statedata = {}
2976 # list of new nodes created by ongoing graft
2977 # list of new nodes created by ongoing graft
2977 statedata[b'newnodes'] = []
2978 statedata[b'newnodes'] = []
2978
2979
2979 cmdutil.resolvecommitoptions(ui, opts)
2980 cmdutil.resolvecommitoptions(ui, opts)
2980
2981
2981 editor = cmdutil.getcommiteditor(
2982 editor = cmdutil.getcommiteditor(
2982 editform=b'graft', **pycompat.strkwargs(opts)
2983 editform=b'graft', **pycompat.strkwargs(opts)
2983 )
2984 )
2984
2985
2985 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2986 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2986
2987
2987 cont = False
2988 cont = False
2988 if opts.get(b'no_commit'):
2989 if opts.get(b'no_commit'):
2989 cmdutil.check_incompatible_arguments(
2990 cmdutil.check_incompatible_arguments(
2990 opts,
2991 opts,
2991 b'no_commit',
2992 b'no_commit',
2992 [b'edit', b'currentuser', b'currentdate', b'log'],
2993 [b'edit', b'currentuser', b'currentdate', b'log'],
2993 )
2994 )
2994
2995
2995 graftstate = statemod.cmdstate(repo, b'graftstate')
2996 graftstate = statemod.cmdstate(repo, b'graftstate')
2996
2997
2997 if opts.get(b'stop'):
2998 if opts.get(b'stop'):
2998 cmdutil.check_incompatible_arguments(
2999 cmdutil.check_incompatible_arguments(
2999 opts,
3000 opts,
3000 b'stop',
3001 b'stop',
3001 [
3002 [
3002 b'edit',
3003 b'edit',
3003 b'log',
3004 b'log',
3004 b'user',
3005 b'user',
3005 b'date',
3006 b'date',
3006 b'currentdate',
3007 b'currentdate',
3007 b'currentuser',
3008 b'currentuser',
3008 b'rev',
3009 b'rev',
3009 ],
3010 ],
3010 )
3011 )
3011 return _stopgraft(ui, repo, graftstate)
3012 return _stopgraft(ui, repo, graftstate)
3012 elif opts.get(b'abort'):
3013 elif opts.get(b'abort'):
3013 cmdutil.check_incompatible_arguments(
3014 cmdutil.check_incompatible_arguments(
3014 opts,
3015 opts,
3015 b'abort',
3016 b'abort',
3016 [
3017 [
3017 b'edit',
3018 b'edit',
3018 b'log',
3019 b'log',
3019 b'user',
3020 b'user',
3020 b'date',
3021 b'date',
3021 b'currentdate',
3022 b'currentdate',
3022 b'currentuser',
3023 b'currentuser',
3023 b'rev',
3024 b'rev',
3024 ],
3025 ],
3025 )
3026 )
3026 return cmdutil.abortgraft(ui, repo, graftstate)
3027 return cmdutil.abortgraft(ui, repo, graftstate)
3027 elif opts.get(b'continue'):
3028 elif opts.get(b'continue'):
3028 cont = True
3029 cont = True
3029 if revs:
3030 if revs:
3030 raise error.Abort(_(b"can't specify --continue and revisions"))
3031 raise error.Abort(_(b"can't specify --continue and revisions"))
3031 # read in unfinished revisions
3032 # read in unfinished revisions
3032 if graftstate.exists():
3033 if graftstate.exists():
3033 statedata = cmdutil.readgraftstate(repo, graftstate)
3034 statedata = cmdutil.readgraftstate(repo, graftstate)
3034 if statedata.get(b'date'):
3035 if statedata.get(b'date'):
3035 opts[b'date'] = statedata[b'date']
3036 opts[b'date'] = statedata[b'date']
3036 if statedata.get(b'user'):
3037 if statedata.get(b'user'):
3037 opts[b'user'] = statedata[b'user']
3038 opts[b'user'] = statedata[b'user']
3038 if statedata.get(b'log'):
3039 if statedata.get(b'log'):
3039 opts[b'log'] = True
3040 opts[b'log'] = True
3040 if statedata.get(b'no_commit'):
3041 if statedata.get(b'no_commit'):
3041 opts[b'no_commit'] = statedata.get(b'no_commit')
3042 opts[b'no_commit'] = statedata.get(b'no_commit')
3042 if statedata.get(b'base'):
3043 if statedata.get(b'base'):
3043 opts[b'base'] = statedata.get(b'base')
3044 opts[b'base'] = statedata.get(b'base')
3044 nodes = statedata[b'nodes']
3045 nodes = statedata[b'nodes']
3045 revs = [repo[node].rev() for node in nodes]
3046 revs = [repo[node].rev() for node in nodes]
3046 else:
3047 else:
3047 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3048 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3048 else:
3049 else:
3049 if not revs:
3050 if not revs:
3050 raise error.Abort(_(b'no revisions specified'))
3051 raise error.Abort(_(b'no revisions specified'))
3051 cmdutil.checkunfinished(repo)
3052 cmdutil.checkunfinished(repo)
3052 cmdutil.bailifchanged(repo)
3053 cmdutil.bailifchanged(repo)
3053 revs = scmutil.revrange(repo, revs)
3054 revs = scmutil.revrange(repo, revs)
3054
3055
3055 skipped = set()
3056 skipped = set()
3056 basectx = None
3057 basectx = None
3057 if opts.get(b'base'):
3058 if opts.get(b'base'):
3058 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3059 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3059 if basectx is None:
3060 if basectx is None:
3060 # check for merges
3061 # check for merges
3061 for rev in repo.revs(b'%ld and merge()', revs):
3062 for rev in repo.revs(b'%ld and merge()', revs):
3062 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3063 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3063 skipped.add(rev)
3064 skipped.add(rev)
3064 revs = [r for r in revs if r not in skipped]
3065 revs = [r for r in revs if r not in skipped]
3065 if not revs:
3066 if not revs:
3066 return -1
3067 return -1
3067 if basectx is not None and len(revs) != 1:
3068 if basectx is not None and len(revs) != 1:
3068 raise error.Abort(_(b'only one revision allowed with --base '))
3069 raise error.Abort(_(b'only one revision allowed with --base '))
3069
3070
3070 # Don't check in the --continue case, in effect retaining --force across
3071 # Don't check in the --continue case, in effect retaining --force across
3071 # --continues. That's because without --force, any revisions we decided to
3072 # --continues. That's because without --force, any revisions we decided to
3072 # skip would have been filtered out here, so they wouldn't have made their
3073 # skip would have been filtered out here, so they wouldn't have made their
3073 # way to the graftstate. With --force, any revisions we would have otherwise
3074 # way to the graftstate. With --force, any revisions we would have otherwise
3074 # skipped would not have been filtered out, and if they hadn't been applied
3075 # skipped would not have been filtered out, and if they hadn't been applied
3075 # already, they'd have been in the graftstate.
3076 # already, they'd have been in the graftstate.
3076 if not (cont or opts.get(b'force')) and basectx is None:
3077 if not (cont or opts.get(b'force')) and basectx is None:
3077 # check for ancestors of dest branch
3078 # check for ancestors of dest branch
3078 ancestors = repo.revs(b'%ld & (::.)', revs)
3079 ancestors = repo.revs(b'%ld & (::.)', revs)
3079 for rev in ancestors:
3080 for rev in ancestors:
3080 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3081 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3081
3082
3082 revs = [r for r in revs if r not in ancestors]
3083 revs = [r for r in revs if r not in ancestors]
3083
3084
3084 if not revs:
3085 if not revs:
3085 return -1
3086 return -1
3086
3087
3087 # analyze revs for earlier grafts
3088 # analyze revs for earlier grafts
3088 ids = {}
3089 ids = {}
3089 for ctx in repo.set(b"%ld", revs):
3090 for ctx in repo.set(b"%ld", revs):
3090 ids[ctx.hex()] = ctx.rev()
3091 ids[ctx.hex()] = ctx.rev()
3091 n = ctx.extra().get(b'source')
3092 n = ctx.extra().get(b'source')
3092 if n:
3093 if n:
3093 ids[n] = ctx.rev()
3094 ids[n] = ctx.rev()
3094
3095
3095 # check ancestors for earlier grafts
3096 # check ancestors for earlier grafts
3096 ui.debug(b'scanning for duplicate grafts\n')
3097 ui.debug(b'scanning for duplicate grafts\n')
3097
3098
3098 # The only changesets we can be sure doesn't contain grafts of any
3099 # The only changesets we can be sure doesn't contain grafts of any
3099 # revs, are the ones that are common ancestors of *all* revs:
3100 # revs, are the ones that are common ancestors of *all* revs:
3100 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3101 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3101 ctx = repo[rev]
3102 ctx = repo[rev]
3102 n = ctx.extra().get(b'source')
3103 n = ctx.extra().get(b'source')
3103 if n in ids:
3104 if n in ids:
3104 try:
3105 try:
3105 r = repo[n].rev()
3106 r = repo[n].rev()
3106 except error.RepoLookupError:
3107 except error.RepoLookupError:
3107 r = None
3108 r = None
3108 if r in revs:
3109 if r in revs:
3109 ui.warn(
3110 ui.warn(
3110 _(
3111 _(
3111 b'skipping revision %d:%s '
3112 b'skipping revision %d:%s '
3112 b'(already grafted to %d:%s)\n'
3113 b'(already grafted to %d:%s)\n'
3113 )
3114 )
3114 % (r, repo[r], rev, ctx)
3115 % (r, repo[r], rev, ctx)
3115 )
3116 )
3116 revs.remove(r)
3117 revs.remove(r)
3117 elif ids[n] in revs:
3118 elif ids[n] in revs:
3118 if r is None:
3119 if r is None:
3119 ui.warn(
3120 ui.warn(
3120 _(
3121 _(
3121 b'skipping already grafted revision %d:%s '
3122 b'skipping already grafted revision %d:%s '
3122 b'(%d:%s also has unknown origin %s)\n'
3123 b'(%d:%s also has unknown origin %s)\n'
3123 )
3124 )
3124 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3125 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3125 )
3126 )
3126 else:
3127 else:
3127 ui.warn(
3128 ui.warn(
3128 _(
3129 _(
3129 b'skipping already grafted revision %d:%s '
3130 b'skipping already grafted revision %d:%s '
3130 b'(%d:%s also has origin %d:%s)\n'
3131 b'(%d:%s also has origin %d:%s)\n'
3131 )
3132 )
3132 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3133 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3133 )
3134 )
3134 revs.remove(ids[n])
3135 revs.remove(ids[n])
3135 elif ctx.hex() in ids:
3136 elif ctx.hex() in ids:
3136 r = ids[ctx.hex()]
3137 r = ids[ctx.hex()]
3137 if r in revs:
3138 if r in revs:
3138 ui.warn(
3139 ui.warn(
3139 _(
3140 _(
3140 b'skipping already grafted revision %d:%s '
3141 b'skipping already grafted revision %d:%s '
3141 b'(was grafted from %d:%s)\n'
3142 b'(was grafted from %d:%s)\n'
3142 )
3143 )
3143 % (r, repo[r], rev, ctx)
3144 % (r, repo[r], rev, ctx)
3144 )
3145 )
3145 revs.remove(r)
3146 revs.remove(r)
3146 if not revs:
3147 if not revs:
3147 return -1
3148 return -1
3148
3149
3149 if opts.get(b'no_commit'):
3150 if opts.get(b'no_commit'):
3150 statedata[b'no_commit'] = True
3151 statedata[b'no_commit'] = True
3151 if opts.get(b'base'):
3152 if opts.get(b'base'):
3152 statedata[b'base'] = opts[b'base']
3153 statedata[b'base'] = opts[b'base']
3153 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3154 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3154 desc = b'%d:%s "%s"' % (
3155 desc = b'%d:%s "%s"' % (
3155 ctx.rev(),
3156 ctx.rev(),
3156 ctx,
3157 ctx,
3157 ctx.description().split(b'\n', 1)[0],
3158 ctx.description().split(b'\n', 1)[0],
3158 )
3159 )
3159 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3160 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3160 if names:
3161 if names:
3161 desc += b' (%s)' % b' '.join(names)
3162 desc += b' (%s)' % b' '.join(names)
3162 ui.status(_(b'grafting %s\n') % desc)
3163 ui.status(_(b'grafting %s\n') % desc)
3163 if opts.get(b'dry_run'):
3164 if opts.get(b'dry_run'):
3164 continue
3165 continue
3165
3166
3166 source = ctx.extra().get(b'source')
3167 source = ctx.extra().get(b'source')
3167 extra = {}
3168 extra = {}
3168 if source:
3169 if source:
3169 extra[b'source'] = source
3170 extra[b'source'] = source
3170 extra[b'intermediate-source'] = ctx.hex()
3171 extra[b'intermediate-source'] = ctx.hex()
3171 else:
3172 else:
3172 extra[b'source'] = ctx.hex()
3173 extra[b'source'] = ctx.hex()
3173 user = ctx.user()
3174 user = ctx.user()
3174 if opts.get(b'user'):
3175 if opts.get(b'user'):
3175 user = opts[b'user']
3176 user = opts[b'user']
3176 statedata[b'user'] = user
3177 statedata[b'user'] = user
3177 date = ctx.date()
3178 date = ctx.date()
3178 if opts.get(b'date'):
3179 if opts.get(b'date'):
3179 date = opts[b'date']
3180 date = opts[b'date']
3180 statedata[b'date'] = date
3181 statedata[b'date'] = date
3181 message = ctx.description()
3182 message = ctx.description()
3182 if opts.get(b'log'):
3183 if opts.get(b'log'):
3183 message += b'\n(grafted from %s)' % ctx.hex()
3184 message += b'\n(grafted from %s)' % ctx.hex()
3184 statedata[b'log'] = True
3185 statedata[b'log'] = True
3185
3186
3186 # we don't merge the first commit when continuing
3187 # we don't merge the first commit when continuing
3187 if not cont:
3188 if not cont:
3188 # perform the graft merge with p1(rev) as 'ancestor'
3189 # perform the graft merge with p1(rev) as 'ancestor'
3189 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3190 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3190 base = ctx.p1() if basectx is None else basectx
3191 base = ctx.p1() if basectx is None else basectx
3191 with ui.configoverride(overrides, b'graft'):
3192 with ui.configoverride(overrides, b'graft'):
3192 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3193 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3193 # report any conflicts
3194 # report any conflicts
3194 if stats.unresolvedcount > 0:
3195 if stats.unresolvedcount > 0:
3195 # write out state for --continue
3196 # write out state for --continue
3196 nodes = [repo[rev].hex() for rev in revs[pos:]]
3197 nodes = [repo[rev].hex() for rev in revs[pos:]]
3197 statedata[b'nodes'] = nodes
3198 statedata[b'nodes'] = nodes
3198 stateversion = 1
3199 stateversion = 1
3199 graftstate.save(stateversion, statedata)
3200 graftstate.save(stateversion, statedata)
3200 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3201 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3201 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3202 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3202 return 1
3203 return 1
3203 else:
3204 else:
3204 cont = False
3205 cont = False
3205
3206
3206 # commit if --no-commit is false
3207 # commit if --no-commit is false
3207 if not opts.get(b'no_commit'):
3208 if not opts.get(b'no_commit'):
3208 node = repo.commit(
3209 node = repo.commit(
3209 text=message, user=user, date=date, extra=extra, editor=editor
3210 text=message, user=user, date=date, extra=extra, editor=editor
3210 )
3211 )
3211 if node is None:
3212 if node is None:
3212 ui.warn(
3213 ui.warn(
3213 _(b'note: graft of %d:%s created no changes to commit\n')
3214 _(b'note: graft of %d:%s created no changes to commit\n')
3214 % (ctx.rev(), ctx)
3215 % (ctx.rev(), ctx)
3215 )
3216 )
3216 # checking that newnodes exist because old state files won't have it
3217 # checking that newnodes exist because old state files won't have it
3217 elif statedata.get(b'newnodes') is not None:
3218 elif statedata.get(b'newnodes') is not None:
3218 statedata[b'newnodes'].append(node)
3219 statedata[b'newnodes'].append(node)
3219
3220
3220 # remove state when we complete successfully
3221 # remove state when we complete successfully
3221 if not opts.get(b'dry_run'):
3222 if not opts.get(b'dry_run'):
3222 graftstate.delete()
3223 graftstate.delete()
3223
3224
3224 return 0
3225 return 0
3225
3226
3226
3227
3227 def _stopgraft(ui, repo, graftstate):
3228 def _stopgraft(ui, repo, graftstate):
3228 """stop the interrupted graft"""
3229 """stop the interrupted graft"""
3229 if not graftstate.exists():
3230 if not graftstate.exists():
3230 raise error.Abort(_(b"no interrupted graft found"))
3231 raise error.Abort(_(b"no interrupted graft found"))
3231 pctx = repo[b'.']
3232 pctx = repo[b'.']
3232 hg.updaterepo(repo, pctx.node(), overwrite=True)
3233 hg.updaterepo(repo, pctx.node(), overwrite=True)
3233 graftstate.delete()
3234 graftstate.delete()
3234 ui.status(_(b"stopped the interrupted graft\n"))
3235 ui.status(_(b"stopped the interrupted graft\n"))
3235 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3236 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3236 return 0
3237 return 0
3237
3238
3238
3239
3239 statemod.addunfinished(
3240 statemod.addunfinished(
3240 b'graft',
3241 b'graft',
3241 fname=b'graftstate',
3242 fname=b'graftstate',
3242 clearable=True,
3243 clearable=True,
3243 stopflag=True,
3244 stopflag=True,
3244 continueflag=True,
3245 continueflag=True,
3245 abortfunc=cmdutil.hgabortgraft,
3246 abortfunc=cmdutil.hgabortgraft,
3246 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3247 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3247 )
3248 )
3248
3249
3249
3250
3250 @command(
3251 @command(
3251 b'grep',
3252 b'grep',
3252 [
3253 [
3253 (b'0', b'print0', None, _(b'end fields with NUL')),
3254 (b'0', b'print0', None, _(b'end fields with NUL')),
3254 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3255 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3255 (
3256 (
3256 b'',
3257 b'',
3257 b'diff',
3258 b'diff',
3258 None,
3259 None,
3259 _(
3260 _(
3260 b'search revision differences for when the pattern was added '
3261 b'search revision differences for when the pattern was added '
3261 b'or removed'
3262 b'or removed'
3262 ),
3263 ),
3263 ),
3264 ),
3264 (b'a', b'text', None, _(b'treat all files as text')),
3265 (b'a', b'text', None, _(b'treat all files as text')),
3265 (
3266 (
3266 b'f',
3267 b'f',
3267 b'follow',
3268 b'follow',
3268 None,
3269 None,
3269 _(
3270 _(
3270 b'follow changeset history,'
3271 b'follow changeset history,'
3271 b' or file history across copies and renames'
3272 b' or file history across copies and renames'
3272 ),
3273 ),
3273 ),
3274 ),
3274 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3275 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3275 (
3276 (
3276 b'l',
3277 b'l',
3277 b'files-with-matches',
3278 b'files-with-matches',
3278 None,
3279 None,
3279 _(b'print only filenames and revisions that match'),
3280 _(b'print only filenames and revisions that match'),
3280 ),
3281 ),
3281 (b'n', b'line-number', None, _(b'print matching line numbers')),
3282 (b'n', b'line-number', None, _(b'print matching line numbers')),
3282 (
3283 (
3283 b'r',
3284 b'r',
3284 b'rev',
3285 b'rev',
3285 [],
3286 [],
3286 _(b'search files changed within revision range'),
3287 _(b'search files changed within revision range'),
3287 _(b'REV'),
3288 _(b'REV'),
3288 ),
3289 ),
3289 (
3290 (
3290 b'',
3291 b'',
3291 b'all-files',
3292 b'all-files',
3292 None,
3293 None,
3293 _(
3294 _(
3294 b'include all files in the changeset while grepping (DEPRECATED)'
3295 b'include all files in the changeset while grepping (DEPRECATED)'
3295 ),
3296 ),
3296 ),
3297 ),
3297 (b'u', b'user', None, _(b'list the author (long with -v)')),
3298 (b'u', b'user', None, _(b'list the author (long with -v)')),
3298 (b'd', b'date', None, _(b'list the date (short with -q)')),
3299 (b'd', b'date', None, _(b'list the date (short with -q)')),
3299 ]
3300 ]
3300 + formatteropts
3301 + formatteropts
3301 + walkopts,
3302 + walkopts,
3302 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3303 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3303 helpcategory=command.CATEGORY_FILE_CONTENTS,
3304 helpcategory=command.CATEGORY_FILE_CONTENTS,
3304 inferrepo=True,
3305 inferrepo=True,
3305 intents={INTENT_READONLY},
3306 intents={INTENT_READONLY},
3306 )
3307 )
3307 def grep(ui, repo, pattern, *pats, **opts):
3308 def grep(ui, repo, pattern, *pats, **opts):
3308 """search for a pattern in specified files
3309 """search for a pattern in specified files
3309
3310
3310 Search the working directory or revision history for a regular
3311 Search the working directory or revision history for a regular
3311 expression in the specified files for the entire repository.
3312 expression in the specified files for the entire repository.
3312
3313
3313 By default, grep searches the repository files in the working
3314 By default, grep searches the repository files in the working
3314 directory and prints the files where it finds a match. To specify
3315 directory and prints the files where it finds a match. To specify
3315 historical revisions instead of the working directory, use the
3316 historical revisions instead of the working directory, use the
3316 --rev flag.
3317 --rev flag.
3317
3318
3318 To search instead historical revision differences that contains a
3319 To search instead historical revision differences that contains a
3319 change in match status ("-" for a match that becomes a non-match,
3320 change in match status ("-" for a match that becomes a non-match,
3320 or "+" for a non-match that becomes a match), use the --diff flag.
3321 or "+" for a non-match that becomes a match), use the --diff flag.
3321
3322
3322 PATTERN can be any Python (roughly Perl-compatible) regular
3323 PATTERN can be any Python (roughly Perl-compatible) regular
3323 expression.
3324 expression.
3324
3325
3325 If no FILEs are specified and the --rev flag isn't supplied, all
3326 If no FILEs are specified and the --rev flag isn't supplied, all
3326 files in the working directory are searched. When using the --rev
3327 files in the working directory are searched. When using the --rev
3327 flag and specifying FILEs, use the --follow argument to also
3328 flag and specifying FILEs, use the --follow argument to also
3328 follow the specified FILEs across renames and copies.
3329 follow the specified FILEs across renames and copies.
3329
3330
3330 .. container:: verbose
3331 .. container:: verbose
3331
3332
3332 Template:
3333 Template:
3333
3334
3334 The following keywords are supported in addition to the common template
3335 The following keywords are supported in addition to the common template
3335 keywords and functions. See also :hg:`help templates`.
3336 keywords and functions. See also :hg:`help templates`.
3336
3337
3337 :change: String. Character denoting insertion ``+`` or removal ``-``.
3338 :change: String. Character denoting insertion ``+`` or removal ``-``.
3338 Available if ``--diff`` is specified.
3339 Available if ``--diff`` is specified.
3339 :lineno: Integer. Line number of the match.
3340 :lineno: Integer. Line number of the match.
3340 :path: String. Repository-absolute path of the file.
3341 :path: String. Repository-absolute path of the file.
3341 :texts: List of text chunks.
3342 :texts: List of text chunks.
3342
3343
3343 And each entry of ``{texts}`` provides the following sub-keywords.
3344 And each entry of ``{texts}`` provides the following sub-keywords.
3344
3345
3345 :matched: Boolean. True if the chunk matches the specified pattern.
3346 :matched: Boolean. True if the chunk matches the specified pattern.
3346 :text: String. Chunk content.
3347 :text: String. Chunk content.
3347
3348
3348 See :hg:`help templates.operators` for the list expansion syntax.
3349 See :hg:`help templates.operators` for the list expansion syntax.
3349
3350
3350 Returns 0 if a match is found, 1 otherwise.
3351 Returns 0 if a match is found, 1 otherwise.
3351
3352
3352 """
3353 """
3353 opts = pycompat.byteskwargs(opts)
3354 opts = pycompat.byteskwargs(opts)
3354 diff = opts.get(b'all') or opts.get(b'diff')
3355 diff = opts.get(b'all') or opts.get(b'diff')
3355 if diff and opts.get(b'all_files'):
3356 if diff and opts.get(b'all_files'):
3356 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3357 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3357 if opts.get(b'all_files') is None and not diff:
3358 if opts.get(b'all_files') is None and not diff:
3358 opts[b'all_files'] = True
3359 opts[b'all_files'] = True
3359 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3360 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3360 all_files = opts.get(b'all_files')
3361 all_files = opts.get(b'all_files')
3361 if plaingrep:
3362 if plaingrep:
3362 opts[b'rev'] = [b'wdir()']
3363 opts[b'rev'] = [b'wdir()']
3363
3364
3364 reflags = re.M
3365 reflags = re.M
3365 if opts.get(b'ignore_case'):
3366 if opts.get(b'ignore_case'):
3366 reflags |= re.I
3367 reflags |= re.I
3367 try:
3368 try:
3368 regexp = util.re.compile(pattern, reflags)
3369 regexp = util.re.compile(pattern, reflags)
3369 except re.error as inst:
3370 except re.error as inst:
3370 ui.warn(
3371 ui.warn(
3371 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3372 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3372 )
3373 )
3373 return 1
3374 return 1
3374 sep, eol = b':', b'\n'
3375 sep, eol = b':', b'\n'
3375 if opts.get(b'print0'):
3376 if opts.get(b'print0'):
3376 sep = eol = b'\0'
3377 sep = eol = b'\0'
3377
3378
3378 getfile = util.lrucachefunc(repo.file)
3379 getfile = util.lrucachefunc(repo.file)
3379
3380
3380 def matchlines(body):
3381 def matchlines(body):
3381 begin = 0
3382 begin = 0
3382 linenum = 0
3383 linenum = 0
3383 while begin < len(body):
3384 while begin < len(body):
3384 match = regexp.search(body, begin)
3385 match = regexp.search(body, begin)
3385 if not match:
3386 if not match:
3386 break
3387 break
3387 mstart, mend = match.span()
3388 mstart, mend = match.span()
3388 linenum += body.count(b'\n', begin, mstart) + 1
3389 linenum += body.count(b'\n', begin, mstart) + 1
3389 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3390 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3390 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3391 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3391 lend = begin - 1
3392 lend = begin - 1
3392 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3393
3394
3394 class linestate(object):
3395 class linestate(object):
3395 def __init__(self, line, linenum, colstart, colend):
3396 def __init__(self, line, linenum, colstart, colend):
3396 self.line = line
3397 self.line = line
3397 self.linenum = linenum
3398 self.linenum = linenum
3398 self.colstart = colstart
3399 self.colstart = colstart
3399 self.colend = colend
3400 self.colend = colend
3400
3401
3401 def __hash__(self):
3402 def __hash__(self):
3402 return hash((self.linenum, self.line))
3403 return hash((self.linenum, self.line))
3403
3404
3404 def __eq__(self, other):
3405 def __eq__(self, other):
3405 return self.line == other.line
3406 return self.line == other.line
3406
3407
3407 def findpos(self):
3408 def findpos(self):
3408 """Iterate all (start, end) indices of matches"""
3409 """Iterate all (start, end) indices of matches"""
3409 yield self.colstart, self.colend
3410 yield self.colstart, self.colend
3410 p = self.colend
3411 p = self.colend
3411 while p < len(self.line):
3412 while p < len(self.line):
3412 m = regexp.search(self.line, p)
3413 m = regexp.search(self.line, p)
3413 if not m:
3414 if not m:
3414 break
3415 break
3415 if m.end() == p:
3416 if m.end() == p:
3416 p += 1
3417 p += 1
3417 else:
3418 else:
3418 yield m.span()
3419 yield m.span()
3419 p = m.end()
3420 p = m.end()
3420
3421
3421 matches = {}
3422 matches = {}
3422 copies = {}
3423 copies = {}
3423
3424
3424 def grepbody(fn, rev, body):
3425 def grepbody(fn, rev, body):
3425 matches[rev].setdefault(fn, [])
3426 matches[rev].setdefault(fn, [])
3426 m = matches[rev][fn]
3427 m = matches[rev][fn]
3427 if body is None:
3428 if body is None:
3428 return
3429 return
3429
3430
3430 for lnum, cstart, cend, line in matchlines(body):
3431 for lnum, cstart, cend, line in matchlines(body):
3431 s = linestate(line, lnum, cstart, cend)
3432 s = linestate(line, lnum, cstart, cend)
3432 m.append(s)
3433 m.append(s)
3433
3434
3434 def difflinestates(a, b):
3435 def difflinestates(a, b):
3435 sm = difflib.SequenceMatcher(None, a, b)
3436 sm = difflib.SequenceMatcher(None, a, b)
3436 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3437 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3437 if tag == 'insert':
3438 if tag == 'insert':
3438 for i in pycompat.xrange(blo, bhi):
3439 for i in pycompat.xrange(blo, bhi):
3439 yield (b'+', b[i])
3440 yield (b'+', b[i])
3440 elif tag == 'delete':
3441 elif tag == 'delete':
3441 for i in pycompat.xrange(alo, ahi):
3442 for i in pycompat.xrange(alo, ahi):
3442 yield (b'-', a[i])
3443 yield (b'-', a[i])
3443 elif tag == 'replace':
3444 elif tag == 'replace':
3444 for i in pycompat.xrange(alo, ahi):
3445 for i in pycompat.xrange(alo, ahi):
3445 yield (b'-', a[i])
3446 yield (b'-', a[i])
3446 for i in pycompat.xrange(blo, bhi):
3447 for i in pycompat.xrange(blo, bhi):
3447 yield (b'+', b[i])
3448 yield (b'+', b[i])
3448
3449
3449 uipathfn = scmutil.getuipathfn(repo)
3450 uipathfn = scmutil.getuipathfn(repo)
3450
3451
3451 def display(fm, fn, ctx, pstates, states):
3452 def display(fm, fn, ctx, pstates, states):
3452 rev = scmutil.intrev(ctx)
3453 rev = scmutil.intrev(ctx)
3453 if fm.isplain():
3454 if fm.isplain():
3454 formatuser = ui.shortuser
3455 formatuser = ui.shortuser
3455 else:
3456 else:
3456 formatuser = pycompat.bytestr
3457 formatuser = pycompat.bytestr
3457 if ui.quiet:
3458 if ui.quiet:
3458 datefmt = b'%Y-%m-%d'
3459 datefmt = b'%Y-%m-%d'
3459 else:
3460 else:
3460 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3461 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3461 found = False
3462 found = False
3462
3463
3463 @util.cachefunc
3464 @util.cachefunc
3464 def binary():
3465 def binary():
3465 flog = getfile(fn)
3466 flog = getfile(fn)
3466 try:
3467 try:
3467 return stringutil.binary(flog.read(ctx.filenode(fn)))
3468 return stringutil.binary(flog.read(ctx.filenode(fn)))
3468 except error.WdirUnsupported:
3469 except error.WdirUnsupported:
3469 return ctx[fn].isbinary()
3470 return ctx[fn].isbinary()
3470
3471
3471 fieldnamemap = {b'linenumber': b'lineno'}
3472 fieldnamemap = {b'linenumber': b'lineno'}
3472 if diff:
3473 if diff:
3473 iter = difflinestates(pstates, states)
3474 iter = difflinestates(pstates, states)
3474 else:
3475 else:
3475 iter = [(b'', l) for l in states]
3476 iter = [(b'', l) for l in states]
3476 for change, l in iter:
3477 for change, l in iter:
3477 fm.startitem()
3478 fm.startitem()
3478 fm.context(ctx=ctx)
3479 fm.context(ctx=ctx)
3479 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3480 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3480 fm.plain(uipathfn(fn), label=b'grep.filename')
3481 fm.plain(uipathfn(fn), label=b'grep.filename')
3481
3482
3482 cols = [
3483 cols = [
3483 (b'rev', b'%d', rev, not plaingrep, b''),
3484 (b'rev', b'%d', rev, not plaingrep, b''),
3484 (
3485 (
3485 b'linenumber',
3486 b'linenumber',
3486 b'%d',
3487 b'%d',
3487 l.linenum,
3488 l.linenum,
3488 opts.get(b'line_number'),
3489 opts.get(b'line_number'),
3489 b'',
3490 b'',
3490 ),
3491 ),
3491 ]
3492 ]
3492 if diff:
3493 if diff:
3493 cols.append(
3494 cols.append(
3494 (
3495 (
3495 b'change',
3496 b'change',
3496 b'%s',
3497 b'%s',
3497 change,
3498 change,
3498 True,
3499 True,
3499 b'grep.inserted '
3500 b'grep.inserted '
3500 if change == b'+'
3501 if change == b'+'
3501 else b'grep.deleted ',
3502 else b'grep.deleted ',
3502 )
3503 )
3503 )
3504 )
3504 cols.extend(
3505 cols.extend(
3505 [
3506 [
3506 (
3507 (
3507 b'user',
3508 b'user',
3508 b'%s',
3509 b'%s',
3509 formatuser(ctx.user()),
3510 formatuser(ctx.user()),
3510 opts.get(b'user'),
3511 opts.get(b'user'),
3511 b'',
3512 b'',
3512 ),
3513 ),
3513 (
3514 (
3514 b'date',
3515 b'date',
3515 b'%s',
3516 b'%s',
3516 fm.formatdate(ctx.date(), datefmt),
3517 fm.formatdate(ctx.date(), datefmt),
3517 opts.get(b'date'),
3518 opts.get(b'date'),
3518 b'',
3519 b'',
3519 ),
3520 ),
3520 ]
3521 ]
3521 )
3522 )
3522 for name, fmt, data, cond, extra_label in cols:
3523 for name, fmt, data, cond, extra_label in cols:
3523 if cond:
3524 if cond:
3524 fm.plain(sep, label=b'grep.sep')
3525 fm.plain(sep, label=b'grep.sep')
3525 field = fieldnamemap.get(name, name)
3526 field = fieldnamemap.get(name, name)
3526 label = extra_label + (b'grep.%s' % name)
3527 label = extra_label + (b'grep.%s' % name)
3527 fm.condwrite(cond, field, fmt, data, label=label)
3528 fm.condwrite(cond, field, fmt, data, label=label)
3528 if not opts.get(b'files_with_matches'):
3529 if not opts.get(b'files_with_matches'):
3529 fm.plain(sep, label=b'grep.sep')
3530 fm.plain(sep, label=b'grep.sep')
3530 if not opts.get(b'text') and binary():
3531 if not opts.get(b'text') and binary():
3531 fm.plain(_(b" Binary file matches"))
3532 fm.plain(_(b" Binary file matches"))
3532 else:
3533 else:
3533 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3534 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3534 fm.plain(eol)
3535 fm.plain(eol)
3535 found = True
3536 found = True
3536 if opts.get(b'files_with_matches'):
3537 if opts.get(b'files_with_matches'):
3537 break
3538 break
3538 return found
3539 return found
3539
3540
3540 def displaymatches(fm, l):
3541 def displaymatches(fm, l):
3541 p = 0
3542 p = 0
3542 for s, e in l.findpos():
3543 for s, e in l.findpos():
3543 if p < s:
3544 if p < s:
3544 fm.startitem()
3545 fm.startitem()
3545 fm.write(b'text', b'%s', l.line[p:s])
3546 fm.write(b'text', b'%s', l.line[p:s])
3546 fm.data(matched=False)
3547 fm.data(matched=False)
3547 fm.startitem()
3548 fm.startitem()
3548 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3549 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3549 fm.data(matched=True)
3550 fm.data(matched=True)
3550 p = e
3551 p = e
3551 if p < len(l.line):
3552 if p < len(l.line):
3552 fm.startitem()
3553 fm.startitem()
3553 fm.write(b'text', b'%s', l.line[p:])
3554 fm.write(b'text', b'%s', l.line[p:])
3554 fm.data(matched=False)
3555 fm.data(matched=False)
3555 fm.end()
3556 fm.end()
3556
3557
3557 skip = set()
3558 skip = set()
3558 revfiles = {}
3559 revfiles = {}
3559 match = scmutil.match(repo[None], pats, opts)
3560 match = scmutil.match(repo[None], pats, opts)
3560 found = False
3561 found = False
3561 follow = opts.get(b'follow')
3562 follow = opts.get(b'follow')
3562
3563
3563 getrenamed = scmutil.getrenamedfn(repo)
3564 getrenamed = scmutil.getrenamedfn(repo)
3564
3565
3565 def readfile(ctx, fn):
3566 def readfile(ctx, fn):
3566 rev = ctx.rev()
3567 rev = ctx.rev()
3567 if rev is None:
3568 if rev is None:
3568 fctx = ctx[fn]
3569 fctx = ctx[fn]
3569 try:
3570 try:
3570 return fctx.data()
3571 return fctx.data()
3571 except IOError as e:
3572 except IOError as e:
3572 if e.errno != errno.ENOENT:
3573 if e.errno != errno.ENOENT:
3573 raise
3574 raise
3574 else:
3575 else:
3575 flog = getfile(fn)
3576 flog = getfile(fn)
3576 fnode = ctx.filenode(fn)
3577 fnode = ctx.filenode(fn)
3577 try:
3578 try:
3578 return flog.read(fnode)
3579 return flog.read(fnode)
3579 except error.CensoredNodeError:
3580 except error.CensoredNodeError:
3580 ui.warn(
3581 ui.warn(
3581 _(
3582 _(
3582 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3583 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3583 )
3584 )
3584 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3585 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3585 )
3586 )
3586
3587
3587 def prep(ctx, fns):
3588 def prep(ctx, fns):
3588 rev = ctx.rev()
3589 rev = ctx.rev()
3589 pctx = ctx.p1()
3590 pctx = ctx.p1()
3590 matches.setdefault(rev, {})
3591 matches.setdefault(rev, {})
3591 if diff:
3592 if diff:
3592 parent = pctx.rev()
3593 parent = pctx.rev()
3593 matches.setdefault(parent, {})
3594 matches.setdefault(parent, {})
3594 files = revfiles.setdefault(rev, [])
3595 files = revfiles.setdefault(rev, [])
3595 if rev is None:
3596 if rev is None:
3596 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3597 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3597 # pathauditor checks without this in mozilla-central
3598 # pathauditor checks without this in mozilla-central
3598 contextmanager = repo.wvfs.audit.cached
3599 contextmanager = repo.wvfs.audit.cached
3599 else:
3600 else:
3600 contextmanager = util.nullcontextmanager
3601 contextmanager = util.nullcontextmanager
3601 with contextmanager():
3602 with contextmanager():
3602 for fn in fns:
3603 for fn in fns:
3603 # fn might not exist in the revision (could be a file removed by
3604 # fn might not exist in the revision (could be a file removed by
3604 # the revision). We could check `fn not in ctx` even when rev is
3605 # the revision). We could check `fn not in ctx` even when rev is
3605 # None, but it's less racy to protect againt that in readfile.
3606 # None, but it's less racy to protect againt that in readfile.
3606 if rev is not None and fn not in ctx:
3607 if rev is not None and fn not in ctx:
3607 continue
3608 continue
3608
3609
3609 copy = None
3610 copy = None
3610 if follow:
3611 if follow:
3611 copy = getrenamed(fn, rev)
3612 copy = getrenamed(fn, rev)
3612 if copy:
3613 if copy:
3613 copies.setdefault(rev, {})[fn] = copy
3614 copies.setdefault(rev, {})[fn] = copy
3614 if fn in skip:
3615 if fn in skip:
3615 skip.add(copy)
3616 skip.add(copy)
3616 if fn in skip:
3617 if fn in skip:
3617 continue
3618 continue
3618 files.append(fn)
3619 files.append(fn)
3619
3620
3620 if fn not in matches[rev]:
3621 if fn not in matches[rev]:
3621 grepbody(fn, rev, readfile(ctx, fn))
3622 grepbody(fn, rev, readfile(ctx, fn))
3622
3623
3623 if diff:
3624 if diff:
3624 pfn = copy or fn
3625 pfn = copy or fn
3625 if pfn not in matches[parent] and pfn in pctx:
3626 if pfn not in matches[parent] and pfn in pctx:
3626 grepbody(pfn, parent, readfile(pctx, pfn))
3627 grepbody(pfn, parent, readfile(pctx, pfn))
3627
3628
3628 ui.pager(b'grep')
3629 ui.pager(b'grep')
3629 fm = ui.formatter(b'grep', opts)
3630 fm = ui.formatter(b'grep', opts)
3630 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3631 rev = ctx.rev()
3632 rev = ctx.rev()
3632 parent = ctx.p1().rev()
3633 parent = ctx.p1().rev()
3633 for fn in sorted(revfiles.get(rev, [])):
3634 for fn in sorted(revfiles.get(rev, [])):
3634 states = matches[rev][fn]
3635 states = matches[rev][fn]
3635 copy = copies.get(rev, {}).get(fn)
3636 copy = copies.get(rev, {}).get(fn)
3636 if fn in skip:
3637 if fn in skip:
3637 if copy:
3638 if copy:
3638 skip.add(copy)
3639 skip.add(copy)
3639 continue
3640 continue
3640 pstates = matches.get(parent, {}).get(copy or fn, [])
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3641 if pstates or states:
3642 if pstates or states:
3642 r = display(fm, fn, ctx, pstates, states)
3643 r = display(fm, fn, ctx, pstates, states)
3643 found = found or r
3644 found = found or r
3644 if r and not diff and not all_files:
3645 if r and not diff and not all_files:
3645 skip.add(fn)
3646 skip.add(fn)
3646 if copy:
3647 if copy:
3647 skip.add(copy)
3648 skip.add(copy)
3648 del revfiles[rev]
3649 del revfiles[rev]
3649 # We will keep the matches dict for the duration of the window
3650 # We will keep the matches dict for the duration of the window
3650 # clear the matches dict once the window is over
3651 # clear the matches dict once the window is over
3651 if not revfiles:
3652 if not revfiles:
3652 matches.clear()
3653 matches.clear()
3653 fm.end()
3654 fm.end()
3654
3655
3655 return not found
3656 return not found
3656
3657
3657
3658
3658 @command(
3659 @command(
3659 b'heads',
3660 b'heads',
3660 [
3661 [
3661 (
3662 (
3662 b'r',
3663 b'r',
3663 b'rev',
3664 b'rev',
3664 b'',
3665 b'',
3665 _(b'show only heads which are descendants of STARTREV'),
3666 _(b'show only heads which are descendants of STARTREV'),
3666 _(b'STARTREV'),
3667 _(b'STARTREV'),
3667 ),
3668 ),
3668 (b't', b'topo', False, _(b'show topological heads only')),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3669 (
3670 (
3670 b'a',
3671 b'a',
3671 b'active',
3672 b'active',
3672 False,
3673 False,
3673 _(b'show active branchheads only (DEPRECATED)'),
3674 _(b'show active branchheads only (DEPRECATED)'),
3674 ),
3675 ),
3675 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3676 ]
3677 ]
3677 + templateopts,
3678 + templateopts,
3678 _(b'[-ct] [-r STARTREV] [REV]...'),
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3679 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3680 intents={INTENT_READONLY},
3681 intents={INTENT_READONLY},
3681 )
3682 )
3682 def heads(ui, repo, *branchrevs, **opts):
3683 def heads(ui, repo, *branchrevs, **opts):
3683 """show branch heads
3684 """show branch heads
3684
3685
3685 With no arguments, show all open branch heads in the repository.
3686 With no arguments, show all open branch heads in the repository.
3686 Branch heads are changesets that have no descendants on the
3687 Branch heads are changesets that have no descendants on the
3687 same branch. They are where development generally takes place and
3688 same branch. They are where development generally takes place and
3688 are the usual targets for update and merge operations.
3689 are the usual targets for update and merge operations.
3689
3690
3690 If one or more REVs are given, only open branch heads on the
3691 If one or more REVs are given, only open branch heads on the
3691 branches associated with the specified changesets are shown. This
3692 branches associated with the specified changesets are shown. This
3692 means that you can use :hg:`heads .` to see the heads on the
3693 means that you can use :hg:`heads .` to see the heads on the
3693 currently checked-out branch.
3694 currently checked-out branch.
3694
3695
3695 If -c/--closed is specified, also show branch heads marked closed
3696 If -c/--closed is specified, also show branch heads marked closed
3696 (see :hg:`commit --close-branch`).
3697 (see :hg:`commit --close-branch`).
3697
3698
3698 If STARTREV is specified, only those heads that are descendants of
3699 If STARTREV is specified, only those heads that are descendants of
3699 STARTREV will be displayed.
3700 STARTREV will be displayed.
3700
3701
3701 If -t/--topo is specified, named branch mechanics will be ignored and only
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3702 topological heads (changesets with no children) will be shown.
3703 topological heads (changesets with no children) will be shown.
3703
3704
3704 Returns 0 if matching heads are found, 1 if not.
3705 Returns 0 if matching heads are found, 1 if not.
3705 """
3706 """
3706
3707
3707 opts = pycompat.byteskwargs(opts)
3708 opts = pycompat.byteskwargs(opts)
3708 start = None
3709 start = None
3709 rev = opts.get(b'rev')
3710 rev = opts.get(b'rev')
3710 if rev:
3711 if rev:
3711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3712 start = scmutil.revsingle(repo, rev, None).node()
3713 start = scmutil.revsingle(repo, rev, None).node()
3713
3714
3714 if opts.get(b'topo'):
3715 if opts.get(b'topo'):
3715 heads = [repo[h] for h in repo.heads(start)]
3716 heads = [repo[h] for h in repo.heads(start)]
3716 else:
3717 else:
3717 heads = []
3718 heads = []
3718 for branch in repo.branchmap():
3719 for branch in repo.branchmap():
3719 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3720 heads = [repo[h] for h in heads]
3721 heads = [repo[h] for h in heads]
3721
3722
3722 if branchrevs:
3723 if branchrevs:
3723 branches = {
3724 branches = {
3724 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3725 }
3726 }
3726 heads = [h for h in heads if h.branch() in branches]
3727 heads = [h for h in heads if h.branch() in branches]
3727
3728
3728 if opts.get(b'active') and branchrevs:
3729 if opts.get(b'active') and branchrevs:
3729 dagheads = repo.heads(start)
3730 dagheads = repo.heads(start)
3730 heads = [h for h in heads if h.node() in dagheads]
3731 heads = [h for h in heads if h.node() in dagheads]
3731
3732
3732 if branchrevs:
3733 if branchrevs:
3733 haveheads = {h.branch() for h in heads}
3734 haveheads = {h.branch() for h in heads}
3734 if branches - haveheads:
3735 if branches - haveheads:
3735 headless = b', '.join(b for b in branches - haveheads)
3736 headless = b', '.join(b for b in branches - haveheads)
3736 msg = _(b'no open branch heads found on branches %s')
3737 msg = _(b'no open branch heads found on branches %s')
3737 if opts.get(b'rev'):
3738 if opts.get(b'rev'):
3738 msg += _(b' (started at %s)') % opts[b'rev']
3739 msg += _(b' (started at %s)') % opts[b'rev']
3739 ui.warn((msg + b'\n') % headless)
3740 ui.warn((msg + b'\n') % headless)
3740
3741
3741 if not heads:
3742 if not heads:
3742 return 1
3743 return 1
3743
3744
3744 ui.pager(b'heads')
3745 ui.pager(b'heads')
3745 heads = sorted(heads, key=lambda x: -(x.rev()))
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3746 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3747 for ctx in heads:
3748 for ctx in heads:
3748 displayer.show(ctx)
3749 displayer.show(ctx)
3749 displayer.close()
3750 displayer.close()
3750
3751
3751
3752
3752 @command(
3753 @command(
3753 b'help',
3754 b'help',
3754 [
3755 [
3755 (b'e', b'extension', None, _(b'show only help for extensions')),
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3756 (b'c', b'command', None, _(b'show only help for commands')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3757 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3758 (
3759 (
3759 b's',
3760 b's',
3760 b'system',
3761 b'system',
3761 [],
3762 [],
3762 _(b'show help for specific platform(s)'),
3763 _(b'show help for specific platform(s)'),
3763 _(b'PLATFORM'),
3764 _(b'PLATFORM'),
3764 ),
3765 ),
3765 ],
3766 ],
3766 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3767 helpcategory=command.CATEGORY_HELP,
3768 helpcategory=command.CATEGORY_HELP,
3768 norepo=True,
3769 norepo=True,
3769 intents={INTENT_READONLY},
3770 intents={INTENT_READONLY},
3770 )
3771 )
3771 def help_(ui, name=None, **opts):
3772 def help_(ui, name=None, **opts):
3772 """show help for a given topic or a help overview
3773 """show help for a given topic or a help overview
3773
3774
3774 With no arguments, print a list of commands with short help messages.
3775 With no arguments, print a list of commands with short help messages.
3775
3776
3776 Given a topic, extension, or command name, print help for that
3777 Given a topic, extension, or command name, print help for that
3777 topic.
3778 topic.
3778
3779
3779 Returns 0 if successful.
3780 Returns 0 if successful.
3780 """
3781 """
3781
3782
3782 keep = opts.get('system') or []
3783 keep = opts.get('system') or []
3783 if len(keep) == 0:
3784 if len(keep) == 0:
3784 if pycompat.sysplatform.startswith(b'win'):
3785 if pycompat.sysplatform.startswith(b'win'):
3785 keep.append(b'windows')
3786 keep.append(b'windows')
3786 elif pycompat.sysplatform == b'OpenVMS':
3787 elif pycompat.sysplatform == b'OpenVMS':
3787 keep.append(b'vms')
3788 keep.append(b'vms')
3788 elif pycompat.sysplatform == b'plan9':
3789 elif pycompat.sysplatform == b'plan9':
3789 keep.append(b'plan9')
3790 keep.append(b'plan9')
3790 else:
3791 else:
3791 keep.append(b'unix')
3792 keep.append(b'unix')
3792 keep.append(pycompat.sysplatform.lower())
3793 keep.append(pycompat.sysplatform.lower())
3793 if ui.verbose:
3794 if ui.verbose:
3794 keep.append(b'verbose')
3795 keep.append(b'verbose')
3795
3796
3796 commands = sys.modules[__name__]
3797 commands = sys.modules[__name__]
3797 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3798 ui.pager(b'help')
3799 ui.pager(b'help')
3799 ui.write(formatted)
3800 ui.write(formatted)
3800
3801
3801
3802
3802 @command(
3803 @command(
3803 b'identify|id',
3804 b'identify|id',
3804 [
3805 [
3805 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3806 (b'n', b'num', None, _(b'show local revision number')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3807 (b'i', b'id', None, _(b'show global revision id')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3808 (b'b', b'branch', None, _(b'show branch')),
3809 (b'b', b'branch', None, _(b'show branch')),
3809 (b't', b'tags', None, _(b'show tags')),
3810 (b't', b'tags', None, _(b'show tags')),
3810 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3811 ]
3812 ]
3812 + remoteopts
3813 + remoteopts
3813 + formatteropts,
3814 + formatteropts,
3814 _(b'[-nibtB] [-r REV] [SOURCE]'),
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3815 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3816 optionalrepo=True,
3817 optionalrepo=True,
3817 intents={INTENT_READONLY},
3818 intents={INTENT_READONLY},
3818 )
3819 )
3819 def identify(
3820 def identify(
3820 ui,
3821 ui,
3821 repo,
3822 repo,
3822 source=None,
3823 source=None,
3823 rev=None,
3824 rev=None,
3824 num=None,
3825 num=None,
3825 id=None,
3826 id=None,
3826 branch=None,
3827 branch=None,
3827 tags=None,
3828 tags=None,
3828 bookmarks=None,
3829 bookmarks=None,
3829 **opts
3830 **opts
3830 ):
3831 ):
3831 """identify the working directory or specified revision
3832 """identify the working directory or specified revision
3832
3833
3833 Print a summary identifying the repository state at REV using one or
3834 Print a summary identifying the repository state at REV using one or
3834 two parent hash identifiers, followed by a "+" if the working
3835 two parent hash identifiers, followed by a "+" if the working
3835 directory has uncommitted changes, the branch name (if not default),
3836 directory has uncommitted changes, the branch name (if not default),
3836 a list of tags, and a list of bookmarks.
3837 a list of tags, and a list of bookmarks.
3837
3838
3838 When REV is not given, print a summary of the current state of the
3839 When REV is not given, print a summary of the current state of the
3839 repository including the working directory. Specify -r. to get information
3840 repository including the working directory. Specify -r. to get information
3840 of the working directory parent without scanning uncommitted changes.
3841 of the working directory parent without scanning uncommitted changes.
3841
3842
3842 Specifying a path to a repository root or Mercurial bundle will
3843 Specifying a path to a repository root or Mercurial bundle will
3843 cause lookup to operate on that repository/bundle.
3844 cause lookup to operate on that repository/bundle.
3844
3845
3845 .. container:: verbose
3846 .. container:: verbose
3846
3847
3847 Template:
3848 Template:
3848
3849
3849 The following keywords are supported in addition to the common template
3850 The following keywords are supported in addition to the common template
3850 keywords and functions. See also :hg:`help templates`.
3851 keywords and functions. See also :hg:`help templates`.
3851
3852
3852 :dirty: String. Character ``+`` denoting if the working directory has
3853 :dirty: String. Character ``+`` denoting if the working directory has
3853 uncommitted changes.
3854 uncommitted changes.
3854 :id: String. One or two nodes, optionally followed by ``+``.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3855 :parents: List of strings. Parent nodes of the changeset.
3856 :parents: List of strings. Parent nodes of the changeset.
3856
3857
3857 Examples:
3858 Examples:
3858
3859
3859 - generate a build identifier for the working directory::
3860 - generate a build identifier for the working directory::
3860
3861
3861 hg id --id > build-id.dat
3862 hg id --id > build-id.dat
3862
3863
3863 - find the revision corresponding to a tag::
3864 - find the revision corresponding to a tag::
3864
3865
3865 hg id -n -r 1.3
3866 hg id -n -r 1.3
3866
3867
3867 - check the most recent revision of a remote repository::
3868 - check the most recent revision of a remote repository::
3868
3869
3869 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3870
3871
3871 See :hg:`log` for generating more information about specific revisions,
3872 See :hg:`log` for generating more information about specific revisions,
3872 including full hash identifiers.
3873 including full hash identifiers.
3873
3874
3874 Returns 0 if successful.
3875 Returns 0 if successful.
3875 """
3876 """
3876
3877
3877 opts = pycompat.byteskwargs(opts)
3878 opts = pycompat.byteskwargs(opts)
3878 if not repo and not source:
3879 if not repo and not source:
3879 raise error.Abort(
3880 raise error.Abort(
3880 _(b"there is no Mercurial repository here (.hg not found)")
3881 _(b"there is no Mercurial repository here (.hg not found)")
3881 )
3882 )
3882
3883
3883 default = not (num or id or branch or tags or bookmarks)
3884 default = not (num or id or branch or tags or bookmarks)
3884 output = []
3885 output = []
3885 revs = []
3886 revs = []
3886
3887
3887 if source:
3888 if source:
3888 source, branches = hg.parseurl(ui.expandpath(source))
3889 source, branches = hg.parseurl(ui.expandpath(source))
3889 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3890 repo = peer.local()
3891 repo = peer.local()
3891 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3892
3893
3893 fm = ui.formatter(b'identify', opts)
3894 fm = ui.formatter(b'identify', opts)
3894 fm.startitem()
3895 fm.startitem()
3895
3896
3896 if not repo:
3897 if not repo:
3897 if num or branch or tags:
3898 if num or branch or tags:
3898 raise error.Abort(
3899 raise error.Abort(
3899 _(b"can't query remote revision number, branch, or tags")
3900 _(b"can't query remote revision number, branch, or tags")
3900 )
3901 )
3901 if not rev and revs:
3902 if not rev and revs:
3902 rev = revs[0]
3903 rev = revs[0]
3903 if not rev:
3904 if not rev:
3904 rev = b"tip"
3905 rev = b"tip"
3905
3906
3906 remoterev = peer.lookup(rev)
3907 remoterev = peer.lookup(rev)
3907 hexrev = fm.hexfunc(remoterev)
3908 hexrev = fm.hexfunc(remoterev)
3908 if default or id:
3909 if default or id:
3909 output = [hexrev]
3910 output = [hexrev]
3910 fm.data(id=hexrev)
3911 fm.data(id=hexrev)
3911
3912
3912 @util.cachefunc
3913 @util.cachefunc
3913 def getbms():
3914 def getbms():
3914 bms = []
3915 bms = []
3915
3916
3916 if b'bookmarks' in peer.listkeys(b'namespaces'):
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3917 hexremoterev = hex(remoterev)
3918 hexremoterev = hex(remoterev)
3918 bms = [
3919 bms = [
3919 bm
3920 bm
3920 for bm, bmr in pycompat.iteritems(
3921 for bm, bmr in pycompat.iteritems(
3921 peer.listkeys(b'bookmarks')
3922 peer.listkeys(b'bookmarks')
3922 )
3923 )
3923 if bmr == hexremoterev
3924 if bmr == hexremoterev
3924 ]
3925 ]
3925
3926
3926 return sorted(bms)
3927 return sorted(bms)
3927
3928
3928 if fm.isplain():
3929 if fm.isplain():
3929 if bookmarks:
3930 if bookmarks:
3930 output.extend(getbms())
3931 output.extend(getbms())
3931 elif default and not ui.quiet:
3932 elif default and not ui.quiet:
3932 # multiple bookmarks for a single parent separated by '/'
3933 # multiple bookmarks for a single parent separated by '/'
3933 bm = b'/'.join(getbms())
3934 bm = b'/'.join(getbms())
3934 if bm:
3935 if bm:
3935 output.append(bm)
3936 output.append(bm)
3936 else:
3937 else:
3937 fm.data(node=hex(remoterev))
3938 fm.data(node=hex(remoterev))
3938 if bookmarks or b'bookmarks' in fm.datahint():
3939 if bookmarks or b'bookmarks' in fm.datahint():
3939 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3940 else:
3941 else:
3941 if rev:
3942 if rev:
3942 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3943 ctx = scmutil.revsingle(repo, rev, None)
3944 ctx = scmutil.revsingle(repo, rev, None)
3944
3945
3945 if ctx.rev() is None:
3946 if ctx.rev() is None:
3946 ctx = repo[None]
3947 ctx = repo[None]
3947 parents = ctx.parents()
3948 parents = ctx.parents()
3948 taglist = []
3949 taglist = []
3949 for p in parents:
3950 for p in parents:
3950 taglist.extend(p.tags())
3951 taglist.extend(p.tags())
3951
3952
3952 dirty = b""
3953 dirty = b""
3953 if ctx.dirty(missing=True, merge=False, branch=False):
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3954 dirty = b'+'
3955 dirty = b'+'
3955 fm.data(dirty=dirty)
3956 fm.data(dirty=dirty)
3956
3957
3957 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3958 if default or id:
3959 if default or id:
3959 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3960 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3961
3962
3962 if num:
3963 if num:
3963 numoutput = [b"%d" % p.rev() for p in parents]
3964 numoutput = [b"%d" % p.rev() for p in parents]
3964 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3965
3966
3966 fm.data(
3967 fm.data(
3967 parents=fm.formatlist(
3968 parents=fm.formatlist(
3968 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3969 )
3970 )
3970 )
3971 )
3971 else:
3972 else:
3972 hexoutput = fm.hexfunc(ctx.node())
3973 hexoutput = fm.hexfunc(ctx.node())
3973 if default or id:
3974 if default or id:
3974 output = [hexoutput]
3975 output = [hexoutput]
3975 fm.data(id=hexoutput)
3976 fm.data(id=hexoutput)
3976
3977
3977 if num:
3978 if num:
3978 output.append(pycompat.bytestr(ctx.rev()))
3979 output.append(pycompat.bytestr(ctx.rev()))
3979 taglist = ctx.tags()
3980 taglist = ctx.tags()
3980
3981
3981 if default and not ui.quiet:
3982 if default and not ui.quiet:
3982 b = ctx.branch()
3983 b = ctx.branch()
3983 if b != b'default':
3984 if b != b'default':
3984 output.append(b"(%s)" % b)
3985 output.append(b"(%s)" % b)
3985
3986
3986 # multiple tags for a single parent separated by '/'
3987 # multiple tags for a single parent separated by '/'
3987 t = b'/'.join(taglist)
3988 t = b'/'.join(taglist)
3988 if t:
3989 if t:
3989 output.append(t)
3990 output.append(t)
3990
3991
3991 # multiple bookmarks for a single parent separated by '/'
3992 # multiple bookmarks for a single parent separated by '/'
3992 bm = b'/'.join(ctx.bookmarks())
3993 bm = b'/'.join(ctx.bookmarks())
3993 if bm:
3994 if bm:
3994 output.append(bm)
3995 output.append(bm)
3995 else:
3996 else:
3996 if branch:
3997 if branch:
3997 output.append(ctx.branch())
3998 output.append(ctx.branch())
3998
3999
3999 if tags:
4000 if tags:
4000 output.extend(taglist)
4001 output.extend(taglist)
4001
4002
4002 if bookmarks:
4003 if bookmarks:
4003 output.extend(ctx.bookmarks())
4004 output.extend(ctx.bookmarks())
4004
4005
4005 fm.data(node=ctx.hex())
4006 fm.data(node=ctx.hex())
4006 fm.data(branch=ctx.branch())
4007 fm.data(branch=ctx.branch())
4007 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4008 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4009 fm.context(ctx=ctx)
4010 fm.context(ctx=ctx)
4010
4011
4011 fm.plain(b"%s\n" % b' '.join(output))
4012 fm.plain(b"%s\n" % b' '.join(output))
4012 fm.end()
4013 fm.end()
4013
4014
4014
4015
4015 @command(
4016 @command(
4016 b'import|patch',
4017 b'import|patch',
4017 [
4018 [
4018 (
4019 (
4019 b'p',
4020 b'p',
4020 b'strip',
4021 b'strip',
4021 1,
4022 1,
4022 _(
4023 _(
4023 b'directory strip option for patch. This has the same '
4024 b'directory strip option for patch. This has the same '
4024 b'meaning as the corresponding patch option'
4025 b'meaning as the corresponding patch option'
4025 ),
4026 ),
4026 _(b'NUM'),
4027 _(b'NUM'),
4027 ),
4028 ),
4028 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4029 (b'', b'secret', None, _(b'use the secret phase for committing')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4030 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4031 (
4032 (
4032 b'f',
4033 b'f',
4033 b'force',
4034 b'force',
4034 None,
4035 None,
4035 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4036 ),
4037 ),
4037 (
4038 (
4038 b'',
4039 b'',
4039 b'no-commit',
4040 b'no-commit',
4040 None,
4041 None,
4041 _(b"don't commit, just update the working directory"),
4042 _(b"don't commit, just update the working directory"),
4042 ),
4043 ),
4043 (
4044 (
4044 b'',
4045 b'',
4045 b'bypass',
4046 b'bypass',
4046 None,
4047 None,
4047 _(b"apply patch without touching the working directory"),
4048 _(b"apply patch without touching the working directory"),
4048 ),
4049 ),
4049 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4050 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4051 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4052 (
4053 (
4053 b'',
4054 b'',
4054 b'import-branch',
4055 b'import-branch',
4055 None,
4056 None,
4056 _(b'use any branch information in patch (implied by --exact)'),
4057 _(b'use any branch information in patch (implied by --exact)'),
4057 ),
4058 ),
4058 ]
4059 ]
4059 + commitopts
4060 + commitopts
4060 + commitopts2
4061 + commitopts2
4061 + similarityopts,
4062 + similarityopts,
4062 _(b'[OPTION]... PATCH...'),
4063 _(b'[OPTION]... PATCH...'),
4063 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4064 )
4065 )
4065 def import_(ui, repo, patch1=None, *patches, **opts):
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4066 """import an ordered set of patches
4067 """import an ordered set of patches
4067
4068
4068 Import a list of patches and commit them individually (unless
4069 Import a list of patches and commit them individually (unless
4069 --no-commit is specified).
4070 --no-commit is specified).
4070
4071
4071 To read a patch from standard input (stdin), use "-" as the patch
4072 To read a patch from standard input (stdin), use "-" as the patch
4072 name. If a URL is specified, the patch will be downloaded from
4073 name. If a URL is specified, the patch will be downloaded from
4073 there.
4074 there.
4074
4075
4075 Import first applies changes to the working directory (unless
4076 Import first applies changes to the working directory (unless
4076 --bypass is specified), import will abort if there are outstanding
4077 --bypass is specified), import will abort if there are outstanding
4077 changes.
4078 changes.
4078
4079
4079 Use --bypass to apply and commit patches directly to the
4080 Use --bypass to apply and commit patches directly to the
4080 repository, without affecting the working directory. Without
4081 repository, without affecting the working directory. Without
4081 --exact, patches will be applied on top of the working directory
4082 --exact, patches will be applied on top of the working directory
4082 parent revision.
4083 parent revision.
4083
4084
4084 You can import a patch straight from a mail message. Even patches
4085 You can import a patch straight from a mail message. Even patches
4085 as attachments work (to use the body part, it must have type
4086 as attachments work (to use the body part, it must have type
4086 text/plain or text/x-patch). From and Subject headers of email
4087 text/plain or text/x-patch). From and Subject headers of email
4087 message are used as default committer and commit message. All
4088 message are used as default committer and commit message. All
4088 text/plain body parts before first diff are added to the commit
4089 text/plain body parts before first diff are added to the commit
4089 message.
4090 message.
4090
4091
4091 If the imported patch was generated by :hg:`export`, user and
4092 If the imported patch was generated by :hg:`export`, user and
4092 description from patch override values from message headers and
4093 description from patch override values from message headers and
4093 body. Values given on command line with -m/--message and -u/--user
4094 body. Values given on command line with -m/--message and -u/--user
4094 override these.
4095 override these.
4095
4096
4096 If --exact is specified, import will set the working directory to
4097 If --exact is specified, import will set the working directory to
4097 the parent of each patch before applying it, and will abort if the
4098 the parent of each patch before applying it, and will abort if the
4098 resulting changeset has a different ID than the one recorded in
4099 resulting changeset has a different ID than the one recorded in
4099 the patch. This will guard against various ways that portable
4100 the patch. This will guard against various ways that portable
4100 patch formats and mail systems might fail to transfer Mercurial
4101 patch formats and mail systems might fail to transfer Mercurial
4101 data or metadata. See :hg:`bundle` for lossless transmission.
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4102
4103
4103 Use --partial to ensure a changeset will be created from the patch
4104 Use --partial to ensure a changeset will be created from the patch
4104 even if some hunks fail to apply. Hunks that fail to apply will be
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4105 written to a <target-file>.rej file. Conflicts can then be resolved
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4106 by hand before :hg:`commit --amend` is run to update the created
4107 by hand before :hg:`commit --amend` is run to update the created
4107 changeset. This flag exists to let people import patches that
4108 changeset. This flag exists to let people import patches that
4108 partially apply without losing the associated metadata (author,
4109 partially apply without losing the associated metadata (author,
4109 date, description, ...).
4110 date, description, ...).
4110
4111
4111 .. note::
4112 .. note::
4112
4113
4113 When no hunks apply cleanly, :hg:`import --partial` will create
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4114 an empty changeset, importing only the patch metadata.
4115 an empty changeset, importing only the patch metadata.
4115
4116
4116 With -s/--similarity, hg will attempt to discover renames and
4117 With -s/--similarity, hg will attempt to discover renames and
4117 copies in the patch in the same way as :hg:`addremove`.
4118 copies in the patch in the same way as :hg:`addremove`.
4118
4119
4119 It is possible to use external patch programs to perform the patch
4120 It is possible to use external patch programs to perform the patch
4120 by setting the ``ui.patch`` configuration option. For the default
4121 by setting the ``ui.patch`` configuration option. For the default
4121 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4122 See :hg:`help config` for more information about configuration
4123 See :hg:`help config` for more information about configuration
4123 files and how to use these options.
4124 files and how to use these options.
4124
4125
4125 See :hg:`help dates` for a list of formats valid for -d/--date.
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4126
4127
4127 .. container:: verbose
4128 .. container:: verbose
4128
4129
4129 Examples:
4130 Examples:
4130
4131
4131 - import a traditional patch from a website and detect renames::
4132 - import a traditional patch from a website and detect renames::
4132
4133
4133 hg import -s 80 http://example.com/bugfix.patch
4134 hg import -s 80 http://example.com/bugfix.patch
4134
4135
4135 - import a changeset from an hgweb server::
4136 - import a changeset from an hgweb server::
4136
4137
4137 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4138
4139
4139 - import all the patches in an Unix-style mbox::
4140 - import all the patches in an Unix-style mbox::
4140
4141
4141 hg import incoming-patches.mbox
4142 hg import incoming-patches.mbox
4142
4143
4143 - import patches from stdin::
4144 - import patches from stdin::
4144
4145
4145 hg import -
4146 hg import -
4146
4147
4147 - attempt to exactly restore an exported changeset (not always
4148 - attempt to exactly restore an exported changeset (not always
4148 possible)::
4149 possible)::
4149
4150
4150 hg import --exact proposed-fix.patch
4151 hg import --exact proposed-fix.patch
4151
4152
4152 - use an external tool to apply a patch which is too fuzzy for
4153 - use an external tool to apply a patch which is too fuzzy for
4153 the default internal tool.
4154 the default internal tool.
4154
4155
4155 hg import --config ui.patch="patch --merge" fuzzy.patch
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4156
4157
4157 - change the default fuzzing from 2 to a less strict 7
4158 - change the default fuzzing from 2 to a less strict 7
4158
4159
4159 hg import --config ui.fuzz=7 fuzz.patch
4160 hg import --config ui.fuzz=7 fuzz.patch
4160
4161
4161 Returns 0 on success, 1 on partial success (see --partial).
4162 Returns 0 on success, 1 on partial success (see --partial).
4162 """
4163 """
4163
4164
4164 opts = pycompat.byteskwargs(opts)
4165 opts = pycompat.byteskwargs(opts)
4165 if not patch1:
4166 if not patch1:
4166 raise error.Abort(_(b'need at least one patch to import'))
4167 raise error.Abort(_(b'need at least one patch to import'))
4167
4168
4168 patches = (patch1,) + patches
4169 patches = (patch1,) + patches
4169
4170
4170 date = opts.get(b'date')
4171 date = opts.get(b'date')
4171 if date:
4172 if date:
4172 opts[b'date'] = dateutil.parsedate(date)
4173 opts[b'date'] = dateutil.parsedate(date)
4173
4174
4174 exact = opts.get(b'exact')
4175 exact = opts.get(b'exact')
4175 update = not opts.get(b'bypass')
4176 update = not opts.get(b'bypass')
4176 if not update and opts.get(b'no_commit'):
4177 if not update and opts.get(b'no_commit'):
4177 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4178 if opts.get(b'secret') and opts.get(b'no_commit'):
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4179 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4180 try:
4181 try:
4181 sim = float(opts.get(b'similarity') or 0)
4182 sim = float(opts.get(b'similarity') or 0)
4182 except ValueError:
4183 except ValueError:
4183 raise error.Abort(_(b'similarity must be a number'))
4184 raise error.Abort(_(b'similarity must be a number'))
4184 if sim < 0 or sim > 100:
4185 if sim < 0 or sim > 100:
4185 raise error.Abort(_(b'similarity must be between 0 and 100'))
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4186 if sim and not update:
4187 if sim and not update:
4187 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4188 if exact:
4189 if exact:
4189 if opts.get(b'edit'):
4190 if opts.get(b'edit'):
4190 raise error.Abort(_(b'cannot use --exact with --edit'))
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4191 if opts.get(b'prefix'):
4192 if opts.get(b'prefix'):
4192 raise error.Abort(_(b'cannot use --exact with --prefix'))
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4193
4194
4194 base = opts[b"base"]
4195 base = opts[b"base"]
4195 msgs = []
4196 msgs = []
4196 ret = 0
4197 ret = 0
4197
4198
4198 with repo.wlock():
4199 with repo.wlock():
4199 if update:
4200 if update:
4200 cmdutil.checkunfinished(repo)
4201 cmdutil.checkunfinished(repo)
4201 if exact or not opts.get(b'force'):
4202 if exact or not opts.get(b'force'):
4202 cmdutil.bailifchanged(repo)
4203 cmdutil.bailifchanged(repo)
4203
4204
4204 if not opts.get(b'no_commit'):
4205 if not opts.get(b'no_commit'):
4205 lock = repo.lock
4206 lock = repo.lock
4206 tr = lambda: repo.transaction(b'import')
4207 tr = lambda: repo.transaction(b'import')
4207 dsguard = util.nullcontextmanager
4208 dsguard = util.nullcontextmanager
4208 else:
4209 else:
4209 lock = util.nullcontextmanager
4210 lock = util.nullcontextmanager
4210 tr = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4211 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4212 with lock(), tr(), dsguard():
4213 with lock(), tr(), dsguard():
4213 parents = repo[None].parents()
4214 parents = repo[None].parents()
4214 for patchurl in patches:
4215 for patchurl in patches:
4215 if patchurl == b'-':
4216 if patchurl == b'-':
4216 ui.status(_(b'applying patch from stdin\n'))
4217 ui.status(_(b'applying patch from stdin\n'))
4217 patchfile = ui.fin
4218 patchfile = ui.fin
4218 patchurl = b'stdin' # for error message
4219 patchurl = b'stdin' # for error message
4219 else:
4220 else:
4220 patchurl = os.path.join(base, patchurl)
4221 patchurl = os.path.join(base, patchurl)
4221 ui.status(_(b'applying %s\n') % patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4222 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4223
4224
4224 haspatch = False
4225 haspatch = False
4225 for hunk in patch.split(patchfile):
4226 for hunk in patch.split(patchfile):
4226 with patch.extract(ui, hunk) as patchdata:
4227 with patch.extract(ui, hunk) as patchdata:
4227 msg, node, rej = cmdutil.tryimportone(
4228 msg, node, rej = cmdutil.tryimportone(
4228 ui, repo, patchdata, parents, opts, msgs, hg.clean
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4229 )
4230 )
4230 if msg:
4231 if msg:
4231 haspatch = True
4232 haspatch = True
4232 ui.note(msg + b'\n')
4233 ui.note(msg + b'\n')
4233 if update or exact:
4234 if update or exact:
4234 parents = repo[None].parents()
4235 parents = repo[None].parents()
4235 else:
4236 else:
4236 parents = [repo[node]]
4237 parents = [repo[node]]
4237 if rej:
4238 if rej:
4238 ui.write_err(_(b"patch applied partially\n"))
4239 ui.write_err(_(b"patch applied partially\n"))
4239 ui.write_err(
4240 ui.write_err(
4240 _(
4241 _(
4241 b"(fix the .rej files and run "
4242 b"(fix the .rej files and run "
4242 b"`hg commit --amend`)\n"
4243 b"`hg commit --amend`)\n"
4243 )
4244 )
4244 )
4245 )
4245 ret = 1
4246 ret = 1
4246 break
4247 break
4247
4248
4248 if not haspatch:
4249 if not haspatch:
4249 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4250
4251
4251 if msgs:
4252 if msgs:
4252 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4253 return ret
4254 return ret
4254
4255
4255
4256
4256 @command(
4257 @command(
4257 b'incoming|in',
4258 b'incoming|in',
4258 [
4259 [
4259 (
4260 (
4260 b'f',
4261 b'f',
4261 b'force',
4262 b'force',
4262 None,
4263 None,
4263 _(b'run even if remote repository is unrelated'),
4264 _(b'run even if remote repository is unrelated'),
4264 ),
4265 ),
4265 (b'n', b'newest-first', None, _(b'show newest record first')),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4266 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4267 (
4268 (
4268 b'r',
4269 b'r',
4269 b'rev',
4270 b'rev',
4270 [],
4271 [],
4271 _(b'a remote changeset intended to be added'),
4272 _(b'a remote changeset intended to be added'),
4272 _(b'REV'),
4273 _(b'REV'),
4273 ),
4274 ),
4274 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4275 (
4276 (
4276 b'b',
4277 b'b',
4277 b'branch',
4278 b'branch',
4278 [],
4279 [],
4279 _(b'a specific branch you would like to pull'),
4280 _(b'a specific branch you would like to pull'),
4280 _(b'BRANCH'),
4281 _(b'BRANCH'),
4281 ),
4282 ),
4282 ]
4283 ]
4283 + logopts
4284 + logopts
4284 + remoteopts
4285 + remoteopts
4285 + subrepoopts,
4286 + subrepoopts,
4286 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4287 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4288 )
4289 )
4289 def incoming(ui, repo, source=b"default", **opts):
4290 def incoming(ui, repo, source=b"default", **opts):
4290 """show new changesets found in source
4291 """show new changesets found in source
4291
4292
4292 Show new changesets found in the specified path/URL or the default
4293 Show new changesets found in the specified path/URL or the default
4293 pull location. These are the changesets that would have been pulled
4294 pull location. These are the changesets that would have been pulled
4294 by :hg:`pull` at the time you issued this command.
4295 by :hg:`pull` at the time you issued this command.
4295
4296
4296 See pull for valid source format details.
4297 See pull for valid source format details.
4297
4298
4298 .. container:: verbose
4299 .. container:: verbose
4299
4300
4300 With -B/--bookmarks, the result of bookmark comparison between
4301 With -B/--bookmarks, the result of bookmark comparison between
4301 local and remote repositories is displayed. With -v/--verbose,
4302 local and remote repositories is displayed. With -v/--verbose,
4302 status is also displayed for each bookmark like below::
4303 status is also displayed for each bookmark like below::
4303
4304
4304 BM1 01234567890a added
4305 BM1 01234567890a added
4305 BM2 1234567890ab advanced
4306 BM2 1234567890ab advanced
4306 BM3 234567890abc diverged
4307 BM3 234567890abc diverged
4307 BM4 34567890abcd changed
4308 BM4 34567890abcd changed
4308
4309
4309 The action taken locally when pulling depends on the
4310 The action taken locally when pulling depends on the
4310 status of each bookmark:
4311 status of each bookmark:
4311
4312
4312 :``added``: pull will create it
4313 :``added``: pull will create it
4313 :``advanced``: pull will update it
4314 :``advanced``: pull will update it
4314 :``diverged``: pull will create a divergent bookmark
4315 :``diverged``: pull will create a divergent bookmark
4315 :``changed``: result depends on remote changesets
4316 :``changed``: result depends on remote changesets
4316
4317
4317 From the point of view of pulling behavior, bookmark
4318 From the point of view of pulling behavior, bookmark
4318 existing only in the remote repository are treated as ``added``,
4319 existing only in the remote repository are treated as ``added``,
4319 even if it is in fact locally deleted.
4320 even if it is in fact locally deleted.
4320
4321
4321 .. container:: verbose
4322 .. container:: verbose
4322
4323
4323 For remote repository, using --bundle avoids downloading the
4324 For remote repository, using --bundle avoids downloading the
4324 changesets twice if the incoming is followed by a pull.
4325 changesets twice if the incoming is followed by a pull.
4325
4326
4326 Examples:
4327 Examples:
4327
4328
4328 - show incoming changes with patches and full description::
4329 - show incoming changes with patches and full description::
4329
4330
4330 hg incoming -vp
4331 hg incoming -vp
4331
4332
4332 - show incoming changes excluding merges, store a bundle::
4333 - show incoming changes excluding merges, store a bundle::
4333
4334
4334 hg in -vpM --bundle incoming.hg
4335 hg in -vpM --bundle incoming.hg
4335 hg pull incoming.hg
4336 hg pull incoming.hg
4336
4337
4337 - briefly list changes inside a bundle::
4338 - briefly list changes inside a bundle::
4338
4339
4339 hg in changes.hg -T "{desc|firstline}\\n"
4340 hg in changes.hg -T "{desc|firstline}\\n"
4340
4341
4341 Returns 0 if there are incoming changes, 1 otherwise.
4342 Returns 0 if there are incoming changes, 1 otherwise.
4342 """
4343 """
4343 opts = pycompat.byteskwargs(opts)
4344 opts = pycompat.byteskwargs(opts)
4344 if opts.get(b'graph'):
4345 if opts.get(b'graph'):
4345 logcmdutil.checkunsupportedgraphflags([], opts)
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4346
4347
4347 def display(other, chlist, displayer):
4348 def display(other, chlist, displayer):
4348 revdag = logcmdutil.graphrevs(other, chlist, opts)
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4349 logcmdutil.displaygraph(
4350 logcmdutil.displaygraph(
4350 ui, repo, revdag, displayer, graphmod.asciiedges
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4351 )
4352 )
4352
4353
4353 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4354 return 0
4355 return 0
4355
4356
4356 if opts.get(b'bundle') and opts.get(b'subrepos'):
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4357 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4358
4359
4359 if opts.get(b'bookmarks'):
4360 if opts.get(b'bookmarks'):
4360 source, branches = hg.parseurl(
4361 source, branches = hg.parseurl(
4361 ui.expandpath(source), opts.get(b'branch')
4362 ui.expandpath(source), opts.get(b'branch')
4362 )
4363 )
4363 other = hg.peer(repo, opts, source)
4364 other = hg.peer(repo, opts, source)
4364 if b'bookmarks' not in other.listkeys(b'namespaces'):
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4365 ui.warn(_(b"remote doesn't support bookmarks\n"))
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4366 return 0
4367 return 0
4367 ui.pager(b'incoming')
4368 ui.pager(b'incoming')
4368 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4369 return bookmarks.incoming(ui, repo, other)
4370 return bookmarks.incoming(ui, repo, other)
4370
4371
4371 repo._subtoppath = ui.expandpath(source)
4372 repo._subtoppath = ui.expandpath(source)
4372 try:
4373 try:
4373 return hg.incoming(ui, repo, source, opts)
4374 return hg.incoming(ui, repo, source, opts)
4374 finally:
4375 finally:
4375 del repo._subtoppath
4376 del repo._subtoppath
4376
4377
4377
4378
4378 @command(
4379 @command(
4379 b'init',
4380 b'init',
4380 remoteopts,
4381 remoteopts,
4381 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4382 helpcategory=command.CATEGORY_REPO_CREATION,
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4383 helpbasic=True,
4384 helpbasic=True,
4384 norepo=True,
4385 norepo=True,
4385 )
4386 )
4386 def init(ui, dest=b".", **opts):
4387 def init(ui, dest=b".", **opts):
4387 """create a new repository in the given directory
4388 """create a new repository in the given directory
4388
4389
4389 Initialize a new repository in the given directory. If the given
4390 Initialize a new repository in the given directory. If the given
4390 directory does not exist, it will be created.
4391 directory does not exist, it will be created.
4391
4392
4392 If no directory is given, the current directory is used.
4393 If no directory is given, the current directory is used.
4393
4394
4394 It is possible to specify an ``ssh://`` URL as the destination.
4395 It is possible to specify an ``ssh://`` URL as the destination.
4395 See :hg:`help urls` for more information.
4396 See :hg:`help urls` for more information.
4396
4397
4397 Returns 0 on success.
4398 Returns 0 on success.
4398 """
4399 """
4399 opts = pycompat.byteskwargs(opts)
4400 opts = pycompat.byteskwargs(opts)
4400 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4401
4402
4402
4403
4403 @command(
4404 @command(
4404 b'locate',
4405 b'locate',
4405 [
4406 [
4406 (
4407 (
4407 b'r',
4408 b'r',
4408 b'rev',
4409 b'rev',
4409 b'',
4410 b'',
4410 _(b'search the repository as it is in REV'),
4411 _(b'search the repository as it is in REV'),
4411 _(b'REV'),
4412 _(b'REV'),
4412 ),
4413 ),
4413 (
4414 (
4414 b'0',
4415 b'0',
4415 b'print0',
4416 b'print0',
4416 None,
4417 None,
4417 _(b'end filenames with NUL, for use with xargs'),
4418 _(b'end filenames with NUL, for use with xargs'),
4418 ),
4419 ),
4419 (
4420 (
4420 b'f',
4421 b'f',
4421 b'fullpath',
4422 b'fullpath',
4422 None,
4423 None,
4423 _(b'print complete paths from the filesystem root'),
4424 _(b'print complete paths from the filesystem root'),
4424 ),
4425 ),
4425 ]
4426 ]
4426 + walkopts,
4427 + walkopts,
4427 _(b'[OPTION]... [PATTERN]...'),
4428 _(b'[OPTION]... [PATTERN]...'),
4428 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4429 )
4430 )
4430 def locate(ui, repo, *pats, **opts):
4431 def locate(ui, repo, *pats, **opts):
4431 """locate files matching specific patterns (DEPRECATED)
4432 """locate files matching specific patterns (DEPRECATED)
4432
4433
4433 Print files under Mercurial control in the working directory whose
4434 Print files under Mercurial control in the working directory whose
4434 names match the given patterns.
4435 names match the given patterns.
4435
4436
4436 By default, this command searches all directories in the working
4437 By default, this command searches all directories in the working
4437 directory. To search just the current directory and its
4438 directory. To search just the current directory and its
4438 subdirectories, use "--include .".
4439 subdirectories, use "--include .".
4439
4440
4440 If no patterns are given to match, this command prints the names
4441 If no patterns are given to match, this command prints the names
4441 of all files under Mercurial control in the working directory.
4442 of all files under Mercurial control in the working directory.
4442
4443
4443 If you want to feed the output of this command into the "xargs"
4444 If you want to feed the output of this command into the "xargs"
4444 command, use the -0 option to both this command and "xargs". This
4445 command, use the -0 option to both this command and "xargs". This
4445 will avoid the problem of "xargs" treating single filenames that
4446 will avoid the problem of "xargs" treating single filenames that
4446 contain whitespace as multiple filenames.
4447 contain whitespace as multiple filenames.
4447
4448
4448 See :hg:`help files` for a more versatile command.
4449 See :hg:`help files` for a more versatile command.
4449
4450
4450 Returns 0 if a match is found, 1 otherwise.
4451 Returns 0 if a match is found, 1 otherwise.
4451 """
4452 """
4452 opts = pycompat.byteskwargs(opts)
4453 opts = pycompat.byteskwargs(opts)
4453 if opts.get(b'print0'):
4454 if opts.get(b'print0'):
4454 end = b'\0'
4455 end = b'\0'
4455 else:
4456 else:
4456 end = b'\n'
4457 end = b'\n'
4457 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4458
4459
4459 ret = 1
4460 ret = 1
4460 m = scmutil.match(
4461 m = scmutil.match(
4461 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4462 )
4463 )
4463
4464
4464 ui.pager(b'locate')
4465 ui.pager(b'locate')
4465 if ctx.rev() is None:
4466 if ctx.rev() is None:
4466 # When run on the working copy, "locate" includes removed files, so
4467 # When run on the working copy, "locate" includes removed files, so
4467 # we get the list of files from the dirstate.
4468 # we get the list of files from the dirstate.
4468 filesgen = sorted(repo.dirstate.matches(m))
4469 filesgen = sorted(repo.dirstate.matches(m))
4469 else:
4470 else:
4470 filesgen = ctx.matches(m)
4471 filesgen = ctx.matches(m)
4471 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4472 for abs in filesgen:
4473 for abs in filesgen:
4473 if opts.get(b'fullpath'):
4474 if opts.get(b'fullpath'):
4474 ui.write(repo.wjoin(abs), end)
4475 ui.write(repo.wjoin(abs), end)
4475 else:
4476 else:
4476 ui.write(uipathfn(abs), end)
4477 ui.write(uipathfn(abs), end)
4477 ret = 0
4478 ret = 0
4478
4479
4479 return ret
4480 return ret
4480
4481
4481
4482
4482 @command(
4483 @command(
4483 b'log|history',
4484 b'log|history',
4484 [
4485 [
4485 (
4486 (
4486 b'f',
4487 b'f',
4487 b'follow',
4488 b'follow',
4488 None,
4489 None,
4489 _(
4490 _(
4490 b'follow changeset history, or file history across copies and renames'
4491 b'follow changeset history, or file history across copies and renames'
4491 ),
4492 ),
4492 ),
4493 ),
4493 (
4494 (
4494 b'',
4495 b'',
4495 b'follow-first',
4496 b'follow-first',
4496 None,
4497 None,
4497 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4498 ),
4499 ),
4499 (
4500 (
4500 b'd',
4501 b'd',
4501 b'date',
4502 b'date',
4502 b'',
4503 b'',
4503 _(b'show revisions matching date spec'),
4504 _(b'show revisions matching date spec'),
4504 _(b'DATE'),
4505 _(b'DATE'),
4505 ),
4506 ),
4506 (b'C', b'copies', None, _(b'show copied files')),
4507 (b'C', b'copies', None, _(b'show copied files')),
4507 (
4508 (
4508 b'k',
4509 b'k',
4509 b'keyword',
4510 b'keyword',
4510 [],
4511 [],
4511 _(b'do case-insensitive search for a given text'),
4512 _(b'do case-insensitive search for a given text'),
4512 _(b'TEXT'),
4513 _(b'TEXT'),
4513 ),
4514 ),
4514 (
4515 (
4515 b'r',
4516 b'r',
4516 b'rev',
4517 b'rev',
4517 [],
4518 [],
4518 _(b'show the specified revision or revset'),
4519 _(b'show the specified revision or revset'),
4519 _(b'REV'),
4520 _(b'REV'),
4520 ),
4521 ),
4521 (
4522 (
4522 b'L',
4523 b'L',
4523 b'line-range',
4524 b'line-range',
4524 [],
4525 [],
4525 _(b'follow line range of specified file (EXPERIMENTAL)'),
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4526 _(b'FILE,RANGE'),
4527 _(b'FILE,RANGE'),
4527 ),
4528 ),
4528 (
4529 (
4529 b'',
4530 b'',
4530 b'removed',
4531 b'removed',
4531 None,
4532 None,
4532 _(b'include revisions where files were removed'),
4533 _(b'include revisions where files were removed'),
4533 ),
4534 ),
4534 (
4535 (
4535 b'm',
4536 b'm',
4536 b'only-merges',
4537 b'only-merges',
4537 None,
4538 None,
4538 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4539 ),
4540 ),
4540 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4541 (
4542 (
4542 b'',
4543 b'',
4543 b'only-branch',
4544 b'only-branch',
4544 [],
4545 [],
4545 _(
4546 _(
4546 b'show only changesets within the given named branch (DEPRECATED)'
4547 b'show only changesets within the given named branch (DEPRECATED)'
4547 ),
4548 ),
4548 _(b'BRANCH'),
4549 _(b'BRANCH'),
4549 ),
4550 ),
4550 (
4551 (
4551 b'b',
4552 b'b',
4552 b'branch',
4553 b'branch',
4553 [],
4554 [],
4554 _(b'show changesets within the given named branch'),
4555 _(b'show changesets within the given named branch'),
4555 _(b'BRANCH'),
4556 _(b'BRANCH'),
4556 ),
4557 ),
4557 (
4558 (
4558 b'P',
4559 b'P',
4559 b'prune',
4560 b'prune',
4560 [],
4561 [],
4561 _(b'do not display revision or any of its ancestors'),
4562 _(b'do not display revision or any of its ancestors'),
4562 _(b'REV'),
4563 _(b'REV'),
4563 ),
4564 ),
4564 ]
4565 ]
4565 + logopts
4566 + logopts
4566 + walkopts,
4567 + walkopts,
4567 _(b'[OPTION]... [FILE]'),
4568 _(b'[OPTION]... [FILE]'),
4568 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4569 helpbasic=True,
4570 helpbasic=True,
4570 inferrepo=True,
4571 inferrepo=True,
4571 intents={INTENT_READONLY},
4572 intents={INTENT_READONLY},
4572 )
4573 )
4573 def log(ui, repo, *pats, **opts):
4574 def log(ui, repo, *pats, **opts):
4574 """show revision history of entire repository or files
4575 """show revision history of entire repository or files
4575
4576
4576 Print the revision history of the specified files or the entire
4577 Print the revision history of the specified files or the entire
4577 project.
4578 project.
4578
4579
4579 If no revision range is specified, the default is ``tip:0`` unless
4580 If no revision range is specified, the default is ``tip:0`` unless
4580 --follow is set, in which case the working directory parent is
4581 --follow is set, in which case the working directory parent is
4581 used as the starting revision.
4582 used as the starting revision.
4582
4583
4583 File history is shown without following rename or copy history of
4584 File history is shown without following rename or copy history of
4584 files. Use -f/--follow with a filename to follow history across
4585 files. Use -f/--follow with a filename to follow history across
4585 renames and copies. --follow without a filename will only show
4586 renames and copies. --follow without a filename will only show
4586 ancestors of the starting revision.
4587 ancestors of the starting revision.
4587
4588
4588 By default this command prints revision number and changeset id,
4589 By default this command prints revision number and changeset id,
4589 tags, non-trivial parents, user, date and time, and a summary for
4590 tags, non-trivial parents, user, date and time, and a summary for
4590 each commit. When the -v/--verbose switch is used, the list of
4591 each commit. When the -v/--verbose switch is used, the list of
4591 changed files and full commit message are shown.
4592 changed files and full commit message are shown.
4592
4593
4593 With --graph the revisions are shown as an ASCII art DAG with the most
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4594 recent changeset at the top.
4595 recent changeset at the top.
4595 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4596 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4596 involved in an unresolved merge conflict, '_' closes a branch,
4597 involved in an unresolved merge conflict, '_' closes a branch,
4597 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4598 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4598 changeset from the lines below is a parent of the 'o' merge on the same
4599 changeset from the lines below is a parent of the 'o' merge on the same
4599 line.
4600 line.
4600 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4601 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4601 of a '|' indicates one or more revisions in a path are omitted.
4602 of a '|' indicates one or more revisions in a path are omitted.
4602
4603
4603 .. container:: verbose
4604 .. container:: verbose
4604
4605
4605 Use -L/--line-range FILE,M:N options to follow the history of lines
4606 Use -L/--line-range FILE,M:N options to follow the history of lines
4606 from M to N in FILE. With -p/--patch only diff hunks affecting
4607 from M to N in FILE. With -p/--patch only diff hunks affecting
4607 specified line range will be shown. This option requires --follow;
4608 specified line range will be shown. This option requires --follow;
4608 it can be specified multiple times. Currently, this option is not
4609 it can be specified multiple times. Currently, this option is not
4609 compatible with --graph. This option is experimental.
4610 compatible with --graph. This option is experimental.
4610
4611
4611 .. note::
4612 .. note::
4612
4613
4613 :hg:`log --patch` may generate unexpected diff output for merge
4614 :hg:`log --patch` may generate unexpected diff output for merge
4614 changesets, as it will only compare the merge changeset against
4615 changesets, as it will only compare the merge changeset against
4615 its first parent. Also, only files different from BOTH parents
4616 its first parent. Also, only files different from BOTH parents
4616 will appear in files:.
4617 will appear in files:.
4617
4618
4618 .. note::
4619 .. note::
4619
4620
4620 For performance reasons, :hg:`log FILE` may omit duplicate changes
4621 For performance reasons, :hg:`log FILE` may omit duplicate changes
4621 made on branches and will not show removals or mode changes. To
4622 made on branches and will not show removals or mode changes. To
4622 see all such changes, use the --removed switch.
4623 see all such changes, use the --removed switch.
4623
4624
4624 .. container:: verbose
4625 .. container:: verbose
4625
4626
4626 .. note::
4627 .. note::
4627
4628
4628 The history resulting from -L/--line-range options depends on diff
4629 The history resulting from -L/--line-range options depends on diff
4629 options; for instance if white-spaces are ignored, respective changes
4630 options; for instance if white-spaces are ignored, respective changes
4630 with only white-spaces in specified line range will not be listed.
4631 with only white-spaces in specified line range will not be listed.
4631
4632
4632 .. container:: verbose
4633 .. container:: verbose
4633
4634
4634 Some examples:
4635 Some examples:
4635
4636
4636 - changesets with full descriptions and file lists::
4637 - changesets with full descriptions and file lists::
4637
4638
4638 hg log -v
4639 hg log -v
4639
4640
4640 - changesets ancestral to the working directory::
4641 - changesets ancestral to the working directory::
4641
4642
4642 hg log -f
4643 hg log -f
4643
4644
4644 - last 10 commits on the current branch::
4645 - last 10 commits on the current branch::
4645
4646
4646 hg log -l 10 -b .
4647 hg log -l 10 -b .
4647
4648
4648 - changesets showing all modifications of a file, including removals::
4649 - changesets showing all modifications of a file, including removals::
4649
4650
4650 hg log --removed file.c
4651 hg log --removed file.c
4651
4652
4652 - all changesets that touch a directory, with diffs, excluding merges::
4653 - all changesets that touch a directory, with diffs, excluding merges::
4653
4654
4654 hg log -Mp lib/
4655 hg log -Mp lib/
4655
4656
4656 - all revision numbers that match a keyword::
4657 - all revision numbers that match a keyword::
4657
4658
4658 hg log -k bug --template "{rev}\\n"
4659 hg log -k bug --template "{rev}\\n"
4659
4660
4660 - the full hash identifier of the working directory parent::
4661 - the full hash identifier of the working directory parent::
4661
4662
4662 hg log -r . --template "{node}\\n"
4663 hg log -r . --template "{node}\\n"
4663
4664
4664 - list available log templates::
4665 - list available log templates::
4665
4666
4666 hg log -T list
4667 hg log -T list
4667
4668
4668 - check if a given changeset is included in a tagged release::
4669 - check if a given changeset is included in a tagged release::
4669
4670
4670 hg log -r "a21ccf and ancestor(1.9)"
4671 hg log -r "a21ccf and ancestor(1.9)"
4671
4672
4672 - find all changesets by some user in a date range::
4673 - find all changesets by some user in a date range::
4673
4674
4674 hg log -k alice -d "may 2008 to jul 2008"
4675 hg log -k alice -d "may 2008 to jul 2008"
4675
4676
4676 - summary of all changesets after the last tag::
4677 - summary of all changesets after the last tag::
4677
4678
4678 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4679 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4679
4680
4680 - changesets touching lines 13 to 23 for file.c::
4681 - changesets touching lines 13 to 23 for file.c::
4681
4682
4682 hg log -L file.c,13:23
4683 hg log -L file.c,13:23
4683
4684
4684 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4685 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4685 main.c with patch::
4686 main.c with patch::
4686
4687
4687 hg log -L file.c,13:23 -L main.c,2:6 -p
4688 hg log -L file.c,13:23 -L main.c,2:6 -p
4688
4689
4689 See :hg:`help dates` for a list of formats valid for -d/--date.
4690 See :hg:`help dates` for a list of formats valid for -d/--date.
4690
4691
4691 See :hg:`help revisions` for more about specifying and ordering
4692 See :hg:`help revisions` for more about specifying and ordering
4692 revisions.
4693 revisions.
4693
4694
4694 See :hg:`help templates` for more about pre-packaged styles and
4695 See :hg:`help templates` for more about pre-packaged styles and
4695 specifying custom templates. The default template used by the log
4696 specifying custom templates. The default template used by the log
4696 command can be customized via the ``ui.logtemplate`` configuration
4697 command can be customized via the ``ui.logtemplate`` configuration
4697 setting.
4698 setting.
4698
4699
4699 Returns 0 on success.
4700 Returns 0 on success.
4700
4701
4701 """
4702 """
4702 opts = pycompat.byteskwargs(opts)
4703 opts = pycompat.byteskwargs(opts)
4703 linerange = opts.get(b'line_range')
4704 linerange = opts.get(b'line_range')
4704
4705
4705 if linerange and not opts.get(b'follow'):
4706 if linerange and not opts.get(b'follow'):
4706 raise error.Abort(_(b'--line-range requires --follow'))
4707 raise error.Abort(_(b'--line-range requires --follow'))
4707
4708
4708 if linerange and pats:
4709 if linerange and pats:
4709 # TODO: take pats as patterns with no line-range filter
4710 # TODO: take pats as patterns with no line-range filter
4710 raise error.Abort(
4711 raise error.Abort(
4711 _(b'FILE arguments are not compatible with --line-range option')
4712 _(b'FILE arguments are not compatible with --line-range option')
4712 )
4713 )
4713
4714
4714 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4715 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4715 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4716 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4716 if linerange:
4717 if linerange:
4717 # TODO: should follow file history from logcmdutil._initialrevs(),
4718 # TODO: should follow file history from logcmdutil._initialrevs(),
4718 # then filter the result by logcmdutil._makerevset() and --limit
4719 # then filter the result by logcmdutil._makerevset() and --limit
4719 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4720 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4720
4721
4721 getcopies = None
4722 getcopies = None
4722 if opts.get(b'copies'):
4723 if opts.get(b'copies'):
4723 endrev = None
4724 endrev = None
4724 if revs:
4725 if revs:
4725 endrev = revs.max() + 1
4726 endrev = revs.max() + 1
4726 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4727 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4727
4728
4728 ui.pager(b'log')
4729 ui.pager(b'log')
4729 displayer = logcmdutil.changesetdisplayer(
4730 displayer = logcmdutil.changesetdisplayer(
4730 ui, repo, opts, differ, buffered=True
4731 ui, repo, opts, differ, buffered=True
4731 )
4732 )
4732 if opts.get(b'graph'):
4733 if opts.get(b'graph'):
4733 displayfn = logcmdutil.displaygraphrevs
4734 displayfn = logcmdutil.displaygraphrevs
4734 else:
4735 else:
4735 displayfn = logcmdutil.displayrevs
4736 displayfn = logcmdutil.displayrevs
4736 displayfn(ui, repo, revs, displayer, getcopies)
4737 displayfn(ui, repo, revs, displayer, getcopies)
4737
4738
4738
4739
4739 @command(
4740 @command(
4740 b'manifest',
4741 b'manifest',
4741 [
4742 [
4742 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4743 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4743 (b'', b'all', False, _(b"list files from all revisions")),
4744 (b'', b'all', False, _(b"list files from all revisions")),
4744 ]
4745 ]
4745 + formatteropts,
4746 + formatteropts,
4746 _(b'[-r REV]'),
4747 _(b'[-r REV]'),
4747 helpcategory=command.CATEGORY_MAINTENANCE,
4748 helpcategory=command.CATEGORY_MAINTENANCE,
4748 intents={INTENT_READONLY},
4749 intents={INTENT_READONLY},
4749 )
4750 )
4750 def manifest(ui, repo, node=None, rev=None, **opts):
4751 def manifest(ui, repo, node=None, rev=None, **opts):
4751 """output the current or given revision of the project manifest
4752 """output the current or given revision of the project manifest
4752
4753
4753 Print a list of version controlled files for the given revision.
4754 Print a list of version controlled files for the given revision.
4754 If no revision is given, the first parent of the working directory
4755 If no revision is given, the first parent of the working directory
4755 is used, or the null revision if no revision is checked out.
4756 is used, or the null revision if no revision is checked out.
4756
4757
4757 With -v, print file permissions, symlink and executable bits.
4758 With -v, print file permissions, symlink and executable bits.
4758 With --debug, print file revision hashes.
4759 With --debug, print file revision hashes.
4759
4760
4760 If option --all is specified, the list of all files from all revisions
4761 If option --all is specified, the list of all files from all revisions
4761 is printed. This includes deleted and renamed files.
4762 is printed. This includes deleted and renamed files.
4762
4763
4763 Returns 0 on success.
4764 Returns 0 on success.
4764 """
4765 """
4765 opts = pycompat.byteskwargs(opts)
4766 opts = pycompat.byteskwargs(opts)
4766 fm = ui.formatter(b'manifest', opts)
4767 fm = ui.formatter(b'manifest', opts)
4767
4768
4768 if opts.get(b'all'):
4769 if opts.get(b'all'):
4769 if rev or node:
4770 if rev or node:
4770 raise error.Abort(_(b"can't specify a revision with --all"))
4771 raise error.Abort(_(b"can't specify a revision with --all"))
4771
4772
4772 res = set()
4773 res = set()
4773 for rev in repo:
4774 for rev in repo:
4774 ctx = repo[rev]
4775 ctx = repo[rev]
4775 res |= set(ctx.files())
4776 res |= set(ctx.files())
4776
4777
4777 ui.pager(b'manifest')
4778 ui.pager(b'manifest')
4778 for f in sorted(res):
4779 for f in sorted(res):
4779 fm.startitem()
4780 fm.startitem()
4780 fm.write(b"path", b'%s\n', f)
4781 fm.write(b"path", b'%s\n', f)
4781 fm.end()
4782 fm.end()
4782 return
4783 return
4783
4784
4784 if rev and node:
4785 if rev and node:
4785 raise error.Abort(_(b"please specify just one revision"))
4786 raise error.Abort(_(b"please specify just one revision"))
4786
4787
4787 if not node:
4788 if not node:
4788 node = rev
4789 node = rev
4789
4790
4790 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4791 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4791 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4792 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4792 if node:
4793 if node:
4793 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4794 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4794 ctx = scmutil.revsingle(repo, node)
4795 ctx = scmutil.revsingle(repo, node)
4795 mf = ctx.manifest()
4796 mf = ctx.manifest()
4796 ui.pager(b'manifest')
4797 ui.pager(b'manifest')
4797 for f in ctx:
4798 for f in ctx:
4798 fm.startitem()
4799 fm.startitem()
4799 fm.context(ctx=ctx)
4800 fm.context(ctx=ctx)
4800 fl = ctx[f].flags()
4801 fl = ctx[f].flags()
4801 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4802 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4802 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4803 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4803 fm.write(b'path', b'%s\n', f)
4804 fm.write(b'path', b'%s\n', f)
4804 fm.end()
4805 fm.end()
4805
4806
4806
4807
4807 @command(
4808 @command(
4808 b'merge',
4809 b'merge',
4809 [
4810 [
4810 (
4811 (
4811 b'f',
4812 b'f',
4812 b'force',
4813 b'force',
4813 None,
4814 None,
4814 _(b'force a merge including outstanding changes (DEPRECATED)'),
4815 _(b'force a merge including outstanding changes (DEPRECATED)'),
4815 ),
4816 ),
4816 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4817 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4817 (
4818 (
4818 b'P',
4819 b'P',
4819 b'preview',
4820 b'preview',
4820 None,
4821 None,
4821 _(b'review revisions to merge (no merge is performed)'),
4822 _(b'review revisions to merge (no merge is performed)'),
4822 ),
4823 ),
4823 (b'', b'abort', None, _(b'abort the ongoing merge')),
4824 (b'', b'abort', None, _(b'abort the ongoing merge')),
4824 ]
4825 ]
4825 + mergetoolopts,
4826 + mergetoolopts,
4826 _(b'[-P] [[-r] REV]'),
4827 _(b'[-P] [[-r] REV]'),
4827 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4828 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4828 helpbasic=True,
4829 helpbasic=True,
4829 )
4830 )
4830 def merge(ui, repo, node=None, **opts):
4831 def merge(ui, repo, node=None, **opts):
4831 """merge another revision into working directory
4832 """merge another revision into working directory
4832
4833
4833 The current working directory is updated with all changes made in
4834 The current working directory is updated with all changes made in
4834 the requested revision since the last common predecessor revision.
4835 the requested revision since the last common predecessor revision.
4835
4836
4836 Files that changed between either parent are marked as changed for
4837 Files that changed between either parent are marked as changed for
4837 the next commit and a commit must be performed before any further
4838 the next commit and a commit must be performed before any further
4838 updates to the repository are allowed. The next commit will have
4839 updates to the repository are allowed. The next commit will have
4839 two parents.
4840 two parents.
4840
4841
4841 ``--tool`` can be used to specify the merge tool used for file
4842 ``--tool`` can be used to specify the merge tool used for file
4842 merges. It overrides the HGMERGE environment variable and your
4843 merges. It overrides the HGMERGE environment variable and your
4843 configuration files. See :hg:`help merge-tools` for options.
4844 configuration files. See :hg:`help merge-tools` for options.
4844
4845
4845 If no revision is specified, the working directory's parent is a
4846 If no revision is specified, the working directory's parent is a
4846 head revision, and the current branch contains exactly one other
4847 head revision, and the current branch contains exactly one other
4847 head, the other head is merged with by default. Otherwise, an
4848 head, the other head is merged with by default. Otherwise, an
4848 explicit revision with which to merge must be provided.
4849 explicit revision with which to merge must be provided.
4849
4850
4850 See :hg:`help resolve` for information on handling file conflicts.
4851 See :hg:`help resolve` for information on handling file conflicts.
4851
4852
4852 To undo an uncommitted merge, use :hg:`merge --abort` which
4853 To undo an uncommitted merge, use :hg:`merge --abort` which
4853 will check out a clean copy of the original merge parent, losing
4854 will check out a clean copy of the original merge parent, losing
4854 all changes.
4855 all changes.
4855
4856
4856 Returns 0 on success, 1 if there are unresolved files.
4857 Returns 0 on success, 1 if there are unresolved files.
4857 """
4858 """
4858
4859
4859 opts = pycompat.byteskwargs(opts)
4860 opts = pycompat.byteskwargs(opts)
4860 abort = opts.get(b'abort')
4861 abort = opts.get(b'abort')
4861 if abort and repo.dirstate.p2() == nullid:
4862 if abort and repo.dirstate.p2() == nullid:
4862 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4863 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4863 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4864 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4864 if abort:
4865 if abort:
4865 state = cmdutil.getunfinishedstate(repo)
4866 state = cmdutil.getunfinishedstate(repo)
4866 if state and state._opname != b'merge':
4867 if state and state._opname != b'merge':
4867 raise error.Abort(
4868 raise error.Abort(
4868 _(b'cannot abort merge with %s in progress') % (state._opname),
4869 _(b'cannot abort merge with %s in progress') % (state._opname),
4869 hint=state.hint(),
4870 hint=state.hint(),
4870 )
4871 )
4871 if node:
4872 if node:
4872 raise error.Abort(_(b"cannot specify a node with --abort"))
4873 raise error.Abort(_(b"cannot specify a node with --abort"))
4873 return hg.abortmerge(repo.ui, repo)
4874 return hg.abortmerge(repo.ui, repo)
4874
4875
4875 if opts.get(b'rev') and node:
4876 if opts.get(b'rev') and node:
4876 raise error.Abort(_(b"please specify just one revision"))
4877 raise error.Abort(_(b"please specify just one revision"))
4877 if not node:
4878 if not node:
4878 node = opts.get(b'rev')
4879 node = opts.get(b'rev')
4879
4880
4880 if node:
4881 if node:
4881 ctx = scmutil.revsingle(repo, node)
4882 ctx = scmutil.revsingle(repo, node)
4882 else:
4883 else:
4883 if ui.configbool(b'commands', b'merge.require-rev'):
4884 if ui.configbool(b'commands', b'merge.require-rev'):
4884 raise error.Abort(
4885 raise error.Abort(
4885 _(
4886 _(
4886 b'configuration requires specifying revision to merge '
4887 b'configuration requires specifying revision to merge '
4887 b'with'
4888 b'with'
4888 )
4889 )
4889 )
4890 )
4890 ctx = repo[destutil.destmerge(repo)]
4891 ctx = repo[destutil.destmerge(repo)]
4891
4892
4892 if ctx.node() is None:
4893 if ctx.node() is None:
4893 raise error.Abort(_(b'merging with the working copy has no effect'))
4894 raise error.Abort(_(b'merging with the working copy has no effect'))
4894
4895
4895 if opts.get(b'preview'):
4896 if opts.get(b'preview'):
4896 # find nodes that are ancestors of p2 but not of p1
4897 # find nodes that are ancestors of p2 but not of p1
4897 p1 = repo[b'.'].node()
4898 p1 = repo[b'.'].node()
4898 p2 = ctx.node()
4899 p2 = ctx.node()
4899 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4900 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4900
4901
4901 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4902 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4902 for node in nodes:
4903 for node in nodes:
4903 displayer.show(repo[node])
4904 displayer.show(repo[node])
4904 displayer.close()
4905 displayer.close()
4905 return 0
4906 return 0
4906
4907
4907 # ui.forcemerge is an internal variable, do not document
4908 # ui.forcemerge is an internal variable, do not document
4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4909 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4909 with ui.configoverride(overrides, b'merge'):
4910 with ui.configoverride(overrides, b'merge'):
4910 force = opts.get(b'force')
4911 force = opts.get(b'force')
4911 labels = [b'working copy', b'merge rev']
4912 labels = [b'working copy', b'merge rev']
4912 return hg.merge(ctx, force=force, labels=labels)
4913 return hg.merge(ctx, force=force, labels=labels)
4913
4914
4914
4915
4915 statemod.addunfinished(
4916 statemod.addunfinished(
4916 b'merge',
4917 b'merge',
4917 fname=None,
4918 fname=None,
4918 clearable=True,
4919 clearable=True,
4919 allowcommit=True,
4920 allowcommit=True,
4920 cmdmsg=_(b'outstanding uncommitted merge'),
4921 cmdmsg=_(b'outstanding uncommitted merge'),
4921 abortfunc=hg.abortmerge,
4922 abortfunc=hg.abortmerge,
4922 statushint=_(
4923 statushint=_(
4923 b'To continue: hg commit\nTo abort: hg merge --abort'
4924 b'To continue: hg commit\nTo abort: hg merge --abort'
4924 ),
4925 ),
4925 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4926 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4926 )
4927 )
4927
4928
4928
4929
4929 @command(
4930 @command(
4930 b'outgoing|out',
4931 b'outgoing|out',
4931 [
4932 [
4932 (
4933 (
4933 b'f',
4934 b'f',
4934 b'force',
4935 b'force',
4935 None,
4936 None,
4936 _(b'run even when the destination is unrelated'),
4937 _(b'run even when the destination is unrelated'),
4937 ),
4938 ),
4938 (
4939 (
4939 b'r',
4940 b'r',
4940 b'rev',
4941 b'rev',
4941 [],
4942 [],
4942 _(b'a changeset intended to be included in the destination'),
4943 _(b'a changeset intended to be included in the destination'),
4943 _(b'REV'),
4944 _(b'REV'),
4944 ),
4945 ),
4945 (b'n', b'newest-first', None, _(b'show newest record first')),
4946 (b'n', b'newest-first', None, _(b'show newest record first')),
4946 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4947 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4947 (
4948 (
4948 b'b',
4949 b'b',
4949 b'branch',
4950 b'branch',
4950 [],
4951 [],
4951 _(b'a specific branch you would like to push'),
4952 _(b'a specific branch you would like to push'),
4952 _(b'BRANCH'),
4953 _(b'BRANCH'),
4953 ),
4954 ),
4954 ]
4955 ]
4955 + logopts
4956 + logopts
4956 + remoteopts
4957 + remoteopts
4957 + subrepoopts,
4958 + subrepoopts,
4958 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4959 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4959 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4960 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4960 )
4961 )
4961 def outgoing(ui, repo, dest=None, **opts):
4962 def outgoing(ui, repo, dest=None, **opts):
4962 """show changesets not found in the destination
4963 """show changesets not found in the destination
4963
4964
4964 Show changesets not found in the specified destination repository
4965 Show changesets not found in the specified destination repository
4965 or the default push location. These are the changesets that would
4966 or the default push location. These are the changesets that would
4966 be pushed if a push was requested.
4967 be pushed if a push was requested.
4967
4968
4968 See pull for details of valid destination formats.
4969 See pull for details of valid destination formats.
4969
4970
4970 .. container:: verbose
4971 .. container:: verbose
4971
4972
4972 With -B/--bookmarks, the result of bookmark comparison between
4973 With -B/--bookmarks, the result of bookmark comparison between
4973 local and remote repositories is displayed. With -v/--verbose,
4974 local and remote repositories is displayed. With -v/--verbose,
4974 status is also displayed for each bookmark like below::
4975 status is also displayed for each bookmark like below::
4975
4976
4976 BM1 01234567890a added
4977 BM1 01234567890a added
4977 BM2 deleted
4978 BM2 deleted
4978 BM3 234567890abc advanced
4979 BM3 234567890abc advanced
4979 BM4 34567890abcd diverged
4980 BM4 34567890abcd diverged
4980 BM5 4567890abcde changed
4981 BM5 4567890abcde changed
4981
4982
4982 The action taken when pushing depends on the
4983 The action taken when pushing depends on the
4983 status of each bookmark:
4984 status of each bookmark:
4984
4985
4985 :``added``: push with ``-B`` will create it
4986 :``added``: push with ``-B`` will create it
4986 :``deleted``: push with ``-B`` will delete it
4987 :``deleted``: push with ``-B`` will delete it
4987 :``advanced``: push will update it
4988 :``advanced``: push will update it
4988 :``diverged``: push with ``-B`` will update it
4989 :``diverged``: push with ``-B`` will update it
4989 :``changed``: push with ``-B`` will update it
4990 :``changed``: push with ``-B`` will update it
4990
4991
4991 From the point of view of pushing behavior, bookmarks
4992 From the point of view of pushing behavior, bookmarks
4992 existing only in the remote repository are treated as
4993 existing only in the remote repository are treated as
4993 ``deleted``, even if it is in fact added remotely.
4994 ``deleted``, even if it is in fact added remotely.
4994
4995
4995 Returns 0 if there are outgoing changes, 1 otherwise.
4996 Returns 0 if there are outgoing changes, 1 otherwise.
4996 """
4997 """
4997 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4998 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4998 # style URLs, so don't overwrite dest.
4999 # style URLs, so don't overwrite dest.
4999 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5000 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5000 if not path:
5001 if not path:
5001 raise error.Abort(
5002 raise error.Abort(
5002 _(b'default repository not configured!'),
5003 _(b'default repository not configured!'),
5003 hint=_(b"see 'hg help config.paths'"),
5004 hint=_(b"see 'hg help config.paths'"),
5004 )
5005 )
5005
5006
5006 opts = pycompat.byteskwargs(opts)
5007 opts = pycompat.byteskwargs(opts)
5007 if opts.get(b'graph'):
5008 if opts.get(b'graph'):
5008 logcmdutil.checkunsupportedgraphflags([], opts)
5009 logcmdutil.checkunsupportedgraphflags([], opts)
5009 o, other = hg._outgoing(ui, repo, dest, opts)
5010 o, other = hg._outgoing(ui, repo, dest, opts)
5010 if not o:
5011 if not o:
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 return
5013 return
5013
5014
5014 revdag = logcmdutil.graphrevs(repo, o, opts)
5015 revdag = logcmdutil.graphrevs(repo, o, opts)
5015 ui.pager(b'outgoing')
5016 ui.pager(b'outgoing')
5016 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5017 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5017 logcmdutil.displaygraph(
5018 logcmdutil.displaygraph(
5018 ui, repo, revdag, displayer, graphmod.asciiedges
5019 ui, repo, revdag, displayer, graphmod.asciiedges
5019 )
5020 )
5020 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5021 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5021 return 0
5022 return 0
5022
5023
5023 if opts.get(b'bookmarks'):
5024 if opts.get(b'bookmarks'):
5024 dest = path.pushloc or path.loc
5025 dest = path.pushloc or path.loc
5025 other = hg.peer(repo, opts, dest)
5026 other = hg.peer(repo, opts, dest)
5026 if b'bookmarks' not in other.listkeys(b'namespaces'):
5027 if b'bookmarks' not in other.listkeys(b'namespaces'):
5027 ui.warn(_(b"remote doesn't support bookmarks\n"))
5028 ui.warn(_(b"remote doesn't support bookmarks\n"))
5028 return 0
5029 return 0
5029 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5030 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5030 ui.pager(b'outgoing')
5031 ui.pager(b'outgoing')
5031 return bookmarks.outgoing(ui, repo, other)
5032 return bookmarks.outgoing(ui, repo, other)
5032
5033
5033 repo._subtoppath = path.pushloc or path.loc
5034 repo._subtoppath = path.pushloc or path.loc
5034 try:
5035 try:
5035 return hg.outgoing(ui, repo, dest, opts)
5036 return hg.outgoing(ui, repo, dest, opts)
5036 finally:
5037 finally:
5037 del repo._subtoppath
5038 del repo._subtoppath
5038
5039
5039
5040
5040 @command(
5041 @command(
5041 b'parents',
5042 b'parents',
5042 [
5043 [
5043 (
5044 (
5044 b'r',
5045 b'r',
5045 b'rev',
5046 b'rev',
5046 b'',
5047 b'',
5047 _(b'show parents of the specified revision'),
5048 _(b'show parents of the specified revision'),
5048 _(b'REV'),
5049 _(b'REV'),
5049 ),
5050 ),
5050 ]
5051 ]
5051 + templateopts,
5052 + templateopts,
5052 _(b'[-r REV] [FILE]'),
5053 _(b'[-r REV] [FILE]'),
5053 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5054 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5054 inferrepo=True,
5055 inferrepo=True,
5055 )
5056 )
5056 def parents(ui, repo, file_=None, **opts):
5057 def parents(ui, repo, file_=None, **opts):
5057 """show the parents of the working directory or revision (DEPRECATED)
5058 """show the parents of the working directory or revision (DEPRECATED)
5058
5059
5059 Print the working directory's parent revisions. If a revision is
5060 Print the working directory's parent revisions. If a revision is
5060 given via -r/--rev, the parent of that revision will be printed.
5061 given via -r/--rev, the parent of that revision will be printed.
5061 If a file argument is given, the revision in which the file was
5062 If a file argument is given, the revision in which the file was
5062 last changed (before the working directory revision or the
5063 last changed (before the working directory revision or the
5063 argument to --rev if given) is printed.
5064 argument to --rev if given) is printed.
5064
5065
5065 This command is equivalent to::
5066 This command is equivalent to::
5066
5067
5067 hg log -r "p1()+p2()" or
5068 hg log -r "p1()+p2()" or
5068 hg log -r "p1(REV)+p2(REV)" or
5069 hg log -r "p1(REV)+p2(REV)" or
5069 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5070 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5070 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5071 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5071
5072
5072 See :hg:`summary` and :hg:`help revsets` for related information.
5073 See :hg:`summary` and :hg:`help revsets` for related information.
5073
5074
5074 Returns 0 on success.
5075 Returns 0 on success.
5075 """
5076 """
5076
5077
5077 opts = pycompat.byteskwargs(opts)
5078 opts = pycompat.byteskwargs(opts)
5078 rev = opts.get(b'rev')
5079 rev = opts.get(b'rev')
5079 if rev:
5080 if rev:
5080 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5081 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5081 ctx = scmutil.revsingle(repo, rev, None)
5082 ctx = scmutil.revsingle(repo, rev, None)
5082
5083
5083 if file_:
5084 if file_:
5084 m = scmutil.match(ctx, (file_,), opts)
5085 m = scmutil.match(ctx, (file_,), opts)
5085 if m.anypats() or len(m.files()) != 1:
5086 if m.anypats() or len(m.files()) != 1:
5086 raise error.Abort(_(b'can only specify an explicit filename'))
5087 raise error.Abort(_(b'can only specify an explicit filename'))
5087 file_ = m.files()[0]
5088 file_ = m.files()[0]
5088 filenodes = []
5089 filenodes = []
5089 for cp in ctx.parents():
5090 for cp in ctx.parents():
5090 if not cp:
5091 if not cp:
5091 continue
5092 continue
5092 try:
5093 try:
5093 filenodes.append(cp.filenode(file_))
5094 filenodes.append(cp.filenode(file_))
5094 except error.LookupError:
5095 except error.LookupError:
5095 pass
5096 pass
5096 if not filenodes:
5097 if not filenodes:
5097 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5098 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5098 p = []
5099 p = []
5099 for fn in filenodes:
5100 for fn in filenodes:
5100 fctx = repo.filectx(file_, fileid=fn)
5101 fctx = repo.filectx(file_, fileid=fn)
5101 p.append(fctx.node())
5102 p.append(fctx.node())
5102 else:
5103 else:
5103 p = [cp.node() for cp in ctx.parents()]
5104 p = [cp.node() for cp in ctx.parents()]
5104
5105
5105 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5106 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5106 for n in p:
5107 for n in p:
5107 if n != nullid:
5108 if n != nullid:
5108 displayer.show(repo[n])
5109 displayer.show(repo[n])
5109 displayer.close()
5110 displayer.close()
5110
5111
5111
5112
5112 @command(
5113 @command(
5113 b'paths',
5114 b'paths',
5114 formatteropts,
5115 formatteropts,
5115 _(b'[NAME]'),
5116 _(b'[NAME]'),
5116 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5117 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5117 optionalrepo=True,
5118 optionalrepo=True,
5118 intents={INTENT_READONLY},
5119 intents={INTENT_READONLY},
5119 )
5120 )
5120 def paths(ui, repo, search=None, **opts):
5121 def paths(ui, repo, search=None, **opts):
5121 """show aliases for remote repositories
5122 """show aliases for remote repositories
5122
5123
5123 Show definition of symbolic path name NAME. If no name is given,
5124 Show definition of symbolic path name NAME. If no name is given,
5124 show definition of all available names.
5125 show definition of all available names.
5125
5126
5126 Option -q/--quiet suppresses all output when searching for NAME
5127 Option -q/--quiet suppresses all output when searching for NAME
5127 and shows only the path names when listing all definitions.
5128 and shows only the path names when listing all definitions.
5128
5129
5129 Path names are defined in the [paths] section of your
5130 Path names are defined in the [paths] section of your
5130 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5131 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5131 repository, ``.hg/hgrc`` is used, too.
5132 repository, ``.hg/hgrc`` is used, too.
5132
5133
5133 The path names ``default`` and ``default-push`` have a special
5134 The path names ``default`` and ``default-push`` have a special
5134 meaning. When performing a push or pull operation, they are used
5135 meaning. When performing a push or pull operation, they are used
5135 as fallbacks if no location is specified on the command-line.
5136 as fallbacks if no location is specified on the command-line.
5136 When ``default-push`` is set, it will be used for push and
5137 When ``default-push`` is set, it will be used for push and
5137 ``default`` will be used for pull; otherwise ``default`` is used
5138 ``default`` will be used for pull; otherwise ``default`` is used
5138 as the fallback for both. When cloning a repository, the clone
5139 as the fallback for both. When cloning a repository, the clone
5139 source is written as ``default`` in ``.hg/hgrc``.
5140 source is written as ``default`` in ``.hg/hgrc``.
5140
5141
5141 .. note::
5142 .. note::
5142
5143
5143 ``default`` and ``default-push`` apply to all inbound (e.g.
5144 ``default`` and ``default-push`` apply to all inbound (e.g.
5144 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5145 and :hg:`bundle`) operations.
5146 and :hg:`bundle`) operations.
5146
5147
5147 See :hg:`help urls` for more information.
5148 See :hg:`help urls` for more information.
5148
5149
5149 .. container:: verbose
5150 .. container:: verbose
5150
5151
5151 Template:
5152 Template:
5152
5153
5153 The following keywords are supported. See also :hg:`help templates`.
5154 The following keywords are supported. See also :hg:`help templates`.
5154
5155
5155 :name: String. Symbolic name of the path alias.
5156 :name: String. Symbolic name of the path alias.
5156 :pushurl: String. URL for push operations.
5157 :pushurl: String. URL for push operations.
5157 :url: String. URL or directory path for the other operations.
5158 :url: String. URL or directory path for the other operations.
5158
5159
5159 Returns 0 on success.
5160 Returns 0 on success.
5160 """
5161 """
5161
5162
5162 opts = pycompat.byteskwargs(opts)
5163 opts = pycompat.byteskwargs(opts)
5163 ui.pager(b'paths')
5164 ui.pager(b'paths')
5164 if search:
5165 if search:
5165 pathitems = [
5166 pathitems = [
5166 (name, path)
5167 (name, path)
5167 for name, path in pycompat.iteritems(ui.paths)
5168 for name, path in pycompat.iteritems(ui.paths)
5168 if name == search
5169 if name == search
5169 ]
5170 ]
5170 else:
5171 else:
5171 pathitems = sorted(pycompat.iteritems(ui.paths))
5172 pathitems = sorted(pycompat.iteritems(ui.paths))
5172
5173
5173 fm = ui.formatter(b'paths', opts)
5174 fm = ui.formatter(b'paths', opts)
5174 if fm.isplain():
5175 if fm.isplain():
5175 hidepassword = util.hidepassword
5176 hidepassword = util.hidepassword
5176 else:
5177 else:
5177 hidepassword = bytes
5178 hidepassword = bytes
5178 if ui.quiet:
5179 if ui.quiet:
5179 namefmt = b'%s\n'
5180 namefmt = b'%s\n'
5180 else:
5181 else:
5181 namefmt = b'%s = '
5182 namefmt = b'%s = '
5182 showsubopts = not search and not ui.quiet
5183 showsubopts = not search and not ui.quiet
5183
5184
5184 for name, path in pathitems:
5185 for name, path in pathitems:
5185 fm.startitem()
5186 fm.startitem()
5186 fm.condwrite(not search, b'name', namefmt, name)
5187 fm.condwrite(not search, b'name', namefmt, name)
5187 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5188 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5188 for subopt, value in sorted(path.suboptions.items()):
5189 for subopt, value in sorted(path.suboptions.items()):
5189 assert subopt not in (b'name', b'url')
5190 assert subopt not in (b'name', b'url')
5190 if showsubopts:
5191 if showsubopts:
5191 fm.plain(b'%s:%s = ' % (name, subopt))
5192 fm.plain(b'%s:%s = ' % (name, subopt))
5192 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5193 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5193
5194
5194 fm.end()
5195 fm.end()
5195
5196
5196 if search and not pathitems:
5197 if search and not pathitems:
5197 if not ui.quiet:
5198 if not ui.quiet:
5198 ui.warn(_(b"not found!\n"))
5199 ui.warn(_(b"not found!\n"))
5199 return 1
5200 return 1
5200 else:
5201 else:
5201 return 0
5202 return 0
5202
5203
5203
5204
5204 @command(
5205 @command(
5205 b'phase',
5206 b'phase',
5206 [
5207 [
5207 (b'p', b'public', False, _(b'set changeset phase to public')),
5208 (b'p', b'public', False, _(b'set changeset phase to public')),
5208 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5209 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5209 (b's', b'secret', False, _(b'set changeset phase to secret')),
5210 (b's', b'secret', False, _(b'set changeset phase to secret')),
5210 (b'f', b'force', False, _(b'allow to move boundary backward')),
5211 (b'f', b'force', False, _(b'allow to move boundary backward')),
5211 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5212 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5212 ],
5213 ],
5213 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5214 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5214 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5215 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5215 )
5216 )
5216 def phase(ui, repo, *revs, **opts):
5217 def phase(ui, repo, *revs, **opts):
5217 """set or show the current phase name
5218 """set or show the current phase name
5218
5219
5219 With no argument, show the phase name of the current revision(s).
5220 With no argument, show the phase name of the current revision(s).
5220
5221
5221 With one of -p/--public, -d/--draft or -s/--secret, change the
5222 With one of -p/--public, -d/--draft or -s/--secret, change the
5222 phase value of the specified revisions.
5223 phase value of the specified revisions.
5223
5224
5224 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5225 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5225 lower phase to a higher phase. Phases are ordered as follows::
5226 lower phase to a higher phase. Phases are ordered as follows::
5226
5227
5227 public < draft < secret
5228 public < draft < secret
5228
5229
5229 Returns 0 on success, 1 if some phases could not be changed.
5230 Returns 0 on success, 1 if some phases could not be changed.
5230
5231
5231 (For more information about the phases concept, see :hg:`help phases`.)
5232 (For more information about the phases concept, see :hg:`help phases`.)
5232 """
5233 """
5233 opts = pycompat.byteskwargs(opts)
5234 opts = pycompat.byteskwargs(opts)
5234 # search for a unique phase argument
5235 # search for a unique phase argument
5235 targetphase = None
5236 targetphase = None
5236 for idx, name in enumerate(phases.cmdphasenames):
5237 for idx, name in enumerate(phases.cmdphasenames):
5237 if opts[name]:
5238 if opts[name]:
5238 if targetphase is not None:
5239 if targetphase is not None:
5239 raise error.Abort(_(b'only one phase can be specified'))
5240 raise error.Abort(_(b'only one phase can be specified'))
5240 targetphase = idx
5241 targetphase = idx
5241
5242
5242 # look for specified revision
5243 # look for specified revision
5243 revs = list(revs)
5244 revs = list(revs)
5244 revs.extend(opts[b'rev'])
5245 revs.extend(opts[b'rev'])
5245 if not revs:
5246 if not revs:
5246 # display both parents as the second parent phase can influence
5247 # display both parents as the second parent phase can influence
5247 # the phase of a merge commit
5248 # the phase of a merge commit
5248 revs = [c.rev() for c in repo[None].parents()]
5249 revs = [c.rev() for c in repo[None].parents()]
5249
5250
5250 revs = scmutil.revrange(repo, revs)
5251 revs = scmutil.revrange(repo, revs)
5251
5252
5252 ret = 0
5253 ret = 0
5253 if targetphase is None:
5254 if targetphase is None:
5254 # display
5255 # display
5255 for r in revs:
5256 for r in revs:
5256 ctx = repo[r]
5257 ctx = repo[r]
5257 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5258 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5258 else:
5259 else:
5259 with repo.lock(), repo.transaction(b"phase") as tr:
5260 with repo.lock(), repo.transaction(b"phase") as tr:
5260 # set phase
5261 # set phase
5261 if not revs:
5262 if not revs:
5262 raise error.Abort(_(b'empty revision set'))
5263 raise error.Abort(_(b'empty revision set'))
5263 nodes = [repo[r].node() for r in revs]
5264 nodes = [repo[r].node() for r in revs]
5264 # moving revision from public to draft may hide them
5265 # moving revision from public to draft may hide them
5265 # We have to check result on an unfiltered repository
5266 # We have to check result on an unfiltered repository
5266 unfi = repo.unfiltered()
5267 unfi = repo.unfiltered()
5267 getphase = unfi._phasecache.phase
5268 getphase = unfi._phasecache.phase
5268 olddata = [getphase(unfi, r) for r in unfi]
5269 olddata = [getphase(unfi, r) for r in unfi]
5269 phases.advanceboundary(repo, tr, targetphase, nodes)
5270 phases.advanceboundary(repo, tr, targetphase, nodes)
5270 if opts[b'force']:
5271 if opts[b'force']:
5271 phases.retractboundary(repo, tr, targetphase, nodes)
5272 phases.retractboundary(repo, tr, targetphase, nodes)
5272 getphase = unfi._phasecache.phase
5273 getphase = unfi._phasecache.phase
5273 newdata = [getphase(unfi, r) for r in unfi]
5274 newdata = [getphase(unfi, r) for r in unfi]
5274 changes = sum(newdata[r] != olddata[r] for r in unfi)
5275 changes = sum(newdata[r] != olddata[r] for r in unfi)
5275 cl = unfi.changelog
5276 cl = unfi.changelog
5276 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5277 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5277 if rejected:
5278 if rejected:
5278 ui.warn(
5279 ui.warn(
5279 _(
5280 _(
5280 b'cannot move %i changesets to a higher '
5281 b'cannot move %i changesets to a higher '
5281 b'phase, use --force\n'
5282 b'phase, use --force\n'
5282 )
5283 )
5283 % len(rejected)
5284 % len(rejected)
5284 )
5285 )
5285 ret = 1
5286 ret = 1
5286 if changes:
5287 if changes:
5287 msg = _(b'phase changed for %i changesets\n') % changes
5288 msg = _(b'phase changed for %i changesets\n') % changes
5288 if ret:
5289 if ret:
5289 ui.status(msg)
5290 ui.status(msg)
5290 else:
5291 else:
5291 ui.note(msg)
5292 ui.note(msg)
5292 else:
5293 else:
5293 ui.warn(_(b'no phases changed\n'))
5294 ui.warn(_(b'no phases changed\n'))
5294 return ret
5295 return ret
5295
5296
5296
5297
5297 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5298 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5298 """Run after a changegroup has been added via pull/unbundle
5299 """Run after a changegroup has been added via pull/unbundle
5299
5300
5300 This takes arguments below:
5301 This takes arguments below:
5301
5302
5302 :modheads: change of heads by pull/unbundle
5303 :modheads: change of heads by pull/unbundle
5303 :optupdate: updating working directory is needed or not
5304 :optupdate: updating working directory is needed or not
5304 :checkout: update destination revision (or None to default destination)
5305 :checkout: update destination revision (or None to default destination)
5305 :brev: a name, which might be a bookmark to be activated after updating
5306 :brev: a name, which might be a bookmark to be activated after updating
5306 """
5307 """
5307 if modheads == 0:
5308 if modheads == 0:
5308 return
5309 return
5309 if optupdate:
5310 if optupdate:
5310 try:
5311 try:
5311 return hg.updatetotally(ui, repo, checkout, brev)
5312 return hg.updatetotally(ui, repo, checkout, brev)
5312 except error.UpdateAbort as inst:
5313 except error.UpdateAbort as inst:
5313 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5314 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5314 hint = inst.hint
5315 hint = inst.hint
5315 raise error.UpdateAbort(msg, hint=hint)
5316 raise error.UpdateAbort(msg, hint=hint)
5316 if modheads is not None and modheads > 1:
5317 if modheads is not None and modheads > 1:
5317 currentbranchheads = len(repo.branchheads())
5318 currentbranchheads = len(repo.branchheads())
5318 if currentbranchheads == modheads:
5319 if currentbranchheads == modheads:
5319 ui.status(
5320 ui.status(
5320 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5321 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5321 )
5322 )
5322 elif currentbranchheads > 1:
5323 elif currentbranchheads > 1:
5323 ui.status(
5324 ui.status(
5324 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5325 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5325 )
5326 )
5326 else:
5327 else:
5327 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5328 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5328 elif not ui.configbool(b'commands', b'update.requiredest'):
5329 elif not ui.configbool(b'commands', b'update.requiredest'):
5329 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5330 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5330
5331
5331
5332
5332 @command(
5333 @command(
5333 b'pull',
5334 b'pull',
5334 [
5335 [
5335 (
5336 (
5336 b'u',
5337 b'u',
5337 b'update',
5338 b'update',
5338 None,
5339 None,
5339 _(b'update to new branch head if new descendants were pulled'),
5340 _(b'update to new branch head if new descendants were pulled'),
5340 ),
5341 ),
5341 (
5342 (
5342 b'f',
5343 b'f',
5343 b'force',
5344 b'force',
5344 None,
5345 None,
5345 _(b'run even when remote repository is unrelated'),
5346 _(b'run even when remote repository is unrelated'),
5346 ),
5347 ),
5347 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5348 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5348 (
5349 (
5349 b'r',
5350 b'r',
5350 b'rev',
5351 b'rev',
5351 [],
5352 [],
5352 _(b'a remote changeset intended to be added'),
5353 _(b'a remote changeset intended to be added'),
5353 _(b'REV'),
5354 _(b'REV'),
5354 ),
5355 ),
5355 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5356 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5356 (
5357 (
5357 b'b',
5358 b'b',
5358 b'branch',
5359 b'branch',
5359 [],
5360 [],
5360 _(b'a specific branch you would like to pull'),
5361 _(b'a specific branch you would like to pull'),
5361 _(b'BRANCH'),
5362 _(b'BRANCH'),
5362 ),
5363 ),
5363 ]
5364 ]
5364 + remoteopts,
5365 + remoteopts,
5365 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5366 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5366 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5367 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5367 helpbasic=True,
5368 helpbasic=True,
5368 )
5369 )
5369 def pull(ui, repo, source=b"default", **opts):
5370 def pull(ui, repo, source=b"default", **opts):
5370 """pull changes from the specified source
5371 """pull changes from the specified source
5371
5372
5372 Pull changes from a remote repository to a local one.
5373 Pull changes from a remote repository to a local one.
5373
5374
5374 This finds all changes from the repository at the specified path
5375 This finds all changes from the repository at the specified path
5375 or URL and adds them to a local repository (the current one unless
5376 or URL and adds them to a local repository (the current one unless
5376 -R is specified). By default, this does not update the copy of the
5377 -R is specified). By default, this does not update the copy of the
5377 project in the working directory.
5378 project in the working directory.
5378
5379
5379 When cloning from servers that support it, Mercurial may fetch
5380 When cloning from servers that support it, Mercurial may fetch
5380 pre-generated data. When this is done, hooks operating on incoming
5381 pre-generated data. When this is done, hooks operating on incoming
5381 changesets and changegroups may fire more than once, once for each
5382 changesets and changegroups may fire more than once, once for each
5382 pre-generated bundle and as well as for any additional remaining
5383 pre-generated bundle and as well as for any additional remaining
5383 data. See :hg:`help -e clonebundles` for more.
5384 data. See :hg:`help -e clonebundles` for more.
5384
5385
5385 Use :hg:`incoming` if you want to see what would have been added
5386 Use :hg:`incoming` if you want to see what would have been added
5386 by a pull at the time you issued this command. If you then decide
5387 by a pull at the time you issued this command. If you then decide
5387 to add those changes to the repository, you should use :hg:`pull
5388 to add those changes to the repository, you should use :hg:`pull
5388 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5389 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5389
5390
5390 If SOURCE is omitted, the 'default' path will be used.
5391 If SOURCE is omitted, the 'default' path will be used.
5391 See :hg:`help urls` for more information.
5392 See :hg:`help urls` for more information.
5392
5393
5393 Specifying bookmark as ``.`` is equivalent to specifying the active
5394 Specifying bookmark as ``.`` is equivalent to specifying the active
5394 bookmark's name.
5395 bookmark's name.
5395
5396
5396 Returns 0 on success, 1 if an update had unresolved files.
5397 Returns 0 on success, 1 if an update had unresolved files.
5397 """
5398 """
5398
5399
5399 opts = pycompat.byteskwargs(opts)
5400 opts = pycompat.byteskwargs(opts)
5400 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5401 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5401 b'update'
5402 b'update'
5402 ):
5403 ):
5403 msg = _(b'update destination required by configuration')
5404 msg = _(b'update destination required by configuration')
5404 hint = _(b'use hg pull followed by hg update DEST')
5405 hint = _(b'use hg pull followed by hg update DEST')
5405 raise error.Abort(msg, hint=hint)
5406 raise error.Abort(msg, hint=hint)
5406
5407
5407 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5408 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5408 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5409 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5409 other = hg.peer(repo, opts, source)
5410 other = hg.peer(repo, opts, source)
5410 try:
5411 try:
5411 revs, checkout = hg.addbranchrevs(
5412 revs, checkout = hg.addbranchrevs(
5412 repo, other, branches, opts.get(b'rev')
5413 repo, other, branches, opts.get(b'rev')
5413 )
5414 )
5414
5415
5415 pullopargs = {}
5416 pullopargs = {}
5416
5417
5417 nodes = None
5418 nodes = None
5418 if opts.get(b'bookmark') or revs:
5419 if opts.get(b'bookmark') or revs:
5419 # The list of bookmark used here is the same used to actually update
5420 # The list of bookmark used here is the same used to actually update
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # all lookup and bookmark queries in one go so they see the same
5422 # all lookup and bookmark queries in one go so they see the same
5422 # version of the server state (issue 4700).
5423 # version of the server state (issue 4700).
5423 nodes = []
5424 nodes = []
5424 fnodes = []
5425 fnodes = []
5425 revs = revs or []
5426 revs = revs or []
5426 if revs and not other.capable(b'lookup'):
5427 if revs and not other.capable(b'lookup'):
5427 err = _(
5428 err = _(
5428 b"other repository doesn't support revision lookup, "
5429 b"other repository doesn't support revision lookup, "
5429 b"so a rev cannot be specified."
5430 b"so a rev cannot be specified."
5430 )
5431 )
5431 raise error.Abort(err)
5432 raise error.Abort(err)
5432 with other.commandexecutor() as e:
5433 with other.commandexecutor() as e:
5433 fremotebookmarks = e.callcommand(
5434 fremotebookmarks = e.callcommand(
5434 b'listkeys', {b'namespace': b'bookmarks'}
5435 b'listkeys', {b'namespace': b'bookmarks'}
5435 )
5436 )
5436 for r in revs:
5437 for r in revs:
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 for b in opts.get(b'bookmark', []):
5442 for b in opts.get(b'bookmark', []):
5442 b = repo._bookmarks.expandname(b)
5443 b = repo._bookmarks.expandname(b)
5443 if b not in remotebookmarks:
5444 if b not in remotebookmarks:
5444 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5445 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5445 nodes.append(remotebookmarks[b])
5446 nodes.append(remotebookmarks[b])
5446 for i, rev in enumerate(revs):
5447 for i, rev in enumerate(revs):
5447 node = fnodes[i].result()
5448 node = fnodes[i].result()
5448 nodes.append(node)
5449 nodes.append(node)
5449 if rev == checkout:
5450 if rev == checkout:
5450 checkout = node
5451 checkout = node
5451
5452
5452 wlock = util.nullcontextmanager()
5453 wlock = util.nullcontextmanager()
5453 if opts.get(b'update'):
5454 if opts.get(b'update'):
5454 wlock = repo.wlock()
5455 wlock = repo.wlock()
5455 with wlock:
5456 with wlock:
5456 pullopargs.update(opts.get(b'opargs', {}))
5457 pullopargs.update(opts.get(b'opargs', {}))
5457 modheads = exchange.pull(
5458 modheads = exchange.pull(
5458 repo,
5459 repo,
5459 other,
5460 other,
5460 heads=nodes,
5461 heads=nodes,
5461 force=opts.get(b'force'),
5462 force=opts.get(b'force'),
5462 bookmarks=opts.get(b'bookmark', ()),
5463 bookmarks=opts.get(b'bookmark', ()),
5463 opargs=pullopargs,
5464 opargs=pullopargs,
5464 confirm=opts.get(b'confirm'),
5465 confirm=opts.get(b'confirm'),
5465 ).cgresult
5466 ).cgresult
5466
5467
5467 # brev is a name, which might be a bookmark to be activated at
5468 # brev is a name, which might be a bookmark to be activated at
5468 # the end of the update. In other words, it is an explicit
5469 # the end of the update. In other words, it is an explicit
5469 # destination of the update
5470 # destination of the update
5470 brev = None
5471 brev = None
5471
5472
5472 if checkout:
5473 if checkout:
5473 checkout = repo.unfiltered().changelog.rev(checkout)
5474 checkout = repo.unfiltered().changelog.rev(checkout)
5474
5475
5475 # order below depends on implementation of
5476 # order below depends on implementation of
5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 # because 'checkout' is determined without it.
5478 # because 'checkout' is determined without it.
5478 if opts.get(b'rev'):
5479 if opts.get(b'rev'):
5479 brev = opts[b'rev'][0]
5480 brev = opts[b'rev'][0]
5480 elif opts.get(b'branch'):
5481 elif opts.get(b'branch'):
5481 brev = opts[b'branch'][0]
5482 brev = opts[b'branch'][0]
5482 else:
5483 else:
5483 brev = branches[0]
5484 brev = branches[0]
5484 repo._subtoppath = source
5485 repo._subtoppath = source
5485 try:
5486 try:
5486 ret = postincoming(
5487 ret = postincoming(
5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 )
5489 )
5489 except error.FilteredRepoLookupError as exc:
5490 except error.FilteredRepoLookupError as exc:
5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 exc.args = (msg,) + exc.args[1:]
5492 exc.args = (msg,) + exc.args[1:]
5492 raise
5493 raise
5493 finally:
5494 finally:
5494 del repo._subtoppath
5495 del repo._subtoppath
5495
5496
5496 finally:
5497 finally:
5497 other.close()
5498 other.close()
5498 return ret
5499 return ret
5499
5500
5500
5501
5501 @command(
5502 @command(
5502 b'push',
5503 b'push',
5503 [
5504 [
5504 (b'f', b'force', None, _(b'force push')),
5505 (b'f', b'force', None, _(b'force push')),
5505 (
5506 (
5506 b'r',
5507 b'r',
5507 b'rev',
5508 b'rev',
5508 [],
5509 [],
5509 _(b'a changeset intended to be included in the destination'),
5510 _(b'a changeset intended to be included in the destination'),
5510 _(b'REV'),
5511 _(b'REV'),
5511 ),
5512 ),
5512 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5513 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5513 (
5514 (
5514 b'b',
5515 b'b',
5515 b'branch',
5516 b'branch',
5516 [],
5517 [],
5517 _(b'a specific branch you would like to push'),
5518 _(b'a specific branch you would like to push'),
5518 _(b'BRANCH'),
5519 _(b'BRANCH'),
5519 ),
5520 ),
5520 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5521 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5521 (
5522 (
5522 b'',
5523 b'',
5523 b'pushvars',
5524 b'pushvars',
5524 [],
5525 [],
5525 _(b'variables that can be sent to server (ADVANCED)'),
5526 _(b'variables that can be sent to server (ADVANCED)'),
5526 ),
5527 ),
5527 (
5528 (
5528 b'',
5529 b'',
5529 b'publish',
5530 b'publish',
5530 False,
5531 False,
5531 _(b'push the changeset as public (EXPERIMENTAL)'),
5532 _(b'push the changeset as public (EXPERIMENTAL)'),
5532 ),
5533 ),
5533 ]
5534 ]
5534 + remoteopts,
5535 + remoteopts,
5535 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5536 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5536 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5537 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5537 helpbasic=True,
5538 helpbasic=True,
5538 )
5539 )
5539 def push(ui, repo, dest=None, **opts):
5540 def push(ui, repo, dest=None, **opts):
5540 """push changes to the specified destination
5541 """push changes to the specified destination
5541
5542
5542 Push changesets from the local repository to the specified
5543 Push changesets from the local repository to the specified
5543 destination.
5544 destination.
5544
5545
5545 This operation is symmetrical to pull: it is identical to a pull
5546 This operation is symmetrical to pull: it is identical to a pull
5546 in the destination repository from the current one.
5547 in the destination repository from the current one.
5547
5548
5548 By default, push will not allow creation of new heads at the
5549 By default, push will not allow creation of new heads at the
5549 destination, since multiple heads would make it unclear which head
5550 destination, since multiple heads would make it unclear which head
5550 to use. In this situation, it is recommended to pull and merge
5551 to use. In this situation, it is recommended to pull and merge
5551 before pushing.
5552 before pushing.
5552
5553
5553 Use --new-branch if you want to allow push to create a new named
5554 Use --new-branch if you want to allow push to create a new named
5554 branch that is not present at the destination. This allows you to
5555 branch that is not present at the destination. This allows you to
5555 only create a new branch without forcing other changes.
5556 only create a new branch without forcing other changes.
5556
5557
5557 .. note::
5558 .. note::
5558
5559
5559 Extra care should be taken with the -f/--force option,
5560 Extra care should be taken with the -f/--force option,
5560 which will push all new heads on all branches, an action which will
5561 which will push all new heads on all branches, an action which will
5561 almost always cause confusion for collaborators.
5562 almost always cause confusion for collaborators.
5562
5563
5563 If -r/--rev is used, the specified revision and all its ancestors
5564 If -r/--rev is used, the specified revision and all its ancestors
5564 will be pushed to the remote repository.
5565 will be pushed to the remote repository.
5565
5566
5566 If -B/--bookmark is used, the specified bookmarked revision, its
5567 If -B/--bookmark is used, the specified bookmarked revision, its
5567 ancestors, and the bookmark will be pushed to the remote
5568 ancestors, and the bookmark will be pushed to the remote
5568 repository. Specifying ``.`` is equivalent to specifying the active
5569 repository. Specifying ``.`` is equivalent to specifying the active
5569 bookmark's name.
5570 bookmark's name.
5570
5571
5571 Please see :hg:`help urls` for important details about ``ssh://``
5572 Please see :hg:`help urls` for important details about ``ssh://``
5572 URLs. If DESTINATION is omitted, a default path will be used.
5573 URLs. If DESTINATION is omitted, a default path will be used.
5573
5574
5574 .. container:: verbose
5575 .. container:: verbose
5575
5576
5576 The --pushvars option sends strings to the server that become
5577 The --pushvars option sends strings to the server that become
5577 environment variables prepended with ``HG_USERVAR_``. For example,
5578 environment variables prepended with ``HG_USERVAR_``. For example,
5578 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5579 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5579 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5580 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5580
5581
5581 pushvars can provide for user-overridable hooks as well as set debug
5582 pushvars can provide for user-overridable hooks as well as set debug
5582 levels. One example is having a hook that blocks commits containing
5583 levels. One example is having a hook that blocks commits containing
5583 conflict markers, but enables the user to override the hook if the file
5584 conflict markers, but enables the user to override the hook if the file
5584 is using conflict markers for testing purposes or the file format has
5585 is using conflict markers for testing purposes or the file format has
5585 strings that look like conflict markers.
5586 strings that look like conflict markers.
5586
5587
5587 By default, servers will ignore `--pushvars`. To enable it add the
5588 By default, servers will ignore `--pushvars`. To enable it add the
5588 following to your configuration file::
5589 following to your configuration file::
5589
5590
5590 [push]
5591 [push]
5591 pushvars.server = true
5592 pushvars.server = true
5592
5593
5593 Returns 0 if push was successful, 1 if nothing to push.
5594 Returns 0 if push was successful, 1 if nothing to push.
5594 """
5595 """
5595
5596
5596 opts = pycompat.byteskwargs(opts)
5597 opts = pycompat.byteskwargs(opts)
5597 if opts.get(b'bookmark'):
5598 if opts.get(b'bookmark'):
5598 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5599 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5599 for b in opts[b'bookmark']:
5600 for b in opts[b'bookmark']:
5600 # translate -B options to -r so changesets get pushed
5601 # translate -B options to -r so changesets get pushed
5601 b = repo._bookmarks.expandname(b)
5602 b = repo._bookmarks.expandname(b)
5602 if b in repo._bookmarks:
5603 if b in repo._bookmarks:
5603 opts.setdefault(b'rev', []).append(b)
5604 opts.setdefault(b'rev', []).append(b)
5604 else:
5605 else:
5605 # if we try to push a deleted bookmark, translate it to null
5606 # if we try to push a deleted bookmark, translate it to null
5606 # this lets simultaneous -r, -b options continue working
5607 # this lets simultaneous -r, -b options continue working
5607 opts.setdefault(b'rev', []).append(b"null")
5608 opts.setdefault(b'rev', []).append(b"null")
5608
5609
5609 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5610 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5610 if not path:
5611 if not path:
5611 raise error.Abort(
5612 raise error.Abort(
5612 _(b'default repository not configured!'),
5613 _(b'default repository not configured!'),
5613 hint=_(b"see 'hg help config.paths'"),
5614 hint=_(b"see 'hg help config.paths'"),
5614 )
5615 )
5615 dest = path.pushloc or path.loc
5616 dest = path.pushloc or path.loc
5616 branches = (path.branch, opts.get(b'branch') or [])
5617 branches = (path.branch, opts.get(b'branch') or [])
5617 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5618 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5618 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5619 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5619 other = hg.peer(repo, opts, dest)
5620 other = hg.peer(repo, opts, dest)
5620
5621
5621 if revs:
5622 if revs:
5622 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5623 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5623 if not revs:
5624 if not revs:
5624 raise error.Abort(
5625 raise error.Abort(
5625 _(b"specified revisions evaluate to an empty set"),
5626 _(b"specified revisions evaluate to an empty set"),
5626 hint=_(b"use different revision arguments"),
5627 hint=_(b"use different revision arguments"),
5627 )
5628 )
5628 elif path.pushrev:
5629 elif path.pushrev:
5629 # It doesn't make any sense to specify ancestor revisions. So limit
5630 # It doesn't make any sense to specify ancestor revisions. So limit
5630 # to DAG heads to make discovery simpler.
5631 # to DAG heads to make discovery simpler.
5631 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5632 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5632 revs = scmutil.revrange(repo, [expr])
5633 revs = scmutil.revrange(repo, [expr])
5633 revs = [repo[rev].node() for rev in revs]
5634 revs = [repo[rev].node() for rev in revs]
5634 if not revs:
5635 if not revs:
5635 raise error.Abort(
5636 raise error.Abort(
5636 _(b'default push revset for path evaluates to an empty set')
5637 _(b'default push revset for path evaluates to an empty set')
5637 )
5638 )
5638 elif ui.configbool(b'commands', b'push.require-revs'):
5639 elif ui.configbool(b'commands', b'push.require-revs'):
5639 raise error.Abort(
5640 raise error.Abort(
5640 _(b'no revisions specified to push'),
5641 _(b'no revisions specified to push'),
5641 hint=_(b'did you mean "hg push -r ."?'),
5642 hint=_(b'did you mean "hg push -r ."?'),
5642 )
5643 )
5643
5644
5644 repo._subtoppath = dest
5645 repo._subtoppath = dest
5645 try:
5646 try:
5646 # push subrepos depth-first for coherent ordering
5647 # push subrepos depth-first for coherent ordering
5647 c = repo[b'.']
5648 c = repo[b'.']
5648 subs = c.substate # only repos that are committed
5649 subs = c.substate # only repos that are committed
5649 for s in sorted(subs):
5650 for s in sorted(subs):
5650 result = c.sub(s).push(opts)
5651 result = c.sub(s).push(opts)
5651 if result == 0:
5652 if result == 0:
5652 return not result
5653 return not result
5653 finally:
5654 finally:
5654 del repo._subtoppath
5655 del repo._subtoppath
5655
5656
5656 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5657 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5657 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5658 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5658
5659
5659 pushop = exchange.push(
5660 pushop = exchange.push(
5660 repo,
5661 repo,
5661 other,
5662 other,
5662 opts.get(b'force'),
5663 opts.get(b'force'),
5663 revs=revs,
5664 revs=revs,
5664 newbranch=opts.get(b'new_branch'),
5665 newbranch=opts.get(b'new_branch'),
5665 bookmarks=opts.get(b'bookmark', ()),
5666 bookmarks=opts.get(b'bookmark', ()),
5666 publish=opts.get(b'publish'),
5667 publish=opts.get(b'publish'),
5667 opargs=opargs,
5668 opargs=opargs,
5668 )
5669 )
5669
5670
5670 result = not pushop.cgresult
5671 result = not pushop.cgresult
5671
5672
5672 if pushop.bkresult is not None:
5673 if pushop.bkresult is not None:
5673 if pushop.bkresult == 2:
5674 if pushop.bkresult == 2:
5674 result = 2
5675 result = 2
5675 elif not result and pushop.bkresult:
5676 elif not result and pushop.bkresult:
5676 result = 2
5677 result = 2
5677
5678
5678 return result
5679 return result
5679
5680
5680
5681
5681 @command(
5682 @command(
5682 b'recover',
5683 b'recover',
5683 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5684 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5684 helpcategory=command.CATEGORY_MAINTENANCE,
5685 helpcategory=command.CATEGORY_MAINTENANCE,
5685 )
5686 )
5686 def recover(ui, repo, **opts):
5687 def recover(ui, repo, **opts):
5687 """roll back an interrupted transaction
5688 """roll back an interrupted transaction
5688
5689
5689 Recover from an interrupted commit or pull.
5690 Recover from an interrupted commit or pull.
5690
5691
5691 This command tries to fix the repository status after an
5692 This command tries to fix the repository status after an
5692 interrupted operation. It should only be necessary when Mercurial
5693 interrupted operation. It should only be necessary when Mercurial
5693 suggests it.
5694 suggests it.
5694
5695
5695 Returns 0 if successful, 1 if nothing to recover or verify fails.
5696 Returns 0 if successful, 1 if nothing to recover or verify fails.
5696 """
5697 """
5697 ret = repo.recover()
5698 ret = repo.recover()
5698 if ret:
5699 if ret:
5699 if opts['verify']:
5700 if opts['verify']:
5700 return hg.verify(repo)
5701 return hg.verify(repo)
5701 else:
5702 else:
5702 msg = _(
5703 msg = _(
5703 b"(verify step skipped, run `hg verify` to check your "
5704 b"(verify step skipped, run `hg verify` to check your "
5704 b"repository content)\n"
5705 b"repository content)\n"
5705 )
5706 )
5706 ui.warn(msg)
5707 ui.warn(msg)
5707 return 0
5708 return 0
5708 return 1
5709 return 1
5709
5710
5710
5711
5711 @command(
5712 @command(
5712 b'remove|rm',
5713 b'remove|rm',
5713 [
5714 [
5714 (b'A', b'after', None, _(b'record delete for missing files')),
5715 (b'A', b'after', None, _(b'record delete for missing files')),
5715 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5716 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5716 ]
5717 ]
5717 + subrepoopts
5718 + subrepoopts
5718 + walkopts
5719 + walkopts
5719 + dryrunopts,
5720 + dryrunopts,
5720 _(b'[OPTION]... FILE...'),
5721 _(b'[OPTION]... FILE...'),
5721 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5722 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5722 helpbasic=True,
5723 helpbasic=True,
5723 inferrepo=True,
5724 inferrepo=True,
5724 )
5725 )
5725 def remove(ui, repo, *pats, **opts):
5726 def remove(ui, repo, *pats, **opts):
5726 """remove the specified files on the next commit
5727 """remove the specified files on the next commit
5727
5728
5728 Schedule the indicated files for removal from the current branch.
5729 Schedule the indicated files for removal from the current branch.
5729
5730
5730 This command schedules the files to be removed at the next commit.
5731 This command schedules the files to be removed at the next commit.
5731 To undo a remove before that, see :hg:`revert`. To undo added
5732 To undo a remove before that, see :hg:`revert`. To undo added
5732 files, see :hg:`forget`.
5733 files, see :hg:`forget`.
5733
5734
5734 .. container:: verbose
5735 .. container:: verbose
5735
5736
5736 -A/--after can be used to remove only files that have already
5737 -A/--after can be used to remove only files that have already
5737 been deleted, -f/--force can be used to force deletion, and -Af
5738 been deleted, -f/--force can be used to force deletion, and -Af
5738 can be used to remove files from the next revision without
5739 can be used to remove files from the next revision without
5739 deleting them from the working directory.
5740 deleting them from the working directory.
5740
5741
5741 The following table details the behavior of remove for different
5742 The following table details the behavior of remove for different
5742 file states (columns) and option combinations (rows). The file
5743 file states (columns) and option combinations (rows). The file
5743 states are Added [A], Clean [C], Modified [M] and Missing [!]
5744 states are Added [A], Clean [C], Modified [M] and Missing [!]
5744 (as reported by :hg:`status`). The actions are Warn, Remove
5745 (as reported by :hg:`status`). The actions are Warn, Remove
5745 (from branch) and Delete (from disk):
5746 (from branch) and Delete (from disk):
5746
5747
5747 ========= == == == ==
5748 ========= == == == ==
5748 opt/state A C M !
5749 opt/state A C M !
5749 ========= == == == ==
5750 ========= == == == ==
5750 none W RD W R
5751 none W RD W R
5751 -f R RD RD R
5752 -f R RD RD R
5752 -A W W W R
5753 -A W W W R
5753 -Af R R R R
5754 -Af R R R R
5754 ========= == == == ==
5755 ========= == == == ==
5755
5756
5756 .. note::
5757 .. note::
5757
5758
5758 :hg:`remove` never deletes files in Added [A] state from the
5759 :hg:`remove` never deletes files in Added [A] state from the
5759 working directory, not even if ``--force`` is specified.
5760 working directory, not even if ``--force`` is specified.
5760
5761
5761 Returns 0 on success, 1 if any warnings encountered.
5762 Returns 0 on success, 1 if any warnings encountered.
5762 """
5763 """
5763
5764
5764 opts = pycompat.byteskwargs(opts)
5765 opts = pycompat.byteskwargs(opts)
5765 after, force = opts.get(b'after'), opts.get(b'force')
5766 after, force = opts.get(b'after'), opts.get(b'force')
5766 dryrun = opts.get(b'dry_run')
5767 dryrun = opts.get(b'dry_run')
5767 if not pats and not after:
5768 if not pats and not after:
5768 raise error.Abort(_(b'no files specified'))
5769 raise error.Abort(_(b'no files specified'))
5769
5770
5770 m = scmutil.match(repo[None], pats, opts)
5771 m = scmutil.match(repo[None], pats, opts)
5771 subrepos = opts.get(b'subrepos')
5772 subrepos = opts.get(b'subrepos')
5772 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5773 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5773 return cmdutil.remove(
5774 return cmdutil.remove(
5774 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5775 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5775 )
5776 )
5776
5777
5777
5778
5778 @command(
5779 @command(
5779 b'rename|move|mv',
5780 b'rename|move|mv',
5780 [
5781 [
5781 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5782 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5782 (
5783 (
5783 b'f',
5784 b'f',
5784 b'force',
5785 b'force',
5785 None,
5786 None,
5786 _(b'forcibly move over an existing managed file'),
5787 _(b'forcibly move over an existing managed file'),
5787 ),
5788 ),
5788 ]
5789 ]
5789 + walkopts
5790 + walkopts
5790 + dryrunopts,
5791 + dryrunopts,
5791 _(b'[OPTION]... SOURCE... DEST'),
5792 _(b'[OPTION]... SOURCE... DEST'),
5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5793 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5793 )
5794 )
5794 def rename(ui, repo, *pats, **opts):
5795 def rename(ui, repo, *pats, **opts):
5795 """rename files; equivalent of copy + remove
5796 """rename files; equivalent of copy + remove
5796
5797
5797 Mark dest as copies of sources; mark sources for deletion. If dest
5798 Mark dest as copies of sources; mark sources for deletion. If dest
5798 is a directory, copies are put in that directory. If dest is a
5799 is a directory, copies are put in that directory. If dest is a
5799 file, there can only be one source.
5800 file, there can only be one source.
5800
5801
5801 By default, this command copies the contents of files as they
5802 By default, this command copies the contents of files as they
5802 exist in the working directory. If invoked with -A/--after, the
5803 exist in the working directory. If invoked with -A/--after, the
5803 operation is recorded, but no copying is performed.
5804 operation is recorded, but no copying is performed.
5804
5805
5805 This command takes effect at the next commit. To undo a rename
5806 This command takes effect at the next commit. To undo a rename
5806 before that, see :hg:`revert`.
5807 before that, see :hg:`revert`.
5807
5808
5808 Returns 0 on success, 1 if errors are encountered.
5809 Returns 0 on success, 1 if errors are encountered.
5809 """
5810 """
5810 opts = pycompat.byteskwargs(opts)
5811 opts = pycompat.byteskwargs(opts)
5811 with repo.wlock():
5812 with repo.wlock():
5812 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5813 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5813
5814
5814
5815
5815 @command(
5816 @command(
5816 b'resolve',
5817 b'resolve',
5817 [
5818 [
5818 (b'a', b'all', None, _(b'select all unresolved files')),
5819 (b'a', b'all', None, _(b'select all unresolved files')),
5819 (b'l', b'list', None, _(b'list state of files needing merge')),
5820 (b'l', b'list', None, _(b'list state of files needing merge')),
5820 (b'm', b'mark', None, _(b'mark files as resolved')),
5821 (b'm', b'mark', None, _(b'mark files as resolved')),
5821 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5822 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5822 (b'n', b'no-status', None, _(b'hide status prefix')),
5823 (b'n', b'no-status', None, _(b'hide status prefix')),
5823 (b'', b're-merge', None, _(b're-merge files')),
5824 (b'', b're-merge', None, _(b're-merge files')),
5824 ]
5825 ]
5825 + mergetoolopts
5826 + mergetoolopts
5826 + walkopts
5827 + walkopts
5827 + formatteropts,
5828 + formatteropts,
5828 _(b'[OPTION]... [FILE]...'),
5829 _(b'[OPTION]... [FILE]...'),
5829 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5830 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5830 inferrepo=True,
5831 inferrepo=True,
5831 )
5832 )
5832 def resolve(ui, repo, *pats, **opts):
5833 def resolve(ui, repo, *pats, **opts):
5833 """redo merges or set/view the merge status of files
5834 """redo merges or set/view the merge status of files
5834
5835
5835 Merges with unresolved conflicts are often the result of
5836 Merges with unresolved conflicts are often the result of
5836 non-interactive merging using the ``internal:merge`` configuration
5837 non-interactive merging using the ``internal:merge`` configuration
5837 setting, or a command-line merge tool like ``diff3``. The resolve
5838 setting, or a command-line merge tool like ``diff3``. The resolve
5838 command is used to manage the files involved in a merge, after
5839 command is used to manage the files involved in a merge, after
5839 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5840 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5840 working directory must have two parents). See :hg:`help
5841 working directory must have two parents). See :hg:`help
5841 merge-tools` for information on configuring merge tools.
5842 merge-tools` for information on configuring merge tools.
5842
5843
5843 The resolve command can be used in the following ways:
5844 The resolve command can be used in the following ways:
5844
5845
5845 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5846 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5846 the specified files, discarding any previous merge attempts. Re-merging
5847 the specified files, discarding any previous merge attempts. Re-merging
5847 is not performed for files already marked as resolved. Use ``--all/-a``
5848 is not performed for files already marked as resolved. Use ``--all/-a``
5848 to select all unresolved files. ``--tool`` can be used to specify
5849 to select all unresolved files. ``--tool`` can be used to specify
5849 the merge tool used for the given files. It overrides the HGMERGE
5850 the merge tool used for the given files. It overrides the HGMERGE
5850 environment variable and your configuration files. Previous file
5851 environment variable and your configuration files. Previous file
5851 contents are saved with a ``.orig`` suffix.
5852 contents are saved with a ``.orig`` suffix.
5852
5853
5853 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5854 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5854 (e.g. after having manually fixed-up the files). The default is
5855 (e.g. after having manually fixed-up the files). The default is
5855 to mark all unresolved files.
5856 to mark all unresolved files.
5856
5857
5857 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5858 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5858 default is to mark all resolved files.
5859 default is to mark all resolved files.
5859
5860
5860 - :hg:`resolve -l`: list files which had or still have conflicts.
5861 - :hg:`resolve -l`: list files which had or still have conflicts.
5861 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5862 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5862 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5863 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5863 the list. See :hg:`help filesets` for details.
5864 the list. See :hg:`help filesets` for details.
5864
5865
5865 .. note::
5866 .. note::
5866
5867
5867 Mercurial will not let you commit files with unresolved merge
5868 Mercurial will not let you commit files with unresolved merge
5868 conflicts. You must use :hg:`resolve -m ...` before you can
5869 conflicts. You must use :hg:`resolve -m ...` before you can
5869 commit after a conflicting merge.
5870 commit after a conflicting merge.
5870
5871
5871 .. container:: verbose
5872 .. container:: verbose
5872
5873
5873 Template:
5874 Template:
5874
5875
5875 The following keywords are supported in addition to the common template
5876 The following keywords are supported in addition to the common template
5876 keywords and functions. See also :hg:`help templates`.
5877 keywords and functions. See also :hg:`help templates`.
5877
5878
5878 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5879 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5879 :path: String. Repository-absolute path of the file.
5880 :path: String. Repository-absolute path of the file.
5880
5881
5881 Returns 0 on success, 1 if any files fail a resolve attempt.
5882 Returns 0 on success, 1 if any files fail a resolve attempt.
5882 """
5883 """
5883
5884
5884 opts = pycompat.byteskwargs(opts)
5885 opts = pycompat.byteskwargs(opts)
5885 confirm = ui.configbool(b'commands', b'resolve.confirm')
5886 confirm = ui.configbool(b'commands', b'resolve.confirm')
5886 flaglist = b'all mark unmark list no_status re_merge'.split()
5887 flaglist = b'all mark unmark list no_status re_merge'.split()
5887 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5888 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5888
5889
5889 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5890 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5890 if actioncount > 1:
5891 if actioncount > 1:
5891 raise error.Abort(_(b"too many actions specified"))
5892 raise error.Abort(_(b"too many actions specified"))
5892 elif actioncount == 0 and ui.configbool(
5893 elif actioncount == 0 and ui.configbool(
5893 b'commands', b'resolve.explicit-re-merge'
5894 b'commands', b'resolve.explicit-re-merge'
5894 ):
5895 ):
5895 hint = _(b'use --mark, --unmark, --list or --re-merge')
5896 hint = _(b'use --mark, --unmark, --list or --re-merge')
5896 raise error.Abort(_(b'no action specified'), hint=hint)
5897 raise error.Abort(_(b'no action specified'), hint=hint)
5897 if pats and all:
5898 if pats and all:
5898 raise error.Abort(_(b"can't specify --all and patterns"))
5899 raise error.Abort(_(b"can't specify --all and patterns"))
5899 if not (all or pats or show or mark or unmark):
5900 if not (all or pats or show or mark or unmark):
5900 raise error.Abort(
5901 raise error.Abort(
5901 _(b'no files or directories specified'),
5902 _(b'no files or directories specified'),
5902 hint=b'use --all to re-merge all unresolved files',
5903 hint=b'use --all to re-merge all unresolved files',
5903 )
5904 )
5904
5905
5905 if confirm:
5906 if confirm:
5906 if all:
5907 if all:
5907 if ui.promptchoice(
5908 if ui.promptchoice(
5908 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5909 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5909 ):
5910 ):
5910 raise error.Abort(_(b'user quit'))
5911 raise error.Abort(_(b'user quit'))
5911 if mark and not pats:
5912 if mark and not pats:
5912 if ui.promptchoice(
5913 if ui.promptchoice(
5913 _(
5914 _(
5914 b'mark all unresolved files as resolved (yn)?'
5915 b'mark all unresolved files as resolved (yn)?'
5915 b'$$ &Yes $$ &No'
5916 b'$$ &Yes $$ &No'
5916 )
5917 )
5917 ):
5918 ):
5918 raise error.Abort(_(b'user quit'))
5919 raise error.Abort(_(b'user quit'))
5919 if unmark and not pats:
5920 if unmark and not pats:
5920 if ui.promptchoice(
5921 if ui.promptchoice(
5921 _(
5922 _(
5922 b'mark all resolved files as unresolved (yn)?'
5923 b'mark all resolved files as unresolved (yn)?'
5923 b'$$ &Yes $$ &No'
5924 b'$$ &Yes $$ &No'
5924 )
5925 )
5925 ):
5926 ):
5926 raise error.Abort(_(b'user quit'))
5927 raise error.Abort(_(b'user quit'))
5927
5928
5928 uipathfn = scmutil.getuipathfn(repo)
5929 uipathfn = scmutil.getuipathfn(repo)
5929
5930
5930 if show:
5931 if show:
5931 ui.pager(b'resolve')
5932 ui.pager(b'resolve')
5932 fm = ui.formatter(b'resolve', opts)
5933 fm = ui.formatter(b'resolve', opts)
5933 ms = mergestatemod.mergestate.read(repo)
5934 ms = mergestatemod.mergestate.read(repo)
5934 wctx = repo[None]
5935 wctx = repo[None]
5935 m = scmutil.match(wctx, pats, opts)
5936 m = scmutil.match(wctx, pats, opts)
5936
5937
5937 # Labels and keys based on merge state. Unresolved path conflicts show
5938 # Labels and keys based on merge state. Unresolved path conflicts show
5938 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5939 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5939 # resolved conflicts.
5940 # resolved conflicts.
5940 mergestateinfo = {
5941 mergestateinfo = {
5941 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5942 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5942 b'resolve.unresolved',
5943 b'resolve.unresolved',
5943 b'U',
5944 b'U',
5944 ),
5945 ),
5945 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5946 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5946 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5947 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5947 b'resolve.unresolved',
5948 b'resolve.unresolved',
5948 b'P',
5949 b'P',
5949 ),
5950 ),
5950 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5951 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5951 b'resolve.resolved',
5952 b'resolve.resolved',
5952 b'R',
5953 b'R',
5953 ),
5954 ),
5954 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5955 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5955 b'resolve.driverresolved',
5956 b'resolve.driverresolved',
5956 b'D',
5957 b'D',
5957 ),
5958 ),
5958 }
5959 }
5959
5960
5960 for f in ms:
5961 for f in ms:
5961 if not m(f):
5962 if not m(f):
5962 continue
5963 continue
5963
5964
5964 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
5965 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
5965 continue
5966 continue
5966 label, key = mergestateinfo[ms[f]]
5967 label, key = mergestateinfo[ms[f]]
5967 fm.startitem()
5968 fm.startitem()
5968 fm.context(ctx=wctx)
5969 fm.context(ctx=wctx)
5969 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5970 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5970 fm.data(path=f)
5971 fm.data(path=f)
5971 fm.plain(b'%s\n' % uipathfn(f), label=label)
5972 fm.plain(b'%s\n' % uipathfn(f), label=label)
5972 fm.end()
5973 fm.end()
5973 return 0
5974 return 0
5974
5975
5975 with repo.wlock():
5976 with repo.wlock():
5976 ms = mergestatemod.mergestate.read(repo)
5977 ms = mergestatemod.mergestate.read(repo)
5977
5978
5978 if not (ms.active() or repo.dirstate.p2() != nullid):
5979 if not (ms.active() or repo.dirstate.p2() != nullid):
5979 raise error.Abort(
5980 raise error.Abort(
5980 _(b'resolve command not applicable when not merging')
5981 _(b'resolve command not applicable when not merging')
5981 )
5982 )
5982
5983
5983 wctx = repo[None]
5984 wctx = repo[None]
5984
5985
5985 if (
5986 if (
5986 ms.mergedriver
5987 ms.mergedriver
5987 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5988 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5988 ):
5989 ):
5989 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5990 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5990 ms.commit()
5991 ms.commit()
5991 # allow mark and unmark to go through
5992 # allow mark and unmark to go through
5992 if not mark and not unmark and not proceed:
5993 if not mark and not unmark and not proceed:
5993 return 1
5994 return 1
5994
5995
5995 m = scmutil.match(wctx, pats, opts)
5996 m = scmutil.match(wctx, pats, opts)
5996 ret = 0
5997 ret = 0
5997 didwork = False
5998 didwork = False
5998 runconclude = False
5999 runconclude = False
5999
6000
6000 tocomplete = []
6001 tocomplete = []
6001 hasconflictmarkers = []
6002 hasconflictmarkers = []
6002 if mark:
6003 if mark:
6003 markcheck = ui.config(b'commands', b'resolve.mark-check')
6004 markcheck = ui.config(b'commands', b'resolve.mark-check')
6004 if markcheck not in [b'warn', b'abort']:
6005 if markcheck not in [b'warn', b'abort']:
6005 # Treat all invalid / unrecognized values as 'none'.
6006 # Treat all invalid / unrecognized values as 'none'.
6006 markcheck = False
6007 markcheck = False
6007 for f in ms:
6008 for f in ms:
6008 if not m(f):
6009 if not m(f):
6009 continue
6010 continue
6010
6011
6011 didwork = True
6012 didwork = True
6012
6013
6013 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
6014 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
6014 continue
6015 continue
6015
6016
6016 # don't let driver-resolved files be marked, and run the conclude
6017 # don't let driver-resolved files be marked, and run the conclude
6017 # step if asked to resolve
6018 # step if asked to resolve
6018 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6019 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6019 exact = m.exact(f)
6020 exact = m.exact(f)
6020 if mark:
6021 if mark:
6021 if exact:
6022 if exact:
6022 ui.warn(
6023 ui.warn(
6023 _(b'not marking %s as it is driver-resolved\n')
6024 _(b'not marking %s as it is driver-resolved\n')
6024 % uipathfn(f)
6025 % uipathfn(f)
6025 )
6026 )
6026 elif unmark:
6027 elif unmark:
6027 if exact:
6028 if exact:
6028 ui.warn(
6029 ui.warn(
6029 _(b'not unmarking %s as it is driver-resolved\n')
6030 _(b'not unmarking %s as it is driver-resolved\n')
6030 % uipathfn(f)
6031 % uipathfn(f)
6031 )
6032 )
6032 else:
6033 else:
6033 runconclude = True
6034 runconclude = True
6034 continue
6035 continue
6035
6036
6036 # path conflicts must be resolved manually
6037 # path conflicts must be resolved manually
6037 if ms[f] in (
6038 if ms[f] in (
6038 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6039 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6039 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6040 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6040 ):
6041 ):
6041 if mark:
6042 if mark:
6042 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6043 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6043 elif unmark:
6044 elif unmark:
6044 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6045 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6045 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6046 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6046 ui.warn(
6047 ui.warn(
6047 _(b'%s: path conflict must be resolved manually\n')
6048 _(b'%s: path conflict must be resolved manually\n')
6048 % uipathfn(f)
6049 % uipathfn(f)
6049 )
6050 )
6050 continue
6051 continue
6051
6052
6052 if mark:
6053 if mark:
6053 if markcheck:
6054 if markcheck:
6054 fdata = repo.wvfs.tryread(f)
6055 fdata = repo.wvfs.tryread(f)
6055 if (
6056 if (
6056 filemerge.hasconflictmarkers(fdata)
6057 filemerge.hasconflictmarkers(fdata)
6057 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6058 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6058 ):
6059 ):
6059 hasconflictmarkers.append(f)
6060 hasconflictmarkers.append(f)
6060 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6061 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6061 elif unmark:
6062 elif unmark:
6062 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6063 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6063 else:
6064 else:
6064 # backup pre-resolve (merge uses .orig for its own purposes)
6065 # backup pre-resolve (merge uses .orig for its own purposes)
6065 a = repo.wjoin(f)
6066 a = repo.wjoin(f)
6066 try:
6067 try:
6067 util.copyfile(a, a + b".resolve")
6068 util.copyfile(a, a + b".resolve")
6068 except (IOError, OSError) as inst:
6069 except (IOError, OSError) as inst:
6069 if inst.errno != errno.ENOENT:
6070 if inst.errno != errno.ENOENT:
6070 raise
6071 raise
6071
6072
6072 try:
6073 try:
6073 # preresolve file
6074 # preresolve file
6074 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6075 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6075 with ui.configoverride(overrides, b'resolve'):
6076 with ui.configoverride(overrides, b'resolve'):
6076 complete, r = ms.preresolve(f, wctx)
6077 complete, r = ms.preresolve(f, wctx)
6077 if not complete:
6078 if not complete:
6078 tocomplete.append(f)
6079 tocomplete.append(f)
6079 elif r:
6080 elif r:
6080 ret = 1
6081 ret = 1
6081 finally:
6082 finally:
6082 ms.commit()
6083 ms.commit()
6083
6084
6084 # replace filemerge's .orig file with our resolve file, but only
6085 # replace filemerge's .orig file with our resolve file, but only
6085 # for merges that are complete
6086 # for merges that are complete
6086 if complete:
6087 if complete:
6087 try:
6088 try:
6088 util.rename(
6089 util.rename(
6089 a + b".resolve", scmutil.backuppath(ui, repo, f)
6090 a + b".resolve", scmutil.backuppath(ui, repo, f)
6090 )
6091 )
6091 except OSError as inst:
6092 except OSError as inst:
6092 if inst.errno != errno.ENOENT:
6093 if inst.errno != errno.ENOENT:
6093 raise
6094 raise
6094
6095
6095 if hasconflictmarkers:
6096 if hasconflictmarkers:
6096 ui.warn(
6097 ui.warn(
6097 _(
6098 _(
6098 b'warning: the following files still have conflict '
6099 b'warning: the following files still have conflict '
6099 b'markers:\n'
6100 b'markers:\n'
6100 )
6101 )
6101 + b''.join(
6102 + b''.join(
6102 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6103 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6103 )
6104 )
6104 )
6105 )
6105 if markcheck == b'abort' and not all and not pats:
6106 if markcheck == b'abort' and not all and not pats:
6106 raise error.Abort(
6107 raise error.Abort(
6107 _(b'conflict markers detected'),
6108 _(b'conflict markers detected'),
6108 hint=_(b'use --all to mark anyway'),
6109 hint=_(b'use --all to mark anyway'),
6109 )
6110 )
6110
6111
6111 for f in tocomplete:
6112 for f in tocomplete:
6112 try:
6113 try:
6113 # resolve file
6114 # resolve file
6114 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6115 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6115 with ui.configoverride(overrides, b'resolve'):
6116 with ui.configoverride(overrides, b'resolve'):
6116 r = ms.resolve(f, wctx)
6117 r = ms.resolve(f, wctx)
6117 if r:
6118 if r:
6118 ret = 1
6119 ret = 1
6119 finally:
6120 finally:
6120 ms.commit()
6121 ms.commit()
6121
6122
6122 # replace filemerge's .orig file with our resolve file
6123 # replace filemerge's .orig file with our resolve file
6123 a = repo.wjoin(f)
6124 a = repo.wjoin(f)
6124 try:
6125 try:
6125 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6126 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6126 except OSError as inst:
6127 except OSError as inst:
6127 if inst.errno != errno.ENOENT:
6128 if inst.errno != errno.ENOENT:
6128 raise
6129 raise
6129
6130
6130 ms.commit()
6131 ms.commit()
6131 ms.recordactions()
6132 ms.recordactions()
6132
6133
6133 if not didwork and pats:
6134 if not didwork and pats:
6134 hint = None
6135 hint = None
6135 if not any([p for p in pats if p.find(b':') >= 0]):
6136 if not any([p for p in pats if p.find(b':') >= 0]):
6136 pats = [b'path:%s' % p for p in pats]
6137 pats = [b'path:%s' % p for p in pats]
6137 m = scmutil.match(wctx, pats, opts)
6138 m = scmutil.match(wctx, pats, opts)
6138 for f in ms:
6139 for f in ms:
6139 if not m(f):
6140 if not m(f):
6140 continue
6141 continue
6141
6142
6142 def flag(o):
6143 def flag(o):
6143 if o == b're_merge':
6144 if o == b're_merge':
6144 return b'--re-merge '
6145 return b'--re-merge '
6145 return b'-%s ' % o[0:1]
6146 return b'-%s ' % o[0:1]
6146
6147
6147 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6148 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6148 hint = _(b"(try: hg resolve %s%s)\n") % (
6149 hint = _(b"(try: hg resolve %s%s)\n") % (
6149 flags,
6150 flags,
6150 b' '.join(pats),
6151 b' '.join(pats),
6151 )
6152 )
6152 break
6153 break
6153 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6154 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6154 if hint:
6155 if hint:
6155 ui.warn(hint)
6156 ui.warn(hint)
6156 elif ms.mergedriver and ms.mdstate() != b's':
6157 elif ms.mergedriver and ms.mdstate() != b's':
6157 # run conclude step when either a driver-resolved file is requested
6158 # run conclude step when either a driver-resolved file is requested
6158 # or there are no driver-resolved files
6159 # or there are no driver-resolved files
6159 # we can't use 'ret' to determine whether any files are unresolved
6160 # we can't use 'ret' to determine whether any files are unresolved
6160 # because we might not have tried to resolve some
6161 # because we might not have tried to resolve some
6161 if (runconclude or not list(ms.driverresolved())) and not list(
6162 if (runconclude or not list(ms.driverresolved())) and not list(
6162 ms.unresolved()
6163 ms.unresolved()
6163 ):
6164 ):
6164 proceed = mergemod.driverconclude(repo, ms, wctx)
6165 proceed = mergemod.driverconclude(repo, ms, wctx)
6165 ms.commit()
6166 ms.commit()
6166 if not proceed:
6167 if not proceed:
6167 return 1
6168 return 1
6168
6169
6169 # Nudge users into finishing an unfinished operation
6170 # Nudge users into finishing an unfinished operation
6170 unresolvedf = list(ms.unresolved())
6171 unresolvedf = list(ms.unresolved())
6171 driverresolvedf = list(ms.driverresolved())
6172 driverresolvedf = list(ms.driverresolved())
6172 if not unresolvedf and not driverresolvedf:
6173 if not unresolvedf and not driverresolvedf:
6173 ui.status(_(b'(no more unresolved files)\n'))
6174 ui.status(_(b'(no more unresolved files)\n'))
6174 cmdutil.checkafterresolved(repo)
6175 cmdutil.checkafterresolved(repo)
6175 elif not unresolvedf:
6176 elif not unresolvedf:
6176 ui.status(
6177 ui.status(
6177 _(
6178 _(
6178 b'(no more unresolved files -- '
6179 b'(no more unresolved files -- '
6179 b'run "hg resolve --all" to conclude)\n'
6180 b'run "hg resolve --all" to conclude)\n'
6180 )
6181 )
6181 )
6182 )
6182
6183
6183 return ret
6184 return ret
6184
6185
6185
6186
6186 @command(
6187 @command(
6187 b'revert',
6188 b'revert',
6188 [
6189 [
6189 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6190 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6190 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6191 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6191 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6192 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6192 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6193 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6193 (b'i', b'interactive', None, _(b'interactively select the changes')),
6194 (b'i', b'interactive', None, _(b'interactively select the changes')),
6194 ]
6195 ]
6195 + walkopts
6196 + walkopts
6196 + dryrunopts,
6197 + dryrunopts,
6197 _(b'[OPTION]... [-r REV] [NAME]...'),
6198 _(b'[OPTION]... [-r REV] [NAME]...'),
6198 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6199 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6199 )
6200 )
6200 def revert(ui, repo, *pats, **opts):
6201 def revert(ui, repo, *pats, **opts):
6201 """restore files to their checkout state
6202 """restore files to their checkout state
6202
6203
6203 .. note::
6204 .. note::
6204
6205
6205 To check out earlier revisions, you should use :hg:`update REV`.
6206 To check out earlier revisions, you should use :hg:`update REV`.
6206 To cancel an uncommitted merge (and lose your changes),
6207 To cancel an uncommitted merge (and lose your changes),
6207 use :hg:`merge --abort`.
6208 use :hg:`merge --abort`.
6208
6209
6209 With no revision specified, revert the specified files or directories
6210 With no revision specified, revert the specified files or directories
6210 to the contents they had in the parent of the working directory.
6211 to the contents they had in the parent of the working directory.
6211 This restores the contents of files to an unmodified
6212 This restores the contents of files to an unmodified
6212 state and unschedules adds, removes, copies, and renames. If the
6213 state and unschedules adds, removes, copies, and renames. If the
6213 working directory has two parents, you must explicitly specify a
6214 working directory has two parents, you must explicitly specify a
6214 revision.
6215 revision.
6215
6216
6216 Using the -r/--rev or -d/--date options, revert the given files or
6217 Using the -r/--rev or -d/--date options, revert the given files or
6217 directories to their states as of a specific revision. Because
6218 directories to their states as of a specific revision. Because
6218 revert does not change the working directory parents, this will
6219 revert does not change the working directory parents, this will
6219 cause these files to appear modified. This can be helpful to "back
6220 cause these files to appear modified. This can be helpful to "back
6220 out" some or all of an earlier change. See :hg:`backout` for a
6221 out" some or all of an earlier change. See :hg:`backout` for a
6221 related method.
6222 related method.
6222
6223
6223 Modified files are saved with a .orig suffix before reverting.
6224 Modified files are saved with a .orig suffix before reverting.
6224 To disable these backups, use --no-backup. It is possible to store
6225 To disable these backups, use --no-backup. It is possible to store
6225 the backup files in a custom directory relative to the root of the
6226 the backup files in a custom directory relative to the root of the
6226 repository by setting the ``ui.origbackuppath`` configuration
6227 repository by setting the ``ui.origbackuppath`` configuration
6227 option.
6228 option.
6228
6229
6229 See :hg:`help dates` for a list of formats valid for -d/--date.
6230 See :hg:`help dates` for a list of formats valid for -d/--date.
6230
6231
6231 See :hg:`help backout` for a way to reverse the effect of an
6232 See :hg:`help backout` for a way to reverse the effect of an
6232 earlier changeset.
6233 earlier changeset.
6233
6234
6234 Returns 0 on success.
6235 Returns 0 on success.
6235 """
6236 """
6236
6237
6237 opts = pycompat.byteskwargs(opts)
6238 opts = pycompat.byteskwargs(opts)
6238 if opts.get(b"date"):
6239 if opts.get(b"date"):
6239 if opts.get(b"rev"):
6240 if opts.get(b"rev"):
6240 raise error.Abort(_(b"you can't specify a revision and a date"))
6241 raise error.Abort(_(b"you can't specify a revision and a date"))
6241 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6242 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6242
6243
6243 parent, p2 = repo.dirstate.parents()
6244 parent, p2 = repo.dirstate.parents()
6244 if not opts.get(b'rev') and p2 != nullid:
6245 if not opts.get(b'rev') and p2 != nullid:
6245 # revert after merge is a trap for new users (issue2915)
6246 # revert after merge is a trap for new users (issue2915)
6246 raise error.Abort(
6247 raise error.Abort(
6247 _(b'uncommitted merge with no revision specified'),
6248 _(b'uncommitted merge with no revision specified'),
6248 hint=_(b"use 'hg update' or see 'hg help revert'"),
6249 hint=_(b"use 'hg update' or see 'hg help revert'"),
6249 )
6250 )
6250
6251
6251 rev = opts.get(b'rev')
6252 rev = opts.get(b'rev')
6252 if rev:
6253 if rev:
6253 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6254 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6254 ctx = scmutil.revsingle(repo, rev)
6255 ctx = scmutil.revsingle(repo, rev)
6255
6256
6256 if not (
6257 if not (
6257 pats
6258 pats
6258 or opts.get(b'include')
6259 or opts.get(b'include')
6259 or opts.get(b'exclude')
6260 or opts.get(b'exclude')
6260 or opts.get(b'all')
6261 or opts.get(b'all')
6261 or opts.get(b'interactive')
6262 or opts.get(b'interactive')
6262 ):
6263 ):
6263 msg = _(b"no files or directories specified")
6264 msg = _(b"no files or directories specified")
6264 if p2 != nullid:
6265 if p2 != nullid:
6265 hint = _(
6266 hint = _(
6266 b"uncommitted merge, use --all to discard all changes,"
6267 b"uncommitted merge, use --all to discard all changes,"
6267 b" or 'hg update -C .' to abort the merge"
6268 b" or 'hg update -C .' to abort the merge"
6268 )
6269 )
6269 raise error.Abort(msg, hint=hint)
6270 raise error.Abort(msg, hint=hint)
6270 dirty = any(repo.status())
6271 dirty = any(repo.status())
6271 node = ctx.node()
6272 node = ctx.node()
6272 if node != parent:
6273 if node != parent:
6273 if dirty:
6274 if dirty:
6274 hint = (
6275 hint = (
6275 _(
6276 _(
6276 b"uncommitted changes, use --all to discard all"
6277 b"uncommitted changes, use --all to discard all"
6277 b" changes, or 'hg update %d' to update"
6278 b" changes, or 'hg update %d' to update"
6278 )
6279 )
6279 % ctx.rev()
6280 % ctx.rev()
6280 )
6281 )
6281 else:
6282 else:
6282 hint = (
6283 hint = (
6283 _(
6284 _(
6284 b"use --all to revert all files,"
6285 b"use --all to revert all files,"
6285 b" or 'hg update %d' to update"
6286 b" or 'hg update %d' to update"
6286 )
6287 )
6287 % ctx.rev()
6288 % ctx.rev()
6288 )
6289 )
6289 elif dirty:
6290 elif dirty:
6290 hint = _(b"uncommitted changes, use --all to discard all changes")
6291 hint = _(b"uncommitted changes, use --all to discard all changes")
6291 else:
6292 else:
6292 hint = _(b"use --all to revert all files")
6293 hint = _(b"use --all to revert all files")
6293 raise error.Abort(msg, hint=hint)
6294 raise error.Abort(msg, hint=hint)
6294
6295
6295 return cmdutil.revert(
6296 return cmdutil.revert(
6296 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6297 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6297 )
6298 )
6298
6299
6299
6300
6300 @command(
6301 @command(
6301 b'rollback',
6302 b'rollback',
6302 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6303 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6303 helpcategory=command.CATEGORY_MAINTENANCE,
6304 helpcategory=command.CATEGORY_MAINTENANCE,
6304 )
6305 )
6305 def rollback(ui, repo, **opts):
6306 def rollback(ui, repo, **opts):
6306 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6307 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6307
6308
6308 Please use :hg:`commit --amend` instead of rollback to correct
6309 Please use :hg:`commit --amend` instead of rollback to correct
6309 mistakes in the last commit.
6310 mistakes in the last commit.
6310
6311
6311 This command should be used with care. There is only one level of
6312 This command should be used with care. There is only one level of
6312 rollback, and there is no way to undo a rollback. It will also
6313 rollback, and there is no way to undo a rollback. It will also
6313 restore the dirstate at the time of the last transaction, losing
6314 restore the dirstate at the time of the last transaction, losing
6314 any dirstate changes since that time. This command does not alter
6315 any dirstate changes since that time. This command does not alter
6315 the working directory.
6316 the working directory.
6316
6317
6317 Transactions are used to encapsulate the effects of all commands
6318 Transactions are used to encapsulate the effects of all commands
6318 that create new changesets or propagate existing changesets into a
6319 that create new changesets or propagate existing changesets into a
6319 repository.
6320 repository.
6320
6321
6321 .. container:: verbose
6322 .. container:: verbose
6322
6323
6323 For example, the following commands are transactional, and their
6324 For example, the following commands are transactional, and their
6324 effects can be rolled back:
6325 effects can be rolled back:
6325
6326
6326 - commit
6327 - commit
6327 - import
6328 - import
6328 - pull
6329 - pull
6329 - push (with this repository as the destination)
6330 - push (with this repository as the destination)
6330 - unbundle
6331 - unbundle
6331
6332
6332 To avoid permanent data loss, rollback will refuse to rollback a
6333 To avoid permanent data loss, rollback will refuse to rollback a
6333 commit transaction if it isn't checked out. Use --force to
6334 commit transaction if it isn't checked out. Use --force to
6334 override this protection.
6335 override this protection.
6335
6336
6336 The rollback command can be entirely disabled by setting the
6337 The rollback command can be entirely disabled by setting the
6337 ``ui.rollback`` configuration setting to false. If you're here
6338 ``ui.rollback`` configuration setting to false. If you're here
6338 because you want to use rollback and it's disabled, you can
6339 because you want to use rollback and it's disabled, you can
6339 re-enable the command by setting ``ui.rollback`` to true.
6340 re-enable the command by setting ``ui.rollback`` to true.
6340
6341
6341 This command is not intended for use on public repositories. Once
6342 This command is not intended for use on public repositories. Once
6342 changes are visible for pull by other users, rolling a transaction
6343 changes are visible for pull by other users, rolling a transaction
6343 back locally is ineffective (someone else may already have pulled
6344 back locally is ineffective (someone else may already have pulled
6344 the changes). Furthermore, a race is possible with readers of the
6345 the changes). Furthermore, a race is possible with readers of the
6345 repository; for example an in-progress pull from the repository
6346 repository; for example an in-progress pull from the repository
6346 may fail if a rollback is performed.
6347 may fail if a rollback is performed.
6347
6348
6348 Returns 0 on success, 1 if no rollback data is available.
6349 Returns 0 on success, 1 if no rollback data is available.
6349 """
6350 """
6350 if not ui.configbool(b'ui', b'rollback'):
6351 if not ui.configbool(b'ui', b'rollback'):
6351 raise error.Abort(
6352 raise error.Abort(
6352 _(b'rollback is disabled because it is unsafe'),
6353 _(b'rollback is disabled because it is unsafe'),
6353 hint=b'see `hg help -v rollback` for information',
6354 hint=b'see `hg help -v rollback` for information',
6354 )
6355 )
6355 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6356 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6356
6357
6357
6358
6358 @command(
6359 @command(
6359 b'root',
6360 b'root',
6360 [] + formatteropts,
6361 [] + formatteropts,
6361 intents={INTENT_READONLY},
6362 intents={INTENT_READONLY},
6362 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6363 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6363 )
6364 )
6364 def root(ui, repo, **opts):
6365 def root(ui, repo, **opts):
6365 """print the root (top) of the current working directory
6366 """print the root (top) of the current working directory
6366
6367
6367 Print the root directory of the current repository.
6368 Print the root directory of the current repository.
6368
6369
6369 .. container:: verbose
6370 .. container:: verbose
6370
6371
6371 Template:
6372 Template:
6372
6373
6373 The following keywords are supported in addition to the common template
6374 The following keywords are supported in addition to the common template
6374 keywords and functions. See also :hg:`help templates`.
6375 keywords and functions. See also :hg:`help templates`.
6375
6376
6376 :hgpath: String. Path to the .hg directory.
6377 :hgpath: String. Path to the .hg directory.
6377 :storepath: String. Path to the directory holding versioned data.
6378 :storepath: String. Path to the directory holding versioned data.
6378
6379
6379 Returns 0 on success.
6380 Returns 0 on success.
6380 """
6381 """
6381 opts = pycompat.byteskwargs(opts)
6382 opts = pycompat.byteskwargs(opts)
6382 with ui.formatter(b'root', opts) as fm:
6383 with ui.formatter(b'root', opts) as fm:
6383 fm.startitem()
6384 fm.startitem()
6384 fm.write(b'reporoot', b'%s\n', repo.root)
6385 fm.write(b'reporoot', b'%s\n', repo.root)
6385 fm.data(hgpath=repo.path, storepath=repo.spath)
6386 fm.data(hgpath=repo.path, storepath=repo.spath)
6386
6387
6387
6388
6388 @command(
6389 @command(
6389 b'serve',
6390 b'serve',
6390 [
6391 [
6391 (
6392 (
6392 b'A',
6393 b'A',
6393 b'accesslog',
6394 b'accesslog',
6394 b'',
6395 b'',
6395 _(b'name of access log file to write to'),
6396 _(b'name of access log file to write to'),
6396 _(b'FILE'),
6397 _(b'FILE'),
6397 ),
6398 ),
6398 (b'd', b'daemon', None, _(b'run server in background')),
6399 (b'd', b'daemon', None, _(b'run server in background')),
6399 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6400 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6400 (
6401 (
6401 b'E',
6402 b'E',
6402 b'errorlog',
6403 b'errorlog',
6403 b'',
6404 b'',
6404 _(b'name of error log file to write to'),
6405 _(b'name of error log file to write to'),
6405 _(b'FILE'),
6406 _(b'FILE'),
6406 ),
6407 ),
6407 # use string type, then we can check if something was passed
6408 # use string type, then we can check if something was passed
6408 (
6409 (
6409 b'p',
6410 b'p',
6410 b'port',
6411 b'port',
6411 b'',
6412 b'',
6412 _(b'port to listen on (default: 8000)'),
6413 _(b'port to listen on (default: 8000)'),
6413 _(b'PORT'),
6414 _(b'PORT'),
6414 ),
6415 ),
6415 (
6416 (
6416 b'a',
6417 b'a',
6417 b'address',
6418 b'address',
6418 b'',
6419 b'',
6419 _(b'address to listen on (default: all interfaces)'),
6420 _(b'address to listen on (default: all interfaces)'),
6420 _(b'ADDR'),
6421 _(b'ADDR'),
6421 ),
6422 ),
6422 (
6423 (
6423 b'',
6424 b'',
6424 b'prefix',
6425 b'prefix',
6425 b'',
6426 b'',
6426 _(b'prefix path to serve from (default: server root)'),
6427 _(b'prefix path to serve from (default: server root)'),
6427 _(b'PREFIX'),
6428 _(b'PREFIX'),
6428 ),
6429 ),
6429 (
6430 (
6430 b'n',
6431 b'n',
6431 b'name',
6432 b'name',
6432 b'',
6433 b'',
6433 _(b'name to show in web pages (default: working directory)'),
6434 _(b'name to show in web pages (default: working directory)'),
6434 _(b'NAME'),
6435 _(b'NAME'),
6435 ),
6436 ),
6436 (
6437 (
6437 b'',
6438 b'',
6438 b'web-conf',
6439 b'web-conf',
6439 b'',
6440 b'',
6440 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6441 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6441 _(b'FILE'),
6442 _(b'FILE'),
6442 ),
6443 ),
6443 (
6444 (
6444 b'',
6445 b'',
6445 b'webdir-conf',
6446 b'webdir-conf',
6446 b'',
6447 b'',
6447 _(b'name of the hgweb config file (DEPRECATED)'),
6448 _(b'name of the hgweb config file (DEPRECATED)'),
6448 _(b'FILE'),
6449 _(b'FILE'),
6449 ),
6450 ),
6450 (
6451 (
6451 b'',
6452 b'',
6452 b'pid-file',
6453 b'pid-file',
6453 b'',
6454 b'',
6454 _(b'name of file to write process ID to'),
6455 _(b'name of file to write process ID to'),
6455 _(b'FILE'),
6456 _(b'FILE'),
6456 ),
6457 ),
6457 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6458 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6458 (
6459 (
6459 b'',
6460 b'',
6460 b'cmdserver',
6461 b'cmdserver',
6461 b'',
6462 b'',
6462 _(b'for remote clients (ADVANCED)'),
6463 _(b'for remote clients (ADVANCED)'),
6463 _(b'MODE'),
6464 _(b'MODE'),
6464 ),
6465 ),
6465 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6466 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6466 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6467 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6467 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6468 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6468 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6469 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6469 (b'', b'print-url', None, _(b'start and print only the URL')),
6470 (b'', b'print-url', None, _(b'start and print only the URL')),
6470 ]
6471 ]
6471 + subrepoopts,
6472 + subrepoopts,
6472 _(b'[OPTION]...'),
6473 _(b'[OPTION]...'),
6473 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6474 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6474 helpbasic=True,
6475 helpbasic=True,
6475 optionalrepo=True,
6476 optionalrepo=True,
6476 )
6477 )
6477 def serve(ui, repo, **opts):
6478 def serve(ui, repo, **opts):
6478 """start stand-alone webserver
6479 """start stand-alone webserver
6479
6480
6480 Start a local HTTP repository browser and pull server. You can use
6481 Start a local HTTP repository browser and pull server. You can use
6481 this for ad-hoc sharing and browsing of repositories. It is
6482 this for ad-hoc sharing and browsing of repositories. It is
6482 recommended to use a real web server to serve a repository for
6483 recommended to use a real web server to serve a repository for
6483 longer periods of time.
6484 longer periods of time.
6484
6485
6485 Please note that the server does not implement access control.
6486 Please note that the server does not implement access control.
6486 This means that, by default, anybody can read from the server and
6487 This means that, by default, anybody can read from the server and
6487 nobody can write to it by default. Set the ``web.allow-push``
6488 nobody can write to it by default. Set the ``web.allow-push``
6488 option to ``*`` to allow everybody to push to the server. You
6489 option to ``*`` to allow everybody to push to the server. You
6489 should use a real web server if you need to authenticate users.
6490 should use a real web server if you need to authenticate users.
6490
6491
6491 By default, the server logs accesses to stdout and errors to
6492 By default, the server logs accesses to stdout and errors to
6492 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6493 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6493 files.
6494 files.
6494
6495
6495 To have the server choose a free port number to listen on, specify
6496 To have the server choose a free port number to listen on, specify
6496 a port number of 0; in this case, the server will print the port
6497 a port number of 0; in this case, the server will print the port
6497 number it uses.
6498 number it uses.
6498
6499
6499 Returns 0 on success.
6500 Returns 0 on success.
6500 """
6501 """
6501
6502
6502 opts = pycompat.byteskwargs(opts)
6503 opts = pycompat.byteskwargs(opts)
6503 if opts[b"stdio"] and opts[b"cmdserver"]:
6504 if opts[b"stdio"] and opts[b"cmdserver"]:
6504 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6505 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6505 if opts[b"print_url"] and ui.verbose:
6506 if opts[b"print_url"] and ui.verbose:
6506 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6507 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6507
6508
6508 if opts[b"stdio"]:
6509 if opts[b"stdio"]:
6509 if repo is None:
6510 if repo is None:
6510 raise error.RepoError(
6511 raise error.RepoError(
6511 _(b"there is no Mercurial repository here (.hg not found)")
6512 _(b"there is no Mercurial repository here (.hg not found)")
6512 )
6513 )
6513 s = wireprotoserver.sshserver(ui, repo)
6514 s = wireprotoserver.sshserver(ui, repo)
6514 s.serve_forever()
6515 s.serve_forever()
6515
6516
6516 service = server.createservice(ui, repo, opts)
6517 service = server.createservice(ui, repo, opts)
6517 return server.runservice(opts, initfn=service.init, runfn=service.run)
6518 return server.runservice(opts, initfn=service.init, runfn=service.run)
6518
6519
6519
6520
6520 @command(
6521 @command(
6521 b'shelve',
6522 b'shelve',
6522 [
6523 [
6523 (
6524 (
6524 b'A',
6525 b'A',
6525 b'addremove',
6526 b'addremove',
6526 None,
6527 None,
6527 _(b'mark new/missing files as added/removed before shelving'),
6528 _(b'mark new/missing files as added/removed before shelving'),
6528 ),
6529 ),
6529 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6530 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6530 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6531 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6531 (
6532 (
6532 b'',
6533 b'',
6533 b'date',
6534 b'date',
6534 b'',
6535 b'',
6535 _(b'shelve with the specified commit date'),
6536 _(b'shelve with the specified commit date'),
6536 _(b'DATE'),
6537 _(b'DATE'),
6537 ),
6538 ),
6538 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6539 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6539 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6540 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6540 (
6541 (
6541 b'k',
6542 b'k',
6542 b'keep',
6543 b'keep',
6543 False,
6544 False,
6544 _(b'shelve, but keep changes in the working directory'),
6545 _(b'shelve, but keep changes in the working directory'),
6545 ),
6546 ),
6546 (b'l', b'list', None, _(b'list current shelves')),
6547 (b'l', b'list', None, _(b'list current shelves')),
6547 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6548 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6548 (
6549 (
6549 b'n',
6550 b'n',
6550 b'name',
6551 b'name',
6551 b'',
6552 b'',
6552 _(b'use the given name for the shelved commit'),
6553 _(b'use the given name for the shelved commit'),
6553 _(b'NAME'),
6554 _(b'NAME'),
6554 ),
6555 ),
6555 (
6556 (
6556 b'p',
6557 b'p',
6557 b'patch',
6558 b'patch',
6558 None,
6559 None,
6559 _(
6560 _(
6560 b'output patches for changes (provide the names of the shelved '
6561 b'output patches for changes (provide the names of the shelved '
6561 b'changes as positional arguments)'
6562 b'changes as positional arguments)'
6562 ),
6563 ),
6563 ),
6564 ),
6564 (b'i', b'interactive', None, _(b'interactive mode')),
6565 (b'i', b'interactive', None, _(b'interactive mode')),
6565 (
6566 (
6566 b'',
6567 b'',
6567 b'stat',
6568 b'stat',
6568 None,
6569 None,
6569 _(
6570 _(
6570 b'output diffstat-style summary of changes (provide the names of '
6571 b'output diffstat-style summary of changes (provide the names of '
6571 b'the shelved changes as positional arguments)'
6572 b'the shelved changes as positional arguments)'
6572 ),
6573 ),
6573 ),
6574 ),
6574 ]
6575 ]
6575 + cmdutil.walkopts,
6576 + cmdutil.walkopts,
6576 _(b'hg shelve [OPTION]... [FILE]...'),
6577 _(b'hg shelve [OPTION]... [FILE]...'),
6577 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6578 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6578 )
6579 )
6579 def shelve(ui, repo, *pats, **opts):
6580 def shelve(ui, repo, *pats, **opts):
6580 '''save and set aside changes from the working directory
6581 '''save and set aside changes from the working directory
6581
6582
6582 Shelving takes files that "hg status" reports as not clean, saves
6583 Shelving takes files that "hg status" reports as not clean, saves
6583 the modifications to a bundle (a shelved change), and reverts the
6584 the modifications to a bundle (a shelved change), and reverts the
6584 files so that their state in the working directory becomes clean.
6585 files so that their state in the working directory becomes clean.
6585
6586
6586 To restore these changes to the working directory, using "hg
6587 To restore these changes to the working directory, using "hg
6587 unshelve"; this will work even if you switch to a different
6588 unshelve"; this will work even if you switch to a different
6588 commit.
6589 commit.
6589
6590
6590 When no files are specified, "hg shelve" saves all not-clean
6591 When no files are specified, "hg shelve" saves all not-clean
6591 files. If specific files or directories are named, only changes to
6592 files. If specific files or directories are named, only changes to
6592 those files are shelved.
6593 those files are shelved.
6593
6594
6594 In bare shelve (when no files are specified, without interactive,
6595 In bare shelve (when no files are specified, without interactive,
6595 include and exclude option), shelving remembers information if the
6596 include and exclude option), shelving remembers information if the
6596 working directory was on newly created branch, in other words working
6597 working directory was on newly created branch, in other words working
6597 directory was on different branch than its first parent. In this
6598 directory was on different branch than its first parent. In this
6598 situation unshelving restores branch information to the working directory.
6599 situation unshelving restores branch information to the working directory.
6599
6600
6600 Each shelved change has a name that makes it easier to find later.
6601 Each shelved change has a name that makes it easier to find later.
6601 The name of a shelved change defaults to being based on the active
6602 The name of a shelved change defaults to being based on the active
6602 bookmark, or if there is no active bookmark, the current named
6603 bookmark, or if there is no active bookmark, the current named
6603 branch. To specify a different name, use ``--name``.
6604 branch. To specify a different name, use ``--name``.
6604
6605
6605 To see a list of existing shelved changes, use the ``--list``
6606 To see a list of existing shelved changes, use the ``--list``
6606 option. For each shelved change, this will print its name, age,
6607 option. For each shelved change, this will print its name, age,
6607 and description; use ``--patch`` or ``--stat`` for more details.
6608 and description; use ``--patch`` or ``--stat`` for more details.
6608
6609
6609 To delete specific shelved changes, use ``--delete``. To delete
6610 To delete specific shelved changes, use ``--delete``. To delete
6610 all shelved changes, use ``--cleanup``.
6611 all shelved changes, use ``--cleanup``.
6611 '''
6612 '''
6612 opts = pycompat.byteskwargs(opts)
6613 opts = pycompat.byteskwargs(opts)
6613 allowables = [
6614 allowables = [
6614 (b'addremove', {b'create'}), # 'create' is pseudo action
6615 (b'addremove', {b'create'}), # 'create' is pseudo action
6615 (b'unknown', {b'create'}),
6616 (b'unknown', {b'create'}),
6616 (b'cleanup', {b'cleanup'}),
6617 (b'cleanup', {b'cleanup'}),
6617 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6618 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6618 (b'delete', {b'delete'}),
6619 (b'delete', {b'delete'}),
6619 (b'edit', {b'create'}),
6620 (b'edit', {b'create'}),
6620 (b'keep', {b'create'}),
6621 (b'keep', {b'create'}),
6621 (b'list', {b'list'}),
6622 (b'list', {b'list'}),
6622 (b'message', {b'create'}),
6623 (b'message', {b'create'}),
6623 (b'name', {b'create'}),
6624 (b'name', {b'create'}),
6624 (b'patch', {b'patch', b'list'}),
6625 (b'patch', {b'patch', b'list'}),
6625 (b'stat', {b'stat', b'list'}),
6626 (b'stat', {b'stat', b'list'}),
6626 ]
6627 ]
6627
6628
6628 def checkopt(opt):
6629 def checkopt(opt):
6629 if opts.get(opt):
6630 if opts.get(opt):
6630 for i, allowable in allowables:
6631 for i, allowable in allowables:
6631 if opts[i] and opt not in allowable:
6632 if opts[i] and opt not in allowable:
6632 raise error.Abort(
6633 raise error.Abort(
6633 _(
6634 _(
6634 b"options '--%s' and '--%s' may not be "
6635 b"options '--%s' and '--%s' may not be "
6635 b"used together"
6636 b"used together"
6636 )
6637 )
6637 % (opt, i)
6638 % (opt, i)
6638 )
6639 )
6639 return True
6640 return True
6640
6641
6641 if checkopt(b'cleanup'):
6642 if checkopt(b'cleanup'):
6642 if pats:
6643 if pats:
6643 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6644 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6644 return shelvemod.cleanupcmd(ui, repo)
6645 return shelvemod.cleanupcmd(ui, repo)
6645 elif checkopt(b'delete'):
6646 elif checkopt(b'delete'):
6646 return shelvemod.deletecmd(ui, repo, pats)
6647 return shelvemod.deletecmd(ui, repo, pats)
6647 elif checkopt(b'list'):
6648 elif checkopt(b'list'):
6648 return shelvemod.listcmd(ui, repo, pats, opts)
6649 return shelvemod.listcmd(ui, repo, pats, opts)
6649 elif checkopt(b'patch') or checkopt(b'stat'):
6650 elif checkopt(b'patch') or checkopt(b'stat'):
6650 return shelvemod.patchcmds(ui, repo, pats, opts)
6651 return shelvemod.patchcmds(ui, repo, pats, opts)
6651 else:
6652 else:
6652 return shelvemod.createcmd(ui, repo, pats, opts)
6653 return shelvemod.createcmd(ui, repo, pats, opts)
6653
6654
6654
6655
6655 _NOTTERSE = b'nothing'
6656 _NOTTERSE = b'nothing'
6656
6657
6657
6658
6658 @command(
6659 @command(
6659 b'status|st',
6660 b'status|st',
6660 [
6661 [
6661 (b'A', b'all', None, _(b'show status of all files')),
6662 (b'A', b'all', None, _(b'show status of all files')),
6662 (b'm', b'modified', None, _(b'show only modified files')),
6663 (b'm', b'modified', None, _(b'show only modified files')),
6663 (b'a', b'added', None, _(b'show only added files')),
6664 (b'a', b'added', None, _(b'show only added files')),
6664 (b'r', b'removed', None, _(b'show only removed files')),
6665 (b'r', b'removed', None, _(b'show only removed files')),
6665 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6666 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6666 (b'c', b'clean', None, _(b'show only files without changes')),
6667 (b'c', b'clean', None, _(b'show only files without changes')),
6667 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6668 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6668 (b'i', b'ignored', None, _(b'show only ignored files')),
6669 (b'i', b'ignored', None, _(b'show only ignored files')),
6669 (b'n', b'no-status', None, _(b'hide status prefix')),
6670 (b'n', b'no-status', None, _(b'hide status prefix')),
6670 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6671 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6671 (
6672 (
6672 b'C',
6673 b'C',
6673 b'copies',
6674 b'copies',
6674 None,
6675 None,
6675 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6676 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6676 ),
6677 ),
6677 (
6678 (
6678 b'0',
6679 b'0',
6679 b'print0',
6680 b'print0',
6680 None,
6681 None,
6681 _(b'end filenames with NUL, for use with xargs'),
6682 _(b'end filenames with NUL, for use with xargs'),
6682 ),
6683 ),
6683 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6684 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6684 (
6685 (
6685 b'',
6686 b'',
6686 b'change',
6687 b'change',
6687 b'',
6688 b'',
6688 _(b'list the changed files of a revision'),
6689 _(b'list the changed files of a revision'),
6689 _(b'REV'),
6690 _(b'REV'),
6690 ),
6691 ),
6691 ]
6692 ]
6692 + walkopts
6693 + walkopts
6693 + subrepoopts
6694 + subrepoopts
6694 + formatteropts,
6695 + formatteropts,
6695 _(b'[OPTION]... [FILE]...'),
6696 _(b'[OPTION]... [FILE]...'),
6696 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6697 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6697 helpbasic=True,
6698 helpbasic=True,
6698 inferrepo=True,
6699 inferrepo=True,
6699 intents={INTENT_READONLY},
6700 intents={INTENT_READONLY},
6700 )
6701 )
6701 def status(ui, repo, *pats, **opts):
6702 def status(ui, repo, *pats, **opts):
6702 """show changed files in the working directory
6703 """show changed files in the working directory
6703
6704
6704 Show status of files in the repository. If names are given, only
6705 Show status of files in the repository. If names are given, only
6705 files that match are shown. Files that are clean or ignored or
6706 files that match are shown. Files that are clean or ignored or
6706 the source of a copy/move operation, are not listed unless
6707 the source of a copy/move operation, are not listed unless
6707 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6708 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6708 Unless options described with "show only ..." are given, the
6709 Unless options described with "show only ..." are given, the
6709 options -mardu are used.
6710 options -mardu are used.
6710
6711
6711 Option -q/--quiet hides untracked (unknown and ignored) files
6712 Option -q/--quiet hides untracked (unknown and ignored) files
6712 unless explicitly requested with -u/--unknown or -i/--ignored.
6713 unless explicitly requested with -u/--unknown or -i/--ignored.
6713
6714
6714 .. note::
6715 .. note::
6715
6716
6716 :hg:`status` may appear to disagree with diff if permissions have
6717 :hg:`status` may appear to disagree with diff if permissions have
6717 changed or a merge has occurred. The standard diff format does
6718 changed or a merge has occurred. The standard diff format does
6718 not report permission changes and diff only reports changes
6719 not report permission changes and diff only reports changes
6719 relative to one merge parent.
6720 relative to one merge parent.
6720
6721
6721 If one revision is given, it is used as the base revision.
6722 If one revision is given, it is used as the base revision.
6722 If two revisions are given, the differences between them are
6723 If two revisions are given, the differences between them are
6723 shown. The --change option can also be used as a shortcut to list
6724 shown. The --change option can also be used as a shortcut to list
6724 the changed files of a revision from its first parent.
6725 the changed files of a revision from its first parent.
6725
6726
6726 The codes used to show the status of files are::
6727 The codes used to show the status of files are::
6727
6728
6728 M = modified
6729 M = modified
6729 A = added
6730 A = added
6730 R = removed
6731 R = removed
6731 C = clean
6732 C = clean
6732 ! = missing (deleted by non-hg command, but still tracked)
6733 ! = missing (deleted by non-hg command, but still tracked)
6733 ? = not tracked
6734 ? = not tracked
6734 I = ignored
6735 I = ignored
6735 = origin of the previous file (with --copies)
6736 = origin of the previous file (with --copies)
6736
6737
6737 .. container:: verbose
6738 .. container:: verbose
6738
6739
6739 The -t/--terse option abbreviates the output by showing only the directory
6740 The -t/--terse option abbreviates the output by showing only the directory
6740 name if all the files in it share the same status. The option takes an
6741 name if all the files in it share the same status. The option takes an
6741 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6742 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6742 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6743 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6743 for 'ignored' and 'c' for clean.
6744 for 'ignored' and 'c' for clean.
6744
6745
6745 It abbreviates only those statuses which are passed. Note that clean and
6746 It abbreviates only those statuses which are passed. Note that clean and
6746 ignored files are not displayed with '--terse ic' unless the -c/--clean
6747 ignored files are not displayed with '--terse ic' unless the -c/--clean
6747 and -i/--ignored options are also used.
6748 and -i/--ignored options are also used.
6748
6749
6749 The -v/--verbose option shows information when the repository is in an
6750 The -v/--verbose option shows information when the repository is in an
6750 unfinished merge, shelve, rebase state etc. You can have this behavior
6751 unfinished merge, shelve, rebase state etc. You can have this behavior
6751 turned on by default by enabling the ``commands.status.verbose`` option.
6752 turned on by default by enabling the ``commands.status.verbose`` option.
6752
6753
6753 You can skip displaying some of these states by setting
6754 You can skip displaying some of these states by setting
6754 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6755 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6755 'histedit', 'merge', 'rebase', or 'unshelve'.
6756 'histedit', 'merge', 'rebase', or 'unshelve'.
6756
6757
6757 Template:
6758 Template:
6758
6759
6759 The following keywords are supported in addition to the common template
6760 The following keywords are supported in addition to the common template
6760 keywords and functions. See also :hg:`help templates`.
6761 keywords and functions. See also :hg:`help templates`.
6761
6762
6762 :path: String. Repository-absolute path of the file.
6763 :path: String. Repository-absolute path of the file.
6763 :source: String. Repository-absolute path of the file originated from.
6764 :source: String. Repository-absolute path of the file originated from.
6764 Available if ``--copies`` is specified.
6765 Available if ``--copies`` is specified.
6765 :status: String. Character denoting file's status.
6766 :status: String. Character denoting file's status.
6766
6767
6767 Examples:
6768 Examples:
6768
6769
6769 - show changes in the working directory relative to a
6770 - show changes in the working directory relative to a
6770 changeset::
6771 changeset::
6771
6772
6772 hg status --rev 9353
6773 hg status --rev 9353
6773
6774
6774 - show changes in the working directory relative to the
6775 - show changes in the working directory relative to the
6775 current directory (see :hg:`help patterns` for more information)::
6776 current directory (see :hg:`help patterns` for more information)::
6776
6777
6777 hg status re:
6778 hg status re:
6778
6779
6779 - show all changes including copies in an existing changeset::
6780 - show all changes including copies in an existing changeset::
6780
6781
6781 hg status --copies --change 9353
6782 hg status --copies --change 9353
6782
6783
6783 - get a NUL separated list of added files, suitable for xargs::
6784 - get a NUL separated list of added files, suitable for xargs::
6784
6785
6785 hg status -an0
6786 hg status -an0
6786
6787
6787 - show more information about the repository status, abbreviating
6788 - show more information about the repository status, abbreviating
6788 added, removed, modified, deleted, and untracked paths::
6789 added, removed, modified, deleted, and untracked paths::
6789
6790
6790 hg status -v -t mardu
6791 hg status -v -t mardu
6791
6792
6792 Returns 0 on success.
6793 Returns 0 on success.
6793
6794
6794 """
6795 """
6795
6796
6796 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6797 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6797 opts = pycompat.byteskwargs(opts)
6798 opts = pycompat.byteskwargs(opts)
6798 revs = opts.get(b'rev')
6799 revs = opts.get(b'rev')
6799 change = opts.get(b'change')
6800 change = opts.get(b'change')
6800 terse = opts.get(b'terse')
6801 terse = opts.get(b'terse')
6801 if terse is _NOTTERSE:
6802 if terse is _NOTTERSE:
6802 if revs:
6803 if revs:
6803 terse = b''
6804 terse = b''
6804 else:
6805 else:
6805 terse = ui.config(b'commands', b'status.terse')
6806 terse = ui.config(b'commands', b'status.terse')
6806
6807
6807 if revs and terse:
6808 if revs and terse:
6808 msg = _(b'cannot use --terse with --rev')
6809 msg = _(b'cannot use --terse with --rev')
6809 raise error.Abort(msg)
6810 raise error.Abort(msg)
6810 elif change:
6811 elif change:
6811 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6812 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6812 ctx2 = scmutil.revsingle(repo, change, None)
6813 ctx2 = scmutil.revsingle(repo, change, None)
6813 ctx1 = ctx2.p1()
6814 ctx1 = ctx2.p1()
6814 else:
6815 else:
6815 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6816 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6816 ctx1, ctx2 = scmutil.revpair(repo, revs)
6817 ctx1, ctx2 = scmutil.revpair(repo, revs)
6817
6818
6818 forcerelativevalue = None
6819 forcerelativevalue = None
6819 if ui.hasconfig(b'commands', b'status.relative'):
6820 if ui.hasconfig(b'commands', b'status.relative'):
6820 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6821 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6821 uipathfn = scmutil.getuipathfn(
6822 uipathfn = scmutil.getuipathfn(
6822 repo,
6823 repo,
6823 legacyrelativevalue=bool(pats),
6824 legacyrelativevalue=bool(pats),
6824 forcerelativevalue=forcerelativevalue,
6825 forcerelativevalue=forcerelativevalue,
6825 )
6826 )
6826
6827
6827 if opts.get(b'print0'):
6828 if opts.get(b'print0'):
6828 end = b'\0'
6829 end = b'\0'
6829 else:
6830 else:
6830 end = b'\n'
6831 end = b'\n'
6831 states = b'modified added removed deleted unknown ignored clean'.split()
6832 states = b'modified added removed deleted unknown ignored clean'.split()
6832 show = [k for k in states if opts.get(k)]
6833 show = [k for k in states if opts.get(k)]
6833 if opts.get(b'all'):
6834 if opts.get(b'all'):
6834 show += ui.quiet and (states[:4] + [b'clean']) or states
6835 show += ui.quiet and (states[:4] + [b'clean']) or states
6835
6836
6836 if not show:
6837 if not show:
6837 if ui.quiet:
6838 if ui.quiet:
6838 show = states[:4]
6839 show = states[:4]
6839 else:
6840 else:
6840 show = states[:5]
6841 show = states[:5]
6841
6842
6842 m = scmutil.match(ctx2, pats, opts)
6843 m = scmutil.match(ctx2, pats, opts)
6843 if terse:
6844 if terse:
6844 # we need to compute clean and unknown to terse
6845 # we need to compute clean and unknown to terse
6845 stat = repo.status(
6846 stat = repo.status(
6846 ctx1.node(),
6847 ctx1.node(),
6847 ctx2.node(),
6848 ctx2.node(),
6848 m,
6849 m,
6849 b'ignored' in show or b'i' in terse,
6850 b'ignored' in show or b'i' in terse,
6850 clean=True,
6851 clean=True,
6851 unknown=True,
6852 unknown=True,
6852 listsubrepos=opts.get(b'subrepos'),
6853 listsubrepos=opts.get(b'subrepos'),
6853 )
6854 )
6854
6855
6855 stat = cmdutil.tersedir(stat, terse)
6856 stat = cmdutil.tersedir(stat, terse)
6856 else:
6857 else:
6857 stat = repo.status(
6858 stat = repo.status(
6858 ctx1.node(),
6859 ctx1.node(),
6859 ctx2.node(),
6860 ctx2.node(),
6860 m,
6861 m,
6861 b'ignored' in show,
6862 b'ignored' in show,
6862 b'clean' in show,
6863 b'clean' in show,
6863 b'unknown' in show,
6864 b'unknown' in show,
6864 opts.get(b'subrepos'),
6865 opts.get(b'subrepos'),
6865 )
6866 )
6866
6867
6867 changestates = zip(
6868 changestates = zip(
6868 states,
6869 states,
6869 pycompat.iterbytestr(b'MAR!?IC'),
6870 pycompat.iterbytestr(b'MAR!?IC'),
6870 [getattr(stat, s.decode('utf8')) for s in states],
6871 [getattr(stat, s.decode('utf8')) for s in states],
6871 )
6872 )
6872
6873
6873 copy = {}
6874 copy = {}
6874 if (
6875 if (
6875 opts.get(b'all')
6876 opts.get(b'all')
6876 or opts.get(b'copies')
6877 or opts.get(b'copies')
6877 or ui.configbool(b'ui', b'statuscopies')
6878 or ui.configbool(b'ui', b'statuscopies')
6878 ) and not opts.get(b'no_status'):
6879 ) and not opts.get(b'no_status'):
6879 copy = copies.pathcopies(ctx1, ctx2, m)
6880 copy = copies.pathcopies(ctx1, ctx2, m)
6880
6881
6881 morestatus = None
6882 morestatus = None
6882 if (
6883 if (
6883 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6884 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6884 ) and not ui.plain():
6885 ) and not ui.plain():
6885 morestatus = cmdutil.readmorestatus(repo)
6886 morestatus = cmdutil.readmorestatus(repo)
6886
6887
6887 ui.pager(b'status')
6888 ui.pager(b'status')
6888 fm = ui.formatter(b'status', opts)
6889 fm = ui.formatter(b'status', opts)
6889 fmt = b'%s' + end
6890 fmt = b'%s' + end
6890 showchar = not opts.get(b'no_status')
6891 showchar = not opts.get(b'no_status')
6891
6892
6892 for state, char, files in changestates:
6893 for state, char, files in changestates:
6893 if state in show:
6894 if state in show:
6894 label = b'status.' + state
6895 label = b'status.' + state
6895 for f in files:
6896 for f in files:
6896 fm.startitem()
6897 fm.startitem()
6897 fm.context(ctx=ctx2)
6898 fm.context(ctx=ctx2)
6898 fm.data(itemtype=b'file', path=f)
6899 fm.data(itemtype=b'file', path=f)
6899 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6900 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6900 fm.plain(fmt % uipathfn(f), label=label)
6901 fm.plain(fmt % uipathfn(f), label=label)
6901 if f in copy:
6902 if f in copy:
6902 fm.data(source=copy[f])
6903 fm.data(source=copy[f])
6903 fm.plain(
6904 fm.plain(
6904 (b' %s' + end) % uipathfn(copy[f]),
6905 (b' %s' + end) % uipathfn(copy[f]),
6905 label=b'status.copied',
6906 label=b'status.copied',
6906 )
6907 )
6907 if morestatus:
6908 if morestatus:
6908 morestatus.formatfile(f, fm)
6909 morestatus.formatfile(f, fm)
6909
6910
6910 if morestatus:
6911 if morestatus:
6911 morestatus.formatfooter(fm)
6912 morestatus.formatfooter(fm)
6912 fm.end()
6913 fm.end()
6913
6914
6914
6915
6915 @command(
6916 @command(
6916 b'summary|sum',
6917 b'summary|sum',
6917 [(b'', b'remote', None, _(b'check for push and pull'))],
6918 [(b'', b'remote', None, _(b'check for push and pull'))],
6918 b'[--remote]',
6919 b'[--remote]',
6919 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6920 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6920 helpbasic=True,
6921 helpbasic=True,
6921 intents={INTENT_READONLY},
6922 intents={INTENT_READONLY},
6922 )
6923 )
6923 def summary(ui, repo, **opts):
6924 def summary(ui, repo, **opts):
6924 """summarize working directory state
6925 """summarize working directory state
6925
6926
6926 This generates a brief summary of the working directory state,
6927 This generates a brief summary of the working directory state,
6927 including parents, branch, commit status, phase and available updates.
6928 including parents, branch, commit status, phase and available updates.
6928
6929
6929 With the --remote option, this will check the default paths for
6930 With the --remote option, this will check the default paths for
6930 incoming and outgoing changes. This can be time-consuming.
6931 incoming and outgoing changes. This can be time-consuming.
6931
6932
6932 Returns 0 on success.
6933 Returns 0 on success.
6933 """
6934 """
6934
6935
6935 opts = pycompat.byteskwargs(opts)
6936 opts = pycompat.byteskwargs(opts)
6936 ui.pager(b'summary')
6937 ui.pager(b'summary')
6937 ctx = repo[None]
6938 ctx = repo[None]
6938 parents = ctx.parents()
6939 parents = ctx.parents()
6939 pnode = parents[0].node()
6940 pnode = parents[0].node()
6940 marks = []
6941 marks = []
6941
6942
6942 try:
6943 try:
6943 ms = mergestatemod.mergestate.read(repo)
6944 ms = mergestatemod.mergestate.read(repo)
6944 except error.UnsupportedMergeRecords as e:
6945 except error.UnsupportedMergeRecords as e:
6945 s = b' '.join(e.recordtypes)
6946 s = b' '.join(e.recordtypes)
6946 ui.warn(
6947 ui.warn(
6947 _(b'warning: merge state has unsupported record types: %s\n') % s
6948 _(b'warning: merge state has unsupported record types: %s\n') % s
6948 )
6949 )
6949 unresolved = []
6950 unresolved = []
6950 else:
6951 else:
6951 unresolved = list(ms.unresolved())
6952 unresolved = list(ms.unresolved())
6952
6953
6953 for p in parents:
6954 for p in parents:
6954 # label with log.changeset (instead of log.parent) since this
6955 # label with log.changeset (instead of log.parent) since this
6955 # shows a working directory parent *changeset*:
6956 # shows a working directory parent *changeset*:
6956 # i18n: column positioning for "hg summary"
6957 # i18n: column positioning for "hg summary"
6957 ui.write(
6958 ui.write(
6958 _(b'parent: %d:%s ') % (p.rev(), p),
6959 _(b'parent: %d:%s ') % (p.rev(), p),
6959 label=logcmdutil.changesetlabels(p),
6960 label=logcmdutil.changesetlabels(p),
6960 )
6961 )
6961 ui.write(b' '.join(p.tags()), label=b'log.tag')
6962 ui.write(b' '.join(p.tags()), label=b'log.tag')
6962 if p.bookmarks():
6963 if p.bookmarks():
6963 marks.extend(p.bookmarks())
6964 marks.extend(p.bookmarks())
6964 if p.rev() == -1:
6965 if p.rev() == -1:
6965 if not len(repo):
6966 if not len(repo):
6966 ui.write(_(b' (empty repository)'))
6967 ui.write(_(b' (empty repository)'))
6967 else:
6968 else:
6968 ui.write(_(b' (no revision checked out)'))
6969 ui.write(_(b' (no revision checked out)'))
6969 if p.obsolete():
6970 if p.obsolete():
6970 ui.write(_(b' (obsolete)'))
6971 ui.write(_(b' (obsolete)'))
6971 if p.isunstable():
6972 if p.isunstable():
6972 instabilities = (
6973 instabilities = (
6973 ui.label(instability, b'trouble.%s' % instability)
6974 ui.label(instability, b'trouble.%s' % instability)
6974 for instability in p.instabilities()
6975 for instability in p.instabilities()
6975 )
6976 )
6976 ui.write(b' (' + b', '.join(instabilities) + b')')
6977 ui.write(b' (' + b', '.join(instabilities) + b')')
6977 ui.write(b'\n')
6978 ui.write(b'\n')
6978 if p.description():
6979 if p.description():
6979 ui.status(
6980 ui.status(
6980 b' ' + p.description().splitlines()[0].strip() + b'\n',
6981 b' ' + p.description().splitlines()[0].strip() + b'\n',
6981 label=b'log.summary',
6982 label=b'log.summary',
6982 )
6983 )
6983
6984
6984 branch = ctx.branch()
6985 branch = ctx.branch()
6985 bheads = repo.branchheads(branch)
6986 bheads = repo.branchheads(branch)
6986 # i18n: column positioning for "hg summary"
6987 # i18n: column positioning for "hg summary"
6987 m = _(b'branch: %s\n') % branch
6988 m = _(b'branch: %s\n') % branch
6988 if branch != b'default':
6989 if branch != b'default':
6989 ui.write(m, label=b'log.branch')
6990 ui.write(m, label=b'log.branch')
6990 else:
6991 else:
6991 ui.status(m, label=b'log.branch')
6992 ui.status(m, label=b'log.branch')
6992
6993
6993 if marks:
6994 if marks:
6994 active = repo._activebookmark
6995 active = repo._activebookmark
6995 # i18n: column positioning for "hg summary"
6996 # i18n: column positioning for "hg summary"
6996 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6997 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6997 if active is not None:
6998 if active is not None:
6998 if active in marks:
6999 if active in marks:
6999 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7000 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7000 marks.remove(active)
7001 marks.remove(active)
7001 else:
7002 else:
7002 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7003 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7003 for m in marks:
7004 for m in marks:
7004 ui.write(b' ' + m, label=b'log.bookmark')
7005 ui.write(b' ' + m, label=b'log.bookmark')
7005 ui.write(b'\n', label=b'log.bookmark')
7006 ui.write(b'\n', label=b'log.bookmark')
7006
7007
7007 status = repo.status(unknown=True)
7008 status = repo.status(unknown=True)
7008
7009
7009 c = repo.dirstate.copies()
7010 c = repo.dirstate.copies()
7010 copied, renamed = [], []
7011 copied, renamed = [], []
7011 for d, s in pycompat.iteritems(c):
7012 for d, s in pycompat.iteritems(c):
7012 if s in status.removed:
7013 if s in status.removed:
7013 status.removed.remove(s)
7014 status.removed.remove(s)
7014 renamed.append(d)
7015 renamed.append(d)
7015 else:
7016 else:
7016 copied.append(d)
7017 copied.append(d)
7017 if d in status.added:
7018 if d in status.added:
7018 status.added.remove(d)
7019 status.added.remove(d)
7019
7020
7020 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7021 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7021
7022
7022 labels = [
7023 labels = [
7023 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7024 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7024 (ui.label(_(b'%d added'), b'status.added'), status.added),
7025 (ui.label(_(b'%d added'), b'status.added'), status.added),
7025 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7026 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7026 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7027 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7027 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7028 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7028 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7029 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7029 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7030 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7030 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7031 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7031 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7032 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7032 ]
7033 ]
7033 t = []
7034 t = []
7034 for l, s in labels:
7035 for l, s in labels:
7035 if s:
7036 if s:
7036 t.append(l % len(s))
7037 t.append(l % len(s))
7037
7038
7038 t = b', '.join(t)
7039 t = b', '.join(t)
7039 cleanworkdir = False
7040 cleanworkdir = False
7040
7041
7041 if repo.vfs.exists(b'graftstate'):
7042 if repo.vfs.exists(b'graftstate'):
7042 t += _(b' (graft in progress)')
7043 t += _(b' (graft in progress)')
7043 if repo.vfs.exists(b'updatestate'):
7044 if repo.vfs.exists(b'updatestate'):
7044 t += _(b' (interrupted update)')
7045 t += _(b' (interrupted update)')
7045 elif len(parents) > 1:
7046 elif len(parents) > 1:
7046 t += _(b' (merge)')
7047 t += _(b' (merge)')
7047 elif branch != parents[0].branch():
7048 elif branch != parents[0].branch():
7048 t += _(b' (new branch)')
7049 t += _(b' (new branch)')
7049 elif parents[0].closesbranch() and pnode in repo.branchheads(
7050 elif parents[0].closesbranch() and pnode in repo.branchheads(
7050 branch, closed=True
7051 branch, closed=True
7051 ):
7052 ):
7052 t += _(b' (head closed)')
7053 t += _(b' (head closed)')
7053 elif not (
7054 elif not (
7054 status.modified
7055 status.modified
7055 or status.added
7056 or status.added
7056 or status.removed
7057 or status.removed
7057 or renamed
7058 or renamed
7058 or copied
7059 or copied
7059 or subs
7060 or subs
7060 ):
7061 ):
7061 t += _(b' (clean)')
7062 t += _(b' (clean)')
7062 cleanworkdir = True
7063 cleanworkdir = True
7063 elif pnode not in bheads:
7064 elif pnode not in bheads:
7064 t += _(b' (new branch head)')
7065 t += _(b' (new branch head)')
7065
7066
7066 if parents:
7067 if parents:
7067 pendingphase = max(p.phase() for p in parents)
7068 pendingphase = max(p.phase() for p in parents)
7068 else:
7069 else:
7069 pendingphase = phases.public
7070 pendingphase = phases.public
7070
7071
7071 if pendingphase > phases.newcommitphase(ui):
7072 if pendingphase > phases.newcommitphase(ui):
7072 t += b' (%s)' % phases.phasenames[pendingphase]
7073 t += b' (%s)' % phases.phasenames[pendingphase]
7073
7074
7074 if cleanworkdir:
7075 if cleanworkdir:
7075 # i18n: column positioning for "hg summary"
7076 # i18n: column positioning for "hg summary"
7076 ui.status(_(b'commit: %s\n') % t.strip())
7077 ui.status(_(b'commit: %s\n') % t.strip())
7077 else:
7078 else:
7078 # i18n: column positioning for "hg summary"
7079 # i18n: column positioning for "hg summary"
7079 ui.write(_(b'commit: %s\n') % t.strip())
7080 ui.write(_(b'commit: %s\n') % t.strip())
7080
7081
7081 # all ancestors of branch heads - all ancestors of parent = new csets
7082 # all ancestors of branch heads - all ancestors of parent = new csets
7082 new = len(
7083 new = len(
7083 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7084 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7084 )
7085 )
7085
7086
7086 if new == 0:
7087 if new == 0:
7087 # i18n: column positioning for "hg summary"
7088 # i18n: column positioning for "hg summary"
7088 ui.status(_(b'update: (current)\n'))
7089 ui.status(_(b'update: (current)\n'))
7089 elif pnode not in bheads:
7090 elif pnode not in bheads:
7090 # i18n: column positioning for "hg summary"
7091 # i18n: column positioning for "hg summary"
7091 ui.write(_(b'update: %d new changesets (update)\n') % new)
7092 ui.write(_(b'update: %d new changesets (update)\n') % new)
7092 else:
7093 else:
7093 # i18n: column positioning for "hg summary"
7094 # i18n: column positioning for "hg summary"
7094 ui.write(
7095 ui.write(
7095 _(b'update: %d new changesets, %d branch heads (merge)\n')
7096 _(b'update: %d new changesets, %d branch heads (merge)\n')
7096 % (new, len(bheads))
7097 % (new, len(bheads))
7097 )
7098 )
7098
7099
7099 t = []
7100 t = []
7100 draft = len(repo.revs(b'draft()'))
7101 draft = len(repo.revs(b'draft()'))
7101 if draft:
7102 if draft:
7102 t.append(_(b'%d draft') % draft)
7103 t.append(_(b'%d draft') % draft)
7103 secret = len(repo.revs(b'secret()'))
7104 secret = len(repo.revs(b'secret()'))
7104 if secret:
7105 if secret:
7105 t.append(_(b'%d secret') % secret)
7106 t.append(_(b'%d secret') % secret)
7106
7107
7107 if draft or secret:
7108 if draft or secret:
7108 ui.status(_(b'phases: %s\n') % b', '.join(t))
7109 ui.status(_(b'phases: %s\n') % b', '.join(t))
7109
7110
7110 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7111 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7111 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7112 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7112 numtrouble = len(repo.revs(trouble + b"()"))
7113 numtrouble = len(repo.revs(trouble + b"()"))
7113 # We write all the possibilities to ease translation
7114 # We write all the possibilities to ease translation
7114 troublemsg = {
7115 troublemsg = {
7115 b"orphan": _(b"orphan: %d changesets"),
7116 b"orphan": _(b"orphan: %d changesets"),
7116 b"contentdivergent": _(b"content-divergent: %d changesets"),
7117 b"contentdivergent": _(b"content-divergent: %d changesets"),
7117 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7118 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7118 }
7119 }
7119 if numtrouble > 0:
7120 if numtrouble > 0:
7120 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7121 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7121
7122
7122 cmdutil.summaryhooks(ui, repo)
7123 cmdutil.summaryhooks(ui, repo)
7123
7124
7124 if opts.get(b'remote'):
7125 if opts.get(b'remote'):
7125 needsincoming, needsoutgoing = True, True
7126 needsincoming, needsoutgoing = True, True
7126 else:
7127 else:
7127 needsincoming, needsoutgoing = False, False
7128 needsincoming, needsoutgoing = False, False
7128 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7129 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7129 if i:
7130 if i:
7130 needsincoming = True
7131 needsincoming = True
7131 if o:
7132 if o:
7132 needsoutgoing = True
7133 needsoutgoing = True
7133 if not needsincoming and not needsoutgoing:
7134 if not needsincoming and not needsoutgoing:
7134 return
7135 return
7135
7136
7136 def getincoming():
7137 def getincoming():
7137 source, branches = hg.parseurl(ui.expandpath(b'default'))
7138 source, branches = hg.parseurl(ui.expandpath(b'default'))
7138 sbranch = branches[0]
7139 sbranch = branches[0]
7139 try:
7140 try:
7140 other = hg.peer(repo, {}, source)
7141 other = hg.peer(repo, {}, source)
7141 except error.RepoError:
7142 except error.RepoError:
7142 if opts.get(b'remote'):
7143 if opts.get(b'remote'):
7143 raise
7144 raise
7144 return source, sbranch, None, None, None
7145 return source, sbranch, None, None, None
7145 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7146 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7146 if revs:
7147 if revs:
7147 revs = [other.lookup(rev) for rev in revs]
7148 revs = [other.lookup(rev) for rev in revs]
7148 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7149 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7149 repo.ui.pushbuffer()
7150 repo.ui.pushbuffer()
7150 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7151 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7151 repo.ui.popbuffer()
7152 repo.ui.popbuffer()
7152 return source, sbranch, other, commoninc, commoninc[1]
7153 return source, sbranch, other, commoninc, commoninc[1]
7153
7154
7154 if needsincoming:
7155 if needsincoming:
7155 source, sbranch, sother, commoninc, incoming = getincoming()
7156 source, sbranch, sother, commoninc, incoming = getincoming()
7156 else:
7157 else:
7157 source = sbranch = sother = commoninc = incoming = None
7158 source = sbranch = sother = commoninc = incoming = None
7158
7159
7159 def getoutgoing():
7160 def getoutgoing():
7160 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7161 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7161 dbranch = branches[0]
7162 dbranch = branches[0]
7162 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7163 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7163 if source != dest:
7164 if source != dest:
7164 try:
7165 try:
7165 dother = hg.peer(repo, {}, dest)
7166 dother = hg.peer(repo, {}, dest)
7166 except error.RepoError:
7167 except error.RepoError:
7167 if opts.get(b'remote'):
7168 if opts.get(b'remote'):
7168 raise
7169 raise
7169 return dest, dbranch, None, None
7170 return dest, dbranch, None, None
7170 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7171 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7171 elif sother is None:
7172 elif sother is None:
7172 # there is no explicit destination peer, but source one is invalid
7173 # there is no explicit destination peer, but source one is invalid
7173 return dest, dbranch, None, None
7174 return dest, dbranch, None, None
7174 else:
7175 else:
7175 dother = sother
7176 dother = sother
7176 if source != dest or (sbranch is not None and sbranch != dbranch):
7177 if source != dest or (sbranch is not None and sbranch != dbranch):
7177 common = None
7178 common = None
7178 else:
7179 else:
7179 common = commoninc
7180 common = commoninc
7180 if revs:
7181 if revs:
7181 revs = [repo.lookup(rev) for rev in revs]
7182 revs = [repo.lookup(rev) for rev in revs]
7182 repo.ui.pushbuffer()
7183 repo.ui.pushbuffer()
7183 outgoing = discovery.findcommonoutgoing(
7184 outgoing = discovery.findcommonoutgoing(
7184 repo, dother, onlyheads=revs, commoninc=common
7185 repo, dother, onlyheads=revs, commoninc=common
7185 )
7186 )
7186 repo.ui.popbuffer()
7187 repo.ui.popbuffer()
7187 return dest, dbranch, dother, outgoing
7188 return dest, dbranch, dother, outgoing
7188
7189
7189 if needsoutgoing:
7190 if needsoutgoing:
7190 dest, dbranch, dother, outgoing = getoutgoing()
7191 dest, dbranch, dother, outgoing = getoutgoing()
7191 else:
7192 else:
7192 dest = dbranch = dother = outgoing = None
7193 dest = dbranch = dother = outgoing = None
7193
7194
7194 if opts.get(b'remote'):
7195 if opts.get(b'remote'):
7195 t = []
7196 t = []
7196 if incoming:
7197 if incoming:
7197 t.append(_(b'1 or more incoming'))
7198 t.append(_(b'1 or more incoming'))
7198 o = outgoing.missing
7199 o = outgoing.missing
7199 if o:
7200 if o:
7200 t.append(_(b'%d outgoing') % len(o))
7201 t.append(_(b'%d outgoing') % len(o))
7201 other = dother or sother
7202 other = dother or sother
7202 if b'bookmarks' in other.listkeys(b'namespaces'):
7203 if b'bookmarks' in other.listkeys(b'namespaces'):
7203 counts = bookmarks.summary(repo, other)
7204 counts = bookmarks.summary(repo, other)
7204 if counts[0] > 0:
7205 if counts[0] > 0:
7205 t.append(_(b'%d incoming bookmarks') % counts[0])
7206 t.append(_(b'%d incoming bookmarks') % counts[0])
7206 if counts[1] > 0:
7207 if counts[1] > 0:
7207 t.append(_(b'%d outgoing bookmarks') % counts[1])
7208 t.append(_(b'%d outgoing bookmarks') % counts[1])
7208
7209
7209 if t:
7210 if t:
7210 # i18n: column positioning for "hg summary"
7211 # i18n: column positioning for "hg summary"
7211 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7212 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7212 else:
7213 else:
7213 # i18n: column positioning for "hg summary"
7214 # i18n: column positioning for "hg summary"
7214 ui.status(_(b'remote: (synced)\n'))
7215 ui.status(_(b'remote: (synced)\n'))
7215
7216
7216 cmdutil.summaryremotehooks(
7217 cmdutil.summaryremotehooks(
7217 ui,
7218 ui,
7218 repo,
7219 repo,
7219 opts,
7220 opts,
7220 (
7221 (
7221 (source, sbranch, sother, commoninc),
7222 (source, sbranch, sother, commoninc),
7222 (dest, dbranch, dother, outgoing),
7223 (dest, dbranch, dother, outgoing),
7223 ),
7224 ),
7224 )
7225 )
7225
7226
7226
7227
7227 @command(
7228 @command(
7228 b'tag',
7229 b'tag',
7229 [
7230 [
7230 (b'f', b'force', None, _(b'force tag')),
7231 (b'f', b'force', None, _(b'force tag')),
7231 (b'l', b'local', None, _(b'make the tag local')),
7232 (b'l', b'local', None, _(b'make the tag local')),
7232 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7233 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7233 (b'', b'remove', None, _(b'remove a tag')),
7234 (b'', b'remove', None, _(b'remove a tag')),
7234 # -l/--local is already there, commitopts cannot be used
7235 # -l/--local is already there, commitopts cannot be used
7235 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7236 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7236 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7237 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7237 ]
7238 ]
7238 + commitopts2,
7239 + commitopts2,
7239 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7240 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7240 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7241 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7241 )
7242 )
7242 def tag(ui, repo, name1, *names, **opts):
7243 def tag(ui, repo, name1, *names, **opts):
7243 """add one or more tags for the current or given revision
7244 """add one or more tags for the current or given revision
7244
7245
7245 Name a particular revision using <name>.
7246 Name a particular revision using <name>.
7246
7247
7247 Tags are used to name particular revisions of the repository and are
7248 Tags are used to name particular revisions of the repository and are
7248 very useful to compare different revisions, to go back to significant
7249 very useful to compare different revisions, to go back to significant
7249 earlier versions or to mark branch points as releases, etc. Changing
7250 earlier versions or to mark branch points as releases, etc. Changing
7250 an existing tag is normally disallowed; use -f/--force to override.
7251 an existing tag is normally disallowed; use -f/--force to override.
7251
7252
7252 If no revision is given, the parent of the working directory is
7253 If no revision is given, the parent of the working directory is
7253 used.
7254 used.
7254
7255
7255 To facilitate version control, distribution, and merging of tags,
7256 To facilitate version control, distribution, and merging of tags,
7256 they are stored as a file named ".hgtags" which is managed similarly
7257 they are stored as a file named ".hgtags" which is managed similarly
7257 to other project files and can be hand-edited if necessary. This
7258 to other project files and can be hand-edited if necessary. This
7258 also means that tagging creates a new commit. The file
7259 also means that tagging creates a new commit. The file
7259 ".hg/localtags" is used for local tags (not shared among
7260 ".hg/localtags" is used for local tags (not shared among
7260 repositories).
7261 repositories).
7261
7262
7262 Tag commits are usually made at the head of a branch. If the parent
7263 Tag commits are usually made at the head of a branch. If the parent
7263 of the working directory is not a branch head, :hg:`tag` aborts; use
7264 of the working directory is not a branch head, :hg:`tag` aborts; use
7264 -f/--force to force the tag commit to be based on a non-head
7265 -f/--force to force the tag commit to be based on a non-head
7265 changeset.
7266 changeset.
7266
7267
7267 See :hg:`help dates` for a list of formats valid for -d/--date.
7268 See :hg:`help dates` for a list of formats valid for -d/--date.
7268
7269
7269 Since tag names have priority over branch names during revision
7270 Since tag names have priority over branch names during revision
7270 lookup, using an existing branch name as a tag name is discouraged.
7271 lookup, using an existing branch name as a tag name is discouraged.
7271
7272
7272 Returns 0 on success.
7273 Returns 0 on success.
7273 """
7274 """
7274 opts = pycompat.byteskwargs(opts)
7275 opts = pycompat.byteskwargs(opts)
7275 with repo.wlock(), repo.lock():
7276 with repo.wlock(), repo.lock():
7276 rev_ = b"."
7277 rev_ = b"."
7277 names = [t.strip() for t in (name1,) + names]
7278 names = [t.strip() for t in (name1,) + names]
7278 if len(names) != len(set(names)):
7279 if len(names) != len(set(names)):
7279 raise error.Abort(_(b'tag names must be unique'))
7280 raise error.Abort(_(b'tag names must be unique'))
7280 for n in names:
7281 for n in names:
7281 scmutil.checknewlabel(repo, n, b'tag')
7282 scmutil.checknewlabel(repo, n, b'tag')
7282 if not n:
7283 if not n:
7283 raise error.Abort(
7284 raise error.Abort(
7284 _(b'tag names cannot consist entirely of whitespace')
7285 _(b'tag names cannot consist entirely of whitespace')
7285 )
7286 )
7286 if opts.get(b'rev') and opts.get(b'remove'):
7287 if opts.get(b'rev') and opts.get(b'remove'):
7287 raise error.Abort(_(b"--rev and --remove are incompatible"))
7288 raise error.Abort(_(b"--rev and --remove are incompatible"))
7288 if opts.get(b'rev'):
7289 if opts.get(b'rev'):
7289 rev_ = opts[b'rev']
7290 rev_ = opts[b'rev']
7290 message = opts.get(b'message')
7291 message = opts.get(b'message')
7291 if opts.get(b'remove'):
7292 if opts.get(b'remove'):
7292 if opts.get(b'local'):
7293 if opts.get(b'local'):
7293 expectedtype = b'local'
7294 expectedtype = b'local'
7294 else:
7295 else:
7295 expectedtype = b'global'
7296 expectedtype = b'global'
7296
7297
7297 for n in names:
7298 for n in names:
7298 if repo.tagtype(n) == b'global':
7299 if repo.tagtype(n) == b'global':
7299 alltags = tagsmod.findglobaltags(ui, repo)
7300 alltags = tagsmod.findglobaltags(ui, repo)
7300 if alltags[n][0] == nullid:
7301 if alltags[n][0] == nullid:
7301 raise error.Abort(_(b"tag '%s' is already removed") % n)
7302 raise error.Abort(_(b"tag '%s' is already removed") % n)
7302 if not repo.tagtype(n):
7303 if not repo.tagtype(n):
7303 raise error.Abort(_(b"tag '%s' does not exist") % n)
7304 raise error.Abort(_(b"tag '%s' does not exist") % n)
7304 if repo.tagtype(n) != expectedtype:
7305 if repo.tagtype(n) != expectedtype:
7305 if expectedtype == b'global':
7306 if expectedtype == b'global':
7306 raise error.Abort(
7307 raise error.Abort(
7307 _(b"tag '%s' is not a global tag") % n
7308 _(b"tag '%s' is not a global tag") % n
7308 )
7309 )
7309 else:
7310 else:
7310 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7311 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7311 rev_ = b'null'
7312 rev_ = b'null'
7312 if not message:
7313 if not message:
7313 # we don't translate commit messages
7314 # we don't translate commit messages
7314 message = b'Removed tag %s' % b', '.join(names)
7315 message = b'Removed tag %s' % b', '.join(names)
7315 elif not opts.get(b'force'):
7316 elif not opts.get(b'force'):
7316 for n in names:
7317 for n in names:
7317 if n in repo.tags():
7318 if n in repo.tags():
7318 raise error.Abort(
7319 raise error.Abort(
7319 _(b"tag '%s' already exists (use -f to force)") % n
7320 _(b"tag '%s' already exists (use -f to force)") % n
7320 )
7321 )
7321 if not opts.get(b'local'):
7322 if not opts.get(b'local'):
7322 p1, p2 = repo.dirstate.parents()
7323 p1, p2 = repo.dirstate.parents()
7323 if p2 != nullid:
7324 if p2 != nullid:
7324 raise error.Abort(_(b'uncommitted merge'))
7325 raise error.Abort(_(b'uncommitted merge'))
7325 bheads = repo.branchheads()
7326 bheads = repo.branchheads()
7326 if not opts.get(b'force') and bheads and p1 not in bheads:
7327 if not opts.get(b'force') and bheads and p1 not in bheads:
7327 raise error.Abort(
7328 raise error.Abort(
7328 _(
7329 _(
7329 b'working directory is not at a branch head '
7330 b'working directory is not at a branch head '
7330 b'(use -f to force)'
7331 b'(use -f to force)'
7331 )
7332 )
7332 )
7333 )
7333 node = scmutil.revsingle(repo, rev_).node()
7334 node = scmutil.revsingle(repo, rev_).node()
7334
7335
7335 if not message:
7336 if not message:
7336 # we don't translate commit messages
7337 # we don't translate commit messages
7337 message = b'Added tag %s for changeset %s' % (
7338 message = b'Added tag %s for changeset %s' % (
7338 b', '.join(names),
7339 b', '.join(names),
7339 short(node),
7340 short(node),
7340 )
7341 )
7341
7342
7342 date = opts.get(b'date')
7343 date = opts.get(b'date')
7343 if date:
7344 if date:
7344 date = dateutil.parsedate(date)
7345 date = dateutil.parsedate(date)
7345
7346
7346 if opts.get(b'remove'):
7347 if opts.get(b'remove'):
7347 editform = b'tag.remove'
7348 editform = b'tag.remove'
7348 else:
7349 else:
7349 editform = b'tag.add'
7350 editform = b'tag.add'
7350 editor = cmdutil.getcommiteditor(
7351 editor = cmdutil.getcommiteditor(
7351 editform=editform, **pycompat.strkwargs(opts)
7352 editform=editform, **pycompat.strkwargs(opts)
7352 )
7353 )
7353
7354
7354 # don't allow tagging the null rev
7355 # don't allow tagging the null rev
7355 if (
7356 if (
7356 not opts.get(b'remove')
7357 not opts.get(b'remove')
7357 and scmutil.revsingle(repo, rev_).rev() == nullrev
7358 and scmutil.revsingle(repo, rev_).rev() == nullrev
7358 ):
7359 ):
7359 raise error.Abort(_(b"cannot tag null revision"))
7360 raise error.Abort(_(b"cannot tag null revision"))
7360
7361
7361 tagsmod.tag(
7362 tagsmod.tag(
7362 repo,
7363 repo,
7363 names,
7364 names,
7364 node,
7365 node,
7365 message,
7366 message,
7366 opts.get(b'local'),
7367 opts.get(b'local'),
7367 opts.get(b'user'),
7368 opts.get(b'user'),
7368 date,
7369 date,
7369 editor=editor,
7370 editor=editor,
7370 )
7371 )
7371
7372
7372
7373
7373 @command(
7374 @command(
7374 b'tags',
7375 b'tags',
7375 formatteropts,
7376 formatteropts,
7376 b'',
7377 b'',
7377 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7378 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7378 intents={INTENT_READONLY},
7379 intents={INTENT_READONLY},
7379 )
7380 )
7380 def tags(ui, repo, **opts):
7381 def tags(ui, repo, **opts):
7381 """list repository tags
7382 """list repository tags
7382
7383
7383 This lists both regular and local tags. When the -v/--verbose
7384 This lists both regular and local tags. When the -v/--verbose
7384 switch is used, a third column "local" is printed for local tags.
7385 switch is used, a third column "local" is printed for local tags.
7385 When the -q/--quiet switch is used, only the tag name is printed.
7386 When the -q/--quiet switch is used, only the tag name is printed.
7386
7387
7387 .. container:: verbose
7388 .. container:: verbose
7388
7389
7389 Template:
7390 Template:
7390
7391
7391 The following keywords are supported in addition to the common template
7392 The following keywords are supported in addition to the common template
7392 keywords and functions such as ``{tag}``. See also
7393 keywords and functions such as ``{tag}``. See also
7393 :hg:`help templates`.
7394 :hg:`help templates`.
7394
7395
7395 :type: String. ``local`` for local tags.
7396 :type: String. ``local`` for local tags.
7396
7397
7397 Returns 0 on success.
7398 Returns 0 on success.
7398 """
7399 """
7399
7400
7400 opts = pycompat.byteskwargs(opts)
7401 opts = pycompat.byteskwargs(opts)
7401 ui.pager(b'tags')
7402 ui.pager(b'tags')
7402 fm = ui.formatter(b'tags', opts)
7403 fm = ui.formatter(b'tags', opts)
7403 hexfunc = fm.hexfunc
7404 hexfunc = fm.hexfunc
7404
7405
7405 for t, n in reversed(repo.tagslist()):
7406 for t, n in reversed(repo.tagslist()):
7406 hn = hexfunc(n)
7407 hn = hexfunc(n)
7407 label = b'tags.normal'
7408 label = b'tags.normal'
7408 tagtype = b''
7409 tagtype = b''
7409 if repo.tagtype(t) == b'local':
7410 if repo.tagtype(t) == b'local':
7410 label = b'tags.local'
7411 label = b'tags.local'
7411 tagtype = b'local'
7412 tagtype = b'local'
7412
7413
7413 fm.startitem()
7414 fm.startitem()
7414 fm.context(repo=repo)
7415 fm.context(repo=repo)
7415 fm.write(b'tag', b'%s', t, label=label)
7416 fm.write(b'tag', b'%s', t, label=label)
7416 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7417 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7417 fm.condwrite(
7418 fm.condwrite(
7418 not ui.quiet,
7419 not ui.quiet,
7419 b'rev node',
7420 b'rev node',
7420 fmt,
7421 fmt,
7421 repo.changelog.rev(n),
7422 repo.changelog.rev(n),
7422 hn,
7423 hn,
7423 label=label,
7424 label=label,
7424 )
7425 )
7425 fm.condwrite(
7426 fm.condwrite(
7426 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7427 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7427 )
7428 )
7428 fm.plain(b'\n')
7429 fm.plain(b'\n')
7429 fm.end()
7430 fm.end()
7430
7431
7431
7432
7432 @command(
7433 @command(
7433 b'tip',
7434 b'tip',
7434 [
7435 [
7435 (b'p', b'patch', None, _(b'show patch')),
7436 (b'p', b'patch', None, _(b'show patch')),
7436 (b'g', b'git', None, _(b'use git extended diff format')),
7437 (b'g', b'git', None, _(b'use git extended diff format')),
7437 ]
7438 ]
7438 + templateopts,
7439 + templateopts,
7439 _(b'[-p] [-g]'),
7440 _(b'[-p] [-g]'),
7440 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7441 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7441 )
7442 )
7442 def tip(ui, repo, **opts):
7443 def tip(ui, repo, **opts):
7443 """show the tip revision (DEPRECATED)
7444 """show the tip revision (DEPRECATED)
7444
7445
7445 The tip revision (usually just called the tip) is the changeset
7446 The tip revision (usually just called the tip) is the changeset
7446 most recently added to the repository (and therefore the most
7447 most recently added to the repository (and therefore the most
7447 recently changed head).
7448 recently changed head).
7448
7449
7449 If you have just made a commit, that commit will be the tip. If
7450 If you have just made a commit, that commit will be the tip. If
7450 you have just pulled changes from another repository, the tip of
7451 you have just pulled changes from another repository, the tip of
7451 that repository becomes the current tip. The "tip" tag is special
7452 that repository becomes the current tip. The "tip" tag is special
7452 and cannot be renamed or assigned to a different changeset.
7453 and cannot be renamed or assigned to a different changeset.
7453
7454
7454 This command is deprecated, please use :hg:`heads` instead.
7455 This command is deprecated, please use :hg:`heads` instead.
7455
7456
7456 Returns 0 on success.
7457 Returns 0 on success.
7457 """
7458 """
7458 opts = pycompat.byteskwargs(opts)
7459 opts = pycompat.byteskwargs(opts)
7459 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7460 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7460 displayer.show(repo[b'tip'])
7461 displayer.show(repo[b'tip'])
7461 displayer.close()
7462 displayer.close()
7462
7463
7463
7464
7464 @command(
7465 @command(
7465 b'unbundle',
7466 b'unbundle',
7466 [
7467 [
7467 (
7468 (
7468 b'u',
7469 b'u',
7469 b'update',
7470 b'update',
7470 None,
7471 None,
7471 _(b'update to new branch head if changesets were unbundled'),
7472 _(b'update to new branch head if changesets were unbundled'),
7472 )
7473 )
7473 ],
7474 ],
7474 _(b'[-u] FILE...'),
7475 _(b'[-u] FILE...'),
7475 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7476 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7476 )
7477 )
7477 def unbundle(ui, repo, fname1, *fnames, **opts):
7478 def unbundle(ui, repo, fname1, *fnames, **opts):
7478 """apply one or more bundle files
7479 """apply one or more bundle files
7479
7480
7480 Apply one or more bundle files generated by :hg:`bundle`.
7481 Apply one or more bundle files generated by :hg:`bundle`.
7481
7482
7482 Returns 0 on success, 1 if an update has unresolved files.
7483 Returns 0 on success, 1 if an update has unresolved files.
7483 """
7484 """
7484 fnames = (fname1,) + fnames
7485 fnames = (fname1,) + fnames
7485
7486
7486 with repo.lock():
7487 with repo.lock():
7487 for fname in fnames:
7488 for fname in fnames:
7488 f = hg.openpath(ui, fname)
7489 f = hg.openpath(ui, fname)
7489 gen = exchange.readbundle(ui, f, fname)
7490 gen = exchange.readbundle(ui, f, fname)
7490 if isinstance(gen, streamclone.streamcloneapplier):
7491 if isinstance(gen, streamclone.streamcloneapplier):
7491 raise error.Abort(
7492 raise error.Abort(
7492 _(
7493 _(
7493 b'packed bundles cannot be applied with '
7494 b'packed bundles cannot be applied with '
7494 b'"hg unbundle"'
7495 b'"hg unbundle"'
7495 ),
7496 ),
7496 hint=_(b'use "hg debugapplystreamclonebundle"'),
7497 hint=_(b'use "hg debugapplystreamclonebundle"'),
7497 )
7498 )
7498 url = b'bundle:' + fname
7499 url = b'bundle:' + fname
7499 try:
7500 try:
7500 txnname = b'unbundle'
7501 txnname = b'unbundle'
7501 if not isinstance(gen, bundle2.unbundle20):
7502 if not isinstance(gen, bundle2.unbundle20):
7502 txnname = b'unbundle\n%s' % util.hidepassword(url)
7503 txnname = b'unbundle\n%s' % util.hidepassword(url)
7503 with repo.transaction(txnname) as tr:
7504 with repo.transaction(txnname) as tr:
7504 op = bundle2.applybundle(
7505 op = bundle2.applybundle(
7505 repo, gen, tr, source=b'unbundle', url=url
7506 repo, gen, tr, source=b'unbundle', url=url
7506 )
7507 )
7507 except error.BundleUnknownFeatureError as exc:
7508 except error.BundleUnknownFeatureError as exc:
7508 raise error.Abort(
7509 raise error.Abort(
7509 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7510 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7510 hint=_(
7511 hint=_(
7511 b"see https://mercurial-scm.org/"
7512 b"see https://mercurial-scm.org/"
7512 b"wiki/BundleFeature for more "
7513 b"wiki/BundleFeature for more "
7513 b"information"
7514 b"information"
7514 ),
7515 ),
7515 )
7516 )
7516 modheads = bundle2.combinechangegroupresults(op)
7517 modheads = bundle2.combinechangegroupresults(op)
7517
7518
7518 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7519 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7519
7520
7520
7521
7521 @command(
7522 @command(
7522 b'unshelve',
7523 b'unshelve',
7523 [
7524 [
7524 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7525 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7525 (
7526 (
7526 b'c',
7527 b'c',
7527 b'continue',
7528 b'continue',
7528 None,
7529 None,
7529 _(b'continue an incomplete unshelve operation'),
7530 _(b'continue an incomplete unshelve operation'),
7530 ),
7531 ),
7531 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7532 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7532 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7533 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7533 (
7534 (
7534 b'n',
7535 b'n',
7535 b'name',
7536 b'name',
7536 b'',
7537 b'',
7537 _(b'restore shelved change with given name'),
7538 _(b'restore shelved change with given name'),
7538 _(b'NAME'),
7539 _(b'NAME'),
7539 ),
7540 ),
7540 (b't', b'tool', b'', _(b'specify merge tool')),
7541 (b't', b'tool', b'', _(b'specify merge tool')),
7541 (
7542 (
7542 b'',
7543 b'',
7543 b'date',
7544 b'date',
7544 b'',
7545 b'',
7545 _(b'set date for temporary commits (DEPRECATED)'),
7546 _(b'set date for temporary commits (DEPRECATED)'),
7546 _(b'DATE'),
7547 _(b'DATE'),
7547 ),
7548 ),
7548 ],
7549 ],
7549 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7550 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7550 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7551 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7551 )
7552 )
7552 def unshelve(ui, repo, *shelved, **opts):
7553 def unshelve(ui, repo, *shelved, **opts):
7553 """restore a shelved change to the working directory
7554 """restore a shelved change to the working directory
7554
7555
7555 This command accepts an optional name of a shelved change to
7556 This command accepts an optional name of a shelved change to
7556 restore. If none is given, the most recent shelved change is used.
7557 restore. If none is given, the most recent shelved change is used.
7557
7558
7558 If a shelved change is applied successfully, the bundle that
7559 If a shelved change is applied successfully, the bundle that
7559 contains the shelved changes is moved to a backup location
7560 contains the shelved changes is moved to a backup location
7560 (.hg/shelve-backup).
7561 (.hg/shelve-backup).
7561
7562
7562 Since you can restore a shelved change on top of an arbitrary
7563 Since you can restore a shelved change on top of an arbitrary
7563 commit, it is possible that unshelving will result in a conflict
7564 commit, it is possible that unshelving will result in a conflict
7564 between your changes and the commits you are unshelving onto. If
7565 between your changes and the commits you are unshelving onto. If
7565 this occurs, you must resolve the conflict, then use
7566 this occurs, you must resolve the conflict, then use
7566 ``--continue`` to complete the unshelve operation. (The bundle
7567 ``--continue`` to complete the unshelve operation. (The bundle
7567 will not be moved until you successfully complete the unshelve.)
7568 will not be moved until you successfully complete the unshelve.)
7568
7569
7569 (Alternatively, you can use ``--abort`` to abandon an unshelve
7570 (Alternatively, you can use ``--abort`` to abandon an unshelve
7570 that causes a conflict. This reverts the unshelved changes, and
7571 that causes a conflict. This reverts the unshelved changes, and
7571 leaves the bundle in place.)
7572 leaves the bundle in place.)
7572
7573
7573 If bare shelved change (without interactive, include and exclude
7574 If bare shelved change (without interactive, include and exclude
7574 option) was done on newly created branch it would restore branch
7575 option) was done on newly created branch it would restore branch
7575 information to the working directory.
7576 information to the working directory.
7576
7577
7577 After a successful unshelve, the shelved changes are stored in a
7578 After a successful unshelve, the shelved changes are stored in a
7578 backup directory. Only the N most recent backups are kept. N
7579 backup directory. Only the N most recent backups are kept. N
7579 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7580 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7580 configuration option.
7581 configuration option.
7581
7582
7582 .. container:: verbose
7583 .. container:: verbose
7583
7584
7584 Timestamp in seconds is used to decide order of backups. More
7585 Timestamp in seconds is used to decide order of backups. More
7585 than ``maxbackups`` backups are kept, if same timestamp
7586 than ``maxbackups`` backups are kept, if same timestamp
7586 prevents from deciding exact order of them, for safety.
7587 prevents from deciding exact order of them, for safety.
7587
7588
7588 Selected changes can be unshelved with ``--interactive`` flag.
7589 Selected changes can be unshelved with ``--interactive`` flag.
7589 The working directory is updated with the selected changes, and
7590 The working directory is updated with the selected changes, and
7590 only the unselected changes remain shelved.
7591 only the unselected changes remain shelved.
7591 Note: The whole shelve is applied to working directory first before
7592 Note: The whole shelve is applied to working directory first before
7592 running interactively. So, this will bring up all the conflicts between
7593 running interactively. So, this will bring up all the conflicts between
7593 working directory and the shelve, irrespective of which changes will be
7594 working directory and the shelve, irrespective of which changes will be
7594 unshelved.
7595 unshelved.
7595 """
7596 """
7596 with repo.wlock():
7597 with repo.wlock():
7597 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7598 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7598
7599
7599
7600
7600 statemod.addunfinished(
7601 statemod.addunfinished(
7601 b'unshelve',
7602 b'unshelve',
7602 fname=b'shelvedstate',
7603 fname=b'shelvedstate',
7603 continueflag=True,
7604 continueflag=True,
7604 abortfunc=shelvemod.hgabortunshelve,
7605 abortfunc=shelvemod.hgabortunshelve,
7605 continuefunc=shelvemod.hgcontinueunshelve,
7606 continuefunc=shelvemod.hgcontinueunshelve,
7606 cmdmsg=_(b'unshelve already in progress'),
7607 cmdmsg=_(b'unshelve already in progress'),
7607 )
7608 )
7608
7609
7609
7610
7610 @command(
7611 @command(
7611 b'update|up|checkout|co',
7612 b'update|up|checkout|co',
7612 [
7613 [
7613 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7614 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7614 (b'c', b'check', None, _(b'require clean working directory')),
7615 (b'c', b'check', None, _(b'require clean working directory')),
7615 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7616 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7616 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7617 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7617 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7618 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7618 ]
7619 ]
7619 + mergetoolopts,
7620 + mergetoolopts,
7620 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7621 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7621 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7622 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7622 helpbasic=True,
7623 helpbasic=True,
7623 )
7624 )
7624 def update(ui, repo, node=None, **opts):
7625 def update(ui, repo, node=None, **opts):
7625 """update working directory (or switch revisions)
7626 """update working directory (or switch revisions)
7626
7627
7627 Update the repository's working directory to the specified
7628 Update the repository's working directory to the specified
7628 changeset. If no changeset is specified, update to the tip of the
7629 changeset. If no changeset is specified, update to the tip of the
7629 current named branch and move the active bookmark (see :hg:`help
7630 current named branch and move the active bookmark (see :hg:`help
7630 bookmarks`).
7631 bookmarks`).
7631
7632
7632 Update sets the working directory's parent revision to the specified
7633 Update sets the working directory's parent revision to the specified
7633 changeset (see :hg:`help parents`).
7634 changeset (see :hg:`help parents`).
7634
7635
7635 If the changeset is not a descendant or ancestor of the working
7636 If the changeset is not a descendant or ancestor of the working
7636 directory's parent and there are uncommitted changes, the update is
7637 directory's parent and there are uncommitted changes, the update is
7637 aborted. With the -c/--check option, the working directory is checked
7638 aborted. With the -c/--check option, the working directory is checked
7638 for uncommitted changes; if none are found, the working directory is
7639 for uncommitted changes; if none are found, the working directory is
7639 updated to the specified changeset.
7640 updated to the specified changeset.
7640
7641
7641 .. container:: verbose
7642 .. container:: verbose
7642
7643
7643 The -C/--clean, -c/--check, and -m/--merge options control what
7644 The -C/--clean, -c/--check, and -m/--merge options control what
7644 happens if the working directory contains uncommitted changes.
7645 happens if the working directory contains uncommitted changes.
7645 At most of one of them can be specified.
7646 At most of one of them can be specified.
7646
7647
7647 1. If no option is specified, and if
7648 1. If no option is specified, and if
7648 the requested changeset is an ancestor or descendant of
7649 the requested changeset is an ancestor or descendant of
7649 the working directory's parent, the uncommitted changes
7650 the working directory's parent, the uncommitted changes
7650 are merged into the requested changeset and the merged
7651 are merged into the requested changeset and the merged
7651 result is left uncommitted. If the requested changeset is
7652 result is left uncommitted. If the requested changeset is
7652 not an ancestor or descendant (that is, it is on another
7653 not an ancestor or descendant (that is, it is on another
7653 branch), the update is aborted and the uncommitted changes
7654 branch), the update is aborted and the uncommitted changes
7654 are preserved.
7655 are preserved.
7655
7656
7656 2. With the -m/--merge option, the update is allowed even if the
7657 2. With the -m/--merge option, the update is allowed even if the
7657 requested changeset is not an ancestor or descendant of
7658 requested changeset is not an ancestor or descendant of
7658 the working directory's parent.
7659 the working directory's parent.
7659
7660
7660 3. With the -c/--check option, the update is aborted and the
7661 3. With the -c/--check option, the update is aborted and the
7661 uncommitted changes are preserved.
7662 uncommitted changes are preserved.
7662
7663
7663 4. With the -C/--clean option, uncommitted changes are discarded and
7664 4. With the -C/--clean option, uncommitted changes are discarded and
7664 the working directory is updated to the requested changeset.
7665 the working directory is updated to the requested changeset.
7665
7666
7666 To cancel an uncommitted merge (and lose your changes), use
7667 To cancel an uncommitted merge (and lose your changes), use
7667 :hg:`merge --abort`.
7668 :hg:`merge --abort`.
7668
7669
7669 Use null as the changeset to remove the working directory (like
7670 Use null as the changeset to remove the working directory (like
7670 :hg:`clone -U`).
7671 :hg:`clone -U`).
7671
7672
7672 If you want to revert just one file to an older revision, use
7673 If you want to revert just one file to an older revision, use
7673 :hg:`revert [-r REV] NAME`.
7674 :hg:`revert [-r REV] NAME`.
7674
7675
7675 See :hg:`help dates` for a list of formats valid for -d/--date.
7676 See :hg:`help dates` for a list of formats valid for -d/--date.
7676
7677
7677 Returns 0 on success, 1 if there are unresolved files.
7678 Returns 0 on success, 1 if there are unresolved files.
7678 """
7679 """
7679 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7680 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7680 rev = opts.get('rev')
7681 rev = opts.get('rev')
7681 date = opts.get('date')
7682 date = opts.get('date')
7682 clean = opts.get('clean')
7683 clean = opts.get('clean')
7683 check = opts.get('check')
7684 check = opts.get('check')
7684 merge = opts.get('merge')
7685 merge = opts.get('merge')
7685 if rev and node:
7686 if rev and node:
7686 raise error.Abort(_(b"please specify just one revision"))
7687 raise error.Abort(_(b"please specify just one revision"))
7687
7688
7688 if ui.configbool(b'commands', b'update.requiredest'):
7689 if ui.configbool(b'commands', b'update.requiredest'):
7689 if not node and not rev and not date:
7690 if not node and not rev and not date:
7690 raise error.Abort(
7691 raise error.Abort(
7691 _(b'you must specify a destination'),
7692 _(b'you must specify a destination'),
7692 hint=_(b'for example: hg update ".::"'),
7693 hint=_(b'for example: hg update ".::"'),
7693 )
7694 )
7694
7695
7695 if rev is None or rev == b'':
7696 if rev is None or rev == b'':
7696 rev = node
7697 rev = node
7697
7698
7698 if date and rev is not None:
7699 if date and rev is not None:
7699 raise error.Abort(_(b"you can't specify a revision and a date"))
7700 raise error.Abort(_(b"you can't specify a revision and a date"))
7700
7701
7701 updatecheck = None
7702 updatecheck = None
7702 if check:
7703 if check:
7703 updatecheck = b'abort'
7704 updatecheck = b'abort'
7704 elif merge:
7705 elif merge:
7705 updatecheck = b'none'
7706 updatecheck = b'none'
7706
7707
7707 with repo.wlock():
7708 with repo.wlock():
7708 cmdutil.clearunfinished(repo)
7709 cmdutil.clearunfinished(repo)
7709 if date:
7710 if date:
7710 rev = cmdutil.finddate(ui, repo, date)
7711 rev = cmdutil.finddate(ui, repo, date)
7711
7712
7712 # if we defined a bookmark, we have to remember the original name
7713 # if we defined a bookmark, we have to remember the original name
7713 brev = rev
7714 brev = rev
7714 if rev:
7715 if rev:
7715 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7716 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7716 ctx = scmutil.revsingle(repo, rev, default=None)
7717 ctx = scmutil.revsingle(repo, rev, default=None)
7717 rev = ctx.rev()
7718 rev = ctx.rev()
7718 hidden = ctx.hidden()
7719 hidden = ctx.hidden()
7719 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7720 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7720 with ui.configoverride(overrides, b'update'):
7721 with ui.configoverride(overrides, b'update'):
7721 ret = hg.updatetotally(
7722 ret = hg.updatetotally(
7722 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7723 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7723 )
7724 )
7724 if hidden:
7725 if hidden:
7725 ctxstr = ctx.hex()[:12]
7726 ctxstr = ctx.hex()[:12]
7726 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7727 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7727
7728
7728 if ctx.obsolete():
7729 if ctx.obsolete():
7729 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7730 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7730 ui.warn(b"(%s)\n" % obsfatemsg)
7731 ui.warn(b"(%s)\n" % obsfatemsg)
7731 return ret
7732 return ret
7732
7733
7733
7734
7734 @command(
7735 @command(
7735 b'verify',
7736 b'verify',
7736 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7737 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7737 helpcategory=command.CATEGORY_MAINTENANCE,
7738 helpcategory=command.CATEGORY_MAINTENANCE,
7738 )
7739 )
7739 def verify(ui, repo, **opts):
7740 def verify(ui, repo, **opts):
7740 """verify the integrity of the repository
7741 """verify the integrity of the repository
7741
7742
7742 Verify the integrity of the current repository.
7743 Verify the integrity of the current repository.
7743
7744
7744 This will perform an extensive check of the repository's
7745 This will perform an extensive check of the repository's
7745 integrity, validating the hashes and checksums of each entry in
7746 integrity, validating the hashes and checksums of each entry in
7746 the changelog, manifest, and tracked files, as well as the
7747 the changelog, manifest, and tracked files, as well as the
7747 integrity of their crosslinks and indices.
7748 integrity of their crosslinks and indices.
7748
7749
7749 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7750 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7750 for more information about recovery from corruption of the
7751 for more information about recovery from corruption of the
7751 repository.
7752 repository.
7752
7753
7753 Returns 0 on success, 1 if errors are encountered.
7754 Returns 0 on success, 1 if errors are encountered.
7754 """
7755 """
7755 opts = pycompat.byteskwargs(opts)
7756 opts = pycompat.byteskwargs(opts)
7756
7757
7757 level = None
7758 level = None
7758 if opts[b'full']:
7759 if opts[b'full']:
7759 level = verifymod.VERIFY_FULL
7760 level = verifymod.VERIFY_FULL
7760 return hg.verify(repo, level)
7761 return hg.verify(repo, level)
7761
7762
7762
7763
7763 @command(
7764 @command(
7764 b'version',
7765 b'version',
7765 [] + formatteropts,
7766 [] + formatteropts,
7766 helpcategory=command.CATEGORY_HELP,
7767 helpcategory=command.CATEGORY_HELP,
7767 norepo=True,
7768 norepo=True,
7768 intents={INTENT_READONLY},
7769 intents={INTENT_READONLY},
7769 )
7770 )
7770 def version_(ui, **opts):
7771 def version_(ui, **opts):
7771 """output version and copyright information
7772 """output version and copyright information
7772
7773
7773 .. container:: verbose
7774 .. container:: verbose
7774
7775
7775 Template:
7776 Template:
7776
7777
7777 The following keywords are supported. See also :hg:`help templates`.
7778 The following keywords are supported. See also :hg:`help templates`.
7778
7779
7779 :extensions: List of extensions.
7780 :extensions: List of extensions.
7780 :ver: String. Version number.
7781 :ver: String. Version number.
7781
7782
7782 And each entry of ``{extensions}`` provides the following sub-keywords
7783 And each entry of ``{extensions}`` provides the following sub-keywords
7783 in addition to ``{ver}``.
7784 in addition to ``{ver}``.
7784
7785
7785 :bundled: Boolean. True if included in the release.
7786 :bundled: Boolean. True if included in the release.
7786 :name: String. Extension name.
7787 :name: String. Extension name.
7787 """
7788 """
7788 opts = pycompat.byteskwargs(opts)
7789 opts = pycompat.byteskwargs(opts)
7789 if ui.verbose:
7790 if ui.verbose:
7790 ui.pager(b'version')
7791 ui.pager(b'version')
7791 fm = ui.formatter(b"version", opts)
7792 fm = ui.formatter(b"version", opts)
7792 fm.startitem()
7793 fm.startitem()
7793 fm.write(
7794 fm.write(
7794 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7795 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7795 )
7796 )
7796 license = _(
7797 license = _(
7797 b"(see https://mercurial-scm.org for more information)\n"
7798 b"(see https://mercurial-scm.org for more information)\n"
7798 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7799 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7799 b"This is free software; see the source for copying conditions. "
7800 b"This is free software; see the source for copying conditions. "
7800 b"There is NO\nwarranty; "
7801 b"There is NO\nwarranty; "
7801 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7802 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7802 )
7803 )
7803 if not ui.quiet:
7804 if not ui.quiet:
7804 fm.plain(license)
7805 fm.plain(license)
7805
7806
7806 if ui.verbose:
7807 if ui.verbose:
7807 fm.plain(_(b"\nEnabled extensions:\n\n"))
7808 fm.plain(_(b"\nEnabled extensions:\n\n"))
7808 # format names and versions into columns
7809 # format names and versions into columns
7809 names = []
7810 names = []
7810 vers = []
7811 vers = []
7811 isinternals = []
7812 isinternals = []
7812 for name, module in sorted(extensions.extensions()):
7813 for name, module in sorted(extensions.extensions()):
7813 names.append(name)
7814 names.append(name)
7814 vers.append(extensions.moduleversion(module) or None)
7815 vers.append(extensions.moduleversion(module) or None)
7815 isinternals.append(extensions.ismoduleinternal(module))
7816 isinternals.append(extensions.ismoduleinternal(module))
7816 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7817 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7817 if names:
7818 if names:
7818 namefmt = b" %%-%ds " % max(len(n) for n in names)
7819 namefmt = b" %%-%ds " % max(len(n) for n in names)
7819 places = [_(b"external"), _(b"internal")]
7820 places = [_(b"external"), _(b"internal")]
7820 for n, v, p in zip(names, vers, isinternals):
7821 for n, v, p in zip(names, vers, isinternals):
7821 fn.startitem()
7822 fn.startitem()
7822 fn.condwrite(ui.verbose, b"name", namefmt, n)
7823 fn.condwrite(ui.verbose, b"name", namefmt, n)
7823 if ui.verbose:
7824 if ui.verbose:
7824 fn.plain(b"%s " % places[p])
7825 fn.plain(b"%s " % places[p])
7825 fn.data(bundled=p)
7826 fn.data(bundled=p)
7826 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7827 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7827 if ui.verbose:
7828 if ui.verbose:
7828 fn.plain(b"\n")
7829 fn.plain(b"\n")
7829 fn.end()
7830 fn.end()
7830 fm.end()
7831 fm.end()
7831
7832
7832
7833
7833 def loadcmdtable(ui, name, cmdtable):
7834 def loadcmdtable(ui, name, cmdtable):
7834 """Load command functions from specified cmdtable
7835 """Load command functions from specified cmdtable
7835 """
7836 """
7836 overrides = [cmd for cmd in cmdtable if cmd in table]
7837 overrides = [cmd for cmd in cmdtable if cmd in table]
7837 if overrides:
7838 if overrides:
7838 ui.warn(
7839 ui.warn(
7839 _(b"extension '%s' overrides commands: %s\n")
7840 _(b"extension '%s' overrides commands: %s\n")
7840 % (name, b" ".join(overrides))
7841 % (name, b" ".join(overrides))
7841 )
7842 )
7842 table.update(cmdtable)
7843 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now