##// END OF EJS Templates
merge: replace a repo.lookup('.') by more typical repo['.'].node()...
Martin von Zweigbergk -
r44640:293cab97 default
parent child Browse files
Show More
@@ -1,7822 +1,7822
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 (
84 (
85 b'R',
85 b'R',
86 b'repository',
86 b'repository',
87 b'',
87 b'',
88 _(b'repository root directory or name of overlay bundle file'),
88 _(b'repository root directory or name of overlay bundle file'),
89 _(b'REPO'),
89 _(b'REPO'),
90 ),
90 ),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (
92 (
93 b'y',
93 b'y',
94 b'noninteractive',
94 b'noninteractive',
95 None,
95 None,
96 _(
96 _(
97 b'do not prompt, automatically pick the first choice for all prompts'
97 b'do not prompt, automatically pick the first choice for all prompts'
98 ),
98 ),
99 ),
99 ),
100 (b'q', b'quiet', None, _(b'suppress output')),
100 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
102 (
102 (
103 b'',
103 b'',
104 b'color',
104 b'color',
105 b'',
105 b'',
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # and should not be translated
107 # and should not be translated
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b'TYPE'),
109 _(b'TYPE'),
110 ),
110 ),
111 (
111 (
112 b'',
112 b'',
113 b'config',
113 b'config',
114 [],
114 [],
115 _(b'set/override config option (use \'section.name=value\')'),
115 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'CONFIG'),
116 _(b'CONFIG'),
117 ),
117 ),
118 (b'', b'debug', None, _(b'enable debugging output')),
118 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debugger', None, _(b'start debugger')),
119 (b'', b'debugger', None, _(b'start debugger')),
120 (
120 (
121 b'',
121 b'',
122 b'encoding',
122 b'encoding',
123 encoding.encoding,
123 encoding.encoding,
124 _(b'set the charset encoding'),
124 _(b'set the charset encoding'),
125 _(b'ENCODE'),
125 _(b'ENCODE'),
126 ),
126 ),
127 (
127 (
128 b'',
128 b'',
129 b'encodingmode',
129 b'encodingmode',
130 encoding.encodingmode,
130 encoding.encodingmode,
131 _(b'set the charset encoding mode'),
131 _(b'set the charset encoding mode'),
132 _(b'MODE'),
132 _(b'MODE'),
133 ),
133 ),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'time', None, _(b'time how long the command takes')),
135 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'profile', None, _(b'print command execution profile')),
136 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'version', None, _(b'output version information and exit')),
137 (b'', b'version', None, _(b'output version information and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (
140 (
141 b'',
141 b'',
142 b'pager',
142 b'pager',
143 b'auto',
143 b'auto',
144 _(b"when to paginate (boolean, always, auto, or never)"),
144 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b'TYPE'),
145 _(b'TYPE'),
146 ),
146 ),
147 ]
147 ]
148
148
149 dryrunopts = cmdutil.dryrunopts
149 dryrunopts = cmdutil.dryrunopts
150 remoteopts = cmdutil.remoteopts
150 remoteopts = cmdutil.remoteopts
151 walkopts = cmdutil.walkopts
151 walkopts = cmdutil.walkopts
152 commitopts = cmdutil.commitopts
152 commitopts = cmdutil.commitopts
153 commitopts2 = cmdutil.commitopts2
153 commitopts2 = cmdutil.commitopts2
154 commitopts3 = cmdutil.commitopts3
154 commitopts3 = cmdutil.commitopts3
155 formatteropts = cmdutil.formatteropts
155 formatteropts = cmdutil.formatteropts
156 templateopts = cmdutil.templateopts
156 templateopts = cmdutil.templateopts
157 logopts = cmdutil.logopts
157 logopts = cmdutil.logopts
158 diffopts = cmdutil.diffopts
158 diffopts = cmdutil.diffopts
159 diffwsopts = cmdutil.diffwsopts
159 diffwsopts = cmdutil.diffwsopts
160 diffopts2 = cmdutil.diffopts2
160 diffopts2 = cmdutil.diffopts2
161 mergetoolopts = cmdutil.mergetoolopts
161 mergetoolopts = cmdutil.mergetoolopts
162 similarityopts = cmdutil.similarityopts
162 similarityopts = cmdutil.similarityopts
163 subrepoopts = cmdutil.subrepoopts
163 subrepoopts = cmdutil.subrepoopts
164 debugrevlogopts = cmdutil.debugrevlogopts
164 debugrevlogopts = cmdutil.debugrevlogopts
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168
168
169 @command(
169 @command(
170 b'abort',
170 b'abort',
171 dryrunopts,
171 dryrunopts,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpbasic=True,
173 helpbasic=True,
174 )
174 )
175 def abort(ui, repo, **opts):
175 def abort(ui, repo, **opts):
176 """abort an unfinished operation (EXPERIMENTAL)
176 """abort an unfinished operation (EXPERIMENTAL)
177
177
178 Aborts a multistep operation like graft, histedit, rebase, merge,
178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 and unshelve if they are in an unfinished state.
179 and unshelve if they are in an unfinished state.
180
180
181 use --dry-run/-n to dry run the command.
181 use --dry-run/-n to dry run the command.
182 """
182 """
183 dryrun = opts.get('dry_run')
183 dryrun = opts.get('dry_run')
184 abortstate = cmdutil.getunfinishedstate(repo)
184 abortstate = cmdutil.getunfinishedstate(repo)
185 if not abortstate:
185 if not abortstate:
186 raise error.Abort(_(b'no operation in progress'))
186 raise error.Abort(_(b'no operation in progress'))
187 if not abortstate.abortfunc:
187 if not abortstate.abortfunc:
188 raise error.Abort(
188 raise error.Abort(
189 (
189 (
190 _(b"%s in progress but does not support 'hg abort'")
190 _(b"%s in progress but does not support 'hg abort'")
191 % (abortstate._opname)
191 % (abortstate._opname)
192 ),
192 ),
193 hint=abortstate.hint(),
193 hint=abortstate.hint(),
194 )
194 )
195 if dryrun:
195 if dryrun:
196 ui.status(
196 ui.status(
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 )
198 )
199 return
199 return
200 return abortstate.abortfunc(ui, repo)
200 return abortstate.abortfunc(ui, repo)
201
201
202
202
203 @command(
203 @command(
204 b'add',
204 b'add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _(b'[OPTION]... [FILE]...'),
206 _(b'[OPTION]... [FILE]...'),
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpbasic=True,
208 helpbasic=True,
209 inferrepo=True,
209 inferrepo=True,
210 )
210 )
211 def add(ui, repo, *pats, **opts):
211 def add(ui, repo, *pats, **opts):
212 """add the specified files on the next commit
212 """add the specified files on the next commit
213
213
214 Schedule files to be version controlled and added to the
214 Schedule files to be version controlled and added to the
215 repository.
215 repository.
216
216
217 The files will be added to the repository at the next commit. To
217 The files will be added to the repository at the next commit. To
218 undo an add before that, see :hg:`forget`.
218 undo an add before that, see :hg:`forget`.
219
219
220 If no names are given, add all files to the repository (except
220 If no names are given, add all files to the repository (except
221 files matching ``.hgignore``).
221 files matching ``.hgignore``).
222
222
223 .. container:: verbose
223 .. container:: verbose
224
224
225 Examples:
225 Examples:
226
226
227 - New (unknown) files are added
227 - New (unknown) files are added
228 automatically by :hg:`add`::
228 automatically by :hg:`add`::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ? foo.c
233 ? foo.c
234 $ hg add
234 $ hg add
235 adding foo.c
235 adding foo.c
236 $ hg status
236 $ hg status
237 A foo.c
237 A foo.c
238
238
239 - Specific files to be added can be specified::
239 - Specific files to be added can be specified::
240
240
241 $ ls
241 $ ls
242 bar.c foo.c
242 bar.c foo.c
243 $ hg status
243 $ hg status
244 ? bar.c
244 ? bar.c
245 ? foo.c
245 ? foo.c
246 $ hg add bar.c
246 $ hg add bar.c
247 $ hg status
247 $ hg status
248 A bar.c
248 A bar.c
249 ? foo.c
249 ? foo.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253
253
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259
259
260 @command(
260 @command(
261 b'addremove',
261 b'addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _(b'[OPTION]... [FILE]...'),
263 _(b'[OPTION]... [FILE]...'),
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 inferrepo=True,
265 inferrepo=True,
266 )
266 )
267 def addremove(ui, repo, *pats, **opts):
267 def addremove(ui, repo, *pats, **opts):
268 """add all new files, delete all missing files
268 """add all new files, delete all missing files
269
269
270 Add all new files and remove all missing files from the
270 Add all new files and remove all missing files from the
271 repository.
271 repository.
272
272
273 Unless names are given, new files are ignored if they match any of
273 Unless names are given, new files are ignored if they match any of
274 the patterns in ``.hgignore``. As with add, these changes take
274 the patterns in ``.hgignore``. As with add, these changes take
275 effect at the next commit.
275 effect at the next commit.
276
276
277 Use the -s/--similarity option to detect renamed files. This
277 Use the -s/--similarity option to detect renamed files. This
278 option takes a percentage between 0 (disabled) and 100 (files must
278 option takes a percentage between 0 (disabled) and 100 (files must
279 be identical) as its parameter. With a parameter greater than 0,
279 be identical) as its parameter. With a parameter greater than 0,
280 this compares every removed file with every added file and records
280 this compares every removed file with every added file and records
281 those similar enough as renames. Detecting renamed files this way
281 those similar enough as renames. Detecting renamed files this way
282 can be expensive. After using this option, :hg:`status -C` can be
282 can be expensive. After using this option, :hg:`status -C` can be
283 used to check which files were identified as moved or renamed. If
283 used to check which files were identified as moved or renamed. If
284 not specified, -s/--similarity defaults to 100 and only renames of
284 not specified, -s/--similarity defaults to 100 and only renames of
285 identical files are detected.
285 identical files are detected.
286
286
287 .. container:: verbose
287 .. container:: verbose
288
288
289 Examples:
289 Examples:
290
290
291 - A number of files (bar.c and foo.c) are new,
291 - A number of files (bar.c and foo.c) are new,
292 while foobar.c has been removed (without using :hg:`remove`)
292 while foobar.c has been removed (without using :hg:`remove`)
293 from the repository::
293 from the repository::
294
294
295 $ ls
295 $ ls
296 bar.c foo.c
296 bar.c foo.c
297 $ hg status
297 $ hg status
298 ! foobar.c
298 ! foobar.c
299 ? bar.c
299 ? bar.c
300 ? foo.c
300 ? foo.c
301 $ hg addremove
301 $ hg addremove
302 adding bar.c
302 adding bar.c
303 adding foo.c
303 adding foo.c
304 removing foobar.c
304 removing foobar.c
305 $ hg status
305 $ hg status
306 A bar.c
306 A bar.c
307 A foo.c
307 A foo.c
308 R foobar.c
308 R foobar.c
309
309
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 Afterwards, it was edited slightly::
311 Afterwards, it was edited slightly::
312
312
313 $ ls
313 $ ls
314 foo.c
314 foo.c
315 $ hg status
315 $ hg status
316 ! foobar.c
316 ! foobar.c
317 ? foo.c
317 ? foo.c
318 $ hg addremove --similarity 90
318 $ hg addremove --similarity 90
319 removing foobar.c
319 removing foobar.c
320 adding foo.c
320 adding foo.c
321 recording removal of foobar.c as rename to foo.c (94% similar)
321 recording removal of foobar.c as rename to foo.c (94% similar)
322 $ hg status -C
322 $ hg status -C
323 A foo.c
323 A foo.c
324 foobar.c
324 foobar.c
325 R foobar.c
325 R foobar.c
326
326
327 Returns 0 if all files are successfully added.
327 Returns 0 if all files are successfully added.
328 """
328 """
329 opts = pycompat.byteskwargs(opts)
329 opts = pycompat.byteskwargs(opts)
330 if not opts.get(b'similarity'):
330 if not opts.get(b'similarity'):
331 opts[b'similarity'] = b'100'
331 opts[b'similarity'] = b'100'
332 matcher = scmutil.match(repo[None], pats, opts)
332 matcher = scmutil.match(repo[None], pats, opts)
333 relative = scmutil.anypats(pats, opts)
333 relative = scmutil.anypats(pats, opts)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336
336
337
337
338 @command(
338 @command(
339 b'annotate|blame',
339 b'annotate|blame',
340 [
340 [
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (
342 (
343 b'',
343 b'',
344 b'follow',
344 b'follow',
345 None,
345 None,
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 ),
347 ),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'a', b'text', None, _(b'treat all files as text')),
349 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'f', b'file', None, _(b'list the filename')),
351 (b'f', b'file', None, _(b'list the filename')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
355 (
355 (
356 b'l',
356 b'l',
357 b'line-number',
357 b'line-number',
358 None,
358 None,
359 _(b'show line number at the first appearance'),
359 _(b'show line number at the first appearance'),
360 ),
360 ),
361 (
361 (
362 b'',
362 b'',
363 b'skip',
363 b'skip',
364 [],
364 [],
365 _(b'revset to not display (EXPERIMENTAL)'),
365 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'REV'),
366 _(b'REV'),
367 ),
367 ),
368 ]
368 ]
369 + diffwsopts
369 + diffwsopts
370 + walkopts
370 + walkopts
371 + formatteropts,
371 + formatteropts,
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpbasic=True,
374 helpbasic=True,
375 inferrepo=True,
375 inferrepo=True,
376 )
376 )
377 def annotate(ui, repo, *pats, **opts):
377 def annotate(ui, repo, *pats, **opts):
378 """show changeset information by line for each file
378 """show changeset information by line for each file
379
379
380 List changes in files, showing the revision id responsible for
380 List changes in files, showing the revision id responsible for
381 each line.
381 each line.
382
382
383 This command is useful for discovering when a change was made and
383 This command is useful for discovering when a change was made and
384 by whom.
384 by whom.
385
385
386 If you include --file, --user, or --date, the revision number is
386 If you include --file, --user, or --date, the revision number is
387 suppressed unless you also include --number.
387 suppressed unless you also include --number.
388
388
389 Without the -a/--text option, annotate will avoid processing files
389 Without the -a/--text option, annotate will avoid processing files
390 it detects as binary. With -a, annotate will annotate the file
390 it detects as binary. With -a, annotate will annotate the file
391 anyway, although the results will probably be neither useful
391 anyway, although the results will probably be neither useful
392 nor desirable.
392 nor desirable.
393
393
394 .. container:: verbose
394 .. container:: verbose
395
395
396 Template:
396 Template:
397
397
398 The following keywords are supported in addition to the common template
398 The following keywords are supported in addition to the common template
399 keywords and functions. See also :hg:`help templates`.
399 keywords and functions. See also :hg:`help templates`.
400
400
401 :lines: List of lines with annotation data.
401 :lines: List of lines with annotation data.
402 :path: String. Repository-absolute path of the specified file.
402 :path: String. Repository-absolute path of the specified file.
403
403
404 And each entry of ``{lines}`` provides the following sub-keywords in
404 And each entry of ``{lines}`` provides the following sub-keywords in
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406
406
407 :line: String. Line content.
407 :line: String. Line content.
408 :lineno: Integer. Line number at that revision.
408 :lineno: Integer. Line number at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
410
410
411 See :hg:`help templates.operators` for the list expansion syntax.
411 See :hg:`help templates.operators` for the list expansion syntax.
412
412
413 Returns 0 on success.
413 Returns 0 on success.
414 """
414 """
415 opts = pycompat.byteskwargs(opts)
415 opts = pycompat.byteskwargs(opts)
416 if not pats:
416 if not pats:
417 raise error.Abort(_(b'at least one filename or pattern is required'))
417 raise error.Abort(_(b'at least one filename or pattern is required'))
418
418
419 if opts.get(b'follow'):
419 if opts.get(b'follow'):
420 # --follow is deprecated and now just an alias for -f/--file
420 # --follow is deprecated and now just an alias for -f/--file
421 # to mimic the behavior of Mercurial before version 1.5
421 # to mimic the behavior of Mercurial before version 1.5
422 opts[b'file'] = True
422 opts[b'file'] = True
423
423
424 if (
424 if (
425 not opts.get(b'user')
425 not opts.get(b'user')
426 and not opts.get(b'changeset')
426 and not opts.get(b'changeset')
427 and not opts.get(b'date')
427 and not opts.get(b'date')
428 and not opts.get(b'file')
428 and not opts.get(b'file')
429 ):
429 ):
430 opts[b'number'] = True
430 opts[b'number'] = True
431
431
432 linenumber = opts.get(b'line_number') is not None
432 linenumber = opts.get(b'line_number') is not None
433 if (
433 if (
434 linenumber
434 linenumber
435 and (not opts.get(b'changeset'))
435 and (not opts.get(b'changeset'))
436 and (not opts.get(b'number'))
436 and (not opts.get(b'number'))
437 ):
437 ):
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439
439
440 rev = opts.get(b'rev')
440 rev = opts.get(b'rev')
441 if rev:
441 if rev:
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 ctx = scmutil.revsingle(repo, rev)
443 ctx = scmutil.revsingle(repo, rev)
444
444
445 ui.pager(b'annotate')
445 ui.pager(b'annotate')
446 rootfm = ui.formatter(b'annotate', opts)
446 rootfm = ui.formatter(b'annotate', opts)
447 if ui.debugflag:
447 if ui.debugflag:
448 shorthex = pycompat.identity
448 shorthex = pycompat.identity
449 else:
449 else:
450
450
451 def shorthex(h):
451 def shorthex(h):
452 return h[:12]
452 return h[:12]
453
453
454 if ui.quiet:
454 if ui.quiet:
455 datefunc = dateutil.shortdate
455 datefunc = dateutil.shortdate
456 else:
456 else:
457 datefunc = dateutil.datestr
457 datefunc = dateutil.datestr
458 if ctx.rev() is None:
458 if ctx.rev() is None:
459 if opts.get(b'changeset'):
459 if opts.get(b'changeset'):
460 # omit "+" suffix which is appended to node hex
460 # omit "+" suffix which is appended to node hex
461 def formatrev(rev):
461 def formatrev(rev):
462 if rev == wdirrev:
462 if rev == wdirrev:
463 return b'%d' % ctx.p1().rev()
463 return b'%d' % ctx.p1().rev()
464 else:
464 else:
465 return b'%d' % rev
465 return b'%d' % rev
466
466
467 else:
467 else:
468
468
469 def formatrev(rev):
469 def formatrev(rev):
470 if rev == wdirrev:
470 if rev == wdirrev:
471 return b'%d+' % ctx.p1().rev()
471 return b'%d+' % ctx.p1().rev()
472 else:
472 else:
473 return b'%d ' % rev
473 return b'%d ' % rev
474
474
475 def formathex(h):
475 def formathex(h):
476 if h == wdirhex:
476 if h == wdirhex:
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 else:
478 else:
479 return b'%s ' % shorthex(h)
479 return b'%s ' % shorthex(h)
480
480
481 else:
481 else:
482 formatrev = b'%d'.__mod__
482 formatrev = b'%d'.__mod__
483 formathex = shorthex
483 formathex = shorthex
484
484
485 opmap = [
485 opmap = [
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 ]
492 ]
493 opnamemap = {
493 opnamemap = {
494 b'rev': b'number',
494 b'rev': b'number',
495 b'node': b'changeset',
495 b'node': b'changeset',
496 b'path': b'file',
496 b'path': b'file',
497 b'lineno': b'line_number',
497 b'lineno': b'line_number',
498 }
498 }
499
499
500 if rootfm.isplain():
500 if rootfm.isplain():
501
501
502 def makefunc(get, fmt):
502 def makefunc(get, fmt):
503 return lambda x: fmt(get(x))
503 return lambda x: fmt(get(x))
504
504
505 else:
505 else:
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return get
508 return get
509
509
510 datahint = rootfm.datahint()
510 datahint = rootfm.datahint()
511 funcmap = [
511 funcmap = [
512 (makefunc(get, fmt), sep)
512 (makefunc(get, fmt), sep)
513 for fn, sep, get, fmt in opmap
513 for fn, sep, get, fmt in opmap
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 ]
515 ]
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 fields = b' '.join(
517 fields = b' '.join(
518 fn
518 fn
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
522
523 def bad(x, y):
523 def bad(x, y):
524 raise error.Abort(b"%s: %s" % (x, y))
524 raise error.Abort(b"%s: %s" % (x, y))
525
525
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527
527
528 follow = not opts.get(b'no_follow')
528 follow = not opts.get(b'no_follow')
529 diffopts = patch.difffeatureopts(
529 diffopts = patch.difffeatureopts(
530 ui, opts, section=b'annotate', whitespace=True
530 ui, opts, section=b'annotate', whitespace=True
531 )
531 )
532 skiprevs = opts.get(b'skip')
532 skiprevs = opts.get(b'skip')
533 if skiprevs:
533 if skiprevs:
534 skiprevs = scmutil.revrange(repo, skiprevs)
534 skiprevs = scmutil.revrange(repo, skiprevs)
535
535
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 for abs in ctx.walk(m):
537 for abs in ctx.walk(m):
538 fctx = ctx[abs]
538 fctx = ctx[abs]
539 rootfm.startitem()
539 rootfm.startitem()
540 rootfm.data(path=abs)
540 rootfm.data(path=abs)
541 if not opts.get(b'text') and fctx.isbinary():
541 if not opts.get(b'text') and fctx.isbinary():
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 continue
543 continue
544
544
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 lines = fctx.annotate(
546 lines = fctx.annotate(
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 )
548 )
549 if not lines:
549 if not lines:
550 fm.end()
550 fm.end()
551 continue
551 continue
552 formats = []
552 formats = []
553 pieces = []
553 pieces = []
554
554
555 for f, sep in funcmap:
555 for f, sep in funcmap:
556 l = [f(n) for n in lines]
556 l = [f(n) for n in lines]
557 if fm.isplain():
557 if fm.isplain():
558 sizes = [encoding.colwidth(x) for x in l]
558 sizes = [encoding.colwidth(x) for x in l]
559 ml = max(sizes)
559 ml = max(sizes)
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 else:
561 else:
562 formats.append([b'%s'] * len(l))
562 formats.append([b'%s'] * len(l))
563 pieces.append(l)
563 pieces.append(l)
564
564
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 fm.startitem()
566 fm.startitem()
567 fm.context(fctx=n.fctx)
567 fm.context(fctx=n.fctx)
568 fm.write(fields, b"".join(f), *p)
568 fm.write(fields, b"".join(f), *p)
569 if n.skip:
569 if n.skip:
570 fmt = b"* %s"
570 fmt = b"* %s"
571 else:
571 else:
572 fmt = b": %s"
572 fmt = b": %s"
573 fm.write(b'line', fmt, n.text)
573 fm.write(b'line', fmt, n.text)
574
574
575 if not lines[-1].text.endswith(b'\n'):
575 if not lines[-1].text.endswith(b'\n'):
576 fm.plain(b'\n')
576 fm.plain(b'\n')
577 fm.end()
577 fm.end()
578
578
579 rootfm.end()
579 rootfm.end()
580
580
581
581
582 @command(
582 @command(
583 b'archive',
583 b'archive',
584 [
584 [
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (
586 (
587 b'p',
587 b'p',
588 b'prefix',
588 b'prefix',
589 b'',
589 b'',
590 _(b'directory prefix for files in archive'),
590 _(b'directory prefix for files in archive'),
591 _(b'PREFIX'),
591 _(b'PREFIX'),
592 ),
592 ),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 ]
595 ]
596 + subrepoopts
596 + subrepoopts
597 + walkopts,
597 + walkopts,
598 _(b'[OPTION]... DEST'),
598 _(b'[OPTION]... DEST'),
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 )
600 )
601 def archive(ui, repo, dest, **opts):
601 def archive(ui, repo, dest, **opts):
602 '''create an unversioned archive of a repository revision
602 '''create an unversioned archive of a repository revision
603
603
604 By default, the revision used is the parent of the working
604 By default, the revision used is the parent of the working
605 directory; use -r/--rev to specify a different revision.
605 directory; use -r/--rev to specify a different revision.
606
606
607 The archive type is automatically detected based on file
607 The archive type is automatically detected based on file
608 extension (to override, use -t/--type).
608 extension (to override, use -t/--type).
609
609
610 .. container:: verbose
610 .. container:: verbose
611
611
612 Examples:
612 Examples:
613
613
614 - create a zip file containing the 1.0 release::
614 - create a zip file containing the 1.0 release::
615
615
616 hg archive -r 1.0 project-1.0.zip
616 hg archive -r 1.0 project-1.0.zip
617
617
618 - create a tarball excluding .hg files::
618 - create a tarball excluding .hg files::
619
619
620 hg archive project.tar.gz -X ".hg*"
620 hg archive project.tar.gz -X ".hg*"
621
621
622 Valid types are:
622 Valid types are:
623
623
624 :``files``: a directory full of files (default)
624 :``files``: a directory full of files (default)
625 :``tar``: tar archive, uncompressed
625 :``tar``: tar archive, uncompressed
626 :``tbz2``: tar archive, compressed using bzip2
626 :``tbz2``: tar archive, compressed using bzip2
627 :``tgz``: tar archive, compressed using gzip
627 :``tgz``: tar archive, compressed using gzip
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``uzip``: zip archive, uncompressed
629 :``uzip``: zip archive, uncompressed
630 :``zip``: zip archive, compressed using deflate
630 :``zip``: zip archive, compressed using deflate
631
631
632 The exact name of the destination archive or directory is given
632 The exact name of the destination archive or directory is given
633 using a format string; see :hg:`help export` for details.
633 using a format string; see :hg:`help export` for details.
634
634
635 Each member added to an archive file has a directory prefix
635 Each member added to an archive file has a directory prefix
636 prepended. Use -p/--prefix to specify a format string for the
636 prepended. Use -p/--prefix to specify a format string for the
637 prefix. The default is the basename of the archive, with suffixes
637 prefix. The default is the basename of the archive, with suffixes
638 removed.
638 removed.
639
639
640 Returns 0 on success.
640 Returns 0 on success.
641 '''
641 '''
642
642
643 opts = pycompat.byteskwargs(opts)
643 opts = pycompat.byteskwargs(opts)
644 rev = opts.get(b'rev')
644 rev = opts.get(b'rev')
645 if rev:
645 if rev:
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 if not ctx:
648 if not ctx:
649 raise error.Abort(_(b'no working directory: please specify a revision'))
649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 node = ctx.node()
650 node = ctx.node()
651 dest = cmdutil.makefilename(ctx, dest)
651 dest = cmdutil.makefilename(ctx, dest)
652 if os.path.realpath(dest) == repo.root:
652 if os.path.realpath(dest) == repo.root:
653 raise error.Abort(_(b'repository root cannot be destination'))
653 raise error.Abort(_(b'repository root cannot be destination'))
654
654
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 prefix = opts.get(b'prefix')
656 prefix = opts.get(b'prefix')
657
657
658 if dest == b'-':
658 if dest == b'-':
659 if kind == b'files':
659 if kind == b'files':
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 dest = cmdutil.makefileobj(ctx, dest)
661 dest = cmdutil.makefileobj(ctx, dest)
662 if not prefix:
662 if not prefix:
663 prefix = os.path.basename(repo.root) + b'-%h'
663 prefix = os.path.basename(repo.root) + b'-%h'
664
664
665 prefix = cmdutil.makefilename(ctx, prefix)
665 prefix = cmdutil.makefilename(ctx, prefix)
666 match = scmutil.match(ctx, [], opts)
666 match = scmutil.match(ctx, [], opts)
667 archival.archive(
667 archival.archive(
668 repo,
668 repo,
669 dest,
669 dest,
670 node,
670 node,
671 kind,
671 kind,
672 not opts.get(b'no_decode'),
672 not opts.get(b'no_decode'),
673 match,
673 match,
674 prefix,
674 prefix,
675 subrepos=opts.get(b'subrepos'),
675 subrepos=opts.get(b'subrepos'),
676 )
676 )
677
677
678
678
679 @command(
679 @command(
680 b'backout',
680 b'backout',
681 [
681 [
682 (
682 (
683 b'',
683 b'',
684 b'merge',
684 b'merge',
685 None,
685 None,
686 _(b'merge with old dirstate parent after backout'),
686 _(b'merge with old dirstate parent after backout'),
687 ),
687 ),
688 (
688 (
689 b'',
689 b'',
690 b'commit',
690 b'commit',
691 None,
691 None,
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 ),
693 ),
694 (b'', b'no-commit', None, _(b'do not commit')),
694 (b'', b'no-commit', None, _(b'do not commit')),
695 (
695 (
696 b'',
696 b'',
697 b'parent',
697 b'parent',
698 b'',
698 b'',
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'REV'),
700 _(b'REV'),
701 ),
701 ),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 ]
704 ]
705 + mergetoolopts
705 + mergetoolopts
706 + walkopts
706 + walkopts
707 + commitopts
707 + commitopts
708 + commitopts2,
708 + commitopts2,
709 _(b'[OPTION]... [-r] REV'),
709 _(b'[OPTION]... [-r] REV'),
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 )
711 )
712 def backout(ui, repo, node=None, rev=None, **opts):
712 def backout(ui, repo, node=None, rev=None, **opts):
713 '''reverse effect of earlier changeset
713 '''reverse effect of earlier changeset
714
714
715 Prepare a new changeset with the effect of REV undone in the
715 Prepare a new changeset with the effect of REV undone in the
716 current working directory. If no conflicts were encountered,
716 current working directory. If no conflicts were encountered,
717 it will be committed immediately.
717 it will be committed immediately.
718
718
719 If REV is the parent of the working directory, then this new changeset
719 If REV is the parent of the working directory, then this new changeset
720 is committed automatically (unless --no-commit is specified).
720 is committed automatically (unless --no-commit is specified).
721
721
722 .. note::
722 .. note::
723
723
724 :hg:`backout` cannot be used to fix either an unwanted or
724 :hg:`backout` cannot be used to fix either an unwanted or
725 incorrect merge.
725 incorrect merge.
726
726
727 .. container:: verbose
727 .. container:: verbose
728
728
729 Examples:
729 Examples:
730
730
731 - Reverse the effect of the parent of the working directory.
731 - Reverse the effect of the parent of the working directory.
732 This backout will be committed immediately::
732 This backout will be committed immediately::
733
733
734 hg backout -r .
734 hg backout -r .
735
735
736 - Reverse the effect of previous bad revision 23::
736 - Reverse the effect of previous bad revision 23::
737
737
738 hg backout -r 23
738 hg backout -r 23
739
739
740 - Reverse the effect of previous bad revision 23 and
740 - Reverse the effect of previous bad revision 23 and
741 leave changes uncommitted::
741 leave changes uncommitted::
742
742
743 hg backout -r 23 --no-commit
743 hg backout -r 23 --no-commit
744 hg commit -m "Backout revision 23"
744 hg commit -m "Backout revision 23"
745
745
746 By default, the pending changeset will have one parent,
746 By default, the pending changeset will have one parent,
747 maintaining a linear history. With --merge, the pending
747 maintaining a linear history. With --merge, the pending
748 changeset will instead have two parents: the old parent of the
748 changeset will instead have two parents: the old parent of the
749 working directory and a new child of REV that simply undoes REV.
749 working directory and a new child of REV that simply undoes REV.
750
750
751 Before version 1.7, the behavior without --merge was equivalent
751 Before version 1.7, the behavior without --merge was equivalent
752 to specifying --merge followed by :hg:`update --clean .` to
752 to specifying --merge followed by :hg:`update --clean .` to
753 cancel the merge and leave the child of REV as a head to be
753 cancel the merge and leave the child of REV as a head to be
754 merged separately.
754 merged separately.
755
755
756 See :hg:`help dates` for a list of formats valid for -d/--date.
756 See :hg:`help dates` for a list of formats valid for -d/--date.
757
757
758 See :hg:`help revert` for a way to restore files to the state
758 See :hg:`help revert` for a way to restore files to the state
759 of another revision.
759 of another revision.
760
760
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 files.
762 files.
763 '''
763 '''
764 with repo.wlock(), repo.lock():
764 with repo.wlock(), repo.lock():
765 return _dobackout(ui, repo, node, rev, **opts)
765 return _dobackout(ui, repo, node, rev, **opts)
766
766
767
767
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 opts = pycompat.byteskwargs(opts)
769 opts = pycompat.byteskwargs(opts)
770 if opts.get(b'commit') and opts.get(b'no_commit'):
770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 if opts.get(b'merge') and opts.get(b'no_commit'):
772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774
774
775 if rev and node:
775 if rev and node:
776 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
777
777
778 if not rev:
778 if not rev:
779 rev = node
779 rev = node
780
780
781 if not rev:
781 if not rev:
782 raise error.Abort(_(b"please specify a revision to backout"))
782 raise error.Abort(_(b"please specify a revision to backout"))
783
783
784 date = opts.get(b'date')
784 date = opts.get(b'date')
785 if date:
785 if date:
786 opts[b'date'] = dateutil.parsedate(date)
786 opts[b'date'] = dateutil.parsedate(date)
787
787
788 cmdutil.checkunfinished(repo)
788 cmdutil.checkunfinished(repo)
789 cmdutil.bailifchanged(repo)
789 cmdutil.bailifchanged(repo)
790 node = scmutil.revsingle(repo, rev).node()
790 node = scmutil.revsingle(repo, rev).node()
791
791
792 op1, op2 = repo.dirstate.parents()
792 op1, op2 = repo.dirstate.parents()
793 if not repo.changelog.isancestor(node, op1):
793 if not repo.changelog.isancestor(node, op1):
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795
795
796 p1, p2 = repo.changelog.parents(node)
796 p1, p2 = repo.changelog.parents(node)
797 if p1 == nullid:
797 if p1 == nullid:
798 raise error.Abort(_(b'cannot backout a change with no parents'))
798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 if p2 != nullid:
799 if p2 != nullid:
800 if not opts.get(b'parent'):
800 if not opts.get(b'parent'):
801 raise error.Abort(_(b'cannot backout a merge changeset'))
801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 p = repo.lookup(opts[b'parent'])
802 p = repo.lookup(opts[b'parent'])
803 if p not in (p1, p2):
803 if p not in (p1, p2):
804 raise error.Abort(
804 raise error.Abort(
805 _(b'%s is not a parent of %s') % (short(p), short(node))
805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 )
806 )
807 parent = p
807 parent = p
808 else:
808 else:
809 if opts.get(b'parent'):
809 if opts.get(b'parent'):
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 parent = p1
811 parent = p1
812
812
813 # the backout should appear on the same branch
813 # the backout should appear on the same branch
814 branch = repo.dirstate.branch()
814 branch = repo.dirstate.branch()
815 bheads = repo.branchheads(branch)
815 bheads = repo.branchheads(branch)
816 rctx = scmutil.revsingle(repo, hex(parent))
816 rctx = scmutil.revsingle(repo, hex(parent))
817 if not opts.get(b'merge') and op1 != node:
817 if not opts.get(b'merge') and op1 != node:
818 with dirstateguard.dirstateguard(repo, b'backout'):
818 with dirstateguard.dirstateguard(repo, b'backout'):
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 with ui.configoverride(overrides, b'backout'):
820 with ui.configoverride(overrides, b'backout'):
821 stats = mergemod.update(
821 stats = mergemod.update(
822 repo,
822 repo,
823 parent,
823 parent,
824 branchmerge=True,
824 branchmerge=True,
825 force=True,
825 force=True,
826 ancestor=node,
826 ancestor=node,
827 mergeancestor=False,
827 mergeancestor=False,
828 )
828 )
829 repo.setparents(op1, op2)
829 repo.setparents(op1, op2)
830 hg._showstats(repo, stats)
830 hg._showstats(repo, stats)
831 if stats.unresolvedcount:
831 if stats.unresolvedcount:
832 repo.ui.status(
832 repo.ui.status(
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 )
834 )
835 return 1
835 return 1
836 else:
836 else:
837 hg.clean(repo, node, show_stats=False)
837 hg.clean(repo, node, show_stats=False)
838 repo.dirstate.setbranch(branch)
838 repo.dirstate.setbranch(branch)
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840
840
841 if opts.get(b'no_commit'):
841 if opts.get(b'no_commit'):
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 ui.status(msg % short(node))
843 ui.status(msg % short(node))
844 return 0
844 return 0
845
845
846 def commitfunc(ui, repo, message, match, opts):
846 def commitfunc(ui, repo, message, match, opts):
847 editform = b'backout'
847 editform = b'backout'
848 e = cmdutil.getcommiteditor(
848 e = cmdutil.getcommiteditor(
849 editform=editform, **pycompat.strkwargs(opts)
849 editform=editform, **pycompat.strkwargs(opts)
850 )
850 )
851 if not message:
851 if not message:
852 # we don't translate commit messages
852 # we don't translate commit messages
853 message = b"Backed out changeset %s" % short(node)
853 message = b"Backed out changeset %s" % short(node)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 return repo.commit(
855 return repo.commit(
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 )
857 )
858
858
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 if not newnode:
860 if not newnode:
861 ui.status(_(b"nothing changed\n"))
861 ui.status(_(b"nothing changed\n"))
862 return 1
862 return 1
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864
864
865 def nice(node):
865 def nice(node):
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867
867
868 ui.status(
868 ui.status(
869 _(b'changeset %s backs out changeset %s\n')
869 _(b'changeset %s backs out changeset %s\n')
870 % (nice(repo.changelog.tip()), nice(node))
870 % (nice(repo.changelog.tip()), nice(node))
871 )
871 )
872 if opts.get(b'merge') and op1 != node:
872 if opts.get(b'merge') and op1 != node:
873 hg.clean(repo, op1, show_stats=False)
873 hg.clean(repo, op1, show_stats=False)
874 ui.status(
874 ui.status(
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 )
876 )
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 with ui.configoverride(overrides, b'backout'):
878 with ui.configoverride(overrides, b'backout'):
879 return hg.merge(repo, hex(repo.changelog.tip()))
879 return hg.merge(repo, hex(repo.changelog.tip()))
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
1239 cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
1240 if not names and action in {b'add', b'delete'}:
1240 if not names and action in {b'add', b'delete'}:
1241 raise error.Abort(_(b"bookmark name required"))
1241 raise error.Abort(_(b"bookmark name required"))
1242
1242
1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1245 if action == b'delete':
1245 if action == b'delete':
1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1247 bookmarks.delete(repo, tr, names)
1247 bookmarks.delete(repo, tr, names)
1248 elif action == b'rename':
1248 elif action == b'rename':
1249 if not names:
1249 if not names:
1250 raise error.Abort(_(b"new bookmark name required"))
1250 raise error.Abort(_(b"new bookmark name required"))
1251 elif len(names) > 1:
1251 elif len(names) > 1:
1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1255 elif action == b'add':
1255 elif action == b'add':
1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1257 elif action == b'inactive':
1257 elif action == b'inactive':
1258 if len(repo._bookmarks) == 0:
1258 if len(repo._bookmarks) == 0:
1259 ui.status(_(b"no bookmarks set\n"))
1259 ui.status(_(b"no bookmarks set\n"))
1260 elif not repo._activebookmark:
1260 elif not repo._activebookmark:
1261 ui.status(_(b"no active bookmark\n"))
1261 ui.status(_(b"no active bookmark\n"))
1262 else:
1262 else:
1263 bookmarks.deactivate(repo)
1263 bookmarks.deactivate(repo)
1264 elif action == b'list':
1264 elif action == b'list':
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 with ui.formatter(b'bookmarks', opts) as fm:
1266 with ui.formatter(b'bookmarks', opts) as fm:
1267 bookmarks.printbookmarks(ui, repo, fm, names)
1267 bookmarks.printbookmarks(ui, repo, fm, names)
1268 else:
1268 else:
1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1270
1270
1271
1271
1272 @command(
1272 @command(
1273 b'branch',
1273 b'branch',
1274 [
1274 [
1275 (
1275 (
1276 b'f',
1276 b'f',
1277 b'force',
1277 b'force',
1278 None,
1278 None,
1279 _(b'set branch name even if it shadows an existing branch'),
1279 _(b'set branch name even if it shadows an existing branch'),
1280 ),
1280 ),
1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1282 (
1282 (
1283 b'r',
1283 b'r',
1284 b'rev',
1284 b'rev',
1285 [],
1285 [],
1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1287 ),
1287 ),
1288 ],
1288 ],
1289 _(b'[-fC] [NAME]'),
1289 _(b'[-fC] [NAME]'),
1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1291 )
1291 )
1292 def branch(ui, repo, label=None, **opts):
1292 def branch(ui, repo, label=None, **opts):
1293 """set or show the current branch name
1293 """set or show the current branch name
1294
1294
1295 .. note::
1295 .. note::
1296
1296
1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1298 light-weight bookmark instead. See :hg:`help glossary` for more
1298 light-weight bookmark instead. See :hg:`help glossary` for more
1299 information about named branches and bookmarks.
1299 information about named branches and bookmarks.
1300
1300
1301 With no argument, show the current branch name. With one argument,
1301 With no argument, show the current branch name. With one argument,
1302 set the working directory branch name (the branch will not exist
1302 set the working directory branch name (the branch will not exist
1303 in the repository until the next commit). Standard practice
1303 in the repository until the next commit). Standard practice
1304 recommends that primary development take place on the 'default'
1304 recommends that primary development take place on the 'default'
1305 branch.
1305 branch.
1306
1306
1307 Unless -f/--force is specified, branch will not let you set a
1307 Unless -f/--force is specified, branch will not let you set a
1308 branch name that already exists.
1308 branch name that already exists.
1309
1309
1310 Use -C/--clean to reset the working directory branch to that of
1310 Use -C/--clean to reset the working directory branch to that of
1311 the parent of the working directory, negating a previous branch
1311 the parent of the working directory, negating a previous branch
1312 change.
1312 change.
1313
1313
1314 Use the command :hg:`update` to switch to an existing branch. Use
1314 Use the command :hg:`update` to switch to an existing branch. Use
1315 :hg:`commit --close-branch` to mark this branch head as closed.
1315 :hg:`commit --close-branch` to mark this branch head as closed.
1316 When all heads of a branch are closed, the branch will be
1316 When all heads of a branch are closed, the branch will be
1317 considered closed.
1317 considered closed.
1318
1318
1319 Returns 0 on success.
1319 Returns 0 on success.
1320 """
1320 """
1321 opts = pycompat.byteskwargs(opts)
1321 opts = pycompat.byteskwargs(opts)
1322 revs = opts.get(b'rev')
1322 revs = opts.get(b'rev')
1323 if label:
1323 if label:
1324 label = label.strip()
1324 label = label.strip()
1325
1325
1326 if not opts.get(b'clean') and not label:
1326 if not opts.get(b'clean') and not label:
1327 if revs:
1327 if revs:
1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1329 ui.write(b"%s\n" % repo.dirstate.branch())
1329 ui.write(b"%s\n" % repo.dirstate.branch())
1330 return
1330 return
1331
1331
1332 with repo.wlock():
1332 with repo.wlock():
1333 if opts.get(b'clean'):
1333 if opts.get(b'clean'):
1334 label = repo[b'.'].branch()
1334 label = repo[b'.'].branch()
1335 repo.dirstate.setbranch(label)
1335 repo.dirstate.setbranch(label)
1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1337 elif label:
1337 elif label:
1338
1338
1339 scmutil.checknewlabel(repo, label, b'branch')
1339 scmutil.checknewlabel(repo, label, b'branch')
1340 if revs:
1340 if revs:
1341 return cmdutil.changebranch(ui, repo, revs, label)
1341 return cmdutil.changebranch(ui, repo, revs, label)
1342
1342
1343 if not opts.get(b'force') and label in repo.branchmap():
1343 if not opts.get(b'force') and label in repo.branchmap():
1344 if label not in [p.branch() for p in repo[None].parents()]:
1344 if label not in [p.branch() for p in repo[None].parents()]:
1345 raise error.Abort(
1345 raise error.Abort(
1346 _(b'a branch of the same name already exists'),
1346 _(b'a branch of the same name already exists'),
1347 # i18n: "it" refers to an existing branch
1347 # i18n: "it" refers to an existing branch
1348 hint=_(b"use 'hg update' to switch to it"),
1348 hint=_(b"use 'hg update' to switch to it"),
1349 )
1349 )
1350
1350
1351 repo.dirstate.setbranch(label)
1351 repo.dirstate.setbranch(label)
1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1353
1353
1354 # find any open named branches aside from default
1354 # find any open named branches aside from default
1355 for n, h, t, c in repo.branchmap().iterbranches():
1355 for n, h, t, c in repo.branchmap().iterbranches():
1356 if n != b"default" and not c:
1356 if n != b"default" and not c:
1357 return 0
1357 return 0
1358 ui.status(
1358 ui.status(
1359 _(
1359 _(
1360 b'(branches are permanent and global, '
1360 b'(branches are permanent and global, '
1361 b'did you want a bookmark?)\n'
1361 b'did you want a bookmark?)\n'
1362 )
1362 )
1363 )
1363 )
1364
1364
1365
1365
1366 @command(
1366 @command(
1367 b'branches',
1367 b'branches',
1368 [
1368 [
1369 (
1369 (
1370 b'a',
1370 b'a',
1371 b'active',
1371 b'active',
1372 False,
1372 False,
1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1374 ),
1374 ),
1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1377 ]
1377 ]
1378 + formatteropts,
1378 + formatteropts,
1379 _(b'[-c]'),
1379 _(b'[-c]'),
1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1381 intents={INTENT_READONLY},
1381 intents={INTENT_READONLY},
1382 )
1382 )
1383 def branches(ui, repo, active=False, closed=False, **opts):
1383 def branches(ui, repo, active=False, closed=False, **opts):
1384 """list repository named branches
1384 """list repository named branches
1385
1385
1386 List the repository's named branches, indicating which ones are
1386 List the repository's named branches, indicating which ones are
1387 inactive. If -c/--closed is specified, also list branches which have
1387 inactive. If -c/--closed is specified, also list branches which have
1388 been marked closed (see :hg:`commit --close-branch`).
1388 been marked closed (see :hg:`commit --close-branch`).
1389
1389
1390 Use the command :hg:`update` to switch to an existing branch.
1390 Use the command :hg:`update` to switch to an existing branch.
1391
1391
1392 .. container:: verbose
1392 .. container:: verbose
1393
1393
1394 Template:
1394 Template:
1395
1395
1396 The following keywords are supported in addition to the common template
1396 The following keywords are supported in addition to the common template
1397 keywords and functions such as ``{branch}``. See also
1397 keywords and functions such as ``{branch}``. See also
1398 :hg:`help templates`.
1398 :hg:`help templates`.
1399
1399
1400 :active: Boolean. True if the branch is active.
1400 :active: Boolean. True if the branch is active.
1401 :closed: Boolean. True if the branch is closed.
1401 :closed: Boolean. True if the branch is closed.
1402 :current: Boolean. True if it is the current branch.
1402 :current: Boolean. True if it is the current branch.
1403
1403
1404 Returns 0.
1404 Returns 0.
1405 """
1405 """
1406
1406
1407 opts = pycompat.byteskwargs(opts)
1407 opts = pycompat.byteskwargs(opts)
1408 revs = opts.get(b'rev')
1408 revs = opts.get(b'rev')
1409 selectedbranches = None
1409 selectedbranches = None
1410 if revs:
1410 if revs:
1411 revs = scmutil.revrange(repo, revs)
1411 revs = scmutil.revrange(repo, revs)
1412 getbi = repo.revbranchcache().branchinfo
1412 getbi = repo.revbranchcache().branchinfo
1413 selectedbranches = {getbi(r)[0] for r in revs}
1413 selectedbranches = {getbi(r)[0] for r in revs}
1414
1414
1415 ui.pager(b'branches')
1415 ui.pager(b'branches')
1416 fm = ui.formatter(b'branches', opts)
1416 fm = ui.formatter(b'branches', opts)
1417 hexfunc = fm.hexfunc
1417 hexfunc = fm.hexfunc
1418
1418
1419 allheads = set(repo.heads())
1419 allheads = set(repo.heads())
1420 branches = []
1420 branches = []
1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1422 if selectedbranches is not None and tag not in selectedbranches:
1422 if selectedbranches is not None and tag not in selectedbranches:
1423 continue
1423 continue
1424 isactive = False
1424 isactive = False
1425 if not isclosed:
1425 if not isclosed:
1426 openheads = set(repo.branchmap().iteropen(heads))
1426 openheads = set(repo.branchmap().iteropen(heads))
1427 isactive = bool(openheads & allheads)
1427 isactive = bool(openheads & allheads)
1428 branches.append((tag, repo[tip], isactive, not isclosed))
1428 branches.append((tag, repo[tip], isactive, not isclosed))
1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1430
1430
1431 for tag, ctx, isactive, isopen in branches:
1431 for tag, ctx, isactive, isopen in branches:
1432 if active and not isactive:
1432 if active and not isactive:
1433 continue
1433 continue
1434 if isactive:
1434 if isactive:
1435 label = b'branches.active'
1435 label = b'branches.active'
1436 notice = b''
1436 notice = b''
1437 elif not isopen:
1437 elif not isopen:
1438 if not closed:
1438 if not closed:
1439 continue
1439 continue
1440 label = b'branches.closed'
1440 label = b'branches.closed'
1441 notice = _(b' (closed)')
1441 notice = _(b' (closed)')
1442 else:
1442 else:
1443 label = b'branches.inactive'
1443 label = b'branches.inactive'
1444 notice = _(b' (inactive)')
1444 notice = _(b' (inactive)')
1445 current = tag == repo.dirstate.branch()
1445 current = tag == repo.dirstate.branch()
1446 if current:
1446 if current:
1447 label = b'branches.current'
1447 label = b'branches.current'
1448
1448
1449 fm.startitem()
1449 fm.startitem()
1450 fm.write(b'branch', b'%s', tag, label=label)
1450 fm.write(b'branch', b'%s', tag, label=label)
1451 rev = ctx.rev()
1451 rev = ctx.rev()
1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1453 fmt = b' ' * padsize + b' %d:%s'
1453 fmt = b' ' * padsize + b' %d:%s'
1454 fm.condwrite(
1454 fm.condwrite(
1455 not ui.quiet,
1455 not ui.quiet,
1456 b'rev node',
1456 b'rev node',
1457 fmt,
1457 fmt,
1458 rev,
1458 rev,
1459 hexfunc(ctx.node()),
1459 hexfunc(ctx.node()),
1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1461 )
1461 )
1462 fm.context(ctx=ctx)
1462 fm.context(ctx=ctx)
1463 fm.data(active=isactive, closed=not isopen, current=current)
1463 fm.data(active=isactive, closed=not isopen, current=current)
1464 if not ui.quiet:
1464 if not ui.quiet:
1465 fm.plain(notice)
1465 fm.plain(notice)
1466 fm.plain(b'\n')
1466 fm.plain(b'\n')
1467 fm.end()
1467 fm.end()
1468
1468
1469
1469
1470 @command(
1470 @command(
1471 b'bundle',
1471 b'bundle',
1472 [
1472 [
1473 (
1473 (
1474 b'f',
1474 b'f',
1475 b'force',
1475 b'force',
1476 None,
1476 None,
1477 _(b'run even when the destination is unrelated'),
1477 _(b'run even when the destination is unrelated'),
1478 ),
1478 ),
1479 (
1479 (
1480 b'r',
1480 b'r',
1481 b'rev',
1481 b'rev',
1482 [],
1482 [],
1483 _(b'a changeset intended to be added to the destination'),
1483 _(b'a changeset intended to be added to the destination'),
1484 _(b'REV'),
1484 _(b'REV'),
1485 ),
1485 ),
1486 (
1486 (
1487 b'b',
1487 b'b',
1488 b'branch',
1488 b'branch',
1489 [],
1489 [],
1490 _(b'a specific branch you would like to bundle'),
1490 _(b'a specific branch you would like to bundle'),
1491 _(b'BRANCH'),
1491 _(b'BRANCH'),
1492 ),
1492 ),
1493 (
1493 (
1494 b'',
1494 b'',
1495 b'base',
1495 b'base',
1496 [],
1496 [],
1497 _(b'a base changeset assumed to be available at the destination'),
1497 _(b'a base changeset assumed to be available at the destination'),
1498 _(b'REV'),
1498 _(b'REV'),
1499 ),
1499 ),
1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1501 (
1501 (
1502 b't',
1502 b't',
1503 b'type',
1503 b'type',
1504 b'bzip2',
1504 b'bzip2',
1505 _(b'bundle compression type to use'),
1505 _(b'bundle compression type to use'),
1506 _(b'TYPE'),
1506 _(b'TYPE'),
1507 ),
1507 ),
1508 ]
1508 ]
1509 + remoteopts,
1509 + remoteopts,
1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1512 )
1512 )
1513 def bundle(ui, repo, fname, dest=None, **opts):
1513 def bundle(ui, repo, fname, dest=None, **opts):
1514 """create a bundle file
1514 """create a bundle file
1515
1515
1516 Generate a bundle file containing data to be transferred to another
1516 Generate a bundle file containing data to be transferred to another
1517 repository.
1517 repository.
1518
1518
1519 To create a bundle containing all changesets, use -a/--all
1519 To create a bundle containing all changesets, use -a/--all
1520 (or --base null). Otherwise, hg assumes the destination will have
1520 (or --base null). Otherwise, hg assumes the destination will have
1521 all the nodes you specify with --base parameters. Otherwise, hg
1521 all the nodes you specify with --base parameters. Otherwise, hg
1522 will assume the repository has all the nodes in destination, or
1522 will assume the repository has all the nodes in destination, or
1523 default-push/default if no destination is specified, where destination
1523 default-push/default if no destination is specified, where destination
1524 is the repository you provide through DEST option.
1524 is the repository you provide through DEST option.
1525
1525
1526 You can change bundle format with the -t/--type option. See
1526 You can change bundle format with the -t/--type option. See
1527 :hg:`help bundlespec` for documentation on this format. By default,
1527 :hg:`help bundlespec` for documentation on this format. By default,
1528 the most appropriate format is used and compression defaults to
1528 the most appropriate format is used and compression defaults to
1529 bzip2.
1529 bzip2.
1530
1530
1531 The bundle file can then be transferred using conventional means
1531 The bundle file can then be transferred using conventional means
1532 and applied to another repository with the unbundle or pull
1532 and applied to another repository with the unbundle or pull
1533 command. This is useful when direct push and pull are not
1533 command. This is useful when direct push and pull are not
1534 available or when exporting an entire repository is undesirable.
1534 available or when exporting an entire repository is undesirable.
1535
1535
1536 Applying bundles preserves all changeset contents including
1536 Applying bundles preserves all changeset contents including
1537 permissions, copy/rename information, and revision history.
1537 permissions, copy/rename information, and revision history.
1538
1538
1539 Returns 0 on success, 1 if no changes found.
1539 Returns 0 on success, 1 if no changes found.
1540 """
1540 """
1541 opts = pycompat.byteskwargs(opts)
1541 opts = pycompat.byteskwargs(opts)
1542 revs = None
1542 revs = None
1543 if b'rev' in opts:
1543 if b'rev' in opts:
1544 revstrings = opts[b'rev']
1544 revstrings = opts[b'rev']
1545 revs = scmutil.revrange(repo, revstrings)
1545 revs = scmutil.revrange(repo, revstrings)
1546 if revstrings and not revs:
1546 if revstrings and not revs:
1547 raise error.Abort(_(b'no commits to bundle'))
1547 raise error.Abort(_(b'no commits to bundle'))
1548
1548
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1550 try:
1550 try:
1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1552 except error.UnsupportedBundleSpecification as e:
1552 except error.UnsupportedBundleSpecification as e:
1553 raise error.Abort(
1553 raise error.Abort(
1554 pycompat.bytestr(e),
1554 pycompat.bytestr(e),
1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1556 )
1556 )
1557 cgversion = bundlespec.contentopts[b"cg.version"]
1557 cgversion = bundlespec.contentopts[b"cg.version"]
1558
1558
1559 # Packed bundles are a pseudo bundle format for now.
1559 # Packed bundles are a pseudo bundle format for now.
1560 if cgversion == b's1':
1560 if cgversion == b's1':
1561 raise error.Abort(
1561 raise error.Abort(
1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1564 )
1564 )
1565
1565
1566 if opts.get(b'all'):
1566 if opts.get(b'all'):
1567 if dest:
1567 if dest:
1568 raise error.Abort(
1568 raise error.Abort(
1569 _(b"--all is incompatible with specifying a destination")
1569 _(b"--all is incompatible with specifying a destination")
1570 )
1570 )
1571 if opts.get(b'base'):
1571 if opts.get(b'base'):
1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1573 base = [nullrev]
1573 base = [nullrev]
1574 else:
1574 else:
1575 base = scmutil.revrange(repo, opts.get(b'base'))
1575 base = scmutil.revrange(repo, opts.get(b'base'))
1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1577 raise error.Abort(
1577 raise error.Abort(
1578 _(b"repository does not support bundle version %s") % cgversion
1578 _(b"repository does not support bundle version %s") % cgversion
1579 )
1579 )
1580
1580
1581 if base:
1581 if base:
1582 if dest:
1582 if dest:
1583 raise error.Abort(
1583 raise error.Abort(
1584 _(b"--base is incompatible with specifying a destination")
1584 _(b"--base is incompatible with specifying a destination")
1585 )
1585 )
1586 common = [repo[rev].node() for rev in base]
1586 common = [repo[rev].node() for rev in base]
1587 heads = [repo[r].node() for r in revs] if revs else None
1587 heads = [repo[r].node() for r in revs] if revs else None
1588 outgoing = discovery.outgoing(repo, common, heads)
1588 outgoing = discovery.outgoing(repo, common, heads)
1589 else:
1589 else:
1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1592 other = hg.peer(repo, opts, dest)
1592 other = hg.peer(repo, opts, dest)
1593 revs = [repo[r].hex() for r in revs]
1593 revs = [repo[r].hex() for r in revs]
1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1596 outgoing = discovery.findcommonoutgoing(
1596 outgoing = discovery.findcommonoutgoing(
1597 repo,
1597 repo,
1598 other,
1598 other,
1599 onlyheads=heads,
1599 onlyheads=heads,
1600 force=opts.get(b'force'),
1600 force=opts.get(b'force'),
1601 portable=True,
1601 portable=True,
1602 )
1602 )
1603
1603
1604 if not outgoing.missing:
1604 if not outgoing.missing:
1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1606 return 1
1606 return 1
1607
1607
1608 if cgversion == b'01': # bundle1
1608 if cgversion == b'01': # bundle1
1609 bversion = b'HG10' + bundlespec.wirecompression
1609 bversion = b'HG10' + bundlespec.wirecompression
1610 bcompression = None
1610 bcompression = None
1611 elif cgversion in (b'02', b'03'):
1611 elif cgversion in (b'02', b'03'):
1612 bversion = b'HG20'
1612 bversion = b'HG20'
1613 bcompression = bundlespec.wirecompression
1613 bcompression = bundlespec.wirecompression
1614 else:
1614 else:
1615 raise error.ProgrammingError(
1615 raise error.ProgrammingError(
1616 b'bundle: unexpected changegroup version %s' % cgversion
1616 b'bundle: unexpected changegroup version %s' % cgversion
1617 )
1617 )
1618
1618
1619 # TODO compression options should be derived from bundlespec parsing.
1619 # TODO compression options should be derived from bundlespec parsing.
1620 # This is a temporary hack to allow adjusting bundle compression
1620 # This is a temporary hack to allow adjusting bundle compression
1621 # level without a) formalizing the bundlespec changes to declare it
1621 # level without a) formalizing the bundlespec changes to declare it
1622 # b) introducing a command flag.
1622 # b) introducing a command flag.
1623 compopts = {}
1623 compopts = {}
1624 complevel = ui.configint(
1624 complevel = ui.configint(
1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1626 )
1626 )
1627 if complevel is None:
1627 if complevel is None:
1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1629 if complevel is not None:
1629 if complevel is not None:
1630 compopts[b'level'] = complevel
1630 compopts[b'level'] = complevel
1631
1631
1632 # Allow overriding the bundling of obsmarker in phases through
1632 # Allow overriding the bundling of obsmarker in phases through
1633 # configuration while we don't have a bundle version that include them
1633 # configuration while we don't have a bundle version that include them
1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1635 bundlespec.contentopts[b'obsolescence'] = True
1635 bundlespec.contentopts[b'obsolescence'] = True
1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1637 bundlespec.contentopts[b'phases'] = True
1637 bundlespec.contentopts[b'phases'] = True
1638
1638
1639 bundle2.writenewbundle(
1639 bundle2.writenewbundle(
1640 ui,
1640 ui,
1641 repo,
1641 repo,
1642 b'bundle',
1642 b'bundle',
1643 fname,
1643 fname,
1644 bversion,
1644 bversion,
1645 outgoing,
1645 outgoing,
1646 bundlespec.contentopts,
1646 bundlespec.contentopts,
1647 compression=bcompression,
1647 compression=bcompression,
1648 compopts=compopts,
1648 compopts=compopts,
1649 )
1649 )
1650
1650
1651
1651
1652 @command(
1652 @command(
1653 b'cat',
1653 b'cat',
1654 [
1654 [
1655 (
1655 (
1656 b'o',
1656 b'o',
1657 b'output',
1657 b'output',
1658 b'',
1658 b'',
1659 _(b'print output to file with formatted name'),
1659 _(b'print output to file with formatted name'),
1660 _(b'FORMAT'),
1660 _(b'FORMAT'),
1661 ),
1661 ),
1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1664 ]
1664 ]
1665 + walkopts
1665 + walkopts
1666 + formatteropts,
1666 + formatteropts,
1667 _(b'[OPTION]... FILE...'),
1667 _(b'[OPTION]... FILE...'),
1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1669 inferrepo=True,
1669 inferrepo=True,
1670 intents={INTENT_READONLY},
1670 intents={INTENT_READONLY},
1671 )
1671 )
1672 def cat(ui, repo, file1, *pats, **opts):
1672 def cat(ui, repo, file1, *pats, **opts):
1673 """output the current or given revision of files
1673 """output the current or given revision of files
1674
1674
1675 Print the specified files as they were at the given revision. If
1675 Print the specified files as they were at the given revision. If
1676 no revision is given, the parent of the working directory is used.
1676 no revision is given, the parent of the working directory is used.
1677
1677
1678 Output may be to a file, in which case the name of the file is
1678 Output may be to a file, in which case the name of the file is
1679 given using a template string. See :hg:`help templates`. In addition
1679 given using a template string. See :hg:`help templates`. In addition
1680 to the common template keywords, the following formatting rules are
1680 to the common template keywords, the following formatting rules are
1681 supported:
1681 supported:
1682
1682
1683 :``%%``: literal "%" character
1683 :``%%``: literal "%" character
1684 :``%s``: basename of file being printed
1684 :``%s``: basename of file being printed
1685 :``%d``: dirname of file being printed, or '.' if in repository root
1685 :``%d``: dirname of file being printed, or '.' if in repository root
1686 :``%p``: root-relative path name of file being printed
1686 :``%p``: root-relative path name of file being printed
1687 :``%H``: changeset hash (40 hexadecimal digits)
1687 :``%H``: changeset hash (40 hexadecimal digits)
1688 :``%R``: changeset revision number
1688 :``%R``: changeset revision number
1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1690 :``%r``: zero-padded changeset revision number
1690 :``%r``: zero-padded changeset revision number
1691 :``%b``: basename of the exporting repository
1691 :``%b``: basename of the exporting repository
1692 :``\\``: literal "\\" character
1692 :``\\``: literal "\\" character
1693
1693
1694 .. container:: verbose
1694 .. container:: verbose
1695
1695
1696 Template:
1696 Template:
1697
1697
1698 The following keywords are supported in addition to the common template
1698 The following keywords are supported in addition to the common template
1699 keywords and functions. See also :hg:`help templates`.
1699 keywords and functions. See also :hg:`help templates`.
1700
1700
1701 :data: String. File content.
1701 :data: String. File content.
1702 :path: String. Repository-absolute path of the file.
1702 :path: String. Repository-absolute path of the file.
1703
1703
1704 Returns 0 on success.
1704 Returns 0 on success.
1705 """
1705 """
1706 opts = pycompat.byteskwargs(opts)
1706 opts = pycompat.byteskwargs(opts)
1707 rev = opts.get(b'rev')
1707 rev = opts.get(b'rev')
1708 if rev:
1708 if rev:
1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1710 ctx = scmutil.revsingle(repo, rev)
1710 ctx = scmutil.revsingle(repo, rev)
1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1712 fntemplate = opts.pop(b'output', b'')
1712 fntemplate = opts.pop(b'output', b'')
1713 if cmdutil.isstdiofilename(fntemplate):
1713 if cmdutil.isstdiofilename(fntemplate):
1714 fntemplate = b''
1714 fntemplate = b''
1715
1715
1716 if fntemplate:
1716 if fntemplate:
1717 fm = formatter.nullformatter(ui, b'cat', opts)
1717 fm = formatter.nullformatter(ui, b'cat', opts)
1718 else:
1718 else:
1719 ui.pager(b'cat')
1719 ui.pager(b'cat')
1720 fm = ui.formatter(b'cat', opts)
1720 fm = ui.formatter(b'cat', opts)
1721 with fm:
1721 with fm:
1722 return cmdutil.cat(
1722 return cmdutil.cat(
1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1724 )
1724 )
1725
1725
1726
1726
1727 @command(
1727 @command(
1728 b'clone',
1728 b'clone',
1729 [
1729 [
1730 (
1730 (
1731 b'U',
1731 b'U',
1732 b'noupdate',
1732 b'noupdate',
1733 None,
1733 None,
1734 _(
1734 _(
1735 b'the clone will include an empty working '
1735 b'the clone will include an empty working '
1736 b'directory (only a repository)'
1736 b'directory (only a repository)'
1737 ),
1737 ),
1738 ),
1738 ),
1739 (
1739 (
1740 b'u',
1740 b'u',
1741 b'updaterev',
1741 b'updaterev',
1742 b'',
1742 b'',
1743 _(b'revision, tag, or branch to check out'),
1743 _(b'revision, tag, or branch to check out'),
1744 _(b'REV'),
1744 _(b'REV'),
1745 ),
1745 ),
1746 (
1746 (
1747 b'r',
1747 b'r',
1748 b'rev',
1748 b'rev',
1749 [],
1749 [],
1750 _(
1750 _(
1751 b'do not clone everything, but include this changeset'
1751 b'do not clone everything, but include this changeset'
1752 b' and its ancestors'
1752 b' and its ancestors'
1753 ),
1753 ),
1754 _(b'REV'),
1754 _(b'REV'),
1755 ),
1755 ),
1756 (
1756 (
1757 b'b',
1757 b'b',
1758 b'branch',
1758 b'branch',
1759 [],
1759 [],
1760 _(
1760 _(
1761 b'do not clone everything, but include this branch\'s'
1761 b'do not clone everything, but include this branch\'s'
1762 b' changesets and their ancestors'
1762 b' changesets and their ancestors'
1763 ),
1763 ),
1764 _(b'BRANCH'),
1764 _(b'BRANCH'),
1765 ),
1765 ),
1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1769 ]
1769 ]
1770 + remoteopts,
1770 + remoteopts,
1771 _(b'[OPTION]... SOURCE [DEST]'),
1771 _(b'[OPTION]... SOURCE [DEST]'),
1772 helpcategory=command.CATEGORY_REPO_CREATION,
1772 helpcategory=command.CATEGORY_REPO_CREATION,
1773 helpbasic=True,
1773 helpbasic=True,
1774 norepo=True,
1774 norepo=True,
1775 )
1775 )
1776 def clone(ui, source, dest=None, **opts):
1776 def clone(ui, source, dest=None, **opts):
1777 """make a copy of an existing repository
1777 """make a copy of an existing repository
1778
1778
1779 Create a copy of an existing repository in a new directory.
1779 Create a copy of an existing repository in a new directory.
1780
1780
1781 If no destination directory name is specified, it defaults to the
1781 If no destination directory name is specified, it defaults to the
1782 basename of the source.
1782 basename of the source.
1783
1783
1784 The location of the source is added to the new repository's
1784 The location of the source is added to the new repository's
1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1786
1786
1787 Only local paths and ``ssh://`` URLs are supported as
1787 Only local paths and ``ssh://`` URLs are supported as
1788 destinations. For ``ssh://`` destinations, no working directory or
1788 destinations. For ``ssh://`` destinations, no working directory or
1789 ``.hg/hgrc`` will be created on the remote side.
1789 ``.hg/hgrc`` will be created on the remote side.
1790
1790
1791 If the source repository has a bookmark called '@' set, that
1791 If the source repository has a bookmark called '@' set, that
1792 revision will be checked out in the new repository by default.
1792 revision will be checked out in the new repository by default.
1793
1793
1794 To check out a particular version, use -u/--update, or
1794 To check out a particular version, use -u/--update, or
1795 -U/--noupdate to create a clone with no working directory.
1795 -U/--noupdate to create a clone with no working directory.
1796
1796
1797 To pull only a subset of changesets, specify one or more revisions
1797 To pull only a subset of changesets, specify one or more revisions
1798 identifiers with -r/--rev or branches with -b/--branch. The
1798 identifiers with -r/--rev or branches with -b/--branch. The
1799 resulting clone will contain only the specified changesets and
1799 resulting clone will contain only the specified changesets and
1800 their ancestors. These options (or 'clone src#rev dest') imply
1800 their ancestors. These options (or 'clone src#rev dest') imply
1801 --pull, even for local source repositories.
1801 --pull, even for local source repositories.
1802
1802
1803 In normal clone mode, the remote normalizes repository data into a common
1803 In normal clone mode, the remote normalizes repository data into a common
1804 exchange format and the receiving end translates this data into its local
1804 exchange format and the receiving end translates this data into its local
1805 storage format. --stream activates a different clone mode that essentially
1805 storage format. --stream activates a different clone mode that essentially
1806 copies repository files from the remote with minimal data processing. This
1806 copies repository files from the remote with minimal data processing. This
1807 significantly reduces the CPU cost of a clone both remotely and locally.
1807 significantly reduces the CPU cost of a clone both remotely and locally.
1808 However, it often increases the transferred data size by 30-40%. This can
1808 However, it often increases the transferred data size by 30-40%. This can
1809 result in substantially faster clones where I/O throughput is plentiful,
1809 result in substantially faster clones where I/O throughput is plentiful,
1810 especially for larger repositories. A side-effect of --stream clones is
1810 especially for larger repositories. A side-effect of --stream clones is
1811 that storage settings and requirements on the remote are applied locally:
1811 that storage settings and requirements on the remote are applied locally:
1812 a modern client may inherit legacy or inefficient storage used by the
1812 a modern client may inherit legacy or inefficient storage used by the
1813 remote or a legacy Mercurial client may not be able to clone from a
1813 remote or a legacy Mercurial client may not be able to clone from a
1814 modern Mercurial remote.
1814 modern Mercurial remote.
1815
1815
1816 .. note::
1816 .. note::
1817
1817
1818 Specifying a tag will include the tagged changeset but not the
1818 Specifying a tag will include the tagged changeset but not the
1819 changeset containing the tag.
1819 changeset containing the tag.
1820
1820
1821 .. container:: verbose
1821 .. container:: verbose
1822
1822
1823 For efficiency, hardlinks are used for cloning whenever the
1823 For efficiency, hardlinks are used for cloning whenever the
1824 source and destination are on the same filesystem (note this
1824 source and destination are on the same filesystem (note this
1825 applies only to the repository data, not to the working
1825 applies only to the repository data, not to the working
1826 directory). Some filesystems, such as AFS, implement hardlinking
1826 directory). Some filesystems, such as AFS, implement hardlinking
1827 incorrectly, but do not report errors. In these cases, use the
1827 incorrectly, but do not report errors. In these cases, use the
1828 --pull option to avoid hardlinking.
1828 --pull option to avoid hardlinking.
1829
1829
1830 Mercurial will update the working directory to the first applicable
1830 Mercurial will update the working directory to the first applicable
1831 revision from this list:
1831 revision from this list:
1832
1832
1833 a) null if -U or the source repository has no changesets
1833 a) null if -U or the source repository has no changesets
1834 b) if -u . and the source repository is local, the first parent of
1834 b) if -u . and the source repository is local, the first parent of
1835 the source repository's working directory
1835 the source repository's working directory
1836 c) the changeset specified with -u (if a branch name, this means the
1836 c) the changeset specified with -u (if a branch name, this means the
1837 latest head of that branch)
1837 latest head of that branch)
1838 d) the changeset specified with -r
1838 d) the changeset specified with -r
1839 e) the tipmost head specified with -b
1839 e) the tipmost head specified with -b
1840 f) the tipmost head specified with the url#branch source syntax
1840 f) the tipmost head specified with the url#branch source syntax
1841 g) the revision marked with the '@' bookmark, if present
1841 g) the revision marked with the '@' bookmark, if present
1842 h) the tipmost head of the default branch
1842 h) the tipmost head of the default branch
1843 i) tip
1843 i) tip
1844
1844
1845 When cloning from servers that support it, Mercurial may fetch
1845 When cloning from servers that support it, Mercurial may fetch
1846 pre-generated data from a server-advertised URL or inline from the
1846 pre-generated data from a server-advertised URL or inline from the
1847 same stream. When this is done, hooks operating on incoming changesets
1847 same stream. When this is done, hooks operating on incoming changesets
1848 and changegroups may fire more than once, once for each pre-generated
1848 and changegroups may fire more than once, once for each pre-generated
1849 bundle and as well as for any additional remaining data. In addition,
1849 bundle and as well as for any additional remaining data. In addition,
1850 if an error occurs, the repository may be rolled back to a partial
1850 if an error occurs, the repository may be rolled back to a partial
1851 clone. This behavior may change in future releases.
1851 clone. This behavior may change in future releases.
1852 See :hg:`help -e clonebundles` for more.
1852 See :hg:`help -e clonebundles` for more.
1853
1853
1854 Examples:
1854 Examples:
1855
1855
1856 - clone a remote repository to a new directory named hg/::
1856 - clone a remote repository to a new directory named hg/::
1857
1857
1858 hg clone https://www.mercurial-scm.org/repo/hg/
1858 hg clone https://www.mercurial-scm.org/repo/hg/
1859
1859
1860 - create a lightweight local clone::
1860 - create a lightweight local clone::
1861
1861
1862 hg clone project/ project-feature/
1862 hg clone project/ project-feature/
1863
1863
1864 - clone from an absolute path on an ssh server (note double-slash)::
1864 - clone from an absolute path on an ssh server (note double-slash)::
1865
1865
1866 hg clone ssh://user@server//home/projects/alpha/
1866 hg clone ssh://user@server//home/projects/alpha/
1867
1867
1868 - do a streaming clone while checking out a specified version::
1868 - do a streaming clone while checking out a specified version::
1869
1869
1870 hg clone --stream http://server/repo -u 1.5
1870 hg clone --stream http://server/repo -u 1.5
1871
1871
1872 - create a repository without changesets after a particular revision::
1872 - create a repository without changesets after a particular revision::
1873
1873
1874 hg clone -r 04e544 experimental/ good/
1874 hg clone -r 04e544 experimental/ good/
1875
1875
1876 - clone (and track) a particular named branch::
1876 - clone (and track) a particular named branch::
1877
1877
1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1879
1879
1880 See :hg:`help urls` for details on specifying URLs.
1880 See :hg:`help urls` for details on specifying URLs.
1881
1881
1882 Returns 0 on success.
1882 Returns 0 on success.
1883 """
1883 """
1884 opts = pycompat.byteskwargs(opts)
1884 opts = pycompat.byteskwargs(opts)
1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1886
1886
1887 # --include/--exclude can come from narrow or sparse.
1887 # --include/--exclude can come from narrow or sparse.
1888 includepats, excludepats = None, None
1888 includepats, excludepats = None, None
1889
1889
1890 # hg.clone() differentiates between None and an empty set. So make sure
1890 # hg.clone() differentiates between None and an empty set. So make sure
1891 # patterns are sets if narrow is requested without patterns.
1891 # patterns are sets if narrow is requested without patterns.
1892 if opts.get(b'narrow'):
1892 if opts.get(b'narrow'):
1893 includepats = set()
1893 includepats = set()
1894 excludepats = set()
1894 excludepats = set()
1895
1895
1896 if opts.get(b'include'):
1896 if opts.get(b'include'):
1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1898 if opts.get(b'exclude'):
1898 if opts.get(b'exclude'):
1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1900
1900
1901 r = hg.clone(
1901 r = hg.clone(
1902 ui,
1902 ui,
1903 opts,
1903 opts,
1904 source,
1904 source,
1905 dest,
1905 dest,
1906 pull=opts.get(b'pull'),
1906 pull=opts.get(b'pull'),
1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1908 revs=opts.get(b'rev'),
1908 revs=opts.get(b'rev'),
1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1910 branch=opts.get(b'branch'),
1910 branch=opts.get(b'branch'),
1911 shareopts=opts.get(b'shareopts'),
1911 shareopts=opts.get(b'shareopts'),
1912 storeincludepats=includepats,
1912 storeincludepats=includepats,
1913 storeexcludepats=excludepats,
1913 storeexcludepats=excludepats,
1914 depth=opts.get(b'depth') or None,
1914 depth=opts.get(b'depth') or None,
1915 )
1915 )
1916
1916
1917 return r is None
1917 return r is None
1918
1918
1919
1919
1920 @command(
1920 @command(
1921 b'commit|ci',
1921 b'commit|ci',
1922 [
1922 [
1923 (
1923 (
1924 b'A',
1924 b'A',
1925 b'addremove',
1925 b'addremove',
1926 None,
1926 None,
1927 _(b'mark new/missing files as added/removed before committing'),
1927 _(b'mark new/missing files as added/removed before committing'),
1928 ),
1928 ),
1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1933 (
1933 (
1934 b'',
1934 b'',
1935 b'force-close-branch',
1935 b'force-close-branch',
1936 None,
1936 None,
1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1938 ),
1938 ),
1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1940 ]
1940 ]
1941 + walkopts
1941 + walkopts
1942 + commitopts
1942 + commitopts
1943 + commitopts2
1943 + commitopts2
1944 + subrepoopts,
1944 + subrepoopts,
1945 _(b'[OPTION]... [FILE]...'),
1945 _(b'[OPTION]... [FILE]...'),
1946 helpcategory=command.CATEGORY_COMMITTING,
1946 helpcategory=command.CATEGORY_COMMITTING,
1947 helpbasic=True,
1947 helpbasic=True,
1948 inferrepo=True,
1948 inferrepo=True,
1949 )
1949 )
1950 def commit(ui, repo, *pats, **opts):
1950 def commit(ui, repo, *pats, **opts):
1951 """commit the specified files or all outstanding changes
1951 """commit the specified files or all outstanding changes
1952
1952
1953 Commit changes to the given files into the repository. Unlike a
1953 Commit changes to the given files into the repository. Unlike a
1954 centralized SCM, this operation is a local operation. See
1954 centralized SCM, this operation is a local operation. See
1955 :hg:`push` for a way to actively distribute your changes.
1955 :hg:`push` for a way to actively distribute your changes.
1956
1956
1957 If a list of files is omitted, all changes reported by :hg:`status`
1957 If a list of files is omitted, all changes reported by :hg:`status`
1958 will be committed.
1958 will be committed.
1959
1959
1960 If you are committing the result of a merge, do not provide any
1960 If you are committing the result of a merge, do not provide any
1961 filenames or -I/-X filters.
1961 filenames or -I/-X filters.
1962
1962
1963 If no commit message is specified, Mercurial starts your
1963 If no commit message is specified, Mercurial starts your
1964 configured editor where you can enter a message. In case your
1964 configured editor where you can enter a message. In case your
1965 commit fails, you will find a backup of your message in
1965 commit fails, you will find a backup of your message in
1966 ``.hg/last-message.txt``.
1966 ``.hg/last-message.txt``.
1967
1967
1968 The --close-branch flag can be used to mark the current branch
1968 The --close-branch flag can be used to mark the current branch
1969 head closed. When all heads of a branch are closed, the branch
1969 head closed. When all heads of a branch are closed, the branch
1970 will be considered closed and no longer listed.
1970 will be considered closed and no longer listed.
1971
1971
1972 The --amend flag can be used to amend the parent of the
1972 The --amend flag can be used to amend the parent of the
1973 working directory with a new commit that contains the changes
1973 working directory with a new commit that contains the changes
1974 in the parent in addition to those currently reported by :hg:`status`,
1974 in the parent in addition to those currently reported by :hg:`status`,
1975 if there are any. The old commit is stored in a backup bundle in
1975 if there are any. The old commit is stored in a backup bundle in
1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1977 on how to restore it).
1977 on how to restore it).
1978
1978
1979 Message, user and date are taken from the amended commit unless
1979 Message, user and date are taken from the amended commit unless
1980 specified. When a message isn't specified on the command line,
1980 specified. When a message isn't specified on the command line,
1981 the editor will open with the message of the amended commit.
1981 the editor will open with the message of the amended commit.
1982
1982
1983 It is not possible to amend public changesets (see :hg:`help phases`)
1983 It is not possible to amend public changesets (see :hg:`help phases`)
1984 or changesets that have children.
1984 or changesets that have children.
1985
1985
1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1987
1987
1988 Returns 0 on success, 1 if nothing changed.
1988 Returns 0 on success, 1 if nothing changed.
1989
1989
1990 .. container:: verbose
1990 .. container:: verbose
1991
1991
1992 Examples:
1992 Examples:
1993
1993
1994 - commit all files ending in .py::
1994 - commit all files ending in .py::
1995
1995
1996 hg commit --include "set:**.py"
1996 hg commit --include "set:**.py"
1997
1997
1998 - commit all non-binary files::
1998 - commit all non-binary files::
1999
1999
2000 hg commit --exclude "set:binary()"
2000 hg commit --exclude "set:binary()"
2001
2001
2002 - amend the current commit and set the date to now::
2002 - amend the current commit and set the date to now::
2003
2003
2004 hg commit --amend --date now
2004 hg commit --amend --date now
2005 """
2005 """
2006 with repo.wlock(), repo.lock():
2006 with repo.wlock(), repo.lock():
2007 return _docommit(ui, repo, *pats, **opts)
2007 return _docommit(ui, repo, *pats, **opts)
2008
2008
2009
2009
2010 def _docommit(ui, repo, *pats, **opts):
2010 def _docommit(ui, repo, *pats, **opts):
2011 if opts.get('interactive'):
2011 if opts.get('interactive'):
2012 opts.pop('interactive')
2012 opts.pop('interactive')
2013 ret = cmdutil.dorecord(
2013 ret = cmdutil.dorecord(
2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2015 )
2015 )
2016 # ret can be 0 (no changes to record) or the value returned by
2016 # ret can be 0 (no changes to record) or the value returned by
2017 # commit(), 1 if nothing changed or None on success.
2017 # commit(), 1 if nothing changed or None on success.
2018 return 1 if ret == 0 else ret
2018 return 1 if ret == 0 else ret
2019
2019
2020 opts = pycompat.byteskwargs(opts)
2020 opts = pycompat.byteskwargs(opts)
2021 if opts.get(b'subrepos'):
2021 if opts.get(b'subrepos'):
2022 if opts.get(b'amend'):
2022 if opts.get(b'amend'):
2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2024 # Let --subrepos on the command line override config setting.
2024 # Let --subrepos on the command line override config setting.
2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2026
2026
2027 cmdutil.checkunfinished(repo, commit=True)
2027 cmdutil.checkunfinished(repo, commit=True)
2028
2028
2029 branch = repo[None].branch()
2029 branch = repo[None].branch()
2030 bheads = repo.branchheads(branch)
2030 bheads = repo.branchheads(branch)
2031
2031
2032 extra = {}
2032 extra = {}
2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2034 extra[b'close'] = b'1'
2034 extra[b'close'] = b'1'
2035
2035
2036 if repo[b'.'].closesbranch():
2036 if repo[b'.'].closesbranch():
2037 raise error.Abort(
2037 raise error.Abort(
2038 _(b'current revision is already a branch closing head')
2038 _(b'current revision is already a branch closing head')
2039 )
2039 )
2040 elif not bheads:
2040 elif not bheads:
2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2042 elif (
2042 elif (
2043 branch == repo[b'.'].branch()
2043 branch == repo[b'.'].branch()
2044 and repo[b'.'].node() not in bheads
2044 and repo[b'.'].node() not in bheads
2045 and not opts.get(b'force_close_branch')
2045 and not opts.get(b'force_close_branch')
2046 ):
2046 ):
2047 hint = _(
2047 hint = _(
2048 b'use --force-close-branch to close branch from a non-head'
2048 b'use --force-close-branch to close branch from a non-head'
2049 b' changeset'
2049 b' changeset'
2050 )
2050 )
2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2052 elif opts.get(b'amend'):
2052 elif opts.get(b'amend'):
2053 if (
2053 if (
2054 repo[b'.'].p1().branch() != branch
2054 repo[b'.'].p1().branch() != branch
2055 and repo[b'.'].p2().branch() != branch
2055 and repo[b'.'].p2().branch() != branch
2056 ):
2056 ):
2057 raise error.Abort(_(b'can only close branch heads'))
2057 raise error.Abort(_(b'can only close branch heads'))
2058
2058
2059 if opts.get(b'amend'):
2059 if opts.get(b'amend'):
2060 if ui.configbool(b'ui', b'commitsubrepos'):
2060 if ui.configbool(b'ui', b'commitsubrepos'):
2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2062
2062
2063 old = repo[b'.']
2063 old = repo[b'.']
2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2065
2065
2066 # Currently histedit gets confused if an amend happens while histedit
2066 # Currently histedit gets confused if an amend happens while histedit
2067 # is in progress. Since we have a checkunfinished command, we are
2067 # is in progress. Since we have a checkunfinished command, we are
2068 # temporarily honoring it.
2068 # temporarily honoring it.
2069 #
2069 #
2070 # Note: eventually this guard will be removed. Please do not expect
2070 # Note: eventually this guard will be removed. Please do not expect
2071 # this behavior to remain.
2071 # this behavior to remain.
2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2073 cmdutil.checkunfinished(repo)
2073 cmdutil.checkunfinished(repo)
2074
2074
2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2076 if node == old.node():
2076 if node == old.node():
2077 ui.status(_(b"nothing changed\n"))
2077 ui.status(_(b"nothing changed\n"))
2078 return 1
2078 return 1
2079 else:
2079 else:
2080
2080
2081 def commitfunc(ui, repo, message, match, opts):
2081 def commitfunc(ui, repo, message, match, opts):
2082 overrides = {}
2082 overrides = {}
2083 if opts.get(b'secret'):
2083 if opts.get(b'secret'):
2084 overrides[(b'phases', b'new-commit')] = b'secret'
2084 overrides[(b'phases', b'new-commit')] = b'secret'
2085
2085
2086 baseui = repo.baseui
2086 baseui = repo.baseui
2087 with baseui.configoverride(overrides, b'commit'):
2087 with baseui.configoverride(overrides, b'commit'):
2088 with ui.configoverride(overrides, b'commit'):
2088 with ui.configoverride(overrides, b'commit'):
2089 editform = cmdutil.mergeeditform(
2089 editform = cmdutil.mergeeditform(
2090 repo[None], b'commit.normal'
2090 repo[None], b'commit.normal'
2091 )
2091 )
2092 editor = cmdutil.getcommiteditor(
2092 editor = cmdutil.getcommiteditor(
2093 editform=editform, **pycompat.strkwargs(opts)
2093 editform=editform, **pycompat.strkwargs(opts)
2094 )
2094 )
2095 return repo.commit(
2095 return repo.commit(
2096 message,
2096 message,
2097 opts.get(b'user'),
2097 opts.get(b'user'),
2098 opts.get(b'date'),
2098 opts.get(b'date'),
2099 match,
2099 match,
2100 editor=editor,
2100 editor=editor,
2101 extra=extra,
2101 extra=extra,
2102 )
2102 )
2103
2103
2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2105
2105
2106 if not node:
2106 if not node:
2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2108 if stat.deleted:
2108 if stat.deleted:
2109 ui.status(
2109 ui.status(
2110 _(
2110 _(
2111 b"nothing changed (%d missing files, see "
2111 b"nothing changed (%d missing files, see "
2112 b"'hg status')\n"
2112 b"'hg status')\n"
2113 )
2113 )
2114 % len(stat.deleted)
2114 % len(stat.deleted)
2115 )
2115 )
2116 else:
2116 else:
2117 ui.status(_(b"nothing changed\n"))
2117 ui.status(_(b"nothing changed\n"))
2118 return 1
2118 return 1
2119
2119
2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2121
2121
2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2123 status(
2123 status(
2124 ui,
2124 ui,
2125 repo,
2125 repo,
2126 modified=True,
2126 modified=True,
2127 added=True,
2127 added=True,
2128 removed=True,
2128 removed=True,
2129 deleted=True,
2129 deleted=True,
2130 unknown=True,
2130 unknown=True,
2131 subrepos=opts.get(b'subrepos'),
2131 subrepos=opts.get(b'subrepos'),
2132 )
2132 )
2133
2133
2134
2134
2135 @command(
2135 @command(
2136 b'config|showconfig|debugconfig',
2136 b'config|showconfig|debugconfig',
2137 [
2137 [
2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2139 (b'e', b'edit', None, _(b'edit user config')),
2139 (b'e', b'edit', None, _(b'edit user config')),
2140 (b'l', b'local', None, _(b'edit repository config')),
2140 (b'l', b'local', None, _(b'edit repository config')),
2141 (b'g', b'global', None, _(b'edit global config')),
2141 (b'g', b'global', None, _(b'edit global config')),
2142 ]
2142 ]
2143 + formatteropts,
2143 + formatteropts,
2144 _(b'[-u] [NAME]...'),
2144 _(b'[-u] [NAME]...'),
2145 helpcategory=command.CATEGORY_HELP,
2145 helpcategory=command.CATEGORY_HELP,
2146 optionalrepo=True,
2146 optionalrepo=True,
2147 intents={INTENT_READONLY},
2147 intents={INTENT_READONLY},
2148 )
2148 )
2149 def config(ui, repo, *values, **opts):
2149 def config(ui, repo, *values, **opts):
2150 """show combined config settings from all hgrc files
2150 """show combined config settings from all hgrc files
2151
2151
2152 With no arguments, print names and values of all config items.
2152 With no arguments, print names and values of all config items.
2153
2153
2154 With one argument of the form section.name, print just the value
2154 With one argument of the form section.name, print just the value
2155 of that config item.
2155 of that config item.
2156
2156
2157 With multiple arguments, print names and values of all config
2157 With multiple arguments, print names and values of all config
2158 items with matching section names or section.names.
2158 items with matching section names or section.names.
2159
2159
2160 With --edit, start an editor on the user-level config file. With
2160 With --edit, start an editor on the user-level config file. With
2161 --global, edit the system-wide config file. With --local, edit the
2161 --global, edit the system-wide config file. With --local, edit the
2162 repository-level config file.
2162 repository-level config file.
2163
2163
2164 With --debug, the source (filename and line number) is printed
2164 With --debug, the source (filename and line number) is printed
2165 for each config item.
2165 for each config item.
2166
2166
2167 See :hg:`help config` for more information about config files.
2167 See :hg:`help config` for more information about config files.
2168
2168
2169 .. container:: verbose
2169 .. container:: verbose
2170
2170
2171 Template:
2171 Template:
2172
2172
2173 The following keywords are supported. See also :hg:`help templates`.
2173 The following keywords are supported. See also :hg:`help templates`.
2174
2174
2175 :name: String. Config name.
2175 :name: String. Config name.
2176 :source: String. Filename and line number where the item is defined.
2176 :source: String. Filename and line number where the item is defined.
2177 :value: String. Config value.
2177 :value: String. Config value.
2178
2178
2179 Returns 0 on success, 1 if NAME does not exist.
2179 Returns 0 on success, 1 if NAME does not exist.
2180
2180
2181 """
2181 """
2182
2182
2183 opts = pycompat.byteskwargs(opts)
2183 opts = pycompat.byteskwargs(opts)
2184 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2184 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2185 if opts.get(b'local') and opts.get(b'global'):
2185 if opts.get(b'local') and opts.get(b'global'):
2186 raise error.Abort(_(b"can't use --local and --global together"))
2186 raise error.Abort(_(b"can't use --local and --global together"))
2187
2187
2188 if opts.get(b'local'):
2188 if opts.get(b'local'):
2189 if not repo:
2189 if not repo:
2190 raise error.Abort(_(b"can't use --local outside a repository"))
2190 raise error.Abort(_(b"can't use --local outside a repository"))
2191 paths = [repo.vfs.join(b'hgrc')]
2191 paths = [repo.vfs.join(b'hgrc')]
2192 elif opts.get(b'global'):
2192 elif opts.get(b'global'):
2193 paths = rcutil.systemrcpath()
2193 paths = rcutil.systemrcpath()
2194 else:
2194 else:
2195 paths = rcutil.userrcpath()
2195 paths = rcutil.userrcpath()
2196
2196
2197 for f in paths:
2197 for f in paths:
2198 if os.path.exists(f):
2198 if os.path.exists(f):
2199 break
2199 break
2200 else:
2200 else:
2201 if opts.get(b'global'):
2201 if opts.get(b'global'):
2202 samplehgrc = uimod.samplehgrcs[b'global']
2202 samplehgrc = uimod.samplehgrcs[b'global']
2203 elif opts.get(b'local'):
2203 elif opts.get(b'local'):
2204 samplehgrc = uimod.samplehgrcs[b'local']
2204 samplehgrc = uimod.samplehgrcs[b'local']
2205 else:
2205 else:
2206 samplehgrc = uimod.samplehgrcs[b'user']
2206 samplehgrc = uimod.samplehgrcs[b'user']
2207
2207
2208 f = paths[0]
2208 f = paths[0]
2209 fp = open(f, b"wb")
2209 fp = open(f, b"wb")
2210 fp.write(util.tonativeeol(samplehgrc))
2210 fp.write(util.tonativeeol(samplehgrc))
2211 fp.close()
2211 fp.close()
2212
2212
2213 editor = ui.geteditor()
2213 editor = ui.geteditor()
2214 ui.system(
2214 ui.system(
2215 b"%s \"%s\"" % (editor, f),
2215 b"%s \"%s\"" % (editor, f),
2216 onerr=error.Abort,
2216 onerr=error.Abort,
2217 errprefix=_(b"edit failed"),
2217 errprefix=_(b"edit failed"),
2218 blockedtag=b'config_edit',
2218 blockedtag=b'config_edit',
2219 )
2219 )
2220 return
2220 return
2221 ui.pager(b'config')
2221 ui.pager(b'config')
2222 fm = ui.formatter(b'config', opts)
2222 fm = ui.formatter(b'config', opts)
2223 for t, f in rcutil.rccomponents():
2223 for t, f in rcutil.rccomponents():
2224 if t == b'path':
2224 if t == b'path':
2225 ui.debug(b'read config from: %s\n' % f)
2225 ui.debug(b'read config from: %s\n' % f)
2226 elif t == b'resource':
2226 elif t == b'resource':
2227 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2227 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2228 elif t == b'items':
2228 elif t == b'items':
2229 # Don't print anything for 'items'.
2229 # Don't print anything for 'items'.
2230 pass
2230 pass
2231 else:
2231 else:
2232 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2232 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2233 untrusted = bool(opts.get(b'untrusted'))
2233 untrusted = bool(opts.get(b'untrusted'))
2234
2234
2235 selsections = selentries = []
2235 selsections = selentries = []
2236 if values:
2236 if values:
2237 selsections = [v for v in values if b'.' not in v]
2237 selsections = [v for v in values if b'.' not in v]
2238 selentries = [v for v in values if b'.' in v]
2238 selentries = [v for v in values if b'.' in v]
2239 uniquesel = len(selentries) == 1 and not selsections
2239 uniquesel = len(selentries) == 1 and not selsections
2240 selsections = set(selsections)
2240 selsections = set(selsections)
2241 selentries = set(selentries)
2241 selentries = set(selentries)
2242
2242
2243 matched = False
2243 matched = False
2244 for section, name, value in ui.walkconfig(untrusted=untrusted):
2244 for section, name, value in ui.walkconfig(untrusted=untrusted):
2245 source = ui.configsource(section, name, untrusted)
2245 source = ui.configsource(section, name, untrusted)
2246 value = pycompat.bytestr(value)
2246 value = pycompat.bytestr(value)
2247 defaultvalue = ui.configdefault(section, name)
2247 defaultvalue = ui.configdefault(section, name)
2248 if fm.isplain():
2248 if fm.isplain():
2249 source = source or b'none'
2249 source = source or b'none'
2250 value = value.replace(b'\n', b'\\n')
2250 value = value.replace(b'\n', b'\\n')
2251 entryname = section + b'.' + name
2251 entryname = section + b'.' + name
2252 if values and not (section in selsections or entryname in selentries):
2252 if values and not (section in selsections or entryname in selentries):
2253 continue
2253 continue
2254 fm.startitem()
2254 fm.startitem()
2255 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2255 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2256 if uniquesel:
2256 if uniquesel:
2257 fm.data(name=entryname)
2257 fm.data(name=entryname)
2258 fm.write(b'value', b'%s\n', value)
2258 fm.write(b'value', b'%s\n', value)
2259 else:
2259 else:
2260 fm.write(b'name value', b'%s=%s\n', entryname, value)
2260 fm.write(b'name value', b'%s=%s\n', entryname, value)
2261 if formatter.isprintable(defaultvalue):
2261 if formatter.isprintable(defaultvalue):
2262 fm.data(defaultvalue=defaultvalue)
2262 fm.data(defaultvalue=defaultvalue)
2263 elif isinstance(defaultvalue, list) and all(
2263 elif isinstance(defaultvalue, list) and all(
2264 formatter.isprintable(e) for e in defaultvalue
2264 formatter.isprintable(e) for e in defaultvalue
2265 ):
2265 ):
2266 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2266 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2267 # TODO: no idea how to process unsupported defaultvalue types
2267 # TODO: no idea how to process unsupported defaultvalue types
2268 matched = True
2268 matched = True
2269 fm.end()
2269 fm.end()
2270 if matched:
2270 if matched:
2271 return 0
2271 return 0
2272 return 1
2272 return 1
2273
2273
2274
2274
2275 @command(
2275 @command(
2276 b'continue',
2276 b'continue',
2277 dryrunopts,
2277 dryrunopts,
2278 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2278 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2279 helpbasic=True,
2279 helpbasic=True,
2280 )
2280 )
2281 def continuecmd(ui, repo, **opts):
2281 def continuecmd(ui, repo, **opts):
2282 """resumes an interrupted operation (EXPERIMENTAL)
2282 """resumes an interrupted operation (EXPERIMENTAL)
2283
2283
2284 Finishes a multistep operation like graft, histedit, rebase, merge,
2284 Finishes a multistep operation like graft, histedit, rebase, merge,
2285 and unshelve if they are in an interrupted state.
2285 and unshelve if they are in an interrupted state.
2286
2286
2287 use --dry-run/-n to dry run the command.
2287 use --dry-run/-n to dry run the command.
2288 """
2288 """
2289 dryrun = opts.get('dry_run')
2289 dryrun = opts.get('dry_run')
2290 contstate = cmdutil.getunfinishedstate(repo)
2290 contstate = cmdutil.getunfinishedstate(repo)
2291 if not contstate:
2291 if not contstate:
2292 raise error.Abort(_(b'no operation in progress'))
2292 raise error.Abort(_(b'no operation in progress'))
2293 if not contstate.continuefunc:
2293 if not contstate.continuefunc:
2294 raise error.Abort(
2294 raise error.Abort(
2295 (
2295 (
2296 _(b"%s in progress but does not support 'hg continue'")
2296 _(b"%s in progress but does not support 'hg continue'")
2297 % (contstate._opname)
2297 % (contstate._opname)
2298 ),
2298 ),
2299 hint=contstate.continuemsg(),
2299 hint=contstate.continuemsg(),
2300 )
2300 )
2301 if dryrun:
2301 if dryrun:
2302 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2302 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2303 return
2303 return
2304 return contstate.continuefunc(ui, repo)
2304 return contstate.continuefunc(ui, repo)
2305
2305
2306
2306
2307 @command(
2307 @command(
2308 b'copy|cp',
2308 b'copy|cp',
2309 [
2309 [
2310 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2310 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2311 (
2311 (
2312 b'f',
2312 b'f',
2313 b'force',
2313 b'force',
2314 None,
2314 None,
2315 _(b'forcibly copy over an existing managed file'),
2315 _(b'forcibly copy over an existing managed file'),
2316 ),
2316 ),
2317 ]
2317 ]
2318 + walkopts
2318 + walkopts
2319 + dryrunopts,
2319 + dryrunopts,
2320 _(b'[OPTION]... SOURCE... DEST'),
2320 _(b'[OPTION]... SOURCE... DEST'),
2321 helpcategory=command.CATEGORY_FILE_CONTENTS,
2321 helpcategory=command.CATEGORY_FILE_CONTENTS,
2322 )
2322 )
2323 def copy(ui, repo, *pats, **opts):
2323 def copy(ui, repo, *pats, **opts):
2324 """mark files as copied for the next commit
2324 """mark files as copied for the next commit
2325
2325
2326 Mark dest as having copies of source files. If dest is a
2326 Mark dest as having copies of source files. If dest is a
2327 directory, copies are put in that directory. If dest is a file,
2327 directory, copies are put in that directory. If dest is a file,
2328 the source must be a single file.
2328 the source must be a single file.
2329
2329
2330 By default, this command copies the contents of files as they
2330 By default, this command copies the contents of files as they
2331 exist in the working directory. If invoked with -A/--after, the
2331 exist in the working directory. If invoked with -A/--after, the
2332 operation is recorded, but no copying is performed.
2332 operation is recorded, but no copying is performed.
2333
2333
2334 This command takes effect with the next commit. To undo a copy
2334 This command takes effect with the next commit. To undo a copy
2335 before that, see :hg:`revert`.
2335 before that, see :hg:`revert`.
2336
2336
2337 Returns 0 on success, 1 if errors are encountered.
2337 Returns 0 on success, 1 if errors are encountered.
2338 """
2338 """
2339 opts = pycompat.byteskwargs(opts)
2339 opts = pycompat.byteskwargs(opts)
2340 with repo.wlock(False):
2340 with repo.wlock(False):
2341 return cmdutil.copy(ui, repo, pats, opts)
2341 return cmdutil.copy(ui, repo, pats, opts)
2342
2342
2343
2343
2344 @command(
2344 @command(
2345 b'debugcommands',
2345 b'debugcommands',
2346 [],
2346 [],
2347 _(b'[COMMAND]'),
2347 _(b'[COMMAND]'),
2348 helpcategory=command.CATEGORY_HELP,
2348 helpcategory=command.CATEGORY_HELP,
2349 norepo=True,
2349 norepo=True,
2350 )
2350 )
2351 def debugcommands(ui, cmd=b'', *args):
2351 def debugcommands(ui, cmd=b'', *args):
2352 """list all available commands and options"""
2352 """list all available commands and options"""
2353 for cmd, vals in sorted(pycompat.iteritems(table)):
2353 for cmd, vals in sorted(pycompat.iteritems(table)):
2354 cmd = cmd.split(b'|')[0]
2354 cmd = cmd.split(b'|')[0]
2355 opts = b', '.join([i[1] for i in vals[1]])
2355 opts = b', '.join([i[1] for i in vals[1]])
2356 ui.write(b'%s: %s\n' % (cmd, opts))
2356 ui.write(b'%s: %s\n' % (cmd, opts))
2357
2357
2358
2358
2359 @command(
2359 @command(
2360 b'debugcomplete',
2360 b'debugcomplete',
2361 [(b'o', b'options', None, _(b'show the command options'))],
2361 [(b'o', b'options', None, _(b'show the command options'))],
2362 _(b'[-o] CMD'),
2362 _(b'[-o] CMD'),
2363 helpcategory=command.CATEGORY_HELP,
2363 helpcategory=command.CATEGORY_HELP,
2364 norepo=True,
2364 norepo=True,
2365 )
2365 )
2366 def debugcomplete(ui, cmd=b'', **opts):
2366 def debugcomplete(ui, cmd=b'', **opts):
2367 """returns the completion list associated with the given command"""
2367 """returns the completion list associated with the given command"""
2368
2368
2369 if opts.get('options'):
2369 if opts.get('options'):
2370 options = []
2370 options = []
2371 otables = [globalopts]
2371 otables = [globalopts]
2372 if cmd:
2372 if cmd:
2373 aliases, entry = cmdutil.findcmd(cmd, table, False)
2373 aliases, entry = cmdutil.findcmd(cmd, table, False)
2374 otables.append(entry[1])
2374 otables.append(entry[1])
2375 for t in otables:
2375 for t in otables:
2376 for o in t:
2376 for o in t:
2377 if b"(DEPRECATED)" in o[3]:
2377 if b"(DEPRECATED)" in o[3]:
2378 continue
2378 continue
2379 if o[0]:
2379 if o[0]:
2380 options.append(b'-%s' % o[0])
2380 options.append(b'-%s' % o[0])
2381 options.append(b'--%s' % o[1])
2381 options.append(b'--%s' % o[1])
2382 ui.write(b"%s\n" % b"\n".join(options))
2382 ui.write(b"%s\n" % b"\n".join(options))
2383 return
2383 return
2384
2384
2385 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2385 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2386 if ui.verbose:
2386 if ui.verbose:
2387 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2387 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2388 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2388 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2389
2389
2390
2390
2391 @command(
2391 @command(
2392 b'diff',
2392 b'diff',
2393 [
2393 [
2394 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2394 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2395 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2395 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2396 ]
2396 ]
2397 + diffopts
2397 + diffopts
2398 + diffopts2
2398 + diffopts2
2399 + walkopts
2399 + walkopts
2400 + subrepoopts,
2400 + subrepoopts,
2401 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2401 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2403 helpbasic=True,
2403 helpbasic=True,
2404 inferrepo=True,
2404 inferrepo=True,
2405 intents={INTENT_READONLY},
2405 intents={INTENT_READONLY},
2406 )
2406 )
2407 def diff(ui, repo, *pats, **opts):
2407 def diff(ui, repo, *pats, **opts):
2408 """diff repository (or selected files)
2408 """diff repository (or selected files)
2409
2409
2410 Show differences between revisions for the specified files.
2410 Show differences between revisions for the specified files.
2411
2411
2412 Differences between files are shown using the unified diff format.
2412 Differences between files are shown using the unified diff format.
2413
2413
2414 .. note::
2414 .. note::
2415
2415
2416 :hg:`diff` may generate unexpected results for merges, as it will
2416 :hg:`diff` may generate unexpected results for merges, as it will
2417 default to comparing against the working directory's first
2417 default to comparing against the working directory's first
2418 parent changeset if no revisions are specified.
2418 parent changeset if no revisions are specified.
2419
2419
2420 When two revision arguments are given, then changes are shown
2420 When two revision arguments are given, then changes are shown
2421 between those revisions. If only one revision is specified then
2421 between those revisions. If only one revision is specified then
2422 that revision is compared to the working directory, and, when no
2422 that revision is compared to the working directory, and, when no
2423 revisions are specified, the working directory files are compared
2423 revisions are specified, the working directory files are compared
2424 to its first parent.
2424 to its first parent.
2425
2425
2426 Alternatively you can specify -c/--change with a revision to see
2426 Alternatively you can specify -c/--change with a revision to see
2427 the changes in that changeset relative to its first parent.
2427 the changes in that changeset relative to its first parent.
2428
2428
2429 Without the -a/--text option, diff will avoid generating diffs of
2429 Without the -a/--text option, diff will avoid generating diffs of
2430 files it detects as binary. With -a, diff will generate a diff
2430 files it detects as binary. With -a, diff will generate a diff
2431 anyway, probably with undesirable results.
2431 anyway, probably with undesirable results.
2432
2432
2433 Use the -g/--git option to generate diffs in the git extended diff
2433 Use the -g/--git option to generate diffs in the git extended diff
2434 format. For more information, read :hg:`help diffs`.
2434 format. For more information, read :hg:`help diffs`.
2435
2435
2436 .. container:: verbose
2436 .. container:: verbose
2437
2437
2438 Examples:
2438 Examples:
2439
2439
2440 - compare a file in the current working directory to its parent::
2440 - compare a file in the current working directory to its parent::
2441
2441
2442 hg diff foo.c
2442 hg diff foo.c
2443
2443
2444 - compare two historical versions of a directory, with rename info::
2444 - compare two historical versions of a directory, with rename info::
2445
2445
2446 hg diff --git -r 1.0:1.2 lib/
2446 hg diff --git -r 1.0:1.2 lib/
2447
2447
2448 - get change stats relative to the last change on some date::
2448 - get change stats relative to the last change on some date::
2449
2449
2450 hg diff --stat -r "date('may 2')"
2450 hg diff --stat -r "date('may 2')"
2451
2451
2452 - diff all newly-added files that contain a keyword::
2452 - diff all newly-added files that contain a keyword::
2453
2453
2454 hg diff "set:added() and grep(GNU)"
2454 hg diff "set:added() and grep(GNU)"
2455
2455
2456 - compare a revision and its parents::
2456 - compare a revision and its parents::
2457
2457
2458 hg diff -c 9353 # compare against first parent
2458 hg diff -c 9353 # compare against first parent
2459 hg diff -r 9353^:9353 # same using revset syntax
2459 hg diff -r 9353^:9353 # same using revset syntax
2460 hg diff -r 9353^2:9353 # compare against the second parent
2460 hg diff -r 9353^2:9353 # compare against the second parent
2461
2461
2462 Returns 0 on success.
2462 Returns 0 on success.
2463 """
2463 """
2464
2464
2465 opts = pycompat.byteskwargs(opts)
2465 opts = pycompat.byteskwargs(opts)
2466 revs = opts.get(b'rev')
2466 revs = opts.get(b'rev')
2467 change = opts.get(b'change')
2467 change = opts.get(b'change')
2468 stat = opts.get(b'stat')
2468 stat = opts.get(b'stat')
2469 reverse = opts.get(b'reverse')
2469 reverse = opts.get(b'reverse')
2470
2470
2471 if revs and change:
2471 if revs and change:
2472 msg = _(b'cannot specify --rev and --change at the same time')
2472 msg = _(b'cannot specify --rev and --change at the same time')
2473 raise error.Abort(msg)
2473 raise error.Abort(msg)
2474 elif change:
2474 elif change:
2475 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2475 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2476 ctx2 = scmutil.revsingle(repo, change, None)
2476 ctx2 = scmutil.revsingle(repo, change, None)
2477 ctx1 = ctx2.p1()
2477 ctx1 = ctx2.p1()
2478 else:
2478 else:
2479 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2479 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2480 ctx1, ctx2 = scmutil.revpair(repo, revs)
2480 ctx1, ctx2 = scmutil.revpair(repo, revs)
2481 node1, node2 = ctx1.node(), ctx2.node()
2481 node1, node2 = ctx1.node(), ctx2.node()
2482
2482
2483 if reverse:
2483 if reverse:
2484 node1, node2 = node2, node1
2484 node1, node2 = node2, node1
2485
2485
2486 diffopts = patch.diffallopts(ui, opts)
2486 diffopts = patch.diffallopts(ui, opts)
2487 m = scmutil.match(ctx2, pats, opts)
2487 m = scmutil.match(ctx2, pats, opts)
2488 m = repo.narrowmatch(m)
2488 m = repo.narrowmatch(m)
2489 ui.pager(b'diff')
2489 ui.pager(b'diff')
2490 logcmdutil.diffordiffstat(
2490 logcmdutil.diffordiffstat(
2491 ui,
2491 ui,
2492 repo,
2492 repo,
2493 diffopts,
2493 diffopts,
2494 node1,
2494 node1,
2495 node2,
2495 node2,
2496 m,
2496 m,
2497 stat=stat,
2497 stat=stat,
2498 listsubrepos=opts.get(b'subrepos'),
2498 listsubrepos=opts.get(b'subrepos'),
2499 root=opts.get(b'root'),
2499 root=opts.get(b'root'),
2500 )
2500 )
2501
2501
2502
2502
2503 @command(
2503 @command(
2504 b'export',
2504 b'export',
2505 [
2505 [
2506 (
2506 (
2507 b'B',
2507 b'B',
2508 b'bookmark',
2508 b'bookmark',
2509 b'',
2509 b'',
2510 _(b'export changes only reachable by given bookmark'),
2510 _(b'export changes only reachable by given bookmark'),
2511 _(b'BOOKMARK'),
2511 _(b'BOOKMARK'),
2512 ),
2512 ),
2513 (
2513 (
2514 b'o',
2514 b'o',
2515 b'output',
2515 b'output',
2516 b'',
2516 b'',
2517 _(b'print output to file with formatted name'),
2517 _(b'print output to file with formatted name'),
2518 _(b'FORMAT'),
2518 _(b'FORMAT'),
2519 ),
2519 ),
2520 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2520 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2521 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2521 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2522 ]
2522 ]
2523 + diffopts
2523 + diffopts
2524 + formatteropts,
2524 + formatteropts,
2525 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2525 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2526 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2526 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2527 helpbasic=True,
2527 helpbasic=True,
2528 intents={INTENT_READONLY},
2528 intents={INTENT_READONLY},
2529 )
2529 )
2530 def export(ui, repo, *changesets, **opts):
2530 def export(ui, repo, *changesets, **opts):
2531 """dump the header and diffs for one or more changesets
2531 """dump the header and diffs for one or more changesets
2532
2532
2533 Print the changeset header and diffs for one or more revisions.
2533 Print the changeset header and diffs for one or more revisions.
2534 If no revision is given, the parent of the working directory is used.
2534 If no revision is given, the parent of the working directory is used.
2535
2535
2536 The information shown in the changeset header is: author, date,
2536 The information shown in the changeset header is: author, date,
2537 branch name (if non-default), changeset hash, parent(s) and commit
2537 branch name (if non-default), changeset hash, parent(s) and commit
2538 comment.
2538 comment.
2539
2539
2540 .. note::
2540 .. note::
2541
2541
2542 :hg:`export` may generate unexpected diff output for merge
2542 :hg:`export` may generate unexpected diff output for merge
2543 changesets, as it will compare the merge changeset against its
2543 changesets, as it will compare the merge changeset against its
2544 first parent only.
2544 first parent only.
2545
2545
2546 Output may be to a file, in which case the name of the file is
2546 Output may be to a file, in which case the name of the file is
2547 given using a template string. See :hg:`help templates`. In addition
2547 given using a template string. See :hg:`help templates`. In addition
2548 to the common template keywords, the following formatting rules are
2548 to the common template keywords, the following formatting rules are
2549 supported:
2549 supported:
2550
2550
2551 :``%%``: literal "%" character
2551 :``%%``: literal "%" character
2552 :``%H``: changeset hash (40 hexadecimal digits)
2552 :``%H``: changeset hash (40 hexadecimal digits)
2553 :``%N``: number of patches being generated
2553 :``%N``: number of patches being generated
2554 :``%R``: changeset revision number
2554 :``%R``: changeset revision number
2555 :``%b``: basename of the exporting repository
2555 :``%b``: basename of the exporting repository
2556 :``%h``: short-form changeset hash (12 hexadecimal digits)
2556 :``%h``: short-form changeset hash (12 hexadecimal digits)
2557 :``%m``: first line of the commit message (only alphanumeric characters)
2557 :``%m``: first line of the commit message (only alphanumeric characters)
2558 :``%n``: zero-padded sequence number, starting at 1
2558 :``%n``: zero-padded sequence number, starting at 1
2559 :``%r``: zero-padded changeset revision number
2559 :``%r``: zero-padded changeset revision number
2560 :``\\``: literal "\\" character
2560 :``\\``: literal "\\" character
2561
2561
2562 Without the -a/--text option, export will avoid generating diffs
2562 Without the -a/--text option, export will avoid generating diffs
2563 of files it detects as binary. With -a, export will generate a
2563 of files it detects as binary. With -a, export will generate a
2564 diff anyway, probably with undesirable results.
2564 diff anyway, probably with undesirable results.
2565
2565
2566 With -B/--bookmark changesets reachable by the given bookmark are
2566 With -B/--bookmark changesets reachable by the given bookmark are
2567 selected.
2567 selected.
2568
2568
2569 Use the -g/--git option to generate diffs in the git extended diff
2569 Use the -g/--git option to generate diffs in the git extended diff
2570 format. See :hg:`help diffs` for more information.
2570 format. See :hg:`help diffs` for more information.
2571
2571
2572 With the --switch-parent option, the diff will be against the
2572 With the --switch-parent option, the diff will be against the
2573 second parent. It can be useful to review a merge.
2573 second parent. It can be useful to review a merge.
2574
2574
2575 .. container:: verbose
2575 .. container:: verbose
2576
2576
2577 Template:
2577 Template:
2578
2578
2579 The following keywords are supported in addition to the common template
2579 The following keywords are supported in addition to the common template
2580 keywords and functions. See also :hg:`help templates`.
2580 keywords and functions. See also :hg:`help templates`.
2581
2581
2582 :diff: String. Diff content.
2582 :diff: String. Diff content.
2583 :parents: List of strings. Parent nodes of the changeset.
2583 :parents: List of strings. Parent nodes of the changeset.
2584
2584
2585 Examples:
2585 Examples:
2586
2586
2587 - use export and import to transplant a bugfix to the current
2587 - use export and import to transplant a bugfix to the current
2588 branch::
2588 branch::
2589
2589
2590 hg export -r 9353 | hg import -
2590 hg export -r 9353 | hg import -
2591
2591
2592 - export all the changesets between two revisions to a file with
2592 - export all the changesets between two revisions to a file with
2593 rename information::
2593 rename information::
2594
2594
2595 hg export --git -r 123:150 > changes.txt
2595 hg export --git -r 123:150 > changes.txt
2596
2596
2597 - split outgoing changes into a series of patches with
2597 - split outgoing changes into a series of patches with
2598 descriptive names::
2598 descriptive names::
2599
2599
2600 hg export -r "outgoing()" -o "%n-%m.patch"
2600 hg export -r "outgoing()" -o "%n-%m.patch"
2601
2601
2602 Returns 0 on success.
2602 Returns 0 on success.
2603 """
2603 """
2604 opts = pycompat.byteskwargs(opts)
2604 opts = pycompat.byteskwargs(opts)
2605 bookmark = opts.get(b'bookmark')
2605 bookmark = opts.get(b'bookmark')
2606 changesets += tuple(opts.get(b'rev', []))
2606 changesets += tuple(opts.get(b'rev', []))
2607
2607
2608 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2608 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2609
2609
2610 if bookmark:
2610 if bookmark:
2611 if bookmark not in repo._bookmarks:
2611 if bookmark not in repo._bookmarks:
2612 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2612 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2613
2613
2614 revs = scmutil.bookmarkrevs(repo, bookmark)
2614 revs = scmutil.bookmarkrevs(repo, bookmark)
2615 else:
2615 else:
2616 if not changesets:
2616 if not changesets:
2617 changesets = [b'.']
2617 changesets = [b'.']
2618
2618
2619 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2619 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2620 revs = scmutil.revrange(repo, changesets)
2620 revs = scmutil.revrange(repo, changesets)
2621
2621
2622 if not revs:
2622 if not revs:
2623 raise error.Abort(_(b"export requires at least one changeset"))
2623 raise error.Abort(_(b"export requires at least one changeset"))
2624 if len(revs) > 1:
2624 if len(revs) > 1:
2625 ui.note(_(b'exporting patches:\n'))
2625 ui.note(_(b'exporting patches:\n'))
2626 else:
2626 else:
2627 ui.note(_(b'exporting patch:\n'))
2627 ui.note(_(b'exporting patch:\n'))
2628
2628
2629 fntemplate = opts.get(b'output')
2629 fntemplate = opts.get(b'output')
2630 if cmdutil.isstdiofilename(fntemplate):
2630 if cmdutil.isstdiofilename(fntemplate):
2631 fntemplate = b''
2631 fntemplate = b''
2632
2632
2633 if fntemplate:
2633 if fntemplate:
2634 fm = formatter.nullformatter(ui, b'export', opts)
2634 fm = formatter.nullformatter(ui, b'export', opts)
2635 else:
2635 else:
2636 ui.pager(b'export')
2636 ui.pager(b'export')
2637 fm = ui.formatter(b'export', opts)
2637 fm = ui.formatter(b'export', opts)
2638 with fm:
2638 with fm:
2639 cmdutil.export(
2639 cmdutil.export(
2640 repo,
2640 repo,
2641 revs,
2641 revs,
2642 fm,
2642 fm,
2643 fntemplate=fntemplate,
2643 fntemplate=fntemplate,
2644 switch_parent=opts.get(b'switch_parent'),
2644 switch_parent=opts.get(b'switch_parent'),
2645 opts=patch.diffallopts(ui, opts),
2645 opts=patch.diffallopts(ui, opts),
2646 )
2646 )
2647
2647
2648
2648
2649 @command(
2649 @command(
2650 b'files',
2650 b'files',
2651 [
2651 [
2652 (
2652 (
2653 b'r',
2653 b'r',
2654 b'rev',
2654 b'rev',
2655 b'',
2655 b'',
2656 _(b'search the repository as it is in REV'),
2656 _(b'search the repository as it is in REV'),
2657 _(b'REV'),
2657 _(b'REV'),
2658 ),
2658 ),
2659 (
2659 (
2660 b'0',
2660 b'0',
2661 b'print0',
2661 b'print0',
2662 None,
2662 None,
2663 _(b'end filenames with NUL, for use with xargs'),
2663 _(b'end filenames with NUL, for use with xargs'),
2664 ),
2664 ),
2665 ]
2665 ]
2666 + walkopts
2666 + walkopts
2667 + formatteropts
2667 + formatteropts
2668 + subrepoopts,
2668 + subrepoopts,
2669 _(b'[OPTION]... [FILE]...'),
2669 _(b'[OPTION]... [FILE]...'),
2670 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2670 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2671 intents={INTENT_READONLY},
2671 intents={INTENT_READONLY},
2672 )
2672 )
2673 def files(ui, repo, *pats, **opts):
2673 def files(ui, repo, *pats, **opts):
2674 """list tracked files
2674 """list tracked files
2675
2675
2676 Print files under Mercurial control in the working directory or
2676 Print files under Mercurial control in the working directory or
2677 specified revision for given files (excluding removed files).
2677 specified revision for given files (excluding removed files).
2678 Files can be specified as filenames or filesets.
2678 Files can be specified as filenames or filesets.
2679
2679
2680 If no files are given to match, this command prints the names
2680 If no files are given to match, this command prints the names
2681 of all files under Mercurial control.
2681 of all files under Mercurial control.
2682
2682
2683 .. container:: verbose
2683 .. container:: verbose
2684
2684
2685 Template:
2685 Template:
2686
2686
2687 The following keywords are supported in addition to the common template
2687 The following keywords are supported in addition to the common template
2688 keywords and functions. See also :hg:`help templates`.
2688 keywords and functions. See also :hg:`help templates`.
2689
2689
2690 :flags: String. Character denoting file's symlink and executable bits.
2690 :flags: String. Character denoting file's symlink and executable bits.
2691 :path: String. Repository-absolute path of the file.
2691 :path: String. Repository-absolute path of the file.
2692 :size: Integer. Size of the file in bytes.
2692 :size: Integer. Size of the file in bytes.
2693
2693
2694 Examples:
2694 Examples:
2695
2695
2696 - list all files under the current directory::
2696 - list all files under the current directory::
2697
2697
2698 hg files .
2698 hg files .
2699
2699
2700 - shows sizes and flags for current revision::
2700 - shows sizes and flags for current revision::
2701
2701
2702 hg files -vr .
2702 hg files -vr .
2703
2703
2704 - list all files named README::
2704 - list all files named README::
2705
2705
2706 hg files -I "**/README"
2706 hg files -I "**/README"
2707
2707
2708 - list all binary files::
2708 - list all binary files::
2709
2709
2710 hg files "set:binary()"
2710 hg files "set:binary()"
2711
2711
2712 - find files containing a regular expression::
2712 - find files containing a regular expression::
2713
2713
2714 hg files "set:grep('bob')"
2714 hg files "set:grep('bob')"
2715
2715
2716 - search tracked file contents with xargs and grep::
2716 - search tracked file contents with xargs and grep::
2717
2717
2718 hg files -0 | xargs -0 grep foo
2718 hg files -0 | xargs -0 grep foo
2719
2719
2720 See :hg:`help patterns` and :hg:`help filesets` for more information
2720 See :hg:`help patterns` and :hg:`help filesets` for more information
2721 on specifying file patterns.
2721 on specifying file patterns.
2722
2722
2723 Returns 0 if a match is found, 1 otherwise.
2723 Returns 0 if a match is found, 1 otherwise.
2724
2724
2725 """
2725 """
2726
2726
2727 opts = pycompat.byteskwargs(opts)
2727 opts = pycompat.byteskwargs(opts)
2728 rev = opts.get(b'rev')
2728 rev = opts.get(b'rev')
2729 if rev:
2729 if rev:
2730 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2730 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2731 ctx = scmutil.revsingle(repo, rev, None)
2731 ctx = scmutil.revsingle(repo, rev, None)
2732
2732
2733 end = b'\n'
2733 end = b'\n'
2734 if opts.get(b'print0'):
2734 if opts.get(b'print0'):
2735 end = b'\0'
2735 end = b'\0'
2736 fmt = b'%s' + end
2736 fmt = b'%s' + end
2737
2737
2738 m = scmutil.match(ctx, pats, opts)
2738 m = scmutil.match(ctx, pats, opts)
2739 ui.pager(b'files')
2739 ui.pager(b'files')
2740 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2740 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2741 with ui.formatter(b'files', opts) as fm:
2741 with ui.formatter(b'files', opts) as fm:
2742 return cmdutil.files(
2742 return cmdutil.files(
2743 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2743 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2744 )
2744 )
2745
2745
2746
2746
2747 @command(
2747 @command(
2748 b'forget',
2748 b'forget',
2749 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2749 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2750 + walkopts
2750 + walkopts
2751 + dryrunopts,
2751 + dryrunopts,
2752 _(b'[OPTION]... FILE...'),
2752 _(b'[OPTION]... FILE...'),
2753 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2753 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2754 helpbasic=True,
2754 helpbasic=True,
2755 inferrepo=True,
2755 inferrepo=True,
2756 )
2756 )
2757 def forget(ui, repo, *pats, **opts):
2757 def forget(ui, repo, *pats, **opts):
2758 """forget the specified files on the next commit
2758 """forget the specified files on the next commit
2759
2759
2760 Mark the specified files so they will no longer be tracked
2760 Mark the specified files so they will no longer be tracked
2761 after the next commit.
2761 after the next commit.
2762
2762
2763 This only removes files from the current branch, not from the
2763 This only removes files from the current branch, not from the
2764 entire project history, and it does not delete them from the
2764 entire project history, and it does not delete them from the
2765 working directory.
2765 working directory.
2766
2766
2767 To delete the file from the working directory, see :hg:`remove`.
2767 To delete the file from the working directory, see :hg:`remove`.
2768
2768
2769 To undo a forget before the next commit, see :hg:`add`.
2769 To undo a forget before the next commit, see :hg:`add`.
2770
2770
2771 .. container:: verbose
2771 .. container:: verbose
2772
2772
2773 Examples:
2773 Examples:
2774
2774
2775 - forget newly-added binary files::
2775 - forget newly-added binary files::
2776
2776
2777 hg forget "set:added() and binary()"
2777 hg forget "set:added() and binary()"
2778
2778
2779 - forget files that would be excluded by .hgignore::
2779 - forget files that would be excluded by .hgignore::
2780
2780
2781 hg forget "set:hgignore()"
2781 hg forget "set:hgignore()"
2782
2782
2783 Returns 0 on success.
2783 Returns 0 on success.
2784 """
2784 """
2785
2785
2786 opts = pycompat.byteskwargs(opts)
2786 opts = pycompat.byteskwargs(opts)
2787 if not pats:
2787 if not pats:
2788 raise error.Abort(_(b'no files specified'))
2788 raise error.Abort(_(b'no files specified'))
2789
2789
2790 m = scmutil.match(repo[None], pats, opts)
2790 m = scmutil.match(repo[None], pats, opts)
2791 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2791 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2792 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2792 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2793 rejected = cmdutil.forget(
2793 rejected = cmdutil.forget(
2794 ui,
2794 ui,
2795 repo,
2795 repo,
2796 m,
2796 m,
2797 prefix=b"",
2797 prefix=b"",
2798 uipathfn=uipathfn,
2798 uipathfn=uipathfn,
2799 explicitonly=False,
2799 explicitonly=False,
2800 dryrun=dryrun,
2800 dryrun=dryrun,
2801 interactive=interactive,
2801 interactive=interactive,
2802 )[0]
2802 )[0]
2803 return rejected and 1 or 0
2803 return rejected and 1 or 0
2804
2804
2805
2805
2806 @command(
2806 @command(
2807 b'graft',
2807 b'graft',
2808 [
2808 [
2809 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2809 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2810 (
2810 (
2811 b'',
2811 b'',
2812 b'base',
2812 b'base',
2813 b'',
2813 b'',
2814 _(b'base revision when doing the graft merge (ADVANCED)'),
2814 _(b'base revision when doing the graft merge (ADVANCED)'),
2815 _(b'REV'),
2815 _(b'REV'),
2816 ),
2816 ),
2817 (b'c', b'continue', False, _(b'resume interrupted graft')),
2817 (b'c', b'continue', False, _(b'resume interrupted graft')),
2818 (b'', b'stop', False, _(b'stop interrupted graft')),
2818 (b'', b'stop', False, _(b'stop interrupted graft')),
2819 (b'', b'abort', False, _(b'abort interrupted graft')),
2819 (b'', b'abort', False, _(b'abort interrupted graft')),
2820 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2820 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2821 (b'', b'log', None, _(b'append graft info to log message')),
2821 (b'', b'log', None, _(b'append graft info to log message')),
2822 (
2822 (
2823 b'',
2823 b'',
2824 b'no-commit',
2824 b'no-commit',
2825 None,
2825 None,
2826 _(b"don't commit, just apply the changes in working directory"),
2826 _(b"don't commit, just apply the changes in working directory"),
2827 ),
2827 ),
2828 (b'f', b'force', False, _(b'force graft')),
2828 (b'f', b'force', False, _(b'force graft')),
2829 (
2829 (
2830 b'D',
2830 b'D',
2831 b'currentdate',
2831 b'currentdate',
2832 False,
2832 False,
2833 _(b'record the current date as commit date'),
2833 _(b'record the current date as commit date'),
2834 ),
2834 ),
2835 (
2835 (
2836 b'U',
2836 b'U',
2837 b'currentuser',
2837 b'currentuser',
2838 False,
2838 False,
2839 _(b'record the current user as committer'),
2839 _(b'record the current user as committer'),
2840 ),
2840 ),
2841 ]
2841 ]
2842 + commitopts2
2842 + commitopts2
2843 + mergetoolopts
2843 + mergetoolopts
2844 + dryrunopts,
2844 + dryrunopts,
2845 _(b'[OPTION]... [-r REV]... REV...'),
2845 _(b'[OPTION]... [-r REV]... REV...'),
2846 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2846 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2847 )
2847 )
2848 def graft(ui, repo, *revs, **opts):
2848 def graft(ui, repo, *revs, **opts):
2849 '''copy changes from other branches onto the current branch
2849 '''copy changes from other branches onto the current branch
2850
2850
2851 This command uses Mercurial's merge logic to copy individual
2851 This command uses Mercurial's merge logic to copy individual
2852 changes from other branches without merging branches in the
2852 changes from other branches without merging branches in the
2853 history graph. This is sometimes known as 'backporting' or
2853 history graph. This is sometimes known as 'backporting' or
2854 'cherry-picking'. By default, graft will copy user, date, and
2854 'cherry-picking'. By default, graft will copy user, date, and
2855 description from the source changesets.
2855 description from the source changesets.
2856
2856
2857 Changesets that are ancestors of the current revision, that have
2857 Changesets that are ancestors of the current revision, that have
2858 already been grafted, or that are merges will be skipped.
2858 already been grafted, or that are merges will be skipped.
2859
2859
2860 If --log is specified, log messages will have a comment appended
2860 If --log is specified, log messages will have a comment appended
2861 of the form::
2861 of the form::
2862
2862
2863 (grafted from CHANGESETHASH)
2863 (grafted from CHANGESETHASH)
2864
2864
2865 If --force is specified, revisions will be grafted even if they
2865 If --force is specified, revisions will be grafted even if they
2866 are already ancestors of, or have been grafted to, the destination.
2866 are already ancestors of, or have been grafted to, the destination.
2867 This is useful when the revisions have since been backed out.
2867 This is useful when the revisions have since been backed out.
2868
2868
2869 If a graft merge results in conflicts, the graft process is
2869 If a graft merge results in conflicts, the graft process is
2870 interrupted so that the current merge can be manually resolved.
2870 interrupted so that the current merge can be manually resolved.
2871 Once all conflicts are addressed, the graft process can be
2871 Once all conflicts are addressed, the graft process can be
2872 continued with the -c/--continue option.
2872 continued with the -c/--continue option.
2873
2873
2874 The -c/--continue option reapplies all the earlier options.
2874 The -c/--continue option reapplies all the earlier options.
2875
2875
2876 .. container:: verbose
2876 .. container:: verbose
2877
2877
2878 The --base option exposes more of how graft internally uses merge with a
2878 The --base option exposes more of how graft internally uses merge with a
2879 custom base revision. --base can be used to specify another ancestor than
2879 custom base revision. --base can be used to specify another ancestor than
2880 the first and only parent.
2880 the first and only parent.
2881
2881
2882 The command::
2882 The command::
2883
2883
2884 hg graft -r 345 --base 234
2884 hg graft -r 345 --base 234
2885
2885
2886 is thus pretty much the same as::
2886 is thus pretty much the same as::
2887
2887
2888 hg diff -r 234 -r 345 | hg import
2888 hg diff -r 234 -r 345 | hg import
2889
2889
2890 but using merge to resolve conflicts and track moved files.
2890 but using merge to resolve conflicts and track moved files.
2891
2891
2892 The result of a merge can thus be backported as a single commit by
2892 The result of a merge can thus be backported as a single commit by
2893 specifying one of the merge parents as base, and thus effectively
2893 specifying one of the merge parents as base, and thus effectively
2894 grafting the changes from the other side.
2894 grafting the changes from the other side.
2895
2895
2896 It is also possible to collapse multiple changesets and clean up history
2896 It is also possible to collapse multiple changesets and clean up history
2897 by specifying another ancestor as base, much like rebase --collapse
2897 by specifying another ancestor as base, much like rebase --collapse
2898 --keep.
2898 --keep.
2899
2899
2900 The commit message can be tweaked after the fact using commit --amend .
2900 The commit message can be tweaked after the fact using commit --amend .
2901
2901
2902 For using non-ancestors as the base to backout changes, see the backout
2902 For using non-ancestors as the base to backout changes, see the backout
2903 command and the hidden --parent option.
2903 command and the hidden --parent option.
2904
2904
2905 .. container:: verbose
2905 .. container:: verbose
2906
2906
2907 Examples:
2907 Examples:
2908
2908
2909 - copy a single change to the stable branch and edit its description::
2909 - copy a single change to the stable branch and edit its description::
2910
2910
2911 hg update stable
2911 hg update stable
2912 hg graft --edit 9393
2912 hg graft --edit 9393
2913
2913
2914 - graft a range of changesets with one exception, updating dates::
2914 - graft a range of changesets with one exception, updating dates::
2915
2915
2916 hg graft -D "2085::2093 and not 2091"
2916 hg graft -D "2085::2093 and not 2091"
2917
2917
2918 - continue a graft after resolving conflicts::
2918 - continue a graft after resolving conflicts::
2919
2919
2920 hg graft -c
2920 hg graft -c
2921
2921
2922 - show the source of a grafted changeset::
2922 - show the source of a grafted changeset::
2923
2923
2924 hg log --debug -r .
2924 hg log --debug -r .
2925
2925
2926 - show revisions sorted by date::
2926 - show revisions sorted by date::
2927
2927
2928 hg log -r "sort(all(), date)"
2928 hg log -r "sort(all(), date)"
2929
2929
2930 - backport the result of a merge as a single commit::
2930 - backport the result of a merge as a single commit::
2931
2931
2932 hg graft -r 123 --base 123^
2932 hg graft -r 123 --base 123^
2933
2933
2934 - land a feature branch as one changeset::
2934 - land a feature branch as one changeset::
2935
2935
2936 hg up -cr default
2936 hg up -cr default
2937 hg graft -r featureX --base "ancestor('featureX', 'default')"
2937 hg graft -r featureX --base "ancestor('featureX', 'default')"
2938
2938
2939 See :hg:`help revisions` for more about specifying revisions.
2939 See :hg:`help revisions` for more about specifying revisions.
2940
2940
2941 Returns 0 on successful completion.
2941 Returns 0 on successful completion.
2942 '''
2942 '''
2943 with repo.wlock():
2943 with repo.wlock():
2944 return _dograft(ui, repo, *revs, **opts)
2944 return _dograft(ui, repo, *revs, **opts)
2945
2945
2946
2946
2947 def _dograft(ui, repo, *revs, **opts):
2947 def _dograft(ui, repo, *revs, **opts):
2948 opts = pycompat.byteskwargs(opts)
2948 opts = pycompat.byteskwargs(opts)
2949 if revs and opts.get(b'rev'):
2949 if revs and opts.get(b'rev'):
2950 ui.warn(
2950 ui.warn(
2951 _(
2951 _(
2952 b'warning: inconsistent use of --rev might give unexpected '
2952 b'warning: inconsistent use of --rev might give unexpected '
2953 b'revision ordering!\n'
2953 b'revision ordering!\n'
2954 )
2954 )
2955 )
2955 )
2956
2956
2957 revs = list(revs)
2957 revs = list(revs)
2958 revs.extend(opts.get(b'rev'))
2958 revs.extend(opts.get(b'rev'))
2959 basectx = None
2959 basectx = None
2960 if opts.get(b'base'):
2960 if opts.get(b'base'):
2961 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2961 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2962 # a dict of data to be stored in state file
2962 # a dict of data to be stored in state file
2963 statedata = {}
2963 statedata = {}
2964 # list of new nodes created by ongoing graft
2964 # list of new nodes created by ongoing graft
2965 statedata[b'newnodes'] = []
2965 statedata[b'newnodes'] = []
2966
2966
2967 cmdutil.resolvecommitoptions(ui, opts)
2967 cmdutil.resolvecommitoptions(ui, opts)
2968
2968
2969 editor = cmdutil.getcommiteditor(
2969 editor = cmdutil.getcommiteditor(
2970 editform=b'graft', **pycompat.strkwargs(opts)
2970 editform=b'graft', **pycompat.strkwargs(opts)
2971 )
2971 )
2972
2972
2973 cont = False
2973 cont = False
2974 if opts.get(b'no_commit'):
2974 if opts.get(b'no_commit'):
2975 if opts.get(b'edit'):
2975 if opts.get(b'edit'):
2976 raise error.Abort(
2976 raise error.Abort(
2977 _(b"cannot specify --no-commit and --edit together")
2977 _(b"cannot specify --no-commit and --edit together")
2978 )
2978 )
2979 if opts.get(b'currentuser'):
2979 if opts.get(b'currentuser'):
2980 raise error.Abort(
2980 raise error.Abort(
2981 _(b"cannot specify --no-commit and --currentuser together")
2981 _(b"cannot specify --no-commit and --currentuser together")
2982 )
2982 )
2983 if opts.get(b'currentdate'):
2983 if opts.get(b'currentdate'):
2984 raise error.Abort(
2984 raise error.Abort(
2985 _(b"cannot specify --no-commit and --currentdate together")
2985 _(b"cannot specify --no-commit and --currentdate together")
2986 )
2986 )
2987 if opts.get(b'log'):
2987 if opts.get(b'log'):
2988 raise error.Abort(
2988 raise error.Abort(
2989 _(b"cannot specify --no-commit and --log together")
2989 _(b"cannot specify --no-commit and --log together")
2990 )
2990 )
2991
2991
2992 graftstate = statemod.cmdstate(repo, b'graftstate')
2992 graftstate = statemod.cmdstate(repo, b'graftstate')
2993
2993
2994 if opts.get(b'stop'):
2994 if opts.get(b'stop'):
2995 if opts.get(b'continue'):
2995 if opts.get(b'continue'):
2996 raise error.Abort(
2996 raise error.Abort(
2997 _(b"cannot use '--continue' and '--stop' together")
2997 _(b"cannot use '--continue' and '--stop' together")
2998 )
2998 )
2999 if opts.get(b'abort'):
2999 if opts.get(b'abort'):
3000 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3000 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3001
3001
3002 if any(
3002 if any(
3003 (
3003 (
3004 opts.get(b'edit'),
3004 opts.get(b'edit'),
3005 opts.get(b'log'),
3005 opts.get(b'log'),
3006 opts.get(b'user'),
3006 opts.get(b'user'),
3007 opts.get(b'date'),
3007 opts.get(b'date'),
3008 opts.get(b'currentdate'),
3008 opts.get(b'currentdate'),
3009 opts.get(b'currentuser'),
3009 opts.get(b'currentuser'),
3010 opts.get(b'rev'),
3010 opts.get(b'rev'),
3011 )
3011 )
3012 ):
3012 ):
3013 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3013 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3014 return _stopgraft(ui, repo, graftstate)
3014 return _stopgraft(ui, repo, graftstate)
3015 elif opts.get(b'abort'):
3015 elif opts.get(b'abort'):
3016 if opts.get(b'continue'):
3016 if opts.get(b'continue'):
3017 raise error.Abort(
3017 raise error.Abort(
3018 _(b"cannot use '--continue' and '--abort' together")
3018 _(b"cannot use '--continue' and '--abort' together")
3019 )
3019 )
3020 if any(
3020 if any(
3021 (
3021 (
3022 opts.get(b'edit'),
3022 opts.get(b'edit'),
3023 opts.get(b'log'),
3023 opts.get(b'log'),
3024 opts.get(b'user'),
3024 opts.get(b'user'),
3025 opts.get(b'date'),
3025 opts.get(b'date'),
3026 opts.get(b'currentdate'),
3026 opts.get(b'currentdate'),
3027 opts.get(b'currentuser'),
3027 opts.get(b'currentuser'),
3028 opts.get(b'rev'),
3028 opts.get(b'rev'),
3029 )
3029 )
3030 ):
3030 ):
3031 raise error.Abort(
3031 raise error.Abort(
3032 _(b"cannot specify any other flag with '--abort'")
3032 _(b"cannot specify any other flag with '--abort'")
3033 )
3033 )
3034
3034
3035 return cmdutil.abortgraft(ui, repo, graftstate)
3035 return cmdutil.abortgraft(ui, repo, graftstate)
3036 elif opts.get(b'continue'):
3036 elif opts.get(b'continue'):
3037 cont = True
3037 cont = True
3038 if revs:
3038 if revs:
3039 raise error.Abort(_(b"can't specify --continue and revisions"))
3039 raise error.Abort(_(b"can't specify --continue and revisions"))
3040 # read in unfinished revisions
3040 # read in unfinished revisions
3041 if graftstate.exists():
3041 if graftstate.exists():
3042 statedata = cmdutil.readgraftstate(repo, graftstate)
3042 statedata = cmdutil.readgraftstate(repo, graftstate)
3043 if statedata.get(b'date'):
3043 if statedata.get(b'date'):
3044 opts[b'date'] = statedata[b'date']
3044 opts[b'date'] = statedata[b'date']
3045 if statedata.get(b'user'):
3045 if statedata.get(b'user'):
3046 opts[b'user'] = statedata[b'user']
3046 opts[b'user'] = statedata[b'user']
3047 if statedata.get(b'log'):
3047 if statedata.get(b'log'):
3048 opts[b'log'] = True
3048 opts[b'log'] = True
3049 if statedata.get(b'no_commit'):
3049 if statedata.get(b'no_commit'):
3050 opts[b'no_commit'] = statedata.get(b'no_commit')
3050 opts[b'no_commit'] = statedata.get(b'no_commit')
3051 nodes = statedata[b'nodes']
3051 nodes = statedata[b'nodes']
3052 revs = [repo[node].rev() for node in nodes]
3052 revs = [repo[node].rev() for node in nodes]
3053 else:
3053 else:
3054 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3054 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3055 else:
3055 else:
3056 if not revs:
3056 if not revs:
3057 raise error.Abort(_(b'no revisions specified'))
3057 raise error.Abort(_(b'no revisions specified'))
3058 cmdutil.checkunfinished(repo)
3058 cmdutil.checkunfinished(repo)
3059 cmdutil.bailifchanged(repo)
3059 cmdutil.bailifchanged(repo)
3060 revs = scmutil.revrange(repo, revs)
3060 revs = scmutil.revrange(repo, revs)
3061
3061
3062 skipped = set()
3062 skipped = set()
3063 if basectx is None:
3063 if basectx is None:
3064 # check for merges
3064 # check for merges
3065 for rev in repo.revs(b'%ld and merge()', revs):
3065 for rev in repo.revs(b'%ld and merge()', revs):
3066 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3066 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3067 skipped.add(rev)
3067 skipped.add(rev)
3068 revs = [r for r in revs if r not in skipped]
3068 revs = [r for r in revs if r not in skipped]
3069 if not revs:
3069 if not revs:
3070 return -1
3070 return -1
3071 if basectx is not None and len(revs) != 1:
3071 if basectx is not None and len(revs) != 1:
3072 raise error.Abort(_(b'only one revision allowed with --base '))
3072 raise error.Abort(_(b'only one revision allowed with --base '))
3073
3073
3074 # Don't check in the --continue case, in effect retaining --force across
3074 # Don't check in the --continue case, in effect retaining --force across
3075 # --continues. That's because without --force, any revisions we decided to
3075 # --continues. That's because without --force, any revisions we decided to
3076 # skip would have been filtered out here, so they wouldn't have made their
3076 # skip would have been filtered out here, so they wouldn't have made their
3077 # way to the graftstate. With --force, any revisions we would have otherwise
3077 # way to the graftstate. With --force, any revisions we would have otherwise
3078 # skipped would not have been filtered out, and if they hadn't been applied
3078 # skipped would not have been filtered out, and if they hadn't been applied
3079 # already, they'd have been in the graftstate.
3079 # already, they'd have been in the graftstate.
3080 if not (cont or opts.get(b'force')) and basectx is None:
3080 if not (cont or opts.get(b'force')) and basectx is None:
3081 # check for ancestors of dest branch
3081 # check for ancestors of dest branch
3082 ancestors = repo.revs(b'%ld & (::.)', revs)
3082 ancestors = repo.revs(b'%ld & (::.)', revs)
3083 for rev in ancestors:
3083 for rev in ancestors:
3084 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3084 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3085
3085
3086 revs = [r for r in revs if r not in ancestors]
3086 revs = [r for r in revs if r not in ancestors]
3087
3087
3088 if not revs:
3088 if not revs:
3089 return -1
3089 return -1
3090
3090
3091 # analyze revs for earlier grafts
3091 # analyze revs for earlier grafts
3092 ids = {}
3092 ids = {}
3093 for ctx in repo.set(b"%ld", revs):
3093 for ctx in repo.set(b"%ld", revs):
3094 ids[ctx.hex()] = ctx.rev()
3094 ids[ctx.hex()] = ctx.rev()
3095 n = ctx.extra().get(b'source')
3095 n = ctx.extra().get(b'source')
3096 if n:
3096 if n:
3097 ids[n] = ctx.rev()
3097 ids[n] = ctx.rev()
3098
3098
3099 # check ancestors for earlier grafts
3099 # check ancestors for earlier grafts
3100 ui.debug(b'scanning for duplicate grafts\n')
3100 ui.debug(b'scanning for duplicate grafts\n')
3101
3101
3102 # The only changesets we can be sure doesn't contain grafts of any
3102 # The only changesets we can be sure doesn't contain grafts of any
3103 # revs, are the ones that are common ancestors of *all* revs:
3103 # revs, are the ones that are common ancestors of *all* revs:
3104 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3104 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3105 ctx = repo[rev]
3105 ctx = repo[rev]
3106 n = ctx.extra().get(b'source')
3106 n = ctx.extra().get(b'source')
3107 if n in ids:
3107 if n in ids:
3108 try:
3108 try:
3109 r = repo[n].rev()
3109 r = repo[n].rev()
3110 except error.RepoLookupError:
3110 except error.RepoLookupError:
3111 r = None
3111 r = None
3112 if r in revs:
3112 if r in revs:
3113 ui.warn(
3113 ui.warn(
3114 _(
3114 _(
3115 b'skipping revision %d:%s '
3115 b'skipping revision %d:%s '
3116 b'(already grafted to %d:%s)\n'
3116 b'(already grafted to %d:%s)\n'
3117 )
3117 )
3118 % (r, repo[r], rev, ctx)
3118 % (r, repo[r], rev, ctx)
3119 )
3119 )
3120 revs.remove(r)
3120 revs.remove(r)
3121 elif ids[n] in revs:
3121 elif ids[n] in revs:
3122 if r is None:
3122 if r is None:
3123 ui.warn(
3123 ui.warn(
3124 _(
3124 _(
3125 b'skipping already grafted revision %d:%s '
3125 b'skipping already grafted revision %d:%s '
3126 b'(%d:%s also has unknown origin %s)\n'
3126 b'(%d:%s also has unknown origin %s)\n'
3127 )
3127 )
3128 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3128 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3129 )
3129 )
3130 else:
3130 else:
3131 ui.warn(
3131 ui.warn(
3132 _(
3132 _(
3133 b'skipping already grafted revision %d:%s '
3133 b'skipping already grafted revision %d:%s '
3134 b'(%d:%s also has origin %d:%s)\n'
3134 b'(%d:%s also has origin %d:%s)\n'
3135 )
3135 )
3136 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3136 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3137 )
3137 )
3138 revs.remove(ids[n])
3138 revs.remove(ids[n])
3139 elif ctx.hex() in ids:
3139 elif ctx.hex() in ids:
3140 r = ids[ctx.hex()]
3140 r = ids[ctx.hex()]
3141 if r in revs:
3141 if r in revs:
3142 ui.warn(
3142 ui.warn(
3143 _(
3143 _(
3144 b'skipping already grafted revision %d:%s '
3144 b'skipping already grafted revision %d:%s '
3145 b'(was grafted from %d:%s)\n'
3145 b'(was grafted from %d:%s)\n'
3146 )
3146 )
3147 % (r, repo[r], rev, ctx)
3147 % (r, repo[r], rev, ctx)
3148 )
3148 )
3149 revs.remove(r)
3149 revs.remove(r)
3150 if not revs:
3150 if not revs:
3151 return -1
3151 return -1
3152
3152
3153 if opts.get(b'no_commit'):
3153 if opts.get(b'no_commit'):
3154 statedata[b'no_commit'] = True
3154 statedata[b'no_commit'] = True
3155 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3155 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3156 desc = b'%d:%s "%s"' % (
3156 desc = b'%d:%s "%s"' % (
3157 ctx.rev(),
3157 ctx.rev(),
3158 ctx,
3158 ctx,
3159 ctx.description().split(b'\n', 1)[0],
3159 ctx.description().split(b'\n', 1)[0],
3160 )
3160 )
3161 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3161 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3162 if names:
3162 if names:
3163 desc += b' (%s)' % b' '.join(names)
3163 desc += b' (%s)' % b' '.join(names)
3164 ui.status(_(b'grafting %s\n') % desc)
3164 ui.status(_(b'grafting %s\n') % desc)
3165 if opts.get(b'dry_run'):
3165 if opts.get(b'dry_run'):
3166 continue
3166 continue
3167
3167
3168 source = ctx.extra().get(b'source')
3168 source = ctx.extra().get(b'source')
3169 extra = {}
3169 extra = {}
3170 if source:
3170 if source:
3171 extra[b'source'] = source
3171 extra[b'source'] = source
3172 extra[b'intermediate-source'] = ctx.hex()
3172 extra[b'intermediate-source'] = ctx.hex()
3173 else:
3173 else:
3174 extra[b'source'] = ctx.hex()
3174 extra[b'source'] = ctx.hex()
3175 user = ctx.user()
3175 user = ctx.user()
3176 if opts.get(b'user'):
3176 if opts.get(b'user'):
3177 user = opts[b'user']
3177 user = opts[b'user']
3178 statedata[b'user'] = user
3178 statedata[b'user'] = user
3179 date = ctx.date()
3179 date = ctx.date()
3180 if opts.get(b'date'):
3180 if opts.get(b'date'):
3181 date = opts[b'date']
3181 date = opts[b'date']
3182 statedata[b'date'] = date
3182 statedata[b'date'] = date
3183 message = ctx.description()
3183 message = ctx.description()
3184 if opts.get(b'log'):
3184 if opts.get(b'log'):
3185 message += b'\n(grafted from %s)' % ctx.hex()
3185 message += b'\n(grafted from %s)' % ctx.hex()
3186 statedata[b'log'] = True
3186 statedata[b'log'] = True
3187
3187
3188 # we don't merge the first commit when continuing
3188 # we don't merge the first commit when continuing
3189 if not cont:
3189 if not cont:
3190 # perform the graft merge with p1(rev) as 'ancestor'
3190 # perform the graft merge with p1(rev) as 'ancestor'
3191 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3191 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3192 base = ctx.p1() if basectx is None else basectx
3192 base = ctx.p1() if basectx is None else basectx
3193 with ui.configoverride(overrides, b'graft'):
3193 with ui.configoverride(overrides, b'graft'):
3194 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3194 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3195 # report any conflicts
3195 # report any conflicts
3196 if stats.unresolvedcount > 0:
3196 if stats.unresolvedcount > 0:
3197 # write out state for --continue
3197 # write out state for --continue
3198 nodes = [repo[rev].hex() for rev in revs[pos:]]
3198 nodes = [repo[rev].hex() for rev in revs[pos:]]
3199 statedata[b'nodes'] = nodes
3199 statedata[b'nodes'] = nodes
3200 stateversion = 1
3200 stateversion = 1
3201 graftstate.save(stateversion, statedata)
3201 graftstate.save(stateversion, statedata)
3202 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3202 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3203 raise error.Abort(
3203 raise error.Abort(
3204 _(b"unresolved conflicts, can't continue"), hint=hint
3204 _(b"unresolved conflicts, can't continue"), hint=hint
3205 )
3205 )
3206 else:
3206 else:
3207 cont = False
3207 cont = False
3208
3208
3209 # commit if --no-commit is false
3209 # commit if --no-commit is false
3210 if not opts.get(b'no_commit'):
3210 if not opts.get(b'no_commit'):
3211 node = repo.commit(
3211 node = repo.commit(
3212 text=message, user=user, date=date, extra=extra, editor=editor
3212 text=message, user=user, date=date, extra=extra, editor=editor
3213 )
3213 )
3214 if node is None:
3214 if node is None:
3215 ui.warn(
3215 ui.warn(
3216 _(b'note: graft of %d:%s created no changes to commit\n')
3216 _(b'note: graft of %d:%s created no changes to commit\n')
3217 % (ctx.rev(), ctx)
3217 % (ctx.rev(), ctx)
3218 )
3218 )
3219 # checking that newnodes exist because old state files won't have it
3219 # checking that newnodes exist because old state files won't have it
3220 elif statedata.get(b'newnodes') is not None:
3220 elif statedata.get(b'newnodes') is not None:
3221 statedata[b'newnodes'].append(node)
3221 statedata[b'newnodes'].append(node)
3222
3222
3223 # remove state when we complete successfully
3223 # remove state when we complete successfully
3224 if not opts.get(b'dry_run'):
3224 if not opts.get(b'dry_run'):
3225 graftstate.delete()
3225 graftstate.delete()
3226
3226
3227 return 0
3227 return 0
3228
3228
3229
3229
3230 def _stopgraft(ui, repo, graftstate):
3230 def _stopgraft(ui, repo, graftstate):
3231 """stop the interrupted graft"""
3231 """stop the interrupted graft"""
3232 if not graftstate.exists():
3232 if not graftstate.exists():
3233 raise error.Abort(_(b"no interrupted graft found"))
3233 raise error.Abort(_(b"no interrupted graft found"))
3234 pctx = repo[b'.']
3234 pctx = repo[b'.']
3235 hg.updaterepo(repo, pctx.node(), overwrite=True)
3235 hg.updaterepo(repo, pctx.node(), overwrite=True)
3236 graftstate.delete()
3236 graftstate.delete()
3237 ui.status(_(b"stopped the interrupted graft\n"))
3237 ui.status(_(b"stopped the interrupted graft\n"))
3238 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3238 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3239 return 0
3239 return 0
3240
3240
3241
3241
3242 statemod.addunfinished(
3242 statemod.addunfinished(
3243 b'graft',
3243 b'graft',
3244 fname=b'graftstate',
3244 fname=b'graftstate',
3245 clearable=True,
3245 clearable=True,
3246 stopflag=True,
3246 stopflag=True,
3247 continueflag=True,
3247 continueflag=True,
3248 abortfunc=cmdutil.hgabortgraft,
3248 abortfunc=cmdutil.hgabortgraft,
3249 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3249 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3250 )
3250 )
3251
3251
3252
3252
3253 @command(
3253 @command(
3254 b'grep',
3254 b'grep',
3255 [
3255 [
3256 (b'0', b'print0', None, _(b'end fields with NUL')),
3256 (b'0', b'print0', None, _(b'end fields with NUL')),
3257 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3257 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3258 (
3258 (
3259 b'',
3259 b'',
3260 b'diff',
3260 b'diff',
3261 None,
3261 None,
3262 _(
3262 _(
3263 b'search revision differences for when the pattern was added '
3263 b'search revision differences for when the pattern was added '
3264 b'or removed'
3264 b'or removed'
3265 ),
3265 ),
3266 ),
3266 ),
3267 (b'a', b'text', None, _(b'treat all files as text')),
3267 (b'a', b'text', None, _(b'treat all files as text')),
3268 (
3268 (
3269 b'f',
3269 b'f',
3270 b'follow',
3270 b'follow',
3271 None,
3271 None,
3272 _(
3272 _(
3273 b'follow changeset history,'
3273 b'follow changeset history,'
3274 b' or file history across copies and renames'
3274 b' or file history across copies and renames'
3275 ),
3275 ),
3276 ),
3276 ),
3277 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3277 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3278 (
3278 (
3279 b'l',
3279 b'l',
3280 b'files-with-matches',
3280 b'files-with-matches',
3281 None,
3281 None,
3282 _(b'print only filenames and revisions that match'),
3282 _(b'print only filenames and revisions that match'),
3283 ),
3283 ),
3284 (b'n', b'line-number', None, _(b'print matching line numbers')),
3284 (b'n', b'line-number', None, _(b'print matching line numbers')),
3285 (
3285 (
3286 b'r',
3286 b'r',
3287 b'rev',
3287 b'rev',
3288 [],
3288 [],
3289 _(b'search files changed within revision range'),
3289 _(b'search files changed within revision range'),
3290 _(b'REV'),
3290 _(b'REV'),
3291 ),
3291 ),
3292 (
3292 (
3293 b'',
3293 b'',
3294 b'all-files',
3294 b'all-files',
3295 None,
3295 None,
3296 _(
3296 _(
3297 b'include all files in the changeset while grepping (DEPRECATED)'
3297 b'include all files in the changeset while grepping (DEPRECATED)'
3298 ),
3298 ),
3299 ),
3299 ),
3300 (b'u', b'user', None, _(b'list the author (long with -v)')),
3300 (b'u', b'user', None, _(b'list the author (long with -v)')),
3301 (b'd', b'date', None, _(b'list the date (short with -q)')),
3301 (b'd', b'date', None, _(b'list the date (short with -q)')),
3302 ]
3302 ]
3303 + formatteropts
3303 + formatteropts
3304 + walkopts,
3304 + walkopts,
3305 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3305 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3306 helpcategory=command.CATEGORY_FILE_CONTENTS,
3306 helpcategory=command.CATEGORY_FILE_CONTENTS,
3307 inferrepo=True,
3307 inferrepo=True,
3308 intents={INTENT_READONLY},
3308 intents={INTENT_READONLY},
3309 )
3309 )
3310 def grep(ui, repo, pattern, *pats, **opts):
3310 def grep(ui, repo, pattern, *pats, **opts):
3311 """search for a pattern in specified files
3311 """search for a pattern in specified files
3312
3312
3313 Search the working directory or revision history for a regular
3313 Search the working directory or revision history for a regular
3314 expression in the specified files for the entire repository.
3314 expression in the specified files for the entire repository.
3315
3315
3316 By default, grep searches the repository files in the working
3316 By default, grep searches the repository files in the working
3317 directory and prints the files where it finds a match. To specify
3317 directory and prints the files where it finds a match. To specify
3318 historical revisions instead of the working directory, use the
3318 historical revisions instead of the working directory, use the
3319 --rev flag.
3319 --rev flag.
3320
3320
3321 To search instead historical revision differences that contains a
3321 To search instead historical revision differences that contains a
3322 change in match status ("-" for a match that becomes a non-match,
3322 change in match status ("-" for a match that becomes a non-match,
3323 or "+" for a non-match that becomes a match), use the --diff flag.
3323 or "+" for a non-match that becomes a match), use the --diff flag.
3324
3324
3325 PATTERN can be any Python (roughly Perl-compatible) regular
3325 PATTERN can be any Python (roughly Perl-compatible) regular
3326 expression.
3326 expression.
3327
3327
3328 If no FILEs are specified and the --rev flag isn't supplied, all
3328 If no FILEs are specified and the --rev flag isn't supplied, all
3329 files in the working directory are searched. When using the --rev
3329 files in the working directory are searched. When using the --rev
3330 flag and specifying FILEs, use the --follow argument to also
3330 flag and specifying FILEs, use the --follow argument to also
3331 follow the specified FILEs across renames and copies.
3331 follow the specified FILEs across renames and copies.
3332
3332
3333 .. container:: verbose
3333 .. container:: verbose
3334
3334
3335 Template:
3335 Template:
3336
3336
3337 The following keywords are supported in addition to the common template
3337 The following keywords are supported in addition to the common template
3338 keywords and functions. See also :hg:`help templates`.
3338 keywords and functions. See also :hg:`help templates`.
3339
3339
3340 :change: String. Character denoting insertion ``+`` or removal ``-``.
3340 :change: String. Character denoting insertion ``+`` or removal ``-``.
3341 Available if ``--diff`` is specified.
3341 Available if ``--diff`` is specified.
3342 :lineno: Integer. Line number of the match.
3342 :lineno: Integer. Line number of the match.
3343 :path: String. Repository-absolute path of the file.
3343 :path: String. Repository-absolute path of the file.
3344 :texts: List of text chunks.
3344 :texts: List of text chunks.
3345
3345
3346 And each entry of ``{texts}`` provides the following sub-keywords.
3346 And each entry of ``{texts}`` provides the following sub-keywords.
3347
3347
3348 :matched: Boolean. True if the chunk matches the specified pattern.
3348 :matched: Boolean. True if the chunk matches the specified pattern.
3349 :text: String. Chunk content.
3349 :text: String. Chunk content.
3350
3350
3351 See :hg:`help templates.operators` for the list expansion syntax.
3351 See :hg:`help templates.operators` for the list expansion syntax.
3352
3352
3353 Returns 0 if a match is found, 1 otherwise.
3353 Returns 0 if a match is found, 1 otherwise.
3354
3354
3355 """
3355 """
3356 opts = pycompat.byteskwargs(opts)
3356 opts = pycompat.byteskwargs(opts)
3357 diff = opts.get(b'all') or opts.get(b'diff')
3357 diff = opts.get(b'all') or opts.get(b'diff')
3358 if diff and opts.get(b'all_files'):
3358 if diff and opts.get(b'all_files'):
3359 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3359 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3360 if opts.get(b'all_files') is None and not diff:
3360 if opts.get(b'all_files') is None and not diff:
3361 opts[b'all_files'] = True
3361 opts[b'all_files'] = True
3362 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3362 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3363 all_files = opts.get(b'all_files')
3363 all_files = opts.get(b'all_files')
3364 if plaingrep:
3364 if plaingrep:
3365 opts[b'rev'] = [b'wdir()']
3365 opts[b'rev'] = [b'wdir()']
3366
3366
3367 reflags = re.M
3367 reflags = re.M
3368 if opts.get(b'ignore_case'):
3368 if opts.get(b'ignore_case'):
3369 reflags |= re.I
3369 reflags |= re.I
3370 try:
3370 try:
3371 regexp = util.re.compile(pattern, reflags)
3371 regexp = util.re.compile(pattern, reflags)
3372 except re.error as inst:
3372 except re.error as inst:
3373 ui.warn(
3373 ui.warn(
3374 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3374 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3375 )
3375 )
3376 return 1
3376 return 1
3377 sep, eol = b':', b'\n'
3377 sep, eol = b':', b'\n'
3378 if opts.get(b'print0'):
3378 if opts.get(b'print0'):
3379 sep = eol = b'\0'
3379 sep = eol = b'\0'
3380
3380
3381 getfile = util.lrucachefunc(repo.file)
3381 getfile = util.lrucachefunc(repo.file)
3382
3382
3383 def matchlines(body):
3383 def matchlines(body):
3384 begin = 0
3384 begin = 0
3385 linenum = 0
3385 linenum = 0
3386 while begin < len(body):
3386 while begin < len(body):
3387 match = regexp.search(body, begin)
3387 match = regexp.search(body, begin)
3388 if not match:
3388 if not match:
3389 break
3389 break
3390 mstart, mend = match.span()
3390 mstart, mend = match.span()
3391 linenum += body.count(b'\n', begin, mstart) + 1
3391 linenum += body.count(b'\n', begin, mstart) + 1
3392 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3392 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3393 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3393 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3394 lend = begin - 1
3394 lend = begin - 1
3395 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3395 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3396
3396
3397 class linestate(object):
3397 class linestate(object):
3398 def __init__(self, line, linenum, colstart, colend):
3398 def __init__(self, line, linenum, colstart, colend):
3399 self.line = line
3399 self.line = line
3400 self.linenum = linenum
3400 self.linenum = linenum
3401 self.colstart = colstart
3401 self.colstart = colstart
3402 self.colend = colend
3402 self.colend = colend
3403
3403
3404 def __hash__(self):
3404 def __hash__(self):
3405 return hash((self.linenum, self.line))
3405 return hash((self.linenum, self.line))
3406
3406
3407 def __eq__(self, other):
3407 def __eq__(self, other):
3408 return self.line == other.line
3408 return self.line == other.line
3409
3409
3410 def findpos(self):
3410 def findpos(self):
3411 """Iterate all (start, end) indices of matches"""
3411 """Iterate all (start, end) indices of matches"""
3412 yield self.colstart, self.colend
3412 yield self.colstart, self.colend
3413 p = self.colend
3413 p = self.colend
3414 while p < len(self.line):
3414 while p < len(self.line):
3415 m = regexp.search(self.line, p)
3415 m = regexp.search(self.line, p)
3416 if not m:
3416 if not m:
3417 break
3417 break
3418 yield m.span()
3418 yield m.span()
3419 p = m.end()
3419 p = m.end()
3420
3420
3421 matches = {}
3421 matches = {}
3422 copies = {}
3422 copies = {}
3423
3423
3424 def grepbody(fn, rev, body):
3424 def grepbody(fn, rev, body):
3425 matches[rev].setdefault(fn, [])
3425 matches[rev].setdefault(fn, [])
3426 m = matches[rev][fn]
3426 m = matches[rev][fn]
3427 if body is None:
3427 if body is None:
3428 return
3428 return
3429
3429
3430 for lnum, cstart, cend, line in matchlines(body):
3430 for lnum, cstart, cend, line in matchlines(body):
3431 s = linestate(line, lnum, cstart, cend)
3431 s = linestate(line, lnum, cstart, cend)
3432 m.append(s)
3432 m.append(s)
3433
3433
3434 def difflinestates(a, b):
3434 def difflinestates(a, b):
3435 sm = difflib.SequenceMatcher(None, a, b)
3435 sm = difflib.SequenceMatcher(None, a, b)
3436 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3436 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3437 if tag == 'insert':
3437 if tag == 'insert':
3438 for i in pycompat.xrange(blo, bhi):
3438 for i in pycompat.xrange(blo, bhi):
3439 yield (b'+', b[i])
3439 yield (b'+', b[i])
3440 elif tag == 'delete':
3440 elif tag == 'delete':
3441 for i in pycompat.xrange(alo, ahi):
3441 for i in pycompat.xrange(alo, ahi):
3442 yield (b'-', a[i])
3442 yield (b'-', a[i])
3443 elif tag == 'replace':
3443 elif tag == 'replace':
3444 for i in pycompat.xrange(alo, ahi):
3444 for i in pycompat.xrange(alo, ahi):
3445 yield (b'-', a[i])
3445 yield (b'-', a[i])
3446 for i in pycompat.xrange(blo, bhi):
3446 for i in pycompat.xrange(blo, bhi):
3447 yield (b'+', b[i])
3447 yield (b'+', b[i])
3448
3448
3449 uipathfn = scmutil.getuipathfn(repo)
3449 uipathfn = scmutil.getuipathfn(repo)
3450
3450
3451 def display(fm, fn, ctx, pstates, states):
3451 def display(fm, fn, ctx, pstates, states):
3452 rev = scmutil.intrev(ctx)
3452 rev = scmutil.intrev(ctx)
3453 if fm.isplain():
3453 if fm.isplain():
3454 formatuser = ui.shortuser
3454 formatuser = ui.shortuser
3455 else:
3455 else:
3456 formatuser = pycompat.bytestr
3456 formatuser = pycompat.bytestr
3457 if ui.quiet:
3457 if ui.quiet:
3458 datefmt = b'%Y-%m-%d'
3458 datefmt = b'%Y-%m-%d'
3459 else:
3459 else:
3460 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3460 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3461 found = False
3461 found = False
3462
3462
3463 @util.cachefunc
3463 @util.cachefunc
3464 def binary():
3464 def binary():
3465 flog = getfile(fn)
3465 flog = getfile(fn)
3466 try:
3466 try:
3467 return stringutil.binary(flog.read(ctx.filenode(fn)))
3467 return stringutil.binary(flog.read(ctx.filenode(fn)))
3468 except error.WdirUnsupported:
3468 except error.WdirUnsupported:
3469 return ctx[fn].isbinary()
3469 return ctx[fn].isbinary()
3470
3470
3471 fieldnamemap = {b'linenumber': b'lineno'}
3471 fieldnamemap = {b'linenumber': b'lineno'}
3472 if diff:
3472 if diff:
3473 iter = difflinestates(pstates, states)
3473 iter = difflinestates(pstates, states)
3474 else:
3474 else:
3475 iter = [(b'', l) for l in states]
3475 iter = [(b'', l) for l in states]
3476 for change, l in iter:
3476 for change, l in iter:
3477 fm.startitem()
3477 fm.startitem()
3478 fm.context(ctx=ctx)
3478 fm.context(ctx=ctx)
3479 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3479 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3480 fm.plain(uipathfn(fn), label=b'grep.filename')
3480 fm.plain(uipathfn(fn), label=b'grep.filename')
3481
3481
3482 cols = [
3482 cols = [
3483 (b'rev', b'%d', rev, not plaingrep, b''),
3483 (b'rev', b'%d', rev, not plaingrep, b''),
3484 (
3484 (
3485 b'linenumber',
3485 b'linenumber',
3486 b'%d',
3486 b'%d',
3487 l.linenum,
3487 l.linenum,
3488 opts.get(b'line_number'),
3488 opts.get(b'line_number'),
3489 b'',
3489 b'',
3490 ),
3490 ),
3491 ]
3491 ]
3492 if diff:
3492 if diff:
3493 cols.append(
3493 cols.append(
3494 (
3494 (
3495 b'change',
3495 b'change',
3496 b'%s',
3496 b'%s',
3497 change,
3497 change,
3498 True,
3498 True,
3499 b'grep.inserted '
3499 b'grep.inserted '
3500 if change == b'+'
3500 if change == b'+'
3501 else b'grep.deleted ',
3501 else b'grep.deleted ',
3502 )
3502 )
3503 )
3503 )
3504 cols.extend(
3504 cols.extend(
3505 [
3505 [
3506 (
3506 (
3507 b'user',
3507 b'user',
3508 b'%s',
3508 b'%s',
3509 formatuser(ctx.user()),
3509 formatuser(ctx.user()),
3510 opts.get(b'user'),
3510 opts.get(b'user'),
3511 b'',
3511 b'',
3512 ),
3512 ),
3513 (
3513 (
3514 b'date',
3514 b'date',
3515 b'%s',
3515 b'%s',
3516 fm.formatdate(ctx.date(), datefmt),
3516 fm.formatdate(ctx.date(), datefmt),
3517 opts.get(b'date'),
3517 opts.get(b'date'),
3518 b'',
3518 b'',
3519 ),
3519 ),
3520 ]
3520 ]
3521 )
3521 )
3522 for name, fmt, data, cond, extra_label in cols:
3522 for name, fmt, data, cond, extra_label in cols:
3523 if cond:
3523 if cond:
3524 fm.plain(sep, label=b'grep.sep')
3524 fm.plain(sep, label=b'grep.sep')
3525 field = fieldnamemap.get(name, name)
3525 field = fieldnamemap.get(name, name)
3526 label = extra_label + (b'grep.%s' % name)
3526 label = extra_label + (b'grep.%s' % name)
3527 fm.condwrite(cond, field, fmt, data, label=label)
3527 fm.condwrite(cond, field, fmt, data, label=label)
3528 if not opts.get(b'files_with_matches'):
3528 if not opts.get(b'files_with_matches'):
3529 fm.plain(sep, label=b'grep.sep')
3529 fm.plain(sep, label=b'grep.sep')
3530 if not opts.get(b'text') and binary():
3530 if not opts.get(b'text') and binary():
3531 fm.plain(_(b" Binary file matches"))
3531 fm.plain(_(b" Binary file matches"))
3532 else:
3532 else:
3533 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3533 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3534 fm.plain(eol)
3534 fm.plain(eol)
3535 found = True
3535 found = True
3536 if opts.get(b'files_with_matches'):
3536 if opts.get(b'files_with_matches'):
3537 break
3537 break
3538 return found
3538 return found
3539
3539
3540 def displaymatches(fm, l):
3540 def displaymatches(fm, l):
3541 p = 0
3541 p = 0
3542 for s, e in l.findpos():
3542 for s, e in l.findpos():
3543 if p < s:
3543 if p < s:
3544 fm.startitem()
3544 fm.startitem()
3545 fm.write(b'text', b'%s', l.line[p:s])
3545 fm.write(b'text', b'%s', l.line[p:s])
3546 fm.data(matched=False)
3546 fm.data(matched=False)
3547 fm.startitem()
3547 fm.startitem()
3548 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3548 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3549 fm.data(matched=True)
3549 fm.data(matched=True)
3550 p = e
3550 p = e
3551 if p < len(l.line):
3551 if p < len(l.line):
3552 fm.startitem()
3552 fm.startitem()
3553 fm.write(b'text', b'%s', l.line[p:])
3553 fm.write(b'text', b'%s', l.line[p:])
3554 fm.data(matched=False)
3554 fm.data(matched=False)
3555 fm.end()
3555 fm.end()
3556
3556
3557 skip = set()
3557 skip = set()
3558 revfiles = {}
3558 revfiles = {}
3559 match = scmutil.match(repo[None], pats, opts)
3559 match = scmutil.match(repo[None], pats, opts)
3560 found = False
3560 found = False
3561 follow = opts.get(b'follow')
3561 follow = opts.get(b'follow')
3562
3562
3563 getrenamed = scmutil.getrenamedfn(repo)
3563 getrenamed = scmutil.getrenamedfn(repo)
3564
3564
3565 def get_file_content(filename, filelog, filenode, context, revision):
3565 def get_file_content(filename, filelog, filenode, context, revision):
3566 try:
3566 try:
3567 content = filelog.read(filenode)
3567 content = filelog.read(filenode)
3568 except error.WdirUnsupported:
3568 except error.WdirUnsupported:
3569 content = context[filename].data()
3569 content = context[filename].data()
3570 except error.CensoredNodeError:
3570 except error.CensoredNodeError:
3571 content = None
3571 content = None
3572 ui.warn(
3572 ui.warn(
3573 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3573 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3574 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3574 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3575 )
3575 )
3576 return content
3576 return content
3577
3577
3578 def prep(ctx, fns):
3578 def prep(ctx, fns):
3579 rev = ctx.rev()
3579 rev = ctx.rev()
3580 pctx = ctx.p1()
3580 pctx = ctx.p1()
3581 parent = pctx.rev()
3581 parent = pctx.rev()
3582 matches.setdefault(rev, {})
3582 matches.setdefault(rev, {})
3583 matches.setdefault(parent, {})
3583 matches.setdefault(parent, {})
3584 files = revfiles.setdefault(rev, [])
3584 files = revfiles.setdefault(rev, [])
3585 for fn in fns:
3585 for fn in fns:
3586 flog = getfile(fn)
3586 flog = getfile(fn)
3587 try:
3587 try:
3588 fnode = ctx.filenode(fn)
3588 fnode = ctx.filenode(fn)
3589 except error.LookupError:
3589 except error.LookupError:
3590 continue
3590 continue
3591
3591
3592 copy = None
3592 copy = None
3593 if follow:
3593 if follow:
3594 copy = getrenamed(fn, rev)
3594 copy = getrenamed(fn, rev)
3595 if copy:
3595 if copy:
3596 copies.setdefault(rev, {})[fn] = copy
3596 copies.setdefault(rev, {})[fn] = copy
3597 if fn in skip:
3597 if fn in skip:
3598 skip.add(copy)
3598 skip.add(copy)
3599 if fn in skip:
3599 if fn in skip:
3600 continue
3600 continue
3601 files.append(fn)
3601 files.append(fn)
3602
3602
3603 if fn not in matches[rev]:
3603 if fn not in matches[rev]:
3604 content = get_file_content(fn, flog, fnode, ctx, rev)
3604 content = get_file_content(fn, flog, fnode, ctx, rev)
3605 grepbody(fn, rev, content)
3605 grepbody(fn, rev, content)
3606
3606
3607 pfn = copy or fn
3607 pfn = copy or fn
3608 if pfn not in matches[parent]:
3608 if pfn not in matches[parent]:
3609 try:
3609 try:
3610 pfnode = pctx.filenode(pfn)
3610 pfnode = pctx.filenode(pfn)
3611 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3611 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3612 grepbody(pfn, parent, pcontent)
3612 grepbody(pfn, parent, pcontent)
3613 except error.LookupError:
3613 except error.LookupError:
3614 pass
3614 pass
3615
3615
3616 ui.pager(b'grep')
3616 ui.pager(b'grep')
3617 fm = ui.formatter(b'grep', opts)
3617 fm = ui.formatter(b'grep', opts)
3618 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3618 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3619 rev = ctx.rev()
3619 rev = ctx.rev()
3620 parent = ctx.p1().rev()
3620 parent = ctx.p1().rev()
3621 for fn in sorted(revfiles.get(rev, [])):
3621 for fn in sorted(revfiles.get(rev, [])):
3622 states = matches[rev][fn]
3622 states = matches[rev][fn]
3623 copy = copies.get(rev, {}).get(fn)
3623 copy = copies.get(rev, {}).get(fn)
3624 if fn in skip:
3624 if fn in skip:
3625 if copy:
3625 if copy:
3626 skip.add(copy)
3626 skip.add(copy)
3627 continue
3627 continue
3628 pstates = matches.get(parent, {}).get(copy or fn, [])
3628 pstates = matches.get(parent, {}).get(copy or fn, [])
3629 if pstates or states:
3629 if pstates or states:
3630 r = display(fm, fn, ctx, pstates, states)
3630 r = display(fm, fn, ctx, pstates, states)
3631 found = found or r
3631 found = found or r
3632 if r and not diff and not all_files:
3632 if r and not diff and not all_files:
3633 skip.add(fn)
3633 skip.add(fn)
3634 if copy:
3634 if copy:
3635 skip.add(copy)
3635 skip.add(copy)
3636 del revfiles[rev]
3636 del revfiles[rev]
3637 # We will keep the matches dict for the duration of the window
3637 # We will keep the matches dict for the duration of the window
3638 # clear the matches dict once the window is over
3638 # clear the matches dict once the window is over
3639 if not revfiles:
3639 if not revfiles:
3640 matches.clear()
3640 matches.clear()
3641 fm.end()
3641 fm.end()
3642
3642
3643 return not found
3643 return not found
3644
3644
3645
3645
3646 @command(
3646 @command(
3647 b'heads',
3647 b'heads',
3648 [
3648 [
3649 (
3649 (
3650 b'r',
3650 b'r',
3651 b'rev',
3651 b'rev',
3652 b'',
3652 b'',
3653 _(b'show only heads which are descendants of STARTREV'),
3653 _(b'show only heads which are descendants of STARTREV'),
3654 _(b'STARTREV'),
3654 _(b'STARTREV'),
3655 ),
3655 ),
3656 (b't', b'topo', False, _(b'show topological heads only')),
3656 (b't', b'topo', False, _(b'show topological heads only')),
3657 (
3657 (
3658 b'a',
3658 b'a',
3659 b'active',
3659 b'active',
3660 False,
3660 False,
3661 _(b'show active branchheads only (DEPRECATED)'),
3661 _(b'show active branchheads only (DEPRECATED)'),
3662 ),
3662 ),
3663 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3663 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3664 ]
3664 ]
3665 + templateopts,
3665 + templateopts,
3666 _(b'[-ct] [-r STARTREV] [REV]...'),
3666 _(b'[-ct] [-r STARTREV] [REV]...'),
3667 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3667 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3668 intents={INTENT_READONLY},
3668 intents={INTENT_READONLY},
3669 )
3669 )
3670 def heads(ui, repo, *branchrevs, **opts):
3670 def heads(ui, repo, *branchrevs, **opts):
3671 """show branch heads
3671 """show branch heads
3672
3672
3673 With no arguments, show all open branch heads in the repository.
3673 With no arguments, show all open branch heads in the repository.
3674 Branch heads are changesets that have no descendants on the
3674 Branch heads are changesets that have no descendants on the
3675 same branch. They are where development generally takes place and
3675 same branch. They are where development generally takes place and
3676 are the usual targets for update and merge operations.
3676 are the usual targets for update and merge operations.
3677
3677
3678 If one or more REVs are given, only open branch heads on the
3678 If one or more REVs are given, only open branch heads on the
3679 branches associated with the specified changesets are shown. This
3679 branches associated with the specified changesets are shown. This
3680 means that you can use :hg:`heads .` to see the heads on the
3680 means that you can use :hg:`heads .` to see the heads on the
3681 currently checked-out branch.
3681 currently checked-out branch.
3682
3682
3683 If -c/--closed is specified, also show branch heads marked closed
3683 If -c/--closed is specified, also show branch heads marked closed
3684 (see :hg:`commit --close-branch`).
3684 (see :hg:`commit --close-branch`).
3685
3685
3686 If STARTREV is specified, only those heads that are descendants of
3686 If STARTREV is specified, only those heads that are descendants of
3687 STARTREV will be displayed.
3687 STARTREV will be displayed.
3688
3688
3689 If -t/--topo is specified, named branch mechanics will be ignored and only
3689 If -t/--topo is specified, named branch mechanics will be ignored and only
3690 topological heads (changesets with no children) will be shown.
3690 topological heads (changesets with no children) will be shown.
3691
3691
3692 Returns 0 if matching heads are found, 1 if not.
3692 Returns 0 if matching heads are found, 1 if not.
3693 """
3693 """
3694
3694
3695 opts = pycompat.byteskwargs(opts)
3695 opts = pycompat.byteskwargs(opts)
3696 start = None
3696 start = None
3697 rev = opts.get(b'rev')
3697 rev = opts.get(b'rev')
3698 if rev:
3698 if rev:
3699 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3699 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3700 start = scmutil.revsingle(repo, rev, None).node()
3700 start = scmutil.revsingle(repo, rev, None).node()
3701
3701
3702 if opts.get(b'topo'):
3702 if opts.get(b'topo'):
3703 heads = [repo[h] for h in repo.heads(start)]
3703 heads = [repo[h] for h in repo.heads(start)]
3704 else:
3704 else:
3705 heads = []
3705 heads = []
3706 for branch in repo.branchmap():
3706 for branch in repo.branchmap():
3707 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3707 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3708 heads = [repo[h] for h in heads]
3708 heads = [repo[h] for h in heads]
3709
3709
3710 if branchrevs:
3710 if branchrevs:
3711 branches = set(
3711 branches = set(
3712 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3712 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3713 )
3713 )
3714 heads = [h for h in heads if h.branch() in branches]
3714 heads = [h for h in heads if h.branch() in branches]
3715
3715
3716 if opts.get(b'active') and branchrevs:
3716 if opts.get(b'active') and branchrevs:
3717 dagheads = repo.heads(start)
3717 dagheads = repo.heads(start)
3718 heads = [h for h in heads if h.node() in dagheads]
3718 heads = [h for h in heads if h.node() in dagheads]
3719
3719
3720 if branchrevs:
3720 if branchrevs:
3721 haveheads = set(h.branch() for h in heads)
3721 haveheads = set(h.branch() for h in heads)
3722 if branches - haveheads:
3722 if branches - haveheads:
3723 headless = b', '.join(b for b in branches - haveheads)
3723 headless = b', '.join(b for b in branches - haveheads)
3724 msg = _(b'no open branch heads found on branches %s')
3724 msg = _(b'no open branch heads found on branches %s')
3725 if opts.get(b'rev'):
3725 if opts.get(b'rev'):
3726 msg += _(b' (started at %s)') % opts[b'rev']
3726 msg += _(b' (started at %s)') % opts[b'rev']
3727 ui.warn((msg + b'\n') % headless)
3727 ui.warn((msg + b'\n') % headless)
3728
3728
3729 if not heads:
3729 if not heads:
3730 return 1
3730 return 1
3731
3731
3732 ui.pager(b'heads')
3732 ui.pager(b'heads')
3733 heads = sorted(heads, key=lambda x: -(x.rev()))
3733 heads = sorted(heads, key=lambda x: -(x.rev()))
3734 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3734 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3735 for ctx in heads:
3735 for ctx in heads:
3736 displayer.show(ctx)
3736 displayer.show(ctx)
3737 displayer.close()
3737 displayer.close()
3738
3738
3739
3739
3740 @command(
3740 @command(
3741 b'help',
3741 b'help',
3742 [
3742 [
3743 (b'e', b'extension', None, _(b'show only help for extensions')),
3743 (b'e', b'extension', None, _(b'show only help for extensions')),
3744 (b'c', b'command', None, _(b'show only help for commands')),
3744 (b'c', b'command', None, _(b'show only help for commands')),
3745 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3745 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3746 (
3746 (
3747 b's',
3747 b's',
3748 b'system',
3748 b'system',
3749 [],
3749 [],
3750 _(b'show help for specific platform(s)'),
3750 _(b'show help for specific platform(s)'),
3751 _(b'PLATFORM'),
3751 _(b'PLATFORM'),
3752 ),
3752 ),
3753 ],
3753 ],
3754 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3754 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3755 helpcategory=command.CATEGORY_HELP,
3755 helpcategory=command.CATEGORY_HELP,
3756 norepo=True,
3756 norepo=True,
3757 intents={INTENT_READONLY},
3757 intents={INTENT_READONLY},
3758 )
3758 )
3759 def help_(ui, name=None, **opts):
3759 def help_(ui, name=None, **opts):
3760 """show help for a given topic or a help overview
3760 """show help for a given topic or a help overview
3761
3761
3762 With no arguments, print a list of commands with short help messages.
3762 With no arguments, print a list of commands with short help messages.
3763
3763
3764 Given a topic, extension, or command name, print help for that
3764 Given a topic, extension, or command name, print help for that
3765 topic.
3765 topic.
3766
3766
3767 Returns 0 if successful.
3767 Returns 0 if successful.
3768 """
3768 """
3769
3769
3770 keep = opts.get('system') or []
3770 keep = opts.get('system') or []
3771 if len(keep) == 0:
3771 if len(keep) == 0:
3772 if pycompat.sysplatform.startswith(b'win'):
3772 if pycompat.sysplatform.startswith(b'win'):
3773 keep.append(b'windows')
3773 keep.append(b'windows')
3774 elif pycompat.sysplatform == b'OpenVMS':
3774 elif pycompat.sysplatform == b'OpenVMS':
3775 keep.append(b'vms')
3775 keep.append(b'vms')
3776 elif pycompat.sysplatform == b'plan9':
3776 elif pycompat.sysplatform == b'plan9':
3777 keep.append(b'plan9')
3777 keep.append(b'plan9')
3778 else:
3778 else:
3779 keep.append(b'unix')
3779 keep.append(b'unix')
3780 keep.append(pycompat.sysplatform.lower())
3780 keep.append(pycompat.sysplatform.lower())
3781 if ui.verbose:
3781 if ui.verbose:
3782 keep.append(b'verbose')
3782 keep.append(b'verbose')
3783
3783
3784 commands = sys.modules[__name__]
3784 commands = sys.modules[__name__]
3785 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3785 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3786 ui.pager(b'help')
3786 ui.pager(b'help')
3787 ui.write(formatted)
3787 ui.write(formatted)
3788
3788
3789
3789
3790 @command(
3790 @command(
3791 b'identify|id',
3791 b'identify|id',
3792 [
3792 [
3793 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3793 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3794 (b'n', b'num', None, _(b'show local revision number')),
3794 (b'n', b'num', None, _(b'show local revision number')),
3795 (b'i', b'id', None, _(b'show global revision id')),
3795 (b'i', b'id', None, _(b'show global revision id')),
3796 (b'b', b'branch', None, _(b'show branch')),
3796 (b'b', b'branch', None, _(b'show branch')),
3797 (b't', b'tags', None, _(b'show tags')),
3797 (b't', b'tags', None, _(b'show tags')),
3798 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3798 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3799 ]
3799 ]
3800 + remoteopts
3800 + remoteopts
3801 + formatteropts,
3801 + formatteropts,
3802 _(b'[-nibtB] [-r REV] [SOURCE]'),
3802 _(b'[-nibtB] [-r REV] [SOURCE]'),
3803 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3803 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3804 optionalrepo=True,
3804 optionalrepo=True,
3805 intents={INTENT_READONLY},
3805 intents={INTENT_READONLY},
3806 )
3806 )
3807 def identify(
3807 def identify(
3808 ui,
3808 ui,
3809 repo,
3809 repo,
3810 source=None,
3810 source=None,
3811 rev=None,
3811 rev=None,
3812 num=None,
3812 num=None,
3813 id=None,
3813 id=None,
3814 branch=None,
3814 branch=None,
3815 tags=None,
3815 tags=None,
3816 bookmarks=None,
3816 bookmarks=None,
3817 **opts
3817 **opts
3818 ):
3818 ):
3819 """identify the working directory or specified revision
3819 """identify the working directory or specified revision
3820
3820
3821 Print a summary identifying the repository state at REV using one or
3821 Print a summary identifying the repository state at REV using one or
3822 two parent hash identifiers, followed by a "+" if the working
3822 two parent hash identifiers, followed by a "+" if the working
3823 directory has uncommitted changes, the branch name (if not default),
3823 directory has uncommitted changes, the branch name (if not default),
3824 a list of tags, and a list of bookmarks.
3824 a list of tags, and a list of bookmarks.
3825
3825
3826 When REV is not given, print a summary of the current state of the
3826 When REV is not given, print a summary of the current state of the
3827 repository including the working directory. Specify -r. to get information
3827 repository including the working directory. Specify -r. to get information
3828 of the working directory parent without scanning uncommitted changes.
3828 of the working directory parent without scanning uncommitted changes.
3829
3829
3830 Specifying a path to a repository root or Mercurial bundle will
3830 Specifying a path to a repository root or Mercurial bundle will
3831 cause lookup to operate on that repository/bundle.
3831 cause lookup to operate on that repository/bundle.
3832
3832
3833 .. container:: verbose
3833 .. container:: verbose
3834
3834
3835 Template:
3835 Template:
3836
3836
3837 The following keywords are supported in addition to the common template
3837 The following keywords are supported in addition to the common template
3838 keywords and functions. See also :hg:`help templates`.
3838 keywords and functions. See also :hg:`help templates`.
3839
3839
3840 :dirty: String. Character ``+`` denoting if the working directory has
3840 :dirty: String. Character ``+`` denoting if the working directory has
3841 uncommitted changes.
3841 uncommitted changes.
3842 :id: String. One or two nodes, optionally followed by ``+``.
3842 :id: String. One or two nodes, optionally followed by ``+``.
3843 :parents: List of strings. Parent nodes of the changeset.
3843 :parents: List of strings. Parent nodes of the changeset.
3844
3844
3845 Examples:
3845 Examples:
3846
3846
3847 - generate a build identifier for the working directory::
3847 - generate a build identifier for the working directory::
3848
3848
3849 hg id --id > build-id.dat
3849 hg id --id > build-id.dat
3850
3850
3851 - find the revision corresponding to a tag::
3851 - find the revision corresponding to a tag::
3852
3852
3853 hg id -n -r 1.3
3853 hg id -n -r 1.3
3854
3854
3855 - check the most recent revision of a remote repository::
3855 - check the most recent revision of a remote repository::
3856
3856
3857 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3857 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3858
3858
3859 See :hg:`log` for generating more information about specific revisions,
3859 See :hg:`log` for generating more information about specific revisions,
3860 including full hash identifiers.
3860 including full hash identifiers.
3861
3861
3862 Returns 0 if successful.
3862 Returns 0 if successful.
3863 """
3863 """
3864
3864
3865 opts = pycompat.byteskwargs(opts)
3865 opts = pycompat.byteskwargs(opts)
3866 if not repo and not source:
3866 if not repo and not source:
3867 raise error.Abort(
3867 raise error.Abort(
3868 _(b"there is no Mercurial repository here (.hg not found)")
3868 _(b"there is no Mercurial repository here (.hg not found)")
3869 )
3869 )
3870
3870
3871 default = not (num or id or branch or tags or bookmarks)
3871 default = not (num or id or branch or tags or bookmarks)
3872 output = []
3872 output = []
3873 revs = []
3873 revs = []
3874
3874
3875 if source:
3875 if source:
3876 source, branches = hg.parseurl(ui.expandpath(source))
3876 source, branches = hg.parseurl(ui.expandpath(source))
3877 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3877 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3878 repo = peer.local()
3878 repo = peer.local()
3879 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3879 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3880
3880
3881 fm = ui.formatter(b'identify', opts)
3881 fm = ui.formatter(b'identify', opts)
3882 fm.startitem()
3882 fm.startitem()
3883
3883
3884 if not repo:
3884 if not repo:
3885 if num or branch or tags:
3885 if num or branch or tags:
3886 raise error.Abort(
3886 raise error.Abort(
3887 _(b"can't query remote revision number, branch, or tags")
3887 _(b"can't query remote revision number, branch, or tags")
3888 )
3888 )
3889 if not rev and revs:
3889 if not rev and revs:
3890 rev = revs[0]
3890 rev = revs[0]
3891 if not rev:
3891 if not rev:
3892 rev = b"tip"
3892 rev = b"tip"
3893
3893
3894 remoterev = peer.lookup(rev)
3894 remoterev = peer.lookup(rev)
3895 hexrev = fm.hexfunc(remoterev)
3895 hexrev = fm.hexfunc(remoterev)
3896 if default or id:
3896 if default or id:
3897 output = [hexrev]
3897 output = [hexrev]
3898 fm.data(id=hexrev)
3898 fm.data(id=hexrev)
3899
3899
3900 @util.cachefunc
3900 @util.cachefunc
3901 def getbms():
3901 def getbms():
3902 bms = []
3902 bms = []
3903
3903
3904 if b'bookmarks' in peer.listkeys(b'namespaces'):
3904 if b'bookmarks' in peer.listkeys(b'namespaces'):
3905 hexremoterev = hex(remoterev)
3905 hexremoterev = hex(remoterev)
3906 bms = [
3906 bms = [
3907 bm
3907 bm
3908 for bm, bmr in pycompat.iteritems(
3908 for bm, bmr in pycompat.iteritems(
3909 peer.listkeys(b'bookmarks')
3909 peer.listkeys(b'bookmarks')
3910 )
3910 )
3911 if bmr == hexremoterev
3911 if bmr == hexremoterev
3912 ]
3912 ]
3913
3913
3914 return sorted(bms)
3914 return sorted(bms)
3915
3915
3916 if fm.isplain():
3916 if fm.isplain():
3917 if bookmarks:
3917 if bookmarks:
3918 output.extend(getbms())
3918 output.extend(getbms())
3919 elif default and not ui.quiet:
3919 elif default and not ui.quiet:
3920 # multiple bookmarks for a single parent separated by '/'
3920 # multiple bookmarks for a single parent separated by '/'
3921 bm = b'/'.join(getbms())
3921 bm = b'/'.join(getbms())
3922 if bm:
3922 if bm:
3923 output.append(bm)
3923 output.append(bm)
3924 else:
3924 else:
3925 fm.data(node=hex(remoterev))
3925 fm.data(node=hex(remoterev))
3926 if bookmarks or b'bookmarks' in fm.datahint():
3926 if bookmarks or b'bookmarks' in fm.datahint():
3927 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3927 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3928 else:
3928 else:
3929 if rev:
3929 if rev:
3930 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3930 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3931 ctx = scmutil.revsingle(repo, rev, None)
3931 ctx = scmutil.revsingle(repo, rev, None)
3932
3932
3933 if ctx.rev() is None:
3933 if ctx.rev() is None:
3934 ctx = repo[None]
3934 ctx = repo[None]
3935 parents = ctx.parents()
3935 parents = ctx.parents()
3936 taglist = []
3936 taglist = []
3937 for p in parents:
3937 for p in parents:
3938 taglist.extend(p.tags())
3938 taglist.extend(p.tags())
3939
3939
3940 dirty = b""
3940 dirty = b""
3941 if ctx.dirty(missing=True, merge=False, branch=False):
3941 if ctx.dirty(missing=True, merge=False, branch=False):
3942 dirty = b'+'
3942 dirty = b'+'
3943 fm.data(dirty=dirty)
3943 fm.data(dirty=dirty)
3944
3944
3945 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3945 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3946 if default or id:
3946 if default or id:
3947 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3947 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3948 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3948 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3949
3949
3950 if num:
3950 if num:
3951 numoutput = [b"%d" % p.rev() for p in parents]
3951 numoutput = [b"%d" % p.rev() for p in parents]
3952 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3952 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3953
3953
3954 fm.data(
3954 fm.data(
3955 parents=fm.formatlist(
3955 parents=fm.formatlist(
3956 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3956 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3957 )
3957 )
3958 )
3958 )
3959 else:
3959 else:
3960 hexoutput = fm.hexfunc(ctx.node())
3960 hexoutput = fm.hexfunc(ctx.node())
3961 if default or id:
3961 if default or id:
3962 output = [hexoutput]
3962 output = [hexoutput]
3963 fm.data(id=hexoutput)
3963 fm.data(id=hexoutput)
3964
3964
3965 if num:
3965 if num:
3966 output.append(pycompat.bytestr(ctx.rev()))
3966 output.append(pycompat.bytestr(ctx.rev()))
3967 taglist = ctx.tags()
3967 taglist = ctx.tags()
3968
3968
3969 if default and not ui.quiet:
3969 if default and not ui.quiet:
3970 b = ctx.branch()
3970 b = ctx.branch()
3971 if b != b'default':
3971 if b != b'default':
3972 output.append(b"(%s)" % b)
3972 output.append(b"(%s)" % b)
3973
3973
3974 # multiple tags for a single parent separated by '/'
3974 # multiple tags for a single parent separated by '/'
3975 t = b'/'.join(taglist)
3975 t = b'/'.join(taglist)
3976 if t:
3976 if t:
3977 output.append(t)
3977 output.append(t)
3978
3978
3979 # multiple bookmarks for a single parent separated by '/'
3979 # multiple bookmarks for a single parent separated by '/'
3980 bm = b'/'.join(ctx.bookmarks())
3980 bm = b'/'.join(ctx.bookmarks())
3981 if bm:
3981 if bm:
3982 output.append(bm)
3982 output.append(bm)
3983 else:
3983 else:
3984 if branch:
3984 if branch:
3985 output.append(ctx.branch())
3985 output.append(ctx.branch())
3986
3986
3987 if tags:
3987 if tags:
3988 output.extend(taglist)
3988 output.extend(taglist)
3989
3989
3990 if bookmarks:
3990 if bookmarks:
3991 output.extend(ctx.bookmarks())
3991 output.extend(ctx.bookmarks())
3992
3992
3993 fm.data(node=ctx.hex())
3993 fm.data(node=ctx.hex())
3994 fm.data(branch=ctx.branch())
3994 fm.data(branch=ctx.branch())
3995 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3995 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3996 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3996 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3997 fm.context(ctx=ctx)
3997 fm.context(ctx=ctx)
3998
3998
3999 fm.plain(b"%s\n" % b' '.join(output))
3999 fm.plain(b"%s\n" % b' '.join(output))
4000 fm.end()
4000 fm.end()
4001
4001
4002
4002
4003 @command(
4003 @command(
4004 b'import|patch',
4004 b'import|patch',
4005 [
4005 [
4006 (
4006 (
4007 b'p',
4007 b'p',
4008 b'strip',
4008 b'strip',
4009 1,
4009 1,
4010 _(
4010 _(
4011 b'directory strip option for patch. This has the same '
4011 b'directory strip option for patch. This has the same '
4012 b'meaning as the corresponding patch option'
4012 b'meaning as the corresponding patch option'
4013 ),
4013 ),
4014 _(b'NUM'),
4014 _(b'NUM'),
4015 ),
4015 ),
4016 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4016 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4017 (b'', b'secret', None, _(b'use the secret phase for committing')),
4017 (b'', b'secret', None, _(b'use the secret phase for committing')),
4018 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4018 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4019 (
4019 (
4020 b'f',
4020 b'f',
4021 b'force',
4021 b'force',
4022 None,
4022 None,
4023 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4023 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4024 ),
4024 ),
4025 (
4025 (
4026 b'',
4026 b'',
4027 b'no-commit',
4027 b'no-commit',
4028 None,
4028 None,
4029 _(b"don't commit, just update the working directory"),
4029 _(b"don't commit, just update the working directory"),
4030 ),
4030 ),
4031 (
4031 (
4032 b'',
4032 b'',
4033 b'bypass',
4033 b'bypass',
4034 None,
4034 None,
4035 _(b"apply patch without touching the working directory"),
4035 _(b"apply patch without touching the working directory"),
4036 ),
4036 ),
4037 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4037 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4038 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4038 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4039 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4039 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4040 (
4040 (
4041 b'',
4041 b'',
4042 b'import-branch',
4042 b'import-branch',
4043 None,
4043 None,
4044 _(b'use any branch information in patch (implied by --exact)'),
4044 _(b'use any branch information in patch (implied by --exact)'),
4045 ),
4045 ),
4046 ]
4046 ]
4047 + commitopts
4047 + commitopts
4048 + commitopts2
4048 + commitopts2
4049 + similarityopts,
4049 + similarityopts,
4050 _(b'[OPTION]... PATCH...'),
4050 _(b'[OPTION]... PATCH...'),
4051 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4051 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4052 )
4052 )
4053 def import_(ui, repo, patch1=None, *patches, **opts):
4053 def import_(ui, repo, patch1=None, *patches, **opts):
4054 """import an ordered set of patches
4054 """import an ordered set of patches
4055
4055
4056 Import a list of patches and commit them individually (unless
4056 Import a list of patches and commit them individually (unless
4057 --no-commit is specified).
4057 --no-commit is specified).
4058
4058
4059 To read a patch from standard input (stdin), use "-" as the patch
4059 To read a patch from standard input (stdin), use "-" as the patch
4060 name. If a URL is specified, the patch will be downloaded from
4060 name. If a URL is specified, the patch will be downloaded from
4061 there.
4061 there.
4062
4062
4063 Import first applies changes to the working directory (unless
4063 Import first applies changes to the working directory (unless
4064 --bypass is specified), import will abort if there are outstanding
4064 --bypass is specified), import will abort if there are outstanding
4065 changes.
4065 changes.
4066
4066
4067 Use --bypass to apply and commit patches directly to the
4067 Use --bypass to apply and commit patches directly to the
4068 repository, without affecting the working directory. Without
4068 repository, without affecting the working directory. Without
4069 --exact, patches will be applied on top of the working directory
4069 --exact, patches will be applied on top of the working directory
4070 parent revision.
4070 parent revision.
4071
4071
4072 You can import a patch straight from a mail message. Even patches
4072 You can import a patch straight from a mail message. Even patches
4073 as attachments work (to use the body part, it must have type
4073 as attachments work (to use the body part, it must have type
4074 text/plain or text/x-patch). From and Subject headers of email
4074 text/plain or text/x-patch). From and Subject headers of email
4075 message are used as default committer and commit message. All
4075 message are used as default committer and commit message. All
4076 text/plain body parts before first diff are added to the commit
4076 text/plain body parts before first diff are added to the commit
4077 message.
4077 message.
4078
4078
4079 If the imported patch was generated by :hg:`export`, user and
4079 If the imported patch was generated by :hg:`export`, user and
4080 description from patch override values from message headers and
4080 description from patch override values from message headers and
4081 body. Values given on command line with -m/--message and -u/--user
4081 body. Values given on command line with -m/--message and -u/--user
4082 override these.
4082 override these.
4083
4083
4084 If --exact is specified, import will set the working directory to
4084 If --exact is specified, import will set the working directory to
4085 the parent of each patch before applying it, and will abort if the
4085 the parent of each patch before applying it, and will abort if the
4086 resulting changeset has a different ID than the one recorded in
4086 resulting changeset has a different ID than the one recorded in
4087 the patch. This will guard against various ways that portable
4087 the patch. This will guard against various ways that portable
4088 patch formats and mail systems might fail to transfer Mercurial
4088 patch formats and mail systems might fail to transfer Mercurial
4089 data or metadata. See :hg:`bundle` for lossless transmission.
4089 data or metadata. See :hg:`bundle` for lossless transmission.
4090
4090
4091 Use --partial to ensure a changeset will be created from the patch
4091 Use --partial to ensure a changeset will be created from the patch
4092 even if some hunks fail to apply. Hunks that fail to apply will be
4092 even if some hunks fail to apply. Hunks that fail to apply will be
4093 written to a <target-file>.rej file. Conflicts can then be resolved
4093 written to a <target-file>.rej file. Conflicts can then be resolved
4094 by hand before :hg:`commit --amend` is run to update the created
4094 by hand before :hg:`commit --amend` is run to update the created
4095 changeset. This flag exists to let people import patches that
4095 changeset. This flag exists to let people import patches that
4096 partially apply without losing the associated metadata (author,
4096 partially apply without losing the associated metadata (author,
4097 date, description, ...).
4097 date, description, ...).
4098
4098
4099 .. note::
4099 .. note::
4100
4100
4101 When no hunks apply cleanly, :hg:`import --partial` will create
4101 When no hunks apply cleanly, :hg:`import --partial` will create
4102 an empty changeset, importing only the patch metadata.
4102 an empty changeset, importing only the patch metadata.
4103
4103
4104 With -s/--similarity, hg will attempt to discover renames and
4104 With -s/--similarity, hg will attempt to discover renames and
4105 copies in the patch in the same way as :hg:`addremove`.
4105 copies in the patch in the same way as :hg:`addremove`.
4106
4106
4107 It is possible to use external patch programs to perform the patch
4107 It is possible to use external patch programs to perform the patch
4108 by setting the ``ui.patch`` configuration option. For the default
4108 by setting the ``ui.patch`` configuration option. For the default
4109 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4109 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4110 See :hg:`help config` for more information about configuration
4110 See :hg:`help config` for more information about configuration
4111 files and how to use these options.
4111 files and how to use these options.
4112
4112
4113 See :hg:`help dates` for a list of formats valid for -d/--date.
4113 See :hg:`help dates` for a list of formats valid for -d/--date.
4114
4114
4115 .. container:: verbose
4115 .. container:: verbose
4116
4116
4117 Examples:
4117 Examples:
4118
4118
4119 - import a traditional patch from a website and detect renames::
4119 - import a traditional patch from a website and detect renames::
4120
4120
4121 hg import -s 80 http://example.com/bugfix.patch
4121 hg import -s 80 http://example.com/bugfix.patch
4122
4122
4123 - import a changeset from an hgweb server::
4123 - import a changeset from an hgweb server::
4124
4124
4125 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4125 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4126
4126
4127 - import all the patches in an Unix-style mbox::
4127 - import all the patches in an Unix-style mbox::
4128
4128
4129 hg import incoming-patches.mbox
4129 hg import incoming-patches.mbox
4130
4130
4131 - import patches from stdin::
4131 - import patches from stdin::
4132
4132
4133 hg import -
4133 hg import -
4134
4134
4135 - attempt to exactly restore an exported changeset (not always
4135 - attempt to exactly restore an exported changeset (not always
4136 possible)::
4136 possible)::
4137
4137
4138 hg import --exact proposed-fix.patch
4138 hg import --exact proposed-fix.patch
4139
4139
4140 - use an external tool to apply a patch which is too fuzzy for
4140 - use an external tool to apply a patch which is too fuzzy for
4141 the default internal tool.
4141 the default internal tool.
4142
4142
4143 hg import --config ui.patch="patch --merge" fuzzy.patch
4143 hg import --config ui.patch="patch --merge" fuzzy.patch
4144
4144
4145 - change the default fuzzing from 2 to a less strict 7
4145 - change the default fuzzing from 2 to a less strict 7
4146
4146
4147 hg import --config ui.fuzz=7 fuzz.patch
4147 hg import --config ui.fuzz=7 fuzz.patch
4148
4148
4149 Returns 0 on success, 1 on partial success (see --partial).
4149 Returns 0 on success, 1 on partial success (see --partial).
4150 """
4150 """
4151
4151
4152 opts = pycompat.byteskwargs(opts)
4152 opts = pycompat.byteskwargs(opts)
4153 if not patch1:
4153 if not patch1:
4154 raise error.Abort(_(b'need at least one patch to import'))
4154 raise error.Abort(_(b'need at least one patch to import'))
4155
4155
4156 patches = (patch1,) + patches
4156 patches = (patch1,) + patches
4157
4157
4158 date = opts.get(b'date')
4158 date = opts.get(b'date')
4159 if date:
4159 if date:
4160 opts[b'date'] = dateutil.parsedate(date)
4160 opts[b'date'] = dateutil.parsedate(date)
4161
4161
4162 exact = opts.get(b'exact')
4162 exact = opts.get(b'exact')
4163 update = not opts.get(b'bypass')
4163 update = not opts.get(b'bypass')
4164 if not update and opts.get(b'no_commit'):
4164 if not update and opts.get(b'no_commit'):
4165 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4165 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4166 if opts.get(b'secret') and opts.get(b'no_commit'):
4166 if opts.get(b'secret') and opts.get(b'no_commit'):
4167 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4167 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4168 try:
4168 try:
4169 sim = float(opts.get(b'similarity') or 0)
4169 sim = float(opts.get(b'similarity') or 0)
4170 except ValueError:
4170 except ValueError:
4171 raise error.Abort(_(b'similarity must be a number'))
4171 raise error.Abort(_(b'similarity must be a number'))
4172 if sim < 0 or sim > 100:
4172 if sim < 0 or sim > 100:
4173 raise error.Abort(_(b'similarity must be between 0 and 100'))
4173 raise error.Abort(_(b'similarity must be between 0 and 100'))
4174 if sim and not update:
4174 if sim and not update:
4175 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4175 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4176 if exact:
4176 if exact:
4177 if opts.get(b'edit'):
4177 if opts.get(b'edit'):
4178 raise error.Abort(_(b'cannot use --exact with --edit'))
4178 raise error.Abort(_(b'cannot use --exact with --edit'))
4179 if opts.get(b'prefix'):
4179 if opts.get(b'prefix'):
4180 raise error.Abort(_(b'cannot use --exact with --prefix'))
4180 raise error.Abort(_(b'cannot use --exact with --prefix'))
4181
4181
4182 base = opts[b"base"]
4182 base = opts[b"base"]
4183 msgs = []
4183 msgs = []
4184 ret = 0
4184 ret = 0
4185
4185
4186 with repo.wlock():
4186 with repo.wlock():
4187 if update:
4187 if update:
4188 cmdutil.checkunfinished(repo)
4188 cmdutil.checkunfinished(repo)
4189 if exact or not opts.get(b'force'):
4189 if exact or not opts.get(b'force'):
4190 cmdutil.bailifchanged(repo)
4190 cmdutil.bailifchanged(repo)
4191
4191
4192 if not opts.get(b'no_commit'):
4192 if not opts.get(b'no_commit'):
4193 lock = repo.lock
4193 lock = repo.lock
4194 tr = lambda: repo.transaction(b'import')
4194 tr = lambda: repo.transaction(b'import')
4195 dsguard = util.nullcontextmanager
4195 dsguard = util.nullcontextmanager
4196 else:
4196 else:
4197 lock = util.nullcontextmanager
4197 lock = util.nullcontextmanager
4198 tr = util.nullcontextmanager
4198 tr = util.nullcontextmanager
4199 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4199 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4200 with lock(), tr(), dsguard():
4200 with lock(), tr(), dsguard():
4201 parents = repo[None].parents()
4201 parents = repo[None].parents()
4202 for patchurl in patches:
4202 for patchurl in patches:
4203 if patchurl == b'-':
4203 if patchurl == b'-':
4204 ui.status(_(b'applying patch from stdin\n'))
4204 ui.status(_(b'applying patch from stdin\n'))
4205 patchfile = ui.fin
4205 patchfile = ui.fin
4206 patchurl = b'stdin' # for error message
4206 patchurl = b'stdin' # for error message
4207 else:
4207 else:
4208 patchurl = os.path.join(base, patchurl)
4208 patchurl = os.path.join(base, patchurl)
4209 ui.status(_(b'applying %s\n') % patchurl)
4209 ui.status(_(b'applying %s\n') % patchurl)
4210 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4210 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4211
4211
4212 haspatch = False
4212 haspatch = False
4213 for hunk in patch.split(patchfile):
4213 for hunk in patch.split(patchfile):
4214 with patch.extract(ui, hunk) as patchdata:
4214 with patch.extract(ui, hunk) as patchdata:
4215 msg, node, rej = cmdutil.tryimportone(
4215 msg, node, rej = cmdutil.tryimportone(
4216 ui, repo, patchdata, parents, opts, msgs, hg.clean
4216 ui, repo, patchdata, parents, opts, msgs, hg.clean
4217 )
4217 )
4218 if msg:
4218 if msg:
4219 haspatch = True
4219 haspatch = True
4220 ui.note(msg + b'\n')
4220 ui.note(msg + b'\n')
4221 if update or exact:
4221 if update or exact:
4222 parents = repo[None].parents()
4222 parents = repo[None].parents()
4223 else:
4223 else:
4224 parents = [repo[node]]
4224 parents = [repo[node]]
4225 if rej:
4225 if rej:
4226 ui.write_err(_(b"patch applied partially\n"))
4226 ui.write_err(_(b"patch applied partially\n"))
4227 ui.write_err(
4227 ui.write_err(
4228 _(
4228 _(
4229 b"(fix the .rej files and run "
4229 b"(fix the .rej files and run "
4230 b"`hg commit --amend`)\n"
4230 b"`hg commit --amend`)\n"
4231 )
4231 )
4232 )
4232 )
4233 ret = 1
4233 ret = 1
4234 break
4234 break
4235
4235
4236 if not haspatch:
4236 if not haspatch:
4237 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4237 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4238
4238
4239 if msgs:
4239 if msgs:
4240 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4240 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4241 return ret
4241 return ret
4242
4242
4243
4243
4244 @command(
4244 @command(
4245 b'incoming|in',
4245 b'incoming|in',
4246 [
4246 [
4247 (
4247 (
4248 b'f',
4248 b'f',
4249 b'force',
4249 b'force',
4250 None,
4250 None,
4251 _(b'run even if remote repository is unrelated'),
4251 _(b'run even if remote repository is unrelated'),
4252 ),
4252 ),
4253 (b'n', b'newest-first', None, _(b'show newest record first')),
4253 (b'n', b'newest-first', None, _(b'show newest record first')),
4254 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4254 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4255 (
4255 (
4256 b'r',
4256 b'r',
4257 b'rev',
4257 b'rev',
4258 [],
4258 [],
4259 _(b'a remote changeset intended to be added'),
4259 _(b'a remote changeset intended to be added'),
4260 _(b'REV'),
4260 _(b'REV'),
4261 ),
4261 ),
4262 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4262 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4263 (
4263 (
4264 b'b',
4264 b'b',
4265 b'branch',
4265 b'branch',
4266 [],
4266 [],
4267 _(b'a specific branch you would like to pull'),
4267 _(b'a specific branch you would like to pull'),
4268 _(b'BRANCH'),
4268 _(b'BRANCH'),
4269 ),
4269 ),
4270 ]
4270 ]
4271 + logopts
4271 + logopts
4272 + remoteopts
4272 + remoteopts
4273 + subrepoopts,
4273 + subrepoopts,
4274 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4274 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4275 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4275 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4276 )
4276 )
4277 def incoming(ui, repo, source=b"default", **opts):
4277 def incoming(ui, repo, source=b"default", **opts):
4278 """show new changesets found in source
4278 """show new changesets found in source
4279
4279
4280 Show new changesets found in the specified path/URL or the default
4280 Show new changesets found in the specified path/URL or the default
4281 pull location. These are the changesets that would have been pulled
4281 pull location. These are the changesets that would have been pulled
4282 by :hg:`pull` at the time you issued this command.
4282 by :hg:`pull` at the time you issued this command.
4283
4283
4284 See pull for valid source format details.
4284 See pull for valid source format details.
4285
4285
4286 .. container:: verbose
4286 .. container:: verbose
4287
4287
4288 With -B/--bookmarks, the result of bookmark comparison between
4288 With -B/--bookmarks, the result of bookmark comparison between
4289 local and remote repositories is displayed. With -v/--verbose,
4289 local and remote repositories is displayed. With -v/--verbose,
4290 status is also displayed for each bookmark like below::
4290 status is also displayed for each bookmark like below::
4291
4291
4292 BM1 01234567890a added
4292 BM1 01234567890a added
4293 BM2 1234567890ab advanced
4293 BM2 1234567890ab advanced
4294 BM3 234567890abc diverged
4294 BM3 234567890abc diverged
4295 BM4 34567890abcd changed
4295 BM4 34567890abcd changed
4296
4296
4297 The action taken locally when pulling depends on the
4297 The action taken locally when pulling depends on the
4298 status of each bookmark:
4298 status of each bookmark:
4299
4299
4300 :``added``: pull will create it
4300 :``added``: pull will create it
4301 :``advanced``: pull will update it
4301 :``advanced``: pull will update it
4302 :``diverged``: pull will create a divergent bookmark
4302 :``diverged``: pull will create a divergent bookmark
4303 :``changed``: result depends on remote changesets
4303 :``changed``: result depends on remote changesets
4304
4304
4305 From the point of view of pulling behavior, bookmark
4305 From the point of view of pulling behavior, bookmark
4306 existing only in the remote repository are treated as ``added``,
4306 existing only in the remote repository are treated as ``added``,
4307 even if it is in fact locally deleted.
4307 even if it is in fact locally deleted.
4308
4308
4309 .. container:: verbose
4309 .. container:: verbose
4310
4310
4311 For remote repository, using --bundle avoids downloading the
4311 For remote repository, using --bundle avoids downloading the
4312 changesets twice if the incoming is followed by a pull.
4312 changesets twice if the incoming is followed by a pull.
4313
4313
4314 Examples:
4314 Examples:
4315
4315
4316 - show incoming changes with patches and full description::
4316 - show incoming changes with patches and full description::
4317
4317
4318 hg incoming -vp
4318 hg incoming -vp
4319
4319
4320 - show incoming changes excluding merges, store a bundle::
4320 - show incoming changes excluding merges, store a bundle::
4321
4321
4322 hg in -vpM --bundle incoming.hg
4322 hg in -vpM --bundle incoming.hg
4323 hg pull incoming.hg
4323 hg pull incoming.hg
4324
4324
4325 - briefly list changes inside a bundle::
4325 - briefly list changes inside a bundle::
4326
4326
4327 hg in changes.hg -T "{desc|firstline}\\n"
4327 hg in changes.hg -T "{desc|firstline}\\n"
4328
4328
4329 Returns 0 if there are incoming changes, 1 otherwise.
4329 Returns 0 if there are incoming changes, 1 otherwise.
4330 """
4330 """
4331 opts = pycompat.byteskwargs(opts)
4331 opts = pycompat.byteskwargs(opts)
4332 if opts.get(b'graph'):
4332 if opts.get(b'graph'):
4333 logcmdutil.checkunsupportedgraphflags([], opts)
4333 logcmdutil.checkunsupportedgraphflags([], opts)
4334
4334
4335 def display(other, chlist, displayer):
4335 def display(other, chlist, displayer):
4336 revdag = logcmdutil.graphrevs(other, chlist, opts)
4336 revdag = logcmdutil.graphrevs(other, chlist, opts)
4337 logcmdutil.displaygraph(
4337 logcmdutil.displaygraph(
4338 ui, repo, revdag, displayer, graphmod.asciiedges
4338 ui, repo, revdag, displayer, graphmod.asciiedges
4339 )
4339 )
4340
4340
4341 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4341 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4342 return 0
4342 return 0
4343
4343
4344 if opts.get(b'bundle') and opts.get(b'subrepos'):
4344 if opts.get(b'bundle') and opts.get(b'subrepos'):
4345 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4345 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4346
4346
4347 if opts.get(b'bookmarks'):
4347 if opts.get(b'bookmarks'):
4348 source, branches = hg.parseurl(
4348 source, branches = hg.parseurl(
4349 ui.expandpath(source), opts.get(b'branch')
4349 ui.expandpath(source), opts.get(b'branch')
4350 )
4350 )
4351 other = hg.peer(repo, opts, source)
4351 other = hg.peer(repo, opts, source)
4352 if b'bookmarks' not in other.listkeys(b'namespaces'):
4352 if b'bookmarks' not in other.listkeys(b'namespaces'):
4353 ui.warn(_(b"remote doesn't support bookmarks\n"))
4353 ui.warn(_(b"remote doesn't support bookmarks\n"))
4354 return 0
4354 return 0
4355 ui.pager(b'incoming')
4355 ui.pager(b'incoming')
4356 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4356 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4357 return bookmarks.incoming(ui, repo, other)
4357 return bookmarks.incoming(ui, repo, other)
4358
4358
4359 repo._subtoppath = ui.expandpath(source)
4359 repo._subtoppath = ui.expandpath(source)
4360 try:
4360 try:
4361 return hg.incoming(ui, repo, source, opts)
4361 return hg.incoming(ui, repo, source, opts)
4362 finally:
4362 finally:
4363 del repo._subtoppath
4363 del repo._subtoppath
4364
4364
4365
4365
4366 @command(
4366 @command(
4367 b'init',
4367 b'init',
4368 remoteopts,
4368 remoteopts,
4369 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4369 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4370 helpcategory=command.CATEGORY_REPO_CREATION,
4370 helpcategory=command.CATEGORY_REPO_CREATION,
4371 helpbasic=True,
4371 helpbasic=True,
4372 norepo=True,
4372 norepo=True,
4373 )
4373 )
4374 def init(ui, dest=b".", **opts):
4374 def init(ui, dest=b".", **opts):
4375 """create a new repository in the given directory
4375 """create a new repository in the given directory
4376
4376
4377 Initialize a new repository in the given directory. If the given
4377 Initialize a new repository in the given directory. If the given
4378 directory does not exist, it will be created.
4378 directory does not exist, it will be created.
4379
4379
4380 If no directory is given, the current directory is used.
4380 If no directory is given, the current directory is used.
4381
4381
4382 It is possible to specify an ``ssh://`` URL as the destination.
4382 It is possible to specify an ``ssh://`` URL as the destination.
4383 See :hg:`help urls` for more information.
4383 See :hg:`help urls` for more information.
4384
4384
4385 Returns 0 on success.
4385 Returns 0 on success.
4386 """
4386 """
4387 opts = pycompat.byteskwargs(opts)
4387 opts = pycompat.byteskwargs(opts)
4388 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4388 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4389
4389
4390
4390
4391 @command(
4391 @command(
4392 b'locate',
4392 b'locate',
4393 [
4393 [
4394 (
4394 (
4395 b'r',
4395 b'r',
4396 b'rev',
4396 b'rev',
4397 b'',
4397 b'',
4398 _(b'search the repository as it is in REV'),
4398 _(b'search the repository as it is in REV'),
4399 _(b'REV'),
4399 _(b'REV'),
4400 ),
4400 ),
4401 (
4401 (
4402 b'0',
4402 b'0',
4403 b'print0',
4403 b'print0',
4404 None,
4404 None,
4405 _(b'end filenames with NUL, for use with xargs'),
4405 _(b'end filenames with NUL, for use with xargs'),
4406 ),
4406 ),
4407 (
4407 (
4408 b'f',
4408 b'f',
4409 b'fullpath',
4409 b'fullpath',
4410 None,
4410 None,
4411 _(b'print complete paths from the filesystem root'),
4411 _(b'print complete paths from the filesystem root'),
4412 ),
4412 ),
4413 ]
4413 ]
4414 + walkopts,
4414 + walkopts,
4415 _(b'[OPTION]... [PATTERN]...'),
4415 _(b'[OPTION]... [PATTERN]...'),
4416 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4416 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4417 )
4417 )
4418 def locate(ui, repo, *pats, **opts):
4418 def locate(ui, repo, *pats, **opts):
4419 """locate files matching specific patterns (DEPRECATED)
4419 """locate files matching specific patterns (DEPRECATED)
4420
4420
4421 Print files under Mercurial control in the working directory whose
4421 Print files under Mercurial control in the working directory whose
4422 names match the given patterns.
4422 names match the given patterns.
4423
4423
4424 By default, this command searches all directories in the working
4424 By default, this command searches all directories in the working
4425 directory. To search just the current directory and its
4425 directory. To search just the current directory and its
4426 subdirectories, use "--include .".
4426 subdirectories, use "--include .".
4427
4427
4428 If no patterns are given to match, this command prints the names
4428 If no patterns are given to match, this command prints the names
4429 of all files under Mercurial control in the working directory.
4429 of all files under Mercurial control in the working directory.
4430
4430
4431 If you want to feed the output of this command into the "xargs"
4431 If you want to feed the output of this command into the "xargs"
4432 command, use the -0 option to both this command and "xargs". This
4432 command, use the -0 option to both this command and "xargs". This
4433 will avoid the problem of "xargs" treating single filenames that
4433 will avoid the problem of "xargs" treating single filenames that
4434 contain whitespace as multiple filenames.
4434 contain whitespace as multiple filenames.
4435
4435
4436 See :hg:`help files` for a more versatile command.
4436 See :hg:`help files` for a more versatile command.
4437
4437
4438 Returns 0 if a match is found, 1 otherwise.
4438 Returns 0 if a match is found, 1 otherwise.
4439 """
4439 """
4440 opts = pycompat.byteskwargs(opts)
4440 opts = pycompat.byteskwargs(opts)
4441 if opts.get(b'print0'):
4441 if opts.get(b'print0'):
4442 end = b'\0'
4442 end = b'\0'
4443 else:
4443 else:
4444 end = b'\n'
4444 end = b'\n'
4445 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4445 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4446
4446
4447 ret = 1
4447 ret = 1
4448 m = scmutil.match(
4448 m = scmutil.match(
4449 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4449 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4450 )
4450 )
4451
4451
4452 ui.pager(b'locate')
4452 ui.pager(b'locate')
4453 if ctx.rev() is None:
4453 if ctx.rev() is None:
4454 # When run on the working copy, "locate" includes removed files, so
4454 # When run on the working copy, "locate" includes removed files, so
4455 # we get the list of files from the dirstate.
4455 # we get the list of files from the dirstate.
4456 filesgen = sorted(repo.dirstate.matches(m))
4456 filesgen = sorted(repo.dirstate.matches(m))
4457 else:
4457 else:
4458 filesgen = ctx.matches(m)
4458 filesgen = ctx.matches(m)
4459 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4459 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4460 for abs in filesgen:
4460 for abs in filesgen:
4461 if opts.get(b'fullpath'):
4461 if opts.get(b'fullpath'):
4462 ui.write(repo.wjoin(abs), end)
4462 ui.write(repo.wjoin(abs), end)
4463 else:
4463 else:
4464 ui.write(uipathfn(abs), end)
4464 ui.write(uipathfn(abs), end)
4465 ret = 0
4465 ret = 0
4466
4466
4467 return ret
4467 return ret
4468
4468
4469
4469
4470 @command(
4470 @command(
4471 b'log|history',
4471 b'log|history',
4472 [
4472 [
4473 (
4473 (
4474 b'f',
4474 b'f',
4475 b'follow',
4475 b'follow',
4476 None,
4476 None,
4477 _(
4477 _(
4478 b'follow changeset history, or file history across copies and renames'
4478 b'follow changeset history, or file history across copies and renames'
4479 ),
4479 ),
4480 ),
4480 ),
4481 (
4481 (
4482 b'',
4482 b'',
4483 b'follow-first',
4483 b'follow-first',
4484 None,
4484 None,
4485 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4485 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4486 ),
4486 ),
4487 (
4487 (
4488 b'd',
4488 b'd',
4489 b'date',
4489 b'date',
4490 b'',
4490 b'',
4491 _(b'show revisions matching date spec'),
4491 _(b'show revisions matching date spec'),
4492 _(b'DATE'),
4492 _(b'DATE'),
4493 ),
4493 ),
4494 (b'C', b'copies', None, _(b'show copied files')),
4494 (b'C', b'copies', None, _(b'show copied files')),
4495 (
4495 (
4496 b'k',
4496 b'k',
4497 b'keyword',
4497 b'keyword',
4498 [],
4498 [],
4499 _(b'do case-insensitive search for a given text'),
4499 _(b'do case-insensitive search for a given text'),
4500 _(b'TEXT'),
4500 _(b'TEXT'),
4501 ),
4501 ),
4502 (
4502 (
4503 b'r',
4503 b'r',
4504 b'rev',
4504 b'rev',
4505 [],
4505 [],
4506 _(b'show the specified revision or revset'),
4506 _(b'show the specified revision or revset'),
4507 _(b'REV'),
4507 _(b'REV'),
4508 ),
4508 ),
4509 (
4509 (
4510 b'L',
4510 b'L',
4511 b'line-range',
4511 b'line-range',
4512 [],
4512 [],
4513 _(b'follow line range of specified file (EXPERIMENTAL)'),
4513 _(b'follow line range of specified file (EXPERIMENTAL)'),
4514 _(b'FILE,RANGE'),
4514 _(b'FILE,RANGE'),
4515 ),
4515 ),
4516 (
4516 (
4517 b'',
4517 b'',
4518 b'removed',
4518 b'removed',
4519 None,
4519 None,
4520 _(b'include revisions where files were removed'),
4520 _(b'include revisions where files were removed'),
4521 ),
4521 ),
4522 (
4522 (
4523 b'm',
4523 b'm',
4524 b'only-merges',
4524 b'only-merges',
4525 None,
4525 None,
4526 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4526 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4527 ),
4527 ),
4528 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4528 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4529 (
4529 (
4530 b'',
4530 b'',
4531 b'only-branch',
4531 b'only-branch',
4532 [],
4532 [],
4533 _(
4533 _(
4534 b'show only changesets within the given named branch (DEPRECATED)'
4534 b'show only changesets within the given named branch (DEPRECATED)'
4535 ),
4535 ),
4536 _(b'BRANCH'),
4536 _(b'BRANCH'),
4537 ),
4537 ),
4538 (
4538 (
4539 b'b',
4539 b'b',
4540 b'branch',
4540 b'branch',
4541 [],
4541 [],
4542 _(b'show changesets within the given named branch'),
4542 _(b'show changesets within the given named branch'),
4543 _(b'BRANCH'),
4543 _(b'BRANCH'),
4544 ),
4544 ),
4545 (
4545 (
4546 b'P',
4546 b'P',
4547 b'prune',
4547 b'prune',
4548 [],
4548 [],
4549 _(b'do not display revision or any of its ancestors'),
4549 _(b'do not display revision or any of its ancestors'),
4550 _(b'REV'),
4550 _(b'REV'),
4551 ),
4551 ),
4552 ]
4552 ]
4553 + logopts
4553 + logopts
4554 + walkopts,
4554 + walkopts,
4555 _(b'[OPTION]... [FILE]'),
4555 _(b'[OPTION]... [FILE]'),
4556 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4556 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4557 helpbasic=True,
4557 helpbasic=True,
4558 inferrepo=True,
4558 inferrepo=True,
4559 intents={INTENT_READONLY},
4559 intents={INTENT_READONLY},
4560 )
4560 )
4561 def log(ui, repo, *pats, **opts):
4561 def log(ui, repo, *pats, **opts):
4562 """show revision history of entire repository or files
4562 """show revision history of entire repository or files
4563
4563
4564 Print the revision history of the specified files or the entire
4564 Print the revision history of the specified files or the entire
4565 project.
4565 project.
4566
4566
4567 If no revision range is specified, the default is ``tip:0`` unless
4567 If no revision range is specified, the default is ``tip:0`` unless
4568 --follow is set, in which case the working directory parent is
4568 --follow is set, in which case the working directory parent is
4569 used as the starting revision.
4569 used as the starting revision.
4570
4570
4571 File history is shown without following rename or copy history of
4571 File history is shown without following rename or copy history of
4572 files. Use -f/--follow with a filename to follow history across
4572 files. Use -f/--follow with a filename to follow history across
4573 renames and copies. --follow without a filename will only show
4573 renames and copies. --follow without a filename will only show
4574 ancestors of the starting revision.
4574 ancestors of the starting revision.
4575
4575
4576 By default this command prints revision number and changeset id,
4576 By default this command prints revision number and changeset id,
4577 tags, non-trivial parents, user, date and time, and a summary for
4577 tags, non-trivial parents, user, date and time, and a summary for
4578 each commit. When the -v/--verbose switch is used, the list of
4578 each commit. When the -v/--verbose switch is used, the list of
4579 changed files and full commit message are shown.
4579 changed files and full commit message are shown.
4580
4580
4581 With --graph the revisions are shown as an ASCII art DAG with the most
4581 With --graph the revisions are shown as an ASCII art DAG with the most
4582 recent changeset at the top.
4582 recent changeset at the top.
4583 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4583 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4584 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4584 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4585 changeset from the lines below is a parent of the 'o' merge on the same
4585 changeset from the lines below is a parent of the 'o' merge on the same
4586 line.
4586 line.
4587 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4587 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4588 of a '|' indicates one or more revisions in a path are omitted.
4588 of a '|' indicates one or more revisions in a path are omitted.
4589
4589
4590 .. container:: verbose
4590 .. container:: verbose
4591
4591
4592 Use -L/--line-range FILE,M:N options to follow the history of lines
4592 Use -L/--line-range FILE,M:N options to follow the history of lines
4593 from M to N in FILE. With -p/--patch only diff hunks affecting
4593 from M to N in FILE. With -p/--patch only diff hunks affecting
4594 specified line range will be shown. This option requires --follow;
4594 specified line range will be shown. This option requires --follow;
4595 it can be specified multiple times. Currently, this option is not
4595 it can be specified multiple times. Currently, this option is not
4596 compatible with --graph. This option is experimental.
4596 compatible with --graph. This option is experimental.
4597
4597
4598 .. note::
4598 .. note::
4599
4599
4600 :hg:`log --patch` may generate unexpected diff output for merge
4600 :hg:`log --patch` may generate unexpected diff output for merge
4601 changesets, as it will only compare the merge changeset against
4601 changesets, as it will only compare the merge changeset against
4602 its first parent. Also, only files different from BOTH parents
4602 its first parent. Also, only files different from BOTH parents
4603 will appear in files:.
4603 will appear in files:.
4604
4604
4605 .. note::
4605 .. note::
4606
4606
4607 For performance reasons, :hg:`log FILE` may omit duplicate changes
4607 For performance reasons, :hg:`log FILE` may omit duplicate changes
4608 made on branches and will not show removals or mode changes. To
4608 made on branches and will not show removals or mode changes. To
4609 see all such changes, use the --removed switch.
4609 see all such changes, use the --removed switch.
4610
4610
4611 .. container:: verbose
4611 .. container:: verbose
4612
4612
4613 .. note::
4613 .. note::
4614
4614
4615 The history resulting from -L/--line-range options depends on diff
4615 The history resulting from -L/--line-range options depends on diff
4616 options; for instance if white-spaces are ignored, respective changes
4616 options; for instance if white-spaces are ignored, respective changes
4617 with only white-spaces in specified line range will not be listed.
4617 with only white-spaces in specified line range will not be listed.
4618
4618
4619 .. container:: verbose
4619 .. container:: verbose
4620
4620
4621 Some examples:
4621 Some examples:
4622
4622
4623 - changesets with full descriptions and file lists::
4623 - changesets with full descriptions and file lists::
4624
4624
4625 hg log -v
4625 hg log -v
4626
4626
4627 - changesets ancestral to the working directory::
4627 - changesets ancestral to the working directory::
4628
4628
4629 hg log -f
4629 hg log -f
4630
4630
4631 - last 10 commits on the current branch::
4631 - last 10 commits on the current branch::
4632
4632
4633 hg log -l 10 -b .
4633 hg log -l 10 -b .
4634
4634
4635 - changesets showing all modifications of a file, including removals::
4635 - changesets showing all modifications of a file, including removals::
4636
4636
4637 hg log --removed file.c
4637 hg log --removed file.c
4638
4638
4639 - all changesets that touch a directory, with diffs, excluding merges::
4639 - all changesets that touch a directory, with diffs, excluding merges::
4640
4640
4641 hg log -Mp lib/
4641 hg log -Mp lib/
4642
4642
4643 - all revision numbers that match a keyword::
4643 - all revision numbers that match a keyword::
4644
4644
4645 hg log -k bug --template "{rev}\\n"
4645 hg log -k bug --template "{rev}\\n"
4646
4646
4647 - the full hash identifier of the working directory parent::
4647 - the full hash identifier of the working directory parent::
4648
4648
4649 hg log -r . --template "{node}\\n"
4649 hg log -r . --template "{node}\\n"
4650
4650
4651 - list available log templates::
4651 - list available log templates::
4652
4652
4653 hg log -T list
4653 hg log -T list
4654
4654
4655 - check if a given changeset is included in a tagged release::
4655 - check if a given changeset is included in a tagged release::
4656
4656
4657 hg log -r "a21ccf and ancestor(1.9)"
4657 hg log -r "a21ccf and ancestor(1.9)"
4658
4658
4659 - find all changesets by some user in a date range::
4659 - find all changesets by some user in a date range::
4660
4660
4661 hg log -k alice -d "may 2008 to jul 2008"
4661 hg log -k alice -d "may 2008 to jul 2008"
4662
4662
4663 - summary of all changesets after the last tag::
4663 - summary of all changesets after the last tag::
4664
4664
4665 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4665 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4666
4666
4667 - changesets touching lines 13 to 23 for file.c::
4667 - changesets touching lines 13 to 23 for file.c::
4668
4668
4669 hg log -L file.c,13:23
4669 hg log -L file.c,13:23
4670
4670
4671 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4671 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4672 main.c with patch::
4672 main.c with patch::
4673
4673
4674 hg log -L file.c,13:23 -L main.c,2:6 -p
4674 hg log -L file.c,13:23 -L main.c,2:6 -p
4675
4675
4676 See :hg:`help dates` for a list of formats valid for -d/--date.
4676 See :hg:`help dates` for a list of formats valid for -d/--date.
4677
4677
4678 See :hg:`help revisions` for more about specifying and ordering
4678 See :hg:`help revisions` for more about specifying and ordering
4679 revisions.
4679 revisions.
4680
4680
4681 See :hg:`help templates` for more about pre-packaged styles and
4681 See :hg:`help templates` for more about pre-packaged styles and
4682 specifying custom templates. The default template used by the log
4682 specifying custom templates. The default template used by the log
4683 command can be customized via the ``ui.logtemplate`` configuration
4683 command can be customized via the ``ui.logtemplate`` configuration
4684 setting.
4684 setting.
4685
4685
4686 Returns 0 on success.
4686 Returns 0 on success.
4687
4687
4688 """
4688 """
4689 opts = pycompat.byteskwargs(opts)
4689 opts = pycompat.byteskwargs(opts)
4690 linerange = opts.get(b'line_range')
4690 linerange = opts.get(b'line_range')
4691
4691
4692 if linerange and not opts.get(b'follow'):
4692 if linerange and not opts.get(b'follow'):
4693 raise error.Abort(_(b'--line-range requires --follow'))
4693 raise error.Abort(_(b'--line-range requires --follow'))
4694
4694
4695 if linerange and pats:
4695 if linerange and pats:
4696 # TODO: take pats as patterns with no line-range filter
4696 # TODO: take pats as patterns with no line-range filter
4697 raise error.Abort(
4697 raise error.Abort(
4698 _(b'FILE arguments are not compatible with --line-range option')
4698 _(b'FILE arguments are not compatible with --line-range option')
4699 )
4699 )
4700
4700
4701 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4701 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4702 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4702 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4703 if linerange:
4703 if linerange:
4704 # TODO: should follow file history from logcmdutil._initialrevs(),
4704 # TODO: should follow file history from logcmdutil._initialrevs(),
4705 # then filter the result by logcmdutil._makerevset() and --limit
4705 # then filter the result by logcmdutil._makerevset() and --limit
4706 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4706 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4707
4707
4708 getcopies = None
4708 getcopies = None
4709 if opts.get(b'copies'):
4709 if opts.get(b'copies'):
4710 endrev = None
4710 endrev = None
4711 if revs:
4711 if revs:
4712 endrev = revs.max() + 1
4712 endrev = revs.max() + 1
4713 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4713 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4714
4714
4715 ui.pager(b'log')
4715 ui.pager(b'log')
4716 displayer = logcmdutil.changesetdisplayer(
4716 displayer = logcmdutil.changesetdisplayer(
4717 ui, repo, opts, differ, buffered=True
4717 ui, repo, opts, differ, buffered=True
4718 )
4718 )
4719 if opts.get(b'graph'):
4719 if opts.get(b'graph'):
4720 displayfn = logcmdutil.displaygraphrevs
4720 displayfn = logcmdutil.displaygraphrevs
4721 else:
4721 else:
4722 displayfn = logcmdutil.displayrevs
4722 displayfn = logcmdutil.displayrevs
4723 displayfn(ui, repo, revs, displayer, getcopies)
4723 displayfn(ui, repo, revs, displayer, getcopies)
4724
4724
4725
4725
4726 @command(
4726 @command(
4727 b'manifest',
4727 b'manifest',
4728 [
4728 [
4729 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4729 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4730 (b'', b'all', False, _(b"list files from all revisions")),
4730 (b'', b'all', False, _(b"list files from all revisions")),
4731 ]
4731 ]
4732 + formatteropts,
4732 + formatteropts,
4733 _(b'[-r REV]'),
4733 _(b'[-r REV]'),
4734 helpcategory=command.CATEGORY_MAINTENANCE,
4734 helpcategory=command.CATEGORY_MAINTENANCE,
4735 intents={INTENT_READONLY},
4735 intents={INTENT_READONLY},
4736 )
4736 )
4737 def manifest(ui, repo, node=None, rev=None, **opts):
4737 def manifest(ui, repo, node=None, rev=None, **opts):
4738 """output the current or given revision of the project manifest
4738 """output the current or given revision of the project manifest
4739
4739
4740 Print a list of version controlled files for the given revision.
4740 Print a list of version controlled files for the given revision.
4741 If no revision is given, the first parent of the working directory
4741 If no revision is given, the first parent of the working directory
4742 is used, or the null revision if no revision is checked out.
4742 is used, or the null revision if no revision is checked out.
4743
4743
4744 With -v, print file permissions, symlink and executable bits.
4744 With -v, print file permissions, symlink and executable bits.
4745 With --debug, print file revision hashes.
4745 With --debug, print file revision hashes.
4746
4746
4747 If option --all is specified, the list of all files from all revisions
4747 If option --all is specified, the list of all files from all revisions
4748 is printed. This includes deleted and renamed files.
4748 is printed. This includes deleted and renamed files.
4749
4749
4750 Returns 0 on success.
4750 Returns 0 on success.
4751 """
4751 """
4752 opts = pycompat.byteskwargs(opts)
4752 opts = pycompat.byteskwargs(opts)
4753 fm = ui.formatter(b'manifest', opts)
4753 fm = ui.formatter(b'manifest', opts)
4754
4754
4755 if opts.get(b'all'):
4755 if opts.get(b'all'):
4756 if rev or node:
4756 if rev or node:
4757 raise error.Abort(_(b"can't specify a revision with --all"))
4757 raise error.Abort(_(b"can't specify a revision with --all"))
4758
4758
4759 res = set()
4759 res = set()
4760 for rev in repo:
4760 for rev in repo:
4761 ctx = repo[rev]
4761 ctx = repo[rev]
4762 res |= set(ctx.files())
4762 res |= set(ctx.files())
4763
4763
4764 ui.pager(b'manifest')
4764 ui.pager(b'manifest')
4765 for f in sorted(res):
4765 for f in sorted(res):
4766 fm.startitem()
4766 fm.startitem()
4767 fm.write(b"path", b'%s\n', f)
4767 fm.write(b"path", b'%s\n', f)
4768 fm.end()
4768 fm.end()
4769 return
4769 return
4770
4770
4771 if rev and node:
4771 if rev and node:
4772 raise error.Abort(_(b"please specify just one revision"))
4772 raise error.Abort(_(b"please specify just one revision"))
4773
4773
4774 if not node:
4774 if not node:
4775 node = rev
4775 node = rev
4776
4776
4777 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4777 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4778 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4778 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4779 if node:
4779 if node:
4780 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4780 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4781 ctx = scmutil.revsingle(repo, node)
4781 ctx = scmutil.revsingle(repo, node)
4782 mf = ctx.manifest()
4782 mf = ctx.manifest()
4783 ui.pager(b'manifest')
4783 ui.pager(b'manifest')
4784 for f in ctx:
4784 for f in ctx:
4785 fm.startitem()
4785 fm.startitem()
4786 fm.context(ctx=ctx)
4786 fm.context(ctx=ctx)
4787 fl = ctx[f].flags()
4787 fl = ctx[f].flags()
4788 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4788 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4789 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4789 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4790 fm.write(b'path', b'%s\n', f)
4790 fm.write(b'path', b'%s\n', f)
4791 fm.end()
4791 fm.end()
4792
4792
4793
4793
4794 @command(
4794 @command(
4795 b'merge',
4795 b'merge',
4796 [
4796 [
4797 (
4797 (
4798 b'f',
4798 b'f',
4799 b'force',
4799 b'force',
4800 None,
4800 None,
4801 _(b'force a merge including outstanding changes (DEPRECATED)'),
4801 _(b'force a merge including outstanding changes (DEPRECATED)'),
4802 ),
4802 ),
4803 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4803 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4804 (
4804 (
4805 b'P',
4805 b'P',
4806 b'preview',
4806 b'preview',
4807 None,
4807 None,
4808 _(b'review revisions to merge (no merge is performed)'),
4808 _(b'review revisions to merge (no merge is performed)'),
4809 ),
4809 ),
4810 (b'', b'abort', None, _(b'abort the ongoing merge')),
4810 (b'', b'abort', None, _(b'abort the ongoing merge')),
4811 ]
4811 ]
4812 + mergetoolopts,
4812 + mergetoolopts,
4813 _(b'[-P] [[-r] REV]'),
4813 _(b'[-P] [[-r] REV]'),
4814 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4814 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4815 helpbasic=True,
4815 helpbasic=True,
4816 )
4816 )
4817 def merge(ui, repo, node=None, **opts):
4817 def merge(ui, repo, node=None, **opts):
4818 """merge another revision into working directory
4818 """merge another revision into working directory
4819
4819
4820 The current working directory is updated with all changes made in
4820 The current working directory is updated with all changes made in
4821 the requested revision since the last common predecessor revision.
4821 the requested revision since the last common predecessor revision.
4822
4822
4823 Files that changed between either parent are marked as changed for
4823 Files that changed between either parent are marked as changed for
4824 the next commit and a commit must be performed before any further
4824 the next commit and a commit must be performed before any further
4825 updates to the repository are allowed. The next commit will have
4825 updates to the repository are allowed. The next commit will have
4826 two parents.
4826 two parents.
4827
4827
4828 ``--tool`` can be used to specify the merge tool used for file
4828 ``--tool`` can be used to specify the merge tool used for file
4829 merges. It overrides the HGMERGE environment variable and your
4829 merges. It overrides the HGMERGE environment variable and your
4830 configuration files. See :hg:`help merge-tools` for options.
4830 configuration files. See :hg:`help merge-tools` for options.
4831
4831
4832 If no revision is specified, the working directory's parent is a
4832 If no revision is specified, the working directory's parent is a
4833 head revision, and the current branch contains exactly one other
4833 head revision, and the current branch contains exactly one other
4834 head, the other head is merged with by default. Otherwise, an
4834 head, the other head is merged with by default. Otherwise, an
4835 explicit revision with which to merge must be provided.
4835 explicit revision with which to merge must be provided.
4836
4836
4837 See :hg:`help resolve` for information on handling file conflicts.
4837 See :hg:`help resolve` for information on handling file conflicts.
4838
4838
4839 To undo an uncommitted merge, use :hg:`merge --abort` which
4839 To undo an uncommitted merge, use :hg:`merge --abort` which
4840 will check out a clean copy of the original merge parent, losing
4840 will check out a clean copy of the original merge parent, losing
4841 all changes.
4841 all changes.
4842
4842
4843 Returns 0 on success, 1 if there are unresolved files.
4843 Returns 0 on success, 1 if there are unresolved files.
4844 """
4844 """
4845
4845
4846 opts = pycompat.byteskwargs(opts)
4846 opts = pycompat.byteskwargs(opts)
4847 abort = opts.get(b'abort')
4847 abort = opts.get(b'abort')
4848 if abort and repo.dirstate.p2() == nullid:
4848 if abort and repo.dirstate.p2() == nullid:
4849 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4849 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4850 cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')
4850 cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')
4851 if abort:
4851 if abort:
4852 state = cmdutil.getunfinishedstate(repo)
4852 state = cmdutil.getunfinishedstate(repo)
4853 if state and state._opname != b'merge':
4853 if state and state._opname != b'merge':
4854 raise error.Abort(
4854 raise error.Abort(
4855 _(b'cannot abort merge with %s in progress') % (state._opname),
4855 _(b'cannot abort merge with %s in progress') % (state._opname),
4856 hint=state.hint(),
4856 hint=state.hint(),
4857 )
4857 )
4858 if node:
4858 if node:
4859 raise error.Abort(_(b"cannot specify a node with --abort"))
4859 raise error.Abort(_(b"cannot specify a node with --abort"))
4860 return hg.abortmerge(repo.ui, repo)
4860 return hg.abortmerge(repo.ui, repo)
4861
4861
4862 if opts.get(b'rev') and node:
4862 if opts.get(b'rev') and node:
4863 raise error.Abort(_(b"please specify just one revision"))
4863 raise error.Abort(_(b"please specify just one revision"))
4864 if not node:
4864 if not node:
4865 node = opts.get(b'rev')
4865 node = opts.get(b'rev')
4866
4866
4867 if node:
4867 if node:
4868 node = scmutil.revsingle(repo, node).node()
4868 node = scmutil.revsingle(repo, node).node()
4869 else:
4869 else:
4870 if ui.configbool(b'commands', b'merge.require-rev'):
4870 if ui.configbool(b'commands', b'merge.require-rev'):
4871 raise error.Abort(
4871 raise error.Abort(
4872 _(
4872 _(
4873 b'configuration requires specifying revision to merge '
4873 b'configuration requires specifying revision to merge '
4874 b'with'
4874 b'with'
4875 )
4875 )
4876 )
4876 )
4877 node = repo[destutil.destmerge(repo)].node()
4877 node = repo[destutil.destmerge(repo)].node()
4878
4878
4879 if node is None:
4879 if node is None:
4880 raise error.Abort(_(b'merging with the working copy has no effect'))
4880 raise error.Abort(_(b'merging with the working copy has no effect'))
4881
4881
4882 if opts.get(b'preview'):
4882 if opts.get(b'preview'):
4883 # find nodes that are ancestors of p2 but not of p1
4883 # find nodes that are ancestors of p2 but not of p1
4884 p1 = repo.lookup(b'.')
4884 p1 = repo[b'.'].node()
4885 p2 = node
4885 p2 = node
4886 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4886 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4887
4887
4888 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4888 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4889 for node in nodes:
4889 for node in nodes:
4890 displayer.show(repo[node])
4890 displayer.show(repo[node])
4891 displayer.close()
4891 displayer.close()
4892 return 0
4892 return 0
4893
4893
4894 # ui.forcemerge is an internal variable, do not document
4894 # ui.forcemerge is an internal variable, do not document
4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4896 with ui.configoverride(overrides, b'merge'):
4896 with ui.configoverride(overrides, b'merge'):
4897 force = opts.get(b'force')
4897 force = opts.get(b'force')
4898 labels = [b'working copy', b'merge rev']
4898 labels = [b'working copy', b'merge rev']
4899 return hg.merge(
4899 return hg.merge(
4900 repo, node, force=force, mergeforce=force, labels=labels
4900 repo, node, force=force, mergeforce=force, labels=labels
4901 )
4901 )
4902
4902
4903
4903
4904 statemod.addunfinished(
4904 statemod.addunfinished(
4905 b'merge',
4905 b'merge',
4906 fname=None,
4906 fname=None,
4907 clearable=True,
4907 clearable=True,
4908 allowcommit=True,
4908 allowcommit=True,
4909 cmdmsg=_(b'outstanding uncommitted merge'),
4909 cmdmsg=_(b'outstanding uncommitted merge'),
4910 abortfunc=hg.abortmerge,
4910 abortfunc=hg.abortmerge,
4911 statushint=_(
4911 statushint=_(
4912 b'To continue: hg commit\nTo abort: hg merge --abort'
4912 b'To continue: hg commit\nTo abort: hg merge --abort'
4913 ),
4913 ),
4914 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4914 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4915 )
4915 )
4916
4916
4917
4917
4918 @command(
4918 @command(
4919 b'outgoing|out',
4919 b'outgoing|out',
4920 [
4920 [
4921 (
4921 (
4922 b'f',
4922 b'f',
4923 b'force',
4923 b'force',
4924 None,
4924 None,
4925 _(b'run even when the destination is unrelated'),
4925 _(b'run even when the destination is unrelated'),
4926 ),
4926 ),
4927 (
4927 (
4928 b'r',
4928 b'r',
4929 b'rev',
4929 b'rev',
4930 [],
4930 [],
4931 _(b'a changeset intended to be included in the destination'),
4931 _(b'a changeset intended to be included in the destination'),
4932 _(b'REV'),
4932 _(b'REV'),
4933 ),
4933 ),
4934 (b'n', b'newest-first', None, _(b'show newest record first')),
4934 (b'n', b'newest-first', None, _(b'show newest record first')),
4935 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4935 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4936 (
4936 (
4937 b'b',
4937 b'b',
4938 b'branch',
4938 b'branch',
4939 [],
4939 [],
4940 _(b'a specific branch you would like to push'),
4940 _(b'a specific branch you would like to push'),
4941 _(b'BRANCH'),
4941 _(b'BRANCH'),
4942 ),
4942 ),
4943 ]
4943 ]
4944 + logopts
4944 + logopts
4945 + remoteopts
4945 + remoteopts
4946 + subrepoopts,
4946 + subrepoopts,
4947 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4947 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4948 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4948 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4949 )
4949 )
4950 def outgoing(ui, repo, dest=None, **opts):
4950 def outgoing(ui, repo, dest=None, **opts):
4951 """show changesets not found in the destination
4951 """show changesets not found in the destination
4952
4952
4953 Show changesets not found in the specified destination repository
4953 Show changesets not found in the specified destination repository
4954 or the default push location. These are the changesets that would
4954 or the default push location. These are the changesets that would
4955 be pushed if a push was requested.
4955 be pushed if a push was requested.
4956
4956
4957 See pull for details of valid destination formats.
4957 See pull for details of valid destination formats.
4958
4958
4959 .. container:: verbose
4959 .. container:: verbose
4960
4960
4961 With -B/--bookmarks, the result of bookmark comparison between
4961 With -B/--bookmarks, the result of bookmark comparison between
4962 local and remote repositories is displayed. With -v/--verbose,
4962 local and remote repositories is displayed. With -v/--verbose,
4963 status is also displayed for each bookmark like below::
4963 status is also displayed for each bookmark like below::
4964
4964
4965 BM1 01234567890a added
4965 BM1 01234567890a added
4966 BM2 deleted
4966 BM2 deleted
4967 BM3 234567890abc advanced
4967 BM3 234567890abc advanced
4968 BM4 34567890abcd diverged
4968 BM4 34567890abcd diverged
4969 BM5 4567890abcde changed
4969 BM5 4567890abcde changed
4970
4970
4971 The action taken when pushing depends on the
4971 The action taken when pushing depends on the
4972 status of each bookmark:
4972 status of each bookmark:
4973
4973
4974 :``added``: push with ``-B`` will create it
4974 :``added``: push with ``-B`` will create it
4975 :``deleted``: push with ``-B`` will delete it
4975 :``deleted``: push with ``-B`` will delete it
4976 :``advanced``: push will update it
4976 :``advanced``: push will update it
4977 :``diverged``: push with ``-B`` will update it
4977 :``diverged``: push with ``-B`` will update it
4978 :``changed``: push with ``-B`` will update it
4978 :``changed``: push with ``-B`` will update it
4979
4979
4980 From the point of view of pushing behavior, bookmarks
4980 From the point of view of pushing behavior, bookmarks
4981 existing only in the remote repository are treated as
4981 existing only in the remote repository are treated as
4982 ``deleted``, even if it is in fact added remotely.
4982 ``deleted``, even if it is in fact added remotely.
4983
4983
4984 Returns 0 if there are outgoing changes, 1 otherwise.
4984 Returns 0 if there are outgoing changes, 1 otherwise.
4985 """
4985 """
4986 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4986 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4987 # style URLs, so don't overwrite dest.
4987 # style URLs, so don't overwrite dest.
4988 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4988 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4989 if not path:
4989 if not path:
4990 raise error.Abort(
4990 raise error.Abort(
4991 _(b'default repository not configured!'),
4991 _(b'default repository not configured!'),
4992 hint=_(b"see 'hg help config.paths'"),
4992 hint=_(b"see 'hg help config.paths'"),
4993 )
4993 )
4994
4994
4995 opts = pycompat.byteskwargs(opts)
4995 opts = pycompat.byteskwargs(opts)
4996 if opts.get(b'graph'):
4996 if opts.get(b'graph'):
4997 logcmdutil.checkunsupportedgraphflags([], opts)
4997 logcmdutil.checkunsupportedgraphflags([], opts)
4998 o, other = hg._outgoing(ui, repo, dest, opts)
4998 o, other = hg._outgoing(ui, repo, dest, opts)
4999 if not o:
4999 if not o:
5000 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5000 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5001 return
5001 return
5002
5002
5003 revdag = logcmdutil.graphrevs(repo, o, opts)
5003 revdag = logcmdutil.graphrevs(repo, o, opts)
5004 ui.pager(b'outgoing')
5004 ui.pager(b'outgoing')
5005 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5005 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5006 logcmdutil.displaygraph(
5006 logcmdutil.displaygraph(
5007 ui, repo, revdag, displayer, graphmod.asciiedges
5007 ui, repo, revdag, displayer, graphmod.asciiedges
5008 )
5008 )
5009 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5009 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5010 return 0
5010 return 0
5011
5011
5012 if opts.get(b'bookmarks'):
5012 if opts.get(b'bookmarks'):
5013 dest = path.pushloc or path.loc
5013 dest = path.pushloc or path.loc
5014 other = hg.peer(repo, opts, dest)
5014 other = hg.peer(repo, opts, dest)
5015 if b'bookmarks' not in other.listkeys(b'namespaces'):
5015 if b'bookmarks' not in other.listkeys(b'namespaces'):
5016 ui.warn(_(b"remote doesn't support bookmarks\n"))
5016 ui.warn(_(b"remote doesn't support bookmarks\n"))
5017 return 0
5017 return 0
5018 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5018 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5019 ui.pager(b'outgoing')
5019 ui.pager(b'outgoing')
5020 return bookmarks.outgoing(ui, repo, other)
5020 return bookmarks.outgoing(ui, repo, other)
5021
5021
5022 repo._subtoppath = path.pushloc or path.loc
5022 repo._subtoppath = path.pushloc or path.loc
5023 try:
5023 try:
5024 return hg.outgoing(ui, repo, dest, opts)
5024 return hg.outgoing(ui, repo, dest, opts)
5025 finally:
5025 finally:
5026 del repo._subtoppath
5026 del repo._subtoppath
5027
5027
5028
5028
5029 @command(
5029 @command(
5030 b'parents',
5030 b'parents',
5031 [
5031 [
5032 (
5032 (
5033 b'r',
5033 b'r',
5034 b'rev',
5034 b'rev',
5035 b'',
5035 b'',
5036 _(b'show parents of the specified revision'),
5036 _(b'show parents of the specified revision'),
5037 _(b'REV'),
5037 _(b'REV'),
5038 ),
5038 ),
5039 ]
5039 ]
5040 + templateopts,
5040 + templateopts,
5041 _(b'[-r REV] [FILE]'),
5041 _(b'[-r REV] [FILE]'),
5042 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5042 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5043 inferrepo=True,
5043 inferrepo=True,
5044 )
5044 )
5045 def parents(ui, repo, file_=None, **opts):
5045 def parents(ui, repo, file_=None, **opts):
5046 """show the parents of the working directory or revision (DEPRECATED)
5046 """show the parents of the working directory or revision (DEPRECATED)
5047
5047
5048 Print the working directory's parent revisions. If a revision is
5048 Print the working directory's parent revisions. If a revision is
5049 given via -r/--rev, the parent of that revision will be printed.
5049 given via -r/--rev, the parent of that revision will be printed.
5050 If a file argument is given, the revision in which the file was
5050 If a file argument is given, the revision in which the file was
5051 last changed (before the working directory revision or the
5051 last changed (before the working directory revision or the
5052 argument to --rev if given) is printed.
5052 argument to --rev if given) is printed.
5053
5053
5054 This command is equivalent to::
5054 This command is equivalent to::
5055
5055
5056 hg log -r "p1()+p2()" or
5056 hg log -r "p1()+p2()" or
5057 hg log -r "p1(REV)+p2(REV)" or
5057 hg log -r "p1(REV)+p2(REV)" or
5058 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5058 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5059 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5059 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5060
5060
5061 See :hg:`summary` and :hg:`help revsets` for related information.
5061 See :hg:`summary` and :hg:`help revsets` for related information.
5062
5062
5063 Returns 0 on success.
5063 Returns 0 on success.
5064 """
5064 """
5065
5065
5066 opts = pycompat.byteskwargs(opts)
5066 opts = pycompat.byteskwargs(opts)
5067 rev = opts.get(b'rev')
5067 rev = opts.get(b'rev')
5068 if rev:
5068 if rev:
5069 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5069 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5070 ctx = scmutil.revsingle(repo, rev, None)
5070 ctx = scmutil.revsingle(repo, rev, None)
5071
5071
5072 if file_:
5072 if file_:
5073 m = scmutil.match(ctx, (file_,), opts)
5073 m = scmutil.match(ctx, (file_,), opts)
5074 if m.anypats() or len(m.files()) != 1:
5074 if m.anypats() or len(m.files()) != 1:
5075 raise error.Abort(_(b'can only specify an explicit filename'))
5075 raise error.Abort(_(b'can only specify an explicit filename'))
5076 file_ = m.files()[0]
5076 file_ = m.files()[0]
5077 filenodes = []
5077 filenodes = []
5078 for cp in ctx.parents():
5078 for cp in ctx.parents():
5079 if not cp:
5079 if not cp:
5080 continue
5080 continue
5081 try:
5081 try:
5082 filenodes.append(cp.filenode(file_))
5082 filenodes.append(cp.filenode(file_))
5083 except error.LookupError:
5083 except error.LookupError:
5084 pass
5084 pass
5085 if not filenodes:
5085 if not filenodes:
5086 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5086 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5087 p = []
5087 p = []
5088 for fn in filenodes:
5088 for fn in filenodes:
5089 fctx = repo.filectx(file_, fileid=fn)
5089 fctx = repo.filectx(file_, fileid=fn)
5090 p.append(fctx.node())
5090 p.append(fctx.node())
5091 else:
5091 else:
5092 p = [cp.node() for cp in ctx.parents()]
5092 p = [cp.node() for cp in ctx.parents()]
5093
5093
5094 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5094 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5095 for n in p:
5095 for n in p:
5096 if n != nullid:
5096 if n != nullid:
5097 displayer.show(repo[n])
5097 displayer.show(repo[n])
5098 displayer.close()
5098 displayer.close()
5099
5099
5100
5100
5101 @command(
5101 @command(
5102 b'paths',
5102 b'paths',
5103 formatteropts,
5103 formatteropts,
5104 _(b'[NAME]'),
5104 _(b'[NAME]'),
5105 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5105 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5106 optionalrepo=True,
5106 optionalrepo=True,
5107 intents={INTENT_READONLY},
5107 intents={INTENT_READONLY},
5108 )
5108 )
5109 def paths(ui, repo, search=None, **opts):
5109 def paths(ui, repo, search=None, **opts):
5110 """show aliases for remote repositories
5110 """show aliases for remote repositories
5111
5111
5112 Show definition of symbolic path name NAME. If no name is given,
5112 Show definition of symbolic path name NAME. If no name is given,
5113 show definition of all available names.
5113 show definition of all available names.
5114
5114
5115 Option -q/--quiet suppresses all output when searching for NAME
5115 Option -q/--quiet suppresses all output when searching for NAME
5116 and shows only the path names when listing all definitions.
5116 and shows only the path names when listing all definitions.
5117
5117
5118 Path names are defined in the [paths] section of your
5118 Path names are defined in the [paths] section of your
5119 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5119 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5120 repository, ``.hg/hgrc`` is used, too.
5120 repository, ``.hg/hgrc`` is used, too.
5121
5121
5122 The path names ``default`` and ``default-push`` have a special
5122 The path names ``default`` and ``default-push`` have a special
5123 meaning. When performing a push or pull operation, they are used
5123 meaning. When performing a push or pull operation, they are used
5124 as fallbacks if no location is specified on the command-line.
5124 as fallbacks if no location is specified on the command-line.
5125 When ``default-push`` is set, it will be used for push and
5125 When ``default-push`` is set, it will be used for push and
5126 ``default`` will be used for pull; otherwise ``default`` is used
5126 ``default`` will be used for pull; otherwise ``default`` is used
5127 as the fallback for both. When cloning a repository, the clone
5127 as the fallback for both. When cloning a repository, the clone
5128 source is written as ``default`` in ``.hg/hgrc``.
5128 source is written as ``default`` in ``.hg/hgrc``.
5129
5129
5130 .. note::
5130 .. note::
5131
5131
5132 ``default`` and ``default-push`` apply to all inbound (e.g.
5132 ``default`` and ``default-push`` apply to all inbound (e.g.
5133 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5133 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5134 and :hg:`bundle`) operations.
5134 and :hg:`bundle`) operations.
5135
5135
5136 See :hg:`help urls` for more information.
5136 See :hg:`help urls` for more information.
5137
5137
5138 .. container:: verbose
5138 .. container:: verbose
5139
5139
5140 Template:
5140 Template:
5141
5141
5142 The following keywords are supported. See also :hg:`help templates`.
5142 The following keywords are supported. See also :hg:`help templates`.
5143
5143
5144 :name: String. Symbolic name of the path alias.
5144 :name: String. Symbolic name of the path alias.
5145 :pushurl: String. URL for push operations.
5145 :pushurl: String. URL for push operations.
5146 :url: String. URL or directory path for the other operations.
5146 :url: String. URL or directory path for the other operations.
5147
5147
5148 Returns 0 on success.
5148 Returns 0 on success.
5149 """
5149 """
5150
5150
5151 opts = pycompat.byteskwargs(opts)
5151 opts = pycompat.byteskwargs(opts)
5152 ui.pager(b'paths')
5152 ui.pager(b'paths')
5153 if search:
5153 if search:
5154 pathitems = [
5154 pathitems = [
5155 (name, path)
5155 (name, path)
5156 for name, path in pycompat.iteritems(ui.paths)
5156 for name, path in pycompat.iteritems(ui.paths)
5157 if name == search
5157 if name == search
5158 ]
5158 ]
5159 else:
5159 else:
5160 pathitems = sorted(pycompat.iteritems(ui.paths))
5160 pathitems = sorted(pycompat.iteritems(ui.paths))
5161
5161
5162 fm = ui.formatter(b'paths', opts)
5162 fm = ui.formatter(b'paths', opts)
5163 if fm.isplain():
5163 if fm.isplain():
5164 hidepassword = util.hidepassword
5164 hidepassword = util.hidepassword
5165 else:
5165 else:
5166 hidepassword = bytes
5166 hidepassword = bytes
5167 if ui.quiet:
5167 if ui.quiet:
5168 namefmt = b'%s\n'
5168 namefmt = b'%s\n'
5169 else:
5169 else:
5170 namefmt = b'%s = '
5170 namefmt = b'%s = '
5171 showsubopts = not search and not ui.quiet
5171 showsubopts = not search and not ui.quiet
5172
5172
5173 for name, path in pathitems:
5173 for name, path in pathitems:
5174 fm.startitem()
5174 fm.startitem()
5175 fm.condwrite(not search, b'name', namefmt, name)
5175 fm.condwrite(not search, b'name', namefmt, name)
5176 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5176 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5177 for subopt, value in sorted(path.suboptions.items()):
5177 for subopt, value in sorted(path.suboptions.items()):
5178 assert subopt not in (b'name', b'url')
5178 assert subopt not in (b'name', b'url')
5179 if showsubopts:
5179 if showsubopts:
5180 fm.plain(b'%s:%s = ' % (name, subopt))
5180 fm.plain(b'%s:%s = ' % (name, subopt))
5181 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5181 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5182
5182
5183 fm.end()
5183 fm.end()
5184
5184
5185 if search and not pathitems:
5185 if search and not pathitems:
5186 if not ui.quiet:
5186 if not ui.quiet:
5187 ui.warn(_(b"not found!\n"))
5187 ui.warn(_(b"not found!\n"))
5188 return 1
5188 return 1
5189 else:
5189 else:
5190 return 0
5190 return 0
5191
5191
5192
5192
5193 @command(
5193 @command(
5194 b'phase',
5194 b'phase',
5195 [
5195 [
5196 (b'p', b'public', False, _(b'set changeset phase to public')),
5196 (b'p', b'public', False, _(b'set changeset phase to public')),
5197 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5197 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5198 (b's', b'secret', False, _(b'set changeset phase to secret')),
5198 (b's', b'secret', False, _(b'set changeset phase to secret')),
5199 (b'f', b'force', False, _(b'allow to move boundary backward')),
5199 (b'f', b'force', False, _(b'allow to move boundary backward')),
5200 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5200 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5201 ],
5201 ],
5202 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5202 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5203 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5203 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5204 )
5204 )
5205 def phase(ui, repo, *revs, **opts):
5205 def phase(ui, repo, *revs, **opts):
5206 """set or show the current phase name
5206 """set or show the current phase name
5207
5207
5208 With no argument, show the phase name of the current revision(s).
5208 With no argument, show the phase name of the current revision(s).
5209
5209
5210 With one of -p/--public, -d/--draft or -s/--secret, change the
5210 With one of -p/--public, -d/--draft or -s/--secret, change the
5211 phase value of the specified revisions.
5211 phase value of the specified revisions.
5212
5212
5213 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5213 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5214 lower phase to a higher phase. Phases are ordered as follows::
5214 lower phase to a higher phase. Phases are ordered as follows::
5215
5215
5216 public < draft < secret
5216 public < draft < secret
5217
5217
5218 Returns 0 on success, 1 if some phases could not be changed.
5218 Returns 0 on success, 1 if some phases could not be changed.
5219
5219
5220 (For more information about the phases concept, see :hg:`help phases`.)
5220 (For more information about the phases concept, see :hg:`help phases`.)
5221 """
5221 """
5222 opts = pycompat.byteskwargs(opts)
5222 opts = pycompat.byteskwargs(opts)
5223 # search for a unique phase argument
5223 # search for a unique phase argument
5224 targetphase = None
5224 targetphase = None
5225 for idx, name in enumerate(phases.cmdphasenames):
5225 for idx, name in enumerate(phases.cmdphasenames):
5226 if opts[name]:
5226 if opts[name]:
5227 if targetphase is not None:
5227 if targetphase is not None:
5228 raise error.Abort(_(b'only one phase can be specified'))
5228 raise error.Abort(_(b'only one phase can be specified'))
5229 targetphase = idx
5229 targetphase = idx
5230
5230
5231 # look for specified revision
5231 # look for specified revision
5232 revs = list(revs)
5232 revs = list(revs)
5233 revs.extend(opts[b'rev'])
5233 revs.extend(opts[b'rev'])
5234 if not revs:
5234 if not revs:
5235 # display both parents as the second parent phase can influence
5235 # display both parents as the second parent phase can influence
5236 # the phase of a merge commit
5236 # the phase of a merge commit
5237 revs = [c.rev() for c in repo[None].parents()]
5237 revs = [c.rev() for c in repo[None].parents()]
5238
5238
5239 revs = scmutil.revrange(repo, revs)
5239 revs = scmutil.revrange(repo, revs)
5240
5240
5241 ret = 0
5241 ret = 0
5242 if targetphase is None:
5242 if targetphase is None:
5243 # display
5243 # display
5244 for r in revs:
5244 for r in revs:
5245 ctx = repo[r]
5245 ctx = repo[r]
5246 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5246 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5247 else:
5247 else:
5248 with repo.lock(), repo.transaction(b"phase") as tr:
5248 with repo.lock(), repo.transaction(b"phase") as tr:
5249 # set phase
5249 # set phase
5250 if not revs:
5250 if not revs:
5251 raise error.Abort(_(b'empty revision set'))
5251 raise error.Abort(_(b'empty revision set'))
5252 nodes = [repo[r].node() for r in revs]
5252 nodes = [repo[r].node() for r in revs]
5253 # moving revision from public to draft may hide them
5253 # moving revision from public to draft may hide them
5254 # We have to check result on an unfiltered repository
5254 # We have to check result on an unfiltered repository
5255 unfi = repo.unfiltered()
5255 unfi = repo.unfiltered()
5256 getphase = unfi._phasecache.phase
5256 getphase = unfi._phasecache.phase
5257 olddata = [getphase(unfi, r) for r in unfi]
5257 olddata = [getphase(unfi, r) for r in unfi]
5258 phases.advanceboundary(repo, tr, targetphase, nodes)
5258 phases.advanceboundary(repo, tr, targetphase, nodes)
5259 if opts[b'force']:
5259 if opts[b'force']:
5260 phases.retractboundary(repo, tr, targetphase, nodes)
5260 phases.retractboundary(repo, tr, targetphase, nodes)
5261 getphase = unfi._phasecache.phase
5261 getphase = unfi._phasecache.phase
5262 newdata = [getphase(unfi, r) for r in unfi]
5262 newdata = [getphase(unfi, r) for r in unfi]
5263 changes = sum(newdata[r] != olddata[r] for r in unfi)
5263 changes = sum(newdata[r] != olddata[r] for r in unfi)
5264 cl = unfi.changelog
5264 cl = unfi.changelog
5265 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5265 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5266 if rejected:
5266 if rejected:
5267 ui.warn(
5267 ui.warn(
5268 _(
5268 _(
5269 b'cannot move %i changesets to a higher '
5269 b'cannot move %i changesets to a higher '
5270 b'phase, use --force\n'
5270 b'phase, use --force\n'
5271 )
5271 )
5272 % len(rejected)
5272 % len(rejected)
5273 )
5273 )
5274 ret = 1
5274 ret = 1
5275 if changes:
5275 if changes:
5276 msg = _(b'phase changed for %i changesets\n') % changes
5276 msg = _(b'phase changed for %i changesets\n') % changes
5277 if ret:
5277 if ret:
5278 ui.status(msg)
5278 ui.status(msg)
5279 else:
5279 else:
5280 ui.note(msg)
5280 ui.note(msg)
5281 else:
5281 else:
5282 ui.warn(_(b'no phases changed\n'))
5282 ui.warn(_(b'no phases changed\n'))
5283 return ret
5283 return ret
5284
5284
5285
5285
5286 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5286 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5287 """Run after a changegroup has been added via pull/unbundle
5287 """Run after a changegroup has been added via pull/unbundle
5288
5288
5289 This takes arguments below:
5289 This takes arguments below:
5290
5290
5291 :modheads: change of heads by pull/unbundle
5291 :modheads: change of heads by pull/unbundle
5292 :optupdate: updating working directory is needed or not
5292 :optupdate: updating working directory is needed or not
5293 :checkout: update destination revision (or None to default destination)
5293 :checkout: update destination revision (or None to default destination)
5294 :brev: a name, which might be a bookmark to be activated after updating
5294 :brev: a name, which might be a bookmark to be activated after updating
5295 """
5295 """
5296 if modheads == 0:
5296 if modheads == 0:
5297 return
5297 return
5298 if optupdate:
5298 if optupdate:
5299 try:
5299 try:
5300 return hg.updatetotally(ui, repo, checkout, brev)
5300 return hg.updatetotally(ui, repo, checkout, brev)
5301 except error.UpdateAbort as inst:
5301 except error.UpdateAbort as inst:
5302 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5302 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5303 hint = inst.hint
5303 hint = inst.hint
5304 raise error.UpdateAbort(msg, hint=hint)
5304 raise error.UpdateAbort(msg, hint=hint)
5305 if modheads is not None and modheads > 1:
5305 if modheads is not None and modheads > 1:
5306 currentbranchheads = len(repo.branchheads())
5306 currentbranchheads = len(repo.branchheads())
5307 if currentbranchheads == modheads:
5307 if currentbranchheads == modheads:
5308 ui.status(
5308 ui.status(
5309 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5309 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5310 )
5310 )
5311 elif currentbranchheads > 1:
5311 elif currentbranchheads > 1:
5312 ui.status(
5312 ui.status(
5313 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5313 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5314 )
5314 )
5315 else:
5315 else:
5316 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5316 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5317 elif not ui.configbool(b'commands', b'update.requiredest'):
5317 elif not ui.configbool(b'commands', b'update.requiredest'):
5318 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5318 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5319
5319
5320
5320
5321 @command(
5321 @command(
5322 b'pull',
5322 b'pull',
5323 [
5323 [
5324 (
5324 (
5325 b'u',
5325 b'u',
5326 b'update',
5326 b'update',
5327 None,
5327 None,
5328 _(b'update to new branch head if new descendants were pulled'),
5328 _(b'update to new branch head if new descendants were pulled'),
5329 ),
5329 ),
5330 (
5330 (
5331 b'f',
5331 b'f',
5332 b'force',
5332 b'force',
5333 None,
5333 None,
5334 _(b'run even when remote repository is unrelated'),
5334 _(b'run even when remote repository is unrelated'),
5335 ),
5335 ),
5336 (
5336 (
5337 b'r',
5337 b'r',
5338 b'rev',
5338 b'rev',
5339 [],
5339 [],
5340 _(b'a remote changeset intended to be added'),
5340 _(b'a remote changeset intended to be added'),
5341 _(b'REV'),
5341 _(b'REV'),
5342 ),
5342 ),
5343 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5343 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5344 (
5344 (
5345 b'b',
5345 b'b',
5346 b'branch',
5346 b'branch',
5347 [],
5347 [],
5348 _(b'a specific branch you would like to pull'),
5348 _(b'a specific branch you would like to pull'),
5349 _(b'BRANCH'),
5349 _(b'BRANCH'),
5350 ),
5350 ),
5351 ]
5351 ]
5352 + remoteopts,
5352 + remoteopts,
5353 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5353 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5354 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5354 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5355 helpbasic=True,
5355 helpbasic=True,
5356 )
5356 )
5357 def pull(ui, repo, source=b"default", **opts):
5357 def pull(ui, repo, source=b"default", **opts):
5358 """pull changes from the specified source
5358 """pull changes from the specified source
5359
5359
5360 Pull changes from a remote repository to a local one.
5360 Pull changes from a remote repository to a local one.
5361
5361
5362 This finds all changes from the repository at the specified path
5362 This finds all changes from the repository at the specified path
5363 or URL and adds them to a local repository (the current one unless
5363 or URL and adds them to a local repository (the current one unless
5364 -R is specified). By default, this does not update the copy of the
5364 -R is specified). By default, this does not update the copy of the
5365 project in the working directory.
5365 project in the working directory.
5366
5366
5367 When cloning from servers that support it, Mercurial may fetch
5367 When cloning from servers that support it, Mercurial may fetch
5368 pre-generated data. When this is done, hooks operating on incoming
5368 pre-generated data. When this is done, hooks operating on incoming
5369 changesets and changegroups may fire more than once, once for each
5369 changesets and changegroups may fire more than once, once for each
5370 pre-generated bundle and as well as for any additional remaining
5370 pre-generated bundle and as well as for any additional remaining
5371 data. See :hg:`help -e clonebundles` for more.
5371 data. See :hg:`help -e clonebundles` for more.
5372
5372
5373 Use :hg:`incoming` if you want to see what would have been added
5373 Use :hg:`incoming` if you want to see what would have been added
5374 by a pull at the time you issued this command. If you then decide
5374 by a pull at the time you issued this command. If you then decide
5375 to add those changes to the repository, you should use :hg:`pull
5375 to add those changes to the repository, you should use :hg:`pull
5376 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5376 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5377
5377
5378 If SOURCE is omitted, the 'default' path will be used.
5378 If SOURCE is omitted, the 'default' path will be used.
5379 See :hg:`help urls` for more information.
5379 See :hg:`help urls` for more information.
5380
5380
5381 Specifying bookmark as ``.`` is equivalent to specifying the active
5381 Specifying bookmark as ``.`` is equivalent to specifying the active
5382 bookmark's name.
5382 bookmark's name.
5383
5383
5384 Returns 0 on success, 1 if an update had unresolved files.
5384 Returns 0 on success, 1 if an update had unresolved files.
5385 """
5385 """
5386
5386
5387 opts = pycompat.byteskwargs(opts)
5387 opts = pycompat.byteskwargs(opts)
5388 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5388 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5389 b'update'
5389 b'update'
5390 ):
5390 ):
5391 msg = _(b'update destination required by configuration')
5391 msg = _(b'update destination required by configuration')
5392 hint = _(b'use hg pull followed by hg update DEST')
5392 hint = _(b'use hg pull followed by hg update DEST')
5393 raise error.Abort(msg, hint=hint)
5393 raise error.Abort(msg, hint=hint)
5394
5394
5395 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5395 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5396 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5396 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5397 other = hg.peer(repo, opts, source)
5397 other = hg.peer(repo, opts, source)
5398 try:
5398 try:
5399 revs, checkout = hg.addbranchrevs(
5399 revs, checkout = hg.addbranchrevs(
5400 repo, other, branches, opts.get(b'rev')
5400 repo, other, branches, opts.get(b'rev')
5401 )
5401 )
5402
5402
5403 pullopargs = {}
5403 pullopargs = {}
5404
5404
5405 nodes = None
5405 nodes = None
5406 if opts.get(b'bookmark') or revs:
5406 if opts.get(b'bookmark') or revs:
5407 # The list of bookmark used here is the same used to actually update
5407 # The list of bookmark used here is the same used to actually update
5408 # the bookmark names, to avoid the race from issue 4689 and we do
5408 # the bookmark names, to avoid the race from issue 4689 and we do
5409 # all lookup and bookmark queries in one go so they see the same
5409 # all lookup and bookmark queries in one go so they see the same
5410 # version of the server state (issue 4700).
5410 # version of the server state (issue 4700).
5411 nodes = []
5411 nodes = []
5412 fnodes = []
5412 fnodes = []
5413 revs = revs or []
5413 revs = revs or []
5414 if revs and not other.capable(b'lookup'):
5414 if revs and not other.capable(b'lookup'):
5415 err = _(
5415 err = _(
5416 b"other repository doesn't support revision lookup, "
5416 b"other repository doesn't support revision lookup, "
5417 b"so a rev cannot be specified."
5417 b"so a rev cannot be specified."
5418 )
5418 )
5419 raise error.Abort(err)
5419 raise error.Abort(err)
5420 with other.commandexecutor() as e:
5420 with other.commandexecutor() as e:
5421 fremotebookmarks = e.callcommand(
5421 fremotebookmarks = e.callcommand(
5422 b'listkeys', {b'namespace': b'bookmarks'}
5422 b'listkeys', {b'namespace': b'bookmarks'}
5423 )
5423 )
5424 for r in revs:
5424 for r in revs:
5425 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5425 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5426 remotebookmarks = fremotebookmarks.result()
5426 remotebookmarks = fremotebookmarks.result()
5427 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5427 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5428 pullopargs[b'remotebookmarks'] = remotebookmarks
5428 pullopargs[b'remotebookmarks'] = remotebookmarks
5429 for b in opts.get(b'bookmark', []):
5429 for b in opts.get(b'bookmark', []):
5430 b = repo._bookmarks.expandname(b)
5430 b = repo._bookmarks.expandname(b)
5431 if b not in remotebookmarks:
5431 if b not in remotebookmarks:
5432 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5432 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5433 nodes.append(remotebookmarks[b])
5433 nodes.append(remotebookmarks[b])
5434 for i, rev in enumerate(revs):
5434 for i, rev in enumerate(revs):
5435 node = fnodes[i].result()
5435 node = fnodes[i].result()
5436 nodes.append(node)
5436 nodes.append(node)
5437 if rev == checkout:
5437 if rev == checkout:
5438 checkout = node
5438 checkout = node
5439
5439
5440 wlock = util.nullcontextmanager()
5440 wlock = util.nullcontextmanager()
5441 if opts.get(b'update'):
5441 if opts.get(b'update'):
5442 wlock = repo.wlock()
5442 wlock = repo.wlock()
5443 with wlock:
5443 with wlock:
5444 pullopargs.update(opts.get(b'opargs', {}))
5444 pullopargs.update(opts.get(b'opargs', {}))
5445 modheads = exchange.pull(
5445 modheads = exchange.pull(
5446 repo,
5446 repo,
5447 other,
5447 other,
5448 heads=nodes,
5448 heads=nodes,
5449 force=opts.get(b'force'),
5449 force=opts.get(b'force'),
5450 bookmarks=opts.get(b'bookmark', ()),
5450 bookmarks=opts.get(b'bookmark', ()),
5451 opargs=pullopargs,
5451 opargs=pullopargs,
5452 ).cgresult
5452 ).cgresult
5453
5453
5454 # brev is a name, which might be a bookmark to be activated at
5454 # brev is a name, which might be a bookmark to be activated at
5455 # the end of the update. In other words, it is an explicit
5455 # the end of the update. In other words, it is an explicit
5456 # destination of the update
5456 # destination of the update
5457 brev = None
5457 brev = None
5458
5458
5459 if checkout:
5459 if checkout:
5460 checkout = repo.unfiltered().changelog.rev(checkout)
5460 checkout = repo.unfiltered().changelog.rev(checkout)
5461
5461
5462 # order below depends on implementation of
5462 # order below depends on implementation of
5463 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5463 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5464 # because 'checkout' is determined without it.
5464 # because 'checkout' is determined without it.
5465 if opts.get(b'rev'):
5465 if opts.get(b'rev'):
5466 brev = opts[b'rev'][0]
5466 brev = opts[b'rev'][0]
5467 elif opts.get(b'branch'):
5467 elif opts.get(b'branch'):
5468 brev = opts[b'branch'][0]
5468 brev = opts[b'branch'][0]
5469 else:
5469 else:
5470 brev = branches[0]
5470 brev = branches[0]
5471 repo._subtoppath = source
5471 repo._subtoppath = source
5472 try:
5472 try:
5473 ret = postincoming(
5473 ret = postincoming(
5474 ui, repo, modheads, opts.get(b'update'), checkout, brev
5474 ui, repo, modheads, opts.get(b'update'), checkout, brev
5475 )
5475 )
5476 except error.FilteredRepoLookupError as exc:
5476 except error.FilteredRepoLookupError as exc:
5477 msg = _(b'cannot update to target: %s') % exc.args[0]
5477 msg = _(b'cannot update to target: %s') % exc.args[0]
5478 exc.args = (msg,) + exc.args[1:]
5478 exc.args = (msg,) + exc.args[1:]
5479 raise
5479 raise
5480 finally:
5480 finally:
5481 del repo._subtoppath
5481 del repo._subtoppath
5482
5482
5483 finally:
5483 finally:
5484 other.close()
5484 other.close()
5485 return ret
5485 return ret
5486
5486
5487
5487
5488 @command(
5488 @command(
5489 b'push',
5489 b'push',
5490 [
5490 [
5491 (b'f', b'force', None, _(b'force push')),
5491 (b'f', b'force', None, _(b'force push')),
5492 (
5492 (
5493 b'r',
5493 b'r',
5494 b'rev',
5494 b'rev',
5495 [],
5495 [],
5496 _(b'a changeset intended to be included in the destination'),
5496 _(b'a changeset intended to be included in the destination'),
5497 _(b'REV'),
5497 _(b'REV'),
5498 ),
5498 ),
5499 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5499 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5500 (
5500 (
5501 b'b',
5501 b'b',
5502 b'branch',
5502 b'branch',
5503 [],
5503 [],
5504 _(b'a specific branch you would like to push'),
5504 _(b'a specific branch you would like to push'),
5505 _(b'BRANCH'),
5505 _(b'BRANCH'),
5506 ),
5506 ),
5507 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5507 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5508 (
5508 (
5509 b'',
5509 b'',
5510 b'pushvars',
5510 b'pushvars',
5511 [],
5511 [],
5512 _(b'variables that can be sent to server (ADVANCED)'),
5512 _(b'variables that can be sent to server (ADVANCED)'),
5513 ),
5513 ),
5514 (
5514 (
5515 b'',
5515 b'',
5516 b'publish',
5516 b'publish',
5517 False,
5517 False,
5518 _(b'push the changeset as public (EXPERIMENTAL)'),
5518 _(b'push the changeset as public (EXPERIMENTAL)'),
5519 ),
5519 ),
5520 ]
5520 ]
5521 + remoteopts,
5521 + remoteopts,
5522 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5522 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5523 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5523 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5524 helpbasic=True,
5524 helpbasic=True,
5525 )
5525 )
5526 def push(ui, repo, dest=None, **opts):
5526 def push(ui, repo, dest=None, **opts):
5527 """push changes to the specified destination
5527 """push changes to the specified destination
5528
5528
5529 Push changesets from the local repository to the specified
5529 Push changesets from the local repository to the specified
5530 destination.
5530 destination.
5531
5531
5532 This operation is symmetrical to pull: it is identical to a pull
5532 This operation is symmetrical to pull: it is identical to a pull
5533 in the destination repository from the current one.
5533 in the destination repository from the current one.
5534
5534
5535 By default, push will not allow creation of new heads at the
5535 By default, push will not allow creation of new heads at the
5536 destination, since multiple heads would make it unclear which head
5536 destination, since multiple heads would make it unclear which head
5537 to use. In this situation, it is recommended to pull and merge
5537 to use. In this situation, it is recommended to pull and merge
5538 before pushing.
5538 before pushing.
5539
5539
5540 Use --new-branch if you want to allow push to create a new named
5540 Use --new-branch if you want to allow push to create a new named
5541 branch that is not present at the destination. This allows you to
5541 branch that is not present at the destination. This allows you to
5542 only create a new branch without forcing other changes.
5542 only create a new branch without forcing other changes.
5543
5543
5544 .. note::
5544 .. note::
5545
5545
5546 Extra care should be taken with the -f/--force option,
5546 Extra care should be taken with the -f/--force option,
5547 which will push all new heads on all branches, an action which will
5547 which will push all new heads on all branches, an action which will
5548 almost always cause confusion for collaborators.
5548 almost always cause confusion for collaborators.
5549
5549
5550 If -r/--rev is used, the specified revision and all its ancestors
5550 If -r/--rev is used, the specified revision and all its ancestors
5551 will be pushed to the remote repository.
5551 will be pushed to the remote repository.
5552
5552
5553 If -B/--bookmark is used, the specified bookmarked revision, its
5553 If -B/--bookmark is used, the specified bookmarked revision, its
5554 ancestors, and the bookmark will be pushed to the remote
5554 ancestors, and the bookmark will be pushed to the remote
5555 repository. Specifying ``.`` is equivalent to specifying the active
5555 repository. Specifying ``.`` is equivalent to specifying the active
5556 bookmark's name.
5556 bookmark's name.
5557
5557
5558 Please see :hg:`help urls` for important details about ``ssh://``
5558 Please see :hg:`help urls` for important details about ``ssh://``
5559 URLs. If DESTINATION is omitted, a default path will be used.
5559 URLs. If DESTINATION is omitted, a default path will be used.
5560
5560
5561 .. container:: verbose
5561 .. container:: verbose
5562
5562
5563 The --pushvars option sends strings to the server that become
5563 The --pushvars option sends strings to the server that become
5564 environment variables prepended with ``HG_USERVAR_``. For example,
5564 environment variables prepended with ``HG_USERVAR_``. For example,
5565 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5565 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5566 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5566 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5567
5567
5568 pushvars can provide for user-overridable hooks as well as set debug
5568 pushvars can provide for user-overridable hooks as well as set debug
5569 levels. One example is having a hook that blocks commits containing
5569 levels. One example is having a hook that blocks commits containing
5570 conflict markers, but enables the user to override the hook if the file
5570 conflict markers, but enables the user to override the hook if the file
5571 is using conflict markers for testing purposes or the file format has
5571 is using conflict markers for testing purposes or the file format has
5572 strings that look like conflict markers.
5572 strings that look like conflict markers.
5573
5573
5574 By default, servers will ignore `--pushvars`. To enable it add the
5574 By default, servers will ignore `--pushvars`. To enable it add the
5575 following to your configuration file::
5575 following to your configuration file::
5576
5576
5577 [push]
5577 [push]
5578 pushvars.server = true
5578 pushvars.server = true
5579
5579
5580 Returns 0 if push was successful, 1 if nothing to push.
5580 Returns 0 if push was successful, 1 if nothing to push.
5581 """
5581 """
5582
5582
5583 opts = pycompat.byteskwargs(opts)
5583 opts = pycompat.byteskwargs(opts)
5584 if opts.get(b'bookmark'):
5584 if opts.get(b'bookmark'):
5585 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5585 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5586 for b in opts[b'bookmark']:
5586 for b in opts[b'bookmark']:
5587 # translate -B options to -r so changesets get pushed
5587 # translate -B options to -r so changesets get pushed
5588 b = repo._bookmarks.expandname(b)
5588 b = repo._bookmarks.expandname(b)
5589 if b in repo._bookmarks:
5589 if b in repo._bookmarks:
5590 opts.setdefault(b'rev', []).append(b)
5590 opts.setdefault(b'rev', []).append(b)
5591 else:
5591 else:
5592 # if we try to push a deleted bookmark, translate it to null
5592 # if we try to push a deleted bookmark, translate it to null
5593 # this lets simultaneous -r, -b options continue working
5593 # this lets simultaneous -r, -b options continue working
5594 opts.setdefault(b'rev', []).append(b"null")
5594 opts.setdefault(b'rev', []).append(b"null")
5595
5595
5596 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5596 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5597 if not path:
5597 if not path:
5598 raise error.Abort(
5598 raise error.Abort(
5599 _(b'default repository not configured!'),
5599 _(b'default repository not configured!'),
5600 hint=_(b"see 'hg help config.paths'"),
5600 hint=_(b"see 'hg help config.paths'"),
5601 )
5601 )
5602 dest = path.pushloc or path.loc
5602 dest = path.pushloc or path.loc
5603 branches = (path.branch, opts.get(b'branch') or [])
5603 branches = (path.branch, opts.get(b'branch') or [])
5604 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5604 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5605 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5605 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5606 other = hg.peer(repo, opts, dest)
5606 other = hg.peer(repo, opts, dest)
5607
5607
5608 if revs:
5608 if revs:
5609 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5609 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5610 if not revs:
5610 if not revs:
5611 raise error.Abort(
5611 raise error.Abort(
5612 _(b"specified revisions evaluate to an empty set"),
5612 _(b"specified revisions evaluate to an empty set"),
5613 hint=_(b"use different revision arguments"),
5613 hint=_(b"use different revision arguments"),
5614 )
5614 )
5615 elif path.pushrev:
5615 elif path.pushrev:
5616 # It doesn't make any sense to specify ancestor revisions. So limit
5616 # It doesn't make any sense to specify ancestor revisions. So limit
5617 # to DAG heads to make discovery simpler.
5617 # to DAG heads to make discovery simpler.
5618 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5618 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5619 revs = scmutil.revrange(repo, [expr])
5619 revs = scmutil.revrange(repo, [expr])
5620 revs = [repo[rev].node() for rev in revs]
5620 revs = [repo[rev].node() for rev in revs]
5621 if not revs:
5621 if not revs:
5622 raise error.Abort(
5622 raise error.Abort(
5623 _(b'default push revset for path evaluates to an empty set')
5623 _(b'default push revset for path evaluates to an empty set')
5624 )
5624 )
5625 elif ui.configbool(b'commands', b'push.require-revs'):
5625 elif ui.configbool(b'commands', b'push.require-revs'):
5626 raise error.Abort(
5626 raise error.Abort(
5627 _(b'no revisions specified to push'),
5627 _(b'no revisions specified to push'),
5628 hint=_(b'did you mean "hg push -r ."?'),
5628 hint=_(b'did you mean "hg push -r ."?'),
5629 )
5629 )
5630
5630
5631 repo._subtoppath = dest
5631 repo._subtoppath = dest
5632 try:
5632 try:
5633 # push subrepos depth-first for coherent ordering
5633 # push subrepos depth-first for coherent ordering
5634 c = repo[b'.']
5634 c = repo[b'.']
5635 subs = c.substate # only repos that are committed
5635 subs = c.substate # only repos that are committed
5636 for s in sorted(subs):
5636 for s in sorted(subs):
5637 result = c.sub(s).push(opts)
5637 result = c.sub(s).push(opts)
5638 if result == 0:
5638 if result == 0:
5639 return not result
5639 return not result
5640 finally:
5640 finally:
5641 del repo._subtoppath
5641 del repo._subtoppath
5642
5642
5643 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5643 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5644 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5644 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5645
5645
5646 pushop = exchange.push(
5646 pushop = exchange.push(
5647 repo,
5647 repo,
5648 other,
5648 other,
5649 opts.get(b'force'),
5649 opts.get(b'force'),
5650 revs=revs,
5650 revs=revs,
5651 newbranch=opts.get(b'new_branch'),
5651 newbranch=opts.get(b'new_branch'),
5652 bookmarks=opts.get(b'bookmark', ()),
5652 bookmarks=opts.get(b'bookmark', ()),
5653 publish=opts.get(b'publish'),
5653 publish=opts.get(b'publish'),
5654 opargs=opargs,
5654 opargs=opargs,
5655 )
5655 )
5656
5656
5657 result = not pushop.cgresult
5657 result = not pushop.cgresult
5658
5658
5659 if pushop.bkresult is not None:
5659 if pushop.bkresult is not None:
5660 if pushop.bkresult == 2:
5660 if pushop.bkresult == 2:
5661 result = 2
5661 result = 2
5662 elif not result and pushop.bkresult:
5662 elif not result and pushop.bkresult:
5663 result = 2
5663 result = 2
5664
5664
5665 return result
5665 return result
5666
5666
5667
5667
5668 @command(
5668 @command(
5669 b'recover',
5669 b'recover',
5670 [(b'', b'verify', True, b"run `hg verify` after successful recover"),],
5670 [(b'', b'verify', True, b"run `hg verify` after successful recover"),],
5671 helpcategory=command.CATEGORY_MAINTENANCE,
5671 helpcategory=command.CATEGORY_MAINTENANCE,
5672 )
5672 )
5673 def recover(ui, repo, **opts):
5673 def recover(ui, repo, **opts):
5674 """roll back an interrupted transaction
5674 """roll back an interrupted transaction
5675
5675
5676 Recover from an interrupted commit or pull.
5676 Recover from an interrupted commit or pull.
5677
5677
5678 This command tries to fix the repository status after an
5678 This command tries to fix the repository status after an
5679 interrupted operation. It should only be necessary when Mercurial
5679 interrupted operation. It should only be necessary when Mercurial
5680 suggests it.
5680 suggests it.
5681
5681
5682 Returns 0 if successful, 1 if nothing to recover or verify fails.
5682 Returns 0 if successful, 1 if nothing to recover or verify fails.
5683 """
5683 """
5684 ret = repo.recover()
5684 ret = repo.recover()
5685 if ret:
5685 if ret:
5686 if opts['verify']:
5686 if opts['verify']:
5687 return hg.verify(repo)
5687 return hg.verify(repo)
5688 else:
5688 else:
5689 msg = _(
5689 msg = _(
5690 b"(verify step skipped, run `hg verify` to check your "
5690 b"(verify step skipped, run `hg verify` to check your "
5691 b"repository content)\n"
5691 b"repository content)\n"
5692 )
5692 )
5693 ui.warn(msg)
5693 ui.warn(msg)
5694 return 0
5694 return 0
5695 return 1
5695 return 1
5696
5696
5697
5697
5698 @command(
5698 @command(
5699 b'remove|rm',
5699 b'remove|rm',
5700 [
5700 [
5701 (b'A', b'after', None, _(b'record delete for missing files')),
5701 (b'A', b'after', None, _(b'record delete for missing files')),
5702 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5702 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5703 ]
5703 ]
5704 + subrepoopts
5704 + subrepoopts
5705 + walkopts
5705 + walkopts
5706 + dryrunopts,
5706 + dryrunopts,
5707 _(b'[OPTION]... FILE...'),
5707 _(b'[OPTION]... FILE...'),
5708 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5708 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5709 helpbasic=True,
5709 helpbasic=True,
5710 inferrepo=True,
5710 inferrepo=True,
5711 )
5711 )
5712 def remove(ui, repo, *pats, **opts):
5712 def remove(ui, repo, *pats, **opts):
5713 """remove the specified files on the next commit
5713 """remove the specified files on the next commit
5714
5714
5715 Schedule the indicated files for removal from the current branch.
5715 Schedule the indicated files for removal from the current branch.
5716
5716
5717 This command schedules the files to be removed at the next commit.
5717 This command schedules the files to be removed at the next commit.
5718 To undo a remove before that, see :hg:`revert`. To undo added
5718 To undo a remove before that, see :hg:`revert`. To undo added
5719 files, see :hg:`forget`.
5719 files, see :hg:`forget`.
5720
5720
5721 .. container:: verbose
5721 .. container:: verbose
5722
5722
5723 -A/--after can be used to remove only files that have already
5723 -A/--after can be used to remove only files that have already
5724 been deleted, -f/--force can be used to force deletion, and -Af
5724 been deleted, -f/--force can be used to force deletion, and -Af
5725 can be used to remove files from the next revision without
5725 can be used to remove files from the next revision without
5726 deleting them from the working directory.
5726 deleting them from the working directory.
5727
5727
5728 The following table details the behavior of remove for different
5728 The following table details the behavior of remove for different
5729 file states (columns) and option combinations (rows). The file
5729 file states (columns) and option combinations (rows). The file
5730 states are Added [A], Clean [C], Modified [M] and Missing [!]
5730 states are Added [A], Clean [C], Modified [M] and Missing [!]
5731 (as reported by :hg:`status`). The actions are Warn, Remove
5731 (as reported by :hg:`status`). The actions are Warn, Remove
5732 (from branch) and Delete (from disk):
5732 (from branch) and Delete (from disk):
5733
5733
5734 ========= == == == ==
5734 ========= == == == ==
5735 opt/state A C M !
5735 opt/state A C M !
5736 ========= == == == ==
5736 ========= == == == ==
5737 none W RD W R
5737 none W RD W R
5738 -f R RD RD R
5738 -f R RD RD R
5739 -A W W W R
5739 -A W W W R
5740 -Af R R R R
5740 -Af R R R R
5741 ========= == == == ==
5741 ========= == == == ==
5742
5742
5743 .. note::
5743 .. note::
5744
5744
5745 :hg:`remove` never deletes files in Added [A] state from the
5745 :hg:`remove` never deletes files in Added [A] state from the
5746 working directory, not even if ``--force`` is specified.
5746 working directory, not even if ``--force`` is specified.
5747
5747
5748 Returns 0 on success, 1 if any warnings encountered.
5748 Returns 0 on success, 1 if any warnings encountered.
5749 """
5749 """
5750
5750
5751 opts = pycompat.byteskwargs(opts)
5751 opts = pycompat.byteskwargs(opts)
5752 after, force = opts.get(b'after'), opts.get(b'force')
5752 after, force = opts.get(b'after'), opts.get(b'force')
5753 dryrun = opts.get(b'dry_run')
5753 dryrun = opts.get(b'dry_run')
5754 if not pats and not after:
5754 if not pats and not after:
5755 raise error.Abort(_(b'no files specified'))
5755 raise error.Abort(_(b'no files specified'))
5756
5756
5757 m = scmutil.match(repo[None], pats, opts)
5757 m = scmutil.match(repo[None], pats, opts)
5758 subrepos = opts.get(b'subrepos')
5758 subrepos = opts.get(b'subrepos')
5759 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5759 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5760 return cmdutil.remove(
5760 return cmdutil.remove(
5761 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5761 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5762 )
5762 )
5763
5763
5764
5764
5765 @command(
5765 @command(
5766 b'rename|move|mv',
5766 b'rename|move|mv',
5767 [
5767 [
5768 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5768 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5769 (
5769 (
5770 b'f',
5770 b'f',
5771 b'force',
5771 b'force',
5772 None,
5772 None,
5773 _(b'forcibly move over an existing managed file'),
5773 _(b'forcibly move over an existing managed file'),
5774 ),
5774 ),
5775 ]
5775 ]
5776 + walkopts
5776 + walkopts
5777 + dryrunopts,
5777 + dryrunopts,
5778 _(b'[OPTION]... SOURCE... DEST'),
5778 _(b'[OPTION]... SOURCE... DEST'),
5779 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5779 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5780 )
5780 )
5781 def rename(ui, repo, *pats, **opts):
5781 def rename(ui, repo, *pats, **opts):
5782 """rename files; equivalent of copy + remove
5782 """rename files; equivalent of copy + remove
5783
5783
5784 Mark dest as copies of sources; mark sources for deletion. If dest
5784 Mark dest as copies of sources; mark sources for deletion. If dest
5785 is a directory, copies are put in that directory. If dest is a
5785 is a directory, copies are put in that directory. If dest is a
5786 file, there can only be one source.
5786 file, there can only be one source.
5787
5787
5788 By default, this command copies the contents of files as they
5788 By default, this command copies the contents of files as they
5789 exist in the working directory. If invoked with -A/--after, the
5789 exist in the working directory. If invoked with -A/--after, the
5790 operation is recorded, but no copying is performed.
5790 operation is recorded, but no copying is performed.
5791
5791
5792 This command takes effect at the next commit. To undo a rename
5792 This command takes effect at the next commit. To undo a rename
5793 before that, see :hg:`revert`.
5793 before that, see :hg:`revert`.
5794
5794
5795 Returns 0 on success, 1 if errors are encountered.
5795 Returns 0 on success, 1 if errors are encountered.
5796 """
5796 """
5797 opts = pycompat.byteskwargs(opts)
5797 opts = pycompat.byteskwargs(opts)
5798 with repo.wlock(False):
5798 with repo.wlock(False):
5799 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5799 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5800
5800
5801
5801
5802 @command(
5802 @command(
5803 b'resolve',
5803 b'resolve',
5804 [
5804 [
5805 (b'a', b'all', None, _(b'select all unresolved files')),
5805 (b'a', b'all', None, _(b'select all unresolved files')),
5806 (b'l', b'list', None, _(b'list state of files needing merge')),
5806 (b'l', b'list', None, _(b'list state of files needing merge')),
5807 (b'm', b'mark', None, _(b'mark files as resolved')),
5807 (b'm', b'mark', None, _(b'mark files as resolved')),
5808 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5808 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5809 (b'n', b'no-status', None, _(b'hide status prefix')),
5809 (b'n', b'no-status', None, _(b'hide status prefix')),
5810 (b'', b're-merge', None, _(b're-merge files')),
5810 (b'', b're-merge', None, _(b're-merge files')),
5811 ]
5811 ]
5812 + mergetoolopts
5812 + mergetoolopts
5813 + walkopts
5813 + walkopts
5814 + formatteropts,
5814 + formatteropts,
5815 _(b'[OPTION]... [FILE]...'),
5815 _(b'[OPTION]... [FILE]...'),
5816 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5816 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5817 inferrepo=True,
5817 inferrepo=True,
5818 )
5818 )
5819 def resolve(ui, repo, *pats, **opts):
5819 def resolve(ui, repo, *pats, **opts):
5820 """redo merges or set/view the merge status of files
5820 """redo merges or set/view the merge status of files
5821
5821
5822 Merges with unresolved conflicts are often the result of
5822 Merges with unresolved conflicts are often the result of
5823 non-interactive merging using the ``internal:merge`` configuration
5823 non-interactive merging using the ``internal:merge`` configuration
5824 setting, or a command-line merge tool like ``diff3``. The resolve
5824 setting, or a command-line merge tool like ``diff3``. The resolve
5825 command is used to manage the files involved in a merge, after
5825 command is used to manage the files involved in a merge, after
5826 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5826 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5827 working directory must have two parents). See :hg:`help
5827 working directory must have two parents). See :hg:`help
5828 merge-tools` for information on configuring merge tools.
5828 merge-tools` for information on configuring merge tools.
5829
5829
5830 The resolve command can be used in the following ways:
5830 The resolve command can be used in the following ways:
5831
5831
5832 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5832 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5833 the specified files, discarding any previous merge attempts. Re-merging
5833 the specified files, discarding any previous merge attempts. Re-merging
5834 is not performed for files already marked as resolved. Use ``--all/-a``
5834 is not performed for files already marked as resolved. Use ``--all/-a``
5835 to select all unresolved files. ``--tool`` can be used to specify
5835 to select all unresolved files. ``--tool`` can be used to specify
5836 the merge tool used for the given files. It overrides the HGMERGE
5836 the merge tool used for the given files. It overrides the HGMERGE
5837 environment variable and your configuration files. Previous file
5837 environment variable and your configuration files. Previous file
5838 contents are saved with a ``.orig`` suffix.
5838 contents are saved with a ``.orig`` suffix.
5839
5839
5840 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5840 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5841 (e.g. after having manually fixed-up the files). The default is
5841 (e.g. after having manually fixed-up the files). The default is
5842 to mark all unresolved files.
5842 to mark all unresolved files.
5843
5843
5844 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5844 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5845 default is to mark all resolved files.
5845 default is to mark all resolved files.
5846
5846
5847 - :hg:`resolve -l`: list files which had or still have conflicts.
5847 - :hg:`resolve -l`: list files which had or still have conflicts.
5848 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5848 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5849 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5849 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5850 the list. See :hg:`help filesets` for details.
5850 the list. See :hg:`help filesets` for details.
5851
5851
5852 .. note::
5852 .. note::
5853
5853
5854 Mercurial will not let you commit files with unresolved merge
5854 Mercurial will not let you commit files with unresolved merge
5855 conflicts. You must use :hg:`resolve -m ...` before you can
5855 conflicts. You must use :hg:`resolve -m ...` before you can
5856 commit after a conflicting merge.
5856 commit after a conflicting merge.
5857
5857
5858 .. container:: verbose
5858 .. container:: verbose
5859
5859
5860 Template:
5860 Template:
5861
5861
5862 The following keywords are supported in addition to the common template
5862 The following keywords are supported in addition to the common template
5863 keywords and functions. See also :hg:`help templates`.
5863 keywords and functions. See also :hg:`help templates`.
5864
5864
5865 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5865 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5866 :path: String. Repository-absolute path of the file.
5866 :path: String. Repository-absolute path of the file.
5867
5867
5868 Returns 0 on success, 1 if any files fail a resolve attempt.
5868 Returns 0 on success, 1 if any files fail a resolve attempt.
5869 """
5869 """
5870
5870
5871 opts = pycompat.byteskwargs(opts)
5871 opts = pycompat.byteskwargs(opts)
5872 confirm = ui.configbool(b'commands', b'resolve.confirm')
5872 confirm = ui.configbool(b'commands', b'resolve.confirm')
5873 flaglist = b'all mark unmark list no_status re_merge'.split()
5873 flaglist = b'all mark unmark list no_status re_merge'.split()
5874 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5874 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5875
5875
5876 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5876 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5877 if actioncount > 1:
5877 if actioncount > 1:
5878 raise error.Abort(_(b"too many actions specified"))
5878 raise error.Abort(_(b"too many actions specified"))
5879 elif actioncount == 0 and ui.configbool(
5879 elif actioncount == 0 and ui.configbool(
5880 b'commands', b'resolve.explicit-re-merge'
5880 b'commands', b'resolve.explicit-re-merge'
5881 ):
5881 ):
5882 hint = _(b'use --mark, --unmark, --list or --re-merge')
5882 hint = _(b'use --mark, --unmark, --list or --re-merge')
5883 raise error.Abort(_(b'no action specified'), hint=hint)
5883 raise error.Abort(_(b'no action specified'), hint=hint)
5884 if pats and all:
5884 if pats and all:
5885 raise error.Abort(_(b"can't specify --all and patterns"))
5885 raise error.Abort(_(b"can't specify --all and patterns"))
5886 if not (all or pats or show or mark or unmark):
5886 if not (all or pats or show or mark or unmark):
5887 raise error.Abort(
5887 raise error.Abort(
5888 _(b'no files or directories specified'),
5888 _(b'no files or directories specified'),
5889 hint=b'use --all to re-merge all unresolved files',
5889 hint=b'use --all to re-merge all unresolved files',
5890 )
5890 )
5891
5891
5892 if confirm:
5892 if confirm:
5893 if all:
5893 if all:
5894 if ui.promptchoice(
5894 if ui.promptchoice(
5895 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5895 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5896 ):
5896 ):
5897 raise error.Abort(_(b'user quit'))
5897 raise error.Abort(_(b'user quit'))
5898 if mark and not pats:
5898 if mark and not pats:
5899 if ui.promptchoice(
5899 if ui.promptchoice(
5900 _(
5900 _(
5901 b'mark all unresolved files as resolved (yn)?'
5901 b'mark all unresolved files as resolved (yn)?'
5902 b'$$ &Yes $$ &No'
5902 b'$$ &Yes $$ &No'
5903 )
5903 )
5904 ):
5904 ):
5905 raise error.Abort(_(b'user quit'))
5905 raise error.Abort(_(b'user quit'))
5906 if unmark and not pats:
5906 if unmark and not pats:
5907 if ui.promptchoice(
5907 if ui.promptchoice(
5908 _(
5908 _(
5909 b'mark all resolved files as unresolved (yn)?'
5909 b'mark all resolved files as unresolved (yn)?'
5910 b'$$ &Yes $$ &No'
5910 b'$$ &Yes $$ &No'
5911 )
5911 )
5912 ):
5912 ):
5913 raise error.Abort(_(b'user quit'))
5913 raise error.Abort(_(b'user quit'))
5914
5914
5915 uipathfn = scmutil.getuipathfn(repo)
5915 uipathfn = scmutil.getuipathfn(repo)
5916
5916
5917 if show:
5917 if show:
5918 ui.pager(b'resolve')
5918 ui.pager(b'resolve')
5919 fm = ui.formatter(b'resolve', opts)
5919 fm = ui.formatter(b'resolve', opts)
5920 ms = mergemod.mergestate.read(repo)
5920 ms = mergemod.mergestate.read(repo)
5921 wctx = repo[None]
5921 wctx = repo[None]
5922 m = scmutil.match(wctx, pats, opts)
5922 m = scmutil.match(wctx, pats, opts)
5923
5923
5924 # Labels and keys based on merge state. Unresolved path conflicts show
5924 # Labels and keys based on merge state. Unresolved path conflicts show
5925 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5925 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5926 # resolved conflicts.
5926 # resolved conflicts.
5927 mergestateinfo = {
5927 mergestateinfo = {
5928 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5928 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5929 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5929 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5930 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5930 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5931 b'resolve.unresolved',
5931 b'resolve.unresolved',
5932 b'P',
5932 b'P',
5933 ),
5933 ),
5934 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5934 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5935 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5935 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5936 b'resolve.driverresolved',
5936 b'resolve.driverresolved',
5937 b'D',
5937 b'D',
5938 ),
5938 ),
5939 }
5939 }
5940
5940
5941 for f in ms:
5941 for f in ms:
5942 if not m(f):
5942 if not m(f):
5943 continue
5943 continue
5944
5944
5945 label, key = mergestateinfo[ms[f]]
5945 label, key = mergestateinfo[ms[f]]
5946 fm.startitem()
5946 fm.startitem()
5947 fm.context(ctx=wctx)
5947 fm.context(ctx=wctx)
5948 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5948 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5949 fm.data(path=f)
5949 fm.data(path=f)
5950 fm.plain(b'%s\n' % uipathfn(f), label=label)
5950 fm.plain(b'%s\n' % uipathfn(f), label=label)
5951 fm.end()
5951 fm.end()
5952 return 0
5952 return 0
5953
5953
5954 with repo.wlock():
5954 with repo.wlock():
5955 ms = mergemod.mergestate.read(repo)
5955 ms = mergemod.mergestate.read(repo)
5956
5956
5957 if not (ms.active() or repo.dirstate.p2() != nullid):
5957 if not (ms.active() or repo.dirstate.p2() != nullid):
5958 raise error.Abort(
5958 raise error.Abort(
5959 _(b'resolve command not applicable when not merging')
5959 _(b'resolve command not applicable when not merging')
5960 )
5960 )
5961
5961
5962 wctx = repo[None]
5962 wctx = repo[None]
5963
5963
5964 if (
5964 if (
5965 ms.mergedriver
5965 ms.mergedriver
5966 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5966 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5967 ):
5967 ):
5968 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5968 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5969 ms.commit()
5969 ms.commit()
5970 # allow mark and unmark to go through
5970 # allow mark and unmark to go through
5971 if not mark and not unmark and not proceed:
5971 if not mark and not unmark and not proceed:
5972 return 1
5972 return 1
5973
5973
5974 m = scmutil.match(wctx, pats, opts)
5974 m = scmutil.match(wctx, pats, opts)
5975 ret = 0
5975 ret = 0
5976 didwork = False
5976 didwork = False
5977 runconclude = False
5977 runconclude = False
5978
5978
5979 tocomplete = []
5979 tocomplete = []
5980 hasconflictmarkers = []
5980 hasconflictmarkers = []
5981 if mark:
5981 if mark:
5982 markcheck = ui.config(b'commands', b'resolve.mark-check')
5982 markcheck = ui.config(b'commands', b'resolve.mark-check')
5983 if markcheck not in [b'warn', b'abort']:
5983 if markcheck not in [b'warn', b'abort']:
5984 # Treat all invalid / unrecognized values as 'none'.
5984 # Treat all invalid / unrecognized values as 'none'.
5985 markcheck = False
5985 markcheck = False
5986 for f in ms:
5986 for f in ms:
5987 if not m(f):
5987 if not m(f):
5988 continue
5988 continue
5989
5989
5990 didwork = True
5990 didwork = True
5991
5991
5992 # don't let driver-resolved files be marked, and run the conclude
5992 # don't let driver-resolved files be marked, and run the conclude
5993 # step if asked to resolve
5993 # step if asked to resolve
5994 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
5994 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
5995 exact = m.exact(f)
5995 exact = m.exact(f)
5996 if mark:
5996 if mark:
5997 if exact:
5997 if exact:
5998 ui.warn(
5998 ui.warn(
5999 _(b'not marking %s as it is driver-resolved\n')
5999 _(b'not marking %s as it is driver-resolved\n')
6000 % uipathfn(f)
6000 % uipathfn(f)
6001 )
6001 )
6002 elif unmark:
6002 elif unmark:
6003 if exact:
6003 if exact:
6004 ui.warn(
6004 ui.warn(
6005 _(b'not unmarking %s as it is driver-resolved\n')
6005 _(b'not unmarking %s as it is driver-resolved\n')
6006 % uipathfn(f)
6006 % uipathfn(f)
6007 )
6007 )
6008 else:
6008 else:
6009 runconclude = True
6009 runconclude = True
6010 continue
6010 continue
6011
6011
6012 # path conflicts must be resolved manually
6012 # path conflicts must be resolved manually
6013 if ms[f] in (
6013 if ms[f] in (
6014 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6014 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6015 mergemod.MERGE_RECORD_RESOLVED_PATH,
6015 mergemod.MERGE_RECORD_RESOLVED_PATH,
6016 ):
6016 ):
6017 if mark:
6017 if mark:
6018 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6018 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6019 elif unmark:
6019 elif unmark:
6020 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6020 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6021 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6021 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6022 ui.warn(
6022 ui.warn(
6023 _(b'%s: path conflict must be resolved manually\n')
6023 _(b'%s: path conflict must be resolved manually\n')
6024 % uipathfn(f)
6024 % uipathfn(f)
6025 )
6025 )
6026 continue
6026 continue
6027
6027
6028 if mark:
6028 if mark:
6029 if markcheck:
6029 if markcheck:
6030 fdata = repo.wvfs.tryread(f)
6030 fdata = repo.wvfs.tryread(f)
6031 if (
6031 if (
6032 filemerge.hasconflictmarkers(fdata)
6032 filemerge.hasconflictmarkers(fdata)
6033 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6033 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6034 ):
6034 ):
6035 hasconflictmarkers.append(f)
6035 hasconflictmarkers.append(f)
6036 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6036 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6037 elif unmark:
6037 elif unmark:
6038 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6038 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6039 else:
6039 else:
6040 # backup pre-resolve (merge uses .orig for its own purposes)
6040 # backup pre-resolve (merge uses .orig for its own purposes)
6041 a = repo.wjoin(f)
6041 a = repo.wjoin(f)
6042 try:
6042 try:
6043 util.copyfile(a, a + b".resolve")
6043 util.copyfile(a, a + b".resolve")
6044 except (IOError, OSError) as inst:
6044 except (IOError, OSError) as inst:
6045 if inst.errno != errno.ENOENT:
6045 if inst.errno != errno.ENOENT:
6046 raise
6046 raise
6047
6047
6048 try:
6048 try:
6049 # preresolve file
6049 # preresolve file
6050 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6050 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6051 with ui.configoverride(overrides, b'resolve'):
6051 with ui.configoverride(overrides, b'resolve'):
6052 complete, r = ms.preresolve(f, wctx)
6052 complete, r = ms.preresolve(f, wctx)
6053 if not complete:
6053 if not complete:
6054 tocomplete.append(f)
6054 tocomplete.append(f)
6055 elif r:
6055 elif r:
6056 ret = 1
6056 ret = 1
6057 finally:
6057 finally:
6058 ms.commit()
6058 ms.commit()
6059
6059
6060 # replace filemerge's .orig file with our resolve file, but only
6060 # replace filemerge's .orig file with our resolve file, but only
6061 # for merges that are complete
6061 # for merges that are complete
6062 if complete:
6062 if complete:
6063 try:
6063 try:
6064 util.rename(
6064 util.rename(
6065 a + b".resolve", scmutil.backuppath(ui, repo, f)
6065 a + b".resolve", scmutil.backuppath(ui, repo, f)
6066 )
6066 )
6067 except OSError as inst:
6067 except OSError as inst:
6068 if inst.errno != errno.ENOENT:
6068 if inst.errno != errno.ENOENT:
6069 raise
6069 raise
6070
6070
6071 if hasconflictmarkers:
6071 if hasconflictmarkers:
6072 ui.warn(
6072 ui.warn(
6073 _(
6073 _(
6074 b'warning: the following files still have conflict '
6074 b'warning: the following files still have conflict '
6075 b'markers:\n'
6075 b'markers:\n'
6076 )
6076 )
6077 + b''.join(
6077 + b''.join(
6078 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6078 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6079 )
6079 )
6080 )
6080 )
6081 if markcheck == b'abort' and not all and not pats:
6081 if markcheck == b'abort' and not all and not pats:
6082 raise error.Abort(
6082 raise error.Abort(
6083 _(b'conflict markers detected'),
6083 _(b'conflict markers detected'),
6084 hint=_(b'use --all to mark anyway'),
6084 hint=_(b'use --all to mark anyway'),
6085 )
6085 )
6086
6086
6087 for f in tocomplete:
6087 for f in tocomplete:
6088 try:
6088 try:
6089 # resolve file
6089 # resolve file
6090 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6090 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6091 with ui.configoverride(overrides, b'resolve'):
6091 with ui.configoverride(overrides, b'resolve'):
6092 r = ms.resolve(f, wctx)
6092 r = ms.resolve(f, wctx)
6093 if r:
6093 if r:
6094 ret = 1
6094 ret = 1
6095 finally:
6095 finally:
6096 ms.commit()
6096 ms.commit()
6097
6097
6098 # replace filemerge's .orig file with our resolve file
6098 # replace filemerge's .orig file with our resolve file
6099 a = repo.wjoin(f)
6099 a = repo.wjoin(f)
6100 try:
6100 try:
6101 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6101 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6102 except OSError as inst:
6102 except OSError as inst:
6103 if inst.errno != errno.ENOENT:
6103 if inst.errno != errno.ENOENT:
6104 raise
6104 raise
6105
6105
6106 ms.commit()
6106 ms.commit()
6107 ms.recordactions()
6107 ms.recordactions()
6108
6108
6109 if not didwork and pats:
6109 if not didwork and pats:
6110 hint = None
6110 hint = None
6111 if not any([p for p in pats if p.find(b':') >= 0]):
6111 if not any([p for p in pats if p.find(b':') >= 0]):
6112 pats = [b'path:%s' % p for p in pats]
6112 pats = [b'path:%s' % p for p in pats]
6113 m = scmutil.match(wctx, pats, opts)
6113 m = scmutil.match(wctx, pats, opts)
6114 for f in ms:
6114 for f in ms:
6115 if not m(f):
6115 if not m(f):
6116 continue
6116 continue
6117
6117
6118 def flag(o):
6118 def flag(o):
6119 if o == b're_merge':
6119 if o == b're_merge':
6120 return b'--re-merge '
6120 return b'--re-merge '
6121 return b'-%s ' % o[0:1]
6121 return b'-%s ' % o[0:1]
6122
6122
6123 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6123 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6124 hint = _(b"(try: hg resolve %s%s)\n") % (
6124 hint = _(b"(try: hg resolve %s%s)\n") % (
6125 flags,
6125 flags,
6126 b' '.join(pats),
6126 b' '.join(pats),
6127 )
6127 )
6128 break
6128 break
6129 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6129 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6130 if hint:
6130 if hint:
6131 ui.warn(hint)
6131 ui.warn(hint)
6132 elif ms.mergedriver and ms.mdstate() != b's':
6132 elif ms.mergedriver and ms.mdstate() != b's':
6133 # run conclude step when either a driver-resolved file is requested
6133 # run conclude step when either a driver-resolved file is requested
6134 # or there are no driver-resolved files
6134 # or there are no driver-resolved files
6135 # we can't use 'ret' to determine whether any files are unresolved
6135 # we can't use 'ret' to determine whether any files are unresolved
6136 # because we might not have tried to resolve some
6136 # because we might not have tried to resolve some
6137 if (runconclude or not list(ms.driverresolved())) and not list(
6137 if (runconclude or not list(ms.driverresolved())) and not list(
6138 ms.unresolved()
6138 ms.unresolved()
6139 ):
6139 ):
6140 proceed = mergemod.driverconclude(repo, ms, wctx)
6140 proceed = mergemod.driverconclude(repo, ms, wctx)
6141 ms.commit()
6141 ms.commit()
6142 if not proceed:
6142 if not proceed:
6143 return 1
6143 return 1
6144
6144
6145 # Nudge users into finishing an unfinished operation
6145 # Nudge users into finishing an unfinished operation
6146 unresolvedf = list(ms.unresolved())
6146 unresolvedf = list(ms.unresolved())
6147 driverresolvedf = list(ms.driverresolved())
6147 driverresolvedf = list(ms.driverresolved())
6148 if not unresolvedf and not driverresolvedf:
6148 if not unresolvedf and not driverresolvedf:
6149 ui.status(_(b'(no more unresolved files)\n'))
6149 ui.status(_(b'(no more unresolved files)\n'))
6150 cmdutil.checkafterresolved(repo)
6150 cmdutil.checkafterresolved(repo)
6151 elif not unresolvedf:
6151 elif not unresolvedf:
6152 ui.status(
6152 ui.status(
6153 _(
6153 _(
6154 b'(no more unresolved files -- '
6154 b'(no more unresolved files -- '
6155 b'run "hg resolve --all" to conclude)\n'
6155 b'run "hg resolve --all" to conclude)\n'
6156 )
6156 )
6157 )
6157 )
6158
6158
6159 return ret
6159 return ret
6160
6160
6161
6161
6162 @command(
6162 @command(
6163 b'revert',
6163 b'revert',
6164 [
6164 [
6165 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6165 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6166 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6166 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6167 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6167 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6168 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6168 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6169 (b'i', b'interactive', None, _(b'interactively select the changes')),
6169 (b'i', b'interactive', None, _(b'interactively select the changes')),
6170 ]
6170 ]
6171 + walkopts
6171 + walkopts
6172 + dryrunopts,
6172 + dryrunopts,
6173 _(b'[OPTION]... [-r REV] [NAME]...'),
6173 _(b'[OPTION]... [-r REV] [NAME]...'),
6174 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6174 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6175 )
6175 )
6176 def revert(ui, repo, *pats, **opts):
6176 def revert(ui, repo, *pats, **opts):
6177 """restore files to their checkout state
6177 """restore files to their checkout state
6178
6178
6179 .. note::
6179 .. note::
6180
6180
6181 To check out earlier revisions, you should use :hg:`update REV`.
6181 To check out earlier revisions, you should use :hg:`update REV`.
6182 To cancel an uncommitted merge (and lose your changes),
6182 To cancel an uncommitted merge (and lose your changes),
6183 use :hg:`merge --abort`.
6183 use :hg:`merge --abort`.
6184
6184
6185 With no revision specified, revert the specified files or directories
6185 With no revision specified, revert the specified files or directories
6186 to the contents they had in the parent of the working directory.
6186 to the contents they had in the parent of the working directory.
6187 This restores the contents of files to an unmodified
6187 This restores the contents of files to an unmodified
6188 state and unschedules adds, removes, copies, and renames. If the
6188 state and unschedules adds, removes, copies, and renames. If the
6189 working directory has two parents, you must explicitly specify a
6189 working directory has two parents, you must explicitly specify a
6190 revision.
6190 revision.
6191
6191
6192 Using the -r/--rev or -d/--date options, revert the given files or
6192 Using the -r/--rev or -d/--date options, revert the given files or
6193 directories to their states as of a specific revision. Because
6193 directories to their states as of a specific revision. Because
6194 revert does not change the working directory parents, this will
6194 revert does not change the working directory parents, this will
6195 cause these files to appear modified. This can be helpful to "back
6195 cause these files to appear modified. This can be helpful to "back
6196 out" some or all of an earlier change. See :hg:`backout` for a
6196 out" some or all of an earlier change. See :hg:`backout` for a
6197 related method.
6197 related method.
6198
6198
6199 Modified files are saved with a .orig suffix before reverting.
6199 Modified files are saved with a .orig suffix before reverting.
6200 To disable these backups, use --no-backup. It is possible to store
6200 To disable these backups, use --no-backup. It is possible to store
6201 the backup files in a custom directory relative to the root of the
6201 the backup files in a custom directory relative to the root of the
6202 repository by setting the ``ui.origbackuppath`` configuration
6202 repository by setting the ``ui.origbackuppath`` configuration
6203 option.
6203 option.
6204
6204
6205 See :hg:`help dates` for a list of formats valid for -d/--date.
6205 See :hg:`help dates` for a list of formats valid for -d/--date.
6206
6206
6207 See :hg:`help backout` for a way to reverse the effect of an
6207 See :hg:`help backout` for a way to reverse the effect of an
6208 earlier changeset.
6208 earlier changeset.
6209
6209
6210 Returns 0 on success.
6210 Returns 0 on success.
6211 """
6211 """
6212
6212
6213 opts = pycompat.byteskwargs(opts)
6213 opts = pycompat.byteskwargs(opts)
6214 if opts.get(b"date"):
6214 if opts.get(b"date"):
6215 if opts.get(b"rev"):
6215 if opts.get(b"rev"):
6216 raise error.Abort(_(b"you can't specify a revision and a date"))
6216 raise error.Abort(_(b"you can't specify a revision and a date"))
6217 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6217 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6218
6218
6219 parent, p2 = repo.dirstate.parents()
6219 parent, p2 = repo.dirstate.parents()
6220 if not opts.get(b'rev') and p2 != nullid:
6220 if not opts.get(b'rev') and p2 != nullid:
6221 # revert after merge is a trap for new users (issue2915)
6221 # revert after merge is a trap for new users (issue2915)
6222 raise error.Abort(
6222 raise error.Abort(
6223 _(b'uncommitted merge with no revision specified'),
6223 _(b'uncommitted merge with no revision specified'),
6224 hint=_(b"use 'hg update' or see 'hg help revert'"),
6224 hint=_(b"use 'hg update' or see 'hg help revert'"),
6225 )
6225 )
6226
6226
6227 rev = opts.get(b'rev')
6227 rev = opts.get(b'rev')
6228 if rev:
6228 if rev:
6229 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6229 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6230 ctx = scmutil.revsingle(repo, rev)
6230 ctx = scmutil.revsingle(repo, rev)
6231
6231
6232 if not (
6232 if not (
6233 pats
6233 pats
6234 or opts.get(b'include')
6234 or opts.get(b'include')
6235 or opts.get(b'exclude')
6235 or opts.get(b'exclude')
6236 or opts.get(b'all')
6236 or opts.get(b'all')
6237 or opts.get(b'interactive')
6237 or opts.get(b'interactive')
6238 ):
6238 ):
6239 msg = _(b"no files or directories specified")
6239 msg = _(b"no files or directories specified")
6240 if p2 != nullid:
6240 if p2 != nullid:
6241 hint = _(
6241 hint = _(
6242 b"uncommitted merge, use --all to discard all changes,"
6242 b"uncommitted merge, use --all to discard all changes,"
6243 b" or 'hg update -C .' to abort the merge"
6243 b" or 'hg update -C .' to abort the merge"
6244 )
6244 )
6245 raise error.Abort(msg, hint=hint)
6245 raise error.Abort(msg, hint=hint)
6246 dirty = any(repo.status())
6246 dirty = any(repo.status())
6247 node = ctx.node()
6247 node = ctx.node()
6248 if node != parent:
6248 if node != parent:
6249 if dirty:
6249 if dirty:
6250 hint = (
6250 hint = (
6251 _(
6251 _(
6252 b"uncommitted changes, use --all to discard all"
6252 b"uncommitted changes, use --all to discard all"
6253 b" changes, or 'hg update %d' to update"
6253 b" changes, or 'hg update %d' to update"
6254 )
6254 )
6255 % ctx.rev()
6255 % ctx.rev()
6256 )
6256 )
6257 else:
6257 else:
6258 hint = (
6258 hint = (
6259 _(
6259 _(
6260 b"use --all to revert all files,"
6260 b"use --all to revert all files,"
6261 b" or 'hg update %d' to update"
6261 b" or 'hg update %d' to update"
6262 )
6262 )
6263 % ctx.rev()
6263 % ctx.rev()
6264 )
6264 )
6265 elif dirty:
6265 elif dirty:
6266 hint = _(b"uncommitted changes, use --all to discard all changes")
6266 hint = _(b"uncommitted changes, use --all to discard all changes")
6267 else:
6267 else:
6268 hint = _(b"use --all to revert all files")
6268 hint = _(b"use --all to revert all files")
6269 raise error.Abort(msg, hint=hint)
6269 raise error.Abort(msg, hint=hint)
6270
6270
6271 return cmdutil.revert(
6271 return cmdutil.revert(
6272 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6272 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6273 )
6273 )
6274
6274
6275
6275
6276 @command(
6276 @command(
6277 b'rollback',
6277 b'rollback',
6278 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6278 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6279 helpcategory=command.CATEGORY_MAINTENANCE,
6279 helpcategory=command.CATEGORY_MAINTENANCE,
6280 )
6280 )
6281 def rollback(ui, repo, **opts):
6281 def rollback(ui, repo, **opts):
6282 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6282 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6283
6283
6284 Please use :hg:`commit --amend` instead of rollback to correct
6284 Please use :hg:`commit --amend` instead of rollback to correct
6285 mistakes in the last commit.
6285 mistakes in the last commit.
6286
6286
6287 This command should be used with care. There is only one level of
6287 This command should be used with care. There is only one level of
6288 rollback, and there is no way to undo a rollback. It will also
6288 rollback, and there is no way to undo a rollback. It will also
6289 restore the dirstate at the time of the last transaction, losing
6289 restore the dirstate at the time of the last transaction, losing
6290 any dirstate changes since that time. This command does not alter
6290 any dirstate changes since that time. This command does not alter
6291 the working directory.
6291 the working directory.
6292
6292
6293 Transactions are used to encapsulate the effects of all commands
6293 Transactions are used to encapsulate the effects of all commands
6294 that create new changesets or propagate existing changesets into a
6294 that create new changesets or propagate existing changesets into a
6295 repository.
6295 repository.
6296
6296
6297 .. container:: verbose
6297 .. container:: verbose
6298
6298
6299 For example, the following commands are transactional, and their
6299 For example, the following commands are transactional, and their
6300 effects can be rolled back:
6300 effects can be rolled back:
6301
6301
6302 - commit
6302 - commit
6303 - import
6303 - import
6304 - pull
6304 - pull
6305 - push (with this repository as the destination)
6305 - push (with this repository as the destination)
6306 - unbundle
6306 - unbundle
6307
6307
6308 To avoid permanent data loss, rollback will refuse to rollback a
6308 To avoid permanent data loss, rollback will refuse to rollback a
6309 commit transaction if it isn't checked out. Use --force to
6309 commit transaction if it isn't checked out. Use --force to
6310 override this protection.
6310 override this protection.
6311
6311
6312 The rollback command can be entirely disabled by setting the
6312 The rollback command can be entirely disabled by setting the
6313 ``ui.rollback`` configuration setting to false. If you're here
6313 ``ui.rollback`` configuration setting to false. If you're here
6314 because you want to use rollback and it's disabled, you can
6314 because you want to use rollback and it's disabled, you can
6315 re-enable the command by setting ``ui.rollback`` to true.
6315 re-enable the command by setting ``ui.rollback`` to true.
6316
6316
6317 This command is not intended for use on public repositories. Once
6317 This command is not intended for use on public repositories. Once
6318 changes are visible for pull by other users, rolling a transaction
6318 changes are visible for pull by other users, rolling a transaction
6319 back locally is ineffective (someone else may already have pulled
6319 back locally is ineffective (someone else may already have pulled
6320 the changes). Furthermore, a race is possible with readers of the
6320 the changes). Furthermore, a race is possible with readers of the
6321 repository; for example an in-progress pull from the repository
6321 repository; for example an in-progress pull from the repository
6322 may fail if a rollback is performed.
6322 may fail if a rollback is performed.
6323
6323
6324 Returns 0 on success, 1 if no rollback data is available.
6324 Returns 0 on success, 1 if no rollback data is available.
6325 """
6325 """
6326 if not ui.configbool(b'ui', b'rollback'):
6326 if not ui.configbool(b'ui', b'rollback'):
6327 raise error.Abort(
6327 raise error.Abort(
6328 _(b'rollback is disabled because it is unsafe'),
6328 _(b'rollback is disabled because it is unsafe'),
6329 hint=b'see `hg help -v rollback` for information',
6329 hint=b'see `hg help -v rollback` for information',
6330 )
6330 )
6331 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6331 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6332
6332
6333
6333
6334 @command(
6334 @command(
6335 b'root',
6335 b'root',
6336 [] + formatteropts,
6336 [] + formatteropts,
6337 intents={INTENT_READONLY},
6337 intents={INTENT_READONLY},
6338 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6338 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6339 )
6339 )
6340 def root(ui, repo, **opts):
6340 def root(ui, repo, **opts):
6341 """print the root (top) of the current working directory
6341 """print the root (top) of the current working directory
6342
6342
6343 Print the root directory of the current repository.
6343 Print the root directory of the current repository.
6344
6344
6345 .. container:: verbose
6345 .. container:: verbose
6346
6346
6347 Template:
6347 Template:
6348
6348
6349 The following keywords are supported in addition to the common template
6349 The following keywords are supported in addition to the common template
6350 keywords and functions. See also :hg:`help templates`.
6350 keywords and functions. See also :hg:`help templates`.
6351
6351
6352 :hgpath: String. Path to the .hg directory.
6352 :hgpath: String. Path to the .hg directory.
6353 :storepath: String. Path to the directory holding versioned data.
6353 :storepath: String. Path to the directory holding versioned data.
6354
6354
6355 Returns 0 on success.
6355 Returns 0 on success.
6356 """
6356 """
6357 opts = pycompat.byteskwargs(opts)
6357 opts = pycompat.byteskwargs(opts)
6358 with ui.formatter(b'root', opts) as fm:
6358 with ui.formatter(b'root', opts) as fm:
6359 fm.startitem()
6359 fm.startitem()
6360 fm.write(b'reporoot', b'%s\n', repo.root)
6360 fm.write(b'reporoot', b'%s\n', repo.root)
6361 fm.data(hgpath=repo.path, storepath=repo.spath)
6361 fm.data(hgpath=repo.path, storepath=repo.spath)
6362
6362
6363
6363
6364 @command(
6364 @command(
6365 b'serve',
6365 b'serve',
6366 [
6366 [
6367 (
6367 (
6368 b'A',
6368 b'A',
6369 b'accesslog',
6369 b'accesslog',
6370 b'',
6370 b'',
6371 _(b'name of access log file to write to'),
6371 _(b'name of access log file to write to'),
6372 _(b'FILE'),
6372 _(b'FILE'),
6373 ),
6373 ),
6374 (b'd', b'daemon', None, _(b'run server in background')),
6374 (b'd', b'daemon', None, _(b'run server in background')),
6375 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6375 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6376 (
6376 (
6377 b'E',
6377 b'E',
6378 b'errorlog',
6378 b'errorlog',
6379 b'',
6379 b'',
6380 _(b'name of error log file to write to'),
6380 _(b'name of error log file to write to'),
6381 _(b'FILE'),
6381 _(b'FILE'),
6382 ),
6382 ),
6383 # use string type, then we can check if something was passed
6383 # use string type, then we can check if something was passed
6384 (
6384 (
6385 b'p',
6385 b'p',
6386 b'port',
6386 b'port',
6387 b'',
6387 b'',
6388 _(b'port to listen on (default: 8000)'),
6388 _(b'port to listen on (default: 8000)'),
6389 _(b'PORT'),
6389 _(b'PORT'),
6390 ),
6390 ),
6391 (
6391 (
6392 b'a',
6392 b'a',
6393 b'address',
6393 b'address',
6394 b'',
6394 b'',
6395 _(b'address to listen on (default: all interfaces)'),
6395 _(b'address to listen on (default: all interfaces)'),
6396 _(b'ADDR'),
6396 _(b'ADDR'),
6397 ),
6397 ),
6398 (
6398 (
6399 b'',
6399 b'',
6400 b'prefix',
6400 b'prefix',
6401 b'',
6401 b'',
6402 _(b'prefix path to serve from (default: server root)'),
6402 _(b'prefix path to serve from (default: server root)'),
6403 _(b'PREFIX'),
6403 _(b'PREFIX'),
6404 ),
6404 ),
6405 (
6405 (
6406 b'n',
6406 b'n',
6407 b'name',
6407 b'name',
6408 b'',
6408 b'',
6409 _(b'name to show in web pages (default: working directory)'),
6409 _(b'name to show in web pages (default: working directory)'),
6410 _(b'NAME'),
6410 _(b'NAME'),
6411 ),
6411 ),
6412 (
6412 (
6413 b'',
6413 b'',
6414 b'web-conf',
6414 b'web-conf',
6415 b'',
6415 b'',
6416 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6416 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6417 _(b'FILE'),
6417 _(b'FILE'),
6418 ),
6418 ),
6419 (
6419 (
6420 b'',
6420 b'',
6421 b'webdir-conf',
6421 b'webdir-conf',
6422 b'',
6422 b'',
6423 _(b'name of the hgweb config file (DEPRECATED)'),
6423 _(b'name of the hgweb config file (DEPRECATED)'),
6424 _(b'FILE'),
6424 _(b'FILE'),
6425 ),
6425 ),
6426 (
6426 (
6427 b'',
6427 b'',
6428 b'pid-file',
6428 b'pid-file',
6429 b'',
6429 b'',
6430 _(b'name of file to write process ID to'),
6430 _(b'name of file to write process ID to'),
6431 _(b'FILE'),
6431 _(b'FILE'),
6432 ),
6432 ),
6433 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6433 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6434 (
6434 (
6435 b'',
6435 b'',
6436 b'cmdserver',
6436 b'cmdserver',
6437 b'',
6437 b'',
6438 _(b'for remote clients (ADVANCED)'),
6438 _(b'for remote clients (ADVANCED)'),
6439 _(b'MODE'),
6439 _(b'MODE'),
6440 ),
6440 ),
6441 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6441 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6442 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6442 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6443 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6443 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6444 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6444 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6445 (b'', b'print-url', None, _(b'start and print only the URL')),
6445 (b'', b'print-url', None, _(b'start and print only the URL')),
6446 ]
6446 ]
6447 + subrepoopts,
6447 + subrepoopts,
6448 _(b'[OPTION]...'),
6448 _(b'[OPTION]...'),
6449 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6449 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6450 helpbasic=True,
6450 helpbasic=True,
6451 optionalrepo=True,
6451 optionalrepo=True,
6452 )
6452 )
6453 def serve(ui, repo, **opts):
6453 def serve(ui, repo, **opts):
6454 """start stand-alone webserver
6454 """start stand-alone webserver
6455
6455
6456 Start a local HTTP repository browser and pull server. You can use
6456 Start a local HTTP repository browser and pull server. You can use
6457 this for ad-hoc sharing and browsing of repositories. It is
6457 this for ad-hoc sharing and browsing of repositories. It is
6458 recommended to use a real web server to serve a repository for
6458 recommended to use a real web server to serve a repository for
6459 longer periods of time.
6459 longer periods of time.
6460
6460
6461 Please note that the server does not implement access control.
6461 Please note that the server does not implement access control.
6462 This means that, by default, anybody can read from the server and
6462 This means that, by default, anybody can read from the server and
6463 nobody can write to it by default. Set the ``web.allow-push``
6463 nobody can write to it by default. Set the ``web.allow-push``
6464 option to ``*`` to allow everybody to push to the server. You
6464 option to ``*`` to allow everybody to push to the server. You
6465 should use a real web server if you need to authenticate users.
6465 should use a real web server if you need to authenticate users.
6466
6466
6467 By default, the server logs accesses to stdout and errors to
6467 By default, the server logs accesses to stdout and errors to
6468 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6468 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6469 files.
6469 files.
6470
6470
6471 To have the server choose a free port number to listen on, specify
6471 To have the server choose a free port number to listen on, specify
6472 a port number of 0; in this case, the server will print the port
6472 a port number of 0; in this case, the server will print the port
6473 number it uses.
6473 number it uses.
6474
6474
6475 Returns 0 on success.
6475 Returns 0 on success.
6476 """
6476 """
6477
6477
6478 opts = pycompat.byteskwargs(opts)
6478 opts = pycompat.byteskwargs(opts)
6479 if opts[b"stdio"] and opts[b"cmdserver"]:
6479 if opts[b"stdio"] and opts[b"cmdserver"]:
6480 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6480 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6481 if opts[b"print_url"] and ui.verbose:
6481 if opts[b"print_url"] and ui.verbose:
6482 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6482 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6483
6483
6484 if opts[b"stdio"]:
6484 if opts[b"stdio"]:
6485 if repo is None:
6485 if repo is None:
6486 raise error.RepoError(
6486 raise error.RepoError(
6487 _(b"there is no Mercurial repository here (.hg not found)")
6487 _(b"there is no Mercurial repository here (.hg not found)")
6488 )
6488 )
6489 s = wireprotoserver.sshserver(ui, repo)
6489 s = wireprotoserver.sshserver(ui, repo)
6490 s.serve_forever()
6490 s.serve_forever()
6491
6491
6492 service = server.createservice(ui, repo, opts)
6492 service = server.createservice(ui, repo, opts)
6493 return server.runservice(opts, initfn=service.init, runfn=service.run)
6493 return server.runservice(opts, initfn=service.init, runfn=service.run)
6494
6494
6495
6495
6496 @command(
6496 @command(
6497 b'shelve',
6497 b'shelve',
6498 [
6498 [
6499 (
6499 (
6500 b'A',
6500 b'A',
6501 b'addremove',
6501 b'addremove',
6502 None,
6502 None,
6503 _(b'mark new/missing files as added/removed before shelving'),
6503 _(b'mark new/missing files as added/removed before shelving'),
6504 ),
6504 ),
6505 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6505 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6506 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6506 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6507 (
6507 (
6508 b'',
6508 b'',
6509 b'date',
6509 b'date',
6510 b'',
6510 b'',
6511 _(b'shelve with the specified commit date'),
6511 _(b'shelve with the specified commit date'),
6512 _(b'DATE'),
6512 _(b'DATE'),
6513 ),
6513 ),
6514 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6514 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6515 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6515 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6516 (
6516 (
6517 b'k',
6517 b'k',
6518 b'keep',
6518 b'keep',
6519 False,
6519 False,
6520 _(b'shelve, but keep changes in the working directory'),
6520 _(b'shelve, but keep changes in the working directory'),
6521 ),
6521 ),
6522 (b'l', b'list', None, _(b'list current shelves')),
6522 (b'l', b'list', None, _(b'list current shelves')),
6523 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6523 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6524 (
6524 (
6525 b'n',
6525 b'n',
6526 b'name',
6526 b'name',
6527 b'',
6527 b'',
6528 _(b'use the given name for the shelved commit'),
6528 _(b'use the given name for the shelved commit'),
6529 _(b'NAME'),
6529 _(b'NAME'),
6530 ),
6530 ),
6531 (
6531 (
6532 b'p',
6532 b'p',
6533 b'patch',
6533 b'patch',
6534 None,
6534 None,
6535 _(
6535 _(
6536 b'output patches for changes (provide the names of the shelved '
6536 b'output patches for changes (provide the names of the shelved '
6537 b'changes as positional arguments)'
6537 b'changes as positional arguments)'
6538 ),
6538 ),
6539 ),
6539 ),
6540 (b'i', b'interactive', None, _(b'interactive mode')),
6540 (b'i', b'interactive', None, _(b'interactive mode')),
6541 (
6541 (
6542 b'',
6542 b'',
6543 b'stat',
6543 b'stat',
6544 None,
6544 None,
6545 _(
6545 _(
6546 b'output diffstat-style summary of changes (provide the names of '
6546 b'output diffstat-style summary of changes (provide the names of '
6547 b'the shelved changes as positional arguments)'
6547 b'the shelved changes as positional arguments)'
6548 ),
6548 ),
6549 ),
6549 ),
6550 ]
6550 ]
6551 + cmdutil.walkopts,
6551 + cmdutil.walkopts,
6552 _(b'hg shelve [OPTION]... [FILE]...'),
6552 _(b'hg shelve [OPTION]... [FILE]...'),
6553 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6553 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6554 )
6554 )
6555 def shelve(ui, repo, *pats, **opts):
6555 def shelve(ui, repo, *pats, **opts):
6556 '''save and set aside changes from the working directory
6556 '''save and set aside changes from the working directory
6557
6557
6558 Shelving takes files that "hg status" reports as not clean, saves
6558 Shelving takes files that "hg status" reports as not clean, saves
6559 the modifications to a bundle (a shelved change), and reverts the
6559 the modifications to a bundle (a shelved change), and reverts the
6560 files so that their state in the working directory becomes clean.
6560 files so that their state in the working directory becomes clean.
6561
6561
6562 To restore these changes to the working directory, using "hg
6562 To restore these changes to the working directory, using "hg
6563 unshelve"; this will work even if you switch to a different
6563 unshelve"; this will work even if you switch to a different
6564 commit.
6564 commit.
6565
6565
6566 When no files are specified, "hg shelve" saves all not-clean
6566 When no files are specified, "hg shelve" saves all not-clean
6567 files. If specific files or directories are named, only changes to
6567 files. If specific files or directories are named, only changes to
6568 those files are shelved.
6568 those files are shelved.
6569
6569
6570 In bare shelve (when no files are specified, without interactive,
6570 In bare shelve (when no files are specified, without interactive,
6571 include and exclude option), shelving remembers information if the
6571 include and exclude option), shelving remembers information if the
6572 working directory was on newly created branch, in other words working
6572 working directory was on newly created branch, in other words working
6573 directory was on different branch than its first parent. In this
6573 directory was on different branch than its first parent. In this
6574 situation unshelving restores branch information to the working directory.
6574 situation unshelving restores branch information to the working directory.
6575
6575
6576 Each shelved change has a name that makes it easier to find later.
6576 Each shelved change has a name that makes it easier to find later.
6577 The name of a shelved change defaults to being based on the active
6577 The name of a shelved change defaults to being based on the active
6578 bookmark, or if there is no active bookmark, the current named
6578 bookmark, or if there is no active bookmark, the current named
6579 branch. To specify a different name, use ``--name``.
6579 branch. To specify a different name, use ``--name``.
6580
6580
6581 To see a list of existing shelved changes, use the ``--list``
6581 To see a list of existing shelved changes, use the ``--list``
6582 option. For each shelved change, this will print its name, age,
6582 option. For each shelved change, this will print its name, age,
6583 and description; use ``--patch`` or ``--stat`` for more details.
6583 and description; use ``--patch`` or ``--stat`` for more details.
6584
6584
6585 To delete specific shelved changes, use ``--delete``. To delete
6585 To delete specific shelved changes, use ``--delete``. To delete
6586 all shelved changes, use ``--cleanup``.
6586 all shelved changes, use ``--cleanup``.
6587 '''
6587 '''
6588 opts = pycompat.byteskwargs(opts)
6588 opts = pycompat.byteskwargs(opts)
6589 allowables = [
6589 allowables = [
6590 (b'addremove', {b'create'}), # 'create' is pseudo action
6590 (b'addremove', {b'create'}), # 'create' is pseudo action
6591 (b'unknown', {b'create'}),
6591 (b'unknown', {b'create'}),
6592 (b'cleanup', {b'cleanup'}),
6592 (b'cleanup', {b'cleanup'}),
6593 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6593 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6594 (b'delete', {b'delete'}),
6594 (b'delete', {b'delete'}),
6595 (b'edit', {b'create'}),
6595 (b'edit', {b'create'}),
6596 (b'keep', {b'create'}),
6596 (b'keep', {b'create'}),
6597 (b'list', {b'list'}),
6597 (b'list', {b'list'}),
6598 (b'message', {b'create'}),
6598 (b'message', {b'create'}),
6599 (b'name', {b'create'}),
6599 (b'name', {b'create'}),
6600 (b'patch', {b'patch', b'list'}),
6600 (b'patch', {b'patch', b'list'}),
6601 (b'stat', {b'stat', b'list'}),
6601 (b'stat', {b'stat', b'list'}),
6602 ]
6602 ]
6603
6603
6604 def checkopt(opt):
6604 def checkopt(opt):
6605 if opts.get(opt):
6605 if opts.get(opt):
6606 for i, allowable in allowables:
6606 for i, allowable in allowables:
6607 if opts[i] and opt not in allowable:
6607 if opts[i] and opt not in allowable:
6608 raise error.Abort(
6608 raise error.Abort(
6609 _(
6609 _(
6610 b"options '--%s' and '--%s' may not be "
6610 b"options '--%s' and '--%s' may not be "
6611 b"used together"
6611 b"used together"
6612 )
6612 )
6613 % (opt, i)
6613 % (opt, i)
6614 )
6614 )
6615 return True
6615 return True
6616
6616
6617 if checkopt(b'cleanup'):
6617 if checkopt(b'cleanup'):
6618 if pats:
6618 if pats:
6619 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6619 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6620 return shelvemod.cleanupcmd(ui, repo)
6620 return shelvemod.cleanupcmd(ui, repo)
6621 elif checkopt(b'delete'):
6621 elif checkopt(b'delete'):
6622 return shelvemod.deletecmd(ui, repo, pats)
6622 return shelvemod.deletecmd(ui, repo, pats)
6623 elif checkopt(b'list'):
6623 elif checkopt(b'list'):
6624 return shelvemod.listcmd(ui, repo, pats, opts)
6624 return shelvemod.listcmd(ui, repo, pats, opts)
6625 elif checkopt(b'patch') or checkopt(b'stat'):
6625 elif checkopt(b'patch') or checkopt(b'stat'):
6626 return shelvemod.patchcmds(ui, repo, pats, opts)
6626 return shelvemod.patchcmds(ui, repo, pats, opts)
6627 else:
6627 else:
6628 return shelvemod.createcmd(ui, repo, pats, opts)
6628 return shelvemod.createcmd(ui, repo, pats, opts)
6629
6629
6630
6630
6631 _NOTTERSE = b'nothing'
6631 _NOTTERSE = b'nothing'
6632
6632
6633
6633
6634 @command(
6634 @command(
6635 b'status|st',
6635 b'status|st',
6636 [
6636 [
6637 (b'A', b'all', None, _(b'show status of all files')),
6637 (b'A', b'all', None, _(b'show status of all files')),
6638 (b'm', b'modified', None, _(b'show only modified files')),
6638 (b'm', b'modified', None, _(b'show only modified files')),
6639 (b'a', b'added', None, _(b'show only added files')),
6639 (b'a', b'added', None, _(b'show only added files')),
6640 (b'r', b'removed', None, _(b'show only removed files')),
6640 (b'r', b'removed', None, _(b'show only removed files')),
6641 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6641 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6642 (b'c', b'clean', None, _(b'show only files without changes')),
6642 (b'c', b'clean', None, _(b'show only files without changes')),
6643 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6643 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6644 (b'i', b'ignored', None, _(b'show only ignored files')),
6644 (b'i', b'ignored', None, _(b'show only ignored files')),
6645 (b'n', b'no-status', None, _(b'hide status prefix')),
6645 (b'n', b'no-status', None, _(b'hide status prefix')),
6646 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6646 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6647 (b'C', b'copies', None, _(b'show source of copied files')),
6647 (b'C', b'copies', None, _(b'show source of copied files')),
6648 (
6648 (
6649 b'0',
6649 b'0',
6650 b'print0',
6650 b'print0',
6651 None,
6651 None,
6652 _(b'end filenames with NUL, for use with xargs'),
6652 _(b'end filenames with NUL, for use with xargs'),
6653 ),
6653 ),
6654 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6654 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6655 (
6655 (
6656 b'',
6656 b'',
6657 b'change',
6657 b'change',
6658 b'',
6658 b'',
6659 _(b'list the changed files of a revision'),
6659 _(b'list the changed files of a revision'),
6660 _(b'REV'),
6660 _(b'REV'),
6661 ),
6661 ),
6662 ]
6662 ]
6663 + walkopts
6663 + walkopts
6664 + subrepoopts
6664 + subrepoopts
6665 + formatteropts,
6665 + formatteropts,
6666 _(b'[OPTION]... [FILE]...'),
6666 _(b'[OPTION]... [FILE]...'),
6667 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6667 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6668 helpbasic=True,
6668 helpbasic=True,
6669 inferrepo=True,
6669 inferrepo=True,
6670 intents={INTENT_READONLY},
6670 intents={INTENT_READONLY},
6671 )
6671 )
6672 def status(ui, repo, *pats, **opts):
6672 def status(ui, repo, *pats, **opts):
6673 """show changed files in the working directory
6673 """show changed files in the working directory
6674
6674
6675 Show status of files in the repository. If names are given, only
6675 Show status of files in the repository. If names are given, only
6676 files that match are shown. Files that are clean or ignored or
6676 files that match are shown. Files that are clean or ignored or
6677 the source of a copy/move operation, are not listed unless
6677 the source of a copy/move operation, are not listed unless
6678 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6678 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6679 Unless options described with "show only ..." are given, the
6679 Unless options described with "show only ..." are given, the
6680 options -mardu are used.
6680 options -mardu are used.
6681
6681
6682 Option -q/--quiet hides untracked (unknown and ignored) files
6682 Option -q/--quiet hides untracked (unknown and ignored) files
6683 unless explicitly requested with -u/--unknown or -i/--ignored.
6683 unless explicitly requested with -u/--unknown or -i/--ignored.
6684
6684
6685 .. note::
6685 .. note::
6686
6686
6687 :hg:`status` may appear to disagree with diff if permissions have
6687 :hg:`status` may appear to disagree with diff if permissions have
6688 changed or a merge has occurred. The standard diff format does
6688 changed or a merge has occurred. The standard diff format does
6689 not report permission changes and diff only reports changes
6689 not report permission changes and diff only reports changes
6690 relative to one merge parent.
6690 relative to one merge parent.
6691
6691
6692 If one revision is given, it is used as the base revision.
6692 If one revision is given, it is used as the base revision.
6693 If two revisions are given, the differences between them are
6693 If two revisions are given, the differences between them are
6694 shown. The --change option can also be used as a shortcut to list
6694 shown. The --change option can also be used as a shortcut to list
6695 the changed files of a revision from its first parent.
6695 the changed files of a revision from its first parent.
6696
6696
6697 The codes used to show the status of files are::
6697 The codes used to show the status of files are::
6698
6698
6699 M = modified
6699 M = modified
6700 A = added
6700 A = added
6701 R = removed
6701 R = removed
6702 C = clean
6702 C = clean
6703 ! = missing (deleted by non-hg command, but still tracked)
6703 ! = missing (deleted by non-hg command, but still tracked)
6704 ? = not tracked
6704 ? = not tracked
6705 I = ignored
6705 I = ignored
6706 = origin of the previous file (with --copies)
6706 = origin of the previous file (with --copies)
6707
6707
6708 .. container:: verbose
6708 .. container:: verbose
6709
6709
6710 The -t/--terse option abbreviates the output by showing only the directory
6710 The -t/--terse option abbreviates the output by showing only the directory
6711 name if all the files in it share the same status. The option takes an
6711 name if all the files in it share the same status. The option takes an
6712 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6712 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6713 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6713 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6714 for 'ignored' and 'c' for clean.
6714 for 'ignored' and 'c' for clean.
6715
6715
6716 It abbreviates only those statuses which are passed. Note that clean and
6716 It abbreviates only those statuses which are passed. Note that clean and
6717 ignored files are not displayed with '--terse ic' unless the -c/--clean
6717 ignored files are not displayed with '--terse ic' unless the -c/--clean
6718 and -i/--ignored options are also used.
6718 and -i/--ignored options are also used.
6719
6719
6720 The -v/--verbose option shows information when the repository is in an
6720 The -v/--verbose option shows information when the repository is in an
6721 unfinished merge, shelve, rebase state etc. You can have this behavior
6721 unfinished merge, shelve, rebase state etc. You can have this behavior
6722 turned on by default by enabling the ``commands.status.verbose`` option.
6722 turned on by default by enabling the ``commands.status.verbose`` option.
6723
6723
6724 You can skip displaying some of these states by setting
6724 You can skip displaying some of these states by setting
6725 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6725 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6726 'histedit', 'merge', 'rebase', or 'unshelve'.
6726 'histedit', 'merge', 'rebase', or 'unshelve'.
6727
6727
6728 Template:
6728 Template:
6729
6729
6730 The following keywords are supported in addition to the common template
6730 The following keywords are supported in addition to the common template
6731 keywords and functions. See also :hg:`help templates`.
6731 keywords and functions. See also :hg:`help templates`.
6732
6732
6733 :path: String. Repository-absolute path of the file.
6733 :path: String. Repository-absolute path of the file.
6734 :source: String. Repository-absolute path of the file originated from.
6734 :source: String. Repository-absolute path of the file originated from.
6735 Available if ``--copies`` is specified.
6735 Available if ``--copies`` is specified.
6736 :status: String. Character denoting file's status.
6736 :status: String. Character denoting file's status.
6737
6737
6738 Examples:
6738 Examples:
6739
6739
6740 - show changes in the working directory relative to a
6740 - show changes in the working directory relative to a
6741 changeset::
6741 changeset::
6742
6742
6743 hg status --rev 9353
6743 hg status --rev 9353
6744
6744
6745 - show changes in the working directory relative to the
6745 - show changes in the working directory relative to the
6746 current directory (see :hg:`help patterns` for more information)::
6746 current directory (see :hg:`help patterns` for more information)::
6747
6747
6748 hg status re:
6748 hg status re:
6749
6749
6750 - show all changes including copies in an existing changeset::
6750 - show all changes including copies in an existing changeset::
6751
6751
6752 hg status --copies --change 9353
6752 hg status --copies --change 9353
6753
6753
6754 - get a NUL separated list of added files, suitable for xargs::
6754 - get a NUL separated list of added files, suitable for xargs::
6755
6755
6756 hg status -an0
6756 hg status -an0
6757
6757
6758 - show more information about the repository status, abbreviating
6758 - show more information about the repository status, abbreviating
6759 added, removed, modified, deleted, and untracked paths::
6759 added, removed, modified, deleted, and untracked paths::
6760
6760
6761 hg status -v -t mardu
6761 hg status -v -t mardu
6762
6762
6763 Returns 0 on success.
6763 Returns 0 on success.
6764
6764
6765 """
6765 """
6766
6766
6767 opts = pycompat.byteskwargs(opts)
6767 opts = pycompat.byteskwargs(opts)
6768 revs = opts.get(b'rev')
6768 revs = opts.get(b'rev')
6769 change = opts.get(b'change')
6769 change = opts.get(b'change')
6770 terse = opts.get(b'terse')
6770 terse = opts.get(b'terse')
6771 if terse is _NOTTERSE:
6771 if terse is _NOTTERSE:
6772 if revs:
6772 if revs:
6773 terse = b''
6773 terse = b''
6774 else:
6774 else:
6775 terse = ui.config(b'commands', b'status.terse')
6775 terse = ui.config(b'commands', b'status.terse')
6776
6776
6777 if revs and change:
6777 if revs and change:
6778 msg = _(b'cannot specify --rev and --change at the same time')
6778 msg = _(b'cannot specify --rev and --change at the same time')
6779 raise error.Abort(msg)
6779 raise error.Abort(msg)
6780 elif revs and terse:
6780 elif revs and terse:
6781 msg = _(b'cannot use --terse with --rev')
6781 msg = _(b'cannot use --terse with --rev')
6782 raise error.Abort(msg)
6782 raise error.Abort(msg)
6783 elif change:
6783 elif change:
6784 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6784 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6785 ctx2 = scmutil.revsingle(repo, change, None)
6785 ctx2 = scmutil.revsingle(repo, change, None)
6786 ctx1 = ctx2.p1()
6786 ctx1 = ctx2.p1()
6787 else:
6787 else:
6788 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6788 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6789 ctx1, ctx2 = scmutil.revpair(repo, revs)
6789 ctx1, ctx2 = scmutil.revpair(repo, revs)
6790
6790
6791 forcerelativevalue = None
6791 forcerelativevalue = None
6792 if ui.hasconfig(b'commands', b'status.relative'):
6792 if ui.hasconfig(b'commands', b'status.relative'):
6793 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6793 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6794 uipathfn = scmutil.getuipathfn(
6794 uipathfn = scmutil.getuipathfn(
6795 repo,
6795 repo,
6796 legacyrelativevalue=bool(pats),
6796 legacyrelativevalue=bool(pats),
6797 forcerelativevalue=forcerelativevalue,
6797 forcerelativevalue=forcerelativevalue,
6798 )
6798 )
6799
6799
6800 if opts.get(b'print0'):
6800 if opts.get(b'print0'):
6801 end = b'\0'
6801 end = b'\0'
6802 else:
6802 else:
6803 end = b'\n'
6803 end = b'\n'
6804 states = b'modified added removed deleted unknown ignored clean'.split()
6804 states = b'modified added removed deleted unknown ignored clean'.split()
6805 show = [k for k in states if opts.get(k)]
6805 show = [k for k in states if opts.get(k)]
6806 if opts.get(b'all'):
6806 if opts.get(b'all'):
6807 show += ui.quiet and (states[:4] + [b'clean']) or states
6807 show += ui.quiet and (states[:4] + [b'clean']) or states
6808
6808
6809 if not show:
6809 if not show:
6810 if ui.quiet:
6810 if ui.quiet:
6811 show = states[:4]
6811 show = states[:4]
6812 else:
6812 else:
6813 show = states[:5]
6813 show = states[:5]
6814
6814
6815 m = scmutil.match(ctx2, pats, opts)
6815 m = scmutil.match(ctx2, pats, opts)
6816 if terse:
6816 if terse:
6817 # we need to compute clean and unknown to terse
6817 # we need to compute clean and unknown to terse
6818 stat = repo.status(
6818 stat = repo.status(
6819 ctx1.node(),
6819 ctx1.node(),
6820 ctx2.node(),
6820 ctx2.node(),
6821 m,
6821 m,
6822 b'ignored' in show or b'i' in terse,
6822 b'ignored' in show or b'i' in terse,
6823 clean=True,
6823 clean=True,
6824 unknown=True,
6824 unknown=True,
6825 listsubrepos=opts.get(b'subrepos'),
6825 listsubrepos=opts.get(b'subrepos'),
6826 )
6826 )
6827
6827
6828 stat = cmdutil.tersedir(stat, terse)
6828 stat = cmdutil.tersedir(stat, terse)
6829 else:
6829 else:
6830 stat = repo.status(
6830 stat = repo.status(
6831 ctx1.node(),
6831 ctx1.node(),
6832 ctx2.node(),
6832 ctx2.node(),
6833 m,
6833 m,
6834 b'ignored' in show,
6834 b'ignored' in show,
6835 b'clean' in show,
6835 b'clean' in show,
6836 b'unknown' in show,
6836 b'unknown' in show,
6837 opts.get(b'subrepos'),
6837 opts.get(b'subrepos'),
6838 )
6838 )
6839
6839
6840 changestates = zip(
6840 changestates = zip(
6841 states,
6841 states,
6842 pycompat.iterbytestr(b'MAR!?IC'),
6842 pycompat.iterbytestr(b'MAR!?IC'),
6843 [getattr(stat, s.decode('utf8')) for s in states],
6843 [getattr(stat, s.decode('utf8')) for s in states],
6844 )
6844 )
6845
6845
6846 copy = {}
6846 copy = {}
6847 if (
6847 if (
6848 opts.get(b'all')
6848 opts.get(b'all')
6849 or opts.get(b'copies')
6849 or opts.get(b'copies')
6850 or ui.configbool(b'ui', b'statuscopies')
6850 or ui.configbool(b'ui', b'statuscopies')
6851 ) and not opts.get(b'no_status'):
6851 ) and not opts.get(b'no_status'):
6852 copy = copies.pathcopies(ctx1, ctx2, m)
6852 copy = copies.pathcopies(ctx1, ctx2, m)
6853
6853
6854 morestatus = None
6854 morestatus = None
6855 if (
6855 if (
6856 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6856 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6857 ) and not ui.plain():
6857 ) and not ui.plain():
6858 morestatus = cmdutil.readmorestatus(repo)
6858 morestatus = cmdutil.readmorestatus(repo)
6859
6859
6860 ui.pager(b'status')
6860 ui.pager(b'status')
6861 fm = ui.formatter(b'status', opts)
6861 fm = ui.formatter(b'status', opts)
6862 fmt = b'%s' + end
6862 fmt = b'%s' + end
6863 showchar = not opts.get(b'no_status')
6863 showchar = not opts.get(b'no_status')
6864
6864
6865 for state, char, files in changestates:
6865 for state, char, files in changestates:
6866 if state in show:
6866 if state in show:
6867 label = b'status.' + state
6867 label = b'status.' + state
6868 for f in files:
6868 for f in files:
6869 fm.startitem()
6869 fm.startitem()
6870 fm.context(ctx=ctx2)
6870 fm.context(ctx=ctx2)
6871 fm.data(itemtype=b'file', path=f)
6871 fm.data(itemtype=b'file', path=f)
6872 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6872 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6873 fm.plain(fmt % uipathfn(f), label=label)
6873 fm.plain(fmt % uipathfn(f), label=label)
6874 if f in copy:
6874 if f in copy:
6875 fm.data(source=copy[f])
6875 fm.data(source=copy[f])
6876 fm.plain(
6876 fm.plain(
6877 (b' %s' + end) % uipathfn(copy[f]),
6877 (b' %s' + end) % uipathfn(copy[f]),
6878 label=b'status.copied',
6878 label=b'status.copied',
6879 )
6879 )
6880 if morestatus:
6880 if morestatus:
6881 morestatus.formatfile(f, fm)
6881 morestatus.formatfile(f, fm)
6882
6882
6883 if morestatus:
6883 if morestatus:
6884 morestatus.formatfooter(fm)
6884 morestatus.formatfooter(fm)
6885 fm.end()
6885 fm.end()
6886
6886
6887
6887
6888 @command(
6888 @command(
6889 b'summary|sum',
6889 b'summary|sum',
6890 [(b'', b'remote', None, _(b'check for push and pull'))],
6890 [(b'', b'remote', None, _(b'check for push and pull'))],
6891 b'[--remote]',
6891 b'[--remote]',
6892 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6892 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6893 helpbasic=True,
6893 helpbasic=True,
6894 intents={INTENT_READONLY},
6894 intents={INTENT_READONLY},
6895 )
6895 )
6896 def summary(ui, repo, **opts):
6896 def summary(ui, repo, **opts):
6897 """summarize working directory state
6897 """summarize working directory state
6898
6898
6899 This generates a brief summary of the working directory state,
6899 This generates a brief summary of the working directory state,
6900 including parents, branch, commit status, phase and available updates.
6900 including parents, branch, commit status, phase and available updates.
6901
6901
6902 With the --remote option, this will check the default paths for
6902 With the --remote option, this will check the default paths for
6903 incoming and outgoing changes. This can be time-consuming.
6903 incoming and outgoing changes. This can be time-consuming.
6904
6904
6905 Returns 0 on success.
6905 Returns 0 on success.
6906 """
6906 """
6907
6907
6908 opts = pycompat.byteskwargs(opts)
6908 opts = pycompat.byteskwargs(opts)
6909 ui.pager(b'summary')
6909 ui.pager(b'summary')
6910 ctx = repo[None]
6910 ctx = repo[None]
6911 parents = ctx.parents()
6911 parents = ctx.parents()
6912 pnode = parents[0].node()
6912 pnode = parents[0].node()
6913 marks = []
6913 marks = []
6914
6914
6915 try:
6915 try:
6916 ms = mergemod.mergestate.read(repo)
6916 ms = mergemod.mergestate.read(repo)
6917 except error.UnsupportedMergeRecords as e:
6917 except error.UnsupportedMergeRecords as e:
6918 s = b' '.join(e.recordtypes)
6918 s = b' '.join(e.recordtypes)
6919 ui.warn(
6919 ui.warn(
6920 _(b'warning: merge state has unsupported record types: %s\n') % s
6920 _(b'warning: merge state has unsupported record types: %s\n') % s
6921 )
6921 )
6922 unresolved = []
6922 unresolved = []
6923 else:
6923 else:
6924 unresolved = list(ms.unresolved())
6924 unresolved = list(ms.unresolved())
6925
6925
6926 for p in parents:
6926 for p in parents:
6927 # label with log.changeset (instead of log.parent) since this
6927 # label with log.changeset (instead of log.parent) since this
6928 # shows a working directory parent *changeset*:
6928 # shows a working directory parent *changeset*:
6929 # i18n: column positioning for "hg summary"
6929 # i18n: column positioning for "hg summary"
6930 ui.write(
6930 ui.write(
6931 _(b'parent: %d:%s ') % (p.rev(), p),
6931 _(b'parent: %d:%s ') % (p.rev(), p),
6932 label=logcmdutil.changesetlabels(p),
6932 label=logcmdutil.changesetlabels(p),
6933 )
6933 )
6934 ui.write(b' '.join(p.tags()), label=b'log.tag')
6934 ui.write(b' '.join(p.tags()), label=b'log.tag')
6935 if p.bookmarks():
6935 if p.bookmarks():
6936 marks.extend(p.bookmarks())
6936 marks.extend(p.bookmarks())
6937 if p.rev() == -1:
6937 if p.rev() == -1:
6938 if not len(repo):
6938 if not len(repo):
6939 ui.write(_(b' (empty repository)'))
6939 ui.write(_(b' (empty repository)'))
6940 else:
6940 else:
6941 ui.write(_(b' (no revision checked out)'))
6941 ui.write(_(b' (no revision checked out)'))
6942 if p.obsolete():
6942 if p.obsolete():
6943 ui.write(_(b' (obsolete)'))
6943 ui.write(_(b' (obsolete)'))
6944 if p.isunstable():
6944 if p.isunstable():
6945 instabilities = (
6945 instabilities = (
6946 ui.label(instability, b'trouble.%s' % instability)
6946 ui.label(instability, b'trouble.%s' % instability)
6947 for instability in p.instabilities()
6947 for instability in p.instabilities()
6948 )
6948 )
6949 ui.write(b' (' + b', '.join(instabilities) + b')')
6949 ui.write(b' (' + b', '.join(instabilities) + b')')
6950 ui.write(b'\n')
6950 ui.write(b'\n')
6951 if p.description():
6951 if p.description():
6952 ui.status(
6952 ui.status(
6953 b' ' + p.description().splitlines()[0].strip() + b'\n',
6953 b' ' + p.description().splitlines()[0].strip() + b'\n',
6954 label=b'log.summary',
6954 label=b'log.summary',
6955 )
6955 )
6956
6956
6957 branch = ctx.branch()
6957 branch = ctx.branch()
6958 bheads = repo.branchheads(branch)
6958 bheads = repo.branchheads(branch)
6959 # i18n: column positioning for "hg summary"
6959 # i18n: column positioning for "hg summary"
6960 m = _(b'branch: %s\n') % branch
6960 m = _(b'branch: %s\n') % branch
6961 if branch != b'default':
6961 if branch != b'default':
6962 ui.write(m, label=b'log.branch')
6962 ui.write(m, label=b'log.branch')
6963 else:
6963 else:
6964 ui.status(m, label=b'log.branch')
6964 ui.status(m, label=b'log.branch')
6965
6965
6966 if marks:
6966 if marks:
6967 active = repo._activebookmark
6967 active = repo._activebookmark
6968 # i18n: column positioning for "hg summary"
6968 # i18n: column positioning for "hg summary"
6969 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6969 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6970 if active is not None:
6970 if active is not None:
6971 if active in marks:
6971 if active in marks:
6972 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6972 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6973 marks.remove(active)
6973 marks.remove(active)
6974 else:
6974 else:
6975 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6975 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6976 for m in marks:
6976 for m in marks:
6977 ui.write(b' ' + m, label=b'log.bookmark')
6977 ui.write(b' ' + m, label=b'log.bookmark')
6978 ui.write(b'\n', label=b'log.bookmark')
6978 ui.write(b'\n', label=b'log.bookmark')
6979
6979
6980 status = repo.status(unknown=True)
6980 status = repo.status(unknown=True)
6981
6981
6982 c = repo.dirstate.copies()
6982 c = repo.dirstate.copies()
6983 copied, renamed = [], []
6983 copied, renamed = [], []
6984 for d, s in pycompat.iteritems(c):
6984 for d, s in pycompat.iteritems(c):
6985 if s in status.removed:
6985 if s in status.removed:
6986 status.removed.remove(s)
6986 status.removed.remove(s)
6987 renamed.append(d)
6987 renamed.append(d)
6988 else:
6988 else:
6989 copied.append(d)
6989 copied.append(d)
6990 if d in status.added:
6990 if d in status.added:
6991 status.added.remove(d)
6991 status.added.remove(d)
6992
6992
6993 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6993 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6994
6994
6995 labels = [
6995 labels = [
6996 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6996 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6997 (ui.label(_(b'%d added'), b'status.added'), status.added),
6997 (ui.label(_(b'%d added'), b'status.added'), status.added),
6998 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6998 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6999 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6999 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7000 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7000 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7001 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7001 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7002 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7002 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7003 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7003 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7004 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7004 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7005 ]
7005 ]
7006 t = []
7006 t = []
7007 for l, s in labels:
7007 for l, s in labels:
7008 if s:
7008 if s:
7009 t.append(l % len(s))
7009 t.append(l % len(s))
7010
7010
7011 t = b', '.join(t)
7011 t = b', '.join(t)
7012 cleanworkdir = False
7012 cleanworkdir = False
7013
7013
7014 if repo.vfs.exists(b'graftstate'):
7014 if repo.vfs.exists(b'graftstate'):
7015 t += _(b' (graft in progress)')
7015 t += _(b' (graft in progress)')
7016 if repo.vfs.exists(b'updatestate'):
7016 if repo.vfs.exists(b'updatestate'):
7017 t += _(b' (interrupted update)')
7017 t += _(b' (interrupted update)')
7018 elif len(parents) > 1:
7018 elif len(parents) > 1:
7019 t += _(b' (merge)')
7019 t += _(b' (merge)')
7020 elif branch != parents[0].branch():
7020 elif branch != parents[0].branch():
7021 t += _(b' (new branch)')
7021 t += _(b' (new branch)')
7022 elif parents[0].closesbranch() and pnode in repo.branchheads(
7022 elif parents[0].closesbranch() and pnode in repo.branchheads(
7023 branch, closed=True
7023 branch, closed=True
7024 ):
7024 ):
7025 t += _(b' (head closed)')
7025 t += _(b' (head closed)')
7026 elif not (
7026 elif not (
7027 status.modified
7027 status.modified
7028 or status.added
7028 or status.added
7029 or status.removed
7029 or status.removed
7030 or renamed
7030 or renamed
7031 or copied
7031 or copied
7032 or subs
7032 or subs
7033 ):
7033 ):
7034 t += _(b' (clean)')
7034 t += _(b' (clean)')
7035 cleanworkdir = True
7035 cleanworkdir = True
7036 elif pnode not in bheads:
7036 elif pnode not in bheads:
7037 t += _(b' (new branch head)')
7037 t += _(b' (new branch head)')
7038
7038
7039 if parents:
7039 if parents:
7040 pendingphase = max(p.phase() for p in parents)
7040 pendingphase = max(p.phase() for p in parents)
7041 else:
7041 else:
7042 pendingphase = phases.public
7042 pendingphase = phases.public
7043
7043
7044 if pendingphase > phases.newcommitphase(ui):
7044 if pendingphase > phases.newcommitphase(ui):
7045 t += b' (%s)' % phases.phasenames[pendingphase]
7045 t += b' (%s)' % phases.phasenames[pendingphase]
7046
7046
7047 if cleanworkdir:
7047 if cleanworkdir:
7048 # i18n: column positioning for "hg summary"
7048 # i18n: column positioning for "hg summary"
7049 ui.status(_(b'commit: %s\n') % t.strip())
7049 ui.status(_(b'commit: %s\n') % t.strip())
7050 else:
7050 else:
7051 # i18n: column positioning for "hg summary"
7051 # i18n: column positioning for "hg summary"
7052 ui.write(_(b'commit: %s\n') % t.strip())
7052 ui.write(_(b'commit: %s\n') % t.strip())
7053
7053
7054 # all ancestors of branch heads - all ancestors of parent = new csets
7054 # all ancestors of branch heads - all ancestors of parent = new csets
7055 new = len(
7055 new = len(
7056 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7056 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7057 )
7057 )
7058
7058
7059 if new == 0:
7059 if new == 0:
7060 # i18n: column positioning for "hg summary"
7060 # i18n: column positioning for "hg summary"
7061 ui.status(_(b'update: (current)\n'))
7061 ui.status(_(b'update: (current)\n'))
7062 elif pnode not in bheads:
7062 elif pnode not in bheads:
7063 # i18n: column positioning for "hg summary"
7063 # i18n: column positioning for "hg summary"
7064 ui.write(_(b'update: %d new changesets (update)\n') % new)
7064 ui.write(_(b'update: %d new changesets (update)\n') % new)
7065 else:
7065 else:
7066 # i18n: column positioning for "hg summary"
7066 # i18n: column positioning for "hg summary"
7067 ui.write(
7067 ui.write(
7068 _(b'update: %d new changesets, %d branch heads (merge)\n')
7068 _(b'update: %d new changesets, %d branch heads (merge)\n')
7069 % (new, len(bheads))
7069 % (new, len(bheads))
7070 )
7070 )
7071
7071
7072 t = []
7072 t = []
7073 draft = len(repo.revs(b'draft()'))
7073 draft = len(repo.revs(b'draft()'))
7074 if draft:
7074 if draft:
7075 t.append(_(b'%d draft') % draft)
7075 t.append(_(b'%d draft') % draft)
7076 secret = len(repo.revs(b'secret()'))
7076 secret = len(repo.revs(b'secret()'))
7077 if secret:
7077 if secret:
7078 t.append(_(b'%d secret') % secret)
7078 t.append(_(b'%d secret') % secret)
7079
7079
7080 if draft or secret:
7080 if draft or secret:
7081 ui.status(_(b'phases: %s\n') % b', '.join(t))
7081 ui.status(_(b'phases: %s\n') % b', '.join(t))
7082
7082
7083 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7083 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7084 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7084 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7085 numtrouble = len(repo.revs(trouble + b"()"))
7085 numtrouble = len(repo.revs(trouble + b"()"))
7086 # We write all the possibilities to ease translation
7086 # We write all the possibilities to ease translation
7087 troublemsg = {
7087 troublemsg = {
7088 b"orphan": _(b"orphan: %d changesets"),
7088 b"orphan": _(b"orphan: %d changesets"),
7089 b"contentdivergent": _(b"content-divergent: %d changesets"),
7089 b"contentdivergent": _(b"content-divergent: %d changesets"),
7090 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7090 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7091 }
7091 }
7092 if numtrouble > 0:
7092 if numtrouble > 0:
7093 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7093 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7094
7094
7095 cmdutil.summaryhooks(ui, repo)
7095 cmdutil.summaryhooks(ui, repo)
7096
7096
7097 if opts.get(b'remote'):
7097 if opts.get(b'remote'):
7098 needsincoming, needsoutgoing = True, True
7098 needsincoming, needsoutgoing = True, True
7099 else:
7099 else:
7100 needsincoming, needsoutgoing = False, False
7100 needsincoming, needsoutgoing = False, False
7101 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7101 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7102 if i:
7102 if i:
7103 needsincoming = True
7103 needsincoming = True
7104 if o:
7104 if o:
7105 needsoutgoing = True
7105 needsoutgoing = True
7106 if not needsincoming and not needsoutgoing:
7106 if not needsincoming and not needsoutgoing:
7107 return
7107 return
7108
7108
7109 def getincoming():
7109 def getincoming():
7110 source, branches = hg.parseurl(ui.expandpath(b'default'))
7110 source, branches = hg.parseurl(ui.expandpath(b'default'))
7111 sbranch = branches[0]
7111 sbranch = branches[0]
7112 try:
7112 try:
7113 other = hg.peer(repo, {}, source)
7113 other = hg.peer(repo, {}, source)
7114 except error.RepoError:
7114 except error.RepoError:
7115 if opts.get(b'remote'):
7115 if opts.get(b'remote'):
7116 raise
7116 raise
7117 return source, sbranch, None, None, None
7117 return source, sbranch, None, None, None
7118 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7118 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7119 if revs:
7119 if revs:
7120 revs = [other.lookup(rev) for rev in revs]
7120 revs = [other.lookup(rev) for rev in revs]
7121 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7121 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7122 repo.ui.pushbuffer()
7122 repo.ui.pushbuffer()
7123 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7123 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7124 repo.ui.popbuffer()
7124 repo.ui.popbuffer()
7125 return source, sbranch, other, commoninc, commoninc[1]
7125 return source, sbranch, other, commoninc, commoninc[1]
7126
7126
7127 if needsincoming:
7127 if needsincoming:
7128 source, sbranch, sother, commoninc, incoming = getincoming()
7128 source, sbranch, sother, commoninc, incoming = getincoming()
7129 else:
7129 else:
7130 source = sbranch = sother = commoninc = incoming = None
7130 source = sbranch = sother = commoninc = incoming = None
7131
7131
7132 def getoutgoing():
7132 def getoutgoing():
7133 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7133 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7134 dbranch = branches[0]
7134 dbranch = branches[0]
7135 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7135 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7136 if source != dest:
7136 if source != dest:
7137 try:
7137 try:
7138 dother = hg.peer(repo, {}, dest)
7138 dother = hg.peer(repo, {}, dest)
7139 except error.RepoError:
7139 except error.RepoError:
7140 if opts.get(b'remote'):
7140 if opts.get(b'remote'):
7141 raise
7141 raise
7142 return dest, dbranch, None, None
7142 return dest, dbranch, None, None
7143 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7143 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7144 elif sother is None:
7144 elif sother is None:
7145 # there is no explicit destination peer, but source one is invalid
7145 # there is no explicit destination peer, but source one is invalid
7146 return dest, dbranch, None, None
7146 return dest, dbranch, None, None
7147 else:
7147 else:
7148 dother = sother
7148 dother = sother
7149 if source != dest or (sbranch is not None and sbranch != dbranch):
7149 if source != dest or (sbranch is not None and sbranch != dbranch):
7150 common = None
7150 common = None
7151 else:
7151 else:
7152 common = commoninc
7152 common = commoninc
7153 if revs:
7153 if revs:
7154 revs = [repo.lookup(rev) for rev in revs]
7154 revs = [repo.lookup(rev) for rev in revs]
7155 repo.ui.pushbuffer()
7155 repo.ui.pushbuffer()
7156 outgoing = discovery.findcommonoutgoing(
7156 outgoing = discovery.findcommonoutgoing(
7157 repo, dother, onlyheads=revs, commoninc=common
7157 repo, dother, onlyheads=revs, commoninc=common
7158 )
7158 )
7159 repo.ui.popbuffer()
7159 repo.ui.popbuffer()
7160 return dest, dbranch, dother, outgoing
7160 return dest, dbranch, dother, outgoing
7161
7161
7162 if needsoutgoing:
7162 if needsoutgoing:
7163 dest, dbranch, dother, outgoing = getoutgoing()
7163 dest, dbranch, dother, outgoing = getoutgoing()
7164 else:
7164 else:
7165 dest = dbranch = dother = outgoing = None
7165 dest = dbranch = dother = outgoing = None
7166
7166
7167 if opts.get(b'remote'):
7167 if opts.get(b'remote'):
7168 t = []
7168 t = []
7169 if incoming:
7169 if incoming:
7170 t.append(_(b'1 or more incoming'))
7170 t.append(_(b'1 or more incoming'))
7171 o = outgoing.missing
7171 o = outgoing.missing
7172 if o:
7172 if o:
7173 t.append(_(b'%d outgoing') % len(o))
7173 t.append(_(b'%d outgoing') % len(o))
7174 other = dother or sother
7174 other = dother or sother
7175 if b'bookmarks' in other.listkeys(b'namespaces'):
7175 if b'bookmarks' in other.listkeys(b'namespaces'):
7176 counts = bookmarks.summary(repo, other)
7176 counts = bookmarks.summary(repo, other)
7177 if counts[0] > 0:
7177 if counts[0] > 0:
7178 t.append(_(b'%d incoming bookmarks') % counts[0])
7178 t.append(_(b'%d incoming bookmarks') % counts[0])
7179 if counts[1] > 0:
7179 if counts[1] > 0:
7180 t.append(_(b'%d outgoing bookmarks') % counts[1])
7180 t.append(_(b'%d outgoing bookmarks') % counts[1])
7181
7181
7182 if t:
7182 if t:
7183 # i18n: column positioning for "hg summary"
7183 # i18n: column positioning for "hg summary"
7184 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7184 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7185 else:
7185 else:
7186 # i18n: column positioning for "hg summary"
7186 # i18n: column positioning for "hg summary"
7187 ui.status(_(b'remote: (synced)\n'))
7187 ui.status(_(b'remote: (synced)\n'))
7188
7188
7189 cmdutil.summaryremotehooks(
7189 cmdutil.summaryremotehooks(
7190 ui,
7190 ui,
7191 repo,
7191 repo,
7192 opts,
7192 opts,
7193 (
7193 (
7194 (source, sbranch, sother, commoninc),
7194 (source, sbranch, sother, commoninc),
7195 (dest, dbranch, dother, outgoing),
7195 (dest, dbranch, dother, outgoing),
7196 ),
7196 ),
7197 )
7197 )
7198
7198
7199
7199
7200 @command(
7200 @command(
7201 b'tag',
7201 b'tag',
7202 [
7202 [
7203 (b'f', b'force', None, _(b'force tag')),
7203 (b'f', b'force', None, _(b'force tag')),
7204 (b'l', b'local', None, _(b'make the tag local')),
7204 (b'l', b'local', None, _(b'make the tag local')),
7205 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7205 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7206 (b'', b'remove', None, _(b'remove a tag')),
7206 (b'', b'remove', None, _(b'remove a tag')),
7207 # -l/--local is already there, commitopts cannot be used
7207 # -l/--local is already there, commitopts cannot be used
7208 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7208 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7209 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7209 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7210 ]
7210 ]
7211 + commitopts2,
7211 + commitopts2,
7212 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7212 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7213 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7213 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7214 )
7214 )
7215 def tag(ui, repo, name1, *names, **opts):
7215 def tag(ui, repo, name1, *names, **opts):
7216 """add one or more tags for the current or given revision
7216 """add one or more tags for the current or given revision
7217
7217
7218 Name a particular revision using <name>.
7218 Name a particular revision using <name>.
7219
7219
7220 Tags are used to name particular revisions of the repository and are
7220 Tags are used to name particular revisions of the repository and are
7221 very useful to compare different revisions, to go back to significant
7221 very useful to compare different revisions, to go back to significant
7222 earlier versions or to mark branch points as releases, etc. Changing
7222 earlier versions or to mark branch points as releases, etc. Changing
7223 an existing tag is normally disallowed; use -f/--force to override.
7223 an existing tag is normally disallowed; use -f/--force to override.
7224
7224
7225 If no revision is given, the parent of the working directory is
7225 If no revision is given, the parent of the working directory is
7226 used.
7226 used.
7227
7227
7228 To facilitate version control, distribution, and merging of tags,
7228 To facilitate version control, distribution, and merging of tags,
7229 they are stored as a file named ".hgtags" which is managed similarly
7229 they are stored as a file named ".hgtags" which is managed similarly
7230 to other project files and can be hand-edited if necessary. This
7230 to other project files and can be hand-edited if necessary. This
7231 also means that tagging creates a new commit. The file
7231 also means that tagging creates a new commit. The file
7232 ".hg/localtags" is used for local tags (not shared among
7232 ".hg/localtags" is used for local tags (not shared among
7233 repositories).
7233 repositories).
7234
7234
7235 Tag commits are usually made at the head of a branch. If the parent
7235 Tag commits are usually made at the head of a branch. If the parent
7236 of the working directory is not a branch head, :hg:`tag` aborts; use
7236 of the working directory is not a branch head, :hg:`tag` aborts; use
7237 -f/--force to force the tag commit to be based on a non-head
7237 -f/--force to force the tag commit to be based on a non-head
7238 changeset.
7238 changeset.
7239
7239
7240 See :hg:`help dates` for a list of formats valid for -d/--date.
7240 See :hg:`help dates` for a list of formats valid for -d/--date.
7241
7241
7242 Since tag names have priority over branch names during revision
7242 Since tag names have priority over branch names during revision
7243 lookup, using an existing branch name as a tag name is discouraged.
7243 lookup, using an existing branch name as a tag name is discouraged.
7244
7244
7245 Returns 0 on success.
7245 Returns 0 on success.
7246 """
7246 """
7247 opts = pycompat.byteskwargs(opts)
7247 opts = pycompat.byteskwargs(opts)
7248 with repo.wlock(), repo.lock():
7248 with repo.wlock(), repo.lock():
7249 rev_ = b"."
7249 rev_ = b"."
7250 names = [t.strip() for t in (name1,) + names]
7250 names = [t.strip() for t in (name1,) + names]
7251 if len(names) != len(set(names)):
7251 if len(names) != len(set(names)):
7252 raise error.Abort(_(b'tag names must be unique'))
7252 raise error.Abort(_(b'tag names must be unique'))
7253 for n in names:
7253 for n in names:
7254 scmutil.checknewlabel(repo, n, b'tag')
7254 scmutil.checknewlabel(repo, n, b'tag')
7255 if not n:
7255 if not n:
7256 raise error.Abort(
7256 raise error.Abort(
7257 _(b'tag names cannot consist entirely of whitespace')
7257 _(b'tag names cannot consist entirely of whitespace')
7258 )
7258 )
7259 if opts.get(b'rev') and opts.get(b'remove'):
7259 if opts.get(b'rev') and opts.get(b'remove'):
7260 raise error.Abort(_(b"--rev and --remove are incompatible"))
7260 raise error.Abort(_(b"--rev and --remove are incompatible"))
7261 if opts.get(b'rev'):
7261 if opts.get(b'rev'):
7262 rev_ = opts[b'rev']
7262 rev_ = opts[b'rev']
7263 message = opts.get(b'message')
7263 message = opts.get(b'message')
7264 if opts.get(b'remove'):
7264 if opts.get(b'remove'):
7265 if opts.get(b'local'):
7265 if opts.get(b'local'):
7266 expectedtype = b'local'
7266 expectedtype = b'local'
7267 else:
7267 else:
7268 expectedtype = b'global'
7268 expectedtype = b'global'
7269
7269
7270 for n in names:
7270 for n in names:
7271 if repo.tagtype(n) == b'global':
7271 if repo.tagtype(n) == b'global':
7272 alltags = tagsmod.findglobaltags(ui, repo)
7272 alltags = tagsmod.findglobaltags(ui, repo)
7273 if alltags[n][0] == nullid:
7273 if alltags[n][0] == nullid:
7274 raise error.Abort(_(b"tag '%s' is already removed") % n)
7274 raise error.Abort(_(b"tag '%s' is already removed") % n)
7275 if not repo.tagtype(n):
7275 if not repo.tagtype(n):
7276 raise error.Abort(_(b"tag '%s' does not exist") % n)
7276 raise error.Abort(_(b"tag '%s' does not exist") % n)
7277 if repo.tagtype(n) != expectedtype:
7277 if repo.tagtype(n) != expectedtype:
7278 if expectedtype == b'global':
7278 if expectedtype == b'global':
7279 raise error.Abort(
7279 raise error.Abort(
7280 _(b"tag '%s' is not a global tag") % n
7280 _(b"tag '%s' is not a global tag") % n
7281 )
7281 )
7282 else:
7282 else:
7283 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7283 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7284 rev_ = b'null'
7284 rev_ = b'null'
7285 if not message:
7285 if not message:
7286 # we don't translate commit messages
7286 # we don't translate commit messages
7287 message = b'Removed tag %s' % b', '.join(names)
7287 message = b'Removed tag %s' % b', '.join(names)
7288 elif not opts.get(b'force'):
7288 elif not opts.get(b'force'):
7289 for n in names:
7289 for n in names:
7290 if n in repo.tags():
7290 if n in repo.tags():
7291 raise error.Abort(
7291 raise error.Abort(
7292 _(b"tag '%s' already exists (use -f to force)") % n
7292 _(b"tag '%s' already exists (use -f to force)") % n
7293 )
7293 )
7294 if not opts.get(b'local'):
7294 if not opts.get(b'local'):
7295 p1, p2 = repo.dirstate.parents()
7295 p1, p2 = repo.dirstate.parents()
7296 if p2 != nullid:
7296 if p2 != nullid:
7297 raise error.Abort(_(b'uncommitted merge'))
7297 raise error.Abort(_(b'uncommitted merge'))
7298 bheads = repo.branchheads()
7298 bheads = repo.branchheads()
7299 if not opts.get(b'force') and bheads and p1 not in bheads:
7299 if not opts.get(b'force') and bheads and p1 not in bheads:
7300 raise error.Abort(
7300 raise error.Abort(
7301 _(
7301 _(
7302 b'working directory is not at a branch head '
7302 b'working directory is not at a branch head '
7303 b'(use -f to force)'
7303 b'(use -f to force)'
7304 )
7304 )
7305 )
7305 )
7306 node = scmutil.revsingle(repo, rev_).node()
7306 node = scmutil.revsingle(repo, rev_).node()
7307
7307
7308 if not message:
7308 if not message:
7309 # we don't translate commit messages
7309 # we don't translate commit messages
7310 message = b'Added tag %s for changeset %s' % (
7310 message = b'Added tag %s for changeset %s' % (
7311 b', '.join(names),
7311 b', '.join(names),
7312 short(node),
7312 short(node),
7313 )
7313 )
7314
7314
7315 date = opts.get(b'date')
7315 date = opts.get(b'date')
7316 if date:
7316 if date:
7317 date = dateutil.parsedate(date)
7317 date = dateutil.parsedate(date)
7318
7318
7319 if opts.get(b'remove'):
7319 if opts.get(b'remove'):
7320 editform = b'tag.remove'
7320 editform = b'tag.remove'
7321 else:
7321 else:
7322 editform = b'tag.add'
7322 editform = b'tag.add'
7323 editor = cmdutil.getcommiteditor(
7323 editor = cmdutil.getcommiteditor(
7324 editform=editform, **pycompat.strkwargs(opts)
7324 editform=editform, **pycompat.strkwargs(opts)
7325 )
7325 )
7326
7326
7327 # don't allow tagging the null rev
7327 # don't allow tagging the null rev
7328 if (
7328 if (
7329 not opts.get(b'remove')
7329 not opts.get(b'remove')
7330 and scmutil.revsingle(repo, rev_).rev() == nullrev
7330 and scmutil.revsingle(repo, rev_).rev() == nullrev
7331 ):
7331 ):
7332 raise error.Abort(_(b"cannot tag null revision"))
7332 raise error.Abort(_(b"cannot tag null revision"))
7333
7333
7334 tagsmod.tag(
7334 tagsmod.tag(
7335 repo,
7335 repo,
7336 names,
7336 names,
7337 node,
7337 node,
7338 message,
7338 message,
7339 opts.get(b'local'),
7339 opts.get(b'local'),
7340 opts.get(b'user'),
7340 opts.get(b'user'),
7341 date,
7341 date,
7342 editor=editor,
7342 editor=editor,
7343 )
7343 )
7344
7344
7345
7345
7346 @command(
7346 @command(
7347 b'tags',
7347 b'tags',
7348 formatteropts,
7348 formatteropts,
7349 b'',
7349 b'',
7350 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7350 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7351 intents={INTENT_READONLY},
7351 intents={INTENT_READONLY},
7352 )
7352 )
7353 def tags(ui, repo, **opts):
7353 def tags(ui, repo, **opts):
7354 """list repository tags
7354 """list repository tags
7355
7355
7356 This lists both regular and local tags. When the -v/--verbose
7356 This lists both regular and local tags. When the -v/--verbose
7357 switch is used, a third column "local" is printed for local tags.
7357 switch is used, a third column "local" is printed for local tags.
7358 When the -q/--quiet switch is used, only the tag name is printed.
7358 When the -q/--quiet switch is used, only the tag name is printed.
7359
7359
7360 .. container:: verbose
7360 .. container:: verbose
7361
7361
7362 Template:
7362 Template:
7363
7363
7364 The following keywords are supported in addition to the common template
7364 The following keywords are supported in addition to the common template
7365 keywords and functions such as ``{tag}``. See also
7365 keywords and functions such as ``{tag}``. See also
7366 :hg:`help templates`.
7366 :hg:`help templates`.
7367
7367
7368 :type: String. ``local`` for local tags.
7368 :type: String. ``local`` for local tags.
7369
7369
7370 Returns 0 on success.
7370 Returns 0 on success.
7371 """
7371 """
7372
7372
7373 opts = pycompat.byteskwargs(opts)
7373 opts = pycompat.byteskwargs(opts)
7374 ui.pager(b'tags')
7374 ui.pager(b'tags')
7375 fm = ui.formatter(b'tags', opts)
7375 fm = ui.formatter(b'tags', opts)
7376 hexfunc = fm.hexfunc
7376 hexfunc = fm.hexfunc
7377
7377
7378 for t, n in reversed(repo.tagslist()):
7378 for t, n in reversed(repo.tagslist()):
7379 hn = hexfunc(n)
7379 hn = hexfunc(n)
7380 label = b'tags.normal'
7380 label = b'tags.normal'
7381 tagtype = b''
7381 tagtype = b''
7382 if repo.tagtype(t) == b'local':
7382 if repo.tagtype(t) == b'local':
7383 label = b'tags.local'
7383 label = b'tags.local'
7384 tagtype = b'local'
7384 tagtype = b'local'
7385
7385
7386 fm.startitem()
7386 fm.startitem()
7387 fm.context(repo=repo)
7387 fm.context(repo=repo)
7388 fm.write(b'tag', b'%s', t, label=label)
7388 fm.write(b'tag', b'%s', t, label=label)
7389 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7389 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7390 fm.condwrite(
7390 fm.condwrite(
7391 not ui.quiet,
7391 not ui.quiet,
7392 b'rev node',
7392 b'rev node',
7393 fmt,
7393 fmt,
7394 repo.changelog.rev(n),
7394 repo.changelog.rev(n),
7395 hn,
7395 hn,
7396 label=label,
7396 label=label,
7397 )
7397 )
7398 fm.condwrite(
7398 fm.condwrite(
7399 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7399 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7400 )
7400 )
7401 fm.plain(b'\n')
7401 fm.plain(b'\n')
7402 fm.end()
7402 fm.end()
7403
7403
7404
7404
7405 @command(
7405 @command(
7406 b'tip',
7406 b'tip',
7407 [
7407 [
7408 (b'p', b'patch', None, _(b'show patch')),
7408 (b'p', b'patch', None, _(b'show patch')),
7409 (b'g', b'git', None, _(b'use git extended diff format')),
7409 (b'g', b'git', None, _(b'use git extended diff format')),
7410 ]
7410 ]
7411 + templateopts,
7411 + templateopts,
7412 _(b'[-p] [-g]'),
7412 _(b'[-p] [-g]'),
7413 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7413 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7414 )
7414 )
7415 def tip(ui, repo, **opts):
7415 def tip(ui, repo, **opts):
7416 """show the tip revision (DEPRECATED)
7416 """show the tip revision (DEPRECATED)
7417
7417
7418 The tip revision (usually just called the tip) is the changeset
7418 The tip revision (usually just called the tip) is the changeset
7419 most recently added to the repository (and therefore the most
7419 most recently added to the repository (and therefore the most
7420 recently changed head).
7420 recently changed head).
7421
7421
7422 If you have just made a commit, that commit will be the tip. If
7422 If you have just made a commit, that commit will be the tip. If
7423 you have just pulled changes from another repository, the tip of
7423 you have just pulled changes from another repository, the tip of
7424 that repository becomes the current tip. The "tip" tag is special
7424 that repository becomes the current tip. The "tip" tag is special
7425 and cannot be renamed or assigned to a different changeset.
7425 and cannot be renamed or assigned to a different changeset.
7426
7426
7427 This command is deprecated, please use :hg:`heads` instead.
7427 This command is deprecated, please use :hg:`heads` instead.
7428
7428
7429 Returns 0 on success.
7429 Returns 0 on success.
7430 """
7430 """
7431 opts = pycompat.byteskwargs(opts)
7431 opts = pycompat.byteskwargs(opts)
7432 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7432 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7433 displayer.show(repo[b'tip'])
7433 displayer.show(repo[b'tip'])
7434 displayer.close()
7434 displayer.close()
7435
7435
7436
7436
7437 @command(
7437 @command(
7438 b'unbundle',
7438 b'unbundle',
7439 [
7439 [
7440 (
7440 (
7441 b'u',
7441 b'u',
7442 b'update',
7442 b'update',
7443 None,
7443 None,
7444 _(b'update to new branch head if changesets were unbundled'),
7444 _(b'update to new branch head if changesets were unbundled'),
7445 )
7445 )
7446 ],
7446 ],
7447 _(b'[-u] FILE...'),
7447 _(b'[-u] FILE...'),
7448 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7448 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7449 )
7449 )
7450 def unbundle(ui, repo, fname1, *fnames, **opts):
7450 def unbundle(ui, repo, fname1, *fnames, **opts):
7451 """apply one or more bundle files
7451 """apply one or more bundle files
7452
7452
7453 Apply one or more bundle files generated by :hg:`bundle`.
7453 Apply one or more bundle files generated by :hg:`bundle`.
7454
7454
7455 Returns 0 on success, 1 if an update has unresolved files.
7455 Returns 0 on success, 1 if an update has unresolved files.
7456 """
7456 """
7457 fnames = (fname1,) + fnames
7457 fnames = (fname1,) + fnames
7458
7458
7459 with repo.lock():
7459 with repo.lock():
7460 for fname in fnames:
7460 for fname in fnames:
7461 f = hg.openpath(ui, fname)
7461 f = hg.openpath(ui, fname)
7462 gen = exchange.readbundle(ui, f, fname)
7462 gen = exchange.readbundle(ui, f, fname)
7463 if isinstance(gen, streamclone.streamcloneapplier):
7463 if isinstance(gen, streamclone.streamcloneapplier):
7464 raise error.Abort(
7464 raise error.Abort(
7465 _(
7465 _(
7466 b'packed bundles cannot be applied with '
7466 b'packed bundles cannot be applied with '
7467 b'"hg unbundle"'
7467 b'"hg unbundle"'
7468 ),
7468 ),
7469 hint=_(b'use "hg debugapplystreamclonebundle"'),
7469 hint=_(b'use "hg debugapplystreamclonebundle"'),
7470 )
7470 )
7471 url = b'bundle:' + fname
7471 url = b'bundle:' + fname
7472 try:
7472 try:
7473 txnname = b'unbundle'
7473 txnname = b'unbundle'
7474 if not isinstance(gen, bundle2.unbundle20):
7474 if not isinstance(gen, bundle2.unbundle20):
7475 txnname = b'unbundle\n%s' % util.hidepassword(url)
7475 txnname = b'unbundle\n%s' % util.hidepassword(url)
7476 with repo.transaction(txnname) as tr:
7476 with repo.transaction(txnname) as tr:
7477 op = bundle2.applybundle(
7477 op = bundle2.applybundle(
7478 repo, gen, tr, source=b'unbundle', url=url
7478 repo, gen, tr, source=b'unbundle', url=url
7479 )
7479 )
7480 except error.BundleUnknownFeatureError as exc:
7480 except error.BundleUnknownFeatureError as exc:
7481 raise error.Abort(
7481 raise error.Abort(
7482 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7482 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7483 hint=_(
7483 hint=_(
7484 b"see https://mercurial-scm.org/"
7484 b"see https://mercurial-scm.org/"
7485 b"wiki/BundleFeature for more "
7485 b"wiki/BundleFeature for more "
7486 b"information"
7486 b"information"
7487 ),
7487 ),
7488 )
7488 )
7489 modheads = bundle2.combinechangegroupresults(op)
7489 modheads = bundle2.combinechangegroupresults(op)
7490
7490
7491 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7491 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7492
7492
7493
7493
7494 @command(
7494 @command(
7495 b'unshelve',
7495 b'unshelve',
7496 [
7496 [
7497 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7497 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7498 (
7498 (
7499 b'c',
7499 b'c',
7500 b'continue',
7500 b'continue',
7501 None,
7501 None,
7502 _(b'continue an incomplete unshelve operation'),
7502 _(b'continue an incomplete unshelve operation'),
7503 ),
7503 ),
7504 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7504 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7505 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7505 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7506 (
7506 (
7507 b'n',
7507 b'n',
7508 b'name',
7508 b'name',
7509 b'',
7509 b'',
7510 _(b'restore shelved change with given name'),
7510 _(b'restore shelved change with given name'),
7511 _(b'NAME'),
7511 _(b'NAME'),
7512 ),
7512 ),
7513 (b't', b'tool', b'', _(b'specify merge tool')),
7513 (b't', b'tool', b'', _(b'specify merge tool')),
7514 (
7514 (
7515 b'',
7515 b'',
7516 b'date',
7516 b'date',
7517 b'',
7517 b'',
7518 _(b'set date for temporary commits (DEPRECATED)'),
7518 _(b'set date for temporary commits (DEPRECATED)'),
7519 _(b'DATE'),
7519 _(b'DATE'),
7520 ),
7520 ),
7521 ],
7521 ],
7522 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7522 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7523 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7523 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7524 )
7524 )
7525 def unshelve(ui, repo, *shelved, **opts):
7525 def unshelve(ui, repo, *shelved, **opts):
7526 """restore a shelved change to the working directory
7526 """restore a shelved change to the working directory
7527
7527
7528 This command accepts an optional name of a shelved change to
7528 This command accepts an optional name of a shelved change to
7529 restore. If none is given, the most recent shelved change is used.
7529 restore. If none is given, the most recent shelved change is used.
7530
7530
7531 If a shelved change is applied successfully, the bundle that
7531 If a shelved change is applied successfully, the bundle that
7532 contains the shelved changes is moved to a backup location
7532 contains the shelved changes is moved to a backup location
7533 (.hg/shelve-backup).
7533 (.hg/shelve-backup).
7534
7534
7535 Since you can restore a shelved change on top of an arbitrary
7535 Since you can restore a shelved change on top of an arbitrary
7536 commit, it is possible that unshelving will result in a conflict
7536 commit, it is possible that unshelving will result in a conflict
7537 between your changes and the commits you are unshelving onto. If
7537 between your changes and the commits you are unshelving onto. If
7538 this occurs, you must resolve the conflict, then use
7538 this occurs, you must resolve the conflict, then use
7539 ``--continue`` to complete the unshelve operation. (The bundle
7539 ``--continue`` to complete the unshelve operation. (The bundle
7540 will not be moved until you successfully complete the unshelve.)
7540 will not be moved until you successfully complete the unshelve.)
7541
7541
7542 (Alternatively, you can use ``--abort`` to abandon an unshelve
7542 (Alternatively, you can use ``--abort`` to abandon an unshelve
7543 that causes a conflict. This reverts the unshelved changes, and
7543 that causes a conflict. This reverts the unshelved changes, and
7544 leaves the bundle in place.)
7544 leaves the bundle in place.)
7545
7545
7546 If bare shelved change (without interactive, include and exclude
7546 If bare shelved change (without interactive, include and exclude
7547 option) was done on newly created branch it would restore branch
7547 option) was done on newly created branch it would restore branch
7548 information to the working directory.
7548 information to the working directory.
7549
7549
7550 After a successful unshelve, the shelved changes are stored in a
7550 After a successful unshelve, the shelved changes are stored in a
7551 backup directory. Only the N most recent backups are kept. N
7551 backup directory. Only the N most recent backups are kept. N
7552 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7552 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7553 configuration option.
7553 configuration option.
7554
7554
7555 .. container:: verbose
7555 .. container:: verbose
7556
7556
7557 Timestamp in seconds is used to decide order of backups. More
7557 Timestamp in seconds is used to decide order of backups. More
7558 than ``maxbackups`` backups are kept, if same timestamp
7558 than ``maxbackups`` backups are kept, if same timestamp
7559 prevents from deciding exact order of them, for safety.
7559 prevents from deciding exact order of them, for safety.
7560
7560
7561 Selected changes can be unshelved with ``--interactive`` flag.
7561 Selected changes can be unshelved with ``--interactive`` flag.
7562 The working directory is updated with the selected changes, and
7562 The working directory is updated with the selected changes, and
7563 only the unselected changes remain shelved.
7563 only the unselected changes remain shelved.
7564 Note: The whole shelve is applied to working directory first before
7564 Note: The whole shelve is applied to working directory first before
7565 running interactively. So, this will bring up all the conflicts between
7565 running interactively. So, this will bring up all the conflicts between
7566 working directory and the shelve, irrespective of which changes will be
7566 working directory and the shelve, irrespective of which changes will be
7567 unshelved.
7567 unshelved.
7568 """
7568 """
7569 with repo.wlock():
7569 with repo.wlock():
7570 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7570 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7571
7571
7572
7572
7573 statemod.addunfinished(
7573 statemod.addunfinished(
7574 b'unshelve',
7574 b'unshelve',
7575 fname=b'shelvedstate',
7575 fname=b'shelvedstate',
7576 continueflag=True,
7576 continueflag=True,
7577 abortfunc=shelvemod.hgabortunshelve,
7577 abortfunc=shelvemod.hgabortunshelve,
7578 continuefunc=shelvemod.hgcontinueunshelve,
7578 continuefunc=shelvemod.hgcontinueunshelve,
7579 cmdmsg=_(b'unshelve already in progress'),
7579 cmdmsg=_(b'unshelve already in progress'),
7580 )
7580 )
7581
7581
7582
7582
7583 @command(
7583 @command(
7584 b'update|up|checkout|co',
7584 b'update|up|checkout|co',
7585 [
7585 [
7586 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7586 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7587 (b'c', b'check', None, _(b'require clean working directory')),
7587 (b'c', b'check', None, _(b'require clean working directory')),
7588 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7588 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7589 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7589 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7590 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7590 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7591 ]
7591 ]
7592 + mergetoolopts,
7592 + mergetoolopts,
7593 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7593 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7594 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7594 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7595 helpbasic=True,
7595 helpbasic=True,
7596 )
7596 )
7597 def update(ui, repo, node=None, **opts):
7597 def update(ui, repo, node=None, **opts):
7598 """update working directory (or switch revisions)
7598 """update working directory (or switch revisions)
7599
7599
7600 Update the repository's working directory to the specified
7600 Update the repository's working directory to the specified
7601 changeset. If no changeset is specified, update to the tip of the
7601 changeset. If no changeset is specified, update to the tip of the
7602 current named branch and move the active bookmark (see :hg:`help
7602 current named branch and move the active bookmark (see :hg:`help
7603 bookmarks`).
7603 bookmarks`).
7604
7604
7605 Update sets the working directory's parent revision to the specified
7605 Update sets the working directory's parent revision to the specified
7606 changeset (see :hg:`help parents`).
7606 changeset (see :hg:`help parents`).
7607
7607
7608 If the changeset is not a descendant or ancestor of the working
7608 If the changeset is not a descendant or ancestor of the working
7609 directory's parent and there are uncommitted changes, the update is
7609 directory's parent and there are uncommitted changes, the update is
7610 aborted. With the -c/--check option, the working directory is checked
7610 aborted. With the -c/--check option, the working directory is checked
7611 for uncommitted changes; if none are found, the working directory is
7611 for uncommitted changes; if none are found, the working directory is
7612 updated to the specified changeset.
7612 updated to the specified changeset.
7613
7613
7614 .. container:: verbose
7614 .. container:: verbose
7615
7615
7616 The -C/--clean, -c/--check, and -m/--merge options control what
7616 The -C/--clean, -c/--check, and -m/--merge options control what
7617 happens if the working directory contains uncommitted changes.
7617 happens if the working directory contains uncommitted changes.
7618 At most of one of them can be specified.
7618 At most of one of them can be specified.
7619
7619
7620 1. If no option is specified, and if
7620 1. If no option is specified, and if
7621 the requested changeset is an ancestor or descendant of
7621 the requested changeset is an ancestor or descendant of
7622 the working directory's parent, the uncommitted changes
7622 the working directory's parent, the uncommitted changes
7623 are merged into the requested changeset and the merged
7623 are merged into the requested changeset and the merged
7624 result is left uncommitted. If the requested changeset is
7624 result is left uncommitted. If the requested changeset is
7625 not an ancestor or descendant (that is, it is on another
7625 not an ancestor or descendant (that is, it is on another
7626 branch), the update is aborted and the uncommitted changes
7626 branch), the update is aborted and the uncommitted changes
7627 are preserved.
7627 are preserved.
7628
7628
7629 2. With the -m/--merge option, the update is allowed even if the
7629 2. With the -m/--merge option, the update is allowed even if the
7630 requested changeset is not an ancestor or descendant of
7630 requested changeset is not an ancestor or descendant of
7631 the working directory's parent.
7631 the working directory's parent.
7632
7632
7633 3. With the -c/--check option, the update is aborted and the
7633 3. With the -c/--check option, the update is aborted and the
7634 uncommitted changes are preserved.
7634 uncommitted changes are preserved.
7635
7635
7636 4. With the -C/--clean option, uncommitted changes are discarded and
7636 4. With the -C/--clean option, uncommitted changes are discarded and
7637 the working directory is updated to the requested changeset.
7637 the working directory is updated to the requested changeset.
7638
7638
7639 To cancel an uncommitted merge (and lose your changes), use
7639 To cancel an uncommitted merge (and lose your changes), use
7640 :hg:`merge --abort`.
7640 :hg:`merge --abort`.
7641
7641
7642 Use null as the changeset to remove the working directory (like
7642 Use null as the changeset to remove the working directory (like
7643 :hg:`clone -U`).
7643 :hg:`clone -U`).
7644
7644
7645 If you want to revert just one file to an older revision, use
7645 If you want to revert just one file to an older revision, use
7646 :hg:`revert [-r REV] NAME`.
7646 :hg:`revert [-r REV] NAME`.
7647
7647
7648 See :hg:`help dates` for a list of formats valid for -d/--date.
7648 See :hg:`help dates` for a list of formats valid for -d/--date.
7649
7649
7650 Returns 0 on success, 1 if there are unresolved files.
7650 Returns 0 on success, 1 if there are unresolved files.
7651 """
7651 """
7652 rev = opts.get('rev')
7652 rev = opts.get('rev')
7653 date = opts.get('date')
7653 date = opts.get('date')
7654 clean = opts.get('clean')
7654 clean = opts.get('clean')
7655 check = opts.get('check')
7655 check = opts.get('check')
7656 merge = opts.get('merge')
7656 merge = opts.get('merge')
7657 if rev and node:
7657 if rev and node:
7658 raise error.Abort(_(b"please specify just one revision"))
7658 raise error.Abort(_(b"please specify just one revision"))
7659
7659
7660 if ui.configbool(b'commands', b'update.requiredest'):
7660 if ui.configbool(b'commands', b'update.requiredest'):
7661 if not node and not rev and not date:
7661 if not node and not rev and not date:
7662 raise error.Abort(
7662 raise error.Abort(
7663 _(b'you must specify a destination'),
7663 _(b'you must specify a destination'),
7664 hint=_(b'for example: hg update ".::"'),
7664 hint=_(b'for example: hg update ".::"'),
7665 )
7665 )
7666
7666
7667 if rev is None or rev == b'':
7667 if rev is None or rev == b'':
7668 rev = node
7668 rev = node
7669
7669
7670 if date and rev is not None:
7670 if date and rev is not None:
7671 raise error.Abort(_(b"you can't specify a revision and a date"))
7671 raise error.Abort(_(b"you can't specify a revision and a date"))
7672
7672
7673 if len([x for x in (clean, check, merge) if x]) > 1:
7673 if len([x for x in (clean, check, merge) if x]) > 1:
7674 raise error.Abort(
7674 raise error.Abort(
7675 _(
7675 _(
7676 b"can only specify one of -C/--clean, -c/--check, "
7676 b"can only specify one of -C/--clean, -c/--check, "
7677 b"or -m/--merge"
7677 b"or -m/--merge"
7678 )
7678 )
7679 )
7679 )
7680
7680
7681 updatecheck = None
7681 updatecheck = None
7682 if check:
7682 if check:
7683 updatecheck = b'abort'
7683 updatecheck = b'abort'
7684 elif merge:
7684 elif merge:
7685 updatecheck = b'none'
7685 updatecheck = b'none'
7686
7686
7687 with repo.wlock():
7687 with repo.wlock():
7688 cmdutil.clearunfinished(repo)
7688 cmdutil.clearunfinished(repo)
7689 if date:
7689 if date:
7690 rev = cmdutil.finddate(ui, repo, date)
7690 rev = cmdutil.finddate(ui, repo, date)
7691
7691
7692 # if we defined a bookmark, we have to remember the original name
7692 # if we defined a bookmark, we have to remember the original name
7693 brev = rev
7693 brev = rev
7694 if rev:
7694 if rev:
7695 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7695 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7696 ctx = scmutil.revsingle(repo, rev, default=None)
7696 ctx = scmutil.revsingle(repo, rev, default=None)
7697 rev = ctx.rev()
7697 rev = ctx.rev()
7698 hidden = ctx.hidden()
7698 hidden = ctx.hidden()
7699 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7699 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7700 with ui.configoverride(overrides, b'update'):
7700 with ui.configoverride(overrides, b'update'):
7701 ret = hg.updatetotally(
7701 ret = hg.updatetotally(
7702 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7702 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7703 )
7703 )
7704 if hidden:
7704 if hidden:
7705 ctxstr = ctx.hex()[:12]
7705 ctxstr = ctx.hex()[:12]
7706 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7706 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7707
7707
7708 if ctx.obsolete():
7708 if ctx.obsolete():
7709 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7709 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7710 ui.warn(b"(%s)\n" % obsfatemsg)
7710 ui.warn(b"(%s)\n" % obsfatemsg)
7711 return ret
7711 return ret
7712
7712
7713
7713
7714 @command(
7714 @command(
7715 b'verify',
7715 b'verify',
7716 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7716 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7717 helpcategory=command.CATEGORY_MAINTENANCE,
7717 helpcategory=command.CATEGORY_MAINTENANCE,
7718 )
7718 )
7719 def verify(ui, repo, **opts):
7719 def verify(ui, repo, **opts):
7720 """verify the integrity of the repository
7720 """verify the integrity of the repository
7721
7721
7722 Verify the integrity of the current repository.
7722 Verify the integrity of the current repository.
7723
7723
7724 This will perform an extensive check of the repository's
7724 This will perform an extensive check of the repository's
7725 integrity, validating the hashes and checksums of each entry in
7725 integrity, validating the hashes and checksums of each entry in
7726 the changelog, manifest, and tracked files, as well as the
7726 the changelog, manifest, and tracked files, as well as the
7727 integrity of their crosslinks and indices.
7727 integrity of their crosslinks and indices.
7728
7728
7729 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7729 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7730 for more information about recovery from corruption of the
7730 for more information about recovery from corruption of the
7731 repository.
7731 repository.
7732
7732
7733 Returns 0 on success, 1 if errors are encountered.
7733 Returns 0 on success, 1 if errors are encountered.
7734 """
7734 """
7735 opts = pycompat.byteskwargs(opts)
7735 opts = pycompat.byteskwargs(opts)
7736
7736
7737 level = None
7737 level = None
7738 if opts[b'full']:
7738 if opts[b'full']:
7739 level = verifymod.VERIFY_FULL
7739 level = verifymod.VERIFY_FULL
7740 return hg.verify(repo, level)
7740 return hg.verify(repo, level)
7741
7741
7742
7742
7743 @command(
7743 @command(
7744 b'version',
7744 b'version',
7745 [] + formatteropts,
7745 [] + formatteropts,
7746 helpcategory=command.CATEGORY_HELP,
7746 helpcategory=command.CATEGORY_HELP,
7747 norepo=True,
7747 norepo=True,
7748 intents={INTENT_READONLY},
7748 intents={INTENT_READONLY},
7749 )
7749 )
7750 def version_(ui, **opts):
7750 def version_(ui, **opts):
7751 """output version and copyright information
7751 """output version and copyright information
7752
7752
7753 .. container:: verbose
7753 .. container:: verbose
7754
7754
7755 Template:
7755 Template:
7756
7756
7757 The following keywords are supported. See also :hg:`help templates`.
7757 The following keywords are supported. See also :hg:`help templates`.
7758
7758
7759 :extensions: List of extensions.
7759 :extensions: List of extensions.
7760 :ver: String. Version number.
7760 :ver: String. Version number.
7761
7761
7762 And each entry of ``{extensions}`` provides the following sub-keywords
7762 And each entry of ``{extensions}`` provides the following sub-keywords
7763 in addition to ``{ver}``.
7763 in addition to ``{ver}``.
7764
7764
7765 :bundled: Boolean. True if included in the release.
7765 :bundled: Boolean. True if included in the release.
7766 :name: String. Extension name.
7766 :name: String. Extension name.
7767 """
7767 """
7768 opts = pycompat.byteskwargs(opts)
7768 opts = pycompat.byteskwargs(opts)
7769 if ui.verbose:
7769 if ui.verbose:
7770 ui.pager(b'version')
7770 ui.pager(b'version')
7771 fm = ui.formatter(b"version", opts)
7771 fm = ui.formatter(b"version", opts)
7772 fm.startitem()
7772 fm.startitem()
7773 fm.write(
7773 fm.write(
7774 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7774 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7775 )
7775 )
7776 license = _(
7776 license = _(
7777 b"(see https://mercurial-scm.org for more information)\n"
7777 b"(see https://mercurial-scm.org for more information)\n"
7778 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7778 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7779 b"This is free software; see the source for copying conditions. "
7779 b"This is free software; see the source for copying conditions. "
7780 b"There is NO\nwarranty; "
7780 b"There is NO\nwarranty; "
7781 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7781 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7782 )
7782 )
7783 if not ui.quiet:
7783 if not ui.quiet:
7784 fm.plain(license)
7784 fm.plain(license)
7785
7785
7786 if ui.verbose:
7786 if ui.verbose:
7787 fm.plain(_(b"\nEnabled extensions:\n\n"))
7787 fm.plain(_(b"\nEnabled extensions:\n\n"))
7788 # format names and versions into columns
7788 # format names and versions into columns
7789 names = []
7789 names = []
7790 vers = []
7790 vers = []
7791 isinternals = []
7791 isinternals = []
7792 for name, module in extensions.extensions():
7792 for name, module in extensions.extensions():
7793 names.append(name)
7793 names.append(name)
7794 vers.append(extensions.moduleversion(module) or None)
7794 vers.append(extensions.moduleversion(module) or None)
7795 isinternals.append(extensions.ismoduleinternal(module))
7795 isinternals.append(extensions.ismoduleinternal(module))
7796 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7796 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7797 if names:
7797 if names:
7798 namefmt = b" %%-%ds " % max(len(n) for n in names)
7798 namefmt = b" %%-%ds " % max(len(n) for n in names)
7799 places = [_(b"external"), _(b"internal")]
7799 places = [_(b"external"), _(b"internal")]
7800 for n, v, p in zip(names, vers, isinternals):
7800 for n, v, p in zip(names, vers, isinternals):
7801 fn.startitem()
7801 fn.startitem()
7802 fn.condwrite(ui.verbose, b"name", namefmt, n)
7802 fn.condwrite(ui.verbose, b"name", namefmt, n)
7803 if ui.verbose:
7803 if ui.verbose:
7804 fn.plain(b"%s " % places[p])
7804 fn.plain(b"%s " % places[p])
7805 fn.data(bundled=p)
7805 fn.data(bundled=p)
7806 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7806 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7807 if ui.verbose:
7807 if ui.verbose:
7808 fn.plain(b"\n")
7808 fn.plain(b"\n")
7809 fn.end()
7809 fn.end()
7810 fm.end()
7810 fm.end()
7811
7811
7812
7812
7813 def loadcmdtable(ui, name, cmdtable):
7813 def loadcmdtable(ui, name, cmdtable):
7814 """Load command functions from specified cmdtable
7814 """Load command functions from specified cmdtable
7815 """
7815 """
7816 overrides = [cmd for cmd in cmdtable if cmd in table]
7816 overrides = [cmd for cmd in cmdtable if cmd in table]
7817 if overrides:
7817 if overrides:
7818 ui.warn(
7818 ui.warn(
7819 _(b"extension '%s' overrides commands: %s\n")
7819 _(b"extension '%s' overrides commands: %s\n")
7820 % (name, b" ".join(overrides))
7820 % (name, b" ".join(overrides))
7821 )
7821 )
7822 table.update(cmdtable)
7822 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now