##// END OF EJS Templates
grep: stop computing information for --diff when unnecessary...
Valentin Gatien-Baron -
r45369:8d552701 default
parent child Browse files
Show More
@@ -1,7839 +1,7843 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 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[b'tip'])
879 return hg.merge(repo[b'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(
1239 cmdutil.check_incompatible_arguments(
1240 opts, b'inactive', [b'delete', b'list']
1240 opts, b'inactive', [b'delete', b'list']
1241 )
1241 )
1242 if not names and action in {b'add', b'delete'}:
1242 if not names and action in {b'add', b'delete'}:
1243 raise error.Abort(_(b"bookmark name required"))
1243 raise error.Abort(_(b"bookmark name required"))
1244
1244
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 if action == b'delete':
1247 if action == b'delete':
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 bookmarks.delete(repo, tr, names)
1249 bookmarks.delete(repo, tr, names)
1250 elif action == b'rename':
1250 elif action == b'rename':
1251 if not names:
1251 if not names:
1252 raise error.Abort(_(b"new bookmark name required"))
1252 raise error.Abort(_(b"new bookmark name required"))
1253 elif len(names) > 1:
1253 elif len(names) > 1:
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 elif action == b'add':
1257 elif action == b'add':
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 elif action == b'inactive':
1259 elif action == b'inactive':
1260 if len(repo._bookmarks) == 0:
1260 if len(repo._bookmarks) == 0:
1261 ui.status(_(b"no bookmarks set\n"))
1261 ui.status(_(b"no bookmarks set\n"))
1262 elif not repo._activebookmark:
1262 elif not repo._activebookmark:
1263 ui.status(_(b"no active bookmark\n"))
1263 ui.status(_(b"no active bookmark\n"))
1264 else:
1264 else:
1265 bookmarks.deactivate(repo)
1265 bookmarks.deactivate(repo)
1266 elif action == b'list':
1266 elif action == b'list':
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 with ui.formatter(b'bookmarks', opts) as fm:
1268 with ui.formatter(b'bookmarks', opts) as fm:
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1270 else:
1270 else:
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1272
1272
1273
1273
1274 @command(
1274 @command(
1275 b'branch',
1275 b'branch',
1276 [
1276 [
1277 (
1277 (
1278 b'f',
1278 b'f',
1279 b'force',
1279 b'force',
1280 None,
1280 None,
1281 _(b'set branch name even if it shadows an existing branch'),
1281 _(b'set branch name even if it shadows an existing branch'),
1282 ),
1282 ),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (
1284 (
1285 b'r',
1285 b'r',
1286 b'rev',
1286 b'rev',
1287 [],
1287 [],
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 ),
1289 ),
1290 ],
1290 ],
1291 _(b'[-fC] [NAME]'),
1291 _(b'[-fC] [NAME]'),
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 )
1293 )
1294 def branch(ui, repo, label=None, **opts):
1294 def branch(ui, repo, label=None, **opts):
1295 """set or show the current branch name
1295 """set or show the current branch name
1296
1296
1297 .. note::
1297 .. note::
1298
1298
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1301 information about named branches and bookmarks.
1301 information about named branches and bookmarks.
1302
1302
1303 With no argument, show the current branch name. With one argument,
1303 With no argument, show the current branch name. With one argument,
1304 set the working directory branch name (the branch will not exist
1304 set the working directory branch name (the branch will not exist
1305 in the repository until the next commit). Standard practice
1305 in the repository until the next commit). Standard practice
1306 recommends that primary development take place on the 'default'
1306 recommends that primary development take place on the 'default'
1307 branch.
1307 branch.
1308
1308
1309 Unless -f/--force is specified, branch will not let you set a
1309 Unless -f/--force is specified, branch will not let you set a
1310 branch name that already exists.
1310 branch name that already exists.
1311
1311
1312 Use -C/--clean to reset the working directory branch to that of
1312 Use -C/--clean to reset the working directory branch to that of
1313 the parent of the working directory, negating a previous branch
1313 the parent of the working directory, negating a previous branch
1314 change.
1314 change.
1315
1315
1316 Use the command :hg:`update` to switch to an existing branch. Use
1316 Use the command :hg:`update` to switch to an existing branch. Use
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1318 When all heads of a branch are closed, the branch will be
1318 When all heads of a branch are closed, the branch will be
1319 considered closed.
1319 considered closed.
1320
1320
1321 Returns 0 on success.
1321 Returns 0 on success.
1322 """
1322 """
1323 opts = pycompat.byteskwargs(opts)
1323 opts = pycompat.byteskwargs(opts)
1324 revs = opts.get(b'rev')
1324 revs = opts.get(b'rev')
1325 if label:
1325 if label:
1326 label = label.strip()
1326 label = label.strip()
1327
1327
1328 if not opts.get(b'clean') and not label:
1328 if not opts.get(b'clean') and not label:
1329 if revs:
1329 if revs:
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1332 return
1332 return
1333
1333
1334 with repo.wlock():
1334 with repo.wlock():
1335 if opts.get(b'clean'):
1335 if opts.get(b'clean'):
1336 label = repo[b'.'].branch()
1336 label = repo[b'.'].branch()
1337 repo.dirstate.setbranch(label)
1337 repo.dirstate.setbranch(label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 elif label:
1339 elif label:
1340
1340
1341 scmutil.checknewlabel(repo, label, b'branch')
1341 scmutil.checknewlabel(repo, label, b'branch')
1342 if revs:
1342 if revs:
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344
1344
1345 if not opts.get(b'force') and label in repo.branchmap():
1345 if not opts.get(b'force') and label in repo.branchmap():
1346 if label not in [p.branch() for p in repo[None].parents()]:
1346 if label not in [p.branch() for p in repo[None].parents()]:
1347 raise error.Abort(
1347 raise error.Abort(
1348 _(b'a branch of the same name already exists'),
1348 _(b'a branch of the same name already exists'),
1349 # i18n: "it" refers to an existing branch
1349 # i18n: "it" refers to an existing branch
1350 hint=_(b"use 'hg update' to switch to it"),
1350 hint=_(b"use 'hg update' to switch to it"),
1351 )
1351 )
1352
1352
1353 repo.dirstate.setbranch(label)
1353 repo.dirstate.setbranch(label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1355
1355
1356 # find any open named branches aside from default
1356 # find any open named branches aside from default
1357 for n, h, t, c in repo.branchmap().iterbranches():
1357 for n, h, t, c in repo.branchmap().iterbranches():
1358 if n != b"default" and not c:
1358 if n != b"default" and not c:
1359 return 0
1359 return 0
1360 ui.status(
1360 ui.status(
1361 _(
1361 _(
1362 b'(branches are permanent and global, '
1362 b'(branches are permanent and global, '
1363 b'did you want a bookmark?)\n'
1363 b'did you want a bookmark?)\n'
1364 )
1364 )
1365 )
1365 )
1366
1366
1367
1367
1368 @command(
1368 @command(
1369 b'branches',
1369 b'branches',
1370 [
1370 [
1371 (
1371 (
1372 b'a',
1372 b'a',
1373 b'active',
1373 b'active',
1374 False,
1374 False,
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 ),
1376 ),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 ]
1379 ]
1380 + formatteropts,
1380 + formatteropts,
1381 _(b'[-c]'),
1381 _(b'[-c]'),
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 intents={INTENT_READONLY},
1383 intents={INTENT_READONLY},
1384 )
1384 )
1385 def branches(ui, repo, active=False, closed=False, **opts):
1385 def branches(ui, repo, active=False, closed=False, **opts):
1386 """list repository named branches
1386 """list repository named branches
1387
1387
1388 List the repository's named branches, indicating which ones are
1388 List the repository's named branches, indicating which ones are
1389 inactive. If -c/--closed is specified, also list branches which have
1389 inactive. If -c/--closed is specified, also list branches which have
1390 been marked closed (see :hg:`commit --close-branch`).
1390 been marked closed (see :hg:`commit --close-branch`).
1391
1391
1392 Use the command :hg:`update` to switch to an existing branch.
1392 Use the command :hg:`update` to switch to an existing branch.
1393
1393
1394 .. container:: verbose
1394 .. container:: verbose
1395
1395
1396 Template:
1396 Template:
1397
1397
1398 The following keywords are supported in addition to the common template
1398 The following keywords are supported in addition to the common template
1399 keywords and functions such as ``{branch}``. See also
1399 keywords and functions such as ``{branch}``. See also
1400 :hg:`help templates`.
1400 :hg:`help templates`.
1401
1401
1402 :active: Boolean. True if the branch is active.
1402 :active: Boolean. True if the branch is active.
1403 :closed: Boolean. True if the branch is closed.
1403 :closed: Boolean. True if the branch is closed.
1404 :current: Boolean. True if it is the current branch.
1404 :current: Boolean. True if it is the current branch.
1405
1405
1406 Returns 0.
1406 Returns 0.
1407 """
1407 """
1408
1408
1409 opts = pycompat.byteskwargs(opts)
1409 opts = pycompat.byteskwargs(opts)
1410 revs = opts.get(b'rev')
1410 revs = opts.get(b'rev')
1411 selectedbranches = None
1411 selectedbranches = None
1412 if revs:
1412 if revs:
1413 revs = scmutil.revrange(repo, revs)
1413 revs = scmutil.revrange(repo, revs)
1414 getbi = repo.revbranchcache().branchinfo
1414 getbi = repo.revbranchcache().branchinfo
1415 selectedbranches = {getbi(r)[0] for r in revs}
1415 selectedbranches = {getbi(r)[0] for r in revs}
1416
1416
1417 ui.pager(b'branches')
1417 ui.pager(b'branches')
1418 fm = ui.formatter(b'branches', opts)
1418 fm = ui.formatter(b'branches', opts)
1419 hexfunc = fm.hexfunc
1419 hexfunc = fm.hexfunc
1420
1420
1421 allheads = set(repo.heads())
1421 allheads = set(repo.heads())
1422 branches = []
1422 branches = []
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 if selectedbranches is not None and tag not in selectedbranches:
1424 if selectedbranches is not None and tag not in selectedbranches:
1425 continue
1425 continue
1426 isactive = False
1426 isactive = False
1427 if not isclosed:
1427 if not isclosed:
1428 openheads = set(repo.branchmap().iteropen(heads))
1428 openheads = set(repo.branchmap().iteropen(heads))
1429 isactive = bool(openheads & allheads)
1429 isactive = bool(openheads & allheads)
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432
1432
1433 for tag, ctx, isactive, isopen in branches:
1433 for tag, ctx, isactive, isopen in branches:
1434 if active and not isactive:
1434 if active and not isactive:
1435 continue
1435 continue
1436 if isactive:
1436 if isactive:
1437 label = b'branches.active'
1437 label = b'branches.active'
1438 notice = b''
1438 notice = b''
1439 elif not isopen:
1439 elif not isopen:
1440 if not closed:
1440 if not closed:
1441 continue
1441 continue
1442 label = b'branches.closed'
1442 label = b'branches.closed'
1443 notice = _(b' (closed)')
1443 notice = _(b' (closed)')
1444 else:
1444 else:
1445 label = b'branches.inactive'
1445 label = b'branches.inactive'
1446 notice = _(b' (inactive)')
1446 notice = _(b' (inactive)')
1447 current = tag == repo.dirstate.branch()
1447 current = tag == repo.dirstate.branch()
1448 if current:
1448 if current:
1449 label = b'branches.current'
1449 label = b'branches.current'
1450
1450
1451 fm.startitem()
1451 fm.startitem()
1452 fm.write(b'branch', b'%s', tag, label=label)
1452 fm.write(b'branch', b'%s', tag, label=label)
1453 rev = ctx.rev()
1453 rev = ctx.rev()
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 fmt = b' ' * padsize + b' %d:%s'
1455 fmt = b' ' * padsize + b' %d:%s'
1456 fm.condwrite(
1456 fm.condwrite(
1457 not ui.quiet,
1457 not ui.quiet,
1458 b'rev node',
1458 b'rev node',
1459 fmt,
1459 fmt,
1460 rev,
1460 rev,
1461 hexfunc(ctx.node()),
1461 hexfunc(ctx.node()),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 )
1463 )
1464 fm.context(ctx=ctx)
1464 fm.context(ctx=ctx)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1466 if not ui.quiet:
1466 if not ui.quiet:
1467 fm.plain(notice)
1467 fm.plain(notice)
1468 fm.plain(b'\n')
1468 fm.plain(b'\n')
1469 fm.end()
1469 fm.end()
1470
1470
1471
1471
1472 @command(
1472 @command(
1473 b'bundle',
1473 b'bundle',
1474 [
1474 [
1475 (
1475 (
1476 b'f',
1476 b'f',
1477 b'force',
1477 b'force',
1478 None,
1478 None,
1479 _(b'run even when the destination is unrelated'),
1479 _(b'run even when the destination is unrelated'),
1480 ),
1480 ),
1481 (
1481 (
1482 b'r',
1482 b'r',
1483 b'rev',
1483 b'rev',
1484 [],
1484 [],
1485 _(b'a changeset intended to be added to the destination'),
1485 _(b'a changeset intended to be added to the destination'),
1486 _(b'REV'),
1486 _(b'REV'),
1487 ),
1487 ),
1488 (
1488 (
1489 b'b',
1489 b'b',
1490 b'branch',
1490 b'branch',
1491 [],
1491 [],
1492 _(b'a specific branch you would like to bundle'),
1492 _(b'a specific branch you would like to bundle'),
1493 _(b'BRANCH'),
1493 _(b'BRANCH'),
1494 ),
1494 ),
1495 (
1495 (
1496 b'',
1496 b'',
1497 b'base',
1497 b'base',
1498 [],
1498 [],
1499 _(b'a base changeset assumed to be available at the destination'),
1499 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'REV'),
1500 _(b'REV'),
1501 ),
1501 ),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (
1503 (
1504 b't',
1504 b't',
1505 b'type',
1505 b'type',
1506 b'bzip2',
1506 b'bzip2',
1507 _(b'bundle compression type to use'),
1507 _(b'bundle compression type to use'),
1508 _(b'TYPE'),
1508 _(b'TYPE'),
1509 ),
1509 ),
1510 ]
1510 ]
1511 + remoteopts,
1511 + remoteopts,
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 )
1514 )
1515 def bundle(ui, repo, fname, dest=None, **opts):
1515 def bundle(ui, repo, fname, dest=None, **opts):
1516 """create a bundle file
1516 """create a bundle file
1517
1517
1518 Generate a bundle file containing data to be transferred to another
1518 Generate a bundle file containing data to be transferred to another
1519 repository.
1519 repository.
1520
1520
1521 To create a bundle containing all changesets, use -a/--all
1521 To create a bundle containing all changesets, use -a/--all
1522 (or --base null). Otherwise, hg assumes the destination will have
1522 (or --base null). Otherwise, hg assumes the destination will have
1523 all the nodes you specify with --base parameters. Otherwise, hg
1523 all the nodes you specify with --base parameters. Otherwise, hg
1524 will assume the repository has all the nodes in destination, or
1524 will assume the repository has all the nodes in destination, or
1525 default-push/default if no destination is specified, where destination
1525 default-push/default if no destination is specified, where destination
1526 is the repository you provide through DEST option.
1526 is the repository you provide through DEST option.
1527
1527
1528 You can change bundle format with the -t/--type option. See
1528 You can change bundle format with the -t/--type option. See
1529 :hg:`help bundlespec` for documentation on this format. By default,
1529 :hg:`help bundlespec` for documentation on this format. By default,
1530 the most appropriate format is used and compression defaults to
1530 the most appropriate format is used and compression defaults to
1531 bzip2.
1531 bzip2.
1532
1532
1533 The bundle file can then be transferred using conventional means
1533 The bundle file can then be transferred using conventional means
1534 and applied to another repository with the unbundle or pull
1534 and applied to another repository with the unbundle or pull
1535 command. This is useful when direct push and pull are not
1535 command. This is useful when direct push and pull are not
1536 available or when exporting an entire repository is undesirable.
1536 available or when exporting an entire repository is undesirable.
1537
1537
1538 Applying bundles preserves all changeset contents including
1538 Applying bundles preserves all changeset contents including
1539 permissions, copy/rename information, and revision history.
1539 permissions, copy/rename information, and revision history.
1540
1540
1541 Returns 0 on success, 1 if no changes found.
1541 Returns 0 on success, 1 if no changes found.
1542 """
1542 """
1543 opts = pycompat.byteskwargs(opts)
1543 opts = pycompat.byteskwargs(opts)
1544 revs = None
1544 revs = None
1545 if b'rev' in opts:
1545 if b'rev' in opts:
1546 revstrings = opts[b'rev']
1546 revstrings = opts[b'rev']
1547 revs = scmutil.revrange(repo, revstrings)
1547 revs = scmutil.revrange(repo, revstrings)
1548 if revstrings and not revs:
1548 if revstrings and not revs:
1549 raise error.Abort(_(b'no commits to bundle'))
1549 raise error.Abort(_(b'no commits to bundle'))
1550
1550
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1552 try:
1552 try:
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 except error.UnsupportedBundleSpecification as e:
1554 except error.UnsupportedBundleSpecification as e:
1555 raise error.Abort(
1555 raise error.Abort(
1556 pycompat.bytestr(e),
1556 pycompat.bytestr(e),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 )
1558 )
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1560
1560
1561 # Packed bundles are a pseudo bundle format for now.
1561 # Packed bundles are a pseudo bundle format for now.
1562 if cgversion == b's1':
1562 if cgversion == b's1':
1563 raise error.Abort(
1563 raise error.Abort(
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 )
1566 )
1567
1567
1568 if opts.get(b'all'):
1568 if opts.get(b'all'):
1569 if dest:
1569 if dest:
1570 raise error.Abort(
1570 raise error.Abort(
1571 _(b"--all is incompatible with specifying a destination")
1571 _(b"--all is incompatible with specifying a destination")
1572 )
1572 )
1573 if opts.get(b'base'):
1573 if opts.get(b'base'):
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 base = [nullrev]
1575 base = [nullrev]
1576 else:
1576 else:
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 raise error.Abort(
1579 raise error.Abort(
1580 _(b"repository does not support bundle version %s") % cgversion
1580 _(b"repository does not support bundle version %s") % cgversion
1581 )
1581 )
1582
1582
1583 if base:
1583 if base:
1584 if dest:
1584 if dest:
1585 raise error.Abort(
1585 raise error.Abort(
1586 _(b"--base is incompatible with specifying a destination")
1586 _(b"--base is incompatible with specifying a destination")
1587 )
1587 )
1588 common = [repo[rev].node() for rev in base]
1588 common = [repo[rev].node() for rev in base]
1589 heads = [repo[r].node() for r in revs] if revs else None
1589 heads = [repo[r].node() for r in revs] if revs else None
1590 outgoing = discovery.outgoing(repo, common, heads)
1590 outgoing = discovery.outgoing(repo, common, heads)
1591 else:
1591 else:
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 other = hg.peer(repo, opts, dest)
1594 other = hg.peer(repo, opts, dest)
1595 revs = [repo[r].hex() for r in revs]
1595 revs = [repo[r].hex() for r in revs]
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 outgoing = discovery.findcommonoutgoing(
1598 outgoing = discovery.findcommonoutgoing(
1599 repo,
1599 repo,
1600 other,
1600 other,
1601 onlyheads=heads,
1601 onlyheads=heads,
1602 force=opts.get(b'force'),
1602 force=opts.get(b'force'),
1603 portable=True,
1603 portable=True,
1604 )
1604 )
1605
1605
1606 if not outgoing.missing:
1606 if not outgoing.missing:
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 return 1
1608 return 1
1609
1609
1610 if cgversion == b'01': # bundle1
1610 if cgversion == b'01': # bundle1
1611 bversion = b'HG10' + bundlespec.wirecompression
1611 bversion = b'HG10' + bundlespec.wirecompression
1612 bcompression = None
1612 bcompression = None
1613 elif cgversion in (b'02', b'03'):
1613 elif cgversion in (b'02', b'03'):
1614 bversion = b'HG20'
1614 bversion = b'HG20'
1615 bcompression = bundlespec.wirecompression
1615 bcompression = bundlespec.wirecompression
1616 else:
1616 else:
1617 raise error.ProgrammingError(
1617 raise error.ProgrammingError(
1618 b'bundle: unexpected changegroup version %s' % cgversion
1618 b'bundle: unexpected changegroup version %s' % cgversion
1619 )
1619 )
1620
1620
1621 # TODO compression options should be derived from bundlespec parsing.
1621 # TODO compression options should be derived from bundlespec parsing.
1622 # This is a temporary hack to allow adjusting bundle compression
1622 # This is a temporary hack to allow adjusting bundle compression
1623 # level without a) formalizing the bundlespec changes to declare it
1623 # level without a) formalizing the bundlespec changes to declare it
1624 # b) introducing a command flag.
1624 # b) introducing a command flag.
1625 compopts = {}
1625 compopts = {}
1626 complevel = ui.configint(
1626 complevel = ui.configint(
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 )
1628 )
1629 if complevel is None:
1629 if complevel is None:
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 if complevel is not None:
1631 if complevel is not None:
1632 compopts[b'level'] = complevel
1632 compopts[b'level'] = complevel
1633
1633
1634 # Allow overriding the bundling of obsmarker in phases through
1634 # Allow overriding the bundling of obsmarker in phases through
1635 # configuration while we don't have a bundle version that include them
1635 # configuration while we don't have a bundle version that include them
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 bundlespec.contentopts[b'obsolescence'] = True
1637 bundlespec.contentopts[b'obsolescence'] = True
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 bundlespec.contentopts[b'phases'] = True
1639 bundlespec.contentopts[b'phases'] = True
1640
1640
1641 bundle2.writenewbundle(
1641 bundle2.writenewbundle(
1642 ui,
1642 ui,
1643 repo,
1643 repo,
1644 b'bundle',
1644 b'bundle',
1645 fname,
1645 fname,
1646 bversion,
1646 bversion,
1647 outgoing,
1647 outgoing,
1648 bundlespec.contentopts,
1648 bundlespec.contentopts,
1649 compression=bcompression,
1649 compression=bcompression,
1650 compopts=compopts,
1650 compopts=compopts,
1651 )
1651 )
1652
1652
1653
1653
1654 @command(
1654 @command(
1655 b'cat',
1655 b'cat',
1656 [
1656 [
1657 (
1657 (
1658 b'o',
1658 b'o',
1659 b'output',
1659 b'output',
1660 b'',
1660 b'',
1661 _(b'print output to file with formatted name'),
1661 _(b'print output to file with formatted name'),
1662 _(b'FORMAT'),
1662 _(b'FORMAT'),
1663 ),
1663 ),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 ]
1666 ]
1667 + walkopts
1667 + walkopts
1668 + formatteropts,
1668 + formatteropts,
1669 _(b'[OPTION]... FILE...'),
1669 _(b'[OPTION]... FILE...'),
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 inferrepo=True,
1671 inferrepo=True,
1672 intents={INTENT_READONLY},
1672 intents={INTENT_READONLY},
1673 )
1673 )
1674 def cat(ui, repo, file1, *pats, **opts):
1674 def cat(ui, repo, file1, *pats, **opts):
1675 """output the current or given revision of files
1675 """output the current or given revision of files
1676
1676
1677 Print the specified files as they were at the given revision. If
1677 Print the specified files as they were at the given revision. If
1678 no revision is given, the parent of the working directory is used.
1678 no revision is given, the parent of the working directory is used.
1679
1679
1680 Output may be to a file, in which case the name of the file is
1680 Output may be to a file, in which case the name of the file is
1681 given using a template string. See :hg:`help templates`. In addition
1681 given using a template string. See :hg:`help templates`. In addition
1682 to the common template keywords, the following formatting rules are
1682 to the common template keywords, the following formatting rules are
1683 supported:
1683 supported:
1684
1684
1685 :``%%``: literal "%" character
1685 :``%%``: literal "%" character
1686 :``%s``: basename of file being printed
1686 :``%s``: basename of file being printed
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%p``: root-relative path name of file being printed
1688 :``%p``: root-relative path name of file being printed
1689 :``%H``: changeset hash (40 hexadecimal digits)
1689 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%R``: changeset revision number
1690 :``%R``: changeset revision number
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%r``: zero-padded changeset revision number
1692 :``%r``: zero-padded changeset revision number
1693 :``%b``: basename of the exporting repository
1693 :``%b``: basename of the exporting repository
1694 :``\\``: literal "\\" character
1694 :``\\``: literal "\\" character
1695
1695
1696 .. container:: verbose
1696 .. container:: verbose
1697
1697
1698 Template:
1698 Template:
1699
1699
1700 The following keywords are supported in addition to the common template
1700 The following keywords are supported in addition to the common template
1701 keywords and functions. See also :hg:`help templates`.
1701 keywords and functions. See also :hg:`help templates`.
1702
1702
1703 :data: String. File content.
1703 :data: String. File content.
1704 :path: String. Repository-absolute path of the file.
1704 :path: String. Repository-absolute path of the file.
1705
1705
1706 Returns 0 on success.
1706 Returns 0 on success.
1707 """
1707 """
1708 opts = pycompat.byteskwargs(opts)
1708 opts = pycompat.byteskwargs(opts)
1709 rev = opts.get(b'rev')
1709 rev = opts.get(b'rev')
1710 if rev:
1710 if rev:
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 ctx = scmutil.revsingle(repo, rev)
1712 ctx = scmutil.revsingle(repo, rev)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 fntemplate = opts.pop(b'output', b'')
1714 fntemplate = opts.pop(b'output', b'')
1715 if cmdutil.isstdiofilename(fntemplate):
1715 if cmdutil.isstdiofilename(fntemplate):
1716 fntemplate = b''
1716 fntemplate = b''
1717
1717
1718 if fntemplate:
1718 if fntemplate:
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1720 else:
1720 else:
1721 ui.pager(b'cat')
1721 ui.pager(b'cat')
1722 fm = ui.formatter(b'cat', opts)
1722 fm = ui.formatter(b'cat', opts)
1723 with fm:
1723 with fm:
1724 return cmdutil.cat(
1724 return cmdutil.cat(
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 )
1726 )
1727
1727
1728
1728
1729 @command(
1729 @command(
1730 b'clone',
1730 b'clone',
1731 [
1731 [
1732 (
1732 (
1733 b'U',
1733 b'U',
1734 b'noupdate',
1734 b'noupdate',
1735 None,
1735 None,
1736 _(
1736 _(
1737 b'the clone will include an empty working '
1737 b'the clone will include an empty working '
1738 b'directory (only a repository)'
1738 b'directory (only a repository)'
1739 ),
1739 ),
1740 ),
1740 ),
1741 (
1741 (
1742 b'u',
1742 b'u',
1743 b'updaterev',
1743 b'updaterev',
1744 b'',
1744 b'',
1745 _(b'revision, tag, or branch to check out'),
1745 _(b'revision, tag, or branch to check out'),
1746 _(b'REV'),
1746 _(b'REV'),
1747 ),
1747 ),
1748 (
1748 (
1749 b'r',
1749 b'r',
1750 b'rev',
1750 b'rev',
1751 [],
1751 [],
1752 _(
1752 _(
1753 b'do not clone everything, but include this changeset'
1753 b'do not clone everything, but include this changeset'
1754 b' and its ancestors'
1754 b' and its ancestors'
1755 ),
1755 ),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'b',
1759 b'b',
1760 b'branch',
1760 b'branch',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this branch\'s'
1763 b'do not clone everything, but include this branch\'s'
1764 b' changesets and their ancestors'
1764 b' changesets and their ancestors'
1765 ),
1765 ),
1766 _(b'BRANCH'),
1766 _(b'BRANCH'),
1767 ),
1767 ),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 ]
1771 ]
1772 + remoteopts,
1772 + remoteopts,
1773 _(b'[OPTION]... SOURCE [DEST]'),
1773 _(b'[OPTION]... SOURCE [DEST]'),
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpbasic=True,
1775 helpbasic=True,
1776 norepo=True,
1776 norepo=True,
1777 )
1777 )
1778 def clone(ui, source, dest=None, **opts):
1778 def clone(ui, source, dest=None, **opts):
1779 """make a copy of an existing repository
1779 """make a copy of an existing repository
1780
1780
1781 Create a copy of an existing repository in a new directory.
1781 Create a copy of an existing repository in a new directory.
1782
1782
1783 If no destination directory name is specified, it defaults to the
1783 If no destination directory name is specified, it defaults to the
1784 basename of the source.
1784 basename of the source.
1785
1785
1786 The location of the source is added to the new repository's
1786 The location of the source is added to the new repository's
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788
1788
1789 Only local paths and ``ssh://`` URLs are supported as
1789 Only local paths and ``ssh://`` URLs are supported as
1790 destinations. For ``ssh://`` destinations, no working directory or
1790 destinations. For ``ssh://`` destinations, no working directory or
1791 ``.hg/hgrc`` will be created on the remote side.
1791 ``.hg/hgrc`` will be created on the remote side.
1792
1792
1793 If the source repository has a bookmark called '@' set, that
1793 If the source repository has a bookmark called '@' set, that
1794 revision will be checked out in the new repository by default.
1794 revision will be checked out in the new repository by default.
1795
1795
1796 To check out a particular version, use -u/--update, or
1796 To check out a particular version, use -u/--update, or
1797 -U/--noupdate to create a clone with no working directory.
1797 -U/--noupdate to create a clone with no working directory.
1798
1798
1799 To pull only a subset of changesets, specify one or more revisions
1799 To pull only a subset of changesets, specify one or more revisions
1800 identifiers with -r/--rev or branches with -b/--branch. The
1800 identifiers with -r/--rev or branches with -b/--branch. The
1801 resulting clone will contain only the specified changesets and
1801 resulting clone will contain only the specified changesets and
1802 their ancestors. These options (or 'clone src#rev dest') imply
1802 their ancestors. These options (or 'clone src#rev dest') imply
1803 --pull, even for local source repositories.
1803 --pull, even for local source repositories.
1804
1804
1805 In normal clone mode, the remote normalizes repository data into a common
1805 In normal clone mode, the remote normalizes repository data into a common
1806 exchange format and the receiving end translates this data into its local
1806 exchange format and the receiving end translates this data into its local
1807 storage format. --stream activates a different clone mode that essentially
1807 storage format. --stream activates a different clone mode that essentially
1808 copies repository files from the remote with minimal data processing. This
1808 copies repository files from the remote with minimal data processing. This
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1810 However, it often increases the transferred data size by 30-40%. This can
1810 However, it often increases the transferred data size by 30-40%. This can
1811 result in substantially faster clones where I/O throughput is plentiful,
1811 result in substantially faster clones where I/O throughput is plentiful,
1812 especially for larger repositories. A side-effect of --stream clones is
1812 especially for larger repositories. A side-effect of --stream clones is
1813 that storage settings and requirements on the remote are applied locally:
1813 that storage settings and requirements on the remote are applied locally:
1814 a modern client may inherit legacy or inefficient storage used by the
1814 a modern client may inherit legacy or inefficient storage used by the
1815 remote or a legacy Mercurial client may not be able to clone from a
1815 remote or a legacy Mercurial client may not be able to clone from a
1816 modern Mercurial remote.
1816 modern Mercurial remote.
1817
1817
1818 .. note::
1818 .. note::
1819
1819
1820 Specifying a tag will include the tagged changeset but not the
1820 Specifying a tag will include the tagged changeset but not the
1821 changeset containing the tag.
1821 changeset containing the tag.
1822
1822
1823 .. container:: verbose
1823 .. container:: verbose
1824
1824
1825 For efficiency, hardlinks are used for cloning whenever the
1825 For efficiency, hardlinks are used for cloning whenever the
1826 source and destination are on the same filesystem (note this
1826 source and destination are on the same filesystem (note this
1827 applies only to the repository data, not to the working
1827 applies only to the repository data, not to the working
1828 directory). Some filesystems, such as AFS, implement hardlinking
1828 directory). Some filesystems, such as AFS, implement hardlinking
1829 incorrectly, but do not report errors. In these cases, use the
1829 incorrectly, but do not report errors. In these cases, use the
1830 --pull option to avoid hardlinking.
1830 --pull option to avoid hardlinking.
1831
1831
1832 Mercurial will update the working directory to the first applicable
1832 Mercurial will update the working directory to the first applicable
1833 revision from this list:
1833 revision from this list:
1834
1834
1835 a) null if -U or the source repository has no changesets
1835 a) null if -U or the source repository has no changesets
1836 b) if -u . and the source repository is local, the first parent of
1836 b) if -u . and the source repository is local, the first parent of
1837 the source repository's working directory
1837 the source repository's working directory
1838 c) the changeset specified with -u (if a branch name, this means the
1838 c) the changeset specified with -u (if a branch name, this means the
1839 latest head of that branch)
1839 latest head of that branch)
1840 d) the changeset specified with -r
1840 d) the changeset specified with -r
1841 e) the tipmost head specified with -b
1841 e) the tipmost head specified with -b
1842 f) the tipmost head specified with the url#branch source syntax
1842 f) the tipmost head specified with the url#branch source syntax
1843 g) the revision marked with the '@' bookmark, if present
1843 g) the revision marked with the '@' bookmark, if present
1844 h) the tipmost head of the default branch
1844 h) the tipmost head of the default branch
1845 i) tip
1845 i) tip
1846
1846
1847 When cloning from servers that support it, Mercurial may fetch
1847 When cloning from servers that support it, Mercurial may fetch
1848 pre-generated data from a server-advertised URL or inline from the
1848 pre-generated data from a server-advertised URL or inline from the
1849 same stream. When this is done, hooks operating on incoming changesets
1849 same stream. When this is done, hooks operating on incoming changesets
1850 and changegroups may fire more than once, once for each pre-generated
1850 and changegroups may fire more than once, once for each pre-generated
1851 bundle and as well as for any additional remaining data. In addition,
1851 bundle and as well as for any additional remaining data. In addition,
1852 if an error occurs, the repository may be rolled back to a partial
1852 if an error occurs, the repository may be rolled back to a partial
1853 clone. This behavior may change in future releases.
1853 clone. This behavior may change in future releases.
1854 See :hg:`help -e clonebundles` for more.
1854 See :hg:`help -e clonebundles` for more.
1855
1855
1856 Examples:
1856 Examples:
1857
1857
1858 - clone a remote repository to a new directory named hg/::
1858 - clone a remote repository to a new directory named hg/::
1859
1859
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1861
1861
1862 - create a lightweight local clone::
1862 - create a lightweight local clone::
1863
1863
1864 hg clone project/ project-feature/
1864 hg clone project/ project-feature/
1865
1865
1866 - clone from an absolute path on an ssh server (note double-slash)::
1866 - clone from an absolute path on an ssh server (note double-slash)::
1867
1867
1868 hg clone ssh://user@server//home/projects/alpha/
1868 hg clone ssh://user@server//home/projects/alpha/
1869
1869
1870 - do a streaming clone while checking out a specified version::
1870 - do a streaming clone while checking out a specified version::
1871
1871
1872 hg clone --stream http://server/repo -u 1.5
1872 hg clone --stream http://server/repo -u 1.5
1873
1873
1874 - create a repository without changesets after a particular revision::
1874 - create a repository without changesets after a particular revision::
1875
1875
1876 hg clone -r 04e544 experimental/ good/
1876 hg clone -r 04e544 experimental/ good/
1877
1877
1878 - clone (and track) a particular named branch::
1878 - clone (and track) a particular named branch::
1879
1879
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881
1881
1882 See :hg:`help urls` for details on specifying URLs.
1882 See :hg:`help urls` for details on specifying URLs.
1883
1883
1884 Returns 0 on success.
1884 Returns 0 on success.
1885 """
1885 """
1886 opts = pycompat.byteskwargs(opts)
1886 opts = pycompat.byteskwargs(opts)
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888
1888
1889 # --include/--exclude can come from narrow or sparse.
1889 # --include/--exclude can come from narrow or sparse.
1890 includepats, excludepats = None, None
1890 includepats, excludepats = None, None
1891
1891
1892 # hg.clone() differentiates between None and an empty set. So make sure
1892 # hg.clone() differentiates between None and an empty set. So make sure
1893 # patterns are sets if narrow is requested without patterns.
1893 # patterns are sets if narrow is requested without patterns.
1894 if opts.get(b'narrow'):
1894 if opts.get(b'narrow'):
1895 includepats = set()
1895 includepats = set()
1896 excludepats = set()
1896 excludepats = set()
1897
1897
1898 if opts.get(b'include'):
1898 if opts.get(b'include'):
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 if opts.get(b'exclude'):
1900 if opts.get(b'exclude'):
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902
1902
1903 r = hg.clone(
1903 r = hg.clone(
1904 ui,
1904 ui,
1905 opts,
1905 opts,
1906 source,
1906 source,
1907 dest,
1907 dest,
1908 pull=opts.get(b'pull'),
1908 pull=opts.get(b'pull'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 revs=opts.get(b'rev'),
1910 revs=opts.get(b'rev'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 branch=opts.get(b'branch'),
1912 branch=opts.get(b'branch'),
1913 shareopts=opts.get(b'shareopts'),
1913 shareopts=opts.get(b'shareopts'),
1914 storeincludepats=includepats,
1914 storeincludepats=includepats,
1915 storeexcludepats=excludepats,
1915 storeexcludepats=excludepats,
1916 depth=opts.get(b'depth') or None,
1916 depth=opts.get(b'depth') or None,
1917 )
1917 )
1918
1918
1919 return r is None
1919 return r is None
1920
1920
1921
1921
1922 @command(
1922 @command(
1923 b'commit|ci',
1923 b'commit|ci',
1924 [
1924 [
1925 (
1925 (
1926 b'A',
1926 b'A',
1927 b'addremove',
1927 b'addremove',
1928 None,
1928 None,
1929 _(b'mark new/missing files as added/removed before committing'),
1929 _(b'mark new/missing files as added/removed before committing'),
1930 ),
1930 ),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (
1935 (
1936 b'',
1936 b'',
1937 b'force-close-branch',
1937 b'force-close-branch',
1938 None,
1938 None,
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 ),
1940 ),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 ]
1942 ]
1943 + walkopts
1943 + walkopts
1944 + commitopts
1944 + commitopts
1945 + commitopts2
1945 + commitopts2
1946 + subrepoopts,
1946 + subrepoopts,
1947 _(b'[OPTION]... [FILE]...'),
1947 _(b'[OPTION]... [FILE]...'),
1948 helpcategory=command.CATEGORY_COMMITTING,
1948 helpcategory=command.CATEGORY_COMMITTING,
1949 helpbasic=True,
1949 helpbasic=True,
1950 inferrepo=True,
1950 inferrepo=True,
1951 )
1951 )
1952 def commit(ui, repo, *pats, **opts):
1952 def commit(ui, repo, *pats, **opts):
1953 """commit the specified files or all outstanding changes
1953 """commit the specified files or all outstanding changes
1954
1954
1955 Commit changes to the given files into the repository. Unlike a
1955 Commit changes to the given files into the repository. Unlike a
1956 centralized SCM, this operation is a local operation. See
1956 centralized SCM, this operation is a local operation. See
1957 :hg:`push` for a way to actively distribute your changes.
1957 :hg:`push` for a way to actively distribute your changes.
1958
1958
1959 If a list of files is omitted, all changes reported by :hg:`status`
1959 If a list of files is omitted, all changes reported by :hg:`status`
1960 will be committed.
1960 will be committed.
1961
1961
1962 If you are committing the result of a merge, do not provide any
1962 If you are committing the result of a merge, do not provide any
1963 filenames or -I/-X filters.
1963 filenames or -I/-X filters.
1964
1964
1965 If no commit message is specified, Mercurial starts your
1965 If no commit message is specified, Mercurial starts your
1966 configured editor where you can enter a message. In case your
1966 configured editor where you can enter a message. In case your
1967 commit fails, you will find a backup of your message in
1967 commit fails, you will find a backup of your message in
1968 ``.hg/last-message.txt``.
1968 ``.hg/last-message.txt``.
1969
1969
1970 The --close-branch flag can be used to mark the current branch
1970 The --close-branch flag can be used to mark the current branch
1971 head closed. When all heads of a branch are closed, the branch
1971 head closed. When all heads of a branch are closed, the branch
1972 will be considered closed and no longer listed.
1972 will be considered closed and no longer listed.
1973
1973
1974 The --amend flag can be used to amend the parent of the
1974 The --amend flag can be used to amend the parent of the
1975 working directory with a new commit that contains the changes
1975 working directory with a new commit that contains the changes
1976 in the parent in addition to those currently reported by :hg:`status`,
1976 in the parent in addition to those currently reported by :hg:`status`,
1977 if there are any. The old commit is stored in a backup bundle in
1977 if there are any. The old commit is stored in a backup bundle in
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 on how to restore it).
1979 on how to restore it).
1980
1980
1981 Message, user and date are taken from the amended commit unless
1981 Message, user and date are taken from the amended commit unless
1982 specified. When a message isn't specified on the command line,
1982 specified. When a message isn't specified on the command line,
1983 the editor will open with the message of the amended commit.
1983 the editor will open with the message of the amended commit.
1984
1984
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1986 or changesets that have children.
1986 or changesets that have children.
1987
1987
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1989
1989
1990 Returns 0 on success, 1 if nothing changed.
1990 Returns 0 on success, 1 if nothing changed.
1991
1991
1992 .. container:: verbose
1992 .. container:: verbose
1993
1993
1994 Examples:
1994 Examples:
1995
1995
1996 - commit all files ending in .py::
1996 - commit all files ending in .py::
1997
1997
1998 hg commit --include "set:**.py"
1998 hg commit --include "set:**.py"
1999
1999
2000 - commit all non-binary files::
2000 - commit all non-binary files::
2001
2001
2002 hg commit --exclude "set:binary()"
2002 hg commit --exclude "set:binary()"
2003
2003
2004 - amend the current commit and set the date to now::
2004 - amend the current commit and set the date to now::
2005
2005
2006 hg commit --amend --date now
2006 hg commit --amend --date now
2007 """
2007 """
2008 with repo.wlock(), repo.lock():
2008 with repo.wlock(), repo.lock():
2009 return _docommit(ui, repo, *pats, **opts)
2009 return _docommit(ui, repo, *pats, **opts)
2010
2010
2011
2011
2012 def _docommit(ui, repo, *pats, **opts):
2012 def _docommit(ui, repo, *pats, **opts):
2013 if opts.get('interactive'):
2013 if opts.get('interactive'):
2014 opts.pop('interactive')
2014 opts.pop('interactive')
2015 ret = cmdutil.dorecord(
2015 ret = cmdutil.dorecord(
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 )
2017 )
2018 # ret can be 0 (no changes to record) or the value returned by
2018 # ret can be 0 (no changes to record) or the value returned by
2019 # commit(), 1 if nothing changed or None on success.
2019 # commit(), 1 if nothing changed or None on success.
2020 return 1 if ret == 0 else ret
2020 return 1 if ret == 0 else ret
2021
2021
2022 opts = pycompat.byteskwargs(opts)
2022 opts = pycompat.byteskwargs(opts)
2023 if opts.get(b'subrepos'):
2023 if opts.get(b'subrepos'):
2024 if opts.get(b'amend'):
2024 if opts.get(b'amend'):
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 # Let --subrepos on the command line override config setting.
2026 # Let --subrepos on the command line override config setting.
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028
2028
2029 cmdutil.checkunfinished(repo, commit=True)
2029 cmdutil.checkunfinished(repo, commit=True)
2030
2030
2031 branch = repo[None].branch()
2031 branch = repo[None].branch()
2032 bheads = repo.branchheads(branch)
2032 bheads = repo.branchheads(branch)
2033
2033
2034 extra = {}
2034 extra = {}
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 extra[b'close'] = b'1'
2036 extra[b'close'] = b'1'
2037
2037
2038 if repo[b'.'].closesbranch():
2038 if repo[b'.'].closesbranch():
2039 raise error.Abort(
2039 raise error.Abort(
2040 _(b'current revision is already a branch closing head')
2040 _(b'current revision is already a branch closing head')
2041 )
2041 )
2042 elif not bheads:
2042 elif not bheads:
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 elif (
2044 elif (
2045 branch == repo[b'.'].branch()
2045 branch == repo[b'.'].branch()
2046 and repo[b'.'].node() not in bheads
2046 and repo[b'.'].node() not in bheads
2047 and not opts.get(b'force_close_branch')
2047 and not opts.get(b'force_close_branch')
2048 ):
2048 ):
2049 hint = _(
2049 hint = _(
2050 b'use --force-close-branch to close branch from a non-head'
2050 b'use --force-close-branch to close branch from a non-head'
2051 b' changeset'
2051 b' changeset'
2052 )
2052 )
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 elif opts.get(b'amend'):
2054 elif opts.get(b'amend'):
2055 if (
2055 if (
2056 repo[b'.'].p1().branch() != branch
2056 repo[b'.'].p1().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2058 ):
2058 ):
2059 raise error.Abort(_(b'can only close branch heads'))
2059 raise error.Abort(_(b'can only close branch heads'))
2060
2060
2061 if opts.get(b'amend'):
2061 if opts.get(b'amend'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064
2064
2065 old = repo[b'.']
2065 old = repo[b'.']
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067
2067
2068 # Currently histedit gets confused if an amend happens while histedit
2068 # Currently histedit gets confused if an amend happens while histedit
2069 # is in progress. Since we have a checkunfinished command, we are
2069 # is in progress. Since we have a checkunfinished command, we are
2070 # temporarily honoring it.
2070 # temporarily honoring it.
2071 #
2071 #
2072 # Note: eventually this guard will be removed. Please do not expect
2072 # Note: eventually this guard will be removed. Please do not expect
2073 # this behavior to remain.
2073 # this behavior to remain.
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 cmdutil.checkunfinished(repo)
2075 cmdutil.checkunfinished(repo)
2076
2076
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 if node == old.node():
2078 if node == old.node():
2079 ui.status(_(b"nothing changed\n"))
2079 ui.status(_(b"nothing changed\n"))
2080 return 1
2080 return 1
2081 else:
2081 else:
2082
2082
2083 def commitfunc(ui, repo, message, match, opts):
2083 def commitfunc(ui, repo, message, match, opts):
2084 overrides = {}
2084 overrides = {}
2085 if opts.get(b'secret'):
2085 if opts.get(b'secret'):
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2087
2087
2088 baseui = repo.baseui
2088 baseui = repo.baseui
2089 with baseui.configoverride(overrides, b'commit'):
2089 with baseui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2091 editform = cmdutil.mergeeditform(
2091 editform = cmdutil.mergeeditform(
2092 repo[None], b'commit.normal'
2092 repo[None], b'commit.normal'
2093 )
2093 )
2094 editor = cmdutil.getcommiteditor(
2094 editor = cmdutil.getcommiteditor(
2095 editform=editform, **pycompat.strkwargs(opts)
2095 editform=editform, **pycompat.strkwargs(opts)
2096 )
2096 )
2097 return repo.commit(
2097 return repo.commit(
2098 message,
2098 message,
2099 opts.get(b'user'),
2099 opts.get(b'user'),
2100 opts.get(b'date'),
2100 opts.get(b'date'),
2101 match,
2101 match,
2102 editor=editor,
2102 editor=editor,
2103 extra=extra,
2103 extra=extra,
2104 )
2104 )
2105
2105
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107
2107
2108 if not node:
2108 if not node:
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 if stat.deleted:
2110 if stat.deleted:
2111 ui.status(
2111 ui.status(
2112 _(
2112 _(
2113 b"nothing changed (%d missing files, see "
2113 b"nothing changed (%d missing files, see "
2114 b"'hg status')\n"
2114 b"'hg status')\n"
2115 )
2115 )
2116 % len(stat.deleted)
2116 % len(stat.deleted)
2117 )
2117 )
2118 else:
2118 else:
2119 ui.status(_(b"nothing changed\n"))
2119 ui.status(_(b"nothing changed\n"))
2120 return 1
2120 return 1
2121
2121
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123
2123
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 status(
2125 status(
2126 ui,
2126 ui,
2127 repo,
2127 repo,
2128 modified=True,
2128 modified=True,
2129 added=True,
2129 added=True,
2130 removed=True,
2130 removed=True,
2131 deleted=True,
2131 deleted=True,
2132 unknown=True,
2132 unknown=True,
2133 subrepos=opts.get(b'subrepos'),
2133 subrepos=opts.get(b'subrepos'),
2134 )
2134 )
2135
2135
2136
2136
2137 @command(
2137 @command(
2138 b'config|showconfig|debugconfig',
2138 b'config|showconfig|debugconfig',
2139 [
2139 [
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2144 ]
2144 ]
2145 + formatteropts,
2145 + formatteropts,
2146 _(b'[-u] [NAME]...'),
2146 _(b'[-u] [NAME]...'),
2147 helpcategory=command.CATEGORY_HELP,
2147 helpcategory=command.CATEGORY_HELP,
2148 optionalrepo=True,
2148 optionalrepo=True,
2149 intents={INTENT_READONLY},
2149 intents={INTENT_READONLY},
2150 )
2150 )
2151 def config(ui, repo, *values, **opts):
2151 def config(ui, repo, *values, **opts):
2152 """show combined config settings from all hgrc files
2152 """show combined config settings from all hgrc files
2153
2153
2154 With no arguments, print names and values of all config items.
2154 With no arguments, print names and values of all config items.
2155
2155
2156 With one argument of the form section.name, print just the value
2156 With one argument of the form section.name, print just the value
2157 of that config item.
2157 of that config item.
2158
2158
2159 With multiple arguments, print names and values of all config
2159 With multiple arguments, print names and values of all config
2160 items with matching section names or section.names.
2160 items with matching section names or section.names.
2161
2161
2162 With --edit, start an editor on the user-level config file. With
2162 With --edit, start an editor on the user-level config file. With
2163 --global, edit the system-wide config file. With --local, edit the
2163 --global, edit the system-wide config file. With --local, edit the
2164 repository-level config file.
2164 repository-level config file.
2165
2165
2166 With --debug, the source (filename and line number) is printed
2166 With --debug, the source (filename and line number) is printed
2167 for each config item.
2167 for each config item.
2168
2168
2169 See :hg:`help config` for more information about config files.
2169 See :hg:`help config` for more information about config files.
2170
2170
2171 .. container:: verbose
2171 .. container:: verbose
2172
2172
2173 Template:
2173 Template:
2174
2174
2175 The following keywords are supported. See also :hg:`help templates`.
2175 The following keywords are supported. See also :hg:`help templates`.
2176
2176
2177 :name: String. Config name.
2177 :name: String. Config name.
2178 :source: String. Filename and line number where the item is defined.
2178 :source: String. Filename and line number where the item is defined.
2179 :value: String. Config value.
2179 :value: String. Config value.
2180
2180
2181 Returns 0 on success, 1 if NAME does not exist.
2181 Returns 0 on success, 1 if NAME does not exist.
2182
2182
2183 """
2183 """
2184
2184
2185 opts = pycompat.byteskwargs(opts)
2185 opts = pycompat.byteskwargs(opts)
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2188 raise error.Abort(_(b"can't use --local and --global together"))
2188 raise error.Abort(_(b"can't use --local and --global together"))
2189
2189
2190 if opts.get(b'local'):
2190 if opts.get(b'local'):
2191 if not repo:
2191 if not repo:
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2193 paths = [repo.vfs.join(b'hgrc')]
2193 paths = [repo.vfs.join(b'hgrc')]
2194 elif opts.get(b'global'):
2194 elif opts.get(b'global'):
2195 paths = rcutil.systemrcpath()
2195 paths = rcutil.systemrcpath()
2196 else:
2196 else:
2197 paths = rcutil.userrcpath()
2197 paths = rcutil.userrcpath()
2198
2198
2199 for f in paths:
2199 for f in paths:
2200 if os.path.exists(f):
2200 if os.path.exists(f):
2201 break
2201 break
2202 else:
2202 else:
2203 if opts.get(b'global'):
2203 if opts.get(b'global'):
2204 samplehgrc = uimod.samplehgrcs[b'global']
2204 samplehgrc = uimod.samplehgrcs[b'global']
2205 elif opts.get(b'local'):
2205 elif opts.get(b'local'):
2206 samplehgrc = uimod.samplehgrcs[b'local']
2206 samplehgrc = uimod.samplehgrcs[b'local']
2207 else:
2207 else:
2208 samplehgrc = uimod.samplehgrcs[b'user']
2208 samplehgrc = uimod.samplehgrcs[b'user']
2209
2209
2210 f = paths[0]
2210 f = paths[0]
2211 fp = open(f, b"wb")
2211 fp = open(f, b"wb")
2212 fp.write(util.tonativeeol(samplehgrc))
2212 fp.write(util.tonativeeol(samplehgrc))
2213 fp.close()
2213 fp.close()
2214
2214
2215 editor = ui.geteditor()
2215 editor = ui.geteditor()
2216 ui.system(
2216 ui.system(
2217 b"%s \"%s\"" % (editor, f),
2217 b"%s \"%s\"" % (editor, f),
2218 onerr=error.Abort,
2218 onerr=error.Abort,
2219 errprefix=_(b"edit failed"),
2219 errprefix=_(b"edit failed"),
2220 blockedtag=b'config_edit',
2220 blockedtag=b'config_edit',
2221 )
2221 )
2222 return
2222 return
2223 ui.pager(b'config')
2223 ui.pager(b'config')
2224 fm = ui.formatter(b'config', opts)
2224 fm = ui.formatter(b'config', opts)
2225 for t, f in rcutil.rccomponents():
2225 for t, f in rcutil.rccomponents():
2226 if t == b'path':
2226 if t == b'path':
2227 ui.debug(b'read config from: %s\n' % f)
2227 ui.debug(b'read config from: %s\n' % f)
2228 elif t == b'resource':
2228 elif t == b'resource':
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 elif t == b'items':
2230 elif t == b'items':
2231 # Don't print anything for 'items'.
2231 # Don't print anything for 'items'.
2232 pass
2232 pass
2233 else:
2233 else:
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 untrusted = bool(opts.get(b'untrusted'))
2235 untrusted = bool(opts.get(b'untrusted'))
2236
2236
2237 selsections = selentries = []
2237 selsections = selentries = []
2238 if values:
2238 if values:
2239 selsections = [v for v in values if b'.' not in v]
2239 selsections = [v for v in values if b'.' not in v]
2240 selentries = [v for v in values if b'.' in v]
2240 selentries = [v for v in values if b'.' in v]
2241 uniquesel = len(selentries) == 1 and not selsections
2241 uniquesel = len(selentries) == 1 and not selsections
2242 selsections = set(selsections)
2242 selsections = set(selsections)
2243 selentries = set(selentries)
2243 selentries = set(selentries)
2244
2244
2245 matched = False
2245 matched = False
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 source = ui.configsource(section, name, untrusted)
2247 source = ui.configsource(section, name, untrusted)
2248 value = pycompat.bytestr(value)
2248 value = pycompat.bytestr(value)
2249 defaultvalue = ui.configdefault(section, name)
2249 defaultvalue = ui.configdefault(section, name)
2250 if fm.isplain():
2250 if fm.isplain():
2251 source = source or b'none'
2251 source = source or b'none'
2252 value = value.replace(b'\n', b'\\n')
2252 value = value.replace(b'\n', b'\\n')
2253 entryname = section + b'.' + name
2253 entryname = section + b'.' + name
2254 if values and not (section in selsections or entryname in selentries):
2254 if values and not (section in selsections or entryname in selentries):
2255 continue
2255 continue
2256 fm.startitem()
2256 fm.startitem()
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 if uniquesel:
2258 if uniquesel:
2259 fm.data(name=entryname)
2259 fm.data(name=entryname)
2260 fm.write(b'value', b'%s\n', value)
2260 fm.write(b'value', b'%s\n', value)
2261 else:
2261 else:
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 if formatter.isprintable(defaultvalue):
2263 if formatter.isprintable(defaultvalue):
2264 fm.data(defaultvalue=defaultvalue)
2264 fm.data(defaultvalue=defaultvalue)
2265 elif isinstance(defaultvalue, list) and all(
2265 elif isinstance(defaultvalue, list) and all(
2266 formatter.isprintable(e) for e in defaultvalue
2266 formatter.isprintable(e) for e in defaultvalue
2267 ):
2267 ):
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 # TODO: no idea how to process unsupported defaultvalue types
2269 # TODO: no idea how to process unsupported defaultvalue types
2270 matched = True
2270 matched = True
2271 fm.end()
2271 fm.end()
2272 if matched:
2272 if matched:
2273 return 0
2273 return 0
2274 return 1
2274 return 1
2275
2275
2276
2276
2277 @command(
2277 @command(
2278 b'continue',
2278 b'continue',
2279 dryrunopts,
2279 dryrunopts,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 helpbasic=True,
2281 helpbasic=True,
2282 )
2282 )
2283 def continuecmd(ui, repo, **opts):
2283 def continuecmd(ui, repo, **opts):
2284 """resumes an interrupted operation (EXPERIMENTAL)
2284 """resumes an interrupted operation (EXPERIMENTAL)
2285
2285
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 and unshelve if they are in an interrupted state.
2287 and unshelve if they are in an interrupted state.
2288
2288
2289 use --dry-run/-n to dry run the command.
2289 use --dry-run/-n to dry run the command.
2290 """
2290 """
2291 dryrun = opts.get('dry_run')
2291 dryrun = opts.get('dry_run')
2292 contstate = cmdutil.getunfinishedstate(repo)
2292 contstate = cmdutil.getunfinishedstate(repo)
2293 if not contstate:
2293 if not contstate:
2294 raise error.Abort(_(b'no operation in progress'))
2294 raise error.Abort(_(b'no operation in progress'))
2295 if not contstate.continuefunc:
2295 if not contstate.continuefunc:
2296 raise error.Abort(
2296 raise error.Abort(
2297 (
2297 (
2298 _(b"%s in progress but does not support 'hg continue'")
2298 _(b"%s in progress but does not support 'hg continue'")
2299 % (contstate._opname)
2299 % (contstate._opname)
2300 ),
2300 ),
2301 hint=contstate.continuemsg(),
2301 hint=contstate.continuemsg(),
2302 )
2302 )
2303 if dryrun:
2303 if dryrun:
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 return
2305 return
2306 return contstate.continuefunc(ui, repo)
2306 return contstate.continuefunc(ui, repo)
2307
2307
2308
2308
2309 @command(
2309 @command(
2310 b'copy|cp',
2310 b'copy|cp',
2311 [
2311 [
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2314 (
2314 (
2315 b'',
2315 b'',
2316 b'at-rev',
2316 b'at-rev',
2317 b'',
2317 b'',
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2319 _(b'REV'),
2319 _(b'REV'),
2320 ),
2320 ),
2321 (
2321 (
2322 b'f',
2322 b'f',
2323 b'force',
2323 b'force',
2324 None,
2324 None,
2325 _(b'forcibly copy over an existing managed file'),
2325 _(b'forcibly copy over an existing managed file'),
2326 ),
2326 ),
2327 ]
2327 ]
2328 + walkopts
2328 + walkopts
2329 + dryrunopts,
2329 + dryrunopts,
2330 _(b'[OPTION]... SOURCE... DEST'),
2330 _(b'[OPTION]... SOURCE... DEST'),
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2332 )
2332 )
2333 def copy(ui, repo, *pats, **opts):
2333 def copy(ui, repo, *pats, **opts):
2334 """mark files as copied for the next commit
2334 """mark files as copied for the next commit
2335
2335
2336 Mark dest as having copies of source files. If dest is a
2336 Mark dest as having copies of source files. If dest is a
2337 directory, copies are put in that directory. If dest is a file,
2337 directory, copies are put in that directory. If dest is a file,
2338 the source must be a single file.
2338 the source must be a single file.
2339
2339
2340 By default, this command copies the contents of files as they
2340 By default, this command copies the contents of files as they
2341 exist in the working directory. If invoked with -A/--after, the
2341 exist in the working directory. If invoked with -A/--after, the
2342 operation is recorded, but no copying is performed.
2342 operation is recorded, but no copying is performed.
2343
2343
2344 To undo marking a file as copied, use --forget. With that option,
2344 To undo marking a file as copied, use --forget. With that option,
2345 all given (positional) arguments are unmarked as copies. The destination
2345 all given (positional) arguments are unmarked as copies. The destination
2346 file(s) will be left in place (still tracked).
2346 file(s) will be left in place (still tracked).
2347
2347
2348 This command takes effect with the next commit by default.
2348 This command takes effect with the next commit by default.
2349
2349
2350 Returns 0 on success, 1 if errors are encountered.
2350 Returns 0 on success, 1 if errors are encountered.
2351 """
2351 """
2352 opts = pycompat.byteskwargs(opts)
2352 opts = pycompat.byteskwargs(opts)
2353 with repo.wlock():
2353 with repo.wlock():
2354 return cmdutil.copy(ui, repo, pats, opts)
2354 return cmdutil.copy(ui, repo, pats, opts)
2355
2355
2356
2356
2357 @command(
2357 @command(
2358 b'debugcommands',
2358 b'debugcommands',
2359 [],
2359 [],
2360 _(b'[COMMAND]'),
2360 _(b'[COMMAND]'),
2361 helpcategory=command.CATEGORY_HELP,
2361 helpcategory=command.CATEGORY_HELP,
2362 norepo=True,
2362 norepo=True,
2363 )
2363 )
2364 def debugcommands(ui, cmd=b'', *args):
2364 def debugcommands(ui, cmd=b'', *args):
2365 """list all available commands and options"""
2365 """list all available commands and options"""
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2367 cmd = cmd.split(b'|')[0]
2367 cmd = cmd.split(b'|')[0]
2368 opts = b', '.join([i[1] for i in vals[1]])
2368 opts = b', '.join([i[1] for i in vals[1]])
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2370
2370
2371
2371
2372 @command(
2372 @command(
2373 b'debugcomplete',
2373 b'debugcomplete',
2374 [(b'o', b'options', None, _(b'show the command options'))],
2374 [(b'o', b'options', None, _(b'show the command options'))],
2375 _(b'[-o] CMD'),
2375 _(b'[-o] CMD'),
2376 helpcategory=command.CATEGORY_HELP,
2376 helpcategory=command.CATEGORY_HELP,
2377 norepo=True,
2377 norepo=True,
2378 )
2378 )
2379 def debugcomplete(ui, cmd=b'', **opts):
2379 def debugcomplete(ui, cmd=b'', **opts):
2380 """returns the completion list associated with the given command"""
2380 """returns the completion list associated with the given command"""
2381
2381
2382 if opts.get('options'):
2382 if opts.get('options'):
2383 options = []
2383 options = []
2384 otables = [globalopts]
2384 otables = [globalopts]
2385 if cmd:
2385 if cmd:
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2387 otables.append(entry[1])
2387 otables.append(entry[1])
2388 for t in otables:
2388 for t in otables:
2389 for o in t:
2389 for o in t:
2390 if b"(DEPRECATED)" in o[3]:
2390 if b"(DEPRECATED)" in o[3]:
2391 continue
2391 continue
2392 if o[0]:
2392 if o[0]:
2393 options.append(b'-%s' % o[0])
2393 options.append(b'-%s' % o[0])
2394 options.append(b'--%s' % o[1])
2394 options.append(b'--%s' % o[1])
2395 ui.write(b"%s\n" % b"\n".join(options))
2395 ui.write(b"%s\n" % b"\n".join(options))
2396 return
2396 return
2397
2397
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2399 if ui.verbose:
2399 if ui.verbose:
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2402
2402
2403
2403
2404 @command(
2404 @command(
2405 b'diff',
2405 b'diff',
2406 [
2406 [
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2409 ]
2409 ]
2410 + diffopts
2410 + diffopts
2411 + diffopts2
2411 + diffopts2
2412 + walkopts
2412 + walkopts
2413 + subrepoopts,
2413 + subrepoopts,
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2416 helpbasic=True,
2416 helpbasic=True,
2417 inferrepo=True,
2417 inferrepo=True,
2418 intents={INTENT_READONLY},
2418 intents={INTENT_READONLY},
2419 )
2419 )
2420 def diff(ui, repo, *pats, **opts):
2420 def diff(ui, repo, *pats, **opts):
2421 """diff repository (or selected files)
2421 """diff repository (or selected files)
2422
2422
2423 Show differences between revisions for the specified files.
2423 Show differences between revisions for the specified files.
2424
2424
2425 Differences between files are shown using the unified diff format.
2425 Differences between files are shown using the unified diff format.
2426
2426
2427 .. note::
2427 .. note::
2428
2428
2429 :hg:`diff` may generate unexpected results for merges, as it will
2429 :hg:`diff` may generate unexpected results for merges, as it will
2430 default to comparing against the working directory's first
2430 default to comparing against the working directory's first
2431 parent changeset if no revisions are specified.
2431 parent changeset if no revisions are specified.
2432
2432
2433 When two revision arguments are given, then changes are shown
2433 When two revision arguments are given, then changes are shown
2434 between those revisions. If only one revision is specified then
2434 between those revisions. If only one revision is specified then
2435 that revision is compared to the working directory, and, when no
2435 that revision is compared to the working directory, and, when no
2436 revisions are specified, the working directory files are compared
2436 revisions are specified, the working directory files are compared
2437 to its first parent.
2437 to its first parent.
2438
2438
2439 Alternatively you can specify -c/--change with a revision to see
2439 Alternatively you can specify -c/--change with a revision to see
2440 the changes in that changeset relative to its first parent.
2440 the changes in that changeset relative to its first parent.
2441
2441
2442 Without the -a/--text option, diff will avoid generating diffs of
2442 Without the -a/--text option, diff will avoid generating diffs of
2443 files it detects as binary. With -a, diff will generate a diff
2443 files it detects as binary. With -a, diff will generate a diff
2444 anyway, probably with undesirable results.
2444 anyway, probably with undesirable results.
2445
2445
2446 Use the -g/--git option to generate diffs in the git extended diff
2446 Use the -g/--git option to generate diffs in the git extended diff
2447 format. For more information, read :hg:`help diffs`.
2447 format. For more information, read :hg:`help diffs`.
2448
2448
2449 .. container:: verbose
2449 .. container:: verbose
2450
2450
2451 Examples:
2451 Examples:
2452
2452
2453 - compare a file in the current working directory to its parent::
2453 - compare a file in the current working directory to its parent::
2454
2454
2455 hg diff foo.c
2455 hg diff foo.c
2456
2456
2457 - compare two historical versions of a directory, with rename info::
2457 - compare two historical versions of a directory, with rename info::
2458
2458
2459 hg diff --git -r 1.0:1.2 lib/
2459 hg diff --git -r 1.0:1.2 lib/
2460
2460
2461 - get change stats relative to the last change on some date::
2461 - get change stats relative to the last change on some date::
2462
2462
2463 hg diff --stat -r "date('may 2')"
2463 hg diff --stat -r "date('may 2')"
2464
2464
2465 - diff all newly-added files that contain a keyword::
2465 - diff all newly-added files that contain a keyword::
2466
2466
2467 hg diff "set:added() and grep(GNU)"
2467 hg diff "set:added() and grep(GNU)"
2468
2468
2469 - compare a revision and its parents::
2469 - compare a revision and its parents::
2470
2470
2471 hg diff -c 9353 # compare against first parent
2471 hg diff -c 9353 # compare against first parent
2472 hg diff -r 9353^:9353 # same using revset syntax
2472 hg diff -r 9353^:9353 # same using revset syntax
2473 hg diff -r 9353^2:9353 # compare against the second parent
2473 hg diff -r 9353^2:9353 # compare against the second parent
2474
2474
2475 Returns 0 on success.
2475 Returns 0 on success.
2476 """
2476 """
2477
2477
2478 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2478 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2479 opts = pycompat.byteskwargs(opts)
2479 opts = pycompat.byteskwargs(opts)
2480 revs = opts.get(b'rev')
2480 revs = opts.get(b'rev')
2481 change = opts.get(b'change')
2481 change = opts.get(b'change')
2482 stat = opts.get(b'stat')
2482 stat = opts.get(b'stat')
2483 reverse = opts.get(b'reverse')
2483 reverse = opts.get(b'reverse')
2484
2484
2485 if change:
2485 if change:
2486 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2486 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2487 ctx2 = scmutil.revsingle(repo, change, None)
2487 ctx2 = scmutil.revsingle(repo, change, None)
2488 ctx1 = ctx2.p1()
2488 ctx1 = ctx2.p1()
2489 else:
2489 else:
2490 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2490 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2491 ctx1, ctx2 = scmutil.revpair(repo, revs)
2491 ctx1, ctx2 = scmutil.revpair(repo, revs)
2492
2492
2493 if reverse:
2493 if reverse:
2494 ctxleft = ctx2
2494 ctxleft = ctx2
2495 ctxright = ctx1
2495 ctxright = ctx1
2496 else:
2496 else:
2497 ctxleft = ctx1
2497 ctxleft = ctx1
2498 ctxright = ctx2
2498 ctxright = ctx2
2499
2499
2500 diffopts = patch.diffallopts(ui, opts)
2500 diffopts = patch.diffallopts(ui, opts)
2501 m = scmutil.match(ctx2, pats, opts)
2501 m = scmutil.match(ctx2, pats, opts)
2502 m = repo.narrowmatch(m)
2502 m = repo.narrowmatch(m)
2503 ui.pager(b'diff')
2503 ui.pager(b'diff')
2504 logcmdutil.diffordiffstat(
2504 logcmdutil.diffordiffstat(
2505 ui,
2505 ui,
2506 repo,
2506 repo,
2507 diffopts,
2507 diffopts,
2508 ctxleft,
2508 ctxleft,
2509 ctxright,
2509 ctxright,
2510 m,
2510 m,
2511 stat=stat,
2511 stat=stat,
2512 listsubrepos=opts.get(b'subrepos'),
2512 listsubrepos=opts.get(b'subrepos'),
2513 root=opts.get(b'root'),
2513 root=opts.get(b'root'),
2514 )
2514 )
2515
2515
2516
2516
2517 @command(
2517 @command(
2518 b'export',
2518 b'export',
2519 [
2519 [
2520 (
2520 (
2521 b'B',
2521 b'B',
2522 b'bookmark',
2522 b'bookmark',
2523 b'',
2523 b'',
2524 _(b'export changes only reachable by given bookmark'),
2524 _(b'export changes only reachable by given bookmark'),
2525 _(b'BOOKMARK'),
2525 _(b'BOOKMARK'),
2526 ),
2526 ),
2527 (
2527 (
2528 b'o',
2528 b'o',
2529 b'output',
2529 b'output',
2530 b'',
2530 b'',
2531 _(b'print output to file with formatted name'),
2531 _(b'print output to file with formatted name'),
2532 _(b'FORMAT'),
2532 _(b'FORMAT'),
2533 ),
2533 ),
2534 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2534 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2535 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2535 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2536 ]
2536 ]
2537 + diffopts
2537 + diffopts
2538 + formatteropts,
2538 + formatteropts,
2539 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2539 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2541 helpbasic=True,
2541 helpbasic=True,
2542 intents={INTENT_READONLY},
2542 intents={INTENT_READONLY},
2543 )
2543 )
2544 def export(ui, repo, *changesets, **opts):
2544 def export(ui, repo, *changesets, **opts):
2545 """dump the header and diffs for one or more changesets
2545 """dump the header and diffs for one or more changesets
2546
2546
2547 Print the changeset header and diffs for one or more revisions.
2547 Print the changeset header and diffs for one or more revisions.
2548 If no revision is given, the parent of the working directory is used.
2548 If no revision is given, the parent of the working directory is used.
2549
2549
2550 The information shown in the changeset header is: author, date,
2550 The information shown in the changeset header is: author, date,
2551 branch name (if non-default), changeset hash, parent(s) and commit
2551 branch name (if non-default), changeset hash, parent(s) and commit
2552 comment.
2552 comment.
2553
2553
2554 .. note::
2554 .. note::
2555
2555
2556 :hg:`export` may generate unexpected diff output for merge
2556 :hg:`export` may generate unexpected diff output for merge
2557 changesets, as it will compare the merge changeset against its
2557 changesets, as it will compare the merge changeset against its
2558 first parent only.
2558 first parent only.
2559
2559
2560 Output may be to a file, in which case the name of the file is
2560 Output may be to a file, in which case the name of the file is
2561 given using a template string. See :hg:`help templates`. In addition
2561 given using a template string. See :hg:`help templates`. In addition
2562 to the common template keywords, the following formatting rules are
2562 to the common template keywords, the following formatting rules are
2563 supported:
2563 supported:
2564
2564
2565 :``%%``: literal "%" character
2565 :``%%``: literal "%" character
2566 :``%H``: changeset hash (40 hexadecimal digits)
2566 :``%H``: changeset hash (40 hexadecimal digits)
2567 :``%N``: number of patches being generated
2567 :``%N``: number of patches being generated
2568 :``%R``: changeset revision number
2568 :``%R``: changeset revision number
2569 :``%b``: basename of the exporting repository
2569 :``%b``: basename of the exporting repository
2570 :``%h``: short-form changeset hash (12 hexadecimal digits)
2570 :``%h``: short-form changeset hash (12 hexadecimal digits)
2571 :``%m``: first line of the commit message (only alphanumeric characters)
2571 :``%m``: first line of the commit message (only alphanumeric characters)
2572 :``%n``: zero-padded sequence number, starting at 1
2572 :``%n``: zero-padded sequence number, starting at 1
2573 :``%r``: zero-padded changeset revision number
2573 :``%r``: zero-padded changeset revision number
2574 :``\\``: literal "\\" character
2574 :``\\``: literal "\\" character
2575
2575
2576 Without the -a/--text option, export will avoid generating diffs
2576 Without the -a/--text option, export will avoid generating diffs
2577 of files it detects as binary. With -a, export will generate a
2577 of files it detects as binary. With -a, export will generate a
2578 diff anyway, probably with undesirable results.
2578 diff anyway, probably with undesirable results.
2579
2579
2580 With -B/--bookmark changesets reachable by the given bookmark are
2580 With -B/--bookmark changesets reachable by the given bookmark are
2581 selected.
2581 selected.
2582
2582
2583 Use the -g/--git option to generate diffs in the git extended diff
2583 Use the -g/--git option to generate diffs in the git extended diff
2584 format. See :hg:`help diffs` for more information.
2584 format. See :hg:`help diffs` for more information.
2585
2585
2586 With the --switch-parent option, the diff will be against the
2586 With the --switch-parent option, the diff will be against the
2587 second parent. It can be useful to review a merge.
2587 second parent. It can be useful to review a merge.
2588
2588
2589 .. container:: verbose
2589 .. container:: verbose
2590
2590
2591 Template:
2591 Template:
2592
2592
2593 The following keywords are supported in addition to the common template
2593 The following keywords are supported in addition to the common template
2594 keywords and functions. See also :hg:`help templates`.
2594 keywords and functions. See also :hg:`help templates`.
2595
2595
2596 :diff: String. Diff content.
2596 :diff: String. Diff content.
2597 :parents: List of strings. Parent nodes of the changeset.
2597 :parents: List of strings. Parent nodes of the changeset.
2598
2598
2599 Examples:
2599 Examples:
2600
2600
2601 - use export and import to transplant a bugfix to the current
2601 - use export and import to transplant a bugfix to the current
2602 branch::
2602 branch::
2603
2603
2604 hg export -r 9353 | hg import -
2604 hg export -r 9353 | hg import -
2605
2605
2606 - export all the changesets between two revisions to a file with
2606 - export all the changesets between two revisions to a file with
2607 rename information::
2607 rename information::
2608
2608
2609 hg export --git -r 123:150 > changes.txt
2609 hg export --git -r 123:150 > changes.txt
2610
2610
2611 - split outgoing changes into a series of patches with
2611 - split outgoing changes into a series of patches with
2612 descriptive names::
2612 descriptive names::
2613
2613
2614 hg export -r "outgoing()" -o "%n-%m.patch"
2614 hg export -r "outgoing()" -o "%n-%m.patch"
2615
2615
2616 Returns 0 on success.
2616 Returns 0 on success.
2617 """
2617 """
2618 opts = pycompat.byteskwargs(opts)
2618 opts = pycompat.byteskwargs(opts)
2619 bookmark = opts.get(b'bookmark')
2619 bookmark = opts.get(b'bookmark')
2620 changesets += tuple(opts.get(b'rev', []))
2620 changesets += tuple(opts.get(b'rev', []))
2621
2621
2622 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2622 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2623
2623
2624 if bookmark:
2624 if bookmark:
2625 if bookmark not in repo._bookmarks:
2625 if bookmark not in repo._bookmarks:
2626 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2626 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2627
2627
2628 revs = scmutil.bookmarkrevs(repo, bookmark)
2628 revs = scmutil.bookmarkrevs(repo, bookmark)
2629 else:
2629 else:
2630 if not changesets:
2630 if not changesets:
2631 changesets = [b'.']
2631 changesets = [b'.']
2632
2632
2633 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2633 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2634 revs = scmutil.revrange(repo, changesets)
2634 revs = scmutil.revrange(repo, changesets)
2635
2635
2636 if not revs:
2636 if not revs:
2637 raise error.Abort(_(b"export requires at least one changeset"))
2637 raise error.Abort(_(b"export requires at least one changeset"))
2638 if len(revs) > 1:
2638 if len(revs) > 1:
2639 ui.note(_(b'exporting patches:\n'))
2639 ui.note(_(b'exporting patches:\n'))
2640 else:
2640 else:
2641 ui.note(_(b'exporting patch:\n'))
2641 ui.note(_(b'exporting patch:\n'))
2642
2642
2643 fntemplate = opts.get(b'output')
2643 fntemplate = opts.get(b'output')
2644 if cmdutil.isstdiofilename(fntemplate):
2644 if cmdutil.isstdiofilename(fntemplate):
2645 fntemplate = b''
2645 fntemplate = b''
2646
2646
2647 if fntemplate:
2647 if fntemplate:
2648 fm = formatter.nullformatter(ui, b'export', opts)
2648 fm = formatter.nullformatter(ui, b'export', opts)
2649 else:
2649 else:
2650 ui.pager(b'export')
2650 ui.pager(b'export')
2651 fm = ui.formatter(b'export', opts)
2651 fm = ui.formatter(b'export', opts)
2652 with fm:
2652 with fm:
2653 cmdutil.export(
2653 cmdutil.export(
2654 repo,
2654 repo,
2655 revs,
2655 revs,
2656 fm,
2656 fm,
2657 fntemplate=fntemplate,
2657 fntemplate=fntemplate,
2658 switch_parent=opts.get(b'switch_parent'),
2658 switch_parent=opts.get(b'switch_parent'),
2659 opts=patch.diffallopts(ui, opts),
2659 opts=patch.diffallopts(ui, opts),
2660 )
2660 )
2661
2661
2662
2662
2663 @command(
2663 @command(
2664 b'files',
2664 b'files',
2665 [
2665 [
2666 (
2666 (
2667 b'r',
2667 b'r',
2668 b'rev',
2668 b'rev',
2669 b'',
2669 b'',
2670 _(b'search the repository as it is in REV'),
2670 _(b'search the repository as it is in REV'),
2671 _(b'REV'),
2671 _(b'REV'),
2672 ),
2672 ),
2673 (
2673 (
2674 b'0',
2674 b'0',
2675 b'print0',
2675 b'print0',
2676 None,
2676 None,
2677 _(b'end filenames with NUL, for use with xargs'),
2677 _(b'end filenames with NUL, for use with xargs'),
2678 ),
2678 ),
2679 ]
2679 ]
2680 + walkopts
2680 + walkopts
2681 + formatteropts
2681 + formatteropts
2682 + subrepoopts,
2682 + subrepoopts,
2683 _(b'[OPTION]... [FILE]...'),
2683 _(b'[OPTION]... [FILE]...'),
2684 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2684 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2685 intents={INTENT_READONLY},
2685 intents={INTENT_READONLY},
2686 )
2686 )
2687 def files(ui, repo, *pats, **opts):
2687 def files(ui, repo, *pats, **opts):
2688 """list tracked files
2688 """list tracked files
2689
2689
2690 Print files under Mercurial control in the working directory or
2690 Print files under Mercurial control in the working directory or
2691 specified revision for given files (excluding removed files).
2691 specified revision for given files (excluding removed files).
2692 Files can be specified as filenames or filesets.
2692 Files can be specified as filenames or filesets.
2693
2693
2694 If no files are given to match, this command prints the names
2694 If no files are given to match, this command prints the names
2695 of all files under Mercurial control.
2695 of all files under Mercurial control.
2696
2696
2697 .. container:: verbose
2697 .. container:: verbose
2698
2698
2699 Template:
2699 Template:
2700
2700
2701 The following keywords are supported in addition to the common template
2701 The following keywords are supported in addition to the common template
2702 keywords and functions. See also :hg:`help templates`.
2702 keywords and functions. See also :hg:`help templates`.
2703
2703
2704 :flags: String. Character denoting file's symlink and executable bits.
2704 :flags: String. Character denoting file's symlink and executable bits.
2705 :path: String. Repository-absolute path of the file.
2705 :path: String. Repository-absolute path of the file.
2706 :size: Integer. Size of the file in bytes.
2706 :size: Integer. Size of the file in bytes.
2707
2707
2708 Examples:
2708 Examples:
2709
2709
2710 - list all files under the current directory::
2710 - list all files under the current directory::
2711
2711
2712 hg files .
2712 hg files .
2713
2713
2714 - shows sizes and flags for current revision::
2714 - shows sizes and flags for current revision::
2715
2715
2716 hg files -vr .
2716 hg files -vr .
2717
2717
2718 - list all files named README::
2718 - list all files named README::
2719
2719
2720 hg files -I "**/README"
2720 hg files -I "**/README"
2721
2721
2722 - list all binary files::
2722 - list all binary files::
2723
2723
2724 hg files "set:binary()"
2724 hg files "set:binary()"
2725
2725
2726 - find files containing a regular expression::
2726 - find files containing a regular expression::
2727
2727
2728 hg files "set:grep('bob')"
2728 hg files "set:grep('bob')"
2729
2729
2730 - search tracked file contents with xargs and grep::
2730 - search tracked file contents with xargs and grep::
2731
2731
2732 hg files -0 | xargs -0 grep foo
2732 hg files -0 | xargs -0 grep foo
2733
2733
2734 See :hg:`help patterns` and :hg:`help filesets` for more information
2734 See :hg:`help patterns` and :hg:`help filesets` for more information
2735 on specifying file patterns.
2735 on specifying file patterns.
2736
2736
2737 Returns 0 if a match is found, 1 otherwise.
2737 Returns 0 if a match is found, 1 otherwise.
2738
2738
2739 """
2739 """
2740
2740
2741 opts = pycompat.byteskwargs(opts)
2741 opts = pycompat.byteskwargs(opts)
2742 rev = opts.get(b'rev')
2742 rev = opts.get(b'rev')
2743 if rev:
2743 if rev:
2744 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2744 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2745 ctx = scmutil.revsingle(repo, rev, None)
2745 ctx = scmutil.revsingle(repo, rev, None)
2746
2746
2747 end = b'\n'
2747 end = b'\n'
2748 if opts.get(b'print0'):
2748 if opts.get(b'print0'):
2749 end = b'\0'
2749 end = b'\0'
2750 fmt = b'%s' + end
2750 fmt = b'%s' + end
2751
2751
2752 m = scmutil.match(ctx, pats, opts)
2752 m = scmutil.match(ctx, pats, opts)
2753 ui.pager(b'files')
2753 ui.pager(b'files')
2754 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2754 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2755 with ui.formatter(b'files', opts) as fm:
2755 with ui.formatter(b'files', opts) as fm:
2756 return cmdutil.files(
2756 return cmdutil.files(
2757 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2757 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2758 )
2758 )
2759
2759
2760
2760
2761 @command(
2761 @command(
2762 b'forget',
2762 b'forget',
2763 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2763 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2764 + walkopts
2764 + walkopts
2765 + dryrunopts,
2765 + dryrunopts,
2766 _(b'[OPTION]... FILE...'),
2766 _(b'[OPTION]... FILE...'),
2767 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2767 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2768 helpbasic=True,
2768 helpbasic=True,
2769 inferrepo=True,
2769 inferrepo=True,
2770 )
2770 )
2771 def forget(ui, repo, *pats, **opts):
2771 def forget(ui, repo, *pats, **opts):
2772 """forget the specified files on the next commit
2772 """forget the specified files on the next commit
2773
2773
2774 Mark the specified files so they will no longer be tracked
2774 Mark the specified files so they will no longer be tracked
2775 after the next commit.
2775 after the next commit.
2776
2776
2777 This only removes files from the current branch, not from the
2777 This only removes files from the current branch, not from the
2778 entire project history, and it does not delete them from the
2778 entire project history, and it does not delete them from the
2779 working directory.
2779 working directory.
2780
2780
2781 To delete the file from the working directory, see :hg:`remove`.
2781 To delete the file from the working directory, see :hg:`remove`.
2782
2782
2783 To undo a forget before the next commit, see :hg:`add`.
2783 To undo a forget before the next commit, see :hg:`add`.
2784
2784
2785 .. container:: verbose
2785 .. container:: verbose
2786
2786
2787 Examples:
2787 Examples:
2788
2788
2789 - forget newly-added binary files::
2789 - forget newly-added binary files::
2790
2790
2791 hg forget "set:added() and binary()"
2791 hg forget "set:added() and binary()"
2792
2792
2793 - forget files that would be excluded by .hgignore::
2793 - forget files that would be excluded by .hgignore::
2794
2794
2795 hg forget "set:hgignore()"
2795 hg forget "set:hgignore()"
2796
2796
2797 Returns 0 on success.
2797 Returns 0 on success.
2798 """
2798 """
2799
2799
2800 opts = pycompat.byteskwargs(opts)
2800 opts = pycompat.byteskwargs(opts)
2801 if not pats:
2801 if not pats:
2802 raise error.Abort(_(b'no files specified'))
2802 raise error.Abort(_(b'no files specified'))
2803
2803
2804 m = scmutil.match(repo[None], pats, opts)
2804 m = scmutil.match(repo[None], pats, opts)
2805 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2805 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2806 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2806 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2807 rejected = cmdutil.forget(
2807 rejected = cmdutil.forget(
2808 ui,
2808 ui,
2809 repo,
2809 repo,
2810 m,
2810 m,
2811 prefix=b"",
2811 prefix=b"",
2812 uipathfn=uipathfn,
2812 uipathfn=uipathfn,
2813 explicitonly=False,
2813 explicitonly=False,
2814 dryrun=dryrun,
2814 dryrun=dryrun,
2815 interactive=interactive,
2815 interactive=interactive,
2816 )[0]
2816 )[0]
2817 return rejected and 1 or 0
2817 return rejected and 1 or 0
2818
2818
2819
2819
2820 @command(
2820 @command(
2821 b'graft',
2821 b'graft',
2822 [
2822 [
2823 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2823 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2824 (
2824 (
2825 b'',
2825 b'',
2826 b'base',
2826 b'base',
2827 b'',
2827 b'',
2828 _(b'base revision when doing the graft merge (ADVANCED)'),
2828 _(b'base revision when doing the graft merge (ADVANCED)'),
2829 _(b'REV'),
2829 _(b'REV'),
2830 ),
2830 ),
2831 (b'c', b'continue', False, _(b'resume interrupted graft')),
2831 (b'c', b'continue', False, _(b'resume interrupted graft')),
2832 (b'', b'stop', False, _(b'stop interrupted graft')),
2832 (b'', b'stop', False, _(b'stop interrupted graft')),
2833 (b'', b'abort', False, _(b'abort interrupted graft')),
2833 (b'', b'abort', False, _(b'abort interrupted graft')),
2834 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2834 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2835 (b'', b'log', None, _(b'append graft info to log message')),
2835 (b'', b'log', None, _(b'append graft info to log message')),
2836 (
2836 (
2837 b'',
2837 b'',
2838 b'no-commit',
2838 b'no-commit',
2839 None,
2839 None,
2840 _(b"don't commit, just apply the changes in working directory"),
2840 _(b"don't commit, just apply the changes in working directory"),
2841 ),
2841 ),
2842 (b'f', b'force', False, _(b'force graft')),
2842 (b'f', b'force', False, _(b'force graft')),
2843 (
2843 (
2844 b'D',
2844 b'D',
2845 b'currentdate',
2845 b'currentdate',
2846 False,
2846 False,
2847 _(b'record the current date as commit date'),
2847 _(b'record the current date as commit date'),
2848 ),
2848 ),
2849 (
2849 (
2850 b'U',
2850 b'U',
2851 b'currentuser',
2851 b'currentuser',
2852 False,
2852 False,
2853 _(b'record the current user as committer'),
2853 _(b'record the current user as committer'),
2854 ),
2854 ),
2855 ]
2855 ]
2856 + commitopts2
2856 + commitopts2
2857 + mergetoolopts
2857 + mergetoolopts
2858 + dryrunopts,
2858 + dryrunopts,
2859 _(b'[OPTION]... [-r REV]... REV...'),
2859 _(b'[OPTION]... [-r REV]... REV...'),
2860 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2860 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2861 )
2861 )
2862 def graft(ui, repo, *revs, **opts):
2862 def graft(ui, repo, *revs, **opts):
2863 '''copy changes from other branches onto the current branch
2863 '''copy changes from other branches onto the current branch
2864
2864
2865 This command uses Mercurial's merge logic to copy individual
2865 This command uses Mercurial's merge logic to copy individual
2866 changes from other branches without merging branches in the
2866 changes from other branches without merging branches in the
2867 history graph. This is sometimes known as 'backporting' or
2867 history graph. This is sometimes known as 'backporting' or
2868 'cherry-picking'. By default, graft will copy user, date, and
2868 'cherry-picking'. By default, graft will copy user, date, and
2869 description from the source changesets.
2869 description from the source changesets.
2870
2870
2871 Changesets that are ancestors of the current revision, that have
2871 Changesets that are ancestors of the current revision, that have
2872 already been grafted, or that are merges will be skipped.
2872 already been grafted, or that are merges will be skipped.
2873
2873
2874 If --log is specified, log messages will have a comment appended
2874 If --log is specified, log messages will have a comment appended
2875 of the form::
2875 of the form::
2876
2876
2877 (grafted from CHANGESETHASH)
2877 (grafted from CHANGESETHASH)
2878
2878
2879 If --force is specified, revisions will be grafted even if they
2879 If --force is specified, revisions will be grafted even if they
2880 are already ancestors of, or have been grafted to, the destination.
2880 are already ancestors of, or have been grafted to, the destination.
2881 This is useful when the revisions have since been backed out.
2881 This is useful when the revisions have since been backed out.
2882
2882
2883 If a graft merge results in conflicts, the graft process is
2883 If a graft merge results in conflicts, the graft process is
2884 interrupted so that the current merge can be manually resolved.
2884 interrupted so that the current merge can be manually resolved.
2885 Once all conflicts are addressed, the graft process can be
2885 Once all conflicts are addressed, the graft process can be
2886 continued with the -c/--continue option.
2886 continued with the -c/--continue option.
2887
2887
2888 The -c/--continue option reapplies all the earlier options.
2888 The -c/--continue option reapplies all the earlier options.
2889
2889
2890 .. container:: verbose
2890 .. container:: verbose
2891
2891
2892 The --base option exposes more of how graft internally uses merge with a
2892 The --base option exposes more of how graft internally uses merge with a
2893 custom base revision. --base can be used to specify another ancestor than
2893 custom base revision. --base can be used to specify another ancestor than
2894 the first and only parent.
2894 the first and only parent.
2895
2895
2896 The command::
2896 The command::
2897
2897
2898 hg graft -r 345 --base 234
2898 hg graft -r 345 --base 234
2899
2899
2900 is thus pretty much the same as::
2900 is thus pretty much the same as::
2901
2901
2902 hg diff -r 234 -r 345 | hg import
2902 hg diff -r 234 -r 345 | hg import
2903
2903
2904 but using merge to resolve conflicts and track moved files.
2904 but using merge to resolve conflicts and track moved files.
2905
2905
2906 The result of a merge can thus be backported as a single commit by
2906 The result of a merge can thus be backported as a single commit by
2907 specifying one of the merge parents as base, and thus effectively
2907 specifying one of the merge parents as base, and thus effectively
2908 grafting the changes from the other side.
2908 grafting the changes from the other side.
2909
2909
2910 It is also possible to collapse multiple changesets and clean up history
2910 It is also possible to collapse multiple changesets and clean up history
2911 by specifying another ancestor as base, much like rebase --collapse
2911 by specifying another ancestor as base, much like rebase --collapse
2912 --keep.
2912 --keep.
2913
2913
2914 The commit message can be tweaked after the fact using commit --amend .
2914 The commit message can be tweaked after the fact using commit --amend .
2915
2915
2916 For using non-ancestors as the base to backout changes, see the backout
2916 For using non-ancestors as the base to backout changes, see the backout
2917 command and the hidden --parent option.
2917 command and the hidden --parent option.
2918
2918
2919 .. container:: verbose
2919 .. container:: verbose
2920
2920
2921 Examples:
2921 Examples:
2922
2922
2923 - copy a single change to the stable branch and edit its description::
2923 - copy a single change to the stable branch and edit its description::
2924
2924
2925 hg update stable
2925 hg update stable
2926 hg graft --edit 9393
2926 hg graft --edit 9393
2927
2927
2928 - graft a range of changesets with one exception, updating dates::
2928 - graft a range of changesets with one exception, updating dates::
2929
2929
2930 hg graft -D "2085::2093 and not 2091"
2930 hg graft -D "2085::2093 and not 2091"
2931
2931
2932 - continue a graft after resolving conflicts::
2932 - continue a graft after resolving conflicts::
2933
2933
2934 hg graft -c
2934 hg graft -c
2935
2935
2936 - show the source of a grafted changeset::
2936 - show the source of a grafted changeset::
2937
2937
2938 hg log --debug -r .
2938 hg log --debug -r .
2939
2939
2940 - show revisions sorted by date::
2940 - show revisions sorted by date::
2941
2941
2942 hg log -r "sort(all(), date)"
2942 hg log -r "sort(all(), date)"
2943
2943
2944 - backport the result of a merge as a single commit::
2944 - backport the result of a merge as a single commit::
2945
2945
2946 hg graft -r 123 --base 123^
2946 hg graft -r 123 --base 123^
2947
2947
2948 - land a feature branch as one changeset::
2948 - land a feature branch as one changeset::
2949
2949
2950 hg up -cr default
2950 hg up -cr default
2951 hg graft -r featureX --base "ancestor('featureX', 'default')"
2951 hg graft -r featureX --base "ancestor('featureX', 'default')"
2952
2952
2953 See :hg:`help revisions` for more about specifying revisions.
2953 See :hg:`help revisions` for more about specifying revisions.
2954
2954
2955 Returns 0 on successful completion, 1 if there are unresolved files.
2955 Returns 0 on successful completion, 1 if there are unresolved files.
2956 '''
2956 '''
2957 with repo.wlock():
2957 with repo.wlock():
2958 return _dograft(ui, repo, *revs, **opts)
2958 return _dograft(ui, repo, *revs, **opts)
2959
2959
2960
2960
2961 def _dograft(ui, repo, *revs, **opts):
2961 def _dograft(ui, repo, *revs, **opts):
2962 opts = pycompat.byteskwargs(opts)
2962 opts = pycompat.byteskwargs(opts)
2963 if revs and opts.get(b'rev'):
2963 if revs and opts.get(b'rev'):
2964 ui.warn(
2964 ui.warn(
2965 _(
2965 _(
2966 b'warning: inconsistent use of --rev might give unexpected '
2966 b'warning: inconsistent use of --rev might give unexpected '
2967 b'revision ordering!\n'
2967 b'revision ordering!\n'
2968 )
2968 )
2969 )
2969 )
2970
2970
2971 revs = list(revs)
2971 revs = list(revs)
2972 revs.extend(opts.get(b'rev'))
2972 revs.extend(opts.get(b'rev'))
2973 basectx = None
2973 basectx = None
2974 if opts.get(b'base'):
2974 if opts.get(b'base'):
2975 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2975 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2976 # a dict of data to be stored in state file
2976 # a dict of data to be stored in state file
2977 statedata = {}
2977 statedata = {}
2978 # list of new nodes created by ongoing graft
2978 # list of new nodes created by ongoing graft
2979 statedata[b'newnodes'] = []
2979 statedata[b'newnodes'] = []
2980
2980
2981 cmdutil.resolvecommitoptions(ui, opts)
2981 cmdutil.resolvecommitoptions(ui, opts)
2982
2982
2983 editor = cmdutil.getcommiteditor(
2983 editor = cmdutil.getcommiteditor(
2984 editform=b'graft', **pycompat.strkwargs(opts)
2984 editform=b'graft', **pycompat.strkwargs(opts)
2985 )
2985 )
2986
2986
2987 cont = False
2987 cont = False
2988 if opts.get(b'no_commit'):
2988 if opts.get(b'no_commit'):
2989 if opts.get(b'edit'):
2989 if opts.get(b'edit'):
2990 raise error.Abort(
2990 raise error.Abort(
2991 _(b"cannot specify --no-commit and --edit together")
2991 _(b"cannot specify --no-commit and --edit together")
2992 )
2992 )
2993 if opts.get(b'currentuser'):
2993 if opts.get(b'currentuser'):
2994 raise error.Abort(
2994 raise error.Abort(
2995 _(b"cannot specify --no-commit and --currentuser together")
2995 _(b"cannot specify --no-commit and --currentuser together")
2996 )
2996 )
2997 if opts.get(b'currentdate'):
2997 if opts.get(b'currentdate'):
2998 raise error.Abort(
2998 raise error.Abort(
2999 _(b"cannot specify --no-commit and --currentdate together")
2999 _(b"cannot specify --no-commit and --currentdate together")
3000 )
3000 )
3001 if opts.get(b'log'):
3001 if opts.get(b'log'):
3002 raise error.Abort(
3002 raise error.Abort(
3003 _(b"cannot specify --no-commit and --log together")
3003 _(b"cannot specify --no-commit and --log together")
3004 )
3004 )
3005
3005
3006 graftstate = statemod.cmdstate(repo, b'graftstate')
3006 graftstate = statemod.cmdstate(repo, b'graftstate')
3007
3007
3008 if opts.get(b'stop'):
3008 if opts.get(b'stop'):
3009 if opts.get(b'continue'):
3009 if opts.get(b'continue'):
3010 raise error.Abort(
3010 raise error.Abort(
3011 _(b"cannot use '--continue' and '--stop' together")
3011 _(b"cannot use '--continue' and '--stop' together")
3012 )
3012 )
3013 if opts.get(b'abort'):
3013 if opts.get(b'abort'):
3014 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3014 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3015
3015
3016 if any(
3016 if any(
3017 (
3017 (
3018 opts.get(b'edit'),
3018 opts.get(b'edit'),
3019 opts.get(b'log'),
3019 opts.get(b'log'),
3020 opts.get(b'user'),
3020 opts.get(b'user'),
3021 opts.get(b'date'),
3021 opts.get(b'date'),
3022 opts.get(b'currentdate'),
3022 opts.get(b'currentdate'),
3023 opts.get(b'currentuser'),
3023 opts.get(b'currentuser'),
3024 opts.get(b'rev'),
3024 opts.get(b'rev'),
3025 )
3025 )
3026 ):
3026 ):
3027 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3027 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3028 return _stopgraft(ui, repo, graftstate)
3028 return _stopgraft(ui, repo, graftstate)
3029 elif opts.get(b'abort'):
3029 elif opts.get(b'abort'):
3030 if opts.get(b'continue'):
3030 if opts.get(b'continue'):
3031 raise error.Abort(
3031 raise error.Abort(
3032 _(b"cannot use '--continue' and '--abort' together")
3032 _(b"cannot use '--continue' and '--abort' together")
3033 )
3033 )
3034 if any(
3034 if any(
3035 (
3035 (
3036 opts.get(b'edit'),
3036 opts.get(b'edit'),
3037 opts.get(b'log'),
3037 opts.get(b'log'),
3038 opts.get(b'user'),
3038 opts.get(b'user'),
3039 opts.get(b'date'),
3039 opts.get(b'date'),
3040 opts.get(b'currentdate'),
3040 opts.get(b'currentdate'),
3041 opts.get(b'currentuser'),
3041 opts.get(b'currentuser'),
3042 opts.get(b'rev'),
3042 opts.get(b'rev'),
3043 )
3043 )
3044 ):
3044 ):
3045 raise error.Abort(
3045 raise error.Abort(
3046 _(b"cannot specify any other flag with '--abort'")
3046 _(b"cannot specify any other flag with '--abort'")
3047 )
3047 )
3048
3048
3049 return cmdutil.abortgraft(ui, repo, graftstate)
3049 return cmdutil.abortgraft(ui, repo, graftstate)
3050 elif opts.get(b'continue'):
3050 elif opts.get(b'continue'):
3051 cont = True
3051 cont = True
3052 if revs:
3052 if revs:
3053 raise error.Abort(_(b"can't specify --continue and revisions"))
3053 raise error.Abort(_(b"can't specify --continue and revisions"))
3054 # read in unfinished revisions
3054 # read in unfinished revisions
3055 if graftstate.exists():
3055 if graftstate.exists():
3056 statedata = cmdutil.readgraftstate(repo, graftstate)
3056 statedata = cmdutil.readgraftstate(repo, graftstate)
3057 if statedata.get(b'date'):
3057 if statedata.get(b'date'):
3058 opts[b'date'] = statedata[b'date']
3058 opts[b'date'] = statedata[b'date']
3059 if statedata.get(b'user'):
3059 if statedata.get(b'user'):
3060 opts[b'user'] = statedata[b'user']
3060 opts[b'user'] = statedata[b'user']
3061 if statedata.get(b'log'):
3061 if statedata.get(b'log'):
3062 opts[b'log'] = True
3062 opts[b'log'] = True
3063 if statedata.get(b'no_commit'):
3063 if statedata.get(b'no_commit'):
3064 opts[b'no_commit'] = statedata.get(b'no_commit')
3064 opts[b'no_commit'] = statedata.get(b'no_commit')
3065 nodes = statedata[b'nodes']
3065 nodes = statedata[b'nodes']
3066 revs = [repo[node].rev() for node in nodes]
3066 revs = [repo[node].rev() for node in nodes]
3067 else:
3067 else:
3068 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3068 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3069 else:
3069 else:
3070 if not revs:
3070 if not revs:
3071 raise error.Abort(_(b'no revisions specified'))
3071 raise error.Abort(_(b'no revisions specified'))
3072 cmdutil.checkunfinished(repo)
3072 cmdutil.checkunfinished(repo)
3073 cmdutil.bailifchanged(repo)
3073 cmdutil.bailifchanged(repo)
3074 revs = scmutil.revrange(repo, revs)
3074 revs = scmutil.revrange(repo, revs)
3075
3075
3076 skipped = set()
3076 skipped = set()
3077 if basectx is None:
3077 if basectx is None:
3078 # check for merges
3078 # check for merges
3079 for rev in repo.revs(b'%ld and merge()', revs):
3079 for rev in repo.revs(b'%ld and merge()', revs):
3080 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3080 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3081 skipped.add(rev)
3081 skipped.add(rev)
3082 revs = [r for r in revs if r not in skipped]
3082 revs = [r for r in revs if r not in skipped]
3083 if not revs:
3083 if not revs:
3084 return -1
3084 return -1
3085 if basectx is not None and len(revs) != 1:
3085 if basectx is not None and len(revs) != 1:
3086 raise error.Abort(_(b'only one revision allowed with --base '))
3086 raise error.Abort(_(b'only one revision allowed with --base '))
3087
3087
3088 # Don't check in the --continue case, in effect retaining --force across
3088 # Don't check in the --continue case, in effect retaining --force across
3089 # --continues. That's because without --force, any revisions we decided to
3089 # --continues. That's because without --force, any revisions we decided to
3090 # skip would have been filtered out here, so they wouldn't have made their
3090 # skip would have been filtered out here, so they wouldn't have made their
3091 # way to the graftstate. With --force, any revisions we would have otherwise
3091 # way to the graftstate. With --force, any revisions we would have otherwise
3092 # skipped would not have been filtered out, and if they hadn't been applied
3092 # skipped would not have been filtered out, and if they hadn't been applied
3093 # already, they'd have been in the graftstate.
3093 # already, they'd have been in the graftstate.
3094 if not (cont or opts.get(b'force')) and basectx is None:
3094 if not (cont or opts.get(b'force')) and basectx is None:
3095 # check for ancestors of dest branch
3095 # check for ancestors of dest branch
3096 ancestors = repo.revs(b'%ld & (::.)', revs)
3096 ancestors = repo.revs(b'%ld & (::.)', revs)
3097 for rev in ancestors:
3097 for rev in ancestors:
3098 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3098 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3099
3099
3100 revs = [r for r in revs if r not in ancestors]
3100 revs = [r for r in revs if r not in ancestors]
3101
3101
3102 if not revs:
3102 if not revs:
3103 return -1
3103 return -1
3104
3104
3105 # analyze revs for earlier grafts
3105 # analyze revs for earlier grafts
3106 ids = {}
3106 ids = {}
3107 for ctx in repo.set(b"%ld", revs):
3107 for ctx in repo.set(b"%ld", revs):
3108 ids[ctx.hex()] = ctx.rev()
3108 ids[ctx.hex()] = ctx.rev()
3109 n = ctx.extra().get(b'source')
3109 n = ctx.extra().get(b'source')
3110 if n:
3110 if n:
3111 ids[n] = ctx.rev()
3111 ids[n] = ctx.rev()
3112
3112
3113 # check ancestors for earlier grafts
3113 # check ancestors for earlier grafts
3114 ui.debug(b'scanning for duplicate grafts\n')
3114 ui.debug(b'scanning for duplicate grafts\n')
3115
3115
3116 # The only changesets we can be sure doesn't contain grafts of any
3116 # The only changesets we can be sure doesn't contain grafts of any
3117 # revs, are the ones that are common ancestors of *all* revs:
3117 # revs, are the ones that are common ancestors of *all* revs:
3118 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3118 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3119 ctx = repo[rev]
3119 ctx = repo[rev]
3120 n = ctx.extra().get(b'source')
3120 n = ctx.extra().get(b'source')
3121 if n in ids:
3121 if n in ids:
3122 try:
3122 try:
3123 r = repo[n].rev()
3123 r = repo[n].rev()
3124 except error.RepoLookupError:
3124 except error.RepoLookupError:
3125 r = None
3125 r = None
3126 if r in revs:
3126 if r in revs:
3127 ui.warn(
3127 ui.warn(
3128 _(
3128 _(
3129 b'skipping revision %d:%s '
3129 b'skipping revision %d:%s '
3130 b'(already grafted to %d:%s)\n'
3130 b'(already grafted to %d:%s)\n'
3131 )
3131 )
3132 % (r, repo[r], rev, ctx)
3132 % (r, repo[r], rev, ctx)
3133 )
3133 )
3134 revs.remove(r)
3134 revs.remove(r)
3135 elif ids[n] in revs:
3135 elif ids[n] in revs:
3136 if r is None:
3136 if r is None:
3137 ui.warn(
3137 ui.warn(
3138 _(
3138 _(
3139 b'skipping already grafted revision %d:%s '
3139 b'skipping already grafted revision %d:%s '
3140 b'(%d:%s also has unknown origin %s)\n'
3140 b'(%d:%s also has unknown origin %s)\n'
3141 )
3141 )
3142 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3142 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3143 )
3143 )
3144 else:
3144 else:
3145 ui.warn(
3145 ui.warn(
3146 _(
3146 _(
3147 b'skipping already grafted revision %d:%s '
3147 b'skipping already grafted revision %d:%s '
3148 b'(%d:%s also has origin %d:%s)\n'
3148 b'(%d:%s also has origin %d:%s)\n'
3149 )
3149 )
3150 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3150 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3151 )
3151 )
3152 revs.remove(ids[n])
3152 revs.remove(ids[n])
3153 elif ctx.hex() in ids:
3153 elif ctx.hex() in ids:
3154 r = ids[ctx.hex()]
3154 r = ids[ctx.hex()]
3155 if r in revs:
3155 if r in revs:
3156 ui.warn(
3156 ui.warn(
3157 _(
3157 _(
3158 b'skipping already grafted revision %d:%s '
3158 b'skipping already grafted revision %d:%s '
3159 b'(was grafted from %d:%s)\n'
3159 b'(was grafted from %d:%s)\n'
3160 )
3160 )
3161 % (r, repo[r], rev, ctx)
3161 % (r, repo[r], rev, ctx)
3162 )
3162 )
3163 revs.remove(r)
3163 revs.remove(r)
3164 if not revs:
3164 if not revs:
3165 return -1
3165 return -1
3166
3166
3167 if opts.get(b'no_commit'):
3167 if opts.get(b'no_commit'):
3168 statedata[b'no_commit'] = True
3168 statedata[b'no_commit'] = True
3169 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3169 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3170 desc = b'%d:%s "%s"' % (
3170 desc = b'%d:%s "%s"' % (
3171 ctx.rev(),
3171 ctx.rev(),
3172 ctx,
3172 ctx,
3173 ctx.description().split(b'\n', 1)[0],
3173 ctx.description().split(b'\n', 1)[0],
3174 )
3174 )
3175 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3175 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3176 if names:
3176 if names:
3177 desc += b' (%s)' % b' '.join(names)
3177 desc += b' (%s)' % b' '.join(names)
3178 ui.status(_(b'grafting %s\n') % desc)
3178 ui.status(_(b'grafting %s\n') % desc)
3179 if opts.get(b'dry_run'):
3179 if opts.get(b'dry_run'):
3180 continue
3180 continue
3181
3181
3182 source = ctx.extra().get(b'source')
3182 source = ctx.extra().get(b'source')
3183 extra = {}
3183 extra = {}
3184 if source:
3184 if source:
3185 extra[b'source'] = source
3185 extra[b'source'] = source
3186 extra[b'intermediate-source'] = ctx.hex()
3186 extra[b'intermediate-source'] = ctx.hex()
3187 else:
3187 else:
3188 extra[b'source'] = ctx.hex()
3188 extra[b'source'] = ctx.hex()
3189 user = ctx.user()
3189 user = ctx.user()
3190 if opts.get(b'user'):
3190 if opts.get(b'user'):
3191 user = opts[b'user']
3191 user = opts[b'user']
3192 statedata[b'user'] = user
3192 statedata[b'user'] = user
3193 date = ctx.date()
3193 date = ctx.date()
3194 if opts.get(b'date'):
3194 if opts.get(b'date'):
3195 date = opts[b'date']
3195 date = opts[b'date']
3196 statedata[b'date'] = date
3196 statedata[b'date'] = date
3197 message = ctx.description()
3197 message = ctx.description()
3198 if opts.get(b'log'):
3198 if opts.get(b'log'):
3199 message += b'\n(grafted from %s)' % ctx.hex()
3199 message += b'\n(grafted from %s)' % ctx.hex()
3200 statedata[b'log'] = True
3200 statedata[b'log'] = True
3201
3201
3202 # we don't merge the first commit when continuing
3202 # we don't merge the first commit when continuing
3203 if not cont:
3203 if not cont:
3204 # perform the graft merge with p1(rev) as 'ancestor'
3204 # perform the graft merge with p1(rev) as 'ancestor'
3205 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3205 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3206 base = ctx.p1() if basectx is None else basectx
3206 base = ctx.p1() if basectx is None else basectx
3207 with ui.configoverride(overrides, b'graft'):
3207 with ui.configoverride(overrides, b'graft'):
3208 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3208 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3209 # report any conflicts
3209 # report any conflicts
3210 if stats.unresolvedcount > 0:
3210 if stats.unresolvedcount > 0:
3211 # write out state for --continue
3211 # write out state for --continue
3212 nodes = [repo[rev].hex() for rev in revs[pos:]]
3212 nodes = [repo[rev].hex() for rev in revs[pos:]]
3213 statedata[b'nodes'] = nodes
3213 statedata[b'nodes'] = nodes
3214 stateversion = 1
3214 stateversion = 1
3215 graftstate.save(stateversion, statedata)
3215 graftstate.save(stateversion, statedata)
3216 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3216 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3217 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3217 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3218 return 1
3218 return 1
3219 else:
3219 else:
3220 cont = False
3220 cont = False
3221
3221
3222 # commit if --no-commit is false
3222 # commit if --no-commit is false
3223 if not opts.get(b'no_commit'):
3223 if not opts.get(b'no_commit'):
3224 node = repo.commit(
3224 node = repo.commit(
3225 text=message, user=user, date=date, extra=extra, editor=editor
3225 text=message, user=user, date=date, extra=extra, editor=editor
3226 )
3226 )
3227 if node is None:
3227 if node is None:
3228 ui.warn(
3228 ui.warn(
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3230 % (ctx.rev(), ctx)
3230 % (ctx.rev(), ctx)
3231 )
3231 )
3232 # checking that newnodes exist because old state files won't have it
3232 # checking that newnodes exist because old state files won't have it
3233 elif statedata.get(b'newnodes') is not None:
3233 elif statedata.get(b'newnodes') is not None:
3234 statedata[b'newnodes'].append(node)
3234 statedata[b'newnodes'].append(node)
3235
3235
3236 # remove state when we complete successfully
3236 # remove state when we complete successfully
3237 if not opts.get(b'dry_run'):
3237 if not opts.get(b'dry_run'):
3238 graftstate.delete()
3238 graftstate.delete()
3239
3239
3240 return 0
3240 return 0
3241
3241
3242
3242
3243 def _stopgraft(ui, repo, graftstate):
3243 def _stopgraft(ui, repo, graftstate):
3244 """stop the interrupted graft"""
3244 """stop the interrupted graft"""
3245 if not graftstate.exists():
3245 if not graftstate.exists():
3246 raise error.Abort(_(b"no interrupted graft found"))
3246 raise error.Abort(_(b"no interrupted graft found"))
3247 pctx = repo[b'.']
3247 pctx = repo[b'.']
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3249 graftstate.delete()
3249 graftstate.delete()
3250 ui.status(_(b"stopped the interrupted graft\n"))
3250 ui.status(_(b"stopped the interrupted graft\n"))
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3252 return 0
3252 return 0
3253
3253
3254
3254
3255 statemod.addunfinished(
3255 statemod.addunfinished(
3256 b'graft',
3256 b'graft',
3257 fname=b'graftstate',
3257 fname=b'graftstate',
3258 clearable=True,
3258 clearable=True,
3259 stopflag=True,
3259 stopflag=True,
3260 continueflag=True,
3260 continueflag=True,
3261 abortfunc=cmdutil.hgabortgraft,
3261 abortfunc=cmdutil.hgabortgraft,
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3263 )
3263 )
3264
3264
3265
3265
3266 @command(
3266 @command(
3267 b'grep',
3267 b'grep',
3268 [
3268 [
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3271 (
3271 (
3272 b'',
3272 b'',
3273 b'diff',
3273 b'diff',
3274 None,
3274 None,
3275 _(
3275 _(
3276 b'search revision differences for when the pattern was added '
3276 b'search revision differences for when the pattern was added '
3277 b'or removed'
3277 b'or removed'
3278 ),
3278 ),
3279 ),
3279 ),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3281 (
3281 (
3282 b'f',
3282 b'f',
3283 b'follow',
3283 b'follow',
3284 None,
3284 None,
3285 _(
3285 _(
3286 b'follow changeset history,'
3286 b'follow changeset history,'
3287 b' or file history across copies and renames'
3287 b' or file history across copies and renames'
3288 ),
3288 ),
3289 ),
3289 ),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3291 (
3291 (
3292 b'l',
3292 b'l',
3293 b'files-with-matches',
3293 b'files-with-matches',
3294 None,
3294 None,
3295 _(b'print only filenames and revisions that match'),
3295 _(b'print only filenames and revisions that match'),
3296 ),
3296 ),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3298 (
3298 (
3299 b'r',
3299 b'r',
3300 b'rev',
3300 b'rev',
3301 [],
3301 [],
3302 _(b'search files changed within revision range'),
3302 _(b'search files changed within revision range'),
3303 _(b'REV'),
3303 _(b'REV'),
3304 ),
3304 ),
3305 (
3305 (
3306 b'',
3306 b'',
3307 b'all-files',
3307 b'all-files',
3308 None,
3308 None,
3309 _(
3309 _(
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3311 ),
3311 ),
3312 ),
3312 ),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3315 ]
3315 ]
3316 + formatteropts
3316 + formatteropts
3317 + walkopts,
3317 + walkopts,
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3320 inferrepo=True,
3320 inferrepo=True,
3321 intents={INTENT_READONLY},
3321 intents={INTENT_READONLY},
3322 )
3322 )
3323 def grep(ui, repo, pattern, *pats, **opts):
3323 def grep(ui, repo, pattern, *pats, **opts):
3324 """search for a pattern in specified files
3324 """search for a pattern in specified files
3325
3325
3326 Search the working directory or revision history for a regular
3326 Search the working directory or revision history for a regular
3327 expression in the specified files for the entire repository.
3327 expression in the specified files for the entire repository.
3328
3328
3329 By default, grep searches the repository files in the working
3329 By default, grep searches the repository files in the working
3330 directory and prints the files where it finds a match. To specify
3330 directory and prints the files where it finds a match. To specify
3331 historical revisions instead of the working directory, use the
3331 historical revisions instead of the working directory, use the
3332 --rev flag.
3332 --rev flag.
3333
3333
3334 To search instead historical revision differences that contains a
3334 To search instead historical revision differences that contains a
3335 change in match status ("-" for a match that becomes a non-match,
3335 change in match status ("-" for a match that becomes a non-match,
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3337
3337
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3339 expression.
3339 expression.
3340
3340
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3342 files in the working directory are searched. When using the --rev
3342 files in the working directory are searched. When using the --rev
3343 flag and specifying FILEs, use the --follow argument to also
3343 flag and specifying FILEs, use the --follow argument to also
3344 follow the specified FILEs across renames and copies.
3344 follow the specified FILEs across renames and copies.
3345
3345
3346 .. container:: verbose
3346 .. container:: verbose
3347
3347
3348 Template:
3348 Template:
3349
3349
3350 The following keywords are supported in addition to the common template
3350 The following keywords are supported in addition to the common template
3351 keywords and functions. See also :hg:`help templates`.
3351 keywords and functions. See also :hg:`help templates`.
3352
3352
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3354 Available if ``--diff`` is specified.
3354 Available if ``--diff`` is specified.
3355 :lineno: Integer. Line number of the match.
3355 :lineno: Integer. Line number of the match.
3356 :path: String. Repository-absolute path of the file.
3356 :path: String. Repository-absolute path of the file.
3357 :texts: List of text chunks.
3357 :texts: List of text chunks.
3358
3358
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3360
3360
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3362 :text: String. Chunk content.
3362 :text: String. Chunk content.
3363
3363
3364 See :hg:`help templates.operators` for the list expansion syntax.
3364 See :hg:`help templates.operators` for the list expansion syntax.
3365
3365
3366 Returns 0 if a match is found, 1 otherwise.
3366 Returns 0 if a match is found, 1 otherwise.
3367
3367
3368 """
3368 """
3369 opts = pycompat.byteskwargs(opts)
3369 opts = pycompat.byteskwargs(opts)
3370 diff = opts.get(b'all') or opts.get(b'diff')
3370 diff = opts.get(b'all') or opts.get(b'diff')
3371 if diff and opts.get(b'all_files'):
3371 if diff and opts.get(b'all_files'):
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3373 if opts.get(b'all_files') is None and not diff:
3373 if opts.get(b'all_files') is None and not diff:
3374 opts[b'all_files'] = True
3374 opts[b'all_files'] = True
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3376 all_files = opts.get(b'all_files')
3376 all_files = opts.get(b'all_files')
3377 if plaingrep:
3377 if plaingrep:
3378 opts[b'rev'] = [b'wdir()']
3378 opts[b'rev'] = [b'wdir()']
3379
3379
3380 reflags = re.M
3380 reflags = re.M
3381 if opts.get(b'ignore_case'):
3381 if opts.get(b'ignore_case'):
3382 reflags |= re.I
3382 reflags |= re.I
3383 try:
3383 try:
3384 regexp = util.re.compile(pattern, reflags)
3384 regexp = util.re.compile(pattern, reflags)
3385 except re.error as inst:
3385 except re.error as inst:
3386 ui.warn(
3386 ui.warn(
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3388 )
3388 )
3389 return 1
3389 return 1
3390 sep, eol = b':', b'\n'
3390 sep, eol = b':', b'\n'
3391 if opts.get(b'print0'):
3391 if opts.get(b'print0'):
3392 sep = eol = b'\0'
3392 sep = eol = b'\0'
3393
3393
3394 getfile = util.lrucachefunc(repo.file)
3394 getfile = util.lrucachefunc(repo.file)
3395
3395
3396 def matchlines(body):
3396 def matchlines(body):
3397 begin = 0
3397 begin = 0
3398 linenum = 0
3398 linenum = 0
3399 while begin < len(body):
3399 while begin < len(body):
3400 match = regexp.search(body, begin)
3400 match = regexp.search(body, begin)
3401 if not match:
3401 if not match:
3402 break
3402 break
3403 mstart, mend = match.span()
3403 mstart, mend = match.span()
3404 linenum += body.count(b'\n', begin, mstart) + 1
3404 linenum += body.count(b'\n', begin, mstart) + 1
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3407 lend = begin - 1
3407 lend = begin - 1
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3409
3409
3410 class linestate(object):
3410 class linestate(object):
3411 def __init__(self, line, linenum, colstart, colend):
3411 def __init__(self, line, linenum, colstart, colend):
3412 self.line = line
3412 self.line = line
3413 self.linenum = linenum
3413 self.linenum = linenum
3414 self.colstart = colstart
3414 self.colstart = colstart
3415 self.colend = colend
3415 self.colend = colend
3416
3416
3417 def __hash__(self):
3417 def __hash__(self):
3418 return hash((self.linenum, self.line))
3418 return hash((self.linenum, self.line))
3419
3419
3420 def __eq__(self, other):
3420 def __eq__(self, other):
3421 return self.line == other.line
3421 return self.line == other.line
3422
3422
3423 def findpos(self):
3423 def findpos(self):
3424 """Iterate all (start, end) indices of matches"""
3424 """Iterate all (start, end) indices of matches"""
3425 yield self.colstart, self.colend
3425 yield self.colstart, self.colend
3426 p = self.colend
3426 p = self.colend
3427 while p < len(self.line):
3427 while p < len(self.line):
3428 m = regexp.search(self.line, p)
3428 m = regexp.search(self.line, p)
3429 if not m:
3429 if not m:
3430 break
3430 break
3431 if m.end() == p:
3431 if m.end() == p:
3432 p += 1
3432 p += 1
3433 else:
3433 else:
3434 yield m.span()
3434 yield m.span()
3435 p = m.end()
3435 p = m.end()
3436
3436
3437 matches = {}
3437 matches = {}
3438 copies = {}
3438 copies = {}
3439
3439
3440 def grepbody(fn, rev, body):
3440 def grepbody(fn, rev, body):
3441 matches[rev].setdefault(fn, [])
3441 matches[rev].setdefault(fn, [])
3442 m = matches[rev][fn]
3442 m = matches[rev][fn]
3443 if body is None:
3443 if body is None:
3444 return
3444 return
3445
3445
3446 for lnum, cstart, cend, line in matchlines(body):
3446 for lnum, cstart, cend, line in matchlines(body):
3447 s = linestate(line, lnum, cstart, cend)
3447 s = linestate(line, lnum, cstart, cend)
3448 m.append(s)
3448 m.append(s)
3449
3449
3450 def difflinestates(a, b):
3450 def difflinestates(a, b):
3451 sm = difflib.SequenceMatcher(None, a, b)
3451 sm = difflib.SequenceMatcher(None, a, b)
3452 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3452 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3453 if tag == 'insert':
3453 if tag == 'insert':
3454 for i in pycompat.xrange(blo, bhi):
3454 for i in pycompat.xrange(blo, bhi):
3455 yield (b'+', b[i])
3455 yield (b'+', b[i])
3456 elif tag == 'delete':
3456 elif tag == 'delete':
3457 for i in pycompat.xrange(alo, ahi):
3457 for i in pycompat.xrange(alo, ahi):
3458 yield (b'-', a[i])
3458 yield (b'-', a[i])
3459 elif tag == 'replace':
3459 elif tag == 'replace':
3460 for i in pycompat.xrange(alo, ahi):
3460 for i in pycompat.xrange(alo, ahi):
3461 yield (b'-', a[i])
3461 yield (b'-', a[i])
3462 for i in pycompat.xrange(blo, bhi):
3462 for i in pycompat.xrange(blo, bhi):
3463 yield (b'+', b[i])
3463 yield (b'+', b[i])
3464
3464
3465 uipathfn = scmutil.getuipathfn(repo)
3465 uipathfn = scmutil.getuipathfn(repo)
3466
3466
3467 def display(fm, fn, ctx, pstates, states):
3467 def display(fm, fn, ctx, pstates, states):
3468 rev = scmutil.intrev(ctx)
3468 rev = scmutil.intrev(ctx)
3469 if fm.isplain():
3469 if fm.isplain():
3470 formatuser = ui.shortuser
3470 formatuser = ui.shortuser
3471 else:
3471 else:
3472 formatuser = pycompat.bytestr
3472 formatuser = pycompat.bytestr
3473 if ui.quiet:
3473 if ui.quiet:
3474 datefmt = b'%Y-%m-%d'
3474 datefmt = b'%Y-%m-%d'
3475 else:
3475 else:
3476 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3476 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3477 found = False
3477 found = False
3478
3478
3479 @util.cachefunc
3479 @util.cachefunc
3480 def binary():
3480 def binary():
3481 flog = getfile(fn)
3481 flog = getfile(fn)
3482 try:
3482 try:
3483 return stringutil.binary(flog.read(ctx.filenode(fn)))
3483 return stringutil.binary(flog.read(ctx.filenode(fn)))
3484 except error.WdirUnsupported:
3484 except error.WdirUnsupported:
3485 return ctx[fn].isbinary()
3485 return ctx[fn].isbinary()
3486
3486
3487 fieldnamemap = {b'linenumber': b'lineno'}
3487 fieldnamemap = {b'linenumber': b'lineno'}
3488 if diff:
3488 if diff:
3489 iter = difflinestates(pstates, states)
3489 iter = difflinestates(pstates, states)
3490 else:
3490 else:
3491 iter = [(b'', l) for l in states]
3491 iter = [(b'', l) for l in states]
3492 for change, l in iter:
3492 for change, l in iter:
3493 fm.startitem()
3493 fm.startitem()
3494 fm.context(ctx=ctx)
3494 fm.context(ctx=ctx)
3495 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3495 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3496 fm.plain(uipathfn(fn), label=b'grep.filename')
3496 fm.plain(uipathfn(fn), label=b'grep.filename')
3497
3497
3498 cols = [
3498 cols = [
3499 (b'rev', b'%d', rev, not plaingrep, b''),
3499 (b'rev', b'%d', rev, not plaingrep, b''),
3500 (
3500 (
3501 b'linenumber',
3501 b'linenumber',
3502 b'%d',
3502 b'%d',
3503 l.linenum,
3503 l.linenum,
3504 opts.get(b'line_number'),
3504 opts.get(b'line_number'),
3505 b'',
3505 b'',
3506 ),
3506 ),
3507 ]
3507 ]
3508 if diff:
3508 if diff:
3509 cols.append(
3509 cols.append(
3510 (
3510 (
3511 b'change',
3511 b'change',
3512 b'%s',
3512 b'%s',
3513 change,
3513 change,
3514 True,
3514 True,
3515 b'grep.inserted '
3515 b'grep.inserted '
3516 if change == b'+'
3516 if change == b'+'
3517 else b'grep.deleted ',
3517 else b'grep.deleted ',
3518 )
3518 )
3519 )
3519 )
3520 cols.extend(
3520 cols.extend(
3521 [
3521 [
3522 (
3522 (
3523 b'user',
3523 b'user',
3524 b'%s',
3524 b'%s',
3525 formatuser(ctx.user()),
3525 formatuser(ctx.user()),
3526 opts.get(b'user'),
3526 opts.get(b'user'),
3527 b'',
3527 b'',
3528 ),
3528 ),
3529 (
3529 (
3530 b'date',
3530 b'date',
3531 b'%s',
3531 b'%s',
3532 fm.formatdate(ctx.date(), datefmt),
3532 fm.formatdate(ctx.date(), datefmt),
3533 opts.get(b'date'),
3533 opts.get(b'date'),
3534 b'',
3534 b'',
3535 ),
3535 ),
3536 ]
3536 ]
3537 )
3537 )
3538 for name, fmt, data, cond, extra_label in cols:
3538 for name, fmt, data, cond, extra_label in cols:
3539 if cond:
3539 if cond:
3540 fm.plain(sep, label=b'grep.sep')
3540 fm.plain(sep, label=b'grep.sep')
3541 field = fieldnamemap.get(name, name)
3541 field = fieldnamemap.get(name, name)
3542 label = extra_label + (b'grep.%s' % name)
3542 label = extra_label + (b'grep.%s' % name)
3543 fm.condwrite(cond, field, fmt, data, label=label)
3543 fm.condwrite(cond, field, fmt, data, label=label)
3544 if not opts.get(b'files_with_matches'):
3544 if not opts.get(b'files_with_matches'):
3545 fm.plain(sep, label=b'grep.sep')
3545 fm.plain(sep, label=b'grep.sep')
3546 if not opts.get(b'text') and binary():
3546 if not opts.get(b'text') and binary():
3547 fm.plain(_(b" Binary file matches"))
3547 fm.plain(_(b" Binary file matches"))
3548 else:
3548 else:
3549 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3549 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3550 fm.plain(eol)
3550 fm.plain(eol)
3551 found = True
3551 found = True
3552 if opts.get(b'files_with_matches'):
3552 if opts.get(b'files_with_matches'):
3553 break
3553 break
3554 return found
3554 return found
3555
3555
3556 def displaymatches(fm, l):
3556 def displaymatches(fm, l):
3557 p = 0
3557 p = 0
3558 for s, e in l.findpos():
3558 for s, e in l.findpos():
3559 if p < s:
3559 if p < s:
3560 fm.startitem()
3560 fm.startitem()
3561 fm.write(b'text', b'%s', l.line[p:s])
3561 fm.write(b'text', b'%s', l.line[p:s])
3562 fm.data(matched=False)
3562 fm.data(matched=False)
3563 fm.startitem()
3563 fm.startitem()
3564 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3564 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3565 fm.data(matched=True)
3565 fm.data(matched=True)
3566 p = e
3566 p = e
3567 if p < len(l.line):
3567 if p < len(l.line):
3568 fm.startitem()
3568 fm.startitem()
3569 fm.write(b'text', b'%s', l.line[p:])
3569 fm.write(b'text', b'%s', l.line[p:])
3570 fm.data(matched=False)
3570 fm.data(matched=False)
3571 fm.end()
3571 fm.end()
3572
3572
3573 skip = set()
3573 skip = set()
3574 revfiles = {}
3574 revfiles = {}
3575 match = scmutil.match(repo[None], pats, opts)
3575 match = scmutil.match(repo[None], pats, opts)
3576 found = False
3576 found = False
3577 follow = opts.get(b'follow')
3577 follow = opts.get(b'follow')
3578
3578
3579 getrenamed = scmutil.getrenamedfn(repo)
3579 getrenamed = scmutil.getrenamedfn(repo)
3580
3580
3581 def get_file_content(filename, filelog, filenode, context, revision):
3581 def get_file_content(filename, filelog, filenode, context, revision):
3582 try:
3582 try:
3583 content = filelog.read(filenode)
3583 content = filelog.read(filenode)
3584 except error.WdirUnsupported:
3584 except error.WdirUnsupported:
3585 content = context[filename].data()
3585 content = context[filename].data()
3586 except error.CensoredNodeError:
3586 except error.CensoredNodeError:
3587 content = None
3587 content = None
3588 ui.warn(
3588 ui.warn(
3589 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3589 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3590 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3590 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3591 )
3591 )
3592 return content
3592 return content
3593
3593
3594 def prep(ctx, fns):
3594 def prep(ctx, fns):
3595 rev = ctx.rev()
3595 rev = ctx.rev()
3596 pctx = ctx.p1()
3596 pctx = ctx.p1()
3597 parent = pctx.rev()
3598 matches.setdefault(rev, {})
3597 matches.setdefault(rev, {})
3599 matches.setdefault(parent, {})
3598 if diff:
3599 parent = pctx.rev()
3600 matches.setdefault(parent, {})
3600 files = revfiles.setdefault(rev, [])
3601 files = revfiles.setdefault(rev, [])
3601 for fn in fns:
3602 for fn in fns:
3602 flog = getfile(fn)
3603 flog = getfile(fn)
3603 try:
3604 try:
3604 fnode = ctx.filenode(fn)
3605 fnode = ctx.filenode(fn)
3605 except error.LookupError:
3606 except error.LookupError:
3606 continue
3607 continue
3607
3608
3608 copy = None
3609 copy = None
3609 if follow:
3610 if follow:
3610 copy = getrenamed(fn, rev)
3611 copy = getrenamed(fn, rev)
3611 if copy:
3612 if copy:
3612 copies.setdefault(rev, {})[fn] = copy
3613 copies.setdefault(rev, {})[fn] = copy
3613 if fn in skip:
3614 if fn in skip:
3614 skip.add(copy)
3615 skip.add(copy)
3615 if fn in skip:
3616 if fn in skip:
3616 continue
3617 continue
3617 files.append(fn)
3618 files.append(fn)
3618
3619
3619 if fn not in matches[rev]:
3620 if fn not in matches[rev]:
3620 content = get_file_content(fn, flog, fnode, ctx, rev)
3621 content = get_file_content(fn, flog, fnode, ctx, rev)
3621 grepbody(fn, rev, content)
3622 grepbody(fn, rev, content)
3622
3623
3623 pfn = copy or fn
3624 if diff:
3624 if pfn not in matches[parent]:
3625 pfn = copy or fn
3625 try:
3626 if pfn not in matches[parent]:
3626 pfnode = pctx.filenode(pfn)
3627 try:
3627 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3628 pfnode = pctx.filenode(pfn)
3628 grepbody(pfn, parent, pcontent)
3629 pcontent = get_file_content(
3629 except error.LookupError:
3630 pfn, flog, pfnode, pctx, parent
3630 pass
3631 )
3632 grepbody(pfn, parent, pcontent)
3633 except error.LookupError:
3634 pass
3631
3635
3632 ui.pager(b'grep')
3636 ui.pager(b'grep')
3633 fm = ui.formatter(b'grep', opts)
3637 fm = ui.formatter(b'grep', opts)
3634 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3638 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3635 rev = ctx.rev()
3639 rev = ctx.rev()
3636 parent = ctx.p1().rev()
3640 parent = ctx.p1().rev()
3637 for fn in sorted(revfiles.get(rev, [])):
3641 for fn in sorted(revfiles.get(rev, [])):
3638 states = matches[rev][fn]
3642 states = matches[rev][fn]
3639 copy = copies.get(rev, {}).get(fn)
3643 copy = copies.get(rev, {}).get(fn)
3640 if fn in skip:
3644 if fn in skip:
3641 if copy:
3645 if copy:
3642 skip.add(copy)
3646 skip.add(copy)
3643 continue
3647 continue
3644 pstates = matches.get(parent, {}).get(copy or fn, [])
3648 pstates = matches.get(parent, {}).get(copy or fn, [])
3645 if pstates or states:
3649 if pstates or states:
3646 r = display(fm, fn, ctx, pstates, states)
3650 r = display(fm, fn, ctx, pstates, states)
3647 found = found or r
3651 found = found or r
3648 if r and not diff and not all_files:
3652 if r and not diff and not all_files:
3649 skip.add(fn)
3653 skip.add(fn)
3650 if copy:
3654 if copy:
3651 skip.add(copy)
3655 skip.add(copy)
3652 del revfiles[rev]
3656 del revfiles[rev]
3653 # We will keep the matches dict for the duration of the window
3657 # We will keep the matches dict for the duration of the window
3654 # clear the matches dict once the window is over
3658 # clear the matches dict once the window is over
3655 if not revfiles:
3659 if not revfiles:
3656 matches.clear()
3660 matches.clear()
3657 fm.end()
3661 fm.end()
3658
3662
3659 return not found
3663 return not found
3660
3664
3661
3665
3662 @command(
3666 @command(
3663 b'heads',
3667 b'heads',
3664 [
3668 [
3665 (
3669 (
3666 b'r',
3670 b'r',
3667 b'rev',
3671 b'rev',
3668 b'',
3672 b'',
3669 _(b'show only heads which are descendants of STARTREV'),
3673 _(b'show only heads which are descendants of STARTREV'),
3670 _(b'STARTREV'),
3674 _(b'STARTREV'),
3671 ),
3675 ),
3672 (b't', b'topo', False, _(b'show topological heads only')),
3676 (b't', b'topo', False, _(b'show topological heads only')),
3673 (
3677 (
3674 b'a',
3678 b'a',
3675 b'active',
3679 b'active',
3676 False,
3680 False,
3677 _(b'show active branchheads only (DEPRECATED)'),
3681 _(b'show active branchheads only (DEPRECATED)'),
3678 ),
3682 ),
3679 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3683 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3680 ]
3684 ]
3681 + templateopts,
3685 + templateopts,
3682 _(b'[-ct] [-r STARTREV] [REV]...'),
3686 _(b'[-ct] [-r STARTREV] [REV]...'),
3683 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3687 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3684 intents={INTENT_READONLY},
3688 intents={INTENT_READONLY},
3685 )
3689 )
3686 def heads(ui, repo, *branchrevs, **opts):
3690 def heads(ui, repo, *branchrevs, **opts):
3687 """show branch heads
3691 """show branch heads
3688
3692
3689 With no arguments, show all open branch heads in the repository.
3693 With no arguments, show all open branch heads in the repository.
3690 Branch heads are changesets that have no descendants on the
3694 Branch heads are changesets that have no descendants on the
3691 same branch. They are where development generally takes place and
3695 same branch. They are where development generally takes place and
3692 are the usual targets for update and merge operations.
3696 are the usual targets for update and merge operations.
3693
3697
3694 If one or more REVs are given, only open branch heads on the
3698 If one or more REVs are given, only open branch heads on the
3695 branches associated with the specified changesets are shown. This
3699 branches associated with the specified changesets are shown. This
3696 means that you can use :hg:`heads .` to see the heads on the
3700 means that you can use :hg:`heads .` to see the heads on the
3697 currently checked-out branch.
3701 currently checked-out branch.
3698
3702
3699 If -c/--closed is specified, also show branch heads marked closed
3703 If -c/--closed is specified, also show branch heads marked closed
3700 (see :hg:`commit --close-branch`).
3704 (see :hg:`commit --close-branch`).
3701
3705
3702 If STARTREV is specified, only those heads that are descendants of
3706 If STARTREV is specified, only those heads that are descendants of
3703 STARTREV will be displayed.
3707 STARTREV will be displayed.
3704
3708
3705 If -t/--topo is specified, named branch mechanics will be ignored and only
3709 If -t/--topo is specified, named branch mechanics will be ignored and only
3706 topological heads (changesets with no children) will be shown.
3710 topological heads (changesets with no children) will be shown.
3707
3711
3708 Returns 0 if matching heads are found, 1 if not.
3712 Returns 0 if matching heads are found, 1 if not.
3709 """
3713 """
3710
3714
3711 opts = pycompat.byteskwargs(opts)
3715 opts = pycompat.byteskwargs(opts)
3712 start = None
3716 start = None
3713 rev = opts.get(b'rev')
3717 rev = opts.get(b'rev')
3714 if rev:
3718 if rev:
3715 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3719 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3716 start = scmutil.revsingle(repo, rev, None).node()
3720 start = scmutil.revsingle(repo, rev, None).node()
3717
3721
3718 if opts.get(b'topo'):
3722 if opts.get(b'topo'):
3719 heads = [repo[h] for h in repo.heads(start)]
3723 heads = [repo[h] for h in repo.heads(start)]
3720 else:
3724 else:
3721 heads = []
3725 heads = []
3722 for branch in repo.branchmap():
3726 for branch in repo.branchmap():
3723 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3727 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3724 heads = [repo[h] for h in heads]
3728 heads = [repo[h] for h in heads]
3725
3729
3726 if branchrevs:
3730 if branchrevs:
3727 branches = {
3731 branches = {
3728 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3732 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3729 }
3733 }
3730 heads = [h for h in heads if h.branch() in branches]
3734 heads = [h for h in heads if h.branch() in branches]
3731
3735
3732 if opts.get(b'active') and branchrevs:
3736 if opts.get(b'active') and branchrevs:
3733 dagheads = repo.heads(start)
3737 dagheads = repo.heads(start)
3734 heads = [h for h in heads if h.node() in dagheads]
3738 heads = [h for h in heads if h.node() in dagheads]
3735
3739
3736 if branchrevs:
3740 if branchrevs:
3737 haveheads = {h.branch() for h in heads}
3741 haveheads = {h.branch() for h in heads}
3738 if branches - haveheads:
3742 if branches - haveheads:
3739 headless = b', '.join(b for b in branches - haveheads)
3743 headless = b', '.join(b for b in branches - haveheads)
3740 msg = _(b'no open branch heads found on branches %s')
3744 msg = _(b'no open branch heads found on branches %s')
3741 if opts.get(b'rev'):
3745 if opts.get(b'rev'):
3742 msg += _(b' (started at %s)') % opts[b'rev']
3746 msg += _(b' (started at %s)') % opts[b'rev']
3743 ui.warn((msg + b'\n') % headless)
3747 ui.warn((msg + b'\n') % headless)
3744
3748
3745 if not heads:
3749 if not heads:
3746 return 1
3750 return 1
3747
3751
3748 ui.pager(b'heads')
3752 ui.pager(b'heads')
3749 heads = sorted(heads, key=lambda x: -(x.rev()))
3753 heads = sorted(heads, key=lambda x: -(x.rev()))
3750 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3754 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3751 for ctx in heads:
3755 for ctx in heads:
3752 displayer.show(ctx)
3756 displayer.show(ctx)
3753 displayer.close()
3757 displayer.close()
3754
3758
3755
3759
3756 @command(
3760 @command(
3757 b'help',
3761 b'help',
3758 [
3762 [
3759 (b'e', b'extension', None, _(b'show only help for extensions')),
3763 (b'e', b'extension', None, _(b'show only help for extensions')),
3760 (b'c', b'command', None, _(b'show only help for commands')),
3764 (b'c', b'command', None, _(b'show only help for commands')),
3761 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3765 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3762 (
3766 (
3763 b's',
3767 b's',
3764 b'system',
3768 b'system',
3765 [],
3769 [],
3766 _(b'show help for specific platform(s)'),
3770 _(b'show help for specific platform(s)'),
3767 _(b'PLATFORM'),
3771 _(b'PLATFORM'),
3768 ),
3772 ),
3769 ],
3773 ],
3770 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3774 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3771 helpcategory=command.CATEGORY_HELP,
3775 helpcategory=command.CATEGORY_HELP,
3772 norepo=True,
3776 norepo=True,
3773 intents={INTENT_READONLY},
3777 intents={INTENT_READONLY},
3774 )
3778 )
3775 def help_(ui, name=None, **opts):
3779 def help_(ui, name=None, **opts):
3776 """show help for a given topic or a help overview
3780 """show help for a given topic or a help overview
3777
3781
3778 With no arguments, print a list of commands with short help messages.
3782 With no arguments, print a list of commands with short help messages.
3779
3783
3780 Given a topic, extension, or command name, print help for that
3784 Given a topic, extension, or command name, print help for that
3781 topic.
3785 topic.
3782
3786
3783 Returns 0 if successful.
3787 Returns 0 if successful.
3784 """
3788 """
3785
3789
3786 keep = opts.get('system') or []
3790 keep = opts.get('system') or []
3787 if len(keep) == 0:
3791 if len(keep) == 0:
3788 if pycompat.sysplatform.startswith(b'win'):
3792 if pycompat.sysplatform.startswith(b'win'):
3789 keep.append(b'windows')
3793 keep.append(b'windows')
3790 elif pycompat.sysplatform == b'OpenVMS':
3794 elif pycompat.sysplatform == b'OpenVMS':
3791 keep.append(b'vms')
3795 keep.append(b'vms')
3792 elif pycompat.sysplatform == b'plan9':
3796 elif pycompat.sysplatform == b'plan9':
3793 keep.append(b'plan9')
3797 keep.append(b'plan9')
3794 else:
3798 else:
3795 keep.append(b'unix')
3799 keep.append(b'unix')
3796 keep.append(pycompat.sysplatform.lower())
3800 keep.append(pycompat.sysplatform.lower())
3797 if ui.verbose:
3801 if ui.verbose:
3798 keep.append(b'verbose')
3802 keep.append(b'verbose')
3799
3803
3800 commands = sys.modules[__name__]
3804 commands = sys.modules[__name__]
3801 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3805 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3802 ui.pager(b'help')
3806 ui.pager(b'help')
3803 ui.write(formatted)
3807 ui.write(formatted)
3804
3808
3805
3809
3806 @command(
3810 @command(
3807 b'identify|id',
3811 b'identify|id',
3808 [
3812 [
3809 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3813 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3810 (b'n', b'num', None, _(b'show local revision number')),
3814 (b'n', b'num', None, _(b'show local revision number')),
3811 (b'i', b'id', None, _(b'show global revision id')),
3815 (b'i', b'id', None, _(b'show global revision id')),
3812 (b'b', b'branch', None, _(b'show branch')),
3816 (b'b', b'branch', None, _(b'show branch')),
3813 (b't', b'tags', None, _(b'show tags')),
3817 (b't', b'tags', None, _(b'show tags')),
3814 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3818 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3815 ]
3819 ]
3816 + remoteopts
3820 + remoteopts
3817 + formatteropts,
3821 + formatteropts,
3818 _(b'[-nibtB] [-r REV] [SOURCE]'),
3822 _(b'[-nibtB] [-r REV] [SOURCE]'),
3819 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3823 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3820 optionalrepo=True,
3824 optionalrepo=True,
3821 intents={INTENT_READONLY},
3825 intents={INTENT_READONLY},
3822 )
3826 )
3823 def identify(
3827 def identify(
3824 ui,
3828 ui,
3825 repo,
3829 repo,
3826 source=None,
3830 source=None,
3827 rev=None,
3831 rev=None,
3828 num=None,
3832 num=None,
3829 id=None,
3833 id=None,
3830 branch=None,
3834 branch=None,
3831 tags=None,
3835 tags=None,
3832 bookmarks=None,
3836 bookmarks=None,
3833 **opts
3837 **opts
3834 ):
3838 ):
3835 """identify the working directory or specified revision
3839 """identify the working directory or specified revision
3836
3840
3837 Print a summary identifying the repository state at REV using one or
3841 Print a summary identifying the repository state at REV using one or
3838 two parent hash identifiers, followed by a "+" if the working
3842 two parent hash identifiers, followed by a "+" if the working
3839 directory has uncommitted changes, the branch name (if not default),
3843 directory has uncommitted changes, the branch name (if not default),
3840 a list of tags, and a list of bookmarks.
3844 a list of tags, and a list of bookmarks.
3841
3845
3842 When REV is not given, print a summary of the current state of the
3846 When REV is not given, print a summary of the current state of the
3843 repository including the working directory. Specify -r. to get information
3847 repository including the working directory. Specify -r. to get information
3844 of the working directory parent without scanning uncommitted changes.
3848 of the working directory parent without scanning uncommitted changes.
3845
3849
3846 Specifying a path to a repository root or Mercurial bundle will
3850 Specifying a path to a repository root or Mercurial bundle will
3847 cause lookup to operate on that repository/bundle.
3851 cause lookup to operate on that repository/bundle.
3848
3852
3849 .. container:: verbose
3853 .. container:: verbose
3850
3854
3851 Template:
3855 Template:
3852
3856
3853 The following keywords are supported in addition to the common template
3857 The following keywords are supported in addition to the common template
3854 keywords and functions. See also :hg:`help templates`.
3858 keywords and functions. See also :hg:`help templates`.
3855
3859
3856 :dirty: String. Character ``+`` denoting if the working directory has
3860 :dirty: String. Character ``+`` denoting if the working directory has
3857 uncommitted changes.
3861 uncommitted changes.
3858 :id: String. One or two nodes, optionally followed by ``+``.
3862 :id: String. One or two nodes, optionally followed by ``+``.
3859 :parents: List of strings. Parent nodes of the changeset.
3863 :parents: List of strings. Parent nodes of the changeset.
3860
3864
3861 Examples:
3865 Examples:
3862
3866
3863 - generate a build identifier for the working directory::
3867 - generate a build identifier for the working directory::
3864
3868
3865 hg id --id > build-id.dat
3869 hg id --id > build-id.dat
3866
3870
3867 - find the revision corresponding to a tag::
3871 - find the revision corresponding to a tag::
3868
3872
3869 hg id -n -r 1.3
3873 hg id -n -r 1.3
3870
3874
3871 - check the most recent revision of a remote repository::
3875 - check the most recent revision of a remote repository::
3872
3876
3873 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3877 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3874
3878
3875 See :hg:`log` for generating more information about specific revisions,
3879 See :hg:`log` for generating more information about specific revisions,
3876 including full hash identifiers.
3880 including full hash identifiers.
3877
3881
3878 Returns 0 if successful.
3882 Returns 0 if successful.
3879 """
3883 """
3880
3884
3881 opts = pycompat.byteskwargs(opts)
3885 opts = pycompat.byteskwargs(opts)
3882 if not repo and not source:
3886 if not repo and not source:
3883 raise error.Abort(
3887 raise error.Abort(
3884 _(b"there is no Mercurial repository here (.hg not found)")
3888 _(b"there is no Mercurial repository here (.hg not found)")
3885 )
3889 )
3886
3890
3887 default = not (num or id or branch or tags or bookmarks)
3891 default = not (num or id or branch or tags or bookmarks)
3888 output = []
3892 output = []
3889 revs = []
3893 revs = []
3890
3894
3891 if source:
3895 if source:
3892 source, branches = hg.parseurl(ui.expandpath(source))
3896 source, branches = hg.parseurl(ui.expandpath(source))
3893 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3897 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3894 repo = peer.local()
3898 repo = peer.local()
3895 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3899 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3896
3900
3897 fm = ui.formatter(b'identify', opts)
3901 fm = ui.formatter(b'identify', opts)
3898 fm.startitem()
3902 fm.startitem()
3899
3903
3900 if not repo:
3904 if not repo:
3901 if num or branch or tags:
3905 if num or branch or tags:
3902 raise error.Abort(
3906 raise error.Abort(
3903 _(b"can't query remote revision number, branch, or tags")
3907 _(b"can't query remote revision number, branch, or tags")
3904 )
3908 )
3905 if not rev and revs:
3909 if not rev and revs:
3906 rev = revs[0]
3910 rev = revs[0]
3907 if not rev:
3911 if not rev:
3908 rev = b"tip"
3912 rev = b"tip"
3909
3913
3910 remoterev = peer.lookup(rev)
3914 remoterev = peer.lookup(rev)
3911 hexrev = fm.hexfunc(remoterev)
3915 hexrev = fm.hexfunc(remoterev)
3912 if default or id:
3916 if default or id:
3913 output = [hexrev]
3917 output = [hexrev]
3914 fm.data(id=hexrev)
3918 fm.data(id=hexrev)
3915
3919
3916 @util.cachefunc
3920 @util.cachefunc
3917 def getbms():
3921 def getbms():
3918 bms = []
3922 bms = []
3919
3923
3920 if b'bookmarks' in peer.listkeys(b'namespaces'):
3924 if b'bookmarks' in peer.listkeys(b'namespaces'):
3921 hexremoterev = hex(remoterev)
3925 hexremoterev = hex(remoterev)
3922 bms = [
3926 bms = [
3923 bm
3927 bm
3924 for bm, bmr in pycompat.iteritems(
3928 for bm, bmr in pycompat.iteritems(
3925 peer.listkeys(b'bookmarks')
3929 peer.listkeys(b'bookmarks')
3926 )
3930 )
3927 if bmr == hexremoterev
3931 if bmr == hexremoterev
3928 ]
3932 ]
3929
3933
3930 return sorted(bms)
3934 return sorted(bms)
3931
3935
3932 if fm.isplain():
3936 if fm.isplain():
3933 if bookmarks:
3937 if bookmarks:
3934 output.extend(getbms())
3938 output.extend(getbms())
3935 elif default and not ui.quiet:
3939 elif default and not ui.quiet:
3936 # multiple bookmarks for a single parent separated by '/'
3940 # multiple bookmarks for a single parent separated by '/'
3937 bm = b'/'.join(getbms())
3941 bm = b'/'.join(getbms())
3938 if bm:
3942 if bm:
3939 output.append(bm)
3943 output.append(bm)
3940 else:
3944 else:
3941 fm.data(node=hex(remoterev))
3945 fm.data(node=hex(remoterev))
3942 if bookmarks or b'bookmarks' in fm.datahint():
3946 if bookmarks or b'bookmarks' in fm.datahint():
3943 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3947 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3944 else:
3948 else:
3945 if rev:
3949 if rev:
3946 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3950 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3947 ctx = scmutil.revsingle(repo, rev, None)
3951 ctx = scmutil.revsingle(repo, rev, None)
3948
3952
3949 if ctx.rev() is None:
3953 if ctx.rev() is None:
3950 ctx = repo[None]
3954 ctx = repo[None]
3951 parents = ctx.parents()
3955 parents = ctx.parents()
3952 taglist = []
3956 taglist = []
3953 for p in parents:
3957 for p in parents:
3954 taglist.extend(p.tags())
3958 taglist.extend(p.tags())
3955
3959
3956 dirty = b""
3960 dirty = b""
3957 if ctx.dirty(missing=True, merge=False, branch=False):
3961 if ctx.dirty(missing=True, merge=False, branch=False):
3958 dirty = b'+'
3962 dirty = b'+'
3959 fm.data(dirty=dirty)
3963 fm.data(dirty=dirty)
3960
3964
3961 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3965 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3962 if default or id:
3966 if default or id:
3963 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3967 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3964 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3968 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3965
3969
3966 if num:
3970 if num:
3967 numoutput = [b"%d" % p.rev() for p in parents]
3971 numoutput = [b"%d" % p.rev() for p in parents]
3968 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3972 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3969
3973
3970 fm.data(
3974 fm.data(
3971 parents=fm.formatlist(
3975 parents=fm.formatlist(
3972 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3976 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3973 )
3977 )
3974 )
3978 )
3975 else:
3979 else:
3976 hexoutput = fm.hexfunc(ctx.node())
3980 hexoutput = fm.hexfunc(ctx.node())
3977 if default or id:
3981 if default or id:
3978 output = [hexoutput]
3982 output = [hexoutput]
3979 fm.data(id=hexoutput)
3983 fm.data(id=hexoutput)
3980
3984
3981 if num:
3985 if num:
3982 output.append(pycompat.bytestr(ctx.rev()))
3986 output.append(pycompat.bytestr(ctx.rev()))
3983 taglist = ctx.tags()
3987 taglist = ctx.tags()
3984
3988
3985 if default and not ui.quiet:
3989 if default and not ui.quiet:
3986 b = ctx.branch()
3990 b = ctx.branch()
3987 if b != b'default':
3991 if b != b'default':
3988 output.append(b"(%s)" % b)
3992 output.append(b"(%s)" % b)
3989
3993
3990 # multiple tags for a single parent separated by '/'
3994 # multiple tags for a single parent separated by '/'
3991 t = b'/'.join(taglist)
3995 t = b'/'.join(taglist)
3992 if t:
3996 if t:
3993 output.append(t)
3997 output.append(t)
3994
3998
3995 # multiple bookmarks for a single parent separated by '/'
3999 # multiple bookmarks for a single parent separated by '/'
3996 bm = b'/'.join(ctx.bookmarks())
4000 bm = b'/'.join(ctx.bookmarks())
3997 if bm:
4001 if bm:
3998 output.append(bm)
4002 output.append(bm)
3999 else:
4003 else:
4000 if branch:
4004 if branch:
4001 output.append(ctx.branch())
4005 output.append(ctx.branch())
4002
4006
4003 if tags:
4007 if tags:
4004 output.extend(taglist)
4008 output.extend(taglist)
4005
4009
4006 if bookmarks:
4010 if bookmarks:
4007 output.extend(ctx.bookmarks())
4011 output.extend(ctx.bookmarks())
4008
4012
4009 fm.data(node=ctx.hex())
4013 fm.data(node=ctx.hex())
4010 fm.data(branch=ctx.branch())
4014 fm.data(branch=ctx.branch())
4011 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4015 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4012 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4016 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4013 fm.context(ctx=ctx)
4017 fm.context(ctx=ctx)
4014
4018
4015 fm.plain(b"%s\n" % b' '.join(output))
4019 fm.plain(b"%s\n" % b' '.join(output))
4016 fm.end()
4020 fm.end()
4017
4021
4018
4022
4019 @command(
4023 @command(
4020 b'import|patch',
4024 b'import|patch',
4021 [
4025 [
4022 (
4026 (
4023 b'p',
4027 b'p',
4024 b'strip',
4028 b'strip',
4025 1,
4029 1,
4026 _(
4030 _(
4027 b'directory strip option for patch. This has the same '
4031 b'directory strip option for patch. This has the same '
4028 b'meaning as the corresponding patch option'
4032 b'meaning as the corresponding patch option'
4029 ),
4033 ),
4030 _(b'NUM'),
4034 _(b'NUM'),
4031 ),
4035 ),
4032 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4036 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4033 (b'', b'secret', None, _(b'use the secret phase for committing')),
4037 (b'', b'secret', None, _(b'use the secret phase for committing')),
4034 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4038 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4035 (
4039 (
4036 b'f',
4040 b'f',
4037 b'force',
4041 b'force',
4038 None,
4042 None,
4039 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4043 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4040 ),
4044 ),
4041 (
4045 (
4042 b'',
4046 b'',
4043 b'no-commit',
4047 b'no-commit',
4044 None,
4048 None,
4045 _(b"don't commit, just update the working directory"),
4049 _(b"don't commit, just update the working directory"),
4046 ),
4050 ),
4047 (
4051 (
4048 b'',
4052 b'',
4049 b'bypass',
4053 b'bypass',
4050 None,
4054 None,
4051 _(b"apply patch without touching the working directory"),
4055 _(b"apply patch without touching the working directory"),
4052 ),
4056 ),
4053 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4057 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4054 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4058 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4055 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4059 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4056 (
4060 (
4057 b'',
4061 b'',
4058 b'import-branch',
4062 b'import-branch',
4059 None,
4063 None,
4060 _(b'use any branch information in patch (implied by --exact)'),
4064 _(b'use any branch information in patch (implied by --exact)'),
4061 ),
4065 ),
4062 ]
4066 ]
4063 + commitopts
4067 + commitopts
4064 + commitopts2
4068 + commitopts2
4065 + similarityopts,
4069 + similarityopts,
4066 _(b'[OPTION]... PATCH...'),
4070 _(b'[OPTION]... PATCH...'),
4067 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4071 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4068 )
4072 )
4069 def import_(ui, repo, patch1=None, *patches, **opts):
4073 def import_(ui, repo, patch1=None, *patches, **opts):
4070 """import an ordered set of patches
4074 """import an ordered set of patches
4071
4075
4072 Import a list of patches and commit them individually (unless
4076 Import a list of patches and commit them individually (unless
4073 --no-commit is specified).
4077 --no-commit is specified).
4074
4078
4075 To read a patch from standard input (stdin), use "-" as the patch
4079 To read a patch from standard input (stdin), use "-" as the patch
4076 name. If a URL is specified, the patch will be downloaded from
4080 name. If a URL is specified, the patch will be downloaded from
4077 there.
4081 there.
4078
4082
4079 Import first applies changes to the working directory (unless
4083 Import first applies changes to the working directory (unless
4080 --bypass is specified), import will abort if there are outstanding
4084 --bypass is specified), import will abort if there are outstanding
4081 changes.
4085 changes.
4082
4086
4083 Use --bypass to apply and commit patches directly to the
4087 Use --bypass to apply and commit patches directly to the
4084 repository, without affecting the working directory. Without
4088 repository, without affecting the working directory. Without
4085 --exact, patches will be applied on top of the working directory
4089 --exact, patches will be applied on top of the working directory
4086 parent revision.
4090 parent revision.
4087
4091
4088 You can import a patch straight from a mail message. Even patches
4092 You can import a patch straight from a mail message. Even patches
4089 as attachments work (to use the body part, it must have type
4093 as attachments work (to use the body part, it must have type
4090 text/plain or text/x-patch). From and Subject headers of email
4094 text/plain or text/x-patch). From and Subject headers of email
4091 message are used as default committer and commit message. All
4095 message are used as default committer and commit message. All
4092 text/plain body parts before first diff are added to the commit
4096 text/plain body parts before first diff are added to the commit
4093 message.
4097 message.
4094
4098
4095 If the imported patch was generated by :hg:`export`, user and
4099 If the imported patch was generated by :hg:`export`, user and
4096 description from patch override values from message headers and
4100 description from patch override values from message headers and
4097 body. Values given on command line with -m/--message and -u/--user
4101 body. Values given on command line with -m/--message and -u/--user
4098 override these.
4102 override these.
4099
4103
4100 If --exact is specified, import will set the working directory to
4104 If --exact is specified, import will set the working directory to
4101 the parent of each patch before applying it, and will abort if the
4105 the parent of each patch before applying it, and will abort if the
4102 resulting changeset has a different ID than the one recorded in
4106 resulting changeset has a different ID than the one recorded in
4103 the patch. This will guard against various ways that portable
4107 the patch. This will guard against various ways that portable
4104 patch formats and mail systems might fail to transfer Mercurial
4108 patch formats and mail systems might fail to transfer Mercurial
4105 data or metadata. See :hg:`bundle` for lossless transmission.
4109 data or metadata. See :hg:`bundle` for lossless transmission.
4106
4110
4107 Use --partial to ensure a changeset will be created from the patch
4111 Use --partial to ensure a changeset will be created from the patch
4108 even if some hunks fail to apply. Hunks that fail to apply will be
4112 even if some hunks fail to apply. Hunks that fail to apply will be
4109 written to a <target-file>.rej file. Conflicts can then be resolved
4113 written to a <target-file>.rej file. Conflicts can then be resolved
4110 by hand before :hg:`commit --amend` is run to update the created
4114 by hand before :hg:`commit --amend` is run to update the created
4111 changeset. This flag exists to let people import patches that
4115 changeset. This flag exists to let people import patches that
4112 partially apply without losing the associated metadata (author,
4116 partially apply without losing the associated metadata (author,
4113 date, description, ...).
4117 date, description, ...).
4114
4118
4115 .. note::
4119 .. note::
4116
4120
4117 When no hunks apply cleanly, :hg:`import --partial` will create
4121 When no hunks apply cleanly, :hg:`import --partial` will create
4118 an empty changeset, importing only the patch metadata.
4122 an empty changeset, importing only the patch metadata.
4119
4123
4120 With -s/--similarity, hg will attempt to discover renames and
4124 With -s/--similarity, hg will attempt to discover renames and
4121 copies in the patch in the same way as :hg:`addremove`.
4125 copies in the patch in the same way as :hg:`addremove`.
4122
4126
4123 It is possible to use external patch programs to perform the patch
4127 It is possible to use external patch programs to perform the patch
4124 by setting the ``ui.patch`` configuration option. For the default
4128 by setting the ``ui.patch`` configuration option. For the default
4125 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4129 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4126 See :hg:`help config` for more information about configuration
4130 See :hg:`help config` for more information about configuration
4127 files and how to use these options.
4131 files and how to use these options.
4128
4132
4129 See :hg:`help dates` for a list of formats valid for -d/--date.
4133 See :hg:`help dates` for a list of formats valid for -d/--date.
4130
4134
4131 .. container:: verbose
4135 .. container:: verbose
4132
4136
4133 Examples:
4137 Examples:
4134
4138
4135 - import a traditional patch from a website and detect renames::
4139 - import a traditional patch from a website and detect renames::
4136
4140
4137 hg import -s 80 http://example.com/bugfix.patch
4141 hg import -s 80 http://example.com/bugfix.patch
4138
4142
4139 - import a changeset from an hgweb server::
4143 - import a changeset from an hgweb server::
4140
4144
4141 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4145 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4142
4146
4143 - import all the patches in an Unix-style mbox::
4147 - import all the patches in an Unix-style mbox::
4144
4148
4145 hg import incoming-patches.mbox
4149 hg import incoming-patches.mbox
4146
4150
4147 - import patches from stdin::
4151 - import patches from stdin::
4148
4152
4149 hg import -
4153 hg import -
4150
4154
4151 - attempt to exactly restore an exported changeset (not always
4155 - attempt to exactly restore an exported changeset (not always
4152 possible)::
4156 possible)::
4153
4157
4154 hg import --exact proposed-fix.patch
4158 hg import --exact proposed-fix.patch
4155
4159
4156 - use an external tool to apply a patch which is too fuzzy for
4160 - use an external tool to apply a patch which is too fuzzy for
4157 the default internal tool.
4161 the default internal tool.
4158
4162
4159 hg import --config ui.patch="patch --merge" fuzzy.patch
4163 hg import --config ui.patch="patch --merge" fuzzy.patch
4160
4164
4161 - change the default fuzzing from 2 to a less strict 7
4165 - change the default fuzzing from 2 to a less strict 7
4162
4166
4163 hg import --config ui.fuzz=7 fuzz.patch
4167 hg import --config ui.fuzz=7 fuzz.patch
4164
4168
4165 Returns 0 on success, 1 on partial success (see --partial).
4169 Returns 0 on success, 1 on partial success (see --partial).
4166 """
4170 """
4167
4171
4168 opts = pycompat.byteskwargs(opts)
4172 opts = pycompat.byteskwargs(opts)
4169 if not patch1:
4173 if not patch1:
4170 raise error.Abort(_(b'need at least one patch to import'))
4174 raise error.Abort(_(b'need at least one patch to import'))
4171
4175
4172 patches = (patch1,) + patches
4176 patches = (patch1,) + patches
4173
4177
4174 date = opts.get(b'date')
4178 date = opts.get(b'date')
4175 if date:
4179 if date:
4176 opts[b'date'] = dateutil.parsedate(date)
4180 opts[b'date'] = dateutil.parsedate(date)
4177
4181
4178 exact = opts.get(b'exact')
4182 exact = opts.get(b'exact')
4179 update = not opts.get(b'bypass')
4183 update = not opts.get(b'bypass')
4180 if not update and opts.get(b'no_commit'):
4184 if not update and opts.get(b'no_commit'):
4181 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4185 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4182 if opts.get(b'secret') and opts.get(b'no_commit'):
4186 if opts.get(b'secret') and opts.get(b'no_commit'):
4183 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4187 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4184 try:
4188 try:
4185 sim = float(opts.get(b'similarity') or 0)
4189 sim = float(opts.get(b'similarity') or 0)
4186 except ValueError:
4190 except ValueError:
4187 raise error.Abort(_(b'similarity must be a number'))
4191 raise error.Abort(_(b'similarity must be a number'))
4188 if sim < 0 or sim > 100:
4192 if sim < 0 or sim > 100:
4189 raise error.Abort(_(b'similarity must be between 0 and 100'))
4193 raise error.Abort(_(b'similarity must be between 0 and 100'))
4190 if sim and not update:
4194 if sim and not update:
4191 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4195 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4192 if exact:
4196 if exact:
4193 if opts.get(b'edit'):
4197 if opts.get(b'edit'):
4194 raise error.Abort(_(b'cannot use --exact with --edit'))
4198 raise error.Abort(_(b'cannot use --exact with --edit'))
4195 if opts.get(b'prefix'):
4199 if opts.get(b'prefix'):
4196 raise error.Abort(_(b'cannot use --exact with --prefix'))
4200 raise error.Abort(_(b'cannot use --exact with --prefix'))
4197
4201
4198 base = opts[b"base"]
4202 base = opts[b"base"]
4199 msgs = []
4203 msgs = []
4200 ret = 0
4204 ret = 0
4201
4205
4202 with repo.wlock():
4206 with repo.wlock():
4203 if update:
4207 if update:
4204 cmdutil.checkunfinished(repo)
4208 cmdutil.checkunfinished(repo)
4205 if exact or not opts.get(b'force'):
4209 if exact or not opts.get(b'force'):
4206 cmdutil.bailifchanged(repo)
4210 cmdutil.bailifchanged(repo)
4207
4211
4208 if not opts.get(b'no_commit'):
4212 if not opts.get(b'no_commit'):
4209 lock = repo.lock
4213 lock = repo.lock
4210 tr = lambda: repo.transaction(b'import')
4214 tr = lambda: repo.transaction(b'import')
4211 dsguard = util.nullcontextmanager
4215 dsguard = util.nullcontextmanager
4212 else:
4216 else:
4213 lock = util.nullcontextmanager
4217 lock = util.nullcontextmanager
4214 tr = util.nullcontextmanager
4218 tr = util.nullcontextmanager
4215 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4219 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4216 with lock(), tr(), dsguard():
4220 with lock(), tr(), dsguard():
4217 parents = repo[None].parents()
4221 parents = repo[None].parents()
4218 for patchurl in patches:
4222 for patchurl in patches:
4219 if patchurl == b'-':
4223 if patchurl == b'-':
4220 ui.status(_(b'applying patch from stdin\n'))
4224 ui.status(_(b'applying patch from stdin\n'))
4221 patchfile = ui.fin
4225 patchfile = ui.fin
4222 patchurl = b'stdin' # for error message
4226 patchurl = b'stdin' # for error message
4223 else:
4227 else:
4224 patchurl = os.path.join(base, patchurl)
4228 patchurl = os.path.join(base, patchurl)
4225 ui.status(_(b'applying %s\n') % patchurl)
4229 ui.status(_(b'applying %s\n') % patchurl)
4226 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4230 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4227
4231
4228 haspatch = False
4232 haspatch = False
4229 for hunk in patch.split(patchfile):
4233 for hunk in patch.split(patchfile):
4230 with patch.extract(ui, hunk) as patchdata:
4234 with patch.extract(ui, hunk) as patchdata:
4231 msg, node, rej = cmdutil.tryimportone(
4235 msg, node, rej = cmdutil.tryimportone(
4232 ui, repo, patchdata, parents, opts, msgs, hg.clean
4236 ui, repo, patchdata, parents, opts, msgs, hg.clean
4233 )
4237 )
4234 if msg:
4238 if msg:
4235 haspatch = True
4239 haspatch = True
4236 ui.note(msg + b'\n')
4240 ui.note(msg + b'\n')
4237 if update or exact:
4241 if update or exact:
4238 parents = repo[None].parents()
4242 parents = repo[None].parents()
4239 else:
4243 else:
4240 parents = [repo[node]]
4244 parents = [repo[node]]
4241 if rej:
4245 if rej:
4242 ui.write_err(_(b"patch applied partially\n"))
4246 ui.write_err(_(b"patch applied partially\n"))
4243 ui.write_err(
4247 ui.write_err(
4244 _(
4248 _(
4245 b"(fix the .rej files and run "
4249 b"(fix the .rej files and run "
4246 b"`hg commit --amend`)\n"
4250 b"`hg commit --amend`)\n"
4247 )
4251 )
4248 )
4252 )
4249 ret = 1
4253 ret = 1
4250 break
4254 break
4251
4255
4252 if not haspatch:
4256 if not haspatch:
4253 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4257 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4254
4258
4255 if msgs:
4259 if msgs:
4256 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4260 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4257 return ret
4261 return ret
4258
4262
4259
4263
4260 @command(
4264 @command(
4261 b'incoming|in',
4265 b'incoming|in',
4262 [
4266 [
4263 (
4267 (
4264 b'f',
4268 b'f',
4265 b'force',
4269 b'force',
4266 None,
4270 None,
4267 _(b'run even if remote repository is unrelated'),
4271 _(b'run even if remote repository is unrelated'),
4268 ),
4272 ),
4269 (b'n', b'newest-first', None, _(b'show newest record first')),
4273 (b'n', b'newest-first', None, _(b'show newest record first')),
4270 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4274 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4271 (
4275 (
4272 b'r',
4276 b'r',
4273 b'rev',
4277 b'rev',
4274 [],
4278 [],
4275 _(b'a remote changeset intended to be added'),
4279 _(b'a remote changeset intended to be added'),
4276 _(b'REV'),
4280 _(b'REV'),
4277 ),
4281 ),
4278 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4282 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4279 (
4283 (
4280 b'b',
4284 b'b',
4281 b'branch',
4285 b'branch',
4282 [],
4286 [],
4283 _(b'a specific branch you would like to pull'),
4287 _(b'a specific branch you would like to pull'),
4284 _(b'BRANCH'),
4288 _(b'BRANCH'),
4285 ),
4289 ),
4286 ]
4290 ]
4287 + logopts
4291 + logopts
4288 + remoteopts
4292 + remoteopts
4289 + subrepoopts,
4293 + subrepoopts,
4290 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4294 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4291 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4295 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4292 )
4296 )
4293 def incoming(ui, repo, source=b"default", **opts):
4297 def incoming(ui, repo, source=b"default", **opts):
4294 """show new changesets found in source
4298 """show new changesets found in source
4295
4299
4296 Show new changesets found in the specified path/URL or the default
4300 Show new changesets found in the specified path/URL or the default
4297 pull location. These are the changesets that would have been pulled
4301 pull location. These are the changesets that would have been pulled
4298 by :hg:`pull` at the time you issued this command.
4302 by :hg:`pull` at the time you issued this command.
4299
4303
4300 See pull for valid source format details.
4304 See pull for valid source format details.
4301
4305
4302 .. container:: verbose
4306 .. container:: verbose
4303
4307
4304 With -B/--bookmarks, the result of bookmark comparison between
4308 With -B/--bookmarks, the result of bookmark comparison between
4305 local and remote repositories is displayed. With -v/--verbose,
4309 local and remote repositories is displayed. With -v/--verbose,
4306 status is also displayed for each bookmark like below::
4310 status is also displayed for each bookmark like below::
4307
4311
4308 BM1 01234567890a added
4312 BM1 01234567890a added
4309 BM2 1234567890ab advanced
4313 BM2 1234567890ab advanced
4310 BM3 234567890abc diverged
4314 BM3 234567890abc diverged
4311 BM4 34567890abcd changed
4315 BM4 34567890abcd changed
4312
4316
4313 The action taken locally when pulling depends on the
4317 The action taken locally when pulling depends on the
4314 status of each bookmark:
4318 status of each bookmark:
4315
4319
4316 :``added``: pull will create it
4320 :``added``: pull will create it
4317 :``advanced``: pull will update it
4321 :``advanced``: pull will update it
4318 :``diverged``: pull will create a divergent bookmark
4322 :``diverged``: pull will create a divergent bookmark
4319 :``changed``: result depends on remote changesets
4323 :``changed``: result depends on remote changesets
4320
4324
4321 From the point of view of pulling behavior, bookmark
4325 From the point of view of pulling behavior, bookmark
4322 existing only in the remote repository are treated as ``added``,
4326 existing only in the remote repository are treated as ``added``,
4323 even if it is in fact locally deleted.
4327 even if it is in fact locally deleted.
4324
4328
4325 .. container:: verbose
4329 .. container:: verbose
4326
4330
4327 For remote repository, using --bundle avoids downloading the
4331 For remote repository, using --bundle avoids downloading the
4328 changesets twice if the incoming is followed by a pull.
4332 changesets twice if the incoming is followed by a pull.
4329
4333
4330 Examples:
4334 Examples:
4331
4335
4332 - show incoming changes with patches and full description::
4336 - show incoming changes with patches and full description::
4333
4337
4334 hg incoming -vp
4338 hg incoming -vp
4335
4339
4336 - show incoming changes excluding merges, store a bundle::
4340 - show incoming changes excluding merges, store a bundle::
4337
4341
4338 hg in -vpM --bundle incoming.hg
4342 hg in -vpM --bundle incoming.hg
4339 hg pull incoming.hg
4343 hg pull incoming.hg
4340
4344
4341 - briefly list changes inside a bundle::
4345 - briefly list changes inside a bundle::
4342
4346
4343 hg in changes.hg -T "{desc|firstline}\\n"
4347 hg in changes.hg -T "{desc|firstline}\\n"
4344
4348
4345 Returns 0 if there are incoming changes, 1 otherwise.
4349 Returns 0 if there are incoming changes, 1 otherwise.
4346 """
4350 """
4347 opts = pycompat.byteskwargs(opts)
4351 opts = pycompat.byteskwargs(opts)
4348 if opts.get(b'graph'):
4352 if opts.get(b'graph'):
4349 logcmdutil.checkunsupportedgraphflags([], opts)
4353 logcmdutil.checkunsupportedgraphflags([], opts)
4350
4354
4351 def display(other, chlist, displayer):
4355 def display(other, chlist, displayer):
4352 revdag = logcmdutil.graphrevs(other, chlist, opts)
4356 revdag = logcmdutil.graphrevs(other, chlist, opts)
4353 logcmdutil.displaygraph(
4357 logcmdutil.displaygraph(
4354 ui, repo, revdag, displayer, graphmod.asciiedges
4358 ui, repo, revdag, displayer, graphmod.asciiedges
4355 )
4359 )
4356
4360
4357 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4361 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4358 return 0
4362 return 0
4359
4363
4360 if opts.get(b'bundle') and opts.get(b'subrepos'):
4364 if opts.get(b'bundle') and opts.get(b'subrepos'):
4361 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4365 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4362
4366
4363 if opts.get(b'bookmarks'):
4367 if opts.get(b'bookmarks'):
4364 source, branches = hg.parseurl(
4368 source, branches = hg.parseurl(
4365 ui.expandpath(source), opts.get(b'branch')
4369 ui.expandpath(source), opts.get(b'branch')
4366 )
4370 )
4367 other = hg.peer(repo, opts, source)
4371 other = hg.peer(repo, opts, source)
4368 if b'bookmarks' not in other.listkeys(b'namespaces'):
4372 if b'bookmarks' not in other.listkeys(b'namespaces'):
4369 ui.warn(_(b"remote doesn't support bookmarks\n"))
4373 ui.warn(_(b"remote doesn't support bookmarks\n"))
4370 return 0
4374 return 0
4371 ui.pager(b'incoming')
4375 ui.pager(b'incoming')
4372 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4376 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4373 return bookmarks.incoming(ui, repo, other)
4377 return bookmarks.incoming(ui, repo, other)
4374
4378
4375 repo._subtoppath = ui.expandpath(source)
4379 repo._subtoppath = ui.expandpath(source)
4376 try:
4380 try:
4377 return hg.incoming(ui, repo, source, opts)
4381 return hg.incoming(ui, repo, source, opts)
4378 finally:
4382 finally:
4379 del repo._subtoppath
4383 del repo._subtoppath
4380
4384
4381
4385
4382 @command(
4386 @command(
4383 b'init',
4387 b'init',
4384 remoteopts,
4388 remoteopts,
4385 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4389 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4386 helpcategory=command.CATEGORY_REPO_CREATION,
4390 helpcategory=command.CATEGORY_REPO_CREATION,
4387 helpbasic=True,
4391 helpbasic=True,
4388 norepo=True,
4392 norepo=True,
4389 )
4393 )
4390 def init(ui, dest=b".", **opts):
4394 def init(ui, dest=b".", **opts):
4391 """create a new repository in the given directory
4395 """create a new repository in the given directory
4392
4396
4393 Initialize a new repository in the given directory. If the given
4397 Initialize a new repository in the given directory. If the given
4394 directory does not exist, it will be created.
4398 directory does not exist, it will be created.
4395
4399
4396 If no directory is given, the current directory is used.
4400 If no directory is given, the current directory is used.
4397
4401
4398 It is possible to specify an ``ssh://`` URL as the destination.
4402 It is possible to specify an ``ssh://`` URL as the destination.
4399 See :hg:`help urls` for more information.
4403 See :hg:`help urls` for more information.
4400
4404
4401 Returns 0 on success.
4405 Returns 0 on success.
4402 """
4406 """
4403 opts = pycompat.byteskwargs(opts)
4407 opts = pycompat.byteskwargs(opts)
4404 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4408 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4405
4409
4406
4410
4407 @command(
4411 @command(
4408 b'locate',
4412 b'locate',
4409 [
4413 [
4410 (
4414 (
4411 b'r',
4415 b'r',
4412 b'rev',
4416 b'rev',
4413 b'',
4417 b'',
4414 _(b'search the repository as it is in REV'),
4418 _(b'search the repository as it is in REV'),
4415 _(b'REV'),
4419 _(b'REV'),
4416 ),
4420 ),
4417 (
4421 (
4418 b'0',
4422 b'0',
4419 b'print0',
4423 b'print0',
4420 None,
4424 None,
4421 _(b'end filenames with NUL, for use with xargs'),
4425 _(b'end filenames with NUL, for use with xargs'),
4422 ),
4426 ),
4423 (
4427 (
4424 b'f',
4428 b'f',
4425 b'fullpath',
4429 b'fullpath',
4426 None,
4430 None,
4427 _(b'print complete paths from the filesystem root'),
4431 _(b'print complete paths from the filesystem root'),
4428 ),
4432 ),
4429 ]
4433 ]
4430 + walkopts,
4434 + walkopts,
4431 _(b'[OPTION]... [PATTERN]...'),
4435 _(b'[OPTION]... [PATTERN]...'),
4432 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4436 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4433 )
4437 )
4434 def locate(ui, repo, *pats, **opts):
4438 def locate(ui, repo, *pats, **opts):
4435 """locate files matching specific patterns (DEPRECATED)
4439 """locate files matching specific patterns (DEPRECATED)
4436
4440
4437 Print files under Mercurial control in the working directory whose
4441 Print files under Mercurial control in the working directory whose
4438 names match the given patterns.
4442 names match the given patterns.
4439
4443
4440 By default, this command searches all directories in the working
4444 By default, this command searches all directories in the working
4441 directory. To search just the current directory and its
4445 directory. To search just the current directory and its
4442 subdirectories, use "--include .".
4446 subdirectories, use "--include .".
4443
4447
4444 If no patterns are given to match, this command prints the names
4448 If no patterns are given to match, this command prints the names
4445 of all files under Mercurial control in the working directory.
4449 of all files under Mercurial control in the working directory.
4446
4450
4447 If you want to feed the output of this command into the "xargs"
4451 If you want to feed the output of this command into the "xargs"
4448 command, use the -0 option to both this command and "xargs". This
4452 command, use the -0 option to both this command and "xargs". This
4449 will avoid the problem of "xargs" treating single filenames that
4453 will avoid the problem of "xargs" treating single filenames that
4450 contain whitespace as multiple filenames.
4454 contain whitespace as multiple filenames.
4451
4455
4452 See :hg:`help files` for a more versatile command.
4456 See :hg:`help files` for a more versatile command.
4453
4457
4454 Returns 0 if a match is found, 1 otherwise.
4458 Returns 0 if a match is found, 1 otherwise.
4455 """
4459 """
4456 opts = pycompat.byteskwargs(opts)
4460 opts = pycompat.byteskwargs(opts)
4457 if opts.get(b'print0'):
4461 if opts.get(b'print0'):
4458 end = b'\0'
4462 end = b'\0'
4459 else:
4463 else:
4460 end = b'\n'
4464 end = b'\n'
4461 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4465 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4462
4466
4463 ret = 1
4467 ret = 1
4464 m = scmutil.match(
4468 m = scmutil.match(
4465 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4469 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4466 )
4470 )
4467
4471
4468 ui.pager(b'locate')
4472 ui.pager(b'locate')
4469 if ctx.rev() is None:
4473 if ctx.rev() is None:
4470 # When run on the working copy, "locate" includes removed files, so
4474 # When run on the working copy, "locate" includes removed files, so
4471 # we get the list of files from the dirstate.
4475 # we get the list of files from the dirstate.
4472 filesgen = sorted(repo.dirstate.matches(m))
4476 filesgen = sorted(repo.dirstate.matches(m))
4473 else:
4477 else:
4474 filesgen = ctx.matches(m)
4478 filesgen = ctx.matches(m)
4475 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4479 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4476 for abs in filesgen:
4480 for abs in filesgen:
4477 if opts.get(b'fullpath'):
4481 if opts.get(b'fullpath'):
4478 ui.write(repo.wjoin(abs), end)
4482 ui.write(repo.wjoin(abs), end)
4479 else:
4483 else:
4480 ui.write(uipathfn(abs), end)
4484 ui.write(uipathfn(abs), end)
4481 ret = 0
4485 ret = 0
4482
4486
4483 return ret
4487 return ret
4484
4488
4485
4489
4486 @command(
4490 @command(
4487 b'log|history',
4491 b'log|history',
4488 [
4492 [
4489 (
4493 (
4490 b'f',
4494 b'f',
4491 b'follow',
4495 b'follow',
4492 None,
4496 None,
4493 _(
4497 _(
4494 b'follow changeset history, or file history across copies and renames'
4498 b'follow changeset history, or file history across copies and renames'
4495 ),
4499 ),
4496 ),
4500 ),
4497 (
4501 (
4498 b'',
4502 b'',
4499 b'follow-first',
4503 b'follow-first',
4500 None,
4504 None,
4501 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4505 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4502 ),
4506 ),
4503 (
4507 (
4504 b'd',
4508 b'd',
4505 b'date',
4509 b'date',
4506 b'',
4510 b'',
4507 _(b'show revisions matching date spec'),
4511 _(b'show revisions matching date spec'),
4508 _(b'DATE'),
4512 _(b'DATE'),
4509 ),
4513 ),
4510 (b'C', b'copies', None, _(b'show copied files')),
4514 (b'C', b'copies', None, _(b'show copied files')),
4511 (
4515 (
4512 b'k',
4516 b'k',
4513 b'keyword',
4517 b'keyword',
4514 [],
4518 [],
4515 _(b'do case-insensitive search for a given text'),
4519 _(b'do case-insensitive search for a given text'),
4516 _(b'TEXT'),
4520 _(b'TEXT'),
4517 ),
4521 ),
4518 (
4522 (
4519 b'r',
4523 b'r',
4520 b'rev',
4524 b'rev',
4521 [],
4525 [],
4522 _(b'show the specified revision or revset'),
4526 _(b'show the specified revision or revset'),
4523 _(b'REV'),
4527 _(b'REV'),
4524 ),
4528 ),
4525 (
4529 (
4526 b'L',
4530 b'L',
4527 b'line-range',
4531 b'line-range',
4528 [],
4532 [],
4529 _(b'follow line range of specified file (EXPERIMENTAL)'),
4533 _(b'follow line range of specified file (EXPERIMENTAL)'),
4530 _(b'FILE,RANGE'),
4534 _(b'FILE,RANGE'),
4531 ),
4535 ),
4532 (
4536 (
4533 b'',
4537 b'',
4534 b'removed',
4538 b'removed',
4535 None,
4539 None,
4536 _(b'include revisions where files were removed'),
4540 _(b'include revisions where files were removed'),
4537 ),
4541 ),
4538 (
4542 (
4539 b'm',
4543 b'm',
4540 b'only-merges',
4544 b'only-merges',
4541 None,
4545 None,
4542 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4546 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4543 ),
4547 ),
4544 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4548 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4545 (
4549 (
4546 b'',
4550 b'',
4547 b'only-branch',
4551 b'only-branch',
4548 [],
4552 [],
4549 _(
4553 _(
4550 b'show only changesets within the given named branch (DEPRECATED)'
4554 b'show only changesets within the given named branch (DEPRECATED)'
4551 ),
4555 ),
4552 _(b'BRANCH'),
4556 _(b'BRANCH'),
4553 ),
4557 ),
4554 (
4558 (
4555 b'b',
4559 b'b',
4556 b'branch',
4560 b'branch',
4557 [],
4561 [],
4558 _(b'show changesets within the given named branch'),
4562 _(b'show changesets within the given named branch'),
4559 _(b'BRANCH'),
4563 _(b'BRANCH'),
4560 ),
4564 ),
4561 (
4565 (
4562 b'P',
4566 b'P',
4563 b'prune',
4567 b'prune',
4564 [],
4568 [],
4565 _(b'do not display revision or any of its ancestors'),
4569 _(b'do not display revision or any of its ancestors'),
4566 _(b'REV'),
4570 _(b'REV'),
4567 ),
4571 ),
4568 ]
4572 ]
4569 + logopts
4573 + logopts
4570 + walkopts,
4574 + walkopts,
4571 _(b'[OPTION]... [FILE]'),
4575 _(b'[OPTION]... [FILE]'),
4572 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4576 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4573 helpbasic=True,
4577 helpbasic=True,
4574 inferrepo=True,
4578 inferrepo=True,
4575 intents={INTENT_READONLY},
4579 intents={INTENT_READONLY},
4576 )
4580 )
4577 def log(ui, repo, *pats, **opts):
4581 def log(ui, repo, *pats, **opts):
4578 """show revision history of entire repository or files
4582 """show revision history of entire repository or files
4579
4583
4580 Print the revision history of the specified files or the entire
4584 Print the revision history of the specified files or the entire
4581 project.
4585 project.
4582
4586
4583 If no revision range is specified, the default is ``tip:0`` unless
4587 If no revision range is specified, the default is ``tip:0`` unless
4584 --follow is set, in which case the working directory parent is
4588 --follow is set, in which case the working directory parent is
4585 used as the starting revision.
4589 used as the starting revision.
4586
4590
4587 File history is shown without following rename or copy history of
4591 File history is shown without following rename or copy history of
4588 files. Use -f/--follow with a filename to follow history across
4592 files. Use -f/--follow with a filename to follow history across
4589 renames and copies. --follow without a filename will only show
4593 renames and copies. --follow without a filename will only show
4590 ancestors of the starting revision.
4594 ancestors of the starting revision.
4591
4595
4592 By default this command prints revision number and changeset id,
4596 By default this command prints revision number and changeset id,
4593 tags, non-trivial parents, user, date and time, and a summary for
4597 tags, non-trivial parents, user, date and time, and a summary for
4594 each commit. When the -v/--verbose switch is used, the list of
4598 each commit. When the -v/--verbose switch is used, the list of
4595 changed files and full commit message are shown.
4599 changed files and full commit message are shown.
4596
4600
4597 With --graph the revisions are shown as an ASCII art DAG with the most
4601 With --graph the revisions are shown as an ASCII art DAG with the most
4598 recent changeset at the top.
4602 recent changeset at the top.
4599 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4603 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4600 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4604 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4601 changeset from the lines below is a parent of the 'o' merge on the same
4605 changeset from the lines below is a parent of the 'o' merge on the same
4602 line.
4606 line.
4603 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4607 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4604 of a '|' indicates one or more revisions in a path are omitted.
4608 of a '|' indicates one or more revisions in a path are omitted.
4605
4609
4606 .. container:: verbose
4610 .. container:: verbose
4607
4611
4608 Use -L/--line-range FILE,M:N options to follow the history of lines
4612 Use -L/--line-range FILE,M:N options to follow the history of lines
4609 from M to N in FILE. With -p/--patch only diff hunks affecting
4613 from M to N in FILE. With -p/--patch only diff hunks affecting
4610 specified line range will be shown. This option requires --follow;
4614 specified line range will be shown. This option requires --follow;
4611 it can be specified multiple times. Currently, this option is not
4615 it can be specified multiple times. Currently, this option is not
4612 compatible with --graph. This option is experimental.
4616 compatible with --graph. This option is experimental.
4613
4617
4614 .. note::
4618 .. note::
4615
4619
4616 :hg:`log --patch` may generate unexpected diff output for merge
4620 :hg:`log --patch` may generate unexpected diff output for merge
4617 changesets, as it will only compare the merge changeset against
4621 changesets, as it will only compare the merge changeset against
4618 its first parent. Also, only files different from BOTH parents
4622 its first parent. Also, only files different from BOTH parents
4619 will appear in files:.
4623 will appear in files:.
4620
4624
4621 .. note::
4625 .. note::
4622
4626
4623 For performance reasons, :hg:`log FILE` may omit duplicate changes
4627 For performance reasons, :hg:`log FILE` may omit duplicate changes
4624 made on branches and will not show removals or mode changes. To
4628 made on branches and will not show removals or mode changes. To
4625 see all such changes, use the --removed switch.
4629 see all such changes, use the --removed switch.
4626
4630
4627 .. container:: verbose
4631 .. container:: verbose
4628
4632
4629 .. note::
4633 .. note::
4630
4634
4631 The history resulting from -L/--line-range options depends on diff
4635 The history resulting from -L/--line-range options depends on diff
4632 options; for instance if white-spaces are ignored, respective changes
4636 options; for instance if white-spaces are ignored, respective changes
4633 with only white-spaces in specified line range will not be listed.
4637 with only white-spaces in specified line range will not be listed.
4634
4638
4635 .. container:: verbose
4639 .. container:: verbose
4636
4640
4637 Some examples:
4641 Some examples:
4638
4642
4639 - changesets with full descriptions and file lists::
4643 - changesets with full descriptions and file lists::
4640
4644
4641 hg log -v
4645 hg log -v
4642
4646
4643 - changesets ancestral to the working directory::
4647 - changesets ancestral to the working directory::
4644
4648
4645 hg log -f
4649 hg log -f
4646
4650
4647 - last 10 commits on the current branch::
4651 - last 10 commits on the current branch::
4648
4652
4649 hg log -l 10 -b .
4653 hg log -l 10 -b .
4650
4654
4651 - changesets showing all modifications of a file, including removals::
4655 - changesets showing all modifications of a file, including removals::
4652
4656
4653 hg log --removed file.c
4657 hg log --removed file.c
4654
4658
4655 - all changesets that touch a directory, with diffs, excluding merges::
4659 - all changesets that touch a directory, with diffs, excluding merges::
4656
4660
4657 hg log -Mp lib/
4661 hg log -Mp lib/
4658
4662
4659 - all revision numbers that match a keyword::
4663 - all revision numbers that match a keyword::
4660
4664
4661 hg log -k bug --template "{rev}\\n"
4665 hg log -k bug --template "{rev}\\n"
4662
4666
4663 - the full hash identifier of the working directory parent::
4667 - the full hash identifier of the working directory parent::
4664
4668
4665 hg log -r . --template "{node}\\n"
4669 hg log -r . --template "{node}\\n"
4666
4670
4667 - list available log templates::
4671 - list available log templates::
4668
4672
4669 hg log -T list
4673 hg log -T list
4670
4674
4671 - check if a given changeset is included in a tagged release::
4675 - check if a given changeset is included in a tagged release::
4672
4676
4673 hg log -r "a21ccf and ancestor(1.9)"
4677 hg log -r "a21ccf and ancestor(1.9)"
4674
4678
4675 - find all changesets by some user in a date range::
4679 - find all changesets by some user in a date range::
4676
4680
4677 hg log -k alice -d "may 2008 to jul 2008"
4681 hg log -k alice -d "may 2008 to jul 2008"
4678
4682
4679 - summary of all changesets after the last tag::
4683 - summary of all changesets after the last tag::
4680
4684
4681 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4685 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4682
4686
4683 - changesets touching lines 13 to 23 for file.c::
4687 - changesets touching lines 13 to 23 for file.c::
4684
4688
4685 hg log -L file.c,13:23
4689 hg log -L file.c,13:23
4686
4690
4687 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4691 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4688 main.c with patch::
4692 main.c with patch::
4689
4693
4690 hg log -L file.c,13:23 -L main.c,2:6 -p
4694 hg log -L file.c,13:23 -L main.c,2:6 -p
4691
4695
4692 See :hg:`help dates` for a list of formats valid for -d/--date.
4696 See :hg:`help dates` for a list of formats valid for -d/--date.
4693
4697
4694 See :hg:`help revisions` for more about specifying and ordering
4698 See :hg:`help revisions` for more about specifying and ordering
4695 revisions.
4699 revisions.
4696
4700
4697 See :hg:`help templates` for more about pre-packaged styles and
4701 See :hg:`help templates` for more about pre-packaged styles and
4698 specifying custom templates. The default template used by the log
4702 specifying custom templates. The default template used by the log
4699 command can be customized via the ``ui.logtemplate`` configuration
4703 command can be customized via the ``ui.logtemplate`` configuration
4700 setting.
4704 setting.
4701
4705
4702 Returns 0 on success.
4706 Returns 0 on success.
4703
4707
4704 """
4708 """
4705 opts = pycompat.byteskwargs(opts)
4709 opts = pycompat.byteskwargs(opts)
4706 linerange = opts.get(b'line_range')
4710 linerange = opts.get(b'line_range')
4707
4711
4708 if linerange and not opts.get(b'follow'):
4712 if linerange and not opts.get(b'follow'):
4709 raise error.Abort(_(b'--line-range requires --follow'))
4713 raise error.Abort(_(b'--line-range requires --follow'))
4710
4714
4711 if linerange and pats:
4715 if linerange and pats:
4712 # TODO: take pats as patterns with no line-range filter
4716 # TODO: take pats as patterns with no line-range filter
4713 raise error.Abort(
4717 raise error.Abort(
4714 _(b'FILE arguments are not compatible with --line-range option')
4718 _(b'FILE arguments are not compatible with --line-range option')
4715 )
4719 )
4716
4720
4717 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4721 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4718 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4722 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4719 if linerange:
4723 if linerange:
4720 # TODO: should follow file history from logcmdutil._initialrevs(),
4724 # TODO: should follow file history from logcmdutil._initialrevs(),
4721 # then filter the result by logcmdutil._makerevset() and --limit
4725 # then filter the result by logcmdutil._makerevset() and --limit
4722 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4726 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4723
4727
4724 getcopies = None
4728 getcopies = None
4725 if opts.get(b'copies'):
4729 if opts.get(b'copies'):
4726 endrev = None
4730 endrev = None
4727 if revs:
4731 if revs:
4728 endrev = revs.max() + 1
4732 endrev = revs.max() + 1
4729 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4733 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4730
4734
4731 ui.pager(b'log')
4735 ui.pager(b'log')
4732 displayer = logcmdutil.changesetdisplayer(
4736 displayer = logcmdutil.changesetdisplayer(
4733 ui, repo, opts, differ, buffered=True
4737 ui, repo, opts, differ, buffered=True
4734 )
4738 )
4735 if opts.get(b'graph'):
4739 if opts.get(b'graph'):
4736 displayfn = logcmdutil.displaygraphrevs
4740 displayfn = logcmdutil.displaygraphrevs
4737 else:
4741 else:
4738 displayfn = logcmdutil.displayrevs
4742 displayfn = logcmdutil.displayrevs
4739 displayfn(ui, repo, revs, displayer, getcopies)
4743 displayfn(ui, repo, revs, displayer, getcopies)
4740
4744
4741
4745
4742 @command(
4746 @command(
4743 b'manifest',
4747 b'manifest',
4744 [
4748 [
4745 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4749 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4746 (b'', b'all', False, _(b"list files from all revisions")),
4750 (b'', b'all', False, _(b"list files from all revisions")),
4747 ]
4751 ]
4748 + formatteropts,
4752 + formatteropts,
4749 _(b'[-r REV]'),
4753 _(b'[-r REV]'),
4750 helpcategory=command.CATEGORY_MAINTENANCE,
4754 helpcategory=command.CATEGORY_MAINTENANCE,
4751 intents={INTENT_READONLY},
4755 intents={INTENT_READONLY},
4752 )
4756 )
4753 def manifest(ui, repo, node=None, rev=None, **opts):
4757 def manifest(ui, repo, node=None, rev=None, **opts):
4754 """output the current or given revision of the project manifest
4758 """output the current or given revision of the project manifest
4755
4759
4756 Print a list of version controlled files for the given revision.
4760 Print a list of version controlled files for the given revision.
4757 If no revision is given, the first parent of the working directory
4761 If no revision is given, the first parent of the working directory
4758 is used, or the null revision if no revision is checked out.
4762 is used, or the null revision if no revision is checked out.
4759
4763
4760 With -v, print file permissions, symlink and executable bits.
4764 With -v, print file permissions, symlink and executable bits.
4761 With --debug, print file revision hashes.
4765 With --debug, print file revision hashes.
4762
4766
4763 If option --all is specified, the list of all files from all revisions
4767 If option --all is specified, the list of all files from all revisions
4764 is printed. This includes deleted and renamed files.
4768 is printed. This includes deleted and renamed files.
4765
4769
4766 Returns 0 on success.
4770 Returns 0 on success.
4767 """
4771 """
4768 opts = pycompat.byteskwargs(opts)
4772 opts = pycompat.byteskwargs(opts)
4769 fm = ui.formatter(b'manifest', opts)
4773 fm = ui.formatter(b'manifest', opts)
4770
4774
4771 if opts.get(b'all'):
4775 if opts.get(b'all'):
4772 if rev or node:
4776 if rev or node:
4773 raise error.Abort(_(b"can't specify a revision with --all"))
4777 raise error.Abort(_(b"can't specify a revision with --all"))
4774
4778
4775 res = set()
4779 res = set()
4776 for rev in repo:
4780 for rev in repo:
4777 ctx = repo[rev]
4781 ctx = repo[rev]
4778 res |= set(ctx.files())
4782 res |= set(ctx.files())
4779
4783
4780 ui.pager(b'manifest')
4784 ui.pager(b'manifest')
4781 for f in sorted(res):
4785 for f in sorted(res):
4782 fm.startitem()
4786 fm.startitem()
4783 fm.write(b"path", b'%s\n', f)
4787 fm.write(b"path", b'%s\n', f)
4784 fm.end()
4788 fm.end()
4785 return
4789 return
4786
4790
4787 if rev and node:
4791 if rev and node:
4788 raise error.Abort(_(b"please specify just one revision"))
4792 raise error.Abort(_(b"please specify just one revision"))
4789
4793
4790 if not node:
4794 if not node:
4791 node = rev
4795 node = rev
4792
4796
4793 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4797 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4794 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4798 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4795 if node:
4799 if node:
4796 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4800 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4797 ctx = scmutil.revsingle(repo, node)
4801 ctx = scmutil.revsingle(repo, node)
4798 mf = ctx.manifest()
4802 mf = ctx.manifest()
4799 ui.pager(b'manifest')
4803 ui.pager(b'manifest')
4800 for f in ctx:
4804 for f in ctx:
4801 fm.startitem()
4805 fm.startitem()
4802 fm.context(ctx=ctx)
4806 fm.context(ctx=ctx)
4803 fl = ctx[f].flags()
4807 fl = ctx[f].flags()
4804 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4808 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4805 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4809 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4806 fm.write(b'path', b'%s\n', f)
4810 fm.write(b'path', b'%s\n', f)
4807 fm.end()
4811 fm.end()
4808
4812
4809
4813
4810 @command(
4814 @command(
4811 b'merge',
4815 b'merge',
4812 [
4816 [
4813 (
4817 (
4814 b'f',
4818 b'f',
4815 b'force',
4819 b'force',
4816 None,
4820 None,
4817 _(b'force a merge including outstanding changes (DEPRECATED)'),
4821 _(b'force a merge including outstanding changes (DEPRECATED)'),
4818 ),
4822 ),
4819 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4823 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4820 (
4824 (
4821 b'P',
4825 b'P',
4822 b'preview',
4826 b'preview',
4823 None,
4827 None,
4824 _(b'review revisions to merge (no merge is performed)'),
4828 _(b'review revisions to merge (no merge is performed)'),
4825 ),
4829 ),
4826 (b'', b'abort', None, _(b'abort the ongoing merge')),
4830 (b'', b'abort', None, _(b'abort the ongoing merge')),
4827 ]
4831 ]
4828 + mergetoolopts,
4832 + mergetoolopts,
4829 _(b'[-P] [[-r] REV]'),
4833 _(b'[-P] [[-r] REV]'),
4830 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4834 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4831 helpbasic=True,
4835 helpbasic=True,
4832 )
4836 )
4833 def merge(ui, repo, node=None, **opts):
4837 def merge(ui, repo, node=None, **opts):
4834 """merge another revision into working directory
4838 """merge another revision into working directory
4835
4839
4836 The current working directory is updated with all changes made in
4840 The current working directory is updated with all changes made in
4837 the requested revision since the last common predecessor revision.
4841 the requested revision since the last common predecessor revision.
4838
4842
4839 Files that changed between either parent are marked as changed for
4843 Files that changed between either parent are marked as changed for
4840 the next commit and a commit must be performed before any further
4844 the next commit and a commit must be performed before any further
4841 updates to the repository are allowed. The next commit will have
4845 updates to the repository are allowed. The next commit will have
4842 two parents.
4846 two parents.
4843
4847
4844 ``--tool`` can be used to specify the merge tool used for file
4848 ``--tool`` can be used to specify the merge tool used for file
4845 merges. It overrides the HGMERGE environment variable and your
4849 merges. It overrides the HGMERGE environment variable and your
4846 configuration files. See :hg:`help merge-tools` for options.
4850 configuration files. See :hg:`help merge-tools` for options.
4847
4851
4848 If no revision is specified, the working directory's parent is a
4852 If no revision is specified, the working directory's parent is a
4849 head revision, and the current branch contains exactly one other
4853 head revision, and the current branch contains exactly one other
4850 head, the other head is merged with by default. Otherwise, an
4854 head, the other head is merged with by default. Otherwise, an
4851 explicit revision with which to merge must be provided.
4855 explicit revision with which to merge must be provided.
4852
4856
4853 See :hg:`help resolve` for information on handling file conflicts.
4857 See :hg:`help resolve` for information on handling file conflicts.
4854
4858
4855 To undo an uncommitted merge, use :hg:`merge --abort` which
4859 To undo an uncommitted merge, use :hg:`merge --abort` which
4856 will check out a clean copy of the original merge parent, losing
4860 will check out a clean copy of the original merge parent, losing
4857 all changes.
4861 all changes.
4858
4862
4859 Returns 0 on success, 1 if there are unresolved files.
4863 Returns 0 on success, 1 if there are unresolved files.
4860 """
4864 """
4861
4865
4862 opts = pycompat.byteskwargs(opts)
4866 opts = pycompat.byteskwargs(opts)
4863 abort = opts.get(b'abort')
4867 abort = opts.get(b'abort')
4864 if abort and repo.dirstate.p2() == nullid:
4868 if abort and repo.dirstate.p2() == nullid:
4865 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4869 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4866 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4870 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4867 if abort:
4871 if abort:
4868 state = cmdutil.getunfinishedstate(repo)
4872 state = cmdutil.getunfinishedstate(repo)
4869 if state and state._opname != b'merge':
4873 if state and state._opname != b'merge':
4870 raise error.Abort(
4874 raise error.Abort(
4871 _(b'cannot abort merge with %s in progress') % (state._opname),
4875 _(b'cannot abort merge with %s in progress') % (state._opname),
4872 hint=state.hint(),
4876 hint=state.hint(),
4873 )
4877 )
4874 if node:
4878 if node:
4875 raise error.Abort(_(b"cannot specify a node with --abort"))
4879 raise error.Abort(_(b"cannot specify a node with --abort"))
4876 return hg.abortmerge(repo.ui, repo)
4880 return hg.abortmerge(repo.ui, repo)
4877
4881
4878 if opts.get(b'rev') and node:
4882 if opts.get(b'rev') and node:
4879 raise error.Abort(_(b"please specify just one revision"))
4883 raise error.Abort(_(b"please specify just one revision"))
4880 if not node:
4884 if not node:
4881 node = opts.get(b'rev')
4885 node = opts.get(b'rev')
4882
4886
4883 if node:
4887 if node:
4884 ctx = scmutil.revsingle(repo, node)
4888 ctx = scmutil.revsingle(repo, node)
4885 else:
4889 else:
4886 if ui.configbool(b'commands', b'merge.require-rev'):
4890 if ui.configbool(b'commands', b'merge.require-rev'):
4887 raise error.Abort(
4891 raise error.Abort(
4888 _(
4892 _(
4889 b'configuration requires specifying revision to merge '
4893 b'configuration requires specifying revision to merge '
4890 b'with'
4894 b'with'
4891 )
4895 )
4892 )
4896 )
4893 ctx = repo[destutil.destmerge(repo)]
4897 ctx = repo[destutil.destmerge(repo)]
4894
4898
4895 if ctx.node() is None:
4899 if ctx.node() is None:
4896 raise error.Abort(_(b'merging with the working copy has no effect'))
4900 raise error.Abort(_(b'merging with the working copy has no effect'))
4897
4901
4898 if opts.get(b'preview'):
4902 if opts.get(b'preview'):
4899 # find nodes that are ancestors of p2 but not of p1
4903 # find nodes that are ancestors of p2 but not of p1
4900 p1 = repo[b'.'].node()
4904 p1 = repo[b'.'].node()
4901 p2 = ctx.node()
4905 p2 = ctx.node()
4902 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4906 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4903
4907
4904 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4908 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4905 for node in nodes:
4909 for node in nodes:
4906 displayer.show(repo[node])
4910 displayer.show(repo[node])
4907 displayer.close()
4911 displayer.close()
4908 return 0
4912 return 0
4909
4913
4910 # ui.forcemerge is an internal variable, do not document
4914 # ui.forcemerge is an internal variable, do not document
4911 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4915 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4912 with ui.configoverride(overrides, b'merge'):
4916 with ui.configoverride(overrides, b'merge'):
4913 force = opts.get(b'force')
4917 force = opts.get(b'force')
4914 labels = [b'working copy', b'merge rev']
4918 labels = [b'working copy', b'merge rev']
4915 return hg.merge(ctx, force=force, labels=labels)
4919 return hg.merge(ctx, force=force, labels=labels)
4916
4920
4917
4921
4918 statemod.addunfinished(
4922 statemod.addunfinished(
4919 b'merge',
4923 b'merge',
4920 fname=None,
4924 fname=None,
4921 clearable=True,
4925 clearable=True,
4922 allowcommit=True,
4926 allowcommit=True,
4923 cmdmsg=_(b'outstanding uncommitted merge'),
4927 cmdmsg=_(b'outstanding uncommitted merge'),
4924 abortfunc=hg.abortmerge,
4928 abortfunc=hg.abortmerge,
4925 statushint=_(
4929 statushint=_(
4926 b'To continue: hg commit\nTo abort: hg merge --abort'
4930 b'To continue: hg commit\nTo abort: hg merge --abort'
4927 ),
4931 ),
4928 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4932 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4929 )
4933 )
4930
4934
4931
4935
4932 @command(
4936 @command(
4933 b'outgoing|out',
4937 b'outgoing|out',
4934 [
4938 [
4935 (
4939 (
4936 b'f',
4940 b'f',
4937 b'force',
4941 b'force',
4938 None,
4942 None,
4939 _(b'run even when the destination is unrelated'),
4943 _(b'run even when the destination is unrelated'),
4940 ),
4944 ),
4941 (
4945 (
4942 b'r',
4946 b'r',
4943 b'rev',
4947 b'rev',
4944 [],
4948 [],
4945 _(b'a changeset intended to be included in the destination'),
4949 _(b'a changeset intended to be included in the destination'),
4946 _(b'REV'),
4950 _(b'REV'),
4947 ),
4951 ),
4948 (b'n', b'newest-first', None, _(b'show newest record first')),
4952 (b'n', b'newest-first', None, _(b'show newest record first')),
4949 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4953 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4950 (
4954 (
4951 b'b',
4955 b'b',
4952 b'branch',
4956 b'branch',
4953 [],
4957 [],
4954 _(b'a specific branch you would like to push'),
4958 _(b'a specific branch you would like to push'),
4955 _(b'BRANCH'),
4959 _(b'BRANCH'),
4956 ),
4960 ),
4957 ]
4961 ]
4958 + logopts
4962 + logopts
4959 + remoteopts
4963 + remoteopts
4960 + subrepoopts,
4964 + subrepoopts,
4961 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4965 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4962 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4966 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4963 )
4967 )
4964 def outgoing(ui, repo, dest=None, **opts):
4968 def outgoing(ui, repo, dest=None, **opts):
4965 """show changesets not found in the destination
4969 """show changesets not found in the destination
4966
4970
4967 Show changesets not found in the specified destination repository
4971 Show changesets not found in the specified destination repository
4968 or the default push location. These are the changesets that would
4972 or the default push location. These are the changesets that would
4969 be pushed if a push was requested.
4973 be pushed if a push was requested.
4970
4974
4971 See pull for details of valid destination formats.
4975 See pull for details of valid destination formats.
4972
4976
4973 .. container:: verbose
4977 .. container:: verbose
4974
4978
4975 With -B/--bookmarks, the result of bookmark comparison between
4979 With -B/--bookmarks, the result of bookmark comparison between
4976 local and remote repositories is displayed. With -v/--verbose,
4980 local and remote repositories is displayed. With -v/--verbose,
4977 status is also displayed for each bookmark like below::
4981 status is also displayed for each bookmark like below::
4978
4982
4979 BM1 01234567890a added
4983 BM1 01234567890a added
4980 BM2 deleted
4984 BM2 deleted
4981 BM3 234567890abc advanced
4985 BM3 234567890abc advanced
4982 BM4 34567890abcd diverged
4986 BM4 34567890abcd diverged
4983 BM5 4567890abcde changed
4987 BM5 4567890abcde changed
4984
4988
4985 The action taken when pushing depends on the
4989 The action taken when pushing depends on the
4986 status of each bookmark:
4990 status of each bookmark:
4987
4991
4988 :``added``: push with ``-B`` will create it
4992 :``added``: push with ``-B`` will create it
4989 :``deleted``: push with ``-B`` will delete it
4993 :``deleted``: push with ``-B`` will delete it
4990 :``advanced``: push will update it
4994 :``advanced``: push will update it
4991 :``diverged``: push with ``-B`` will update it
4995 :``diverged``: push with ``-B`` will update it
4992 :``changed``: push with ``-B`` will update it
4996 :``changed``: push with ``-B`` will update it
4993
4997
4994 From the point of view of pushing behavior, bookmarks
4998 From the point of view of pushing behavior, bookmarks
4995 existing only in the remote repository are treated as
4999 existing only in the remote repository are treated as
4996 ``deleted``, even if it is in fact added remotely.
5000 ``deleted``, even if it is in fact added remotely.
4997
5001
4998 Returns 0 if there are outgoing changes, 1 otherwise.
5002 Returns 0 if there are outgoing changes, 1 otherwise.
4999 """
5003 """
5000 # hg._outgoing() needs to re-resolve the path in order to handle #branch
5004 # hg._outgoing() needs to re-resolve the path in order to handle #branch
5001 # style URLs, so don't overwrite dest.
5005 # style URLs, so don't overwrite dest.
5002 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5006 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5003 if not path:
5007 if not path:
5004 raise error.Abort(
5008 raise error.Abort(
5005 _(b'default repository not configured!'),
5009 _(b'default repository not configured!'),
5006 hint=_(b"see 'hg help config.paths'"),
5010 hint=_(b"see 'hg help config.paths'"),
5007 )
5011 )
5008
5012
5009 opts = pycompat.byteskwargs(opts)
5013 opts = pycompat.byteskwargs(opts)
5010 if opts.get(b'graph'):
5014 if opts.get(b'graph'):
5011 logcmdutil.checkunsupportedgraphflags([], opts)
5015 logcmdutil.checkunsupportedgraphflags([], opts)
5012 o, other = hg._outgoing(ui, repo, dest, opts)
5016 o, other = hg._outgoing(ui, repo, dest, opts)
5013 if not o:
5017 if not o:
5014 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5018 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5015 return
5019 return
5016
5020
5017 revdag = logcmdutil.graphrevs(repo, o, opts)
5021 revdag = logcmdutil.graphrevs(repo, o, opts)
5018 ui.pager(b'outgoing')
5022 ui.pager(b'outgoing')
5019 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5023 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5020 logcmdutil.displaygraph(
5024 logcmdutil.displaygraph(
5021 ui, repo, revdag, displayer, graphmod.asciiedges
5025 ui, repo, revdag, displayer, graphmod.asciiedges
5022 )
5026 )
5023 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5027 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5024 return 0
5028 return 0
5025
5029
5026 if opts.get(b'bookmarks'):
5030 if opts.get(b'bookmarks'):
5027 dest = path.pushloc or path.loc
5031 dest = path.pushloc or path.loc
5028 other = hg.peer(repo, opts, dest)
5032 other = hg.peer(repo, opts, dest)
5029 if b'bookmarks' not in other.listkeys(b'namespaces'):
5033 if b'bookmarks' not in other.listkeys(b'namespaces'):
5030 ui.warn(_(b"remote doesn't support bookmarks\n"))
5034 ui.warn(_(b"remote doesn't support bookmarks\n"))
5031 return 0
5035 return 0
5032 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5036 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5033 ui.pager(b'outgoing')
5037 ui.pager(b'outgoing')
5034 return bookmarks.outgoing(ui, repo, other)
5038 return bookmarks.outgoing(ui, repo, other)
5035
5039
5036 repo._subtoppath = path.pushloc or path.loc
5040 repo._subtoppath = path.pushloc or path.loc
5037 try:
5041 try:
5038 return hg.outgoing(ui, repo, dest, opts)
5042 return hg.outgoing(ui, repo, dest, opts)
5039 finally:
5043 finally:
5040 del repo._subtoppath
5044 del repo._subtoppath
5041
5045
5042
5046
5043 @command(
5047 @command(
5044 b'parents',
5048 b'parents',
5045 [
5049 [
5046 (
5050 (
5047 b'r',
5051 b'r',
5048 b'rev',
5052 b'rev',
5049 b'',
5053 b'',
5050 _(b'show parents of the specified revision'),
5054 _(b'show parents of the specified revision'),
5051 _(b'REV'),
5055 _(b'REV'),
5052 ),
5056 ),
5053 ]
5057 ]
5054 + templateopts,
5058 + templateopts,
5055 _(b'[-r REV] [FILE]'),
5059 _(b'[-r REV] [FILE]'),
5056 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5060 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5057 inferrepo=True,
5061 inferrepo=True,
5058 )
5062 )
5059 def parents(ui, repo, file_=None, **opts):
5063 def parents(ui, repo, file_=None, **opts):
5060 """show the parents of the working directory or revision (DEPRECATED)
5064 """show the parents of the working directory or revision (DEPRECATED)
5061
5065
5062 Print the working directory's parent revisions. If a revision is
5066 Print the working directory's parent revisions. If a revision is
5063 given via -r/--rev, the parent of that revision will be printed.
5067 given via -r/--rev, the parent of that revision will be printed.
5064 If a file argument is given, the revision in which the file was
5068 If a file argument is given, the revision in which the file was
5065 last changed (before the working directory revision or the
5069 last changed (before the working directory revision or the
5066 argument to --rev if given) is printed.
5070 argument to --rev if given) is printed.
5067
5071
5068 This command is equivalent to::
5072 This command is equivalent to::
5069
5073
5070 hg log -r "p1()+p2()" or
5074 hg log -r "p1()+p2()" or
5071 hg log -r "p1(REV)+p2(REV)" or
5075 hg log -r "p1(REV)+p2(REV)" or
5072 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5076 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5073 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5077 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5074
5078
5075 See :hg:`summary` and :hg:`help revsets` for related information.
5079 See :hg:`summary` and :hg:`help revsets` for related information.
5076
5080
5077 Returns 0 on success.
5081 Returns 0 on success.
5078 """
5082 """
5079
5083
5080 opts = pycompat.byteskwargs(opts)
5084 opts = pycompat.byteskwargs(opts)
5081 rev = opts.get(b'rev')
5085 rev = opts.get(b'rev')
5082 if rev:
5086 if rev:
5083 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5087 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5084 ctx = scmutil.revsingle(repo, rev, None)
5088 ctx = scmutil.revsingle(repo, rev, None)
5085
5089
5086 if file_:
5090 if file_:
5087 m = scmutil.match(ctx, (file_,), opts)
5091 m = scmutil.match(ctx, (file_,), opts)
5088 if m.anypats() or len(m.files()) != 1:
5092 if m.anypats() or len(m.files()) != 1:
5089 raise error.Abort(_(b'can only specify an explicit filename'))
5093 raise error.Abort(_(b'can only specify an explicit filename'))
5090 file_ = m.files()[0]
5094 file_ = m.files()[0]
5091 filenodes = []
5095 filenodes = []
5092 for cp in ctx.parents():
5096 for cp in ctx.parents():
5093 if not cp:
5097 if not cp:
5094 continue
5098 continue
5095 try:
5099 try:
5096 filenodes.append(cp.filenode(file_))
5100 filenodes.append(cp.filenode(file_))
5097 except error.LookupError:
5101 except error.LookupError:
5098 pass
5102 pass
5099 if not filenodes:
5103 if not filenodes:
5100 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5104 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5101 p = []
5105 p = []
5102 for fn in filenodes:
5106 for fn in filenodes:
5103 fctx = repo.filectx(file_, fileid=fn)
5107 fctx = repo.filectx(file_, fileid=fn)
5104 p.append(fctx.node())
5108 p.append(fctx.node())
5105 else:
5109 else:
5106 p = [cp.node() for cp in ctx.parents()]
5110 p = [cp.node() for cp in ctx.parents()]
5107
5111
5108 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5112 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5109 for n in p:
5113 for n in p:
5110 if n != nullid:
5114 if n != nullid:
5111 displayer.show(repo[n])
5115 displayer.show(repo[n])
5112 displayer.close()
5116 displayer.close()
5113
5117
5114
5118
5115 @command(
5119 @command(
5116 b'paths',
5120 b'paths',
5117 formatteropts,
5121 formatteropts,
5118 _(b'[NAME]'),
5122 _(b'[NAME]'),
5119 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5123 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5120 optionalrepo=True,
5124 optionalrepo=True,
5121 intents={INTENT_READONLY},
5125 intents={INTENT_READONLY},
5122 )
5126 )
5123 def paths(ui, repo, search=None, **opts):
5127 def paths(ui, repo, search=None, **opts):
5124 """show aliases for remote repositories
5128 """show aliases for remote repositories
5125
5129
5126 Show definition of symbolic path name NAME. If no name is given,
5130 Show definition of symbolic path name NAME. If no name is given,
5127 show definition of all available names.
5131 show definition of all available names.
5128
5132
5129 Option -q/--quiet suppresses all output when searching for NAME
5133 Option -q/--quiet suppresses all output when searching for NAME
5130 and shows only the path names when listing all definitions.
5134 and shows only the path names when listing all definitions.
5131
5135
5132 Path names are defined in the [paths] section of your
5136 Path names are defined in the [paths] section of your
5133 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5137 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5134 repository, ``.hg/hgrc`` is used, too.
5138 repository, ``.hg/hgrc`` is used, too.
5135
5139
5136 The path names ``default`` and ``default-push`` have a special
5140 The path names ``default`` and ``default-push`` have a special
5137 meaning. When performing a push or pull operation, they are used
5141 meaning. When performing a push or pull operation, they are used
5138 as fallbacks if no location is specified on the command-line.
5142 as fallbacks if no location is specified on the command-line.
5139 When ``default-push`` is set, it will be used for push and
5143 When ``default-push`` is set, it will be used for push and
5140 ``default`` will be used for pull; otherwise ``default`` is used
5144 ``default`` will be used for pull; otherwise ``default`` is used
5141 as the fallback for both. When cloning a repository, the clone
5145 as the fallback for both. When cloning a repository, the clone
5142 source is written as ``default`` in ``.hg/hgrc``.
5146 source is written as ``default`` in ``.hg/hgrc``.
5143
5147
5144 .. note::
5148 .. note::
5145
5149
5146 ``default`` and ``default-push`` apply to all inbound (e.g.
5150 ``default`` and ``default-push`` apply to all inbound (e.g.
5147 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5151 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5148 and :hg:`bundle`) operations.
5152 and :hg:`bundle`) operations.
5149
5153
5150 See :hg:`help urls` for more information.
5154 See :hg:`help urls` for more information.
5151
5155
5152 .. container:: verbose
5156 .. container:: verbose
5153
5157
5154 Template:
5158 Template:
5155
5159
5156 The following keywords are supported. See also :hg:`help templates`.
5160 The following keywords are supported. See also :hg:`help templates`.
5157
5161
5158 :name: String. Symbolic name of the path alias.
5162 :name: String. Symbolic name of the path alias.
5159 :pushurl: String. URL for push operations.
5163 :pushurl: String. URL for push operations.
5160 :url: String. URL or directory path for the other operations.
5164 :url: String. URL or directory path for the other operations.
5161
5165
5162 Returns 0 on success.
5166 Returns 0 on success.
5163 """
5167 """
5164
5168
5165 opts = pycompat.byteskwargs(opts)
5169 opts = pycompat.byteskwargs(opts)
5166 ui.pager(b'paths')
5170 ui.pager(b'paths')
5167 if search:
5171 if search:
5168 pathitems = [
5172 pathitems = [
5169 (name, path)
5173 (name, path)
5170 for name, path in pycompat.iteritems(ui.paths)
5174 for name, path in pycompat.iteritems(ui.paths)
5171 if name == search
5175 if name == search
5172 ]
5176 ]
5173 else:
5177 else:
5174 pathitems = sorted(pycompat.iteritems(ui.paths))
5178 pathitems = sorted(pycompat.iteritems(ui.paths))
5175
5179
5176 fm = ui.formatter(b'paths', opts)
5180 fm = ui.formatter(b'paths', opts)
5177 if fm.isplain():
5181 if fm.isplain():
5178 hidepassword = util.hidepassword
5182 hidepassword = util.hidepassword
5179 else:
5183 else:
5180 hidepassword = bytes
5184 hidepassword = bytes
5181 if ui.quiet:
5185 if ui.quiet:
5182 namefmt = b'%s\n'
5186 namefmt = b'%s\n'
5183 else:
5187 else:
5184 namefmt = b'%s = '
5188 namefmt = b'%s = '
5185 showsubopts = not search and not ui.quiet
5189 showsubopts = not search and not ui.quiet
5186
5190
5187 for name, path in pathitems:
5191 for name, path in pathitems:
5188 fm.startitem()
5192 fm.startitem()
5189 fm.condwrite(not search, b'name', namefmt, name)
5193 fm.condwrite(not search, b'name', namefmt, name)
5190 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5194 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5191 for subopt, value in sorted(path.suboptions.items()):
5195 for subopt, value in sorted(path.suboptions.items()):
5192 assert subopt not in (b'name', b'url')
5196 assert subopt not in (b'name', b'url')
5193 if showsubopts:
5197 if showsubopts:
5194 fm.plain(b'%s:%s = ' % (name, subopt))
5198 fm.plain(b'%s:%s = ' % (name, subopt))
5195 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5199 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5196
5200
5197 fm.end()
5201 fm.end()
5198
5202
5199 if search and not pathitems:
5203 if search and not pathitems:
5200 if not ui.quiet:
5204 if not ui.quiet:
5201 ui.warn(_(b"not found!\n"))
5205 ui.warn(_(b"not found!\n"))
5202 return 1
5206 return 1
5203 else:
5207 else:
5204 return 0
5208 return 0
5205
5209
5206
5210
5207 @command(
5211 @command(
5208 b'phase',
5212 b'phase',
5209 [
5213 [
5210 (b'p', b'public', False, _(b'set changeset phase to public')),
5214 (b'p', b'public', False, _(b'set changeset phase to public')),
5211 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5215 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5212 (b's', b'secret', False, _(b'set changeset phase to secret')),
5216 (b's', b'secret', False, _(b'set changeset phase to secret')),
5213 (b'f', b'force', False, _(b'allow to move boundary backward')),
5217 (b'f', b'force', False, _(b'allow to move boundary backward')),
5214 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5218 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5215 ],
5219 ],
5216 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5220 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5217 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5221 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5218 )
5222 )
5219 def phase(ui, repo, *revs, **opts):
5223 def phase(ui, repo, *revs, **opts):
5220 """set or show the current phase name
5224 """set or show the current phase name
5221
5225
5222 With no argument, show the phase name of the current revision(s).
5226 With no argument, show the phase name of the current revision(s).
5223
5227
5224 With one of -p/--public, -d/--draft or -s/--secret, change the
5228 With one of -p/--public, -d/--draft or -s/--secret, change the
5225 phase value of the specified revisions.
5229 phase value of the specified revisions.
5226
5230
5227 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5231 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5228 lower phase to a higher phase. Phases are ordered as follows::
5232 lower phase to a higher phase. Phases are ordered as follows::
5229
5233
5230 public < draft < secret
5234 public < draft < secret
5231
5235
5232 Returns 0 on success, 1 if some phases could not be changed.
5236 Returns 0 on success, 1 if some phases could not be changed.
5233
5237
5234 (For more information about the phases concept, see :hg:`help phases`.)
5238 (For more information about the phases concept, see :hg:`help phases`.)
5235 """
5239 """
5236 opts = pycompat.byteskwargs(opts)
5240 opts = pycompat.byteskwargs(opts)
5237 # search for a unique phase argument
5241 # search for a unique phase argument
5238 targetphase = None
5242 targetphase = None
5239 for idx, name in enumerate(phases.cmdphasenames):
5243 for idx, name in enumerate(phases.cmdphasenames):
5240 if opts[name]:
5244 if opts[name]:
5241 if targetphase is not None:
5245 if targetphase is not None:
5242 raise error.Abort(_(b'only one phase can be specified'))
5246 raise error.Abort(_(b'only one phase can be specified'))
5243 targetphase = idx
5247 targetphase = idx
5244
5248
5245 # look for specified revision
5249 # look for specified revision
5246 revs = list(revs)
5250 revs = list(revs)
5247 revs.extend(opts[b'rev'])
5251 revs.extend(opts[b'rev'])
5248 if not revs:
5252 if not revs:
5249 # display both parents as the second parent phase can influence
5253 # display both parents as the second parent phase can influence
5250 # the phase of a merge commit
5254 # the phase of a merge commit
5251 revs = [c.rev() for c in repo[None].parents()]
5255 revs = [c.rev() for c in repo[None].parents()]
5252
5256
5253 revs = scmutil.revrange(repo, revs)
5257 revs = scmutil.revrange(repo, revs)
5254
5258
5255 ret = 0
5259 ret = 0
5256 if targetphase is None:
5260 if targetphase is None:
5257 # display
5261 # display
5258 for r in revs:
5262 for r in revs:
5259 ctx = repo[r]
5263 ctx = repo[r]
5260 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5264 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5261 else:
5265 else:
5262 with repo.lock(), repo.transaction(b"phase") as tr:
5266 with repo.lock(), repo.transaction(b"phase") as tr:
5263 # set phase
5267 # set phase
5264 if not revs:
5268 if not revs:
5265 raise error.Abort(_(b'empty revision set'))
5269 raise error.Abort(_(b'empty revision set'))
5266 nodes = [repo[r].node() for r in revs]
5270 nodes = [repo[r].node() for r in revs]
5267 # moving revision from public to draft may hide them
5271 # moving revision from public to draft may hide them
5268 # We have to check result on an unfiltered repository
5272 # We have to check result on an unfiltered repository
5269 unfi = repo.unfiltered()
5273 unfi = repo.unfiltered()
5270 getphase = unfi._phasecache.phase
5274 getphase = unfi._phasecache.phase
5271 olddata = [getphase(unfi, r) for r in unfi]
5275 olddata = [getphase(unfi, r) for r in unfi]
5272 phases.advanceboundary(repo, tr, targetphase, nodes)
5276 phases.advanceboundary(repo, tr, targetphase, nodes)
5273 if opts[b'force']:
5277 if opts[b'force']:
5274 phases.retractboundary(repo, tr, targetphase, nodes)
5278 phases.retractboundary(repo, tr, targetphase, nodes)
5275 getphase = unfi._phasecache.phase
5279 getphase = unfi._phasecache.phase
5276 newdata = [getphase(unfi, r) for r in unfi]
5280 newdata = [getphase(unfi, r) for r in unfi]
5277 changes = sum(newdata[r] != olddata[r] for r in unfi)
5281 changes = sum(newdata[r] != olddata[r] for r in unfi)
5278 cl = unfi.changelog
5282 cl = unfi.changelog
5279 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5283 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5280 if rejected:
5284 if rejected:
5281 ui.warn(
5285 ui.warn(
5282 _(
5286 _(
5283 b'cannot move %i changesets to a higher '
5287 b'cannot move %i changesets to a higher '
5284 b'phase, use --force\n'
5288 b'phase, use --force\n'
5285 )
5289 )
5286 % len(rejected)
5290 % len(rejected)
5287 )
5291 )
5288 ret = 1
5292 ret = 1
5289 if changes:
5293 if changes:
5290 msg = _(b'phase changed for %i changesets\n') % changes
5294 msg = _(b'phase changed for %i changesets\n') % changes
5291 if ret:
5295 if ret:
5292 ui.status(msg)
5296 ui.status(msg)
5293 else:
5297 else:
5294 ui.note(msg)
5298 ui.note(msg)
5295 else:
5299 else:
5296 ui.warn(_(b'no phases changed\n'))
5300 ui.warn(_(b'no phases changed\n'))
5297 return ret
5301 return ret
5298
5302
5299
5303
5300 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5304 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5301 """Run after a changegroup has been added via pull/unbundle
5305 """Run after a changegroup has been added via pull/unbundle
5302
5306
5303 This takes arguments below:
5307 This takes arguments below:
5304
5308
5305 :modheads: change of heads by pull/unbundle
5309 :modheads: change of heads by pull/unbundle
5306 :optupdate: updating working directory is needed or not
5310 :optupdate: updating working directory is needed or not
5307 :checkout: update destination revision (or None to default destination)
5311 :checkout: update destination revision (or None to default destination)
5308 :brev: a name, which might be a bookmark to be activated after updating
5312 :brev: a name, which might be a bookmark to be activated after updating
5309 """
5313 """
5310 if modheads == 0:
5314 if modheads == 0:
5311 return
5315 return
5312 if optupdate:
5316 if optupdate:
5313 try:
5317 try:
5314 return hg.updatetotally(ui, repo, checkout, brev)
5318 return hg.updatetotally(ui, repo, checkout, brev)
5315 except error.UpdateAbort as inst:
5319 except error.UpdateAbort as inst:
5316 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5320 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5317 hint = inst.hint
5321 hint = inst.hint
5318 raise error.UpdateAbort(msg, hint=hint)
5322 raise error.UpdateAbort(msg, hint=hint)
5319 if modheads is not None and modheads > 1:
5323 if modheads is not None and modheads > 1:
5320 currentbranchheads = len(repo.branchheads())
5324 currentbranchheads = len(repo.branchheads())
5321 if currentbranchheads == modheads:
5325 if currentbranchheads == modheads:
5322 ui.status(
5326 ui.status(
5323 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5327 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5324 )
5328 )
5325 elif currentbranchheads > 1:
5329 elif currentbranchheads > 1:
5326 ui.status(
5330 ui.status(
5327 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5331 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5328 )
5332 )
5329 else:
5333 else:
5330 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5334 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5331 elif not ui.configbool(b'commands', b'update.requiredest'):
5335 elif not ui.configbool(b'commands', b'update.requiredest'):
5332 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5336 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5333
5337
5334
5338
5335 @command(
5339 @command(
5336 b'pull',
5340 b'pull',
5337 [
5341 [
5338 (
5342 (
5339 b'u',
5343 b'u',
5340 b'update',
5344 b'update',
5341 None,
5345 None,
5342 _(b'update to new branch head if new descendants were pulled'),
5346 _(b'update to new branch head if new descendants were pulled'),
5343 ),
5347 ),
5344 (
5348 (
5345 b'f',
5349 b'f',
5346 b'force',
5350 b'force',
5347 None,
5351 None,
5348 _(b'run even when remote repository is unrelated'),
5352 _(b'run even when remote repository is unrelated'),
5349 ),
5353 ),
5350 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5354 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5351 (
5355 (
5352 b'r',
5356 b'r',
5353 b'rev',
5357 b'rev',
5354 [],
5358 [],
5355 _(b'a remote changeset intended to be added'),
5359 _(b'a remote changeset intended to be added'),
5356 _(b'REV'),
5360 _(b'REV'),
5357 ),
5361 ),
5358 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5362 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5359 (
5363 (
5360 b'b',
5364 b'b',
5361 b'branch',
5365 b'branch',
5362 [],
5366 [],
5363 _(b'a specific branch you would like to pull'),
5367 _(b'a specific branch you would like to pull'),
5364 _(b'BRANCH'),
5368 _(b'BRANCH'),
5365 ),
5369 ),
5366 ]
5370 ]
5367 + remoteopts,
5371 + remoteopts,
5368 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5372 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5369 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5373 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5370 helpbasic=True,
5374 helpbasic=True,
5371 )
5375 )
5372 def pull(ui, repo, source=b"default", **opts):
5376 def pull(ui, repo, source=b"default", **opts):
5373 """pull changes from the specified source
5377 """pull changes from the specified source
5374
5378
5375 Pull changes from a remote repository to a local one.
5379 Pull changes from a remote repository to a local one.
5376
5380
5377 This finds all changes from the repository at the specified path
5381 This finds all changes from the repository at the specified path
5378 or URL and adds them to a local repository (the current one unless
5382 or URL and adds them to a local repository (the current one unless
5379 -R is specified). By default, this does not update the copy of the
5383 -R is specified). By default, this does not update the copy of the
5380 project in the working directory.
5384 project in the working directory.
5381
5385
5382 When cloning from servers that support it, Mercurial may fetch
5386 When cloning from servers that support it, Mercurial may fetch
5383 pre-generated data. When this is done, hooks operating on incoming
5387 pre-generated data. When this is done, hooks operating on incoming
5384 changesets and changegroups may fire more than once, once for each
5388 changesets and changegroups may fire more than once, once for each
5385 pre-generated bundle and as well as for any additional remaining
5389 pre-generated bundle and as well as for any additional remaining
5386 data. See :hg:`help -e clonebundles` for more.
5390 data. See :hg:`help -e clonebundles` for more.
5387
5391
5388 Use :hg:`incoming` if you want to see what would have been added
5392 Use :hg:`incoming` if you want to see what would have been added
5389 by a pull at the time you issued this command. If you then decide
5393 by a pull at the time you issued this command. If you then decide
5390 to add those changes to the repository, you should use :hg:`pull
5394 to add those changes to the repository, you should use :hg:`pull
5391 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5395 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5392
5396
5393 If SOURCE is omitted, the 'default' path will be used.
5397 If SOURCE is omitted, the 'default' path will be used.
5394 See :hg:`help urls` for more information.
5398 See :hg:`help urls` for more information.
5395
5399
5396 Specifying bookmark as ``.`` is equivalent to specifying the active
5400 Specifying bookmark as ``.`` is equivalent to specifying the active
5397 bookmark's name.
5401 bookmark's name.
5398
5402
5399 Returns 0 on success, 1 if an update had unresolved files.
5403 Returns 0 on success, 1 if an update had unresolved files.
5400 """
5404 """
5401
5405
5402 opts = pycompat.byteskwargs(opts)
5406 opts = pycompat.byteskwargs(opts)
5403 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5407 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5404 b'update'
5408 b'update'
5405 ):
5409 ):
5406 msg = _(b'update destination required by configuration')
5410 msg = _(b'update destination required by configuration')
5407 hint = _(b'use hg pull followed by hg update DEST')
5411 hint = _(b'use hg pull followed by hg update DEST')
5408 raise error.Abort(msg, hint=hint)
5412 raise error.Abort(msg, hint=hint)
5409
5413
5410 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5414 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5411 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5415 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5412 other = hg.peer(repo, opts, source)
5416 other = hg.peer(repo, opts, source)
5413 try:
5417 try:
5414 revs, checkout = hg.addbranchrevs(
5418 revs, checkout = hg.addbranchrevs(
5415 repo, other, branches, opts.get(b'rev')
5419 repo, other, branches, opts.get(b'rev')
5416 )
5420 )
5417
5421
5418 pullopargs = {}
5422 pullopargs = {}
5419
5423
5420 nodes = None
5424 nodes = None
5421 if opts.get(b'bookmark') or revs:
5425 if opts.get(b'bookmark') or revs:
5422 # The list of bookmark used here is the same used to actually update
5426 # The list of bookmark used here is the same used to actually update
5423 # the bookmark names, to avoid the race from issue 4689 and we do
5427 # the bookmark names, to avoid the race from issue 4689 and we do
5424 # all lookup and bookmark queries in one go so they see the same
5428 # all lookup and bookmark queries in one go so they see the same
5425 # version of the server state (issue 4700).
5429 # version of the server state (issue 4700).
5426 nodes = []
5430 nodes = []
5427 fnodes = []
5431 fnodes = []
5428 revs = revs or []
5432 revs = revs or []
5429 if revs and not other.capable(b'lookup'):
5433 if revs and not other.capable(b'lookup'):
5430 err = _(
5434 err = _(
5431 b"other repository doesn't support revision lookup, "
5435 b"other repository doesn't support revision lookup, "
5432 b"so a rev cannot be specified."
5436 b"so a rev cannot be specified."
5433 )
5437 )
5434 raise error.Abort(err)
5438 raise error.Abort(err)
5435 with other.commandexecutor() as e:
5439 with other.commandexecutor() as e:
5436 fremotebookmarks = e.callcommand(
5440 fremotebookmarks = e.callcommand(
5437 b'listkeys', {b'namespace': b'bookmarks'}
5441 b'listkeys', {b'namespace': b'bookmarks'}
5438 )
5442 )
5439 for r in revs:
5443 for r in revs:
5440 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5444 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5441 remotebookmarks = fremotebookmarks.result()
5445 remotebookmarks = fremotebookmarks.result()
5442 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5446 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5443 pullopargs[b'remotebookmarks'] = remotebookmarks
5447 pullopargs[b'remotebookmarks'] = remotebookmarks
5444 for b in opts.get(b'bookmark', []):
5448 for b in opts.get(b'bookmark', []):
5445 b = repo._bookmarks.expandname(b)
5449 b = repo._bookmarks.expandname(b)
5446 if b not in remotebookmarks:
5450 if b not in remotebookmarks:
5447 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5451 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5448 nodes.append(remotebookmarks[b])
5452 nodes.append(remotebookmarks[b])
5449 for i, rev in enumerate(revs):
5453 for i, rev in enumerate(revs):
5450 node = fnodes[i].result()
5454 node = fnodes[i].result()
5451 nodes.append(node)
5455 nodes.append(node)
5452 if rev == checkout:
5456 if rev == checkout:
5453 checkout = node
5457 checkout = node
5454
5458
5455 wlock = util.nullcontextmanager()
5459 wlock = util.nullcontextmanager()
5456 if opts.get(b'update'):
5460 if opts.get(b'update'):
5457 wlock = repo.wlock()
5461 wlock = repo.wlock()
5458 with wlock:
5462 with wlock:
5459 pullopargs.update(opts.get(b'opargs', {}))
5463 pullopargs.update(opts.get(b'opargs', {}))
5460 modheads = exchange.pull(
5464 modheads = exchange.pull(
5461 repo,
5465 repo,
5462 other,
5466 other,
5463 heads=nodes,
5467 heads=nodes,
5464 force=opts.get(b'force'),
5468 force=opts.get(b'force'),
5465 bookmarks=opts.get(b'bookmark', ()),
5469 bookmarks=opts.get(b'bookmark', ()),
5466 opargs=pullopargs,
5470 opargs=pullopargs,
5467 confirm=opts.get(b'confirm'),
5471 confirm=opts.get(b'confirm'),
5468 ).cgresult
5472 ).cgresult
5469
5473
5470 # brev is a name, which might be a bookmark to be activated at
5474 # brev is a name, which might be a bookmark to be activated at
5471 # the end of the update. In other words, it is an explicit
5475 # the end of the update. In other words, it is an explicit
5472 # destination of the update
5476 # destination of the update
5473 brev = None
5477 brev = None
5474
5478
5475 if checkout:
5479 if checkout:
5476 checkout = repo.unfiltered().changelog.rev(checkout)
5480 checkout = repo.unfiltered().changelog.rev(checkout)
5477
5481
5478 # order below depends on implementation of
5482 # order below depends on implementation of
5479 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5483 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5480 # because 'checkout' is determined without it.
5484 # because 'checkout' is determined without it.
5481 if opts.get(b'rev'):
5485 if opts.get(b'rev'):
5482 brev = opts[b'rev'][0]
5486 brev = opts[b'rev'][0]
5483 elif opts.get(b'branch'):
5487 elif opts.get(b'branch'):
5484 brev = opts[b'branch'][0]
5488 brev = opts[b'branch'][0]
5485 else:
5489 else:
5486 brev = branches[0]
5490 brev = branches[0]
5487 repo._subtoppath = source
5491 repo._subtoppath = source
5488 try:
5492 try:
5489 ret = postincoming(
5493 ret = postincoming(
5490 ui, repo, modheads, opts.get(b'update'), checkout, brev
5494 ui, repo, modheads, opts.get(b'update'), checkout, brev
5491 )
5495 )
5492 except error.FilteredRepoLookupError as exc:
5496 except error.FilteredRepoLookupError as exc:
5493 msg = _(b'cannot update to target: %s') % exc.args[0]
5497 msg = _(b'cannot update to target: %s') % exc.args[0]
5494 exc.args = (msg,) + exc.args[1:]
5498 exc.args = (msg,) + exc.args[1:]
5495 raise
5499 raise
5496 finally:
5500 finally:
5497 del repo._subtoppath
5501 del repo._subtoppath
5498
5502
5499 finally:
5503 finally:
5500 other.close()
5504 other.close()
5501 return ret
5505 return ret
5502
5506
5503
5507
5504 @command(
5508 @command(
5505 b'push',
5509 b'push',
5506 [
5510 [
5507 (b'f', b'force', None, _(b'force push')),
5511 (b'f', b'force', None, _(b'force push')),
5508 (
5512 (
5509 b'r',
5513 b'r',
5510 b'rev',
5514 b'rev',
5511 [],
5515 [],
5512 _(b'a changeset intended to be included in the destination'),
5516 _(b'a changeset intended to be included in the destination'),
5513 _(b'REV'),
5517 _(b'REV'),
5514 ),
5518 ),
5515 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5519 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5516 (
5520 (
5517 b'b',
5521 b'b',
5518 b'branch',
5522 b'branch',
5519 [],
5523 [],
5520 _(b'a specific branch you would like to push'),
5524 _(b'a specific branch you would like to push'),
5521 _(b'BRANCH'),
5525 _(b'BRANCH'),
5522 ),
5526 ),
5523 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5527 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5524 (
5528 (
5525 b'',
5529 b'',
5526 b'pushvars',
5530 b'pushvars',
5527 [],
5531 [],
5528 _(b'variables that can be sent to server (ADVANCED)'),
5532 _(b'variables that can be sent to server (ADVANCED)'),
5529 ),
5533 ),
5530 (
5534 (
5531 b'',
5535 b'',
5532 b'publish',
5536 b'publish',
5533 False,
5537 False,
5534 _(b'push the changeset as public (EXPERIMENTAL)'),
5538 _(b'push the changeset as public (EXPERIMENTAL)'),
5535 ),
5539 ),
5536 ]
5540 ]
5537 + remoteopts,
5541 + remoteopts,
5538 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5542 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5539 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5543 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5540 helpbasic=True,
5544 helpbasic=True,
5541 )
5545 )
5542 def push(ui, repo, dest=None, **opts):
5546 def push(ui, repo, dest=None, **opts):
5543 """push changes to the specified destination
5547 """push changes to the specified destination
5544
5548
5545 Push changesets from the local repository to the specified
5549 Push changesets from the local repository to the specified
5546 destination.
5550 destination.
5547
5551
5548 This operation is symmetrical to pull: it is identical to a pull
5552 This operation is symmetrical to pull: it is identical to a pull
5549 in the destination repository from the current one.
5553 in the destination repository from the current one.
5550
5554
5551 By default, push will not allow creation of new heads at the
5555 By default, push will not allow creation of new heads at the
5552 destination, since multiple heads would make it unclear which head
5556 destination, since multiple heads would make it unclear which head
5553 to use. In this situation, it is recommended to pull and merge
5557 to use. In this situation, it is recommended to pull and merge
5554 before pushing.
5558 before pushing.
5555
5559
5556 Use --new-branch if you want to allow push to create a new named
5560 Use --new-branch if you want to allow push to create a new named
5557 branch that is not present at the destination. This allows you to
5561 branch that is not present at the destination. This allows you to
5558 only create a new branch without forcing other changes.
5562 only create a new branch without forcing other changes.
5559
5563
5560 .. note::
5564 .. note::
5561
5565
5562 Extra care should be taken with the -f/--force option,
5566 Extra care should be taken with the -f/--force option,
5563 which will push all new heads on all branches, an action which will
5567 which will push all new heads on all branches, an action which will
5564 almost always cause confusion for collaborators.
5568 almost always cause confusion for collaborators.
5565
5569
5566 If -r/--rev is used, the specified revision and all its ancestors
5570 If -r/--rev is used, the specified revision and all its ancestors
5567 will be pushed to the remote repository.
5571 will be pushed to the remote repository.
5568
5572
5569 If -B/--bookmark is used, the specified bookmarked revision, its
5573 If -B/--bookmark is used, the specified bookmarked revision, its
5570 ancestors, and the bookmark will be pushed to the remote
5574 ancestors, and the bookmark will be pushed to the remote
5571 repository. Specifying ``.`` is equivalent to specifying the active
5575 repository. Specifying ``.`` is equivalent to specifying the active
5572 bookmark's name.
5576 bookmark's name.
5573
5577
5574 Please see :hg:`help urls` for important details about ``ssh://``
5578 Please see :hg:`help urls` for important details about ``ssh://``
5575 URLs. If DESTINATION is omitted, a default path will be used.
5579 URLs. If DESTINATION is omitted, a default path will be used.
5576
5580
5577 .. container:: verbose
5581 .. container:: verbose
5578
5582
5579 The --pushvars option sends strings to the server that become
5583 The --pushvars option sends strings to the server that become
5580 environment variables prepended with ``HG_USERVAR_``. For example,
5584 environment variables prepended with ``HG_USERVAR_``. For example,
5581 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5585 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5582 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5586 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5583
5587
5584 pushvars can provide for user-overridable hooks as well as set debug
5588 pushvars can provide for user-overridable hooks as well as set debug
5585 levels. One example is having a hook that blocks commits containing
5589 levels. One example is having a hook that blocks commits containing
5586 conflict markers, but enables the user to override the hook if the file
5590 conflict markers, but enables the user to override the hook if the file
5587 is using conflict markers for testing purposes or the file format has
5591 is using conflict markers for testing purposes or the file format has
5588 strings that look like conflict markers.
5592 strings that look like conflict markers.
5589
5593
5590 By default, servers will ignore `--pushvars`. To enable it add the
5594 By default, servers will ignore `--pushvars`. To enable it add the
5591 following to your configuration file::
5595 following to your configuration file::
5592
5596
5593 [push]
5597 [push]
5594 pushvars.server = true
5598 pushvars.server = true
5595
5599
5596 Returns 0 if push was successful, 1 if nothing to push.
5600 Returns 0 if push was successful, 1 if nothing to push.
5597 """
5601 """
5598
5602
5599 opts = pycompat.byteskwargs(opts)
5603 opts = pycompat.byteskwargs(opts)
5600 if opts.get(b'bookmark'):
5604 if opts.get(b'bookmark'):
5601 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5605 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5602 for b in opts[b'bookmark']:
5606 for b in opts[b'bookmark']:
5603 # translate -B options to -r so changesets get pushed
5607 # translate -B options to -r so changesets get pushed
5604 b = repo._bookmarks.expandname(b)
5608 b = repo._bookmarks.expandname(b)
5605 if b in repo._bookmarks:
5609 if b in repo._bookmarks:
5606 opts.setdefault(b'rev', []).append(b)
5610 opts.setdefault(b'rev', []).append(b)
5607 else:
5611 else:
5608 # if we try to push a deleted bookmark, translate it to null
5612 # if we try to push a deleted bookmark, translate it to null
5609 # this lets simultaneous -r, -b options continue working
5613 # this lets simultaneous -r, -b options continue working
5610 opts.setdefault(b'rev', []).append(b"null")
5614 opts.setdefault(b'rev', []).append(b"null")
5611
5615
5612 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5616 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5613 if not path:
5617 if not path:
5614 raise error.Abort(
5618 raise error.Abort(
5615 _(b'default repository not configured!'),
5619 _(b'default repository not configured!'),
5616 hint=_(b"see 'hg help config.paths'"),
5620 hint=_(b"see 'hg help config.paths'"),
5617 )
5621 )
5618 dest = path.pushloc or path.loc
5622 dest = path.pushloc or path.loc
5619 branches = (path.branch, opts.get(b'branch') or [])
5623 branches = (path.branch, opts.get(b'branch') or [])
5620 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5624 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5621 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5625 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5622 other = hg.peer(repo, opts, dest)
5626 other = hg.peer(repo, opts, dest)
5623
5627
5624 if revs:
5628 if revs:
5625 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5629 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5626 if not revs:
5630 if not revs:
5627 raise error.Abort(
5631 raise error.Abort(
5628 _(b"specified revisions evaluate to an empty set"),
5632 _(b"specified revisions evaluate to an empty set"),
5629 hint=_(b"use different revision arguments"),
5633 hint=_(b"use different revision arguments"),
5630 )
5634 )
5631 elif path.pushrev:
5635 elif path.pushrev:
5632 # It doesn't make any sense to specify ancestor revisions. So limit
5636 # It doesn't make any sense to specify ancestor revisions. So limit
5633 # to DAG heads to make discovery simpler.
5637 # to DAG heads to make discovery simpler.
5634 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5638 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5635 revs = scmutil.revrange(repo, [expr])
5639 revs = scmutil.revrange(repo, [expr])
5636 revs = [repo[rev].node() for rev in revs]
5640 revs = [repo[rev].node() for rev in revs]
5637 if not revs:
5641 if not revs:
5638 raise error.Abort(
5642 raise error.Abort(
5639 _(b'default push revset for path evaluates to an empty set')
5643 _(b'default push revset for path evaluates to an empty set')
5640 )
5644 )
5641 elif ui.configbool(b'commands', b'push.require-revs'):
5645 elif ui.configbool(b'commands', b'push.require-revs'):
5642 raise error.Abort(
5646 raise error.Abort(
5643 _(b'no revisions specified to push'),
5647 _(b'no revisions specified to push'),
5644 hint=_(b'did you mean "hg push -r ."?'),
5648 hint=_(b'did you mean "hg push -r ."?'),
5645 )
5649 )
5646
5650
5647 repo._subtoppath = dest
5651 repo._subtoppath = dest
5648 try:
5652 try:
5649 # push subrepos depth-first for coherent ordering
5653 # push subrepos depth-first for coherent ordering
5650 c = repo[b'.']
5654 c = repo[b'.']
5651 subs = c.substate # only repos that are committed
5655 subs = c.substate # only repos that are committed
5652 for s in sorted(subs):
5656 for s in sorted(subs):
5653 result = c.sub(s).push(opts)
5657 result = c.sub(s).push(opts)
5654 if result == 0:
5658 if result == 0:
5655 return not result
5659 return not result
5656 finally:
5660 finally:
5657 del repo._subtoppath
5661 del repo._subtoppath
5658
5662
5659 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5663 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5660 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5664 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5661
5665
5662 pushop = exchange.push(
5666 pushop = exchange.push(
5663 repo,
5667 repo,
5664 other,
5668 other,
5665 opts.get(b'force'),
5669 opts.get(b'force'),
5666 revs=revs,
5670 revs=revs,
5667 newbranch=opts.get(b'new_branch'),
5671 newbranch=opts.get(b'new_branch'),
5668 bookmarks=opts.get(b'bookmark', ()),
5672 bookmarks=opts.get(b'bookmark', ()),
5669 publish=opts.get(b'publish'),
5673 publish=opts.get(b'publish'),
5670 opargs=opargs,
5674 opargs=opargs,
5671 )
5675 )
5672
5676
5673 result = not pushop.cgresult
5677 result = not pushop.cgresult
5674
5678
5675 if pushop.bkresult is not None:
5679 if pushop.bkresult is not None:
5676 if pushop.bkresult == 2:
5680 if pushop.bkresult == 2:
5677 result = 2
5681 result = 2
5678 elif not result and pushop.bkresult:
5682 elif not result and pushop.bkresult:
5679 result = 2
5683 result = 2
5680
5684
5681 return result
5685 return result
5682
5686
5683
5687
5684 @command(
5688 @command(
5685 b'recover',
5689 b'recover',
5686 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5690 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5687 helpcategory=command.CATEGORY_MAINTENANCE,
5691 helpcategory=command.CATEGORY_MAINTENANCE,
5688 )
5692 )
5689 def recover(ui, repo, **opts):
5693 def recover(ui, repo, **opts):
5690 """roll back an interrupted transaction
5694 """roll back an interrupted transaction
5691
5695
5692 Recover from an interrupted commit or pull.
5696 Recover from an interrupted commit or pull.
5693
5697
5694 This command tries to fix the repository status after an
5698 This command tries to fix the repository status after an
5695 interrupted operation. It should only be necessary when Mercurial
5699 interrupted operation. It should only be necessary when Mercurial
5696 suggests it.
5700 suggests it.
5697
5701
5698 Returns 0 if successful, 1 if nothing to recover or verify fails.
5702 Returns 0 if successful, 1 if nothing to recover or verify fails.
5699 """
5703 """
5700 ret = repo.recover()
5704 ret = repo.recover()
5701 if ret:
5705 if ret:
5702 if opts['verify']:
5706 if opts['verify']:
5703 return hg.verify(repo)
5707 return hg.verify(repo)
5704 else:
5708 else:
5705 msg = _(
5709 msg = _(
5706 b"(verify step skipped, run `hg verify` to check your "
5710 b"(verify step skipped, run `hg verify` to check your "
5707 b"repository content)\n"
5711 b"repository content)\n"
5708 )
5712 )
5709 ui.warn(msg)
5713 ui.warn(msg)
5710 return 0
5714 return 0
5711 return 1
5715 return 1
5712
5716
5713
5717
5714 @command(
5718 @command(
5715 b'remove|rm',
5719 b'remove|rm',
5716 [
5720 [
5717 (b'A', b'after', None, _(b'record delete for missing files')),
5721 (b'A', b'after', None, _(b'record delete for missing files')),
5718 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5722 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5719 ]
5723 ]
5720 + subrepoopts
5724 + subrepoopts
5721 + walkopts
5725 + walkopts
5722 + dryrunopts,
5726 + dryrunopts,
5723 _(b'[OPTION]... FILE...'),
5727 _(b'[OPTION]... FILE...'),
5724 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5728 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5725 helpbasic=True,
5729 helpbasic=True,
5726 inferrepo=True,
5730 inferrepo=True,
5727 )
5731 )
5728 def remove(ui, repo, *pats, **opts):
5732 def remove(ui, repo, *pats, **opts):
5729 """remove the specified files on the next commit
5733 """remove the specified files on the next commit
5730
5734
5731 Schedule the indicated files for removal from the current branch.
5735 Schedule the indicated files for removal from the current branch.
5732
5736
5733 This command schedules the files to be removed at the next commit.
5737 This command schedules the files to be removed at the next commit.
5734 To undo a remove before that, see :hg:`revert`. To undo added
5738 To undo a remove before that, see :hg:`revert`. To undo added
5735 files, see :hg:`forget`.
5739 files, see :hg:`forget`.
5736
5740
5737 .. container:: verbose
5741 .. container:: verbose
5738
5742
5739 -A/--after can be used to remove only files that have already
5743 -A/--after can be used to remove only files that have already
5740 been deleted, -f/--force can be used to force deletion, and -Af
5744 been deleted, -f/--force can be used to force deletion, and -Af
5741 can be used to remove files from the next revision without
5745 can be used to remove files from the next revision without
5742 deleting them from the working directory.
5746 deleting them from the working directory.
5743
5747
5744 The following table details the behavior of remove for different
5748 The following table details the behavior of remove for different
5745 file states (columns) and option combinations (rows). The file
5749 file states (columns) and option combinations (rows). The file
5746 states are Added [A], Clean [C], Modified [M] and Missing [!]
5750 states are Added [A], Clean [C], Modified [M] and Missing [!]
5747 (as reported by :hg:`status`). The actions are Warn, Remove
5751 (as reported by :hg:`status`). The actions are Warn, Remove
5748 (from branch) and Delete (from disk):
5752 (from branch) and Delete (from disk):
5749
5753
5750 ========= == == == ==
5754 ========= == == == ==
5751 opt/state A C M !
5755 opt/state A C M !
5752 ========= == == == ==
5756 ========= == == == ==
5753 none W RD W R
5757 none W RD W R
5754 -f R RD RD R
5758 -f R RD RD R
5755 -A W W W R
5759 -A W W W R
5756 -Af R R R R
5760 -Af R R R R
5757 ========= == == == ==
5761 ========= == == == ==
5758
5762
5759 .. note::
5763 .. note::
5760
5764
5761 :hg:`remove` never deletes files in Added [A] state from the
5765 :hg:`remove` never deletes files in Added [A] state from the
5762 working directory, not even if ``--force`` is specified.
5766 working directory, not even if ``--force`` is specified.
5763
5767
5764 Returns 0 on success, 1 if any warnings encountered.
5768 Returns 0 on success, 1 if any warnings encountered.
5765 """
5769 """
5766
5770
5767 opts = pycompat.byteskwargs(opts)
5771 opts = pycompat.byteskwargs(opts)
5768 after, force = opts.get(b'after'), opts.get(b'force')
5772 after, force = opts.get(b'after'), opts.get(b'force')
5769 dryrun = opts.get(b'dry_run')
5773 dryrun = opts.get(b'dry_run')
5770 if not pats and not after:
5774 if not pats and not after:
5771 raise error.Abort(_(b'no files specified'))
5775 raise error.Abort(_(b'no files specified'))
5772
5776
5773 m = scmutil.match(repo[None], pats, opts)
5777 m = scmutil.match(repo[None], pats, opts)
5774 subrepos = opts.get(b'subrepos')
5778 subrepos = opts.get(b'subrepos')
5775 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5779 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5776 return cmdutil.remove(
5780 return cmdutil.remove(
5777 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5781 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5778 )
5782 )
5779
5783
5780
5784
5781 @command(
5785 @command(
5782 b'rename|move|mv',
5786 b'rename|move|mv',
5783 [
5787 [
5784 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5788 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5785 (
5789 (
5786 b'f',
5790 b'f',
5787 b'force',
5791 b'force',
5788 None,
5792 None,
5789 _(b'forcibly move over an existing managed file'),
5793 _(b'forcibly move over an existing managed file'),
5790 ),
5794 ),
5791 ]
5795 ]
5792 + walkopts
5796 + walkopts
5793 + dryrunopts,
5797 + dryrunopts,
5794 _(b'[OPTION]... SOURCE... DEST'),
5798 _(b'[OPTION]... SOURCE... DEST'),
5795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5799 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5796 )
5800 )
5797 def rename(ui, repo, *pats, **opts):
5801 def rename(ui, repo, *pats, **opts):
5798 """rename files; equivalent of copy + remove
5802 """rename files; equivalent of copy + remove
5799
5803
5800 Mark dest as copies of sources; mark sources for deletion. If dest
5804 Mark dest as copies of sources; mark sources for deletion. If dest
5801 is a directory, copies are put in that directory. If dest is a
5805 is a directory, copies are put in that directory. If dest is a
5802 file, there can only be one source.
5806 file, there can only be one source.
5803
5807
5804 By default, this command copies the contents of files as they
5808 By default, this command copies the contents of files as they
5805 exist in the working directory. If invoked with -A/--after, the
5809 exist in the working directory. If invoked with -A/--after, the
5806 operation is recorded, but no copying is performed.
5810 operation is recorded, but no copying is performed.
5807
5811
5808 This command takes effect at the next commit. To undo a rename
5812 This command takes effect at the next commit. To undo a rename
5809 before that, see :hg:`revert`.
5813 before that, see :hg:`revert`.
5810
5814
5811 Returns 0 on success, 1 if errors are encountered.
5815 Returns 0 on success, 1 if errors are encountered.
5812 """
5816 """
5813 opts = pycompat.byteskwargs(opts)
5817 opts = pycompat.byteskwargs(opts)
5814 with repo.wlock():
5818 with repo.wlock():
5815 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5819 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5816
5820
5817
5821
5818 @command(
5822 @command(
5819 b'resolve',
5823 b'resolve',
5820 [
5824 [
5821 (b'a', b'all', None, _(b'select all unresolved files')),
5825 (b'a', b'all', None, _(b'select all unresolved files')),
5822 (b'l', b'list', None, _(b'list state of files needing merge')),
5826 (b'l', b'list', None, _(b'list state of files needing merge')),
5823 (b'm', b'mark', None, _(b'mark files as resolved')),
5827 (b'm', b'mark', None, _(b'mark files as resolved')),
5824 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5828 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5825 (b'n', b'no-status', None, _(b'hide status prefix')),
5829 (b'n', b'no-status', None, _(b'hide status prefix')),
5826 (b'', b're-merge', None, _(b're-merge files')),
5830 (b'', b're-merge', None, _(b're-merge files')),
5827 ]
5831 ]
5828 + mergetoolopts
5832 + mergetoolopts
5829 + walkopts
5833 + walkopts
5830 + formatteropts,
5834 + formatteropts,
5831 _(b'[OPTION]... [FILE]...'),
5835 _(b'[OPTION]... [FILE]...'),
5832 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5836 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5833 inferrepo=True,
5837 inferrepo=True,
5834 )
5838 )
5835 def resolve(ui, repo, *pats, **opts):
5839 def resolve(ui, repo, *pats, **opts):
5836 """redo merges or set/view the merge status of files
5840 """redo merges or set/view the merge status of files
5837
5841
5838 Merges with unresolved conflicts are often the result of
5842 Merges with unresolved conflicts are often the result of
5839 non-interactive merging using the ``internal:merge`` configuration
5843 non-interactive merging using the ``internal:merge`` configuration
5840 setting, or a command-line merge tool like ``diff3``. The resolve
5844 setting, or a command-line merge tool like ``diff3``. The resolve
5841 command is used to manage the files involved in a merge, after
5845 command is used to manage the files involved in a merge, after
5842 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5846 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5843 working directory must have two parents). See :hg:`help
5847 working directory must have two parents). See :hg:`help
5844 merge-tools` for information on configuring merge tools.
5848 merge-tools` for information on configuring merge tools.
5845
5849
5846 The resolve command can be used in the following ways:
5850 The resolve command can be used in the following ways:
5847
5851
5848 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5852 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5849 the specified files, discarding any previous merge attempts. Re-merging
5853 the specified files, discarding any previous merge attempts. Re-merging
5850 is not performed for files already marked as resolved. Use ``--all/-a``
5854 is not performed for files already marked as resolved. Use ``--all/-a``
5851 to select all unresolved files. ``--tool`` can be used to specify
5855 to select all unresolved files. ``--tool`` can be used to specify
5852 the merge tool used for the given files. It overrides the HGMERGE
5856 the merge tool used for the given files. It overrides the HGMERGE
5853 environment variable and your configuration files. Previous file
5857 environment variable and your configuration files. Previous file
5854 contents are saved with a ``.orig`` suffix.
5858 contents are saved with a ``.orig`` suffix.
5855
5859
5856 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5860 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5857 (e.g. after having manually fixed-up the files). The default is
5861 (e.g. after having manually fixed-up the files). The default is
5858 to mark all unresolved files.
5862 to mark all unresolved files.
5859
5863
5860 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5864 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5861 default is to mark all resolved files.
5865 default is to mark all resolved files.
5862
5866
5863 - :hg:`resolve -l`: list files which had or still have conflicts.
5867 - :hg:`resolve -l`: list files which had or still have conflicts.
5864 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5868 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5865 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5869 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5866 the list. See :hg:`help filesets` for details.
5870 the list. See :hg:`help filesets` for details.
5867
5871
5868 .. note::
5872 .. note::
5869
5873
5870 Mercurial will not let you commit files with unresolved merge
5874 Mercurial will not let you commit files with unresolved merge
5871 conflicts. You must use :hg:`resolve -m ...` before you can
5875 conflicts. You must use :hg:`resolve -m ...` before you can
5872 commit after a conflicting merge.
5876 commit after a conflicting merge.
5873
5877
5874 .. container:: verbose
5878 .. container:: verbose
5875
5879
5876 Template:
5880 Template:
5877
5881
5878 The following keywords are supported in addition to the common template
5882 The following keywords are supported in addition to the common template
5879 keywords and functions. See also :hg:`help templates`.
5883 keywords and functions. See also :hg:`help templates`.
5880
5884
5881 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5885 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5882 :path: String. Repository-absolute path of the file.
5886 :path: String. Repository-absolute path of the file.
5883
5887
5884 Returns 0 on success, 1 if any files fail a resolve attempt.
5888 Returns 0 on success, 1 if any files fail a resolve attempt.
5885 """
5889 """
5886
5890
5887 opts = pycompat.byteskwargs(opts)
5891 opts = pycompat.byteskwargs(opts)
5888 confirm = ui.configbool(b'commands', b'resolve.confirm')
5892 confirm = ui.configbool(b'commands', b'resolve.confirm')
5889 flaglist = b'all mark unmark list no_status re_merge'.split()
5893 flaglist = b'all mark unmark list no_status re_merge'.split()
5890 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5894 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5891
5895
5892 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5896 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5893 if actioncount > 1:
5897 if actioncount > 1:
5894 raise error.Abort(_(b"too many actions specified"))
5898 raise error.Abort(_(b"too many actions specified"))
5895 elif actioncount == 0 and ui.configbool(
5899 elif actioncount == 0 and ui.configbool(
5896 b'commands', b'resolve.explicit-re-merge'
5900 b'commands', b'resolve.explicit-re-merge'
5897 ):
5901 ):
5898 hint = _(b'use --mark, --unmark, --list or --re-merge')
5902 hint = _(b'use --mark, --unmark, --list or --re-merge')
5899 raise error.Abort(_(b'no action specified'), hint=hint)
5903 raise error.Abort(_(b'no action specified'), hint=hint)
5900 if pats and all:
5904 if pats and all:
5901 raise error.Abort(_(b"can't specify --all and patterns"))
5905 raise error.Abort(_(b"can't specify --all and patterns"))
5902 if not (all or pats or show or mark or unmark):
5906 if not (all or pats or show or mark or unmark):
5903 raise error.Abort(
5907 raise error.Abort(
5904 _(b'no files or directories specified'),
5908 _(b'no files or directories specified'),
5905 hint=b'use --all to re-merge all unresolved files',
5909 hint=b'use --all to re-merge all unresolved files',
5906 )
5910 )
5907
5911
5908 if confirm:
5912 if confirm:
5909 if all:
5913 if all:
5910 if ui.promptchoice(
5914 if ui.promptchoice(
5911 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5915 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5912 ):
5916 ):
5913 raise error.Abort(_(b'user quit'))
5917 raise error.Abort(_(b'user quit'))
5914 if mark and not pats:
5918 if mark and not pats:
5915 if ui.promptchoice(
5919 if ui.promptchoice(
5916 _(
5920 _(
5917 b'mark all unresolved files as resolved (yn)?'
5921 b'mark all unresolved files as resolved (yn)?'
5918 b'$$ &Yes $$ &No'
5922 b'$$ &Yes $$ &No'
5919 )
5923 )
5920 ):
5924 ):
5921 raise error.Abort(_(b'user quit'))
5925 raise error.Abort(_(b'user quit'))
5922 if unmark and not pats:
5926 if unmark and not pats:
5923 if ui.promptchoice(
5927 if ui.promptchoice(
5924 _(
5928 _(
5925 b'mark all resolved files as unresolved (yn)?'
5929 b'mark all resolved files as unresolved (yn)?'
5926 b'$$ &Yes $$ &No'
5930 b'$$ &Yes $$ &No'
5927 )
5931 )
5928 ):
5932 ):
5929 raise error.Abort(_(b'user quit'))
5933 raise error.Abort(_(b'user quit'))
5930
5934
5931 uipathfn = scmutil.getuipathfn(repo)
5935 uipathfn = scmutil.getuipathfn(repo)
5932
5936
5933 if show:
5937 if show:
5934 ui.pager(b'resolve')
5938 ui.pager(b'resolve')
5935 fm = ui.formatter(b'resolve', opts)
5939 fm = ui.formatter(b'resolve', opts)
5936 ms = mergemod.mergestate.read(repo)
5940 ms = mergemod.mergestate.read(repo)
5937 wctx = repo[None]
5941 wctx = repo[None]
5938 m = scmutil.match(wctx, pats, opts)
5942 m = scmutil.match(wctx, pats, opts)
5939
5943
5940 # Labels and keys based on merge state. Unresolved path conflicts show
5944 # Labels and keys based on merge state. Unresolved path conflicts show
5941 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5945 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5942 # resolved conflicts.
5946 # resolved conflicts.
5943 mergestateinfo = {
5947 mergestateinfo = {
5944 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5948 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5945 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5949 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5946 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5950 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5947 b'resolve.unresolved',
5951 b'resolve.unresolved',
5948 b'P',
5952 b'P',
5949 ),
5953 ),
5950 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5954 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5951 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5955 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5952 b'resolve.driverresolved',
5956 b'resolve.driverresolved',
5953 b'D',
5957 b'D',
5954 ),
5958 ),
5955 }
5959 }
5956
5960
5957 for f in ms:
5961 for f in ms:
5958 if not m(f):
5962 if not m(f):
5959 continue
5963 continue
5960
5964
5961 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
5965 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
5962 continue
5966 continue
5963 label, key = mergestateinfo[ms[f]]
5967 label, key = mergestateinfo[ms[f]]
5964 fm.startitem()
5968 fm.startitem()
5965 fm.context(ctx=wctx)
5969 fm.context(ctx=wctx)
5966 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5970 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5967 fm.data(path=f)
5971 fm.data(path=f)
5968 fm.plain(b'%s\n' % uipathfn(f), label=label)
5972 fm.plain(b'%s\n' % uipathfn(f), label=label)
5969 fm.end()
5973 fm.end()
5970 return 0
5974 return 0
5971
5975
5972 with repo.wlock():
5976 with repo.wlock():
5973 ms = mergemod.mergestate.read(repo)
5977 ms = mergemod.mergestate.read(repo)
5974
5978
5975 if not (ms.active() or repo.dirstate.p2() != nullid):
5979 if not (ms.active() or repo.dirstate.p2() != nullid):
5976 raise error.Abort(
5980 raise error.Abort(
5977 _(b'resolve command not applicable when not merging')
5981 _(b'resolve command not applicable when not merging')
5978 )
5982 )
5979
5983
5980 wctx = repo[None]
5984 wctx = repo[None]
5981
5985
5982 if (
5986 if (
5983 ms.mergedriver
5987 ms.mergedriver
5984 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5988 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5985 ):
5989 ):
5986 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5990 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5987 ms.commit()
5991 ms.commit()
5988 # allow mark and unmark to go through
5992 # allow mark and unmark to go through
5989 if not mark and not unmark and not proceed:
5993 if not mark and not unmark and not proceed:
5990 return 1
5994 return 1
5991
5995
5992 m = scmutil.match(wctx, pats, opts)
5996 m = scmutil.match(wctx, pats, opts)
5993 ret = 0
5997 ret = 0
5994 didwork = False
5998 didwork = False
5995 runconclude = False
5999 runconclude = False
5996
6000
5997 tocomplete = []
6001 tocomplete = []
5998 hasconflictmarkers = []
6002 hasconflictmarkers = []
5999 if mark:
6003 if mark:
6000 markcheck = ui.config(b'commands', b'resolve.mark-check')
6004 markcheck = ui.config(b'commands', b'resolve.mark-check')
6001 if markcheck not in [b'warn', b'abort']:
6005 if markcheck not in [b'warn', b'abort']:
6002 # Treat all invalid / unrecognized values as 'none'.
6006 # Treat all invalid / unrecognized values as 'none'.
6003 markcheck = False
6007 markcheck = False
6004 for f in ms:
6008 for f in ms:
6005 if not m(f):
6009 if not m(f):
6006 continue
6010 continue
6007
6011
6008 didwork = True
6012 didwork = True
6009
6013
6010 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
6014 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
6011 continue
6015 continue
6012
6016
6013 # don't let driver-resolved files be marked, and run the conclude
6017 # don't let driver-resolved files be marked, and run the conclude
6014 # step if asked to resolve
6018 # step if asked to resolve
6015 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6019 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6016 exact = m.exact(f)
6020 exact = m.exact(f)
6017 if mark:
6021 if mark:
6018 if exact:
6022 if exact:
6019 ui.warn(
6023 ui.warn(
6020 _(b'not marking %s as it is driver-resolved\n')
6024 _(b'not marking %s as it is driver-resolved\n')
6021 % uipathfn(f)
6025 % uipathfn(f)
6022 )
6026 )
6023 elif unmark:
6027 elif unmark:
6024 if exact:
6028 if exact:
6025 ui.warn(
6029 ui.warn(
6026 _(b'not unmarking %s as it is driver-resolved\n')
6030 _(b'not unmarking %s as it is driver-resolved\n')
6027 % uipathfn(f)
6031 % uipathfn(f)
6028 )
6032 )
6029 else:
6033 else:
6030 runconclude = True
6034 runconclude = True
6031 continue
6035 continue
6032
6036
6033 # path conflicts must be resolved manually
6037 # path conflicts must be resolved manually
6034 if ms[f] in (
6038 if ms[f] in (
6035 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6039 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6036 mergemod.MERGE_RECORD_RESOLVED_PATH,
6040 mergemod.MERGE_RECORD_RESOLVED_PATH,
6037 ):
6041 ):
6038 if mark:
6042 if mark:
6039 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6043 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6040 elif unmark:
6044 elif unmark:
6041 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6045 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6042 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6046 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6043 ui.warn(
6047 ui.warn(
6044 _(b'%s: path conflict must be resolved manually\n')
6048 _(b'%s: path conflict must be resolved manually\n')
6045 % uipathfn(f)
6049 % uipathfn(f)
6046 )
6050 )
6047 continue
6051 continue
6048
6052
6049 if mark:
6053 if mark:
6050 if markcheck:
6054 if markcheck:
6051 fdata = repo.wvfs.tryread(f)
6055 fdata = repo.wvfs.tryread(f)
6052 if (
6056 if (
6053 filemerge.hasconflictmarkers(fdata)
6057 filemerge.hasconflictmarkers(fdata)
6054 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6058 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6055 ):
6059 ):
6056 hasconflictmarkers.append(f)
6060 hasconflictmarkers.append(f)
6057 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6061 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6058 elif unmark:
6062 elif unmark:
6059 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6063 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6060 else:
6064 else:
6061 # backup pre-resolve (merge uses .orig for its own purposes)
6065 # backup pre-resolve (merge uses .orig for its own purposes)
6062 a = repo.wjoin(f)
6066 a = repo.wjoin(f)
6063 try:
6067 try:
6064 util.copyfile(a, a + b".resolve")
6068 util.copyfile(a, a + b".resolve")
6065 except (IOError, OSError) as inst:
6069 except (IOError, OSError) as inst:
6066 if inst.errno != errno.ENOENT:
6070 if inst.errno != errno.ENOENT:
6067 raise
6071 raise
6068
6072
6069 try:
6073 try:
6070 # preresolve file
6074 # preresolve file
6071 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6075 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6072 with ui.configoverride(overrides, b'resolve'):
6076 with ui.configoverride(overrides, b'resolve'):
6073 complete, r = ms.preresolve(f, wctx)
6077 complete, r = ms.preresolve(f, wctx)
6074 if not complete:
6078 if not complete:
6075 tocomplete.append(f)
6079 tocomplete.append(f)
6076 elif r:
6080 elif r:
6077 ret = 1
6081 ret = 1
6078 finally:
6082 finally:
6079 ms.commit()
6083 ms.commit()
6080
6084
6081 # replace filemerge's .orig file with our resolve file, but only
6085 # replace filemerge's .orig file with our resolve file, but only
6082 # for merges that are complete
6086 # for merges that are complete
6083 if complete:
6087 if complete:
6084 try:
6088 try:
6085 util.rename(
6089 util.rename(
6086 a + b".resolve", scmutil.backuppath(ui, repo, f)
6090 a + b".resolve", scmutil.backuppath(ui, repo, f)
6087 )
6091 )
6088 except OSError as inst:
6092 except OSError as inst:
6089 if inst.errno != errno.ENOENT:
6093 if inst.errno != errno.ENOENT:
6090 raise
6094 raise
6091
6095
6092 if hasconflictmarkers:
6096 if hasconflictmarkers:
6093 ui.warn(
6097 ui.warn(
6094 _(
6098 _(
6095 b'warning: the following files still have conflict '
6099 b'warning: the following files still have conflict '
6096 b'markers:\n'
6100 b'markers:\n'
6097 )
6101 )
6098 + b''.join(
6102 + b''.join(
6099 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6103 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6100 )
6104 )
6101 )
6105 )
6102 if markcheck == b'abort' and not all and not pats:
6106 if markcheck == b'abort' and not all and not pats:
6103 raise error.Abort(
6107 raise error.Abort(
6104 _(b'conflict markers detected'),
6108 _(b'conflict markers detected'),
6105 hint=_(b'use --all to mark anyway'),
6109 hint=_(b'use --all to mark anyway'),
6106 )
6110 )
6107
6111
6108 for f in tocomplete:
6112 for f in tocomplete:
6109 try:
6113 try:
6110 # resolve file
6114 # resolve file
6111 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6115 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6112 with ui.configoverride(overrides, b'resolve'):
6116 with ui.configoverride(overrides, b'resolve'):
6113 r = ms.resolve(f, wctx)
6117 r = ms.resolve(f, wctx)
6114 if r:
6118 if r:
6115 ret = 1
6119 ret = 1
6116 finally:
6120 finally:
6117 ms.commit()
6121 ms.commit()
6118
6122
6119 # replace filemerge's .orig file with our resolve file
6123 # replace filemerge's .orig file with our resolve file
6120 a = repo.wjoin(f)
6124 a = repo.wjoin(f)
6121 try:
6125 try:
6122 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6126 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6123 except OSError as inst:
6127 except OSError as inst:
6124 if inst.errno != errno.ENOENT:
6128 if inst.errno != errno.ENOENT:
6125 raise
6129 raise
6126
6130
6127 ms.commit()
6131 ms.commit()
6128 ms.recordactions()
6132 ms.recordactions()
6129
6133
6130 if not didwork and pats:
6134 if not didwork and pats:
6131 hint = None
6135 hint = None
6132 if not any([p for p in pats if p.find(b':') >= 0]):
6136 if not any([p for p in pats if p.find(b':') >= 0]):
6133 pats = [b'path:%s' % p for p in pats]
6137 pats = [b'path:%s' % p for p in pats]
6134 m = scmutil.match(wctx, pats, opts)
6138 m = scmutil.match(wctx, pats, opts)
6135 for f in ms:
6139 for f in ms:
6136 if not m(f):
6140 if not m(f):
6137 continue
6141 continue
6138
6142
6139 def flag(o):
6143 def flag(o):
6140 if o == b're_merge':
6144 if o == b're_merge':
6141 return b'--re-merge '
6145 return b'--re-merge '
6142 return b'-%s ' % o[0:1]
6146 return b'-%s ' % o[0:1]
6143
6147
6144 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6148 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6145 hint = _(b"(try: hg resolve %s%s)\n") % (
6149 hint = _(b"(try: hg resolve %s%s)\n") % (
6146 flags,
6150 flags,
6147 b' '.join(pats),
6151 b' '.join(pats),
6148 )
6152 )
6149 break
6153 break
6150 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6154 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6151 if hint:
6155 if hint:
6152 ui.warn(hint)
6156 ui.warn(hint)
6153 elif ms.mergedriver and ms.mdstate() != b's':
6157 elif ms.mergedriver and ms.mdstate() != b's':
6154 # run conclude step when either a driver-resolved file is requested
6158 # run conclude step when either a driver-resolved file is requested
6155 # or there are no driver-resolved files
6159 # or there are no driver-resolved files
6156 # we can't use 'ret' to determine whether any files are unresolved
6160 # we can't use 'ret' to determine whether any files are unresolved
6157 # because we might not have tried to resolve some
6161 # because we might not have tried to resolve some
6158 if (runconclude or not list(ms.driverresolved())) and not list(
6162 if (runconclude or not list(ms.driverresolved())) and not list(
6159 ms.unresolved()
6163 ms.unresolved()
6160 ):
6164 ):
6161 proceed = mergemod.driverconclude(repo, ms, wctx)
6165 proceed = mergemod.driverconclude(repo, ms, wctx)
6162 ms.commit()
6166 ms.commit()
6163 if not proceed:
6167 if not proceed:
6164 return 1
6168 return 1
6165
6169
6166 # Nudge users into finishing an unfinished operation
6170 # Nudge users into finishing an unfinished operation
6167 unresolvedf = list(ms.unresolved())
6171 unresolvedf = list(ms.unresolved())
6168 driverresolvedf = list(ms.driverresolved())
6172 driverresolvedf = list(ms.driverresolved())
6169 if not unresolvedf and not driverresolvedf:
6173 if not unresolvedf and not driverresolvedf:
6170 ui.status(_(b'(no more unresolved files)\n'))
6174 ui.status(_(b'(no more unresolved files)\n'))
6171 cmdutil.checkafterresolved(repo)
6175 cmdutil.checkafterresolved(repo)
6172 elif not unresolvedf:
6176 elif not unresolvedf:
6173 ui.status(
6177 ui.status(
6174 _(
6178 _(
6175 b'(no more unresolved files -- '
6179 b'(no more unresolved files -- '
6176 b'run "hg resolve --all" to conclude)\n'
6180 b'run "hg resolve --all" to conclude)\n'
6177 )
6181 )
6178 )
6182 )
6179
6183
6180 return ret
6184 return ret
6181
6185
6182
6186
6183 @command(
6187 @command(
6184 b'revert',
6188 b'revert',
6185 [
6189 [
6186 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6190 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6187 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6191 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6188 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6192 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6189 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6193 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6190 (b'i', b'interactive', None, _(b'interactively select the changes')),
6194 (b'i', b'interactive', None, _(b'interactively select the changes')),
6191 ]
6195 ]
6192 + walkopts
6196 + walkopts
6193 + dryrunopts,
6197 + dryrunopts,
6194 _(b'[OPTION]... [-r REV] [NAME]...'),
6198 _(b'[OPTION]... [-r REV] [NAME]...'),
6195 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6199 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6196 )
6200 )
6197 def revert(ui, repo, *pats, **opts):
6201 def revert(ui, repo, *pats, **opts):
6198 """restore files to their checkout state
6202 """restore files to their checkout state
6199
6203
6200 .. note::
6204 .. note::
6201
6205
6202 To check out earlier revisions, you should use :hg:`update REV`.
6206 To check out earlier revisions, you should use :hg:`update REV`.
6203 To cancel an uncommitted merge (and lose your changes),
6207 To cancel an uncommitted merge (and lose your changes),
6204 use :hg:`merge --abort`.
6208 use :hg:`merge --abort`.
6205
6209
6206 With no revision specified, revert the specified files or directories
6210 With no revision specified, revert the specified files or directories
6207 to the contents they had in the parent of the working directory.
6211 to the contents they had in the parent of the working directory.
6208 This restores the contents of files to an unmodified
6212 This restores the contents of files to an unmodified
6209 state and unschedules adds, removes, copies, and renames. If the
6213 state and unschedules adds, removes, copies, and renames. If the
6210 working directory has two parents, you must explicitly specify a
6214 working directory has two parents, you must explicitly specify a
6211 revision.
6215 revision.
6212
6216
6213 Using the -r/--rev or -d/--date options, revert the given files or
6217 Using the -r/--rev or -d/--date options, revert the given files or
6214 directories to their states as of a specific revision. Because
6218 directories to their states as of a specific revision. Because
6215 revert does not change the working directory parents, this will
6219 revert does not change the working directory parents, this will
6216 cause these files to appear modified. This can be helpful to "back
6220 cause these files to appear modified. This can be helpful to "back
6217 out" some or all of an earlier change. See :hg:`backout` for a
6221 out" some or all of an earlier change. See :hg:`backout` for a
6218 related method.
6222 related method.
6219
6223
6220 Modified files are saved with a .orig suffix before reverting.
6224 Modified files are saved with a .orig suffix before reverting.
6221 To disable these backups, use --no-backup. It is possible to store
6225 To disable these backups, use --no-backup. It is possible to store
6222 the backup files in a custom directory relative to the root of the
6226 the backup files in a custom directory relative to the root of the
6223 repository by setting the ``ui.origbackuppath`` configuration
6227 repository by setting the ``ui.origbackuppath`` configuration
6224 option.
6228 option.
6225
6229
6226 See :hg:`help dates` for a list of formats valid for -d/--date.
6230 See :hg:`help dates` for a list of formats valid for -d/--date.
6227
6231
6228 See :hg:`help backout` for a way to reverse the effect of an
6232 See :hg:`help backout` for a way to reverse the effect of an
6229 earlier changeset.
6233 earlier changeset.
6230
6234
6231 Returns 0 on success.
6235 Returns 0 on success.
6232 """
6236 """
6233
6237
6234 opts = pycompat.byteskwargs(opts)
6238 opts = pycompat.byteskwargs(opts)
6235 if opts.get(b"date"):
6239 if opts.get(b"date"):
6236 if opts.get(b"rev"):
6240 if opts.get(b"rev"):
6237 raise error.Abort(_(b"you can't specify a revision and a date"))
6241 raise error.Abort(_(b"you can't specify a revision and a date"))
6238 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6242 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6239
6243
6240 parent, p2 = repo.dirstate.parents()
6244 parent, p2 = repo.dirstate.parents()
6241 if not opts.get(b'rev') and p2 != nullid:
6245 if not opts.get(b'rev') and p2 != nullid:
6242 # revert after merge is a trap for new users (issue2915)
6246 # revert after merge is a trap for new users (issue2915)
6243 raise error.Abort(
6247 raise error.Abort(
6244 _(b'uncommitted merge with no revision specified'),
6248 _(b'uncommitted merge with no revision specified'),
6245 hint=_(b"use 'hg update' or see 'hg help revert'"),
6249 hint=_(b"use 'hg update' or see 'hg help revert'"),
6246 )
6250 )
6247
6251
6248 rev = opts.get(b'rev')
6252 rev = opts.get(b'rev')
6249 if rev:
6253 if rev:
6250 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6254 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6251 ctx = scmutil.revsingle(repo, rev)
6255 ctx = scmutil.revsingle(repo, rev)
6252
6256
6253 if not (
6257 if not (
6254 pats
6258 pats
6255 or opts.get(b'include')
6259 or opts.get(b'include')
6256 or opts.get(b'exclude')
6260 or opts.get(b'exclude')
6257 or opts.get(b'all')
6261 or opts.get(b'all')
6258 or opts.get(b'interactive')
6262 or opts.get(b'interactive')
6259 ):
6263 ):
6260 msg = _(b"no files or directories specified")
6264 msg = _(b"no files or directories specified")
6261 if p2 != nullid:
6265 if p2 != nullid:
6262 hint = _(
6266 hint = _(
6263 b"uncommitted merge, use --all to discard all changes,"
6267 b"uncommitted merge, use --all to discard all changes,"
6264 b" or 'hg update -C .' to abort the merge"
6268 b" or 'hg update -C .' to abort the merge"
6265 )
6269 )
6266 raise error.Abort(msg, hint=hint)
6270 raise error.Abort(msg, hint=hint)
6267 dirty = any(repo.status())
6271 dirty = any(repo.status())
6268 node = ctx.node()
6272 node = ctx.node()
6269 if node != parent:
6273 if node != parent:
6270 if dirty:
6274 if dirty:
6271 hint = (
6275 hint = (
6272 _(
6276 _(
6273 b"uncommitted changes, use --all to discard all"
6277 b"uncommitted changes, use --all to discard all"
6274 b" changes, or 'hg update %d' to update"
6278 b" changes, or 'hg update %d' to update"
6275 )
6279 )
6276 % ctx.rev()
6280 % ctx.rev()
6277 )
6281 )
6278 else:
6282 else:
6279 hint = (
6283 hint = (
6280 _(
6284 _(
6281 b"use --all to revert all files,"
6285 b"use --all to revert all files,"
6282 b" or 'hg update %d' to update"
6286 b" or 'hg update %d' to update"
6283 )
6287 )
6284 % ctx.rev()
6288 % ctx.rev()
6285 )
6289 )
6286 elif dirty:
6290 elif dirty:
6287 hint = _(b"uncommitted changes, use --all to discard all changes")
6291 hint = _(b"uncommitted changes, use --all to discard all changes")
6288 else:
6292 else:
6289 hint = _(b"use --all to revert all files")
6293 hint = _(b"use --all to revert all files")
6290 raise error.Abort(msg, hint=hint)
6294 raise error.Abort(msg, hint=hint)
6291
6295
6292 return cmdutil.revert(
6296 return cmdutil.revert(
6293 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6297 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6294 )
6298 )
6295
6299
6296
6300
6297 @command(
6301 @command(
6298 b'rollback',
6302 b'rollback',
6299 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6303 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6300 helpcategory=command.CATEGORY_MAINTENANCE,
6304 helpcategory=command.CATEGORY_MAINTENANCE,
6301 )
6305 )
6302 def rollback(ui, repo, **opts):
6306 def rollback(ui, repo, **opts):
6303 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6307 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6304
6308
6305 Please use :hg:`commit --amend` instead of rollback to correct
6309 Please use :hg:`commit --amend` instead of rollback to correct
6306 mistakes in the last commit.
6310 mistakes in the last commit.
6307
6311
6308 This command should be used with care. There is only one level of
6312 This command should be used with care. There is only one level of
6309 rollback, and there is no way to undo a rollback. It will also
6313 rollback, and there is no way to undo a rollback. It will also
6310 restore the dirstate at the time of the last transaction, losing
6314 restore the dirstate at the time of the last transaction, losing
6311 any dirstate changes since that time. This command does not alter
6315 any dirstate changes since that time. This command does not alter
6312 the working directory.
6316 the working directory.
6313
6317
6314 Transactions are used to encapsulate the effects of all commands
6318 Transactions are used to encapsulate the effects of all commands
6315 that create new changesets or propagate existing changesets into a
6319 that create new changesets or propagate existing changesets into a
6316 repository.
6320 repository.
6317
6321
6318 .. container:: verbose
6322 .. container:: verbose
6319
6323
6320 For example, the following commands are transactional, and their
6324 For example, the following commands are transactional, and their
6321 effects can be rolled back:
6325 effects can be rolled back:
6322
6326
6323 - commit
6327 - commit
6324 - import
6328 - import
6325 - pull
6329 - pull
6326 - push (with this repository as the destination)
6330 - push (with this repository as the destination)
6327 - unbundle
6331 - unbundle
6328
6332
6329 To avoid permanent data loss, rollback will refuse to rollback a
6333 To avoid permanent data loss, rollback will refuse to rollback a
6330 commit transaction if it isn't checked out. Use --force to
6334 commit transaction if it isn't checked out. Use --force to
6331 override this protection.
6335 override this protection.
6332
6336
6333 The rollback command can be entirely disabled by setting the
6337 The rollback command can be entirely disabled by setting the
6334 ``ui.rollback`` configuration setting to false. If you're here
6338 ``ui.rollback`` configuration setting to false. If you're here
6335 because you want to use rollback and it's disabled, you can
6339 because you want to use rollback and it's disabled, you can
6336 re-enable the command by setting ``ui.rollback`` to true.
6340 re-enable the command by setting ``ui.rollback`` to true.
6337
6341
6338 This command is not intended for use on public repositories. Once
6342 This command is not intended for use on public repositories. Once
6339 changes are visible for pull by other users, rolling a transaction
6343 changes are visible for pull by other users, rolling a transaction
6340 back locally is ineffective (someone else may already have pulled
6344 back locally is ineffective (someone else may already have pulled
6341 the changes). Furthermore, a race is possible with readers of the
6345 the changes). Furthermore, a race is possible with readers of the
6342 repository; for example an in-progress pull from the repository
6346 repository; for example an in-progress pull from the repository
6343 may fail if a rollback is performed.
6347 may fail if a rollback is performed.
6344
6348
6345 Returns 0 on success, 1 if no rollback data is available.
6349 Returns 0 on success, 1 if no rollback data is available.
6346 """
6350 """
6347 if not ui.configbool(b'ui', b'rollback'):
6351 if not ui.configbool(b'ui', b'rollback'):
6348 raise error.Abort(
6352 raise error.Abort(
6349 _(b'rollback is disabled because it is unsafe'),
6353 _(b'rollback is disabled because it is unsafe'),
6350 hint=b'see `hg help -v rollback` for information',
6354 hint=b'see `hg help -v rollback` for information',
6351 )
6355 )
6352 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6356 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6353
6357
6354
6358
6355 @command(
6359 @command(
6356 b'root',
6360 b'root',
6357 [] + formatteropts,
6361 [] + formatteropts,
6358 intents={INTENT_READONLY},
6362 intents={INTENT_READONLY},
6359 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6363 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6360 )
6364 )
6361 def root(ui, repo, **opts):
6365 def root(ui, repo, **opts):
6362 """print the root (top) of the current working directory
6366 """print the root (top) of the current working directory
6363
6367
6364 Print the root directory of the current repository.
6368 Print the root directory of the current repository.
6365
6369
6366 .. container:: verbose
6370 .. container:: verbose
6367
6371
6368 Template:
6372 Template:
6369
6373
6370 The following keywords are supported in addition to the common template
6374 The following keywords are supported in addition to the common template
6371 keywords and functions. See also :hg:`help templates`.
6375 keywords and functions. See also :hg:`help templates`.
6372
6376
6373 :hgpath: String. Path to the .hg directory.
6377 :hgpath: String. Path to the .hg directory.
6374 :storepath: String. Path to the directory holding versioned data.
6378 :storepath: String. Path to the directory holding versioned data.
6375
6379
6376 Returns 0 on success.
6380 Returns 0 on success.
6377 """
6381 """
6378 opts = pycompat.byteskwargs(opts)
6382 opts = pycompat.byteskwargs(opts)
6379 with ui.formatter(b'root', opts) as fm:
6383 with ui.formatter(b'root', opts) as fm:
6380 fm.startitem()
6384 fm.startitem()
6381 fm.write(b'reporoot', b'%s\n', repo.root)
6385 fm.write(b'reporoot', b'%s\n', repo.root)
6382 fm.data(hgpath=repo.path, storepath=repo.spath)
6386 fm.data(hgpath=repo.path, storepath=repo.spath)
6383
6387
6384
6388
6385 @command(
6389 @command(
6386 b'serve',
6390 b'serve',
6387 [
6391 [
6388 (
6392 (
6389 b'A',
6393 b'A',
6390 b'accesslog',
6394 b'accesslog',
6391 b'',
6395 b'',
6392 _(b'name of access log file to write to'),
6396 _(b'name of access log file to write to'),
6393 _(b'FILE'),
6397 _(b'FILE'),
6394 ),
6398 ),
6395 (b'd', b'daemon', None, _(b'run server in background')),
6399 (b'd', b'daemon', None, _(b'run server in background')),
6396 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6400 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6397 (
6401 (
6398 b'E',
6402 b'E',
6399 b'errorlog',
6403 b'errorlog',
6400 b'',
6404 b'',
6401 _(b'name of error log file to write to'),
6405 _(b'name of error log file to write to'),
6402 _(b'FILE'),
6406 _(b'FILE'),
6403 ),
6407 ),
6404 # use string type, then we can check if something was passed
6408 # use string type, then we can check if something was passed
6405 (
6409 (
6406 b'p',
6410 b'p',
6407 b'port',
6411 b'port',
6408 b'',
6412 b'',
6409 _(b'port to listen on (default: 8000)'),
6413 _(b'port to listen on (default: 8000)'),
6410 _(b'PORT'),
6414 _(b'PORT'),
6411 ),
6415 ),
6412 (
6416 (
6413 b'a',
6417 b'a',
6414 b'address',
6418 b'address',
6415 b'',
6419 b'',
6416 _(b'address to listen on (default: all interfaces)'),
6420 _(b'address to listen on (default: all interfaces)'),
6417 _(b'ADDR'),
6421 _(b'ADDR'),
6418 ),
6422 ),
6419 (
6423 (
6420 b'',
6424 b'',
6421 b'prefix',
6425 b'prefix',
6422 b'',
6426 b'',
6423 _(b'prefix path to serve from (default: server root)'),
6427 _(b'prefix path to serve from (default: server root)'),
6424 _(b'PREFIX'),
6428 _(b'PREFIX'),
6425 ),
6429 ),
6426 (
6430 (
6427 b'n',
6431 b'n',
6428 b'name',
6432 b'name',
6429 b'',
6433 b'',
6430 _(b'name to show in web pages (default: working directory)'),
6434 _(b'name to show in web pages (default: working directory)'),
6431 _(b'NAME'),
6435 _(b'NAME'),
6432 ),
6436 ),
6433 (
6437 (
6434 b'',
6438 b'',
6435 b'web-conf',
6439 b'web-conf',
6436 b'',
6440 b'',
6437 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6441 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6438 _(b'FILE'),
6442 _(b'FILE'),
6439 ),
6443 ),
6440 (
6444 (
6441 b'',
6445 b'',
6442 b'webdir-conf',
6446 b'webdir-conf',
6443 b'',
6447 b'',
6444 _(b'name of the hgweb config file (DEPRECATED)'),
6448 _(b'name of the hgweb config file (DEPRECATED)'),
6445 _(b'FILE'),
6449 _(b'FILE'),
6446 ),
6450 ),
6447 (
6451 (
6448 b'',
6452 b'',
6449 b'pid-file',
6453 b'pid-file',
6450 b'',
6454 b'',
6451 _(b'name of file to write process ID to'),
6455 _(b'name of file to write process ID to'),
6452 _(b'FILE'),
6456 _(b'FILE'),
6453 ),
6457 ),
6454 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6458 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6455 (
6459 (
6456 b'',
6460 b'',
6457 b'cmdserver',
6461 b'cmdserver',
6458 b'',
6462 b'',
6459 _(b'for remote clients (ADVANCED)'),
6463 _(b'for remote clients (ADVANCED)'),
6460 _(b'MODE'),
6464 _(b'MODE'),
6461 ),
6465 ),
6462 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6466 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6463 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6467 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6464 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6468 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6465 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6469 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6466 (b'', b'print-url', None, _(b'start and print only the URL')),
6470 (b'', b'print-url', None, _(b'start and print only the URL')),
6467 ]
6471 ]
6468 + subrepoopts,
6472 + subrepoopts,
6469 _(b'[OPTION]...'),
6473 _(b'[OPTION]...'),
6470 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6474 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6471 helpbasic=True,
6475 helpbasic=True,
6472 optionalrepo=True,
6476 optionalrepo=True,
6473 )
6477 )
6474 def serve(ui, repo, **opts):
6478 def serve(ui, repo, **opts):
6475 """start stand-alone webserver
6479 """start stand-alone webserver
6476
6480
6477 Start a local HTTP repository browser and pull server. You can use
6481 Start a local HTTP repository browser and pull server. You can use
6478 this for ad-hoc sharing and browsing of repositories. It is
6482 this for ad-hoc sharing and browsing of repositories. It is
6479 recommended to use a real web server to serve a repository for
6483 recommended to use a real web server to serve a repository for
6480 longer periods of time.
6484 longer periods of time.
6481
6485
6482 Please note that the server does not implement access control.
6486 Please note that the server does not implement access control.
6483 This means that, by default, anybody can read from the server and
6487 This means that, by default, anybody can read from the server and
6484 nobody can write to it by default. Set the ``web.allow-push``
6488 nobody can write to it by default. Set the ``web.allow-push``
6485 option to ``*`` to allow everybody to push to the server. You
6489 option to ``*`` to allow everybody to push to the server. You
6486 should use a real web server if you need to authenticate users.
6490 should use a real web server if you need to authenticate users.
6487
6491
6488 By default, the server logs accesses to stdout and errors to
6492 By default, the server logs accesses to stdout and errors to
6489 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6493 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6490 files.
6494 files.
6491
6495
6492 To have the server choose a free port number to listen on, specify
6496 To have the server choose a free port number to listen on, specify
6493 a port number of 0; in this case, the server will print the port
6497 a port number of 0; in this case, the server will print the port
6494 number it uses.
6498 number it uses.
6495
6499
6496 Returns 0 on success.
6500 Returns 0 on success.
6497 """
6501 """
6498
6502
6499 opts = pycompat.byteskwargs(opts)
6503 opts = pycompat.byteskwargs(opts)
6500 if opts[b"stdio"] and opts[b"cmdserver"]:
6504 if opts[b"stdio"] and opts[b"cmdserver"]:
6501 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6505 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6502 if opts[b"print_url"] and ui.verbose:
6506 if opts[b"print_url"] and ui.verbose:
6503 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6507 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6504
6508
6505 if opts[b"stdio"]:
6509 if opts[b"stdio"]:
6506 if repo is None:
6510 if repo is None:
6507 raise error.RepoError(
6511 raise error.RepoError(
6508 _(b"there is no Mercurial repository here (.hg not found)")
6512 _(b"there is no Mercurial repository here (.hg not found)")
6509 )
6513 )
6510 s = wireprotoserver.sshserver(ui, repo)
6514 s = wireprotoserver.sshserver(ui, repo)
6511 s.serve_forever()
6515 s.serve_forever()
6512
6516
6513 service = server.createservice(ui, repo, opts)
6517 service = server.createservice(ui, repo, opts)
6514 return server.runservice(opts, initfn=service.init, runfn=service.run)
6518 return server.runservice(opts, initfn=service.init, runfn=service.run)
6515
6519
6516
6520
6517 @command(
6521 @command(
6518 b'shelve',
6522 b'shelve',
6519 [
6523 [
6520 (
6524 (
6521 b'A',
6525 b'A',
6522 b'addremove',
6526 b'addremove',
6523 None,
6527 None,
6524 _(b'mark new/missing files as added/removed before shelving'),
6528 _(b'mark new/missing files as added/removed before shelving'),
6525 ),
6529 ),
6526 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6530 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6527 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6531 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6528 (
6532 (
6529 b'',
6533 b'',
6530 b'date',
6534 b'date',
6531 b'',
6535 b'',
6532 _(b'shelve with the specified commit date'),
6536 _(b'shelve with the specified commit date'),
6533 _(b'DATE'),
6537 _(b'DATE'),
6534 ),
6538 ),
6535 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6539 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6536 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6540 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6537 (
6541 (
6538 b'k',
6542 b'k',
6539 b'keep',
6543 b'keep',
6540 False,
6544 False,
6541 _(b'shelve, but keep changes in the working directory'),
6545 _(b'shelve, but keep changes in the working directory'),
6542 ),
6546 ),
6543 (b'l', b'list', None, _(b'list current shelves')),
6547 (b'l', b'list', None, _(b'list current shelves')),
6544 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6548 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6545 (
6549 (
6546 b'n',
6550 b'n',
6547 b'name',
6551 b'name',
6548 b'',
6552 b'',
6549 _(b'use the given name for the shelved commit'),
6553 _(b'use the given name for the shelved commit'),
6550 _(b'NAME'),
6554 _(b'NAME'),
6551 ),
6555 ),
6552 (
6556 (
6553 b'p',
6557 b'p',
6554 b'patch',
6558 b'patch',
6555 None,
6559 None,
6556 _(
6560 _(
6557 b'output patches for changes (provide the names of the shelved '
6561 b'output patches for changes (provide the names of the shelved '
6558 b'changes as positional arguments)'
6562 b'changes as positional arguments)'
6559 ),
6563 ),
6560 ),
6564 ),
6561 (b'i', b'interactive', None, _(b'interactive mode')),
6565 (b'i', b'interactive', None, _(b'interactive mode')),
6562 (
6566 (
6563 b'',
6567 b'',
6564 b'stat',
6568 b'stat',
6565 None,
6569 None,
6566 _(
6570 _(
6567 b'output diffstat-style summary of changes (provide the names of '
6571 b'output diffstat-style summary of changes (provide the names of '
6568 b'the shelved changes as positional arguments)'
6572 b'the shelved changes as positional arguments)'
6569 ),
6573 ),
6570 ),
6574 ),
6571 ]
6575 ]
6572 + cmdutil.walkopts,
6576 + cmdutil.walkopts,
6573 _(b'hg shelve [OPTION]... [FILE]...'),
6577 _(b'hg shelve [OPTION]... [FILE]...'),
6574 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6578 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6575 )
6579 )
6576 def shelve(ui, repo, *pats, **opts):
6580 def shelve(ui, repo, *pats, **opts):
6577 '''save and set aside changes from the working directory
6581 '''save and set aside changes from the working directory
6578
6582
6579 Shelving takes files that "hg status" reports as not clean, saves
6583 Shelving takes files that "hg status" reports as not clean, saves
6580 the modifications to a bundle (a shelved change), and reverts the
6584 the modifications to a bundle (a shelved change), and reverts the
6581 files so that their state in the working directory becomes clean.
6585 files so that their state in the working directory becomes clean.
6582
6586
6583 To restore these changes to the working directory, using "hg
6587 To restore these changes to the working directory, using "hg
6584 unshelve"; this will work even if you switch to a different
6588 unshelve"; this will work even if you switch to a different
6585 commit.
6589 commit.
6586
6590
6587 When no files are specified, "hg shelve" saves all not-clean
6591 When no files are specified, "hg shelve" saves all not-clean
6588 files. If specific files or directories are named, only changes to
6592 files. If specific files or directories are named, only changes to
6589 those files are shelved.
6593 those files are shelved.
6590
6594
6591 In bare shelve (when no files are specified, without interactive,
6595 In bare shelve (when no files are specified, without interactive,
6592 include and exclude option), shelving remembers information if the
6596 include and exclude option), shelving remembers information if the
6593 working directory was on newly created branch, in other words working
6597 working directory was on newly created branch, in other words working
6594 directory was on different branch than its first parent. In this
6598 directory was on different branch than its first parent. In this
6595 situation unshelving restores branch information to the working directory.
6599 situation unshelving restores branch information to the working directory.
6596
6600
6597 Each shelved change has a name that makes it easier to find later.
6601 Each shelved change has a name that makes it easier to find later.
6598 The name of a shelved change defaults to being based on the active
6602 The name of a shelved change defaults to being based on the active
6599 bookmark, or if there is no active bookmark, the current named
6603 bookmark, or if there is no active bookmark, the current named
6600 branch. To specify a different name, use ``--name``.
6604 branch. To specify a different name, use ``--name``.
6601
6605
6602 To see a list of existing shelved changes, use the ``--list``
6606 To see a list of existing shelved changes, use the ``--list``
6603 option. For each shelved change, this will print its name, age,
6607 option. For each shelved change, this will print its name, age,
6604 and description; use ``--patch`` or ``--stat`` for more details.
6608 and description; use ``--patch`` or ``--stat`` for more details.
6605
6609
6606 To delete specific shelved changes, use ``--delete``. To delete
6610 To delete specific shelved changes, use ``--delete``. To delete
6607 all shelved changes, use ``--cleanup``.
6611 all shelved changes, use ``--cleanup``.
6608 '''
6612 '''
6609 opts = pycompat.byteskwargs(opts)
6613 opts = pycompat.byteskwargs(opts)
6610 allowables = [
6614 allowables = [
6611 (b'addremove', {b'create'}), # 'create' is pseudo action
6615 (b'addremove', {b'create'}), # 'create' is pseudo action
6612 (b'unknown', {b'create'}),
6616 (b'unknown', {b'create'}),
6613 (b'cleanup', {b'cleanup'}),
6617 (b'cleanup', {b'cleanup'}),
6614 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6618 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6615 (b'delete', {b'delete'}),
6619 (b'delete', {b'delete'}),
6616 (b'edit', {b'create'}),
6620 (b'edit', {b'create'}),
6617 (b'keep', {b'create'}),
6621 (b'keep', {b'create'}),
6618 (b'list', {b'list'}),
6622 (b'list', {b'list'}),
6619 (b'message', {b'create'}),
6623 (b'message', {b'create'}),
6620 (b'name', {b'create'}),
6624 (b'name', {b'create'}),
6621 (b'patch', {b'patch', b'list'}),
6625 (b'patch', {b'patch', b'list'}),
6622 (b'stat', {b'stat', b'list'}),
6626 (b'stat', {b'stat', b'list'}),
6623 ]
6627 ]
6624
6628
6625 def checkopt(opt):
6629 def checkopt(opt):
6626 if opts.get(opt):
6630 if opts.get(opt):
6627 for i, allowable in allowables:
6631 for i, allowable in allowables:
6628 if opts[i] and opt not in allowable:
6632 if opts[i] and opt not in allowable:
6629 raise error.Abort(
6633 raise error.Abort(
6630 _(
6634 _(
6631 b"options '--%s' and '--%s' may not be "
6635 b"options '--%s' and '--%s' may not be "
6632 b"used together"
6636 b"used together"
6633 )
6637 )
6634 % (opt, i)
6638 % (opt, i)
6635 )
6639 )
6636 return True
6640 return True
6637
6641
6638 if checkopt(b'cleanup'):
6642 if checkopt(b'cleanup'):
6639 if pats:
6643 if pats:
6640 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6644 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6641 return shelvemod.cleanupcmd(ui, repo)
6645 return shelvemod.cleanupcmd(ui, repo)
6642 elif checkopt(b'delete'):
6646 elif checkopt(b'delete'):
6643 return shelvemod.deletecmd(ui, repo, pats)
6647 return shelvemod.deletecmd(ui, repo, pats)
6644 elif checkopt(b'list'):
6648 elif checkopt(b'list'):
6645 return shelvemod.listcmd(ui, repo, pats, opts)
6649 return shelvemod.listcmd(ui, repo, pats, opts)
6646 elif checkopt(b'patch') or checkopt(b'stat'):
6650 elif checkopt(b'patch') or checkopt(b'stat'):
6647 return shelvemod.patchcmds(ui, repo, pats, opts)
6651 return shelvemod.patchcmds(ui, repo, pats, opts)
6648 else:
6652 else:
6649 return shelvemod.createcmd(ui, repo, pats, opts)
6653 return shelvemod.createcmd(ui, repo, pats, opts)
6650
6654
6651
6655
6652 _NOTTERSE = b'nothing'
6656 _NOTTERSE = b'nothing'
6653
6657
6654
6658
6655 @command(
6659 @command(
6656 b'status|st',
6660 b'status|st',
6657 [
6661 [
6658 (b'A', b'all', None, _(b'show status of all files')),
6662 (b'A', b'all', None, _(b'show status of all files')),
6659 (b'm', b'modified', None, _(b'show only modified files')),
6663 (b'm', b'modified', None, _(b'show only modified files')),
6660 (b'a', b'added', None, _(b'show only added files')),
6664 (b'a', b'added', None, _(b'show only added files')),
6661 (b'r', b'removed', None, _(b'show only removed files')),
6665 (b'r', b'removed', None, _(b'show only removed files')),
6662 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6666 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6663 (b'c', b'clean', None, _(b'show only files without changes')),
6667 (b'c', b'clean', None, _(b'show only files without changes')),
6664 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6668 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6665 (b'i', b'ignored', None, _(b'show only ignored files')),
6669 (b'i', b'ignored', None, _(b'show only ignored files')),
6666 (b'n', b'no-status', None, _(b'hide status prefix')),
6670 (b'n', b'no-status', None, _(b'hide status prefix')),
6667 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6671 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6668 (
6672 (
6669 b'C',
6673 b'C',
6670 b'copies',
6674 b'copies',
6671 None,
6675 None,
6672 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6676 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6673 ),
6677 ),
6674 (
6678 (
6675 b'0',
6679 b'0',
6676 b'print0',
6680 b'print0',
6677 None,
6681 None,
6678 _(b'end filenames with NUL, for use with xargs'),
6682 _(b'end filenames with NUL, for use with xargs'),
6679 ),
6683 ),
6680 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6684 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6681 (
6685 (
6682 b'',
6686 b'',
6683 b'change',
6687 b'change',
6684 b'',
6688 b'',
6685 _(b'list the changed files of a revision'),
6689 _(b'list the changed files of a revision'),
6686 _(b'REV'),
6690 _(b'REV'),
6687 ),
6691 ),
6688 ]
6692 ]
6689 + walkopts
6693 + walkopts
6690 + subrepoopts
6694 + subrepoopts
6691 + formatteropts,
6695 + formatteropts,
6692 _(b'[OPTION]... [FILE]...'),
6696 _(b'[OPTION]... [FILE]...'),
6693 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6697 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6694 helpbasic=True,
6698 helpbasic=True,
6695 inferrepo=True,
6699 inferrepo=True,
6696 intents={INTENT_READONLY},
6700 intents={INTENT_READONLY},
6697 )
6701 )
6698 def status(ui, repo, *pats, **opts):
6702 def status(ui, repo, *pats, **opts):
6699 """show changed files in the working directory
6703 """show changed files in the working directory
6700
6704
6701 Show status of files in the repository. If names are given, only
6705 Show status of files in the repository. If names are given, only
6702 files that match are shown. Files that are clean or ignored or
6706 files that match are shown. Files that are clean or ignored or
6703 the source of a copy/move operation, are not listed unless
6707 the source of a copy/move operation, are not listed unless
6704 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6708 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6705 Unless options described with "show only ..." are given, the
6709 Unless options described with "show only ..." are given, the
6706 options -mardu are used.
6710 options -mardu are used.
6707
6711
6708 Option -q/--quiet hides untracked (unknown and ignored) files
6712 Option -q/--quiet hides untracked (unknown and ignored) files
6709 unless explicitly requested with -u/--unknown or -i/--ignored.
6713 unless explicitly requested with -u/--unknown or -i/--ignored.
6710
6714
6711 .. note::
6715 .. note::
6712
6716
6713 :hg:`status` may appear to disagree with diff if permissions have
6717 :hg:`status` may appear to disagree with diff if permissions have
6714 changed or a merge has occurred. The standard diff format does
6718 changed or a merge has occurred. The standard diff format does
6715 not report permission changes and diff only reports changes
6719 not report permission changes and diff only reports changes
6716 relative to one merge parent.
6720 relative to one merge parent.
6717
6721
6718 If one revision is given, it is used as the base revision.
6722 If one revision is given, it is used as the base revision.
6719 If two revisions are given, the differences between them are
6723 If two revisions are given, the differences between them are
6720 shown. The --change option can also be used as a shortcut to list
6724 shown. The --change option can also be used as a shortcut to list
6721 the changed files of a revision from its first parent.
6725 the changed files of a revision from its first parent.
6722
6726
6723 The codes used to show the status of files are::
6727 The codes used to show the status of files are::
6724
6728
6725 M = modified
6729 M = modified
6726 A = added
6730 A = added
6727 R = removed
6731 R = removed
6728 C = clean
6732 C = clean
6729 ! = missing (deleted by non-hg command, but still tracked)
6733 ! = missing (deleted by non-hg command, but still tracked)
6730 ? = not tracked
6734 ? = not tracked
6731 I = ignored
6735 I = ignored
6732 = origin of the previous file (with --copies)
6736 = origin of the previous file (with --copies)
6733
6737
6734 .. container:: verbose
6738 .. container:: verbose
6735
6739
6736 The -t/--terse option abbreviates the output by showing only the directory
6740 The -t/--terse option abbreviates the output by showing only the directory
6737 name if all the files in it share the same status. The option takes an
6741 name if all the files in it share the same status. The option takes an
6738 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6742 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6739 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6743 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6740 for 'ignored' and 'c' for clean.
6744 for 'ignored' and 'c' for clean.
6741
6745
6742 It abbreviates only those statuses which are passed. Note that clean and
6746 It abbreviates only those statuses which are passed. Note that clean and
6743 ignored files are not displayed with '--terse ic' unless the -c/--clean
6747 ignored files are not displayed with '--terse ic' unless the -c/--clean
6744 and -i/--ignored options are also used.
6748 and -i/--ignored options are also used.
6745
6749
6746 The -v/--verbose option shows information when the repository is in an
6750 The -v/--verbose option shows information when the repository is in an
6747 unfinished merge, shelve, rebase state etc. You can have this behavior
6751 unfinished merge, shelve, rebase state etc. You can have this behavior
6748 turned on by default by enabling the ``commands.status.verbose`` option.
6752 turned on by default by enabling the ``commands.status.verbose`` option.
6749
6753
6750 You can skip displaying some of these states by setting
6754 You can skip displaying some of these states by setting
6751 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6755 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6752 'histedit', 'merge', 'rebase', or 'unshelve'.
6756 'histedit', 'merge', 'rebase', or 'unshelve'.
6753
6757
6754 Template:
6758 Template:
6755
6759
6756 The following keywords are supported in addition to the common template
6760 The following keywords are supported in addition to the common template
6757 keywords and functions. See also :hg:`help templates`.
6761 keywords and functions. See also :hg:`help templates`.
6758
6762
6759 :path: String. Repository-absolute path of the file.
6763 :path: String. Repository-absolute path of the file.
6760 :source: String. Repository-absolute path of the file originated from.
6764 :source: String. Repository-absolute path of the file originated from.
6761 Available if ``--copies`` is specified.
6765 Available if ``--copies`` is specified.
6762 :status: String. Character denoting file's status.
6766 :status: String. Character denoting file's status.
6763
6767
6764 Examples:
6768 Examples:
6765
6769
6766 - show changes in the working directory relative to a
6770 - show changes in the working directory relative to a
6767 changeset::
6771 changeset::
6768
6772
6769 hg status --rev 9353
6773 hg status --rev 9353
6770
6774
6771 - show changes in the working directory relative to the
6775 - show changes in the working directory relative to the
6772 current directory (see :hg:`help patterns` for more information)::
6776 current directory (see :hg:`help patterns` for more information)::
6773
6777
6774 hg status re:
6778 hg status re:
6775
6779
6776 - show all changes including copies in an existing changeset::
6780 - show all changes including copies in an existing changeset::
6777
6781
6778 hg status --copies --change 9353
6782 hg status --copies --change 9353
6779
6783
6780 - get a NUL separated list of added files, suitable for xargs::
6784 - get a NUL separated list of added files, suitable for xargs::
6781
6785
6782 hg status -an0
6786 hg status -an0
6783
6787
6784 - show more information about the repository status, abbreviating
6788 - show more information about the repository status, abbreviating
6785 added, removed, modified, deleted, and untracked paths::
6789 added, removed, modified, deleted, and untracked paths::
6786
6790
6787 hg status -v -t mardu
6791 hg status -v -t mardu
6788
6792
6789 Returns 0 on success.
6793 Returns 0 on success.
6790
6794
6791 """
6795 """
6792
6796
6793 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6797 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6794 opts = pycompat.byteskwargs(opts)
6798 opts = pycompat.byteskwargs(opts)
6795 revs = opts.get(b'rev')
6799 revs = opts.get(b'rev')
6796 change = opts.get(b'change')
6800 change = opts.get(b'change')
6797 terse = opts.get(b'terse')
6801 terse = opts.get(b'terse')
6798 if terse is _NOTTERSE:
6802 if terse is _NOTTERSE:
6799 if revs:
6803 if revs:
6800 terse = b''
6804 terse = b''
6801 else:
6805 else:
6802 terse = ui.config(b'commands', b'status.terse')
6806 terse = ui.config(b'commands', b'status.terse')
6803
6807
6804 if revs and terse:
6808 if revs and terse:
6805 msg = _(b'cannot use --terse with --rev')
6809 msg = _(b'cannot use --terse with --rev')
6806 raise error.Abort(msg)
6810 raise error.Abort(msg)
6807 elif change:
6811 elif change:
6808 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6812 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6809 ctx2 = scmutil.revsingle(repo, change, None)
6813 ctx2 = scmutil.revsingle(repo, change, None)
6810 ctx1 = ctx2.p1()
6814 ctx1 = ctx2.p1()
6811 else:
6815 else:
6812 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6816 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6813 ctx1, ctx2 = scmutil.revpair(repo, revs)
6817 ctx1, ctx2 = scmutil.revpair(repo, revs)
6814
6818
6815 forcerelativevalue = None
6819 forcerelativevalue = None
6816 if ui.hasconfig(b'commands', b'status.relative'):
6820 if ui.hasconfig(b'commands', b'status.relative'):
6817 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6821 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6818 uipathfn = scmutil.getuipathfn(
6822 uipathfn = scmutil.getuipathfn(
6819 repo,
6823 repo,
6820 legacyrelativevalue=bool(pats),
6824 legacyrelativevalue=bool(pats),
6821 forcerelativevalue=forcerelativevalue,
6825 forcerelativevalue=forcerelativevalue,
6822 )
6826 )
6823
6827
6824 if opts.get(b'print0'):
6828 if opts.get(b'print0'):
6825 end = b'\0'
6829 end = b'\0'
6826 else:
6830 else:
6827 end = b'\n'
6831 end = b'\n'
6828 states = b'modified added removed deleted unknown ignored clean'.split()
6832 states = b'modified added removed deleted unknown ignored clean'.split()
6829 show = [k for k in states if opts.get(k)]
6833 show = [k for k in states if opts.get(k)]
6830 if opts.get(b'all'):
6834 if opts.get(b'all'):
6831 show += ui.quiet and (states[:4] + [b'clean']) or states
6835 show += ui.quiet and (states[:4] + [b'clean']) or states
6832
6836
6833 if not show:
6837 if not show:
6834 if ui.quiet:
6838 if ui.quiet:
6835 show = states[:4]
6839 show = states[:4]
6836 else:
6840 else:
6837 show = states[:5]
6841 show = states[:5]
6838
6842
6839 m = scmutil.match(ctx2, pats, opts)
6843 m = scmutil.match(ctx2, pats, opts)
6840 if terse:
6844 if terse:
6841 # we need to compute clean and unknown to terse
6845 # we need to compute clean and unknown to terse
6842 stat = repo.status(
6846 stat = repo.status(
6843 ctx1.node(),
6847 ctx1.node(),
6844 ctx2.node(),
6848 ctx2.node(),
6845 m,
6849 m,
6846 b'ignored' in show or b'i' in terse,
6850 b'ignored' in show or b'i' in terse,
6847 clean=True,
6851 clean=True,
6848 unknown=True,
6852 unknown=True,
6849 listsubrepos=opts.get(b'subrepos'),
6853 listsubrepos=opts.get(b'subrepos'),
6850 )
6854 )
6851
6855
6852 stat = cmdutil.tersedir(stat, terse)
6856 stat = cmdutil.tersedir(stat, terse)
6853 else:
6857 else:
6854 stat = repo.status(
6858 stat = repo.status(
6855 ctx1.node(),
6859 ctx1.node(),
6856 ctx2.node(),
6860 ctx2.node(),
6857 m,
6861 m,
6858 b'ignored' in show,
6862 b'ignored' in show,
6859 b'clean' in show,
6863 b'clean' in show,
6860 b'unknown' in show,
6864 b'unknown' in show,
6861 opts.get(b'subrepos'),
6865 opts.get(b'subrepos'),
6862 )
6866 )
6863
6867
6864 changestates = zip(
6868 changestates = zip(
6865 states,
6869 states,
6866 pycompat.iterbytestr(b'MAR!?IC'),
6870 pycompat.iterbytestr(b'MAR!?IC'),
6867 [getattr(stat, s.decode('utf8')) for s in states],
6871 [getattr(stat, s.decode('utf8')) for s in states],
6868 )
6872 )
6869
6873
6870 copy = {}
6874 copy = {}
6871 if (
6875 if (
6872 opts.get(b'all')
6876 opts.get(b'all')
6873 or opts.get(b'copies')
6877 or opts.get(b'copies')
6874 or ui.configbool(b'ui', b'statuscopies')
6878 or ui.configbool(b'ui', b'statuscopies')
6875 ) and not opts.get(b'no_status'):
6879 ) and not opts.get(b'no_status'):
6876 copy = copies.pathcopies(ctx1, ctx2, m)
6880 copy = copies.pathcopies(ctx1, ctx2, m)
6877
6881
6878 morestatus = None
6882 morestatus = None
6879 if (
6883 if (
6880 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6884 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6881 ) and not ui.plain():
6885 ) and not ui.plain():
6882 morestatus = cmdutil.readmorestatus(repo)
6886 morestatus = cmdutil.readmorestatus(repo)
6883
6887
6884 ui.pager(b'status')
6888 ui.pager(b'status')
6885 fm = ui.formatter(b'status', opts)
6889 fm = ui.formatter(b'status', opts)
6886 fmt = b'%s' + end
6890 fmt = b'%s' + end
6887 showchar = not opts.get(b'no_status')
6891 showchar = not opts.get(b'no_status')
6888
6892
6889 for state, char, files in changestates:
6893 for state, char, files in changestates:
6890 if state in show:
6894 if state in show:
6891 label = b'status.' + state
6895 label = b'status.' + state
6892 for f in files:
6896 for f in files:
6893 fm.startitem()
6897 fm.startitem()
6894 fm.context(ctx=ctx2)
6898 fm.context(ctx=ctx2)
6895 fm.data(itemtype=b'file', path=f)
6899 fm.data(itemtype=b'file', path=f)
6896 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6900 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6897 fm.plain(fmt % uipathfn(f), label=label)
6901 fm.plain(fmt % uipathfn(f), label=label)
6898 if f in copy:
6902 if f in copy:
6899 fm.data(source=copy[f])
6903 fm.data(source=copy[f])
6900 fm.plain(
6904 fm.plain(
6901 (b' %s' + end) % uipathfn(copy[f]),
6905 (b' %s' + end) % uipathfn(copy[f]),
6902 label=b'status.copied',
6906 label=b'status.copied',
6903 )
6907 )
6904 if morestatus:
6908 if morestatus:
6905 morestatus.formatfile(f, fm)
6909 morestatus.formatfile(f, fm)
6906
6910
6907 if morestatus:
6911 if morestatus:
6908 morestatus.formatfooter(fm)
6912 morestatus.formatfooter(fm)
6909 fm.end()
6913 fm.end()
6910
6914
6911
6915
6912 @command(
6916 @command(
6913 b'summary|sum',
6917 b'summary|sum',
6914 [(b'', b'remote', None, _(b'check for push and pull'))],
6918 [(b'', b'remote', None, _(b'check for push and pull'))],
6915 b'[--remote]',
6919 b'[--remote]',
6916 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6920 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6917 helpbasic=True,
6921 helpbasic=True,
6918 intents={INTENT_READONLY},
6922 intents={INTENT_READONLY},
6919 )
6923 )
6920 def summary(ui, repo, **opts):
6924 def summary(ui, repo, **opts):
6921 """summarize working directory state
6925 """summarize working directory state
6922
6926
6923 This generates a brief summary of the working directory state,
6927 This generates a brief summary of the working directory state,
6924 including parents, branch, commit status, phase and available updates.
6928 including parents, branch, commit status, phase and available updates.
6925
6929
6926 With the --remote option, this will check the default paths for
6930 With the --remote option, this will check the default paths for
6927 incoming and outgoing changes. This can be time-consuming.
6931 incoming and outgoing changes. This can be time-consuming.
6928
6932
6929 Returns 0 on success.
6933 Returns 0 on success.
6930 """
6934 """
6931
6935
6932 opts = pycompat.byteskwargs(opts)
6936 opts = pycompat.byteskwargs(opts)
6933 ui.pager(b'summary')
6937 ui.pager(b'summary')
6934 ctx = repo[None]
6938 ctx = repo[None]
6935 parents = ctx.parents()
6939 parents = ctx.parents()
6936 pnode = parents[0].node()
6940 pnode = parents[0].node()
6937 marks = []
6941 marks = []
6938
6942
6939 try:
6943 try:
6940 ms = mergemod.mergestate.read(repo)
6944 ms = mergemod.mergestate.read(repo)
6941 except error.UnsupportedMergeRecords as e:
6945 except error.UnsupportedMergeRecords as e:
6942 s = b' '.join(e.recordtypes)
6946 s = b' '.join(e.recordtypes)
6943 ui.warn(
6947 ui.warn(
6944 _(b'warning: merge state has unsupported record types: %s\n') % s
6948 _(b'warning: merge state has unsupported record types: %s\n') % s
6945 )
6949 )
6946 unresolved = []
6950 unresolved = []
6947 else:
6951 else:
6948 unresolved = list(ms.unresolved())
6952 unresolved = list(ms.unresolved())
6949
6953
6950 for p in parents:
6954 for p in parents:
6951 # label with log.changeset (instead of log.parent) since this
6955 # label with log.changeset (instead of log.parent) since this
6952 # shows a working directory parent *changeset*:
6956 # shows a working directory parent *changeset*:
6953 # i18n: column positioning for "hg summary"
6957 # i18n: column positioning for "hg summary"
6954 ui.write(
6958 ui.write(
6955 _(b'parent: %d:%s ') % (p.rev(), p),
6959 _(b'parent: %d:%s ') % (p.rev(), p),
6956 label=logcmdutil.changesetlabels(p),
6960 label=logcmdutil.changesetlabels(p),
6957 )
6961 )
6958 ui.write(b' '.join(p.tags()), label=b'log.tag')
6962 ui.write(b' '.join(p.tags()), label=b'log.tag')
6959 if p.bookmarks():
6963 if p.bookmarks():
6960 marks.extend(p.bookmarks())
6964 marks.extend(p.bookmarks())
6961 if p.rev() == -1:
6965 if p.rev() == -1:
6962 if not len(repo):
6966 if not len(repo):
6963 ui.write(_(b' (empty repository)'))
6967 ui.write(_(b' (empty repository)'))
6964 else:
6968 else:
6965 ui.write(_(b' (no revision checked out)'))
6969 ui.write(_(b' (no revision checked out)'))
6966 if p.obsolete():
6970 if p.obsolete():
6967 ui.write(_(b' (obsolete)'))
6971 ui.write(_(b' (obsolete)'))
6968 if p.isunstable():
6972 if p.isunstable():
6969 instabilities = (
6973 instabilities = (
6970 ui.label(instability, b'trouble.%s' % instability)
6974 ui.label(instability, b'trouble.%s' % instability)
6971 for instability in p.instabilities()
6975 for instability in p.instabilities()
6972 )
6976 )
6973 ui.write(b' (' + b', '.join(instabilities) + b')')
6977 ui.write(b' (' + b', '.join(instabilities) + b')')
6974 ui.write(b'\n')
6978 ui.write(b'\n')
6975 if p.description():
6979 if p.description():
6976 ui.status(
6980 ui.status(
6977 b' ' + p.description().splitlines()[0].strip() + b'\n',
6981 b' ' + p.description().splitlines()[0].strip() + b'\n',
6978 label=b'log.summary',
6982 label=b'log.summary',
6979 )
6983 )
6980
6984
6981 branch = ctx.branch()
6985 branch = ctx.branch()
6982 bheads = repo.branchheads(branch)
6986 bheads = repo.branchheads(branch)
6983 # i18n: column positioning for "hg summary"
6987 # i18n: column positioning for "hg summary"
6984 m = _(b'branch: %s\n') % branch
6988 m = _(b'branch: %s\n') % branch
6985 if branch != b'default':
6989 if branch != b'default':
6986 ui.write(m, label=b'log.branch')
6990 ui.write(m, label=b'log.branch')
6987 else:
6991 else:
6988 ui.status(m, label=b'log.branch')
6992 ui.status(m, label=b'log.branch')
6989
6993
6990 if marks:
6994 if marks:
6991 active = repo._activebookmark
6995 active = repo._activebookmark
6992 # i18n: column positioning for "hg summary"
6996 # i18n: column positioning for "hg summary"
6993 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6997 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6994 if active is not None:
6998 if active is not None:
6995 if active in marks:
6999 if active in marks:
6996 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7000 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6997 marks.remove(active)
7001 marks.remove(active)
6998 else:
7002 else:
6999 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7003 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7000 for m in marks:
7004 for m in marks:
7001 ui.write(b' ' + m, label=b'log.bookmark')
7005 ui.write(b' ' + m, label=b'log.bookmark')
7002 ui.write(b'\n', label=b'log.bookmark')
7006 ui.write(b'\n', label=b'log.bookmark')
7003
7007
7004 status = repo.status(unknown=True)
7008 status = repo.status(unknown=True)
7005
7009
7006 c = repo.dirstate.copies()
7010 c = repo.dirstate.copies()
7007 copied, renamed = [], []
7011 copied, renamed = [], []
7008 for d, s in pycompat.iteritems(c):
7012 for d, s in pycompat.iteritems(c):
7009 if s in status.removed:
7013 if s in status.removed:
7010 status.removed.remove(s)
7014 status.removed.remove(s)
7011 renamed.append(d)
7015 renamed.append(d)
7012 else:
7016 else:
7013 copied.append(d)
7017 copied.append(d)
7014 if d in status.added:
7018 if d in status.added:
7015 status.added.remove(d)
7019 status.added.remove(d)
7016
7020
7017 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7021 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7018
7022
7019 labels = [
7023 labels = [
7020 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7024 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7021 (ui.label(_(b'%d added'), b'status.added'), status.added),
7025 (ui.label(_(b'%d added'), b'status.added'), status.added),
7022 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7026 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7023 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7027 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7024 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7028 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7025 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7029 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7026 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7030 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7027 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7031 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7028 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7032 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7029 ]
7033 ]
7030 t = []
7034 t = []
7031 for l, s in labels:
7035 for l, s in labels:
7032 if s:
7036 if s:
7033 t.append(l % len(s))
7037 t.append(l % len(s))
7034
7038
7035 t = b', '.join(t)
7039 t = b', '.join(t)
7036 cleanworkdir = False
7040 cleanworkdir = False
7037
7041
7038 if repo.vfs.exists(b'graftstate'):
7042 if repo.vfs.exists(b'graftstate'):
7039 t += _(b' (graft in progress)')
7043 t += _(b' (graft in progress)')
7040 if repo.vfs.exists(b'updatestate'):
7044 if repo.vfs.exists(b'updatestate'):
7041 t += _(b' (interrupted update)')
7045 t += _(b' (interrupted update)')
7042 elif len(parents) > 1:
7046 elif len(parents) > 1:
7043 t += _(b' (merge)')
7047 t += _(b' (merge)')
7044 elif branch != parents[0].branch():
7048 elif branch != parents[0].branch():
7045 t += _(b' (new branch)')
7049 t += _(b' (new branch)')
7046 elif parents[0].closesbranch() and pnode in repo.branchheads(
7050 elif parents[0].closesbranch() and pnode in repo.branchheads(
7047 branch, closed=True
7051 branch, closed=True
7048 ):
7052 ):
7049 t += _(b' (head closed)')
7053 t += _(b' (head closed)')
7050 elif not (
7054 elif not (
7051 status.modified
7055 status.modified
7052 or status.added
7056 or status.added
7053 or status.removed
7057 or status.removed
7054 or renamed
7058 or renamed
7055 or copied
7059 or copied
7056 or subs
7060 or subs
7057 ):
7061 ):
7058 t += _(b' (clean)')
7062 t += _(b' (clean)')
7059 cleanworkdir = True
7063 cleanworkdir = True
7060 elif pnode not in bheads:
7064 elif pnode not in bheads:
7061 t += _(b' (new branch head)')
7065 t += _(b' (new branch head)')
7062
7066
7063 if parents:
7067 if parents:
7064 pendingphase = max(p.phase() for p in parents)
7068 pendingphase = max(p.phase() for p in parents)
7065 else:
7069 else:
7066 pendingphase = phases.public
7070 pendingphase = phases.public
7067
7071
7068 if pendingphase > phases.newcommitphase(ui):
7072 if pendingphase > phases.newcommitphase(ui):
7069 t += b' (%s)' % phases.phasenames[pendingphase]
7073 t += b' (%s)' % phases.phasenames[pendingphase]
7070
7074
7071 if cleanworkdir:
7075 if cleanworkdir:
7072 # i18n: column positioning for "hg summary"
7076 # i18n: column positioning for "hg summary"
7073 ui.status(_(b'commit: %s\n') % t.strip())
7077 ui.status(_(b'commit: %s\n') % t.strip())
7074 else:
7078 else:
7075 # i18n: column positioning for "hg summary"
7079 # i18n: column positioning for "hg summary"
7076 ui.write(_(b'commit: %s\n') % t.strip())
7080 ui.write(_(b'commit: %s\n') % t.strip())
7077
7081
7078 # all ancestors of branch heads - all ancestors of parent = new csets
7082 # all ancestors of branch heads - all ancestors of parent = new csets
7079 new = len(
7083 new = len(
7080 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7084 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7081 )
7085 )
7082
7086
7083 if new == 0:
7087 if new == 0:
7084 # i18n: column positioning for "hg summary"
7088 # i18n: column positioning for "hg summary"
7085 ui.status(_(b'update: (current)\n'))
7089 ui.status(_(b'update: (current)\n'))
7086 elif pnode not in bheads:
7090 elif pnode not in bheads:
7087 # i18n: column positioning for "hg summary"
7091 # i18n: column positioning for "hg summary"
7088 ui.write(_(b'update: %d new changesets (update)\n') % new)
7092 ui.write(_(b'update: %d new changesets (update)\n') % new)
7089 else:
7093 else:
7090 # i18n: column positioning for "hg summary"
7094 # i18n: column positioning for "hg summary"
7091 ui.write(
7095 ui.write(
7092 _(b'update: %d new changesets, %d branch heads (merge)\n')
7096 _(b'update: %d new changesets, %d branch heads (merge)\n')
7093 % (new, len(bheads))
7097 % (new, len(bheads))
7094 )
7098 )
7095
7099
7096 t = []
7100 t = []
7097 draft = len(repo.revs(b'draft()'))
7101 draft = len(repo.revs(b'draft()'))
7098 if draft:
7102 if draft:
7099 t.append(_(b'%d draft') % draft)
7103 t.append(_(b'%d draft') % draft)
7100 secret = len(repo.revs(b'secret()'))
7104 secret = len(repo.revs(b'secret()'))
7101 if secret:
7105 if secret:
7102 t.append(_(b'%d secret') % secret)
7106 t.append(_(b'%d secret') % secret)
7103
7107
7104 if draft or secret:
7108 if draft or secret:
7105 ui.status(_(b'phases: %s\n') % b', '.join(t))
7109 ui.status(_(b'phases: %s\n') % b', '.join(t))
7106
7110
7107 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7111 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7108 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7112 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7109 numtrouble = len(repo.revs(trouble + b"()"))
7113 numtrouble = len(repo.revs(trouble + b"()"))
7110 # We write all the possibilities to ease translation
7114 # We write all the possibilities to ease translation
7111 troublemsg = {
7115 troublemsg = {
7112 b"orphan": _(b"orphan: %d changesets"),
7116 b"orphan": _(b"orphan: %d changesets"),
7113 b"contentdivergent": _(b"content-divergent: %d changesets"),
7117 b"contentdivergent": _(b"content-divergent: %d changesets"),
7114 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7118 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7115 }
7119 }
7116 if numtrouble > 0:
7120 if numtrouble > 0:
7117 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7121 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7118
7122
7119 cmdutil.summaryhooks(ui, repo)
7123 cmdutil.summaryhooks(ui, repo)
7120
7124
7121 if opts.get(b'remote'):
7125 if opts.get(b'remote'):
7122 needsincoming, needsoutgoing = True, True
7126 needsincoming, needsoutgoing = True, True
7123 else:
7127 else:
7124 needsincoming, needsoutgoing = False, False
7128 needsincoming, needsoutgoing = False, False
7125 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7129 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7126 if i:
7130 if i:
7127 needsincoming = True
7131 needsincoming = True
7128 if o:
7132 if o:
7129 needsoutgoing = True
7133 needsoutgoing = True
7130 if not needsincoming and not needsoutgoing:
7134 if not needsincoming and not needsoutgoing:
7131 return
7135 return
7132
7136
7133 def getincoming():
7137 def getincoming():
7134 source, branches = hg.parseurl(ui.expandpath(b'default'))
7138 source, branches = hg.parseurl(ui.expandpath(b'default'))
7135 sbranch = branches[0]
7139 sbranch = branches[0]
7136 try:
7140 try:
7137 other = hg.peer(repo, {}, source)
7141 other = hg.peer(repo, {}, source)
7138 except error.RepoError:
7142 except error.RepoError:
7139 if opts.get(b'remote'):
7143 if opts.get(b'remote'):
7140 raise
7144 raise
7141 return source, sbranch, None, None, None
7145 return source, sbranch, None, None, None
7142 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7146 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7143 if revs:
7147 if revs:
7144 revs = [other.lookup(rev) for rev in revs]
7148 revs = [other.lookup(rev) for rev in revs]
7145 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7149 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7146 repo.ui.pushbuffer()
7150 repo.ui.pushbuffer()
7147 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7151 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7148 repo.ui.popbuffer()
7152 repo.ui.popbuffer()
7149 return source, sbranch, other, commoninc, commoninc[1]
7153 return source, sbranch, other, commoninc, commoninc[1]
7150
7154
7151 if needsincoming:
7155 if needsincoming:
7152 source, sbranch, sother, commoninc, incoming = getincoming()
7156 source, sbranch, sother, commoninc, incoming = getincoming()
7153 else:
7157 else:
7154 source = sbranch = sother = commoninc = incoming = None
7158 source = sbranch = sother = commoninc = incoming = None
7155
7159
7156 def getoutgoing():
7160 def getoutgoing():
7157 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7161 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7158 dbranch = branches[0]
7162 dbranch = branches[0]
7159 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7163 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7160 if source != dest:
7164 if source != dest:
7161 try:
7165 try:
7162 dother = hg.peer(repo, {}, dest)
7166 dother = hg.peer(repo, {}, dest)
7163 except error.RepoError:
7167 except error.RepoError:
7164 if opts.get(b'remote'):
7168 if opts.get(b'remote'):
7165 raise
7169 raise
7166 return dest, dbranch, None, None
7170 return dest, dbranch, None, None
7167 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7171 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7168 elif sother is None:
7172 elif sother is None:
7169 # there is no explicit destination peer, but source one is invalid
7173 # there is no explicit destination peer, but source one is invalid
7170 return dest, dbranch, None, None
7174 return dest, dbranch, None, None
7171 else:
7175 else:
7172 dother = sother
7176 dother = sother
7173 if source != dest or (sbranch is not None and sbranch != dbranch):
7177 if source != dest or (sbranch is not None and sbranch != dbranch):
7174 common = None
7178 common = None
7175 else:
7179 else:
7176 common = commoninc
7180 common = commoninc
7177 if revs:
7181 if revs:
7178 revs = [repo.lookup(rev) for rev in revs]
7182 revs = [repo.lookup(rev) for rev in revs]
7179 repo.ui.pushbuffer()
7183 repo.ui.pushbuffer()
7180 outgoing = discovery.findcommonoutgoing(
7184 outgoing = discovery.findcommonoutgoing(
7181 repo, dother, onlyheads=revs, commoninc=common
7185 repo, dother, onlyheads=revs, commoninc=common
7182 )
7186 )
7183 repo.ui.popbuffer()
7187 repo.ui.popbuffer()
7184 return dest, dbranch, dother, outgoing
7188 return dest, dbranch, dother, outgoing
7185
7189
7186 if needsoutgoing:
7190 if needsoutgoing:
7187 dest, dbranch, dother, outgoing = getoutgoing()
7191 dest, dbranch, dother, outgoing = getoutgoing()
7188 else:
7192 else:
7189 dest = dbranch = dother = outgoing = None
7193 dest = dbranch = dother = outgoing = None
7190
7194
7191 if opts.get(b'remote'):
7195 if opts.get(b'remote'):
7192 t = []
7196 t = []
7193 if incoming:
7197 if incoming:
7194 t.append(_(b'1 or more incoming'))
7198 t.append(_(b'1 or more incoming'))
7195 o = outgoing.missing
7199 o = outgoing.missing
7196 if o:
7200 if o:
7197 t.append(_(b'%d outgoing') % len(o))
7201 t.append(_(b'%d outgoing') % len(o))
7198 other = dother or sother
7202 other = dother or sother
7199 if b'bookmarks' in other.listkeys(b'namespaces'):
7203 if b'bookmarks' in other.listkeys(b'namespaces'):
7200 counts = bookmarks.summary(repo, other)
7204 counts = bookmarks.summary(repo, other)
7201 if counts[0] > 0:
7205 if counts[0] > 0:
7202 t.append(_(b'%d incoming bookmarks') % counts[0])
7206 t.append(_(b'%d incoming bookmarks') % counts[0])
7203 if counts[1] > 0:
7207 if counts[1] > 0:
7204 t.append(_(b'%d outgoing bookmarks') % counts[1])
7208 t.append(_(b'%d outgoing bookmarks') % counts[1])
7205
7209
7206 if t:
7210 if t:
7207 # i18n: column positioning for "hg summary"
7211 # i18n: column positioning for "hg summary"
7208 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7212 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7209 else:
7213 else:
7210 # i18n: column positioning for "hg summary"
7214 # i18n: column positioning for "hg summary"
7211 ui.status(_(b'remote: (synced)\n'))
7215 ui.status(_(b'remote: (synced)\n'))
7212
7216
7213 cmdutil.summaryremotehooks(
7217 cmdutil.summaryremotehooks(
7214 ui,
7218 ui,
7215 repo,
7219 repo,
7216 opts,
7220 opts,
7217 (
7221 (
7218 (source, sbranch, sother, commoninc),
7222 (source, sbranch, sother, commoninc),
7219 (dest, dbranch, dother, outgoing),
7223 (dest, dbranch, dother, outgoing),
7220 ),
7224 ),
7221 )
7225 )
7222
7226
7223
7227
7224 @command(
7228 @command(
7225 b'tag',
7229 b'tag',
7226 [
7230 [
7227 (b'f', b'force', None, _(b'force tag')),
7231 (b'f', b'force', None, _(b'force tag')),
7228 (b'l', b'local', None, _(b'make the tag local')),
7232 (b'l', b'local', None, _(b'make the tag local')),
7229 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7233 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7230 (b'', b'remove', None, _(b'remove a tag')),
7234 (b'', b'remove', None, _(b'remove a tag')),
7231 # -l/--local is already there, commitopts cannot be used
7235 # -l/--local is already there, commitopts cannot be used
7232 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7236 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7233 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7237 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7234 ]
7238 ]
7235 + commitopts2,
7239 + commitopts2,
7236 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7240 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7237 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7241 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7238 )
7242 )
7239 def tag(ui, repo, name1, *names, **opts):
7243 def tag(ui, repo, name1, *names, **opts):
7240 """add one or more tags for the current or given revision
7244 """add one or more tags for the current or given revision
7241
7245
7242 Name a particular revision using <name>.
7246 Name a particular revision using <name>.
7243
7247
7244 Tags are used to name particular revisions of the repository and are
7248 Tags are used to name particular revisions of the repository and are
7245 very useful to compare different revisions, to go back to significant
7249 very useful to compare different revisions, to go back to significant
7246 earlier versions or to mark branch points as releases, etc. Changing
7250 earlier versions or to mark branch points as releases, etc. Changing
7247 an existing tag is normally disallowed; use -f/--force to override.
7251 an existing tag is normally disallowed; use -f/--force to override.
7248
7252
7249 If no revision is given, the parent of the working directory is
7253 If no revision is given, the parent of the working directory is
7250 used.
7254 used.
7251
7255
7252 To facilitate version control, distribution, and merging of tags,
7256 To facilitate version control, distribution, and merging of tags,
7253 they are stored as a file named ".hgtags" which is managed similarly
7257 they are stored as a file named ".hgtags" which is managed similarly
7254 to other project files and can be hand-edited if necessary. This
7258 to other project files and can be hand-edited if necessary. This
7255 also means that tagging creates a new commit. The file
7259 also means that tagging creates a new commit. The file
7256 ".hg/localtags" is used for local tags (not shared among
7260 ".hg/localtags" is used for local tags (not shared among
7257 repositories).
7261 repositories).
7258
7262
7259 Tag commits are usually made at the head of a branch. If the parent
7263 Tag commits are usually made at the head of a branch. If the parent
7260 of the working directory is not a branch head, :hg:`tag` aborts; use
7264 of the working directory is not a branch head, :hg:`tag` aborts; use
7261 -f/--force to force the tag commit to be based on a non-head
7265 -f/--force to force the tag commit to be based on a non-head
7262 changeset.
7266 changeset.
7263
7267
7264 See :hg:`help dates` for a list of formats valid for -d/--date.
7268 See :hg:`help dates` for a list of formats valid for -d/--date.
7265
7269
7266 Since tag names have priority over branch names during revision
7270 Since tag names have priority over branch names during revision
7267 lookup, using an existing branch name as a tag name is discouraged.
7271 lookup, using an existing branch name as a tag name is discouraged.
7268
7272
7269 Returns 0 on success.
7273 Returns 0 on success.
7270 """
7274 """
7271 opts = pycompat.byteskwargs(opts)
7275 opts = pycompat.byteskwargs(opts)
7272 with repo.wlock(), repo.lock():
7276 with repo.wlock(), repo.lock():
7273 rev_ = b"."
7277 rev_ = b"."
7274 names = [t.strip() for t in (name1,) + names]
7278 names = [t.strip() for t in (name1,) + names]
7275 if len(names) != len(set(names)):
7279 if len(names) != len(set(names)):
7276 raise error.Abort(_(b'tag names must be unique'))
7280 raise error.Abort(_(b'tag names must be unique'))
7277 for n in names:
7281 for n in names:
7278 scmutil.checknewlabel(repo, n, b'tag')
7282 scmutil.checknewlabel(repo, n, b'tag')
7279 if not n:
7283 if not n:
7280 raise error.Abort(
7284 raise error.Abort(
7281 _(b'tag names cannot consist entirely of whitespace')
7285 _(b'tag names cannot consist entirely of whitespace')
7282 )
7286 )
7283 if opts.get(b'rev') and opts.get(b'remove'):
7287 if opts.get(b'rev') and opts.get(b'remove'):
7284 raise error.Abort(_(b"--rev and --remove are incompatible"))
7288 raise error.Abort(_(b"--rev and --remove are incompatible"))
7285 if opts.get(b'rev'):
7289 if opts.get(b'rev'):
7286 rev_ = opts[b'rev']
7290 rev_ = opts[b'rev']
7287 message = opts.get(b'message')
7291 message = opts.get(b'message')
7288 if opts.get(b'remove'):
7292 if opts.get(b'remove'):
7289 if opts.get(b'local'):
7293 if opts.get(b'local'):
7290 expectedtype = b'local'
7294 expectedtype = b'local'
7291 else:
7295 else:
7292 expectedtype = b'global'
7296 expectedtype = b'global'
7293
7297
7294 for n in names:
7298 for n in names:
7295 if repo.tagtype(n) == b'global':
7299 if repo.tagtype(n) == b'global':
7296 alltags = tagsmod.findglobaltags(ui, repo)
7300 alltags = tagsmod.findglobaltags(ui, repo)
7297 if alltags[n][0] == nullid:
7301 if alltags[n][0] == nullid:
7298 raise error.Abort(_(b"tag '%s' is already removed") % n)
7302 raise error.Abort(_(b"tag '%s' is already removed") % n)
7299 if not repo.tagtype(n):
7303 if not repo.tagtype(n):
7300 raise error.Abort(_(b"tag '%s' does not exist") % n)
7304 raise error.Abort(_(b"tag '%s' does not exist") % n)
7301 if repo.tagtype(n) != expectedtype:
7305 if repo.tagtype(n) != expectedtype:
7302 if expectedtype == b'global':
7306 if expectedtype == b'global':
7303 raise error.Abort(
7307 raise error.Abort(
7304 _(b"tag '%s' is not a global tag") % n
7308 _(b"tag '%s' is not a global tag") % n
7305 )
7309 )
7306 else:
7310 else:
7307 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7311 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7308 rev_ = b'null'
7312 rev_ = b'null'
7309 if not message:
7313 if not message:
7310 # we don't translate commit messages
7314 # we don't translate commit messages
7311 message = b'Removed tag %s' % b', '.join(names)
7315 message = b'Removed tag %s' % b', '.join(names)
7312 elif not opts.get(b'force'):
7316 elif not opts.get(b'force'):
7313 for n in names:
7317 for n in names:
7314 if n in repo.tags():
7318 if n in repo.tags():
7315 raise error.Abort(
7319 raise error.Abort(
7316 _(b"tag '%s' already exists (use -f to force)") % n
7320 _(b"tag '%s' already exists (use -f to force)") % n
7317 )
7321 )
7318 if not opts.get(b'local'):
7322 if not opts.get(b'local'):
7319 p1, p2 = repo.dirstate.parents()
7323 p1, p2 = repo.dirstate.parents()
7320 if p2 != nullid:
7324 if p2 != nullid:
7321 raise error.Abort(_(b'uncommitted merge'))
7325 raise error.Abort(_(b'uncommitted merge'))
7322 bheads = repo.branchheads()
7326 bheads = repo.branchheads()
7323 if not opts.get(b'force') and bheads and p1 not in bheads:
7327 if not opts.get(b'force') and bheads and p1 not in bheads:
7324 raise error.Abort(
7328 raise error.Abort(
7325 _(
7329 _(
7326 b'working directory is not at a branch head '
7330 b'working directory is not at a branch head '
7327 b'(use -f to force)'
7331 b'(use -f to force)'
7328 )
7332 )
7329 )
7333 )
7330 node = scmutil.revsingle(repo, rev_).node()
7334 node = scmutil.revsingle(repo, rev_).node()
7331
7335
7332 if not message:
7336 if not message:
7333 # we don't translate commit messages
7337 # we don't translate commit messages
7334 message = b'Added tag %s for changeset %s' % (
7338 message = b'Added tag %s for changeset %s' % (
7335 b', '.join(names),
7339 b', '.join(names),
7336 short(node),
7340 short(node),
7337 )
7341 )
7338
7342
7339 date = opts.get(b'date')
7343 date = opts.get(b'date')
7340 if date:
7344 if date:
7341 date = dateutil.parsedate(date)
7345 date = dateutil.parsedate(date)
7342
7346
7343 if opts.get(b'remove'):
7347 if opts.get(b'remove'):
7344 editform = b'tag.remove'
7348 editform = b'tag.remove'
7345 else:
7349 else:
7346 editform = b'tag.add'
7350 editform = b'tag.add'
7347 editor = cmdutil.getcommiteditor(
7351 editor = cmdutil.getcommiteditor(
7348 editform=editform, **pycompat.strkwargs(opts)
7352 editform=editform, **pycompat.strkwargs(opts)
7349 )
7353 )
7350
7354
7351 # don't allow tagging the null rev
7355 # don't allow tagging the null rev
7352 if (
7356 if (
7353 not opts.get(b'remove')
7357 not opts.get(b'remove')
7354 and scmutil.revsingle(repo, rev_).rev() == nullrev
7358 and scmutil.revsingle(repo, rev_).rev() == nullrev
7355 ):
7359 ):
7356 raise error.Abort(_(b"cannot tag null revision"))
7360 raise error.Abort(_(b"cannot tag null revision"))
7357
7361
7358 tagsmod.tag(
7362 tagsmod.tag(
7359 repo,
7363 repo,
7360 names,
7364 names,
7361 node,
7365 node,
7362 message,
7366 message,
7363 opts.get(b'local'),
7367 opts.get(b'local'),
7364 opts.get(b'user'),
7368 opts.get(b'user'),
7365 date,
7369 date,
7366 editor=editor,
7370 editor=editor,
7367 )
7371 )
7368
7372
7369
7373
7370 @command(
7374 @command(
7371 b'tags',
7375 b'tags',
7372 formatteropts,
7376 formatteropts,
7373 b'',
7377 b'',
7374 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7378 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7375 intents={INTENT_READONLY},
7379 intents={INTENT_READONLY},
7376 )
7380 )
7377 def tags(ui, repo, **opts):
7381 def tags(ui, repo, **opts):
7378 """list repository tags
7382 """list repository tags
7379
7383
7380 This lists both regular and local tags. When the -v/--verbose
7384 This lists both regular and local tags. When the -v/--verbose
7381 switch is used, a third column "local" is printed for local tags.
7385 switch is used, a third column "local" is printed for local tags.
7382 When the -q/--quiet switch is used, only the tag name is printed.
7386 When the -q/--quiet switch is used, only the tag name is printed.
7383
7387
7384 .. container:: verbose
7388 .. container:: verbose
7385
7389
7386 Template:
7390 Template:
7387
7391
7388 The following keywords are supported in addition to the common template
7392 The following keywords are supported in addition to the common template
7389 keywords and functions such as ``{tag}``. See also
7393 keywords and functions such as ``{tag}``. See also
7390 :hg:`help templates`.
7394 :hg:`help templates`.
7391
7395
7392 :type: String. ``local`` for local tags.
7396 :type: String. ``local`` for local tags.
7393
7397
7394 Returns 0 on success.
7398 Returns 0 on success.
7395 """
7399 """
7396
7400
7397 opts = pycompat.byteskwargs(opts)
7401 opts = pycompat.byteskwargs(opts)
7398 ui.pager(b'tags')
7402 ui.pager(b'tags')
7399 fm = ui.formatter(b'tags', opts)
7403 fm = ui.formatter(b'tags', opts)
7400 hexfunc = fm.hexfunc
7404 hexfunc = fm.hexfunc
7401
7405
7402 for t, n in reversed(repo.tagslist()):
7406 for t, n in reversed(repo.tagslist()):
7403 hn = hexfunc(n)
7407 hn = hexfunc(n)
7404 label = b'tags.normal'
7408 label = b'tags.normal'
7405 tagtype = b''
7409 tagtype = b''
7406 if repo.tagtype(t) == b'local':
7410 if repo.tagtype(t) == b'local':
7407 label = b'tags.local'
7411 label = b'tags.local'
7408 tagtype = b'local'
7412 tagtype = b'local'
7409
7413
7410 fm.startitem()
7414 fm.startitem()
7411 fm.context(repo=repo)
7415 fm.context(repo=repo)
7412 fm.write(b'tag', b'%s', t, label=label)
7416 fm.write(b'tag', b'%s', t, label=label)
7413 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7417 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7414 fm.condwrite(
7418 fm.condwrite(
7415 not ui.quiet,
7419 not ui.quiet,
7416 b'rev node',
7420 b'rev node',
7417 fmt,
7421 fmt,
7418 repo.changelog.rev(n),
7422 repo.changelog.rev(n),
7419 hn,
7423 hn,
7420 label=label,
7424 label=label,
7421 )
7425 )
7422 fm.condwrite(
7426 fm.condwrite(
7423 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7427 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7424 )
7428 )
7425 fm.plain(b'\n')
7429 fm.plain(b'\n')
7426 fm.end()
7430 fm.end()
7427
7431
7428
7432
7429 @command(
7433 @command(
7430 b'tip',
7434 b'tip',
7431 [
7435 [
7432 (b'p', b'patch', None, _(b'show patch')),
7436 (b'p', b'patch', None, _(b'show patch')),
7433 (b'g', b'git', None, _(b'use git extended diff format')),
7437 (b'g', b'git', None, _(b'use git extended diff format')),
7434 ]
7438 ]
7435 + templateopts,
7439 + templateopts,
7436 _(b'[-p] [-g]'),
7440 _(b'[-p] [-g]'),
7437 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7441 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7438 )
7442 )
7439 def tip(ui, repo, **opts):
7443 def tip(ui, repo, **opts):
7440 """show the tip revision (DEPRECATED)
7444 """show the tip revision (DEPRECATED)
7441
7445
7442 The tip revision (usually just called the tip) is the changeset
7446 The tip revision (usually just called the tip) is the changeset
7443 most recently added to the repository (and therefore the most
7447 most recently added to the repository (and therefore the most
7444 recently changed head).
7448 recently changed head).
7445
7449
7446 If you have just made a commit, that commit will be the tip. If
7450 If you have just made a commit, that commit will be the tip. If
7447 you have just pulled changes from another repository, the tip of
7451 you have just pulled changes from another repository, the tip of
7448 that repository becomes the current tip. The "tip" tag is special
7452 that repository becomes the current tip. The "tip" tag is special
7449 and cannot be renamed or assigned to a different changeset.
7453 and cannot be renamed or assigned to a different changeset.
7450
7454
7451 This command is deprecated, please use :hg:`heads` instead.
7455 This command is deprecated, please use :hg:`heads` instead.
7452
7456
7453 Returns 0 on success.
7457 Returns 0 on success.
7454 """
7458 """
7455 opts = pycompat.byteskwargs(opts)
7459 opts = pycompat.byteskwargs(opts)
7456 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7460 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7457 displayer.show(repo[b'tip'])
7461 displayer.show(repo[b'tip'])
7458 displayer.close()
7462 displayer.close()
7459
7463
7460
7464
7461 @command(
7465 @command(
7462 b'unbundle',
7466 b'unbundle',
7463 [
7467 [
7464 (
7468 (
7465 b'u',
7469 b'u',
7466 b'update',
7470 b'update',
7467 None,
7471 None,
7468 _(b'update to new branch head if changesets were unbundled'),
7472 _(b'update to new branch head if changesets were unbundled'),
7469 )
7473 )
7470 ],
7474 ],
7471 _(b'[-u] FILE...'),
7475 _(b'[-u] FILE...'),
7472 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7476 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7473 )
7477 )
7474 def unbundle(ui, repo, fname1, *fnames, **opts):
7478 def unbundle(ui, repo, fname1, *fnames, **opts):
7475 """apply one or more bundle files
7479 """apply one or more bundle files
7476
7480
7477 Apply one or more bundle files generated by :hg:`bundle`.
7481 Apply one or more bundle files generated by :hg:`bundle`.
7478
7482
7479 Returns 0 on success, 1 if an update has unresolved files.
7483 Returns 0 on success, 1 if an update has unresolved files.
7480 """
7484 """
7481 fnames = (fname1,) + fnames
7485 fnames = (fname1,) + fnames
7482
7486
7483 with repo.lock():
7487 with repo.lock():
7484 for fname in fnames:
7488 for fname in fnames:
7485 f = hg.openpath(ui, fname)
7489 f = hg.openpath(ui, fname)
7486 gen = exchange.readbundle(ui, f, fname)
7490 gen = exchange.readbundle(ui, f, fname)
7487 if isinstance(gen, streamclone.streamcloneapplier):
7491 if isinstance(gen, streamclone.streamcloneapplier):
7488 raise error.Abort(
7492 raise error.Abort(
7489 _(
7493 _(
7490 b'packed bundles cannot be applied with '
7494 b'packed bundles cannot be applied with '
7491 b'"hg unbundle"'
7495 b'"hg unbundle"'
7492 ),
7496 ),
7493 hint=_(b'use "hg debugapplystreamclonebundle"'),
7497 hint=_(b'use "hg debugapplystreamclonebundle"'),
7494 )
7498 )
7495 url = b'bundle:' + fname
7499 url = b'bundle:' + fname
7496 try:
7500 try:
7497 txnname = b'unbundle'
7501 txnname = b'unbundle'
7498 if not isinstance(gen, bundle2.unbundle20):
7502 if not isinstance(gen, bundle2.unbundle20):
7499 txnname = b'unbundle\n%s' % util.hidepassword(url)
7503 txnname = b'unbundle\n%s' % util.hidepassword(url)
7500 with repo.transaction(txnname) as tr:
7504 with repo.transaction(txnname) as tr:
7501 op = bundle2.applybundle(
7505 op = bundle2.applybundle(
7502 repo, gen, tr, source=b'unbundle', url=url
7506 repo, gen, tr, source=b'unbundle', url=url
7503 )
7507 )
7504 except error.BundleUnknownFeatureError as exc:
7508 except error.BundleUnknownFeatureError as exc:
7505 raise error.Abort(
7509 raise error.Abort(
7506 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7510 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7507 hint=_(
7511 hint=_(
7508 b"see https://mercurial-scm.org/"
7512 b"see https://mercurial-scm.org/"
7509 b"wiki/BundleFeature for more "
7513 b"wiki/BundleFeature for more "
7510 b"information"
7514 b"information"
7511 ),
7515 ),
7512 )
7516 )
7513 modheads = bundle2.combinechangegroupresults(op)
7517 modheads = bundle2.combinechangegroupresults(op)
7514
7518
7515 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7519 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7516
7520
7517
7521
7518 @command(
7522 @command(
7519 b'unshelve',
7523 b'unshelve',
7520 [
7524 [
7521 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7525 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7522 (
7526 (
7523 b'c',
7527 b'c',
7524 b'continue',
7528 b'continue',
7525 None,
7529 None,
7526 _(b'continue an incomplete unshelve operation'),
7530 _(b'continue an incomplete unshelve operation'),
7527 ),
7531 ),
7528 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7532 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7529 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7533 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7530 (
7534 (
7531 b'n',
7535 b'n',
7532 b'name',
7536 b'name',
7533 b'',
7537 b'',
7534 _(b'restore shelved change with given name'),
7538 _(b'restore shelved change with given name'),
7535 _(b'NAME'),
7539 _(b'NAME'),
7536 ),
7540 ),
7537 (b't', b'tool', b'', _(b'specify merge tool')),
7541 (b't', b'tool', b'', _(b'specify merge tool')),
7538 (
7542 (
7539 b'',
7543 b'',
7540 b'date',
7544 b'date',
7541 b'',
7545 b'',
7542 _(b'set date for temporary commits (DEPRECATED)'),
7546 _(b'set date for temporary commits (DEPRECATED)'),
7543 _(b'DATE'),
7547 _(b'DATE'),
7544 ),
7548 ),
7545 ],
7549 ],
7546 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7550 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7547 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7551 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7548 )
7552 )
7549 def unshelve(ui, repo, *shelved, **opts):
7553 def unshelve(ui, repo, *shelved, **opts):
7550 """restore a shelved change to the working directory
7554 """restore a shelved change to the working directory
7551
7555
7552 This command accepts an optional name of a shelved change to
7556 This command accepts an optional name of a shelved change to
7553 restore. If none is given, the most recent shelved change is used.
7557 restore. If none is given, the most recent shelved change is used.
7554
7558
7555 If a shelved change is applied successfully, the bundle that
7559 If a shelved change is applied successfully, the bundle that
7556 contains the shelved changes is moved to a backup location
7560 contains the shelved changes is moved to a backup location
7557 (.hg/shelve-backup).
7561 (.hg/shelve-backup).
7558
7562
7559 Since you can restore a shelved change on top of an arbitrary
7563 Since you can restore a shelved change on top of an arbitrary
7560 commit, it is possible that unshelving will result in a conflict
7564 commit, it is possible that unshelving will result in a conflict
7561 between your changes and the commits you are unshelving onto. If
7565 between your changes and the commits you are unshelving onto. If
7562 this occurs, you must resolve the conflict, then use
7566 this occurs, you must resolve the conflict, then use
7563 ``--continue`` to complete the unshelve operation. (The bundle
7567 ``--continue`` to complete the unshelve operation. (The bundle
7564 will not be moved until you successfully complete the unshelve.)
7568 will not be moved until you successfully complete the unshelve.)
7565
7569
7566 (Alternatively, you can use ``--abort`` to abandon an unshelve
7570 (Alternatively, you can use ``--abort`` to abandon an unshelve
7567 that causes a conflict. This reverts the unshelved changes, and
7571 that causes a conflict. This reverts the unshelved changes, and
7568 leaves the bundle in place.)
7572 leaves the bundle in place.)
7569
7573
7570 If bare shelved change (without interactive, include and exclude
7574 If bare shelved change (without interactive, include and exclude
7571 option) was done on newly created branch it would restore branch
7575 option) was done on newly created branch it would restore branch
7572 information to the working directory.
7576 information to the working directory.
7573
7577
7574 After a successful unshelve, the shelved changes are stored in a
7578 After a successful unshelve, the shelved changes are stored in a
7575 backup directory. Only the N most recent backups are kept. N
7579 backup directory. Only the N most recent backups are kept. N
7576 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7580 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7577 configuration option.
7581 configuration option.
7578
7582
7579 .. container:: verbose
7583 .. container:: verbose
7580
7584
7581 Timestamp in seconds is used to decide order of backups. More
7585 Timestamp in seconds is used to decide order of backups. More
7582 than ``maxbackups`` backups are kept, if same timestamp
7586 than ``maxbackups`` backups are kept, if same timestamp
7583 prevents from deciding exact order of them, for safety.
7587 prevents from deciding exact order of them, for safety.
7584
7588
7585 Selected changes can be unshelved with ``--interactive`` flag.
7589 Selected changes can be unshelved with ``--interactive`` flag.
7586 The working directory is updated with the selected changes, and
7590 The working directory is updated with the selected changes, and
7587 only the unselected changes remain shelved.
7591 only the unselected changes remain shelved.
7588 Note: The whole shelve is applied to working directory first before
7592 Note: The whole shelve is applied to working directory first before
7589 running interactively. So, this will bring up all the conflicts between
7593 running interactively. So, this will bring up all the conflicts between
7590 working directory and the shelve, irrespective of which changes will be
7594 working directory and the shelve, irrespective of which changes will be
7591 unshelved.
7595 unshelved.
7592 """
7596 """
7593 with repo.wlock():
7597 with repo.wlock():
7594 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7598 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7595
7599
7596
7600
7597 statemod.addunfinished(
7601 statemod.addunfinished(
7598 b'unshelve',
7602 b'unshelve',
7599 fname=b'shelvedstate',
7603 fname=b'shelvedstate',
7600 continueflag=True,
7604 continueflag=True,
7601 abortfunc=shelvemod.hgabortunshelve,
7605 abortfunc=shelvemod.hgabortunshelve,
7602 continuefunc=shelvemod.hgcontinueunshelve,
7606 continuefunc=shelvemod.hgcontinueunshelve,
7603 cmdmsg=_(b'unshelve already in progress'),
7607 cmdmsg=_(b'unshelve already in progress'),
7604 )
7608 )
7605
7609
7606
7610
7607 @command(
7611 @command(
7608 b'update|up|checkout|co',
7612 b'update|up|checkout|co',
7609 [
7613 [
7610 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7614 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7611 (b'c', b'check', None, _(b'require clean working directory')),
7615 (b'c', b'check', None, _(b'require clean working directory')),
7612 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7616 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7613 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7617 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7614 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7618 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7615 ]
7619 ]
7616 + mergetoolopts,
7620 + mergetoolopts,
7617 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7621 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7618 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7622 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7619 helpbasic=True,
7623 helpbasic=True,
7620 )
7624 )
7621 def update(ui, repo, node=None, **opts):
7625 def update(ui, repo, node=None, **opts):
7622 """update working directory (or switch revisions)
7626 """update working directory (or switch revisions)
7623
7627
7624 Update the repository's working directory to the specified
7628 Update the repository's working directory to the specified
7625 changeset. If no changeset is specified, update to the tip of the
7629 changeset. If no changeset is specified, update to the tip of the
7626 current named branch and move the active bookmark (see :hg:`help
7630 current named branch and move the active bookmark (see :hg:`help
7627 bookmarks`).
7631 bookmarks`).
7628
7632
7629 Update sets the working directory's parent revision to the specified
7633 Update sets the working directory's parent revision to the specified
7630 changeset (see :hg:`help parents`).
7634 changeset (see :hg:`help parents`).
7631
7635
7632 If the changeset is not a descendant or ancestor of the working
7636 If the changeset is not a descendant or ancestor of the working
7633 directory's parent and there are uncommitted changes, the update is
7637 directory's parent and there are uncommitted changes, the update is
7634 aborted. With the -c/--check option, the working directory is checked
7638 aborted. With the -c/--check option, the working directory is checked
7635 for uncommitted changes; if none are found, the working directory is
7639 for uncommitted changes; if none are found, the working directory is
7636 updated to the specified changeset.
7640 updated to the specified changeset.
7637
7641
7638 .. container:: verbose
7642 .. container:: verbose
7639
7643
7640 The -C/--clean, -c/--check, and -m/--merge options control what
7644 The -C/--clean, -c/--check, and -m/--merge options control what
7641 happens if the working directory contains uncommitted changes.
7645 happens if the working directory contains uncommitted changes.
7642 At most of one of them can be specified.
7646 At most of one of them can be specified.
7643
7647
7644 1. If no option is specified, and if
7648 1. If no option is specified, and if
7645 the requested changeset is an ancestor or descendant of
7649 the requested changeset is an ancestor or descendant of
7646 the working directory's parent, the uncommitted changes
7650 the working directory's parent, the uncommitted changes
7647 are merged into the requested changeset and the merged
7651 are merged into the requested changeset and the merged
7648 result is left uncommitted. If the requested changeset is
7652 result is left uncommitted. If the requested changeset is
7649 not an ancestor or descendant (that is, it is on another
7653 not an ancestor or descendant (that is, it is on another
7650 branch), the update is aborted and the uncommitted changes
7654 branch), the update is aborted and the uncommitted changes
7651 are preserved.
7655 are preserved.
7652
7656
7653 2. With the -m/--merge option, the update is allowed even if the
7657 2. With the -m/--merge option, the update is allowed even if the
7654 requested changeset is not an ancestor or descendant of
7658 requested changeset is not an ancestor or descendant of
7655 the working directory's parent.
7659 the working directory's parent.
7656
7660
7657 3. With the -c/--check option, the update is aborted and the
7661 3. With the -c/--check option, the update is aborted and the
7658 uncommitted changes are preserved.
7662 uncommitted changes are preserved.
7659
7663
7660 4. With the -C/--clean option, uncommitted changes are discarded and
7664 4. With the -C/--clean option, uncommitted changes are discarded and
7661 the working directory is updated to the requested changeset.
7665 the working directory is updated to the requested changeset.
7662
7666
7663 To cancel an uncommitted merge (and lose your changes), use
7667 To cancel an uncommitted merge (and lose your changes), use
7664 :hg:`merge --abort`.
7668 :hg:`merge --abort`.
7665
7669
7666 Use null as the changeset to remove the working directory (like
7670 Use null as the changeset to remove the working directory (like
7667 :hg:`clone -U`).
7671 :hg:`clone -U`).
7668
7672
7669 If you want to revert just one file to an older revision, use
7673 If you want to revert just one file to an older revision, use
7670 :hg:`revert [-r REV] NAME`.
7674 :hg:`revert [-r REV] NAME`.
7671
7675
7672 See :hg:`help dates` for a list of formats valid for -d/--date.
7676 See :hg:`help dates` for a list of formats valid for -d/--date.
7673
7677
7674 Returns 0 on success, 1 if there are unresolved files.
7678 Returns 0 on success, 1 if there are unresolved files.
7675 """
7679 """
7676 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7680 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7677 rev = opts.get('rev')
7681 rev = opts.get('rev')
7678 date = opts.get('date')
7682 date = opts.get('date')
7679 clean = opts.get('clean')
7683 clean = opts.get('clean')
7680 check = opts.get('check')
7684 check = opts.get('check')
7681 merge = opts.get('merge')
7685 merge = opts.get('merge')
7682 if rev and node:
7686 if rev and node:
7683 raise error.Abort(_(b"please specify just one revision"))
7687 raise error.Abort(_(b"please specify just one revision"))
7684
7688
7685 if ui.configbool(b'commands', b'update.requiredest'):
7689 if ui.configbool(b'commands', b'update.requiredest'):
7686 if not node and not rev and not date:
7690 if not node and not rev and not date:
7687 raise error.Abort(
7691 raise error.Abort(
7688 _(b'you must specify a destination'),
7692 _(b'you must specify a destination'),
7689 hint=_(b'for example: hg update ".::"'),
7693 hint=_(b'for example: hg update ".::"'),
7690 )
7694 )
7691
7695
7692 if rev is None or rev == b'':
7696 if rev is None or rev == b'':
7693 rev = node
7697 rev = node
7694
7698
7695 if date and rev is not None:
7699 if date and rev is not None:
7696 raise error.Abort(_(b"you can't specify a revision and a date"))
7700 raise error.Abort(_(b"you can't specify a revision and a date"))
7697
7701
7698 updatecheck = None
7702 updatecheck = None
7699 if check:
7703 if check:
7700 updatecheck = b'abort'
7704 updatecheck = b'abort'
7701 elif merge:
7705 elif merge:
7702 updatecheck = b'none'
7706 updatecheck = b'none'
7703
7707
7704 with repo.wlock():
7708 with repo.wlock():
7705 cmdutil.clearunfinished(repo)
7709 cmdutil.clearunfinished(repo)
7706 if date:
7710 if date:
7707 rev = cmdutil.finddate(ui, repo, date)
7711 rev = cmdutil.finddate(ui, repo, date)
7708
7712
7709 # if we defined a bookmark, we have to remember the original name
7713 # if we defined a bookmark, we have to remember the original name
7710 brev = rev
7714 brev = rev
7711 if rev:
7715 if rev:
7712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7716 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7713 ctx = scmutil.revsingle(repo, rev, default=None)
7717 ctx = scmutil.revsingle(repo, rev, default=None)
7714 rev = ctx.rev()
7718 rev = ctx.rev()
7715 hidden = ctx.hidden()
7719 hidden = ctx.hidden()
7716 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7720 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7717 with ui.configoverride(overrides, b'update'):
7721 with ui.configoverride(overrides, b'update'):
7718 ret = hg.updatetotally(
7722 ret = hg.updatetotally(
7719 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7723 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7720 )
7724 )
7721 if hidden:
7725 if hidden:
7722 ctxstr = ctx.hex()[:12]
7726 ctxstr = ctx.hex()[:12]
7723 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7727 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7724
7728
7725 if ctx.obsolete():
7729 if ctx.obsolete():
7726 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7730 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7727 ui.warn(b"(%s)\n" % obsfatemsg)
7731 ui.warn(b"(%s)\n" % obsfatemsg)
7728 return ret
7732 return ret
7729
7733
7730
7734
7731 @command(
7735 @command(
7732 b'verify',
7736 b'verify',
7733 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7737 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7734 helpcategory=command.CATEGORY_MAINTENANCE,
7738 helpcategory=command.CATEGORY_MAINTENANCE,
7735 )
7739 )
7736 def verify(ui, repo, **opts):
7740 def verify(ui, repo, **opts):
7737 """verify the integrity of the repository
7741 """verify the integrity of the repository
7738
7742
7739 Verify the integrity of the current repository.
7743 Verify the integrity of the current repository.
7740
7744
7741 This will perform an extensive check of the repository's
7745 This will perform an extensive check of the repository's
7742 integrity, validating the hashes and checksums of each entry in
7746 integrity, validating the hashes and checksums of each entry in
7743 the changelog, manifest, and tracked files, as well as the
7747 the changelog, manifest, and tracked files, as well as the
7744 integrity of their crosslinks and indices.
7748 integrity of their crosslinks and indices.
7745
7749
7746 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7750 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7747 for more information about recovery from corruption of the
7751 for more information about recovery from corruption of the
7748 repository.
7752 repository.
7749
7753
7750 Returns 0 on success, 1 if errors are encountered.
7754 Returns 0 on success, 1 if errors are encountered.
7751 """
7755 """
7752 opts = pycompat.byteskwargs(opts)
7756 opts = pycompat.byteskwargs(opts)
7753
7757
7754 level = None
7758 level = None
7755 if opts[b'full']:
7759 if opts[b'full']:
7756 level = verifymod.VERIFY_FULL
7760 level = verifymod.VERIFY_FULL
7757 return hg.verify(repo, level)
7761 return hg.verify(repo, level)
7758
7762
7759
7763
7760 @command(
7764 @command(
7761 b'version',
7765 b'version',
7762 [] + formatteropts,
7766 [] + formatteropts,
7763 helpcategory=command.CATEGORY_HELP,
7767 helpcategory=command.CATEGORY_HELP,
7764 norepo=True,
7768 norepo=True,
7765 intents={INTENT_READONLY},
7769 intents={INTENT_READONLY},
7766 )
7770 )
7767 def version_(ui, **opts):
7771 def version_(ui, **opts):
7768 """output version and copyright information
7772 """output version and copyright information
7769
7773
7770 .. container:: verbose
7774 .. container:: verbose
7771
7775
7772 Template:
7776 Template:
7773
7777
7774 The following keywords are supported. See also :hg:`help templates`.
7778 The following keywords are supported. See also :hg:`help templates`.
7775
7779
7776 :extensions: List of extensions.
7780 :extensions: List of extensions.
7777 :ver: String. Version number.
7781 :ver: String. Version number.
7778
7782
7779 And each entry of ``{extensions}`` provides the following sub-keywords
7783 And each entry of ``{extensions}`` provides the following sub-keywords
7780 in addition to ``{ver}``.
7784 in addition to ``{ver}``.
7781
7785
7782 :bundled: Boolean. True if included in the release.
7786 :bundled: Boolean. True if included in the release.
7783 :name: String. Extension name.
7787 :name: String. Extension name.
7784 """
7788 """
7785 opts = pycompat.byteskwargs(opts)
7789 opts = pycompat.byteskwargs(opts)
7786 if ui.verbose:
7790 if ui.verbose:
7787 ui.pager(b'version')
7791 ui.pager(b'version')
7788 fm = ui.formatter(b"version", opts)
7792 fm = ui.formatter(b"version", opts)
7789 fm.startitem()
7793 fm.startitem()
7790 fm.write(
7794 fm.write(
7791 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7795 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7792 )
7796 )
7793 license = _(
7797 license = _(
7794 b"(see https://mercurial-scm.org for more information)\n"
7798 b"(see https://mercurial-scm.org for more information)\n"
7795 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7799 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7796 b"This is free software; see the source for copying conditions. "
7800 b"This is free software; see the source for copying conditions. "
7797 b"There is NO\nwarranty; "
7801 b"There is NO\nwarranty; "
7798 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7802 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7799 )
7803 )
7800 if not ui.quiet:
7804 if not ui.quiet:
7801 fm.plain(license)
7805 fm.plain(license)
7802
7806
7803 if ui.verbose:
7807 if ui.verbose:
7804 fm.plain(_(b"\nEnabled extensions:\n\n"))
7808 fm.plain(_(b"\nEnabled extensions:\n\n"))
7805 # format names and versions into columns
7809 # format names and versions into columns
7806 names = []
7810 names = []
7807 vers = []
7811 vers = []
7808 isinternals = []
7812 isinternals = []
7809 for name, module in extensions.extensions():
7813 for name, module in extensions.extensions():
7810 names.append(name)
7814 names.append(name)
7811 vers.append(extensions.moduleversion(module) or None)
7815 vers.append(extensions.moduleversion(module) or None)
7812 isinternals.append(extensions.ismoduleinternal(module))
7816 isinternals.append(extensions.ismoduleinternal(module))
7813 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7817 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7814 if names:
7818 if names:
7815 namefmt = b" %%-%ds " % max(len(n) for n in names)
7819 namefmt = b" %%-%ds " % max(len(n) for n in names)
7816 places = [_(b"external"), _(b"internal")]
7820 places = [_(b"external"), _(b"internal")]
7817 for n, v, p in zip(names, vers, isinternals):
7821 for n, v, p in zip(names, vers, isinternals):
7818 fn.startitem()
7822 fn.startitem()
7819 fn.condwrite(ui.verbose, b"name", namefmt, n)
7823 fn.condwrite(ui.verbose, b"name", namefmt, n)
7820 if ui.verbose:
7824 if ui.verbose:
7821 fn.plain(b"%s " % places[p])
7825 fn.plain(b"%s " % places[p])
7822 fn.data(bundled=p)
7826 fn.data(bundled=p)
7823 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7827 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7824 if ui.verbose:
7828 if ui.verbose:
7825 fn.plain(b"\n")
7829 fn.plain(b"\n")
7826 fn.end()
7830 fn.end()
7827 fm.end()
7831 fm.end()
7828
7832
7829
7833
7830 def loadcmdtable(ui, name, cmdtable):
7834 def loadcmdtable(ui, name, cmdtable):
7831 """Load command functions from specified cmdtable
7835 """Load command functions from specified cmdtable
7832 """
7836 """
7833 overrides = [cmd for cmd in cmdtable if cmd in table]
7837 overrides = [cmd for cmd in cmdtable if cmd in table]
7834 if overrides:
7838 if overrides:
7835 ui.warn(
7839 ui.warn(
7836 _(b"extension '%s' overrides commands: %s\n")
7840 _(b"extension '%s' overrides commands: %s\n")
7837 % (name, b" ".join(overrides))
7841 % (name, b" ".join(overrides))
7838 )
7842 )
7839 table.update(cmdtable)
7843 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now