##// END OF EJS Templates
errors: consistently don't use trailing "!" in "not found in manifest" message...
Martin von Zweigbergk -
r46519:50afeeeb default
parent child Browse files
Show More
@@ -1,7718 +1,7718 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import sys
13 import sys
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 wdirhex,
21 wdirhex,
22 wdirrev,
22 wdirrev,
23 )
23 )
24 from .pycompat import open
24 from .pycompat import open
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 bundlecaches,
29 bundlecaches,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 grep as grepmod,
44 grep as grepmod,
45 hbisect,
45 hbisect,
46 help,
46 help,
47 hg,
47 hg,
48 logcmdutil,
48 logcmdutil,
49 merge as mergemod,
49 merge as mergemod,
50 mergestate as mergestatemod,
50 mergestate as mergestatemod,
51 narrowspec,
51 narrowspec,
52 obsolete,
52 obsolete,
53 obsutil,
53 obsutil,
54 patch,
54 patch,
55 phases,
55 phases,
56 pycompat,
56 pycompat,
57 rcutil,
57 rcutil,
58 registrar,
58 registrar,
59 requirements,
59 requirements,
60 revsetlang,
60 revsetlang,
61 rewriteutil,
61 rewriteutil,
62 scmutil,
62 scmutil,
63 server,
63 server,
64 shelve as shelvemod,
64 shelve as shelvemod,
65 state as statemod,
65 state as statemod,
66 streamclone,
66 streamclone,
67 tags as tagsmod,
67 tags as tagsmod,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 verify as verifymod,
70 verify as verifymod,
71 vfs as vfsmod,
71 vfs as vfsmod,
72 wireprotoserver,
72 wireprotoserver,
73 )
73 )
74 from .utils import (
74 from .utils import (
75 dateutil,
75 dateutil,
76 stringutil,
76 stringutil,
77 )
77 )
78
78
79 table = {}
79 table = {}
80 table.update(debugcommandsmod.command._table)
80 table.update(debugcommandsmod.command._table)
81
81
82 command = registrar.command(table)
82 command = registrar.command(table)
83 INTENT_READONLY = registrar.INTENT_READONLY
83 INTENT_READONLY = registrar.INTENT_READONLY
84
84
85 # common command options
85 # common command options
86
86
87 globalopts = [
87 globalopts = [
88 (
88 (
89 b'R',
89 b'R',
90 b'repository',
90 b'repository',
91 b'',
91 b'',
92 _(b'repository root directory or name of overlay bundle file'),
92 _(b'repository root directory or name of overlay bundle file'),
93 _(b'REPO'),
93 _(b'REPO'),
94 ),
94 ),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
96 (
96 (
97 b'y',
97 b'y',
98 b'noninteractive',
98 b'noninteractive',
99 None,
99 None,
100 _(
100 _(
101 b'do not prompt, automatically pick the first choice for all prompts'
101 b'do not prompt, automatically pick the first choice for all prompts'
102 ),
102 ),
103 ),
103 ),
104 (b'q', b'quiet', None, _(b'suppress output')),
104 (b'q', b'quiet', None, _(b'suppress output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
106 (
106 (
107 b'',
107 b'',
108 b'color',
108 b'color',
109 b'',
109 b'',
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
111 # and should not be translated
111 # and should not be translated
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
113 _(b'TYPE'),
113 _(b'TYPE'),
114 ),
114 ),
115 (
115 (
116 b'',
116 b'',
117 b'config',
117 b'config',
118 [],
118 [],
119 _(b'set/override config option (use \'section.name=value\')'),
119 _(b'set/override config option (use \'section.name=value\')'),
120 _(b'CONFIG'),
120 _(b'CONFIG'),
121 ),
121 ),
122 (b'', b'debug', None, _(b'enable debugging output')),
122 (b'', b'debug', None, _(b'enable debugging output')),
123 (b'', b'debugger', None, _(b'start debugger')),
123 (b'', b'debugger', None, _(b'start debugger')),
124 (
124 (
125 b'',
125 b'',
126 b'encoding',
126 b'encoding',
127 encoding.encoding,
127 encoding.encoding,
128 _(b'set the charset encoding'),
128 _(b'set the charset encoding'),
129 _(b'ENCODE'),
129 _(b'ENCODE'),
130 ),
130 ),
131 (
131 (
132 b'',
132 b'',
133 b'encodingmode',
133 b'encodingmode',
134 encoding.encodingmode,
134 encoding.encodingmode,
135 _(b'set the charset encoding mode'),
135 _(b'set the charset encoding mode'),
136 _(b'MODE'),
136 _(b'MODE'),
137 ),
137 ),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
139 (b'', b'time', None, _(b'time how long the command takes')),
139 (b'', b'time', None, _(b'time how long the command takes')),
140 (b'', b'profile', None, _(b'print command execution profile')),
140 (b'', b'profile', None, _(b'print command execution profile')),
141 (b'', b'version', None, _(b'output version information and exit')),
141 (b'', b'version', None, _(b'output version information and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
144 (
144 (
145 b'',
145 b'',
146 b'pager',
146 b'pager',
147 b'auto',
147 b'auto',
148 _(b"when to paginate (boolean, always, auto, or never)"),
148 _(b"when to paginate (boolean, always, auto, or never)"),
149 _(b'TYPE'),
149 _(b'TYPE'),
150 ),
150 ),
151 ]
151 ]
152
152
153 dryrunopts = cmdutil.dryrunopts
153 dryrunopts = cmdutil.dryrunopts
154 remoteopts = cmdutil.remoteopts
154 remoteopts = cmdutil.remoteopts
155 walkopts = cmdutil.walkopts
155 walkopts = cmdutil.walkopts
156 commitopts = cmdutil.commitopts
156 commitopts = cmdutil.commitopts
157 commitopts2 = cmdutil.commitopts2
157 commitopts2 = cmdutil.commitopts2
158 commitopts3 = cmdutil.commitopts3
158 commitopts3 = cmdutil.commitopts3
159 formatteropts = cmdutil.formatteropts
159 formatteropts = cmdutil.formatteropts
160 templateopts = cmdutil.templateopts
160 templateopts = cmdutil.templateopts
161 logopts = cmdutil.logopts
161 logopts = cmdutil.logopts
162 diffopts = cmdutil.diffopts
162 diffopts = cmdutil.diffopts
163 diffwsopts = cmdutil.diffwsopts
163 diffwsopts = cmdutil.diffwsopts
164 diffopts2 = cmdutil.diffopts2
164 diffopts2 = cmdutil.diffopts2
165 mergetoolopts = cmdutil.mergetoolopts
165 mergetoolopts = cmdutil.mergetoolopts
166 similarityopts = cmdutil.similarityopts
166 similarityopts = cmdutil.similarityopts
167 subrepoopts = cmdutil.subrepoopts
167 subrepoopts = cmdutil.subrepoopts
168 debugrevlogopts = cmdutil.debugrevlogopts
168 debugrevlogopts = cmdutil.debugrevlogopts
169
169
170 # Commands start here, listed alphabetically
170 # Commands start here, listed alphabetically
171
171
172
172
173 @command(
173 @command(
174 b'abort',
174 b'abort',
175 dryrunopts,
175 dryrunopts,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
177 helpbasic=True,
177 helpbasic=True,
178 )
178 )
179 def abort(ui, repo, **opts):
179 def abort(ui, repo, **opts):
180 """abort an unfinished operation (EXPERIMENTAL)
180 """abort an unfinished operation (EXPERIMENTAL)
181
181
182 Aborts a multistep operation like graft, histedit, rebase, merge,
182 Aborts a multistep operation like graft, histedit, rebase, merge,
183 and unshelve if they are in an unfinished state.
183 and unshelve if they are in an unfinished state.
184
184
185 use --dry-run/-n to dry run the command.
185 use --dry-run/-n to dry run the command.
186 """
186 """
187 dryrun = opts.get('dry_run')
187 dryrun = opts.get('dry_run')
188 abortstate = cmdutil.getunfinishedstate(repo)
188 abortstate = cmdutil.getunfinishedstate(repo)
189 if not abortstate:
189 if not abortstate:
190 raise error.StateError(_(b'no operation in progress'))
190 raise error.StateError(_(b'no operation in progress'))
191 if not abortstate.abortfunc:
191 if not abortstate.abortfunc:
192 raise error.InputError(
192 raise error.InputError(
193 (
193 (
194 _(b"%s in progress but does not support 'hg abort'")
194 _(b"%s in progress but does not support 'hg abort'")
195 % (abortstate._opname)
195 % (abortstate._opname)
196 ),
196 ),
197 hint=abortstate.hint(),
197 hint=abortstate.hint(),
198 )
198 )
199 if dryrun:
199 if dryrun:
200 ui.status(
200 ui.status(
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
202 )
202 )
203 return
203 return
204 return abortstate.abortfunc(ui, repo)
204 return abortstate.abortfunc(ui, repo)
205
205
206
206
207 @command(
207 @command(
208 b'add',
208 b'add',
209 walkopts + subrepoopts + dryrunopts,
209 walkopts + subrepoopts + dryrunopts,
210 _(b'[OPTION]... [FILE]...'),
210 _(b'[OPTION]... [FILE]...'),
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
212 helpbasic=True,
212 helpbasic=True,
213 inferrepo=True,
213 inferrepo=True,
214 )
214 )
215 def add(ui, repo, *pats, **opts):
215 def add(ui, repo, *pats, **opts):
216 """add the specified files on the next commit
216 """add the specified files on the next commit
217
217
218 Schedule files to be version controlled and added to the
218 Schedule files to be version controlled and added to the
219 repository.
219 repository.
220
220
221 The files will be added to the repository at the next commit. To
221 The files will be added to the repository at the next commit. To
222 undo an add before that, see :hg:`forget`.
222 undo an add before that, see :hg:`forget`.
223
223
224 If no names are given, add all files to the repository (except
224 If no names are given, add all files to the repository (except
225 files matching ``.hgignore``).
225 files matching ``.hgignore``).
226
226
227 .. container:: verbose
227 .. container:: verbose
228
228
229 Examples:
229 Examples:
230
230
231 - New (unknown) files are added
231 - New (unknown) files are added
232 automatically by :hg:`add`::
232 automatically by :hg:`add`::
233
233
234 $ ls
234 $ ls
235 foo.c
235 foo.c
236 $ hg status
236 $ hg status
237 ? foo.c
237 ? foo.c
238 $ hg add
238 $ hg add
239 adding foo.c
239 adding foo.c
240 $ hg status
240 $ hg status
241 A foo.c
241 A foo.c
242
242
243 - Specific files to be added can be specified::
243 - Specific files to be added can be specified::
244
244
245 $ ls
245 $ ls
246 bar.c foo.c
246 bar.c foo.c
247 $ hg status
247 $ hg status
248 ? bar.c
248 ? bar.c
249 ? foo.c
249 ? foo.c
250 $ hg add bar.c
250 $ hg add bar.c
251 $ hg status
251 $ hg status
252 A bar.c
252 A bar.c
253 ? foo.c
253 ? foo.c
254
254
255 Returns 0 if all files are successfully added.
255 Returns 0 if all files are successfully added.
256 """
256 """
257
257
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
261 return rejected and 1 or 0
261 return rejected and 1 or 0
262
262
263
263
264 @command(
264 @command(
265 b'addremove',
265 b'addremove',
266 similarityopts + subrepoopts + walkopts + dryrunopts,
266 similarityopts + subrepoopts + walkopts + dryrunopts,
267 _(b'[OPTION]... [FILE]...'),
267 _(b'[OPTION]... [FILE]...'),
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
269 inferrepo=True,
269 inferrepo=True,
270 )
270 )
271 def addremove(ui, repo, *pats, **opts):
271 def addremove(ui, repo, *pats, **opts):
272 """add all new files, delete all missing files
272 """add all new files, delete all missing files
273
273
274 Add all new files and remove all missing files from the
274 Add all new files and remove all missing files from the
275 repository.
275 repository.
276
276
277 Unless names are given, new files are ignored if they match any of
277 Unless names are given, new files are ignored if they match any of
278 the patterns in ``.hgignore``. As with add, these changes take
278 the patterns in ``.hgignore``. As with add, these changes take
279 effect at the next commit.
279 effect at the next commit.
280
280
281 Use the -s/--similarity option to detect renamed files. This
281 Use the -s/--similarity option to detect renamed files. This
282 option takes a percentage between 0 (disabled) and 100 (files must
282 option takes a percentage between 0 (disabled) and 100 (files must
283 be identical) as its parameter. With a parameter greater than 0,
283 be identical) as its parameter. With a parameter greater than 0,
284 this compares every removed file with every added file and records
284 this compares every removed file with every added file and records
285 those similar enough as renames. Detecting renamed files this way
285 those similar enough as renames. Detecting renamed files this way
286 can be expensive. After using this option, :hg:`status -C` can be
286 can be expensive. After using this option, :hg:`status -C` can be
287 used to check which files were identified as moved or renamed. If
287 used to check which files were identified as moved or renamed. If
288 not specified, -s/--similarity defaults to 100 and only renames of
288 not specified, -s/--similarity defaults to 100 and only renames of
289 identical files are detected.
289 identical files are detected.
290
290
291 .. container:: verbose
291 .. container:: verbose
292
292
293 Examples:
293 Examples:
294
294
295 - A number of files (bar.c and foo.c) are new,
295 - A number of files (bar.c and foo.c) are new,
296 while foobar.c has been removed (without using :hg:`remove`)
296 while foobar.c has been removed (without using :hg:`remove`)
297 from the repository::
297 from the repository::
298
298
299 $ ls
299 $ ls
300 bar.c foo.c
300 bar.c foo.c
301 $ hg status
301 $ hg status
302 ! foobar.c
302 ! foobar.c
303 ? bar.c
303 ? bar.c
304 ? foo.c
304 ? foo.c
305 $ hg addremove
305 $ hg addremove
306 adding bar.c
306 adding bar.c
307 adding foo.c
307 adding foo.c
308 removing foobar.c
308 removing foobar.c
309 $ hg status
309 $ hg status
310 A bar.c
310 A bar.c
311 A foo.c
311 A foo.c
312 R foobar.c
312 R foobar.c
313
313
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 Afterwards, it was edited slightly::
315 Afterwards, it was edited slightly::
316
316
317 $ ls
317 $ ls
318 foo.c
318 foo.c
319 $ hg status
319 $ hg status
320 ! foobar.c
320 ! foobar.c
321 ? foo.c
321 ? foo.c
322 $ hg addremove --similarity 90
322 $ hg addremove --similarity 90
323 removing foobar.c
323 removing foobar.c
324 adding foo.c
324 adding foo.c
325 recording removal of foobar.c as rename to foo.c (94% similar)
325 recording removal of foobar.c as rename to foo.c (94% similar)
326 $ hg status -C
326 $ hg status -C
327 A foo.c
327 A foo.c
328 foobar.c
328 foobar.c
329 R foobar.c
329 R foobar.c
330
330
331 Returns 0 if all files are successfully added.
331 Returns 0 if all files are successfully added.
332 """
332 """
333 opts = pycompat.byteskwargs(opts)
333 opts = pycompat.byteskwargs(opts)
334 if not opts.get(b'similarity'):
334 if not opts.get(b'similarity'):
335 opts[b'similarity'] = b'100'
335 opts[b'similarity'] = b'100'
336 matcher = scmutil.match(repo[None], pats, opts)
336 matcher = scmutil.match(repo[None], pats, opts)
337 relative = scmutil.anypats(pats, opts)
337 relative = scmutil.anypats(pats, opts)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
340
340
341
341
342 @command(
342 @command(
343 b'annotate|blame',
343 b'annotate|blame',
344 [
344 [
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
346 (
346 (
347 b'',
347 b'',
348 b'follow',
348 b'follow',
349 None,
349 None,
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
351 ),
351 ),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
353 (b'a', b'text', None, _(b'treat all files as text')),
353 (b'a', b'text', None, _(b'treat all files as text')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
355 (b'f', b'file', None, _(b'list the filename')),
355 (b'f', b'file', None, _(b'list the filename')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
359 (
359 (
360 b'l',
360 b'l',
361 b'line-number',
361 b'line-number',
362 None,
362 None,
363 _(b'show line number at the first appearance'),
363 _(b'show line number at the first appearance'),
364 ),
364 ),
365 (
365 (
366 b'',
366 b'',
367 b'skip',
367 b'skip',
368 [],
368 [],
369 _(b'revset to not display (EXPERIMENTAL)'),
369 _(b'revset to not display (EXPERIMENTAL)'),
370 _(b'REV'),
370 _(b'REV'),
371 ),
371 ),
372 ]
372 ]
373 + diffwsopts
373 + diffwsopts
374 + walkopts
374 + walkopts
375 + formatteropts,
375 + formatteropts,
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
378 helpbasic=True,
378 helpbasic=True,
379 inferrepo=True,
379 inferrepo=True,
380 )
380 )
381 def annotate(ui, repo, *pats, **opts):
381 def annotate(ui, repo, *pats, **opts):
382 """show changeset information by line for each file
382 """show changeset information by line for each file
383
383
384 List changes in files, showing the revision id responsible for
384 List changes in files, showing the revision id responsible for
385 each line.
385 each line.
386
386
387 This command is useful for discovering when a change was made and
387 This command is useful for discovering when a change was made and
388 by whom.
388 by whom.
389
389
390 If you include --file, --user, or --date, the revision number is
390 If you include --file, --user, or --date, the revision number is
391 suppressed unless you also include --number.
391 suppressed unless you also include --number.
392
392
393 Without the -a/--text option, annotate will avoid processing files
393 Without the -a/--text option, annotate will avoid processing files
394 it detects as binary. With -a, annotate will annotate the file
394 it detects as binary. With -a, annotate will annotate the file
395 anyway, although the results will probably be neither useful
395 anyway, although the results will probably be neither useful
396 nor desirable.
396 nor desirable.
397
397
398 .. container:: verbose
398 .. container:: verbose
399
399
400 Template:
400 Template:
401
401
402 The following keywords are supported in addition to the common template
402 The following keywords are supported in addition to the common template
403 keywords and functions. See also :hg:`help templates`.
403 keywords and functions. See also :hg:`help templates`.
404
404
405 :lines: List of lines with annotation data.
405 :lines: List of lines with annotation data.
406 :path: String. Repository-absolute path of the specified file.
406 :path: String. Repository-absolute path of the specified file.
407
407
408 And each entry of ``{lines}`` provides the following sub-keywords in
408 And each entry of ``{lines}`` provides the following sub-keywords in
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
410
410
411 :line: String. Line content.
411 :line: String. Line content.
412 :lineno: Integer. Line number at that revision.
412 :lineno: Integer. Line number at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
414
414
415 See :hg:`help templates.operators` for the list expansion syntax.
415 See :hg:`help templates.operators` for the list expansion syntax.
416
416
417 Returns 0 on success.
417 Returns 0 on success.
418 """
418 """
419 opts = pycompat.byteskwargs(opts)
419 opts = pycompat.byteskwargs(opts)
420 if not pats:
420 if not pats:
421 raise error.InputError(
421 raise error.InputError(
422 _(b'at least one filename or pattern is required')
422 _(b'at least one filename or pattern is required')
423 )
423 )
424
424
425 if opts.get(b'follow'):
425 if opts.get(b'follow'):
426 # --follow is deprecated and now just an alias for -f/--file
426 # --follow is deprecated and now just an alias for -f/--file
427 # to mimic the behavior of Mercurial before version 1.5
427 # to mimic the behavior of Mercurial before version 1.5
428 opts[b'file'] = True
428 opts[b'file'] = True
429
429
430 if (
430 if (
431 not opts.get(b'user')
431 not opts.get(b'user')
432 and not opts.get(b'changeset')
432 and not opts.get(b'changeset')
433 and not opts.get(b'date')
433 and not opts.get(b'date')
434 and not opts.get(b'file')
434 and not opts.get(b'file')
435 ):
435 ):
436 opts[b'number'] = True
436 opts[b'number'] = True
437
437
438 linenumber = opts.get(b'line_number') is not None
438 linenumber = opts.get(b'line_number') is not None
439 if (
439 if (
440 linenumber
440 linenumber
441 and (not opts.get(b'changeset'))
441 and (not opts.get(b'changeset'))
442 and (not opts.get(b'number'))
442 and (not opts.get(b'number'))
443 ):
443 ):
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
445
445
446 rev = opts.get(b'rev')
446 rev = opts.get(b'rev')
447 if rev:
447 if rev:
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
449 ctx = scmutil.revsingle(repo, rev)
449 ctx = scmutil.revsingle(repo, rev)
450
450
451 ui.pager(b'annotate')
451 ui.pager(b'annotate')
452 rootfm = ui.formatter(b'annotate', opts)
452 rootfm = ui.formatter(b'annotate', opts)
453 if ui.debugflag:
453 if ui.debugflag:
454 shorthex = pycompat.identity
454 shorthex = pycompat.identity
455 else:
455 else:
456
456
457 def shorthex(h):
457 def shorthex(h):
458 return h[:12]
458 return h[:12]
459
459
460 if ui.quiet:
460 if ui.quiet:
461 datefunc = dateutil.shortdate
461 datefunc = dateutil.shortdate
462 else:
462 else:
463 datefunc = dateutil.datestr
463 datefunc = dateutil.datestr
464 if ctx.rev() is None:
464 if ctx.rev() is None:
465 if opts.get(b'changeset'):
465 if opts.get(b'changeset'):
466 # omit "+" suffix which is appended to node hex
466 # omit "+" suffix which is appended to node hex
467 def formatrev(rev):
467 def formatrev(rev):
468 if rev == wdirrev:
468 if rev == wdirrev:
469 return b'%d' % ctx.p1().rev()
469 return b'%d' % ctx.p1().rev()
470 else:
470 else:
471 return b'%d' % rev
471 return b'%d' % rev
472
472
473 else:
473 else:
474
474
475 def formatrev(rev):
475 def formatrev(rev):
476 if rev == wdirrev:
476 if rev == wdirrev:
477 return b'%d+' % ctx.p1().rev()
477 return b'%d+' % ctx.p1().rev()
478 else:
478 else:
479 return b'%d ' % rev
479 return b'%d ' % rev
480
480
481 def formathex(h):
481 def formathex(h):
482 if h == wdirhex:
482 if h == wdirhex:
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
484 else:
484 else:
485 return b'%s ' % shorthex(h)
485 return b'%s ' % shorthex(h)
486
486
487 else:
487 else:
488 formatrev = b'%d'.__mod__
488 formatrev = b'%d'.__mod__
489 formathex = shorthex
489 formathex = shorthex
490
490
491 opmap = [
491 opmap = [
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
498 ]
498 ]
499 opnamemap = {
499 opnamemap = {
500 b'rev': b'number',
500 b'rev': b'number',
501 b'node': b'changeset',
501 b'node': b'changeset',
502 b'path': b'file',
502 b'path': b'file',
503 b'lineno': b'line_number',
503 b'lineno': b'line_number',
504 }
504 }
505
505
506 if rootfm.isplain():
506 if rootfm.isplain():
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return lambda x: fmt(get(x))
509 return lambda x: fmt(get(x))
510
510
511 else:
511 else:
512
512
513 def makefunc(get, fmt):
513 def makefunc(get, fmt):
514 return get
514 return get
515
515
516 datahint = rootfm.datahint()
516 datahint = rootfm.datahint()
517 funcmap = [
517 funcmap = [
518 (makefunc(get, fmt), sep)
518 (makefunc(get, fmt), sep)
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 ]
521 ]
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
523 fields = b' '.join(
523 fields = b' '.join(
524 fn
524 fn
525 for fn, sep, get, fmt in opmap
525 for fn, sep, get, fmt in opmap
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 )
527 )
528
528
529 def bad(x, y):
529 def bad(x, y):
530 raise error.Abort(b"%s: %s" % (x, y))
530 raise error.Abort(b"%s: %s" % (x, y))
531
531
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
533
533
534 follow = not opts.get(b'no_follow')
534 follow = not opts.get(b'no_follow')
535 diffopts = patch.difffeatureopts(
535 diffopts = patch.difffeatureopts(
536 ui, opts, section=b'annotate', whitespace=True
536 ui, opts, section=b'annotate', whitespace=True
537 )
537 )
538 skiprevs = opts.get(b'skip')
538 skiprevs = opts.get(b'skip')
539 if skiprevs:
539 if skiprevs:
540 skiprevs = scmutil.revrange(repo, skiprevs)
540 skiprevs = scmutil.revrange(repo, skiprevs)
541
541
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
543 for abs in ctx.walk(m):
543 for abs in ctx.walk(m):
544 fctx = ctx[abs]
544 fctx = ctx[abs]
545 rootfm.startitem()
545 rootfm.startitem()
546 rootfm.data(path=abs)
546 rootfm.data(path=abs)
547 if not opts.get(b'text') and fctx.isbinary():
547 if not opts.get(b'text') and fctx.isbinary():
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
549 continue
549 continue
550
550
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
552 lines = fctx.annotate(
552 lines = fctx.annotate(
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
554 )
554 )
555 if not lines:
555 if not lines:
556 fm.end()
556 fm.end()
557 continue
557 continue
558 formats = []
558 formats = []
559 pieces = []
559 pieces = []
560
560
561 for f, sep in funcmap:
561 for f, sep in funcmap:
562 l = [f(n) for n in lines]
562 l = [f(n) for n in lines]
563 if fm.isplain():
563 if fm.isplain():
564 sizes = [encoding.colwidth(x) for x in l]
564 sizes = [encoding.colwidth(x) for x in l]
565 ml = max(sizes)
565 ml = max(sizes)
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
567 else:
567 else:
568 formats.append([b'%s'] * len(l))
568 formats.append([b'%s'] * len(l))
569 pieces.append(l)
569 pieces.append(l)
570
570
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
572 fm.startitem()
572 fm.startitem()
573 fm.context(fctx=n.fctx)
573 fm.context(fctx=n.fctx)
574 fm.write(fields, b"".join(f), *p)
574 fm.write(fields, b"".join(f), *p)
575 if n.skip:
575 if n.skip:
576 fmt = b"* %s"
576 fmt = b"* %s"
577 else:
577 else:
578 fmt = b": %s"
578 fmt = b": %s"
579 fm.write(b'line', fmt, n.text)
579 fm.write(b'line', fmt, n.text)
580
580
581 if not lines[-1].text.endswith(b'\n'):
581 if not lines[-1].text.endswith(b'\n'):
582 fm.plain(b'\n')
582 fm.plain(b'\n')
583 fm.end()
583 fm.end()
584
584
585 rootfm.end()
585 rootfm.end()
586
586
587
587
588 @command(
588 @command(
589 b'archive',
589 b'archive',
590 [
590 [
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
592 (
592 (
593 b'p',
593 b'p',
594 b'prefix',
594 b'prefix',
595 b'',
595 b'',
596 _(b'directory prefix for files in archive'),
596 _(b'directory prefix for files in archive'),
597 _(b'PREFIX'),
597 _(b'PREFIX'),
598 ),
598 ),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
601 ]
601 ]
602 + subrepoopts
602 + subrepoopts
603 + walkopts,
603 + walkopts,
604 _(b'[OPTION]... DEST'),
604 _(b'[OPTION]... DEST'),
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
606 )
606 )
607 def archive(ui, repo, dest, **opts):
607 def archive(ui, repo, dest, **opts):
608 '''create an unversioned archive of a repository revision
608 '''create an unversioned archive of a repository revision
609
609
610 By default, the revision used is the parent of the working
610 By default, the revision used is the parent of the working
611 directory; use -r/--rev to specify a different revision.
611 directory; use -r/--rev to specify a different revision.
612
612
613 The archive type is automatically detected based on file
613 The archive type is automatically detected based on file
614 extension (to override, use -t/--type).
614 extension (to override, use -t/--type).
615
615
616 .. container:: verbose
616 .. container:: verbose
617
617
618 Examples:
618 Examples:
619
619
620 - create a zip file containing the 1.0 release::
620 - create a zip file containing the 1.0 release::
621
621
622 hg archive -r 1.0 project-1.0.zip
622 hg archive -r 1.0 project-1.0.zip
623
623
624 - create a tarball excluding .hg files::
624 - create a tarball excluding .hg files::
625
625
626 hg archive project.tar.gz -X ".hg*"
626 hg archive project.tar.gz -X ".hg*"
627
627
628 Valid types are:
628 Valid types are:
629
629
630 :``files``: a directory full of files (default)
630 :``files``: a directory full of files (default)
631 :``tar``: tar archive, uncompressed
631 :``tar``: tar archive, uncompressed
632 :``tbz2``: tar archive, compressed using bzip2
632 :``tbz2``: tar archive, compressed using bzip2
633 :``tgz``: tar archive, compressed using gzip
633 :``tgz``: tar archive, compressed using gzip
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
635 :``uzip``: zip archive, uncompressed
635 :``uzip``: zip archive, uncompressed
636 :``zip``: zip archive, compressed using deflate
636 :``zip``: zip archive, compressed using deflate
637
637
638 The exact name of the destination archive or directory is given
638 The exact name of the destination archive or directory is given
639 using a format string; see :hg:`help export` for details.
639 using a format string; see :hg:`help export` for details.
640
640
641 Each member added to an archive file has a directory prefix
641 Each member added to an archive file has a directory prefix
642 prepended. Use -p/--prefix to specify a format string for the
642 prepended. Use -p/--prefix to specify a format string for the
643 prefix. The default is the basename of the archive, with suffixes
643 prefix. The default is the basename of the archive, with suffixes
644 removed.
644 removed.
645
645
646 Returns 0 on success.
646 Returns 0 on success.
647 '''
647 '''
648
648
649 opts = pycompat.byteskwargs(opts)
649 opts = pycompat.byteskwargs(opts)
650 rev = opts.get(b'rev')
650 rev = opts.get(b'rev')
651 if rev:
651 if rev:
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
653 ctx = scmutil.revsingle(repo, rev)
653 ctx = scmutil.revsingle(repo, rev)
654 if not ctx:
654 if not ctx:
655 raise error.InputError(
655 raise error.InputError(
656 _(b'no working directory: please specify a revision')
656 _(b'no working directory: please specify a revision')
657 )
657 )
658 node = ctx.node()
658 node = ctx.node()
659 dest = cmdutil.makefilename(ctx, dest)
659 dest = cmdutil.makefilename(ctx, dest)
660 if os.path.realpath(dest) == repo.root:
660 if os.path.realpath(dest) == repo.root:
661 raise error.InputError(_(b'repository root cannot be destination'))
661 raise error.InputError(_(b'repository root cannot be destination'))
662
662
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
664 prefix = opts.get(b'prefix')
664 prefix = opts.get(b'prefix')
665
665
666 if dest == b'-':
666 if dest == b'-':
667 if kind == b'files':
667 if kind == b'files':
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
669 dest = cmdutil.makefileobj(ctx, dest)
669 dest = cmdutil.makefileobj(ctx, dest)
670 if not prefix:
670 if not prefix:
671 prefix = os.path.basename(repo.root) + b'-%h'
671 prefix = os.path.basename(repo.root) + b'-%h'
672
672
673 prefix = cmdutil.makefilename(ctx, prefix)
673 prefix = cmdutil.makefilename(ctx, prefix)
674 match = scmutil.match(ctx, [], opts)
674 match = scmutil.match(ctx, [], opts)
675 archival.archive(
675 archival.archive(
676 repo,
676 repo,
677 dest,
677 dest,
678 node,
678 node,
679 kind,
679 kind,
680 not opts.get(b'no_decode'),
680 not opts.get(b'no_decode'),
681 match,
681 match,
682 prefix,
682 prefix,
683 subrepos=opts.get(b'subrepos'),
683 subrepos=opts.get(b'subrepos'),
684 )
684 )
685
685
686
686
687 @command(
687 @command(
688 b'backout',
688 b'backout',
689 [
689 [
690 (
690 (
691 b'',
691 b'',
692 b'merge',
692 b'merge',
693 None,
693 None,
694 _(b'merge with old dirstate parent after backout'),
694 _(b'merge with old dirstate parent after backout'),
695 ),
695 ),
696 (
696 (
697 b'',
697 b'',
698 b'commit',
698 b'commit',
699 None,
699 None,
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
701 ),
701 ),
702 (b'', b'no-commit', None, _(b'do not commit')),
702 (b'', b'no-commit', None, _(b'do not commit')),
703 (
703 (
704 b'',
704 b'',
705 b'parent',
705 b'parent',
706 b'',
706 b'',
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
708 _(b'REV'),
708 _(b'REV'),
709 ),
709 ),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
712 ]
712 ]
713 + mergetoolopts
713 + mergetoolopts
714 + walkopts
714 + walkopts
715 + commitopts
715 + commitopts
716 + commitopts2,
716 + commitopts2,
717 _(b'[OPTION]... [-r] REV'),
717 _(b'[OPTION]... [-r] REV'),
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
719 )
719 )
720 def backout(ui, repo, node=None, rev=None, **opts):
720 def backout(ui, repo, node=None, rev=None, **opts):
721 '''reverse effect of earlier changeset
721 '''reverse effect of earlier changeset
722
722
723 Prepare a new changeset with the effect of REV undone in the
723 Prepare a new changeset with the effect of REV undone in the
724 current working directory. If no conflicts were encountered,
724 current working directory. If no conflicts were encountered,
725 it will be committed immediately.
725 it will be committed immediately.
726
726
727 If REV is the parent of the working directory, then this new changeset
727 If REV is the parent of the working directory, then this new changeset
728 is committed automatically (unless --no-commit is specified).
728 is committed automatically (unless --no-commit is specified).
729
729
730 .. note::
730 .. note::
731
731
732 :hg:`backout` cannot be used to fix either an unwanted or
732 :hg:`backout` cannot be used to fix either an unwanted or
733 incorrect merge.
733 incorrect merge.
734
734
735 .. container:: verbose
735 .. container:: verbose
736
736
737 Examples:
737 Examples:
738
738
739 - Reverse the effect of the parent of the working directory.
739 - Reverse the effect of the parent of the working directory.
740 This backout will be committed immediately::
740 This backout will be committed immediately::
741
741
742 hg backout -r .
742 hg backout -r .
743
743
744 - Reverse the effect of previous bad revision 23::
744 - Reverse the effect of previous bad revision 23::
745
745
746 hg backout -r 23
746 hg backout -r 23
747
747
748 - Reverse the effect of previous bad revision 23 and
748 - Reverse the effect of previous bad revision 23 and
749 leave changes uncommitted::
749 leave changes uncommitted::
750
750
751 hg backout -r 23 --no-commit
751 hg backout -r 23 --no-commit
752 hg commit -m "Backout revision 23"
752 hg commit -m "Backout revision 23"
753
753
754 By default, the pending changeset will have one parent,
754 By default, the pending changeset will have one parent,
755 maintaining a linear history. With --merge, the pending
755 maintaining a linear history. With --merge, the pending
756 changeset will instead have two parents: the old parent of the
756 changeset will instead have two parents: the old parent of the
757 working directory and a new child of REV that simply undoes REV.
757 working directory and a new child of REV that simply undoes REV.
758
758
759 Before version 1.7, the behavior without --merge was equivalent
759 Before version 1.7, the behavior without --merge was equivalent
760 to specifying --merge followed by :hg:`update --clean .` to
760 to specifying --merge followed by :hg:`update --clean .` to
761 cancel the merge and leave the child of REV as a head to be
761 cancel the merge and leave the child of REV as a head to be
762 merged separately.
762 merged separately.
763
763
764 See :hg:`help dates` for a list of formats valid for -d/--date.
764 See :hg:`help dates` for a list of formats valid for -d/--date.
765
765
766 See :hg:`help revert` for a way to restore files to the state
766 See :hg:`help revert` for a way to restore files to the state
767 of another revision.
767 of another revision.
768
768
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
770 files.
770 files.
771 '''
771 '''
772 with repo.wlock(), repo.lock():
772 with repo.wlock(), repo.lock():
773 return _dobackout(ui, repo, node, rev, **opts)
773 return _dobackout(ui, repo, node, rev, **opts)
774
774
775
775
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
778 opts = pycompat.byteskwargs(opts)
778 opts = pycompat.byteskwargs(opts)
779
779
780 if rev and node:
780 if rev and node:
781 raise error.InputError(_(b"please specify just one revision"))
781 raise error.InputError(_(b"please specify just one revision"))
782
782
783 if not rev:
783 if not rev:
784 rev = node
784 rev = node
785
785
786 if not rev:
786 if not rev:
787 raise error.InputError(_(b"please specify a revision to backout"))
787 raise error.InputError(_(b"please specify a revision to backout"))
788
788
789 date = opts.get(b'date')
789 date = opts.get(b'date')
790 if date:
790 if date:
791 opts[b'date'] = dateutil.parsedate(date)
791 opts[b'date'] = dateutil.parsedate(date)
792
792
793 cmdutil.checkunfinished(repo)
793 cmdutil.checkunfinished(repo)
794 cmdutil.bailifchanged(repo)
794 cmdutil.bailifchanged(repo)
795 ctx = scmutil.revsingle(repo, rev)
795 ctx = scmutil.revsingle(repo, rev)
796 node = ctx.node()
796 node = ctx.node()
797
797
798 op1, op2 = repo.dirstate.parents()
798 op1, op2 = repo.dirstate.parents()
799 if not repo.changelog.isancestor(node, op1):
799 if not repo.changelog.isancestor(node, op1):
800 raise error.InputError(
800 raise error.InputError(
801 _(b'cannot backout change that is not an ancestor')
801 _(b'cannot backout change that is not an ancestor')
802 )
802 )
803
803
804 p1, p2 = repo.changelog.parents(node)
804 p1, p2 = repo.changelog.parents(node)
805 if p1 == nullid:
805 if p1 == nullid:
806 raise error.InputError(_(b'cannot backout a change with no parents'))
806 raise error.InputError(_(b'cannot backout a change with no parents'))
807 if p2 != nullid:
807 if p2 != nullid:
808 if not opts.get(b'parent'):
808 if not opts.get(b'parent'):
809 raise error.InputError(_(b'cannot backout a merge changeset'))
809 raise error.InputError(_(b'cannot backout a merge changeset'))
810 p = repo.lookup(opts[b'parent'])
810 p = repo.lookup(opts[b'parent'])
811 if p not in (p1, p2):
811 if p not in (p1, p2):
812 raise error.InputError(
812 raise error.InputError(
813 _(b'%s is not a parent of %s') % (short(p), short(node))
813 _(b'%s is not a parent of %s') % (short(p), short(node))
814 )
814 )
815 parent = p
815 parent = p
816 else:
816 else:
817 if opts.get(b'parent'):
817 if opts.get(b'parent'):
818 raise error.InputError(
818 raise error.InputError(
819 _(b'cannot use --parent on non-merge changeset')
819 _(b'cannot use --parent on non-merge changeset')
820 )
820 )
821 parent = p1
821 parent = p1
822
822
823 # the backout should appear on the same branch
823 # the backout should appear on the same branch
824 branch = repo.dirstate.branch()
824 branch = repo.dirstate.branch()
825 bheads = repo.branchheads(branch)
825 bheads = repo.branchheads(branch)
826 rctx = scmutil.revsingle(repo, hex(parent))
826 rctx = scmutil.revsingle(repo, hex(parent))
827 if not opts.get(b'merge') and op1 != node:
827 if not opts.get(b'merge') and op1 != node:
828 with dirstateguard.dirstateguard(repo, b'backout'):
828 with dirstateguard.dirstateguard(repo, b'backout'):
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
830 with ui.configoverride(overrides, b'backout'):
830 with ui.configoverride(overrides, b'backout'):
831 stats = mergemod.back_out(ctx, parent=repo[parent])
831 stats = mergemod.back_out(ctx, parent=repo[parent])
832 repo.setparents(op1, op2)
832 repo.setparents(op1, op2)
833 hg._showstats(repo, stats)
833 hg._showstats(repo, stats)
834 if stats.unresolvedcount:
834 if stats.unresolvedcount:
835 repo.ui.status(
835 repo.ui.status(
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
837 )
837 )
838 return 1
838 return 1
839 else:
839 else:
840 hg.clean(repo, node, show_stats=False)
840 hg.clean(repo, node, show_stats=False)
841 repo.dirstate.setbranch(branch)
841 repo.dirstate.setbranch(branch)
842 cmdutil.revert(ui, repo, rctx)
842 cmdutil.revert(ui, repo, rctx)
843
843
844 if opts.get(b'no_commit'):
844 if opts.get(b'no_commit'):
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
846 ui.status(msg % short(node))
846 ui.status(msg % short(node))
847 return 0
847 return 0
848
848
849 def commitfunc(ui, repo, message, match, opts):
849 def commitfunc(ui, repo, message, match, opts):
850 editform = b'backout'
850 editform = b'backout'
851 e = cmdutil.getcommiteditor(
851 e = cmdutil.getcommiteditor(
852 editform=editform, **pycompat.strkwargs(opts)
852 editform=editform, **pycompat.strkwargs(opts)
853 )
853 )
854 if not message:
854 if not message:
855 # we don't translate commit messages
855 # we don't translate commit messages
856 message = b"Backed out changeset %s" % short(node)
856 message = b"Backed out changeset %s" % short(node)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
858 return repo.commit(
858 return repo.commit(
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
860 )
860 )
861
861
862 # save to detect changes
862 # save to detect changes
863 tip = repo.changelog.tip()
863 tip = repo.changelog.tip()
864
864
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
866 if not newnode:
866 if not newnode:
867 ui.status(_(b"nothing changed\n"))
867 ui.status(_(b"nothing changed\n"))
868 return 1
868 return 1
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
870
870
871 def nice(node):
871 def nice(node):
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
873
873
874 ui.status(
874 ui.status(
875 _(b'changeset %s backs out changeset %s\n')
875 _(b'changeset %s backs out changeset %s\n')
876 % (nice(newnode), nice(node))
876 % (nice(newnode), nice(node))
877 )
877 )
878 if opts.get(b'merge') and op1 != node:
878 if opts.get(b'merge') and op1 != node:
879 hg.clean(repo, op1, show_stats=False)
879 hg.clean(repo, op1, show_stats=False)
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
882 with ui.configoverride(overrides, b'backout'):
882 with ui.configoverride(overrides, b'backout'):
883 return hg.merge(repo[b'tip'])
883 return hg.merge(repo[b'tip'])
884 return 0
884 return 0
885
885
886
886
887 @command(
887 @command(
888 b'bisect',
888 b'bisect',
889 [
889 [
890 (b'r', b'reset', False, _(b'reset bisect state')),
890 (b'r', b'reset', False, _(b'reset bisect state')),
891 (b'g', b'good', False, _(b'mark changeset good')),
891 (b'g', b'good', False, _(b'mark changeset good')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
895 (
895 (
896 b'c',
896 b'c',
897 b'command',
897 b'command',
898 b'',
898 b'',
899 _(b'use command to check changeset state'),
899 _(b'use command to check changeset state'),
900 _(b'CMD'),
900 _(b'CMD'),
901 ),
901 ),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
903 ],
903 ],
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
906 )
906 )
907 def bisect(
907 def bisect(
908 ui,
908 ui,
909 repo,
909 repo,
910 rev=None,
910 rev=None,
911 extra=None,
911 extra=None,
912 command=None,
912 command=None,
913 reset=None,
913 reset=None,
914 good=None,
914 good=None,
915 bad=None,
915 bad=None,
916 skip=None,
916 skip=None,
917 extend=None,
917 extend=None,
918 noupdate=None,
918 noupdate=None,
919 ):
919 ):
920 """subdivision search of changesets
920 """subdivision search of changesets
921
921
922 This command helps to find changesets which introduce problems. To
922 This command helps to find changesets which introduce problems. To
923 use, mark the earliest changeset you know exhibits the problem as
923 use, mark the earliest changeset you know exhibits the problem as
924 bad, then mark the latest changeset which is free from the problem
924 bad, then mark the latest changeset which is free from the problem
925 as good. Bisect will update your working directory to a revision
925 as good. Bisect will update your working directory to a revision
926 for testing (unless the -U/--noupdate option is specified). Once
926 for testing (unless the -U/--noupdate option is specified). Once
927 you have performed tests, mark the working directory as good or
927 you have performed tests, mark the working directory as good or
928 bad, and bisect will either update to another candidate changeset
928 bad, and bisect will either update to another candidate changeset
929 or announce that it has found the bad revision.
929 or announce that it has found the bad revision.
930
930
931 As a shortcut, you can also use the revision argument to mark a
931 As a shortcut, you can also use the revision argument to mark a
932 revision as good or bad without checking it out first.
932 revision as good or bad without checking it out first.
933
933
934 If you supply a command, it will be used for automatic bisection.
934 If you supply a command, it will be used for automatic bisection.
935 The environment variable HG_NODE will contain the ID of the
935 The environment variable HG_NODE will contain the ID of the
936 changeset being tested. The exit status of the command will be
936 changeset being tested. The exit status of the command will be
937 used to mark revisions as good or bad: status 0 means good, 125
937 used to mark revisions as good or bad: status 0 means good, 125
938 means to skip the revision, 127 (command not found) will abort the
938 means to skip the revision, 127 (command not found) will abort the
939 bisection, and any other non-zero exit status means the revision
939 bisection, and any other non-zero exit status means the revision
940 is bad.
940 is bad.
941
941
942 .. container:: verbose
942 .. container:: verbose
943
943
944 Some examples:
944 Some examples:
945
945
946 - start a bisection with known bad revision 34, and good revision 12::
946 - start a bisection with known bad revision 34, and good revision 12::
947
947
948 hg bisect --bad 34
948 hg bisect --bad 34
949 hg bisect --good 12
949 hg bisect --good 12
950
950
951 - advance the current bisection by marking current revision as good or
951 - advance the current bisection by marking current revision as good or
952 bad::
952 bad::
953
953
954 hg bisect --good
954 hg bisect --good
955 hg bisect --bad
955 hg bisect --bad
956
956
957 - mark the current revision, or a known revision, to be skipped (e.g. if
957 - mark the current revision, or a known revision, to be skipped (e.g. if
958 that revision is not usable because of another issue)::
958 that revision is not usable because of another issue)::
959
959
960 hg bisect --skip
960 hg bisect --skip
961 hg bisect --skip 23
961 hg bisect --skip 23
962
962
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
964
964
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
966
966
967 - forget the current bisection::
967 - forget the current bisection::
968
968
969 hg bisect --reset
969 hg bisect --reset
970
970
971 - use 'make && make tests' to automatically find the first broken
971 - use 'make && make tests' to automatically find the first broken
972 revision::
972 revision::
973
973
974 hg bisect --reset
974 hg bisect --reset
975 hg bisect --bad 34
975 hg bisect --bad 34
976 hg bisect --good 12
976 hg bisect --good 12
977 hg bisect --command "make && make tests"
977 hg bisect --command "make && make tests"
978
978
979 - see all changesets whose states are already known in the current
979 - see all changesets whose states are already known in the current
980 bisection::
980 bisection::
981
981
982 hg log -r "bisect(pruned)"
982 hg log -r "bisect(pruned)"
983
983
984 - see the changeset currently being bisected (especially useful
984 - see the changeset currently being bisected (especially useful
985 if running with -U/--noupdate)::
985 if running with -U/--noupdate)::
986
986
987 hg log -r "bisect(current)"
987 hg log -r "bisect(current)"
988
988
989 - see all changesets that took part in the current bisection::
989 - see all changesets that took part in the current bisection::
990
990
991 hg log -r "bisect(range)"
991 hg log -r "bisect(range)"
992
992
993 - you can even get a nice graph::
993 - you can even get a nice graph::
994
994
995 hg log --graph -r "bisect(range)"
995 hg log --graph -r "bisect(range)"
996
996
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
998
998
999 Returns 0 on success.
999 Returns 0 on success.
1000 """
1000 """
1001 # backward compatibility
1001 # backward compatibility
1002 if rev in (b"good", b"bad", b"reset", b"init"):
1002 if rev in (b"good", b"bad", b"reset", b"init"):
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 cmd, rev, extra = rev, extra, None
1004 cmd, rev, extra = rev, extra, None
1005 if cmd == b"good":
1005 if cmd == b"good":
1006 good = True
1006 good = True
1007 elif cmd == b"bad":
1007 elif cmd == b"bad":
1008 bad = True
1008 bad = True
1009 else:
1009 else:
1010 reset = True
1010 reset = True
1011 elif extra:
1011 elif extra:
1012 raise error.InputError(_(b'incompatible arguments'))
1012 raise error.InputError(_(b'incompatible arguments'))
1013
1013
1014 incompatibles = {
1014 incompatibles = {
1015 b'--bad': bad,
1015 b'--bad': bad,
1016 b'--command': bool(command),
1016 b'--command': bool(command),
1017 b'--extend': extend,
1017 b'--extend': extend,
1018 b'--good': good,
1018 b'--good': good,
1019 b'--reset': reset,
1019 b'--reset': reset,
1020 b'--skip': skip,
1020 b'--skip': skip,
1021 }
1021 }
1022
1022
1023 enabled = [x for x in incompatibles if incompatibles[x]]
1023 enabled = [x for x in incompatibles if incompatibles[x]]
1024
1024
1025 if len(enabled) > 1:
1025 if len(enabled) > 1:
1026 raise error.InputError(
1026 raise error.InputError(
1027 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1027 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1028 )
1028 )
1029
1029
1030 if reset:
1030 if reset:
1031 hbisect.resetstate(repo)
1031 hbisect.resetstate(repo)
1032 return
1032 return
1033
1033
1034 state = hbisect.load_state(repo)
1034 state = hbisect.load_state(repo)
1035
1035
1036 # update state
1036 # update state
1037 if good or bad or skip:
1037 if good or bad or skip:
1038 if rev:
1038 if rev:
1039 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1039 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1040 else:
1040 else:
1041 nodes = [repo.lookup(b'.')]
1041 nodes = [repo.lookup(b'.')]
1042 if good:
1042 if good:
1043 state[b'good'] += nodes
1043 state[b'good'] += nodes
1044 elif bad:
1044 elif bad:
1045 state[b'bad'] += nodes
1045 state[b'bad'] += nodes
1046 elif skip:
1046 elif skip:
1047 state[b'skip'] += nodes
1047 state[b'skip'] += nodes
1048 hbisect.save_state(repo, state)
1048 hbisect.save_state(repo, state)
1049 if not (state[b'good'] and state[b'bad']):
1049 if not (state[b'good'] and state[b'bad']):
1050 return
1050 return
1051
1051
1052 def mayupdate(repo, node, show_stats=True):
1052 def mayupdate(repo, node, show_stats=True):
1053 """common used update sequence"""
1053 """common used update sequence"""
1054 if noupdate:
1054 if noupdate:
1055 return
1055 return
1056 cmdutil.checkunfinished(repo)
1056 cmdutil.checkunfinished(repo)
1057 cmdutil.bailifchanged(repo)
1057 cmdutil.bailifchanged(repo)
1058 return hg.clean(repo, node, show_stats=show_stats)
1058 return hg.clean(repo, node, show_stats=show_stats)
1059
1059
1060 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1060 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1061
1061
1062 if command:
1062 if command:
1063 changesets = 1
1063 changesets = 1
1064 if noupdate:
1064 if noupdate:
1065 try:
1065 try:
1066 node = state[b'current'][0]
1066 node = state[b'current'][0]
1067 except LookupError:
1067 except LookupError:
1068 raise error.StateError(
1068 raise error.StateError(
1069 _(
1069 _(
1070 b'current bisect revision is unknown - '
1070 b'current bisect revision is unknown - '
1071 b'start a new bisect to fix'
1071 b'start a new bisect to fix'
1072 )
1072 )
1073 )
1073 )
1074 else:
1074 else:
1075 node, p2 = repo.dirstate.parents()
1075 node, p2 = repo.dirstate.parents()
1076 if p2 != nullid:
1076 if p2 != nullid:
1077 raise error.StateError(_(b'current bisect revision is a merge'))
1077 raise error.StateError(_(b'current bisect revision is a merge'))
1078 if rev:
1078 if rev:
1079 node = repo[scmutil.revsingle(repo, rev, node)].node()
1079 node = repo[scmutil.revsingle(repo, rev, node)].node()
1080 with hbisect.restore_state(repo, state, node):
1080 with hbisect.restore_state(repo, state, node):
1081 while changesets:
1081 while changesets:
1082 # update state
1082 # update state
1083 state[b'current'] = [node]
1083 state[b'current'] = [node]
1084 hbisect.save_state(repo, state)
1084 hbisect.save_state(repo, state)
1085 status = ui.system(
1085 status = ui.system(
1086 command,
1086 command,
1087 environ={b'HG_NODE': hex(node)},
1087 environ={b'HG_NODE': hex(node)},
1088 blockedtag=b'bisect_check',
1088 blockedtag=b'bisect_check',
1089 )
1089 )
1090 if status == 125:
1090 if status == 125:
1091 transition = b"skip"
1091 transition = b"skip"
1092 elif status == 0:
1092 elif status == 0:
1093 transition = b"good"
1093 transition = b"good"
1094 # status < 0 means process was killed
1094 # status < 0 means process was killed
1095 elif status == 127:
1095 elif status == 127:
1096 raise error.Abort(_(b"failed to execute %s") % command)
1096 raise error.Abort(_(b"failed to execute %s") % command)
1097 elif status < 0:
1097 elif status < 0:
1098 raise error.Abort(_(b"%s killed") % command)
1098 raise error.Abort(_(b"%s killed") % command)
1099 else:
1099 else:
1100 transition = b"bad"
1100 transition = b"bad"
1101 state[transition].append(node)
1101 state[transition].append(node)
1102 ctx = repo[node]
1102 ctx = repo[node]
1103 ui.status(
1103 ui.status(
1104 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1104 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1105 )
1105 )
1106 hbisect.checkstate(state)
1106 hbisect.checkstate(state)
1107 # bisect
1107 # bisect
1108 nodes, changesets, bgood = hbisect.bisect(repo, state)
1108 nodes, changesets, bgood = hbisect.bisect(repo, state)
1109 # update to next check
1109 # update to next check
1110 node = nodes[0]
1110 node = nodes[0]
1111 mayupdate(repo, node, show_stats=False)
1111 mayupdate(repo, node, show_stats=False)
1112 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1112 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1113 return
1113 return
1114
1114
1115 hbisect.checkstate(state)
1115 hbisect.checkstate(state)
1116
1116
1117 # actually bisect
1117 # actually bisect
1118 nodes, changesets, good = hbisect.bisect(repo, state)
1118 nodes, changesets, good = hbisect.bisect(repo, state)
1119 if extend:
1119 if extend:
1120 if not changesets:
1120 if not changesets:
1121 extendnode = hbisect.extendrange(repo, state, nodes, good)
1121 extendnode = hbisect.extendrange(repo, state, nodes, good)
1122 if extendnode is not None:
1122 if extendnode is not None:
1123 ui.write(
1123 ui.write(
1124 _(b"Extending search to changeset %d:%s\n")
1124 _(b"Extending search to changeset %d:%s\n")
1125 % (extendnode.rev(), extendnode)
1125 % (extendnode.rev(), extendnode)
1126 )
1126 )
1127 state[b'current'] = [extendnode.node()]
1127 state[b'current'] = [extendnode.node()]
1128 hbisect.save_state(repo, state)
1128 hbisect.save_state(repo, state)
1129 return mayupdate(repo, extendnode.node())
1129 return mayupdate(repo, extendnode.node())
1130 raise error.StateError(_(b"nothing to extend"))
1130 raise error.StateError(_(b"nothing to extend"))
1131
1131
1132 if changesets == 0:
1132 if changesets == 0:
1133 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1133 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1134 else:
1134 else:
1135 assert len(nodes) == 1 # only a single node can be tested next
1135 assert len(nodes) == 1 # only a single node can be tested next
1136 node = nodes[0]
1136 node = nodes[0]
1137 # compute the approximate number of remaining tests
1137 # compute the approximate number of remaining tests
1138 tests, size = 0, 2
1138 tests, size = 0, 2
1139 while size <= changesets:
1139 while size <= changesets:
1140 tests, size = tests + 1, size * 2
1140 tests, size = tests + 1, size * 2
1141 rev = repo.changelog.rev(node)
1141 rev = repo.changelog.rev(node)
1142 ui.write(
1142 ui.write(
1143 _(
1143 _(
1144 b"Testing changeset %d:%s "
1144 b"Testing changeset %d:%s "
1145 b"(%d changesets remaining, ~%d tests)\n"
1145 b"(%d changesets remaining, ~%d tests)\n"
1146 )
1146 )
1147 % (rev, short(node), changesets, tests)
1147 % (rev, short(node), changesets, tests)
1148 )
1148 )
1149 state[b'current'] = [node]
1149 state[b'current'] = [node]
1150 hbisect.save_state(repo, state)
1150 hbisect.save_state(repo, state)
1151 return mayupdate(repo, node)
1151 return mayupdate(repo, node)
1152
1152
1153
1153
1154 @command(
1154 @command(
1155 b'bookmarks|bookmark',
1155 b'bookmarks|bookmark',
1156 [
1156 [
1157 (b'f', b'force', False, _(b'force')),
1157 (b'f', b'force', False, _(b'force')),
1158 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1158 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1159 (b'd', b'delete', False, _(b'delete a given bookmark')),
1159 (b'd', b'delete', False, _(b'delete a given bookmark')),
1160 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1160 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1161 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1161 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1162 (b'l', b'list', False, _(b'list existing bookmarks')),
1162 (b'l', b'list', False, _(b'list existing bookmarks')),
1163 ]
1163 ]
1164 + formatteropts,
1164 + formatteropts,
1165 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1165 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1166 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1166 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1167 )
1167 )
1168 def bookmark(ui, repo, *names, **opts):
1168 def bookmark(ui, repo, *names, **opts):
1169 '''create a new bookmark or list existing bookmarks
1169 '''create a new bookmark or list existing bookmarks
1170
1170
1171 Bookmarks are labels on changesets to help track lines of development.
1171 Bookmarks are labels on changesets to help track lines of development.
1172 Bookmarks are unversioned and can be moved, renamed and deleted.
1172 Bookmarks are unversioned and can be moved, renamed and deleted.
1173 Deleting or moving a bookmark has no effect on the associated changesets.
1173 Deleting or moving a bookmark has no effect on the associated changesets.
1174
1174
1175 Creating or updating to a bookmark causes it to be marked as 'active'.
1175 Creating or updating to a bookmark causes it to be marked as 'active'.
1176 The active bookmark is indicated with a '*'.
1176 The active bookmark is indicated with a '*'.
1177 When a commit is made, the active bookmark will advance to the new commit.
1177 When a commit is made, the active bookmark will advance to the new commit.
1178 A plain :hg:`update` will also advance an active bookmark, if possible.
1178 A plain :hg:`update` will also advance an active bookmark, if possible.
1179 Updating away from a bookmark will cause it to be deactivated.
1179 Updating away from a bookmark will cause it to be deactivated.
1180
1180
1181 Bookmarks can be pushed and pulled between repositories (see
1181 Bookmarks can be pushed and pulled between repositories (see
1182 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1182 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1183 diverged, a new 'divergent bookmark' of the form 'name@path' will
1183 diverged, a new 'divergent bookmark' of the form 'name@path' will
1184 be created. Using :hg:`merge` will resolve the divergence.
1184 be created. Using :hg:`merge` will resolve the divergence.
1185
1185
1186 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1186 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1187 the active bookmark's name.
1187 the active bookmark's name.
1188
1188
1189 A bookmark named '@' has the special property that :hg:`clone` will
1189 A bookmark named '@' has the special property that :hg:`clone` will
1190 check it out by default if it exists.
1190 check it out by default if it exists.
1191
1191
1192 .. container:: verbose
1192 .. container:: verbose
1193
1193
1194 Template:
1194 Template:
1195
1195
1196 The following keywords are supported in addition to the common template
1196 The following keywords are supported in addition to the common template
1197 keywords and functions such as ``{bookmark}``. See also
1197 keywords and functions such as ``{bookmark}``. See also
1198 :hg:`help templates`.
1198 :hg:`help templates`.
1199
1199
1200 :active: Boolean. True if the bookmark is active.
1200 :active: Boolean. True if the bookmark is active.
1201
1201
1202 Examples:
1202 Examples:
1203
1203
1204 - create an active bookmark for a new line of development::
1204 - create an active bookmark for a new line of development::
1205
1205
1206 hg book new-feature
1206 hg book new-feature
1207
1207
1208 - create an inactive bookmark as a place marker::
1208 - create an inactive bookmark as a place marker::
1209
1209
1210 hg book -i reviewed
1210 hg book -i reviewed
1211
1211
1212 - create an inactive bookmark on another changeset::
1212 - create an inactive bookmark on another changeset::
1213
1213
1214 hg book -r .^ tested
1214 hg book -r .^ tested
1215
1215
1216 - rename bookmark turkey to dinner::
1216 - rename bookmark turkey to dinner::
1217
1217
1218 hg book -m turkey dinner
1218 hg book -m turkey dinner
1219
1219
1220 - move the '@' bookmark from another branch::
1220 - move the '@' bookmark from another branch::
1221
1221
1222 hg book -f @
1222 hg book -f @
1223
1223
1224 - print only the active bookmark name::
1224 - print only the active bookmark name::
1225
1225
1226 hg book -ql .
1226 hg book -ql .
1227 '''
1227 '''
1228 opts = pycompat.byteskwargs(opts)
1228 opts = pycompat.byteskwargs(opts)
1229 force = opts.get(b'force')
1229 force = opts.get(b'force')
1230 rev = opts.get(b'rev')
1230 rev = opts.get(b'rev')
1231 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1231 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1232
1232
1233 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1233 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1234 if action:
1234 if action:
1235 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1235 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1236 elif names or rev:
1236 elif names or rev:
1237 action = b'add'
1237 action = b'add'
1238 elif inactive:
1238 elif inactive:
1239 action = b'inactive' # meaning deactivate
1239 action = b'inactive' # meaning deactivate
1240 else:
1240 else:
1241 action = b'list'
1241 action = b'list'
1242
1242
1243 cmdutil.check_incompatible_arguments(
1243 cmdutil.check_incompatible_arguments(
1244 opts, b'inactive', [b'delete', b'list']
1244 opts, b'inactive', [b'delete', b'list']
1245 )
1245 )
1246 if not names and action in {b'add', b'delete'}:
1246 if not names and action in {b'add', b'delete'}:
1247 raise error.InputError(_(b"bookmark name required"))
1247 raise error.InputError(_(b"bookmark name required"))
1248
1248
1249 if action in {b'add', b'delete', b'rename', b'inactive'}:
1249 if action in {b'add', b'delete', b'rename', b'inactive'}:
1250 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1250 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1251 if action == b'delete':
1251 if action == b'delete':
1252 names = pycompat.maplist(repo._bookmarks.expandname, names)
1252 names = pycompat.maplist(repo._bookmarks.expandname, names)
1253 bookmarks.delete(repo, tr, names)
1253 bookmarks.delete(repo, tr, names)
1254 elif action == b'rename':
1254 elif action == b'rename':
1255 if not names:
1255 if not names:
1256 raise error.InputError(_(b"new bookmark name required"))
1256 raise error.InputError(_(b"new bookmark name required"))
1257 elif len(names) > 1:
1257 elif len(names) > 1:
1258 raise error.InputError(
1258 raise error.InputError(
1259 _(b"only one new bookmark name allowed")
1259 _(b"only one new bookmark name allowed")
1260 )
1260 )
1261 oldname = repo._bookmarks.expandname(opts[b'rename'])
1261 oldname = repo._bookmarks.expandname(opts[b'rename'])
1262 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1262 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1263 elif action == b'add':
1263 elif action == b'add':
1264 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1264 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1265 elif action == b'inactive':
1265 elif action == b'inactive':
1266 if len(repo._bookmarks) == 0:
1266 if len(repo._bookmarks) == 0:
1267 ui.status(_(b"no bookmarks set\n"))
1267 ui.status(_(b"no bookmarks set\n"))
1268 elif not repo._activebookmark:
1268 elif not repo._activebookmark:
1269 ui.status(_(b"no active bookmark\n"))
1269 ui.status(_(b"no active bookmark\n"))
1270 else:
1270 else:
1271 bookmarks.deactivate(repo)
1271 bookmarks.deactivate(repo)
1272 elif action == b'list':
1272 elif action == b'list':
1273 names = pycompat.maplist(repo._bookmarks.expandname, names)
1273 names = pycompat.maplist(repo._bookmarks.expandname, names)
1274 with ui.formatter(b'bookmarks', opts) as fm:
1274 with ui.formatter(b'bookmarks', opts) as fm:
1275 bookmarks.printbookmarks(ui, repo, fm, names)
1275 bookmarks.printbookmarks(ui, repo, fm, names)
1276 else:
1276 else:
1277 raise error.ProgrammingError(b'invalid action: %s' % action)
1277 raise error.ProgrammingError(b'invalid action: %s' % action)
1278
1278
1279
1279
1280 @command(
1280 @command(
1281 b'branch',
1281 b'branch',
1282 [
1282 [
1283 (
1283 (
1284 b'f',
1284 b'f',
1285 b'force',
1285 b'force',
1286 None,
1286 None,
1287 _(b'set branch name even if it shadows an existing branch'),
1287 _(b'set branch name even if it shadows an existing branch'),
1288 ),
1288 ),
1289 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1289 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1290 (
1290 (
1291 b'r',
1291 b'r',
1292 b'rev',
1292 b'rev',
1293 [],
1293 [],
1294 _(b'change branches of the given revs (EXPERIMENTAL)'),
1294 _(b'change branches of the given revs (EXPERIMENTAL)'),
1295 ),
1295 ),
1296 ],
1296 ],
1297 _(b'[-fC] [NAME]'),
1297 _(b'[-fC] [NAME]'),
1298 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1298 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1299 )
1299 )
1300 def branch(ui, repo, label=None, **opts):
1300 def branch(ui, repo, label=None, **opts):
1301 """set or show the current branch name
1301 """set or show the current branch name
1302
1302
1303 .. note::
1303 .. note::
1304
1304
1305 Branch names are permanent and global. Use :hg:`bookmark` to create a
1305 Branch names are permanent and global. Use :hg:`bookmark` to create a
1306 light-weight bookmark instead. See :hg:`help glossary` for more
1306 light-weight bookmark instead. See :hg:`help glossary` for more
1307 information about named branches and bookmarks.
1307 information about named branches and bookmarks.
1308
1308
1309 With no argument, show the current branch name. With one argument,
1309 With no argument, show the current branch name. With one argument,
1310 set the working directory branch name (the branch will not exist
1310 set the working directory branch name (the branch will not exist
1311 in the repository until the next commit). Standard practice
1311 in the repository until the next commit). Standard practice
1312 recommends that primary development take place on the 'default'
1312 recommends that primary development take place on the 'default'
1313 branch.
1313 branch.
1314
1314
1315 Unless -f/--force is specified, branch will not let you set a
1315 Unless -f/--force is specified, branch will not let you set a
1316 branch name that already exists.
1316 branch name that already exists.
1317
1317
1318 Use -C/--clean to reset the working directory branch to that of
1318 Use -C/--clean to reset the working directory branch to that of
1319 the parent of the working directory, negating a previous branch
1319 the parent of the working directory, negating a previous branch
1320 change.
1320 change.
1321
1321
1322 Use the command :hg:`update` to switch to an existing branch. Use
1322 Use the command :hg:`update` to switch to an existing branch. Use
1323 :hg:`commit --close-branch` to mark this branch head as closed.
1323 :hg:`commit --close-branch` to mark this branch head as closed.
1324 When all heads of a branch are closed, the branch will be
1324 When all heads of a branch are closed, the branch will be
1325 considered closed.
1325 considered closed.
1326
1326
1327 Returns 0 on success.
1327 Returns 0 on success.
1328 """
1328 """
1329 opts = pycompat.byteskwargs(opts)
1329 opts = pycompat.byteskwargs(opts)
1330 revs = opts.get(b'rev')
1330 revs = opts.get(b'rev')
1331 if label:
1331 if label:
1332 label = label.strip()
1332 label = label.strip()
1333
1333
1334 if not opts.get(b'clean') and not label:
1334 if not opts.get(b'clean') and not label:
1335 if revs:
1335 if revs:
1336 raise error.InputError(
1336 raise error.InputError(
1337 _(b"no branch name specified for the revisions")
1337 _(b"no branch name specified for the revisions")
1338 )
1338 )
1339 ui.write(b"%s\n" % repo.dirstate.branch())
1339 ui.write(b"%s\n" % repo.dirstate.branch())
1340 return
1340 return
1341
1341
1342 with repo.wlock():
1342 with repo.wlock():
1343 if opts.get(b'clean'):
1343 if opts.get(b'clean'):
1344 label = repo[b'.'].branch()
1344 label = repo[b'.'].branch()
1345 repo.dirstate.setbranch(label)
1345 repo.dirstate.setbranch(label)
1346 ui.status(_(b'reset working directory to branch %s\n') % label)
1346 ui.status(_(b'reset working directory to branch %s\n') % label)
1347 elif label:
1347 elif label:
1348
1348
1349 scmutil.checknewlabel(repo, label, b'branch')
1349 scmutil.checknewlabel(repo, label, b'branch')
1350 if revs:
1350 if revs:
1351 return cmdutil.changebranch(ui, repo, revs, label, opts)
1351 return cmdutil.changebranch(ui, repo, revs, label, opts)
1352
1352
1353 if not opts.get(b'force') and label in repo.branchmap():
1353 if not opts.get(b'force') and label in repo.branchmap():
1354 if label not in [p.branch() for p in repo[None].parents()]:
1354 if label not in [p.branch() for p in repo[None].parents()]:
1355 raise error.InputError(
1355 raise error.InputError(
1356 _(b'a branch of the same name already exists'),
1356 _(b'a branch of the same name already exists'),
1357 # i18n: "it" refers to an existing branch
1357 # i18n: "it" refers to an existing branch
1358 hint=_(b"use 'hg update' to switch to it"),
1358 hint=_(b"use 'hg update' to switch to it"),
1359 )
1359 )
1360
1360
1361 repo.dirstate.setbranch(label)
1361 repo.dirstate.setbranch(label)
1362 ui.status(_(b'marked working directory as branch %s\n') % label)
1362 ui.status(_(b'marked working directory as branch %s\n') % label)
1363
1363
1364 # find any open named branches aside from default
1364 # find any open named branches aside from default
1365 for n, h, t, c in repo.branchmap().iterbranches():
1365 for n, h, t, c in repo.branchmap().iterbranches():
1366 if n != b"default" and not c:
1366 if n != b"default" and not c:
1367 return 0
1367 return 0
1368 ui.status(
1368 ui.status(
1369 _(
1369 _(
1370 b'(branches are permanent and global, '
1370 b'(branches are permanent and global, '
1371 b'did you want a bookmark?)\n'
1371 b'did you want a bookmark?)\n'
1372 )
1372 )
1373 )
1373 )
1374
1374
1375
1375
1376 @command(
1376 @command(
1377 b'branches',
1377 b'branches',
1378 [
1378 [
1379 (
1379 (
1380 b'a',
1380 b'a',
1381 b'active',
1381 b'active',
1382 False,
1382 False,
1383 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1383 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1384 ),
1384 ),
1385 (b'c', b'closed', False, _(b'show normal and closed branches')),
1385 (b'c', b'closed', False, _(b'show normal and closed branches')),
1386 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1386 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1387 ]
1387 ]
1388 + formatteropts,
1388 + formatteropts,
1389 _(b'[-c]'),
1389 _(b'[-c]'),
1390 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1390 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1391 intents={INTENT_READONLY},
1391 intents={INTENT_READONLY},
1392 )
1392 )
1393 def branches(ui, repo, active=False, closed=False, **opts):
1393 def branches(ui, repo, active=False, closed=False, **opts):
1394 """list repository named branches
1394 """list repository named branches
1395
1395
1396 List the repository's named branches, indicating which ones are
1396 List the repository's named branches, indicating which ones are
1397 inactive. If -c/--closed is specified, also list branches which have
1397 inactive. If -c/--closed is specified, also list branches which have
1398 been marked closed (see :hg:`commit --close-branch`).
1398 been marked closed (see :hg:`commit --close-branch`).
1399
1399
1400 Use the command :hg:`update` to switch to an existing branch.
1400 Use the command :hg:`update` to switch to an existing branch.
1401
1401
1402 .. container:: verbose
1402 .. container:: verbose
1403
1403
1404 Template:
1404 Template:
1405
1405
1406 The following keywords are supported in addition to the common template
1406 The following keywords are supported in addition to the common template
1407 keywords and functions such as ``{branch}``. See also
1407 keywords and functions such as ``{branch}``. See also
1408 :hg:`help templates`.
1408 :hg:`help templates`.
1409
1409
1410 :active: Boolean. True if the branch is active.
1410 :active: Boolean. True if the branch is active.
1411 :closed: Boolean. True if the branch is closed.
1411 :closed: Boolean. True if the branch is closed.
1412 :current: Boolean. True if it is the current branch.
1412 :current: Boolean. True if it is the current branch.
1413
1413
1414 Returns 0.
1414 Returns 0.
1415 """
1415 """
1416
1416
1417 opts = pycompat.byteskwargs(opts)
1417 opts = pycompat.byteskwargs(opts)
1418 revs = opts.get(b'rev')
1418 revs = opts.get(b'rev')
1419 selectedbranches = None
1419 selectedbranches = None
1420 if revs:
1420 if revs:
1421 revs = scmutil.revrange(repo, revs)
1421 revs = scmutil.revrange(repo, revs)
1422 getbi = repo.revbranchcache().branchinfo
1422 getbi = repo.revbranchcache().branchinfo
1423 selectedbranches = {getbi(r)[0] for r in revs}
1423 selectedbranches = {getbi(r)[0] for r in revs}
1424
1424
1425 ui.pager(b'branches')
1425 ui.pager(b'branches')
1426 fm = ui.formatter(b'branches', opts)
1426 fm = ui.formatter(b'branches', opts)
1427 hexfunc = fm.hexfunc
1427 hexfunc = fm.hexfunc
1428
1428
1429 allheads = set(repo.heads())
1429 allheads = set(repo.heads())
1430 branches = []
1430 branches = []
1431 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1431 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1432 if selectedbranches is not None and tag not in selectedbranches:
1432 if selectedbranches is not None and tag not in selectedbranches:
1433 continue
1433 continue
1434 isactive = False
1434 isactive = False
1435 if not isclosed:
1435 if not isclosed:
1436 openheads = set(repo.branchmap().iteropen(heads))
1436 openheads = set(repo.branchmap().iteropen(heads))
1437 isactive = bool(openheads & allheads)
1437 isactive = bool(openheads & allheads)
1438 branches.append((tag, repo[tip], isactive, not isclosed))
1438 branches.append((tag, repo[tip], isactive, not isclosed))
1439 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1439 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1440
1440
1441 for tag, ctx, isactive, isopen in branches:
1441 for tag, ctx, isactive, isopen in branches:
1442 if active and not isactive:
1442 if active and not isactive:
1443 continue
1443 continue
1444 if isactive:
1444 if isactive:
1445 label = b'branches.active'
1445 label = b'branches.active'
1446 notice = b''
1446 notice = b''
1447 elif not isopen:
1447 elif not isopen:
1448 if not closed:
1448 if not closed:
1449 continue
1449 continue
1450 label = b'branches.closed'
1450 label = b'branches.closed'
1451 notice = _(b' (closed)')
1451 notice = _(b' (closed)')
1452 else:
1452 else:
1453 label = b'branches.inactive'
1453 label = b'branches.inactive'
1454 notice = _(b' (inactive)')
1454 notice = _(b' (inactive)')
1455 current = tag == repo.dirstate.branch()
1455 current = tag == repo.dirstate.branch()
1456 if current:
1456 if current:
1457 label = b'branches.current'
1457 label = b'branches.current'
1458
1458
1459 fm.startitem()
1459 fm.startitem()
1460 fm.write(b'branch', b'%s', tag, label=label)
1460 fm.write(b'branch', b'%s', tag, label=label)
1461 rev = ctx.rev()
1461 rev = ctx.rev()
1462 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1462 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1463 fmt = b' ' * padsize + b' %d:%s'
1463 fmt = b' ' * padsize + b' %d:%s'
1464 fm.condwrite(
1464 fm.condwrite(
1465 not ui.quiet,
1465 not ui.quiet,
1466 b'rev node',
1466 b'rev node',
1467 fmt,
1467 fmt,
1468 rev,
1468 rev,
1469 hexfunc(ctx.node()),
1469 hexfunc(ctx.node()),
1470 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1470 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1471 )
1471 )
1472 fm.context(ctx=ctx)
1472 fm.context(ctx=ctx)
1473 fm.data(active=isactive, closed=not isopen, current=current)
1473 fm.data(active=isactive, closed=not isopen, current=current)
1474 if not ui.quiet:
1474 if not ui.quiet:
1475 fm.plain(notice)
1475 fm.plain(notice)
1476 fm.plain(b'\n')
1476 fm.plain(b'\n')
1477 fm.end()
1477 fm.end()
1478
1478
1479
1479
1480 @command(
1480 @command(
1481 b'bundle',
1481 b'bundle',
1482 [
1482 [
1483 (
1483 (
1484 b'f',
1484 b'f',
1485 b'force',
1485 b'force',
1486 None,
1486 None,
1487 _(b'run even when the destination is unrelated'),
1487 _(b'run even when the destination is unrelated'),
1488 ),
1488 ),
1489 (
1489 (
1490 b'r',
1490 b'r',
1491 b'rev',
1491 b'rev',
1492 [],
1492 [],
1493 _(b'a changeset intended to be added to the destination'),
1493 _(b'a changeset intended to be added to the destination'),
1494 _(b'REV'),
1494 _(b'REV'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'b',
1497 b'b',
1498 b'branch',
1498 b'branch',
1499 [],
1499 [],
1500 _(b'a specific branch you would like to bundle'),
1500 _(b'a specific branch you would like to bundle'),
1501 _(b'BRANCH'),
1501 _(b'BRANCH'),
1502 ),
1502 ),
1503 (
1503 (
1504 b'',
1504 b'',
1505 b'base',
1505 b'base',
1506 [],
1506 [],
1507 _(b'a base changeset assumed to be available at the destination'),
1507 _(b'a base changeset assumed to be available at the destination'),
1508 _(b'REV'),
1508 _(b'REV'),
1509 ),
1509 ),
1510 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1510 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1511 (
1511 (
1512 b't',
1512 b't',
1513 b'type',
1513 b'type',
1514 b'bzip2',
1514 b'bzip2',
1515 _(b'bundle compression type to use'),
1515 _(b'bundle compression type to use'),
1516 _(b'TYPE'),
1516 _(b'TYPE'),
1517 ),
1517 ),
1518 ]
1518 ]
1519 + remoteopts,
1519 + remoteopts,
1520 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1520 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1521 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1521 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1522 )
1522 )
1523 def bundle(ui, repo, fname, dest=None, **opts):
1523 def bundle(ui, repo, fname, dest=None, **opts):
1524 """create a bundle file
1524 """create a bundle file
1525
1525
1526 Generate a bundle file containing data to be transferred to another
1526 Generate a bundle file containing data to be transferred to another
1527 repository.
1527 repository.
1528
1528
1529 To create a bundle containing all changesets, use -a/--all
1529 To create a bundle containing all changesets, use -a/--all
1530 (or --base null). Otherwise, hg assumes the destination will have
1530 (or --base null). Otherwise, hg assumes the destination will have
1531 all the nodes you specify with --base parameters. Otherwise, hg
1531 all the nodes you specify with --base parameters. Otherwise, hg
1532 will assume the repository has all the nodes in destination, or
1532 will assume the repository has all the nodes in destination, or
1533 default-push/default if no destination is specified, where destination
1533 default-push/default if no destination is specified, where destination
1534 is the repository you provide through DEST option.
1534 is the repository you provide through DEST option.
1535
1535
1536 You can change bundle format with the -t/--type option. See
1536 You can change bundle format with the -t/--type option. See
1537 :hg:`help bundlespec` for documentation on this format. By default,
1537 :hg:`help bundlespec` for documentation on this format. By default,
1538 the most appropriate format is used and compression defaults to
1538 the most appropriate format is used and compression defaults to
1539 bzip2.
1539 bzip2.
1540
1540
1541 The bundle file can then be transferred using conventional means
1541 The bundle file can then be transferred using conventional means
1542 and applied to another repository with the unbundle or pull
1542 and applied to another repository with the unbundle or pull
1543 command. This is useful when direct push and pull are not
1543 command. This is useful when direct push and pull are not
1544 available or when exporting an entire repository is undesirable.
1544 available or when exporting an entire repository is undesirable.
1545
1545
1546 Applying bundles preserves all changeset contents including
1546 Applying bundles preserves all changeset contents including
1547 permissions, copy/rename information, and revision history.
1547 permissions, copy/rename information, and revision history.
1548
1548
1549 Returns 0 on success, 1 if no changes found.
1549 Returns 0 on success, 1 if no changes found.
1550 """
1550 """
1551 opts = pycompat.byteskwargs(opts)
1551 opts = pycompat.byteskwargs(opts)
1552 revs = None
1552 revs = None
1553 if b'rev' in opts:
1553 if b'rev' in opts:
1554 revstrings = opts[b'rev']
1554 revstrings = opts[b'rev']
1555 revs = scmutil.revrange(repo, revstrings)
1555 revs = scmutil.revrange(repo, revstrings)
1556 if revstrings and not revs:
1556 if revstrings and not revs:
1557 raise error.InputError(_(b'no commits to bundle'))
1557 raise error.InputError(_(b'no commits to bundle'))
1558
1558
1559 bundletype = opts.get(b'type', b'bzip2').lower()
1559 bundletype = opts.get(b'type', b'bzip2').lower()
1560 try:
1560 try:
1561 bundlespec = bundlecaches.parsebundlespec(
1561 bundlespec = bundlecaches.parsebundlespec(
1562 repo, bundletype, strict=False
1562 repo, bundletype, strict=False
1563 )
1563 )
1564 except error.UnsupportedBundleSpecification as e:
1564 except error.UnsupportedBundleSpecification as e:
1565 raise error.InputError(
1565 raise error.InputError(
1566 pycompat.bytestr(e),
1566 pycompat.bytestr(e),
1567 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1567 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1568 )
1568 )
1569 cgversion = bundlespec.contentopts[b"cg.version"]
1569 cgversion = bundlespec.contentopts[b"cg.version"]
1570
1570
1571 # Packed bundles are a pseudo bundle format for now.
1571 # Packed bundles are a pseudo bundle format for now.
1572 if cgversion == b's1':
1572 if cgversion == b's1':
1573 raise error.InputError(
1573 raise error.InputError(
1574 _(b'packed bundles cannot be produced by "hg bundle"'),
1574 _(b'packed bundles cannot be produced by "hg bundle"'),
1575 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1575 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1576 )
1576 )
1577
1577
1578 if opts.get(b'all'):
1578 if opts.get(b'all'):
1579 if dest:
1579 if dest:
1580 raise error.InputError(
1580 raise error.InputError(
1581 _(b"--all is incompatible with specifying a destination")
1581 _(b"--all is incompatible with specifying a destination")
1582 )
1582 )
1583 if opts.get(b'base'):
1583 if opts.get(b'base'):
1584 ui.warn(_(b"ignoring --base because --all was specified\n"))
1584 ui.warn(_(b"ignoring --base because --all was specified\n"))
1585 base = [nullrev]
1585 base = [nullrev]
1586 else:
1586 else:
1587 base = scmutil.revrange(repo, opts.get(b'base'))
1587 base = scmutil.revrange(repo, opts.get(b'base'))
1588 if cgversion not in changegroup.supportedoutgoingversions(repo):
1588 if cgversion not in changegroup.supportedoutgoingversions(repo):
1589 raise error.Abort(
1589 raise error.Abort(
1590 _(b"repository does not support bundle version %s") % cgversion
1590 _(b"repository does not support bundle version %s") % cgversion
1591 )
1591 )
1592
1592
1593 if base:
1593 if base:
1594 if dest:
1594 if dest:
1595 raise error.InputError(
1595 raise error.InputError(
1596 _(b"--base is incompatible with specifying a destination")
1596 _(b"--base is incompatible with specifying a destination")
1597 )
1597 )
1598 common = [repo[rev].node() for rev in base]
1598 common = [repo[rev].node() for rev in base]
1599 heads = [repo[r].node() for r in revs] if revs else None
1599 heads = [repo[r].node() for r in revs] if revs else None
1600 outgoing = discovery.outgoing(repo, common, heads)
1600 outgoing = discovery.outgoing(repo, common, heads)
1601 else:
1601 else:
1602 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1602 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1603 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1603 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1604 other = hg.peer(repo, opts, dest)
1604 other = hg.peer(repo, opts, dest)
1605 revs = [repo[r].hex() for r in revs]
1605 revs = [repo[r].hex() for r in revs]
1606 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1606 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1607 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1607 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1608 outgoing = discovery.findcommonoutgoing(
1608 outgoing = discovery.findcommonoutgoing(
1609 repo,
1609 repo,
1610 other,
1610 other,
1611 onlyheads=heads,
1611 onlyheads=heads,
1612 force=opts.get(b'force'),
1612 force=opts.get(b'force'),
1613 portable=True,
1613 portable=True,
1614 )
1614 )
1615
1615
1616 if not outgoing.missing:
1616 if not outgoing.missing:
1617 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1617 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1618 return 1
1618 return 1
1619
1619
1620 if cgversion == b'01': # bundle1
1620 if cgversion == b'01': # bundle1
1621 bversion = b'HG10' + bundlespec.wirecompression
1621 bversion = b'HG10' + bundlespec.wirecompression
1622 bcompression = None
1622 bcompression = None
1623 elif cgversion in (b'02', b'03'):
1623 elif cgversion in (b'02', b'03'):
1624 bversion = b'HG20'
1624 bversion = b'HG20'
1625 bcompression = bundlespec.wirecompression
1625 bcompression = bundlespec.wirecompression
1626 else:
1626 else:
1627 raise error.ProgrammingError(
1627 raise error.ProgrammingError(
1628 b'bundle: unexpected changegroup version %s' % cgversion
1628 b'bundle: unexpected changegroup version %s' % cgversion
1629 )
1629 )
1630
1630
1631 # TODO compression options should be derived from bundlespec parsing.
1631 # TODO compression options should be derived from bundlespec parsing.
1632 # This is a temporary hack to allow adjusting bundle compression
1632 # This is a temporary hack to allow adjusting bundle compression
1633 # level without a) formalizing the bundlespec changes to declare it
1633 # level without a) formalizing the bundlespec changes to declare it
1634 # b) introducing a command flag.
1634 # b) introducing a command flag.
1635 compopts = {}
1635 compopts = {}
1636 complevel = ui.configint(
1636 complevel = ui.configint(
1637 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1637 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1638 )
1638 )
1639 if complevel is None:
1639 if complevel is None:
1640 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1640 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1641 if complevel is not None:
1641 if complevel is not None:
1642 compopts[b'level'] = complevel
1642 compopts[b'level'] = complevel
1643
1643
1644 # Allow overriding the bundling of obsmarker in phases through
1644 # Allow overriding the bundling of obsmarker in phases through
1645 # configuration while we don't have a bundle version that include them
1645 # configuration while we don't have a bundle version that include them
1646 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1646 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1647 bundlespec.contentopts[b'obsolescence'] = True
1647 bundlespec.contentopts[b'obsolescence'] = True
1648 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1648 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1649 bundlespec.contentopts[b'phases'] = True
1649 bundlespec.contentopts[b'phases'] = True
1650
1650
1651 bundle2.writenewbundle(
1651 bundle2.writenewbundle(
1652 ui,
1652 ui,
1653 repo,
1653 repo,
1654 b'bundle',
1654 b'bundle',
1655 fname,
1655 fname,
1656 bversion,
1656 bversion,
1657 outgoing,
1657 outgoing,
1658 bundlespec.contentopts,
1658 bundlespec.contentopts,
1659 compression=bcompression,
1659 compression=bcompression,
1660 compopts=compopts,
1660 compopts=compopts,
1661 )
1661 )
1662
1662
1663
1663
1664 @command(
1664 @command(
1665 b'cat',
1665 b'cat',
1666 [
1666 [
1667 (
1667 (
1668 b'o',
1668 b'o',
1669 b'output',
1669 b'output',
1670 b'',
1670 b'',
1671 _(b'print output to file with formatted name'),
1671 _(b'print output to file with formatted name'),
1672 _(b'FORMAT'),
1672 _(b'FORMAT'),
1673 ),
1673 ),
1674 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1674 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1675 (b'', b'decode', None, _(b'apply any matching decode filter')),
1675 (b'', b'decode', None, _(b'apply any matching decode filter')),
1676 ]
1676 ]
1677 + walkopts
1677 + walkopts
1678 + formatteropts,
1678 + formatteropts,
1679 _(b'[OPTION]... FILE...'),
1679 _(b'[OPTION]... FILE...'),
1680 helpcategory=command.CATEGORY_FILE_CONTENTS,
1680 helpcategory=command.CATEGORY_FILE_CONTENTS,
1681 inferrepo=True,
1681 inferrepo=True,
1682 intents={INTENT_READONLY},
1682 intents={INTENT_READONLY},
1683 )
1683 )
1684 def cat(ui, repo, file1, *pats, **opts):
1684 def cat(ui, repo, file1, *pats, **opts):
1685 """output the current or given revision of files
1685 """output the current or given revision of files
1686
1686
1687 Print the specified files as they were at the given revision. If
1687 Print the specified files as they were at the given revision. If
1688 no revision is given, the parent of the working directory is used.
1688 no revision is given, the parent of the working directory is used.
1689
1689
1690 Output may be to a file, in which case the name of the file is
1690 Output may be to a file, in which case the name of the file is
1691 given using a template string. See :hg:`help templates`. In addition
1691 given using a template string. See :hg:`help templates`. In addition
1692 to the common template keywords, the following formatting rules are
1692 to the common template keywords, the following formatting rules are
1693 supported:
1693 supported:
1694
1694
1695 :``%%``: literal "%" character
1695 :``%%``: literal "%" character
1696 :``%s``: basename of file being printed
1696 :``%s``: basename of file being printed
1697 :``%d``: dirname of file being printed, or '.' if in repository root
1697 :``%d``: dirname of file being printed, or '.' if in repository root
1698 :``%p``: root-relative path name of file being printed
1698 :``%p``: root-relative path name of file being printed
1699 :``%H``: changeset hash (40 hexadecimal digits)
1699 :``%H``: changeset hash (40 hexadecimal digits)
1700 :``%R``: changeset revision number
1700 :``%R``: changeset revision number
1701 :``%h``: short-form changeset hash (12 hexadecimal digits)
1701 :``%h``: short-form changeset hash (12 hexadecimal digits)
1702 :``%r``: zero-padded changeset revision number
1702 :``%r``: zero-padded changeset revision number
1703 :``%b``: basename of the exporting repository
1703 :``%b``: basename of the exporting repository
1704 :``\\``: literal "\\" character
1704 :``\\``: literal "\\" character
1705
1705
1706 .. container:: verbose
1706 .. container:: verbose
1707
1707
1708 Template:
1708 Template:
1709
1709
1710 The following keywords are supported in addition to the common template
1710 The following keywords are supported in addition to the common template
1711 keywords and functions. See also :hg:`help templates`.
1711 keywords and functions. See also :hg:`help templates`.
1712
1712
1713 :data: String. File content.
1713 :data: String. File content.
1714 :path: String. Repository-absolute path of the file.
1714 :path: String. Repository-absolute path of the file.
1715
1715
1716 Returns 0 on success.
1716 Returns 0 on success.
1717 """
1717 """
1718 opts = pycompat.byteskwargs(opts)
1718 opts = pycompat.byteskwargs(opts)
1719 rev = opts.get(b'rev')
1719 rev = opts.get(b'rev')
1720 if rev:
1720 if rev:
1721 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1721 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1722 ctx = scmutil.revsingle(repo, rev)
1722 ctx = scmutil.revsingle(repo, rev)
1723 m = scmutil.match(ctx, (file1,) + pats, opts)
1723 m = scmutil.match(ctx, (file1,) + pats, opts)
1724 fntemplate = opts.pop(b'output', b'')
1724 fntemplate = opts.pop(b'output', b'')
1725 if cmdutil.isstdiofilename(fntemplate):
1725 if cmdutil.isstdiofilename(fntemplate):
1726 fntemplate = b''
1726 fntemplate = b''
1727
1727
1728 if fntemplate:
1728 if fntemplate:
1729 fm = formatter.nullformatter(ui, b'cat', opts)
1729 fm = formatter.nullformatter(ui, b'cat', opts)
1730 else:
1730 else:
1731 ui.pager(b'cat')
1731 ui.pager(b'cat')
1732 fm = ui.formatter(b'cat', opts)
1732 fm = ui.formatter(b'cat', opts)
1733 with fm:
1733 with fm:
1734 return cmdutil.cat(
1734 return cmdutil.cat(
1735 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1735 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1736 )
1736 )
1737
1737
1738
1738
1739 @command(
1739 @command(
1740 b'clone',
1740 b'clone',
1741 [
1741 [
1742 (
1742 (
1743 b'U',
1743 b'U',
1744 b'noupdate',
1744 b'noupdate',
1745 None,
1745 None,
1746 _(
1746 _(
1747 b'the clone will include an empty working '
1747 b'the clone will include an empty working '
1748 b'directory (only a repository)'
1748 b'directory (only a repository)'
1749 ),
1749 ),
1750 ),
1750 ),
1751 (
1751 (
1752 b'u',
1752 b'u',
1753 b'updaterev',
1753 b'updaterev',
1754 b'',
1754 b'',
1755 _(b'revision, tag, or branch to check out'),
1755 _(b'revision, tag, or branch to check out'),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'r',
1759 b'r',
1760 b'rev',
1760 b'rev',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this changeset'
1763 b'do not clone everything, but include this changeset'
1764 b' and its ancestors'
1764 b' and its ancestors'
1765 ),
1765 ),
1766 _(b'REV'),
1766 _(b'REV'),
1767 ),
1767 ),
1768 (
1768 (
1769 b'b',
1769 b'b',
1770 b'branch',
1770 b'branch',
1771 [],
1771 [],
1772 _(
1772 _(
1773 b'do not clone everything, but include this branch\'s'
1773 b'do not clone everything, but include this branch\'s'
1774 b' changesets and their ancestors'
1774 b' changesets and their ancestors'
1775 ),
1775 ),
1776 _(b'BRANCH'),
1776 _(b'BRANCH'),
1777 ),
1777 ),
1778 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1778 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1779 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1779 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1780 (b'', b'stream', None, _(b'clone with minimal data processing')),
1780 (b'', b'stream', None, _(b'clone with minimal data processing')),
1781 ]
1781 ]
1782 + remoteopts,
1782 + remoteopts,
1783 _(b'[OPTION]... SOURCE [DEST]'),
1783 _(b'[OPTION]... SOURCE [DEST]'),
1784 helpcategory=command.CATEGORY_REPO_CREATION,
1784 helpcategory=command.CATEGORY_REPO_CREATION,
1785 helpbasic=True,
1785 helpbasic=True,
1786 norepo=True,
1786 norepo=True,
1787 )
1787 )
1788 def clone(ui, source, dest=None, **opts):
1788 def clone(ui, source, dest=None, **opts):
1789 """make a copy of an existing repository
1789 """make a copy of an existing repository
1790
1790
1791 Create a copy of an existing repository in a new directory.
1791 Create a copy of an existing repository in a new directory.
1792
1792
1793 If no destination directory name is specified, it defaults to the
1793 If no destination directory name is specified, it defaults to the
1794 basename of the source.
1794 basename of the source.
1795
1795
1796 The location of the source is added to the new repository's
1796 The location of the source is added to the new repository's
1797 ``.hg/hgrc`` file, as the default to be used for future pulls.
1797 ``.hg/hgrc`` file, as the default to be used for future pulls.
1798
1798
1799 Only local paths and ``ssh://`` URLs are supported as
1799 Only local paths and ``ssh://`` URLs are supported as
1800 destinations. For ``ssh://`` destinations, no working directory or
1800 destinations. For ``ssh://`` destinations, no working directory or
1801 ``.hg/hgrc`` will be created on the remote side.
1801 ``.hg/hgrc`` will be created on the remote side.
1802
1802
1803 If the source repository has a bookmark called '@' set, that
1803 If the source repository has a bookmark called '@' set, that
1804 revision will be checked out in the new repository by default.
1804 revision will be checked out in the new repository by default.
1805
1805
1806 To check out a particular version, use -u/--update, or
1806 To check out a particular version, use -u/--update, or
1807 -U/--noupdate to create a clone with no working directory.
1807 -U/--noupdate to create a clone with no working directory.
1808
1808
1809 To pull only a subset of changesets, specify one or more revisions
1809 To pull only a subset of changesets, specify one or more revisions
1810 identifiers with -r/--rev or branches with -b/--branch. The
1810 identifiers with -r/--rev or branches with -b/--branch. The
1811 resulting clone will contain only the specified changesets and
1811 resulting clone will contain only the specified changesets and
1812 their ancestors. These options (or 'clone src#rev dest') imply
1812 their ancestors. These options (or 'clone src#rev dest') imply
1813 --pull, even for local source repositories.
1813 --pull, even for local source repositories.
1814
1814
1815 In normal clone mode, the remote normalizes repository data into a common
1815 In normal clone mode, the remote normalizes repository data into a common
1816 exchange format and the receiving end translates this data into its local
1816 exchange format and the receiving end translates this data into its local
1817 storage format. --stream activates a different clone mode that essentially
1817 storage format. --stream activates a different clone mode that essentially
1818 copies repository files from the remote with minimal data processing. This
1818 copies repository files from the remote with minimal data processing. This
1819 significantly reduces the CPU cost of a clone both remotely and locally.
1819 significantly reduces the CPU cost of a clone both remotely and locally.
1820 However, it often increases the transferred data size by 30-40%. This can
1820 However, it often increases the transferred data size by 30-40%. This can
1821 result in substantially faster clones where I/O throughput is plentiful,
1821 result in substantially faster clones where I/O throughput is plentiful,
1822 especially for larger repositories. A side-effect of --stream clones is
1822 especially for larger repositories. A side-effect of --stream clones is
1823 that storage settings and requirements on the remote are applied locally:
1823 that storage settings and requirements on the remote are applied locally:
1824 a modern client may inherit legacy or inefficient storage used by the
1824 a modern client may inherit legacy or inefficient storage used by the
1825 remote or a legacy Mercurial client may not be able to clone from a
1825 remote or a legacy Mercurial client may not be able to clone from a
1826 modern Mercurial remote.
1826 modern Mercurial remote.
1827
1827
1828 .. note::
1828 .. note::
1829
1829
1830 Specifying a tag will include the tagged changeset but not the
1830 Specifying a tag will include the tagged changeset but not the
1831 changeset containing the tag.
1831 changeset containing the tag.
1832
1832
1833 .. container:: verbose
1833 .. container:: verbose
1834
1834
1835 For efficiency, hardlinks are used for cloning whenever the
1835 For efficiency, hardlinks are used for cloning whenever the
1836 source and destination are on the same filesystem (note this
1836 source and destination are on the same filesystem (note this
1837 applies only to the repository data, not to the working
1837 applies only to the repository data, not to the working
1838 directory). Some filesystems, such as AFS, implement hardlinking
1838 directory). Some filesystems, such as AFS, implement hardlinking
1839 incorrectly, but do not report errors. In these cases, use the
1839 incorrectly, but do not report errors. In these cases, use the
1840 --pull option to avoid hardlinking.
1840 --pull option to avoid hardlinking.
1841
1841
1842 Mercurial will update the working directory to the first applicable
1842 Mercurial will update the working directory to the first applicable
1843 revision from this list:
1843 revision from this list:
1844
1844
1845 a) null if -U or the source repository has no changesets
1845 a) null if -U or the source repository has no changesets
1846 b) if -u . and the source repository is local, the first parent of
1846 b) if -u . and the source repository is local, the first parent of
1847 the source repository's working directory
1847 the source repository's working directory
1848 c) the changeset specified with -u (if a branch name, this means the
1848 c) the changeset specified with -u (if a branch name, this means the
1849 latest head of that branch)
1849 latest head of that branch)
1850 d) the changeset specified with -r
1850 d) the changeset specified with -r
1851 e) the tipmost head specified with -b
1851 e) the tipmost head specified with -b
1852 f) the tipmost head specified with the url#branch source syntax
1852 f) the tipmost head specified with the url#branch source syntax
1853 g) the revision marked with the '@' bookmark, if present
1853 g) the revision marked with the '@' bookmark, if present
1854 h) the tipmost head of the default branch
1854 h) the tipmost head of the default branch
1855 i) tip
1855 i) tip
1856
1856
1857 When cloning from servers that support it, Mercurial may fetch
1857 When cloning from servers that support it, Mercurial may fetch
1858 pre-generated data from a server-advertised URL or inline from the
1858 pre-generated data from a server-advertised URL or inline from the
1859 same stream. When this is done, hooks operating on incoming changesets
1859 same stream. When this is done, hooks operating on incoming changesets
1860 and changegroups may fire more than once, once for each pre-generated
1860 and changegroups may fire more than once, once for each pre-generated
1861 bundle and as well as for any additional remaining data. In addition,
1861 bundle and as well as for any additional remaining data. In addition,
1862 if an error occurs, the repository may be rolled back to a partial
1862 if an error occurs, the repository may be rolled back to a partial
1863 clone. This behavior may change in future releases.
1863 clone. This behavior may change in future releases.
1864 See :hg:`help -e clonebundles` for more.
1864 See :hg:`help -e clonebundles` for more.
1865
1865
1866 Examples:
1866 Examples:
1867
1867
1868 - clone a remote repository to a new directory named hg/::
1868 - clone a remote repository to a new directory named hg/::
1869
1869
1870 hg clone https://www.mercurial-scm.org/repo/hg/
1870 hg clone https://www.mercurial-scm.org/repo/hg/
1871
1871
1872 - create a lightweight local clone::
1872 - create a lightweight local clone::
1873
1873
1874 hg clone project/ project-feature/
1874 hg clone project/ project-feature/
1875
1875
1876 - clone from an absolute path on an ssh server (note double-slash)::
1876 - clone from an absolute path on an ssh server (note double-slash)::
1877
1877
1878 hg clone ssh://user@server//home/projects/alpha/
1878 hg clone ssh://user@server//home/projects/alpha/
1879
1879
1880 - do a streaming clone while checking out a specified version::
1880 - do a streaming clone while checking out a specified version::
1881
1881
1882 hg clone --stream http://server/repo -u 1.5
1882 hg clone --stream http://server/repo -u 1.5
1883
1883
1884 - create a repository without changesets after a particular revision::
1884 - create a repository without changesets after a particular revision::
1885
1885
1886 hg clone -r 04e544 experimental/ good/
1886 hg clone -r 04e544 experimental/ good/
1887
1887
1888 - clone (and track) a particular named branch::
1888 - clone (and track) a particular named branch::
1889
1889
1890 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1890 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1891
1891
1892 See :hg:`help urls` for details on specifying URLs.
1892 See :hg:`help urls` for details on specifying URLs.
1893
1893
1894 Returns 0 on success.
1894 Returns 0 on success.
1895 """
1895 """
1896 opts = pycompat.byteskwargs(opts)
1896 opts = pycompat.byteskwargs(opts)
1897 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1897 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1898
1898
1899 # --include/--exclude can come from narrow or sparse.
1899 # --include/--exclude can come from narrow or sparse.
1900 includepats, excludepats = None, None
1900 includepats, excludepats = None, None
1901
1901
1902 # hg.clone() differentiates between None and an empty set. So make sure
1902 # hg.clone() differentiates between None and an empty set. So make sure
1903 # patterns are sets if narrow is requested without patterns.
1903 # patterns are sets if narrow is requested without patterns.
1904 if opts.get(b'narrow'):
1904 if opts.get(b'narrow'):
1905 includepats = set()
1905 includepats = set()
1906 excludepats = set()
1906 excludepats = set()
1907
1907
1908 if opts.get(b'include'):
1908 if opts.get(b'include'):
1909 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1909 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1910 if opts.get(b'exclude'):
1910 if opts.get(b'exclude'):
1911 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1911 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1912
1912
1913 r = hg.clone(
1913 r = hg.clone(
1914 ui,
1914 ui,
1915 opts,
1915 opts,
1916 source,
1916 source,
1917 dest,
1917 dest,
1918 pull=opts.get(b'pull'),
1918 pull=opts.get(b'pull'),
1919 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1919 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1920 revs=opts.get(b'rev'),
1920 revs=opts.get(b'rev'),
1921 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1921 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1922 branch=opts.get(b'branch'),
1922 branch=opts.get(b'branch'),
1923 shareopts=opts.get(b'shareopts'),
1923 shareopts=opts.get(b'shareopts'),
1924 storeincludepats=includepats,
1924 storeincludepats=includepats,
1925 storeexcludepats=excludepats,
1925 storeexcludepats=excludepats,
1926 depth=opts.get(b'depth') or None,
1926 depth=opts.get(b'depth') or None,
1927 )
1927 )
1928
1928
1929 return r is None
1929 return r is None
1930
1930
1931
1931
1932 @command(
1932 @command(
1933 b'commit|ci',
1933 b'commit|ci',
1934 [
1934 [
1935 (
1935 (
1936 b'A',
1936 b'A',
1937 b'addremove',
1937 b'addremove',
1938 None,
1938 None,
1939 _(b'mark new/missing files as added/removed before committing'),
1939 _(b'mark new/missing files as added/removed before committing'),
1940 ),
1940 ),
1941 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1941 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1942 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1942 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1943 (b's', b'secret', None, _(b'use the secret phase for committing')),
1943 (b's', b'secret', None, _(b'use the secret phase for committing')),
1944 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1944 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1945 (
1945 (
1946 b'',
1946 b'',
1947 b'force-close-branch',
1947 b'force-close-branch',
1948 None,
1948 None,
1949 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1949 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1950 ),
1950 ),
1951 (b'i', b'interactive', None, _(b'use interactive mode')),
1951 (b'i', b'interactive', None, _(b'use interactive mode')),
1952 ]
1952 ]
1953 + walkopts
1953 + walkopts
1954 + commitopts
1954 + commitopts
1955 + commitopts2
1955 + commitopts2
1956 + subrepoopts,
1956 + subrepoopts,
1957 _(b'[OPTION]... [FILE]...'),
1957 _(b'[OPTION]... [FILE]...'),
1958 helpcategory=command.CATEGORY_COMMITTING,
1958 helpcategory=command.CATEGORY_COMMITTING,
1959 helpbasic=True,
1959 helpbasic=True,
1960 inferrepo=True,
1960 inferrepo=True,
1961 )
1961 )
1962 def commit(ui, repo, *pats, **opts):
1962 def commit(ui, repo, *pats, **opts):
1963 """commit the specified files or all outstanding changes
1963 """commit the specified files or all outstanding changes
1964
1964
1965 Commit changes to the given files into the repository. Unlike a
1965 Commit changes to the given files into the repository. Unlike a
1966 centralized SCM, this operation is a local operation. See
1966 centralized SCM, this operation is a local operation. See
1967 :hg:`push` for a way to actively distribute your changes.
1967 :hg:`push` for a way to actively distribute your changes.
1968
1968
1969 If a list of files is omitted, all changes reported by :hg:`status`
1969 If a list of files is omitted, all changes reported by :hg:`status`
1970 will be committed.
1970 will be committed.
1971
1971
1972 If you are committing the result of a merge, do not provide any
1972 If you are committing the result of a merge, do not provide any
1973 filenames or -I/-X filters.
1973 filenames or -I/-X filters.
1974
1974
1975 If no commit message is specified, Mercurial starts your
1975 If no commit message is specified, Mercurial starts your
1976 configured editor where you can enter a message. In case your
1976 configured editor where you can enter a message. In case your
1977 commit fails, you will find a backup of your message in
1977 commit fails, you will find a backup of your message in
1978 ``.hg/last-message.txt``.
1978 ``.hg/last-message.txt``.
1979
1979
1980 The --close-branch flag can be used to mark the current branch
1980 The --close-branch flag can be used to mark the current branch
1981 head closed. When all heads of a branch are closed, the branch
1981 head closed. When all heads of a branch are closed, the branch
1982 will be considered closed and no longer listed.
1982 will be considered closed and no longer listed.
1983
1983
1984 The --amend flag can be used to amend the parent of the
1984 The --amend flag can be used to amend the parent of the
1985 working directory with a new commit that contains the changes
1985 working directory with a new commit that contains the changes
1986 in the parent in addition to those currently reported by :hg:`status`,
1986 in the parent in addition to those currently reported by :hg:`status`,
1987 if there are any. The old commit is stored in a backup bundle in
1987 if there are any. The old commit is stored in a backup bundle in
1988 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1988 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1989 on how to restore it).
1989 on how to restore it).
1990
1990
1991 Message, user and date are taken from the amended commit unless
1991 Message, user and date are taken from the amended commit unless
1992 specified. When a message isn't specified on the command line,
1992 specified. When a message isn't specified on the command line,
1993 the editor will open with the message of the amended commit.
1993 the editor will open with the message of the amended commit.
1994
1994
1995 It is not possible to amend public changesets (see :hg:`help phases`)
1995 It is not possible to amend public changesets (see :hg:`help phases`)
1996 or changesets that have children.
1996 or changesets that have children.
1997
1997
1998 See :hg:`help dates` for a list of formats valid for -d/--date.
1998 See :hg:`help dates` for a list of formats valid for -d/--date.
1999
1999
2000 Returns 0 on success, 1 if nothing changed.
2000 Returns 0 on success, 1 if nothing changed.
2001
2001
2002 .. container:: verbose
2002 .. container:: verbose
2003
2003
2004 Examples:
2004 Examples:
2005
2005
2006 - commit all files ending in .py::
2006 - commit all files ending in .py::
2007
2007
2008 hg commit --include "set:**.py"
2008 hg commit --include "set:**.py"
2009
2009
2010 - commit all non-binary files::
2010 - commit all non-binary files::
2011
2011
2012 hg commit --exclude "set:binary()"
2012 hg commit --exclude "set:binary()"
2013
2013
2014 - amend the current commit and set the date to now::
2014 - amend the current commit and set the date to now::
2015
2015
2016 hg commit --amend --date now
2016 hg commit --amend --date now
2017 """
2017 """
2018 with repo.wlock(), repo.lock():
2018 with repo.wlock(), repo.lock():
2019 return _docommit(ui, repo, *pats, **opts)
2019 return _docommit(ui, repo, *pats, **opts)
2020
2020
2021
2021
2022 def _docommit(ui, repo, *pats, **opts):
2022 def _docommit(ui, repo, *pats, **opts):
2023 if opts.get('interactive'):
2023 if opts.get('interactive'):
2024 opts.pop('interactive')
2024 opts.pop('interactive')
2025 ret = cmdutil.dorecord(
2025 ret = cmdutil.dorecord(
2026 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2026 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2027 )
2027 )
2028 # ret can be 0 (no changes to record) or the value returned by
2028 # ret can be 0 (no changes to record) or the value returned by
2029 # commit(), 1 if nothing changed or None on success.
2029 # commit(), 1 if nothing changed or None on success.
2030 return 1 if ret == 0 else ret
2030 return 1 if ret == 0 else ret
2031
2031
2032 opts = pycompat.byteskwargs(opts)
2032 opts = pycompat.byteskwargs(opts)
2033 if opts.get(b'subrepos'):
2033 if opts.get(b'subrepos'):
2034 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2034 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2035 # Let --subrepos on the command line override config setting.
2035 # Let --subrepos on the command line override config setting.
2036 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2036 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2037
2037
2038 cmdutil.checkunfinished(repo, commit=True)
2038 cmdutil.checkunfinished(repo, commit=True)
2039
2039
2040 branch = repo[None].branch()
2040 branch = repo[None].branch()
2041 bheads = repo.branchheads(branch)
2041 bheads = repo.branchheads(branch)
2042 tip = repo.changelog.tip()
2042 tip = repo.changelog.tip()
2043
2043
2044 extra = {}
2044 extra = {}
2045 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2045 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2046 extra[b'close'] = b'1'
2046 extra[b'close'] = b'1'
2047
2047
2048 if repo[b'.'].closesbranch():
2048 if repo[b'.'].closesbranch():
2049 raise error.InputError(
2049 raise error.InputError(
2050 _(b'current revision is already a branch closing head')
2050 _(b'current revision is already a branch closing head')
2051 )
2051 )
2052 elif not bheads:
2052 elif not bheads:
2053 raise error.InputError(
2053 raise error.InputError(
2054 _(b'branch "%s" has no heads to close') % branch
2054 _(b'branch "%s" has no heads to close') % branch
2055 )
2055 )
2056 elif (
2056 elif (
2057 branch == repo[b'.'].branch()
2057 branch == repo[b'.'].branch()
2058 and repo[b'.'].node() not in bheads
2058 and repo[b'.'].node() not in bheads
2059 and not opts.get(b'force_close_branch')
2059 and not opts.get(b'force_close_branch')
2060 ):
2060 ):
2061 hint = _(
2061 hint = _(
2062 b'use --force-close-branch to close branch from a non-head'
2062 b'use --force-close-branch to close branch from a non-head'
2063 b' changeset'
2063 b' changeset'
2064 )
2064 )
2065 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2065 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2066 elif opts.get(b'amend'):
2066 elif opts.get(b'amend'):
2067 if (
2067 if (
2068 repo[b'.'].p1().branch() != branch
2068 repo[b'.'].p1().branch() != branch
2069 and repo[b'.'].p2().branch() != branch
2069 and repo[b'.'].p2().branch() != branch
2070 ):
2070 ):
2071 raise error.InputError(_(b'can only close branch heads'))
2071 raise error.InputError(_(b'can only close branch heads'))
2072
2072
2073 if opts.get(b'amend'):
2073 if opts.get(b'amend'):
2074 if ui.configbool(b'ui', b'commitsubrepos'):
2074 if ui.configbool(b'ui', b'commitsubrepos'):
2075 raise error.InputError(
2075 raise error.InputError(
2076 _(b'cannot amend with ui.commitsubrepos enabled')
2076 _(b'cannot amend with ui.commitsubrepos enabled')
2077 )
2077 )
2078
2078
2079 old = repo[b'.']
2079 old = repo[b'.']
2080 rewriteutil.precheck(repo, [old.rev()], b'amend')
2080 rewriteutil.precheck(repo, [old.rev()], b'amend')
2081
2081
2082 # Currently histedit gets confused if an amend happens while histedit
2082 # Currently histedit gets confused if an amend happens while histedit
2083 # is in progress. Since we have a checkunfinished command, we are
2083 # is in progress. Since we have a checkunfinished command, we are
2084 # temporarily honoring it.
2084 # temporarily honoring it.
2085 #
2085 #
2086 # Note: eventually this guard will be removed. Please do not expect
2086 # Note: eventually this guard will be removed. Please do not expect
2087 # this behavior to remain.
2087 # this behavior to remain.
2088 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2088 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2089 cmdutil.checkunfinished(repo)
2089 cmdutil.checkunfinished(repo)
2090
2090
2091 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2091 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2092 if node == old.node():
2092 if node == old.node():
2093 ui.status(_(b"nothing changed\n"))
2093 ui.status(_(b"nothing changed\n"))
2094 return 1
2094 return 1
2095 else:
2095 else:
2096
2096
2097 def commitfunc(ui, repo, message, match, opts):
2097 def commitfunc(ui, repo, message, match, opts):
2098 overrides = {}
2098 overrides = {}
2099 if opts.get(b'secret'):
2099 if opts.get(b'secret'):
2100 overrides[(b'phases', b'new-commit')] = b'secret'
2100 overrides[(b'phases', b'new-commit')] = b'secret'
2101
2101
2102 baseui = repo.baseui
2102 baseui = repo.baseui
2103 with baseui.configoverride(overrides, b'commit'):
2103 with baseui.configoverride(overrides, b'commit'):
2104 with ui.configoverride(overrides, b'commit'):
2104 with ui.configoverride(overrides, b'commit'):
2105 editform = cmdutil.mergeeditform(
2105 editform = cmdutil.mergeeditform(
2106 repo[None], b'commit.normal'
2106 repo[None], b'commit.normal'
2107 )
2107 )
2108 editor = cmdutil.getcommiteditor(
2108 editor = cmdutil.getcommiteditor(
2109 editform=editform, **pycompat.strkwargs(opts)
2109 editform=editform, **pycompat.strkwargs(opts)
2110 )
2110 )
2111 return repo.commit(
2111 return repo.commit(
2112 message,
2112 message,
2113 opts.get(b'user'),
2113 opts.get(b'user'),
2114 opts.get(b'date'),
2114 opts.get(b'date'),
2115 match,
2115 match,
2116 editor=editor,
2116 editor=editor,
2117 extra=extra,
2117 extra=extra,
2118 )
2118 )
2119
2119
2120 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2120 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2121
2121
2122 if not node:
2122 if not node:
2123 stat = cmdutil.postcommitstatus(repo, pats, opts)
2123 stat = cmdutil.postcommitstatus(repo, pats, opts)
2124 if stat.deleted:
2124 if stat.deleted:
2125 ui.status(
2125 ui.status(
2126 _(
2126 _(
2127 b"nothing changed (%d missing files, see "
2127 b"nothing changed (%d missing files, see "
2128 b"'hg status')\n"
2128 b"'hg status')\n"
2129 )
2129 )
2130 % len(stat.deleted)
2130 % len(stat.deleted)
2131 )
2131 )
2132 else:
2132 else:
2133 ui.status(_(b"nothing changed\n"))
2133 ui.status(_(b"nothing changed\n"))
2134 return 1
2134 return 1
2135
2135
2136 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2136 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2137
2137
2138 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2138 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2139 status(
2139 status(
2140 ui,
2140 ui,
2141 repo,
2141 repo,
2142 modified=True,
2142 modified=True,
2143 added=True,
2143 added=True,
2144 removed=True,
2144 removed=True,
2145 deleted=True,
2145 deleted=True,
2146 unknown=True,
2146 unknown=True,
2147 subrepos=opts.get(b'subrepos'),
2147 subrepos=opts.get(b'subrepos'),
2148 )
2148 )
2149
2149
2150
2150
2151 @command(
2151 @command(
2152 b'config|showconfig|debugconfig',
2152 b'config|showconfig|debugconfig',
2153 [
2153 [
2154 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2154 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2155 (b'e', b'edit', None, _(b'edit user config')),
2155 (b'e', b'edit', None, _(b'edit user config')),
2156 (b'l', b'local', None, _(b'edit repository config')),
2156 (b'l', b'local', None, _(b'edit repository config')),
2157 (
2157 (
2158 b'',
2158 b'',
2159 b'shared',
2159 b'shared',
2160 None,
2160 None,
2161 _(b'edit shared source repository config (EXPERIMENTAL)'),
2161 _(b'edit shared source repository config (EXPERIMENTAL)'),
2162 ),
2162 ),
2163 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2163 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2164 (b'g', b'global', None, _(b'edit global config')),
2164 (b'g', b'global', None, _(b'edit global config')),
2165 ]
2165 ]
2166 + formatteropts,
2166 + formatteropts,
2167 _(b'[-u] [NAME]...'),
2167 _(b'[-u] [NAME]...'),
2168 helpcategory=command.CATEGORY_HELP,
2168 helpcategory=command.CATEGORY_HELP,
2169 optionalrepo=True,
2169 optionalrepo=True,
2170 intents={INTENT_READONLY},
2170 intents={INTENT_READONLY},
2171 )
2171 )
2172 def config(ui, repo, *values, **opts):
2172 def config(ui, repo, *values, **opts):
2173 """show combined config settings from all hgrc files
2173 """show combined config settings from all hgrc files
2174
2174
2175 With no arguments, print names and values of all config items.
2175 With no arguments, print names and values of all config items.
2176
2176
2177 With one argument of the form section.name, print just the value
2177 With one argument of the form section.name, print just the value
2178 of that config item.
2178 of that config item.
2179
2179
2180 With multiple arguments, print names and values of all config
2180 With multiple arguments, print names and values of all config
2181 items with matching section names or section.names.
2181 items with matching section names or section.names.
2182
2182
2183 With --edit, start an editor on the user-level config file. With
2183 With --edit, start an editor on the user-level config file. With
2184 --global, edit the system-wide config file. With --local, edit the
2184 --global, edit the system-wide config file. With --local, edit the
2185 repository-level config file.
2185 repository-level config file.
2186
2186
2187 With --debug, the source (filename and line number) is printed
2187 With --debug, the source (filename and line number) is printed
2188 for each config item.
2188 for each config item.
2189
2189
2190 See :hg:`help config` for more information about config files.
2190 See :hg:`help config` for more information about config files.
2191
2191
2192 .. container:: verbose
2192 .. container:: verbose
2193
2193
2194 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2194 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2195 This file is not shared across shares when in share-safe mode.
2195 This file is not shared across shares when in share-safe mode.
2196
2196
2197 Template:
2197 Template:
2198
2198
2199 The following keywords are supported. See also :hg:`help templates`.
2199 The following keywords are supported. See also :hg:`help templates`.
2200
2200
2201 :name: String. Config name.
2201 :name: String. Config name.
2202 :source: String. Filename and line number where the item is defined.
2202 :source: String. Filename and line number where the item is defined.
2203 :value: String. Config value.
2203 :value: String. Config value.
2204
2204
2205 The --shared flag can be used to edit the config file of shared source
2205 The --shared flag can be used to edit the config file of shared source
2206 repository. It only works when you have shared using the experimental
2206 repository. It only works when you have shared using the experimental
2207 share safe feature.
2207 share safe feature.
2208
2208
2209 Returns 0 on success, 1 if NAME does not exist.
2209 Returns 0 on success, 1 if NAME does not exist.
2210
2210
2211 """
2211 """
2212
2212
2213 opts = pycompat.byteskwargs(opts)
2213 opts = pycompat.byteskwargs(opts)
2214 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2214 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2215 if any(opts.get(o) for o in editopts):
2215 if any(opts.get(o) for o in editopts):
2216 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2216 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2217 if opts.get(b'local'):
2217 if opts.get(b'local'):
2218 if not repo:
2218 if not repo:
2219 raise error.InputError(
2219 raise error.InputError(
2220 _(b"can't use --local outside a repository")
2220 _(b"can't use --local outside a repository")
2221 )
2221 )
2222 paths = [repo.vfs.join(b'hgrc')]
2222 paths = [repo.vfs.join(b'hgrc')]
2223 elif opts.get(b'global'):
2223 elif opts.get(b'global'):
2224 paths = rcutil.systemrcpath()
2224 paths = rcutil.systemrcpath()
2225 elif opts.get(b'shared'):
2225 elif opts.get(b'shared'):
2226 if not repo.shared():
2226 if not repo.shared():
2227 raise error.InputError(
2227 raise error.InputError(
2228 _(b"repository is not shared; can't use --shared")
2228 _(b"repository is not shared; can't use --shared")
2229 )
2229 )
2230 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2230 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2231 raise error.InputError(
2231 raise error.InputError(
2232 _(
2232 _(
2233 b"share safe feature not unabled; "
2233 b"share safe feature not unabled; "
2234 b"unable to edit shared source repository config"
2234 b"unable to edit shared source repository config"
2235 )
2235 )
2236 )
2236 )
2237 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2237 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2238 elif opts.get(b'non_shared'):
2238 elif opts.get(b'non_shared'):
2239 paths = [repo.vfs.join(b'hgrc-not-shared')]
2239 paths = [repo.vfs.join(b'hgrc-not-shared')]
2240 else:
2240 else:
2241 paths = rcutil.userrcpath()
2241 paths = rcutil.userrcpath()
2242
2242
2243 for f in paths:
2243 for f in paths:
2244 if os.path.exists(f):
2244 if os.path.exists(f):
2245 break
2245 break
2246 else:
2246 else:
2247 if opts.get(b'global'):
2247 if opts.get(b'global'):
2248 samplehgrc = uimod.samplehgrcs[b'global']
2248 samplehgrc = uimod.samplehgrcs[b'global']
2249 elif opts.get(b'local'):
2249 elif opts.get(b'local'):
2250 samplehgrc = uimod.samplehgrcs[b'local']
2250 samplehgrc = uimod.samplehgrcs[b'local']
2251 else:
2251 else:
2252 samplehgrc = uimod.samplehgrcs[b'user']
2252 samplehgrc = uimod.samplehgrcs[b'user']
2253
2253
2254 f = paths[0]
2254 f = paths[0]
2255 fp = open(f, b"wb")
2255 fp = open(f, b"wb")
2256 fp.write(util.tonativeeol(samplehgrc))
2256 fp.write(util.tonativeeol(samplehgrc))
2257 fp.close()
2257 fp.close()
2258
2258
2259 editor = ui.geteditor()
2259 editor = ui.geteditor()
2260 ui.system(
2260 ui.system(
2261 b"%s \"%s\"" % (editor, f),
2261 b"%s \"%s\"" % (editor, f),
2262 onerr=error.InputError,
2262 onerr=error.InputError,
2263 errprefix=_(b"edit failed"),
2263 errprefix=_(b"edit failed"),
2264 blockedtag=b'config_edit',
2264 blockedtag=b'config_edit',
2265 )
2265 )
2266 return
2266 return
2267 ui.pager(b'config')
2267 ui.pager(b'config')
2268 fm = ui.formatter(b'config', opts)
2268 fm = ui.formatter(b'config', opts)
2269 for t, f in rcutil.rccomponents():
2269 for t, f in rcutil.rccomponents():
2270 if t == b'path':
2270 if t == b'path':
2271 ui.debug(b'read config from: %s\n' % f)
2271 ui.debug(b'read config from: %s\n' % f)
2272 elif t == b'resource':
2272 elif t == b'resource':
2273 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2273 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2274 elif t == b'items':
2274 elif t == b'items':
2275 # Don't print anything for 'items'.
2275 # Don't print anything for 'items'.
2276 pass
2276 pass
2277 else:
2277 else:
2278 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2278 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2279 untrusted = bool(opts.get(b'untrusted'))
2279 untrusted = bool(opts.get(b'untrusted'))
2280
2280
2281 selsections = selentries = []
2281 selsections = selentries = []
2282 if values:
2282 if values:
2283 selsections = [v for v in values if b'.' not in v]
2283 selsections = [v for v in values if b'.' not in v]
2284 selentries = [v for v in values if b'.' in v]
2284 selentries = [v for v in values if b'.' in v]
2285 uniquesel = len(selentries) == 1 and not selsections
2285 uniquesel = len(selentries) == 1 and not selsections
2286 selsections = set(selsections)
2286 selsections = set(selsections)
2287 selentries = set(selentries)
2287 selentries = set(selentries)
2288
2288
2289 matched = False
2289 matched = False
2290 for section, name, value in ui.walkconfig(untrusted=untrusted):
2290 for section, name, value in ui.walkconfig(untrusted=untrusted):
2291 source = ui.configsource(section, name, untrusted)
2291 source = ui.configsource(section, name, untrusted)
2292 value = pycompat.bytestr(value)
2292 value = pycompat.bytestr(value)
2293 defaultvalue = ui.configdefault(section, name)
2293 defaultvalue = ui.configdefault(section, name)
2294 if fm.isplain():
2294 if fm.isplain():
2295 source = source or b'none'
2295 source = source or b'none'
2296 value = value.replace(b'\n', b'\\n')
2296 value = value.replace(b'\n', b'\\n')
2297 entryname = section + b'.' + name
2297 entryname = section + b'.' + name
2298 if values and not (section in selsections or entryname in selentries):
2298 if values and not (section in selsections or entryname in selentries):
2299 continue
2299 continue
2300 fm.startitem()
2300 fm.startitem()
2301 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2301 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2302 if uniquesel:
2302 if uniquesel:
2303 fm.data(name=entryname)
2303 fm.data(name=entryname)
2304 fm.write(b'value', b'%s\n', value)
2304 fm.write(b'value', b'%s\n', value)
2305 else:
2305 else:
2306 fm.write(b'name value', b'%s=%s\n', entryname, value)
2306 fm.write(b'name value', b'%s=%s\n', entryname, value)
2307 if formatter.isprintable(defaultvalue):
2307 if formatter.isprintable(defaultvalue):
2308 fm.data(defaultvalue=defaultvalue)
2308 fm.data(defaultvalue=defaultvalue)
2309 elif isinstance(defaultvalue, list) and all(
2309 elif isinstance(defaultvalue, list) and all(
2310 formatter.isprintable(e) for e in defaultvalue
2310 formatter.isprintable(e) for e in defaultvalue
2311 ):
2311 ):
2312 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2312 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2313 # TODO: no idea how to process unsupported defaultvalue types
2313 # TODO: no idea how to process unsupported defaultvalue types
2314 matched = True
2314 matched = True
2315 fm.end()
2315 fm.end()
2316 if matched:
2316 if matched:
2317 return 0
2317 return 0
2318 return 1
2318 return 1
2319
2319
2320
2320
2321 @command(
2321 @command(
2322 b'continue',
2322 b'continue',
2323 dryrunopts,
2323 dryrunopts,
2324 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2324 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2325 helpbasic=True,
2325 helpbasic=True,
2326 )
2326 )
2327 def continuecmd(ui, repo, **opts):
2327 def continuecmd(ui, repo, **opts):
2328 """resumes an interrupted operation (EXPERIMENTAL)
2328 """resumes an interrupted operation (EXPERIMENTAL)
2329
2329
2330 Finishes a multistep operation like graft, histedit, rebase, merge,
2330 Finishes a multistep operation like graft, histedit, rebase, merge,
2331 and unshelve if they are in an interrupted state.
2331 and unshelve if they are in an interrupted state.
2332
2332
2333 use --dry-run/-n to dry run the command.
2333 use --dry-run/-n to dry run the command.
2334 """
2334 """
2335 dryrun = opts.get('dry_run')
2335 dryrun = opts.get('dry_run')
2336 contstate = cmdutil.getunfinishedstate(repo)
2336 contstate = cmdutil.getunfinishedstate(repo)
2337 if not contstate:
2337 if not contstate:
2338 raise error.StateError(_(b'no operation in progress'))
2338 raise error.StateError(_(b'no operation in progress'))
2339 if not contstate.continuefunc:
2339 if not contstate.continuefunc:
2340 raise error.StateError(
2340 raise error.StateError(
2341 (
2341 (
2342 _(b"%s in progress but does not support 'hg continue'")
2342 _(b"%s in progress but does not support 'hg continue'")
2343 % (contstate._opname)
2343 % (contstate._opname)
2344 ),
2344 ),
2345 hint=contstate.continuemsg(),
2345 hint=contstate.continuemsg(),
2346 )
2346 )
2347 if dryrun:
2347 if dryrun:
2348 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2348 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2349 return
2349 return
2350 return contstate.continuefunc(ui, repo)
2350 return contstate.continuefunc(ui, repo)
2351
2351
2352
2352
2353 @command(
2353 @command(
2354 b'copy|cp',
2354 b'copy|cp',
2355 [
2355 [
2356 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2356 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2357 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2357 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2358 (
2358 (
2359 b'',
2359 b'',
2360 b'at-rev',
2360 b'at-rev',
2361 b'',
2361 b'',
2362 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2362 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2363 _(b'REV'),
2363 _(b'REV'),
2364 ),
2364 ),
2365 (
2365 (
2366 b'f',
2366 b'f',
2367 b'force',
2367 b'force',
2368 None,
2368 None,
2369 _(b'forcibly copy over an existing managed file'),
2369 _(b'forcibly copy over an existing managed file'),
2370 ),
2370 ),
2371 ]
2371 ]
2372 + walkopts
2372 + walkopts
2373 + dryrunopts,
2373 + dryrunopts,
2374 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2374 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2375 helpcategory=command.CATEGORY_FILE_CONTENTS,
2375 helpcategory=command.CATEGORY_FILE_CONTENTS,
2376 )
2376 )
2377 def copy(ui, repo, *pats, **opts):
2377 def copy(ui, repo, *pats, **opts):
2378 """mark files as copied for the next commit
2378 """mark files as copied for the next commit
2379
2379
2380 Mark dest as having copies of source files. If dest is a
2380 Mark dest as having copies of source files. If dest is a
2381 directory, copies are put in that directory. If dest is a file,
2381 directory, copies are put in that directory. If dest is a file,
2382 the source must be a single file.
2382 the source must be a single file.
2383
2383
2384 By default, this command copies the contents of files as they
2384 By default, this command copies the contents of files as they
2385 exist in the working directory. If invoked with -A/--after, the
2385 exist in the working directory. If invoked with -A/--after, the
2386 operation is recorded, but no copying is performed.
2386 operation is recorded, but no copying is performed.
2387
2387
2388 To undo marking a destination file as copied, use --forget. With that
2388 To undo marking a destination file as copied, use --forget. With that
2389 option, all given (positional) arguments are unmarked as copies. The
2389 option, all given (positional) arguments are unmarked as copies. The
2390 destination file(s) will be left in place (still tracked).
2390 destination file(s) will be left in place (still tracked).
2391
2391
2392 This command takes effect with the next commit by default.
2392 This command takes effect with the next commit by default.
2393
2393
2394 Returns 0 on success, 1 if errors are encountered.
2394 Returns 0 on success, 1 if errors are encountered.
2395 """
2395 """
2396 opts = pycompat.byteskwargs(opts)
2396 opts = pycompat.byteskwargs(opts)
2397 with repo.wlock():
2397 with repo.wlock():
2398 return cmdutil.copy(ui, repo, pats, opts)
2398 return cmdutil.copy(ui, repo, pats, opts)
2399
2399
2400
2400
2401 @command(
2401 @command(
2402 b'debugcommands',
2402 b'debugcommands',
2403 [],
2403 [],
2404 _(b'[COMMAND]'),
2404 _(b'[COMMAND]'),
2405 helpcategory=command.CATEGORY_HELP,
2405 helpcategory=command.CATEGORY_HELP,
2406 norepo=True,
2406 norepo=True,
2407 )
2407 )
2408 def debugcommands(ui, cmd=b'', *args):
2408 def debugcommands(ui, cmd=b'', *args):
2409 """list all available commands and options"""
2409 """list all available commands and options"""
2410 for cmd, vals in sorted(pycompat.iteritems(table)):
2410 for cmd, vals in sorted(pycompat.iteritems(table)):
2411 cmd = cmd.split(b'|')[0]
2411 cmd = cmd.split(b'|')[0]
2412 opts = b', '.join([i[1] for i in vals[1]])
2412 opts = b', '.join([i[1] for i in vals[1]])
2413 ui.write(b'%s: %s\n' % (cmd, opts))
2413 ui.write(b'%s: %s\n' % (cmd, opts))
2414
2414
2415
2415
2416 @command(
2416 @command(
2417 b'debugcomplete',
2417 b'debugcomplete',
2418 [(b'o', b'options', None, _(b'show the command options'))],
2418 [(b'o', b'options', None, _(b'show the command options'))],
2419 _(b'[-o] CMD'),
2419 _(b'[-o] CMD'),
2420 helpcategory=command.CATEGORY_HELP,
2420 helpcategory=command.CATEGORY_HELP,
2421 norepo=True,
2421 norepo=True,
2422 )
2422 )
2423 def debugcomplete(ui, cmd=b'', **opts):
2423 def debugcomplete(ui, cmd=b'', **opts):
2424 """returns the completion list associated with the given command"""
2424 """returns the completion list associated with the given command"""
2425
2425
2426 if opts.get('options'):
2426 if opts.get('options'):
2427 options = []
2427 options = []
2428 otables = [globalopts]
2428 otables = [globalopts]
2429 if cmd:
2429 if cmd:
2430 aliases, entry = cmdutil.findcmd(cmd, table, False)
2430 aliases, entry = cmdutil.findcmd(cmd, table, False)
2431 otables.append(entry[1])
2431 otables.append(entry[1])
2432 for t in otables:
2432 for t in otables:
2433 for o in t:
2433 for o in t:
2434 if b"(DEPRECATED)" in o[3]:
2434 if b"(DEPRECATED)" in o[3]:
2435 continue
2435 continue
2436 if o[0]:
2436 if o[0]:
2437 options.append(b'-%s' % o[0])
2437 options.append(b'-%s' % o[0])
2438 options.append(b'--%s' % o[1])
2438 options.append(b'--%s' % o[1])
2439 ui.write(b"%s\n" % b"\n".join(options))
2439 ui.write(b"%s\n" % b"\n".join(options))
2440 return
2440 return
2441
2441
2442 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2442 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2443 if ui.verbose:
2443 if ui.verbose:
2444 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2444 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2445 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2445 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2446
2446
2447
2447
2448 @command(
2448 @command(
2449 b'diff',
2449 b'diff',
2450 [
2450 [
2451 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2451 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2452 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2452 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2453 ]
2453 ]
2454 + diffopts
2454 + diffopts
2455 + diffopts2
2455 + diffopts2
2456 + walkopts
2456 + walkopts
2457 + subrepoopts,
2457 + subrepoopts,
2458 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2458 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2459 helpcategory=command.CATEGORY_FILE_CONTENTS,
2459 helpcategory=command.CATEGORY_FILE_CONTENTS,
2460 helpbasic=True,
2460 helpbasic=True,
2461 inferrepo=True,
2461 inferrepo=True,
2462 intents={INTENT_READONLY},
2462 intents={INTENT_READONLY},
2463 )
2463 )
2464 def diff(ui, repo, *pats, **opts):
2464 def diff(ui, repo, *pats, **opts):
2465 """diff repository (or selected files)
2465 """diff repository (or selected files)
2466
2466
2467 Show differences between revisions for the specified files.
2467 Show differences between revisions for the specified files.
2468
2468
2469 Differences between files are shown using the unified diff format.
2469 Differences between files are shown using the unified diff format.
2470
2470
2471 .. note::
2471 .. note::
2472
2472
2473 :hg:`diff` may generate unexpected results for merges, as it will
2473 :hg:`diff` may generate unexpected results for merges, as it will
2474 default to comparing against the working directory's first
2474 default to comparing against the working directory's first
2475 parent changeset if no revisions are specified.
2475 parent changeset if no revisions are specified.
2476
2476
2477 When two revision arguments are given, then changes are shown
2477 When two revision arguments are given, then changes are shown
2478 between those revisions. If only one revision is specified then
2478 between those revisions. If only one revision is specified then
2479 that revision is compared to the working directory, and, when no
2479 that revision is compared to the working directory, and, when no
2480 revisions are specified, the working directory files are compared
2480 revisions are specified, the working directory files are compared
2481 to its first parent.
2481 to its first parent.
2482
2482
2483 Alternatively you can specify -c/--change with a revision to see
2483 Alternatively you can specify -c/--change with a revision to see
2484 the changes in that changeset relative to its first parent.
2484 the changes in that changeset relative to its first parent.
2485
2485
2486 Without the -a/--text option, diff will avoid generating diffs of
2486 Without the -a/--text option, diff will avoid generating diffs of
2487 files it detects as binary. With -a, diff will generate a diff
2487 files it detects as binary. With -a, diff will generate a diff
2488 anyway, probably with undesirable results.
2488 anyway, probably with undesirable results.
2489
2489
2490 Use the -g/--git option to generate diffs in the git extended diff
2490 Use the -g/--git option to generate diffs in the git extended diff
2491 format. For more information, read :hg:`help diffs`.
2491 format. For more information, read :hg:`help diffs`.
2492
2492
2493 .. container:: verbose
2493 .. container:: verbose
2494
2494
2495 Examples:
2495 Examples:
2496
2496
2497 - compare a file in the current working directory to its parent::
2497 - compare a file in the current working directory to its parent::
2498
2498
2499 hg diff foo.c
2499 hg diff foo.c
2500
2500
2501 - compare two historical versions of a directory, with rename info::
2501 - compare two historical versions of a directory, with rename info::
2502
2502
2503 hg diff --git -r 1.0:1.2 lib/
2503 hg diff --git -r 1.0:1.2 lib/
2504
2504
2505 - get change stats relative to the last change on some date::
2505 - get change stats relative to the last change on some date::
2506
2506
2507 hg diff --stat -r "date('may 2')"
2507 hg diff --stat -r "date('may 2')"
2508
2508
2509 - diff all newly-added files that contain a keyword::
2509 - diff all newly-added files that contain a keyword::
2510
2510
2511 hg diff "set:added() and grep(GNU)"
2511 hg diff "set:added() and grep(GNU)"
2512
2512
2513 - compare a revision and its parents::
2513 - compare a revision and its parents::
2514
2514
2515 hg diff -c 9353 # compare against first parent
2515 hg diff -c 9353 # compare against first parent
2516 hg diff -r 9353^:9353 # same using revset syntax
2516 hg diff -r 9353^:9353 # same using revset syntax
2517 hg diff -r 9353^2:9353 # compare against the second parent
2517 hg diff -r 9353^2:9353 # compare against the second parent
2518
2518
2519 Returns 0 on success.
2519 Returns 0 on success.
2520 """
2520 """
2521
2521
2522 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2522 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2523 opts = pycompat.byteskwargs(opts)
2523 opts = pycompat.byteskwargs(opts)
2524 revs = opts.get(b'rev')
2524 revs = opts.get(b'rev')
2525 change = opts.get(b'change')
2525 change = opts.get(b'change')
2526 stat = opts.get(b'stat')
2526 stat = opts.get(b'stat')
2527 reverse = opts.get(b'reverse')
2527 reverse = opts.get(b'reverse')
2528
2528
2529 if change:
2529 if change:
2530 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2530 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2531 ctx2 = scmutil.revsingle(repo, change, None)
2531 ctx2 = scmutil.revsingle(repo, change, None)
2532 ctx1 = ctx2.p1()
2532 ctx1 = ctx2.p1()
2533 else:
2533 else:
2534 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2534 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2535 ctx1, ctx2 = scmutil.revpair(repo, revs)
2535 ctx1, ctx2 = scmutil.revpair(repo, revs)
2536
2536
2537 if reverse:
2537 if reverse:
2538 ctxleft = ctx2
2538 ctxleft = ctx2
2539 ctxright = ctx1
2539 ctxright = ctx1
2540 else:
2540 else:
2541 ctxleft = ctx1
2541 ctxleft = ctx1
2542 ctxright = ctx2
2542 ctxright = ctx2
2543
2543
2544 diffopts = patch.diffallopts(ui, opts)
2544 diffopts = patch.diffallopts(ui, opts)
2545 m = scmutil.match(ctx2, pats, opts)
2545 m = scmutil.match(ctx2, pats, opts)
2546 m = repo.narrowmatch(m)
2546 m = repo.narrowmatch(m)
2547 ui.pager(b'diff')
2547 ui.pager(b'diff')
2548 logcmdutil.diffordiffstat(
2548 logcmdutil.diffordiffstat(
2549 ui,
2549 ui,
2550 repo,
2550 repo,
2551 diffopts,
2551 diffopts,
2552 ctxleft,
2552 ctxleft,
2553 ctxright,
2553 ctxright,
2554 m,
2554 m,
2555 stat=stat,
2555 stat=stat,
2556 listsubrepos=opts.get(b'subrepos'),
2556 listsubrepos=opts.get(b'subrepos'),
2557 root=opts.get(b'root'),
2557 root=opts.get(b'root'),
2558 )
2558 )
2559
2559
2560
2560
2561 @command(
2561 @command(
2562 b'export',
2562 b'export',
2563 [
2563 [
2564 (
2564 (
2565 b'B',
2565 b'B',
2566 b'bookmark',
2566 b'bookmark',
2567 b'',
2567 b'',
2568 _(b'export changes only reachable by given bookmark'),
2568 _(b'export changes only reachable by given bookmark'),
2569 _(b'BOOKMARK'),
2569 _(b'BOOKMARK'),
2570 ),
2570 ),
2571 (
2571 (
2572 b'o',
2572 b'o',
2573 b'output',
2573 b'output',
2574 b'',
2574 b'',
2575 _(b'print output to file with formatted name'),
2575 _(b'print output to file with formatted name'),
2576 _(b'FORMAT'),
2576 _(b'FORMAT'),
2577 ),
2577 ),
2578 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2578 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2579 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2579 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2580 ]
2580 ]
2581 + diffopts
2581 + diffopts
2582 + formatteropts,
2582 + formatteropts,
2583 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2583 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2584 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2584 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2585 helpbasic=True,
2585 helpbasic=True,
2586 intents={INTENT_READONLY},
2586 intents={INTENT_READONLY},
2587 )
2587 )
2588 def export(ui, repo, *changesets, **opts):
2588 def export(ui, repo, *changesets, **opts):
2589 """dump the header and diffs for one or more changesets
2589 """dump the header and diffs for one or more changesets
2590
2590
2591 Print the changeset header and diffs for one or more revisions.
2591 Print the changeset header and diffs for one or more revisions.
2592 If no revision is given, the parent of the working directory is used.
2592 If no revision is given, the parent of the working directory is used.
2593
2593
2594 The information shown in the changeset header is: author, date,
2594 The information shown in the changeset header is: author, date,
2595 branch name (if non-default), changeset hash, parent(s) and commit
2595 branch name (if non-default), changeset hash, parent(s) and commit
2596 comment.
2596 comment.
2597
2597
2598 .. note::
2598 .. note::
2599
2599
2600 :hg:`export` may generate unexpected diff output for merge
2600 :hg:`export` may generate unexpected diff output for merge
2601 changesets, as it will compare the merge changeset against its
2601 changesets, as it will compare the merge changeset against its
2602 first parent only.
2602 first parent only.
2603
2603
2604 Output may be to a file, in which case the name of the file is
2604 Output may be to a file, in which case the name of the file is
2605 given using a template string. See :hg:`help templates`. In addition
2605 given using a template string. See :hg:`help templates`. In addition
2606 to the common template keywords, the following formatting rules are
2606 to the common template keywords, the following formatting rules are
2607 supported:
2607 supported:
2608
2608
2609 :``%%``: literal "%" character
2609 :``%%``: literal "%" character
2610 :``%H``: changeset hash (40 hexadecimal digits)
2610 :``%H``: changeset hash (40 hexadecimal digits)
2611 :``%N``: number of patches being generated
2611 :``%N``: number of patches being generated
2612 :``%R``: changeset revision number
2612 :``%R``: changeset revision number
2613 :``%b``: basename of the exporting repository
2613 :``%b``: basename of the exporting repository
2614 :``%h``: short-form changeset hash (12 hexadecimal digits)
2614 :``%h``: short-form changeset hash (12 hexadecimal digits)
2615 :``%m``: first line of the commit message (only alphanumeric characters)
2615 :``%m``: first line of the commit message (only alphanumeric characters)
2616 :``%n``: zero-padded sequence number, starting at 1
2616 :``%n``: zero-padded sequence number, starting at 1
2617 :``%r``: zero-padded changeset revision number
2617 :``%r``: zero-padded changeset revision number
2618 :``\\``: literal "\\" character
2618 :``\\``: literal "\\" character
2619
2619
2620 Without the -a/--text option, export will avoid generating diffs
2620 Without the -a/--text option, export will avoid generating diffs
2621 of files it detects as binary. With -a, export will generate a
2621 of files it detects as binary. With -a, export will generate a
2622 diff anyway, probably with undesirable results.
2622 diff anyway, probably with undesirable results.
2623
2623
2624 With -B/--bookmark changesets reachable by the given bookmark are
2624 With -B/--bookmark changesets reachable by the given bookmark are
2625 selected.
2625 selected.
2626
2626
2627 Use the -g/--git option to generate diffs in the git extended diff
2627 Use the -g/--git option to generate diffs in the git extended diff
2628 format. See :hg:`help diffs` for more information.
2628 format. See :hg:`help diffs` for more information.
2629
2629
2630 With the --switch-parent option, the diff will be against the
2630 With the --switch-parent option, the diff will be against the
2631 second parent. It can be useful to review a merge.
2631 second parent. It can be useful to review a merge.
2632
2632
2633 .. container:: verbose
2633 .. container:: verbose
2634
2634
2635 Template:
2635 Template:
2636
2636
2637 The following keywords are supported in addition to the common template
2637 The following keywords are supported in addition to the common template
2638 keywords and functions. See also :hg:`help templates`.
2638 keywords and functions. See also :hg:`help templates`.
2639
2639
2640 :diff: String. Diff content.
2640 :diff: String. Diff content.
2641 :parents: List of strings. Parent nodes of the changeset.
2641 :parents: List of strings. Parent nodes of the changeset.
2642
2642
2643 Examples:
2643 Examples:
2644
2644
2645 - use export and import to transplant a bugfix to the current
2645 - use export and import to transplant a bugfix to the current
2646 branch::
2646 branch::
2647
2647
2648 hg export -r 9353 | hg import -
2648 hg export -r 9353 | hg import -
2649
2649
2650 - export all the changesets between two revisions to a file with
2650 - export all the changesets between two revisions to a file with
2651 rename information::
2651 rename information::
2652
2652
2653 hg export --git -r 123:150 > changes.txt
2653 hg export --git -r 123:150 > changes.txt
2654
2654
2655 - split outgoing changes into a series of patches with
2655 - split outgoing changes into a series of patches with
2656 descriptive names::
2656 descriptive names::
2657
2657
2658 hg export -r "outgoing()" -o "%n-%m.patch"
2658 hg export -r "outgoing()" -o "%n-%m.patch"
2659
2659
2660 Returns 0 on success.
2660 Returns 0 on success.
2661 """
2661 """
2662 opts = pycompat.byteskwargs(opts)
2662 opts = pycompat.byteskwargs(opts)
2663 bookmark = opts.get(b'bookmark')
2663 bookmark = opts.get(b'bookmark')
2664 changesets += tuple(opts.get(b'rev', []))
2664 changesets += tuple(opts.get(b'rev', []))
2665
2665
2666 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2666 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2667
2667
2668 if bookmark:
2668 if bookmark:
2669 if bookmark not in repo._bookmarks:
2669 if bookmark not in repo._bookmarks:
2670 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2670 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2671
2671
2672 revs = scmutil.bookmarkrevs(repo, bookmark)
2672 revs = scmutil.bookmarkrevs(repo, bookmark)
2673 else:
2673 else:
2674 if not changesets:
2674 if not changesets:
2675 changesets = [b'.']
2675 changesets = [b'.']
2676
2676
2677 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2677 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2678 revs = scmutil.revrange(repo, changesets)
2678 revs = scmutil.revrange(repo, changesets)
2679
2679
2680 if not revs:
2680 if not revs:
2681 raise error.InputError(_(b"export requires at least one changeset"))
2681 raise error.InputError(_(b"export requires at least one changeset"))
2682 if len(revs) > 1:
2682 if len(revs) > 1:
2683 ui.note(_(b'exporting patches:\n'))
2683 ui.note(_(b'exporting patches:\n'))
2684 else:
2684 else:
2685 ui.note(_(b'exporting patch:\n'))
2685 ui.note(_(b'exporting patch:\n'))
2686
2686
2687 fntemplate = opts.get(b'output')
2687 fntemplate = opts.get(b'output')
2688 if cmdutil.isstdiofilename(fntemplate):
2688 if cmdutil.isstdiofilename(fntemplate):
2689 fntemplate = b''
2689 fntemplate = b''
2690
2690
2691 if fntemplate:
2691 if fntemplate:
2692 fm = formatter.nullformatter(ui, b'export', opts)
2692 fm = formatter.nullformatter(ui, b'export', opts)
2693 else:
2693 else:
2694 ui.pager(b'export')
2694 ui.pager(b'export')
2695 fm = ui.formatter(b'export', opts)
2695 fm = ui.formatter(b'export', opts)
2696 with fm:
2696 with fm:
2697 cmdutil.export(
2697 cmdutil.export(
2698 repo,
2698 repo,
2699 revs,
2699 revs,
2700 fm,
2700 fm,
2701 fntemplate=fntemplate,
2701 fntemplate=fntemplate,
2702 switch_parent=opts.get(b'switch_parent'),
2702 switch_parent=opts.get(b'switch_parent'),
2703 opts=patch.diffallopts(ui, opts),
2703 opts=patch.diffallopts(ui, opts),
2704 )
2704 )
2705
2705
2706
2706
2707 @command(
2707 @command(
2708 b'files',
2708 b'files',
2709 [
2709 [
2710 (
2710 (
2711 b'r',
2711 b'r',
2712 b'rev',
2712 b'rev',
2713 b'',
2713 b'',
2714 _(b'search the repository as it is in REV'),
2714 _(b'search the repository as it is in REV'),
2715 _(b'REV'),
2715 _(b'REV'),
2716 ),
2716 ),
2717 (
2717 (
2718 b'0',
2718 b'0',
2719 b'print0',
2719 b'print0',
2720 None,
2720 None,
2721 _(b'end filenames with NUL, for use with xargs'),
2721 _(b'end filenames with NUL, for use with xargs'),
2722 ),
2722 ),
2723 ]
2723 ]
2724 + walkopts
2724 + walkopts
2725 + formatteropts
2725 + formatteropts
2726 + subrepoopts,
2726 + subrepoopts,
2727 _(b'[OPTION]... [FILE]...'),
2727 _(b'[OPTION]... [FILE]...'),
2728 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2728 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2729 intents={INTENT_READONLY},
2729 intents={INTENT_READONLY},
2730 )
2730 )
2731 def files(ui, repo, *pats, **opts):
2731 def files(ui, repo, *pats, **opts):
2732 """list tracked files
2732 """list tracked files
2733
2733
2734 Print files under Mercurial control in the working directory or
2734 Print files under Mercurial control in the working directory or
2735 specified revision for given files (excluding removed files).
2735 specified revision for given files (excluding removed files).
2736 Files can be specified as filenames or filesets.
2736 Files can be specified as filenames or filesets.
2737
2737
2738 If no files are given to match, this command prints the names
2738 If no files are given to match, this command prints the names
2739 of all files under Mercurial control.
2739 of all files under Mercurial control.
2740
2740
2741 .. container:: verbose
2741 .. container:: verbose
2742
2742
2743 Template:
2743 Template:
2744
2744
2745 The following keywords are supported in addition to the common template
2745 The following keywords are supported in addition to the common template
2746 keywords and functions. See also :hg:`help templates`.
2746 keywords and functions. See also :hg:`help templates`.
2747
2747
2748 :flags: String. Character denoting file's symlink and executable bits.
2748 :flags: String. Character denoting file's symlink and executable bits.
2749 :path: String. Repository-absolute path of the file.
2749 :path: String. Repository-absolute path of the file.
2750 :size: Integer. Size of the file in bytes.
2750 :size: Integer. Size of the file in bytes.
2751
2751
2752 Examples:
2752 Examples:
2753
2753
2754 - list all files under the current directory::
2754 - list all files under the current directory::
2755
2755
2756 hg files .
2756 hg files .
2757
2757
2758 - shows sizes and flags for current revision::
2758 - shows sizes and flags for current revision::
2759
2759
2760 hg files -vr .
2760 hg files -vr .
2761
2761
2762 - list all files named README::
2762 - list all files named README::
2763
2763
2764 hg files -I "**/README"
2764 hg files -I "**/README"
2765
2765
2766 - list all binary files::
2766 - list all binary files::
2767
2767
2768 hg files "set:binary()"
2768 hg files "set:binary()"
2769
2769
2770 - find files containing a regular expression::
2770 - find files containing a regular expression::
2771
2771
2772 hg files "set:grep('bob')"
2772 hg files "set:grep('bob')"
2773
2773
2774 - search tracked file contents with xargs and grep::
2774 - search tracked file contents with xargs and grep::
2775
2775
2776 hg files -0 | xargs -0 grep foo
2776 hg files -0 | xargs -0 grep foo
2777
2777
2778 See :hg:`help patterns` and :hg:`help filesets` for more information
2778 See :hg:`help patterns` and :hg:`help filesets` for more information
2779 on specifying file patterns.
2779 on specifying file patterns.
2780
2780
2781 Returns 0 if a match is found, 1 otherwise.
2781 Returns 0 if a match is found, 1 otherwise.
2782
2782
2783 """
2783 """
2784
2784
2785 opts = pycompat.byteskwargs(opts)
2785 opts = pycompat.byteskwargs(opts)
2786 rev = opts.get(b'rev')
2786 rev = opts.get(b'rev')
2787 if rev:
2787 if rev:
2788 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2788 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2789 ctx = scmutil.revsingle(repo, rev, None)
2789 ctx = scmutil.revsingle(repo, rev, None)
2790
2790
2791 end = b'\n'
2791 end = b'\n'
2792 if opts.get(b'print0'):
2792 if opts.get(b'print0'):
2793 end = b'\0'
2793 end = b'\0'
2794 fmt = b'%s' + end
2794 fmt = b'%s' + end
2795
2795
2796 m = scmutil.match(ctx, pats, opts)
2796 m = scmutil.match(ctx, pats, opts)
2797 ui.pager(b'files')
2797 ui.pager(b'files')
2798 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2798 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2799 with ui.formatter(b'files', opts) as fm:
2799 with ui.formatter(b'files', opts) as fm:
2800 return cmdutil.files(
2800 return cmdutil.files(
2801 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2801 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2802 )
2802 )
2803
2803
2804
2804
2805 @command(
2805 @command(
2806 b'forget',
2806 b'forget',
2807 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2807 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2808 + walkopts
2808 + walkopts
2809 + dryrunopts,
2809 + dryrunopts,
2810 _(b'[OPTION]... FILE...'),
2810 _(b'[OPTION]... FILE...'),
2811 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2811 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2812 helpbasic=True,
2812 helpbasic=True,
2813 inferrepo=True,
2813 inferrepo=True,
2814 )
2814 )
2815 def forget(ui, repo, *pats, **opts):
2815 def forget(ui, repo, *pats, **opts):
2816 """forget the specified files on the next commit
2816 """forget the specified files on the next commit
2817
2817
2818 Mark the specified files so they will no longer be tracked
2818 Mark the specified files so they will no longer be tracked
2819 after the next commit.
2819 after the next commit.
2820
2820
2821 This only removes files from the current branch, not from the
2821 This only removes files from the current branch, not from the
2822 entire project history, and it does not delete them from the
2822 entire project history, and it does not delete them from the
2823 working directory.
2823 working directory.
2824
2824
2825 To delete the file from the working directory, see :hg:`remove`.
2825 To delete the file from the working directory, see :hg:`remove`.
2826
2826
2827 To undo a forget before the next commit, see :hg:`add`.
2827 To undo a forget before the next commit, see :hg:`add`.
2828
2828
2829 .. container:: verbose
2829 .. container:: verbose
2830
2830
2831 Examples:
2831 Examples:
2832
2832
2833 - forget newly-added binary files::
2833 - forget newly-added binary files::
2834
2834
2835 hg forget "set:added() and binary()"
2835 hg forget "set:added() and binary()"
2836
2836
2837 - forget files that would be excluded by .hgignore::
2837 - forget files that would be excluded by .hgignore::
2838
2838
2839 hg forget "set:hgignore()"
2839 hg forget "set:hgignore()"
2840
2840
2841 Returns 0 on success.
2841 Returns 0 on success.
2842 """
2842 """
2843
2843
2844 opts = pycompat.byteskwargs(opts)
2844 opts = pycompat.byteskwargs(opts)
2845 if not pats:
2845 if not pats:
2846 raise error.InputError(_(b'no files specified'))
2846 raise error.InputError(_(b'no files specified'))
2847
2847
2848 m = scmutil.match(repo[None], pats, opts)
2848 m = scmutil.match(repo[None], pats, opts)
2849 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2849 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2850 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2850 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2851 rejected = cmdutil.forget(
2851 rejected = cmdutil.forget(
2852 ui,
2852 ui,
2853 repo,
2853 repo,
2854 m,
2854 m,
2855 prefix=b"",
2855 prefix=b"",
2856 uipathfn=uipathfn,
2856 uipathfn=uipathfn,
2857 explicitonly=False,
2857 explicitonly=False,
2858 dryrun=dryrun,
2858 dryrun=dryrun,
2859 interactive=interactive,
2859 interactive=interactive,
2860 )[0]
2860 )[0]
2861 return rejected and 1 or 0
2861 return rejected and 1 or 0
2862
2862
2863
2863
2864 @command(
2864 @command(
2865 b'graft',
2865 b'graft',
2866 [
2866 [
2867 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2867 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2868 (
2868 (
2869 b'',
2869 b'',
2870 b'base',
2870 b'base',
2871 b'',
2871 b'',
2872 _(b'base revision when doing the graft merge (ADVANCED)'),
2872 _(b'base revision when doing the graft merge (ADVANCED)'),
2873 _(b'REV'),
2873 _(b'REV'),
2874 ),
2874 ),
2875 (b'c', b'continue', False, _(b'resume interrupted graft')),
2875 (b'c', b'continue', False, _(b'resume interrupted graft')),
2876 (b'', b'stop', False, _(b'stop interrupted graft')),
2876 (b'', b'stop', False, _(b'stop interrupted graft')),
2877 (b'', b'abort', False, _(b'abort interrupted graft')),
2877 (b'', b'abort', False, _(b'abort interrupted graft')),
2878 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2878 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2879 (b'', b'log', None, _(b'append graft info to log message')),
2879 (b'', b'log', None, _(b'append graft info to log message')),
2880 (
2880 (
2881 b'',
2881 b'',
2882 b'no-commit',
2882 b'no-commit',
2883 None,
2883 None,
2884 _(b"don't commit, just apply the changes in working directory"),
2884 _(b"don't commit, just apply the changes in working directory"),
2885 ),
2885 ),
2886 (b'f', b'force', False, _(b'force graft')),
2886 (b'f', b'force', False, _(b'force graft')),
2887 (
2887 (
2888 b'D',
2888 b'D',
2889 b'currentdate',
2889 b'currentdate',
2890 False,
2890 False,
2891 _(b'record the current date as commit date'),
2891 _(b'record the current date as commit date'),
2892 ),
2892 ),
2893 (
2893 (
2894 b'U',
2894 b'U',
2895 b'currentuser',
2895 b'currentuser',
2896 False,
2896 False,
2897 _(b'record the current user as committer'),
2897 _(b'record the current user as committer'),
2898 ),
2898 ),
2899 ]
2899 ]
2900 + commitopts2
2900 + commitopts2
2901 + mergetoolopts
2901 + mergetoolopts
2902 + dryrunopts,
2902 + dryrunopts,
2903 _(b'[OPTION]... [-r REV]... REV...'),
2903 _(b'[OPTION]... [-r REV]... REV...'),
2904 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2904 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2905 )
2905 )
2906 def graft(ui, repo, *revs, **opts):
2906 def graft(ui, repo, *revs, **opts):
2907 '''copy changes from other branches onto the current branch
2907 '''copy changes from other branches onto the current branch
2908
2908
2909 This command uses Mercurial's merge logic to copy individual
2909 This command uses Mercurial's merge logic to copy individual
2910 changes from other branches without merging branches in the
2910 changes from other branches without merging branches in the
2911 history graph. This is sometimes known as 'backporting' or
2911 history graph. This is sometimes known as 'backporting' or
2912 'cherry-picking'. By default, graft will copy user, date, and
2912 'cherry-picking'. By default, graft will copy user, date, and
2913 description from the source changesets.
2913 description from the source changesets.
2914
2914
2915 Changesets that are ancestors of the current revision, that have
2915 Changesets that are ancestors of the current revision, that have
2916 already been grafted, or that are merges will be skipped.
2916 already been grafted, or that are merges will be skipped.
2917
2917
2918 If --log is specified, log messages will have a comment appended
2918 If --log is specified, log messages will have a comment appended
2919 of the form::
2919 of the form::
2920
2920
2921 (grafted from CHANGESETHASH)
2921 (grafted from CHANGESETHASH)
2922
2922
2923 If --force is specified, revisions will be grafted even if they
2923 If --force is specified, revisions will be grafted even if they
2924 are already ancestors of, or have been grafted to, the destination.
2924 are already ancestors of, or have been grafted to, the destination.
2925 This is useful when the revisions have since been backed out.
2925 This is useful when the revisions have since been backed out.
2926
2926
2927 If a graft merge results in conflicts, the graft process is
2927 If a graft merge results in conflicts, the graft process is
2928 interrupted so that the current merge can be manually resolved.
2928 interrupted so that the current merge can be manually resolved.
2929 Once all conflicts are addressed, the graft process can be
2929 Once all conflicts are addressed, the graft process can be
2930 continued with the -c/--continue option.
2930 continued with the -c/--continue option.
2931
2931
2932 The -c/--continue option reapplies all the earlier options.
2932 The -c/--continue option reapplies all the earlier options.
2933
2933
2934 .. container:: verbose
2934 .. container:: verbose
2935
2935
2936 The --base option exposes more of how graft internally uses merge with a
2936 The --base option exposes more of how graft internally uses merge with a
2937 custom base revision. --base can be used to specify another ancestor than
2937 custom base revision. --base can be used to specify another ancestor than
2938 the first and only parent.
2938 the first and only parent.
2939
2939
2940 The command::
2940 The command::
2941
2941
2942 hg graft -r 345 --base 234
2942 hg graft -r 345 --base 234
2943
2943
2944 is thus pretty much the same as::
2944 is thus pretty much the same as::
2945
2945
2946 hg diff -r 234 -r 345 | hg import
2946 hg diff -r 234 -r 345 | hg import
2947
2947
2948 but using merge to resolve conflicts and track moved files.
2948 but using merge to resolve conflicts and track moved files.
2949
2949
2950 The result of a merge can thus be backported as a single commit by
2950 The result of a merge can thus be backported as a single commit by
2951 specifying one of the merge parents as base, and thus effectively
2951 specifying one of the merge parents as base, and thus effectively
2952 grafting the changes from the other side.
2952 grafting the changes from the other side.
2953
2953
2954 It is also possible to collapse multiple changesets and clean up history
2954 It is also possible to collapse multiple changesets and clean up history
2955 by specifying another ancestor as base, much like rebase --collapse
2955 by specifying another ancestor as base, much like rebase --collapse
2956 --keep.
2956 --keep.
2957
2957
2958 The commit message can be tweaked after the fact using commit --amend .
2958 The commit message can be tweaked after the fact using commit --amend .
2959
2959
2960 For using non-ancestors as the base to backout changes, see the backout
2960 For using non-ancestors as the base to backout changes, see the backout
2961 command and the hidden --parent option.
2961 command and the hidden --parent option.
2962
2962
2963 .. container:: verbose
2963 .. container:: verbose
2964
2964
2965 Examples:
2965 Examples:
2966
2966
2967 - copy a single change to the stable branch and edit its description::
2967 - copy a single change to the stable branch and edit its description::
2968
2968
2969 hg update stable
2969 hg update stable
2970 hg graft --edit 9393
2970 hg graft --edit 9393
2971
2971
2972 - graft a range of changesets with one exception, updating dates::
2972 - graft a range of changesets with one exception, updating dates::
2973
2973
2974 hg graft -D "2085::2093 and not 2091"
2974 hg graft -D "2085::2093 and not 2091"
2975
2975
2976 - continue a graft after resolving conflicts::
2976 - continue a graft after resolving conflicts::
2977
2977
2978 hg graft -c
2978 hg graft -c
2979
2979
2980 - show the source of a grafted changeset::
2980 - show the source of a grafted changeset::
2981
2981
2982 hg log --debug -r .
2982 hg log --debug -r .
2983
2983
2984 - show revisions sorted by date::
2984 - show revisions sorted by date::
2985
2985
2986 hg log -r "sort(all(), date)"
2986 hg log -r "sort(all(), date)"
2987
2987
2988 - backport the result of a merge as a single commit::
2988 - backport the result of a merge as a single commit::
2989
2989
2990 hg graft -r 123 --base 123^
2990 hg graft -r 123 --base 123^
2991
2991
2992 - land a feature branch as one changeset::
2992 - land a feature branch as one changeset::
2993
2993
2994 hg up -cr default
2994 hg up -cr default
2995 hg graft -r featureX --base "ancestor('featureX', 'default')"
2995 hg graft -r featureX --base "ancestor('featureX', 'default')"
2996
2996
2997 See :hg:`help revisions` for more about specifying revisions.
2997 See :hg:`help revisions` for more about specifying revisions.
2998
2998
2999 Returns 0 on successful completion, 1 if there are unresolved files.
2999 Returns 0 on successful completion, 1 if there are unresolved files.
3000 '''
3000 '''
3001 with repo.wlock():
3001 with repo.wlock():
3002 return _dograft(ui, repo, *revs, **opts)
3002 return _dograft(ui, repo, *revs, **opts)
3003
3003
3004
3004
3005 def _dograft(ui, repo, *revs, **opts):
3005 def _dograft(ui, repo, *revs, **opts):
3006 opts = pycompat.byteskwargs(opts)
3006 opts = pycompat.byteskwargs(opts)
3007 if revs and opts.get(b'rev'):
3007 if revs and opts.get(b'rev'):
3008 ui.warn(
3008 ui.warn(
3009 _(
3009 _(
3010 b'warning: inconsistent use of --rev might give unexpected '
3010 b'warning: inconsistent use of --rev might give unexpected '
3011 b'revision ordering!\n'
3011 b'revision ordering!\n'
3012 )
3012 )
3013 )
3013 )
3014
3014
3015 revs = list(revs)
3015 revs = list(revs)
3016 revs.extend(opts.get(b'rev'))
3016 revs.extend(opts.get(b'rev'))
3017 # a dict of data to be stored in state file
3017 # a dict of data to be stored in state file
3018 statedata = {}
3018 statedata = {}
3019 # list of new nodes created by ongoing graft
3019 # list of new nodes created by ongoing graft
3020 statedata[b'newnodes'] = []
3020 statedata[b'newnodes'] = []
3021
3021
3022 cmdutil.resolvecommitoptions(ui, opts)
3022 cmdutil.resolvecommitoptions(ui, opts)
3023
3023
3024 editor = cmdutil.getcommiteditor(
3024 editor = cmdutil.getcommiteditor(
3025 editform=b'graft', **pycompat.strkwargs(opts)
3025 editform=b'graft', **pycompat.strkwargs(opts)
3026 )
3026 )
3027
3027
3028 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3028 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3029
3029
3030 cont = False
3030 cont = False
3031 if opts.get(b'no_commit'):
3031 if opts.get(b'no_commit'):
3032 cmdutil.check_incompatible_arguments(
3032 cmdutil.check_incompatible_arguments(
3033 opts,
3033 opts,
3034 b'no_commit',
3034 b'no_commit',
3035 [b'edit', b'currentuser', b'currentdate', b'log'],
3035 [b'edit', b'currentuser', b'currentdate', b'log'],
3036 )
3036 )
3037
3037
3038 graftstate = statemod.cmdstate(repo, b'graftstate')
3038 graftstate = statemod.cmdstate(repo, b'graftstate')
3039
3039
3040 if opts.get(b'stop'):
3040 if opts.get(b'stop'):
3041 cmdutil.check_incompatible_arguments(
3041 cmdutil.check_incompatible_arguments(
3042 opts,
3042 opts,
3043 b'stop',
3043 b'stop',
3044 [
3044 [
3045 b'edit',
3045 b'edit',
3046 b'log',
3046 b'log',
3047 b'user',
3047 b'user',
3048 b'date',
3048 b'date',
3049 b'currentdate',
3049 b'currentdate',
3050 b'currentuser',
3050 b'currentuser',
3051 b'rev',
3051 b'rev',
3052 ],
3052 ],
3053 )
3053 )
3054 return _stopgraft(ui, repo, graftstate)
3054 return _stopgraft(ui, repo, graftstate)
3055 elif opts.get(b'abort'):
3055 elif opts.get(b'abort'):
3056 cmdutil.check_incompatible_arguments(
3056 cmdutil.check_incompatible_arguments(
3057 opts,
3057 opts,
3058 b'abort',
3058 b'abort',
3059 [
3059 [
3060 b'edit',
3060 b'edit',
3061 b'log',
3061 b'log',
3062 b'user',
3062 b'user',
3063 b'date',
3063 b'date',
3064 b'currentdate',
3064 b'currentdate',
3065 b'currentuser',
3065 b'currentuser',
3066 b'rev',
3066 b'rev',
3067 ],
3067 ],
3068 )
3068 )
3069 return cmdutil.abortgraft(ui, repo, graftstate)
3069 return cmdutil.abortgraft(ui, repo, graftstate)
3070 elif opts.get(b'continue'):
3070 elif opts.get(b'continue'):
3071 cont = True
3071 cont = True
3072 if revs:
3072 if revs:
3073 raise error.InputError(_(b"can't specify --continue and revisions"))
3073 raise error.InputError(_(b"can't specify --continue and revisions"))
3074 # read in unfinished revisions
3074 # read in unfinished revisions
3075 if graftstate.exists():
3075 if graftstate.exists():
3076 statedata = cmdutil.readgraftstate(repo, graftstate)
3076 statedata = cmdutil.readgraftstate(repo, graftstate)
3077 if statedata.get(b'date'):
3077 if statedata.get(b'date'):
3078 opts[b'date'] = statedata[b'date']
3078 opts[b'date'] = statedata[b'date']
3079 if statedata.get(b'user'):
3079 if statedata.get(b'user'):
3080 opts[b'user'] = statedata[b'user']
3080 opts[b'user'] = statedata[b'user']
3081 if statedata.get(b'log'):
3081 if statedata.get(b'log'):
3082 opts[b'log'] = True
3082 opts[b'log'] = True
3083 if statedata.get(b'no_commit'):
3083 if statedata.get(b'no_commit'):
3084 opts[b'no_commit'] = statedata.get(b'no_commit')
3084 opts[b'no_commit'] = statedata.get(b'no_commit')
3085 if statedata.get(b'base'):
3085 if statedata.get(b'base'):
3086 opts[b'base'] = statedata.get(b'base')
3086 opts[b'base'] = statedata.get(b'base')
3087 nodes = statedata[b'nodes']
3087 nodes = statedata[b'nodes']
3088 revs = [repo[node].rev() for node in nodes]
3088 revs = [repo[node].rev() for node in nodes]
3089 else:
3089 else:
3090 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3090 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3091 else:
3091 else:
3092 if not revs:
3092 if not revs:
3093 raise error.InputError(_(b'no revisions specified'))
3093 raise error.InputError(_(b'no revisions specified'))
3094 cmdutil.checkunfinished(repo)
3094 cmdutil.checkunfinished(repo)
3095 cmdutil.bailifchanged(repo)
3095 cmdutil.bailifchanged(repo)
3096 revs = scmutil.revrange(repo, revs)
3096 revs = scmutil.revrange(repo, revs)
3097
3097
3098 skipped = set()
3098 skipped = set()
3099 basectx = None
3099 basectx = None
3100 if opts.get(b'base'):
3100 if opts.get(b'base'):
3101 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3101 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3102 if basectx is None:
3102 if basectx is None:
3103 # check for merges
3103 # check for merges
3104 for rev in repo.revs(b'%ld and merge()', revs):
3104 for rev in repo.revs(b'%ld and merge()', revs):
3105 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3105 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3106 skipped.add(rev)
3106 skipped.add(rev)
3107 revs = [r for r in revs if r not in skipped]
3107 revs = [r for r in revs if r not in skipped]
3108 if not revs:
3108 if not revs:
3109 return -1
3109 return -1
3110 if basectx is not None and len(revs) != 1:
3110 if basectx is not None and len(revs) != 1:
3111 raise error.InputError(_(b'only one revision allowed with --base '))
3111 raise error.InputError(_(b'only one revision allowed with --base '))
3112
3112
3113 # Don't check in the --continue case, in effect retaining --force across
3113 # Don't check in the --continue case, in effect retaining --force across
3114 # --continues. That's because without --force, any revisions we decided to
3114 # --continues. That's because without --force, any revisions we decided to
3115 # skip would have been filtered out here, so they wouldn't have made their
3115 # skip would have been filtered out here, so they wouldn't have made their
3116 # way to the graftstate. With --force, any revisions we would have otherwise
3116 # way to the graftstate. With --force, any revisions we would have otherwise
3117 # skipped would not have been filtered out, and if they hadn't been applied
3117 # skipped would not have been filtered out, and if they hadn't been applied
3118 # already, they'd have been in the graftstate.
3118 # already, they'd have been in the graftstate.
3119 if not (cont or opts.get(b'force')) and basectx is None:
3119 if not (cont or opts.get(b'force')) and basectx is None:
3120 # check for ancestors of dest branch
3120 # check for ancestors of dest branch
3121 ancestors = repo.revs(b'%ld & (::.)', revs)
3121 ancestors = repo.revs(b'%ld & (::.)', revs)
3122 for rev in ancestors:
3122 for rev in ancestors:
3123 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3123 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3124
3124
3125 revs = [r for r in revs if r not in ancestors]
3125 revs = [r for r in revs if r not in ancestors]
3126
3126
3127 if not revs:
3127 if not revs:
3128 return -1
3128 return -1
3129
3129
3130 # analyze revs for earlier grafts
3130 # analyze revs for earlier grafts
3131 ids = {}
3131 ids = {}
3132 for ctx in repo.set(b"%ld", revs):
3132 for ctx in repo.set(b"%ld", revs):
3133 ids[ctx.hex()] = ctx.rev()
3133 ids[ctx.hex()] = ctx.rev()
3134 n = ctx.extra().get(b'source')
3134 n = ctx.extra().get(b'source')
3135 if n:
3135 if n:
3136 ids[n] = ctx.rev()
3136 ids[n] = ctx.rev()
3137
3137
3138 # check ancestors for earlier grafts
3138 # check ancestors for earlier grafts
3139 ui.debug(b'scanning for duplicate grafts\n')
3139 ui.debug(b'scanning for duplicate grafts\n')
3140
3140
3141 # The only changesets we can be sure doesn't contain grafts of any
3141 # The only changesets we can be sure doesn't contain grafts of any
3142 # revs, are the ones that are common ancestors of *all* revs:
3142 # revs, are the ones that are common ancestors of *all* revs:
3143 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3143 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3144 ctx = repo[rev]
3144 ctx = repo[rev]
3145 n = ctx.extra().get(b'source')
3145 n = ctx.extra().get(b'source')
3146 if n in ids:
3146 if n in ids:
3147 try:
3147 try:
3148 r = repo[n].rev()
3148 r = repo[n].rev()
3149 except error.RepoLookupError:
3149 except error.RepoLookupError:
3150 r = None
3150 r = None
3151 if r in revs:
3151 if r in revs:
3152 ui.warn(
3152 ui.warn(
3153 _(
3153 _(
3154 b'skipping revision %d:%s '
3154 b'skipping revision %d:%s '
3155 b'(already grafted to %d:%s)\n'
3155 b'(already grafted to %d:%s)\n'
3156 )
3156 )
3157 % (r, repo[r], rev, ctx)
3157 % (r, repo[r], rev, ctx)
3158 )
3158 )
3159 revs.remove(r)
3159 revs.remove(r)
3160 elif ids[n] in revs:
3160 elif ids[n] in revs:
3161 if r is None:
3161 if r is None:
3162 ui.warn(
3162 ui.warn(
3163 _(
3163 _(
3164 b'skipping already grafted revision %d:%s '
3164 b'skipping already grafted revision %d:%s '
3165 b'(%d:%s also has unknown origin %s)\n'
3165 b'(%d:%s also has unknown origin %s)\n'
3166 )
3166 )
3167 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3167 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3168 )
3168 )
3169 else:
3169 else:
3170 ui.warn(
3170 ui.warn(
3171 _(
3171 _(
3172 b'skipping already grafted revision %d:%s '
3172 b'skipping already grafted revision %d:%s '
3173 b'(%d:%s also has origin %d:%s)\n'
3173 b'(%d:%s also has origin %d:%s)\n'
3174 )
3174 )
3175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3176 )
3176 )
3177 revs.remove(ids[n])
3177 revs.remove(ids[n])
3178 elif ctx.hex() in ids:
3178 elif ctx.hex() in ids:
3179 r = ids[ctx.hex()]
3179 r = ids[ctx.hex()]
3180 if r in revs:
3180 if r in revs:
3181 ui.warn(
3181 ui.warn(
3182 _(
3182 _(
3183 b'skipping already grafted revision %d:%s '
3183 b'skipping already grafted revision %d:%s '
3184 b'(was grafted from %d:%s)\n'
3184 b'(was grafted from %d:%s)\n'
3185 )
3185 )
3186 % (r, repo[r], rev, ctx)
3186 % (r, repo[r], rev, ctx)
3187 )
3187 )
3188 revs.remove(r)
3188 revs.remove(r)
3189 if not revs:
3189 if not revs:
3190 return -1
3190 return -1
3191
3191
3192 if opts.get(b'no_commit'):
3192 if opts.get(b'no_commit'):
3193 statedata[b'no_commit'] = True
3193 statedata[b'no_commit'] = True
3194 if opts.get(b'base'):
3194 if opts.get(b'base'):
3195 statedata[b'base'] = opts[b'base']
3195 statedata[b'base'] = opts[b'base']
3196 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3196 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3197 desc = b'%d:%s "%s"' % (
3197 desc = b'%d:%s "%s"' % (
3198 ctx.rev(),
3198 ctx.rev(),
3199 ctx,
3199 ctx,
3200 ctx.description().split(b'\n', 1)[0],
3200 ctx.description().split(b'\n', 1)[0],
3201 )
3201 )
3202 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3202 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3203 if names:
3203 if names:
3204 desc += b' (%s)' % b' '.join(names)
3204 desc += b' (%s)' % b' '.join(names)
3205 ui.status(_(b'grafting %s\n') % desc)
3205 ui.status(_(b'grafting %s\n') % desc)
3206 if opts.get(b'dry_run'):
3206 if opts.get(b'dry_run'):
3207 continue
3207 continue
3208
3208
3209 source = ctx.extra().get(b'source')
3209 source = ctx.extra().get(b'source')
3210 extra = {}
3210 extra = {}
3211 if source:
3211 if source:
3212 extra[b'source'] = source
3212 extra[b'source'] = source
3213 extra[b'intermediate-source'] = ctx.hex()
3213 extra[b'intermediate-source'] = ctx.hex()
3214 else:
3214 else:
3215 extra[b'source'] = ctx.hex()
3215 extra[b'source'] = ctx.hex()
3216 user = ctx.user()
3216 user = ctx.user()
3217 if opts.get(b'user'):
3217 if opts.get(b'user'):
3218 user = opts[b'user']
3218 user = opts[b'user']
3219 statedata[b'user'] = user
3219 statedata[b'user'] = user
3220 date = ctx.date()
3220 date = ctx.date()
3221 if opts.get(b'date'):
3221 if opts.get(b'date'):
3222 date = opts[b'date']
3222 date = opts[b'date']
3223 statedata[b'date'] = date
3223 statedata[b'date'] = date
3224 message = ctx.description()
3224 message = ctx.description()
3225 if opts.get(b'log'):
3225 if opts.get(b'log'):
3226 message += b'\n(grafted from %s)' % ctx.hex()
3226 message += b'\n(grafted from %s)' % ctx.hex()
3227 statedata[b'log'] = True
3227 statedata[b'log'] = True
3228
3228
3229 # we don't merge the first commit when continuing
3229 # we don't merge the first commit when continuing
3230 if not cont:
3230 if not cont:
3231 # perform the graft merge with p1(rev) as 'ancestor'
3231 # perform the graft merge with p1(rev) as 'ancestor'
3232 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3232 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3233 base = ctx.p1() if basectx is None else basectx
3233 base = ctx.p1() if basectx is None else basectx
3234 with ui.configoverride(overrides, b'graft'):
3234 with ui.configoverride(overrides, b'graft'):
3235 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3235 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3236 # report any conflicts
3236 # report any conflicts
3237 if stats.unresolvedcount > 0:
3237 if stats.unresolvedcount > 0:
3238 # write out state for --continue
3238 # write out state for --continue
3239 nodes = [repo[rev].hex() for rev in revs[pos:]]
3239 nodes = [repo[rev].hex() for rev in revs[pos:]]
3240 statedata[b'nodes'] = nodes
3240 statedata[b'nodes'] = nodes
3241 stateversion = 1
3241 stateversion = 1
3242 graftstate.save(stateversion, statedata)
3242 graftstate.save(stateversion, statedata)
3243 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3243 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3244 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3244 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3245 return 1
3245 return 1
3246 else:
3246 else:
3247 cont = False
3247 cont = False
3248
3248
3249 # commit if --no-commit is false
3249 # commit if --no-commit is false
3250 if not opts.get(b'no_commit'):
3250 if not opts.get(b'no_commit'):
3251 node = repo.commit(
3251 node = repo.commit(
3252 text=message, user=user, date=date, extra=extra, editor=editor
3252 text=message, user=user, date=date, extra=extra, editor=editor
3253 )
3253 )
3254 if node is None:
3254 if node is None:
3255 ui.warn(
3255 ui.warn(
3256 _(b'note: graft of %d:%s created no changes to commit\n')
3256 _(b'note: graft of %d:%s created no changes to commit\n')
3257 % (ctx.rev(), ctx)
3257 % (ctx.rev(), ctx)
3258 )
3258 )
3259 # checking that newnodes exist because old state files won't have it
3259 # checking that newnodes exist because old state files won't have it
3260 elif statedata.get(b'newnodes') is not None:
3260 elif statedata.get(b'newnodes') is not None:
3261 statedata[b'newnodes'].append(node)
3261 statedata[b'newnodes'].append(node)
3262
3262
3263 # remove state when we complete successfully
3263 # remove state when we complete successfully
3264 if not opts.get(b'dry_run'):
3264 if not opts.get(b'dry_run'):
3265 graftstate.delete()
3265 graftstate.delete()
3266
3266
3267 return 0
3267 return 0
3268
3268
3269
3269
3270 def _stopgraft(ui, repo, graftstate):
3270 def _stopgraft(ui, repo, graftstate):
3271 """stop the interrupted graft"""
3271 """stop the interrupted graft"""
3272 if not graftstate.exists():
3272 if not graftstate.exists():
3273 raise error.StateError(_(b"no interrupted graft found"))
3273 raise error.StateError(_(b"no interrupted graft found"))
3274 pctx = repo[b'.']
3274 pctx = repo[b'.']
3275 mergemod.clean_update(pctx)
3275 mergemod.clean_update(pctx)
3276 graftstate.delete()
3276 graftstate.delete()
3277 ui.status(_(b"stopped the interrupted graft\n"))
3277 ui.status(_(b"stopped the interrupted graft\n"))
3278 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3278 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3279 return 0
3279 return 0
3280
3280
3281
3281
3282 statemod.addunfinished(
3282 statemod.addunfinished(
3283 b'graft',
3283 b'graft',
3284 fname=b'graftstate',
3284 fname=b'graftstate',
3285 clearable=True,
3285 clearable=True,
3286 stopflag=True,
3286 stopflag=True,
3287 continueflag=True,
3287 continueflag=True,
3288 abortfunc=cmdutil.hgabortgraft,
3288 abortfunc=cmdutil.hgabortgraft,
3289 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3289 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3290 )
3290 )
3291
3291
3292
3292
3293 @command(
3293 @command(
3294 b'grep',
3294 b'grep',
3295 [
3295 [
3296 (b'0', b'print0', None, _(b'end fields with NUL')),
3296 (b'0', b'print0', None, _(b'end fields with NUL')),
3297 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3297 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3298 (
3298 (
3299 b'',
3299 b'',
3300 b'diff',
3300 b'diff',
3301 None,
3301 None,
3302 _(
3302 _(
3303 b'search revision differences for when the pattern was added '
3303 b'search revision differences for when the pattern was added '
3304 b'or removed'
3304 b'or removed'
3305 ),
3305 ),
3306 ),
3306 ),
3307 (b'a', b'text', None, _(b'treat all files as text')),
3307 (b'a', b'text', None, _(b'treat all files as text')),
3308 (
3308 (
3309 b'f',
3309 b'f',
3310 b'follow',
3310 b'follow',
3311 None,
3311 None,
3312 _(
3312 _(
3313 b'follow changeset history,'
3313 b'follow changeset history,'
3314 b' or file history across copies and renames'
3314 b' or file history across copies and renames'
3315 ),
3315 ),
3316 ),
3316 ),
3317 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3317 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3318 (
3318 (
3319 b'l',
3319 b'l',
3320 b'files-with-matches',
3320 b'files-with-matches',
3321 None,
3321 None,
3322 _(b'print only filenames and revisions that match'),
3322 _(b'print only filenames and revisions that match'),
3323 ),
3323 ),
3324 (b'n', b'line-number', None, _(b'print matching line numbers')),
3324 (b'n', b'line-number', None, _(b'print matching line numbers')),
3325 (
3325 (
3326 b'r',
3326 b'r',
3327 b'rev',
3327 b'rev',
3328 [],
3328 [],
3329 _(b'search files changed within revision range'),
3329 _(b'search files changed within revision range'),
3330 _(b'REV'),
3330 _(b'REV'),
3331 ),
3331 ),
3332 (
3332 (
3333 b'',
3333 b'',
3334 b'all-files',
3334 b'all-files',
3335 None,
3335 None,
3336 _(
3336 _(
3337 b'include all files in the changeset while grepping (DEPRECATED)'
3337 b'include all files in the changeset while grepping (DEPRECATED)'
3338 ),
3338 ),
3339 ),
3339 ),
3340 (b'u', b'user', None, _(b'list the author (long with -v)')),
3340 (b'u', b'user', None, _(b'list the author (long with -v)')),
3341 (b'd', b'date', None, _(b'list the date (short with -q)')),
3341 (b'd', b'date', None, _(b'list the date (short with -q)')),
3342 ]
3342 ]
3343 + formatteropts
3343 + formatteropts
3344 + walkopts,
3344 + walkopts,
3345 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3345 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3346 helpcategory=command.CATEGORY_FILE_CONTENTS,
3346 helpcategory=command.CATEGORY_FILE_CONTENTS,
3347 inferrepo=True,
3347 inferrepo=True,
3348 intents={INTENT_READONLY},
3348 intents={INTENT_READONLY},
3349 )
3349 )
3350 def grep(ui, repo, pattern, *pats, **opts):
3350 def grep(ui, repo, pattern, *pats, **opts):
3351 """search for a pattern in specified files
3351 """search for a pattern in specified files
3352
3352
3353 Search the working directory or revision history for a regular
3353 Search the working directory or revision history for a regular
3354 expression in the specified files for the entire repository.
3354 expression in the specified files for the entire repository.
3355
3355
3356 By default, grep searches the repository files in the working
3356 By default, grep searches the repository files in the working
3357 directory and prints the files where it finds a match. To specify
3357 directory and prints the files where it finds a match. To specify
3358 historical revisions instead of the working directory, use the
3358 historical revisions instead of the working directory, use the
3359 --rev flag.
3359 --rev flag.
3360
3360
3361 To search instead historical revision differences that contains a
3361 To search instead historical revision differences that contains a
3362 change in match status ("-" for a match that becomes a non-match,
3362 change in match status ("-" for a match that becomes a non-match,
3363 or "+" for a non-match that becomes a match), use the --diff flag.
3363 or "+" for a non-match that becomes a match), use the --diff flag.
3364
3364
3365 PATTERN can be any Python (roughly Perl-compatible) regular
3365 PATTERN can be any Python (roughly Perl-compatible) regular
3366 expression.
3366 expression.
3367
3367
3368 If no FILEs are specified and the --rev flag isn't supplied, all
3368 If no FILEs are specified and the --rev flag isn't supplied, all
3369 files in the working directory are searched. When using the --rev
3369 files in the working directory are searched. When using the --rev
3370 flag and specifying FILEs, use the --follow argument to also
3370 flag and specifying FILEs, use the --follow argument to also
3371 follow the specified FILEs across renames and copies.
3371 follow the specified FILEs across renames and copies.
3372
3372
3373 .. container:: verbose
3373 .. container:: verbose
3374
3374
3375 Template:
3375 Template:
3376
3376
3377 The following keywords are supported in addition to the common template
3377 The following keywords are supported in addition to the common template
3378 keywords and functions. See also :hg:`help templates`.
3378 keywords and functions. See also :hg:`help templates`.
3379
3379
3380 :change: String. Character denoting insertion ``+`` or removal ``-``.
3380 :change: String. Character denoting insertion ``+`` or removal ``-``.
3381 Available if ``--diff`` is specified.
3381 Available if ``--diff`` is specified.
3382 :lineno: Integer. Line number of the match.
3382 :lineno: Integer. Line number of the match.
3383 :path: String. Repository-absolute path of the file.
3383 :path: String. Repository-absolute path of the file.
3384 :texts: List of text chunks.
3384 :texts: List of text chunks.
3385
3385
3386 And each entry of ``{texts}`` provides the following sub-keywords.
3386 And each entry of ``{texts}`` provides the following sub-keywords.
3387
3387
3388 :matched: Boolean. True if the chunk matches the specified pattern.
3388 :matched: Boolean. True if the chunk matches the specified pattern.
3389 :text: String. Chunk content.
3389 :text: String. Chunk content.
3390
3390
3391 See :hg:`help templates.operators` for the list expansion syntax.
3391 See :hg:`help templates.operators` for the list expansion syntax.
3392
3392
3393 Returns 0 if a match is found, 1 otherwise.
3393 Returns 0 if a match is found, 1 otherwise.
3394
3394
3395 """
3395 """
3396 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3396 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3397 opts = pycompat.byteskwargs(opts)
3397 opts = pycompat.byteskwargs(opts)
3398 diff = opts.get(b'all') or opts.get(b'diff')
3398 diff = opts.get(b'all') or opts.get(b'diff')
3399 follow = opts.get(b'follow')
3399 follow = opts.get(b'follow')
3400 if opts.get(b'all_files') is None and not diff:
3400 if opts.get(b'all_files') is None and not diff:
3401 opts[b'all_files'] = True
3401 opts[b'all_files'] = True
3402 plaingrep = (
3402 plaingrep = (
3403 opts.get(b'all_files')
3403 opts.get(b'all_files')
3404 and not opts.get(b'rev')
3404 and not opts.get(b'rev')
3405 and not opts.get(b'follow')
3405 and not opts.get(b'follow')
3406 )
3406 )
3407 all_files = opts.get(b'all_files')
3407 all_files = opts.get(b'all_files')
3408 if plaingrep:
3408 if plaingrep:
3409 opts[b'rev'] = [b'wdir()']
3409 opts[b'rev'] = [b'wdir()']
3410
3410
3411 reflags = re.M
3411 reflags = re.M
3412 if opts.get(b'ignore_case'):
3412 if opts.get(b'ignore_case'):
3413 reflags |= re.I
3413 reflags |= re.I
3414 try:
3414 try:
3415 regexp = util.re.compile(pattern, reflags)
3415 regexp = util.re.compile(pattern, reflags)
3416 except re.error as inst:
3416 except re.error as inst:
3417 ui.warn(
3417 ui.warn(
3418 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3418 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3419 )
3419 )
3420 return 1
3420 return 1
3421 sep, eol = b':', b'\n'
3421 sep, eol = b':', b'\n'
3422 if opts.get(b'print0'):
3422 if opts.get(b'print0'):
3423 sep = eol = b'\0'
3423 sep = eol = b'\0'
3424
3424
3425 searcher = grepmod.grepsearcher(
3425 searcher = grepmod.grepsearcher(
3426 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3426 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3427 )
3427 )
3428
3428
3429 getfile = searcher._getfile
3429 getfile = searcher._getfile
3430
3430
3431 uipathfn = scmutil.getuipathfn(repo)
3431 uipathfn = scmutil.getuipathfn(repo)
3432
3432
3433 def display(fm, fn, ctx, pstates, states):
3433 def display(fm, fn, ctx, pstates, states):
3434 rev = scmutil.intrev(ctx)
3434 rev = scmutil.intrev(ctx)
3435 if fm.isplain():
3435 if fm.isplain():
3436 formatuser = ui.shortuser
3436 formatuser = ui.shortuser
3437 else:
3437 else:
3438 formatuser = pycompat.bytestr
3438 formatuser = pycompat.bytestr
3439 if ui.quiet:
3439 if ui.quiet:
3440 datefmt = b'%Y-%m-%d'
3440 datefmt = b'%Y-%m-%d'
3441 else:
3441 else:
3442 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3442 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3443 found = False
3443 found = False
3444
3444
3445 @util.cachefunc
3445 @util.cachefunc
3446 def binary():
3446 def binary():
3447 flog = getfile(fn)
3447 flog = getfile(fn)
3448 try:
3448 try:
3449 return stringutil.binary(flog.read(ctx.filenode(fn)))
3449 return stringutil.binary(flog.read(ctx.filenode(fn)))
3450 except error.WdirUnsupported:
3450 except error.WdirUnsupported:
3451 return ctx[fn].isbinary()
3451 return ctx[fn].isbinary()
3452
3452
3453 fieldnamemap = {b'linenumber': b'lineno'}
3453 fieldnamemap = {b'linenumber': b'lineno'}
3454 if diff:
3454 if diff:
3455 iter = grepmod.difflinestates(pstates, states)
3455 iter = grepmod.difflinestates(pstates, states)
3456 else:
3456 else:
3457 iter = [(b'', l) for l in states]
3457 iter = [(b'', l) for l in states]
3458 for change, l in iter:
3458 for change, l in iter:
3459 fm.startitem()
3459 fm.startitem()
3460 fm.context(ctx=ctx)
3460 fm.context(ctx=ctx)
3461 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3461 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3462 fm.plain(uipathfn(fn), label=b'grep.filename')
3462 fm.plain(uipathfn(fn), label=b'grep.filename')
3463
3463
3464 cols = [
3464 cols = [
3465 (b'rev', b'%d', rev, not plaingrep, b''),
3465 (b'rev', b'%d', rev, not plaingrep, b''),
3466 (
3466 (
3467 b'linenumber',
3467 b'linenumber',
3468 b'%d',
3468 b'%d',
3469 l.linenum,
3469 l.linenum,
3470 opts.get(b'line_number'),
3470 opts.get(b'line_number'),
3471 b'',
3471 b'',
3472 ),
3472 ),
3473 ]
3473 ]
3474 if diff:
3474 if diff:
3475 cols.append(
3475 cols.append(
3476 (
3476 (
3477 b'change',
3477 b'change',
3478 b'%s',
3478 b'%s',
3479 change,
3479 change,
3480 True,
3480 True,
3481 b'grep.inserted '
3481 b'grep.inserted '
3482 if change == b'+'
3482 if change == b'+'
3483 else b'grep.deleted ',
3483 else b'grep.deleted ',
3484 )
3484 )
3485 )
3485 )
3486 cols.extend(
3486 cols.extend(
3487 [
3487 [
3488 (
3488 (
3489 b'user',
3489 b'user',
3490 b'%s',
3490 b'%s',
3491 formatuser(ctx.user()),
3491 formatuser(ctx.user()),
3492 opts.get(b'user'),
3492 opts.get(b'user'),
3493 b'',
3493 b'',
3494 ),
3494 ),
3495 (
3495 (
3496 b'date',
3496 b'date',
3497 b'%s',
3497 b'%s',
3498 fm.formatdate(ctx.date(), datefmt),
3498 fm.formatdate(ctx.date(), datefmt),
3499 opts.get(b'date'),
3499 opts.get(b'date'),
3500 b'',
3500 b'',
3501 ),
3501 ),
3502 ]
3502 ]
3503 )
3503 )
3504 for name, fmt, data, cond, extra_label in cols:
3504 for name, fmt, data, cond, extra_label in cols:
3505 if cond:
3505 if cond:
3506 fm.plain(sep, label=b'grep.sep')
3506 fm.plain(sep, label=b'grep.sep')
3507 field = fieldnamemap.get(name, name)
3507 field = fieldnamemap.get(name, name)
3508 label = extra_label + (b'grep.%s' % name)
3508 label = extra_label + (b'grep.%s' % name)
3509 fm.condwrite(cond, field, fmt, data, label=label)
3509 fm.condwrite(cond, field, fmt, data, label=label)
3510 if not opts.get(b'files_with_matches'):
3510 if not opts.get(b'files_with_matches'):
3511 fm.plain(sep, label=b'grep.sep')
3511 fm.plain(sep, label=b'grep.sep')
3512 if not opts.get(b'text') and binary():
3512 if not opts.get(b'text') and binary():
3513 fm.plain(_(b" Binary file matches"))
3513 fm.plain(_(b" Binary file matches"))
3514 else:
3514 else:
3515 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3515 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3516 fm.plain(eol)
3516 fm.plain(eol)
3517 found = True
3517 found = True
3518 if opts.get(b'files_with_matches'):
3518 if opts.get(b'files_with_matches'):
3519 break
3519 break
3520 return found
3520 return found
3521
3521
3522 def displaymatches(fm, l):
3522 def displaymatches(fm, l):
3523 p = 0
3523 p = 0
3524 for s, e in l.findpos(regexp):
3524 for s, e in l.findpos(regexp):
3525 if p < s:
3525 if p < s:
3526 fm.startitem()
3526 fm.startitem()
3527 fm.write(b'text', b'%s', l.line[p:s])
3527 fm.write(b'text', b'%s', l.line[p:s])
3528 fm.data(matched=False)
3528 fm.data(matched=False)
3529 fm.startitem()
3529 fm.startitem()
3530 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3530 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3531 fm.data(matched=True)
3531 fm.data(matched=True)
3532 p = e
3532 p = e
3533 if p < len(l.line):
3533 if p < len(l.line):
3534 fm.startitem()
3534 fm.startitem()
3535 fm.write(b'text', b'%s', l.line[p:])
3535 fm.write(b'text', b'%s', l.line[p:])
3536 fm.data(matched=False)
3536 fm.data(matched=False)
3537 fm.end()
3537 fm.end()
3538
3538
3539 found = False
3539 found = False
3540
3540
3541 wopts = logcmdutil.walkopts(
3541 wopts = logcmdutil.walkopts(
3542 pats=pats,
3542 pats=pats,
3543 opts=opts,
3543 opts=opts,
3544 revspec=opts[b'rev'],
3544 revspec=opts[b'rev'],
3545 include_pats=opts[b'include'],
3545 include_pats=opts[b'include'],
3546 exclude_pats=opts[b'exclude'],
3546 exclude_pats=opts[b'exclude'],
3547 follow=follow,
3547 follow=follow,
3548 force_changelog_traversal=all_files,
3548 force_changelog_traversal=all_files,
3549 filter_revisions_by_pats=not all_files,
3549 filter_revisions_by_pats=not all_files,
3550 )
3550 )
3551 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3551 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3552
3552
3553 ui.pager(b'grep')
3553 ui.pager(b'grep')
3554 fm = ui.formatter(b'grep', opts)
3554 fm = ui.formatter(b'grep', opts)
3555 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3555 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3556 r = display(fm, fn, ctx, pstates, states)
3556 r = display(fm, fn, ctx, pstates, states)
3557 found = found or r
3557 found = found or r
3558 if r and not diff and not all_files:
3558 if r and not diff and not all_files:
3559 searcher.skipfile(fn, ctx.rev())
3559 searcher.skipfile(fn, ctx.rev())
3560 fm.end()
3560 fm.end()
3561
3561
3562 return not found
3562 return not found
3563
3563
3564
3564
3565 @command(
3565 @command(
3566 b'heads',
3566 b'heads',
3567 [
3567 [
3568 (
3568 (
3569 b'r',
3569 b'r',
3570 b'rev',
3570 b'rev',
3571 b'',
3571 b'',
3572 _(b'show only heads which are descendants of STARTREV'),
3572 _(b'show only heads which are descendants of STARTREV'),
3573 _(b'STARTREV'),
3573 _(b'STARTREV'),
3574 ),
3574 ),
3575 (b't', b'topo', False, _(b'show topological heads only')),
3575 (b't', b'topo', False, _(b'show topological heads only')),
3576 (
3576 (
3577 b'a',
3577 b'a',
3578 b'active',
3578 b'active',
3579 False,
3579 False,
3580 _(b'show active branchheads only (DEPRECATED)'),
3580 _(b'show active branchheads only (DEPRECATED)'),
3581 ),
3581 ),
3582 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3582 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3583 ]
3583 ]
3584 + templateopts,
3584 + templateopts,
3585 _(b'[-ct] [-r STARTREV] [REV]...'),
3585 _(b'[-ct] [-r STARTREV] [REV]...'),
3586 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3586 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3587 intents={INTENT_READONLY},
3587 intents={INTENT_READONLY},
3588 )
3588 )
3589 def heads(ui, repo, *branchrevs, **opts):
3589 def heads(ui, repo, *branchrevs, **opts):
3590 """show branch heads
3590 """show branch heads
3591
3591
3592 With no arguments, show all open branch heads in the repository.
3592 With no arguments, show all open branch heads in the repository.
3593 Branch heads are changesets that have no descendants on the
3593 Branch heads are changesets that have no descendants on the
3594 same branch. They are where development generally takes place and
3594 same branch. They are where development generally takes place and
3595 are the usual targets for update and merge operations.
3595 are the usual targets for update and merge operations.
3596
3596
3597 If one or more REVs are given, only open branch heads on the
3597 If one or more REVs are given, only open branch heads on the
3598 branches associated with the specified changesets are shown. This
3598 branches associated with the specified changesets are shown. This
3599 means that you can use :hg:`heads .` to see the heads on the
3599 means that you can use :hg:`heads .` to see the heads on the
3600 currently checked-out branch.
3600 currently checked-out branch.
3601
3601
3602 If -c/--closed is specified, also show branch heads marked closed
3602 If -c/--closed is specified, also show branch heads marked closed
3603 (see :hg:`commit --close-branch`).
3603 (see :hg:`commit --close-branch`).
3604
3604
3605 If STARTREV is specified, only those heads that are descendants of
3605 If STARTREV is specified, only those heads that are descendants of
3606 STARTREV will be displayed.
3606 STARTREV will be displayed.
3607
3607
3608 If -t/--topo is specified, named branch mechanics will be ignored and only
3608 If -t/--topo is specified, named branch mechanics will be ignored and only
3609 topological heads (changesets with no children) will be shown.
3609 topological heads (changesets with no children) will be shown.
3610
3610
3611 Returns 0 if matching heads are found, 1 if not.
3611 Returns 0 if matching heads are found, 1 if not.
3612 """
3612 """
3613
3613
3614 opts = pycompat.byteskwargs(opts)
3614 opts = pycompat.byteskwargs(opts)
3615 start = None
3615 start = None
3616 rev = opts.get(b'rev')
3616 rev = opts.get(b'rev')
3617 if rev:
3617 if rev:
3618 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3618 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3619 start = scmutil.revsingle(repo, rev, None).node()
3619 start = scmutil.revsingle(repo, rev, None).node()
3620
3620
3621 if opts.get(b'topo'):
3621 if opts.get(b'topo'):
3622 heads = [repo[h] for h in repo.heads(start)]
3622 heads = [repo[h] for h in repo.heads(start)]
3623 else:
3623 else:
3624 heads = []
3624 heads = []
3625 for branch in repo.branchmap():
3625 for branch in repo.branchmap():
3626 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3626 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3627 heads = [repo[h] for h in heads]
3627 heads = [repo[h] for h in heads]
3628
3628
3629 if branchrevs:
3629 if branchrevs:
3630 branches = {
3630 branches = {
3631 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3631 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3632 }
3632 }
3633 heads = [h for h in heads if h.branch() in branches]
3633 heads = [h for h in heads if h.branch() in branches]
3634
3634
3635 if opts.get(b'active') and branchrevs:
3635 if opts.get(b'active') and branchrevs:
3636 dagheads = repo.heads(start)
3636 dagheads = repo.heads(start)
3637 heads = [h for h in heads if h.node() in dagheads]
3637 heads = [h for h in heads if h.node() in dagheads]
3638
3638
3639 if branchrevs:
3639 if branchrevs:
3640 haveheads = {h.branch() for h in heads}
3640 haveheads = {h.branch() for h in heads}
3641 if branches - haveheads:
3641 if branches - haveheads:
3642 headless = b', '.join(b for b in branches - haveheads)
3642 headless = b', '.join(b for b in branches - haveheads)
3643 msg = _(b'no open branch heads found on branches %s')
3643 msg = _(b'no open branch heads found on branches %s')
3644 if opts.get(b'rev'):
3644 if opts.get(b'rev'):
3645 msg += _(b' (started at %s)') % opts[b'rev']
3645 msg += _(b' (started at %s)') % opts[b'rev']
3646 ui.warn((msg + b'\n') % headless)
3646 ui.warn((msg + b'\n') % headless)
3647
3647
3648 if not heads:
3648 if not heads:
3649 return 1
3649 return 1
3650
3650
3651 ui.pager(b'heads')
3651 ui.pager(b'heads')
3652 heads = sorted(heads, key=lambda x: -(x.rev()))
3652 heads = sorted(heads, key=lambda x: -(x.rev()))
3653 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3653 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3654 for ctx in heads:
3654 for ctx in heads:
3655 displayer.show(ctx)
3655 displayer.show(ctx)
3656 displayer.close()
3656 displayer.close()
3657
3657
3658
3658
3659 @command(
3659 @command(
3660 b'help',
3660 b'help',
3661 [
3661 [
3662 (b'e', b'extension', None, _(b'show only help for extensions')),
3662 (b'e', b'extension', None, _(b'show only help for extensions')),
3663 (b'c', b'command', None, _(b'show only help for commands')),
3663 (b'c', b'command', None, _(b'show only help for commands')),
3664 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3664 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3665 (
3665 (
3666 b's',
3666 b's',
3667 b'system',
3667 b'system',
3668 [],
3668 [],
3669 _(b'show help for specific platform(s)'),
3669 _(b'show help for specific platform(s)'),
3670 _(b'PLATFORM'),
3670 _(b'PLATFORM'),
3671 ),
3671 ),
3672 ],
3672 ],
3673 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3673 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3674 helpcategory=command.CATEGORY_HELP,
3674 helpcategory=command.CATEGORY_HELP,
3675 norepo=True,
3675 norepo=True,
3676 intents={INTENT_READONLY},
3676 intents={INTENT_READONLY},
3677 )
3677 )
3678 def help_(ui, name=None, **opts):
3678 def help_(ui, name=None, **opts):
3679 """show help for a given topic or a help overview
3679 """show help for a given topic or a help overview
3680
3680
3681 With no arguments, print a list of commands with short help messages.
3681 With no arguments, print a list of commands with short help messages.
3682
3682
3683 Given a topic, extension, or command name, print help for that
3683 Given a topic, extension, or command name, print help for that
3684 topic.
3684 topic.
3685
3685
3686 Returns 0 if successful.
3686 Returns 0 if successful.
3687 """
3687 """
3688
3688
3689 keep = opts.get('system') or []
3689 keep = opts.get('system') or []
3690 if len(keep) == 0:
3690 if len(keep) == 0:
3691 if pycompat.sysplatform.startswith(b'win'):
3691 if pycompat.sysplatform.startswith(b'win'):
3692 keep.append(b'windows')
3692 keep.append(b'windows')
3693 elif pycompat.sysplatform == b'OpenVMS':
3693 elif pycompat.sysplatform == b'OpenVMS':
3694 keep.append(b'vms')
3694 keep.append(b'vms')
3695 elif pycompat.sysplatform == b'plan9':
3695 elif pycompat.sysplatform == b'plan9':
3696 keep.append(b'plan9')
3696 keep.append(b'plan9')
3697 else:
3697 else:
3698 keep.append(b'unix')
3698 keep.append(b'unix')
3699 keep.append(pycompat.sysplatform.lower())
3699 keep.append(pycompat.sysplatform.lower())
3700 if ui.verbose:
3700 if ui.verbose:
3701 keep.append(b'verbose')
3701 keep.append(b'verbose')
3702
3702
3703 commands = sys.modules[__name__]
3703 commands = sys.modules[__name__]
3704 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3704 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3705 ui.pager(b'help')
3705 ui.pager(b'help')
3706 ui.write(formatted)
3706 ui.write(formatted)
3707
3707
3708
3708
3709 @command(
3709 @command(
3710 b'identify|id',
3710 b'identify|id',
3711 [
3711 [
3712 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3712 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3713 (b'n', b'num', None, _(b'show local revision number')),
3713 (b'n', b'num', None, _(b'show local revision number')),
3714 (b'i', b'id', None, _(b'show global revision id')),
3714 (b'i', b'id', None, _(b'show global revision id')),
3715 (b'b', b'branch', None, _(b'show branch')),
3715 (b'b', b'branch', None, _(b'show branch')),
3716 (b't', b'tags', None, _(b'show tags')),
3716 (b't', b'tags', None, _(b'show tags')),
3717 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3717 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3718 ]
3718 ]
3719 + remoteopts
3719 + remoteopts
3720 + formatteropts,
3720 + formatteropts,
3721 _(b'[-nibtB] [-r REV] [SOURCE]'),
3721 _(b'[-nibtB] [-r REV] [SOURCE]'),
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3723 optionalrepo=True,
3723 optionalrepo=True,
3724 intents={INTENT_READONLY},
3724 intents={INTENT_READONLY},
3725 )
3725 )
3726 def identify(
3726 def identify(
3727 ui,
3727 ui,
3728 repo,
3728 repo,
3729 source=None,
3729 source=None,
3730 rev=None,
3730 rev=None,
3731 num=None,
3731 num=None,
3732 id=None,
3732 id=None,
3733 branch=None,
3733 branch=None,
3734 tags=None,
3734 tags=None,
3735 bookmarks=None,
3735 bookmarks=None,
3736 **opts
3736 **opts
3737 ):
3737 ):
3738 """identify the working directory or specified revision
3738 """identify the working directory or specified revision
3739
3739
3740 Print a summary identifying the repository state at REV using one or
3740 Print a summary identifying the repository state at REV using one or
3741 two parent hash identifiers, followed by a "+" if the working
3741 two parent hash identifiers, followed by a "+" if the working
3742 directory has uncommitted changes, the branch name (if not default),
3742 directory has uncommitted changes, the branch name (if not default),
3743 a list of tags, and a list of bookmarks.
3743 a list of tags, and a list of bookmarks.
3744
3744
3745 When REV is not given, print a summary of the current state of the
3745 When REV is not given, print a summary of the current state of the
3746 repository including the working directory. Specify -r. to get information
3746 repository including the working directory. Specify -r. to get information
3747 of the working directory parent without scanning uncommitted changes.
3747 of the working directory parent without scanning uncommitted changes.
3748
3748
3749 Specifying a path to a repository root or Mercurial bundle will
3749 Specifying a path to a repository root or Mercurial bundle will
3750 cause lookup to operate on that repository/bundle.
3750 cause lookup to operate on that repository/bundle.
3751
3751
3752 .. container:: verbose
3752 .. container:: verbose
3753
3753
3754 Template:
3754 Template:
3755
3755
3756 The following keywords are supported in addition to the common template
3756 The following keywords are supported in addition to the common template
3757 keywords and functions. See also :hg:`help templates`.
3757 keywords and functions. See also :hg:`help templates`.
3758
3758
3759 :dirty: String. Character ``+`` denoting if the working directory has
3759 :dirty: String. Character ``+`` denoting if the working directory has
3760 uncommitted changes.
3760 uncommitted changes.
3761 :id: String. One or two nodes, optionally followed by ``+``.
3761 :id: String. One or two nodes, optionally followed by ``+``.
3762 :parents: List of strings. Parent nodes of the changeset.
3762 :parents: List of strings. Parent nodes of the changeset.
3763
3763
3764 Examples:
3764 Examples:
3765
3765
3766 - generate a build identifier for the working directory::
3766 - generate a build identifier for the working directory::
3767
3767
3768 hg id --id > build-id.dat
3768 hg id --id > build-id.dat
3769
3769
3770 - find the revision corresponding to a tag::
3770 - find the revision corresponding to a tag::
3771
3771
3772 hg id -n -r 1.3
3772 hg id -n -r 1.3
3773
3773
3774 - check the most recent revision of a remote repository::
3774 - check the most recent revision of a remote repository::
3775
3775
3776 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3776 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3777
3777
3778 See :hg:`log` for generating more information about specific revisions,
3778 See :hg:`log` for generating more information about specific revisions,
3779 including full hash identifiers.
3779 including full hash identifiers.
3780
3780
3781 Returns 0 if successful.
3781 Returns 0 if successful.
3782 """
3782 """
3783
3783
3784 opts = pycompat.byteskwargs(opts)
3784 opts = pycompat.byteskwargs(opts)
3785 if not repo and not source:
3785 if not repo and not source:
3786 raise error.InputError(
3786 raise error.InputError(
3787 _(b"there is no Mercurial repository here (.hg not found)")
3787 _(b"there is no Mercurial repository here (.hg not found)")
3788 )
3788 )
3789
3789
3790 default = not (num or id or branch or tags or bookmarks)
3790 default = not (num or id or branch or tags or bookmarks)
3791 output = []
3791 output = []
3792 revs = []
3792 revs = []
3793
3793
3794 if source:
3794 if source:
3795 source, branches = hg.parseurl(ui.expandpath(source))
3795 source, branches = hg.parseurl(ui.expandpath(source))
3796 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3796 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3797 repo = peer.local()
3797 repo = peer.local()
3798 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3798 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3799
3799
3800 fm = ui.formatter(b'identify', opts)
3800 fm = ui.formatter(b'identify', opts)
3801 fm.startitem()
3801 fm.startitem()
3802
3802
3803 if not repo:
3803 if not repo:
3804 if num or branch or tags:
3804 if num or branch or tags:
3805 raise error.InputError(
3805 raise error.InputError(
3806 _(b"can't query remote revision number, branch, or tags")
3806 _(b"can't query remote revision number, branch, or tags")
3807 )
3807 )
3808 if not rev and revs:
3808 if not rev and revs:
3809 rev = revs[0]
3809 rev = revs[0]
3810 if not rev:
3810 if not rev:
3811 rev = b"tip"
3811 rev = b"tip"
3812
3812
3813 remoterev = peer.lookup(rev)
3813 remoterev = peer.lookup(rev)
3814 hexrev = fm.hexfunc(remoterev)
3814 hexrev = fm.hexfunc(remoterev)
3815 if default or id:
3815 if default or id:
3816 output = [hexrev]
3816 output = [hexrev]
3817 fm.data(id=hexrev)
3817 fm.data(id=hexrev)
3818
3818
3819 @util.cachefunc
3819 @util.cachefunc
3820 def getbms():
3820 def getbms():
3821 bms = []
3821 bms = []
3822
3822
3823 if b'bookmarks' in peer.listkeys(b'namespaces'):
3823 if b'bookmarks' in peer.listkeys(b'namespaces'):
3824 hexremoterev = hex(remoterev)
3824 hexremoterev = hex(remoterev)
3825 bms = [
3825 bms = [
3826 bm
3826 bm
3827 for bm, bmr in pycompat.iteritems(
3827 for bm, bmr in pycompat.iteritems(
3828 peer.listkeys(b'bookmarks')
3828 peer.listkeys(b'bookmarks')
3829 )
3829 )
3830 if bmr == hexremoterev
3830 if bmr == hexremoterev
3831 ]
3831 ]
3832
3832
3833 return sorted(bms)
3833 return sorted(bms)
3834
3834
3835 if fm.isplain():
3835 if fm.isplain():
3836 if bookmarks:
3836 if bookmarks:
3837 output.extend(getbms())
3837 output.extend(getbms())
3838 elif default and not ui.quiet:
3838 elif default and not ui.quiet:
3839 # multiple bookmarks for a single parent separated by '/'
3839 # multiple bookmarks for a single parent separated by '/'
3840 bm = b'/'.join(getbms())
3840 bm = b'/'.join(getbms())
3841 if bm:
3841 if bm:
3842 output.append(bm)
3842 output.append(bm)
3843 else:
3843 else:
3844 fm.data(node=hex(remoterev))
3844 fm.data(node=hex(remoterev))
3845 if bookmarks or b'bookmarks' in fm.datahint():
3845 if bookmarks or b'bookmarks' in fm.datahint():
3846 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3846 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3847 else:
3847 else:
3848 if rev:
3848 if rev:
3849 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3849 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3850 ctx = scmutil.revsingle(repo, rev, None)
3850 ctx = scmutil.revsingle(repo, rev, None)
3851
3851
3852 if ctx.rev() is None:
3852 if ctx.rev() is None:
3853 ctx = repo[None]
3853 ctx = repo[None]
3854 parents = ctx.parents()
3854 parents = ctx.parents()
3855 taglist = []
3855 taglist = []
3856 for p in parents:
3856 for p in parents:
3857 taglist.extend(p.tags())
3857 taglist.extend(p.tags())
3858
3858
3859 dirty = b""
3859 dirty = b""
3860 if ctx.dirty(missing=True, merge=False, branch=False):
3860 if ctx.dirty(missing=True, merge=False, branch=False):
3861 dirty = b'+'
3861 dirty = b'+'
3862 fm.data(dirty=dirty)
3862 fm.data(dirty=dirty)
3863
3863
3864 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3864 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3865 if default or id:
3865 if default or id:
3866 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3866 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3867 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3867 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3868
3868
3869 if num:
3869 if num:
3870 numoutput = [b"%d" % p.rev() for p in parents]
3870 numoutput = [b"%d" % p.rev() for p in parents]
3871 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3871 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3872
3872
3873 fm.data(
3873 fm.data(
3874 parents=fm.formatlist(
3874 parents=fm.formatlist(
3875 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3875 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3876 )
3876 )
3877 )
3877 )
3878 else:
3878 else:
3879 hexoutput = fm.hexfunc(ctx.node())
3879 hexoutput = fm.hexfunc(ctx.node())
3880 if default or id:
3880 if default or id:
3881 output = [hexoutput]
3881 output = [hexoutput]
3882 fm.data(id=hexoutput)
3882 fm.data(id=hexoutput)
3883
3883
3884 if num:
3884 if num:
3885 output.append(pycompat.bytestr(ctx.rev()))
3885 output.append(pycompat.bytestr(ctx.rev()))
3886 taglist = ctx.tags()
3886 taglist = ctx.tags()
3887
3887
3888 if default and not ui.quiet:
3888 if default and not ui.quiet:
3889 b = ctx.branch()
3889 b = ctx.branch()
3890 if b != b'default':
3890 if b != b'default':
3891 output.append(b"(%s)" % b)
3891 output.append(b"(%s)" % b)
3892
3892
3893 # multiple tags for a single parent separated by '/'
3893 # multiple tags for a single parent separated by '/'
3894 t = b'/'.join(taglist)
3894 t = b'/'.join(taglist)
3895 if t:
3895 if t:
3896 output.append(t)
3896 output.append(t)
3897
3897
3898 # multiple bookmarks for a single parent separated by '/'
3898 # multiple bookmarks for a single parent separated by '/'
3899 bm = b'/'.join(ctx.bookmarks())
3899 bm = b'/'.join(ctx.bookmarks())
3900 if bm:
3900 if bm:
3901 output.append(bm)
3901 output.append(bm)
3902 else:
3902 else:
3903 if branch:
3903 if branch:
3904 output.append(ctx.branch())
3904 output.append(ctx.branch())
3905
3905
3906 if tags:
3906 if tags:
3907 output.extend(taglist)
3907 output.extend(taglist)
3908
3908
3909 if bookmarks:
3909 if bookmarks:
3910 output.extend(ctx.bookmarks())
3910 output.extend(ctx.bookmarks())
3911
3911
3912 fm.data(node=ctx.hex())
3912 fm.data(node=ctx.hex())
3913 fm.data(branch=ctx.branch())
3913 fm.data(branch=ctx.branch())
3914 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3914 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3915 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3915 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3916 fm.context(ctx=ctx)
3916 fm.context(ctx=ctx)
3917
3917
3918 fm.plain(b"%s\n" % b' '.join(output))
3918 fm.plain(b"%s\n" % b' '.join(output))
3919 fm.end()
3919 fm.end()
3920
3920
3921
3921
3922 @command(
3922 @command(
3923 b'import|patch',
3923 b'import|patch',
3924 [
3924 [
3925 (
3925 (
3926 b'p',
3926 b'p',
3927 b'strip',
3927 b'strip',
3928 1,
3928 1,
3929 _(
3929 _(
3930 b'directory strip option for patch. This has the same '
3930 b'directory strip option for patch. This has the same '
3931 b'meaning as the corresponding patch option'
3931 b'meaning as the corresponding patch option'
3932 ),
3932 ),
3933 _(b'NUM'),
3933 _(b'NUM'),
3934 ),
3934 ),
3935 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3935 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3936 (b'', b'secret', None, _(b'use the secret phase for committing')),
3936 (b'', b'secret', None, _(b'use the secret phase for committing')),
3937 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3937 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3938 (
3938 (
3939 b'f',
3939 b'f',
3940 b'force',
3940 b'force',
3941 None,
3941 None,
3942 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3942 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3943 ),
3943 ),
3944 (
3944 (
3945 b'',
3945 b'',
3946 b'no-commit',
3946 b'no-commit',
3947 None,
3947 None,
3948 _(b"don't commit, just update the working directory"),
3948 _(b"don't commit, just update the working directory"),
3949 ),
3949 ),
3950 (
3950 (
3951 b'',
3951 b'',
3952 b'bypass',
3952 b'bypass',
3953 None,
3953 None,
3954 _(b"apply patch without touching the working directory"),
3954 _(b"apply patch without touching the working directory"),
3955 ),
3955 ),
3956 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3956 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3957 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3957 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3958 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3958 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3959 (
3959 (
3960 b'',
3960 b'',
3961 b'import-branch',
3961 b'import-branch',
3962 None,
3962 None,
3963 _(b'use any branch information in patch (implied by --exact)'),
3963 _(b'use any branch information in patch (implied by --exact)'),
3964 ),
3964 ),
3965 ]
3965 ]
3966 + commitopts
3966 + commitopts
3967 + commitopts2
3967 + commitopts2
3968 + similarityopts,
3968 + similarityopts,
3969 _(b'[OPTION]... PATCH...'),
3969 _(b'[OPTION]... PATCH...'),
3970 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3970 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3971 )
3971 )
3972 def import_(ui, repo, patch1=None, *patches, **opts):
3972 def import_(ui, repo, patch1=None, *patches, **opts):
3973 """import an ordered set of patches
3973 """import an ordered set of patches
3974
3974
3975 Import a list of patches and commit them individually (unless
3975 Import a list of patches and commit them individually (unless
3976 --no-commit is specified).
3976 --no-commit is specified).
3977
3977
3978 To read a patch from standard input (stdin), use "-" as the patch
3978 To read a patch from standard input (stdin), use "-" as the patch
3979 name. If a URL is specified, the patch will be downloaded from
3979 name. If a URL is specified, the patch will be downloaded from
3980 there.
3980 there.
3981
3981
3982 Import first applies changes to the working directory (unless
3982 Import first applies changes to the working directory (unless
3983 --bypass is specified), import will abort if there are outstanding
3983 --bypass is specified), import will abort if there are outstanding
3984 changes.
3984 changes.
3985
3985
3986 Use --bypass to apply and commit patches directly to the
3986 Use --bypass to apply and commit patches directly to the
3987 repository, without affecting the working directory. Without
3987 repository, without affecting the working directory. Without
3988 --exact, patches will be applied on top of the working directory
3988 --exact, patches will be applied on top of the working directory
3989 parent revision.
3989 parent revision.
3990
3990
3991 You can import a patch straight from a mail message. Even patches
3991 You can import a patch straight from a mail message. Even patches
3992 as attachments work (to use the body part, it must have type
3992 as attachments work (to use the body part, it must have type
3993 text/plain or text/x-patch). From and Subject headers of email
3993 text/plain or text/x-patch). From and Subject headers of email
3994 message are used as default committer and commit message. All
3994 message are used as default committer and commit message. All
3995 text/plain body parts before first diff are added to the commit
3995 text/plain body parts before first diff are added to the commit
3996 message.
3996 message.
3997
3997
3998 If the imported patch was generated by :hg:`export`, user and
3998 If the imported patch was generated by :hg:`export`, user and
3999 description from patch override values from message headers and
3999 description from patch override values from message headers and
4000 body. Values given on command line with -m/--message and -u/--user
4000 body. Values given on command line with -m/--message and -u/--user
4001 override these.
4001 override these.
4002
4002
4003 If --exact is specified, import will set the working directory to
4003 If --exact is specified, import will set the working directory to
4004 the parent of each patch before applying it, and will abort if the
4004 the parent of each patch before applying it, and will abort if the
4005 resulting changeset has a different ID than the one recorded in
4005 resulting changeset has a different ID than the one recorded in
4006 the patch. This will guard against various ways that portable
4006 the patch. This will guard against various ways that portable
4007 patch formats and mail systems might fail to transfer Mercurial
4007 patch formats and mail systems might fail to transfer Mercurial
4008 data or metadata. See :hg:`bundle` for lossless transmission.
4008 data or metadata. See :hg:`bundle` for lossless transmission.
4009
4009
4010 Use --partial to ensure a changeset will be created from the patch
4010 Use --partial to ensure a changeset will be created from the patch
4011 even if some hunks fail to apply. Hunks that fail to apply will be
4011 even if some hunks fail to apply. Hunks that fail to apply will be
4012 written to a <target-file>.rej file. Conflicts can then be resolved
4012 written to a <target-file>.rej file. Conflicts can then be resolved
4013 by hand before :hg:`commit --amend` is run to update the created
4013 by hand before :hg:`commit --amend` is run to update the created
4014 changeset. This flag exists to let people import patches that
4014 changeset. This flag exists to let people import patches that
4015 partially apply without losing the associated metadata (author,
4015 partially apply without losing the associated metadata (author,
4016 date, description, ...).
4016 date, description, ...).
4017
4017
4018 .. note::
4018 .. note::
4019
4019
4020 When no hunks apply cleanly, :hg:`import --partial` will create
4020 When no hunks apply cleanly, :hg:`import --partial` will create
4021 an empty changeset, importing only the patch metadata.
4021 an empty changeset, importing only the patch metadata.
4022
4022
4023 With -s/--similarity, hg will attempt to discover renames and
4023 With -s/--similarity, hg will attempt to discover renames and
4024 copies in the patch in the same way as :hg:`addremove`.
4024 copies in the patch in the same way as :hg:`addremove`.
4025
4025
4026 It is possible to use external patch programs to perform the patch
4026 It is possible to use external patch programs to perform the patch
4027 by setting the ``ui.patch`` configuration option. For the default
4027 by setting the ``ui.patch`` configuration option. For the default
4028 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4028 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4029 See :hg:`help config` for more information about configuration
4029 See :hg:`help config` for more information about configuration
4030 files and how to use these options.
4030 files and how to use these options.
4031
4031
4032 See :hg:`help dates` for a list of formats valid for -d/--date.
4032 See :hg:`help dates` for a list of formats valid for -d/--date.
4033
4033
4034 .. container:: verbose
4034 .. container:: verbose
4035
4035
4036 Examples:
4036 Examples:
4037
4037
4038 - import a traditional patch from a website and detect renames::
4038 - import a traditional patch from a website and detect renames::
4039
4039
4040 hg import -s 80 http://example.com/bugfix.patch
4040 hg import -s 80 http://example.com/bugfix.patch
4041
4041
4042 - import a changeset from an hgweb server::
4042 - import a changeset from an hgweb server::
4043
4043
4044 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4044 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4045
4045
4046 - import all the patches in an Unix-style mbox::
4046 - import all the patches in an Unix-style mbox::
4047
4047
4048 hg import incoming-patches.mbox
4048 hg import incoming-patches.mbox
4049
4049
4050 - import patches from stdin::
4050 - import patches from stdin::
4051
4051
4052 hg import -
4052 hg import -
4053
4053
4054 - attempt to exactly restore an exported changeset (not always
4054 - attempt to exactly restore an exported changeset (not always
4055 possible)::
4055 possible)::
4056
4056
4057 hg import --exact proposed-fix.patch
4057 hg import --exact proposed-fix.patch
4058
4058
4059 - use an external tool to apply a patch which is too fuzzy for
4059 - use an external tool to apply a patch which is too fuzzy for
4060 the default internal tool.
4060 the default internal tool.
4061
4061
4062 hg import --config ui.patch="patch --merge" fuzzy.patch
4062 hg import --config ui.patch="patch --merge" fuzzy.patch
4063
4063
4064 - change the default fuzzing from 2 to a less strict 7
4064 - change the default fuzzing from 2 to a less strict 7
4065
4065
4066 hg import --config ui.fuzz=7 fuzz.patch
4066 hg import --config ui.fuzz=7 fuzz.patch
4067
4067
4068 Returns 0 on success, 1 on partial success (see --partial).
4068 Returns 0 on success, 1 on partial success (see --partial).
4069 """
4069 """
4070
4070
4071 cmdutil.check_incompatible_arguments(
4071 cmdutil.check_incompatible_arguments(
4072 opts, 'no_commit', ['bypass', 'secret']
4072 opts, 'no_commit', ['bypass', 'secret']
4073 )
4073 )
4074 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4074 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4075 opts = pycompat.byteskwargs(opts)
4075 opts = pycompat.byteskwargs(opts)
4076 if not patch1:
4076 if not patch1:
4077 raise error.InputError(_(b'need at least one patch to import'))
4077 raise error.InputError(_(b'need at least one patch to import'))
4078
4078
4079 patches = (patch1,) + patches
4079 patches = (patch1,) + patches
4080
4080
4081 date = opts.get(b'date')
4081 date = opts.get(b'date')
4082 if date:
4082 if date:
4083 opts[b'date'] = dateutil.parsedate(date)
4083 opts[b'date'] = dateutil.parsedate(date)
4084
4084
4085 exact = opts.get(b'exact')
4085 exact = opts.get(b'exact')
4086 update = not opts.get(b'bypass')
4086 update = not opts.get(b'bypass')
4087 try:
4087 try:
4088 sim = float(opts.get(b'similarity') or 0)
4088 sim = float(opts.get(b'similarity') or 0)
4089 except ValueError:
4089 except ValueError:
4090 raise error.InputError(_(b'similarity must be a number'))
4090 raise error.InputError(_(b'similarity must be a number'))
4091 if sim < 0 or sim > 100:
4091 if sim < 0 or sim > 100:
4092 raise error.InputError(_(b'similarity must be between 0 and 100'))
4092 raise error.InputError(_(b'similarity must be between 0 and 100'))
4093 if sim and not update:
4093 if sim and not update:
4094 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4094 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4095
4095
4096 base = opts[b"base"]
4096 base = opts[b"base"]
4097 msgs = []
4097 msgs = []
4098 ret = 0
4098 ret = 0
4099
4099
4100 with repo.wlock():
4100 with repo.wlock():
4101 if update:
4101 if update:
4102 cmdutil.checkunfinished(repo)
4102 cmdutil.checkunfinished(repo)
4103 if exact or not opts.get(b'force'):
4103 if exact or not opts.get(b'force'):
4104 cmdutil.bailifchanged(repo)
4104 cmdutil.bailifchanged(repo)
4105
4105
4106 if not opts.get(b'no_commit'):
4106 if not opts.get(b'no_commit'):
4107 lock = repo.lock
4107 lock = repo.lock
4108 tr = lambda: repo.transaction(b'import')
4108 tr = lambda: repo.transaction(b'import')
4109 dsguard = util.nullcontextmanager
4109 dsguard = util.nullcontextmanager
4110 else:
4110 else:
4111 lock = util.nullcontextmanager
4111 lock = util.nullcontextmanager
4112 tr = util.nullcontextmanager
4112 tr = util.nullcontextmanager
4113 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4113 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4114 with lock(), tr(), dsguard():
4114 with lock(), tr(), dsguard():
4115 parents = repo[None].parents()
4115 parents = repo[None].parents()
4116 for patchurl in patches:
4116 for patchurl in patches:
4117 if patchurl == b'-':
4117 if patchurl == b'-':
4118 ui.status(_(b'applying patch from stdin\n'))
4118 ui.status(_(b'applying patch from stdin\n'))
4119 patchfile = ui.fin
4119 patchfile = ui.fin
4120 patchurl = b'stdin' # for error message
4120 patchurl = b'stdin' # for error message
4121 else:
4121 else:
4122 patchurl = os.path.join(base, patchurl)
4122 patchurl = os.path.join(base, patchurl)
4123 ui.status(_(b'applying %s\n') % patchurl)
4123 ui.status(_(b'applying %s\n') % patchurl)
4124 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4124 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4125
4125
4126 haspatch = False
4126 haspatch = False
4127 for hunk in patch.split(patchfile):
4127 for hunk in patch.split(patchfile):
4128 with patch.extract(ui, hunk) as patchdata:
4128 with patch.extract(ui, hunk) as patchdata:
4129 msg, node, rej = cmdutil.tryimportone(
4129 msg, node, rej = cmdutil.tryimportone(
4130 ui, repo, patchdata, parents, opts, msgs, hg.clean
4130 ui, repo, patchdata, parents, opts, msgs, hg.clean
4131 )
4131 )
4132 if msg:
4132 if msg:
4133 haspatch = True
4133 haspatch = True
4134 ui.note(msg + b'\n')
4134 ui.note(msg + b'\n')
4135 if update or exact:
4135 if update or exact:
4136 parents = repo[None].parents()
4136 parents = repo[None].parents()
4137 else:
4137 else:
4138 parents = [repo[node]]
4138 parents = [repo[node]]
4139 if rej:
4139 if rej:
4140 ui.write_err(_(b"patch applied partially\n"))
4140 ui.write_err(_(b"patch applied partially\n"))
4141 ui.write_err(
4141 ui.write_err(
4142 _(
4142 _(
4143 b"(fix the .rej files and run "
4143 b"(fix the .rej files and run "
4144 b"`hg commit --amend`)\n"
4144 b"`hg commit --amend`)\n"
4145 )
4145 )
4146 )
4146 )
4147 ret = 1
4147 ret = 1
4148 break
4148 break
4149
4149
4150 if not haspatch:
4150 if not haspatch:
4151 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4151 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4152
4152
4153 if msgs:
4153 if msgs:
4154 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4154 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4155 return ret
4155 return ret
4156
4156
4157
4157
4158 @command(
4158 @command(
4159 b'incoming|in',
4159 b'incoming|in',
4160 [
4160 [
4161 (
4161 (
4162 b'f',
4162 b'f',
4163 b'force',
4163 b'force',
4164 None,
4164 None,
4165 _(b'run even if remote repository is unrelated'),
4165 _(b'run even if remote repository is unrelated'),
4166 ),
4166 ),
4167 (b'n', b'newest-first', None, _(b'show newest record first')),
4167 (b'n', b'newest-first', None, _(b'show newest record first')),
4168 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4168 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4169 (
4169 (
4170 b'r',
4170 b'r',
4171 b'rev',
4171 b'rev',
4172 [],
4172 [],
4173 _(b'a remote changeset intended to be added'),
4173 _(b'a remote changeset intended to be added'),
4174 _(b'REV'),
4174 _(b'REV'),
4175 ),
4175 ),
4176 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4176 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4177 (
4177 (
4178 b'b',
4178 b'b',
4179 b'branch',
4179 b'branch',
4180 [],
4180 [],
4181 _(b'a specific branch you would like to pull'),
4181 _(b'a specific branch you would like to pull'),
4182 _(b'BRANCH'),
4182 _(b'BRANCH'),
4183 ),
4183 ),
4184 ]
4184 ]
4185 + logopts
4185 + logopts
4186 + remoteopts
4186 + remoteopts
4187 + subrepoopts,
4187 + subrepoopts,
4188 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4188 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4189 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4189 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4190 )
4190 )
4191 def incoming(ui, repo, source=b"default", **opts):
4191 def incoming(ui, repo, source=b"default", **opts):
4192 """show new changesets found in source
4192 """show new changesets found in source
4193
4193
4194 Show new changesets found in the specified path/URL or the default
4194 Show new changesets found in the specified path/URL or the default
4195 pull location. These are the changesets that would have been pulled
4195 pull location. These are the changesets that would have been pulled
4196 by :hg:`pull` at the time you issued this command.
4196 by :hg:`pull` at the time you issued this command.
4197
4197
4198 See pull for valid source format details.
4198 See pull for valid source format details.
4199
4199
4200 .. container:: verbose
4200 .. container:: verbose
4201
4201
4202 With -B/--bookmarks, the result of bookmark comparison between
4202 With -B/--bookmarks, the result of bookmark comparison between
4203 local and remote repositories is displayed. With -v/--verbose,
4203 local and remote repositories is displayed. With -v/--verbose,
4204 status is also displayed for each bookmark like below::
4204 status is also displayed for each bookmark like below::
4205
4205
4206 BM1 01234567890a added
4206 BM1 01234567890a added
4207 BM2 1234567890ab advanced
4207 BM2 1234567890ab advanced
4208 BM3 234567890abc diverged
4208 BM3 234567890abc diverged
4209 BM4 34567890abcd changed
4209 BM4 34567890abcd changed
4210
4210
4211 The action taken locally when pulling depends on the
4211 The action taken locally when pulling depends on the
4212 status of each bookmark:
4212 status of each bookmark:
4213
4213
4214 :``added``: pull will create it
4214 :``added``: pull will create it
4215 :``advanced``: pull will update it
4215 :``advanced``: pull will update it
4216 :``diverged``: pull will create a divergent bookmark
4216 :``diverged``: pull will create a divergent bookmark
4217 :``changed``: result depends on remote changesets
4217 :``changed``: result depends on remote changesets
4218
4218
4219 From the point of view of pulling behavior, bookmark
4219 From the point of view of pulling behavior, bookmark
4220 existing only in the remote repository are treated as ``added``,
4220 existing only in the remote repository are treated as ``added``,
4221 even if it is in fact locally deleted.
4221 even if it is in fact locally deleted.
4222
4222
4223 .. container:: verbose
4223 .. container:: verbose
4224
4224
4225 For remote repository, using --bundle avoids downloading the
4225 For remote repository, using --bundle avoids downloading the
4226 changesets twice if the incoming is followed by a pull.
4226 changesets twice if the incoming is followed by a pull.
4227
4227
4228 Examples:
4228 Examples:
4229
4229
4230 - show incoming changes with patches and full description::
4230 - show incoming changes with patches and full description::
4231
4231
4232 hg incoming -vp
4232 hg incoming -vp
4233
4233
4234 - show incoming changes excluding merges, store a bundle::
4234 - show incoming changes excluding merges, store a bundle::
4235
4235
4236 hg in -vpM --bundle incoming.hg
4236 hg in -vpM --bundle incoming.hg
4237 hg pull incoming.hg
4237 hg pull incoming.hg
4238
4238
4239 - briefly list changes inside a bundle::
4239 - briefly list changes inside a bundle::
4240
4240
4241 hg in changes.hg -T "{desc|firstline}\\n"
4241 hg in changes.hg -T "{desc|firstline}\\n"
4242
4242
4243 Returns 0 if there are incoming changes, 1 otherwise.
4243 Returns 0 if there are incoming changes, 1 otherwise.
4244 """
4244 """
4245 opts = pycompat.byteskwargs(opts)
4245 opts = pycompat.byteskwargs(opts)
4246 if opts.get(b'graph'):
4246 if opts.get(b'graph'):
4247 logcmdutil.checkunsupportedgraphflags([], opts)
4247 logcmdutil.checkunsupportedgraphflags([], opts)
4248
4248
4249 def display(other, chlist, displayer):
4249 def display(other, chlist, displayer):
4250 revdag = logcmdutil.graphrevs(other, chlist, opts)
4250 revdag = logcmdutil.graphrevs(other, chlist, opts)
4251 logcmdutil.displaygraph(
4251 logcmdutil.displaygraph(
4252 ui, repo, revdag, displayer, graphmod.asciiedges
4252 ui, repo, revdag, displayer, graphmod.asciiedges
4253 )
4253 )
4254
4254
4255 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4255 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4256 return 0
4256 return 0
4257
4257
4258 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4258 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4259
4259
4260 if opts.get(b'bookmarks'):
4260 if opts.get(b'bookmarks'):
4261 source, branches = hg.parseurl(
4261 source, branches = hg.parseurl(
4262 ui.expandpath(source), opts.get(b'branch')
4262 ui.expandpath(source), opts.get(b'branch')
4263 )
4263 )
4264 other = hg.peer(repo, opts, source)
4264 other = hg.peer(repo, opts, source)
4265 if b'bookmarks' not in other.listkeys(b'namespaces'):
4265 if b'bookmarks' not in other.listkeys(b'namespaces'):
4266 ui.warn(_(b"remote doesn't support bookmarks\n"))
4266 ui.warn(_(b"remote doesn't support bookmarks\n"))
4267 return 0
4267 return 0
4268 ui.pager(b'incoming')
4268 ui.pager(b'incoming')
4269 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4269 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4270 return bookmarks.incoming(ui, repo, other)
4270 return bookmarks.incoming(ui, repo, other)
4271
4271
4272 repo._subtoppath = ui.expandpath(source)
4272 repo._subtoppath = ui.expandpath(source)
4273 try:
4273 try:
4274 return hg.incoming(ui, repo, source, opts)
4274 return hg.incoming(ui, repo, source, opts)
4275 finally:
4275 finally:
4276 del repo._subtoppath
4276 del repo._subtoppath
4277
4277
4278
4278
4279 @command(
4279 @command(
4280 b'init',
4280 b'init',
4281 remoteopts,
4281 remoteopts,
4282 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4282 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4283 helpcategory=command.CATEGORY_REPO_CREATION,
4283 helpcategory=command.CATEGORY_REPO_CREATION,
4284 helpbasic=True,
4284 helpbasic=True,
4285 norepo=True,
4285 norepo=True,
4286 )
4286 )
4287 def init(ui, dest=b".", **opts):
4287 def init(ui, dest=b".", **opts):
4288 """create a new repository in the given directory
4288 """create a new repository in the given directory
4289
4289
4290 Initialize a new repository in the given directory. If the given
4290 Initialize a new repository in the given directory. If the given
4291 directory does not exist, it will be created.
4291 directory does not exist, it will be created.
4292
4292
4293 If no directory is given, the current directory is used.
4293 If no directory is given, the current directory is used.
4294
4294
4295 It is possible to specify an ``ssh://`` URL as the destination.
4295 It is possible to specify an ``ssh://`` URL as the destination.
4296 See :hg:`help urls` for more information.
4296 See :hg:`help urls` for more information.
4297
4297
4298 Returns 0 on success.
4298 Returns 0 on success.
4299 """
4299 """
4300 opts = pycompat.byteskwargs(opts)
4300 opts = pycompat.byteskwargs(opts)
4301 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4301 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4302
4302
4303
4303
4304 @command(
4304 @command(
4305 b'locate',
4305 b'locate',
4306 [
4306 [
4307 (
4307 (
4308 b'r',
4308 b'r',
4309 b'rev',
4309 b'rev',
4310 b'',
4310 b'',
4311 _(b'search the repository as it is in REV'),
4311 _(b'search the repository as it is in REV'),
4312 _(b'REV'),
4312 _(b'REV'),
4313 ),
4313 ),
4314 (
4314 (
4315 b'0',
4315 b'0',
4316 b'print0',
4316 b'print0',
4317 None,
4317 None,
4318 _(b'end filenames with NUL, for use with xargs'),
4318 _(b'end filenames with NUL, for use with xargs'),
4319 ),
4319 ),
4320 (
4320 (
4321 b'f',
4321 b'f',
4322 b'fullpath',
4322 b'fullpath',
4323 None,
4323 None,
4324 _(b'print complete paths from the filesystem root'),
4324 _(b'print complete paths from the filesystem root'),
4325 ),
4325 ),
4326 ]
4326 ]
4327 + walkopts,
4327 + walkopts,
4328 _(b'[OPTION]... [PATTERN]...'),
4328 _(b'[OPTION]... [PATTERN]...'),
4329 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4329 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4330 )
4330 )
4331 def locate(ui, repo, *pats, **opts):
4331 def locate(ui, repo, *pats, **opts):
4332 """locate files matching specific patterns (DEPRECATED)
4332 """locate files matching specific patterns (DEPRECATED)
4333
4333
4334 Print files under Mercurial control in the working directory whose
4334 Print files under Mercurial control in the working directory whose
4335 names match the given patterns.
4335 names match the given patterns.
4336
4336
4337 By default, this command searches all directories in the working
4337 By default, this command searches all directories in the working
4338 directory. To search just the current directory and its
4338 directory. To search just the current directory and its
4339 subdirectories, use "--include .".
4339 subdirectories, use "--include .".
4340
4340
4341 If no patterns are given to match, this command prints the names
4341 If no patterns are given to match, this command prints the names
4342 of all files under Mercurial control in the working directory.
4342 of all files under Mercurial control in the working directory.
4343
4343
4344 If you want to feed the output of this command into the "xargs"
4344 If you want to feed the output of this command into the "xargs"
4345 command, use the -0 option to both this command and "xargs". This
4345 command, use the -0 option to both this command and "xargs". This
4346 will avoid the problem of "xargs" treating single filenames that
4346 will avoid the problem of "xargs" treating single filenames that
4347 contain whitespace as multiple filenames.
4347 contain whitespace as multiple filenames.
4348
4348
4349 See :hg:`help files` for a more versatile command.
4349 See :hg:`help files` for a more versatile command.
4350
4350
4351 Returns 0 if a match is found, 1 otherwise.
4351 Returns 0 if a match is found, 1 otherwise.
4352 """
4352 """
4353 opts = pycompat.byteskwargs(opts)
4353 opts = pycompat.byteskwargs(opts)
4354 if opts.get(b'print0'):
4354 if opts.get(b'print0'):
4355 end = b'\0'
4355 end = b'\0'
4356 else:
4356 else:
4357 end = b'\n'
4357 end = b'\n'
4358 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4358 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4359
4359
4360 ret = 1
4360 ret = 1
4361 m = scmutil.match(
4361 m = scmutil.match(
4362 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4362 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4363 )
4363 )
4364
4364
4365 ui.pager(b'locate')
4365 ui.pager(b'locate')
4366 if ctx.rev() is None:
4366 if ctx.rev() is None:
4367 # When run on the working copy, "locate" includes removed files, so
4367 # When run on the working copy, "locate" includes removed files, so
4368 # we get the list of files from the dirstate.
4368 # we get the list of files from the dirstate.
4369 filesgen = sorted(repo.dirstate.matches(m))
4369 filesgen = sorted(repo.dirstate.matches(m))
4370 else:
4370 else:
4371 filesgen = ctx.matches(m)
4371 filesgen = ctx.matches(m)
4372 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4372 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4373 for abs in filesgen:
4373 for abs in filesgen:
4374 if opts.get(b'fullpath'):
4374 if opts.get(b'fullpath'):
4375 ui.write(repo.wjoin(abs), end)
4375 ui.write(repo.wjoin(abs), end)
4376 else:
4376 else:
4377 ui.write(uipathfn(abs), end)
4377 ui.write(uipathfn(abs), end)
4378 ret = 0
4378 ret = 0
4379
4379
4380 return ret
4380 return ret
4381
4381
4382
4382
4383 @command(
4383 @command(
4384 b'log|history',
4384 b'log|history',
4385 [
4385 [
4386 (
4386 (
4387 b'f',
4387 b'f',
4388 b'follow',
4388 b'follow',
4389 None,
4389 None,
4390 _(
4390 _(
4391 b'follow changeset history, or file history across copies and renames'
4391 b'follow changeset history, or file history across copies and renames'
4392 ),
4392 ),
4393 ),
4393 ),
4394 (
4394 (
4395 b'',
4395 b'',
4396 b'follow-first',
4396 b'follow-first',
4397 None,
4397 None,
4398 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4398 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4399 ),
4399 ),
4400 (
4400 (
4401 b'd',
4401 b'd',
4402 b'date',
4402 b'date',
4403 b'',
4403 b'',
4404 _(b'show revisions matching date spec'),
4404 _(b'show revisions matching date spec'),
4405 _(b'DATE'),
4405 _(b'DATE'),
4406 ),
4406 ),
4407 (b'C', b'copies', None, _(b'show copied files')),
4407 (b'C', b'copies', None, _(b'show copied files')),
4408 (
4408 (
4409 b'k',
4409 b'k',
4410 b'keyword',
4410 b'keyword',
4411 [],
4411 [],
4412 _(b'do case-insensitive search for a given text'),
4412 _(b'do case-insensitive search for a given text'),
4413 _(b'TEXT'),
4413 _(b'TEXT'),
4414 ),
4414 ),
4415 (
4415 (
4416 b'r',
4416 b'r',
4417 b'rev',
4417 b'rev',
4418 [],
4418 [],
4419 _(b'show the specified revision or revset'),
4419 _(b'show the specified revision or revset'),
4420 _(b'REV'),
4420 _(b'REV'),
4421 ),
4421 ),
4422 (
4422 (
4423 b'L',
4423 b'L',
4424 b'line-range',
4424 b'line-range',
4425 [],
4425 [],
4426 _(b'follow line range of specified file (EXPERIMENTAL)'),
4426 _(b'follow line range of specified file (EXPERIMENTAL)'),
4427 _(b'FILE,RANGE'),
4427 _(b'FILE,RANGE'),
4428 ),
4428 ),
4429 (
4429 (
4430 b'',
4430 b'',
4431 b'removed',
4431 b'removed',
4432 None,
4432 None,
4433 _(b'include revisions where files were removed'),
4433 _(b'include revisions where files were removed'),
4434 ),
4434 ),
4435 (
4435 (
4436 b'm',
4436 b'm',
4437 b'only-merges',
4437 b'only-merges',
4438 None,
4438 None,
4439 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4439 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4440 ),
4440 ),
4441 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4441 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4442 (
4442 (
4443 b'',
4443 b'',
4444 b'only-branch',
4444 b'only-branch',
4445 [],
4445 [],
4446 _(
4446 _(
4447 b'show only changesets within the given named branch (DEPRECATED)'
4447 b'show only changesets within the given named branch (DEPRECATED)'
4448 ),
4448 ),
4449 _(b'BRANCH'),
4449 _(b'BRANCH'),
4450 ),
4450 ),
4451 (
4451 (
4452 b'b',
4452 b'b',
4453 b'branch',
4453 b'branch',
4454 [],
4454 [],
4455 _(b'show changesets within the given named branch'),
4455 _(b'show changesets within the given named branch'),
4456 _(b'BRANCH'),
4456 _(b'BRANCH'),
4457 ),
4457 ),
4458 (
4458 (
4459 b'B',
4459 b'B',
4460 b'bookmark',
4460 b'bookmark',
4461 [],
4461 [],
4462 _(b"show changesets within the given bookmark"),
4462 _(b"show changesets within the given bookmark"),
4463 _(b'BOOKMARK'),
4463 _(b'BOOKMARK'),
4464 ),
4464 ),
4465 (
4465 (
4466 b'P',
4466 b'P',
4467 b'prune',
4467 b'prune',
4468 [],
4468 [],
4469 _(b'do not display revision or any of its ancestors'),
4469 _(b'do not display revision or any of its ancestors'),
4470 _(b'REV'),
4470 _(b'REV'),
4471 ),
4471 ),
4472 ]
4472 ]
4473 + logopts
4473 + logopts
4474 + walkopts,
4474 + walkopts,
4475 _(b'[OPTION]... [FILE]'),
4475 _(b'[OPTION]... [FILE]'),
4476 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4476 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4477 helpbasic=True,
4477 helpbasic=True,
4478 inferrepo=True,
4478 inferrepo=True,
4479 intents={INTENT_READONLY},
4479 intents={INTENT_READONLY},
4480 )
4480 )
4481 def log(ui, repo, *pats, **opts):
4481 def log(ui, repo, *pats, **opts):
4482 """show revision history of entire repository or files
4482 """show revision history of entire repository or files
4483
4483
4484 Print the revision history of the specified files or the entire
4484 Print the revision history of the specified files or the entire
4485 project.
4485 project.
4486
4486
4487 If no revision range is specified, the default is ``tip:0`` unless
4487 If no revision range is specified, the default is ``tip:0`` unless
4488 --follow is set, in which case the working directory parent is
4488 --follow is set, in which case the working directory parent is
4489 used as the starting revision.
4489 used as the starting revision.
4490
4490
4491 File history is shown without following rename or copy history of
4491 File history is shown without following rename or copy history of
4492 files. Use -f/--follow with a filename to follow history across
4492 files. Use -f/--follow with a filename to follow history across
4493 renames and copies. --follow without a filename will only show
4493 renames and copies. --follow without a filename will only show
4494 ancestors of the starting revision.
4494 ancestors of the starting revision.
4495
4495
4496 By default this command prints revision number and changeset id,
4496 By default this command prints revision number and changeset id,
4497 tags, non-trivial parents, user, date and time, and a summary for
4497 tags, non-trivial parents, user, date and time, and a summary for
4498 each commit. When the -v/--verbose switch is used, the list of
4498 each commit. When the -v/--verbose switch is used, the list of
4499 changed files and full commit message are shown.
4499 changed files and full commit message are shown.
4500
4500
4501 With --graph the revisions are shown as an ASCII art DAG with the most
4501 With --graph the revisions are shown as an ASCII art DAG with the most
4502 recent changeset at the top.
4502 recent changeset at the top.
4503 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4503 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4504 involved in an unresolved merge conflict, '_' closes a branch,
4504 involved in an unresolved merge conflict, '_' closes a branch,
4505 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4505 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4506 changeset from the lines below is a parent of the 'o' merge on the same
4506 changeset from the lines below is a parent of the 'o' merge on the same
4507 line.
4507 line.
4508 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4508 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4509 of a '|' indicates one or more revisions in a path are omitted.
4509 of a '|' indicates one or more revisions in a path are omitted.
4510
4510
4511 .. container:: verbose
4511 .. container:: verbose
4512
4512
4513 Use -L/--line-range FILE,M:N options to follow the history of lines
4513 Use -L/--line-range FILE,M:N options to follow the history of lines
4514 from M to N in FILE. With -p/--patch only diff hunks affecting
4514 from M to N in FILE. With -p/--patch only diff hunks affecting
4515 specified line range will be shown. This option requires --follow;
4515 specified line range will be shown. This option requires --follow;
4516 it can be specified multiple times. Currently, this option is not
4516 it can be specified multiple times. Currently, this option is not
4517 compatible with --graph. This option is experimental.
4517 compatible with --graph. This option is experimental.
4518
4518
4519 .. note::
4519 .. note::
4520
4520
4521 :hg:`log --patch` may generate unexpected diff output for merge
4521 :hg:`log --patch` may generate unexpected diff output for merge
4522 changesets, as it will only compare the merge changeset against
4522 changesets, as it will only compare the merge changeset against
4523 its first parent. Also, only files different from BOTH parents
4523 its first parent. Also, only files different from BOTH parents
4524 will appear in files:.
4524 will appear in files:.
4525
4525
4526 .. note::
4526 .. note::
4527
4527
4528 For performance reasons, :hg:`log FILE` may omit duplicate changes
4528 For performance reasons, :hg:`log FILE` may omit duplicate changes
4529 made on branches and will not show removals or mode changes. To
4529 made on branches and will not show removals or mode changes. To
4530 see all such changes, use the --removed switch.
4530 see all such changes, use the --removed switch.
4531
4531
4532 .. container:: verbose
4532 .. container:: verbose
4533
4533
4534 .. note::
4534 .. note::
4535
4535
4536 The history resulting from -L/--line-range options depends on diff
4536 The history resulting from -L/--line-range options depends on diff
4537 options; for instance if white-spaces are ignored, respective changes
4537 options; for instance if white-spaces are ignored, respective changes
4538 with only white-spaces in specified line range will not be listed.
4538 with only white-spaces in specified line range will not be listed.
4539
4539
4540 .. container:: verbose
4540 .. container:: verbose
4541
4541
4542 Some examples:
4542 Some examples:
4543
4543
4544 - changesets with full descriptions and file lists::
4544 - changesets with full descriptions and file lists::
4545
4545
4546 hg log -v
4546 hg log -v
4547
4547
4548 - changesets ancestral to the working directory::
4548 - changesets ancestral to the working directory::
4549
4549
4550 hg log -f
4550 hg log -f
4551
4551
4552 - last 10 commits on the current branch::
4552 - last 10 commits on the current branch::
4553
4553
4554 hg log -l 10 -b .
4554 hg log -l 10 -b .
4555
4555
4556 - changesets showing all modifications of a file, including removals::
4556 - changesets showing all modifications of a file, including removals::
4557
4557
4558 hg log --removed file.c
4558 hg log --removed file.c
4559
4559
4560 - all changesets that touch a directory, with diffs, excluding merges::
4560 - all changesets that touch a directory, with diffs, excluding merges::
4561
4561
4562 hg log -Mp lib/
4562 hg log -Mp lib/
4563
4563
4564 - all revision numbers that match a keyword::
4564 - all revision numbers that match a keyword::
4565
4565
4566 hg log -k bug --template "{rev}\\n"
4566 hg log -k bug --template "{rev}\\n"
4567
4567
4568 - the full hash identifier of the working directory parent::
4568 - the full hash identifier of the working directory parent::
4569
4569
4570 hg log -r . --template "{node}\\n"
4570 hg log -r . --template "{node}\\n"
4571
4571
4572 - list available log templates::
4572 - list available log templates::
4573
4573
4574 hg log -T list
4574 hg log -T list
4575
4575
4576 - check if a given changeset is included in a tagged release::
4576 - check if a given changeset is included in a tagged release::
4577
4577
4578 hg log -r "a21ccf and ancestor(1.9)"
4578 hg log -r "a21ccf and ancestor(1.9)"
4579
4579
4580 - find all changesets by some user in a date range::
4580 - find all changesets by some user in a date range::
4581
4581
4582 hg log -k alice -d "may 2008 to jul 2008"
4582 hg log -k alice -d "may 2008 to jul 2008"
4583
4583
4584 - summary of all changesets after the last tag::
4584 - summary of all changesets after the last tag::
4585
4585
4586 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4586 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4587
4587
4588 - changesets touching lines 13 to 23 for file.c::
4588 - changesets touching lines 13 to 23 for file.c::
4589
4589
4590 hg log -L file.c,13:23
4590 hg log -L file.c,13:23
4591
4591
4592 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4592 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4593 main.c with patch::
4593 main.c with patch::
4594
4594
4595 hg log -L file.c,13:23 -L main.c,2:6 -p
4595 hg log -L file.c,13:23 -L main.c,2:6 -p
4596
4596
4597 See :hg:`help dates` for a list of formats valid for -d/--date.
4597 See :hg:`help dates` for a list of formats valid for -d/--date.
4598
4598
4599 See :hg:`help revisions` for more about specifying and ordering
4599 See :hg:`help revisions` for more about specifying and ordering
4600 revisions.
4600 revisions.
4601
4601
4602 See :hg:`help templates` for more about pre-packaged styles and
4602 See :hg:`help templates` for more about pre-packaged styles and
4603 specifying custom templates. The default template used by the log
4603 specifying custom templates. The default template used by the log
4604 command can be customized via the ``command-templates.log`` configuration
4604 command can be customized via the ``command-templates.log`` configuration
4605 setting.
4605 setting.
4606
4606
4607 Returns 0 on success.
4607 Returns 0 on success.
4608
4608
4609 """
4609 """
4610 opts = pycompat.byteskwargs(opts)
4610 opts = pycompat.byteskwargs(opts)
4611 linerange = opts.get(b'line_range')
4611 linerange = opts.get(b'line_range')
4612
4612
4613 if linerange and not opts.get(b'follow'):
4613 if linerange and not opts.get(b'follow'):
4614 raise error.InputError(_(b'--line-range requires --follow'))
4614 raise error.InputError(_(b'--line-range requires --follow'))
4615
4615
4616 if linerange and pats:
4616 if linerange and pats:
4617 # TODO: take pats as patterns with no line-range filter
4617 # TODO: take pats as patterns with no line-range filter
4618 raise error.InputError(
4618 raise error.InputError(
4619 _(b'FILE arguments are not compatible with --line-range option')
4619 _(b'FILE arguments are not compatible with --line-range option')
4620 )
4620 )
4621
4621
4622 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4622 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4623 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4623 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4624 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4624 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4625 if linerange:
4625 if linerange:
4626 # TODO: should follow file history from logcmdutil._initialrevs(),
4626 # TODO: should follow file history from logcmdutil._initialrevs(),
4627 # then filter the result by logcmdutil._makerevset() and --limit
4627 # then filter the result by logcmdutil._makerevset() and --limit
4628 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4628 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4629
4629
4630 if opts.get(b'bookmark'):
4630 if opts.get(b'bookmark'):
4631 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
4631 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
4632 bookmarks = opts.get(b'bookmark')
4632 bookmarks = opts.get(b'bookmark')
4633 bookmark = bookmarks[0]
4633 bookmark = bookmarks[0]
4634 revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)
4634 revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)
4635
4635
4636 getcopies = None
4636 getcopies = None
4637 if opts.get(b'copies'):
4637 if opts.get(b'copies'):
4638 endrev = None
4638 endrev = None
4639 if revs:
4639 if revs:
4640 endrev = revs.max() + 1
4640 endrev = revs.max() + 1
4641 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4641 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4642
4642
4643 ui.pager(b'log')
4643 ui.pager(b'log')
4644 displayer = logcmdutil.changesetdisplayer(
4644 displayer = logcmdutil.changesetdisplayer(
4645 ui, repo, opts, differ, buffered=True
4645 ui, repo, opts, differ, buffered=True
4646 )
4646 )
4647 if opts.get(b'graph'):
4647 if opts.get(b'graph'):
4648 displayfn = logcmdutil.displaygraphrevs
4648 displayfn = logcmdutil.displaygraphrevs
4649 else:
4649 else:
4650 displayfn = logcmdutil.displayrevs
4650 displayfn = logcmdutil.displayrevs
4651 displayfn(ui, repo, revs, displayer, getcopies)
4651 displayfn(ui, repo, revs, displayer, getcopies)
4652
4652
4653
4653
4654 @command(
4654 @command(
4655 b'manifest',
4655 b'manifest',
4656 [
4656 [
4657 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4657 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4658 (b'', b'all', False, _(b"list files from all revisions")),
4658 (b'', b'all', False, _(b"list files from all revisions")),
4659 ]
4659 ]
4660 + formatteropts,
4660 + formatteropts,
4661 _(b'[-r REV]'),
4661 _(b'[-r REV]'),
4662 helpcategory=command.CATEGORY_MAINTENANCE,
4662 helpcategory=command.CATEGORY_MAINTENANCE,
4663 intents={INTENT_READONLY},
4663 intents={INTENT_READONLY},
4664 )
4664 )
4665 def manifest(ui, repo, node=None, rev=None, **opts):
4665 def manifest(ui, repo, node=None, rev=None, **opts):
4666 """output the current or given revision of the project manifest
4666 """output the current or given revision of the project manifest
4667
4667
4668 Print a list of version controlled files for the given revision.
4668 Print a list of version controlled files for the given revision.
4669 If no revision is given, the first parent of the working directory
4669 If no revision is given, the first parent of the working directory
4670 is used, or the null revision if no revision is checked out.
4670 is used, or the null revision if no revision is checked out.
4671
4671
4672 With -v, print file permissions, symlink and executable bits.
4672 With -v, print file permissions, symlink and executable bits.
4673 With --debug, print file revision hashes.
4673 With --debug, print file revision hashes.
4674
4674
4675 If option --all is specified, the list of all files from all revisions
4675 If option --all is specified, the list of all files from all revisions
4676 is printed. This includes deleted and renamed files.
4676 is printed. This includes deleted and renamed files.
4677
4677
4678 Returns 0 on success.
4678 Returns 0 on success.
4679 """
4679 """
4680 opts = pycompat.byteskwargs(opts)
4680 opts = pycompat.byteskwargs(opts)
4681 fm = ui.formatter(b'manifest', opts)
4681 fm = ui.formatter(b'manifest', opts)
4682
4682
4683 if opts.get(b'all'):
4683 if opts.get(b'all'):
4684 if rev or node:
4684 if rev or node:
4685 raise error.InputError(_(b"can't specify a revision with --all"))
4685 raise error.InputError(_(b"can't specify a revision with --all"))
4686
4686
4687 res = set()
4687 res = set()
4688 for rev in repo:
4688 for rev in repo:
4689 ctx = repo[rev]
4689 ctx = repo[rev]
4690 res |= set(ctx.files())
4690 res |= set(ctx.files())
4691
4691
4692 ui.pager(b'manifest')
4692 ui.pager(b'manifest')
4693 for f in sorted(res):
4693 for f in sorted(res):
4694 fm.startitem()
4694 fm.startitem()
4695 fm.write(b"path", b'%s\n', f)
4695 fm.write(b"path", b'%s\n', f)
4696 fm.end()
4696 fm.end()
4697 return
4697 return
4698
4698
4699 if rev and node:
4699 if rev and node:
4700 raise error.InputError(_(b"please specify just one revision"))
4700 raise error.InputError(_(b"please specify just one revision"))
4701
4701
4702 if not node:
4702 if not node:
4703 node = rev
4703 node = rev
4704
4704
4705 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4705 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4706 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4706 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4707 if node:
4707 if node:
4708 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4708 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4709 ctx = scmutil.revsingle(repo, node)
4709 ctx = scmutil.revsingle(repo, node)
4710 mf = ctx.manifest()
4710 mf = ctx.manifest()
4711 ui.pager(b'manifest')
4711 ui.pager(b'manifest')
4712 for f in ctx:
4712 for f in ctx:
4713 fm.startitem()
4713 fm.startitem()
4714 fm.context(ctx=ctx)
4714 fm.context(ctx=ctx)
4715 fl = ctx[f].flags()
4715 fl = ctx[f].flags()
4716 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4716 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4717 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4717 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4718 fm.write(b'path', b'%s\n', f)
4718 fm.write(b'path', b'%s\n', f)
4719 fm.end()
4719 fm.end()
4720
4720
4721
4721
4722 @command(
4722 @command(
4723 b'merge',
4723 b'merge',
4724 [
4724 [
4725 (
4725 (
4726 b'f',
4726 b'f',
4727 b'force',
4727 b'force',
4728 None,
4728 None,
4729 _(b'force a merge including outstanding changes (DEPRECATED)'),
4729 _(b'force a merge including outstanding changes (DEPRECATED)'),
4730 ),
4730 ),
4731 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4731 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4732 (
4732 (
4733 b'P',
4733 b'P',
4734 b'preview',
4734 b'preview',
4735 None,
4735 None,
4736 _(b'review revisions to merge (no merge is performed)'),
4736 _(b'review revisions to merge (no merge is performed)'),
4737 ),
4737 ),
4738 (b'', b'abort', None, _(b'abort the ongoing merge')),
4738 (b'', b'abort', None, _(b'abort the ongoing merge')),
4739 ]
4739 ]
4740 + mergetoolopts,
4740 + mergetoolopts,
4741 _(b'[-P] [[-r] REV]'),
4741 _(b'[-P] [[-r] REV]'),
4742 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4742 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4743 helpbasic=True,
4743 helpbasic=True,
4744 )
4744 )
4745 def merge(ui, repo, node=None, **opts):
4745 def merge(ui, repo, node=None, **opts):
4746 """merge another revision into working directory
4746 """merge another revision into working directory
4747
4747
4748 The current working directory is updated with all changes made in
4748 The current working directory is updated with all changes made in
4749 the requested revision since the last common predecessor revision.
4749 the requested revision since the last common predecessor revision.
4750
4750
4751 Files that changed between either parent are marked as changed for
4751 Files that changed between either parent are marked as changed for
4752 the next commit and a commit must be performed before any further
4752 the next commit and a commit must be performed before any further
4753 updates to the repository are allowed. The next commit will have
4753 updates to the repository are allowed. The next commit will have
4754 two parents.
4754 two parents.
4755
4755
4756 ``--tool`` can be used to specify the merge tool used for file
4756 ``--tool`` can be used to specify the merge tool used for file
4757 merges. It overrides the HGMERGE environment variable and your
4757 merges. It overrides the HGMERGE environment variable and your
4758 configuration files. See :hg:`help merge-tools` for options.
4758 configuration files. See :hg:`help merge-tools` for options.
4759
4759
4760 If no revision is specified, the working directory's parent is a
4760 If no revision is specified, the working directory's parent is a
4761 head revision, and the current branch contains exactly one other
4761 head revision, and the current branch contains exactly one other
4762 head, the other head is merged with by default. Otherwise, an
4762 head, the other head is merged with by default. Otherwise, an
4763 explicit revision with which to merge must be provided.
4763 explicit revision with which to merge must be provided.
4764
4764
4765 See :hg:`help resolve` for information on handling file conflicts.
4765 See :hg:`help resolve` for information on handling file conflicts.
4766
4766
4767 To undo an uncommitted merge, use :hg:`merge --abort` which
4767 To undo an uncommitted merge, use :hg:`merge --abort` which
4768 will check out a clean copy of the original merge parent, losing
4768 will check out a clean copy of the original merge parent, losing
4769 all changes.
4769 all changes.
4770
4770
4771 Returns 0 on success, 1 if there are unresolved files.
4771 Returns 0 on success, 1 if there are unresolved files.
4772 """
4772 """
4773
4773
4774 opts = pycompat.byteskwargs(opts)
4774 opts = pycompat.byteskwargs(opts)
4775 abort = opts.get(b'abort')
4775 abort = opts.get(b'abort')
4776 if abort and repo.dirstate.p2() == nullid:
4776 if abort and repo.dirstate.p2() == nullid:
4777 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4777 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4778 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4778 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4779 if abort:
4779 if abort:
4780 state = cmdutil.getunfinishedstate(repo)
4780 state = cmdutil.getunfinishedstate(repo)
4781 if state and state._opname != b'merge':
4781 if state and state._opname != b'merge':
4782 raise error.StateError(
4782 raise error.StateError(
4783 _(b'cannot abort merge with %s in progress') % (state._opname),
4783 _(b'cannot abort merge with %s in progress') % (state._opname),
4784 hint=state.hint(),
4784 hint=state.hint(),
4785 )
4785 )
4786 if node:
4786 if node:
4787 raise error.InputError(_(b"cannot specify a node with --abort"))
4787 raise error.InputError(_(b"cannot specify a node with --abort"))
4788 return hg.abortmerge(repo.ui, repo)
4788 return hg.abortmerge(repo.ui, repo)
4789
4789
4790 if opts.get(b'rev') and node:
4790 if opts.get(b'rev') and node:
4791 raise error.InputError(_(b"please specify just one revision"))
4791 raise error.InputError(_(b"please specify just one revision"))
4792 if not node:
4792 if not node:
4793 node = opts.get(b'rev')
4793 node = opts.get(b'rev')
4794
4794
4795 if node:
4795 if node:
4796 ctx = scmutil.revsingle(repo, node)
4796 ctx = scmutil.revsingle(repo, node)
4797 else:
4797 else:
4798 if ui.configbool(b'commands', b'merge.require-rev'):
4798 if ui.configbool(b'commands', b'merge.require-rev'):
4799 raise error.InputError(
4799 raise error.InputError(
4800 _(
4800 _(
4801 b'configuration requires specifying revision to merge '
4801 b'configuration requires specifying revision to merge '
4802 b'with'
4802 b'with'
4803 )
4803 )
4804 )
4804 )
4805 ctx = repo[destutil.destmerge(repo)]
4805 ctx = repo[destutil.destmerge(repo)]
4806
4806
4807 if ctx.node() is None:
4807 if ctx.node() is None:
4808 raise error.InputError(
4808 raise error.InputError(
4809 _(b'merging with the working copy has no effect')
4809 _(b'merging with the working copy has no effect')
4810 )
4810 )
4811
4811
4812 if opts.get(b'preview'):
4812 if opts.get(b'preview'):
4813 # find nodes that are ancestors of p2 but not of p1
4813 # find nodes that are ancestors of p2 but not of p1
4814 p1 = repo[b'.'].node()
4814 p1 = repo[b'.'].node()
4815 p2 = ctx.node()
4815 p2 = ctx.node()
4816 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4816 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4817
4817
4818 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4818 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4819 for node in nodes:
4819 for node in nodes:
4820 displayer.show(repo[node])
4820 displayer.show(repo[node])
4821 displayer.close()
4821 displayer.close()
4822 return 0
4822 return 0
4823
4823
4824 # ui.forcemerge is an internal variable, do not document
4824 # ui.forcemerge is an internal variable, do not document
4825 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4825 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4826 with ui.configoverride(overrides, b'merge'):
4826 with ui.configoverride(overrides, b'merge'):
4827 force = opts.get(b'force')
4827 force = opts.get(b'force')
4828 labels = [b'working copy', b'merge rev']
4828 labels = [b'working copy', b'merge rev']
4829 return hg.merge(ctx, force=force, labels=labels)
4829 return hg.merge(ctx, force=force, labels=labels)
4830
4830
4831
4831
4832 statemod.addunfinished(
4832 statemod.addunfinished(
4833 b'merge',
4833 b'merge',
4834 fname=None,
4834 fname=None,
4835 clearable=True,
4835 clearable=True,
4836 allowcommit=True,
4836 allowcommit=True,
4837 cmdmsg=_(b'outstanding uncommitted merge'),
4837 cmdmsg=_(b'outstanding uncommitted merge'),
4838 abortfunc=hg.abortmerge,
4838 abortfunc=hg.abortmerge,
4839 statushint=_(
4839 statushint=_(
4840 b'To continue: hg commit\nTo abort: hg merge --abort'
4840 b'To continue: hg commit\nTo abort: hg merge --abort'
4841 ),
4841 ),
4842 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4842 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4843 )
4843 )
4844
4844
4845
4845
4846 @command(
4846 @command(
4847 b'outgoing|out',
4847 b'outgoing|out',
4848 [
4848 [
4849 (
4849 (
4850 b'f',
4850 b'f',
4851 b'force',
4851 b'force',
4852 None,
4852 None,
4853 _(b'run even when the destination is unrelated'),
4853 _(b'run even when the destination is unrelated'),
4854 ),
4854 ),
4855 (
4855 (
4856 b'r',
4856 b'r',
4857 b'rev',
4857 b'rev',
4858 [],
4858 [],
4859 _(b'a changeset intended to be included in the destination'),
4859 _(b'a changeset intended to be included in the destination'),
4860 _(b'REV'),
4860 _(b'REV'),
4861 ),
4861 ),
4862 (b'n', b'newest-first', None, _(b'show newest record first')),
4862 (b'n', b'newest-first', None, _(b'show newest record first')),
4863 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4863 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4864 (
4864 (
4865 b'b',
4865 b'b',
4866 b'branch',
4866 b'branch',
4867 [],
4867 [],
4868 _(b'a specific branch you would like to push'),
4868 _(b'a specific branch you would like to push'),
4869 _(b'BRANCH'),
4869 _(b'BRANCH'),
4870 ),
4870 ),
4871 ]
4871 ]
4872 + logopts
4872 + logopts
4873 + remoteopts
4873 + remoteopts
4874 + subrepoopts,
4874 + subrepoopts,
4875 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4875 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4876 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4876 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4877 )
4877 )
4878 def outgoing(ui, repo, dest=None, **opts):
4878 def outgoing(ui, repo, dest=None, **opts):
4879 """show changesets not found in the destination
4879 """show changesets not found in the destination
4880
4880
4881 Show changesets not found in the specified destination repository
4881 Show changesets not found in the specified destination repository
4882 or the default push location. These are the changesets that would
4882 or the default push location. These are the changesets that would
4883 be pushed if a push was requested.
4883 be pushed if a push was requested.
4884
4884
4885 See pull for details of valid destination formats.
4885 See pull for details of valid destination formats.
4886
4886
4887 .. container:: verbose
4887 .. container:: verbose
4888
4888
4889 With -B/--bookmarks, the result of bookmark comparison between
4889 With -B/--bookmarks, the result of bookmark comparison between
4890 local and remote repositories is displayed. With -v/--verbose,
4890 local and remote repositories is displayed. With -v/--verbose,
4891 status is also displayed for each bookmark like below::
4891 status is also displayed for each bookmark like below::
4892
4892
4893 BM1 01234567890a added
4893 BM1 01234567890a added
4894 BM2 deleted
4894 BM2 deleted
4895 BM3 234567890abc advanced
4895 BM3 234567890abc advanced
4896 BM4 34567890abcd diverged
4896 BM4 34567890abcd diverged
4897 BM5 4567890abcde changed
4897 BM5 4567890abcde changed
4898
4898
4899 The action taken when pushing depends on the
4899 The action taken when pushing depends on the
4900 status of each bookmark:
4900 status of each bookmark:
4901
4901
4902 :``added``: push with ``-B`` will create it
4902 :``added``: push with ``-B`` will create it
4903 :``deleted``: push with ``-B`` will delete it
4903 :``deleted``: push with ``-B`` will delete it
4904 :``advanced``: push will update it
4904 :``advanced``: push will update it
4905 :``diverged``: push with ``-B`` will update it
4905 :``diverged``: push with ``-B`` will update it
4906 :``changed``: push with ``-B`` will update it
4906 :``changed``: push with ``-B`` will update it
4907
4907
4908 From the point of view of pushing behavior, bookmarks
4908 From the point of view of pushing behavior, bookmarks
4909 existing only in the remote repository are treated as
4909 existing only in the remote repository are treated as
4910 ``deleted``, even if it is in fact added remotely.
4910 ``deleted``, even if it is in fact added remotely.
4911
4911
4912 Returns 0 if there are outgoing changes, 1 otherwise.
4912 Returns 0 if there are outgoing changes, 1 otherwise.
4913 """
4913 """
4914 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4914 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4915 # style URLs, so don't overwrite dest.
4915 # style URLs, so don't overwrite dest.
4916 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4916 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4917 if not path:
4917 if not path:
4918 raise error.ConfigError(
4918 raise error.ConfigError(
4919 _(b'default repository not configured!'),
4919 _(b'default repository not configured!'),
4920 hint=_(b"see 'hg help config.paths'"),
4920 hint=_(b"see 'hg help config.paths'"),
4921 )
4921 )
4922
4922
4923 opts = pycompat.byteskwargs(opts)
4923 opts = pycompat.byteskwargs(opts)
4924 if opts.get(b'graph'):
4924 if opts.get(b'graph'):
4925 logcmdutil.checkunsupportedgraphflags([], opts)
4925 logcmdutil.checkunsupportedgraphflags([], opts)
4926 o, other = hg._outgoing(ui, repo, dest, opts)
4926 o, other = hg._outgoing(ui, repo, dest, opts)
4927 if not o:
4927 if not o:
4928 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4928 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4929 return
4929 return
4930
4930
4931 revdag = logcmdutil.graphrevs(repo, o, opts)
4931 revdag = logcmdutil.graphrevs(repo, o, opts)
4932 ui.pager(b'outgoing')
4932 ui.pager(b'outgoing')
4933 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4933 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4934 logcmdutil.displaygraph(
4934 logcmdutil.displaygraph(
4935 ui, repo, revdag, displayer, graphmod.asciiedges
4935 ui, repo, revdag, displayer, graphmod.asciiedges
4936 )
4936 )
4937 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4937 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4938 return 0
4938 return 0
4939
4939
4940 if opts.get(b'bookmarks'):
4940 if opts.get(b'bookmarks'):
4941 dest = path.pushloc or path.loc
4941 dest = path.pushloc or path.loc
4942 other = hg.peer(repo, opts, dest)
4942 other = hg.peer(repo, opts, dest)
4943 if b'bookmarks' not in other.listkeys(b'namespaces'):
4943 if b'bookmarks' not in other.listkeys(b'namespaces'):
4944 ui.warn(_(b"remote doesn't support bookmarks\n"))
4944 ui.warn(_(b"remote doesn't support bookmarks\n"))
4945 return 0
4945 return 0
4946 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4946 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4947 ui.pager(b'outgoing')
4947 ui.pager(b'outgoing')
4948 return bookmarks.outgoing(ui, repo, other)
4948 return bookmarks.outgoing(ui, repo, other)
4949
4949
4950 repo._subtoppath = path.pushloc or path.loc
4950 repo._subtoppath = path.pushloc or path.loc
4951 try:
4951 try:
4952 return hg.outgoing(ui, repo, dest, opts)
4952 return hg.outgoing(ui, repo, dest, opts)
4953 finally:
4953 finally:
4954 del repo._subtoppath
4954 del repo._subtoppath
4955
4955
4956
4956
4957 @command(
4957 @command(
4958 b'parents',
4958 b'parents',
4959 [
4959 [
4960 (
4960 (
4961 b'r',
4961 b'r',
4962 b'rev',
4962 b'rev',
4963 b'',
4963 b'',
4964 _(b'show parents of the specified revision'),
4964 _(b'show parents of the specified revision'),
4965 _(b'REV'),
4965 _(b'REV'),
4966 ),
4966 ),
4967 ]
4967 ]
4968 + templateopts,
4968 + templateopts,
4969 _(b'[-r REV] [FILE]'),
4969 _(b'[-r REV] [FILE]'),
4970 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4970 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4971 inferrepo=True,
4971 inferrepo=True,
4972 )
4972 )
4973 def parents(ui, repo, file_=None, **opts):
4973 def parents(ui, repo, file_=None, **opts):
4974 """show the parents of the working directory or revision (DEPRECATED)
4974 """show the parents of the working directory or revision (DEPRECATED)
4975
4975
4976 Print the working directory's parent revisions. If a revision is
4976 Print the working directory's parent revisions. If a revision is
4977 given via -r/--rev, the parent of that revision will be printed.
4977 given via -r/--rev, the parent of that revision will be printed.
4978 If a file argument is given, the revision in which the file was
4978 If a file argument is given, the revision in which the file was
4979 last changed (before the working directory revision or the
4979 last changed (before the working directory revision or the
4980 argument to --rev if given) is printed.
4980 argument to --rev if given) is printed.
4981
4981
4982 This command is equivalent to::
4982 This command is equivalent to::
4983
4983
4984 hg log -r "p1()+p2()" or
4984 hg log -r "p1()+p2()" or
4985 hg log -r "p1(REV)+p2(REV)" or
4985 hg log -r "p1(REV)+p2(REV)" or
4986 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4986 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4987 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4987 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4988
4988
4989 See :hg:`summary` and :hg:`help revsets` for related information.
4989 See :hg:`summary` and :hg:`help revsets` for related information.
4990
4990
4991 Returns 0 on success.
4991 Returns 0 on success.
4992 """
4992 """
4993
4993
4994 opts = pycompat.byteskwargs(opts)
4994 opts = pycompat.byteskwargs(opts)
4995 rev = opts.get(b'rev')
4995 rev = opts.get(b'rev')
4996 if rev:
4996 if rev:
4997 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
4997 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
4998 ctx = scmutil.revsingle(repo, rev, None)
4998 ctx = scmutil.revsingle(repo, rev, None)
4999
4999
5000 if file_:
5000 if file_:
5001 m = scmutil.match(ctx, (file_,), opts)
5001 m = scmutil.match(ctx, (file_,), opts)
5002 if m.anypats() or len(m.files()) != 1:
5002 if m.anypats() or len(m.files()) != 1:
5003 raise error.InputError(_(b'can only specify an explicit filename'))
5003 raise error.InputError(_(b'can only specify an explicit filename'))
5004 file_ = m.files()[0]
5004 file_ = m.files()[0]
5005 filenodes = []
5005 filenodes = []
5006 for cp in ctx.parents():
5006 for cp in ctx.parents():
5007 if not cp:
5007 if not cp:
5008 continue
5008 continue
5009 try:
5009 try:
5010 filenodes.append(cp.filenode(file_))
5010 filenodes.append(cp.filenode(file_))
5011 except error.LookupError:
5011 except error.LookupError:
5012 pass
5012 pass
5013 if not filenodes:
5013 if not filenodes:
5014 raise error.InputError(_(b"'%s' not found in manifest!") % file_)
5014 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5015 p = []
5015 p = []
5016 for fn in filenodes:
5016 for fn in filenodes:
5017 fctx = repo.filectx(file_, fileid=fn)
5017 fctx = repo.filectx(file_, fileid=fn)
5018 p.append(fctx.node())
5018 p.append(fctx.node())
5019 else:
5019 else:
5020 p = [cp.node() for cp in ctx.parents()]
5020 p = [cp.node() for cp in ctx.parents()]
5021
5021
5022 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5022 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5023 for n in p:
5023 for n in p:
5024 if n != nullid:
5024 if n != nullid:
5025 displayer.show(repo[n])
5025 displayer.show(repo[n])
5026 displayer.close()
5026 displayer.close()
5027
5027
5028
5028
5029 @command(
5029 @command(
5030 b'paths',
5030 b'paths',
5031 formatteropts,
5031 formatteropts,
5032 _(b'[NAME]'),
5032 _(b'[NAME]'),
5033 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5033 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5034 optionalrepo=True,
5034 optionalrepo=True,
5035 intents={INTENT_READONLY},
5035 intents={INTENT_READONLY},
5036 )
5036 )
5037 def paths(ui, repo, search=None, **opts):
5037 def paths(ui, repo, search=None, **opts):
5038 """show aliases for remote repositories
5038 """show aliases for remote repositories
5039
5039
5040 Show definition of symbolic path name NAME. If no name is given,
5040 Show definition of symbolic path name NAME. If no name is given,
5041 show definition of all available names.
5041 show definition of all available names.
5042
5042
5043 Option -q/--quiet suppresses all output when searching for NAME
5043 Option -q/--quiet suppresses all output when searching for NAME
5044 and shows only the path names when listing all definitions.
5044 and shows only the path names when listing all definitions.
5045
5045
5046 Path names are defined in the [paths] section of your
5046 Path names are defined in the [paths] section of your
5047 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5047 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5048 repository, ``.hg/hgrc`` is used, too.
5048 repository, ``.hg/hgrc`` is used, too.
5049
5049
5050 The path names ``default`` and ``default-push`` have a special
5050 The path names ``default`` and ``default-push`` have a special
5051 meaning. When performing a push or pull operation, they are used
5051 meaning. When performing a push or pull operation, they are used
5052 as fallbacks if no location is specified on the command-line.
5052 as fallbacks if no location is specified on the command-line.
5053 When ``default-push`` is set, it will be used for push and
5053 When ``default-push`` is set, it will be used for push and
5054 ``default`` will be used for pull; otherwise ``default`` is used
5054 ``default`` will be used for pull; otherwise ``default`` is used
5055 as the fallback for both. When cloning a repository, the clone
5055 as the fallback for both. When cloning a repository, the clone
5056 source is written as ``default`` in ``.hg/hgrc``.
5056 source is written as ``default`` in ``.hg/hgrc``.
5057
5057
5058 .. note::
5058 .. note::
5059
5059
5060 ``default`` and ``default-push`` apply to all inbound (e.g.
5060 ``default`` and ``default-push`` apply to all inbound (e.g.
5061 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5061 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5062 and :hg:`bundle`) operations.
5062 and :hg:`bundle`) operations.
5063
5063
5064 See :hg:`help urls` for more information.
5064 See :hg:`help urls` for more information.
5065
5065
5066 .. container:: verbose
5066 .. container:: verbose
5067
5067
5068 Template:
5068 Template:
5069
5069
5070 The following keywords are supported. See also :hg:`help templates`.
5070 The following keywords are supported. See also :hg:`help templates`.
5071
5071
5072 :name: String. Symbolic name of the path alias.
5072 :name: String. Symbolic name of the path alias.
5073 :pushurl: String. URL for push operations.
5073 :pushurl: String. URL for push operations.
5074 :url: String. URL or directory path for the other operations.
5074 :url: String. URL or directory path for the other operations.
5075
5075
5076 Returns 0 on success.
5076 Returns 0 on success.
5077 """
5077 """
5078
5078
5079 opts = pycompat.byteskwargs(opts)
5079 opts = pycompat.byteskwargs(opts)
5080 ui.pager(b'paths')
5080 ui.pager(b'paths')
5081 if search:
5081 if search:
5082 pathitems = [
5082 pathitems = [
5083 (name, path)
5083 (name, path)
5084 for name, path in pycompat.iteritems(ui.paths)
5084 for name, path in pycompat.iteritems(ui.paths)
5085 if name == search
5085 if name == search
5086 ]
5086 ]
5087 else:
5087 else:
5088 pathitems = sorted(pycompat.iteritems(ui.paths))
5088 pathitems = sorted(pycompat.iteritems(ui.paths))
5089
5089
5090 fm = ui.formatter(b'paths', opts)
5090 fm = ui.formatter(b'paths', opts)
5091 if fm.isplain():
5091 if fm.isplain():
5092 hidepassword = util.hidepassword
5092 hidepassword = util.hidepassword
5093 else:
5093 else:
5094 hidepassword = bytes
5094 hidepassword = bytes
5095 if ui.quiet:
5095 if ui.quiet:
5096 namefmt = b'%s\n'
5096 namefmt = b'%s\n'
5097 else:
5097 else:
5098 namefmt = b'%s = '
5098 namefmt = b'%s = '
5099 showsubopts = not search and not ui.quiet
5099 showsubopts = not search and not ui.quiet
5100
5100
5101 for name, path in pathitems:
5101 for name, path in pathitems:
5102 fm.startitem()
5102 fm.startitem()
5103 fm.condwrite(not search, b'name', namefmt, name)
5103 fm.condwrite(not search, b'name', namefmt, name)
5104 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5104 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5105 for subopt, value in sorted(path.suboptions.items()):
5105 for subopt, value in sorted(path.suboptions.items()):
5106 assert subopt not in (b'name', b'url')
5106 assert subopt not in (b'name', b'url')
5107 if showsubopts:
5107 if showsubopts:
5108 fm.plain(b'%s:%s = ' % (name, subopt))
5108 fm.plain(b'%s:%s = ' % (name, subopt))
5109 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5109 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5110
5110
5111 fm.end()
5111 fm.end()
5112
5112
5113 if search and not pathitems:
5113 if search and not pathitems:
5114 if not ui.quiet:
5114 if not ui.quiet:
5115 ui.warn(_(b"not found!\n"))
5115 ui.warn(_(b"not found!\n"))
5116 return 1
5116 return 1
5117 else:
5117 else:
5118 return 0
5118 return 0
5119
5119
5120
5120
5121 @command(
5121 @command(
5122 b'phase',
5122 b'phase',
5123 [
5123 [
5124 (b'p', b'public', False, _(b'set changeset phase to public')),
5124 (b'p', b'public', False, _(b'set changeset phase to public')),
5125 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5125 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5126 (b's', b'secret', False, _(b'set changeset phase to secret')),
5126 (b's', b'secret', False, _(b'set changeset phase to secret')),
5127 (b'f', b'force', False, _(b'allow to move boundary backward')),
5127 (b'f', b'force', False, _(b'allow to move boundary backward')),
5128 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5128 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5129 ],
5129 ],
5130 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5130 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5131 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5131 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5132 )
5132 )
5133 def phase(ui, repo, *revs, **opts):
5133 def phase(ui, repo, *revs, **opts):
5134 """set or show the current phase name
5134 """set or show the current phase name
5135
5135
5136 With no argument, show the phase name of the current revision(s).
5136 With no argument, show the phase name of the current revision(s).
5137
5137
5138 With one of -p/--public, -d/--draft or -s/--secret, change the
5138 With one of -p/--public, -d/--draft or -s/--secret, change the
5139 phase value of the specified revisions.
5139 phase value of the specified revisions.
5140
5140
5141 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5141 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5142 lower phase to a higher phase. Phases are ordered as follows::
5142 lower phase to a higher phase. Phases are ordered as follows::
5143
5143
5144 public < draft < secret
5144 public < draft < secret
5145
5145
5146 Returns 0 on success, 1 if some phases could not be changed.
5146 Returns 0 on success, 1 if some phases could not be changed.
5147
5147
5148 (For more information about the phases concept, see :hg:`help phases`.)
5148 (For more information about the phases concept, see :hg:`help phases`.)
5149 """
5149 """
5150 opts = pycompat.byteskwargs(opts)
5150 opts = pycompat.byteskwargs(opts)
5151 # search for a unique phase argument
5151 # search for a unique phase argument
5152 targetphase = None
5152 targetphase = None
5153 for idx, name in enumerate(phases.cmdphasenames):
5153 for idx, name in enumerate(phases.cmdphasenames):
5154 if opts[name]:
5154 if opts[name]:
5155 if targetphase is not None:
5155 if targetphase is not None:
5156 raise error.InputError(_(b'only one phase can be specified'))
5156 raise error.InputError(_(b'only one phase can be specified'))
5157 targetphase = idx
5157 targetphase = idx
5158
5158
5159 # look for specified revision
5159 # look for specified revision
5160 revs = list(revs)
5160 revs = list(revs)
5161 revs.extend(opts[b'rev'])
5161 revs.extend(opts[b'rev'])
5162 if not revs:
5162 if not revs:
5163 # display both parents as the second parent phase can influence
5163 # display both parents as the second parent phase can influence
5164 # the phase of a merge commit
5164 # the phase of a merge commit
5165 revs = [c.rev() for c in repo[None].parents()]
5165 revs = [c.rev() for c in repo[None].parents()]
5166
5166
5167 revs = scmutil.revrange(repo, revs)
5167 revs = scmutil.revrange(repo, revs)
5168
5168
5169 ret = 0
5169 ret = 0
5170 if targetphase is None:
5170 if targetphase is None:
5171 # display
5171 # display
5172 for r in revs:
5172 for r in revs:
5173 ctx = repo[r]
5173 ctx = repo[r]
5174 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5174 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5175 else:
5175 else:
5176 with repo.lock(), repo.transaction(b"phase") as tr:
5176 with repo.lock(), repo.transaction(b"phase") as tr:
5177 # set phase
5177 # set phase
5178 if not revs:
5178 if not revs:
5179 raise error.InputError(_(b'empty revision set'))
5179 raise error.InputError(_(b'empty revision set'))
5180 nodes = [repo[r].node() for r in revs]
5180 nodes = [repo[r].node() for r in revs]
5181 # moving revision from public to draft may hide them
5181 # moving revision from public to draft may hide them
5182 # We have to check result on an unfiltered repository
5182 # We have to check result on an unfiltered repository
5183 unfi = repo.unfiltered()
5183 unfi = repo.unfiltered()
5184 getphase = unfi._phasecache.phase
5184 getphase = unfi._phasecache.phase
5185 olddata = [getphase(unfi, r) for r in unfi]
5185 olddata = [getphase(unfi, r) for r in unfi]
5186 phases.advanceboundary(repo, tr, targetphase, nodes)
5186 phases.advanceboundary(repo, tr, targetphase, nodes)
5187 if opts[b'force']:
5187 if opts[b'force']:
5188 phases.retractboundary(repo, tr, targetphase, nodes)
5188 phases.retractboundary(repo, tr, targetphase, nodes)
5189 getphase = unfi._phasecache.phase
5189 getphase = unfi._phasecache.phase
5190 newdata = [getphase(unfi, r) for r in unfi]
5190 newdata = [getphase(unfi, r) for r in unfi]
5191 changes = sum(newdata[r] != olddata[r] for r in unfi)
5191 changes = sum(newdata[r] != olddata[r] for r in unfi)
5192 cl = unfi.changelog
5192 cl = unfi.changelog
5193 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5193 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5194 if rejected:
5194 if rejected:
5195 ui.warn(
5195 ui.warn(
5196 _(
5196 _(
5197 b'cannot move %i changesets to a higher '
5197 b'cannot move %i changesets to a higher '
5198 b'phase, use --force\n'
5198 b'phase, use --force\n'
5199 )
5199 )
5200 % len(rejected)
5200 % len(rejected)
5201 )
5201 )
5202 ret = 1
5202 ret = 1
5203 if changes:
5203 if changes:
5204 msg = _(b'phase changed for %i changesets\n') % changes
5204 msg = _(b'phase changed for %i changesets\n') % changes
5205 if ret:
5205 if ret:
5206 ui.status(msg)
5206 ui.status(msg)
5207 else:
5207 else:
5208 ui.note(msg)
5208 ui.note(msg)
5209 else:
5209 else:
5210 ui.warn(_(b'no phases changed\n'))
5210 ui.warn(_(b'no phases changed\n'))
5211 return ret
5211 return ret
5212
5212
5213
5213
5214 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5214 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5215 """Run after a changegroup has been added via pull/unbundle
5215 """Run after a changegroup has been added via pull/unbundle
5216
5216
5217 This takes arguments below:
5217 This takes arguments below:
5218
5218
5219 :modheads: change of heads by pull/unbundle
5219 :modheads: change of heads by pull/unbundle
5220 :optupdate: updating working directory is needed or not
5220 :optupdate: updating working directory is needed or not
5221 :checkout: update destination revision (or None to default destination)
5221 :checkout: update destination revision (or None to default destination)
5222 :brev: a name, which might be a bookmark to be activated after updating
5222 :brev: a name, which might be a bookmark to be activated after updating
5223 """
5223 """
5224 if modheads == 0:
5224 if modheads == 0:
5225 return
5225 return
5226 if optupdate:
5226 if optupdate:
5227 try:
5227 try:
5228 return hg.updatetotally(ui, repo, checkout, brev)
5228 return hg.updatetotally(ui, repo, checkout, brev)
5229 except error.UpdateAbort as inst:
5229 except error.UpdateAbort as inst:
5230 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5230 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5231 hint = inst.hint
5231 hint = inst.hint
5232 raise error.UpdateAbort(msg, hint=hint)
5232 raise error.UpdateAbort(msg, hint=hint)
5233 if modheads is not None and modheads > 1:
5233 if modheads is not None and modheads > 1:
5234 currentbranchheads = len(repo.branchheads())
5234 currentbranchheads = len(repo.branchheads())
5235 if currentbranchheads == modheads:
5235 if currentbranchheads == modheads:
5236 ui.status(
5236 ui.status(
5237 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5237 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5238 )
5238 )
5239 elif currentbranchheads > 1:
5239 elif currentbranchheads > 1:
5240 ui.status(
5240 ui.status(
5241 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5241 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5242 )
5242 )
5243 else:
5243 else:
5244 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5244 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5245 elif not ui.configbool(b'commands', b'update.requiredest'):
5245 elif not ui.configbool(b'commands', b'update.requiredest'):
5246 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5246 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5247
5247
5248
5248
5249 @command(
5249 @command(
5250 b'pull',
5250 b'pull',
5251 [
5251 [
5252 (
5252 (
5253 b'u',
5253 b'u',
5254 b'update',
5254 b'update',
5255 None,
5255 None,
5256 _(b'update to new branch head if new descendants were pulled'),
5256 _(b'update to new branch head if new descendants were pulled'),
5257 ),
5257 ),
5258 (
5258 (
5259 b'f',
5259 b'f',
5260 b'force',
5260 b'force',
5261 None,
5261 None,
5262 _(b'run even when remote repository is unrelated'),
5262 _(b'run even when remote repository is unrelated'),
5263 ),
5263 ),
5264 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5264 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5265 (
5265 (
5266 b'r',
5266 b'r',
5267 b'rev',
5267 b'rev',
5268 [],
5268 [],
5269 _(b'a remote changeset intended to be added'),
5269 _(b'a remote changeset intended to be added'),
5270 _(b'REV'),
5270 _(b'REV'),
5271 ),
5271 ),
5272 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5272 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5273 (
5273 (
5274 b'b',
5274 b'b',
5275 b'branch',
5275 b'branch',
5276 [],
5276 [],
5277 _(b'a specific branch you would like to pull'),
5277 _(b'a specific branch you would like to pull'),
5278 _(b'BRANCH'),
5278 _(b'BRANCH'),
5279 ),
5279 ),
5280 ]
5280 ]
5281 + remoteopts,
5281 + remoteopts,
5282 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5282 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5283 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5283 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5284 helpbasic=True,
5284 helpbasic=True,
5285 )
5285 )
5286 def pull(ui, repo, source=b"default", **opts):
5286 def pull(ui, repo, source=b"default", **opts):
5287 """pull changes from the specified source
5287 """pull changes from the specified source
5288
5288
5289 Pull changes from a remote repository to a local one.
5289 Pull changes from a remote repository to a local one.
5290
5290
5291 This finds all changes from the repository at the specified path
5291 This finds all changes from the repository at the specified path
5292 or URL and adds them to a local repository (the current one unless
5292 or URL and adds them to a local repository (the current one unless
5293 -R is specified). By default, this does not update the copy of the
5293 -R is specified). By default, this does not update the copy of the
5294 project in the working directory.
5294 project in the working directory.
5295
5295
5296 When cloning from servers that support it, Mercurial may fetch
5296 When cloning from servers that support it, Mercurial may fetch
5297 pre-generated data. When this is done, hooks operating on incoming
5297 pre-generated data. When this is done, hooks operating on incoming
5298 changesets and changegroups may fire more than once, once for each
5298 changesets and changegroups may fire more than once, once for each
5299 pre-generated bundle and as well as for any additional remaining
5299 pre-generated bundle and as well as for any additional remaining
5300 data. See :hg:`help -e clonebundles` for more.
5300 data. See :hg:`help -e clonebundles` for more.
5301
5301
5302 Use :hg:`incoming` if you want to see what would have been added
5302 Use :hg:`incoming` if you want to see what would have been added
5303 by a pull at the time you issued this command. If you then decide
5303 by a pull at the time you issued this command. If you then decide
5304 to add those changes to the repository, you should use :hg:`pull
5304 to add those changes to the repository, you should use :hg:`pull
5305 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5305 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5306
5306
5307 If SOURCE is omitted, the 'default' path will be used.
5307 If SOURCE is omitted, the 'default' path will be used.
5308 See :hg:`help urls` for more information.
5308 See :hg:`help urls` for more information.
5309
5309
5310 Specifying bookmark as ``.`` is equivalent to specifying the active
5310 Specifying bookmark as ``.`` is equivalent to specifying the active
5311 bookmark's name.
5311 bookmark's name.
5312
5312
5313 Returns 0 on success, 1 if an update had unresolved files.
5313 Returns 0 on success, 1 if an update had unresolved files.
5314 """
5314 """
5315
5315
5316 opts = pycompat.byteskwargs(opts)
5316 opts = pycompat.byteskwargs(opts)
5317 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5317 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5318 b'update'
5318 b'update'
5319 ):
5319 ):
5320 msg = _(b'update destination required by configuration')
5320 msg = _(b'update destination required by configuration')
5321 hint = _(b'use hg pull followed by hg update DEST')
5321 hint = _(b'use hg pull followed by hg update DEST')
5322 raise error.InputError(msg, hint=hint)
5322 raise error.InputError(msg, hint=hint)
5323
5323
5324 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5324 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5325 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5325 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5326 other = hg.peer(repo, opts, source)
5326 other = hg.peer(repo, opts, source)
5327 try:
5327 try:
5328 revs, checkout = hg.addbranchrevs(
5328 revs, checkout = hg.addbranchrevs(
5329 repo, other, branches, opts.get(b'rev')
5329 repo, other, branches, opts.get(b'rev')
5330 )
5330 )
5331
5331
5332 pullopargs = {}
5332 pullopargs = {}
5333
5333
5334 nodes = None
5334 nodes = None
5335 if opts.get(b'bookmark') or revs:
5335 if opts.get(b'bookmark') or revs:
5336 # The list of bookmark used here is the same used to actually update
5336 # The list of bookmark used here is the same used to actually update
5337 # the bookmark names, to avoid the race from issue 4689 and we do
5337 # the bookmark names, to avoid the race from issue 4689 and we do
5338 # all lookup and bookmark queries in one go so they see the same
5338 # all lookup and bookmark queries in one go so they see the same
5339 # version of the server state (issue 4700).
5339 # version of the server state (issue 4700).
5340 nodes = []
5340 nodes = []
5341 fnodes = []
5341 fnodes = []
5342 revs = revs or []
5342 revs = revs or []
5343 if revs and not other.capable(b'lookup'):
5343 if revs and not other.capable(b'lookup'):
5344 err = _(
5344 err = _(
5345 b"other repository doesn't support revision lookup, "
5345 b"other repository doesn't support revision lookup, "
5346 b"so a rev cannot be specified."
5346 b"so a rev cannot be specified."
5347 )
5347 )
5348 raise error.Abort(err)
5348 raise error.Abort(err)
5349 with other.commandexecutor() as e:
5349 with other.commandexecutor() as e:
5350 fremotebookmarks = e.callcommand(
5350 fremotebookmarks = e.callcommand(
5351 b'listkeys', {b'namespace': b'bookmarks'}
5351 b'listkeys', {b'namespace': b'bookmarks'}
5352 )
5352 )
5353 for r in revs:
5353 for r in revs:
5354 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5354 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5355 remotebookmarks = fremotebookmarks.result()
5355 remotebookmarks = fremotebookmarks.result()
5356 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5356 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5357 pullopargs[b'remotebookmarks'] = remotebookmarks
5357 pullopargs[b'remotebookmarks'] = remotebookmarks
5358 for b in opts.get(b'bookmark', []):
5358 for b in opts.get(b'bookmark', []):
5359 b = repo._bookmarks.expandname(b)
5359 b = repo._bookmarks.expandname(b)
5360 if b not in remotebookmarks:
5360 if b not in remotebookmarks:
5361 raise error.InputError(
5361 raise error.InputError(
5362 _(b'remote bookmark %s not found!') % b
5362 _(b'remote bookmark %s not found!') % b
5363 )
5363 )
5364 nodes.append(remotebookmarks[b])
5364 nodes.append(remotebookmarks[b])
5365 for i, rev in enumerate(revs):
5365 for i, rev in enumerate(revs):
5366 node = fnodes[i].result()
5366 node = fnodes[i].result()
5367 nodes.append(node)
5367 nodes.append(node)
5368 if rev == checkout:
5368 if rev == checkout:
5369 checkout = node
5369 checkout = node
5370
5370
5371 wlock = util.nullcontextmanager()
5371 wlock = util.nullcontextmanager()
5372 if opts.get(b'update'):
5372 if opts.get(b'update'):
5373 wlock = repo.wlock()
5373 wlock = repo.wlock()
5374 with wlock:
5374 with wlock:
5375 pullopargs.update(opts.get(b'opargs', {}))
5375 pullopargs.update(opts.get(b'opargs', {}))
5376 modheads = exchange.pull(
5376 modheads = exchange.pull(
5377 repo,
5377 repo,
5378 other,
5378 other,
5379 heads=nodes,
5379 heads=nodes,
5380 force=opts.get(b'force'),
5380 force=opts.get(b'force'),
5381 bookmarks=opts.get(b'bookmark', ()),
5381 bookmarks=opts.get(b'bookmark', ()),
5382 opargs=pullopargs,
5382 opargs=pullopargs,
5383 confirm=opts.get(b'confirm'),
5383 confirm=opts.get(b'confirm'),
5384 ).cgresult
5384 ).cgresult
5385
5385
5386 # brev is a name, which might be a bookmark to be activated at
5386 # brev is a name, which might be a bookmark to be activated at
5387 # the end of the update. In other words, it is an explicit
5387 # the end of the update. In other words, it is an explicit
5388 # destination of the update
5388 # destination of the update
5389 brev = None
5389 brev = None
5390
5390
5391 if checkout:
5391 if checkout:
5392 checkout = repo.unfiltered().changelog.rev(checkout)
5392 checkout = repo.unfiltered().changelog.rev(checkout)
5393
5393
5394 # order below depends on implementation of
5394 # order below depends on implementation of
5395 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5395 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5396 # because 'checkout' is determined without it.
5396 # because 'checkout' is determined without it.
5397 if opts.get(b'rev'):
5397 if opts.get(b'rev'):
5398 brev = opts[b'rev'][0]
5398 brev = opts[b'rev'][0]
5399 elif opts.get(b'branch'):
5399 elif opts.get(b'branch'):
5400 brev = opts[b'branch'][0]
5400 brev = opts[b'branch'][0]
5401 else:
5401 else:
5402 brev = branches[0]
5402 brev = branches[0]
5403 repo._subtoppath = source
5403 repo._subtoppath = source
5404 try:
5404 try:
5405 ret = postincoming(
5405 ret = postincoming(
5406 ui, repo, modheads, opts.get(b'update'), checkout, brev
5406 ui, repo, modheads, opts.get(b'update'), checkout, brev
5407 )
5407 )
5408 except error.FilteredRepoLookupError as exc:
5408 except error.FilteredRepoLookupError as exc:
5409 msg = _(b'cannot update to target: %s') % exc.args[0]
5409 msg = _(b'cannot update to target: %s') % exc.args[0]
5410 exc.args = (msg,) + exc.args[1:]
5410 exc.args = (msg,) + exc.args[1:]
5411 raise
5411 raise
5412 finally:
5412 finally:
5413 del repo._subtoppath
5413 del repo._subtoppath
5414
5414
5415 finally:
5415 finally:
5416 other.close()
5416 other.close()
5417 return ret
5417 return ret
5418
5418
5419
5419
5420 @command(
5420 @command(
5421 b'push',
5421 b'push',
5422 [
5422 [
5423 (b'f', b'force', None, _(b'force push')),
5423 (b'f', b'force', None, _(b'force push')),
5424 (
5424 (
5425 b'r',
5425 b'r',
5426 b'rev',
5426 b'rev',
5427 [],
5427 [],
5428 _(b'a changeset intended to be included in the destination'),
5428 _(b'a changeset intended to be included in the destination'),
5429 _(b'REV'),
5429 _(b'REV'),
5430 ),
5430 ),
5431 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5431 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5432 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5432 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5433 (
5433 (
5434 b'b',
5434 b'b',
5435 b'branch',
5435 b'branch',
5436 [],
5436 [],
5437 _(b'a specific branch you would like to push'),
5437 _(b'a specific branch you would like to push'),
5438 _(b'BRANCH'),
5438 _(b'BRANCH'),
5439 ),
5439 ),
5440 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5440 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5441 (
5441 (
5442 b'',
5442 b'',
5443 b'pushvars',
5443 b'pushvars',
5444 [],
5444 [],
5445 _(b'variables that can be sent to server (ADVANCED)'),
5445 _(b'variables that can be sent to server (ADVANCED)'),
5446 ),
5446 ),
5447 (
5447 (
5448 b'',
5448 b'',
5449 b'publish',
5449 b'publish',
5450 False,
5450 False,
5451 _(b'push the changeset as public (EXPERIMENTAL)'),
5451 _(b'push the changeset as public (EXPERIMENTAL)'),
5452 ),
5452 ),
5453 ]
5453 ]
5454 + remoteopts,
5454 + remoteopts,
5455 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5455 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5456 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5456 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5457 helpbasic=True,
5457 helpbasic=True,
5458 )
5458 )
5459 def push(ui, repo, dest=None, **opts):
5459 def push(ui, repo, dest=None, **opts):
5460 """push changes to the specified destination
5460 """push changes to the specified destination
5461
5461
5462 Push changesets from the local repository to the specified
5462 Push changesets from the local repository to the specified
5463 destination.
5463 destination.
5464
5464
5465 This operation is symmetrical to pull: it is identical to a pull
5465 This operation is symmetrical to pull: it is identical to a pull
5466 in the destination repository from the current one.
5466 in the destination repository from the current one.
5467
5467
5468 By default, push will not allow creation of new heads at the
5468 By default, push will not allow creation of new heads at the
5469 destination, since multiple heads would make it unclear which head
5469 destination, since multiple heads would make it unclear which head
5470 to use. In this situation, it is recommended to pull and merge
5470 to use. In this situation, it is recommended to pull and merge
5471 before pushing.
5471 before pushing.
5472
5472
5473 Use --new-branch if you want to allow push to create a new named
5473 Use --new-branch if you want to allow push to create a new named
5474 branch that is not present at the destination. This allows you to
5474 branch that is not present at the destination. This allows you to
5475 only create a new branch without forcing other changes.
5475 only create a new branch without forcing other changes.
5476
5476
5477 .. note::
5477 .. note::
5478
5478
5479 Extra care should be taken with the -f/--force option,
5479 Extra care should be taken with the -f/--force option,
5480 which will push all new heads on all branches, an action which will
5480 which will push all new heads on all branches, an action which will
5481 almost always cause confusion for collaborators.
5481 almost always cause confusion for collaborators.
5482
5482
5483 If -r/--rev is used, the specified revision and all its ancestors
5483 If -r/--rev is used, the specified revision and all its ancestors
5484 will be pushed to the remote repository.
5484 will be pushed to the remote repository.
5485
5485
5486 If -B/--bookmark is used, the specified bookmarked revision, its
5486 If -B/--bookmark is used, the specified bookmarked revision, its
5487 ancestors, and the bookmark will be pushed to the remote
5487 ancestors, and the bookmark will be pushed to the remote
5488 repository. Specifying ``.`` is equivalent to specifying the active
5488 repository. Specifying ``.`` is equivalent to specifying the active
5489 bookmark's name. Use the --all-bookmarks option for pushing all
5489 bookmark's name. Use the --all-bookmarks option for pushing all
5490 current bookmarks.
5490 current bookmarks.
5491
5491
5492 Please see :hg:`help urls` for important details about ``ssh://``
5492 Please see :hg:`help urls` for important details about ``ssh://``
5493 URLs. If DESTINATION is omitted, a default path will be used.
5493 URLs. If DESTINATION is omitted, a default path will be used.
5494
5494
5495 .. container:: verbose
5495 .. container:: verbose
5496
5496
5497 The --pushvars option sends strings to the server that become
5497 The --pushvars option sends strings to the server that become
5498 environment variables prepended with ``HG_USERVAR_``. For example,
5498 environment variables prepended with ``HG_USERVAR_``. For example,
5499 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5499 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5500 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5500 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5501
5501
5502 pushvars can provide for user-overridable hooks as well as set debug
5502 pushvars can provide for user-overridable hooks as well as set debug
5503 levels. One example is having a hook that blocks commits containing
5503 levels. One example is having a hook that blocks commits containing
5504 conflict markers, but enables the user to override the hook if the file
5504 conflict markers, but enables the user to override the hook if the file
5505 is using conflict markers for testing purposes or the file format has
5505 is using conflict markers for testing purposes or the file format has
5506 strings that look like conflict markers.
5506 strings that look like conflict markers.
5507
5507
5508 By default, servers will ignore `--pushvars`. To enable it add the
5508 By default, servers will ignore `--pushvars`. To enable it add the
5509 following to your configuration file::
5509 following to your configuration file::
5510
5510
5511 [push]
5511 [push]
5512 pushvars.server = true
5512 pushvars.server = true
5513
5513
5514 Returns 0 if push was successful, 1 if nothing to push.
5514 Returns 0 if push was successful, 1 if nothing to push.
5515 """
5515 """
5516
5516
5517 opts = pycompat.byteskwargs(opts)
5517 opts = pycompat.byteskwargs(opts)
5518
5518
5519 if opts.get(b'all_bookmarks'):
5519 if opts.get(b'all_bookmarks'):
5520 cmdutil.check_incompatible_arguments(
5520 cmdutil.check_incompatible_arguments(
5521 opts, b'all_bookmarks', [b'bookmark', b'rev'],
5521 opts, b'all_bookmarks', [b'bookmark', b'rev'],
5522 )
5522 )
5523 opts[b'bookmark'] = list(repo._bookmarks)
5523 opts[b'bookmark'] = list(repo._bookmarks)
5524
5524
5525 if opts.get(b'bookmark'):
5525 if opts.get(b'bookmark'):
5526 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5526 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5527 for b in opts[b'bookmark']:
5527 for b in opts[b'bookmark']:
5528 # translate -B options to -r so changesets get pushed
5528 # translate -B options to -r so changesets get pushed
5529 b = repo._bookmarks.expandname(b)
5529 b = repo._bookmarks.expandname(b)
5530 if b in repo._bookmarks:
5530 if b in repo._bookmarks:
5531 opts.setdefault(b'rev', []).append(b)
5531 opts.setdefault(b'rev', []).append(b)
5532 else:
5532 else:
5533 # if we try to push a deleted bookmark, translate it to null
5533 # if we try to push a deleted bookmark, translate it to null
5534 # this lets simultaneous -r, -b options continue working
5534 # this lets simultaneous -r, -b options continue working
5535 opts.setdefault(b'rev', []).append(b"null")
5535 opts.setdefault(b'rev', []).append(b"null")
5536
5536
5537 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5537 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5538 if not path:
5538 if not path:
5539 raise error.ConfigError(
5539 raise error.ConfigError(
5540 _(b'default repository not configured!'),
5540 _(b'default repository not configured!'),
5541 hint=_(b"see 'hg help config.paths'"),
5541 hint=_(b"see 'hg help config.paths'"),
5542 )
5542 )
5543 dest = path.pushloc or path.loc
5543 dest = path.pushloc or path.loc
5544 branches = (path.branch, opts.get(b'branch') or [])
5544 branches = (path.branch, opts.get(b'branch') or [])
5545 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5545 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5546 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5546 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5547 other = hg.peer(repo, opts, dest)
5547 other = hg.peer(repo, opts, dest)
5548
5548
5549 if revs:
5549 if revs:
5550 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5550 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5551 if not revs:
5551 if not revs:
5552 raise error.InputError(
5552 raise error.InputError(
5553 _(b"specified revisions evaluate to an empty set"),
5553 _(b"specified revisions evaluate to an empty set"),
5554 hint=_(b"use different revision arguments"),
5554 hint=_(b"use different revision arguments"),
5555 )
5555 )
5556 elif path.pushrev:
5556 elif path.pushrev:
5557 # It doesn't make any sense to specify ancestor revisions. So limit
5557 # It doesn't make any sense to specify ancestor revisions. So limit
5558 # to DAG heads to make discovery simpler.
5558 # to DAG heads to make discovery simpler.
5559 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5559 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5560 revs = scmutil.revrange(repo, [expr])
5560 revs = scmutil.revrange(repo, [expr])
5561 revs = [repo[rev].node() for rev in revs]
5561 revs = [repo[rev].node() for rev in revs]
5562 if not revs:
5562 if not revs:
5563 raise error.InputError(
5563 raise error.InputError(
5564 _(b'default push revset for path evaluates to an empty set')
5564 _(b'default push revset for path evaluates to an empty set')
5565 )
5565 )
5566 elif ui.configbool(b'commands', b'push.require-revs'):
5566 elif ui.configbool(b'commands', b'push.require-revs'):
5567 raise error.InputError(
5567 raise error.InputError(
5568 _(b'no revisions specified to push'),
5568 _(b'no revisions specified to push'),
5569 hint=_(b'did you mean "hg push -r ."?'),
5569 hint=_(b'did you mean "hg push -r ."?'),
5570 )
5570 )
5571
5571
5572 repo._subtoppath = dest
5572 repo._subtoppath = dest
5573 try:
5573 try:
5574 # push subrepos depth-first for coherent ordering
5574 # push subrepos depth-first for coherent ordering
5575 c = repo[b'.']
5575 c = repo[b'.']
5576 subs = c.substate # only repos that are committed
5576 subs = c.substate # only repos that are committed
5577 for s in sorted(subs):
5577 for s in sorted(subs):
5578 result = c.sub(s).push(opts)
5578 result = c.sub(s).push(opts)
5579 if result == 0:
5579 if result == 0:
5580 return not result
5580 return not result
5581 finally:
5581 finally:
5582 del repo._subtoppath
5582 del repo._subtoppath
5583
5583
5584 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5584 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5585 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5585 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5586
5586
5587 pushop = exchange.push(
5587 pushop = exchange.push(
5588 repo,
5588 repo,
5589 other,
5589 other,
5590 opts.get(b'force'),
5590 opts.get(b'force'),
5591 revs=revs,
5591 revs=revs,
5592 newbranch=opts.get(b'new_branch'),
5592 newbranch=opts.get(b'new_branch'),
5593 bookmarks=opts.get(b'bookmark', ()),
5593 bookmarks=opts.get(b'bookmark', ()),
5594 publish=opts.get(b'publish'),
5594 publish=opts.get(b'publish'),
5595 opargs=opargs,
5595 opargs=opargs,
5596 )
5596 )
5597
5597
5598 result = not pushop.cgresult
5598 result = not pushop.cgresult
5599
5599
5600 if pushop.bkresult is not None:
5600 if pushop.bkresult is not None:
5601 if pushop.bkresult == 2:
5601 if pushop.bkresult == 2:
5602 result = 2
5602 result = 2
5603 elif not result and pushop.bkresult:
5603 elif not result and pushop.bkresult:
5604 result = 2
5604 result = 2
5605
5605
5606 return result
5606 return result
5607
5607
5608
5608
5609 @command(
5609 @command(
5610 b'recover',
5610 b'recover',
5611 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5611 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5612 helpcategory=command.CATEGORY_MAINTENANCE,
5612 helpcategory=command.CATEGORY_MAINTENANCE,
5613 )
5613 )
5614 def recover(ui, repo, **opts):
5614 def recover(ui, repo, **opts):
5615 """roll back an interrupted transaction
5615 """roll back an interrupted transaction
5616
5616
5617 Recover from an interrupted commit or pull.
5617 Recover from an interrupted commit or pull.
5618
5618
5619 This command tries to fix the repository status after an
5619 This command tries to fix the repository status after an
5620 interrupted operation. It should only be necessary when Mercurial
5620 interrupted operation. It should only be necessary when Mercurial
5621 suggests it.
5621 suggests it.
5622
5622
5623 Returns 0 if successful, 1 if nothing to recover or verify fails.
5623 Returns 0 if successful, 1 if nothing to recover or verify fails.
5624 """
5624 """
5625 ret = repo.recover()
5625 ret = repo.recover()
5626 if ret:
5626 if ret:
5627 if opts['verify']:
5627 if opts['verify']:
5628 return hg.verify(repo)
5628 return hg.verify(repo)
5629 else:
5629 else:
5630 msg = _(
5630 msg = _(
5631 b"(verify step skipped, run `hg verify` to check your "
5631 b"(verify step skipped, run `hg verify` to check your "
5632 b"repository content)\n"
5632 b"repository content)\n"
5633 )
5633 )
5634 ui.warn(msg)
5634 ui.warn(msg)
5635 return 0
5635 return 0
5636 return 1
5636 return 1
5637
5637
5638
5638
5639 @command(
5639 @command(
5640 b'remove|rm',
5640 b'remove|rm',
5641 [
5641 [
5642 (b'A', b'after', None, _(b'record delete for missing files')),
5642 (b'A', b'after', None, _(b'record delete for missing files')),
5643 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5643 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5644 ]
5644 ]
5645 + subrepoopts
5645 + subrepoopts
5646 + walkopts
5646 + walkopts
5647 + dryrunopts,
5647 + dryrunopts,
5648 _(b'[OPTION]... FILE...'),
5648 _(b'[OPTION]... FILE...'),
5649 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5649 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5650 helpbasic=True,
5650 helpbasic=True,
5651 inferrepo=True,
5651 inferrepo=True,
5652 )
5652 )
5653 def remove(ui, repo, *pats, **opts):
5653 def remove(ui, repo, *pats, **opts):
5654 """remove the specified files on the next commit
5654 """remove the specified files on the next commit
5655
5655
5656 Schedule the indicated files for removal from the current branch.
5656 Schedule the indicated files for removal from the current branch.
5657
5657
5658 This command schedules the files to be removed at the next commit.
5658 This command schedules the files to be removed at the next commit.
5659 To undo a remove before that, see :hg:`revert`. To undo added
5659 To undo a remove before that, see :hg:`revert`. To undo added
5660 files, see :hg:`forget`.
5660 files, see :hg:`forget`.
5661
5661
5662 .. container:: verbose
5662 .. container:: verbose
5663
5663
5664 -A/--after can be used to remove only files that have already
5664 -A/--after can be used to remove only files that have already
5665 been deleted, -f/--force can be used to force deletion, and -Af
5665 been deleted, -f/--force can be used to force deletion, and -Af
5666 can be used to remove files from the next revision without
5666 can be used to remove files from the next revision without
5667 deleting them from the working directory.
5667 deleting them from the working directory.
5668
5668
5669 The following table details the behavior of remove for different
5669 The following table details the behavior of remove for different
5670 file states (columns) and option combinations (rows). The file
5670 file states (columns) and option combinations (rows). The file
5671 states are Added [A], Clean [C], Modified [M] and Missing [!]
5671 states are Added [A], Clean [C], Modified [M] and Missing [!]
5672 (as reported by :hg:`status`). The actions are Warn, Remove
5672 (as reported by :hg:`status`). The actions are Warn, Remove
5673 (from branch) and Delete (from disk):
5673 (from branch) and Delete (from disk):
5674
5674
5675 ========= == == == ==
5675 ========= == == == ==
5676 opt/state A C M !
5676 opt/state A C M !
5677 ========= == == == ==
5677 ========= == == == ==
5678 none W RD W R
5678 none W RD W R
5679 -f R RD RD R
5679 -f R RD RD R
5680 -A W W W R
5680 -A W W W R
5681 -Af R R R R
5681 -Af R R R R
5682 ========= == == == ==
5682 ========= == == == ==
5683
5683
5684 .. note::
5684 .. note::
5685
5685
5686 :hg:`remove` never deletes files in Added [A] state from the
5686 :hg:`remove` never deletes files in Added [A] state from the
5687 working directory, not even if ``--force`` is specified.
5687 working directory, not even if ``--force`` is specified.
5688
5688
5689 Returns 0 on success, 1 if any warnings encountered.
5689 Returns 0 on success, 1 if any warnings encountered.
5690 """
5690 """
5691
5691
5692 opts = pycompat.byteskwargs(opts)
5692 opts = pycompat.byteskwargs(opts)
5693 after, force = opts.get(b'after'), opts.get(b'force')
5693 after, force = opts.get(b'after'), opts.get(b'force')
5694 dryrun = opts.get(b'dry_run')
5694 dryrun = opts.get(b'dry_run')
5695 if not pats and not after:
5695 if not pats and not after:
5696 raise error.InputError(_(b'no files specified'))
5696 raise error.InputError(_(b'no files specified'))
5697
5697
5698 m = scmutil.match(repo[None], pats, opts)
5698 m = scmutil.match(repo[None], pats, opts)
5699 subrepos = opts.get(b'subrepos')
5699 subrepos = opts.get(b'subrepos')
5700 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5700 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5701 return cmdutil.remove(
5701 return cmdutil.remove(
5702 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5702 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5703 )
5703 )
5704
5704
5705
5705
5706 @command(
5706 @command(
5707 b'rename|move|mv',
5707 b'rename|move|mv',
5708 [
5708 [
5709 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5709 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5710 (
5710 (
5711 b'',
5711 b'',
5712 b'at-rev',
5712 b'at-rev',
5713 b'',
5713 b'',
5714 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5714 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5715 _(b'REV'),
5715 _(b'REV'),
5716 ),
5716 ),
5717 (
5717 (
5718 b'f',
5718 b'f',
5719 b'force',
5719 b'force',
5720 None,
5720 None,
5721 _(b'forcibly move over an existing managed file'),
5721 _(b'forcibly move over an existing managed file'),
5722 ),
5722 ),
5723 ]
5723 ]
5724 + walkopts
5724 + walkopts
5725 + dryrunopts,
5725 + dryrunopts,
5726 _(b'[OPTION]... SOURCE... DEST'),
5726 _(b'[OPTION]... SOURCE... DEST'),
5727 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5727 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5728 )
5728 )
5729 def rename(ui, repo, *pats, **opts):
5729 def rename(ui, repo, *pats, **opts):
5730 """rename files; equivalent of copy + remove
5730 """rename files; equivalent of copy + remove
5731
5731
5732 Mark dest as copies of sources; mark sources for deletion. If dest
5732 Mark dest as copies of sources; mark sources for deletion. If dest
5733 is a directory, copies are put in that directory. If dest is a
5733 is a directory, copies are put in that directory. If dest is a
5734 file, there can only be one source.
5734 file, there can only be one source.
5735
5735
5736 By default, this command copies the contents of files as they
5736 By default, this command copies the contents of files as they
5737 exist in the working directory. If invoked with -A/--after, the
5737 exist in the working directory. If invoked with -A/--after, the
5738 operation is recorded, but no copying is performed.
5738 operation is recorded, but no copying is performed.
5739
5739
5740 This command takes effect at the next commit. To undo a rename
5740 This command takes effect at the next commit. To undo a rename
5741 before that, see :hg:`revert`.
5741 before that, see :hg:`revert`.
5742
5742
5743 Returns 0 on success, 1 if errors are encountered.
5743 Returns 0 on success, 1 if errors are encountered.
5744 """
5744 """
5745 opts = pycompat.byteskwargs(opts)
5745 opts = pycompat.byteskwargs(opts)
5746 with repo.wlock():
5746 with repo.wlock():
5747 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5747 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5748
5748
5749
5749
5750 @command(
5750 @command(
5751 b'resolve',
5751 b'resolve',
5752 [
5752 [
5753 (b'a', b'all', None, _(b'select all unresolved files')),
5753 (b'a', b'all', None, _(b'select all unresolved files')),
5754 (b'l', b'list', None, _(b'list state of files needing merge')),
5754 (b'l', b'list', None, _(b'list state of files needing merge')),
5755 (b'm', b'mark', None, _(b'mark files as resolved')),
5755 (b'm', b'mark', None, _(b'mark files as resolved')),
5756 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5756 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5757 (b'n', b'no-status', None, _(b'hide status prefix')),
5757 (b'n', b'no-status', None, _(b'hide status prefix')),
5758 (b'', b're-merge', None, _(b're-merge files')),
5758 (b'', b're-merge', None, _(b're-merge files')),
5759 ]
5759 ]
5760 + mergetoolopts
5760 + mergetoolopts
5761 + walkopts
5761 + walkopts
5762 + formatteropts,
5762 + formatteropts,
5763 _(b'[OPTION]... [FILE]...'),
5763 _(b'[OPTION]... [FILE]...'),
5764 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5764 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5765 inferrepo=True,
5765 inferrepo=True,
5766 )
5766 )
5767 def resolve(ui, repo, *pats, **opts):
5767 def resolve(ui, repo, *pats, **opts):
5768 """redo merges or set/view the merge status of files
5768 """redo merges or set/view the merge status of files
5769
5769
5770 Merges with unresolved conflicts are often the result of
5770 Merges with unresolved conflicts are often the result of
5771 non-interactive merging using the ``internal:merge`` configuration
5771 non-interactive merging using the ``internal:merge`` configuration
5772 setting, or a command-line merge tool like ``diff3``. The resolve
5772 setting, or a command-line merge tool like ``diff3``. The resolve
5773 command is used to manage the files involved in a merge, after
5773 command is used to manage the files involved in a merge, after
5774 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5774 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5775 working directory must have two parents). See :hg:`help
5775 working directory must have two parents). See :hg:`help
5776 merge-tools` for information on configuring merge tools.
5776 merge-tools` for information on configuring merge tools.
5777
5777
5778 The resolve command can be used in the following ways:
5778 The resolve command can be used in the following ways:
5779
5779
5780 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5780 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5781 the specified files, discarding any previous merge attempts. Re-merging
5781 the specified files, discarding any previous merge attempts. Re-merging
5782 is not performed for files already marked as resolved. Use ``--all/-a``
5782 is not performed for files already marked as resolved. Use ``--all/-a``
5783 to select all unresolved files. ``--tool`` can be used to specify
5783 to select all unresolved files. ``--tool`` can be used to specify
5784 the merge tool used for the given files. It overrides the HGMERGE
5784 the merge tool used for the given files. It overrides the HGMERGE
5785 environment variable and your configuration files. Previous file
5785 environment variable and your configuration files. Previous file
5786 contents are saved with a ``.orig`` suffix.
5786 contents are saved with a ``.orig`` suffix.
5787
5787
5788 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5788 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5789 (e.g. after having manually fixed-up the files). The default is
5789 (e.g. after having manually fixed-up the files). The default is
5790 to mark all unresolved files.
5790 to mark all unresolved files.
5791
5791
5792 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5792 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5793 default is to mark all resolved files.
5793 default is to mark all resolved files.
5794
5794
5795 - :hg:`resolve -l`: list files which had or still have conflicts.
5795 - :hg:`resolve -l`: list files which had or still have conflicts.
5796 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5796 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5797 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5797 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5798 the list. See :hg:`help filesets` for details.
5798 the list. See :hg:`help filesets` for details.
5799
5799
5800 .. note::
5800 .. note::
5801
5801
5802 Mercurial will not let you commit files with unresolved merge
5802 Mercurial will not let you commit files with unresolved merge
5803 conflicts. You must use :hg:`resolve -m ...` before you can
5803 conflicts. You must use :hg:`resolve -m ...` before you can
5804 commit after a conflicting merge.
5804 commit after a conflicting merge.
5805
5805
5806 .. container:: verbose
5806 .. container:: verbose
5807
5807
5808 Template:
5808 Template:
5809
5809
5810 The following keywords are supported in addition to the common template
5810 The following keywords are supported in addition to the common template
5811 keywords and functions. See also :hg:`help templates`.
5811 keywords and functions. See also :hg:`help templates`.
5812
5812
5813 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5813 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5814 :path: String. Repository-absolute path of the file.
5814 :path: String. Repository-absolute path of the file.
5815
5815
5816 Returns 0 on success, 1 if any files fail a resolve attempt.
5816 Returns 0 on success, 1 if any files fail a resolve attempt.
5817 """
5817 """
5818
5818
5819 opts = pycompat.byteskwargs(opts)
5819 opts = pycompat.byteskwargs(opts)
5820 confirm = ui.configbool(b'commands', b'resolve.confirm')
5820 confirm = ui.configbool(b'commands', b'resolve.confirm')
5821 flaglist = b'all mark unmark list no_status re_merge'.split()
5821 flaglist = b'all mark unmark list no_status re_merge'.split()
5822 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5822 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5823
5823
5824 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5824 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5825 if actioncount > 1:
5825 if actioncount > 1:
5826 raise error.InputError(_(b"too many actions specified"))
5826 raise error.InputError(_(b"too many actions specified"))
5827 elif actioncount == 0 and ui.configbool(
5827 elif actioncount == 0 and ui.configbool(
5828 b'commands', b'resolve.explicit-re-merge'
5828 b'commands', b'resolve.explicit-re-merge'
5829 ):
5829 ):
5830 hint = _(b'use --mark, --unmark, --list or --re-merge')
5830 hint = _(b'use --mark, --unmark, --list or --re-merge')
5831 raise error.InputError(_(b'no action specified'), hint=hint)
5831 raise error.InputError(_(b'no action specified'), hint=hint)
5832 if pats and all:
5832 if pats and all:
5833 raise error.InputError(_(b"can't specify --all and patterns"))
5833 raise error.InputError(_(b"can't specify --all and patterns"))
5834 if not (all or pats or show or mark or unmark):
5834 if not (all or pats or show or mark or unmark):
5835 raise error.InputError(
5835 raise error.InputError(
5836 _(b'no files or directories specified'),
5836 _(b'no files or directories specified'),
5837 hint=b'use --all to re-merge all unresolved files',
5837 hint=b'use --all to re-merge all unresolved files',
5838 )
5838 )
5839
5839
5840 if confirm:
5840 if confirm:
5841 if all:
5841 if all:
5842 if ui.promptchoice(
5842 if ui.promptchoice(
5843 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5843 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5844 ):
5844 ):
5845 raise error.CanceledError(_(b'user quit'))
5845 raise error.CanceledError(_(b'user quit'))
5846 if mark and not pats:
5846 if mark and not pats:
5847 if ui.promptchoice(
5847 if ui.promptchoice(
5848 _(
5848 _(
5849 b'mark all unresolved files as resolved (yn)?'
5849 b'mark all unresolved files as resolved (yn)?'
5850 b'$$ &Yes $$ &No'
5850 b'$$ &Yes $$ &No'
5851 )
5851 )
5852 ):
5852 ):
5853 raise error.CanceledError(_(b'user quit'))
5853 raise error.CanceledError(_(b'user quit'))
5854 if unmark and not pats:
5854 if unmark and not pats:
5855 if ui.promptchoice(
5855 if ui.promptchoice(
5856 _(
5856 _(
5857 b'mark all resolved files as unresolved (yn)?'
5857 b'mark all resolved files as unresolved (yn)?'
5858 b'$$ &Yes $$ &No'
5858 b'$$ &Yes $$ &No'
5859 )
5859 )
5860 ):
5860 ):
5861 raise error.CanceledError(_(b'user quit'))
5861 raise error.CanceledError(_(b'user quit'))
5862
5862
5863 uipathfn = scmutil.getuipathfn(repo)
5863 uipathfn = scmutil.getuipathfn(repo)
5864
5864
5865 if show:
5865 if show:
5866 ui.pager(b'resolve')
5866 ui.pager(b'resolve')
5867 fm = ui.formatter(b'resolve', opts)
5867 fm = ui.formatter(b'resolve', opts)
5868 ms = mergestatemod.mergestate.read(repo)
5868 ms = mergestatemod.mergestate.read(repo)
5869 wctx = repo[None]
5869 wctx = repo[None]
5870 m = scmutil.match(wctx, pats, opts)
5870 m = scmutil.match(wctx, pats, opts)
5871
5871
5872 # Labels and keys based on merge state. Unresolved path conflicts show
5872 # Labels and keys based on merge state. Unresolved path conflicts show
5873 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5873 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5874 # resolved conflicts.
5874 # resolved conflicts.
5875 mergestateinfo = {
5875 mergestateinfo = {
5876 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5876 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5877 b'resolve.unresolved',
5877 b'resolve.unresolved',
5878 b'U',
5878 b'U',
5879 ),
5879 ),
5880 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5880 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5881 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5881 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5882 b'resolve.unresolved',
5882 b'resolve.unresolved',
5883 b'P',
5883 b'P',
5884 ),
5884 ),
5885 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5885 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5886 b'resolve.resolved',
5886 b'resolve.resolved',
5887 b'R',
5887 b'R',
5888 ),
5888 ),
5889 }
5889 }
5890
5890
5891 for f in ms:
5891 for f in ms:
5892 if not m(f):
5892 if not m(f):
5893 continue
5893 continue
5894
5894
5895 label, key = mergestateinfo[ms[f]]
5895 label, key = mergestateinfo[ms[f]]
5896 fm.startitem()
5896 fm.startitem()
5897 fm.context(ctx=wctx)
5897 fm.context(ctx=wctx)
5898 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5898 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5899 fm.data(path=f)
5899 fm.data(path=f)
5900 fm.plain(b'%s\n' % uipathfn(f), label=label)
5900 fm.plain(b'%s\n' % uipathfn(f), label=label)
5901 fm.end()
5901 fm.end()
5902 return 0
5902 return 0
5903
5903
5904 with repo.wlock():
5904 with repo.wlock():
5905 ms = mergestatemod.mergestate.read(repo)
5905 ms = mergestatemod.mergestate.read(repo)
5906
5906
5907 if not (ms.active() or repo.dirstate.p2() != nullid):
5907 if not (ms.active() or repo.dirstate.p2() != nullid):
5908 raise error.StateError(
5908 raise error.StateError(
5909 _(b'resolve command not applicable when not merging')
5909 _(b'resolve command not applicable when not merging')
5910 )
5910 )
5911
5911
5912 wctx = repo[None]
5912 wctx = repo[None]
5913 m = scmutil.match(wctx, pats, opts)
5913 m = scmutil.match(wctx, pats, opts)
5914 ret = 0
5914 ret = 0
5915 didwork = False
5915 didwork = False
5916
5916
5917 tocomplete = []
5917 tocomplete = []
5918 hasconflictmarkers = []
5918 hasconflictmarkers = []
5919 if mark:
5919 if mark:
5920 markcheck = ui.config(b'commands', b'resolve.mark-check')
5920 markcheck = ui.config(b'commands', b'resolve.mark-check')
5921 if markcheck not in [b'warn', b'abort']:
5921 if markcheck not in [b'warn', b'abort']:
5922 # Treat all invalid / unrecognized values as 'none'.
5922 # Treat all invalid / unrecognized values as 'none'.
5923 markcheck = False
5923 markcheck = False
5924 for f in ms:
5924 for f in ms:
5925 if not m(f):
5925 if not m(f):
5926 continue
5926 continue
5927
5927
5928 didwork = True
5928 didwork = True
5929
5929
5930 # path conflicts must be resolved manually
5930 # path conflicts must be resolved manually
5931 if ms[f] in (
5931 if ms[f] in (
5932 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5932 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5933 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5933 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5934 ):
5934 ):
5935 if mark:
5935 if mark:
5936 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5936 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5937 elif unmark:
5937 elif unmark:
5938 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5938 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5939 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5939 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5940 ui.warn(
5940 ui.warn(
5941 _(b'%s: path conflict must be resolved manually\n')
5941 _(b'%s: path conflict must be resolved manually\n')
5942 % uipathfn(f)
5942 % uipathfn(f)
5943 )
5943 )
5944 continue
5944 continue
5945
5945
5946 if mark:
5946 if mark:
5947 if markcheck:
5947 if markcheck:
5948 fdata = repo.wvfs.tryread(f)
5948 fdata = repo.wvfs.tryread(f)
5949 if (
5949 if (
5950 filemerge.hasconflictmarkers(fdata)
5950 filemerge.hasconflictmarkers(fdata)
5951 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5951 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5952 ):
5952 ):
5953 hasconflictmarkers.append(f)
5953 hasconflictmarkers.append(f)
5954 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5954 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5955 elif unmark:
5955 elif unmark:
5956 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5956 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5957 else:
5957 else:
5958 # backup pre-resolve (merge uses .orig for its own purposes)
5958 # backup pre-resolve (merge uses .orig for its own purposes)
5959 a = repo.wjoin(f)
5959 a = repo.wjoin(f)
5960 try:
5960 try:
5961 util.copyfile(a, a + b".resolve")
5961 util.copyfile(a, a + b".resolve")
5962 except (IOError, OSError) as inst:
5962 except (IOError, OSError) as inst:
5963 if inst.errno != errno.ENOENT:
5963 if inst.errno != errno.ENOENT:
5964 raise
5964 raise
5965
5965
5966 try:
5966 try:
5967 # preresolve file
5967 # preresolve file
5968 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5968 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5969 with ui.configoverride(overrides, b'resolve'):
5969 with ui.configoverride(overrides, b'resolve'):
5970 complete, r = ms.preresolve(f, wctx)
5970 complete, r = ms.preresolve(f, wctx)
5971 if not complete:
5971 if not complete:
5972 tocomplete.append(f)
5972 tocomplete.append(f)
5973 elif r:
5973 elif r:
5974 ret = 1
5974 ret = 1
5975 finally:
5975 finally:
5976 ms.commit()
5976 ms.commit()
5977
5977
5978 # replace filemerge's .orig file with our resolve file, but only
5978 # replace filemerge's .orig file with our resolve file, but only
5979 # for merges that are complete
5979 # for merges that are complete
5980 if complete:
5980 if complete:
5981 try:
5981 try:
5982 util.rename(
5982 util.rename(
5983 a + b".resolve", scmutil.backuppath(ui, repo, f)
5983 a + b".resolve", scmutil.backuppath(ui, repo, f)
5984 )
5984 )
5985 except OSError as inst:
5985 except OSError as inst:
5986 if inst.errno != errno.ENOENT:
5986 if inst.errno != errno.ENOENT:
5987 raise
5987 raise
5988
5988
5989 if hasconflictmarkers:
5989 if hasconflictmarkers:
5990 ui.warn(
5990 ui.warn(
5991 _(
5991 _(
5992 b'warning: the following files still have conflict '
5992 b'warning: the following files still have conflict '
5993 b'markers:\n'
5993 b'markers:\n'
5994 )
5994 )
5995 + b''.join(
5995 + b''.join(
5996 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
5996 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
5997 )
5997 )
5998 )
5998 )
5999 if markcheck == b'abort' and not all and not pats:
5999 if markcheck == b'abort' and not all and not pats:
6000 raise error.StateError(
6000 raise error.StateError(
6001 _(b'conflict markers detected'),
6001 _(b'conflict markers detected'),
6002 hint=_(b'use --all to mark anyway'),
6002 hint=_(b'use --all to mark anyway'),
6003 )
6003 )
6004
6004
6005 for f in tocomplete:
6005 for f in tocomplete:
6006 try:
6006 try:
6007 # resolve file
6007 # resolve file
6008 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6008 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6009 with ui.configoverride(overrides, b'resolve'):
6009 with ui.configoverride(overrides, b'resolve'):
6010 r = ms.resolve(f, wctx)
6010 r = ms.resolve(f, wctx)
6011 if r:
6011 if r:
6012 ret = 1
6012 ret = 1
6013 finally:
6013 finally:
6014 ms.commit()
6014 ms.commit()
6015
6015
6016 # replace filemerge's .orig file with our resolve file
6016 # replace filemerge's .orig file with our resolve file
6017 a = repo.wjoin(f)
6017 a = repo.wjoin(f)
6018 try:
6018 try:
6019 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6019 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6020 except OSError as inst:
6020 except OSError as inst:
6021 if inst.errno != errno.ENOENT:
6021 if inst.errno != errno.ENOENT:
6022 raise
6022 raise
6023
6023
6024 ms.commit()
6024 ms.commit()
6025 branchmerge = repo.dirstate.p2() != nullid
6025 branchmerge = repo.dirstate.p2() != nullid
6026 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6026 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6027
6027
6028 if not didwork and pats:
6028 if not didwork and pats:
6029 hint = None
6029 hint = None
6030 if not any([p for p in pats if p.find(b':') >= 0]):
6030 if not any([p for p in pats if p.find(b':') >= 0]):
6031 pats = [b'path:%s' % p for p in pats]
6031 pats = [b'path:%s' % p for p in pats]
6032 m = scmutil.match(wctx, pats, opts)
6032 m = scmutil.match(wctx, pats, opts)
6033 for f in ms:
6033 for f in ms:
6034 if not m(f):
6034 if not m(f):
6035 continue
6035 continue
6036
6036
6037 def flag(o):
6037 def flag(o):
6038 if o == b're_merge':
6038 if o == b're_merge':
6039 return b'--re-merge '
6039 return b'--re-merge '
6040 return b'-%s ' % o[0:1]
6040 return b'-%s ' % o[0:1]
6041
6041
6042 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6042 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6043 hint = _(b"(try: hg resolve %s%s)\n") % (
6043 hint = _(b"(try: hg resolve %s%s)\n") % (
6044 flags,
6044 flags,
6045 b' '.join(pats),
6045 b' '.join(pats),
6046 )
6046 )
6047 break
6047 break
6048 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6048 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6049 if hint:
6049 if hint:
6050 ui.warn(hint)
6050 ui.warn(hint)
6051
6051
6052 unresolvedf = list(ms.unresolved())
6052 unresolvedf = list(ms.unresolved())
6053 if not unresolvedf:
6053 if not unresolvedf:
6054 ui.status(_(b'(no more unresolved files)\n'))
6054 ui.status(_(b'(no more unresolved files)\n'))
6055 cmdutil.checkafterresolved(repo)
6055 cmdutil.checkafterresolved(repo)
6056
6056
6057 return ret
6057 return ret
6058
6058
6059
6059
6060 @command(
6060 @command(
6061 b'revert',
6061 b'revert',
6062 [
6062 [
6063 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6063 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6064 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6064 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6065 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6065 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6066 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6066 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6067 (b'i', b'interactive', None, _(b'interactively select the changes')),
6067 (b'i', b'interactive', None, _(b'interactively select the changes')),
6068 ]
6068 ]
6069 + walkopts
6069 + walkopts
6070 + dryrunopts,
6070 + dryrunopts,
6071 _(b'[OPTION]... [-r REV] [NAME]...'),
6071 _(b'[OPTION]... [-r REV] [NAME]...'),
6072 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6072 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6073 )
6073 )
6074 def revert(ui, repo, *pats, **opts):
6074 def revert(ui, repo, *pats, **opts):
6075 """restore files to their checkout state
6075 """restore files to their checkout state
6076
6076
6077 .. note::
6077 .. note::
6078
6078
6079 To check out earlier revisions, you should use :hg:`update REV`.
6079 To check out earlier revisions, you should use :hg:`update REV`.
6080 To cancel an uncommitted merge (and lose your changes),
6080 To cancel an uncommitted merge (and lose your changes),
6081 use :hg:`merge --abort`.
6081 use :hg:`merge --abort`.
6082
6082
6083 With no revision specified, revert the specified files or directories
6083 With no revision specified, revert the specified files or directories
6084 to the contents they had in the parent of the working directory.
6084 to the contents they had in the parent of the working directory.
6085 This restores the contents of files to an unmodified
6085 This restores the contents of files to an unmodified
6086 state and unschedules adds, removes, copies, and renames. If the
6086 state and unschedules adds, removes, copies, and renames. If the
6087 working directory has two parents, you must explicitly specify a
6087 working directory has two parents, you must explicitly specify a
6088 revision.
6088 revision.
6089
6089
6090 Using the -r/--rev or -d/--date options, revert the given files or
6090 Using the -r/--rev or -d/--date options, revert the given files or
6091 directories to their states as of a specific revision. Because
6091 directories to their states as of a specific revision. Because
6092 revert does not change the working directory parents, this will
6092 revert does not change the working directory parents, this will
6093 cause these files to appear modified. This can be helpful to "back
6093 cause these files to appear modified. This can be helpful to "back
6094 out" some or all of an earlier change. See :hg:`backout` for a
6094 out" some or all of an earlier change. See :hg:`backout` for a
6095 related method.
6095 related method.
6096
6096
6097 Modified files are saved with a .orig suffix before reverting.
6097 Modified files are saved with a .orig suffix before reverting.
6098 To disable these backups, use --no-backup. It is possible to store
6098 To disable these backups, use --no-backup. It is possible to store
6099 the backup files in a custom directory relative to the root of the
6099 the backup files in a custom directory relative to the root of the
6100 repository by setting the ``ui.origbackuppath`` configuration
6100 repository by setting the ``ui.origbackuppath`` configuration
6101 option.
6101 option.
6102
6102
6103 See :hg:`help dates` for a list of formats valid for -d/--date.
6103 See :hg:`help dates` for a list of formats valid for -d/--date.
6104
6104
6105 See :hg:`help backout` for a way to reverse the effect of an
6105 See :hg:`help backout` for a way to reverse the effect of an
6106 earlier changeset.
6106 earlier changeset.
6107
6107
6108 Returns 0 on success.
6108 Returns 0 on success.
6109 """
6109 """
6110
6110
6111 opts = pycompat.byteskwargs(opts)
6111 opts = pycompat.byteskwargs(opts)
6112 if opts.get(b"date"):
6112 if opts.get(b"date"):
6113 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6113 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6114 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6114 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6115
6115
6116 parent, p2 = repo.dirstate.parents()
6116 parent, p2 = repo.dirstate.parents()
6117 if not opts.get(b'rev') and p2 != nullid:
6117 if not opts.get(b'rev') and p2 != nullid:
6118 # revert after merge is a trap for new users (issue2915)
6118 # revert after merge is a trap for new users (issue2915)
6119 raise error.InputError(
6119 raise error.InputError(
6120 _(b'uncommitted merge with no revision specified'),
6120 _(b'uncommitted merge with no revision specified'),
6121 hint=_(b"use 'hg update' or see 'hg help revert'"),
6121 hint=_(b"use 'hg update' or see 'hg help revert'"),
6122 )
6122 )
6123
6123
6124 rev = opts.get(b'rev')
6124 rev = opts.get(b'rev')
6125 if rev:
6125 if rev:
6126 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6126 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6127 ctx = scmutil.revsingle(repo, rev)
6127 ctx = scmutil.revsingle(repo, rev)
6128
6128
6129 if not (
6129 if not (
6130 pats
6130 pats
6131 or opts.get(b'include')
6131 or opts.get(b'include')
6132 or opts.get(b'exclude')
6132 or opts.get(b'exclude')
6133 or opts.get(b'all')
6133 or opts.get(b'all')
6134 or opts.get(b'interactive')
6134 or opts.get(b'interactive')
6135 ):
6135 ):
6136 msg = _(b"no files or directories specified")
6136 msg = _(b"no files or directories specified")
6137 if p2 != nullid:
6137 if p2 != nullid:
6138 hint = _(
6138 hint = _(
6139 b"uncommitted merge, use --all to discard all changes,"
6139 b"uncommitted merge, use --all to discard all changes,"
6140 b" or 'hg update -C .' to abort the merge"
6140 b" or 'hg update -C .' to abort the merge"
6141 )
6141 )
6142 raise error.InputError(msg, hint=hint)
6142 raise error.InputError(msg, hint=hint)
6143 dirty = any(repo.status())
6143 dirty = any(repo.status())
6144 node = ctx.node()
6144 node = ctx.node()
6145 if node != parent:
6145 if node != parent:
6146 if dirty:
6146 if dirty:
6147 hint = (
6147 hint = (
6148 _(
6148 _(
6149 b"uncommitted changes, use --all to discard all"
6149 b"uncommitted changes, use --all to discard all"
6150 b" changes, or 'hg update %d' to update"
6150 b" changes, or 'hg update %d' to update"
6151 )
6151 )
6152 % ctx.rev()
6152 % ctx.rev()
6153 )
6153 )
6154 else:
6154 else:
6155 hint = (
6155 hint = (
6156 _(
6156 _(
6157 b"use --all to revert all files,"
6157 b"use --all to revert all files,"
6158 b" or 'hg update %d' to update"
6158 b" or 'hg update %d' to update"
6159 )
6159 )
6160 % ctx.rev()
6160 % ctx.rev()
6161 )
6161 )
6162 elif dirty:
6162 elif dirty:
6163 hint = _(b"uncommitted changes, use --all to discard all changes")
6163 hint = _(b"uncommitted changes, use --all to discard all changes")
6164 else:
6164 else:
6165 hint = _(b"use --all to revert all files")
6165 hint = _(b"use --all to revert all files")
6166 raise error.InputError(msg, hint=hint)
6166 raise error.InputError(msg, hint=hint)
6167
6167
6168 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6168 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6169
6169
6170
6170
6171 @command(
6171 @command(
6172 b'rollback',
6172 b'rollback',
6173 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6173 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6174 helpcategory=command.CATEGORY_MAINTENANCE,
6174 helpcategory=command.CATEGORY_MAINTENANCE,
6175 )
6175 )
6176 def rollback(ui, repo, **opts):
6176 def rollback(ui, repo, **opts):
6177 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6177 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6178
6178
6179 Please use :hg:`commit --amend` instead of rollback to correct
6179 Please use :hg:`commit --amend` instead of rollback to correct
6180 mistakes in the last commit.
6180 mistakes in the last commit.
6181
6181
6182 This command should be used with care. There is only one level of
6182 This command should be used with care. There is only one level of
6183 rollback, and there is no way to undo a rollback. It will also
6183 rollback, and there is no way to undo a rollback. It will also
6184 restore the dirstate at the time of the last transaction, losing
6184 restore the dirstate at the time of the last transaction, losing
6185 any dirstate changes since that time. This command does not alter
6185 any dirstate changes since that time. This command does not alter
6186 the working directory.
6186 the working directory.
6187
6187
6188 Transactions are used to encapsulate the effects of all commands
6188 Transactions are used to encapsulate the effects of all commands
6189 that create new changesets or propagate existing changesets into a
6189 that create new changesets or propagate existing changesets into a
6190 repository.
6190 repository.
6191
6191
6192 .. container:: verbose
6192 .. container:: verbose
6193
6193
6194 For example, the following commands are transactional, and their
6194 For example, the following commands are transactional, and their
6195 effects can be rolled back:
6195 effects can be rolled back:
6196
6196
6197 - commit
6197 - commit
6198 - import
6198 - import
6199 - pull
6199 - pull
6200 - push (with this repository as the destination)
6200 - push (with this repository as the destination)
6201 - unbundle
6201 - unbundle
6202
6202
6203 To avoid permanent data loss, rollback will refuse to rollback a
6203 To avoid permanent data loss, rollback will refuse to rollback a
6204 commit transaction if it isn't checked out. Use --force to
6204 commit transaction if it isn't checked out. Use --force to
6205 override this protection.
6205 override this protection.
6206
6206
6207 The rollback command can be entirely disabled by setting the
6207 The rollback command can be entirely disabled by setting the
6208 ``ui.rollback`` configuration setting to false. If you're here
6208 ``ui.rollback`` configuration setting to false. If you're here
6209 because you want to use rollback and it's disabled, you can
6209 because you want to use rollback and it's disabled, you can
6210 re-enable the command by setting ``ui.rollback`` to true.
6210 re-enable the command by setting ``ui.rollback`` to true.
6211
6211
6212 This command is not intended for use on public repositories. Once
6212 This command is not intended for use on public repositories. Once
6213 changes are visible for pull by other users, rolling a transaction
6213 changes are visible for pull by other users, rolling a transaction
6214 back locally is ineffective (someone else may already have pulled
6214 back locally is ineffective (someone else may already have pulled
6215 the changes). Furthermore, a race is possible with readers of the
6215 the changes). Furthermore, a race is possible with readers of the
6216 repository; for example an in-progress pull from the repository
6216 repository; for example an in-progress pull from the repository
6217 may fail if a rollback is performed.
6217 may fail if a rollback is performed.
6218
6218
6219 Returns 0 on success, 1 if no rollback data is available.
6219 Returns 0 on success, 1 if no rollback data is available.
6220 """
6220 """
6221 if not ui.configbool(b'ui', b'rollback'):
6221 if not ui.configbool(b'ui', b'rollback'):
6222 raise error.Abort(
6222 raise error.Abort(
6223 _(b'rollback is disabled because it is unsafe'),
6223 _(b'rollback is disabled because it is unsafe'),
6224 hint=b'see `hg help -v rollback` for information',
6224 hint=b'see `hg help -v rollback` for information',
6225 )
6225 )
6226 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6226 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6227
6227
6228
6228
6229 @command(
6229 @command(
6230 b'root',
6230 b'root',
6231 [] + formatteropts,
6231 [] + formatteropts,
6232 intents={INTENT_READONLY},
6232 intents={INTENT_READONLY},
6233 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6233 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6234 )
6234 )
6235 def root(ui, repo, **opts):
6235 def root(ui, repo, **opts):
6236 """print the root (top) of the current working directory
6236 """print the root (top) of the current working directory
6237
6237
6238 Print the root directory of the current repository.
6238 Print the root directory of the current repository.
6239
6239
6240 .. container:: verbose
6240 .. container:: verbose
6241
6241
6242 Template:
6242 Template:
6243
6243
6244 The following keywords are supported in addition to the common template
6244 The following keywords are supported in addition to the common template
6245 keywords and functions. See also :hg:`help templates`.
6245 keywords and functions. See also :hg:`help templates`.
6246
6246
6247 :hgpath: String. Path to the .hg directory.
6247 :hgpath: String. Path to the .hg directory.
6248 :storepath: String. Path to the directory holding versioned data.
6248 :storepath: String. Path to the directory holding versioned data.
6249
6249
6250 Returns 0 on success.
6250 Returns 0 on success.
6251 """
6251 """
6252 opts = pycompat.byteskwargs(opts)
6252 opts = pycompat.byteskwargs(opts)
6253 with ui.formatter(b'root', opts) as fm:
6253 with ui.formatter(b'root', opts) as fm:
6254 fm.startitem()
6254 fm.startitem()
6255 fm.write(b'reporoot', b'%s\n', repo.root)
6255 fm.write(b'reporoot', b'%s\n', repo.root)
6256 fm.data(hgpath=repo.path, storepath=repo.spath)
6256 fm.data(hgpath=repo.path, storepath=repo.spath)
6257
6257
6258
6258
6259 @command(
6259 @command(
6260 b'serve',
6260 b'serve',
6261 [
6261 [
6262 (
6262 (
6263 b'A',
6263 b'A',
6264 b'accesslog',
6264 b'accesslog',
6265 b'',
6265 b'',
6266 _(b'name of access log file to write to'),
6266 _(b'name of access log file to write to'),
6267 _(b'FILE'),
6267 _(b'FILE'),
6268 ),
6268 ),
6269 (b'd', b'daemon', None, _(b'run server in background')),
6269 (b'd', b'daemon', None, _(b'run server in background')),
6270 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6270 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6271 (
6271 (
6272 b'E',
6272 b'E',
6273 b'errorlog',
6273 b'errorlog',
6274 b'',
6274 b'',
6275 _(b'name of error log file to write to'),
6275 _(b'name of error log file to write to'),
6276 _(b'FILE'),
6276 _(b'FILE'),
6277 ),
6277 ),
6278 # use string type, then we can check if something was passed
6278 # use string type, then we can check if something was passed
6279 (
6279 (
6280 b'p',
6280 b'p',
6281 b'port',
6281 b'port',
6282 b'',
6282 b'',
6283 _(b'port to listen on (default: 8000)'),
6283 _(b'port to listen on (default: 8000)'),
6284 _(b'PORT'),
6284 _(b'PORT'),
6285 ),
6285 ),
6286 (
6286 (
6287 b'a',
6287 b'a',
6288 b'address',
6288 b'address',
6289 b'',
6289 b'',
6290 _(b'address to listen on (default: all interfaces)'),
6290 _(b'address to listen on (default: all interfaces)'),
6291 _(b'ADDR'),
6291 _(b'ADDR'),
6292 ),
6292 ),
6293 (
6293 (
6294 b'',
6294 b'',
6295 b'prefix',
6295 b'prefix',
6296 b'',
6296 b'',
6297 _(b'prefix path to serve from (default: server root)'),
6297 _(b'prefix path to serve from (default: server root)'),
6298 _(b'PREFIX'),
6298 _(b'PREFIX'),
6299 ),
6299 ),
6300 (
6300 (
6301 b'n',
6301 b'n',
6302 b'name',
6302 b'name',
6303 b'',
6303 b'',
6304 _(b'name to show in web pages (default: working directory)'),
6304 _(b'name to show in web pages (default: working directory)'),
6305 _(b'NAME'),
6305 _(b'NAME'),
6306 ),
6306 ),
6307 (
6307 (
6308 b'',
6308 b'',
6309 b'web-conf',
6309 b'web-conf',
6310 b'',
6310 b'',
6311 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6311 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6312 _(b'FILE'),
6312 _(b'FILE'),
6313 ),
6313 ),
6314 (
6314 (
6315 b'',
6315 b'',
6316 b'webdir-conf',
6316 b'webdir-conf',
6317 b'',
6317 b'',
6318 _(b'name of the hgweb config file (DEPRECATED)'),
6318 _(b'name of the hgweb config file (DEPRECATED)'),
6319 _(b'FILE'),
6319 _(b'FILE'),
6320 ),
6320 ),
6321 (
6321 (
6322 b'',
6322 b'',
6323 b'pid-file',
6323 b'pid-file',
6324 b'',
6324 b'',
6325 _(b'name of file to write process ID to'),
6325 _(b'name of file to write process ID to'),
6326 _(b'FILE'),
6326 _(b'FILE'),
6327 ),
6327 ),
6328 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6328 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6329 (
6329 (
6330 b'',
6330 b'',
6331 b'cmdserver',
6331 b'cmdserver',
6332 b'',
6332 b'',
6333 _(b'for remote clients (ADVANCED)'),
6333 _(b'for remote clients (ADVANCED)'),
6334 _(b'MODE'),
6334 _(b'MODE'),
6335 ),
6335 ),
6336 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6336 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6337 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6337 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6338 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6338 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6339 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6339 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6340 (b'', b'print-url', None, _(b'start and print only the URL')),
6340 (b'', b'print-url', None, _(b'start and print only the URL')),
6341 ]
6341 ]
6342 + subrepoopts,
6342 + subrepoopts,
6343 _(b'[OPTION]...'),
6343 _(b'[OPTION]...'),
6344 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6344 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6345 helpbasic=True,
6345 helpbasic=True,
6346 optionalrepo=True,
6346 optionalrepo=True,
6347 )
6347 )
6348 def serve(ui, repo, **opts):
6348 def serve(ui, repo, **opts):
6349 """start stand-alone webserver
6349 """start stand-alone webserver
6350
6350
6351 Start a local HTTP repository browser and pull server. You can use
6351 Start a local HTTP repository browser and pull server. You can use
6352 this for ad-hoc sharing and browsing of repositories. It is
6352 this for ad-hoc sharing and browsing of repositories. It is
6353 recommended to use a real web server to serve a repository for
6353 recommended to use a real web server to serve a repository for
6354 longer periods of time.
6354 longer periods of time.
6355
6355
6356 Please note that the server does not implement access control.
6356 Please note that the server does not implement access control.
6357 This means that, by default, anybody can read from the server and
6357 This means that, by default, anybody can read from the server and
6358 nobody can write to it by default. Set the ``web.allow-push``
6358 nobody can write to it by default. Set the ``web.allow-push``
6359 option to ``*`` to allow everybody to push to the server. You
6359 option to ``*`` to allow everybody to push to the server. You
6360 should use a real web server if you need to authenticate users.
6360 should use a real web server if you need to authenticate users.
6361
6361
6362 By default, the server logs accesses to stdout and errors to
6362 By default, the server logs accesses to stdout and errors to
6363 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6363 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6364 files.
6364 files.
6365
6365
6366 To have the server choose a free port number to listen on, specify
6366 To have the server choose a free port number to listen on, specify
6367 a port number of 0; in this case, the server will print the port
6367 a port number of 0; in this case, the server will print the port
6368 number it uses.
6368 number it uses.
6369
6369
6370 Returns 0 on success.
6370 Returns 0 on success.
6371 """
6371 """
6372
6372
6373 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6373 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6374 opts = pycompat.byteskwargs(opts)
6374 opts = pycompat.byteskwargs(opts)
6375 if opts[b"print_url"] and ui.verbose:
6375 if opts[b"print_url"] and ui.verbose:
6376 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6376 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6377
6377
6378 if opts[b"stdio"]:
6378 if opts[b"stdio"]:
6379 if repo is None:
6379 if repo is None:
6380 raise error.RepoError(
6380 raise error.RepoError(
6381 _(b"there is no Mercurial repository here (.hg not found)")
6381 _(b"there is no Mercurial repository here (.hg not found)")
6382 )
6382 )
6383 s = wireprotoserver.sshserver(ui, repo)
6383 s = wireprotoserver.sshserver(ui, repo)
6384 s.serve_forever()
6384 s.serve_forever()
6385 return
6385 return
6386
6386
6387 service = server.createservice(ui, repo, opts)
6387 service = server.createservice(ui, repo, opts)
6388 return server.runservice(opts, initfn=service.init, runfn=service.run)
6388 return server.runservice(opts, initfn=service.init, runfn=service.run)
6389
6389
6390
6390
6391 @command(
6391 @command(
6392 b'shelve',
6392 b'shelve',
6393 [
6393 [
6394 (
6394 (
6395 b'A',
6395 b'A',
6396 b'addremove',
6396 b'addremove',
6397 None,
6397 None,
6398 _(b'mark new/missing files as added/removed before shelving'),
6398 _(b'mark new/missing files as added/removed before shelving'),
6399 ),
6399 ),
6400 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6400 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6401 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6401 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6402 (
6402 (
6403 b'',
6403 b'',
6404 b'date',
6404 b'date',
6405 b'',
6405 b'',
6406 _(b'shelve with the specified commit date'),
6406 _(b'shelve with the specified commit date'),
6407 _(b'DATE'),
6407 _(b'DATE'),
6408 ),
6408 ),
6409 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6409 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6410 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6410 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6411 (
6411 (
6412 b'k',
6412 b'k',
6413 b'keep',
6413 b'keep',
6414 False,
6414 False,
6415 _(b'shelve, but keep changes in the working directory'),
6415 _(b'shelve, but keep changes in the working directory'),
6416 ),
6416 ),
6417 (b'l', b'list', None, _(b'list current shelves')),
6417 (b'l', b'list', None, _(b'list current shelves')),
6418 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6418 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6419 (
6419 (
6420 b'n',
6420 b'n',
6421 b'name',
6421 b'name',
6422 b'',
6422 b'',
6423 _(b'use the given name for the shelved commit'),
6423 _(b'use the given name for the shelved commit'),
6424 _(b'NAME'),
6424 _(b'NAME'),
6425 ),
6425 ),
6426 (
6426 (
6427 b'p',
6427 b'p',
6428 b'patch',
6428 b'patch',
6429 None,
6429 None,
6430 _(
6430 _(
6431 b'output patches for changes (provide the names of the shelved '
6431 b'output patches for changes (provide the names of the shelved '
6432 b'changes as positional arguments)'
6432 b'changes as positional arguments)'
6433 ),
6433 ),
6434 ),
6434 ),
6435 (b'i', b'interactive', None, _(b'interactive mode')),
6435 (b'i', b'interactive', None, _(b'interactive mode')),
6436 (
6436 (
6437 b'',
6437 b'',
6438 b'stat',
6438 b'stat',
6439 None,
6439 None,
6440 _(
6440 _(
6441 b'output diffstat-style summary of changes (provide the names of '
6441 b'output diffstat-style summary of changes (provide the names of '
6442 b'the shelved changes as positional arguments)'
6442 b'the shelved changes as positional arguments)'
6443 ),
6443 ),
6444 ),
6444 ),
6445 ]
6445 ]
6446 + cmdutil.walkopts,
6446 + cmdutil.walkopts,
6447 _(b'hg shelve [OPTION]... [FILE]...'),
6447 _(b'hg shelve [OPTION]... [FILE]...'),
6448 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6448 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6449 )
6449 )
6450 def shelve(ui, repo, *pats, **opts):
6450 def shelve(ui, repo, *pats, **opts):
6451 '''save and set aside changes from the working directory
6451 '''save and set aside changes from the working directory
6452
6452
6453 Shelving takes files that "hg status" reports as not clean, saves
6453 Shelving takes files that "hg status" reports as not clean, saves
6454 the modifications to a bundle (a shelved change), and reverts the
6454 the modifications to a bundle (a shelved change), and reverts the
6455 files so that their state in the working directory becomes clean.
6455 files so that their state in the working directory becomes clean.
6456
6456
6457 To restore these changes to the working directory, using "hg
6457 To restore these changes to the working directory, using "hg
6458 unshelve"; this will work even if you switch to a different
6458 unshelve"; this will work even if you switch to a different
6459 commit.
6459 commit.
6460
6460
6461 When no files are specified, "hg shelve" saves all not-clean
6461 When no files are specified, "hg shelve" saves all not-clean
6462 files. If specific files or directories are named, only changes to
6462 files. If specific files or directories are named, only changes to
6463 those files are shelved.
6463 those files are shelved.
6464
6464
6465 In bare shelve (when no files are specified, without interactive,
6465 In bare shelve (when no files are specified, without interactive,
6466 include and exclude option), shelving remembers information if the
6466 include and exclude option), shelving remembers information if the
6467 working directory was on newly created branch, in other words working
6467 working directory was on newly created branch, in other words working
6468 directory was on different branch than its first parent. In this
6468 directory was on different branch than its first parent. In this
6469 situation unshelving restores branch information to the working directory.
6469 situation unshelving restores branch information to the working directory.
6470
6470
6471 Each shelved change has a name that makes it easier to find later.
6471 Each shelved change has a name that makes it easier to find later.
6472 The name of a shelved change defaults to being based on the active
6472 The name of a shelved change defaults to being based on the active
6473 bookmark, or if there is no active bookmark, the current named
6473 bookmark, or if there is no active bookmark, the current named
6474 branch. To specify a different name, use ``--name``.
6474 branch. To specify a different name, use ``--name``.
6475
6475
6476 To see a list of existing shelved changes, use the ``--list``
6476 To see a list of existing shelved changes, use the ``--list``
6477 option. For each shelved change, this will print its name, age,
6477 option. For each shelved change, this will print its name, age,
6478 and description; use ``--patch`` or ``--stat`` for more details.
6478 and description; use ``--patch`` or ``--stat`` for more details.
6479
6479
6480 To delete specific shelved changes, use ``--delete``. To delete
6480 To delete specific shelved changes, use ``--delete``. To delete
6481 all shelved changes, use ``--cleanup``.
6481 all shelved changes, use ``--cleanup``.
6482 '''
6482 '''
6483 opts = pycompat.byteskwargs(opts)
6483 opts = pycompat.byteskwargs(opts)
6484 allowables = [
6484 allowables = [
6485 (b'addremove', {b'create'}), # 'create' is pseudo action
6485 (b'addremove', {b'create'}), # 'create' is pseudo action
6486 (b'unknown', {b'create'}),
6486 (b'unknown', {b'create'}),
6487 (b'cleanup', {b'cleanup'}),
6487 (b'cleanup', {b'cleanup'}),
6488 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6488 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6489 (b'delete', {b'delete'}),
6489 (b'delete', {b'delete'}),
6490 (b'edit', {b'create'}),
6490 (b'edit', {b'create'}),
6491 (b'keep', {b'create'}),
6491 (b'keep', {b'create'}),
6492 (b'list', {b'list'}),
6492 (b'list', {b'list'}),
6493 (b'message', {b'create'}),
6493 (b'message', {b'create'}),
6494 (b'name', {b'create'}),
6494 (b'name', {b'create'}),
6495 (b'patch', {b'patch', b'list'}),
6495 (b'patch', {b'patch', b'list'}),
6496 (b'stat', {b'stat', b'list'}),
6496 (b'stat', {b'stat', b'list'}),
6497 ]
6497 ]
6498
6498
6499 def checkopt(opt):
6499 def checkopt(opt):
6500 if opts.get(opt):
6500 if opts.get(opt):
6501 for i, allowable in allowables:
6501 for i, allowable in allowables:
6502 if opts[i] and opt not in allowable:
6502 if opts[i] and opt not in allowable:
6503 raise error.InputError(
6503 raise error.InputError(
6504 _(
6504 _(
6505 b"options '--%s' and '--%s' may not be "
6505 b"options '--%s' and '--%s' may not be "
6506 b"used together"
6506 b"used together"
6507 )
6507 )
6508 % (opt, i)
6508 % (opt, i)
6509 )
6509 )
6510 return True
6510 return True
6511
6511
6512 if checkopt(b'cleanup'):
6512 if checkopt(b'cleanup'):
6513 if pats:
6513 if pats:
6514 raise error.InputError(
6514 raise error.InputError(
6515 _(b"cannot specify names when using '--cleanup'")
6515 _(b"cannot specify names when using '--cleanup'")
6516 )
6516 )
6517 return shelvemod.cleanupcmd(ui, repo)
6517 return shelvemod.cleanupcmd(ui, repo)
6518 elif checkopt(b'delete'):
6518 elif checkopt(b'delete'):
6519 return shelvemod.deletecmd(ui, repo, pats)
6519 return shelvemod.deletecmd(ui, repo, pats)
6520 elif checkopt(b'list'):
6520 elif checkopt(b'list'):
6521 return shelvemod.listcmd(ui, repo, pats, opts)
6521 return shelvemod.listcmd(ui, repo, pats, opts)
6522 elif checkopt(b'patch') or checkopt(b'stat'):
6522 elif checkopt(b'patch') or checkopt(b'stat'):
6523 return shelvemod.patchcmds(ui, repo, pats, opts)
6523 return shelvemod.patchcmds(ui, repo, pats, opts)
6524 else:
6524 else:
6525 return shelvemod.createcmd(ui, repo, pats, opts)
6525 return shelvemod.createcmd(ui, repo, pats, opts)
6526
6526
6527
6527
6528 _NOTTERSE = b'nothing'
6528 _NOTTERSE = b'nothing'
6529
6529
6530
6530
6531 @command(
6531 @command(
6532 b'status|st',
6532 b'status|st',
6533 [
6533 [
6534 (b'A', b'all', None, _(b'show status of all files')),
6534 (b'A', b'all', None, _(b'show status of all files')),
6535 (b'm', b'modified', None, _(b'show only modified files')),
6535 (b'm', b'modified', None, _(b'show only modified files')),
6536 (b'a', b'added', None, _(b'show only added files')),
6536 (b'a', b'added', None, _(b'show only added files')),
6537 (b'r', b'removed', None, _(b'show only removed files')),
6537 (b'r', b'removed', None, _(b'show only removed files')),
6538 (b'd', b'deleted', None, _(b'show only missing files')),
6538 (b'd', b'deleted', None, _(b'show only missing files')),
6539 (b'c', b'clean', None, _(b'show only files without changes')),
6539 (b'c', b'clean', None, _(b'show only files without changes')),
6540 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6540 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6541 (b'i', b'ignored', None, _(b'show only ignored files')),
6541 (b'i', b'ignored', None, _(b'show only ignored files')),
6542 (b'n', b'no-status', None, _(b'hide status prefix')),
6542 (b'n', b'no-status', None, _(b'hide status prefix')),
6543 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6543 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6544 (
6544 (
6545 b'C',
6545 b'C',
6546 b'copies',
6546 b'copies',
6547 None,
6547 None,
6548 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6548 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6549 ),
6549 ),
6550 (
6550 (
6551 b'0',
6551 b'0',
6552 b'print0',
6552 b'print0',
6553 None,
6553 None,
6554 _(b'end filenames with NUL, for use with xargs'),
6554 _(b'end filenames with NUL, for use with xargs'),
6555 ),
6555 ),
6556 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6556 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6557 (
6557 (
6558 b'',
6558 b'',
6559 b'change',
6559 b'change',
6560 b'',
6560 b'',
6561 _(b'list the changed files of a revision'),
6561 _(b'list the changed files of a revision'),
6562 _(b'REV'),
6562 _(b'REV'),
6563 ),
6563 ),
6564 ]
6564 ]
6565 + walkopts
6565 + walkopts
6566 + subrepoopts
6566 + subrepoopts
6567 + formatteropts,
6567 + formatteropts,
6568 _(b'[OPTION]... [FILE]...'),
6568 _(b'[OPTION]... [FILE]...'),
6569 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6569 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6570 helpbasic=True,
6570 helpbasic=True,
6571 inferrepo=True,
6571 inferrepo=True,
6572 intents={INTENT_READONLY},
6572 intents={INTENT_READONLY},
6573 )
6573 )
6574 def status(ui, repo, *pats, **opts):
6574 def status(ui, repo, *pats, **opts):
6575 """show changed files in the working directory
6575 """show changed files in the working directory
6576
6576
6577 Show status of files in the repository. If names are given, only
6577 Show status of files in the repository. If names are given, only
6578 files that match are shown. Files that are clean or ignored or
6578 files that match are shown. Files that are clean or ignored or
6579 the source of a copy/move operation, are not listed unless
6579 the source of a copy/move operation, are not listed unless
6580 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6580 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6581 Unless options described with "show only ..." are given, the
6581 Unless options described with "show only ..." are given, the
6582 options -mardu are used.
6582 options -mardu are used.
6583
6583
6584 Option -q/--quiet hides untracked (unknown and ignored) files
6584 Option -q/--quiet hides untracked (unknown and ignored) files
6585 unless explicitly requested with -u/--unknown or -i/--ignored.
6585 unless explicitly requested with -u/--unknown or -i/--ignored.
6586
6586
6587 .. note::
6587 .. note::
6588
6588
6589 :hg:`status` may appear to disagree with diff if permissions have
6589 :hg:`status` may appear to disagree with diff if permissions have
6590 changed or a merge has occurred. The standard diff format does
6590 changed or a merge has occurred. The standard diff format does
6591 not report permission changes and diff only reports changes
6591 not report permission changes and diff only reports changes
6592 relative to one merge parent.
6592 relative to one merge parent.
6593
6593
6594 If one revision is given, it is used as the base revision.
6594 If one revision is given, it is used as the base revision.
6595 If two revisions are given, the differences between them are
6595 If two revisions are given, the differences between them are
6596 shown. The --change option can also be used as a shortcut to list
6596 shown. The --change option can also be used as a shortcut to list
6597 the changed files of a revision from its first parent.
6597 the changed files of a revision from its first parent.
6598
6598
6599 The codes used to show the status of files are::
6599 The codes used to show the status of files are::
6600
6600
6601 M = modified
6601 M = modified
6602 A = added
6602 A = added
6603 R = removed
6603 R = removed
6604 C = clean
6604 C = clean
6605 ! = missing (deleted by non-hg command, but still tracked)
6605 ! = missing (deleted by non-hg command, but still tracked)
6606 ? = not tracked
6606 ? = not tracked
6607 I = ignored
6607 I = ignored
6608 = origin of the previous file (with --copies)
6608 = origin of the previous file (with --copies)
6609
6609
6610 .. container:: verbose
6610 .. container:: verbose
6611
6611
6612 The -t/--terse option abbreviates the output by showing only the directory
6612 The -t/--terse option abbreviates the output by showing only the directory
6613 name if all the files in it share the same status. The option takes an
6613 name if all the files in it share the same status. The option takes an
6614 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6614 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6615 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6615 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6616 for 'ignored' and 'c' for clean.
6616 for 'ignored' and 'c' for clean.
6617
6617
6618 It abbreviates only those statuses which are passed. Note that clean and
6618 It abbreviates only those statuses which are passed. Note that clean and
6619 ignored files are not displayed with '--terse ic' unless the -c/--clean
6619 ignored files are not displayed with '--terse ic' unless the -c/--clean
6620 and -i/--ignored options are also used.
6620 and -i/--ignored options are also used.
6621
6621
6622 The -v/--verbose option shows information when the repository is in an
6622 The -v/--verbose option shows information when the repository is in an
6623 unfinished merge, shelve, rebase state etc. You can have this behavior
6623 unfinished merge, shelve, rebase state etc. You can have this behavior
6624 turned on by default by enabling the ``commands.status.verbose`` option.
6624 turned on by default by enabling the ``commands.status.verbose`` option.
6625
6625
6626 You can skip displaying some of these states by setting
6626 You can skip displaying some of these states by setting
6627 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6627 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6628 'histedit', 'merge', 'rebase', or 'unshelve'.
6628 'histedit', 'merge', 'rebase', or 'unshelve'.
6629
6629
6630 Template:
6630 Template:
6631
6631
6632 The following keywords are supported in addition to the common template
6632 The following keywords are supported in addition to the common template
6633 keywords and functions. See also :hg:`help templates`.
6633 keywords and functions. See also :hg:`help templates`.
6634
6634
6635 :path: String. Repository-absolute path of the file.
6635 :path: String. Repository-absolute path of the file.
6636 :source: String. Repository-absolute path of the file originated from.
6636 :source: String. Repository-absolute path of the file originated from.
6637 Available if ``--copies`` is specified.
6637 Available if ``--copies`` is specified.
6638 :status: String. Character denoting file's status.
6638 :status: String. Character denoting file's status.
6639
6639
6640 Examples:
6640 Examples:
6641
6641
6642 - show changes in the working directory relative to a
6642 - show changes in the working directory relative to a
6643 changeset::
6643 changeset::
6644
6644
6645 hg status --rev 9353
6645 hg status --rev 9353
6646
6646
6647 - show changes in the working directory relative to the
6647 - show changes in the working directory relative to the
6648 current directory (see :hg:`help patterns` for more information)::
6648 current directory (see :hg:`help patterns` for more information)::
6649
6649
6650 hg status re:
6650 hg status re:
6651
6651
6652 - show all changes including copies in an existing changeset::
6652 - show all changes including copies in an existing changeset::
6653
6653
6654 hg status --copies --change 9353
6654 hg status --copies --change 9353
6655
6655
6656 - get a NUL separated list of added files, suitable for xargs::
6656 - get a NUL separated list of added files, suitable for xargs::
6657
6657
6658 hg status -an0
6658 hg status -an0
6659
6659
6660 - show more information about the repository status, abbreviating
6660 - show more information about the repository status, abbreviating
6661 added, removed, modified, deleted, and untracked paths::
6661 added, removed, modified, deleted, and untracked paths::
6662
6662
6663 hg status -v -t mardu
6663 hg status -v -t mardu
6664
6664
6665 Returns 0 on success.
6665 Returns 0 on success.
6666
6666
6667 """
6667 """
6668
6668
6669 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6669 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6670 opts = pycompat.byteskwargs(opts)
6670 opts = pycompat.byteskwargs(opts)
6671 revs = opts.get(b'rev')
6671 revs = opts.get(b'rev')
6672 change = opts.get(b'change')
6672 change = opts.get(b'change')
6673 terse = opts.get(b'terse')
6673 terse = opts.get(b'terse')
6674 if terse is _NOTTERSE:
6674 if terse is _NOTTERSE:
6675 if revs:
6675 if revs:
6676 terse = b''
6676 terse = b''
6677 else:
6677 else:
6678 terse = ui.config(b'commands', b'status.terse')
6678 terse = ui.config(b'commands', b'status.terse')
6679
6679
6680 if revs and terse:
6680 if revs and terse:
6681 msg = _(b'cannot use --terse with --rev')
6681 msg = _(b'cannot use --terse with --rev')
6682 raise error.InputError(msg)
6682 raise error.InputError(msg)
6683 elif change:
6683 elif change:
6684 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6684 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6685 ctx2 = scmutil.revsingle(repo, change, None)
6685 ctx2 = scmutil.revsingle(repo, change, None)
6686 ctx1 = ctx2.p1()
6686 ctx1 = ctx2.p1()
6687 else:
6687 else:
6688 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6688 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6689 ctx1, ctx2 = scmutil.revpair(repo, revs)
6689 ctx1, ctx2 = scmutil.revpair(repo, revs)
6690
6690
6691 forcerelativevalue = None
6691 forcerelativevalue = None
6692 if ui.hasconfig(b'commands', b'status.relative'):
6692 if ui.hasconfig(b'commands', b'status.relative'):
6693 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6693 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6694 uipathfn = scmutil.getuipathfn(
6694 uipathfn = scmutil.getuipathfn(
6695 repo,
6695 repo,
6696 legacyrelativevalue=bool(pats),
6696 legacyrelativevalue=bool(pats),
6697 forcerelativevalue=forcerelativevalue,
6697 forcerelativevalue=forcerelativevalue,
6698 )
6698 )
6699
6699
6700 if opts.get(b'print0'):
6700 if opts.get(b'print0'):
6701 end = b'\0'
6701 end = b'\0'
6702 else:
6702 else:
6703 end = b'\n'
6703 end = b'\n'
6704 states = b'modified added removed deleted unknown ignored clean'.split()
6704 states = b'modified added removed deleted unknown ignored clean'.split()
6705 show = [k for k in states if opts.get(k)]
6705 show = [k for k in states if opts.get(k)]
6706 if opts.get(b'all'):
6706 if opts.get(b'all'):
6707 show += ui.quiet and (states[:4] + [b'clean']) or states
6707 show += ui.quiet and (states[:4] + [b'clean']) or states
6708
6708
6709 if not show:
6709 if not show:
6710 if ui.quiet:
6710 if ui.quiet:
6711 show = states[:4]
6711 show = states[:4]
6712 else:
6712 else:
6713 show = states[:5]
6713 show = states[:5]
6714
6714
6715 m = scmutil.match(ctx2, pats, opts)
6715 m = scmutil.match(ctx2, pats, opts)
6716 if terse:
6716 if terse:
6717 # we need to compute clean and unknown to terse
6717 # we need to compute clean and unknown to terse
6718 stat = repo.status(
6718 stat = repo.status(
6719 ctx1.node(),
6719 ctx1.node(),
6720 ctx2.node(),
6720 ctx2.node(),
6721 m,
6721 m,
6722 b'ignored' in show or b'i' in terse,
6722 b'ignored' in show or b'i' in terse,
6723 clean=True,
6723 clean=True,
6724 unknown=True,
6724 unknown=True,
6725 listsubrepos=opts.get(b'subrepos'),
6725 listsubrepos=opts.get(b'subrepos'),
6726 )
6726 )
6727
6727
6728 stat = cmdutil.tersedir(stat, terse)
6728 stat = cmdutil.tersedir(stat, terse)
6729 else:
6729 else:
6730 stat = repo.status(
6730 stat = repo.status(
6731 ctx1.node(),
6731 ctx1.node(),
6732 ctx2.node(),
6732 ctx2.node(),
6733 m,
6733 m,
6734 b'ignored' in show,
6734 b'ignored' in show,
6735 b'clean' in show,
6735 b'clean' in show,
6736 b'unknown' in show,
6736 b'unknown' in show,
6737 opts.get(b'subrepos'),
6737 opts.get(b'subrepos'),
6738 )
6738 )
6739
6739
6740 changestates = zip(
6740 changestates = zip(
6741 states,
6741 states,
6742 pycompat.iterbytestr(b'MAR!?IC'),
6742 pycompat.iterbytestr(b'MAR!?IC'),
6743 [getattr(stat, s.decode('utf8')) for s in states],
6743 [getattr(stat, s.decode('utf8')) for s in states],
6744 )
6744 )
6745
6745
6746 copy = {}
6746 copy = {}
6747 if (
6747 if (
6748 opts.get(b'all')
6748 opts.get(b'all')
6749 or opts.get(b'copies')
6749 or opts.get(b'copies')
6750 or ui.configbool(b'ui', b'statuscopies')
6750 or ui.configbool(b'ui', b'statuscopies')
6751 ) and not opts.get(b'no_status'):
6751 ) and not opts.get(b'no_status'):
6752 copy = copies.pathcopies(ctx1, ctx2, m)
6752 copy = copies.pathcopies(ctx1, ctx2, m)
6753
6753
6754 morestatus = None
6754 morestatus = None
6755 if (
6755 if (
6756 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6756 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6757 ) and not ui.plain():
6757 ) and not ui.plain():
6758 morestatus = cmdutil.readmorestatus(repo)
6758 morestatus = cmdutil.readmorestatus(repo)
6759
6759
6760 ui.pager(b'status')
6760 ui.pager(b'status')
6761 fm = ui.formatter(b'status', opts)
6761 fm = ui.formatter(b'status', opts)
6762 fmt = b'%s' + end
6762 fmt = b'%s' + end
6763 showchar = not opts.get(b'no_status')
6763 showchar = not opts.get(b'no_status')
6764
6764
6765 for state, char, files in changestates:
6765 for state, char, files in changestates:
6766 if state in show:
6766 if state in show:
6767 label = b'status.' + state
6767 label = b'status.' + state
6768 for f in files:
6768 for f in files:
6769 fm.startitem()
6769 fm.startitem()
6770 fm.context(ctx=ctx2)
6770 fm.context(ctx=ctx2)
6771 fm.data(itemtype=b'file', path=f)
6771 fm.data(itemtype=b'file', path=f)
6772 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6772 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6773 fm.plain(fmt % uipathfn(f), label=label)
6773 fm.plain(fmt % uipathfn(f), label=label)
6774 if f in copy:
6774 if f in copy:
6775 fm.data(source=copy[f])
6775 fm.data(source=copy[f])
6776 fm.plain(
6776 fm.plain(
6777 (b' %s' + end) % uipathfn(copy[f]),
6777 (b' %s' + end) % uipathfn(copy[f]),
6778 label=b'status.copied',
6778 label=b'status.copied',
6779 )
6779 )
6780 if morestatus:
6780 if morestatus:
6781 morestatus.formatfile(f, fm)
6781 morestatus.formatfile(f, fm)
6782
6782
6783 if morestatus:
6783 if morestatus:
6784 morestatus.formatfooter(fm)
6784 morestatus.formatfooter(fm)
6785 fm.end()
6785 fm.end()
6786
6786
6787
6787
6788 @command(
6788 @command(
6789 b'summary|sum',
6789 b'summary|sum',
6790 [(b'', b'remote', None, _(b'check for push and pull'))],
6790 [(b'', b'remote', None, _(b'check for push and pull'))],
6791 b'[--remote]',
6791 b'[--remote]',
6792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6793 helpbasic=True,
6793 helpbasic=True,
6794 intents={INTENT_READONLY},
6794 intents={INTENT_READONLY},
6795 )
6795 )
6796 def summary(ui, repo, **opts):
6796 def summary(ui, repo, **opts):
6797 """summarize working directory state
6797 """summarize working directory state
6798
6798
6799 This generates a brief summary of the working directory state,
6799 This generates a brief summary of the working directory state,
6800 including parents, branch, commit status, phase and available updates.
6800 including parents, branch, commit status, phase and available updates.
6801
6801
6802 With the --remote option, this will check the default paths for
6802 With the --remote option, this will check the default paths for
6803 incoming and outgoing changes. This can be time-consuming.
6803 incoming and outgoing changes. This can be time-consuming.
6804
6804
6805 Returns 0 on success.
6805 Returns 0 on success.
6806 """
6806 """
6807
6807
6808 opts = pycompat.byteskwargs(opts)
6808 opts = pycompat.byteskwargs(opts)
6809 ui.pager(b'summary')
6809 ui.pager(b'summary')
6810 ctx = repo[None]
6810 ctx = repo[None]
6811 parents = ctx.parents()
6811 parents = ctx.parents()
6812 pnode = parents[0].node()
6812 pnode = parents[0].node()
6813 marks = []
6813 marks = []
6814
6814
6815 try:
6815 try:
6816 ms = mergestatemod.mergestate.read(repo)
6816 ms = mergestatemod.mergestate.read(repo)
6817 except error.UnsupportedMergeRecords as e:
6817 except error.UnsupportedMergeRecords as e:
6818 s = b' '.join(e.recordtypes)
6818 s = b' '.join(e.recordtypes)
6819 ui.warn(
6819 ui.warn(
6820 _(b'warning: merge state has unsupported record types: %s\n') % s
6820 _(b'warning: merge state has unsupported record types: %s\n') % s
6821 )
6821 )
6822 unresolved = []
6822 unresolved = []
6823 else:
6823 else:
6824 unresolved = list(ms.unresolved())
6824 unresolved = list(ms.unresolved())
6825
6825
6826 for p in parents:
6826 for p in parents:
6827 # label with log.changeset (instead of log.parent) since this
6827 # label with log.changeset (instead of log.parent) since this
6828 # shows a working directory parent *changeset*:
6828 # shows a working directory parent *changeset*:
6829 # i18n: column positioning for "hg summary"
6829 # i18n: column positioning for "hg summary"
6830 ui.write(
6830 ui.write(
6831 _(b'parent: %d:%s ') % (p.rev(), p),
6831 _(b'parent: %d:%s ') % (p.rev(), p),
6832 label=logcmdutil.changesetlabels(p),
6832 label=logcmdutil.changesetlabels(p),
6833 )
6833 )
6834 ui.write(b' '.join(p.tags()), label=b'log.tag')
6834 ui.write(b' '.join(p.tags()), label=b'log.tag')
6835 if p.bookmarks():
6835 if p.bookmarks():
6836 marks.extend(p.bookmarks())
6836 marks.extend(p.bookmarks())
6837 if p.rev() == -1:
6837 if p.rev() == -1:
6838 if not len(repo):
6838 if not len(repo):
6839 ui.write(_(b' (empty repository)'))
6839 ui.write(_(b' (empty repository)'))
6840 else:
6840 else:
6841 ui.write(_(b' (no revision checked out)'))
6841 ui.write(_(b' (no revision checked out)'))
6842 if p.obsolete():
6842 if p.obsolete():
6843 ui.write(_(b' (obsolete)'))
6843 ui.write(_(b' (obsolete)'))
6844 if p.isunstable():
6844 if p.isunstable():
6845 instabilities = (
6845 instabilities = (
6846 ui.label(instability, b'trouble.%s' % instability)
6846 ui.label(instability, b'trouble.%s' % instability)
6847 for instability in p.instabilities()
6847 for instability in p.instabilities()
6848 )
6848 )
6849 ui.write(b' (' + b', '.join(instabilities) + b')')
6849 ui.write(b' (' + b', '.join(instabilities) + b')')
6850 ui.write(b'\n')
6850 ui.write(b'\n')
6851 if p.description():
6851 if p.description():
6852 ui.status(
6852 ui.status(
6853 b' ' + p.description().splitlines()[0].strip() + b'\n',
6853 b' ' + p.description().splitlines()[0].strip() + b'\n',
6854 label=b'log.summary',
6854 label=b'log.summary',
6855 )
6855 )
6856
6856
6857 branch = ctx.branch()
6857 branch = ctx.branch()
6858 bheads = repo.branchheads(branch)
6858 bheads = repo.branchheads(branch)
6859 # i18n: column positioning for "hg summary"
6859 # i18n: column positioning for "hg summary"
6860 m = _(b'branch: %s\n') % branch
6860 m = _(b'branch: %s\n') % branch
6861 if branch != b'default':
6861 if branch != b'default':
6862 ui.write(m, label=b'log.branch')
6862 ui.write(m, label=b'log.branch')
6863 else:
6863 else:
6864 ui.status(m, label=b'log.branch')
6864 ui.status(m, label=b'log.branch')
6865
6865
6866 if marks:
6866 if marks:
6867 active = repo._activebookmark
6867 active = repo._activebookmark
6868 # i18n: column positioning for "hg summary"
6868 # i18n: column positioning for "hg summary"
6869 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6869 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6870 if active is not None:
6870 if active is not None:
6871 if active in marks:
6871 if active in marks:
6872 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6872 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6873 marks.remove(active)
6873 marks.remove(active)
6874 else:
6874 else:
6875 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6875 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6876 for m in marks:
6876 for m in marks:
6877 ui.write(b' ' + m, label=b'log.bookmark')
6877 ui.write(b' ' + m, label=b'log.bookmark')
6878 ui.write(b'\n', label=b'log.bookmark')
6878 ui.write(b'\n', label=b'log.bookmark')
6879
6879
6880 status = repo.status(unknown=True)
6880 status = repo.status(unknown=True)
6881
6881
6882 c = repo.dirstate.copies()
6882 c = repo.dirstate.copies()
6883 copied, renamed = [], []
6883 copied, renamed = [], []
6884 for d, s in pycompat.iteritems(c):
6884 for d, s in pycompat.iteritems(c):
6885 if s in status.removed:
6885 if s in status.removed:
6886 status.removed.remove(s)
6886 status.removed.remove(s)
6887 renamed.append(d)
6887 renamed.append(d)
6888 else:
6888 else:
6889 copied.append(d)
6889 copied.append(d)
6890 if d in status.added:
6890 if d in status.added:
6891 status.added.remove(d)
6891 status.added.remove(d)
6892
6892
6893 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6893 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6894
6894
6895 labels = [
6895 labels = [
6896 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6896 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6897 (ui.label(_(b'%d added'), b'status.added'), status.added),
6897 (ui.label(_(b'%d added'), b'status.added'), status.added),
6898 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6898 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6899 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6899 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6900 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6900 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6901 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6901 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6902 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6902 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6903 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6903 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6904 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6904 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6905 ]
6905 ]
6906 t = []
6906 t = []
6907 for l, s in labels:
6907 for l, s in labels:
6908 if s:
6908 if s:
6909 t.append(l % len(s))
6909 t.append(l % len(s))
6910
6910
6911 t = b', '.join(t)
6911 t = b', '.join(t)
6912 cleanworkdir = False
6912 cleanworkdir = False
6913
6913
6914 if repo.vfs.exists(b'graftstate'):
6914 if repo.vfs.exists(b'graftstate'):
6915 t += _(b' (graft in progress)')
6915 t += _(b' (graft in progress)')
6916 if repo.vfs.exists(b'updatestate'):
6916 if repo.vfs.exists(b'updatestate'):
6917 t += _(b' (interrupted update)')
6917 t += _(b' (interrupted update)')
6918 elif len(parents) > 1:
6918 elif len(parents) > 1:
6919 t += _(b' (merge)')
6919 t += _(b' (merge)')
6920 elif branch != parents[0].branch():
6920 elif branch != parents[0].branch():
6921 t += _(b' (new branch)')
6921 t += _(b' (new branch)')
6922 elif parents[0].closesbranch() and pnode in repo.branchheads(
6922 elif parents[0].closesbranch() and pnode in repo.branchheads(
6923 branch, closed=True
6923 branch, closed=True
6924 ):
6924 ):
6925 t += _(b' (head closed)')
6925 t += _(b' (head closed)')
6926 elif not (
6926 elif not (
6927 status.modified
6927 status.modified
6928 or status.added
6928 or status.added
6929 or status.removed
6929 or status.removed
6930 or renamed
6930 or renamed
6931 or copied
6931 or copied
6932 or subs
6932 or subs
6933 ):
6933 ):
6934 t += _(b' (clean)')
6934 t += _(b' (clean)')
6935 cleanworkdir = True
6935 cleanworkdir = True
6936 elif pnode not in bheads:
6936 elif pnode not in bheads:
6937 t += _(b' (new branch head)')
6937 t += _(b' (new branch head)')
6938
6938
6939 if parents:
6939 if parents:
6940 pendingphase = max(p.phase() for p in parents)
6940 pendingphase = max(p.phase() for p in parents)
6941 else:
6941 else:
6942 pendingphase = phases.public
6942 pendingphase = phases.public
6943
6943
6944 if pendingphase > phases.newcommitphase(ui):
6944 if pendingphase > phases.newcommitphase(ui):
6945 t += b' (%s)' % phases.phasenames[pendingphase]
6945 t += b' (%s)' % phases.phasenames[pendingphase]
6946
6946
6947 if cleanworkdir:
6947 if cleanworkdir:
6948 # i18n: column positioning for "hg summary"
6948 # i18n: column positioning for "hg summary"
6949 ui.status(_(b'commit: %s\n') % t.strip())
6949 ui.status(_(b'commit: %s\n') % t.strip())
6950 else:
6950 else:
6951 # i18n: column positioning for "hg summary"
6951 # i18n: column positioning for "hg summary"
6952 ui.write(_(b'commit: %s\n') % t.strip())
6952 ui.write(_(b'commit: %s\n') % t.strip())
6953
6953
6954 # all ancestors of branch heads - all ancestors of parent = new csets
6954 # all ancestors of branch heads - all ancestors of parent = new csets
6955 new = len(
6955 new = len(
6956 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6956 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6957 )
6957 )
6958
6958
6959 if new == 0:
6959 if new == 0:
6960 # i18n: column positioning for "hg summary"
6960 # i18n: column positioning for "hg summary"
6961 ui.status(_(b'update: (current)\n'))
6961 ui.status(_(b'update: (current)\n'))
6962 elif pnode not in bheads:
6962 elif pnode not in bheads:
6963 # i18n: column positioning for "hg summary"
6963 # i18n: column positioning for "hg summary"
6964 ui.write(_(b'update: %d new changesets (update)\n') % new)
6964 ui.write(_(b'update: %d new changesets (update)\n') % new)
6965 else:
6965 else:
6966 # i18n: column positioning for "hg summary"
6966 # i18n: column positioning for "hg summary"
6967 ui.write(
6967 ui.write(
6968 _(b'update: %d new changesets, %d branch heads (merge)\n')
6968 _(b'update: %d new changesets, %d branch heads (merge)\n')
6969 % (new, len(bheads))
6969 % (new, len(bheads))
6970 )
6970 )
6971
6971
6972 t = []
6972 t = []
6973 draft = len(repo.revs(b'draft()'))
6973 draft = len(repo.revs(b'draft()'))
6974 if draft:
6974 if draft:
6975 t.append(_(b'%d draft') % draft)
6975 t.append(_(b'%d draft') % draft)
6976 secret = len(repo.revs(b'secret()'))
6976 secret = len(repo.revs(b'secret()'))
6977 if secret:
6977 if secret:
6978 t.append(_(b'%d secret') % secret)
6978 t.append(_(b'%d secret') % secret)
6979
6979
6980 if draft or secret:
6980 if draft or secret:
6981 ui.status(_(b'phases: %s\n') % b', '.join(t))
6981 ui.status(_(b'phases: %s\n') % b', '.join(t))
6982
6982
6983 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6983 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6984 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
6984 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
6985 numtrouble = len(repo.revs(trouble + b"()"))
6985 numtrouble = len(repo.revs(trouble + b"()"))
6986 # We write all the possibilities to ease translation
6986 # We write all the possibilities to ease translation
6987 troublemsg = {
6987 troublemsg = {
6988 b"orphan": _(b"orphan: %d changesets"),
6988 b"orphan": _(b"orphan: %d changesets"),
6989 b"contentdivergent": _(b"content-divergent: %d changesets"),
6989 b"contentdivergent": _(b"content-divergent: %d changesets"),
6990 b"phasedivergent": _(b"phase-divergent: %d changesets"),
6990 b"phasedivergent": _(b"phase-divergent: %d changesets"),
6991 }
6991 }
6992 if numtrouble > 0:
6992 if numtrouble > 0:
6993 ui.status(troublemsg[trouble] % numtrouble + b"\n")
6993 ui.status(troublemsg[trouble] % numtrouble + b"\n")
6994
6994
6995 cmdutil.summaryhooks(ui, repo)
6995 cmdutil.summaryhooks(ui, repo)
6996
6996
6997 if opts.get(b'remote'):
6997 if opts.get(b'remote'):
6998 needsincoming, needsoutgoing = True, True
6998 needsincoming, needsoutgoing = True, True
6999 else:
6999 else:
7000 needsincoming, needsoutgoing = False, False
7000 needsincoming, needsoutgoing = False, False
7001 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7001 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7002 if i:
7002 if i:
7003 needsincoming = True
7003 needsincoming = True
7004 if o:
7004 if o:
7005 needsoutgoing = True
7005 needsoutgoing = True
7006 if not needsincoming and not needsoutgoing:
7006 if not needsincoming and not needsoutgoing:
7007 return
7007 return
7008
7008
7009 def getincoming():
7009 def getincoming():
7010 source, branches = hg.parseurl(ui.expandpath(b'default'))
7010 source, branches = hg.parseurl(ui.expandpath(b'default'))
7011 sbranch = branches[0]
7011 sbranch = branches[0]
7012 try:
7012 try:
7013 other = hg.peer(repo, {}, source)
7013 other = hg.peer(repo, {}, source)
7014 except error.RepoError:
7014 except error.RepoError:
7015 if opts.get(b'remote'):
7015 if opts.get(b'remote'):
7016 raise
7016 raise
7017 return source, sbranch, None, None, None
7017 return source, sbranch, None, None, None
7018 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7018 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7019 if revs:
7019 if revs:
7020 revs = [other.lookup(rev) for rev in revs]
7020 revs = [other.lookup(rev) for rev in revs]
7021 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7021 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7022 repo.ui.pushbuffer()
7022 repo.ui.pushbuffer()
7023 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7023 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7024 repo.ui.popbuffer()
7024 repo.ui.popbuffer()
7025 return source, sbranch, other, commoninc, commoninc[1]
7025 return source, sbranch, other, commoninc, commoninc[1]
7026
7026
7027 if needsincoming:
7027 if needsincoming:
7028 source, sbranch, sother, commoninc, incoming = getincoming()
7028 source, sbranch, sother, commoninc, incoming = getincoming()
7029 else:
7029 else:
7030 source = sbranch = sother = commoninc = incoming = None
7030 source = sbranch = sother = commoninc = incoming = None
7031
7031
7032 def getoutgoing():
7032 def getoutgoing():
7033 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7033 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7034 dbranch = branches[0]
7034 dbranch = branches[0]
7035 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7035 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7036 if source != dest:
7036 if source != dest:
7037 try:
7037 try:
7038 dother = hg.peer(repo, {}, dest)
7038 dother = hg.peer(repo, {}, dest)
7039 except error.RepoError:
7039 except error.RepoError:
7040 if opts.get(b'remote'):
7040 if opts.get(b'remote'):
7041 raise
7041 raise
7042 return dest, dbranch, None, None
7042 return dest, dbranch, None, None
7043 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7043 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7044 elif sother is None:
7044 elif sother is None:
7045 # there is no explicit destination peer, but source one is invalid
7045 # there is no explicit destination peer, but source one is invalid
7046 return dest, dbranch, None, None
7046 return dest, dbranch, None, None
7047 else:
7047 else:
7048 dother = sother
7048 dother = sother
7049 if source != dest or (sbranch is not None and sbranch != dbranch):
7049 if source != dest or (sbranch is not None and sbranch != dbranch):
7050 common = None
7050 common = None
7051 else:
7051 else:
7052 common = commoninc
7052 common = commoninc
7053 if revs:
7053 if revs:
7054 revs = [repo.lookup(rev) for rev in revs]
7054 revs = [repo.lookup(rev) for rev in revs]
7055 repo.ui.pushbuffer()
7055 repo.ui.pushbuffer()
7056 outgoing = discovery.findcommonoutgoing(
7056 outgoing = discovery.findcommonoutgoing(
7057 repo, dother, onlyheads=revs, commoninc=common
7057 repo, dother, onlyheads=revs, commoninc=common
7058 )
7058 )
7059 repo.ui.popbuffer()
7059 repo.ui.popbuffer()
7060 return dest, dbranch, dother, outgoing
7060 return dest, dbranch, dother, outgoing
7061
7061
7062 if needsoutgoing:
7062 if needsoutgoing:
7063 dest, dbranch, dother, outgoing = getoutgoing()
7063 dest, dbranch, dother, outgoing = getoutgoing()
7064 else:
7064 else:
7065 dest = dbranch = dother = outgoing = None
7065 dest = dbranch = dother = outgoing = None
7066
7066
7067 if opts.get(b'remote'):
7067 if opts.get(b'remote'):
7068 t = []
7068 t = []
7069 if incoming:
7069 if incoming:
7070 t.append(_(b'1 or more incoming'))
7070 t.append(_(b'1 or more incoming'))
7071 o = outgoing.missing
7071 o = outgoing.missing
7072 if o:
7072 if o:
7073 t.append(_(b'%d outgoing') % len(o))
7073 t.append(_(b'%d outgoing') % len(o))
7074 other = dother or sother
7074 other = dother or sother
7075 if b'bookmarks' in other.listkeys(b'namespaces'):
7075 if b'bookmarks' in other.listkeys(b'namespaces'):
7076 counts = bookmarks.summary(repo, other)
7076 counts = bookmarks.summary(repo, other)
7077 if counts[0] > 0:
7077 if counts[0] > 0:
7078 t.append(_(b'%d incoming bookmarks') % counts[0])
7078 t.append(_(b'%d incoming bookmarks') % counts[0])
7079 if counts[1] > 0:
7079 if counts[1] > 0:
7080 t.append(_(b'%d outgoing bookmarks') % counts[1])
7080 t.append(_(b'%d outgoing bookmarks') % counts[1])
7081
7081
7082 if t:
7082 if t:
7083 # i18n: column positioning for "hg summary"
7083 # i18n: column positioning for "hg summary"
7084 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7084 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7085 else:
7085 else:
7086 # i18n: column positioning for "hg summary"
7086 # i18n: column positioning for "hg summary"
7087 ui.status(_(b'remote: (synced)\n'))
7087 ui.status(_(b'remote: (synced)\n'))
7088
7088
7089 cmdutil.summaryremotehooks(
7089 cmdutil.summaryremotehooks(
7090 ui,
7090 ui,
7091 repo,
7091 repo,
7092 opts,
7092 opts,
7093 (
7093 (
7094 (source, sbranch, sother, commoninc),
7094 (source, sbranch, sother, commoninc),
7095 (dest, dbranch, dother, outgoing),
7095 (dest, dbranch, dother, outgoing),
7096 ),
7096 ),
7097 )
7097 )
7098
7098
7099
7099
7100 @command(
7100 @command(
7101 b'tag',
7101 b'tag',
7102 [
7102 [
7103 (b'f', b'force', None, _(b'force tag')),
7103 (b'f', b'force', None, _(b'force tag')),
7104 (b'l', b'local', None, _(b'make the tag local')),
7104 (b'l', b'local', None, _(b'make the tag local')),
7105 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7105 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7106 (b'', b'remove', None, _(b'remove a tag')),
7106 (b'', b'remove', None, _(b'remove a tag')),
7107 # -l/--local is already there, commitopts cannot be used
7107 # -l/--local is already there, commitopts cannot be used
7108 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7108 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7109 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7109 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7110 ]
7110 ]
7111 + commitopts2,
7111 + commitopts2,
7112 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7112 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7113 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7113 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7114 )
7114 )
7115 def tag(ui, repo, name1, *names, **opts):
7115 def tag(ui, repo, name1, *names, **opts):
7116 """add one or more tags for the current or given revision
7116 """add one or more tags for the current or given revision
7117
7117
7118 Name a particular revision using <name>.
7118 Name a particular revision using <name>.
7119
7119
7120 Tags are used to name particular revisions of the repository and are
7120 Tags are used to name particular revisions of the repository and are
7121 very useful to compare different revisions, to go back to significant
7121 very useful to compare different revisions, to go back to significant
7122 earlier versions or to mark branch points as releases, etc. Changing
7122 earlier versions or to mark branch points as releases, etc. Changing
7123 an existing tag is normally disallowed; use -f/--force to override.
7123 an existing tag is normally disallowed; use -f/--force to override.
7124
7124
7125 If no revision is given, the parent of the working directory is
7125 If no revision is given, the parent of the working directory is
7126 used.
7126 used.
7127
7127
7128 To facilitate version control, distribution, and merging of tags,
7128 To facilitate version control, distribution, and merging of tags,
7129 they are stored as a file named ".hgtags" which is managed similarly
7129 they are stored as a file named ".hgtags" which is managed similarly
7130 to other project files and can be hand-edited if necessary. This
7130 to other project files and can be hand-edited if necessary. This
7131 also means that tagging creates a new commit. The file
7131 also means that tagging creates a new commit. The file
7132 ".hg/localtags" is used for local tags (not shared among
7132 ".hg/localtags" is used for local tags (not shared among
7133 repositories).
7133 repositories).
7134
7134
7135 Tag commits are usually made at the head of a branch. If the parent
7135 Tag commits are usually made at the head of a branch. If the parent
7136 of the working directory is not a branch head, :hg:`tag` aborts; use
7136 of the working directory is not a branch head, :hg:`tag` aborts; use
7137 -f/--force to force the tag commit to be based on a non-head
7137 -f/--force to force the tag commit to be based on a non-head
7138 changeset.
7138 changeset.
7139
7139
7140 See :hg:`help dates` for a list of formats valid for -d/--date.
7140 See :hg:`help dates` for a list of formats valid for -d/--date.
7141
7141
7142 Since tag names have priority over branch names during revision
7142 Since tag names have priority over branch names during revision
7143 lookup, using an existing branch name as a tag name is discouraged.
7143 lookup, using an existing branch name as a tag name is discouraged.
7144
7144
7145 Returns 0 on success.
7145 Returns 0 on success.
7146 """
7146 """
7147 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7147 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7148 opts = pycompat.byteskwargs(opts)
7148 opts = pycompat.byteskwargs(opts)
7149 with repo.wlock(), repo.lock():
7149 with repo.wlock(), repo.lock():
7150 rev_ = b"."
7150 rev_ = b"."
7151 names = [t.strip() for t in (name1,) + names]
7151 names = [t.strip() for t in (name1,) + names]
7152 if len(names) != len(set(names)):
7152 if len(names) != len(set(names)):
7153 raise error.InputError(_(b'tag names must be unique'))
7153 raise error.InputError(_(b'tag names must be unique'))
7154 for n in names:
7154 for n in names:
7155 scmutil.checknewlabel(repo, n, b'tag')
7155 scmutil.checknewlabel(repo, n, b'tag')
7156 if not n:
7156 if not n:
7157 raise error.InputError(
7157 raise error.InputError(
7158 _(b'tag names cannot consist entirely of whitespace')
7158 _(b'tag names cannot consist entirely of whitespace')
7159 )
7159 )
7160 if opts.get(b'rev'):
7160 if opts.get(b'rev'):
7161 rev_ = opts[b'rev']
7161 rev_ = opts[b'rev']
7162 message = opts.get(b'message')
7162 message = opts.get(b'message')
7163 if opts.get(b'remove'):
7163 if opts.get(b'remove'):
7164 if opts.get(b'local'):
7164 if opts.get(b'local'):
7165 expectedtype = b'local'
7165 expectedtype = b'local'
7166 else:
7166 else:
7167 expectedtype = b'global'
7167 expectedtype = b'global'
7168
7168
7169 for n in names:
7169 for n in names:
7170 if repo.tagtype(n) == b'global':
7170 if repo.tagtype(n) == b'global':
7171 alltags = tagsmod.findglobaltags(ui, repo)
7171 alltags = tagsmod.findglobaltags(ui, repo)
7172 if alltags[n][0] == nullid:
7172 if alltags[n][0] == nullid:
7173 raise error.InputError(
7173 raise error.InputError(
7174 _(b"tag '%s' is already removed") % n
7174 _(b"tag '%s' is already removed") % n
7175 )
7175 )
7176 if not repo.tagtype(n):
7176 if not repo.tagtype(n):
7177 raise error.InputError(_(b"tag '%s' does not exist") % n)
7177 raise error.InputError(_(b"tag '%s' does not exist") % n)
7178 if repo.tagtype(n) != expectedtype:
7178 if repo.tagtype(n) != expectedtype:
7179 if expectedtype == b'global':
7179 if expectedtype == b'global':
7180 raise error.InputError(
7180 raise error.InputError(
7181 _(b"tag '%s' is not a global tag") % n
7181 _(b"tag '%s' is not a global tag") % n
7182 )
7182 )
7183 else:
7183 else:
7184 raise error.InputError(
7184 raise error.InputError(
7185 _(b"tag '%s' is not a local tag") % n
7185 _(b"tag '%s' is not a local tag") % n
7186 )
7186 )
7187 rev_ = b'null'
7187 rev_ = b'null'
7188 if not message:
7188 if not message:
7189 # we don't translate commit messages
7189 # we don't translate commit messages
7190 message = b'Removed tag %s' % b', '.join(names)
7190 message = b'Removed tag %s' % b', '.join(names)
7191 elif not opts.get(b'force'):
7191 elif not opts.get(b'force'):
7192 for n in names:
7192 for n in names:
7193 if n in repo.tags():
7193 if n in repo.tags():
7194 raise error.InputError(
7194 raise error.InputError(
7195 _(b"tag '%s' already exists (use -f to force)") % n
7195 _(b"tag '%s' already exists (use -f to force)") % n
7196 )
7196 )
7197 if not opts.get(b'local'):
7197 if not opts.get(b'local'):
7198 p1, p2 = repo.dirstate.parents()
7198 p1, p2 = repo.dirstate.parents()
7199 if p2 != nullid:
7199 if p2 != nullid:
7200 raise error.StateError(_(b'uncommitted merge'))
7200 raise error.StateError(_(b'uncommitted merge'))
7201 bheads = repo.branchheads()
7201 bheads = repo.branchheads()
7202 if not opts.get(b'force') and bheads and p1 not in bheads:
7202 if not opts.get(b'force') and bheads and p1 not in bheads:
7203 raise error.InputError(
7203 raise error.InputError(
7204 _(
7204 _(
7205 b'working directory is not at a branch head '
7205 b'working directory is not at a branch head '
7206 b'(use -f to force)'
7206 b'(use -f to force)'
7207 )
7207 )
7208 )
7208 )
7209 node = scmutil.revsingle(repo, rev_).node()
7209 node = scmutil.revsingle(repo, rev_).node()
7210
7210
7211 if not message:
7211 if not message:
7212 # we don't translate commit messages
7212 # we don't translate commit messages
7213 message = b'Added tag %s for changeset %s' % (
7213 message = b'Added tag %s for changeset %s' % (
7214 b', '.join(names),
7214 b', '.join(names),
7215 short(node),
7215 short(node),
7216 )
7216 )
7217
7217
7218 date = opts.get(b'date')
7218 date = opts.get(b'date')
7219 if date:
7219 if date:
7220 date = dateutil.parsedate(date)
7220 date = dateutil.parsedate(date)
7221
7221
7222 if opts.get(b'remove'):
7222 if opts.get(b'remove'):
7223 editform = b'tag.remove'
7223 editform = b'tag.remove'
7224 else:
7224 else:
7225 editform = b'tag.add'
7225 editform = b'tag.add'
7226 editor = cmdutil.getcommiteditor(
7226 editor = cmdutil.getcommiteditor(
7227 editform=editform, **pycompat.strkwargs(opts)
7227 editform=editform, **pycompat.strkwargs(opts)
7228 )
7228 )
7229
7229
7230 # don't allow tagging the null rev
7230 # don't allow tagging the null rev
7231 if (
7231 if (
7232 not opts.get(b'remove')
7232 not opts.get(b'remove')
7233 and scmutil.revsingle(repo, rev_).rev() == nullrev
7233 and scmutil.revsingle(repo, rev_).rev() == nullrev
7234 ):
7234 ):
7235 raise error.InputError(_(b"cannot tag null revision"))
7235 raise error.InputError(_(b"cannot tag null revision"))
7236
7236
7237 tagsmod.tag(
7237 tagsmod.tag(
7238 repo,
7238 repo,
7239 names,
7239 names,
7240 node,
7240 node,
7241 message,
7241 message,
7242 opts.get(b'local'),
7242 opts.get(b'local'),
7243 opts.get(b'user'),
7243 opts.get(b'user'),
7244 date,
7244 date,
7245 editor=editor,
7245 editor=editor,
7246 )
7246 )
7247
7247
7248
7248
7249 @command(
7249 @command(
7250 b'tags',
7250 b'tags',
7251 formatteropts,
7251 formatteropts,
7252 b'',
7252 b'',
7253 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7253 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7254 intents={INTENT_READONLY},
7254 intents={INTENT_READONLY},
7255 )
7255 )
7256 def tags(ui, repo, **opts):
7256 def tags(ui, repo, **opts):
7257 """list repository tags
7257 """list repository tags
7258
7258
7259 This lists both regular and local tags. When the -v/--verbose
7259 This lists both regular and local tags. When the -v/--verbose
7260 switch is used, a third column "local" is printed for local tags.
7260 switch is used, a third column "local" is printed for local tags.
7261 When the -q/--quiet switch is used, only the tag name is printed.
7261 When the -q/--quiet switch is used, only the tag name is printed.
7262
7262
7263 .. container:: verbose
7263 .. container:: verbose
7264
7264
7265 Template:
7265 Template:
7266
7266
7267 The following keywords are supported in addition to the common template
7267 The following keywords are supported in addition to the common template
7268 keywords and functions such as ``{tag}``. See also
7268 keywords and functions such as ``{tag}``. See also
7269 :hg:`help templates`.
7269 :hg:`help templates`.
7270
7270
7271 :type: String. ``local`` for local tags.
7271 :type: String. ``local`` for local tags.
7272
7272
7273 Returns 0 on success.
7273 Returns 0 on success.
7274 """
7274 """
7275
7275
7276 opts = pycompat.byteskwargs(opts)
7276 opts = pycompat.byteskwargs(opts)
7277 ui.pager(b'tags')
7277 ui.pager(b'tags')
7278 fm = ui.formatter(b'tags', opts)
7278 fm = ui.formatter(b'tags', opts)
7279 hexfunc = fm.hexfunc
7279 hexfunc = fm.hexfunc
7280
7280
7281 for t, n in reversed(repo.tagslist()):
7281 for t, n in reversed(repo.tagslist()):
7282 hn = hexfunc(n)
7282 hn = hexfunc(n)
7283 label = b'tags.normal'
7283 label = b'tags.normal'
7284 tagtype = b''
7284 tagtype = b''
7285 if repo.tagtype(t) == b'local':
7285 if repo.tagtype(t) == b'local':
7286 label = b'tags.local'
7286 label = b'tags.local'
7287 tagtype = b'local'
7287 tagtype = b'local'
7288
7288
7289 fm.startitem()
7289 fm.startitem()
7290 fm.context(repo=repo)
7290 fm.context(repo=repo)
7291 fm.write(b'tag', b'%s', t, label=label)
7291 fm.write(b'tag', b'%s', t, label=label)
7292 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7292 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7293 fm.condwrite(
7293 fm.condwrite(
7294 not ui.quiet,
7294 not ui.quiet,
7295 b'rev node',
7295 b'rev node',
7296 fmt,
7296 fmt,
7297 repo.changelog.rev(n),
7297 repo.changelog.rev(n),
7298 hn,
7298 hn,
7299 label=label,
7299 label=label,
7300 )
7300 )
7301 fm.condwrite(
7301 fm.condwrite(
7302 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7302 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7303 )
7303 )
7304 fm.plain(b'\n')
7304 fm.plain(b'\n')
7305 fm.end()
7305 fm.end()
7306
7306
7307
7307
7308 @command(
7308 @command(
7309 b'tip',
7309 b'tip',
7310 [
7310 [
7311 (b'p', b'patch', None, _(b'show patch')),
7311 (b'p', b'patch', None, _(b'show patch')),
7312 (b'g', b'git', None, _(b'use git extended diff format')),
7312 (b'g', b'git', None, _(b'use git extended diff format')),
7313 ]
7313 ]
7314 + templateopts,
7314 + templateopts,
7315 _(b'[-p] [-g]'),
7315 _(b'[-p] [-g]'),
7316 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7316 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7317 )
7317 )
7318 def tip(ui, repo, **opts):
7318 def tip(ui, repo, **opts):
7319 """show the tip revision (DEPRECATED)
7319 """show the tip revision (DEPRECATED)
7320
7320
7321 The tip revision (usually just called the tip) is the changeset
7321 The tip revision (usually just called the tip) is the changeset
7322 most recently added to the repository (and therefore the most
7322 most recently added to the repository (and therefore the most
7323 recently changed head).
7323 recently changed head).
7324
7324
7325 If you have just made a commit, that commit will be the tip. If
7325 If you have just made a commit, that commit will be the tip. If
7326 you have just pulled changes from another repository, the tip of
7326 you have just pulled changes from another repository, the tip of
7327 that repository becomes the current tip. The "tip" tag is special
7327 that repository becomes the current tip. The "tip" tag is special
7328 and cannot be renamed or assigned to a different changeset.
7328 and cannot be renamed or assigned to a different changeset.
7329
7329
7330 This command is deprecated, please use :hg:`heads` instead.
7330 This command is deprecated, please use :hg:`heads` instead.
7331
7331
7332 Returns 0 on success.
7332 Returns 0 on success.
7333 """
7333 """
7334 opts = pycompat.byteskwargs(opts)
7334 opts = pycompat.byteskwargs(opts)
7335 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7335 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7336 displayer.show(repo[b'tip'])
7336 displayer.show(repo[b'tip'])
7337 displayer.close()
7337 displayer.close()
7338
7338
7339
7339
7340 @command(
7340 @command(
7341 b'unbundle',
7341 b'unbundle',
7342 [
7342 [
7343 (
7343 (
7344 b'u',
7344 b'u',
7345 b'update',
7345 b'update',
7346 None,
7346 None,
7347 _(b'update to new branch head if changesets were unbundled'),
7347 _(b'update to new branch head if changesets were unbundled'),
7348 )
7348 )
7349 ],
7349 ],
7350 _(b'[-u] FILE...'),
7350 _(b'[-u] FILE...'),
7351 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7351 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7352 )
7352 )
7353 def unbundle(ui, repo, fname1, *fnames, **opts):
7353 def unbundle(ui, repo, fname1, *fnames, **opts):
7354 """apply one or more bundle files
7354 """apply one or more bundle files
7355
7355
7356 Apply one or more bundle files generated by :hg:`bundle`.
7356 Apply one or more bundle files generated by :hg:`bundle`.
7357
7357
7358 Returns 0 on success, 1 if an update has unresolved files.
7358 Returns 0 on success, 1 if an update has unresolved files.
7359 """
7359 """
7360 fnames = (fname1,) + fnames
7360 fnames = (fname1,) + fnames
7361
7361
7362 with repo.lock():
7362 with repo.lock():
7363 for fname in fnames:
7363 for fname in fnames:
7364 f = hg.openpath(ui, fname)
7364 f = hg.openpath(ui, fname)
7365 gen = exchange.readbundle(ui, f, fname)
7365 gen = exchange.readbundle(ui, f, fname)
7366 if isinstance(gen, streamclone.streamcloneapplier):
7366 if isinstance(gen, streamclone.streamcloneapplier):
7367 raise error.InputError(
7367 raise error.InputError(
7368 _(
7368 _(
7369 b'packed bundles cannot be applied with '
7369 b'packed bundles cannot be applied with '
7370 b'"hg unbundle"'
7370 b'"hg unbundle"'
7371 ),
7371 ),
7372 hint=_(b'use "hg debugapplystreamclonebundle"'),
7372 hint=_(b'use "hg debugapplystreamclonebundle"'),
7373 )
7373 )
7374 url = b'bundle:' + fname
7374 url = b'bundle:' + fname
7375 try:
7375 try:
7376 txnname = b'unbundle'
7376 txnname = b'unbundle'
7377 if not isinstance(gen, bundle2.unbundle20):
7377 if not isinstance(gen, bundle2.unbundle20):
7378 txnname = b'unbundle\n%s' % util.hidepassword(url)
7378 txnname = b'unbundle\n%s' % util.hidepassword(url)
7379 with repo.transaction(txnname) as tr:
7379 with repo.transaction(txnname) as tr:
7380 op = bundle2.applybundle(
7380 op = bundle2.applybundle(
7381 repo, gen, tr, source=b'unbundle', url=url
7381 repo, gen, tr, source=b'unbundle', url=url
7382 )
7382 )
7383 except error.BundleUnknownFeatureError as exc:
7383 except error.BundleUnknownFeatureError as exc:
7384 raise error.Abort(
7384 raise error.Abort(
7385 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7385 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7386 hint=_(
7386 hint=_(
7387 b"see https://mercurial-scm.org/"
7387 b"see https://mercurial-scm.org/"
7388 b"wiki/BundleFeature for more "
7388 b"wiki/BundleFeature for more "
7389 b"information"
7389 b"information"
7390 ),
7390 ),
7391 )
7391 )
7392 modheads = bundle2.combinechangegroupresults(op)
7392 modheads = bundle2.combinechangegroupresults(op)
7393
7393
7394 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7394 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7395
7395
7396
7396
7397 @command(
7397 @command(
7398 b'unshelve',
7398 b'unshelve',
7399 [
7399 [
7400 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7400 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7401 (
7401 (
7402 b'c',
7402 b'c',
7403 b'continue',
7403 b'continue',
7404 None,
7404 None,
7405 _(b'continue an incomplete unshelve operation'),
7405 _(b'continue an incomplete unshelve operation'),
7406 ),
7406 ),
7407 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7407 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7408 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7408 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7409 (
7409 (
7410 b'n',
7410 b'n',
7411 b'name',
7411 b'name',
7412 b'',
7412 b'',
7413 _(b'restore shelved change with given name'),
7413 _(b'restore shelved change with given name'),
7414 _(b'NAME'),
7414 _(b'NAME'),
7415 ),
7415 ),
7416 (b't', b'tool', b'', _(b'specify merge tool')),
7416 (b't', b'tool', b'', _(b'specify merge tool')),
7417 (
7417 (
7418 b'',
7418 b'',
7419 b'date',
7419 b'date',
7420 b'',
7420 b'',
7421 _(b'set date for temporary commits (DEPRECATED)'),
7421 _(b'set date for temporary commits (DEPRECATED)'),
7422 _(b'DATE'),
7422 _(b'DATE'),
7423 ),
7423 ),
7424 ],
7424 ],
7425 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7425 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7426 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7426 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7427 )
7427 )
7428 def unshelve(ui, repo, *shelved, **opts):
7428 def unshelve(ui, repo, *shelved, **opts):
7429 """restore a shelved change to the working directory
7429 """restore a shelved change to the working directory
7430
7430
7431 This command accepts an optional name of a shelved change to
7431 This command accepts an optional name of a shelved change to
7432 restore. If none is given, the most recent shelved change is used.
7432 restore. If none is given, the most recent shelved change is used.
7433
7433
7434 If a shelved change is applied successfully, the bundle that
7434 If a shelved change is applied successfully, the bundle that
7435 contains the shelved changes is moved to a backup location
7435 contains the shelved changes is moved to a backup location
7436 (.hg/shelve-backup).
7436 (.hg/shelve-backup).
7437
7437
7438 Since you can restore a shelved change on top of an arbitrary
7438 Since you can restore a shelved change on top of an arbitrary
7439 commit, it is possible that unshelving will result in a conflict
7439 commit, it is possible that unshelving will result in a conflict
7440 between your changes and the commits you are unshelving onto. If
7440 between your changes and the commits you are unshelving onto. If
7441 this occurs, you must resolve the conflict, then use
7441 this occurs, you must resolve the conflict, then use
7442 ``--continue`` to complete the unshelve operation. (The bundle
7442 ``--continue`` to complete the unshelve operation. (The bundle
7443 will not be moved until you successfully complete the unshelve.)
7443 will not be moved until you successfully complete the unshelve.)
7444
7444
7445 (Alternatively, you can use ``--abort`` to abandon an unshelve
7445 (Alternatively, you can use ``--abort`` to abandon an unshelve
7446 that causes a conflict. This reverts the unshelved changes, and
7446 that causes a conflict. This reverts the unshelved changes, and
7447 leaves the bundle in place.)
7447 leaves the bundle in place.)
7448
7448
7449 If bare shelved change (without interactive, include and exclude
7449 If bare shelved change (without interactive, include and exclude
7450 option) was done on newly created branch it would restore branch
7450 option) was done on newly created branch it would restore branch
7451 information to the working directory.
7451 information to the working directory.
7452
7452
7453 After a successful unshelve, the shelved changes are stored in a
7453 After a successful unshelve, the shelved changes are stored in a
7454 backup directory. Only the N most recent backups are kept. N
7454 backup directory. Only the N most recent backups are kept. N
7455 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7455 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7456 configuration option.
7456 configuration option.
7457
7457
7458 .. container:: verbose
7458 .. container:: verbose
7459
7459
7460 Timestamp in seconds is used to decide order of backups. More
7460 Timestamp in seconds is used to decide order of backups. More
7461 than ``maxbackups`` backups are kept, if same timestamp
7461 than ``maxbackups`` backups are kept, if same timestamp
7462 prevents from deciding exact order of them, for safety.
7462 prevents from deciding exact order of them, for safety.
7463
7463
7464 Selected changes can be unshelved with ``--interactive`` flag.
7464 Selected changes can be unshelved with ``--interactive`` flag.
7465 The working directory is updated with the selected changes, and
7465 The working directory is updated with the selected changes, and
7466 only the unselected changes remain shelved.
7466 only the unselected changes remain shelved.
7467 Note: The whole shelve is applied to working directory first before
7467 Note: The whole shelve is applied to working directory first before
7468 running interactively. So, this will bring up all the conflicts between
7468 running interactively. So, this will bring up all the conflicts between
7469 working directory and the shelve, irrespective of which changes will be
7469 working directory and the shelve, irrespective of which changes will be
7470 unshelved.
7470 unshelved.
7471 """
7471 """
7472 with repo.wlock():
7472 with repo.wlock():
7473 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7473 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7474
7474
7475
7475
7476 statemod.addunfinished(
7476 statemod.addunfinished(
7477 b'unshelve',
7477 b'unshelve',
7478 fname=b'shelvedstate',
7478 fname=b'shelvedstate',
7479 continueflag=True,
7479 continueflag=True,
7480 abortfunc=shelvemod.hgabortunshelve,
7480 abortfunc=shelvemod.hgabortunshelve,
7481 continuefunc=shelvemod.hgcontinueunshelve,
7481 continuefunc=shelvemod.hgcontinueunshelve,
7482 cmdmsg=_(b'unshelve already in progress'),
7482 cmdmsg=_(b'unshelve already in progress'),
7483 )
7483 )
7484
7484
7485
7485
7486 @command(
7486 @command(
7487 b'update|up|checkout|co',
7487 b'update|up|checkout|co',
7488 [
7488 [
7489 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7489 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7490 (b'c', b'check', None, _(b'require clean working directory')),
7490 (b'c', b'check', None, _(b'require clean working directory')),
7491 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7491 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7492 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7492 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7493 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7493 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7494 ]
7494 ]
7495 + mergetoolopts,
7495 + mergetoolopts,
7496 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7496 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7497 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7497 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7498 helpbasic=True,
7498 helpbasic=True,
7499 )
7499 )
7500 def update(ui, repo, node=None, **opts):
7500 def update(ui, repo, node=None, **opts):
7501 """update working directory (or switch revisions)
7501 """update working directory (or switch revisions)
7502
7502
7503 Update the repository's working directory to the specified
7503 Update the repository's working directory to the specified
7504 changeset. If no changeset is specified, update to the tip of the
7504 changeset. If no changeset is specified, update to the tip of the
7505 current named branch and move the active bookmark (see :hg:`help
7505 current named branch and move the active bookmark (see :hg:`help
7506 bookmarks`).
7506 bookmarks`).
7507
7507
7508 Update sets the working directory's parent revision to the specified
7508 Update sets the working directory's parent revision to the specified
7509 changeset (see :hg:`help parents`).
7509 changeset (see :hg:`help parents`).
7510
7510
7511 If the changeset is not a descendant or ancestor of the working
7511 If the changeset is not a descendant or ancestor of the working
7512 directory's parent and there are uncommitted changes, the update is
7512 directory's parent and there are uncommitted changes, the update is
7513 aborted. With the -c/--check option, the working directory is checked
7513 aborted. With the -c/--check option, the working directory is checked
7514 for uncommitted changes; if none are found, the working directory is
7514 for uncommitted changes; if none are found, the working directory is
7515 updated to the specified changeset.
7515 updated to the specified changeset.
7516
7516
7517 .. container:: verbose
7517 .. container:: verbose
7518
7518
7519 The -C/--clean, -c/--check, and -m/--merge options control what
7519 The -C/--clean, -c/--check, and -m/--merge options control what
7520 happens if the working directory contains uncommitted changes.
7520 happens if the working directory contains uncommitted changes.
7521 At most of one of them can be specified.
7521 At most of one of them can be specified.
7522
7522
7523 1. If no option is specified, and if
7523 1. If no option is specified, and if
7524 the requested changeset is an ancestor or descendant of
7524 the requested changeset is an ancestor or descendant of
7525 the working directory's parent, the uncommitted changes
7525 the working directory's parent, the uncommitted changes
7526 are merged into the requested changeset and the merged
7526 are merged into the requested changeset and the merged
7527 result is left uncommitted. If the requested changeset is
7527 result is left uncommitted. If the requested changeset is
7528 not an ancestor or descendant (that is, it is on another
7528 not an ancestor or descendant (that is, it is on another
7529 branch), the update is aborted and the uncommitted changes
7529 branch), the update is aborted and the uncommitted changes
7530 are preserved.
7530 are preserved.
7531
7531
7532 2. With the -m/--merge option, the update is allowed even if the
7532 2. With the -m/--merge option, the update is allowed even if the
7533 requested changeset is not an ancestor or descendant of
7533 requested changeset is not an ancestor or descendant of
7534 the working directory's parent.
7534 the working directory's parent.
7535
7535
7536 3. With the -c/--check option, the update is aborted and the
7536 3. With the -c/--check option, the update is aborted and the
7537 uncommitted changes are preserved.
7537 uncommitted changes are preserved.
7538
7538
7539 4. With the -C/--clean option, uncommitted changes are discarded and
7539 4. With the -C/--clean option, uncommitted changes are discarded and
7540 the working directory is updated to the requested changeset.
7540 the working directory is updated to the requested changeset.
7541
7541
7542 To cancel an uncommitted merge (and lose your changes), use
7542 To cancel an uncommitted merge (and lose your changes), use
7543 :hg:`merge --abort`.
7543 :hg:`merge --abort`.
7544
7544
7545 Use null as the changeset to remove the working directory (like
7545 Use null as the changeset to remove the working directory (like
7546 :hg:`clone -U`).
7546 :hg:`clone -U`).
7547
7547
7548 If you want to revert just one file to an older revision, use
7548 If you want to revert just one file to an older revision, use
7549 :hg:`revert [-r REV] NAME`.
7549 :hg:`revert [-r REV] NAME`.
7550
7550
7551 See :hg:`help dates` for a list of formats valid for -d/--date.
7551 See :hg:`help dates` for a list of formats valid for -d/--date.
7552
7552
7553 Returns 0 on success, 1 if there are unresolved files.
7553 Returns 0 on success, 1 if there are unresolved files.
7554 """
7554 """
7555 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7555 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7556 rev = opts.get('rev')
7556 rev = opts.get('rev')
7557 date = opts.get('date')
7557 date = opts.get('date')
7558 clean = opts.get('clean')
7558 clean = opts.get('clean')
7559 check = opts.get('check')
7559 check = opts.get('check')
7560 merge = opts.get('merge')
7560 merge = opts.get('merge')
7561 if rev and node:
7561 if rev and node:
7562 raise error.InputError(_(b"please specify just one revision"))
7562 raise error.InputError(_(b"please specify just one revision"))
7563
7563
7564 if ui.configbool(b'commands', b'update.requiredest'):
7564 if ui.configbool(b'commands', b'update.requiredest'):
7565 if not node and not rev and not date:
7565 if not node and not rev and not date:
7566 raise error.InputError(
7566 raise error.InputError(
7567 _(b'you must specify a destination'),
7567 _(b'you must specify a destination'),
7568 hint=_(b'for example: hg update ".::"'),
7568 hint=_(b'for example: hg update ".::"'),
7569 )
7569 )
7570
7570
7571 if rev is None or rev == b'':
7571 if rev is None or rev == b'':
7572 rev = node
7572 rev = node
7573
7573
7574 if date and rev is not None:
7574 if date and rev is not None:
7575 raise error.InputError(_(b"you can't specify a revision and a date"))
7575 raise error.InputError(_(b"you can't specify a revision and a date"))
7576
7576
7577 updatecheck = None
7577 updatecheck = None
7578 if check:
7578 if check:
7579 updatecheck = b'abort'
7579 updatecheck = b'abort'
7580 elif merge:
7580 elif merge:
7581 updatecheck = b'none'
7581 updatecheck = b'none'
7582
7582
7583 with repo.wlock():
7583 with repo.wlock():
7584 cmdutil.clearunfinished(repo)
7584 cmdutil.clearunfinished(repo)
7585 if date:
7585 if date:
7586 rev = cmdutil.finddate(ui, repo, date)
7586 rev = cmdutil.finddate(ui, repo, date)
7587
7587
7588 # if we defined a bookmark, we have to remember the original name
7588 # if we defined a bookmark, we have to remember the original name
7589 brev = rev
7589 brev = rev
7590 if rev:
7590 if rev:
7591 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7591 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7592 ctx = scmutil.revsingle(repo, rev, default=None)
7592 ctx = scmutil.revsingle(repo, rev, default=None)
7593 rev = ctx.rev()
7593 rev = ctx.rev()
7594 hidden = ctx.hidden()
7594 hidden = ctx.hidden()
7595 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7595 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7596 with ui.configoverride(overrides, b'update'):
7596 with ui.configoverride(overrides, b'update'):
7597 ret = hg.updatetotally(
7597 ret = hg.updatetotally(
7598 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7598 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7599 )
7599 )
7600 if hidden:
7600 if hidden:
7601 ctxstr = ctx.hex()[:12]
7601 ctxstr = ctx.hex()[:12]
7602 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7602 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7603
7603
7604 if ctx.obsolete():
7604 if ctx.obsolete():
7605 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7605 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7606 ui.warn(b"(%s)\n" % obsfatemsg)
7606 ui.warn(b"(%s)\n" % obsfatemsg)
7607 return ret
7607 return ret
7608
7608
7609
7609
7610 @command(
7610 @command(
7611 b'verify',
7611 b'verify',
7612 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7612 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7613 helpcategory=command.CATEGORY_MAINTENANCE,
7613 helpcategory=command.CATEGORY_MAINTENANCE,
7614 )
7614 )
7615 def verify(ui, repo, **opts):
7615 def verify(ui, repo, **opts):
7616 """verify the integrity of the repository
7616 """verify the integrity of the repository
7617
7617
7618 Verify the integrity of the current repository.
7618 Verify the integrity of the current repository.
7619
7619
7620 This will perform an extensive check of the repository's
7620 This will perform an extensive check of the repository's
7621 integrity, validating the hashes and checksums of each entry in
7621 integrity, validating the hashes and checksums of each entry in
7622 the changelog, manifest, and tracked files, as well as the
7622 the changelog, manifest, and tracked files, as well as the
7623 integrity of their crosslinks and indices.
7623 integrity of their crosslinks and indices.
7624
7624
7625 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7625 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7626 for more information about recovery from corruption of the
7626 for more information about recovery from corruption of the
7627 repository.
7627 repository.
7628
7628
7629 Returns 0 on success, 1 if errors are encountered.
7629 Returns 0 on success, 1 if errors are encountered.
7630 """
7630 """
7631 opts = pycompat.byteskwargs(opts)
7631 opts = pycompat.byteskwargs(opts)
7632
7632
7633 level = None
7633 level = None
7634 if opts[b'full']:
7634 if opts[b'full']:
7635 level = verifymod.VERIFY_FULL
7635 level = verifymod.VERIFY_FULL
7636 return hg.verify(repo, level)
7636 return hg.verify(repo, level)
7637
7637
7638
7638
7639 @command(
7639 @command(
7640 b'version',
7640 b'version',
7641 [] + formatteropts,
7641 [] + formatteropts,
7642 helpcategory=command.CATEGORY_HELP,
7642 helpcategory=command.CATEGORY_HELP,
7643 norepo=True,
7643 norepo=True,
7644 intents={INTENT_READONLY},
7644 intents={INTENT_READONLY},
7645 )
7645 )
7646 def version_(ui, **opts):
7646 def version_(ui, **opts):
7647 """output version and copyright information
7647 """output version and copyright information
7648
7648
7649 .. container:: verbose
7649 .. container:: verbose
7650
7650
7651 Template:
7651 Template:
7652
7652
7653 The following keywords are supported. See also :hg:`help templates`.
7653 The following keywords are supported. See also :hg:`help templates`.
7654
7654
7655 :extensions: List of extensions.
7655 :extensions: List of extensions.
7656 :ver: String. Version number.
7656 :ver: String. Version number.
7657
7657
7658 And each entry of ``{extensions}`` provides the following sub-keywords
7658 And each entry of ``{extensions}`` provides the following sub-keywords
7659 in addition to ``{ver}``.
7659 in addition to ``{ver}``.
7660
7660
7661 :bundled: Boolean. True if included in the release.
7661 :bundled: Boolean. True if included in the release.
7662 :name: String. Extension name.
7662 :name: String. Extension name.
7663 """
7663 """
7664 opts = pycompat.byteskwargs(opts)
7664 opts = pycompat.byteskwargs(opts)
7665 if ui.verbose:
7665 if ui.verbose:
7666 ui.pager(b'version')
7666 ui.pager(b'version')
7667 fm = ui.formatter(b"version", opts)
7667 fm = ui.formatter(b"version", opts)
7668 fm.startitem()
7668 fm.startitem()
7669 fm.write(
7669 fm.write(
7670 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7670 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7671 )
7671 )
7672 license = _(
7672 license = _(
7673 b"(see https://mercurial-scm.org for more information)\n"
7673 b"(see https://mercurial-scm.org for more information)\n"
7674 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7674 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7675 b"This is free software; see the source for copying conditions. "
7675 b"This is free software; see the source for copying conditions. "
7676 b"There is NO\nwarranty; "
7676 b"There is NO\nwarranty; "
7677 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7677 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7678 )
7678 )
7679 if not ui.quiet:
7679 if not ui.quiet:
7680 fm.plain(license)
7680 fm.plain(license)
7681
7681
7682 if ui.verbose:
7682 if ui.verbose:
7683 fm.plain(_(b"\nEnabled extensions:\n\n"))
7683 fm.plain(_(b"\nEnabled extensions:\n\n"))
7684 # format names and versions into columns
7684 # format names and versions into columns
7685 names = []
7685 names = []
7686 vers = []
7686 vers = []
7687 isinternals = []
7687 isinternals = []
7688 for name, module in sorted(extensions.extensions()):
7688 for name, module in sorted(extensions.extensions()):
7689 names.append(name)
7689 names.append(name)
7690 vers.append(extensions.moduleversion(module) or None)
7690 vers.append(extensions.moduleversion(module) or None)
7691 isinternals.append(extensions.ismoduleinternal(module))
7691 isinternals.append(extensions.ismoduleinternal(module))
7692 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7692 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7693 if names:
7693 if names:
7694 namefmt = b" %%-%ds " % max(len(n) for n in names)
7694 namefmt = b" %%-%ds " % max(len(n) for n in names)
7695 places = [_(b"external"), _(b"internal")]
7695 places = [_(b"external"), _(b"internal")]
7696 for n, v, p in zip(names, vers, isinternals):
7696 for n, v, p in zip(names, vers, isinternals):
7697 fn.startitem()
7697 fn.startitem()
7698 fn.condwrite(ui.verbose, b"name", namefmt, n)
7698 fn.condwrite(ui.verbose, b"name", namefmt, n)
7699 if ui.verbose:
7699 if ui.verbose:
7700 fn.plain(b"%s " % places[p])
7700 fn.plain(b"%s " % places[p])
7701 fn.data(bundled=p)
7701 fn.data(bundled=p)
7702 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7702 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7703 if ui.verbose:
7703 if ui.verbose:
7704 fn.plain(b"\n")
7704 fn.plain(b"\n")
7705 fn.end()
7705 fn.end()
7706 fm.end()
7706 fm.end()
7707
7707
7708
7708
7709 def loadcmdtable(ui, name, cmdtable):
7709 def loadcmdtable(ui, name, cmdtable):
7710 """Load command functions from specified cmdtable
7710 """Load command functions from specified cmdtable
7711 """
7711 """
7712 overrides = [cmd for cmd in cmdtable if cmd in table]
7712 overrides = [cmd for cmd in cmdtable if cmd in table]
7713 if overrides:
7713 if overrides:
7714 ui.warn(
7714 ui.warn(
7715 _(b"extension '%s' overrides commands: %s\n")
7715 _(b"extension '%s' overrides commands: %s\n")
7716 % (name, b" ".join(overrides))
7716 % (name, b" ".join(overrides))
7717 )
7717 )
7718 table.update(cmdtable)
7718 table.update(cmdtable)
@@ -1,154 +1,154 b''
1 test parents command
1 test parents command
2
2
3 $ hg init repo
3 $ hg init repo
4 $ cd repo
4 $ cd repo
5
5
6 no working directory
6 no working directory
7
7
8 $ hg parents
8 $ hg parents
9
9
10 $ echo a > a
10 $ echo a > a
11 $ echo b > b
11 $ echo b > b
12 $ hg ci -Amab -d '0 0'
12 $ hg ci -Amab -d '0 0'
13 adding a
13 adding a
14 adding b
14 adding b
15 $ echo a >> a
15 $ echo a >> a
16 $ hg ci -Ama -d '1 0'
16 $ hg ci -Ama -d '1 0'
17 $ echo b >> b
17 $ echo b >> b
18 $ hg ci -Amb -d '2 0'
18 $ hg ci -Amb -d '2 0'
19 $ echo c > c
19 $ echo c > c
20 $ hg ci -Amc -d '3 0'
20 $ hg ci -Amc -d '3 0'
21 adding c
21 adding c
22 $ hg up -C 1
22 $ hg up -C 1
23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
24 $ echo d > c
24 $ echo d > c
25 $ hg ci -Amc2 -d '4 0'
25 $ hg ci -Amc2 -d '4 0'
26 adding c
26 adding c
27 created new head
27 created new head
28 $ hg up -C 3
28 $ hg up -C 3
29 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
30
30
31
31
32 $ hg parents
32 $ hg parents
33 changeset: 3:02d851b7e549
33 changeset: 3:02d851b7e549
34 user: test
34 user: test
35 date: Thu Jan 01 00:00:03 1970 +0000
35 date: Thu Jan 01 00:00:03 1970 +0000
36 summary: c
36 summary: c
37
37
38
38
39 $ hg parents a
39 $ hg parents a
40 changeset: 1:d786049f033a
40 changeset: 1:d786049f033a
41 user: test
41 user: test
42 date: Thu Jan 01 00:00:01 1970 +0000
42 date: Thu Jan 01 00:00:01 1970 +0000
43 summary: a
43 summary: a
44
44
45
45
46 hg parents c, single revision
46 hg parents c, single revision
47
47
48 $ hg parents c
48 $ hg parents c
49 changeset: 3:02d851b7e549
49 changeset: 3:02d851b7e549
50 user: test
50 user: test
51 date: Thu Jan 01 00:00:03 1970 +0000
51 date: Thu Jan 01 00:00:03 1970 +0000
52 summary: c
52 summary: c
53
53
54
54
55 $ hg parents -r 3 c
55 $ hg parents -r 3 c
56 abort: 'c' not found in manifest!
56 abort: 'c' not found in manifest
57 [10]
57 [10]
58
58
59 $ hg parents -r 2
59 $ hg parents -r 2
60 changeset: 1:d786049f033a
60 changeset: 1:d786049f033a
61 user: test
61 user: test
62 date: Thu Jan 01 00:00:01 1970 +0000
62 date: Thu Jan 01 00:00:01 1970 +0000
63 summary: a
63 summary: a
64
64
65
65
66 $ hg parents -r 2 a
66 $ hg parents -r 2 a
67 changeset: 1:d786049f033a
67 changeset: 1:d786049f033a
68 user: test
68 user: test
69 date: Thu Jan 01 00:00:01 1970 +0000
69 date: Thu Jan 01 00:00:01 1970 +0000
70 summary: a
70 summary: a
71
71
72
72
73 $ hg parents -r 2 ../a
73 $ hg parents -r 2 ../a
74 abort: ../a not under root '$TESTTMP/repo'
74 abort: ../a not under root '$TESTTMP/repo'
75 [255]
75 [255]
76
76
77
77
78 cd dir; hg parents -r 2 ../a
78 cd dir; hg parents -r 2 ../a
79
79
80 $ mkdir dir
80 $ mkdir dir
81 $ cd dir
81 $ cd dir
82 $ hg parents -r 2 ../a
82 $ hg parents -r 2 ../a
83 changeset: 1:d786049f033a
83 changeset: 1:d786049f033a
84 user: test
84 user: test
85 date: Thu Jan 01 00:00:01 1970 +0000
85 date: Thu Jan 01 00:00:01 1970 +0000
86 summary: a
86 summary: a
87
87
88 $ hg parents -r 2 path:a
88 $ hg parents -r 2 path:a
89 changeset: 1:d786049f033a
89 changeset: 1:d786049f033a
90 user: test
90 user: test
91 date: Thu Jan 01 00:00:01 1970 +0000
91 date: Thu Jan 01 00:00:01 1970 +0000
92 summary: a
92 summary: a
93
93
94 $ cd ..
94 $ cd ..
95
95
96 $ hg parents -r 2 glob:a
96 $ hg parents -r 2 glob:a
97 abort: can only specify an explicit filename
97 abort: can only specify an explicit filename
98 [10]
98 [10]
99
99
100
100
101 merge working dir with 2 parents, hg parents c
101 merge working dir with 2 parents, hg parents c
102
102
103 $ HGMERGE=true hg merge
103 $ HGMERGE=true hg merge
104 merging c
104 merging c
105 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
105 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
106 (branch merge, don't forget to commit)
106 (branch merge, don't forget to commit)
107 $ hg parents c
107 $ hg parents c
108 changeset: 3:02d851b7e549
108 changeset: 3:02d851b7e549
109 user: test
109 user: test
110 date: Thu Jan 01 00:00:03 1970 +0000
110 date: Thu Jan 01 00:00:03 1970 +0000
111 summary: c
111 summary: c
112
112
113 changeset: 4:48cee28d4b4e
113 changeset: 4:48cee28d4b4e
114 tag: tip
114 tag: tip
115 parent: 1:d786049f033a
115 parent: 1:d786049f033a
116 user: test
116 user: test
117 date: Thu Jan 01 00:00:04 1970 +0000
117 date: Thu Jan 01 00:00:04 1970 +0000
118 summary: c2
118 summary: c2
119
119
120
120
121
121
122 merge working dir with 1 parent, hg parents
122 merge working dir with 1 parent, hg parents
123
123
124 $ hg up -C 2
124 $ hg up -C 2
125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
126 $ HGMERGE=true hg merge -r 4
126 $ HGMERGE=true hg merge -r 4
127 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
127 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
128 (branch merge, don't forget to commit)
128 (branch merge, don't forget to commit)
129 $ hg parents
129 $ hg parents
130 changeset: 2:6cfac479f009
130 changeset: 2:6cfac479f009
131 user: test
131 user: test
132 date: Thu Jan 01 00:00:02 1970 +0000
132 date: Thu Jan 01 00:00:02 1970 +0000
133 summary: b
133 summary: b
134
134
135 changeset: 4:48cee28d4b4e
135 changeset: 4:48cee28d4b4e
136 tag: tip
136 tag: tip
137 parent: 1:d786049f033a
137 parent: 1:d786049f033a
138 user: test
138 user: test
139 date: Thu Jan 01 00:00:04 1970 +0000
139 date: Thu Jan 01 00:00:04 1970 +0000
140 summary: c2
140 summary: c2
141
141
142
142
143 merge working dir with 1 parent, hg parents c
143 merge working dir with 1 parent, hg parents c
144
144
145 $ hg parents c
145 $ hg parents c
146 changeset: 4:48cee28d4b4e
146 changeset: 4:48cee28d4b4e
147 tag: tip
147 tag: tip
148 parent: 1:d786049f033a
148 parent: 1:d786049f033a
149 user: test
149 user: test
150 date: Thu Jan 01 00:00:04 1970 +0000
150 date: Thu Jan 01 00:00:04 1970 +0000
151 summary: c2
151 summary: c2
152
152
153
153
154 $ cd ..
154 $ cd ..
@@ -1,280 +1,280 b''
1 #require no-windows
1 #require no-windows
2
2
3 $ . "$TESTDIR/remotefilelog-library.sh"
3 $ . "$TESTDIR/remotefilelog-library.sh"
4
4
5 $ hg init master
5 $ hg init master
6 $ cd master
6 $ cd master
7 $ cat >> .hg/hgrc <<EOF
7 $ cat >> .hg/hgrc <<EOF
8 > [remotefilelog]
8 > [remotefilelog]
9 > server=True
9 > server=True
10 > EOF
10 > EOF
11 $ echo x > x
11 $ echo x > x
12 $ echo z > z
12 $ echo z > z
13 $ hg commit -qAm x
13 $ hg commit -qAm x
14 $ echo x2 > x
14 $ echo x2 > x
15 $ echo y > y
15 $ echo y > y
16 $ hg commit -qAm y
16 $ hg commit -qAm y
17 $ hg bookmark foo
17 $ hg bookmark foo
18
18
19 $ cd ..
19 $ cd ..
20
20
21 # prefetch a revision
21 # prefetch a revision
22
22
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
23 $ hgcloneshallow ssh://user@dummy/master shallow --noupdate
24 streaming all changes
24 streaming all changes
25 2 files to transfer, 528 bytes of data
25 2 files to transfer, 528 bytes of data
26 transferred 528 bytes in * seconds (*/sec) (glob)
26 transferred 528 bytes in * seconds (*/sec) (glob)
27 searching for changes
27 searching for changes
28 no changes found
28 no changes found
29 $ cd shallow
29 $ cd shallow
30
30
31 $ hg prefetch -r 0
31 $ hg prefetch -r 0
32 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
32 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
33
33
34 $ hg cat -r 0 x
34 $ hg cat -r 0 x
35 x
35 x
36
36
37 # prefetch with base
37 # prefetch with base
38
38
39 $ clearcache
39 $ clearcache
40 $ hg prefetch -r 0::1 -b 0
40 $ hg prefetch -r 0::1 -b 0
41 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
41 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
42
42
43 $ hg cat -r 1 x
43 $ hg cat -r 1 x
44 x2
44 x2
45 $ hg cat -r 1 y
45 $ hg cat -r 1 y
46 y
46 y
47
47
48 $ hg cat -r 0 x
48 $ hg cat -r 0 x
49 x
49 x
50 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
50 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
51
51
52 $ hg cat -r 0 z
52 $ hg cat -r 0 z
53 z
53 z
54 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
54 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
55
55
56 $ hg prefetch -r 0::1 --base 0
56 $ hg prefetch -r 0::1 --base 0
57 $ hg prefetch -r 0::1 -b 1
57 $ hg prefetch -r 0::1 -b 1
58 $ hg prefetch -r 0::1
58 $ hg prefetch -r 0::1
59
59
60 # prefetch a range of revisions
60 # prefetch a range of revisions
61
61
62 $ clearcache
62 $ clearcache
63 $ hg prefetch -r 0::1
63 $ hg prefetch -r 0::1
64 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over *s (glob)
64 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over *s (glob)
65
65
66 $ hg cat -r 0 x
66 $ hg cat -r 0 x
67 x
67 x
68 $ hg cat -r 1 x
68 $ hg cat -r 1 x
69 x2
69 x2
70
70
71 # prefetch certain files
71 # prefetch certain files
72
72
73 $ clearcache
73 $ clearcache
74 $ hg prefetch -r 1 x
74 $ hg prefetch -r 1 x
75 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
75 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
76
76
77 $ hg cat -r 1 x
77 $ hg cat -r 1 x
78 x2
78 x2
79
79
80 $ hg cat -r 1 y
80 $ hg cat -r 1 y
81 y
81 y
82 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
82 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
83
83
84 # prefetch on pull when configured
84 # prefetch on pull when configured
85
85
86 $ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc
86 $ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc
87 $ hg strip tip
87 $ hg strip tip
88 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
88 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
89
89
90 $ clearcache
90 $ clearcache
91 $ hg pull
91 $ hg pull
92 pulling from ssh://user@dummy/master
92 pulling from ssh://user@dummy/master
93 searching for changes
93 searching for changes
94 adding changesets
94 adding changesets
95 adding manifests
95 adding manifests
96 adding file changes
96 adding file changes
97 updating bookmark foo
97 updating bookmark foo
98 added 1 changesets with 0 changes to 0 files
98 added 1 changesets with 0 changes to 0 files
99 new changesets 109c3a557a73
99 new changesets 109c3a557a73
100 (run 'hg update' to get a working copy)
100 (run 'hg update' to get a working copy)
101 prefetching file contents
101 prefetching file contents
102 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
102 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
103
103
104 $ hg up tip
104 $ hg up tip
105 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
105 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
106
106
107 # prefetch only fetches changes not in working copy
107 # prefetch only fetches changes not in working copy
108
108
109 $ hg strip tip
109 $ hg strip tip
110 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
110 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
111 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
111 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
112 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
112 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
113 $ clearcache
113 $ clearcache
114
114
115 $ hg pull
115 $ hg pull
116 pulling from ssh://user@dummy/master
116 pulling from ssh://user@dummy/master
117 searching for changes
117 searching for changes
118 adding changesets
118 adding changesets
119 adding manifests
119 adding manifests
120 adding file changes
120 adding file changes
121 updating bookmark foo
121 updating bookmark foo
122 added 1 changesets with 0 changes to 0 files
122 added 1 changesets with 0 changes to 0 files
123 new changesets 109c3a557a73
123 new changesets 109c3a557a73
124 (run 'hg update' to get a working copy)
124 (run 'hg update' to get a working copy)
125 prefetching file contents
125 prefetching file contents
126 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
126 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
127
127
128 # Make some local commits that produce the same file versions as are on the
128 # Make some local commits that produce the same file versions as are on the
129 # server. To simulate a situation where we have local commits that were somehow
129 # server. To simulate a situation where we have local commits that were somehow
130 # pushed, and we will soon pull.
130 # pushed, and we will soon pull.
131
131
132 $ hg prefetch -r 'all()'
132 $ hg prefetch -r 'all()'
133 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
133 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
134 $ hg strip -q -r 0
134 $ hg strip -q -r 0
135 $ echo x > x
135 $ echo x > x
136 $ echo z > z
136 $ echo z > z
137 $ hg commit -qAm x
137 $ hg commit -qAm x
138 $ echo x2 > x
138 $ echo x2 > x
139 $ echo y > y
139 $ echo y > y
140 $ hg commit -qAm y
140 $ hg commit -qAm y
141
141
142 # prefetch server versions, even if local versions are available
142 # prefetch server versions, even if local versions are available
143
143
144 $ clearcache
144 $ clearcache
145 $ hg strip -q tip
145 $ hg strip -q tip
146 $ hg pull
146 $ hg pull
147 pulling from ssh://user@dummy/master
147 pulling from ssh://user@dummy/master
148 searching for changes
148 searching for changes
149 adding changesets
149 adding changesets
150 adding manifests
150 adding manifests
151 adding file changes
151 adding file changes
152 updating bookmark foo
152 updating bookmark foo
153 added 1 changesets with 0 changes to 0 files
153 added 1 changesets with 0 changes to 0 files
154 new changesets 109c3a557a73
154 new changesets 109c3a557a73
155 1 local changesets published (?)
155 1 local changesets published (?)
156 (run 'hg update' to get a working copy)
156 (run 'hg update' to get a working copy)
157 prefetching file contents
157 prefetching file contents
158 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
158 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
159
159
160 $ cd ..
160 $ cd ..
161
161
162 # Prefetch unknown files during checkout
162 # Prefetch unknown files during checkout
163
163
164 $ hgcloneshallow ssh://user@dummy/master shallow2
164 $ hgcloneshallow ssh://user@dummy/master shallow2
165 streaming all changes
165 streaming all changes
166 2 files to transfer, 528 bytes of data
166 2 files to transfer, 528 bytes of data
167 transferred 528 bytes in * seconds * (glob)
167 transferred 528 bytes in * seconds * (glob)
168 searching for changes
168 searching for changes
169 no changes found
169 no changes found
170 updating to branch default
170 updating to branch default
171 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
171 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
172 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
172 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
173 $ cd shallow2
173 $ cd shallow2
174 $ hg up -q null
174 $ hg up -q null
175 $ echo x > x
175 $ echo x > x
176 $ echo y > y
176 $ echo y > y
177 $ echo z > z
177 $ echo z > z
178 $ clearcache
178 $ clearcache
179 $ hg up tip
179 $ hg up tip
180 x: untracked file differs
180 x: untracked file differs
181 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
181 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
182 abort: untracked files in working directory differ from files in requested revision
182 abort: untracked files in working directory differ from files in requested revision
183 [255]
183 [255]
184 $ hg revert --all
184 $ hg revert --all
185
185
186 # Test batch fetching of lookup files during hg status
186 # Test batch fetching of lookup files during hg status
187 $ hg up --clean tip
187 $ hg up --clean tip
188 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
188 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
189 $ hg debugrebuilddirstate
189 $ hg debugrebuilddirstate
190 $ clearcache
190 $ clearcache
191 $ hg status
191 $ hg status
192 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
192 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
193
193
194 # Prefetch during addrename detection
194 # Prefetch during addrename detection
195 $ hg up -q --clean tip
195 $ hg up -q --clean tip
196 $ hg revert --all
196 $ hg revert --all
197 $ mv x x2
197 $ mv x x2
198 $ mv y y2
198 $ mv y y2
199 $ mv z z2
199 $ mv z z2
200 $ echo a > a
200 $ echo a > a
201 $ hg add a
201 $ hg add a
202 $ rm a
202 $ rm a
203 $ clearcache
203 $ clearcache
204 $ hg addremove -s 50 > /dev/null
204 $ hg addremove -s 50 > /dev/null
205 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
205 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
206 $ hg revert --all
206 $ hg revert --all
207 forgetting x2
207 forgetting x2
208 forgetting y2
208 forgetting y2
209 forgetting z2
209 forgetting z2
210 undeleting x
210 undeleting x
211 undeleting y
211 undeleting y
212 undeleting z
212 undeleting z
213
213
214
214
215 # Revert across double renames. Note: the scary "abort", error is because
215 # Revert across double renames. Note: the scary "abort", error is because
216 # https://bz.mercurial-scm.org/5419 .
216 # https://bz.mercurial-scm.org/5419 .
217
217
218 $ cd ../master
218 $ cd ../master
219 $ hg mv z z2
219 $ hg mv z z2
220 $ hg commit -m 'move z -> z2'
220 $ hg commit -m 'move z -> z2'
221 $ cd ../shallow2
221 $ cd ../shallow2
222 $ hg pull -q
222 $ hg pull -q
223 $ clearcache
223 $ clearcache
224 $ hg mv y y2
224 $ hg mv y y2
225 y2: not overwriting - file exists
225 y2: not overwriting - file exists
226 ('hg rename --after' to record the rename)
226 ('hg rename --after' to record the rename)
227 [1]
227 [1]
228 $ hg mv x x2
228 $ hg mv x x2
229 x2: not overwriting - file exists
229 x2: not overwriting - file exists
230 ('hg rename --after' to record the rename)
230 ('hg rename --after' to record the rename)
231 [1]
231 [1]
232 $ hg mv z2 z3
232 $ hg mv z2 z3
233 z2: not copying - file is not managed
233 z2: not copying - file is not managed
234 abort: no files to copy
234 abort: no files to copy
235 [10]
235 [10]
236 $ find $CACHEDIR -type f | sort
236 $ find $CACHEDIR -type f | sort
237 .. The following output line about files fetches is globed because it is
237 .. The following output line about files fetches is globed because it is
238 .. flaky, the core the test is checked when checking the cache dir, so
238 .. flaky, the core the test is checked when checking the cache dir, so
239 .. hopefully this flakyness is not hiding any actual bug.
239 .. hopefully this flakyness is not hiding any actual bug.
240 $ hg revert -a -r 1 || true
240 $ hg revert -a -r 1 || true
241 ? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob)
241 ? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob)
242 abort: z2@109c3a557a73: not found in manifest! (?)
242 abort: z2@109c3a557a73: not found in manifest (?)
243 $ find $CACHEDIR -type f | sort
243 $ find $CACHEDIR -type f | sort
244 $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0
244 $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0
245 $TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a
245 $TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a
246 $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca
246 $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca
247 $TESTTMP/hgcache/repos
247 $TESTTMP/hgcache/repos
248
248
249 # warning when we have excess remotefilelog fetching
249 # warning when we have excess remotefilelog fetching
250
250
251 $ cat > repeated_fetch.py << EOF
251 $ cat > repeated_fetch.py << EOF
252 > import binascii
252 > import binascii
253 > from mercurial import extensions, registrar
253 > from mercurial import extensions, registrar
254 > cmdtable = {}
254 > cmdtable = {}
255 > command = registrar.command(cmdtable)
255 > command = registrar.command(cmdtable)
256 > @command(b'repeated-fetch', [], b'', inferrepo=True)
256 > @command(b'repeated-fetch', [], b'', inferrepo=True)
257 > def repeated_fetch(ui, repo, *args, **opts):
257 > def repeated_fetch(ui, repo, *args, **opts):
258 > for i in range(20):
258 > for i in range(20):
259 > try:
259 > try:
260 > hexid = (b'%02x' % (i + 1)) * 20
260 > hexid = (b'%02x' % (i + 1)) * 20
261 > repo.fileservice.prefetch([(b'somefile.txt', hexid)])
261 > repo.fileservice.prefetch([(b'somefile.txt', hexid)])
262 > except Exception:
262 > except Exception:
263 > pass
263 > pass
264 > EOF
264 > EOF
265
265
266 We should only output to the user once. We're ignoring most of the output
266 We should only output to the user once. We're ignoring most of the output
267 because we're not actually fetching anything real here, all the hashes are
267 because we're not actually fetching anything real here, all the hashes are
268 bogus, so it's just going to be errors and a final summary of all the misses.
268 bogus, so it's just going to be errors and a final summary of all the misses.
269 $ hg --config extensions.repeated_fetch=repeated_fetch.py \
269 $ hg --config extensions.repeated_fetch=repeated_fetch.py \
270 > --config remotefilelog.fetchwarning="fetch warning!" \
270 > --config remotefilelog.fetchwarning="fetch warning!" \
271 > --config extensions.blackbox= \
271 > --config extensions.blackbox= \
272 > repeated-fetch 2>&1 | grep 'fetch warning'
272 > repeated-fetch 2>&1 | grep 'fetch warning'
273 fetch warning!
273 fetch warning!
274
274
275 We should output to blackbox three times, with a stack trace on each (though
275 We should output to blackbox three times, with a stack trace on each (though
276 that isn't tested here).
276 that isn't tested here).
277 $ grep 'excess remotefilelog fetching' .hg/blackbox.log
277 $ grep 'excess remotefilelog fetching' .hg/blackbox.log
278 .* excess remotefilelog fetching: (re)
278 .* excess remotefilelog fetching: (re)
279 .* excess remotefilelog fetching: (re)
279 .* excess remotefilelog fetching: (re)
280 .* excess remotefilelog fetching: (re)
280 .* excess remotefilelog fetching: (re)
General Comments 0
You need to be logged in to leave comments. Login now