##// END OF EJS Templates
ui: add the ability to apply `defaultrc` configs from resources...
Matt Harbison -
r44483:1864efbe default
parent child Browse files
Show More
@@ -1,7829 +1,7831 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, hex(repo.changelog.tip()))
879 return hg.merge(repo, hex(repo.changelog.tip()))
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
1239 cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
1240 if not names and action in {b'add', b'delete'}:
1240 if not names and action in {b'add', b'delete'}:
1241 raise error.Abort(_(b"bookmark name required"))
1241 raise error.Abort(_(b"bookmark name required"))
1242
1242
1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1245 if action == b'delete':
1245 if action == b'delete':
1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1247 bookmarks.delete(repo, tr, names)
1247 bookmarks.delete(repo, tr, names)
1248 elif action == b'rename':
1248 elif action == b'rename':
1249 if not names:
1249 if not names:
1250 raise error.Abort(_(b"new bookmark name required"))
1250 raise error.Abort(_(b"new bookmark name required"))
1251 elif len(names) > 1:
1251 elif len(names) > 1:
1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1255 elif action == b'add':
1255 elif action == b'add':
1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1257 elif action == b'inactive':
1257 elif action == b'inactive':
1258 if len(repo._bookmarks) == 0:
1258 if len(repo._bookmarks) == 0:
1259 ui.status(_(b"no bookmarks set\n"))
1259 ui.status(_(b"no bookmarks set\n"))
1260 elif not repo._activebookmark:
1260 elif not repo._activebookmark:
1261 ui.status(_(b"no active bookmark\n"))
1261 ui.status(_(b"no active bookmark\n"))
1262 else:
1262 else:
1263 bookmarks.deactivate(repo)
1263 bookmarks.deactivate(repo)
1264 elif action == b'list':
1264 elif action == b'list':
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 with ui.formatter(b'bookmarks', opts) as fm:
1266 with ui.formatter(b'bookmarks', opts) as fm:
1267 bookmarks.printbookmarks(ui, repo, fm, names)
1267 bookmarks.printbookmarks(ui, repo, fm, names)
1268 else:
1268 else:
1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1270
1270
1271
1271
1272 @command(
1272 @command(
1273 b'branch',
1273 b'branch',
1274 [
1274 [
1275 (
1275 (
1276 b'f',
1276 b'f',
1277 b'force',
1277 b'force',
1278 None,
1278 None,
1279 _(b'set branch name even if it shadows an existing branch'),
1279 _(b'set branch name even if it shadows an existing branch'),
1280 ),
1280 ),
1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1282 (
1282 (
1283 b'r',
1283 b'r',
1284 b'rev',
1284 b'rev',
1285 [],
1285 [],
1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1287 ),
1287 ),
1288 ],
1288 ],
1289 _(b'[-fC] [NAME]'),
1289 _(b'[-fC] [NAME]'),
1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1291 )
1291 )
1292 def branch(ui, repo, label=None, **opts):
1292 def branch(ui, repo, label=None, **opts):
1293 """set or show the current branch name
1293 """set or show the current branch name
1294
1294
1295 .. note::
1295 .. note::
1296
1296
1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1298 light-weight bookmark instead. See :hg:`help glossary` for more
1298 light-weight bookmark instead. See :hg:`help glossary` for more
1299 information about named branches and bookmarks.
1299 information about named branches and bookmarks.
1300
1300
1301 With no argument, show the current branch name. With one argument,
1301 With no argument, show the current branch name. With one argument,
1302 set the working directory branch name (the branch will not exist
1302 set the working directory branch name (the branch will not exist
1303 in the repository until the next commit). Standard practice
1303 in the repository until the next commit). Standard practice
1304 recommends that primary development take place on the 'default'
1304 recommends that primary development take place on the 'default'
1305 branch.
1305 branch.
1306
1306
1307 Unless -f/--force is specified, branch will not let you set a
1307 Unless -f/--force is specified, branch will not let you set a
1308 branch name that already exists.
1308 branch name that already exists.
1309
1309
1310 Use -C/--clean to reset the working directory branch to that of
1310 Use -C/--clean to reset the working directory branch to that of
1311 the parent of the working directory, negating a previous branch
1311 the parent of the working directory, negating a previous branch
1312 change.
1312 change.
1313
1313
1314 Use the command :hg:`update` to switch to an existing branch. Use
1314 Use the command :hg:`update` to switch to an existing branch. Use
1315 :hg:`commit --close-branch` to mark this branch head as closed.
1315 :hg:`commit --close-branch` to mark this branch head as closed.
1316 When all heads of a branch are closed, the branch will be
1316 When all heads of a branch are closed, the branch will be
1317 considered closed.
1317 considered closed.
1318
1318
1319 Returns 0 on success.
1319 Returns 0 on success.
1320 """
1320 """
1321 opts = pycompat.byteskwargs(opts)
1321 opts = pycompat.byteskwargs(opts)
1322 revs = opts.get(b'rev')
1322 revs = opts.get(b'rev')
1323 if label:
1323 if label:
1324 label = label.strip()
1324 label = label.strip()
1325
1325
1326 if not opts.get(b'clean') and not label:
1326 if not opts.get(b'clean') and not label:
1327 if revs:
1327 if revs:
1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1329 ui.write(b"%s\n" % repo.dirstate.branch())
1329 ui.write(b"%s\n" % repo.dirstate.branch())
1330 return
1330 return
1331
1331
1332 with repo.wlock():
1332 with repo.wlock():
1333 if opts.get(b'clean'):
1333 if opts.get(b'clean'):
1334 label = repo[b'.'].branch()
1334 label = repo[b'.'].branch()
1335 repo.dirstate.setbranch(label)
1335 repo.dirstate.setbranch(label)
1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1337 elif label:
1337 elif label:
1338
1338
1339 scmutil.checknewlabel(repo, label, b'branch')
1339 scmutil.checknewlabel(repo, label, b'branch')
1340 if revs:
1340 if revs:
1341 return cmdutil.changebranch(ui, repo, revs, label)
1341 return cmdutil.changebranch(ui, repo, revs, label)
1342
1342
1343 if not opts.get(b'force') and label in repo.branchmap():
1343 if not opts.get(b'force') and label in repo.branchmap():
1344 if label not in [p.branch() for p in repo[None].parents()]:
1344 if label not in [p.branch() for p in repo[None].parents()]:
1345 raise error.Abort(
1345 raise error.Abort(
1346 _(b'a branch of the same name already exists'),
1346 _(b'a branch of the same name already exists'),
1347 # i18n: "it" refers to an existing branch
1347 # i18n: "it" refers to an existing branch
1348 hint=_(b"use 'hg update' to switch to it"),
1348 hint=_(b"use 'hg update' to switch to it"),
1349 )
1349 )
1350
1350
1351 repo.dirstate.setbranch(label)
1351 repo.dirstate.setbranch(label)
1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1353
1353
1354 # find any open named branches aside from default
1354 # find any open named branches aside from default
1355 for n, h, t, c in repo.branchmap().iterbranches():
1355 for n, h, t, c in repo.branchmap().iterbranches():
1356 if n != b"default" and not c:
1356 if n != b"default" and not c:
1357 return 0
1357 return 0
1358 ui.status(
1358 ui.status(
1359 _(
1359 _(
1360 b'(branches are permanent and global, '
1360 b'(branches are permanent and global, '
1361 b'did you want a bookmark?)\n'
1361 b'did you want a bookmark?)\n'
1362 )
1362 )
1363 )
1363 )
1364
1364
1365
1365
1366 @command(
1366 @command(
1367 b'branches',
1367 b'branches',
1368 [
1368 [
1369 (
1369 (
1370 b'a',
1370 b'a',
1371 b'active',
1371 b'active',
1372 False,
1372 False,
1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1374 ),
1374 ),
1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1377 ]
1377 ]
1378 + formatteropts,
1378 + formatteropts,
1379 _(b'[-c]'),
1379 _(b'[-c]'),
1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1381 intents={INTENT_READONLY},
1381 intents={INTENT_READONLY},
1382 )
1382 )
1383 def branches(ui, repo, active=False, closed=False, **opts):
1383 def branches(ui, repo, active=False, closed=False, **opts):
1384 """list repository named branches
1384 """list repository named branches
1385
1385
1386 List the repository's named branches, indicating which ones are
1386 List the repository's named branches, indicating which ones are
1387 inactive. If -c/--closed is specified, also list branches which have
1387 inactive. If -c/--closed is specified, also list branches which have
1388 been marked closed (see :hg:`commit --close-branch`).
1388 been marked closed (see :hg:`commit --close-branch`).
1389
1389
1390 Use the command :hg:`update` to switch to an existing branch.
1390 Use the command :hg:`update` to switch to an existing branch.
1391
1391
1392 .. container:: verbose
1392 .. container:: verbose
1393
1393
1394 Template:
1394 Template:
1395
1395
1396 The following keywords are supported in addition to the common template
1396 The following keywords are supported in addition to the common template
1397 keywords and functions such as ``{branch}``. See also
1397 keywords and functions such as ``{branch}``. See also
1398 :hg:`help templates`.
1398 :hg:`help templates`.
1399
1399
1400 :active: Boolean. True if the branch is active.
1400 :active: Boolean. True if the branch is active.
1401 :closed: Boolean. True if the branch is closed.
1401 :closed: Boolean. True if the branch is closed.
1402 :current: Boolean. True if it is the current branch.
1402 :current: Boolean. True if it is the current branch.
1403
1403
1404 Returns 0.
1404 Returns 0.
1405 """
1405 """
1406
1406
1407 opts = pycompat.byteskwargs(opts)
1407 opts = pycompat.byteskwargs(opts)
1408 revs = opts.get(b'rev')
1408 revs = opts.get(b'rev')
1409 selectedbranches = None
1409 selectedbranches = None
1410 if revs:
1410 if revs:
1411 revs = scmutil.revrange(repo, revs)
1411 revs = scmutil.revrange(repo, revs)
1412 getbi = repo.revbranchcache().branchinfo
1412 getbi = repo.revbranchcache().branchinfo
1413 selectedbranches = {getbi(r)[0] for r in revs}
1413 selectedbranches = {getbi(r)[0] for r in revs}
1414
1414
1415 ui.pager(b'branches')
1415 ui.pager(b'branches')
1416 fm = ui.formatter(b'branches', opts)
1416 fm = ui.formatter(b'branches', opts)
1417 hexfunc = fm.hexfunc
1417 hexfunc = fm.hexfunc
1418
1418
1419 allheads = set(repo.heads())
1419 allheads = set(repo.heads())
1420 branches = []
1420 branches = []
1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1422 if selectedbranches is not None and tag not in selectedbranches:
1422 if selectedbranches is not None and tag not in selectedbranches:
1423 continue
1423 continue
1424 isactive = False
1424 isactive = False
1425 if not isclosed:
1425 if not isclosed:
1426 openheads = set(repo.branchmap().iteropen(heads))
1426 openheads = set(repo.branchmap().iteropen(heads))
1427 isactive = bool(openheads & allheads)
1427 isactive = bool(openheads & allheads)
1428 branches.append((tag, repo[tip], isactive, not isclosed))
1428 branches.append((tag, repo[tip], isactive, not isclosed))
1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1430
1430
1431 for tag, ctx, isactive, isopen in branches:
1431 for tag, ctx, isactive, isopen in branches:
1432 if active and not isactive:
1432 if active and not isactive:
1433 continue
1433 continue
1434 if isactive:
1434 if isactive:
1435 label = b'branches.active'
1435 label = b'branches.active'
1436 notice = b''
1436 notice = b''
1437 elif not isopen:
1437 elif not isopen:
1438 if not closed:
1438 if not closed:
1439 continue
1439 continue
1440 label = b'branches.closed'
1440 label = b'branches.closed'
1441 notice = _(b' (closed)')
1441 notice = _(b' (closed)')
1442 else:
1442 else:
1443 label = b'branches.inactive'
1443 label = b'branches.inactive'
1444 notice = _(b' (inactive)')
1444 notice = _(b' (inactive)')
1445 current = tag == repo.dirstate.branch()
1445 current = tag == repo.dirstate.branch()
1446 if current:
1446 if current:
1447 label = b'branches.current'
1447 label = b'branches.current'
1448
1448
1449 fm.startitem()
1449 fm.startitem()
1450 fm.write(b'branch', b'%s', tag, label=label)
1450 fm.write(b'branch', b'%s', tag, label=label)
1451 rev = ctx.rev()
1451 rev = ctx.rev()
1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1453 fmt = b' ' * padsize + b' %d:%s'
1453 fmt = b' ' * padsize + b' %d:%s'
1454 fm.condwrite(
1454 fm.condwrite(
1455 not ui.quiet,
1455 not ui.quiet,
1456 b'rev node',
1456 b'rev node',
1457 fmt,
1457 fmt,
1458 rev,
1458 rev,
1459 hexfunc(ctx.node()),
1459 hexfunc(ctx.node()),
1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1461 )
1461 )
1462 fm.context(ctx=ctx)
1462 fm.context(ctx=ctx)
1463 fm.data(active=isactive, closed=not isopen, current=current)
1463 fm.data(active=isactive, closed=not isopen, current=current)
1464 if not ui.quiet:
1464 if not ui.quiet:
1465 fm.plain(notice)
1465 fm.plain(notice)
1466 fm.plain(b'\n')
1466 fm.plain(b'\n')
1467 fm.end()
1467 fm.end()
1468
1468
1469
1469
1470 @command(
1470 @command(
1471 b'bundle',
1471 b'bundle',
1472 [
1472 [
1473 (
1473 (
1474 b'f',
1474 b'f',
1475 b'force',
1475 b'force',
1476 None,
1476 None,
1477 _(b'run even when the destination is unrelated'),
1477 _(b'run even when the destination is unrelated'),
1478 ),
1478 ),
1479 (
1479 (
1480 b'r',
1480 b'r',
1481 b'rev',
1481 b'rev',
1482 [],
1482 [],
1483 _(b'a changeset intended to be added to the destination'),
1483 _(b'a changeset intended to be added to the destination'),
1484 _(b'REV'),
1484 _(b'REV'),
1485 ),
1485 ),
1486 (
1486 (
1487 b'b',
1487 b'b',
1488 b'branch',
1488 b'branch',
1489 [],
1489 [],
1490 _(b'a specific branch you would like to bundle'),
1490 _(b'a specific branch you would like to bundle'),
1491 _(b'BRANCH'),
1491 _(b'BRANCH'),
1492 ),
1492 ),
1493 (
1493 (
1494 b'',
1494 b'',
1495 b'base',
1495 b'base',
1496 [],
1496 [],
1497 _(b'a base changeset assumed to be available at the destination'),
1497 _(b'a base changeset assumed to be available at the destination'),
1498 _(b'REV'),
1498 _(b'REV'),
1499 ),
1499 ),
1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1501 (
1501 (
1502 b't',
1502 b't',
1503 b'type',
1503 b'type',
1504 b'bzip2',
1504 b'bzip2',
1505 _(b'bundle compression type to use'),
1505 _(b'bundle compression type to use'),
1506 _(b'TYPE'),
1506 _(b'TYPE'),
1507 ),
1507 ),
1508 ]
1508 ]
1509 + remoteopts,
1509 + remoteopts,
1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1512 )
1512 )
1513 def bundle(ui, repo, fname, dest=None, **opts):
1513 def bundle(ui, repo, fname, dest=None, **opts):
1514 """create a bundle file
1514 """create a bundle file
1515
1515
1516 Generate a bundle file containing data to be transferred to another
1516 Generate a bundle file containing data to be transferred to another
1517 repository.
1517 repository.
1518
1518
1519 To create a bundle containing all changesets, use -a/--all
1519 To create a bundle containing all changesets, use -a/--all
1520 (or --base null). Otherwise, hg assumes the destination will have
1520 (or --base null). Otherwise, hg assumes the destination will have
1521 all the nodes you specify with --base parameters. Otherwise, hg
1521 all the nodes you specify with --base parameters. Otherwise, hg
1522 will assume the repository has all the nodes in destination, or
1522 will assume the repository has all the nodes in destination, or
1523 default-push/default if no destination is specified, where destination
1523 default-push/default if no destination is specified, where destination
1524 is the repository you provide through DEST option.
1524 is the repository you provide through DEST option.
1525
1525
1526 You can change bundle format with the -t/--type option. See
1526 You can change bundle format with the -t/--type option. See
1527 :hg:`help bundlespec` for documentation on this format. By default,
1527 :hg:`help bundlespec` for documentation on this format. By default,
1528 the most appropriate format is used and compression defaults to
1528 the most appropriate format is used and compression defaults to
1529 bzip2.
1529 bzip2.
1530
1530
1531 The bundle file can then be transferred using conventional means
1531 The bundle file can then be transferred using conventional means
1532 and applied to another repository with the unbundle or pull
1532 and applied to another repository with the unbundle or pull
1533 command. This is useful when direct push and pull are not
1533 command. This is useful when direct push and pull are not
1534 available or when exporting an entire repository is undesirable.
1534 available or when exporting an entire repository is undesirable.
1535
1535
1536 Applying bundles preserves all changeset contents including
1536 Applying bundles preserves all changeset contents including
1537 permissions, copy/rename information, and revision history.
1537 permissions, copy/rename information, and revision history.
1538
1538
1539 Returns 0 on success, 1 if no changes found.
1539 Returns 0 on success, 1 if no changes found.
1540 """
1540 """
1541 opts = pycompat.byteskwargs(opts)
1541 opts = pycompat.byteskwargs(opts)
1542 revs = None
1542 revs = None
1543 if b'rev' in opts:
1543 if b'rev' in opts:
1544 revstrings = opts[b'rev']
1544 revstrings = opts[b'rev']
1545 revs = scmutil.revrange(repo, revstrings)
1545 revs = scmutil.revrange(repo, revstrings)
1546 if revstrings and not revs:
1546 if revstrings and not revs:
1547 raise error.Abort(_(b'no commits to bundle'))
1547 raise error.Abort(_(b'no commits to bundle'))
1548
1548
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1550 try:
1550 try:
1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1552 except error.UnsupportedBundleSpecification as e:
1552 except error.UnsupportedBundleSpecification as e:
1553 raise error.Abort(
1553 raise error.Abort(
1554 pycompat.bytestr(e),
1554 pycompat.bytestr(e),
1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1556 )
1556 )
1557 cgversion = bundlespec.contentopts[b"cg.version"]
1557 cgversion = bundlespec.contentopts[b"cg.version"]
1558
1558
1559 # Packed bundles are a pseudo bundle format for now.
1559 # Packed bundles are a pseudo bundle format for now.
1560 if cgversion == b's1':
1560 if cgversion == b's1':
1561 raise error.Abort(
1561 raise error.Abort(
1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1564 )
1564 )
1565
1565
1566 if opts.get(b'all'):
1566 if opts.get(b'all'):
1567 if dest:
1567 if dest:
1568 raise error.Abort(
1568 raise error.Abort(
1569 _(b"--all is incompatible with specifying a destination")
1569 _(b"--all is incompatible with specifying a destination")
1570 )
1570 )
1571 if opts.get(b'base'):
1571 if opts.get(b'base'):
1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1573 base = [nullrev]
1573 base = [nullrev]
1574 else:
1574 else:
1575 base = scmutil.revrange(repo, opts.get(b'base'))
1575 base = scmutil.revrange(repo, opts.get(b'base'))
1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1577 raise error.Abort(
1577 raise error.Abort(
1578 _(b"repository does not support bundle version %s") % cgversion
1578 _(b"repository does not support bundle version %s") % cgversion
1579 )
1579 )
1580
1580
1581 if base:
1581 if base:
1582 if dest:
1582 if dest:
1583 raise error.Abort(
1583 raise error.Abort(
1584 _(b"--base is incompatible with specifying a destination")
1584 _(b"--base is incompatible with specifying a destination")
1585 )
1585 )
1586 common = [repo[rev].node() for rev in base]
1586 common = [repo[rev].node() for rev in base]
1587 heads = [repo[r].node() for r in revs] if revs else None
1587 heads = [repo[r].node() for r in revs] if revs else None
1588 outgoing = discovery.outgoing(repo, common, heads)
1588 outgoing = discovery.outgoing(repo, common, heads)
1589 else:
1589 else:
1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1592 other = hg.peer(repo, opts, dest)
1592 other = hg.peer(repo, opts, dest)
1593 revs = [repo[r].hex() for r in revs]
1593 revs = [repo[r].hex() for r in revs]
1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1596 outgoing = discovery.findcommonoutgoing(
1596 outgoing = discovery.findcommonoutgoing(
1597 repo,
1597 repo,
1598 other,
1598 other,
1599 onlyheads=heads,
1599 onlyheads=heads,
1600 force=opts.get(b'force'),
1600 force=opts.get(b'force'),
1601 portable=True,
1601 portable=True,
1602 )
1602 )
1603
1603
1604 if not outgoing.missing:
1604 if not outgoing.missing:
1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1606 return 1
1606 return 1
1607
1607
1608 if cgversion == b'01': # bundle1
1608 if cgversion == b'01': # bundle1
1609 bversion = b'HG10' + bundlespec.wirecompression
1609 bversion = b'HG10' + bundlespec.wirecompression
1610 bcompression = None
1610 bcompression = None
1611 elif cgversion in (b'02', b'03'):
1611 elif cgversion in (b'02', b'03'):
1612 bversion = b'HG20'
1612 bversion = b'HG20'
1613 bcompression = bundlespec.wirecompression
1613 bcompression = bundlespec.wirecompression
1614 else:
1614 else:
1615 raise error.ProgrammingError(
1615 raise error.ProgrammingError(
1616 b'bundle: unexpected changegroup version %s' % cgversion
1616 b'bundle: unexpected changegroup version %s' % cgversion
1617 )
1617 )
1618
1618
1619 # TODO compression options should be derived from bundlespec parsing.
1619 # TODO compression options should be derived from bundlespec parsing.
1620 # This is a temporary hack to allow adjusting bundle compression
1620 # This is a temporary hack to allow adjusting bundle compression
1621 # level without a) formalizing the bundlespec changes to declare it
1621 # level without a) formalizing the bundlespec changes to declare it
1622 # b) introducing a command flag.
1622 # b) introducing a command flag.
1623 compopts = {}
1623 compopts = {}
1624 complevel = ui.configint(
1624 complevel = ui.configint(
1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1626 )
1626 )
1627 if complevel is None:
1627 if complevel is None:
1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1629 if complevel is not None:
1629 if complevel is not None:
1630 compopts[b'level'] = complevel
1630 compopts[b'level'] = complevel
1631
1631
1632 # Allow overriding the bundling of obsmarker in phases through
1632 # Allow overriding the bundling of obsmarker in phases through
1633 # configuration while we don't have a bundle version that include them
1633 # configuration while we don't have a bundle version that include them
1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1635 bundlespec.contentopts[b'obsolescence'] = True
1635 bundlespec.contentopts[b'obsolescence'] = True
1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1637 bundlespec.contentopts[b'phases'] = True
1637 bundlespec.contentopts[b'phases'] = True
1638
1638
1639 bundle2.writenewbundle(
1639 bundle2.writenewbundle(
1640 ui,
1640 ui,
1641 repo,
1641 repo,
1642 b'bundle',
1642 b'bundle',
1643 fname,
1643 fname,
1644 bversion,
1644 bversion,
1645 outgoing,
1645 outgoing,
1646 bundlespec.contentopts,
1646 bundlespec.contentopts,
1647 compression=bcompression,
1647 compression=bcompression,
1648 compopts=compopts,
1648 compopts=compopts,
1649 )
1649 )
1650
1650
1651
1651
1652 @command(
1652 @command(
1653 b'cat',
1653 b'cat',
1654 [
1654 [
1655 (
1655 (
1656 b'o',
1656 b'o',
1657 b'output',
1657 b'output',
1658 b'',
1658 b'',
1659 _(b'print output to file with formatted name'),
1659 _(b'print output to file with formatted name'),
1660 _(b'FORMAT'),
1660 _(b'FORMAT'),
1661 ),
1661 ),
1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1664 ]
1664 ]
1665 + walkopts
1665 + walkopts
1666 + formatteropts,
1666 + formatteropts,
1667 _(b'[OPTION]... FILE...'),
1667 _(b'[OPTION]... FILE...'),
1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1669 inferrepo=True,
1669 inferrepo=True,
1670 intents={INTENT_READONLY},
1670 intents={INTENT_READONLY},
1671 )
1671 )
1672 def cat(ui, repo, file1, *pats, **opts):
1672 def cat(ui, repo, file1, *pats, **opts):
1673 """output the current or given revision of files
1673 """output the current or given revision of files
1674
1674
1675 Print the specified files as they were at the given revision. If
1675 Print the specified files as they were at the given revision. If
1676 no revision is given, the parent of the working directory is used.
1676 no revision is given, the parent of the working directory is used.
1677
1677
1678 Output may be to a file, in which case the name of the file is
1678 Output may be to a file, in which case the name of the file is
1679 given using a template string. See :hg:`help templates`. In addition
1679 given using a template string. See :hg:`help templates`. In addition
1680 to the common template keywords, the following formatting rules are
1680 to the common template keywords, the following formatting rules are
1681 supported:
1681 supported:
1682
1682
1683 :``%%``: literal "%" character
1683 :``%%``: literal "%" character
1684 :``%s``: basename of file being printed
1684 :``%s``: basename of file being printed
1685 :``%d``: dirname of file being printed, or '.' if in repository root
1685 :``%d``: dirname of file being printed, or '.' if in repository root
1686 :``%p``: root-relative path name of file being printed
1686 :``%p``: root-relative path name of file being printed
1687 :``%H``: changeset hash (40 hexadecimal digits)
1687 :``%H``: changeset hash (40 hexadecimal digits)
1688 :``%R``: changeset revision number
1688 :``%R``: changeset revision number
1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1690 :``%r``: zero-padded changeset revision number
1690 :``%r``: zero-padded changeset revision number
1691 :``%b``: basename of the exporting repository
1691 :``%b``: basename of the exporting repository
1692 :``\\``: literal "\\" character
1692 :``\\``: literal "\\" character
1693
1693
1694 .. container:: verbose
1694 .. container:: verbose
1695
1695
1696 Template:
1696 Template:
1697
1697
1698 The following keywords are supported in addition to the common template
1698 The following keywords are supported in addition to the common template
1699 keywords and functions. See also :hg:`help templates`.
1699 keywords and functions. See also :hg:`help templates`.
1700
1700
1701 :data: String. File content.
1701 :data: String. File content.
1702 :path: String. Repository-absolute path of the file.
1702 :path: String. Repository-absolute path of the file.
1703
1703
1704 Returns 0 on success.
1704 Returns 0 on success.
1705 """
1705 """
1706 opts = pycompat.byteskwargs(opts)
1706 opts = pycompat.byteskwargs(opts)
1707 rev = opts.get(b'rev')
1707 rev = opts.get(b'rev')
1708 if rev:
1708 if rev:
1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1710 ctx = scmutil.revsingle(repo, rev)
1710 ctx = scmutil.revsingle(repo, rev)
1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1712 fntemplate = opts.pop(b'output', b'')
1712 fntemplate = opts.pop(b'output', b'')
1713 if cmdutil.isstdiofilename(fntemplate):
1713 if cmdutil.isstdiofilename(fntemplate):
1714 fntemplate = b''
1714 fntemplate = b''
1715
1715
1716 if fntemplate:
1716 if fntemplate:
1717 fm = formatter.nullformatter(ui, b'cat', opts)
1717 fm = formatter.nullformatter(ui, b'cat', opts)
1718 else:
1718 else:
1719 ui.pager(b'cat')
1719 ui.pager(b'cat')
1720 fm = ui.formatter(b'cat', opts)
1720 fm = ui.formatter(b'cat', opts)
1721 with fm:
1721 with fm:
1722 return cmdutil.cat(
1722 return cmdutil.cat(
1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1724 )
1724 )
1725
1725
1726
1726
1727 @command(
1727 @command(
1728 b'clone',
1728 b'clone',
1729 [
1729 [
1730 (
1730 (
1731 b'U',
1731 b'U',
1732 b'noupdate',
1732 b'noupdate',
1733 None,
1733 None,
1734 _(
1734 _(
1735 b'the clone will include an empty working '
1735 b'the clone will include an empty working '
1736 b'directory (only a repository)'
1736 b'directory (only a repository)'
1737 ),
1737 ),
1738 ),
1738 ),
1739 (
1739 (
1740 b'u',
1740 b'u',
1741 b'updaterev',
1741 b'updaterev',
1742 b'',
1742 b'',
1743 _(b'revision, tag, or branch to check out'),
1743 _(b'revision, tag, or branch to check out'),
1744 _(b'REV'),
1744 _(b'REV'),
1745 ),
1745 ),
1746 (
1746 (
1747 b'r',
1747 b'r',
1748 b'rev',
1748 b'rev',
1749 [],
1749 [],
1750 _(
1750 _(
1751 b'do not clone everything, but include this changeset'
1751 b'do not clone everything, but include this changeset'
1752 b' and its ancestors'
1752 b' and its ancestors'
1753 ),
1753 ),
1754 _(b'REV'),
1754 _(b'REV'),
1755 ),
1755 ),
1756 (
1756 (
1757 b'b',
1757 b'b',
1758 b'branch',
1758 b'branch',
1759 [],
1759 [],
1760 _(
1760 _(
1761 b'do not clone everything, but include this branch\'s'
1761 b'do not clone everything, but include this branch\'s'
1762 b' changesets and their ancestors'
1762 b' changesets and their ancestors'
1763 ),
1763 ),
1764 _(b'BRANCH'),
1764 _(b'BRANCH'),
1765 ),
1765 ),
1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1769 ]
1769 ]
1770 + remoteopts,
1770 + remoteopts,
1771 _(b'[OPTION]... SOURCE [DEST]'),
1771 _(b'[OPTION]... SOURCE [DEST]'),
1772 helpcategory=command.CATEGORY_REPO_CREATION,
1772 helpcategory=command.CATEGORY_REPO_CREATION,
1773 helpbasic=True,
1773 helpbasic=True,
1774 norepo=True,
1774 norepo=True,
1775 )
1775 )
1776 def clone(ui, source, dest=None, **opts):
1776 def clone(ui, source, dest=None, **opts):
1777 """make a copy of an existing repository
1777 """make a copy of an existing repository
1778
1778
1779 Create a copy of an existing repository in a new directory.
1779 Create a copy of an existing repository in a new directory.
1780
1780
1781 If no destination directory name is specified, it defaults to the
1781 If no destination directory name is specified, it defaults to the
1782 basename of the source.
1782 basename of the source.
1783
1783
1784 The location of the source is added to the new repository's
1784 The location of the source is added to the new repository's
1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1786
1786
1787 Only local paths and ``ssh://`` URLs are supported as
1787 Only local paths and ``ssh://`` URLs are supported as
1788 destinations. For ``ssh://`` destinations, no working directory or
1788 destinations. For ``ssh://`` destinations, no working directory or
1789 ``.hg/hgrc`` will be created on the remote side.
1789 ``.hg/hgrc`` will be created on the remote side.
1790
1790
1791 If the source repository has a bookmark called '@' set, that
1791 If the source repository has a bookmark called '@' set, that
1792 revision will be checked out in the new repository by default.
1792 revision will be checked out in the new repository by default.
1793
1793
1794 To check out a particular version, use -u/--update, or
1794 To check out a particular version, use -u/--update, or
1795 -U/--noupdate to create a clone with no working directory.
1795 -U/--noupdate to create a clone with no working directory.
1796
1796
1797 To pull only a subset of changesets, specify one or more revisions
1797 To pull only a subset of changesets, specify one or more revisions
1798 identifiers with -r/--rev or branches with -b/--branch. The
1798 identifiers with -r/--rev or branches with -b/--branch. The
1799 resulting clone will contain only the specified changesets and
1799 resulting clone will contain only the specified changesets and
1800 their ancestors. These options (or 'clone src#rev dest') imply
1800 their ancestors. These options (or 'clone src#rev dest') imply
1801 --pull, even for local source repositories.
1801 --pull, even for local source repositories.
1802
1802
1803 In normal clone mode, the remote normalizes repository data into a common
1803 In normal clone mode, the remote normalizes repository data into a common
1804 exchange format and the receiving end translates this data into its local
1804 exchange format and the receiving end translates this data into its local
1805 storage format. --stream activates a different clone mode that essentially
1805 storage format. --stream activates a different clone mode that essentially
1806 copies repository files from the remote with minimal data processing. This
1806 copies repository files from the remote with minimal data processing. This
1807 significantly reduces the CPU cost of a clone both remotely and locally.
1807 significantly reduces the CPU cost of a clone both remotely and locally.
1808 However, it often increases the transferred data size by 30-40%. This can
1808 However, it often increases the transferred data size by 30-40%. This can
1809 result in substantially faster clones where I/O throughput is plentiful,
1809 result in substantially faster clones where I/O throughput is plentiful,
1810 especially for larger repositories. A side-effect of --stream clones is
1810 especially for larger repositories. A side-effect of --stream clones is
1811 that storage settings and requirements on the remote are applied locally:
1811 that storage settings and requirements on the remote are applied locally:
1812 a modern client may inherit legacy or inefficient storage used by the
1812 a modern client may inherit legacy or inefficient storage used by the
1813 remote or a legacy Mercurial client may not be able to clone from a
1813 remote or a legacy Mercurial client may not be able to clone from a
1814 modern Mercurial remote.
1814 modern Mercurial remote.
1815
1815
1816 .. note::
1816 .. note::
1817
1817
1818 Specifying a tag will include the tagged changeset but not the
1818 Specifying a tag will include the tagged changeset but not the
1819 changeset containing the tag.
1819 changeset containing the tag.
1820
1820
1821 .. container:: verbose
1821 .. container:: verbose
1822
1822
1823 For efficiency, hardlinks are used for cloning whenever the
1823 For efficiency, hardlinks are used for cloning whenever the
1824 source and destination are on the same filesystem (note this
1824 source and destination are on the same filesystem (note this
1825 applies only to the repository data, not to the working
1825 applies only to the repository data, not to the working
1826 directory). Some filesystems, such as AFS, implement hardlinking
1826 directory). Some filesystems, such as AFS, implement hardlinking
1827 incorrectly, but do not report errors. In these cases, use the
1827 incorrectly, but do not report errors. In these cases, use the
1828 --pull option to avoid hardlinking.
1828 --pull option to avoid hardlinking.
1829
1829
1830 Mercurial will update the working directory to the first applicable
1830 Mercurial will update the working directory to the first applicable
1831 revision from this list:
1831 revision from this list:
1832
1832
1833 a) null if -U or the source repository has no changesets
1833 a) null if -U or the source repository has no changesets
1834 b) if -u . and the source repository is local, the first parent of
1834 b) if -u . and the source repository is local, the first parent of
1835 the source repository's working directory
1835 the source repository's working directory
1836 c) the changeset specified with -u (if a branch name, this means the
1836 c) the changeset specified with -u (if a branch name, this means the
1837 latest head of that branch)
1837 latest head of that branch)
1838 d) the changeset specified with -r
1838 d) the changeset specified with -r
1839 e) the tipmost head specified with -b
1839 e) the tipmost head specified with -b
1840 f) the tipmost head specified with the url#branch source syntax
1840 f) the tipmost head specified with the url#branch source syntax
1841 g) the revision marked with the '@' bookmark, if present
1841 g) the revision marked with the '@' bookmark, if present
1842 h) the tipmost head of the default branch
1842 h) the tipmost head of the default branch
1843 i) tip
1843 i) tip
1844
1844
1845 When cloning from servers that support it, Mercurial may fetch
1845 When cloning from servers that support it, Mercurial may fetch
1846 pre-generated data from a server-advertised URL or inline from the
1846 pre-generated data from a server-advertised URL or inline from the
1847 same stream. When this is done, hooks operating on incoming changesets
1847 same stream. When this is done, hooks operating on incoming changesets
1848 and changegroups may fire more than once, once for each pre-generated
1848 and changegroups may fire more than once, once for each pre-generated
1849 bundle and as well as for any additional remaining data. In addition,
1849 bundle and as well as for any additional remaining data. In addition,
1850 if an error occurs, the repository may be rolled back to a partial
1850 if an error occurs, the repository may be rolled back to a partial
1851 clone. This behavior may change in future releases.
1851 clone. This behavior may change in future releases.
1852 See :hg:`help -e clonebundles` for more.
1852 See :hg:`help -e clonebundles` for more.
1853
1853
1854 Examples:
1854 Examples:
1855
1855
1856 - clone a remote repository to a new directory named hg/::
1856 - clone a remote repository to a new directory named hg/::
1857
1857
1858 hg clone https://www.mercurial-scm.org/repo/hg/
1858 hg clone https://www.mercurial-scm.org/repo/hg/
1859
1859
1860 - create a lightweight local clone::
1860 - create a lightweight local clone::
1861
1861
1862 hg clone project/ project-feature/
1862 hg clone project/ project-feature/
1863
1863
1864 - clone from an absolute path on an ssh server (note double-slash)::
1864 - clone from an absolute path on an ssh server (note double-slash)::
1865
1865
1866 hg clone ssh://user@server//home/projects/alpha/
1866 hg clone ssh://user@server//home/projects/alpha/
1867
1867
1868 - do a streaming clone while checking out a specified version::
1868 - do a streaming clone while checking out a specified version::
1869
1869
1870 hg clone --stream http://server/repo -u 1.5
1870 hg clone --stream http://server/repo -u 1.5
1871
1871
1872 - create a repository without changesets after a particular revision::
1872 - create a repository without changesets after a particular revision::
1873
1873
1874 hg clone -r 04e544 experimental/ good/
1874 hg clone -r 04e544 experimental/ good/
1875
1875
1876 - clone (and track) a particular named branch::
1876 - clone (and track) a particular named branch::
1877
1877
1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1879
1879
1880 See :hg:`help urls` for details on specifying URLs.
1880 See :hg:`help urls` for details on specifying URLs.
1881
1881
1882 Returns 0 on success.
1882 Returns 0 on success.
1883 """
1883 """
1884 opts = pycompat.byteskwargs(opts)
1884 opts = pycompat.byteskwargs(opts)
1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1886
1886
1887 # --include/--exclude can come from narrow or sparse.
1887 # --include/--exclude can come from narrow or sparse.
1888 includepats, excludepats = None, None
1888 includepats, excludepats = None, None
1889
1889
1890 # hg.clone() differentiates between None and an empty set. So make sure
1890 # hg.clone() differentiates between None and an empty set. So make sure
1891 # patterns are sets if narrow is requested without patterns.
1891 # patterns are sets if narrow is requested without patterns.
1892 if opts.get(b'narrow'):
1892 if opts.get(b'narrow'):
1893 includepats = set()
1893 includepats = set()
1894 excludepats = set()
1894 excludepats = set()
1895
1895
1896 if opts.get(b'include'):
1896 if opts.get(b'include'):
1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1898 if opts.get(b'exclude'):
1898 if opts.get(b'exclude'):
1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1900
1900
1901 r = hg.clone(
1901 r = hg.clone(
1902 ui,
1902 ui,
1903 opts,
1903 opts,
1904 source,
1904 source,
1905 dest,
1905 dest,
1906 pull=opts.get(b'pull'),
1906 pull=opts.get(b'pull'),
1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1908 revs=opts.get(b'rev'),
1908 revs=opts.get(b'rev'),
1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1910 branch=opts.get(b'branch'),
1910 branch=opts.get(b'branch'),
1911 shareopts=opts.get(b'shareopts'),
1911 shareopts=opts.get(b'shareopts'),
1912 storeincludepats=includepats,
1912 storeincludepats=includepats,
1913 storeexcludepats=excludepats,
1913 storeexcludepats=excludepats,
1914 depth=opts.get(b'depth') or None,
1914 depth=opts.get(b'depth') or None,
1915 )
1915 )
1916
1916
1917 return r is None
1917 return r is None
1918
1918
1919
1919
1920 @command(
1920 @command(
1921 b'commit|ci',
1921 b'commit|ci',
1922 [
1922 [
1923 (
1923 (
1924 b'A',
1924 b'A',
1925 b'addremove',
1925 b'addremove',
1926 None,
1926 None,
1927 _(b'mark new/missing files as added/removed before committing'),
1927 _(b'mark new/missing files as added/removed before committing'),
1928 ),
1928 ),
1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1933 (
1933 (
1934 b'',
1934 b'',
1935 b'force-close-branch',
1935 b'force-close-branch',
1936 None,
1936 None,
1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1938 ),
1938 ),
1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1940 ]
1940 ]
1941 + walkopts
1941 + walkopts
1942 + commitopts
1942 + commitopts
1943 + commitopts2
1943 + commitopts2
1944 + subrepoopts,
1944 + subrepoopts,
1945 _(b'[OPTION]... [FILE]...'),
1945 _(b'[OPTION]... [FILE]...'),
1946 helpcategory=command.CATEGORY_COMMITTING,
1946 helpcategory=command.CATEGORY_COMMITTING,
1947 helpbasic=True,
1947 helpbasic=True,
1948 inferrepo=True,
1948 inferrepo=True,
1949 )
1949 )
1950 def commit(ui, repo, *pats, **opts):
1950 def commit(ui, repo, *pats, **opts):
1951 """commit the specified files or all outstanding changes
1951 """commit the specified files or all outstanding changes
1952
1952
1953 Commit changes to the given files into the repository. Unlike a
1953 Commit changes to the given files into the repository. Unlike a
1954 centralized SCM, this operation is a local operation. See
1954 centralized SCM, this operation is a local operation. See
1955 :hg:`push` for a way to actively distribute your changes.
1955 :hg:`push` for a way to actively distribute your changes.
1956
1956
1957 If a list of files is omitted, all changes reported by :hg:`status`
1957 If a list of files is omitted, all changes reported by :hg:`status`
1958 will be committed.
1958 will be committed.
1959
1959
1960 If you are committing the result of a merge, do not provide any
1960 If you are committing the result of a merge, do not provide any
1961 filenames or -I/-X filters.
1961 filenames or -I/-X filters.
1962
1962
1963 If no commit message is specified, Mercurial starts your
1963 If no commit message is specified, Mercurial starts your
1964 configured editor where you can enter a message. In case your
1964 configured editor where you can enter a message. In case your
1965 commit fails, you will find a backup of your message in
1965 commit fails, you will find a backup of your message in
1966 ``.hg/last-message.txt``.
1966 ``.hg/last-message.txt``.
1967
1967
1968 The --close-branch flag can be used to mark the current branch
1968 The --close-branch flag can be used to mark the current branch
1969 head closed. When all heads of a branch are closed, the branch
1969 head closed. When all heads of a branch are closed, the branch
1970 will be considered closed and no longer listed.
1970 will be considered closed and no longer listed.
1971
1971
1972 The --amend flag can be used to amend the parent of the
1972 The --amend flag can be used to amend the parent of the
1973 working directory with a new commit that contains the changes
1973 working directory with a new commit that contains the changes
1974 in the parent in addition to those currently reported by :hg:`status`,
1974 in the parent in addition to those currently reported by :hg:`status`,
1975 if there are any. The old commit is stored in a backup bundle in
1975 if there are any. The old commit is stored in a backup bundle in
1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1977 on how to restore it).
1977 on how to restore it).
1978
1978
1979 Message, user and date are taken from the amended commit unless
1979 Message, user and date are taken from the amended commit unless
1980 specified. When a message isn't specified on the command line,
1980 specified. When a message isn't specified on the command line,
1981 the editor will open with the message of the amended commit.
1981 the editor will open with the message of the amended commit.
1982
1982
1983 It is not possible to amend public changesets (see :hg:`help phases`)
1983 It is not possible to amend public changesets (see :hg:`help phases`)
1984 or changesets that have children.
1984 or changesets that have children.
1985
1985
1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1987
1987
1988 Returns 0 on success, 1 if nothing changed.
1988 Returns 0 on success, 1 if nothing changed.
1989
1989
1990 .. container:: verbose
1990 .. container:: verbose
1991
1991
1992 Examples:
1992 Examples:
1993
1993
1994 - commit all files ending in .py::
1994 - commit all files ending in .py::
1995
1995
1996 hg commit --include "set:**.py"
1996 hg commit --include "set:**.py"
1997
1997
1998 - commit all non-binary files::
1998 - commit all non-binary files::
1999
1999
2000 hg commit --exclude "set:binary()"
2000 hg commit --exclude "set:binary()"
2001
2001
2002 - amend the current commit and set the date to now::
2002 - amend the current commit and set the date to now::
2003
2003
2004 hg commit --amend --date now
2004 hg commit --amend --date now
2005 """
2005 """
2006 with repo.wlock(), repo.lock():
2006 with repo.wlock(), repo.lock():
2007 return _docommit(ui, repo, *pats, **opts)
2007 return _docommit(ui, repo, *pats, **opts)
2008
2008
2009
2009
2010 def _docommit(ui, repo, *pats, **opts):
2010 def _docommit(ui, repo, *pats, **opts):
2011 if opts.get('interactive'):
2011 if opts.get('interactive'):
2012 opts.pop('interactive')
2012 opts.pop('interactive')
2013 ret = cmdutil.dorecord(
2013 ret = cmdutil.dorecord(
2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2015 )
2015 )
2016 # ret can be 0 (no changes to record) or the value returned by
2016 # ret can be 0 (no changes to record) or the value returned by
2017 # commit(), 1 if nothing changed or None on success.
2017 # commit(), 1 if nothing changed or None on success.
2018 return 1 if ret == 0 else ret
2018 return 1 if ret == 0 else ret
2019
2019
2020 opts = pycompat.byteskwargs(opts)
2020 opts = pycompat.byteskwargs(opts)
2021 if opts.get(b'subrepos'):
2021 if opts.get(b'subrepos'):
2022 if opts.get(b'amend'):
2022 if opts.get(b'amend'):
2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2024 # Let --subrepos on the command line override config setting.
2024 # Let --subrepos on the command line override config setting.
2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2026
2026
2027 cmdutil.checkunfinished(repo, commit=True)
2027 cmdutil.checkunfinished(repo, commit=True)
2028
2028
2029 branch = repo[None].branch()
2029 branch = repo[None].branch()
2030 bheads = repo.branchheads(branch)
2030 bheads = repo.branchheads(branch)
2031
2031
2032 extra = {}
2032 extra = {}
2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2034 extra[b'close'] = b'1'
2034 extra[b'close'] = b'1'
2035
2035
2036 if repo[b'.'].closesbranch():
2036 if repo[b'.'].closesbranch():
2037 raise error.Abort(
2037 raise error.Abort(
2038 _(b'current revision is already a branch closing head')
2038 _(b'current revision is already a branch closing head')
2039 )
2039 )
2040 elif not bheads:
2040 elif not bheads:
2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2042 elif (
2042 elif (
2043 branch == repo[b'.'].branch()
2043 branch == repo[b'.'].branch()
2044 and repo[b'.'].node() not in bheads
2044 and repo[b'.'].node() not in bheads
2045 and not opts.get(b'force_close_branch')
2045 and not opts.get(b'force_close_branch')
2046 ):
2046 ):
2047 hint = _(
2047 hint = _(
2048 b'use --force-close-branch to close branch from a non-head'
2048 b'use --force-close-branch to close branch from a non-head'
2049 b' changeset'
2049 b' changeset'
2050 )
2050 )
2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2052 elif opts.get(b'amend'):
2052 elif opts.get(b'amend'):
2053 if (
2053 if (
2054 repo[b'.'].p1().branch() != branch
2054 repo[b'.'].p1().branch() != branch
2055 and repo[b'.'].p2().branch() != branch
2055 and repo[b'.'].p2().branch() != branch
2056 ):
2056 ):
2057 raise error.Abort(_(b'can only close branch heads'))
2057 raise error.Abort(_(b'can only close branch heads'))
2058
2058
2059 if opts.get(b'amend'):
2059 if opts.get(b'amend'):
2060 if ui.configbool(b'ui', b'commitsubrepos'):
2060 if ui.configbool(b'ui', b'commitsubrepos'):
2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2062
2062
2063 old = repo[b'.']
2063 old = repo[b'.']
2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2065
2065
2066 # Currently histedit gets confused if an amend happens while histedit
2066 # Currently histedit gets confused if an amend happens while histedit
2067 # is in progress. Since we have a checkunfinished command, we are
2067 # is in progress. Since we have a checkunfinished command, we are
2068 # temporarily honoring it.
2068 # temporarily honoring it.
2069 #
2069 #
2070 # Note: eventually this guard will be removed. Please do not expect
2070 # Note: eventually this guard will be removed. Please do not expect
2071 # this behavior to remain.
2071 # this behavior to remain.
2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2073 cmdutil.checkunfinished(repo)
2073 cmdutil.checkunfinished(repo)
2074
2074
2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2076 if node == old.node():
2076 if node == old.node():
2077 ui.status(_(b"nothing changed\n"))
2077 ui.status(_(b"nothing changed\n"))
2078 return 1
2078 return 1
2079 else:
2079 else:
2080
2080
2081 def commitfunc(ui, repo, message, match, opts):
2081 def commitfunc(ui, repo, message, match, opts):
2082 overrides = {}
2082 overrides = {}
2083 if opts.get(b'secret'):
2083 if opts.get(b'secret'):
2084 overrides[(b'phases', b'new-commit')] = b'secret'
2084 overrides[(b'phases', b'new-commit')] = b'secret'
2085
2085
2086 baseui = repo.baseui
2086 baseui = repo.baseui
2087 with baseui.configoverride(overrides, b'commit'):
2087 with baseui.configoverride(overrides, b'commit'):
2088 with ui.configoverride(overrides, b'commit'):
2088 with ui.configoverride(overrides, b'commit'):
2089 editform = cmdutil.mergeeditform(
2089 editform = cmdutil.mergeeditform(
2090 repo[None], b'commit.normal'
2090 repo[None], b'commit.normal'
2091 )
2091 )
2092 editor = cmdutil.getcommiteditor(
2092 editor = cmdutil.getcommiteditor(
2093 editform=editform, **pycompat.strkwargs(opts)
2093 editform=editform, **pycompat.strkwargs(opts)
2094 )
2094 )
2095 return repo.commit(
2095 return repo.commit(
2096 message,
2096 message,
2097 opts.get(b'user'),
2097 opts.get(b'user'),
2098 opts.get(b'date'),
2098 opts.get(b'date'),
2099 match,
2099 match,
2100 editor=editor,
2100 editor=editor,
2101 extra=extra,
2101 extra=extra,
2102 )
2102 )
2103
2103
2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2105
2105
2106 if not node:
2106 if not node:
2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2108 if stat.deleted:
2108 if stat.deleted:
2109 ui.status(
2109 ui.status(
2110 _(
2110 _(
2111 b"nothing changed (%d missing files, see "
2111 b"nothing changed (%d missing files, see "
2112 b"'hg status')\n"
2112 b"'hg status')\n"
2113 )
2113 )
2114 % len(stat.deleted)
2114 % len(stat.deleted)
2115 )
2115 )
2116 else:
2116 else:
2117 ui.status(_(b"nothing changed\n"))
2117 ui.status(_(b"nothing changed\n"))
2118 return 1
2118 return 1
2119
2119
2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2121
2121
2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2123 status(
2123 status(
2124 ui,
2124 ui,
2125 repo,
2125 repo,
2126 modified=True,
2126 modified=True,
2127 added=True,
2127 added=True,
2128 removed=True,
2128 removed=True,
2129 deleted=True,
2129 deleted=True,
2130 unknown=True,
2130 unknown=True,
2131 subrepos=opts.get(b'subrepos'),
2131 subrepos=opts.get(b'subrepos'),
2132 )
2132 )
2133
2133
2134
2134
2135 @command(
2135 @command(
2136 b'config|showconfig|debugconfig',
2136 b'config|showconfig|debugconfig',
2137 [
2137 [
2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2139 (b'e', b'edit', None, _(b'edit user config')),
2139 (b'e', b'edit', None, _(b'edit user config')),
2140 (b'l', b'local', None, _(b'edit repository config')),
2140 (b'l', b'local', None, _(b'edit repository config')),
2141 (b'g', b'global', None, _(b'edit global config')),
2141 (b'g', b'global', None, _(b'edit global config')),
2142 ]
2142 ]
2143 + formatteropts,
2143 + formatteropts,
2144 _(b'[-u] [NAME]...'),
2144 _(b'[-u] [NAME]...'),
2145 helpcategory=command.CATEGORY_HELP,
2145 helpcategory=command.CATEGORY_HELP,
2146 optionalrepo=True,
2146 optionalrepo=True,
2147 intents={INTENT_READONLY},
2147 intents={INTENT_READONLY},
2148 )
2148 )
2149 def config(ui, repo, *values, **opts):
2149 def config(ui, repo, *values, **opts):
2150 """show combined config settings from all hgrc files
2150 """show combined config settings from all hgrc files
2151
2151
2152 With no arguments, print names and values of all config items.
2152 With no arguments, print names and values of all config items.
2153
2153
2154 With one argument of the form section.name, print just the value
2154 With one argument of the form section.name, print just the value
2155 of that config item.
2155 of that config item.
2156
2156
2157 With multiple arguments, print names and values of all config
2157 With multiple arguments, print names and values of all config
2158 items with matching section names or section.names.
2158 items with matching section names or section.names.
2159
2159
2160 With --edit, start an editor on the user-level config file. With
2160 With --edit, start an editor on the user-level config file. With
2161 --global, edit the system-wide config file. With --local, edit the
2161 --global, edit the system-wide config file. With --local, edit the
2162 repository-level config file.
2162 repository-level config file.
2163
2163
2164 With --debug, the source (filename and line number) is printed
2164 With --debug, the source (filename and line number) is printed
2165 for each config item.
2165 for each config item.
2166
2166
2167 See :hg:`help config` for more information about config files.
2167 See :hg:`help config` for more information about config files.
2168
2168
2169 .. container:: verbose
2169 .. container:: verbose
2170
2170
2171 Template:
2171 Template:
2172
2172
2173 The following keywords are supported. See also :hg:`help templates`.
2173 The following keywords are supported. See also :hg:`help templates`.
2174
2174
2175 :name: String. Config name.
2175 :name: String. Config name.
2176 :source: String. Filename and line number where the item is defined.
2176 :source: String. Filename and line number where the item is defined.
2177 :value: String. Config value.
2177 :value: String. Config value.
2178
2178
2179 Returns 0 on success, 1 if NAME does not exist.
2179 Returns 0 on success, 1 if NAME does not exist.
2180
2180
2181 """
2181 """
2182
2182
2183 opts = pycompat.byteskwargs(opts)
2183 opts = pycompat.byteskwargs(opts)
2184 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2184 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2185 if opts.get(b'local') and opts.get(b'global'):
2185 if opts.get(b'local') and opts.get(b'global'):
2186 raise error.Abort(_(b"can't use --local and --global together"))
2186 raise error.Abort(_(b"can't use --local and --global together"))
2187
2187
2188 if opts.get(b'local'):
2188 if opts.get(b'local'):
2189 if not repo:
2189 if not repo:
2190 raise error.Abort(_(b"can't use --local outside a repository"))
2190 raise error.Abort(_(b"can't use --local outside a repository"))
2191 paths = [repo.vfs.join(b'hgrc')]
2191 paths = [repo.vfs.join(b'hgrc')]
2192 elif opts.get(b'global'):
2192 elif opts.get(b'global'):
2193 paths = rcutil.systemrcpath()
2193 paths = rcutil.systemrcpath()
2194 else:
2194 else:
2195 paths = rcutil.userrcpath()
2195 paths = rcutil.userrcpath()
2196
2196
2197 for f in paths:
2197 for f in paths:
2198 if os.path.exists(f):
2198 if os.path.exists(f):
2199 break
2199 break
2200 else:
2200 else:
2201 if opts.get(b'global'):
2201 if opts.get(b'global'):
2202 samplehgrc = uimod.samplehgrcs[b'global']
2202 samplehgrc = uimod.samplehgrcs[b'global']
2203 elif opts.get(b'local'):
2203 elif opts.get(b'local'):
2204 samplehgrc = uimod.samplehgrcs[b'local']
2204 samplehgrc = uimod.samplehgrcs[b'local']
2205 else:
2205 else:
2206 samplehgrc = uimod.samplehgrcs[b'user']
2206 samplehgrc = uimod.samplehgrcs[b'user']
2207
2207
2208 f = paths[0]
2208 f = paths[0]
2209 fp = open(f, b"wb")
2209 fp = open(f, b"wb")
2210 fp.write(util.tonativeeol(samplehgrc))
2210 fp.write(util.tonativeeol(samplehgrc))
2211 fp.close()
2211 fp.close()
2212
2212
2213 editor = ui.geteditor()
2213 editor = ui.geteditor()
2214 ui.system(
2214 ui.system(
2215 b"%s \"%s\"" % (editor, f),
2215 b"%s \"%s\"" % (editor, f),
2216 onerr=error.Abort,
2216 onerr=error.Abort,
2217 errprefix=_(b"edit failed"),
2217 errprefix=_(b"edit failed"),
2218 blockedtag=b'config_edit',
2218 blockedtag=b'config_edit',
2219 )
2219 )
2220 return
2220 return
2221 ui.pager(b'config')
2221 ui.pager(b'config')
2222 fm = ui.formatter(b'config', opts)
2222 fm = ui.formatter(b'config', opts)
2223 for t, f in rcutil.rccomponents():
2223 for t, f in rcutil.rccomponents():
2224 if t == b'path':
2224 if t == b'path':
2225 ui.debug(b'read config from: %s\n' % f)
2225 ui.debug(b'read config from: %s\n' % f)
2226 elif t == b'resource':
2227 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2226 elif t == b'items':
2228 elif t == b'items':
2227 # Don't print anything for 'items'.
2229 # Don't print anything for 'items'.
2228 pass
2230 pass
2229 else:
2231 else:
2230 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2232 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2231 untrusted = bool(opts.get(b'untrusted'))
2233 untrusted = bool(opts.get(b'untrusted'))
2232
2234
2233 selsections = selentries = []
2235 selsections = selentries = []
2234 if values:
2236 if values:
2235 selsections = [v for v in values if b'.' not in v]
2237 selsections = [v for v in values if b'.' not in v]
2236 selentries = [v for v in values if b'.' in v]
2238 selentries = [v for v in values if b'.' in v]
2237 uniquesel = len(selentries) == 1 and not selsections
2239 uniquesel = len(selentries) == 1 and not selsections
2238 selsections = set(selsections)
2240 selsections = set(selsections)
2239 selentries = set(selentries)
2241 selentries = set(selentries)
2240
2242
2241 matched = False
2243 matched = False
2242 for section, name, value in ui.walkconfig(untrusted=untrusted):
2244 for section, name, value in ui.walkconfig(untrusted=untrusted):
2243 source = ui.configsource(section, name, untrusted)
2245 source = ui.configsource(section, name, untrusted)
2244 value = pycompat.bytestr(value)
2246 value = pycompat.bytestr(value)
2245 defaultvalue = ui.configdefault(section, name)
2247 defaultvalue = ui.configdefault(section, name)
2246 if fm.isplain():
2248 if fm.isplain():
2247 source = source or b'none'
2249 source = source or b'none'
2248 value = value.replace(b'\n', b'\\n')
2250 value = value.replace(b'\n', b'\\n')
2249 entryname = section + b'.' + name
2251 entryname = section + b'.' + name
2250 if values and not (section in selsections or entryname in selentries):
2252 if values and not (section in selsections or entryname in selentries):
2251 continue
2253 continue
2252 fm.startitem()
2254 fm.startitem()
2253 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2255 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2254 if uniquesel:
2256 if uniquesel:
2255 fm.data(name=entryname)
2257 fm.data(name=entryname)
2256 fm.write(b'value', b'%s\n', value)
2258 fm.write(b'value', b'%s\n', value)
2257 else:
2259 else:
2258 fm.write(b'name value', b'%s=%s\n', entryname, value)
2260 fm.write(b'name value', b'%s=%s\n', entryname, value)
2259 if formatter.isprintable(defaultvalue):
2261 if formatter.isprintable(defaultvalue):
2260 fm.data(defaultvalue=defaultvalue)
2262 fm.data(defaultvalue=defaultvalue)
2261 elif isinstance(defaultvalue, list) and all(
2263 elif isinstance(defaultvalue, list) and all(
2262 formatter.isprintable(e) for e in defaultvalue
2264 formatter.isprintable(e) for e in defaultvalue
2263 ):
2265 ):
2264 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2266 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2265 # TODO: no idea how to process unsupported defaultvalue types
2267 # TODO: no idea how to process unsupported defaultvalue types
2266 matched = True
2268 matched = True
2267 fm.end()
2269 fm.end()
2268 if matched:
2270 if matched:
2269 return 0
2271 return 0
2270 return 1
2272 return 1
2271
2273
2272
2274
2273 @command(
2275 @command(
2274 b'continue',
2276 b'continue',
2275 dryrunopts,
2277 dryrunopts,
2276 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2278 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2277 helpbasic=True,
2279 helpbasic=True,
2278 )
2280 )
2279 def continuecmd(ui, repo, **opts):
2281 def continuecmd(ui, repo, **opts):
2280 """resumes an interrupted operation (EXPERIMENTAL)
2282 """resumes an interrupted operation (EXPERIMENTAL)
2281
2283
2282 Finishes a multistep operation like graft, histedit, rebase, merge,
2284 Finishes a multistep operation like graft, histedit, rebase, merge,
2283 and unshelve if they are in an interrupted state.
2285 and unshelve if they are in an interrupted state.
2284
2286
2285 use --dry-run/-n to dry run the command.
2287 use --dry-run/-n to dry run the command.
2286 """
2288 """
2287 dryrun = opts.get('dry_run')
2289 dryrun = opts.get('dry_run')
2288 contstate = cmdutil.getunfinishedstate(repo)
2290 contstate = cmdutil.getunfinishedstate(repo)
2289 if not contstate:
2291 if not contstate:
2290 raise error.Abort(_(b'no operation in progress'))
2292 raise error.Abort(_(b'no operation in progress'))
2291 if not contstate.continuefunc:
2293 if not contstate.continuefunc:
2292 raise error.Abort(
2294 raise error.Abort(
2293 (
2295 (
2294 _(b"%s in progress but does not support 'hg continue'")
2296 _(b"%s in progress but does not support 'hg continue'")
2295 % (contstate._opname)
2297 % (contstate._opname)
2296 ),
2298 ),
2297 hint=contstate.continuemsg(),
2299 hint=contstate.continuemsg(),
2298 )
2300 )
2299 if dryrun:
2301 if dryrun:
2300 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2302 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2301 return
2303 return
2302 return contstate.continuefunc(ui, repo)
2304 return contstate.continuefunc(ui, repo)
2303
2305
2304
2306
2305 @command(
2307 @command(
2306 b'copy|cp',
2308 b'copy|cp',
2307 [
2309 [
2308 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2310 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2309 (
2311 (
2310 b'f',
2312 b'f',
2311 b'force',
2313 b'force',
2312 None,
2314 None,
2313 _(b'forcibly copy over an existing managed file'),
2315 _(b'forcibly copy over an existing managed file'),
2314 ),
2316 ),
2315 ]
2317 ]
2316 + walkopts
2318 + walkopts
2317 + dryrunopts,
2319 + dryrunopts,
2318 _(b'[OPTION]... SOURCE... DEST'),
2320 _(b'[OPTION]... SOURCE... DEST'),
2319 helpcategory=command.CATEGORY_FILE_CONTENTS,
2321 helpcategory=command.CATEGORY_FILE_CONTENTS,
2320 )
2322 )
2321 def copy(ui, repo, *pats, **opts):
2323 def copy(ui, repo, *pats, **opts):
2322 """mark files as copied for the next commit
2324 """mark files as copied for the next commit
2323
2325
2324 Mark dest as having copies of source files. If dest is a
2326 Mark dest as having copies of source files. If dest is a
2325 directory, copies are put in that directory. If dest is a file,
2327 directory, copies are put in that directory. If dest is a file,
2326 the source must be a single file.
2328 the source must be a single file.
2327
2329
2328 By default, this command copies the contents of files as they
2330 By default, this command copies the contents of files as they
2329 exist in the working directory. If invoked with -A/--after, the
2331 exist in the working directory. If invoked with -A/--after, the
2330 operation is recorded, but no copying is performed.
2332 operation is recorded, but no copying is performed.
2331
2333
2332 This command takes effect with the next commit. To undo a copy
2334 This command takes effect with the next commit. To undo a copy
2333 before that, see :hg:`revert`.
2335 before that, see :hg:`revert`.
2334
2336
2335 Returns 0 on success, 1 if errors are encountered.
2337 Returns 0 on success, 1 if errors are encountered.
2336 """
2338 """
2337 opts = pycompat.byteskwargs(opts)
2339 opts = pycompat.byteskwargs(opts)
2338 with repo.wlock(False):
2340 with repo.wlock(False):
2339 return cmdutil.copy(ui, repo, pats, opts)
2341 return cmdutil.copy(ui, repo, pats, opts)
2340
2342
2341
2343
2342 @command(
2344 @command(
2343 b'debugcommands',
2345 b'debugcommands',
2344 [],
2346 [],
2345 _(b'[COMMAND]'),
2347 _(b'[COMMAND]'),
2346 helpcategory=command.CATEGORY_HELP,
2348 helpcategory=command.CATEGORY_HELP,
2347 norepo=True,
2349 norepo=True,
2348 )
2350 )
2349 def debugcommands(ui, cmd=b'', *args):
2351 def debugcommands(ui, cmd=b'', *args):
2350 """list all available commands and options"""
2352 """list all available commands and options"""
2351 for cmd, vals in sorted(pycompat.iteritems(table)):
2353 for cmd, vals in sorted(pycompat.iteritems(table)):
2352 cmd = cmd.split(b'|')[0]
2354 cmd = cmd.split(b'|')[0]
2353 opts = b', '.join([i[1] for i in vals[1]])
2355 opts = b', '.join([i[1] for i in vals[1]])
2354 ui.write(b'%s: %s\n' % (cmd, opts))
2356 ui.write(b'%s: %s\n' % (cmd, opts))
2355
2357
2356
2358
2357 @command(
2359 @command(
2358 b'debugcomplete',
2360 b'debugcomplete',
2359 [(b'o', b'options', None, _(b'show the command options'))],
2361 [(b'o', b'options', None, _(b'show the command options'))],
2360 _(b'[-o] CMD'),
2362 _(b'[-o] CMD'),
2361 helpcategory=command.CATEGORY_HELP,
2363 helpcategory=command.CATEGORY_HELP,
2362 norepo=True,
2364 norepo=True,
2363 )
2365 )
2364 def debugcomplete(ui, cmd=b'', **opts):
2366 def debugcomplete(ui, cmd=b'', **opts):
2365 """returns the completion list associated with the given command"""
2367 """returns the completion list associated with the given command"""
2366
2368
2367 if opts.get('options'):
2369 if opts.get('options'):
2368 options = []
2370 options = []
2369 otables = [globalopts]
2371 otables = [globalopts]
2370 if cmd:
2372 if cmd:
2371 aliases, entry = cmdutil.findcmd(cmd, table, False)
2373 aliases, entry = cmdutil.findcmd(cmd, table, False)
2372 otables.append(entry[1])
2374 otables.append(entry[1])
2373 for t in otables:
2375 for t in otables:
2374 for o in t:
2376 for o in t:
2375 if b"(DEPRECATED)" in o[3]:
2377 if b"(DEPRECATED)" in o[3]:
2376 continue
2378 continue
2377 if o[0]:
2379 if o[0]:
2378 options.append(b'-%s' % o[0])
2380 options.append(b'-%s' % o[0])
2379 options.append(b'--%s' % o[1])
2381 options.append(b'--%s' % o[1])
2380 ui.write(b"%s\n" % b"\n".join(options))
2382 ui.write(b"%s\n" % b"\n".join(options))
2381 return
2383 return
2382
2384
2383 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2385 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2384 if ui.verbose:
2386 if ui.verbose:
2385 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2387 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2386 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2388 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2387
2389
2388
2390
2389 @command(
2391 @command(
2390 b'diff',
2392 b'diff',
2391 [
2393 [
2392 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2394 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2393 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2395 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2394 ]
2396 ]
2395 + diffopts
2397 + diffopts
2396 + diffopts2
2398 + diffopts2
2397 + walkopts
2399 + walkopts
2398 + subrepoopts,
2400 + subrepoopts,
2399 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2401 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2400 helpcategory=command.CATEGORY_FILE_CONTENTS,
2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2401 helpbasic=True,
2403 helpbasic=True,
2402 inferrepo=True,
2404 inferrepo=True,
2403 intents={INTENT_READONLY},
2405 intents={INTENT_READONLY},
2404 )
2406 )
2405 def diff(ui, repo, *pats, **opts):
2407 def diff(ui, repo, *pats, **opts):
2406 """diff repository (or selected files)
2408 """diff repository (or selected files)
2407
2409
2408 Show differences between revisions for the specified files.
2410 Show differences between revisions for the specified files.
2409
2411
2410 Differences between files are shown using the unified diff format.
2412 Differences between files are shown using the unified diff format.
2411
2413
2412 .. note::
2414 .. note::
2413
2415
2414 :hg:`diff` may generate unexpected results for merges, as it will
2416 :hg:`diff` may generate unexpected results for merges, as it will
2415 default to comparing against the working directory's first
2417 default to comparing against the working directory's first
2416 parent changeset if no revisions are specified.
2418 parent changeset if no revisions are specified.
2417
2419
2418 When two revision arguments are given, then changes are shown
2420 When two revision arguments are given, then changes are shown
2419 between those revisions. If only one revision is specified then
2421 between those revisions. If only one revision is specified then
2420 that revision is compared to the working directory, and, when no
2422 that revision is compared to the working directory, and, when no
2421 revisions are specified, the working directory files are compared
2423 revisions are specified, the working directory files are compared
2422 to its first parent.
2424 to its first parent.
2423
2425
2424 Alternatively you can specify -c/--change with a revision to see
2426 Alternatively you can specify -c/--change with a revision to see
2425 the changes in that changeset relative to its first parent.
2427 the changes in that changeset relative to its first parent.
2426
2428
2427 Without the -a/--text option, diff will avoid generating diffs of
2429 Without the -a/--text option, diff will avoid generating diffs of
2428 files it detects as binary. With -a, diff will generate a diff
2430 files it detects as binary. With -a, diff will generate a diff
2429 anyway, probably with undesirable results.
2431 anyway, probably with undesirable results.
2430
2432
2431 Use the -g/--git option to generate diffs in the git extended diff
2433 Use the -g/--git option to generate diffs in the git extended diff
2432 format. For more information, read :hg:`help diffs`.
2434 format. For more information, read :hg:`help diffs`.
2433
2435
2434 .. container:: verbose
2436 .. container:: verbose
2435
2437
2436 Examples:
2438 Examples:
2437
2439
2438 - compare a file in the current working directory to its parent::
2440 - compare a file in the current working directory to its parent::
2439
2441
2440 hg diff foo.c
2442 hg diff foo.c
2441
2443
2442 - compare two historical versions of a directory, with rename info::
2444 - compare two historical versions of a directory, with rename info::
2443
2445
2444 hg diff --git -r 1.0:1.2 lib/
2446 hg diff --git -r 1.0:1.2 lib/
2445
2447
2446 - get change stats relative to the last change on some date::
2448 - get change stats relative to the last change on some date::
2447
2449
2448 hg diff --stat -r "date('may 2')"
2450 hg diff --stat -r "date('may 2')"
2449
2451
2450 - diff all newly-added files that contain a keyword::
2452 - diff all newly-added files that contain a keyword::
2451
2453
2452 hg diff "set:added() and grep(GNU)"
2454 hg diff "set:added() and grep(GNU)"
2453
2455
2454 - compare a revision and its parents::
2456 - compare a revision and its parents::
2455
2457
2456 hg diff -c 9353 # compare against first parent
2458 hg diff -c 9353 # compare against first parent
2457 hg diff -r 9353^:9353 # same using revset syntax
2459 hg diff -r 9353^:9353 # same using revset syntax
2458 hg diff -r 9353^2:9353 # compare against the second parent
2460 hg diff -r 9353^2:9353 # compare against the second parent
2459
2461
2460 Returns 0 on success.
2462 Returns 0 on success.
2461 """
2463 """
2462
2464
2463 opts = pycompat.byteskwargs(opts)
2465 opts = pycompat.byteskwargs(opts)
2464 revs = opts.get(b'rev')
2466 revs = opts.get(b'rev')
2465 change = opts.get(b'change')
2467 change = opts.get(b'change')
2466 stat = opts.get(b'stat')
2468 stat = opts.get(b'stat')
2467 reverse = opts.get(b'reverse')
2469 reverse = opts.get(b'reverse')
2468
2470
2469 if revs and change:
2471 if revs and change:
2470 msg = _(b'cannot specify --rev and --change at the same time')
2472 msg = _(b'cannot specify --rev and --change at the same time')
2471 raise error.Abort(msg)
2473 raise error.Abort(msg)
2472 elif change:
2474 elif change:
2473 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2475 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2474 ctx2 = scmutil.revsingle(repo, change, None)
2476 ctx2 = scmutil.revsingle(repo, change, None)
2475 ctx1 = ctx2.p1()
2477 ctx1 = ctx2.p1()
2476 else:
2478 else:
2477 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2479 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2478 ctx1, ctx2 = scmutil.revpair(repo, revs)
2480 ctx1, ctx2 = scmutil.revpair(repo, revs)
2479 node1, node2 = ctx1.node(), ctx2.node()
2481 node1, node2 = ctx1.node(), ctx2.node()
2480
2482
2481 if reverse:
2483 if reverse:
2482 node1, node2 = node2, node1
2484 node1, node2 = node2, node1
2483
2485
2484 diffopts = patch.diffallopts(ui, opts)
2486 diffopts = patch.diffallopts(ui, opts)
2485 m = scmutil.match(ctx2, pats, opts)
2487 m = scmutil.match(ctx2, pats, opts)
2486 m = repo.narrowmatch(m)
2488 m = repo.narrowmatch(m)
2487 ui.pager(b'diff')
2489 ui.pager(b'diff')
2488 logcmdutil.diffordiffstat(
2490 logcmdutil.diffordiffstat(
2489 ui,
2491 ui,
2490 repo,
2492 repo,
2491 diffopts,
2493 diffopts,
2492 node1,
2494 node1,
2493 node2,
2495 node2,
2494 m,
2496 m,
2495 stat=stat,
2497 stat=stat,
2496 listsubrepos=opts.get(b'subrepos'),
2498 listsubrepos=opts.get(b'subrepos'),
2497 root=opts.get(b'root'),
2499 root=opts.get(b'root'),
2498 )
2500 )
2499
2501
2500
2502
2501 @command(
2503 @command(
2502 b'export',
2504 b'export',
2503 [
2505 [
2504 (
2506 (
2505 b'B',
2507 b'B',
2506 b'bookmark',
2508 b'bookmark',
2507 b'',
2509 b'',
2508 _(b'export changes only reachable by given bookmark'),
2510 _(b'export changes only reachable by given bookmark'),
2509 _(b'BOOKMARK'),
2511 _(b'BOOKMARK'),
2510 ),
2512 ),
2511 (
2513 (
2512 b'o',
2514 b'o',
2513 b'output',
2515 b'output',
2514 b'',
2516 b'',
2515 _(b'print output to file with formatted name'),
2517 _(b'print output to file with formatted name'),
2516 _(b'FORMAT'),
2518 _(b'FORMAT'),
2517 ),
2519 ),
2518 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2520 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2519 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2521 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2520 ]
2522 ]
2521 + diffopts
2523 + diffopts
2522 + formatteropts,
2524 + formatteropts,
2523 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2525 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2524 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2526 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2525 helpbasic=True,
2527 helpbasic=True,
2526 intents={INTENT_READONLY},
2528 intents={INTENT_READONLY},
2527 )
2529 )
2528 def export(ui, repo, *changesets, **opts):
2530 def export(ui, repo, *changesets, **opts):
2529 """dump the header and diffs for one or more changesets
2531 """dump the header and diffs for one or more changesets
2530
2532
2531 Print the changeset header and diffs for one or more revisions.
2533 Print the changeset header and diffs for one or more revisions.
2532 If no revision is given, the parent of the working directory is used.
2534 If no revision is given, the parent of the working directory is used.
2533
2535
2534 The information shown in the changeset header is: author, date,
2536 The information shown in the changeset header is: author, date,
2535 branch name (if non-default), changeset hash, parent(s) and commit
2537 branch name (if non-default), changeset hash, parent(s) and commit
2536 comment.
2538 comment.
2537
2539
2538 .. note::
2540 .. note::
2539
2541
2540 :hg:`export` may generate unexpected diff output for merge
2542 :hg:`export` may generate unexpected diff output for merge
2541 changesets, as it will compare the merge changeset against its
2543 changesets, as it will compare the merge changeset against its
2542 first parent only.
2544 first parent only.
2543
2545
2544 Output may be to a file, in which case the name of the file is
2546 Output may be to a file, in which case the name of the file is
2545 given using a template string. See :hg:`help templates`. In addition
2547 given using a template string. See :hg:`help templates`. In addition
2546 to the common template keywords, the following formatting rules are
2548 to the common template keywords, the following formatting rules are
2547 supported:
2549 supported:
2548
2550
2549 :``%%``: literal "%" character
2551 :``%%``: literal "%" character
2550 :``%H``: changeset hash (40 hexadecimal digits)
2552 :``%H``: changeset hash (40 hexadecimal digits)
2551 :``%N``: number of patches being generated
2553 :``%N``: number of patches being generated
2552 :``%R``: changeset revision number
2554 :``%R``: changeset revision number
2553 :``%b``: basename of the exporting repository
2555 :``%b``: basename of the exporting repository
2554 :``%h``: short-form changeset hash (12 hexadecimal digits)
2556 :``%h``: short-form changeset hash (12 hexadecimal digits)
2555 :``%m``: first line of the commit message (only alphanumeric characters)
2557 :``%m``: first line of the commit message (only alphanumeric characters)
2556 :``%n``: zero-padded sequence number, starting at 1
2558 :``%n``: zero-padded sequence number, starting at 1
2557 :``%r``: zero-padded changeset revision number
2559 :``%r``: zero-padded changeset revision number
2558 :``\\``: literal "\\" character
2560 :``\\``: literal "\\" character
2559
2561
2560 Without the -a/--text option, export will avoid generating diffs
2562 Without the -a/--text option, export will avoid generating diffs
2561 of files it detects as binary. With -a, export will generate a
2563 of files it detects as binary. With -a, export will generate a
2562 diff anyway, probably with undesirable results.
2564 diff anyway, probably with undesirable results.
2563
2565
2564 With -B/--bookmark changesets reachable by the given bookmark are
2566 With -B/--bookmark changesets reachable by the given bookmark are
2565 selected.
2567 selected.
2566
2568
2567 Use the -g/--git option to generate diffs in the git extended diff
2569 Use the -g/--git option to generate diffs in the git extended diff
2568 format. See :hg:`help diffs` for more information.
2570 format. See :hg:`help diffs` for more information.
2569
2571
2570 With the --switch-parent option, the diff will be against the
2572 With the --switch-parent option, the diff will be against the
2571 second parent. It can be useful to review a merge.
2573 second parent. It can be useful to review a merge.
2572
2574
2573 .. container:: verbose
2575 .. container:: verbose
2574
2576
2575 Template:
2577 Template:
2576
2578
2577 The following keywords are supported in addition to the common template
2579 The following keywords are supported in addition to the common template
2578 keywords and functions. See also :hg:`help templates`.
2580 keywords and functions. See also :hg:`help templates`.
2579
2581
2580 :diff: String. Diff content.
2582 :diff: String. Diff content.
2581 :parents: List of strings. Parent nodes of the changeset.
2583 :parents: List of strings. Parent nodes of the changeset.
2582
2584
2583 Examples:
2585 Examples:
2584
2586
2585 - use export and import to transplant a bugfix to the current
2587 - use export and import to transplant a bugfix to the current
2586 branch::
2588 branch::
2587
2589
2588 hg export -r 9353 | hg import -
2590 hg export -r 9353 | hg import -
2589
2591
2590 - export all the changesets between two revisions to a file with
2592 - export all the changesets between two revisions to a file with
2591 rename information::
2593 rename information::
2592
2594
2593 hg export --git -r 123:150 > changes.txt
2595 hg export --git -r 123:150 > changes.txt
2594
2596
2595 - split outgoing changes into a series of patches with
2597 - split outgoing changes into a series of patches with
2596 descriptive names::
2598 descriptive names::
2597
2599
2598 hg export -r "outgoing()" -o "%n-%m.patch"
2600 hg export -r "outgoing()" -o "%n-%m.patch"
2599
2601
2600 Returns 0 on success.
2602 Returns 0 on success.
2601 """
2603 """
2602 opts = pycompat.byteskwargs(opts)
2604 opts = pycompat.byteskwargs(opts)
2603 bookmark = opts.get(b'bookmark')
2605 bookmark = opts.get(b'bookmark')
2604 changesets += tuple(opts.get(b'rev', []))
2606 changesets += tuple(opts.get(b'rev', []))
2605
2607
2606 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2608 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2607
2609
2608 if bookmark:
2610 if bookmark:
2609 if bookmark not in repo._bookmarks:
2611 if bookmark not in repo._bookmarks:
2610 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2612 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2611
2613
2612 revs = scmutil.bookmarkrevs(repo, bookmark)
2614 revs = scmutil.bookmarkrevs(repo, bookmark)
2613 else:
2615 else:
2614 if not changesets:
2616 if not changesets:
2615 changesets = [b'.']
2617 changesets = [b'.']
2616
2618
2617 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2619 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2618 revs = scmutil.revrange(repo, changesets)
2620 revs = scmutil.revrange(repo, changesets)
2619
2621
2620 if not revs:
2622 if not revs:
2621 raise error.Abort(_(b"export requires at least one changeset"))
2623 raise error.Abort(_(b"export requires at least one changeset"))
2622 if len(revs) > 1:
2624 if len(revs) > 1:
2623 ui.note(_(b'exporting patches:\n'))
2625 ui.note(_(b'exporting patches:\n'))
2624 else:
2626 else:
2625 ui.note(_(b'exporting patch:\n'))
2627 ui.note(_(b'exporting patch:\n'))
2626
2628
2627 fntemplate = opts.get(b'output')
2629 fntemplate = opts.get(b'output')
2628 if cmdutil.isstdiofilename(fntemplate):
2630 if cmdutil.isstdiofilename(fntemplate):
2629 fntemplate = b''
2631 fntemplate = b''
2630
2632
2631 if fntemplate:
2633 if fntemplate:
2632 fm = formatter.nullformatter(ui, b'export', opts)
2634 fm = formatter.nullformatter(ui, b'export', opts)
2633 else:
2635 else:
2634 ui.pager(b'export')
2636 ui.pager(b'export')
2635 fm = ui.formatter(b'export', opts)
2637 fm = ui.formatter(b'export', opts)
2636 with fm:
2638 with fm:
2637 cmdutil.export(
2639 cmdutil.export(
2638 repo,
2640 repo,
2639 revs,
2641 revs,
2640 fm,
2642 fm,
2641 fntemplate=fntemplate,
2643 fntemplate=fntemplate,
2642 switch_parent=opts.get(b'switch_parent'),
2644 switch_parent=opts.get(b'switch_parent'),
2643 opts=patch.diffallopts(ui, opts),
2645 opts=patch.diffallopts(ui, opts),
2644 )
2646 )
2645
2647
2646
2648
2647 @command(
2649 @command(
2648 b'files',
2650 b'files',
2649 [
2651 [
2650 (
2652 (
2651 b'r',
2653 b'r',
2652 b'rev',
2654 b'rev',
2653 b'',
2655 b'',
2654 _(b'search the repository as it is in REV'),
2656 _(b'search the repository as it is in REV'),
2655 _(b'REV'),
2657 _(b'REV'),
2656 ),
2658 ),
2657 (
2659 (
2658 b'0',
2660 b'0',
2659 b'print0',
2661 b'print0',
2660 None,
2662 None,
2661 _(b'end filenames with NUL, for use with xargs'),
2663 _(b'end filenames with NUL, for use with xargs'),
2662 ),
2664 ),
2663 ]
2665 ]
2664 + walkopts
2666 + walkopts
2665 + formatteropts
2667 + formatteropts
2666 + subrepoopts,
2668 + subrepoopts,
2667 _(b'[OPTION]... [FILE]...'),
2669 _(b'[OPTION]... [FILE]...'),
2668 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2670 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2669 intents={INTENT_READONLY},
2671 intents={INTENT_READONLY},
2670 )
2672 )
2671 def files(ui, repo, *pats, **opts):
2673 def files(ui, repo, *pats, **opts):
2672 """list tracked files
2674 """list tracked files
2673
2675
2674 Print files under Mercurial control in the working directory or
2676 Print files under Mercurial control in the working directory or
2675 specified revision for given files (excluding removed files).
2677 specified revision for given files (excluding removed files).
2676 Files can be specified as filenames or filesets.
2678 Files can be specified as filenames or filesets.
2677
2679
2678 If no files are given to match, this command prints the names
2680 If no files are given to match, this command prints the names
2679 of all files under Mercurial control.
2681 of all files under Mercurial control.
2680
2682
2681 .. container:: verbose
2683 .. container:: verbose
2682
2684
2683 Template:
2685 Template:
2684
2686
2685 The following keywords are supported in addition to the common template
2687 The following keywords are supported in addition to the common template
2686 keywords and functions. See also :hg:`help templates`.
2688 keywords and functions. See also :hg:`help templates`.
2687
2689
2688 :flags: String. Character denoting file's symlink and executable bits.
2690 :flags: String. Character denoting file's symlink and executable bits.
2689 :path: String. Repository-absolute path of the file.
2691 :path: String. Repository-absolute path of the file.
2690 :size: Integer. Size of the file in bytes.
2692 :size: Integer. Size of the file in bytes.
2691
2693
2692 Examples:
2694 Examples:
2693
2695
2694 - list all files under the current directory::
2696 - list all files under the current directory::
2695
2697
2696 hg files .
2698 hg files .
2697
2699
2698 - shows sizes and flags for current revision::
2700 - shows sizes and flags for current revision::
2699
2701
2700 hg files -vr .
2702 hg files -vr .
2701
2703
2702 - list all files named README::
2704 - list all files named README::
2703
2705
2704 hg files -I "**/README"
2706 hg files -I "**/README"
2705
2707
2706 - list all binary files::
2708 - list all binary files::
2707
2709
2708 hg files "set:binary()"
2710 hg files "set:binary()"
2709
2711
2710 - find files containing a regular expression::
2712 - find files containing a regular expression::
2711
2713
2712 hg files "set:grep('bob')"
2714 hg files "set:grep('bob')"
2713
2715
2714 - search tracked file contents with xargs and grep::
2716 - search tracked file contents with xargs and grep::
2715
2717
2716 hg files -0 | xargs -0 grep foo
2718 hg files -0 | xargs -0 grep foo
2717
2719
2718 See :hg:`help patterns` and :hg:`help filesets` for more information
2720 See :hg:`help patterns` and :hg:`help filesets` for more information
2719 on specifying file patterns.
2721 on specifying file patterns.
2720
2722
2721 Returns 0 if a match is found, 1 otherwise.
2723 Returns 0 if a match is found, 1 otherwise.
2722
2724
2723 """
2725 """
2724
2726
2725 opts = pycompat.byteskwargs(opts)
2727 opts = pycompat.byteskwargs(opts)
2726 rev = opts.get(b'rev')
2728 rev = opts.get(b'rev')
2727 if rev:
2729 if rev:
2728 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2730 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2729 ctx = scmutil.revsingle(repo, rev, None)
2731 ctx = scmutil.revsingle(repo, rev, None)
2730
2732
2731 end = b'\n'
2733 end = b'\n'
2732 if opts.get(b'print0'):
2734 if opts.get(b'print0'):
2733 end = b'\0'
2735 end = b'\0'
2734 fmt = b'%s' + end
2736 fmt = b'%s' + end
2735
2737
2736 m = scmutil.match(ctx, pats, opts)
2738 m = scmutil.match(ctx, pats, opts)
2737 ui.pager(b'files')
2739 ui.pager(b'files')
2738 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2740 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2739 with ui.formatter(b'files', opts) as fm:
2741 with ui.formatter(b'files', opts) as fm:
2740 return cmdutil.files(
2742 return cmdutil.files(
2741 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2743 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2742 )
2744 )
2743
2745
2744
2746
2745 @command(
2747 @command(
2746 b'forget',
2748 b'forget',
2747 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2749 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2748 + walkopts
2750 + walkopts
2749 + dryrunopts,
2751 + dryrunopts,
2750 _(b'[OPTION]... FILE...'),
2752 _(b'[OPTION]... FILE...'),
2751 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2753 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2752 helpbasic=True,
2754 helpbasic=True,
2753 inferrepo=True,
2755 inferrepo=True,
2754 )
2756 )
2755 def forget(ui, repo, *pats, **opts):
2757 def forget(ui, repo, *pats, **opts):
2756 """forget the specified files on the next commit
2758 """forget the specified files on the next commit
2757
2759
2758 Mark the specified files so they will no longer be tracked
2760 Mark the specified files so they will no longer be tracked
2759 after the next commit.
2761 after the next commit.
2760
2762
2761 This only removes files from the current branch, not from the
2763 This only removes files from the current branch, not from the
2762 entire project history, and it does not delete them from the
2764 entire project history, and it does not delete them from the
2763 working directory.
2765 working directory.
2764
2766
2765 To delete the file from the working directory, see :hg:`remove`.
2767 To delete the file from the working directory, see :hg:`remove`.
2766
2768
2767 To undo a forget before the next commit, see :hg:`add`.
2769 To undo a forget before the next commit, see :hg:`add`.
2768
2770
2769 .. container:: verbose
2771 .. container:: verbose
2770
2772
2771 Examples:
2773 Examples:
2772
2774
2773 - forget newly-added binary files::
2775 - forget newly-added binary files::
2774
2776
2775 hg forget "set:added() and binary()"
2777 hg forget "set:added() and binary()"
2776
2778
2777 - forget files that would be excluded by .hgignore::
2779 - forget files that would be excluded by .hgignore::
2778
2780
2779 hg forget "set:hgignore()"
2781 hg forget "set:hgignore()"
2780
2782
2781 Returns 0 on success.
2783 Returns 0 on success.
2782 """
2784 """
2783
2785
2784 opts = pycompat.byteskwargs(opts)
2786 opts = pycompat.byteskwargs(opts)
2785 if not pats:
2787 if not pats:
2786 raise error.Abort(_(b'no files specified'))
2788 raise error.Abort(_(b'no files specified'))
2787
2789
2788 m = scmutil.match(repo[None], pats, opts)
2790 m = scmutil.match(repo[None], pats, opts)
2789 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2791 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2790 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2792 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2791 rejected = cmdutil.forget(
2793 rejected = cmdutil.forget(
2792 ui,
2794 ui,
2793 repo,
2795 repo,
2794 m,
2796 m,
2795 prefix=b"",
2797 prefix=b"",
2796 uipathfn=uipathfn,
2798 uipathfn=uipathfn,
2797 explicitonly=False,
2799 explicitonly=False,
2798 dryrun=dryrun,
2800 dryrun=dryrun,
2799 interactive=interactive,
2801 interactive=interactive,
2800 )[0]
2802 )[0]
2801 return rejected and 1 or 0
2803 return rejected and 1 or 0
2802
2804
2803
2805
2804 @command(
2806 @command(
2805 b'graft',
2807 b'graft',
2806 [
2808 [
2807 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2809 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2808 (
2810 (
2809 b'',
2811 b'',
2810 b'base',
2812 b'base',
2811 b'',
2813 b'',
2812 _(b'base revision when doing the graft merge (ADVANCED)'),
2814 _(b'base revision when doing the graft merge (ADVANCED)'),
2813 _(b'REV'),
2815 _(b'REV'),
2814 ),
2816 ),
2815 (b'c', b'continue', False, _(b'resume interrupted graft')),
2817 (b'c', b'continue', False, _(b'resume interrupted graft')),
2816 (b'', b'stop', False, _(b'stop interrupted graft')),
2818 (b'', b'stop', False, _(b'stop interrupted graft')),
2817 (b'', b'abort', False, _(b'abort interrupted graft')),
2819 (b'', b'abort', False, _(b'abort interrupted graft')),
2818 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2820 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2819 (b'', b'log', None, _(b'append graft info to log message')),
2821 (b'', b'log', None, _(b'append graft info to log message')),
2820 (
2822 (
2821 b'',
2823 b'',
2822 b'no-commit',
2824 b'no-commit',
2823 None,
2825 None,
2824 _(b"don't commit, just apply the changes in working directory"),
2826 _(b"don't commit, just apply the changes in working directory"),
2825 ),
2827 ),
2826 (b'f', b'force', False, _(b'force graft')),
2828 (b'f', b'force', False, _(b'force graft')),
2827 (
2829 (
2828 b'D',
2830 b'D',
2829 b'currentdate',
2831 b'currentdate',
2830 False,
2832 False,
2831 _(b'record the current date as commit date'),
2833 _(b'record the current date as commit date'),
2832 ),
2834 ),
2833 (
2835 (
2834 b'U',
2836 b'U',
2835 b'currentuser',
2837 b'currentuser',
2836 False,
2838 False,
2837 _(b'record the current user as committer'),
2839 _(b'record the current user as committer'),
2838 ),
2840 ),
2839 ]
2841 ]
2840 + commitopts2
2842 + commitopts2
2841 + mergetoolopts
2843 + mergetoolopts
2842 + dryrunopts,
2844 + dryrunopts,
2843 _(b'[OPTION]... [-r REV]... REV...'),
2845 _(b'[OPTION]... [-r REV]... REV...'),
2844 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2846 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2845 )
2847 )
2846 def graft(ui, repo, *revs, **opts):
2848 def graft(ui, repo, *revs, **opts):
2847 '''copy changes from other branches onto the current branch
2849 '''copy changes from other branches onto the current branch
2848
2850
2849 This command uses Mercurial's merge logic to copy individual
2851 This command uses Mercurial's merge logic to copy individual
2850 changes from other branches without merging branches in the
2852 changes from other branches without merging branches in the
2851 history graph. This is sometimes known as 'backporting' or
2853 history graph. This is sometimes known as 'backporting' or
2852 'cherry-picking'. By default, graft will copy user, date, and
2854 'cherry-picking'. By default, graft will copy user, date, and
2853 description from the source changesets.
2855 description from the source changesets.
2854
2856
2855 Changesets that are ancestors of the current revision, that have
2857 Changesets that are ancestors of the current revision, that have
2856 already been grafted, or that are merges will be skipped.
2858 already been grafted, or that are merges will be skipped.
2857
2859
2858 If --log is specified, log messages will have a comment appended
2860 If --log is specified, log messages will have a comment appended
2859 of the form::
2861 of the form::
2860
2862
2861 (grafted from CHANGESETHASH)
2863 (grafted from CHANGESETHASH)
2862
2864
2863 If --force is specified, revisions will be grafted even if they
2865 If --force is specified, revisions will be grafted even if they
2864 are already ancestors of, or have been grafted to, the destination.
2866 are already ancestors of, or have been grafted to, the destination.
2865 This is useful when the revisions have since been backed out.
2867 This is useful when the revisions have since been backed out.
2866
2868
2867 If a graft merge results in conflicts, the graft process is
2869 If a graft merge results in conflicts, the graft process is
2868 interrupted so that the current merge can be manually resolved.
2870 interrupted so that the current merge can be manually resolved.
2869 Once all conflicts are addressed, the graft process can be
2871 Once all conflicts are addressed, the graft process can be
2870 continued with the -c/--continue option.
2872 continued with the -c/--continue option.
2871
2873
2872 The -c/--continue option reapplies all the earlier options.
2874 The -c/--continue option reapplies all the earlier options.
2873
2875
2874 .. container:: verbose
2876 .. container:: verbose
2875
2877
2876 The --base option exposes more of how graft internally uses merge with a
2878 The --base option exposes more of how graft internally uses merge with a
2877 custom base revision. --base can be used to specify another ancestor than
2879 custom base revision. --base can be used to specify another ancestor than
2878 the first and only parent.
2880 the first and only parent.
2879
2881
2880 The command::
2882 The command::
2881
2883
2882 hg graft -r 345 --base 234
2884 hg graft -r 345 --base 234
2883
2885
2884 is thus pretty much the same as::
2886 is thus pretty much the same as::
2885
2887
2886 hg diff -r 234 -r 345 | hg import
2888 hg diff -r 234 -r 345 | hg import
2887
2889
2888 but using merge to resolve conflicts and track moved files.
2890 but using merge to resolve conflicts and track moved files.
2889
2891
2890 The result of a merge can thus be backported as a single commit by
2892 The result of a merge can thus be backported as a single commit by
2891 specifying one of the merge parents as base, and thus effectively
2893 specifying one of the merge parents as base, and thus effectively
2892 grafting the changes from the other side.
2894 grafting the changes from the other side.
2893
2895
2894 It is also possible to collapse multiple changesets and clean up history
2896 It is also possible to collapse multiple changesets and clean up history
2895 by specifying another ancestor as base, much like rebase --collapse
2897 by specifying another ancestor as base, much like rebase --collapse
2896 --keep.
2898 --keep.
2897
2899
2898 The commit message can be tweaked after the fact using commit --amend .
2900 The commit message can be tweaked after the fact using commit --amend .
2899
2901
2900 For using non-ancestors as the base to backout changes, see the backout
2902 For using non-ancestors as the base to backout changes, see the backout
2901 command and the hidden --parent option.
2903 command and the hidden --parent option.
2902
2904
2903 .. container:: verbose
2905 .. container:: verbose
2904
2906
2905 Examples:
2907 Examples:
2906
2908
2907 - copy a single change to the stable branch and edit its description::
2909 - copy a single change to the stable branch and edit its description::
2908
2910
2909 hg update stable
2911 hg update stable
2910 hg graft --edit 9393
2912 hg graft --edit 9393
2911
2913
2912 - graft a range of changesets with one exception, updating dates::
2914 - graft a range of changesets with one exception, updating dates::
2913
2915
2914 hg graft -D "2085::2093 and not 2091"
2916 hg graft -D "2085::2093 and not 2091"
2915
2917
2916 - continue a graft after resolving conflicts::
2918 - continue a graft after resolving conflicts::
2917
2919
2918 hg graft -c
2920 hg graft -c
2919
2921
2920 - show the source of a grafted changeset::
2922 - show the source of a grafted changeset::
2921
2923
2922 hg log --debug -r .
2924 hg log --debug -r .
2923
2925
2924 - show revisions sorted by date::
2926 - show revisions sorted by date::
2925
2927
2926 hg log -r "sort(all(), date)"
2928 hg log -r "sort(all(), date)"
2927
2929
2928 - backport the result of a merge as a single commit::
2930 - backport the result of a merge as a single commit::
2929
2931
2930 hg graft -r 123 --base 123^
2932 hg graft -r 123 --base 123^
2931
2933
2932 - land a feature branch as one changeset::
2934 - land a feature branch as one changeset::
2933
2935
2934 hg up -cr default
2936 hg up -cr default
2935 hg graft -r featureX --base "ancestor('featureX', 'default')"
2937 hg graft -r featureX --base "ancestor('featureX', 'default')"
2936
2938
2937 See :hg:`help revisions` for more about specifying revisions.
2939 See :hg:`help revisions` for more about specifying revisions.
2938
2940
2939 Returns 0 on successful completion.
2941 Returns 0 on successful completion.
2940 '''
2942 '''
2941 with repo.wlock():
2943 with repo.wlock():
2942 return _dograft(ui, repo, *revs, **opts)
2944 return _dograft(ui, repo, *revs, **opts)
2943
2945
2944
2946
2945 def _dograft(ui, repo, *revs, **opts):
2947 def _dograft(ui, repo, *revs, **opts):
2946 opts = pycompat.byteskwargs(opts)
2948 opts = pycompat.byteskwargs(opts)
2947 if revs and opts.get(b'rev'):
2949 if revs and opts.get(b'rev'):
2948 ui.warn(
2950 ui.warn(
2949 _(
2951 _(
2950 b'warning: inconsistent use of --rev might give unexpected '
2952 b'warning: inconsistent use of --rev might give unexpected '
2951 b'revision ordering!\n'
2953 b'revision ordering!\n'
2952 )
2954 )
2953 )
2955 )
2954
2956
2955 revs = list(revs)
2957 revs = list(revs)
2956 revs.extend(opts.get(b'rev'))
2958 revs.extend(opts.get(b'rev'))
2957 basectx = None
2959 basectx = None
2958 if opts.get(b'base'):
2960 if opts.get(b'base'):
2959 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2961 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2960 # a dict of data to be stored in state file
2962 # a dict of data to be stored in state file
2961 statedata = {}
2963 statedata = {}
2962 # list of new nodes created by ongoing graft
2964 # list of new nodes created by ongoing graft
2963 statedata[b'newnodes'] = []
2965 statedata[b'newnodes'] = []
2964
2966
2965 cmdutil.resolvecommitoptions(ui, opts)
2967 cmdutil.resolvecommitoptions(ui, opts)
2966
2968
2967 editor = cmdutil.getcommiteditor(
2969 editor = cmdutil.getcommiteditor(
2968 editform=b'graft', **pycompat.strkwargs(opts)
2970 editform=b'graft', **pycompat.strkwargs(opts)
2969 )
2971 )
2970
2972
2971 cont = False
2973 cont = False
2972 if opts.get(b'no_commit'):
2974 if opts.get(b'no_commit'):
2973 if opts.get(b'edit'):
2975 if opts.get(b'edit'):
2974 raise error.Abort(
2976 raise error.Abort(
2975 _(b"cannot specify --no-commit and --edit together")
2977 _(b"cannot specify --no-commit and --edit together")
2976 )
2978 )
2977 if opts.get(b'currentuser'):
2979 if opts.get(b'currentuser'):
2978 raise error.Abort(
2980 raise error.Abort(
2979 _(b"cannot specify --no-commit and --currentuser together")
2981 _(b"cannot specify --no-commit and --currentuser together")
2980 )
2982 )
2981 if opts.get(b'currentdate'):
2983 if opts.get(b'currentdate'):
2982 raise error.Abort(
2984 raise error.Abort(
2983 _(b"cannot specify --no-commit and --currentdate together")
2985 _(b"cannot specify --no-commit and --currentdate together")
2984 )
2986 )
2985 if opts.get(b'log'):
2987 if opts.get(b'log'):
2986 raise error.Abort(
2988 raise error.Abort(
2987 _(b"cannot specify --no-commit and --log together")
2989 _(b"cannot specify --no-commit and --log together")
2988 )
2990 )
2989
2991
2990 graftstate = statemod.cmdstate(repo, b'graftstate')
2992 graftstate = statemod.cmdstate(repo, b'graftstate')
2991
2993
2992 if opts.get(b'stop'):
2994 if opts.get(b'stop'):
2993 if opts.get(b'continue'):
2995 if opts.get(b'continue'):
2994 raise error.Abort(
2996 raise error.Abort(
2995 _(b"cannot use '--continue' and '--stop' together")
2997 _(b"cannot use '--continue' and '--stop' together")
2996 )
2998 )
2997 if opts.get(b'abort'):
2999 if opts.get(b'abort'):
2998 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3000 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
2999
3001
3000 if any(
3002 if any(
3001 (
3003 (
3002 opts.get(b'edit'),
3004 opts.get(b'edit'),
3003 opts.get(b'log'),
3005 opts.get(b'log'),
3004 opts.get(b'user'),
3006 opts.get(b'user'),
3005 opts.get(b'date'),
3007 opts.get(b'date'),
3006 opts.get(b'currentdate'),
3008 opts.get(b'currentdate'),
3007 opts.get(b'currentuser'),
3009 opts.get(b'currentuser'),
3008 opts.get(b'rev'),
3010 opts.get(b'rev'),
3009 )
3011 )
3010 ):
3012 ):
3011 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3013 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3012 return _stopgraft(ui, repo, graftstate)
3014 return _stopgraft(ui, repo, graftstate)
3013 elif opts.get(b'abort'):
3015 elif opts.get(b'abort'):
3014 if opts.get(b'continue'):
3016 if opts.get(b'continue'):
3015 raise error.Abort(
3017 raise error.Abort(
3016 _(b"cannot use '--continue' and '--abort' together")
3018 _(b"cannot use '--continue' and '--abort' together")
3017 )
3019 )
3018 if any(
3020 if any(
3019 (
3021 (
3020 opts.get(b'edit'),
3022 opts.get(b'edit'),
3021 opts.get(b'log'),
3023 opts.get(b'log'),
3022 opts.get(b'user'),
3024 opts.get(b'user'),
3023 opts.get(b'date'),
3025 opts.get(b'date'),
3024 opts.get(b'currentdate'),
3026 opts.get(b'currentdate'),
3025 opts.get(b'currentuser'),
3027 opts.get(b'currentuser'),
3026 opts.get(b'rev'),
3028 opts.get(b'rev'),
3027 )
3029 )
3028 ):
3030 ):
3029 raise error.Abort(
3031 raise error.Abort(
3030 _(b"cannot specify any other flag with '--abort'")
3032 _(b"cannot specify any other flag with '--abort'")
3031 )
3033 )
3032
3034
3033 return cmdutil.abortgraft(ui, repo, graftstate)
3035 return cmdutil.abortgraft(ui, repo, graftstate)
3034 elif opts.get(b'continue'):
3036 elif opts.get(b'continue'):
3035 cont = True
3037 cont = True
3036 if revs:
3038 if revs:
3037 raise error.Abort(_(b"can't specify --continue and revisions"))
3039 raise error.Abort(_(b"can't specify --continue and revisions"))
3038 # read in unfinished revisions
3040 # read in unfinished revisions
3039 if graftstate.exists():
3041 if graftstate.exists():
3040 statedata = cmdutil.readgraftstate(repo, graftstate)
3042 statedata = cmdutil.readgraftstate(repo, graftstate)
3041 if statedata.get(b'date'):
3043 if statedata.get(b'date'):
3042 opts[b'date'] = statedata[b'date']
3044 opts[b'date'] = statedata[b'date']
3043 if statedata.get(b'user'):
3045 if statedata.get(b'user'):
3044 opts[b'user'] = statedata[b'user']
3046 opts[b'user'] = statedata[b'user']
3045 if statedata.get(b'log'):
3047 if statedata.get(b'log'):
3046 opts[b'log'] = True
3048 opts[b'log'] = True
3047 if statedata.get(b'no_commit'):
3049 if statedata.get(b'no_commit'):
3048 opts[b'no_commit'] = statedata.get(b'no_commit')
3050 opts[b'no_commit'] = statedata.get(b'no_commit')
3049 nodes = statedata[b'nodes']
3051 nodes = statedata[b'nodes']
3050 revs = [repo[node].rev() for node in nodes]
3052 revs = [repo[node].rev() for node in nodes]
3051 else:
3053 else:
3052 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3054 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3053 else:
3055 else:
3054 if not revs:
3056 if not revs:
3055 raise error.Abort(_(b'no revisions specified'))
3057 raise error.Abort(_(b'no revisions specified'))
3056 cmdutil.checkunfinished(repo)
3058 cmdutil.checkunfinished(repo)
3057 cmdutil.bailifchanged(repo)
3059 cmdutil.bailifchanged(repo)
3058 revs = scmutil.revrange(repo, revs)
3060 revs = scmutil.revrange(repo, revs)
3059
3061
3060 skipped = set()
3062 skipped = set()
3061 if basectx is None:
3063 if basectx is None:
3062 # check for merges
3064 # check for merges
3063 for rev in repo.revs(b'%ld and merge()', revs):
3065 for rev in repo.revs(b'%ld and merge()', revs):
3064 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3066 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3065 skipped.add(rev)
3067 skipped.add(rev)
3066 revs = [r for r in revs if r not in skipped]
3068 revs = [r for r in revs if r not in skipped]
3067 if not revs:
3069 if not revs:
3068 return -1
3070 return -1
3069 if basectx is not None and len(revs) != 1:
3071 if basectx is not None and len(revs) != 1:
3070 raise error.Abort(_(b'only one revision allowed with --base '))
3072 raise error.Abort(_(b'only one revision allowed with --base '))
3071
3073
3072 # Don't check in the --continue case, in effect retaining --force across
3074 # Don't check in the --continue case, in effect retaining --force across
3073 # --continues. That's because without --force, any revisions we decided to
3075 # --continues. That's because without --force, any revisions we decided to
3074 # skip would have been filtered out here, so they wouldn't have made their
3076 # skip would have been filtered out here, so they wouldn't have made their
3075 # way to the graftstate. With --force, any revisions we would have otherwise
3077 # way to the graftstate. With --force, any revisions we would have otherwise
3076 # skipped would not have been filtered out, and if they hadn't been applied
3078 # skipped would not have been filtered out, and if they hadn't been applied
3077 # already, they'd have been in the graftstate.
3079 # already, they'd have been in the graftstate.
3078 if not (cont or opts.get(b'force')) and basectx is None:
3080 if not (cont or opts.get(b'force')) and basectx is None:
3079 # check for ancestors of dest branch
3081 # check for ancestors of dest branch
3080 crev = repo[b'.'].rev()
3082 crev = repo[b'.'].rev()
3081 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3083 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3082 # XXX make this lazy in the future
3084 # XXX make this lazy in the future
3083 # don't mutate while iterating, create a copy
3085 # don't mutate while iterating, create a copy
3084 for rev in list(revs):
3086 for rev in list(revs):
3085 if rev in ancestors:
3087 if rev in ancestors:
3086 ui.warn(
3088 ui.warn(
3087 _(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
3089 _(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
3088 )
3090 )
3089 # XXX remove on list is slow
3091 # XXX remove on list is slow
3090 revs.remove(rev)
3092 revs.remove(rev)
3091 if not revs:
3093 if not revs:
3092 return -1
3094 return -1
3093
3095
3094 # analyze revs for earlier grafts
3096 # analyze revs for earlier grafts
3095 ids = {}
3097 ids = {}
3096 for ctx in repo.set(b"%ld", revs):
3098 for ctx in repo.set(b"%ld", revs):
3097 ids[ctx.hex()] = ctx.rev()
3099 ids[ctx.hex()] = ctx.rev()
3098 n = ctx.extra().get(b'source')
3100 n = ctx.extra().get(b'source')
3099 if n:
3101 if n:
3100 ids[n] = ctx.rev()
3102 ids[n] = ctx.rev()
3101
3103
3102 # check ancestors for earlier grafts
3104 # check ancestors for earlier grafts
3103 ui.debug(b'scanning for duplicate grafts\n')
3105 ui.debug(b'scanning for duplicate grafts\n')
3104
3106
3105 # The only changesets we can be sure doesn't contain grafts of any
3107 # The only changesets we can be sure doesn't contain grafts of any
3106 # revs, are the ones that are common ancestors of *all* revs:
3108 # revs, are the ones that are common ancestors of *all* revs:
3107 for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs):
3109 for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs):
3108 ctx = repo[rev]
3110 ctx = repo[rev]
3109 n = ctx.extra().get(b'source')
3111 n = ctx.extra().get(b'source')
3110 if n in ids:
3112 if n in ids:
3111 try:
3113 try:
3112 r = repo[n].rev()
3114 r = repo[n].rev()
3113 except error.RepoLookupError:
3115 except error.RepoLookupError:
3114 r = None
3116 r = None
3115 if r in revs:
3117 if r in revs:
3116 ui.warn(
3118 ui.warn(
3117 _(
3119 _(
3118 b'skipping revision %d:%s '
3120 b'skipping revision %d:%s '
3119 b'(already grafted to %d:%s)\n'
3121 b'(already grafted to %d:%s)\n'
3120 )
3122 )
3121 % (r, repo[r], rev, ctx)
3123 % (r, repo[r], rev, ctx)
3122 )
3124 )
3123 revs.remove(r)
3125 revs.remove(r)
3124 elif ids[n] in revs:
3126 elif ids[n] in revs:
3125 if r is None:
3127 if r is None:
3126 ui.warn(
3128 ui.warn(
3127 _(
3129 _(
3128 b'skipping already grafted revision %d:%s '
3130 b'skipping already grafted revision %d:%s '
3129 b'(%d:%s also has unknown origin %s)\n'
3131 b'(%d:%s also has unknown origin %s)\n'
3130 )
3132 )
3131 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3133 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3132 )
3134 )
3133 else:
3135 else:
3134 ui.warn(
3136 ui.warn(
3135 _(
3137 _(
3136 b'skipping already grafted revision %d:%s '
3138 b'skipping already grafted revision %d:%s '
3137 b'(%d:%s also has origin %d:%s)\n'
3139 b'(%d:%s also has origin %d:%s)\n'
3138 )
3140 )
3139 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3141 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3140 )
3142 )
3141 revs.remove(ids[n])
3143 revs.remove(ids[n])
3142 elif ctx.hex() in ids:
3144 elif ctx.hex() in ids:
3143 r = ids[ctx.hex()]
3145 r = ids[ctx.hex()]
3144 if r in revs:
3146 if r in revs:
3145 ui.warn(
3147 ui.warn(
3146 _(
3148 _(
3147 b'skipping already grafted revision %d:%s '
3149 b'skipping already grafted revision %d:%s '
3148 b'(was grafted from %d:%s)\n'
3150 b'(was grafted from %d:%s)\n'
3149 )
3151 )
3150 % (r, repo[r], rev, ctx)
3152 % (r, repo[r], rev, ctx)
3151 )
3153 )
3152 revs.remove(r)
3154 revs.remove(r)
3153 if not revs:
3155 if not revs:
3154 return -1
3156 return -1
3155
3157
3156 if opts.get(b'no_commit'):
3158 if opts.get(b'no_commit'):
3157 statedata[b'no_commit'] = True
3159 statedata[b'no_commit'] = True
3158 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3160 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3159 desc = b'%d:%s "%s"' % (
3161 desc = b'%d:%s "%s"' % (
3160 ctx.rev(),
3162 ctx.rev(),
3161 ctx,
3163 ctx,
3162 ctx.description().split(b'\n', 1)[0],
3164 ctx.description().split(b'\n', 1)[0],
3163 )
3165 )
3164 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3166 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3165 if names:
3167 if names:
3166 desc += b' (%s)' % b' '.join(names)
3168 desc += b' (%s)' % b' '.join(names)
3167 ui.status(_(b'grafting %s\n') % desc)
3169 ui.status(_(b'grafting %s\n') % desc)
3168 if opts.get(b'dry_run'):
3170 if opts.get(b'dry_run'):
3169 continue
3171 continue
3170
3172
3171 source = ctx.extra().get(b'source')
3173 source = ctx.extra().get(b'source')
3172 extra = {}
3174 extra = {}
3173 if source:
3175 if source:
3174 extra[b'source'] = source
3176 extra[b'source'] = source
3175 extra[b'intermediate-source'] = ctx.hex()
3177 extra[b'intermediate-source'] = ctx.hex()
3176 else:
3178 else:
3177 extra[b'source'] = ctx.hex()
3179 extra[b'source'] = ctx.hex()
3178 user = ctx.user()
3180 user = ctx.user()
3179 if opts.get(b'user'):
3181 if opts.get(b'user'):
3180 user = opts[b'user']
3182 user = opts[b'user']
3181 statedata[b'user'] = user
3183 statedata[b'user'] = user
3182 date = ctx.date()
3184 date = ctx.date()
3183 if opts.get(b'date'):
3185 if opts.get(b'date'):
3184 date = opts[b'date']
3186 date = opts[b'date']
3185 statedata[b'date'] = date
3187 statedata[b'date'] = date
3186 message = ctx.description()
3188 message = ctx.description()
3187 if opts.get(b'log'):
3189 if opts.get(b'log'):
3188 message += b'\n(grafted from %s)' % ctx.hex()
3190 message += b'\n(grafted from %s)' % ctx.hex()
3189 statedata[b'log'] = True
3191 statedata[b'log'] = True
3190
3192
3191 # we don't merge the first commit when continuing
3193 # we don't merge the first commit when continuing
3192 if not cont:
3194 if not cont:
3193 # perform the graft merge with p1(rev) as 'ancestor'
3195 # perform the graft merge with p1(rev) as 'ancestor'
3194 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3196 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3195 base = ctx.p1() if basectx is None else basectx
3197 base = ctx.p1() if basectx is None else basectx
3196 with ui.configoverride(overrides, b'graft'):
3198 with ui.configoverride(overrides, b'graft'):
3197 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3199 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3198 # report any conflicts
3200 # report any conflicts
3199 if stats.unresolvedcount > 0:
3201 if stats.unresolvedcount > 0:
3200 # write out state for --continue
3202 # write out state for --continue
3201 nodes = [repo[rev].hex() for rev in revs[pos:]]
3203 nodes = [repo[rev].hex() for rev in revs[pos:]]
3202 statedata[b'nodes'] = nodes
3204 statedata[b'nodes'] = nodes
3203 stateversion = 1
3205 stateversion = 1
3204 graftstate.save(stateversion, statedata)
3206 graftstate.save(stateversion, statedata)
3205 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3207 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3206 raise error.Abort(
3208 raise error.Abort(
3207 _(b"unresolved conflicts, can't continue"), hint=hint
3209 _(b"unresolved conflicts, can't continue"), hint=hint
3208 )
3210 )
3209 else:
3211 else:
3210 cont = False
3212 cont = False
3211
3213
3212 # commit if --no-commit is false
3214 # commit if --no-commit is false
3213 if not opts.get(b'no_commit'):
3215 if not opts.get(b'no_commit'):
3214 node = repo.commit(
3216 node = repo.commit(
3215 text=message, user=user, date=date, extra=extra, editor=editor
3217 text=message, user=user, date=date, extra=extra, editor=editor
3216 )
3218 )
3217 if node is None:
3219 if node is None:
3218 ui.warn(
3220 ui.warn(
3219 _(b'note: graft of %d:%s created no changes to commit\n')
3221 _(b'note: graft of %d:%s created no changes to commit\n')
3220 % (ctx.rev(), ctx)
3222 % (ctx.rev(), ctx)
3221 )
3223 )
3222 # checking that newnodes exist because old state files won't have it
3224 # checking that newnodes exist because old state files won't have it
3223 elif statedata.get(b'newnodes') is not None:
3225 elif statedata.get(b'newnodes') is not None:
3224 statedata[b'newnodes'].append(node)
3226 statedata[b'newnodes'].append(node)
3225
3227
3226 # remove state when we complete successfully
3228 # remove state when we complete successfully
3227 if not opts.get(b'dry_run'):
3229 if not opts.get(b'dry_run'):
3228 graftstate.delete()
3230 graftstate.delete()
3229
3231
3230 return 0
3232 return 0
3231
3233
3232
3234
3233 def _stopgraft(ui, repo, graftstate):
3235 def _stopgraft(ui, repo, graftstate):
3234 """stop the interrupted graft"""
3236 """stop the interrupted graft"""
3235 if not graftstate.exists():
3237 if not graftstate.exists():
3236 raise error.Abort(_(b"no interrupted graft found"))
3238 raise error.Abort(_(b"no interrupted graft found"))
3237 pctx = repo[b'.']
3239 pctx = repo[b'.']
3238 hg.updaterepo(repo, pctx.node(), overwrite=True)
3240 hg.updaterepo(repo, pctx.node(), overwrite=True)
3239 graftstate.delete()
3241 graftstate.delete()
3240 ui.status(_(b"stopped the interrupted graft\n"))
3242 ui.status(_(b"stopped the interrupted graft\n"))
3241 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3243 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3242 return 0
3244 return 0
3243
3245
3244
3246
3245 statemod.addunfinished(
3247 statemod.addunfinished(
3246 b'graft',
3248 b'graft',
3247 fname=b'graftstate',
3249 fname=b'graftstate',
3248 clearable=True,
3250 clearable=True,
3249 stopflag=True,
3251 stopflag=True,
3250 continueflag=True,
3252 continueflag=True,
3251 abortfunc=cmdutil.hgabortgraft,
3253 abortfunc=cmdutil.hgabortgraft,
3252 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3254 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3253 )
3255 )
3254
3256
3255
3257
3256 @command(
3258 @command(
3257 b'grep',
3259 b'grep',
3258 [
3260 [
3259 (b'0', b'print0', None, _(b'end fields with NUL')),
3261 (b'0', b'print0', None, _(b'end fields with NUL')),
3260 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3262 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3261 (
3263 (
3262 b'',
3264 b'',
3263 b'diff',
3265 b'diff',
3264 None,
3266 None,
3265 _(
3267 _(
3266 b'search revision differences for when the pattern was added '
3268 b'search revision differences for when the pattern was added '
3267 b'or removed'
3269 b'or removed'
3268 ),
3270 ),
3269 ),
3271 ),
3270 (b'a', b'text', None, _(b'treat all files as text')),
3272 (b'a', b'text', None, _(b'treat all files as text')),
3271 (
3273 (
3272 b'f',
3274 b'f',
3273 b'follow',
3275 b'follow',
3274 None,
3276 None,
3275 _(
3277 _(
3276 b'follow changeset history,'
3278 b'follow changeset history,'
3277 b' or file history across copies and renames'
3279 b' or file history across copies and renames'
3278 ),
3280 ),
3279 ),
3281 ),
3280 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3282 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3281 (
3283 (
3282 b'l',
3284 b'l',
3283 b'files-with-matches',
3285 b'files-with-matches',
3284 None,
3286 None,
3285 _(b'print only filenames and revisions that match'),
3287 _(b'print only filenames and revisions that match'),
3286 ),
3288 ),
3287 (b'n', b'line-number', None, _(b'print matching line numbers')),
3289 (b'n', b'line-number', None, _(b'print matching line numbers')),
3288 (
3290 (
3289 b'r',
3291 b'r',
3290 b'rev',
3292 b'rev',
3291 [],
3293 [],
3292 _(b'search files changed within revision range'),
3294 _(b'search files changed within revision range'),
3293 _(b'REV'),
3295 _(b'REV'),
3294 ),
3296 ),
3295 (
3297 (
3296 b'',
3298 b'',
3297 b'all-files',
3299 b'all-files',
3298 None,
3300 None,
3299 _(
3301 _(
3300 b'include all files in the changeset while grepping (DEPRECATED)'
3302 b'include all files in the changeset while grepping (DEPRECATED)'
3301 ),
3303 ),
3302 ),
3304 ),
3303 (b'u', b'user', None, _(b'list the author (long with -v)')),
3305 (b'u', b'user', None, _(b'list the author (long with -v)')),
3304 (b'd', b'date', None, _(b'list the date (short with -q)')),
3306 (b'd', b'date', None, _(b'list the date (short with -q)')),
3305 ]
3307 ]
3306 + formatteropts
3308 + formatteropts
3307 + walkopts,
3309 + walkopts,
3308 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3310 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3309 helpcategory=command.CATEGORY_FILE_CONTENTS,
3311 helpcategory=command.CATEGORY_FILE_CONTENTS,
3310 inferrepo=True,
3312 inferrepo=True,
3311 intents={INTENT_READONLY},
3313 intents={INTENT_READONLY},
3312 )
3314 )
3313 def grep(ui, repo, pattern, *pats, **opts):
3315 def grep(ui, repo, pattern, *pats, **opts):
3314 """search for a pattern in specified files
3316 """search for a pattern in specified files
3315
3317
3316 Search the working directory or revision history for a regular
3318 Search the working directory or revision history for a regular
3317 expression in the specified files for the entire repository.
3319 expression in the specified files for the entire repository.
3318
3320
3319 By default, grep searches the repository files in the working
3321 By default, grep searches the repository files in the working
3320 directory and prints the files where it finds a match. To specify
3322 directory and prints the files where it finds a match. To specify
3321 historical revisions instead of the working directory, use the
3323 historical revisions instead of the working directory, use the
3322 --rev flag.
3324 --rev flag.
3323
3325
3324 To search instead historical revision differences that contains a
3326 To search instead historical revision differences that contains a
3325 change in match status ("-" for a match that becomes a non-match,
3327 change in match status ("-" for a match that becomes a non-match,
3326 or "+" for a non-match that becomes a match), use the --diff flag.
3328 or "+" for a non-match that becomes a match), use the --diff flag.
3327
3329
3328 PATTERN can be any Python (roughly Perl-compatible) regular
3330 PATTERN can be any Python (roughly Perl-compatible) regular
3329 expression.
3331 expression.
3330
3332
3331 If no FILEs are specified and the --rev flag isn't supplied, all
3333 If no FILEs are specified and the --rev flag isn't supplied, all
3332 files in the working directory are searched. When using the --rev
3334 files in the working directory are searched. When using the --rev
3333 flag and specifying FILEs, use the --follow argument to also
3335 flag and specifying FILEs, use the --follow argument to also
3334 follow the specified FILEs across renames and copies.
3336 follow the specified FILEs across renames and copies.
3335
3337
3336 .. container:: verbose
3338 .. container:: verbose
3337
3339
3338 Template:
3340 Template:
3339
3341
3340 The following keywords are supported in addition to the common template
3342 The following keywords are supported in addition to the common template
3341 keywords and functions. See also :hg:`help templates`.
3343 keywords and functions. See also :hg:`help templates`.
3342
3344
3343 :change: String. Character denoting insertion ``+`` or removal ``-``.
3345 :change: String. Character denoting insertion ``+`` or removal ``-``.
3344 Available if ``--diff`` is specified.
3346 Available if ``--diff`` is specified.
3345 :lineno: Integer. Line number of the match.
3347 :lineno: Integer. Line number of the match.
3346 :path: String. Repository-absolute path of the file.
3348 :path: String. Repository-absolute path of the file.
3347 :texts: List of text chunks.
3349 :texts: List of text chunks.
3348
3350
3349 And each entry of ``{texts}`` provides the following sub-keywords.
3351 And each entry of ``{texts}`` provides the following sub-keywords.
3350
3352
3351 :matched: Boolean. True if the chunk matches the specified pattern.
3353 :matched: Boolean. True if the chunk matches the specified pattern.
3352 :text: String. Chunk content.
3354 :text: String. Chunk content.
3353
3355
3354 See :hg:`help templates.operators` for the list expansion syntax.
3356 See :hg:`help templates.operators` for the list expansion syntax.
3355
3357
3356 Returns 0 if a match is found, 1 otherwise.
3358 Returns 0 if a match is found, 1 otherwise.
3357
3359
3358 """
3360 """
3359 opts = pycompat.byteskwargs(opts)
3361 opts = pycompat.byteskwargs(opts)
3360 diff = opts.get(b'all') or opts.get(b'diff')
3362 diff = opts.get(b'all') or opts.get(b'diff')
3361 if diff and opts.get(b'all_files'):
3363 if diff and opts.get(b'all_files'):
3362 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3364 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3363 if opts.get(b'all_files') is None and not diff:
3365 if opts.get(b'all_files') is None and not diff:
3364 opts[b'all_files'] = True
3366 opts[b'all_files'] = True
3365 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3367 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3366 all_files = opts.get(b'all_files')
3368 all_files = opts.get(b'all_files')
3367 if plaingrep:
3369 if plaingrep:
3368 opts[b'rev'] = [b'wdir()']
3370 opts[b'rev'] = [b'wdir()']
3369
3371
3370 reflags = re.M
3372 reflags = re.M
3371 if opts.get(b'ignore_case'):
3373 if opts.get(b'ignore_case'):
3372 reflags |= re.I
3374 reflags |= re.I
3373 try:
3375 try:
3374 regexp = util.re.compile(pattern, reflags)
3376 regexp = util.re.compile(pattern, reflags)
3375 except re.error as inst:
3377 except re.error as inst:
3376 ui.warn(
3378 ui.warn(
3377 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3379 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3378 )
3380 )
3379 return 1
3381 return 1
3380 sep, eol = b':', b'\n'
3382 sep, eol = b':', b'\n'
3381 if opts.get(b'print0'):
3383 if opts.get(b'print0'):
3382 sep = eol = b'\0'
3384 sep = eol = b'\0'
3383
3385
3384 getfile = util.lrucachefunc(repo.file)
3386 getfile = util.lrucachefunc(repo.file)
3385
3387
3386 def matchlines(body):
3388 def matchlines(body):
3387 begin = 0
3389 begin = 0
3388 linenum = 0
3390 linenum = 0
3389 while begin < len(body):
3391 while begin < len(body):
3390 match = regexp.search(body, begin)
3392 match = regexp.search(body, begin)
3391 if not match:
3393 if not match:
3392 break
3394 break
3393 mstart, mend = match.span()
3395 mstart, mend = match.span()
3394 linenum += body.count(b'\n', begin, mstart) + 1
3396 linenum += body.count(b'\n', begin, mstart) + 1
3395 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3397 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3396 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3398 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3397 lend = begin - 1
3399 lend = begin - 1
3398 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3400 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3399
3401
3400 class linestate(object):
3402 class linestate(object):
3401 def __init__(self, line, linenum, colstart, colend):
3403 def __init__(self, line, linenum, colstart, colend):
3402 self.line = line
3404 self.line = line
3403 self.linenum = linenum
3405 self.linenum = linenum
3404 self.colstart = colstart
3406 self.colstart = colstart
3405 self.colend = colend
3407 self.colend = colend
3406
3408
3407 def __hash__(self):
3409 def __hash__(self):
3408 return hash((self.linenum, self.line))
3410 return hash((self.linenum, self.line))
3409
3411
3410 def __eq__(self, other):
3412 def __eq__(self, other):
3411 return self.line == other.line
3413 return self.line == other.line
3412
3414
3413 def findpos(self):
3415 def findpos(self):
3414 """Iterate all (start, end) indices of matches"""
3416 """Iterate all (start, end) indices of matches"""
3415 yield self.colstart, self.colend
3417 yield self.colstart, self.colend
3416 p = self.colend
3418 p = self.colend
3417 while p < len(self.line):
3419 while p < len(self.line):
3418 m = regexp.search(self.line, p)
3420 m = regexp.search(self.line, p)
3419 if not m:
3421 if not m:
3420 break
3422 break
3421 yield m.span()
3423 yield m.span()
3422 p = m.end()
3424 p = m.end()
3423
3425
3424 matches = {}
3426 matches = {}
3425 copies = {}
3427 copies = {}
3426
3428
3427 def grepbody(fn, rev, body):
3429 def grepbody(fn, rev, body):
3428 matches[rev].setdefault(fn, [])
3430 matches[rev].setdefault(fn, [])
3429 m = matches[rev][fn]
3431 m = matches[rev][fn]
3430 if body is None:
3432 if body is None:
3431 return
3433 return
3432
3434
3433 for lnum, cstart, cend, line in matchlines(body):
3435 for lnum, cstart, cend, line in matchlines(body):
3434 s = linestate(line, lnum, cstart, cend)
3436 s = linestate(line, lnum, cstart, cend)
3435 m.append(s)
3437 m.append(s)
3436
3438
3437 def difflinestates(a, b):
3439 def difflinestates(a, b):
3438 sm = difflib.SequenceMatcher(None, a, b)
3440 sm = difflib.SequenceMatcher(None, a, b)
3439 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3441 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3440 if tag == 'insert':
3442 if tag == 'insert':
3441 for i in pycompat.xrange(blo, bhi):
3443 for i in pycompat.xrange(blo, bhi):
3442 yield (b'+', b[i])
3444 yield (b'+', b[i])
3443 elif tag == 'delete':
3445 elif tag == 'delete':
3444 for i in pycompat.xrange(alo, ahi):
3446 for i in pycompat.xrange(alo, ahi):
3445 yield (b'-', a[i])
3447 yield (b'-', a[i])
3446 elif tag == 'replace':
3448 elif tag == 'replace':
3447 for i in pycompat.xrange(alo, ahi):
3449 for i in pycompat.xrange(alo, ahi):
3448 yield (b'-', a[i])
3450 yield (b'-', a[i])
3449 for i in pycompat.xrange(blo, bhi):
3451 for i in pycompat.xrange(blo, bhi):
3450 yield (b'+', b[i])
3452 yield (b'+', b[i])
3451
3453
3452 uipathfn = scmutil.getuipathfn(repo)
3454 uipathfn = scmutil.getuipathfn(repo)
3453
3455
3454 def display(fm, fn, ctx, pstates, states):
3456 def display(fm, fn, ctx, pstates, states):
3455 rev = scmutil.intrev(ctx)
3457 rev = scmutil.intrev(ctx)
3456 if fm.isplain():
3458 if fm.isplain():
3457 formatuser = ui.shortuser
3459 formatuser = ui.shortuser
3458 else:
3460 else:
3459 formatuser = pycompat.bytestr
3461 formatuser = pycompat.bytestr
3460 if ui.quiet:
3462 if ui.quiet:
3461 datefmt = b'%Y-%m-%d'
3463 datefmt = b'%Y-%m-%d'
3462 else:
3464 else:
3463 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3465 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3464 found = False
3466 found = False
3465
3467
3466 @util.cachefunc
3468 @util.cachefunc
3467 def binary():
3469 def binary():
3468 flog = getfile(fn)
3470 flog = getfile(fn)
3469 try:
3471 try:
3470 return stringutil.binary(flog.read(ctx.filenode(fn)))
3472 return stringutil.binary(flog.read(ctx.filenode(fn)))
3471 except error.WdirUnsupported:
3473 except error.WdirUnsupported:
3472 return ctx[fn].isbinary()
3474 return ctx[fn].isbinary()
3473
3475
3474 fieldnamemap = {b'linenumber': b'lineno'}
3476 fieldnamemap = {b'linenumber': b'lineno'}
3475 if diff:
3477 if diff:
3476 iter = difflinestates(pstates, states)
3478 iter = difflinestates(pstates, states)
3477 else:
3479 else:
3478 iter = [(b'', l) for l in states]
3480 iter = [(b'', l) for l in states]
3479 for change, l in iter:
3481 for change, l in iter:
3480 fm.startitem()
3482 fm.startitem()
3481 fm.context(ctx=ctx)
3483 fm.context(ctx=ctx)
3482 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3484 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3483 fm.plain(uipathfn(fn), label=b'grep.filename')
3485 fm.plain(uipathfn(fn), label=b'grep.filename')
3484
3486
3485 cols = [
3487 cols = [
3486 (b'rev', b'%d', rev, not plaingrep, b''),
3488 (b'rev', b'%d', rev, not plaingrep, b''),
3487 (
3489 (
3488 b'linenumber',
3490 b'linenumber',
3489 b'%d',
3491 b'%d',
3490 l.linenum,
3492 l.linenum,
3491 opts.get(b'line_number'),
3493 opts.get(b'line_number'),
3492 b'',
3494 b'',
3493 ),
3495 ),
3494 ]
3496 ]
3495 if diff:
3497 if diff:
3496 cols.append(
3498 cols.append(
3497 (
3499 (
3498 b'change',
3500 b'change',
3499 b'%s',
3501 b'%s',
3500 change,
3502 change,
3501 True,
3503 True,
3502 b'grep.inserted '
3504 b'grep.inserted '
3503 if change == b'+'
3505 if change == b'+'
3504 else b'grep.deleted ',
3506 else b'grep.deleted ',
3505 )
3507 )
3506 )
3508 )
3507 cols.extend(
3509 cols.extend(
3508 [
3510 [
3509 (
3511 (
3510 b'user',
3512 b'user',
3511 b'%s',
3513 b'%s',
3512 formatuser(ctx.user()),
3514 formatuser(ctx.user()),
3513 opts.get(b'user'),
3515 opts.get(b'user'),
3514 b'',
3516 b'',
3515 ),
3517 ),
3516 (
3518 (
3517 b'date',
3519 b'date',
3518 b'%s',
3520 b'%s',
3519 fm.formatdate(ctx.date(), datefmt),
3521 fm.formatdate(ctx.date(), datefmt),
3520 opts.get(b'date'),
3522 opts.get(b'date'),
3521 b'',
3523 b'',
3522 ),
3524 ),
3523 ]
3525 ]
3524 )
3526 )
3525 for name, fmt, data, cond, extra_label in cols:
3527 for name, fmt, data, cond, extra_label in cols:
3526 if cond:
3528 if cond:
3527 fm.plain(sep, label=b'grep.sep')
3529 fm.plain(sep, label=b'grep.sep')
3528 field = fieldnamemap.get(name, name)
3530 field = fieldnamemap.get(name, name)
3529 label = extra_label + (b'grep.%s' % name)
3531 label = extra_label + (b'grep.%s' % name)
3530 fm.condwrite(cond, field, fmt, data, label=label)
3532 fm.condwrite(cond, field, fmt, data, label=label)
3531 if not opts.get(b'files_with_matches'):
3533 if not opts.get(b'files_with_matches'):
3532 fm.plain(sep, label=b'grep.sep')
3534 fm.plain(sep, label=b'grep.sep')
3533 if not opts.get(b'text') and binary():
3535 if not opts.get(b'text') and binary():
3534 fm.plain(_(b" Binary file matches"))
3536 fm.plain(_(b" Binary file matches"))
3535 else:
3537 else:
3536 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3538 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3537 fm.plain(eol)
3539 fm.plain(eol)
3538 found = True
3540 found = True
3539 if opts.get(b'files_with_matches'):
3541 if opts.get(b'files_with_matches'):
3540 break
3542 break
3541 return found
3543 return found
3542
3544
3543 def displaymatches(fm, l):
3545 def displaymatches(fm, l):
3544 p = 0
3546 p = 0
3545 for s, e in l.findpos():
3547 for s, e in l.findpos():
3546 if p < s:
3548 if p < s:
3547 fm.startitem()
3549 fm.startitem()
3548 fm.write(b'text', b'%s', l.line[p:s])
3550 fm.write(b'text', b'%s', l.line[p:s])
3549 fm.data(matched=False)
3551 fm.data(matched=False)
3550 fm.startitem()
3552 fm.startitem()
3551 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3553 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3552 fm.data(matched=True)
3554 fm.data(matched=True)
3553 p = e
3555 p = e
3554 if p < len(l.line):
3556 if p < len(l.line):
3555 fm.startitem()
3557 fm.startitem()
3556 fm.write(b'text', b'%s', l.line[p:])
3558 fm.write(b'text', b'%s', l.line[p:])
3557 fm.data(matched=False)
3559 fm.data(matched=False)
3558 fm.end()
3560 fm.end()
3559
3561
3560 skip = set()
3562 skip = set()
3561 revfiles = {}
3563 revfiles = {}
3562 match = scmutil.match(repo[None], pats, opts)
3564 match = scmutil.match(repo[None], pats, opts)
3563 found = False
3565 found = False
3564 follow = opts.get(b'follow')
3566 follow = opts.get(b'follow')
3565
3567
3566 getrenamed = scmutil.getrenamedfn(repo)
3568 getrenamed = scmutil.getrenamedfn(repo)
3567
3569
3568 def get_file_content(filename, filelog, filenode, context, revision):
3570 def get_file_content(filename, filelog, filenode, context, revision):
3569 try:
3571 try:
3570 content = filelog.read(filenode)
3572 content = filelog.read(filenode)
3571 except error.WdirUnsupported:
3573 except error.WdirUnsupported:
3572 content = context[filename].data()
3574 content = context[filename].data()
3573 except error.CensoredNodeError:
3575 except error.CensoredNodeError:
3574 content = None
3576 content = None
3575 ui.warn(
3577 ui.warn(
3576 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3578 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3577 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3579 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3578 )
3580 )
3579 return content
3581 return content
3580
3582
3581 def prep(ctx, fns):
3583 def prep(ctx, fns):
3582 rev = ctx.rev()
3584 rev = ctx.rev()
3583 pctx = ctx.p1()
3585 pctx = ctx.p1()
3584 parent = pctx.rev()
3586 parent = pctx.rev()
3585 matches.setdefault(rev, {})
3587 matches.setdefault(rev, {})
3586 matches.setdefault(parent, {})
3588 matches.setdefault(parent, {})
3587 files = revfiles.setdefault(rev, [])
3589 files = revfiles.setdefault(rev, [])
3588 for fn in fns:
3590 for fn in fns:
3589 flog = getfile(fn)
3591 flog = getfile(fn)
3590 try:
3592 try:
3591 fnode = ctx.filenode(fn)
3593 fnode = ctx.filenode(fn)
3592 except error.LookupError:
3594 except error.LookupError:
3593 continue
3595 continue
3594
3596
3595 copy = None
3597 copy = None
3596 if follow:
3598 if follow:
3597 copy = getrenamed(fn, rev)
3599 copy = getrenamed(fn, rev)
3598 if copy:
3600 if copy:
3599 copies.setdefault(rev, {})[fn] = copy
3601 copies.setdefault(rev, {})[fn] = copy
3600 if fn in skip:
3602 if fn in skip:
3601 skip.add(copy)
3603 skip.add(copy)
3602 if fn in skip:
3604 if fn in skip:
3603 continue
3605 continue
3604 files.append(fn)
3606 files.append(fn)
3605
3607
3606 if fn not in matches[rev]:
3608 if fn not in matches[rev]:
3607 content = get_file_content(fn, flog, fnode, ctx, rev)
3609 content = get_file_content(fn, flog, fnode, ctx, rev)
3608 grepbody(fn, rev, content)
3610 grepbody(fn, rev, content)
3609
3611
3610 pfn = copy or fn
3612 pfn = copy or fn
3611 if pfn not in matches[parent]:
3613 if pfn not in matches[parent]:
3612 try:
3614 try:
3613 pfnode = pctx.filenode(pfn)
3615 pfnode = pctx.filenode(pfn)
3614 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3616 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3615 grepbody(pfn, parent, pcontent)
3617 grepbody(pfn, parent, pcontent)
3616 except error.LookupError:
3618 except error.LookupError:
3617 pass
3619 pass
3618
3620
3619 ui.pager(b'grep')
3621 ui.pager(b'grep')
3620 fm = ui.formatter(b'grep', opts)
3622 fm = ui.formatter(b'grep', opts)
3621 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3623 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3622 rev = ctx.rev()
3624 rev = ctx.rev()
3623 parent = ctx.p1().rev()
3625 parent = ctx.p1().rev()
3624 for fn in sorted(revfiles.get(rev, [])):
3626 for fn in sorted(revfiles.get(rev, [])):
3625 states = matches[rev][fn]
3627 states = matches[rev][fn]
3626 copy = copies.get(rev, {}).get(fn)
3628 copy = copies.get(rev, {}).get(fn)
3627 if fn in skip:
3629 if fn in skip:
3628 if copy:
3630 if copy:
3629 skip.add(copy)
3631 skip.add(copy)
3630 continue
3632 continue
3631 pstates = matches.get(parent, {}).get(copy or fn, [])
3633 pstates = matches.get(parent, {}).get(copy or fn, [])
3632 if pstates or states:
3634 if pstates or states:
3633 r = display(fm, fn, ctx, pstates, states)
3635 r = display(fm, fn, ctx, pstates, states)
3634 found = found or r
3636 found = found or r
3635 if r and not diff and not all_files:
3637 if r and not diff and not all_files:
3636 skip.add(fn)
3638 skip.add(fn)
3637 if copy:
3639 if copy:
3638 skip.add(copy)
3640 skip.add(copy)
3639 del revfiles[rev]
3641 del revfiles[rev]
3640 # We will keep the matches dict for the duration of the window
3642 # We will keep the matches dict for the duration of the window
3641 # clear the matches dict once the window is over
3643 # clear the matches dict once the window is over
3642 if not revfiles:
3644 if not revfiles:
3643 matches.clear()
3645 matches.clear()
3644 fm.end()
3646 fm.end()
3645
3647
3646 return not found
3648 return not found
3647
3649
3648
3650
3649 @command(
3651 @command(
3650 b'heads',
3652 b'heads',
3651 [
3653 [
3652 (
3654 (
3653 b'r',
3655 b'r',
3654 b'rev',
3656 b'rev',
3655 b'',
3657 b'',
3656 _(b'show only heads which are descendants of STARTREV'),
3658 _(b'show only heads which are descendants of STARTREV'),
3657 _(b'STARTREV'),
3659 _(b'STARTREV'),
3658 ),
3660 ),
3659 (b't', b'topo', False, _(b'show topological heads only')),
3661 (b't', b'topo', False, _(b'show topological heads only')),
3660 (
3662 (
3661 b'a',
3663 b'a',
3662 b'active',
3664 b'active',
3663 False,
3665 False,
3664 _(b'show active branchheads only (DEPRECATED)'),
3666 _(b'show active branchheads only (DEPRECATED)'),
3665 ),
3667 ),
3666 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3668 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3667 ]
3669 ]
3668 + templateopts,
3670 + templateopts,
3669 _(b'[-ct] [-r STARTREV] [REV]...'),
3671 _(b'[-ct] [-r STARTREV] [REV]...'),
3670 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3672 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3671 intents={INTENT_READONLY},
3673 intents={INTENT_READONLY},
3672 )
3674 )
3673 def heads(ui, repo, *branchrevs, **opts):
3675 def heads(ui, repo, *branchrevs, **opts):
3674 """show branch heads
3676 """show branch heads
3675
3677
3676 With no arguments, show all open branch heads in the repository.
3678 With no arguments, show all open branch heads in the repository.
3677 Branch heads are changesets that have no descendants on the
3679 Branch heads are changesets that have no descendants on the
3678 same branch. They are where development generally takes place and
3680 same branch. They are where development generally takes place and
3679 are the usual targets for update and merge operations.
3681 are the usual targets for update and merge operations.
3680
3682
3681 If one or more REVs are given, only open branch heads on the
3683 If one or more REVs are given, only open branch heads on the
3682 branches associated with the specified changesets are shown. This
3684 branches associated with the specified changesets are shown. This
3683 means that you can use :hg:`heads .` to see the heads on the
3685 means that you can use :hg:`heads .` to see the heads on the
3684 currently checked-out branch.
3686 currently checked-out branch.
3685
3687
3686 If -c/--closed is specified, also show branch heads marked closed
3688 If -c/--closed is specified, also show branch heads marked closed
3687 (see :hg:`commit --close-branch`).
3689 (see :hg:`commit --close-branch`).
3688
3690
3689 If STARTREV is specified, only those heads that are descendants of
3691 If STARTREV is specified, only those heads that are descendants of
3690 STARTREV will be displayed.
3692 STARTREV will be displayed.
3691
3693
3692 If -t/--topo is specified, named branch mechanics will be ignored and only
3694 If -t/--topo is specified, named branch mechanics will be ignored and only
3693 topological heads (changesets with no children) will be shown.
3695 topological heads (changesets with no children) will be shown.
3694
3696
3695 Returns 0 if matching heads are found, 1 if not.
3697 Returns 0 if matching heads are found, 1 if not.
3696 """
3698 """
3697
3699
3698 opts = pycompat.byteskwargs(opts)
3700 opts = pycompat.byteskwargs(opts)
3699 start = None
3701 start = None
3700 rev = opts.get(b'rev')
3702 rev = opts.get(b'rev')
3701 if rev:
3703 if rev:
3702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3704 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3703 start = scmutil.revsingle(repo, rev, None).node()
3705 start = scmutil.revsingle(repo, rev, None).node()
3704
3706
3705 if opts.get(b'topo'):
3707 if opts.get(b'topo'):
3706 heads = [repo[h] for h in repo.heads(start)]
3708 heads = [repo[h] for h in repo.heads(start)]
3707 else:
3709 else:
3708 heads = []
3710 heads = []
3709 for branch in repo.branchmap():
3711 for branch in repo.branchmap():
3710 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3712 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3711 heads = [repo[h] for h in heads]
3713 heads = [repo[h] for h in heads]
3712
3714
3713 if branchrevs:
3715 if branchrevs:
3714 branches = set(
3716 branches = set(
3715 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3717 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3716 )
3718 )
3717 heads = [h for h in heads if h.branch() in branches]
3719 heads = [h for h in heads if h.branch() in branches]
3718
3720
3719 if opts.get(b'active') and branchrevs:
3721 if opts.get(b'active') and branchrevs:
3720 dagheads = repo.heads(start)
3722 dagheads = repo.heads(start)
3721 heads = [h for h in heads if h.node() in dagheads]
3723 heads = [h for h in heads if h.node() in dagheads]
3722
3724
3723 if branchrevs:
3725 if branchrevs:
3724 haveheads = set(h.branch() for h in heads)
3726 haveheads = set(h.branch() for h in heads)
3725 if branches - haveheads:
3727 if branches - haveheads:
3726 headless = b', '.join(b for b in branches - haveheads)
3728 headless = b', '.join(b for b in branches - haveheads)
3727 msg = _(b'no open branch heads found on branches %s')
3729 msg = _(b'no open branch heads found on branches %s')
3728 if opts.get(b'rev'):
3730 if opts.get(b'rev'):
3729 msg += _(b' (started at %s)') % opts[b'rev']
3731 msg += _(b' (started at %s)') % opts[b'rev']
3730 ui.warn((msg + b'\n') % headless)
3732 ui.warn((msg + b'\n') % headless)
3731
3733
3732 if not heads:
3734 if not heads:
3733 return 1
3735 return 1
3734
3736
3735 ui.pager(b'heads')
3737 ui.pager(b'heads')
3736 heads = sorted(heads, key=lambda x: -(x.rev()))
3738 heads = sorted(heads, key=lambda x: -(x.rev()))
3737 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3739 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3738 for ctx in heads:
3740 for ctx in heads:
3739 displayer.show(ctx)
3741 displayer.show(ctx)
3740 displayer.close()
3742 displayer.close()
3741
3743
3742
3744
3743 @command(
3745 @command(
3744 b'help',
3746 b'help',
3745 [
3747 [
3746 (b'e', b'extension', None, _(b'show only help for extensions')),
3748 (b'e', b'extension', None, _(b'show only help for extensions')),
3747 (b'c', b'command', None, _(b'show only help for commands')),
3749 (b'c', b'command', None, _(b'show only help for commands')),
3748 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3750 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3749 (
3751 (
3750 b's',
3752 b's',
3751 b'system',
3753 b'system',
3752 [],
3754 [],
3753 _(b'show help for specific platform(s)'),
3755 _(b'show help for specific platform(s)'),
3754 _(b'PLATFORM'),
3756 _(b'PLATFORM'),
3755 ),
3757 ),
3756 ],
3758 ],
3757 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3759 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3758 helpcategory=command.CATEGORY_HELP,
3760 helpcategory=command.CATEGORY_HELP,
3759 norepo=True,
3761 norepo=True,
3760 intents={INTENT_READONLY},
3762 intents={INTENT_READONLY},
3761 )
3763 )
3762 def help_(ui, name=None, **opts):
3764 def help_(ui, name=None, **opts):
3763 """show help for a given topic or a help overview
3765 """show help for a given topic or a help overview
3764
3766
3765 With no arguments, print a list of commands with short help messages.
3767 With no arguments, print a list of commands with short help messages.
3766
3768
3767 Given a topic, extension, or command name, print help for that
3769 Given a topic, extension, or command name, print help for that
3768 topic.
3770 topic.
3769
3771
3770 Returns 0 if successful.
3772 Returns 0 if successful.
3771 """
3773 """
3772
3774
3773 keep = opts.get('system') or []
3775 keep = opts.get('system') or []
3774 if len(keep) == 0:
3776 if len(keep) == 0:
3775 if pycompat.sysplatform.startswith(b'win'):
3777 if pycompat.sysplatform.startswith(b'win'):
3776 keep.append(b'windows')
3778 keep.append(b'windows')
3777 elif pycompat.sysplatform == b'OpenVMS':
3779 elif pycompat.sysplatform == b'OpenVMS':
3778 keep.append(b'vms')
3780 keep.append(b'vms')
3779 elif pycompat.sysplatform == b'plan9':
3781 elif pycompat.sysplatform == b'plan9':
3780 keep.append(b'plan9')
3782 keep.append(b'plan9')
3781 else:
3783 else:
3782 keep.append(b'unix')
3784 keep.append(b'unix')
3783 keep.append(pycompat.sysplatform.lower())
3785 keep.append(pycompat.sysplatform.lower())
3784 if ui.verbose:
3786 if ui.verbose:
3785 keep.append(b'verbose')
3787 keep.append(b'verbose')
3786
3788
3787 commands = sys.modules[__name__]
3789 commands = sys.modules[__name__]
3788 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3790 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3789 ui.pager(b'help')
3791 ui.pager(b'help')
3790 ui.write(formatted)
3792 ui.write(formatted)
3791
3793
3792
3794
3793 @command(
3795 @command(
3794 b'identify|id',
3796 b'identify|id',
3795 [
3797 [
3796 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3798 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3797 (b'n', b'num', None, _(b'show local revision number')),
3799 (b'n', b'num', None, _(b'show local revision number')),
3798 (b'i', b'id', None, _(b'show global revision id')),
3800 (b'i', b'id', None, _(b'show global revision id')),
3799 (b'b', b'branch', None, _(b'show branch')),
3801 (b'b', b'branch', None, _(b'show branch')),
3800 (b't', b'tags', None, _(b'show tags')),
3802 (b't', b'tags', None, _(b'show tags')),
3801 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3803 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3802 ]
3804 ]
3803 + remoteopts
3805 + remoteopts
3804 + formatteropts,
3806 + formatteropts,
3805 _(b'[-nibtB] [-r REV] [SOURCE]'),
3807 _(b'[-nibtB] [-r REV] [SOURCE]'),
3806 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3808 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3807 optionalrepo=True,
3809 optionalrepo=True,
3808 intents={INTENT_READONLY},
3810 intents={INTENT_READONLY},
3809 )
3811 )
3810 def identify(
3812 def identify(
3811 ui,
3813 ui,
3812 repo,
3814 repo,
3813 source=None,
3815 source=None,
3814 rev=None,
3816 rev=None,
3815 num=None,
3817 num=None,
3816 id=None,
3818 id=None,
3817 branch=None,
3819 branch=None,
3818 tags=None,
3820 tags=None,
3819 bookmarks=None,
3821 bookmarks=None,
3820 **opts
3822 **opts
3821 ):
3823 ):
3822 """identify the working directory or specified revision
3824 """identify the working directory or specified revision
3823
3825
3824 Print a summary identifying the repository state at REV using one or
3826 Print a summary identifying the repository state at REV using one or
3825 two parent hash identifiers, followed by a "+" if the working
3827 two parent hash identifiers, followed by a "+" if the working
3826 directory has uncommitted changes, the branch name (if not default),
3828 directory has uncommitted changes, the branch name (if not default),
3827 a list of tags, and a list of bookmarks.
3829 a list of tags, and a list of bookmarks.
3828
3830
3829 When REV is not given, print a summary of the current state of the
3831 When REV is not given, print a summary of the current state of the
3830 repository including the working directory. Specify -r. to get information
3832 repository including the working directory. Specify -r. to get information
3831 of the working directory parent without scanning uncommitted changes.
3833 of the working directory parent without scanning uncommitted changes.
3832
3834
3833 Specifying a path to a repository root or Mercurial bundle will
3835 Specifying a path to a repository root or Mercurial bundle will
3834 cause lookup to operate on that repository/bundle.
3836 cause lookup to operate on that repository/bundle.
3835
3837
3836 .. container:: verbose
3838 .. container:: verbose
3837
3839
3838 Template:
3840 Template:
3839
3841
3840 The following keywords are supported in addition to the common template
3842 The following keywords are supported in addition to the common template
3841 keywords and functions. See also :hg:`help templates`.
3843 keywords and functions. See also :hg:`help templates`.
3842
3844
3843 :dirty: String. Character ``+`` denoting if the working directory has
3845 :dirty: String. Character ``+`` denoting if the working directory has
3844 uncommitted changes.
3846 uncommitted changes.
3845 :id: String. One or two nodes, optionally followed by ``+``.
3847 :id: String. One or two nodes, optionally followed by ``+``.
3846 :parents: List of strings. Parent nodes of the changeset.
3848 :parents: List of strings. Parent nodes of the changeset.
3847
3849
3848 Examples:
3850 Examples:
3849
3851
3850 - generate a build identifier for the working directory::
3852 - generate a build identifier for the working directory::
3851
3853
3852 hg id --id > build-id.dat
3854 hg id --id > build-id.dat
3853
3855
3854 - find the revision corresponding to a tag::
3856 - find the revision corresponding to a tag::
3855
3857
3856 hg id -n -r 1.3
3858 hg id -n -r 1.3
3857
3859
3858 - check the most recent revision of a remote repository::
3860 - check the most recent revision of a remote repository::
3859
3861
3860 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3862 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3861
3863
3862 See :hg:`log` for generating more information about specific revisions,
3864 See :hg:`log` for generating more information about specific revisions,
3863 including full hash identifiers.
3865 including full hash identifiers.
3864
3866
3865 Returns 0 if successful.
3867 Returns 0 if successful.
3866 """
3868 """
3867
3869
3868 opts = pycompat.byteskwargs(opts)
3870 opts = pycompat.byteskwargs(opts)
3869 if not repo and not source:
3871 if not repo and not source:
3870 raise error.Abort(
3872 raise error.Abort(
3871 _(b"there is no Mercurial repository here (.hg not found)")
3873 _(b"there is no Mercurial repository here (.hg not found)")
3872 )
3874 )
3873
3875
3874 default = not (num or id or branch or tags or bookmarks)
3876 default = not (num or id or branch or tags or bookmarks)
3875 output = []
3877 output = []
3876 revs = []
3878 revs = []
3877
3879
3878 if source:
3880 if source:
3879 source, branches = hg.parseurl(ui.expandpath(source))
3881 source, branches = hg.parseurl(ui.expandpath(source))
3880 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3882 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3881 repo = peer.local()
3883 repo = peer.local()
3882 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3884 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3883
3885
3884 fm = ui.formatter(b'identify', opts)
3886 fm = ui.formatter(b'identify', opts)
3885 fm.startitem()
3887 fm.startitem()
3886
3888
3887 if not repo:
3889 if not repo:
3888 if num or branch or tags:
3890 if num or branch or tags:
3889 raise error.Abort(
3891 raise error.Abort(
3890 _(b"can't query remote revision number, branch, or tags")
3892 _(b"can't query remote revision number, branch, or tags")
3891 )
3893 )
3892 if not rev and revs:
3894 if not rev and revs:
3893 rev = revs[0]
3895 rev = revs[0]
3894 if not rev:
3896 if not rev:
3895 rev = b"tip"
3897 rev = b"tip"
3896
3898
3897 remoterev = peer.lookup(rev)
3899 remoterev = peer.lookup(rev)
3898 hexrev = fm.hexfunc(remoterev)
3900 hexrev = fm.hexfunc(remoterev)
3899 if default or id:
3901 if default or id:
3900 output = [hexrev]
3902 output = [hexrev]
3901 fm.data(id=hexrev)
3903 fm.data(id=hexrev)
3902
3904
3903 @util.cachefunc
3905 @util.cachefunc
3904 def getbms():
3906 def getbms():
3905 bms = []
3907 bms = []
3906
3908
3907 if b'bookmarks' in peer.listkeys(b'namespaces'):
3909 if b'bookmarks' in peer.listkeys(b'namespaces'):
3908 hexremoterev = hex(remoterev)
3910 hexremoterev = hex(remoterev)
3909 bms = [
3911 bms = [
3910 bm
3912 bm
3911 for bm, bmr in pycompat.iteritems(
3913 for bm, bmr in pycompat.iteritems(
3912 peer.listkeys(b'bookmarks')
3914 peer.listkeys(b'bookmarks')
3913 )
3915 )
3914 if bmr == hexremoterev
3916 if bmr == hexremoterev
3915 ]
3917 ]
3916
3918
3917 return sorted(bms)
3919 return sorted(bms)
3918
3920
3919 if fm.isplain():
3921 if fm.isplain():
3920 if bookmarks:
3922 if bookmarks:
3921 output.extend(getbms())
3923 output.extend(getbms())
3922 elif default and not ui.quiet:
3924 elif default and not ui.quiet:
3923 # multiple bookmarks for a single parent separated by '/'
3925 # multiple bookmarks for a single parent separated by '/'
3924 bm = b'/'.join(getbms())
3926 bm = b'/'.join(getbms())
3925 if bm:
3927 if bm:
3926 output.append(bm)
3928 output.append(bm)
3927 else:
3929 else:
3928 fm.data(node=hex(remoterev))
3930 fm.data(node=hex(remoterev))
3929 if bookmarks or b'bookmarks' in fm.datahint():
3931 if bookmarks or b'bookmarks' in fm.datahint():
3930 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3932 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3931 else:
3933 else:
3932 if rev:
3934 if rev:
3933 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3935 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3934 ctx = scmutil.revsingle(repo, rev, None)
3936 ctx = scmutil.revsingle(repo, rev, None)
3935
3937
3936 if ctx.rev() is None:
3938 if ctx.rev() is None:
3937 ctx = repo[None]
3939 ctx = repo[None]
3938 parents = ctx.parents()
3940 parents = ctx.parents()
3939 taglist = []
3941 taglist = []
3940 for p in parents:
3942 for p in parents:
3941 taglist.extend(p.tags())
3943 taglist.extend(p.tags())
3942
3944
3943 dirty = b""
3945 dirty = b""
3944 if ctx.dirty(missing=True, merge=False, branch=False):
3946 if ctx.dirty(missing=True, merge=False, branch=False):
3945 dirty = b'+'
3947 dirty = b'+'
3946 fm.data(dirty=dirty)
3948 fm.data(dirty=dirty)
3947
3949
3948 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3950 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3949 if default or id:
3951 if default or id:
3950 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3952 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3951 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3953 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3952
3954
3953 if num:
3955 if num:
3954 numoutput = [b"%d" % p.rev() for p in parents]
3956 numoutput = [b"%d" % p.rev() for p in parents]
3955 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3957 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3956
3958
3957 fm.data(
3959 fm.data(
3958 parents=fm.formatlist(
3960 parents=fm.formatlist(
3959 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3961 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3960 )
3962 )
3961 )
3963 )
3962 else:
3964 else:
3963 hexoutput = fm.hexfunc(ctx.node())
3965 hexoutput = fm.hexfunc(ctx.node())
3964 if default or id:
3966 if default or id:
3965 output = [hexoutput]
3967 output = [hexoutput]
3966 fm.data(id=hexoutput)
3968 fm.data(id=hexoutput)
3967
3969
3968 if num:
3970 if num:
3969 output.append(pycompat.bytestr(ctx.rev()))
3971 output.append(pycompat.bytestr(ctx.rev()))
3970 taglist = ctx.tags()
3972 taglist = ctx.tags()
3971
3973
3972 if default and not ui.quiet:
3974 if default and not ui.quiet:
3973 b = ctx.branch()
3975 b = ctx.branch()
3974 if b != b'default':
3976 if b != b'default':
3975 output.append(b"(%s)" % b)
3977 output.append(b"(%s)" % b)
3976
3978
3977 # multiple tags for a single parent separated by '/'
3979 # multiple tags for a single parent separated by '/'
3978 t = b'/'.join(taglist)
3980 t = b'/'.join(taglist)
3979 if t:
3981 if t:
3980 output.append(t)
3982 output.append(t)
3981
3983
3982 # multiple bookmarks for a single parent separated by '/'
3984 # multiple bookmarks for a single parent separated by '/'
3983 bm = b'/'.join(ctx.bookmarks())
3985 bm = b'/'.join(ctx.bookmarks())
3984 if bm:
3986 if bm:
3985 output.append(bm)
3987 output.append(bm)
3986 else:
3988 else:
3987 if branch:
3989 if branch:
3988 output.append(ctx.branch())
3990 output.append(ctx.branch())
3989
3991
3990 if tags:
3992 if tags:
3991 output.extend(taglist)
3993 output.extend(taglist)
3992
3994
3993 if bookmarks:
3995 if bookmarks:
3994 output.extend(ctx.bookmarks())
3996 output.extend(ctx.bookmarks())
3995
3997
3996 fm.data(node=ctx.hex())
3998 fm.data(node=ctx.hex())
3997 fm.data(branch=ctx.branch())
3999 fm.data(branch=ctx.branch())
3998 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4000 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3999 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4001 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4000 fm.context(ctx=ctx)
4002 fm.context(ctx=ctx)
4001
4003
4002 fm.plain(b"%s\n" % b' '.join(output))
4004 fm.plain(b"%s\n" % b' '.join(output))
4003 fm.end()
4005 fm.end()
4004
4006
4005
4007
4006 @command(
4008 @command(
4007 b'import|patch',
4009 b'import|patch',
4008 [
4010 [
4009 (
4011 (
4010 b'p',
4012 b'p',
4011 b'strip',
4013 b'strip',
4012 1,
4014 1,
4013 _(
4015 _(
4014 b'directory strip option for patch. This has the same '
4016 b'directory strip option for patch. This has the same '
4015 b'meaning as the corresponding patch option'
4017 b'meaning as the corresponding patch option'
4016 ),
4018 ),
4017 _(b'NUM'),
4019 _(b'NUM'),
4018 ),
4020 ),
4019 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4021 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4020 (b'', b'secret', None, _(b'use the secret phase for committing')),
4022 (b'', b'secret', None, _(b'use the secret phase for committing')),
4021 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4023 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4022 (
4024 (
4023 b'f',
4025 b'f',
4024 b'force',
4026 b'force',
4025 None,
4027 None,
4026 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4028 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4027 ),
4029 ),
4028 (
4030 (
4029 b'',
4031 b'',
4030 b'no-commit',
4032 b'no-commit',
4031 None,
4033 None,
4032 _(b"don't commit, just update the working directory"),
4034 _(b"don't commit, just update the working directory"),
4033 ),
4035 ),
4034 (
4036 (
4035 b'',
4037 b'',
4036 b'bypass',
4038 b'bypass',
4037 None,
4039 None,
4038 _(b"apply patch without touching the working directory"),
4040 _(b"apply patch without touching the working directory"),
4039 ),
4041 ),
4040 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4042 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4041 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4043 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4042 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4044 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4043 (
4045 (
4044 b'',
4046 b'',
4045 b'import-branch',
4047 b'import-branch',
4046 None,
4048 None,
4047 _(b'use any branch information in patch (implied by --exact)'),
4049 _(b'use any branch information in patch (implied by --exact)'),
4048 ),
4050 ),
4049 ]
4051 ]
4050 + commitopts
4052 + commitopts
4051 + commitopts2
4053 + commitopts2
4052 + similarityopts,
4054 + similarityopts,
4053 _(b'[OPTION]... PATCH...'),
4055 _(b'[OPTION]... PATCH...'),
4054 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4056 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4055 )
4057 )
4056 def import_(ui, repo, patch1=None, *patches, **opts):
4058 def import_(ui, repo, patch1=None, *patches, **opts):
4057 """import an ordered set of patches
4059 """import an ordered set of patches
4058
4060
4059 Import a list of patches and commit them individually (unless
4061 Import a list of patches and commit them individually (unless
4060 --no-commit is specified).
4062 --no-commit is specified).
4061
4063
4062 To read a patch from standard input (stdin), use "-" as the patch
4064 To read a patch from standard input (stdin), use "-" as the patch
4063 name. If a URL is specified, the patch will be downloaded from
4065 name. If a URL is specified, the patch will be downloaded from
4064 there.
4066 there.
4065
4067
4066 Import first applies changes to the working directory (unless
4068 Import first applies changes to the working directory (unless
4067 --bypass is specified), import will abort if there are outstanding
4069 --bypass is specified), import will abort if there are outstanding
4068 changes.
4070 changes.
4069
4071
4070 Use --bypass to apply and commit patches directly to the
4072 Use --bypass to apply and commit patches directly to the
4071 repository, without affecting the working directory. Without
4073 repository, without affecting the working directory. Without
4072 --exact, patches will be applied on top of the working directory
4074 --exact, patches will be applied on top of the working directory
4073 parent revision.
4075 parent revision.
4074
4076
4075 You can import a patch straight from a mail message. Even patches
4077 You can import a patch straight from a mail message. Even patches
4076 as attachments work (to use the body part, it must have type
4078 as attachments work (to use the body part, it must have type
4077 text/plain or text/x-patch). From and Subject headers of email
4079 text/plain or text/x-patch). From and Subject headers of email
4078 message are used as default committer and commit message. All
4080 message are used as default committer and commit message. All
4079 text/plain body parts before first diff are added to the commit
4081 text/plain body parts before first diff are added to the commit
4080 message.
4082 message.
4081
4083
4082 If the imported patch was generated by :hg:`export`, user and
4084 If the imported patch was generated by :hg:`export`, user and
4083 description from patch override values from message headers and
4085 description from patch override values from message headers and
4084 body. Values given on command line with -m/--message and -u/--user
4086 body. Values given on command line with -m/--message and -u/--user
4085 override these.
4087 override these.
4086
4088
4087 If --exact is specified, import will set the working directory to
4089 If --exact is specified, import will set the working directory to
4088 the parent of each patch before applying it, and will abort if the
4090 the parent of each patch before applying it, and will abort if the
4089 resulting changeset has a different ID than the one recorded in
4091 resulting changeset has a different ID than the one recorded in
4090 the patch. This will guard against various ways that portable
4092 the patch. This will guard against various ways that portable
4091 patch formats and mail systems might fail to transfer Mercurial
4093 patch formats and mail systems might fail to transfer Mercurial
4092 data or metadata. See :hg:`bundle` for lossless transmission.
4094 data or metadata. See :hg:`bundle` for lossless transmission.
4093
4095
4094 Use --partial to ensure a changeset will be created from the patch
4096 Use --partial to ensure a changeset will be created from the patch
4095 even if some hunks fail to apply. Hunks that fail to apply will be
4097 even if some hunks fail to apply. Hunks that fail to apply will be
4096 written to a <target-file>.rej file. Conflicts can then be resolved
4098 written to a <target-file>.rej file. Conflicts can then be resolved
4097 by hand before :hg:`commit --amend` is run to update the created
4099 by hand before :hg:`commit --amend` is run to update the created
4098 changeset. This flag exists to let people import patches that
4100 changeset. This flag exists to let people import patches that
4099 partially apply without losing the associated metadata (author,
4101 partially apply without losing the associated metadata (author,
4100 date, description, ...).
4102 date, description, ...).
4101
4103
4102 .. note::
4104 .. note::
4103
4105
4104 When no hunks apply cleanly, :hg:`import --partial` will create
4106 When no hunks apply cleanly, :hg:`import --partial` will create
4105 an empty changeset, importing only the patch metadata.
4107 an empty changeset, importing only the patch metadata.
4106
4108
4107 With -s/--similarity, hg will attempt to discover renames and
4109 With -s/--similarity, hg will attempt to discover renames and
4108 copies in the patch in the same way as :hg:`addremove`.
4110 copies in the patch in the same way as :hg:`addremove`.
4109
4111
4110 It is possible to use external patch programs to perform the patch
4112 It is possible to use external patch programs to perform the patch
4111 by setting the ``ui.patch`` configuration option. For the default
4113 by setting the ``ui.patch`` configuration option. For the default
4112 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4114 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4113 See :hg:`help config` for more information about configuration
4115 See :hg:`help config` for more information about configuration
4114 files and how to use these options.
4116 files and how to use these options.
4115
4117
4116 See :hg:`help dates` for a list of formats valid for -d/--date.
4118 See :hg:`help dates` for a list of formats valid for -d/--date.
4117
4119
4118 .. container:: verbose
4120 .. container:: verbose
4119
4121
4120 Examples:
4122 Examples:
4121
4123
4122 - import a traditional patch from a website and detect renames::
4124 - import a traditional patch from a website and detect renames::
4123
4125
4124 hg import -s 80 http://example.com/bugfix.patch
4126 hg import -s 80 http://example.com/bugfix.patch
4125
4127
4126 - import a changeset from an hgweb server::
4128 - import a changeset from an hgweb server::
4127
4129
4128 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4130 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4129
4131
4130 - import all the patches in an Unix-style mbox::
4132 - import all the patches in an Unix-style mbox::
4131
4133
4132 hg import incoming-patches.mbox
4134 hg import incoming-patches.mbox
4133
4135
4134 - import patches from stdin::
4136 - import patches from stdin::
4135
4137
4136 hg import -
4138 hg import -
4137
4139
4138 - attempt to exactly restore an exported changeset (not always
4140 - attempt to exactly restore an exported changeset (not always
4139 possible)::
4141 possible)::
4140
4142
4141 hg import --exact proposed-fix.patch
4143 hg import --exact proposed-fix.patch
4142
4144
4143 - use an external tool to apply a patch which is too fuzzy for
4145 - use an external tool to apply a patch which is too fuzzy for
4144 the default internal tool.
4146 the default internal tool.
4145
4147
4146 hg import --config ui.patch="patch --merge" fuzzy.patch
4148 hg import --config ui.patch="patch --merge" fuzzy.patch
4147
4149
4148 - change the default fuzzing from 2 to a less strict 7
4150 - change the default fuzzing from 2 to a less strict 7
4149
4151
4150 hg import --config ui.fuzz=7 fuzz.patch
4152 hg import --config ui.fuzz=7 fuzz.patch
4151
4153
4152 Returns 0 on success, 1 on partial success (see --partial).
4154 Returns 0 on success, 1 on partial success (see --partial).
4153 """
4155 """
4154
4156
4155 opts = pycompat.byteskwargs(opts)
4157 opts = pycompat.byteskwargs(opts)
4156 if not patch1:
4158 if not patch1:
4157 raise error.Abort(_(b'need at least one patch to import'))
4159 raise error.Abort(_(b'need at least one patch to import'))
4158
4160
4159 patches = (patch1,) + patches
4161 patches = (patch1,) + patches
4160
4162
4161 date = opts.get(b'date')
4163 date = opts.get(b'date')
4162 if date:
4164 if date:
4163 opts[b'date'] = dateutil.parsedate(date)
4165 opts[b'date'] = dateutil.parsedate(date)
4164
4166
4165 exact = opts.get(b'exact')
4167 exact = opts.get(b'exact')
4166 update = not opts.get(b'bypass')
4168 update = not opts.get(b'bypass')
4167 if not update and opts.get(b'no_commit'):
4169 if not update and opts.get(b'no_commit'):
4168 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4170 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4169 if opts.get(b'secret') and opts.get(b'no_commit'):
4171 if opts.get(b'secret') and opts.get(b'no_commit'):
4170 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4172 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4171 try:
4173 try:
4172 sim = float(opts.get(b'similarity') or 0)
4174 sim = float(opts.get(b'similarity') or 0)
4173 except ValueError:
4175 except ValueError:
4174 raise error.Abort(_(b'similarity must be a number'))
4176 raise error.Abort(_(b'similarity must be a number'))
4175 if sim < 0 or sim > 100:
4177 if sim < 0 or sim > 100:
4176 raise error.Abort(_(b'similarity must be between 0 and 100'))
4178 raise error.Abort(_(b'similarity must be between 0 and 100'))
4177 if sim and not update:
4179 if sim and not update:
4178 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4180 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4179 if exact:
4181 if exact:
4180 if opts.get(b'edit'):
4182 if opts.get(b'edit'):
4181 raise error.Abort(_(b'cannot use --exact with --edit'))
4183 raise error.Abort(_(b'cannot use --exact with --edit'))
4182 if opts.get(b'prefix'):
4184 if opts.get(b'prefix'):
4183 raise error.Abort(_(b'cannot use --exact with --prefix'))
4185 raise error.Abort(_(b'cannot use --exact with --prefix'))
4184
4186
4185 base = opts[b"base"]
4187 base = opts[b"base"]
4186 msgs = []
4188 msgs = []
4187 ret = 0
4189 ret = 0
4188
4190
4189 with repo.wlock():
4191 with repo.wlock():
4190 if update:
4192 if update:
4191 cmdutil.checkunfinished(repo)
4193 cmdutil.checkunfinished(repo)
4192 if exact or not opts.get(b'force'):
4194 if exact or not opts.get(b'force'):
4193 cmdutil.bailifchanged(repo)
4195 cmdutil.bailifchanged(repo)
4194
4196
4195 if not opts.get(b'no_commit'):
4197 if not opts.get(b'no_commit'):
4196 lock = repo.lock
4198 lock = repo.lock
4197 tr = lambda: repo.transaction(b'import')
4199 tr = lambda: repo.transaction(b'import')
4198 dsguard = util.nullcontextmanager
4200 dsguard = util.nullcontextmanager
4199 else:
4201 else:
4200 lock = util.nullcontextmanager
4202 lock = util.nullcontextmanager
4201 tr = util.nullcontextmanager
4203 tr = util.nullcontextmanager
4202 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4204 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4203 with lock(), tr(), dsguard():
4205 with lock(), tr(), dsguard():
4204 parents = repo[None].parents()
4206 parents = repo[None].parents()
4205 for patchurl in patches:
4207 for patchurl in patches:
4206 if patchurl == b'-':
4208 if patchurl == b'-':
4207 ui.status(_(b'applying patch from stdin\n'))
4209 ui.status(_(b'applying patch from stdin\n'))
4208 patchfile = ui.fin
4210 patchfile = ui.fin
4209 patchurl = b'stdin' # for error message
4211 patchurl = b'stdin' # for error message
4210 else:
4212 else:
4211 patchurl = os.path.join(base, patchurl)
4213 patchurl = os.path.join(base, patchurl)
4212 ui.status(_(b'applying %s\n') % patchurl)
4214 ui.status(_(b'applying %s\n') % patchurl)
4213 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4215 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4214
4216
4215 haspatch = False
4217 haspatch = False
4216 for hunk in patch.split(patchfile):
4218 for hunk in patch.split(patchfile):
4217 with patch.extract(ui, hunk) as patchdata:
4219 with patch.extract(ui, hunk) as patchdata:
4218 msg, node, rej = cmdutil.tryimportone(
4220 msg, node, rej = cmdutil.tryimportone(
4219 ui, repo, patchdata, parents, opts, msgs, hg.clean
4221 ui, repo, patchdata, parents, opts, msgs, hg.clean
4220 )
4222 )
4221 if msg:
4223 if msg:
4222 haspatch = True
4224 haspatch = True
4223 ui.note(msg + b'\n')
4225 ui.note(msg + b'\n')
4224 if update or exact:
4226 if update or exact:
4225 parents = repo[None].parents()
4227 parents = repo[None].parents()
4226 else:
4228 else:
4227 parents = [repo[node]]
4229 parents = [repo[node]]
4228 if rej:
4230 if rej:
4229 ui.write_err(_(b"patch applied partially\n"))
4231 ui.write_err(_(b"patch applied partially\n"))
4230 ui.write_err(
4232 ui.write_err(
4231 _(
4233 _(
4232 b"(fix the .rej files and run "
4234 b"(fix the .rej files and run "
4233 b"`hg commit --amend`)\n"
4235 b"`hg commit --amend`)\n"
4234 )
4236 )
4235 )
4237 )
4236 ret = 1
4238 ret = 1
4237 break
4239 break
4238
4240
4239 if not haspatch:
4241 if not haspatch:
4240 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4242 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4241
4243
4242 if msgs:
4244 if msgs:
4243 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4245 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4244 return ret
4246 return ret
4245
4247
4246
4248
4247 @command(
4249 @command(
4248 b'incoming|in',
4250 b'incoming|in',
4249 [
4251 [
4250 (
4252 (
4251 b'f',
4253 b'f',
4252 b'force',
4254 b'force',
4253 None,
4255 None,
4254 _(b'run even if remote repository is unrelated'),
4256 _(b'run even if remote repository is unrelated'),
4255 ),
4257 ),
4256 (b'n', b'newest-first', None, _(b'show newest record first')),
4258 (b'n', b'newest-first', None, _(b'show newest record first')),
4257 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4259 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4258 (
4260 (
4259 b'r',
4261 b'r',
4260 b'rev',
4262 b'rev',
4261 [],
4263 [],
4262 _(b'a remote changeset intended to be added'),
4264 _(b'a remote changeset intended to be added'),
4263 _(b'REV'),
4265 _(b'REV'),
4264 ),
4266 ),
4265 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4267 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4266 (
4268 (
4267 b'b',
4269 b'b',
4268 b'branch',
4270 b'branch',
4269 [],
4271 [],
4270 _(b'a specific branch you would like to pull'),
4272 _(b'a specific branch you would like to pull'),
4271 _(b'BRANCH'),
4273 _(b'BRANCH'),
4272 ),
4274 ),
4273 ]
4275 ]
4274 + logopts
4276 + logopts
4275 + remoteopts
4277 + remoteopts
4276 + subrepoopts,
4278 + subrepoopts,
4277 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4279 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4278 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4280 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4279 )
4281 )
4280 def incoming(ui, repo, source=b"default", **opts):
4282 def incoming(ui, repo, source=b"default", **opts):
4281 """show new changesets found in source
4283 """show new changesets found in source
4282
4284
4283 Show new changesets found in the specified path/URL or the default
4285 Show new changesets found in the specified path/URL or the default
4284 pull location. These are the changesets that would have been pulled
4286 pull location. These are the changesets that would have been pulled
4285 by :hg:`pull` at the time you issued this command.
4287 by :hg:`pull` at the time you issued this command.
4286
4288
4287 See pull for valid source format details.
4289 See pull for valid source format details.
4288
4290
4289 .. container:: verbose
4291 .. container:: verbose
4290
4292
4291 With -B/--bookmarks, the result of bookmark comparison between
4293 With -B/--bookmarks, the result of bookmark comparison between
4292 local and remote repositories is displayed. With -v/--verbose,
4294 local and remote repositories is displayed. With -v/--verbose,
4293 status is also displayed for each bookmark like below::
4295 status is also displayed for each bookmark like below::
4294
4296
4295 BM1 01234567890a added
4297 BM1 01234567890a added
4296 BM2 1234567890ab advanced
4298 BM2 1234567890ab advanced
4297 BM3 234567890abc diverged
4299 BM3 234567890abc diverged
4298 BM4 34567890abcd changed
4300 BM4 34567890abcd changed
4299
4301
4300 The action taken locally when pulling depends on the
4302 The action taken locally when pulling depends on the
4301 status of each bookmark:
4303 status of each bookmark:
4302
4304
4303 :``added``: pull will create it
4305 :``added``: pull will create it
4304 :``advanced``: pull will update it
4306 :``advanced``: pull will update it
4305 :``diverged``: pull will create a divergent bookmark
4307 :``diverged``: pull will create a divergent bookmark
4306 :``changed``: result depends on remote changesets
4308 :``changed``: result depends on remote changesets
4307
4309
4308 From the point of view of pulling behavior, bookmark
4310 From the point of view of pulling behavior, bookmark
4309 existing only in the remote repository are treated as ``added``,
4311 existing only in the remote repository are treated as ``added``,
4310 even if it is in fact locally deleted.
4312 even if it is in fact locally deleted.
4311
4313
4312 .. container:: verbose
4314 .. container:: verbose
4313
4315
4314 For remote repository, using --bundle avoids downloading the
4316 For remote repository, using --bundle avoids downloading the
4315 changesets twice if the incoming is followed by a pull.
4317 changesets twice if the incoming is followed by a pull.
4316
4318
4317 Examples:
4319 Examples:
4318
4320
4319 - show incoming changes with patches and full description::
4321 - show incoming changes with patches and full description::
4320
4322
4321 hg incoming -vp
4323 hg incoming -vp
4322
4324
4323 - show incoming changes excluding merges, store a bundle::
4325 - show incoming changes excluding merges, store a bundle::
4324
4326
4325 hg in -vpM --bundle incoming.hg
4327 hg in -vpM --bundle incoming.hg
4326 hg pull incoming.hg
4328 hg pull incoming.hg
4327
4329
4328 - briefly list changes inside a bundle::
4330 - briefly list changes inside a bundle::
4329
4331
4330 hg in changes.hg -T "{desc|firstline}\\n"
4332 hg in changes.hg -T "{desc|firstline}\\n"
4331
4333
4332 Returns 0 if there are incoming changes, 1 otherwise.
4334 Returns 0 if there are incoming changes, 1 otherwise.
4333 """
4335 """
4334 opts = pycompat.byteskwargs(opts)
4336 opts = pycompat.byteskwargs(opts)
4335 if opts.get(b'graph'):
4337 if opts.get(b'graph'):
4336 logcmdutil.checkunsupportedgraphflags([], opts)
4338 logcmdutil.checkunsupportedgraphflags([], opts)
4337
4339
4338 def display(other, chlist, displayer):
4340 def display(other, chlist, displayer):
4339 revdag = logcmdutil.graphrevs(other, chlist, opts)
4341 revdag = logcmdutil.graphrevs(other, chlist, opts)
4340 logcmdutil.displaygraph(
4342 logcmdutil.displaygraph(
4341 ui, repo, revdag, displayer, graphmod.asciiedges
4343 ui, repo, revdag, displayer, graphmod.asciiedges
4342 )
4344 )
4343
4345
4344 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4346 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4345 return 0
4347 return 0
4346
4348
4347 if opts.get(b'bundle') and opts.get(b'subrepos'):
4349 if opts.get(b'bundle') and opts.get(b'subrepos'):
4348 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4350 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4349
4351
4350 if opts.get(b'bookmarks'):
4352 if opts.get(b'bookmarks'):
4351 source, branches = hg.parseurl(
4353 source, branches = hg.parseurl(
4352 ui.expandpath(source), opts.get(b'branch')
4354 ui.expandpath(source), opts.get(b'branch')
4353 )
4355 )
4354 other = hg.peer(repo, opts, source)
4356 other = hg.peer(repo, opts, source)
4355 if b'bookmarks' not in other.listkeys(b'namespaces'):
4357 if b'bookmarks' not in other.listkeys(b'namespaces'):
4356 ui.warn(_(b"remote doesn't support bookmarks\n"))
4358 ui.warn(_(b"remote doesn't support bookmarks\n"))
4357 return 0
4359 return 0
4358 ui.pager(b'incoming')
4360 ui.pager(b'incoming')
4359 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4361 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4360 return bookmarks.incoming(ui, repo, other)
4362 return bookmarks.incoming(ui, repo, other)
4361
4363
4362 repo._subtoppath = ui.expandpath(source)
4364 repo._subtoppath = ui.expandpath(source)
4363 try:
4365 try:
4364 return hg.incoming(ui, repo, source, opts)
4366 return hg.incoming(ui, repo, source, opts)
4365 finally:
4367 finally:
4366 del repo._subtoppath
4368 del repo._subtoppath
4367
4369
4368
4370
4369 @command(
4371 @command(
4370 b'init',
4372 b'init',
4371 remoteopts,
4373 remoteopts,
4372 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4374 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4373 helpcategory=command.CATEGORY_REPO_CREATION,
4375 helpcategory=command.CATEGORY_REPO_CREATION,
4374 helpbasic=True,
4376 helpbasic=True,
4375 norepo=True,
4377 norepo=True,
4376 )
4378 )
4377 def init(ui, dest=b".", **opts):
4379 def init(ui, dest=b".", **opts):
4378 """create a new repository in the given directory
4380 """create a new repository in the given directory
4379
4381
4380 Initialize a new repository in the given directory. If the given
4382 Initialize a new repository in the given directory. If the given
4381 directory does not exist, it will be created.
4383 directory does not exist, it will be created.
4382
4384
4383 If no directory is given, the current directory is used.
4385 If no directory is given, the current directory is used.
4384
4386
4385 It is possible to specify an ``ssh://`` URL as the destination.
4387 It is possible to specify an ``ssh://`` URL as the destination.
4386 See :hg:`help urls` for more information.
4388 See :hg:`help urls` for more information.
4387
4389
4388 Returns 0 on success.
4390 Returns 0 on success.
4389 """
4391 """
4390 opts = pycompat.byteskwargs(opts)
4392 opts = pycompat.byteskwargs(opts)
4391 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4393 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4392
4394
4393
4395
4394 @command(
4396 @command(
4395 b'locate',
4397 b'locate',
4396 [
4398 [
4397 (
4399 (
4398 b'r',
4400 b'r',
4399 b'rev',
4401 b'rev',
4400 b'',
4402 b'',
4401 _(b'search the repository as it is in REV'),
4403 _(b'search the repository as it is in REV'),
4402 _(b'REV'),
4404 _(b'REV'),
4403 ),
4405 ),
4404 (
4406 (
4405 b'0',
4407 b'0',
4406 b'print0',
4408 b'print0',
4407 None,
4409 None,
4408 _(b'end filenames with NUL, for use with xargs'),
4410 _(b'end filenames with NUL, for use with xargs'),
4409 ),
4411 ),
4410 (
4412 (
4411 b'f',
4413 b'f',
4412 b'fullpath',
4414 b'fullpath',
4413 None,
4415 None,
4414 _(b'print complete paths from the filesystem root'),
4416 _(b'print complete paths from the filesystem root'),
4415 ),
4417 ),
4416 ]
4418 ]
4417 + walkopts,
4419 + walkopts,
4418 _(b'[OPTION]... [PATTERN]...'),
4420 _(b'[OPTION]... [PATTERN]...'),
4419 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4421 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4420 )
4422 )
4421 def locate(ui, repo, *pats, **opts):
4423 def locate(ui, repo, *pats, **opts):
4422 """locate files matching specific patterns (DEPRECATED)
4424 """locate files matching specific patterns (DEPRECATED)
4423
4425
4424 Print files under Mercurial control in the working directory whose
4426 Print files under Mercurial control in the working directory whose
4425 names match the given patterns.
4427 names match the given patterns.
4426
4428
4427 By default, this command searches all directories in the working
4429 By default, this command searches all directories in the working
4428 directory. To search just the current directory and its
4430 directory. To search just the current directory and its
4429 subdirectories, use "--include .".
4431 subdirectories, use "--include .".
4430
4432
4431 If no patterns are given to match, this command prints the names
4433 If no patterns are given to match, this command prints the names
4432 of all files under Mercurial control in the working directory.
4434 of all files under Mercurial control in the working directory.
4433
4435
4434 If you want to feed the output of this command into the "xargs"
4436 If you want to feed the output of this command into the "xargs"
4435 command, use the -0 option to both this command and "xargs". This
4437 command, use the -0 option to both this command and "xargs". This
4436 will avoid the problem of "xargs" treating single filenames that
4438 will avoid the problem of "xargs" treating single filenames that
4437 contain whitespace as multiple filenames.
4439 contain whitespace as multiple filenames.
4438
4440
4439 See :hg:`help files` for a more versatile command.
4441 See :hg:`help files` for a more versatile command.
4440
4442
4441 Returns 0 if a match is found, 1 otherwise.
4443 Returns 0 if a match is found, 1 otherwise.
4442 """
4444 """
4443 opts = pycompat.byteskwargs(opts)
4445 opts = pycompat.byteskwargs(opts)
4444 if opts.get(b'print0'):
4446 if opts.get(b'print0'):
4445 end = b'\0'
4447 end = b'\0'
4446 else:
4448 else:
4447 end = b'\n'
4449 end = b'\n'
4448 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4450 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4449
4451
4450 ret = 1
4452 ret = 1
4451 m = scmutil.match(
4453 m = scmutil.match(
4452 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4454 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4453 )
4455 )
4454
4456
4455 ui.pager(b'locate')
4457 ui.pager(b'locate')
4456 if ctx.rev() is None:
4458 if ctx.rev() is None:
4457 # When run on the working copy, "locate" includes removed files, so
4459 # When run on the working copy, "locate" includes removed files, so
4458 # we get the list of files from the dirstate.
4460 # we get the list of files from the dirstate.
4459 filesgen = sorted(repo.dirstate.matches(m))
4461 filesgen = sorted(repo.dirstate.matches(m))
4460 else:
4462 else:
4461 filesgen = ctx.matches(m)
4463 filesgen = ctx.matches(m)
4462 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4464 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4463 for abs in filesgen:
4465 for abs in filesgen:
4464 if opts.get(b'fullpath'):
4466 if opts.get(b'fullpath'):
4465 ui.write(repo.wjoin(abs), end)
4467 ui.write(repo.wjoin(abs), end)
4466 else:
4468 else:
4467 ui.write(uipathfn(abs), end)
4469 ui.write(uipathfn(abs), end)
4468 ret = 0
4470 ret = 0
4469
4471
4470 return ret
4472 return ret
4471
4473
4472
4474
4473 @command(
4475 @command(
4474 b'log|history',
4476 b'log|history',
4475 [
4477 [
4476 (
4478 (
4477 b'f',
4479 b'f',
4478 b'follow',
4480 b'follow',
4479 None,
4481 None,
4480 _(
4482 _(
4481 b'follow changeset history, or file history across copies and renames'
4483 b'follow changeset history, or file history across copies and renames'
4482 ),
4484 ),
4483 ),
4485 ),
4484 (
4486 (
4485 b'',
4487 b'',
4486 b'follow-first',
4488 b'follow-first',
4487 None,
4489 None,
4488 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4490 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4489 ),
4491 ),
4490 (
4492 (
4491 b'd',
4493 b'd',
4492 b'date',
4494 b'date',
4493 b'',
4495 b'',
4494 _(b'show revisions matching date spec'),
4496 _(b'show revisions matching date spec'),
4495 _(b'DATE'),
4497 _(b'DATE'),
4496 ),
4498 ),
4497 (b'C', b'copies', None, _(b'show copied files')),
4499 (b'C', b'copies', None, _(b'show copied files')),
4498 (
4500 (
4499 b'k',
4501 b'k',
4500 b'keyword',
4502 b'keyword',
4501 [],
4503 [],
4502 _(b'do case-insensitive search for a given text'),
4504 _(b'do case-insensitive search for a given text'),
4503 _(b'TEXT'),
4505 _(b'TEXT'),
4504 ),
4506 ),
4505 (
4507 (
4506 b'r',
4508 b'r',
4507 b'rev',
4509 b'rev',
4508 [],
4510 [],
4509 _(b'show the specified revision or revset'),
4511 _(b'show the specified revision or revset'),
4510 _(b'REV'),
4512 _(b'REV'),
4511 ),
4513 ),
4512 (
4514 (
4513 b'L',
4515 b'L',
4514 b'line-range',
4516 b'line-range',
4515 [],
4517 [],
4516 _(b'follow line range of specified file (EXPERIMENTAL)'),
4518 _(b'follow line range of specified file (EXPERIMENTAL)'),
4517 _(b'FILE,RANGE'),
4519 _(b'FILE,RANGE'),
4518 ),
4520 ),
4519 (
4521 (
4520 b'',
4522 b'',
4521 b'removed',
4523 b'removed',
4522 None,
4524 None,
4523 _(b'include revisions where files were removed'),
4525 _(b'include revisions where files were removed'),
4524 ),
4526 ),
4525 (
4527 (
4526 b'm',
4528 b'm',
4527 b'only-merges',
4529 b'only-merges',
4528 None,
4530 None,
4529 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4531 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4530 ),
4532 ),
4531 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4533 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4532 (
4534 (
4533 b'',
4535 b'',
4534 b'only-branch',
4536 b'only-branch',
4535 [],
4537 [],
4536 _(
4538 _(
4537 b'show only changesets within the given named branch (DEPRECATED)'
4539 b'show only changesets within the given named branch (DEPRECATED)'
4538 ),
4540 ),
4539 _(b'BRANCH'),
4541 _(b'BRANCH'),
4540 ),
4542 ),
4541 (
4543 (
4542 b'b',
4544 b'b',
4543 b'branch',
4545 b'branch',
4544 [],
4546 [],
4545 _(b'show changesets within the given named branch'),
4547 _(b'show changesets within the given named branch'),
4546 _(b'BRANCH'),
4548 _(b'BRANCH'),
4547 ),
4549 ),
4548 (
4550 (
4549 b'P',
4551 b'P',
4550 b'prune',
4552 b'prune',
4551 [],
4553 [],
4552 _(b'do not display revision or any of its ancestors'),
4554 _(b'do not display revision or any of its ancestors'),
4553 _(b'REV'),
4555 _(b'REV'),
4554 ),
4556 ),
4555 ]
4557 ]
4556 + logopts
4558 + logopts
4557 + walkopts,
4559 + walkopts,
4558 _(b'[OPTION]... [FILE]'),
4560 _(b'[OPTION]... [FILE]'),
4559 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4561 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4560 helpbasic=True,
4562 helpbasic=True,
4561 inferrepo=True,
4563 inferrepo=True,
4562 intents={INTENT_READONLY},
4564 intents={INTENT_READONLY},
4563 )
4565 )
4564 def log(ui, repo, *pats, **opts):
4566 def log(ui, repo, *pats, **opts):
4565 """show revision history of entire repository or files
4567 """show revision history of entire repository or files
4566
4568
4567 Print the revision history of the specified files or the entire
4569 Print the revision history of the specified files or the entire
4568 project.
4570 project.
4569
4571
4570 If no revision range is specified, the default is ``tip:0`` unless
4572 If no revision range is specified, the default is ``tip:0`` unless
4571 --follow is set, in which case the working directory parent is
4573 --follow is set, in which case the working directory parent is
4572 used as the starting revision.
4574 used as the starting revision.
4573
4575
4574 File history is shown without following rename or copy history of
4576 File history is shown without following rename or copy history of
4575 files. Use -f/--follow with a filename to follow history across
4577 files. Use -f/--follow with a filename to follow history across
4576 renames and copies. --follow without a filename will only show
4578 renames and copies. --follow without a filename will only show
4577 ancestors of the starting revision.
4579 ancestors of the starting revision.
4578
4580
4579 By default this command prints revision number and changeset id,
4581 By default this command prints revision number and changeset id,
4580 tags, non-trivial parents, user, date and time, and a summary for
4582 tags, non-trivial parents, user, date and time, and a summary for
4581 each commit. When the -v/--verbose switch is used, the list of
4583 each commit. When the -v/--verbose switch is used, the list of
4582 changed files and full commit message are shown.
4584 changed files and full commit message are shown.
4583
4585
4584 With --graph the revisions are shown as an ASCII art DAG with the most
4586 With --graph the revisions are shown as an ASCII art DAG with the most
4585 recent changeset at the top.
4587 recent changeset at the top.
4586 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4588 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4587 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4589 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4588 changeset from the lines below is a parent of the 'o' merge on the same
4590 changeset from the lines below is a parent of the 'o' merge on the same
4589 line.
4591 line.
4590 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4592 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4591 of a '|' indicates one or more revisions in a path are omitted.
4593 of a '|' indicates one or more revisions in a path are omitted.
4592
4594
4593 .. container:: verbose
4595 .. container:: verbose
4594
4596
4595 Use -L/--line-range FILE,M:N options to follow the history of lines
4597 Use -L/--line-range FILE,M:N options to follow the history of lines
4596 from M to N in FILE. With -p/--patch only diff hunks affecting
4598 from M to N in FILE. With -p/--patch only diff hunks affecting
4597 specified line range will be shown. This option requires --follow;
4599 specified line range will be shown. This option requires --follow;
4598 it can be specified multiple times. Currently, this option is not
4600 it can be specified multiple times. Currently, this option is not
4599 compatible with --graph. This option is experimental.
4601 compatible with --graph. This option is experimental.
4600
4602
4601 .. note::
4603 .. note::
4602
4604
4603 :hg:`log --patch` may generate unexpected diff output for merge
4605 :hg:`log --patch` may generate unexpected diff output for merge
4604 changesets, as it will only compare the merge changeset against
4606 changesets, as it will only compare the merge changeset against
4605 its first parent. Also, only files different from BOTH parents
4607 its first parent. Also, only files different from BOTH parents
4606 will appear in files:.
4608 will appear in files:.
4607
4609
4608 .. note::
4610 .. note::
4609
4611
4610 For performance reasons, :hg:`log FILE` may omit duplicate changes
4612 For performance reasons, :hg:`log FILE` may omit duplicate changes
4611 made on branches and will not show removals or mode changes. To
4613 made on branches and will not show removals or mode changes. To
4612 see all such changes, use the --removed switch.
4614 see all such changes, use the --removed switch.
4613
4615
4614 .. container:: verbose
4616 .. container:: verbose
4615
4617
4616 .. note::
4618 .. note::
4617
4619
4618 The history resulting from -L/--line-range options depends on diff
4620 The history resulting from -L/--line-range options depends on diff
4619 options; for instance if white-spaces are ignored, respective changes
4621 options; for instance if white-spaces are ignored, respective changes
4620 with only white-spaces in specified line range will not be listed.
4622 with only white-spaces in specified line range will not be listed.
4621
4623
4622 .. container:: verbose
4624 .. container:: verbose
4623
4625
4624 Some examples:
4626 Some examples:
4625
4627
4626 - changesets with full descriptions and file lists::
4628 - changesets with full descriptions and file lists::
4627
4629
4628 hg log -v
4630 hg log -v
4629
4631
4630 - changesets ancestral to the working directory::
4632 - changesets ancestral to the working directory::
4631
4633
4632 hg log -f
4634 hg log -f
4633
4635
4634 - last 10 commits on the current branch::
4636 - last 10 commits on the current branch::
4635
4637
4636 hg log -l 10 -b .
4638 hg log -l 10 -b .
4637
4639
4638 - changesets showing all modifications of a file, including removals::
4640 - changesets showing all modifications of a file, including removals::
4639
4641
4640 hg log --removed file.c
4642 hg log --removed file.c
4641
4643
4642 - all changesets that touch a directory, with diffs, excluding merges::
4644 - all changesets that touch a directory, with diffs, excluding merges::
4643
4645
4644 hg log -Mp lib/
4646 hg log -Mp lib/
4645
4647
4646 - all revision numbers that match a keyword::
4648 - all revision numbers that match a keyword::
4647
4649
4648 hg log -k bug --template "{rev}\\n"
4650 hg log -k bug --template "{rev}\\n"
4649
4651
4650 - the full hash identifier of the working directory parent::
4652 - the full hash identifier of the working directory parent::
4651
4653
4652 hg log -r . --template "{node}\\n"
4654 hg log -r . --template "{node}\\n"
4653
4655
4654 - list available log templates::
4656 - list available log templates::
4655
4657
4656 hg log -T list
4658 hg log -T list
4657
4659
4658 - check if a given changeset is included in a tagged release::
4660 - check if a given changeset is included in a tagged release::
4659
4661
4660 hg log -r "a21ccf and ancestor(1.9)"
4662 hg log -r "a21ccf and ancestor(1.9)"
4661
4663
4662 - find all changesets by some user in a date range::
4664 - find all changesets by some user in a date range::
4663
4665
4664 hg log -k alice -d "may 2008 to jul 2008"
4666 hg log -k alice -d "may 2008 to jul 2008"
4665
4667
4666 - summary of all changesets after the last tag::
4668 - summary of all changesets after the last tag::
4667
4669
4668 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4670 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4669
4671
4670 - changesets touching lines 13 to 23 for file.c::
4672 - changesets touching lines 13 to 23 for file.c::
4671
4673
4672 hg log -L file.c,13:23
4674 hg log -L file.c,13:23
4673
4675
4674 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4676 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4675 main.c with patch::
4677 main.c with patch::
4676
4678
4677 hg log -L file.c,13:23 -L main.c,2:6 -p
4679 hg log -L file.c,13:23 -L main.c,2:6 -p
4678
4680
4679 See :hg:`help dates` for a list of formats valid for -d/--date.
4681 See :hg:`help dates` for a list of formats valid for -d/--date.
4680
4682
4681 See :hg:`help revisions` for more about specifying and ordering
4683 See :hg:`help revisions` for more about specifying and ordering
4682 revisions.
4684 revisions.
4683
4685
4684 See :hg:`help templates` for more about pre-packaged styles and
4686 See :hg:`help templates` for more about pre-packaged styles and
4685 specifying custom templates. The default template used by the log
4687 specifying custom templates. The default template used by the log
4686 command can be customized via the ``ui.logtemplate`` configuration
4688 command can be customized via the ``ui.logtemplate`` configuration
4687 setting.
4689 setting.
4688
4690
4689 Returns 0 on success.
4691 Returns 0 on success.
4690
4692
4691 """
4693 """
4692 opts = pycompat.byteskwargs(opts)
4694 opts = pycompat.byteskwargs(opts)
4693 linerange = opts.get(b'line_range')
4695 linerange = opts.get(b'line_range')
4694
4696
4695 if linerange and not opts.get(b'follow'):
4697 if linerange and not opts.get(b'follow'):
4696 raise error.Abort(_(b'--line-range requires --follow'))
4698 raise error.Abort(_(b'--line-range requires --follow'))
4697
4699
4698 if linerange and pats:
4700 if linerange and pats:
4699 # TODO: take pats as patterns with no line-range filter
4701 # TODO: take pats as patterns with no line-range filter
4700 raise error.Abort(
4702 raise error.Abort(
4701 _(b'FILE arguments are not compatible with --line-range option')
4703 _(b'FILE arguments are not compatible with --line-range option')
4702 )
4704 )
4703
4705
4704 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4706 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4705 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4707 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4706 if linerange:
4708 if linerange:
4707 # TODO: should follow file history from logcmdutil._initialrevs(),
4709 # TODO: should follow file history from logcmdutil._initialrevs(),
4708 # then filter the result by logcmdutil._makerevset() and --limit
4710 # then filter the result by logcmdutil._makerevset() and --limit
4709 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4711 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4710
4712
4711 getcopies = None
4713 getcopies = None
4712 if opts.get(b'copies'):
4714 if opts.get(b'copies'):
4713 endrev = None
4715 endrev = None
4714 if revs:
4716 if revs:
4715 endrev = revs.max() + 1
4717 endrev = revs.max() + 1
4716 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4718 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4717
4719
4718 ui.pager(b'log')
4720 ui.pager(b'log')
4719 displayer = logcmdutil.changesetdisplayer(
4721 displayer = logcmdutil.changesetdisplayer(
4720 ui, repo, opts, differ, buffered=True
4722 ui, repo, opts, differ, buffered=True
4721 )
4723 )
4722 if opts.get(b'graph'):
4724 if opts.get(b'graph'):
4723 displayfn = logcmdutil.displaygraphrevs
4725 displayfn = logcmdutil.displaygraphrevs
4724 else:
4726 else:
4725 displayfn = logcmdutil.displayrevs
4727 displayfn = logcmdutil.displayrevs
4726 displayfn(ui, repo, revs, displayer, getcopies)
4728 displayfn(ui, repo, revs, displayer, getcopies)
4727
4729
4728
4730
4729 @command(
4731 @command(
4730 b'manifest',
4732 b'manifest',
4731 [
4733 [
4732 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4734 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4733 (b'', b'all', False, _(b"list files from all revisions")),
4735 (b'', b'all', False, _(b"list files from all revisions")),
4734 ]
4736 ]
4735 + formatteropts,
4737 + formatteropts,
4736 _(b'[-r REV]'),
4738 _(b'[-r REV]'),
4737 helpcategory=command.CATEGORY_MAINTENANCE,
4739 helpcategory=command.CATEGORY_MAINTENANCE,
4738 intents={INTENT_READONLY},
4740 intents={INTENT_READONLY},
4739 )
4741 )
4740 def manifest(ui, repo, node=None, rev=None, **opts):
4742 def manifest(ui, repo, node=None, rev=None, **opts):
4741 """output the current or given revision of the project manifest
4743 """output the current or given revision of the project manifest
4742
4744
4743 Print a list of version controlled files for the given revision.
4745 Print a list of version controlled files for the given revision.
4744 If no revision is given, the first parent of the working directory
4746 If no revision is given, the first parent of the working directory
4745 is used, or the null revision if no revision is checked out.
4747 is used, or the null revision if no revision is checked out.
4746
4748
4747 With -v, print file permissions, symlink and executable bits.
4749 With -v, print file permissions, symlink and executable bits.
4748 With --debug, print file revision hashes.
4750 With --debug, print file revision hashes.
4749
4751
4750 If option --all is specified, the list of all files from all revisions
4752 If option --all is specified, the list of all files from all revisions
4751 is printed. This includes deleted and renamed files.
4753 is printed. This includes deleted and renamed files.
4752
4754
4753 Returns 0 on success.
4755 Returns 0 on success.
4754 """
4756 """
4755 opts = pycompat.byteskwargs(opts)
4757 opts = pycompat.byteskwargs(opts)
4756 fm = ui.formatter(b'manifest', opts)
4758 fm = ui.formatter(b'manifest', opts)
4757
4759
4758 if opts.get(b'all'):
4760 if opts.get(b'all'):
4759 if rev or node:
4761 if rev or node:
4760 raise error.Abort(_(b"can't specify a revision with --all"))
4762 raise error.Abort(_(b"can't specify a revision with --all"))
4761
4763
4762 res = set()
4764 res = set()
4763 for rev in repo:
4765 for rev in repo:
4764 ctx = repo[rev]
4766 ctx = repo[rev]
4765 res |= set(ctx.files())
4767 res |= set(ctx.files())
4766
4768
4767 ui.pager(b'manifest')
4769 ui.pager(b'manifest')
4768 for f in sorted(res):
4770 for f in sorted(res):
4769 fm.startitem()
4771 fm.startitem()
4770 fm.write(b"path", b'%s\n', f)
4772 fm.write(b"path", b'%s\n', f)
4771 fm.end()
4773 fm.end()
4772 return
4774 return
4773
4775
4774 if rev and node:
4776 if rev and node:
4775 raise error.Abort(_(b"please specify just one revision"))
4777 raise error.Abort(_(b"please specify just one revision"))
4776
4778
4777 if not node:
4779 if not node:
4778 node = rev
4780 node = rev
4779
4781
4780 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4782 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4781 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4783 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4782 if node:
4784 if node:
4783 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4785 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4784 ctx = scmutil.revsingle(repo, node)
4786 ctx = scmutil.revsingle(repo, node)
4785 mf = ctx.manifest()
4787 mf = ctx.manifest()
4786 ui.pager(b'manifest')
4788 ui.pager(b'manifest')
4787 for f in ctx:
4789 for f in ctx:
4788 fm.startitem()
4790 fm.startitem()
4789 fm.context(ctx=ctx)
4791 fm.context(ctx=ctx)
4790 fl = ctx[f].flags()
4792 fl = ctx[f].flags()
4791 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4793 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4792 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4794 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4793 fm.write(b'path', b'%s\n', f)
4795 fm.write(b'path', b'%s\n', f)
4794 fm.end()
4796 fm.end()
4795
4797
4796
4798
4797 @command(
4799 @command(
4798 b'merge',
4800 b'merge',
4799 [
4801 [
4800 (
4802 (
4801 b'f',
4803 b'f',
4802 b'force',
4804 b'force',
4803 None,
4805 None,
4804 _(b'force a merge including outstanding changes (DEPRECATED)'),
4806 _(b'force a merge including outstanding changes (DEPRECATED)'),
4805 ),
4807 ),
4806 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4808 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4807 (
4809 (
4808 b'P',
4810 b'P',
4809 b'preview',
4811 b'preview',
4810 None,
4812 None,
4811 _(b'review revisions to merge (no merge is performed)'),
4813 _(b'review revisions to merge (no merge is performed)'),
4812 ),
4814 ),
4813 (b'', b'abort', None, _(b'abort the ongoing merge')),
4815 (b'', b'abort', None, _(b'abort the ongoing merge')),
4814 ]
4816 ]
4815 + mergetoolopts,
4817 + mergetoolopts,
4816 _(b'[-P] [[-r] REV]'),
4818 _(b'[-P] [[-r] REV]'),
4817 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4819 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4818 helpbasic=True,
4820 helpbasic=True,
4819 )
4821 )
4820 def merge(ui, repo, node=None, **opts):
4822 def merge(ui, repo, node=None, **opts):
4821 """merge another revision into working directory
4823 """merge another revision into working directory
4822
4824
4823 The current working directory is updated with all changes made in
4825 The current working directory is updated with all changes made in
4824 the requested revision since the last common predecessor revision.
4826 the requested revision since the last common predecessor revision.
4825
4827
4826 Files that changed between either parent are marked as changed for
4828 Files that changed between either parent are marked as changed for
4827 the next commit and a commit must be performed before any further
4829 the next commit and a commit must be performed before any further
4828 updates to the repository are allowed. The next commit will have
4830 updates to the repository are allowed. The next commit will have
4829 two parents.
4831 two parents.
4830
4832
4831 ``--tool`` can be used to specify the merge tool used for file
4833 ``--tool`` can be used to specify the merge tool used for file
4832 merges. It overrides the HGMERGE environment variable and your
4834 merges. It overrides the HGMERGE environment variable and your
4833 configuration files. See :hg:`help merge-tools` for options.
4835 configuration files. See :hg:`help merge-tools` for options.
4834
4836
4835 If no revision is specified, the working directory's parent is a
4837 If no revision is specified, the working directory's parent is a
4836 head revision, and the current branch contains exactly one other
4838 head revision, and the current branch contains exactly one other
4837 head, the other head is merged with by default. Otherwise, an
4839 head, the other head is merged with by default. Otherwise, an
4838 explicit revision with which to merge must be provided.
4840 explicit revision with which to merge must be provided.
4839
4841
4840 See :hg:`help resolve` for information on handling file conflicts.
4842 See :hg:`help resolve` for information on handling file conflicts.
4841
4843
4842 To undo an uncommitted merge, use :hg:`merge --abort` which
4844 To undo an uncommitted merge, use :hg:`merge --abort` which
4843 will check out a clean copy of the original merge parent, losing
4845 will check out a clean copy of the original merge parent, losing
4844 all changes.
4846 all changes.
4845
4847
4846 Returns 0 on success, 1 if there are unresolved files.
4848 Returns 0 on success, 1 if there are unresolved files.
4847 """
4849 """
4848
4850
4849 opts = pycompat.byteskwargs(opts)
4851 opts = pycompat.byteskwargs(opts)
4850 abort = opts.get(b'abort')
4852 abort = opts.get(b'abort')
4851 if abort and repo.dirstate.p2() == nullid:
4853 if abort and repo.dirstate.p2() == nullid:
4852 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4854 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4853 if abort:
4855 if abort:
4854 state = cmdutil.getunfinishedstate(repo)
4856 state = cmdutil.getunfinishedstate(repo)
4855 if state and state._opname != b'merge':
4857 if state and state._opname != b'merge':
4856 raise error.Abort(
4858 raise error.Abort(
4857 _(b'cannot abort merge with %s in progress') % (state._opname),
4859 _(b'cannot abort merge with %s in progress') % (state._opname),
4858 hint=state.hint(),
4860 hint=state.hint(),
4859 )
4861 )
4860 if node:
4862 if node:
4861 raise error.Abort(_(b"cannot specify a node with --abort"))
4863 raise error.Abort(_(b"cannot specify a node with --abort"))
4862 if opts.get(b'rev'):
4864 if opts.get(b'rev'):
4863 raise error.Abort(_(b"cannot specify both --rev and --abort"))
4865 raise error.Abort(_(b"cannot specify both --rev and --abort"))
4864 if opts.get(b'preview'):
4866 if opts.get(b'preview'):
4865 raise error.Abort(_(b"cannot specify --preview with --abort"))
4867 raise error.Abort(_(b"cannot specify --preview with --abort"))
4866 if opts.get(b'rev') and node:
4868 if opts.get(b'rev') and node:
4867 raise error.Abort(_(b"please specify just one revision"))
4869 raise error.Abort(_(b"please specify just one revision"))
4868 if not node:
4870 if not node:
4869 node = opts.get(b'rev')
4871 node = opts.get(b'rev')
4870
4872
4871 if node:
4873 if node:
4872 node = scmutil.revsingle(repo, node).node()
4874 node = scmutil.revsingle(repo, node).node()
4873
4875
4874 if not node and not abort:
4876 if not node and not abort:
4875 if ui.configbool(b'commands', b'merge.require-rev'):
4877 if ui.configbool(b'commands', b'merge.require-rev'):
4876 raise error.Abort(
4878 raise error.Abort(
4877 _(
4879 _(
4878 b'configuration requires specifying revision to merge '
4880 b'configuration requires specifying revision to merge '
4879 b'with'
4881 b'with'
4880 )
4882 )
4881 )
4883 )
4882 node = repo[destutil.destmerge(repo)].node()
4884 node = repo[destutil.destmerge(repo)].node()
4883
4885
4884 if opts.get(b'preview'):
4886 if opts.get(b'preview'):
4885 # find nodes that are ancestors of p2 but not of p1
4887 # find nodes that are ancestors of p2 but not of p1
4886 p1 = repo.lookup(b'.')
4888 p1 = repo.lookup(b'.')
4887 p2 = node
4889 p2 = node
4888 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4890 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4889
4891
4890 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4892 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4891 for node in nodes:
4893 for node in nodes:
4892 displayer.show(repo[node])
4894 displayer.show(repo[node])
4893 displayer.close()
4895 displayer.close()
4894 return 0
4896 return 0
4895
4897
4896 # ui.forcemerge is an internal variable, do not document
4898 # ui.forcemerge is an internal variable, do not document
4897 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4899 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4898 with ui.configoverride(overrides, b'merge'):
4900 with ui.configoverride(overrides, b'merge'):
4899 force = opts.get(b'force')
4901 force = opts.get(b'force')
4900 labels = [b'working copy', b'merge rev']
4902 labels = [b'working copy', b'merge rev']
4901 return hg.merge(
4903 return hg.merge(
4902 repo,
4904 repo,
4903 node,
4905 node,
4904 force=force,
4906 force=force,
4905 mergeforce=force,
4907 mergeforce=force,
4906 labels=labels,
4908 labels=labels,
4907 abort=abort,
4909 abort=abort,
4908 )
4910 )
4909
4911
4910
4912
4911 statemod.addunfinished(
4913 statemod.addunfinished(
4912 b'merge',
4914 b'merge',
4913 fname=None,
4915 fname=None,
4914 clearable=True,
4916 clearable=True,
4915 allowcommit=True,
4917 allowcommit=True,
4916 cmdmsg=_(b'outstanding uncommitted merge'),
4918 cmdmsg=_(b'outstanding uncommitted merge'),
4917 abortfunc=hg.abortmerge,
4919 abortfunc=hg.abortmerge,
4918 statushint=_(
4920 statushint=_(
4919 b'To continue: hg commit\nTo abort: hg merge --abort'
4921 b'To continue: hg commit\nTo abort: hg merge --abort'
4920 ),
4922 ),
4921 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4923 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4922 )
4924 )
4923
4925
4924
4926
4925 @command(
4927 @command(
4926 b'outgoing|out',
4928 b'outgoing|out',
4927 [
4929 [
4928 (
4930 (
4929 b'f',
4931 b'f',
4930 b'force',
4932 b'force',
4931 None,
4933 None,
4932 _(b'run even when the destination is unrelated'),
4934 _(b'run even when the destination is unrelated'),
4933 ),
4935 ),
4934 (
4936 (
4935 b'r',
4937 b'r',
4936 b'rev',
4938 b'rev',
4937 [],
4939 [],
4938 _(b'a changeset intended to be included in the destination'),
4940 _(b'a changeset intended to be included in the destination'),
4939 _(b'REV'),
4941 _(b'REV'),
4940 ),
4942 ),
4941 (b'n', b'newest-first', None, _(b'show newest record first')),
4943 (b'n', b'newest-first', None, _(b'show newest record first')),
4942 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4944 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4943 (
4945 (
4944 b'b',
4946 b'b',
4945 b'branch',
4947 b'branch',
4946 [],
4948 [],
4947 _(b'a specific branch you would like to push'),
4949 _(b'a specific branch you would like to push'),
4948 _(b'BRANCH'),
4950 _(b'BRANCH'),
4949 ),
4951 ),
4950 ]
4952 ]
4951 + logopts
4953 + logopts
4952 + remoteopts
4954 + remoteopts
4953 + subrepoopts,
4955 + subrepoopts,
4954 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4956 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4955 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4957 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4956 )
4958 )
4957 def outgoing(ui, repo, dest=None, **opts):
4959 def outgoing(ui, repo, dest=None, **opts):
4958 """show changesets not found in the destination
4960 """show changesets not found in the destination
4959
4961
4960 Show changesets not found in the specified destination repository
4962 Show changesets not found in the specified destination repository
4961 or the default push location. These are the changesets that would
4963 or the default push location. These are the changesets that would
4962 be pushed if a push was requested.
4964 be pushed if a push was requested.
4963
4965
4964 See pull for details of valid destination formats.
4966 See pull for details of valid destination formats.
4965
4967
4966 .. container:: verbose
4968 .. container:: verbose
4967
4969
4968 With -B/--bookmarks, the result of bookmark comparison between
4970 With -B/--bookmarks, the result of bookmark comparison between
4969 local and remote repositories is displayed. With -v/--verbose,
4971 local and remote repositories is displayed. With -v/--verbose,
4970 status is also displayed for each bookmark like below::
4972 status is also displayed for each bookmark like below::
4971
4973
4972 BM1 01234567890a added
4974 BM1 01234567890a added
4973 BM2 deleted
4975 BM2 deleted
4974 BM3 234567890abc advanced
4976 BM3 234567890abc advanced
4975 BM4 34567890abcd diverged
4977 BM4 34567890abcd diverged
4976 BM5 4567890abcde changed
4978 BM5 4567890abcde changed
4977
4979
4978 The action taken when pushing depends on the
4980 The action taken when pushing depends on the
4979 status of each bookmark:
4981 status of each bookmark:
4980
4982
4981 :``added``: push with ``-B`` will create it
4983 :``added``: push with ``-B`` will create it
4982 :``deleted``: push with ``-B`` will delete it
4984 :``deleted``: push with ``-B`` will delete it
4983 :``advanced``: push will update it
4985 :``advanced``: push will update it
4984 :``diverged``: push with ``-B`` will update it
4986 :``diverged``: push with ``-B`` will update it
4985 :``changed``: push with ``-B`` will update it
4987 :``changed``: push with ``-B`` will update it
4986
4988
4987 From the point of view of pushing behavior, bookmarks
4989 From the point of view of pushing behavior, bookmarks
4988 existing only in the remote repository are treated as
4990 existing only in the remote repository are treated as
4989 ``deleted``, even if it is in fact added remotely.
4991 ``deleted``, even if it is in fact added remotely.
4990
4992
4991 Returns 0 if there are outgoing changes, 1 otherwise.
4993 Returns 0 if there are outgoing changes, 1 otherwise.
4992 """
4994 """
4993 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4995 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4994 # style URLs, so don't overwrite dest.
4996 # style URLs, so don't overwrite dest.
4995 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4997 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4996 if not path:
4998 if not path:
4997 raise error.Abort(
4999 raise error.Abort(
4998 _(b'default repository not configured!'),
5000 _(b'default repository not configured!'),
4999 hint=_(b"see 'hg help config.paths'"),
5001 hint=_(b"see 'hg help config.paths'"),
5000 )
5002 )
5001
5003
5002 opts = pycompat.byteskwargs(opts)
5004 opts = pycompat.byteskwargs(opts)
5003 if opts.get(b'graph'):
5005 if opts.get(b'graph'):
5004 logcmdutil.checkunsupportedgraphflags([], opts)
5006 logcmdutil.checkunsupportedgraphflags([], opts)
5005 o, other = hg._outgoing(ui, repo, dest, opts)
5007 o, other = hg._outgoing(ui, repo, dest, opts)
5006 if not o:
5008 if not o:
5007 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5009 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5008 return
5010 return
5009
5011
5010 revdag = logcmdutil.graphrevs(repo, o, opts)
5012 revdag = logcmdutil.graphrevs(repo, o, opts)
5011 ui.pager(b'outgoing')
5013 ui.pager(b'outgoing')
5012 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5014 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5013 logcmdutil.displaygraph(
5015 logcmdutil.displaygraph(
5014 ui, repo, revdag, displayer, graphmod.asciiedges
5016 ui, repo, revdag, displayer, graphmod.asciiedges
5015 )
5017 )
5016 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5018 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5017 return 0
5019 return 0
5018
5020
5019 if opts.get(b'bookmarks'):
5021 if opts.get(b'bookmarks'):
5020 dest = path.pushloc or path.loc
5022 dest = path.pushloc or path.loc
5021 other = hg.peer(repo, opts, dest)
5023 other = hg.peer(repo, opts, dest)
5022 if b'bookmarks' not in other.listkeys(b'namespaces'):
5024 if b'bookmarks' not in other.listkeys(b'namespaces'):
5023 ui.warn(_(b"remote doesn't support bookmarks\n"))
5025 ui.warn(_(b"remote doesn't support bookmarks\n"))
5024 return 0
5026 return 0
5025 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5027 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5026 ui.pager(b'outgoing')
5028 ui.pager(b'outgoing')
5027 return bookmarks.outgoing(ui, repo, other)
5029 return bookmarks.outgoing(ui, repo, other)
5028
5030
5029 repo._subtoppath = path.pushloc or path.loc
5031 repo._subtoppath = path.pushloc or path.loc
5030 try:
5032 try:
5031 return hg.outgoing(ui, repo, dest, opts)
5033 return hg.outgoing(ui, repo, dest, opts)
5032 finally:
5034 finally:
5033 del repo._subtoppath
5035 del repo._subtoppath
5034
5036
5035
5037
5036 @command(
5038 @command(
5037 b'parents',
5039 b'parents',
5038 [
5040 [
5039 (
5041 (
5040 b'r',
5042 b'r',
5041 b'rev',
5043 b'rev',
5042 b'',
5044 b'',
5043 _(b'show parents of the specified revision'),
5045 _(b'show parents of the specified revision'),
5044 _(b'REV'),
5046 _(b'REV'),
5045 ),
5047 ),
5046 ]
5048 ]
5047 + templateopts,
5049 + templateopts,
5048 _(b'[-r REV] [FILE]'),
5050 _(b'[-r REV] [FILE]'),
5049 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5051 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5050 inferrepo=True,
5052 inferrepo=True,
5051 )
5053 )
5052 def parents(ui, repo, file_=None, **opts):
5054 def parents(ui, repo, file_=None, **opts):
5053 """show the parents of the working directory or revision (DEPRECATED)
5055 """show the parents of the working directory or revision (DEPRECATED)
5054
5056
5055 Print the working directory's parent revisions. If a revision is
5057 Print the working directory's parent revisions. If a revision is
5056 given via -r/--rev, the parent of that revision will be printed.
5058 given via -r/--rev, the parent of that revision will be printed.
5057 If a file argument is given, the revision in which the file was
5059 If a file argument is given, the revision in which the file was
5058 last changed (before the working directory revision or the
5060 last changed (before the working directory revision or the
5059 argument to --rev if given) is printed.
5061 argument to --rev if given) is printed.
5060
5062
5061 This command is equivalent to::
5063 This command is equivalent to::
5062
5064
5063 hg log -r "p1()+p2()" or
5065 hg log -r "p1()+p2()" or
5064 hg log -r "p1(REV)+p2(REV)" or
5066 hg log -r "p1(REV)+p2(REV)" or
5065 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5067 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5066 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5068 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5067
5069
5068 See :hg:`summary` and :hg:`help revsets` for related information.
5070 See :hg:`summary` and :hg:`help revsets` for related information.
5069
5071
5070 Returns 0 on success.
5072 Returns 0 on success.
5071 """
5073 """
5072
5074
5073 opts = pycompat.byteskwargs(opts)
5075 opts = pycompat.byteskwargs(opts)
5074 rev = opts.get(b'rev')
5076 rev = opts.get(b'rev')
5075 if rev:
5077 if rev:
5076 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5078 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5077 ctx = scmutil.revsingle(repo, rev, None)
5079 ctx = scmutil.revsingle(repo, rev, None)
5078
5080
5079 if file_:
5081 if file_:
5080 m = scmutil.match(ctx, (file_,), opts)
5082 m = scmutil.match(ctx, (file_,), opts)
5081 if m.anypats() or len(m.files()) != 1:
5083 if m.anypats() or len(m.files()) != 1:
5082 raise error.Abort(_(b'can only specify an explicit filename'))
5084 raise error.Abort(_(b'can only specify an explicit filename'))
5083 file_ = m.files()[0]
5085 file_ = m.files()[0]
5084 filenodes = []
5086 filenodes = []
5085 for cp in ctx.parents():
5087 for cp in ctx.parents():
5086 if not cp:
5088 if not cp:
5087 continue
5089 continue
5088 try:
5090 try:
5089 filenodes.append(cp.filenode(file_))
5091 filenodes.append(cp.filenode(file_))
5090 except error.LookupError:
5092 except error.LookupError:
5091 pass
5093 pass
5092 if not filenodes:
5094 if not filenodes:
5093 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5095 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5094 p = []
5096 p = []
5095 for fn in filenodes:
5097 for fn in filenodes:
5096 fctx = repo.filectx(file_, fileid=fn)
5098 fctx = repo.filectx(file_, fileid=fn)
5097 p.append(fctx.node())
5099 p.append(fctx.node())
5098 else:
5100 else:
5099 p = [cp.node() for cp in ctx.parents()]
5101 p = [cp.node() for cp in ctx.parents()]
5100
5102
5101 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5103 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5102 for n in p:
5104 for n in p:
5103 if n != nullid:
5105 if n != nullid:
5104 displayer.show(repo[n])
5106 displayer.show(repo[n])
5105 displayer.close()
5107 displayer.close()
5106
5108
5107
5109
5108 @command(
5110 @command(
5109 b'paths',
5111 b'paths',
5110 formatteropts,
5112 formatteropts,
5111 _(b'[NAME]'),
5113 _(b'[NAME]'),
5112 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5114 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5113 optionalrepo=True,
5115 optionalrepo=True,
5114 intents={INTENT_READONLY},
5116 intents={INTENT_READONLY},
5115 )
5117 )
5116 def paths(ui, repo, search=None, **opts):
5118 def paths(ui, repo, search=None, **opts):
5117 """show aliases for remote repositories
5119 """show aliases for remote repositories
5118
5120
5119 Show definition of symbolic path name NAME. If no name is given,
5121 Show definition of symbolic path name NAME. If no name is given,
5120 show definition of all available names.
5122 show definition of all available names.
5121
5123
5122 Option -q/--quiet suppresses all output when searching for NAME
5124 Option -q/--quiet suppresses all output when searching for NAME
5123 and shows only the path names when listing all definitions.
5125 and shows only the path names when listing all definitions.
5124
5126
5125 Path names are defined in the [paths] section of your
5127 Path names are defined in the [paths] section of your
5126 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5128 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5127 repository, ``.hg/hgrc`` is used, too.
5129 repository, ``.hg/hgrc`` is used, too.
5128
5130
5129 The path names ``default`` and ``default-push`` have a special
5131 The path names ``default`` and ``default-push`` have a special
5130 meaning. When performing a push or pull operation, they are used
5132 meaning. When performing a push or pull operation, they are used
5131 as fallbacks if no location is specified on the command-line.
5133 as fallbacks if no location is specified on the command-line.
5132 When ``default-push`` is set, it will be used for push and
5134 When ``default-push`` is set, it will be used for push and
5133 ``default`` will be used for pull; otherwise ``default`` is used
5135 ``default`` will be used for pull; otherwise ``default`` is used
5134 as the fallback for both. When cloning a repository, the clone
5136 as the fallback for both. When cloning a repository, the clone
5135 source is written as ``default`` in ``.hg/hgrc``.
5137 source is written as ``default`` in ``.hg/hgrc``.
5136
5138
5137 .. note::
5139 .. note::
5138
5140
5139 ``default`` and ``default-push`` apply to all inbound (e.g.
5141 ``default`` and ``default-push`` apply to all inbound (e.g.
5140 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5142 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5141 and :hg:`bundle`) operations.
5143 and :hg:`bundle`) operations.
5142
5144
5143 See :hg:`help urls` for more information.
5145 See :hg:`help urls` for more information.
5144
5146
5145 .. container:: verbose
5147 .. container:: verbose
5146
5148
5147 Template:
5149 Template:
5148
5150
5149 The following keywords are supported. See also :hg:`help templates`.
5151 The following keywords are supported. See also :hg:`help templates`.
5150
5152
5151 :name: String. Symbolic name of the path alias.
5153 :name: String. Symbolic name of the path alias.
5152 :pushurl: String. URL for push operations.
5154 :pushurl: String. URL for push operations.
5153 :url: String. URL or directory path for the other operations.
5155 :url: String. URL or directory path for the other operations.
5154
5156
5155 Returns 0 on success.
5157 Returns 0 on success.
5156 """
5158 """
5157
5159
5158 opts = pycompat.byteskwargs(opts)
5160 opts = pycompat.byteskwargs(opts)
5159 ui.pager(b'paths')
5161 ui.pager(b'paths')
5160 if search:
5162 if search:
5161 pathitems = [
5163 pathitems = [
5162 (name, path)
5164 (name, path)
5163 for name, path in pycompat.iteritems(ui.paths)
5165 for name, path in pycompat.iteritems(ui.paths)
5164 if name == search
5166 if name == search
5165 ]
5167 ]
5166 else:
5168 else:
5167 pathitems = sorted(pycompat.iteritems(ui.paths))
5169 pathitems = sorted(pycompat.iteritems(ui.paths))
5168
5170
5169 fm = ui.formatter(b'paths', opts)
5171 fm = ui.formatter(b'paths', opts)
5170 if fm.isplain():
5172 if fm.isplain():
5171 hidepassword = util.hidepassword
5173 hidepassword = util.hidepassword
5172 else:
5174 else:
5173 hidepassword = bytes
5175 hidepassword = bytes
5174 if ui.quiet:
5176 if ui.quiet:
5175 namefmt = b'%s\n'
5177 namefmt = b'%s\n'
5176 else:
5178 else:
5177 namefmt = b'%s = '
5179 namefmt = b'%s = '
5178 showsubopts = not search and not ui.quiet
5180 showsubopts = not search and not ui.quiet
5179
5181
5180 for name, path in pathitems:
5182 for name, path in pathitems:
5181 fm.startitem()
5183 fm.startitem()
5182 fm.condwrite(not search, b'name', namefmt, name)
5184 fm.condwrite(not search, b'name', namefmt, name)
5183 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5185 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5184 for subopt, value in sorted(path.suboptions.items()):
5186 for subopt, value in sorted(path.suboptions.items()):
5185 assert subopt not in (b'name', b'url')
5187 assert subopt not in (b'name', b'url')
5186 if showsubopts:
5188 if showsubopts:
5187 fm.plain(b'%s:%s = ' % (name, subopt))
5189 fm.plain(b'%s:%s = ' % (name, subopt))
5188 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5190 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5189
5191
5190 fm.end()
5192 fm.end()
5191
5193
5192 if search and not pathitems:
5194 if search and not pathitems:
5193 if not ui.quiet:
5195 if not ui.quiet:
5194 ui.warn(_(b"not found!\n"))
5196 ui.warn(_(b"not found!\n"))
5195 return 1
5197 return 1
5196 else:
5198 else:
5197 return 0
5199 return 0
5198
5200
5199
5201
5200 @command(
5202 @command(
5201 b'phase',
5203 b'phase',
5202 [
5204 [
5203 (b'p', b'public', False, _(b'set changeset phase to public')),
5205 (b'p', b'public', False, _(b'set changeset phase to public')),
5204 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5206 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5205 (b's', b'secret', False, _(b'set changeset phase to secret')),
5207 (b's', b'secret', False, _(b'set changeset phase to secret')),
5206 (b'f', b'force', False, _(b'allow to move boundary backward')),
5208 (b'f', b'force', False, _(b'allow to move boundary backward')),
5207 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5209 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5208 ],
5210 ],
5209 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5211 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5210 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5212 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5211 )
5213 )
5212 def phase(ui, repo, *revs, **opts):
5214 def phase(ui, repo, *revs, **opts):
5213 """set or show the current phase name
5215 """set or show the current phase name
5214
5216
5215 With no argument, show the phase name of the current revision(s).
5217 With no argument, show the phase name of the current revision(s).
5216
5218
5217 With one of -p/--public, -d/--draft or -s/--secret, change the
5219 With one of -p/--public, -d/--draft or -s/--secret, change the
5218 phase value of the specified revisions.
5220 phase value of the specified revisions.
5219
5221
5220 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5222 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5221 lower phase to a higher phase. Phases are ordered as follows::
5223 lower phase to a higher phase. Phases are ordered as follows::
5222
5224
5223 public < draft < secret
5225 public < draft < secret
5224
5226
5225 Returns 0 on success, 1 if some phases could not be changed.
5227 Returns 0 on success, 1 if some phases could not be changed.
5226
5228
5227 (For more information about the phases concept, see :hg:`help phases`.)
5229 (For more information about the phases concept, see :hg:`help phases`.)
5228 """
5230 """
5229 opts = pycompat.byteskwargs(opts)
5231 opts = pycompat.byteskwargs(opts)
5230 # search for a unique phase argument
5232 # search for a unique phase argument
5231 targetphase = None
5233 targetphase = None
5232 for idx, name in enumerate(phases.cmdphasenames):
5234 for idx, name in enumerate(phases.cmdphasenames):
5233 if opts[name]:
5235 if opts[name]:
5234 if targetphase is not None:
5236 if targetphase is not None:
5235 raise error.Abort(_(b'only one phase can be specified'))
5237 raise error.Abort(_(b'only one phase can be specified'))
5236 targetphase = idx
5238 targetphase = idx
5237
5239
5238 # look for specified revision
5240 # look for specified revision
5239 revs = list(revs)
5241 revs = list(revs)
5240 revs.extend(opts[b'rev'])
5242 revs.extend(opts[b'rev'])
5241 if not revs:
5243 if not revs:
5242 # display both parents as the second parent phase can influence
5244 # display both parents as the second parent phase can influence
5243 # the phase of a merge commit
5245 # the phase of a merge commit
5244 revs = [c.rev() for c in repo[None].parents()]
5246 revs = [c.rev() for c in repo[None].parents()]
5245
5247
5246 revs = scmutil.revrange(repo, revs)
5248 revs = scmutil.revrange(repo, revs)
5247
5249
5248 ret = 0
5250 ret = 0
5249 if targetphase is None:
5251 if targetphase is None:
5250 # display
5252 # display
5251 for r in revs:
5253 for r in revs:
5252 ctx = repo[r]
5254 ctx = repo[r]
5253 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5255 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5254 else:
5256 else:
5255 with repo.lock(), repo.transaction(b"phase") as tr:
5257 with repo.lock(), repo.transaction(b"phase") as tr:
5256 # set phase
5258 # set phase
5257 if not revs:
5259 if not revs:
5258 raise error.Abort(_(b'empty revision set'))
5260 raise error.Abort(_(b'empty revision set'))
5259 nodes = [repo[r].node() for r in revs]
5261 nodes = [repo[r].node() for r in revs]
5260 # moving revision from public to draft may hide them
5262 # moving revision from public to draft may hide them
5261 # We have to check result on an unfiltered repository
5263 # We have to check result on an unfiltered repository
5262 unfi = repo.unfiltered()
5264 unfi = repo.unfiltered()
5263 getphase = unfi._phasecache.phase
5265 getphase = unfi._phasecache.phase
5264 olddata = [getphase(unfi, r) for r in unfi]
5266 olddata = [getphase(unfi, r) for r in unfi]
5265 phases.advanceboundary(repo, tr, targetphase, nodes)
5267 phases.advanceboundary(repo, tr, targetphase, nodes)
5266 if opts[b'force']:
5268 if opts[b'force']:
5267 phases.retractboundary(repo, tr, targetphase, nodes)
5269 phases.retractboundary(repo, tr, targetphase, nodes)
5268 getphase = unfi._phasecache.phase
5270 getphase = unfi._phasecache.phase
5269 newdata = [getphase(unfi, r) for r in unfi]
5271 newdata = [getphase(unfi, r) for r in unfi]
5270 changes = sum(newdata[r] != olddata[r] for r in unfi)
5272 changes = sum(newdata[r] != olddata[r] for r in unfi)
5271 cl = unfi.changelog
5273 cl = unfi.changelog
5272 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5274 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5273 if rejected:
5275 if rejected:
5274 ui.warn(
5276 ui.warn(
5275 _(
5277 _(
5276 b'cannot move %i changesets to a higher '
5278 b'cannot move %i changesets to a higher '
5277 b'phase, use --force\n'
5279 b'phase, use --force\n'
5278 )
5280 )
5279 % len(rejected)
5281 % len(rejected)
5280 )
5282 )
5281 ret = 1
5283 ret = 1
5282 if changes:
5284 if changes:
5283 msg = _(b'phase changed for %i changesets\n') % changes
5285 msg = _(b'phase changed for %i changesets\n') % changes
5284 if ret:
5286 if ret:
5285 ui.status(msg)
5287 ui.status(msg)
5286 else:
5288 else:
5287 ui.note(msg)
5289 ui.note(msg)
5288 else:
5290 else:
5289 ui.warn(_(b'no phases changed\n'))
5291 ui.warn(_(b'no phases changed\n'))
5290 return ret
5292 return ret
5291
5293
5292
5294
5293 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5295 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5294 """Run after a changegroup has been added via pull/unbundle
5296 """Run after a changegroup has been added via pull/unbundle
5295
5297
5296 This takes arguments below:
5298 This takes arguments below:
5297
5299
5298 :modheads: change of heads by pull/unbundle
5300 :modheads: change of heads by pull/unbundle
5299 :optupdate: updating working directory is needed or not
5301 :optupdate: updating working directory is needed or not
5300 :checkout: update destination revision (or None to default destination)
5302 :checkout: update destination revision (or None to default destination)
5301 :brev: a name, which might be a bookmark to be activated after updating
5303 :brev: a name, which might be a bookmark to be activated after updating
5302 """
5304 """
5303 if modheads == 0:
5305 if modheads == 0:
5304 return
5306 return
5305 if optupdate:
5307 if optupdate:
5306 try:
5308 try:
5307 return hg.updatetotally(ui, repo, checkout, brev)
5309 return hg.updatetotally(ui, repo, checkout, brev)
5308 except error.UpdateAbort as inst:
5310 except error.UpdateAbort as inst:
5309 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5311 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5310 hint = inst.hint
5312 hint = inst.hint
5311 raise error.UpdateAbort(msg, hint=hint)
5313 raise error.UpdateAbort(msg, hint=hint)
5312 if modheads is not None and modheads > 1:
5314 if modheads is not None and modheads > 1:
5313 currentbranchheads = len(repo.branchheads())
5315 currentbranchheads = len(repo.branchheads())
5314 if currentbranchheads == modheads:
5316 if currentbranchheads == modheads:
5315 ui.status(
5317 ui.status(
5316 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5318 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5317 )
5319 )
5318 elif currentbranchheads > 1:
5320 elif currentbranchheads > 1:
5319 ui.status(
5321 ui.status(
5320 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5322 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5321 )
5323 )
5322 else:
5324 else:
5323 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5325 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5324 elif not ui.configbool(b'commands', b'update.requiredest'):
5326 elif not ui.configbool(b'commands', b'update.requiredest'):
5325 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5327 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5326
5328
5327
5329
5328 @command(
5330 @command(
5329 b'pull',
5331 b'pull',
5330 [
5332 [
5331 (
5333 (
5332 b'u',
5334 b'u',
5333 b'update',
5335 b'update',
5334 None,
5336 None,
5335 _(b'update to new branch head if new descendants were pulled'),
5337 _(b'update to new branch head if new descendants were pulled'),
5336 ),
5338 ),
5337 (
5339 (
5338 b'f',
5340 b'f',
5339 b'force',
5341 b'force',
5340 None,
5342 None,
5341 _(b'run even when remote repository is unrelated'),
5343 _(b'run even when remote repository is unrelated'),
5342 ),
5344 ),
5343 (
5345 (
5344 b'r',
5346 b'r',
5345 b'rev',
5347 b'rev',
5346 [],
5348 [],
5347 _(b'a remote changeset intended to be added'),
5349 _(b'a remote changeset intended to be added'),
5348 _(b'REV'),
5350 _(b'REV'),
5349 ),
5351 ),
5350 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5352 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5351 (
5353 (
5352 b'b',
5354 b'b',
5353 b'branch',
5355 b'branch',
5354 [],
5356 [],
5355 _(b'a specific branch you would like to pull'),
5357 _(b'a specific branch you would like to pull'),
5356 _(b'BRANCH'),
5358 _(b'BRANCH'),
5357 ),
5359 ),
5358 ]
5360 ]
5359 + remoteopts,
5361 + remoteopts,
5360 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5362 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5361 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5363 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5362 helpbasic=True,
5364 helpbasic=True,
5363 )
5365 )
5364 def pull(ui, repo, source=b"default", **opts):
5366 def pull(ui, repo, source=b"default", **opts):
5365 """pull changes from the specified source
5367 """pull changes from the specified source
5366
5368
5367 Pull changes from a remote repository to a local one.
5369 Pull changes from a remote repository to a local one.
5368
5370
5369 This finds all changes from the repository at the specified path
5371 This finds all changes from the repository at the specified path
5370 or URL and adds them to a local repository (the current one unless
5372 or URL and adds them to a local repository (the current one unless
5371 -R is specified). By default, this does not update the copy of the
5373 -R is specified). By default, this does not update the copy of the
5372 project in the working directory.
5374 project in the working directory.
5373
5375
5374 When cloning from servers that support it, Mercurial may fetch
5376 When cloning from servers that support it, Mercurial may fetch
5375 pre-generated data. When this is done, hooks operating on incoming
5377 pre-generated data. When this is done, hooks operating on incoming
5376 changesets and changegroups may fire more than once, once for each
5378 changesets and changegroups may fire more than once, once for each
5377 pre-generated bundle and as well as for any additional remaining
5379 pre-generated bundle and as well as for any additional remaining
5378 data. See :hg:`help -e clonebundles` for more.
5380 data. See :hg:`help -e clonebundles` for more.
5379
5381
5380 Use :hg:`incoming` if you want to see what would have been added
5382 Use :hg:`incoming` if you want to see what would have been added
5381 by a pull at the time you issued this command. If you then decide
5383 by a pull at the time you issued this command. If you then decide
5382 to add those changes to the repository, you should use :hg:`pull
5384 to add those changes to the repository, you should use :hg:`pull
5383 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5385 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5384
5386
5385 If SOURCE is omitted, the 'default' path will be used.
5387 If SOURCE is omitted, the 'default' path will be used.
5386 See :hg:`help urls` for more information.
5388 See :hg:`help urls` for more information.
5387
5389
5388 Specifying bookmark as ``.`` is equivalent to specifying the active
5390 Specifying bookmark as ``.`` is equivalent to specifying the active
5389 bookmark's name.
5391 bookmark's name.
5390
5392
5391 Returns 0 on success, 1 if an update had unresolved files.
5393 Returns 0 on success, 1 if an update had unresolved files.
5392 """
5394 """
5393
5395
5394 opts = pycompat.byteskwargs(opts)
5396 opts = pycompat.byteskwargs(opts)
5395 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5397 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5396 b'update'
5398 b'update'
5397 ):
5399 ):
5398 msg = _(b'update destination required by configuration')
5400 msg = _(b'update destination required by configuration')
5399 hint = _(b'use hg pull followed by hg update DEST')
5401 hint = _(b'use hg pull followed by hg update DEST')
5400 raise error.Abort(msg, hint=hint)
5402 raise error.Abort(msg, hint=hint)
5401
5403
5402 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5404 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5403 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5405 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5404 other = hg.peer(repo, opts, source)
5406 other = hg.peer(repo, opts, source)
5405 try:
5407 try:
5406 revs, checkout = hg.addbranchrevs(
5408 revs, checkout = hg.addbranchrevs(
5407 repo, other, branches, opts.get(b'rev')
5409 repo, other, branches, opts.get(b'rev')
5408 )
5410 )
5409
5411
5410 pullopargs = {}
5412 pullopargs = {}
5411
5413
5412 nodes = None
5414 nodes = None
5413 if opts.get(b'bookmark') or revs:
5415 if opts.get(b'bookmark') or revs:
5414 # The list of bookmark used here is the same used to actually update
5416 # The list of bookmark used here is the same used to actually update
5415 # the bookmark names, to avoid the race from issue 4689 and we do
5417 # the bookmark names, to avoid the race from issue 4689 and we do
5416 # all lookup and bookmark queries in one go so they see the same
5418 # all lookup and bookmark queries in one go so they see the same
5417 # version of the server state (issue 4700).
5419 # version of the server state (issue 4700).
5418 nodes = []
5420 nodes = []
5419 fnodes = []
5421 fnodes = []
5420 revs = revs or []
5422 revs = revs or []
5421 if revs and not other.capable(b'lookup'):
5423 if revs and not other.capable(b'lookup'):
5422 err = _(
5424 err = _(
5423 b"other repository doesn't support revision lookup, "
5425 b"other repository doesn't support revision lookup, "
5424 b"so a rev cannot be specified."
5426 b"so a rev cannot be specified."
5425 )
5427 )
5426 raise error.Abort(err)
5428 raise error.Abort(err)
5427 with other.commandexecutor() as e:
5429 with other.commandexecutor() as e:
5428 fremotebookmarks = e.callcommand(
5430 fremotebookmarks = e.callcommand(
5429 b'listkeys', {b'namespace': b'bookmarks'}
5431 b'listkeys', {b'namespace': b'bookmarks'}
5430 )
5432 )
5431 for r in revs:
5433 for r in revs:
5432 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5434 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5433 remotebookmarks = fremotebookmarks.result()
5435 remotebookmarks = fremotebookmarks.result()
5434 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5436 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5435 pullopargs[b'remotebookmarks'] = remotebookmarks
5437 pullopargs[b'remotebookmarks'] = remotebookmarks
5436 for b in opts.get(b'bookmark', []):
5438 for b in opts.get(b'bookmark', []):
5437 b = repo._bookmarks.expandname(b)
5439 b = repo._bookmarks.expandname(b)
5438 if b not in remotebookmarks:
5440 if b not in remotebookmarks:
5439 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5441 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5440 nodes.append(remotebookmarks[b])
5442 nodes.append(remotebookmarks[b])
5441 for i, rev in enumerate(revs):
5443 for i, rev in enumerate(revs):
5442 node = fnodes[i].result()
5444 node = fnodes[i].result()
5443 nodes.append(node)
5445 nodes.append(node)
5444 if rev == checkout:
5446 if rev == checkout:
5445 checkout = node
5447 checkout = node
5446
5448
5447 wlock = util.nullcontextmanager()
5449 wlock = util.nullcontextmanager()
5448 if opts.get(b'update'):
5450 if opts.get(b'update'):
5449 wlock = repo.wlock()
5451 wlock = repo.wlock()
5450 with wlock:
5452 with wlock:
5451 pullopargs.update(opts.get(b'opargs', {}))
5453 pullopargs.update(opts.get(b'opargs', {}))
5452 modheads = exchange.pull(
5454 modheads = exchange.pull(
5453 repo,
5455 repo,
5454 other,
5456 other,
5455 heads=nodes,
5457 heads=nodes,
5456 force=opts.get(b'force'),
5458 force=opts.get(b'force'),
5457 bookmarks=opts.get(b'bookmark', ()),
5459 bookmarks=opts.get(b'bookmark', ()),
5458 opargs=pullopargs,
5460 opargs=pullopargs,
5459 ).cgresult
5461 ).cgresult
5460
5462
5461 # brev is a name, which might be a bookmark to be activated at
5463 # brev is a name, which might be a bookmark to be activated at
5462 # the end of the update. In other words, it is an explicit
5464 # the end of the update. In other words, it is an explicit
5463 # destination of the update
5465 # destination of the update
5464 brev = None
5466 brev = None
5465
5467
5466 if checkout:
5468 if checkout:
5467 checkout = repo.unfiltered().changelog.rev(checkout)
5469 checkout = repo.unfiltered().changelog.rev(checkout)
5468
5470
5469 # order below depends on implementation of
5471 # order below depends on implementation of
5470 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5472 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5471 # because 'checkout' is determined without it.
5473 # because 'checkout' is determined without it.
5472 if opts.get(b'rev'):
5474 if opts.get(b'rev'):
5473 brev = opts[b'rev'][0]
5475 brev = opts[b'rev'][0]
5474 elif opts.get(b'branch'):
5476 elif opts.get(b'branch'):
5475 brev = opts[b'branch'][0]
5477 brev = opts[b'branch'][0]
5476 else:
5478 else:
5477 brev = branches[0]
5479 brev = branches[0]
5478 repo._subtoppath = source
5480 repo._subtoppath = source
5479 try:
5481 try:
5480 ret = postincoming(
5482 ret = postincoming(
5481 ui, repo, modheads, opts.get(b'update'), checkout, brev
5483 ui, repo, modheads, opts.get(b'update'), checkout, brev
5482 )
5484 )
5483 except error.FilteredRepoLookupError as exc:
5485 except error.FilteredRepoLookupError as exc:
5484 msg = _(b'cannot update to target: %s') % exc.args[0]
5486 msg = _(b'cannot update to target: %s') % exc.args[0]
5485 exc.args = (msg,) + exc.args[1:]
5487 exc.args = (msg,) + exc.args[1:]
5486 raise
5488 raise
5487 finally:
5489 finally:
5488 del repo._subtoppath
5490 del repo._subtoppath
5489
5491
5490 finally:
5492 finally:
5491 other.close()
5493 other.close()
5492 return ret
5494 return ret
5493
5495
5494
5496
5495 @command(
5497 @command(
5496 b'push',
5498 b'push',
5497 [
5499 [
5498 (b'f', b'force', None, _(b'force push')),
5500 (b'f', b'force', None, _(b'force push')),
5499 (
5501 (
5500 b'r',
5502 b'r',
5501 b'rev',
5503 b'rev',
5502 [],
5504 [],
5503 _(b'a changeset intended to be included in the destination'),
5505 _(b'a changeset intended to be included in the destination'),
5504 _(b'REV'),
5506 _(b'REV'),
5505 ),
5507 ),
5506 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5508 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5507 (
5509 (
5508 b'b',
5510 b'b',
5509 b'branch',
5511 b'branch',
5510 [],
5512 [],
5511 _(b'a specific branch you would like to push'),
5513 _(b'a specific branch you would like to push'),
5512 _(b'BRANCH'),
5514 _(b'BRANCH'),
5513 ),
5515 ),
5514 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5516 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5515 (
5517 (
5516 b'',
5518 b'',
5517 b'pushvars',
5519 b'pushvars',
5518 [],
5520 [],
5519 _(b'variables that can be sent to server (ADVANCED)'),
5521 _(b'variables that can be sent to server (ADVANCED)'),
5520 ),
5522 ),
5521 (
5523 (
5522 b'',
5524 b'',
5523 b'publish',
5525 b'publish',
5524 False,
5526 False,
5525 _(b'push the changeset as public (EXPERIMENTAL)'),
5527 _(b'push the changeset as public (EXPERIMENTAL)'),
5526 ),
5528 ),
5527 ]
5529 ]
5528 + remoteopts,
5530 + remoteopts,
5529 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5531 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5530 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5532 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5531 helpbasic=True,
5533 helpbasic=True,
5532 )
5534 )
5533 def push(ui, repo, dest=None, **opts):
5535 def push(ui, repo, dest=None, **opts):
5534 """push changes to the specified destination
5536 """push changes to the specified destination
5535
5537
5536 Push changesets from the local repository to the specified
5538 Push changesets from the local repository to the specified
5537 destination.
5539 destination.
5538
5540
5539 This operation is symmetrical to pull: it is identical to a pull
5541 This operation is symmetrical to pull: it is identical to a pull
5540 in the destination repository from the current one.
5542 in the destination repository from the current one.
5541
5543
5542 By default, push will not allow creation of new heads at the
5544 By default, push will not allow creation of new heads at the
5543 destination, since multiple heads would make it unclear which head
5545 destination, since multiple heads would make it unclear which head
5544 to use. In this situation, it is recommended to pull and merge
5546 to use. In this situation, it is recommended to pull and merge
5545 before pushing.
5547 before pushing.
5546
5548
5547 Use --new-branch if you want to allow push to create a new named
5549 Use --new-branch if you want to allow push to create a new named
5548 branch that is not present at the destination. This allows you to
5550 branch that is not present at the destination. This allows you to
5549 only create a new branch without forcing other changes.
5551 only create a new branch without forcing other changes.
5550
5552
5551 .. note::
5553 .. note::
5552
5554
5553 Extra care should be taken with the -f/--force option,
5555 Extra care should be taken with the -f/--force option,
5554 which will push all new heads on all branches, an action which will
5556 which will push all new heads on all branches, an action which will
5555 almost always cause confusion for collaborators.
5557 almost always cause confusion for collaborators.
5556
5558
5557 If -r/--rev is used, the specified revision and all its ancestors
5559 If -r/--rev is used, the specified revision and all its ancestors
5558 will be pushed to the remote repository.
5560 will be pushed to the remote repository.
5559
5561
5560 If -B/--bookmark is used, the specified bookmarked revision, its
5562 If -B/--bookmark is used, the specified bookmarked revision, its
5561 ancestors, and the bookmark will be pushed to the remote
5563 ancestors, and the bookmark will be pushed to the remote
5562 repository. Specifying ``.`` is equivalent to specifying the active
5564 repository. Specifying ``.`` is equivalent to specifying the active
5563 bookmark's name.
5565 bookmark's name.
5564
5566
5565 Please see :hg:`help urls` for important details about ``ssh://``
5567 Please see :hg:`help urls` for important details about ``ssh://``
5566 URLs. If DESTINATION is omitted, a default path will be used.
5568 URLs. If DESTINATION is omitted, a default path will be used.
5567
5569
5568 .. container:: verbose
5570 .. container:: verbose
5569
5571
5570 The --pushvars option sends strings to the server that become
5572 The --pushvars option sends strings to the server that become
5571 environment variables prepended with ``HG_USERVAR_``. For example,
5573 environment variables prepended with ``HG_USERVAR_``. For example,
5572 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5574 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5573 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5575 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5574
5576
5575 pushvars can provide for user-overridable hooks as well as set debug
5577 pushvars can provide for user-overridable hooks as well as set debug
5576 levels. One example is having a hook that blocks commits containing
5578 levels. One example is having a hook that blocks commits containing
5577 conflict markers, but enables the user to override the hook if the file
5579 conflict markers, but enables the user to override the hook if the file
5578 is using conflict markers for testing purposes or the file format has
5580 is using conflict markers for testing purposes or the file format has
5579 strings that look like conflict markers.
5581 strings that look like conflict markers.
5580
5582
5581 By default, servers will ignore `--pushvars`. To enable it add the
5583 By default, servers will ignore `--pushvars`. To enable it add the
5582 following to your configuration file::
5584 following to your configuration file::
5583
5585
5584 [push]
5586 [push]
5585 pushvars.server = true
5587 pushvars.server = true
5586
5588
5587 Returns 0 if push was successful, 1 if nothing to push.
5589 Returns 0 if push was successful, 1 if nothing to push.
5588 """
5590 """
5589
5591
5590 opts = pycompat.byteskwargs(opts)
5592 opts = pycompat.byteskwargs(opts)
5591 if opts.get(b'bookmark'):
5593 if opts.get(b'bookmark'):
5592 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5594 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5593 for b in opts[b'bookmark']:
5595 for b in opts[b'bookmark']:
5594 # translate -B options to -r so changesets get pushed
5596 # translate -B options to -r so changesets get pushed
5595 b = repo._bookmarks.expandname(b)
5597 b = repo._bookmarks.expandname(b)
5596 if b in repo._bookmarks:
5598 if b in repo._bookmarks:
5597 opts.setdefault(b'rev', []).append(b)
5599 opts.setdefault(b'rev', []).append(b)
5598 else:
5600 else:
5599 # if we try to push a deleted bookmark, translate it to null
5601 # if we try to push a deleted bookmark, translate it to null
5600 # this lets simultaneous -r, -b options continue working
5602 # this lets simultaneous -r, -b options continue working
5601 opts.setdefault(b'rev', []).append(b"null")
5603 opts.setdefault(b'rev', []).append(b"null")
5602
5604
5603 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5605 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5604 if not path:
5606 if not path:
5605 raise error.Abort(
5607 raise error.Abort(
5606 _(b'default repository not configured!'),
5608 _(b'default repository not configured!'),
5607 hint=_(b"see 'hg help config.paths'"),
5609 hint=_(b"see 'hg help config.paths'"),
5608 )
5610 )
5609 dest = path.pushloc or path.loc
5611 dest = path.pushloc or path.loc
5610 branches = (path.branch, opts.get(b'branch') or [])
5612 branches = (path.branch, opts.get(b'branch') or [])
5611 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5613 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5612 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5614 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5613 other = hg.peer(repo, opts, dest)
5615 other = hg.peer(repo, opts, dest)
5614
5616
5615 if revs:
5617 if revs:
5616 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5618 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5617 if not revs:
5619 if not revs:
5618 raise error.Abort(
5620 raise error.Abort(
5619 _(b"specified revisions evaluate to an empty set"),
5621 _(b"specified revisions evaluate to an empty set"),
5620 hint=_(b"use different revision arguments"),
5622 hint=_(b"use different revision arguments"),
5621 )
5623 )
5622 elif path.pushrev:
5624 elif path.pushrev:
5623 # It doesn't make any sense to specify ancestor revisions. So limit
5625 # It doesn't make any sense to specify ancestor revisions. So limit
5624 # to DAG heads to make discovery simpler.
5626 # to DAG heads to make discovery simpler.
5625 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5627 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5626 revs = scmutil.revrange(repo, [expr])
5628 revs = scmutil.revrange(repo, [expr])
5627 revs = [repo[rev].node() for rev in revs]
5629 revs = [repo[rev].node() for rev in revs]
5628 if not revs:
5630 if not revs:
5629 raise error.Abort(
5631 raise error.Abort(
5630 _(b'default push revset for path evaluates to an empty set')
5632 _(b'default push revset for path evaluates to an empty set')
5631 )
5633 )
5632 elif ui.configbool(b'commands', b'push.require-revs'):
5634 elif ui.configbool(b'commands', b'push.require-revs'):
5633 raise error.Abort(
5635 raise error.Abort(
5634 _(b'no revisions specified to push'),
5636 _(b'no revisions specified to push'),
5635 hint=_(b'did you mean "hg push -r ."?'),
5637 hint=_(b'did you mean "hg push -r ."?'),
5636 )
5638 )
5637
5639
5638 repo._subtoppath = dest
5640 repo._subtoppath = dest
5639 try:
5641 try:
5640 # push subrepos depth-first for coherent ordering
5642 # push subrepos depth-first for coherent ordering
5641 c = repo[b'.']
5643 c = repo[b'.']
5642 subs = c.substate # only repos that are committed
5644 subs = c.substate # only repos that are committed
5643 for s in sorted(subs):
5645 for s in sorted(subs):
5644 result = c.sub(s).push(opts)
5646 result = c.sub(s).push(opts)
5645 if result == 0:
5647 if result == 0:
5646 return not result
5648 return not result
5647 finally:
5649 finally:
5648 del repo._subtoppath
5650 del repo._subtoppath
5649
5651
5650 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5652 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5651 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5653 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5652
5654
5653 pushop = exchange.push(
5655 pushop = exchange.push(
5654 repo,
5656 repo,
5655 other,
5657 other,
5656 opts.get(b'force'),
5658 opts.get(b'force'),
5657 revs=revs,
5659 revs=revs,
5658 newbranch=opts.get(b'new_branch'),
5660 newbranch=opts.get(b'new_branch'),
5659 bookmarks=opts.get(b'bookmark', ()),
5661 bookmarks=opts.get(b'bookmark', ()),
5660 publish=opts.get(b'publish'),
5662 publish=opts.get(b'publish'),
5661 opargs=opargs,
5663 opargs=opargs,
5662 )
5664 )
5663
5665
5664 result = not pushop.cgresult
5666 result = not pushop.cgresult
5665
5667
5666 if pushop.bkresult is not None:
5668 if pushop.bkresult is not None:
5667 if pushop.bkresult == 2:
5669 if pushop.bkresult == 2:
5668 result = 2
5670 result = 2
5669 elif not result and pushop.bkresult:
5671 elif not result and pushop.bkresult:
5670 result = 2
5672 result = 2
5671
5673
5672 return result
5674 return result
5673
5675
5674
5676
5675 @command(
5677 @command(
5676 b'recover',
5678 b'recover',
5677 [(b'', b'verify', True, b"run `hg verify` after succesful recover"),],
5679 [(b'', b'verify', True, b"run `hg verify` after succesful recover"),],
5678 helpcategory=command.CATEGORY_MAINTENANCE,
5680 helpcategory=command.CATEGORY_MAINTENANCE,
5679 )
5681 )
5680 def recover(ui, repo, **opts):
5682 def recover(ui, repo, **opts):
5681 """roll back an interrupted transaction
5683 """roll back an interrupted transaction
5682
5684
5683 Recover from an interrupted commit or pull.
5685 Recover from an interrupted commit or pull.
5684
5686
5685 This command tries to fix the repository status after an
5687 This command tries to fix the repository status after an
5686 interrupted operation. It should only be necessary when Mercurial
5688 interrupted operation. It should only be necessary when Mercurial
5687 suggests it.
5689 suggests it.
5688
5690
5689 Returns 0 if successful, 1 if nothing to recover or verify fails.
5691 Returns 0 if successful, 1 if nothing to recover or verify fails.
5690 """
5692 """
5691 ret = repo.recover()
5693 ret = repo.recover()
5692 if ret:
5694 if ret:
5693 if opts['verify']:
5695 if opts['verify']:
5694 return hg.verify(repo)
5696 return hg.verify(repo)
5695 else:
5697 else:
5696 msg = _(
5698 msg = _(
5697 b"(verify step skipped, run `hg verify` to check your "
5699 b"(verify step skipped, run `hg verify` to check your "
5698 b"repository content)\n"
5700 b"repository content)\n"
5699 )
5701 )
5700 ui.warn(msg)
5702 ui.warn(msg)
5701 return 0
5703 return 0
5702 return 1
5704 return 1
5703
5705
5704
5706
5705 @command(
5707 @command(
5706 b'remove|rm',
5708 b'remove|rm',
5707 [
5709 [
5708 (b'A', b'after', None, _(b'record delete for missing files')),
5710 (b'A', b'after', None, _(b'record delete for missing files')),
5709 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5711 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5710 ]
5712 ]
5711 + subrepoopts
5713 + subrepoopts
5712 + walkopts
5714 + walkopts
5713 + dryrunopts,
5715 + dryrunopts,
5714 _(b'[OPTION]... FILE...'),
5716 _(b'[OPTION]... FILE...'),
5715 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5717 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5716 helpbasic=True,
5718 helpbasic=True,
5717 inferrepo=True,
5719 inferrepo=True,
5718 )
5720 )
5719 def remove(ui, repo, *pats, **opts):
5721 def remove(ui, repo, *pats, **opts):
5720 """remove the specified files on the next commit
5722 """remove the specified files on the next commit
5721
5723
5722 Schedule the indicated files for removal from the current branch.
5724 Schedule the indicated files for removal from the current branch.
5723
5725
5724 This command schedules the files to be removed at the next commit.
5726 This command schedules the files to be removed at the next commit.
5725 To undo a remove before that, see :hg:`revert`. To undo added
5727 To undo a remove before that, see :hg:`revert`. To undo added
5726 files, see :hg:`forget`.
5728 files, see :hg:`forget`.
5727
5729
5728 .. container:: verbose
5730 .. container:: verbose
5729
5731
5730 -A/--after can be used to remove only files that have already
5732 -A/--after can be used to remove only files that have already
5731 been deleted, -f/--force can be used to force deletion, and -Af
5733 been deleted, -f/--force can be used to force deletion, and -Af
5732 can be used to remove files from the next revision without
5734 can be used to remove files from the next revision without
5733 deleting them from the working directory.
5735 deleting them from the working directory.
5734
5736
5735 The following table details the behavior of remove for different
5737 The following table details the behavior of remove for different
5736 file states (columns) and option combinations (rows). The file
5738 file states (columns) and option combinations (rows). The file
5737 states are Added [A], Clean [C], Modified [M] and Missing [!]
5739 states are Added [A], Clean [C], Modified [M] and Missing [!]
5738 (as reported by :hg:`status`). The actions are Warn, Remove
5740 (as reported by :hg:`status`). The actions are Warn, Remove
5739 (from branch) and Delete (from disk):
5741 (from branch) and Delete (from disk):
5740
5742
5741 ========= == == == ==
5743 ========= == == == ==
5742 opt/state A C M !
5744 opt/state A C M !
5743 ========= == == == ==
5745 ========= == == == ==
5744 none W RD W R
5746 none W RD W R
5745 -f R RD RD R
5747 -f R RD RD R
5746 -A W W W R
5748 -A W W W R
5747 -Af R R R R
5749 -Af R R R R
5748 ========= == == == ==
5750 ========= == == == ==
5749
5751
5750 .. note::
5752 .. note::
5751
5753
5752 :hg:`remove` never deletes files in Added [A] state from the
5754 :hg:`remove` never deletes files in Added [A] state from the
5753 working directory, not even if ``--force`` is specified.
5755 working directory, not even if ``--force`` is specified.
5754
5756
5755 Returns 0 on success, 1 if any warnings encountered.
5757 Returns 0 on success, 1 if any warnings encountered.
5756 """
5758 """
5757
5759
5758 opts = pycompat.byteskwargs(opts)
5760 opts = pycompat.byteskwargs(opts)
5759 after, force = opts.get(b'after'), opts.get(b'force')
5761 after, force = opts.get(b'after'), opts.get(b'force')
5760 dryrun = opts.get(b'dry_run')
5762 dryrun = opts.get(b'dry_run')
5761 if not pats and not after:
5763 if not pats and not after:
5762 raise error.Abort(_(b'no files specified'))
5764 raise error.Abort(_(b'no files specified'))
5763
5765
5764 m = scmutil.match(repo[None], pats, opts)
5766 m = scmutil.match(repo[None], pats, opts)
5765 subrepos = opts.get(b'subrepos')
5767 subrepos = opts.get(b'subrepos')
5766 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5768 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5767 return cmdutil.remove(
5769 return cmdutil.remove(
5768 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5770 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5769 )
5771 )
5770
5772
5771
5773
5772 @command(
5774 @command(
5773 b'rename|move|mv',
5775 b'rename|move|mv',
5774 [
5776 [
5775 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5777 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5776 (
5778 (
5777 b'f',
5779 b'f',
5778 b'force',
5780 b'force',
5779 None,
5781 None,
5780 _(b'forcibly move over an existing managed file'),
5782 _(b'forcibly move over an existing managed file'),
5781 ),
5783 ),
5782 ]
5784 ]
5783 + walkopts
5785 + walkopts
5784 + dryrunopts,
5786 + dryrunopts,
5785 _(b'[OPTION]... SOURCE... DEST'),
5787 _(b'[OPTION]... SOURCE... DEST'),
5786 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5788 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5787 )
5789 )
5788 def rename(ui, repo, *pats, **opts):
5790 def rename(ui, repo, *pats, **opts):
5789 """rename files; equivalent of copy + remove
5791 """rename files; equivalent of copy + remove
5790
5792
5791 Mark dest as copies of sources; mark sources for deletion. If dest
5793 Mark dest as copies of sources; mark sources for deletion. If dest
5792 is a directory, copies are put in that directory. If dest is a
5794 is a directory, copies are put in that directory. If dest is a
5793 file, there can only be one source.
5795 file, there can only be one source.
5794
5796
5795 By default, this command copies the contents of files as they
5797 By default, this command copies the contents of files as they
5796 exist in the working directory. If invoked with -A/--after, the
5798 exist in the working directory. If invoked with -A/--after, the
5797 operation is recorded, but no copying is performed.
5799 operation is recorded, but no copying is performed.
5798
5800
5799 This command takes effect at the next commit. To undo a rename
5801 This command takes effect at the next commit. To undo a rename
5800 before that, see :hg:`revert`.
5802 before that, see :hg:`revert`.
5801
5803
5802 Returns 0 on success, 1 if errors are encountered.
5804 Returns 0 on success, 1 if errors are encountered.
5803 """
5805 """
5804 opts = pycompat.byteskwargs(opts)
5806 opts = pycompat.byteskwargs(opts)
5805 with repo.wlock(False):
5807 with repo.wlock(False):
5806 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5808 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5807
5809
5808
5810
5809 @command(
5811 @command(
5810 b'resolve',
5812 b'resolve',
5811 [
5813 [
5812 (b'a', b'all', None, _(b'select all unresolved files')),
5814 (b'a', b'all', None, _(b'select all unresolved files')),
5813 (b'l', b'list', None, _(b'list state of files needing merge')),
5815 (b'l', b'list', None, _(b'list state of files needing merge')),
5814 (b'm', b'mark', None, _(b'mark files as resolved')),
5816 (b'm', b'mark', None, _(b'mark files as resolved')),
5815 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5817 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5816 (b'n', b'no-status', None, _(b'hide status prefix')),
5818 (b'n', b'no-status', None, _(b'hide status prefix')),
5817 (b'', b're-merge', None, _(b're-merge files')),
5819 (b'', b're-merge', None, _(b're-merge files')),
5818 ]
5820 ]
5819 + mergetoolopts
5821 + mergetoolopts
5820 + walkopts
5822 + walkopts
5821 + formatteropts,
5823 + formatteropts,
5822 _(b'[OPTION]... [FILE]...'),
5824 _(b'[OPTION]... [FILE]...'),
5823 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5825 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5824 inferrepo=True,
5826 inferrepo=True,
5825 )
5827 )
5826 def resolve(ui, repo, *pats, **opts):
5828 def resolve(ui, repo, *pats, **opts):
5827 """redo merges or set/view the merge status of files
5829 """redo merges or set/view the merge status of files
5828
5830
5829 Merges with unresolved conflicts are often the result of
5831 Merges with unresolved conflicts are often the result of
5830 non-interactive merging using the ``internal:merge`` configuration
5832 non-interactive merging using the ``internal:merge`` configuration
5831 setting, or a command-line merge tool like ``diff3``. The resolve
5833 setting, or a command-line merge tool like ``diff3``. The resolve
5832 command is used to manage the files involved in a merge, after
5834 command is used to manage the files involved in a merge, after
5833 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5835 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5834 working directory must have two parents). See :hg:`help
5836 working directory must have two parents). See :hg:`help
5835 merge-tools` for information on configuring merge tools.
5837 merge-tools` for information on configuring merge tools.
5836
5838
5837 The resolve command can be used in the following ways:
5839 The resolve command can be used in the following ways:
5838
5840
5839 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5841 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5840 the specified files, discarding any previous merge attempts. Re-merging
5842 the specified files, discarding any previous merge attempts. Re-merging
5841 is not performed for files already marked as resolved. Use ``--all/-a``
5843 is not performed for files already marked as resolved. Use ``--all/-a``
5842 to select all unresolved files. ``--tool`` can be used to specify
5844 to select all unresolved files. ``--tool`` can be used to specify
5843 the merge tool used for the given files. It overrides the HGMERGE
5845 the merge tool used for the given files. It overrides the HGMERGE
5844 environment variable and your configuration files. Previous file
5846 environment variable and your configuration files. Previous file
5845 contents are saved with a ``.orig`` suffix.
5847 contents are saved with a ``.orig`` suffix.
5846
5848
5847 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5849 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5848 (e.g. after having manually fixed-up the files). The default is
5850 (e.g. after having manually fixed-up the files). The default is
5849 to mark all unresolved files.
5851 to mark all unresolved files.
5850
5852
5851 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5853 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5852 default is to mark all resolved files.
5854 default is to mark all resolved files.
5853
5855
5854 - :hg:`resolve -l`: list files which had or still have conflicts.
5856 - :hg:`resolve -l`: list files which had or still have conflicts.
5855 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5857 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5856 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5858 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5857 the list. See :hg:`help filesets` for details.
5859 the list. See :hg:`help filesets` for details.
5858
5860
5859 .. note::
5861 .. note::
5860
5862
5861 Mercurial will not let you commit files with unresolved merge
5863 Mercurial will not let you commit files with unresolved merge
5862 conflicts. You must use :hg:`resolve -m ...` before you can
5864 conflicts. You must use :hg:`resolve -m ...` before you can
5863 commit after a conflicting merge.
5865 commit after a conflicting merge.
5864
5866
5865 .. container:: verbose
5867 .. container:: verbose
5866
5868
5867 Template:
5869 Template:
5868
5870
5869 The following keywords are supported in addition to the common template
5871 The following keywords are supported in addition to the common template
5870 keywords and functions. See also :hg:`help templates`.
5872 keywords and functions. See also :hg:`help templates`.
5871
5873
5872 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5874 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5873 :path: String. Repository-absolute path of the file.
5875 :path: String. Repository-absolute path of the file.
5874
5876
5875 Returns 0 on success, 1 if any files fail a resolve attempt.
5877 Returns 0 on success, 1 if any files fail a resolve attempt.
5876 """
5878 """
5877
5879
5878 opts = pycompat.byteskwargs(opts)
5880 opts = pycompat.byteskwargs(opts)
5879 confirm = ui.configbool(b'commands', b'resolve.confirm')
5881 confirm = ui.configbool(b'commands', b'resolve.confirm')
5880 flaglist = b'all mark unmark list no_status re_merge'.split()
5882 flaglist = b'all mark unmark list no_status re_merge'.split()
5881 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5883 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5882
5884
5883 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5885 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5884 if actioncount > 1:
5886 if actioncount > 1:
5885 raise error.Abort(_(b"too many actions specified"))
5887 raise error.Abort(_(b"too many actions specified"))
5886 elif actioncount == 0 and ui.configbool(
5888 elif actioncount == 0 and ui.configbool(
5887 b'commands', b'resolve.explicit-re-merge'
5889 b'commands', b'resolve.explicit-re-merge'
5888 ):
5890 ):
5889 hint = _(b'use --mark, --unmark, --list or --re-merge')
5891 hint = _(b'use --mark, --unmark, --list or --re-merge')
5890 raise error.Abort(_(b'no action specified'), hint=hint)
5892 raise error.Abort(_(b'no action specified'), hint=hint)
5891 if pats and all:
5893 if pats and all:
5892 raise error.Abort(_(b"can't specify --all and patterns"))
5894 raise error.Abort(_(b"can't specify --all and patterns"))
5893 if not (all or pats or show or mark or unmark):
5895 if not (all or pats or show or mark or unmark):
5894 raise error.Abort(
5896 raise error.Abort(
5895 _(b'no files or directories specified'),
5897 _(b'no files or directories specified'),
5896 hint=b'use --all to re-merge all unresolved files',
5898 hint=b'use --all to re-merge all unresolved files',
5897 )
5899 )
5898
5900
5899 if confirm:
5901 if confirm:
5900 if all:
5902 if all:
5901 if ui.promptchoice(
5903 if ui.promptchoice(
5902 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5904 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5903 ):
5905 ):
5904 raise error.Abort(_(b'user quit'))
5906 raise error.Abort(_(b'user quit'))
5905 if mark and not pats:
5907 if mark and not pats:
5906 if ui.promptchoice(
5908 if ui.promptchoice(
5907 _(
5909 _(
5908 b'mark all unresolved files as resolved (yn)?'
5910 b'mark all unresolved files as resolved (yn)?'
5909 b'$$ &Yes $$ &No'
5911 b'$$ &Yes $$ &No'
5910 )
5912 )
5911 ):
5913 ):
5912 raise error.Abort(_(b'user quit'))
5914 raise error.Abort(_(b'user quit'))
5913 if unmark and not pats:
5915 if unmark and not pats:
5914 if ui.promptchoice(
5916 if ui.promptchoice(
5915 _(
5917 _(
5916 b'mark all resolved files as unresolved (yn)?'
5918 b'mark all resolved files as unresolved (yn)?'
5917 b'$$ &Yes $$ &No'
5919 b'$$ &Yes $$ &No'
5918 )
5920 )
5919 ):
5921 ):
5920 raise error.Abort(_(b'user quit'))
5922 raise error.Abort(_(b'user quit'))
5921
5923
5922 uipathfn = scmutil.getuipathfn(repo)
5924 uipathfn = scmutil.getuipathfn(repo)
5923
5925
5924 if show:
5926 if show:
5925 ui.pager(b'resolve')
5927 ui.pager(b'resolve')
5926 fm = ui.formatter(b'resolve', opts)
5928 fm = ui.formatter(b'resolve', opts)
5927 ms = mergemod.mergestate.read(repo)
5929 ms = mergemod.mergestate.read(repo)
5928 wctx = repo[None]
5930 wctx = repo[None]
5929 m = scmutil.match(wctx, pats, opts)
5931 m = scmutil.match(wctx, pats, opts)
5930
5932
5931 # Labels and keys based on merge state. Unresolved path conflicts show
5933 # Labels and keys based on merge state. Unresolved path conflicts show
5932 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5934 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5933 # resolved conflicts.
5935 # resolved conflicts.
5934 mergestateinfo = {
5936 mergestateinfo = {
5935 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5937 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5936 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5938 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5937 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5939 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5938 b'resolve.unresolved',
5940 b'resolve.unresolved',
5939 b'P',
5941 b'P',
5940 ),
5942 ),
5941 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5943 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5942 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5944 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5943 b'resolve.driverresolved',
5945 b'resolve.driverresolved',
5944 b'D',
5946 b'D',
5945 ),
5947 ),
5946 }
5948 }
5947
5949
5948 for f in ms:
5950 for f in ms:
5949 if not m(f):
5951 if not m(f):
5950 continue
5952 continue
5951
5953
5952 label, key = mergestateinfo[ms[f]]
5954 label, key = mergestateinfo[ms[f]]
5953 fm.startitem()
5955 fm.startitem()
5954 fm.context(ctx=wctx)
5956 fm.context(ctx=wctx)
5955 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5957 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5956 fm.data(path=f)
5958 fm.data(path=f)
5957 fm.plain(b'%s\n' % uipathfn(f), label=label)
5959 fm.plain(b'%s\n' % uipathfn(f), label=label)
5958 fm.end()
5960 fm.end()
5959 return 0
5961 return 0
5960
5962
5961 with repo.wlock():
5963 with repo.wlock():
5962 ms = mergemod.mergestate.read(repo)
5964 ms = mergemod.mergestate.read(repo)
5963
5965
5964 if not (ms.active() or repo.dirstate.p2() != nullid):
5966 if not (ms.active() or repo.dirstate.p2() != nullid):
5965 raise error.Abort(
5967 raise error.Abort(
5966 _(b'resolve command not applicable when not merging')
5968 _(b'resolve command not applicable when not merging')
5967 )
5969 )
5968
5970
5969 wctx = repo[None]
5971 wctx = repo[None]
5970
5972
5971 if (
5973 if (
5972 ms.mergedriver
5974 ms.mergedriver
5973 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5975 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5974 ):
5976 ):
5975 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5977 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5976 ms.commit()
5978 ms.commit()
5977 # allow mark and unmark to go through
5979 # allow mark and unmark to go through
5978 if not mark and not unmark and not proceed:
5980 if not mark and not unmark and not proceed:
5979 return 1
5981 return 1
5980
5982
5981 m = scmutil.match(wctx, pats, opts)
5983 m = scmutil.match(wctx, pats, opts)
5982 ret = 0
5984 ret = 0
5983 didwork = False
5985 didwork = False
5984 runconclude = False
5986 runconclude = False
5985
5987
5986 tocomplete = []
5988 tocomplete = []
5987 hasconflictmarkers = []
5989 hasconflictmarkers = []
5988 if mark:
5990 if mark:
5989 markcheck = ui.config(b'commands', b'resolve.mark-check')
5991 markcheck = ui.config(b'commands', b'resolve.mark-check')
5990 if markcheck not in [b'warn', b'abort']:
5992 if markcheck not in [b'warn', b'abort']:
5991 # Treat all invalid / unrecognized values as 'none'.
5993 # Treat all invalid / unrecognized values as 'none'.
5992 markcheck = False
5994 markcheck = False
5993 for f in ms:
5995 for f in ms:
5994 if not m(f):
5996 if not m(f):
5995 continue
5997 continue
5996
5998
5997 didwork = True
5999 didwork = True
5998
6000
5999 # don't let driver-resolved files be marked, and run the conclude
6001 # don't let driver-resolved files be marked, and run the conclude
6000 # step if asked to resolve
6002 # step if asked to resolve
6001 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6003 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6002 exact = m.exact(f)
6004 exact = m.exact(f)
6003 if mark:
6005 if mark:
6004 if exact:
6006 if exact:
6005 ui.warn(
6007 ui.warn(
6006 _(b'not marking %s as it is driver-resolved\n')
6008 _(b'not marking %s as it is driver-resolved\n')
6007 % uipathfn(f)
6009 % uipathfn(f)
6008 )
6010 )
6009 elif unmark:
6011 elif unmark:
6010 if exact:
6012 if exact:
6011 ui.warn(
6013 ui.warn(
6012 _(b'not unmarking %s as it is driver-resolved\n')
6014 _(b'not unmarking %s as it is driver-resolved\n')
6013 % uipathfn(f)
6015 % uipathfn(f)
6014 )
6016 )
6015 else:
6017 else:
6016 runconclude = True
6018 runconclude = True
6017 continue
6019 continue
6018
6020
6019 # path conflicts must be resolved manually
6021 # path conflicts must be resolved manually
6020 if ms[f] in (
6022 if ms[f] in (
6021 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6023 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6022 mergemod.MERGE_RECORD_RESOLVED_PATH,
6024 mergemod.MERGE_RECORD_RESOLVED_PATH,
6023 ):
6025 ):
6024 if mark:
6026 if mark:
6025 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6027 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6026 elif unmark:
6028 elif unmark:
6027 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6029 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6028 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6030 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6029 ui.warn(
6031 ui.warn(
6030 _(b'%s: path conflict must be resolved manually\n')
6032 _(b'%s: path conflict must be resolved manually\n')
6031 % uipathfn(f)
6033 % uipathfn(f)
6032 )
6034 )
6033 continue
6035 continue
6034
6036
6035 if mark:
6037 if mark:
6036 if markcheck:
6038 if markcheck:
6037 fdata = repo.wvfs.tryread(f)
6039 fdata = repo.wvfs.tryread(f)
6038 if (
6040 if (
6039 filemerge.hasconflictmarkers(fdata)
6041 filemerge.hasconflictmarkers(fdata)
6040 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6042 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6041 ):
6043 ):
6042 hasconflictmarkers.append(f)
6044 hasconflictmarkers.append(f)
6043 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6045 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6044 elif unmark:
6046 elif unmark:
6045 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6047 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6046 else:
6048 else:
6047 # backup pre-resolve (merge uses .orig for its own purposes)
6049 # backup pre-resolve (merge uses .orig for its own purposes)
6048 a = repo.wjoin(f)
6050 a = repo.wjoin(f)
6049 try:
6051 try:
6050 util.copyfile(a, a + b".resolve")
6052 util.copyfile(a, a + b".resolve")
6051 except (IOError, OSError) as inst:
6053 except (IOError, OSError) as inst:
6052 if inst.errno != errno.ENOENT:
6054 if inst.errno != errno.ENOENT:
6053 raise
6055 raise
6054
6056
6055 try:
6057 try:
6056 # preresolve file
6058 # preresolve file
6057 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6059 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6058 with ui.configoverride(overrides, b'resolve'):
6060 with ui.configoverride(overrides, b'resolve'):
6059 complete, r = ms.preresolve(f, wctx)
6061 complete, r = ms.preresolve(f, wctx)
6060 if not complete:
6062 if not complete:
6061 tocomplete.append(f)
6063 tocomplete.append(f)
6062 elif r:
6064 elif r:
6063 ret = 1
6065 ret = 1
6064 finally:
6066 finally:
6065 ms.commit()
6067 ms.commit()
6066
6068
6067 # replace filemerge's .orig file with our resolve file, but only
6069 # replace filemerge's .orig file with our resolve file, but only
6068 # for merges that are complete
6070 # for merges that are complete
6069 if complete:
6071 if complete:
6070 try:
6072 try:
6071 util.rename(
6073 util.rename(
6072 a + b".resolve", scmutil.backuppath(ui, repo, f)
6074 a + b".resolve", scmutil.backuppath(ui, repo, f)
6073 )
6075 )
6074 except OSError as inst:
6076 except OSError as inst:
6075 if inst.errno != errno.ENOENT:
6077 if inst.errno != errno.ENOENT:
6076 raise
6078 raise
6077
6079
6078 if hasconflictmarkers:
6080 if hasconflictmarkers:
6079 ui.warn(
6081 ui.warn(
6080 _(
6082 _(
6081 b'warning: the following files still have conflict '
6083 b'warning: the following files still have conflict '
6082 b'markers:\n'
6084 b'markers:\n'
6083 )
6085 )
6084 + b''.join(
6086 + b''.join(
6085 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6087 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6086 )
6088 )
6087 )
6089 )
6088 if markcheck == b'abort' and not all and not pats:
6090 if markcheck == b'abort' and not all and not pats:
6089 raise error.Abort(
6091 raise error.Abort(
6090 _(b'conflict markers detected'),
6092 _(b'conflict markers detected'),
6091 hint=_(b'use --all to mark anyway'),
6093 hint=_(b'use --all to mark anyway'),
6092 )
6094 )
6093
6095
6094 for f in tocomplete:
6096 for f in tocomplete:
6095 try:
6097 try:
6096 # resolve file
6098 # resolve file
6097 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6099 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6098 with ui.configoverride(overrides, b'resolve'):
6100 with ui.configoverride(overrides, b'resolve'):
6099 r = ms.resolve(f, wctx)
6101 r = ms.resolve(f, wctx)
6100 if r:
6102 if r:
6101 ret = 1
6103 ret = 1
6102 finally:
6104 finally:
6103 ms.commit()
6105 ms.commit()
6104
6106
6105 # replace filemerge's .orig file with our resolve file
6107 # replace filemerge's .orig file with our resolve file
6106 a = repo.wjoin(f)
6108 a = repo.wjoin(f)
6107 try:
6109 try:
6108 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6110 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6109 except OSError as inst:
6111 except OSError as inst:
6110 if inst.errno != errno.ENOENT:
6112 if inst.errno != errno.ENOENT:
6111 raise
6113 raise
6112
6114
6113 ms.commit()
6115 ms.commit()
6114 ms.recordactions()
6116 ms.recordactions()
6115
6117
6116 if not didwork and pats:
6118 if not didwork and pats:
6117 hint = None
6119 hint = None
6118 if not any([p for p in pats if p.find(b':') >= 0]):
6120 if not any([p for p in pats if p.find(b':') >= 0]):
6119 pats = [b'path:%s' % p for p in pats]
6121 pats = [b'path:%s' % p for p in pats]
6120 m = scmutil.match(wctx, pats, opts)
6122 m = scmutil.match(wctx, pats, opts)
6121 for f in ms:
6123 for f in ms:
6122 if not m(f):
6124 if not m(f):
6123 continue
6125 continue
6124
6126
6125 def flag(o):
6127 def flag(o):
6126 if o == b're_merge':
6128 if o == b're_merge':
6127 return b'--re-merge '
6129 return b'--re-merge '
6128 return b'-%s ' % o[0:1]
6130 return b'-%s ' % o[0:1]
6129
6131
6130 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6132 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6131 hint = _(b"(try: hg resolve %s%s)\n") % (
6133 hint = _(b"(try: hg resolve %s%s)\n") % (
6132 flags,
6134 flags,
6133 b' '.join(pats),
6135 b' '.join(pats),
6134 )
6136 )
6135 break
6137 break
6136 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6138 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6137 if hint:
6139 if hint:
6138 ui.warn(hint)
6140 ui.warn(hint)
6139 elif ms.mergedriver and ms.mdstate() != b's':
6141 elif ms.mergedriver and ms.mdstate() != b's':
6140 # run conclude step when either a driver-resolved file is requested
6142 # run conclude step when either a driver-resolved file is requested
6141 # or there are no driver-resolved files
6143 # or there are no driver-resolved files
6142 # we can't use 'ret' to determine whether any files are unresolved
6144 # we can't use 'ret' to determine whether any files are unresolved
6143 # because we might not have tried to resolve some
6145 # because we might not have tried to resolve some
6144 if (runconclude or not list(ms.driverresolved())) and not list(
6146 if (runconclude or not list(ms.driverresolved())) and not list(
6145 ms.unresolved()
6147 ms.unresolved()
6146 ):
6148 ):
6147 proceed = mergemod.driverconclude(repo, ms, wctx)
6149 proceed = mergemod.driverconclude(repo, ms, wctx)
6148 ms.commit()
6150 ms.commit()
6149 if not proceed:
6151 if not proceed:
6150 return 1
6152 return 1
6151
6153
6152 # Nudge users into finishing an unfinished operation
6154 # Nudge users into finishing an unfinished operation
6153 unresolvedf = list(ms.unresolved())
6155 unresolvedf = list(ms.unresolved())
6154 driverresolvedf = list(ms.driverresolved())
6156 driverresolvedf = list(ms.driverresolved())
6155 if not unresolvedf and not driverresolvedf:
6157 if not unresolvedf and not driverresolvedf:
6156 ui.status(_(b'(no more unresolved files)\n'))
6158 ui.status(_(b'(no more unresolved files)\n'))
6157 cmdutil.checkafterresolved(repo)
6159 cmdutil.checkafterresolved(repo)
6158 elif not unresolvedf:
6160 elif not unresolvedf:
6159 ui.status(
6161 ui.status(
6160 _(
6162 _(
6161 b'(no more unresolved files -- '
6163 b'(no more unresolved files -- '
6162 b'run "hg resolve --all" to conclude)\n'
6164 b'run "hg resolve --all" to conclude)\n'
6163 )
6165 )
6164 )
6166 )
6165
6167
6166 return ret
6168 return ret
6167
6169
6168
6170
6169 @command(
6171 @command(
6170 b'revert',
6172 b'revert',
6171 [
6173 [
6172 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6174 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6173 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6175 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6174 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6176 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6175 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6177 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6176 (b'i', b'interactive', None, _(b'interactively select the changes')),
6178 (b'i', b'interactive', None, _(b'interactively select the changes')),
6177 ]
6179 ]
6178 + walkopts
6180 + walkopts
6179 + dryrunopts,
6181 + dryrunopts,
6180 _(b'[OPTION]... [-r REV] [NAME]...'),
6182 _(b'[OPTION]... [-r REV] [NAME]...'),
6181 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6183 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6182 )
6184 )
6183 def revert(ui, repo, *pats, **opts):
6185 def revert(ui, repo, *pats, **opts):
6184 """restore files to their checkout state
6186 """restore files to their checkout state
6185
6187
6186 .. note::
6188 .. note::
6187
6189
6188 To check out earlier revisions, you should use :hg:`update REV`.
6190 To check out earlier revisions, you should use :hg:`update REV`.
6189 To cancel an uncommitted merge (and lose your changes),
6191 To cancel an uncommitted merge (and lose your changes),
6190 use :hg:`merge --abort`.
6192 use :hg:`merge --abort`.
6191
6193
6192 With no revision specified, revert the specified files or directories
6194 With no revision specified, revert the specified files or directories
6193 to the contents they had in the parent of the working directory.
6195 to the contents they had in the parent of the working directory.
6194 This restores the contents of files to an unmodified
6196 This restores the contents of files to an unmodified
6195 state and unschedules adds, removes, copies, and renames. If the
6197 state and unschedules adds, removes, copies, and renames. If the
6196 working directory has two parents, you must explicitly specify a
6198 working directory has two parents, you must explicitly specify a
6197 revision.
6199 revision.
6198
6200
6199 Using the -r/--rev or -d/--date options, revert the given files or
6201 Using the -r/--rev or -d/--date options, revert the given files or
6200 directories to their states as of a specific revision. Because
6202 directories to their states as of a specific revision. Because
6201 revert does not change the working directory parents, this will
6203 revert does not change the working directory parents, this will
6202 cause these files to appear modified. This can be helpful to "back
6204 cause these files to appear modified. This can be helpful to "back
6203 out" some or all of an earlier change. See :hg:`backout` for a
6205 out" some or all of an earlier change. See :hg:`backout` for a
6204 related method.
6206 related method.
6205
6207
6206 Modified files are saved with a .orig suffix before reverting.
6208 Modified files are saved with a .orig suffix before reverting.
6207 To disable these backups, use --no-backup. It is possible to store
6209 To disable these backups, use --no-backup. It is possible to store
6208 the backup files in a custom directory relative to the root of the
6210 the backup files in a custom directory relative to the root of the
6209 repository by setting the ``ui.origbackuppath`` configuration
6211 repository by setting the ``ui.origbackuppath`` configuration
6210 option.
6212 option.
6211
6213
6212 See :hg:`help dates` for a list of formats valid for -d/--date.
6214 See :hg:`help dates` for a list of formats valid for -d/--date.
6213
6215
6214 See :hg:`help backout` for a way to reverse the effect of an
6216 See :hg:`help backout` for a way to reverse the effect of an
6215 earlier changeset.
6217 earlier changeset.
6216
6218
6217 Returns 0 on success.
6219 Returns 0 on success.
6218 """
6220 """
6219
6221
6220 opts = pycompat.byteskwargs(opts)
6222 opts = pycompat.byteskwargs(opts)
6221 if opts.get(b"date"):
6223 if opts.get(b"date"):
6222 if opts.get(b"rev"):
6224 if opts.get(b"rev"):
6223 raise error.Abort(_(b"you can't specify a revision and a date"))
6225 raise error.Abort(_(b"you can't specify a revision and a date"))
6224 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6226 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6225
6227
6226 parent, p2 = repo.dirstate.parents()
6228 parent, p2 = repo.dirstate.parents()
6227 if not opts.get(b'rev') and p2 != nullid:
6229 if not opts.get(b'rev') and p2 != nullid:
6228 # revert after merge is a trap for new users (issue2915)
6230 # revert after merge is a trap for new users (issue2915)
6229 raise error.Abort(
6231 raise error.Abort(
6230 _(b'uncommitted merge with no revision specified'),
6232 _(b'uncommitted merge with no revision specified'),
6231 hint=_(b"use 'hg update' or see 'hg help revert'"),
6233 hint=_(b"use 'hg update' or see 'hg help revert'"),
6232 )
6234 )
6233
6235
6234 rev = opts.get(b'rev')
6236 rev = opts.get(b'rev')
6235 if rev:
6237 if rev:
6236 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6238 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6237 ctx = scmutil.revsingle(repo, rev)
6239 ctx = scmutil.revsingle(repo, rev)
6238
6240
6239 if not (
6241 if not (
6240 pats
6242 pats
6241 or opts.get(b'include')
6243 or opts.get(b'include')
6242 or opts.get(b'exclude')
6244 or opts.get(b'exclude')
6243 or opts.get(b'all')
6245 or opts.get(b'all')
6244 or opts.get(b'interactive')
6246 or opts.get(b'interactive')
6245 ):
6247 ):
6246 msg = _(b"no files or directories specified")
6248 msg = _(b"no files or directories specified")
6247 if p2 != nullid:
6249 if p2 != nullid:
6248 hint = _(
6250 hint = _(
6249 b"uncommitted merge, use --all to discard all changes,"
6251 b"uncommitted merge, use --all to discard all changes,"
6250 b" or 'hg update -C .' to abort the merge"
6252 b" or 'hg update -C .' to abort the merge"
6251 )
6253 )
6252 raise error.Abort(msg, hint=hint)
6254 raise error.Abort(msg, hint=hint)
6253 dirty = any(repo.status())
6255 dirty = any(repo.status())
6254 node = ctx.node()
6256 node = ctx.node()
6255 if node != parent:
6257 if node != parent:
6256 if dirty:
6258 if dirty:
6257 hint = (
6259 hint = (
6258 _(
6260 _(
6259 b"uncommitted changes, use --all to discard all"
6261 b"uncommitted changes, use --all to discard all"
6260 b" changes, or 'hg update %d' to update"
6262 b" changes, or 'hg update %d' to update"
6261 )
6263 )
6262 % ctx.rev()
6264 % ctx.rev()
6263 )
6265 )
6264 else:
6266 else:
6265 hint = (
6267 hint = (
6266 _(
6268 _(
6267 b"use --all to revert all files,"
6269 b"use --all to revert all files,"
6268 b" or 'hg update %d' to update"
6270 b" or 'hg update %d' to update"
6269 )
6271 )
6270 % ctx.rev()
6272 % ctx.rev()
6271 )
6273 )
6272 elif dirty:
6274 elif dirty:
6273 hint = _(b"uncommitted changes, use --all to discard all changes")
6275 hint = _(b"uncommitted changes, use --all to discard all changes")
6274 else:
6276 else:
6275 hint = _(b"use --all to revert all files")
6277 hint = _(b"use --all to revert all files")
6276 raise error.Abort(msg, hint=hint)
6278 raise error.Abort(msg, hint=hint)
6277
6279
6278 return cmdutil.revert(
6280 return cmdutil.revert(
6279 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6281 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6280 )
6282 )
6281
6283
6282
6284
6283 @command(
6285 @command(
6284 b'rollback',
6286 b'rollback',
6285 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6287 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6286 helpcategory=command.CATEGORY_MAINTENANCE,
6288 helpcategory=command.CATEGORY_MAINTENANCE,
6287 )
6289 )
6288 def rollback(ui, repo, **opts):
6290 def rollback(ui, repo, **opts):
6289 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6291 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6290
6292
6291 Please use :hg:`commit --amend` instead of rollback to correct
6293 Please use :hg:`commit --amend` instead of rollback to correct
6292 mistakes in the last commit.
6294 mistakes in the last commit.
6293
6295
6294 This command should be used with care. There is only one level of
6296 This command should be used with care. There is only one level of
6295 rollback, and there is no way to undo a rollback. It will also
6297 rollback, and there is no way to undo a rollback. It will also
6296 restore the dirstate at the time of the last transaction, losing
6298 restore the dirstate at the time of the last transaction, losing
6297 any dirstate changes since that time. This command does not alter
6299 any dirstate changes since that time. This command does not alter
6298 the working directory.
6300 the working directory.
6299
6301
6300 Transactions are used to encapsulate the effects of all commands
6302 Transactions are used to encapsulate the effects of all commands
6301 that create new changesets or propagate existing changesets into a
6303 that create new changesets or propagate existing changesets into a
6302 repository.
6304 repository.
6303
6305
6304 .. container:: verbose
6306 .. container:: verbose
6305
6307
6306 For example, the following commands are transactional, and their
6308 For example, the following commands are transactional, and their
6307 effects can be rolled back:
6309 effects can be rolled back:
6308
6310
6309 - commit
6311 - commit
6310 - import
6312 - import
6311 - pull
6313 - pull
6312 - push (with this repository as the destination)
6314 - push (with this repository as the destination)
6313 - unbundle
6315 - unbundle
6314
6316
6315 To avoid permanent data loss, rollback will refuse to rollback a
6317 To avoid permanent data loss, rollback will refuse to rollback a
6316 commit transaction if it isn't checked out. Use --force to
6318 commit transaction if it isn't checked out. Use --force to
6317 override this protection.
6319 override this protection.
6318
6320
6319 The rollback command can be entirely disabled by setting the
6321 The rollback command can be entirely disabled by setting the
6320 ``ui.rollback`` configuration setting to false. If you're here
6322 ``ui.rollback`` configuration setting to false. If you're here
6321 because you want to use rollback and it's disabled, you can
6323 because you want to use rollback and it's disabled, you can
6322 re-enable the command by setting ``ui.rollback`` to true.
6324 re-enable the command by setting ``ui.rollback`` to true.
6323
6325
6324 This command is not intended for use on public repositories. Once
6326 This command is not intended for use on public repositories. Once
6325 changes are visible for pull by other users, rolling a transaction
6327 changes are visible for pull by other users, rolling a transaction
6326 back locally is ineffective (someone else may already have pulled
6328 back locally is ineffective (someone else may already have pulled
6327 the changes). Furthermore, a race is possible with readers of the
6329 the changes). Furthermore, a race is possible with readers of the
6328 repository; for example an in-progress pull from the repository
6330 repository; for example an in-progress pull from the repository
6329 may fail if a rollback is performed.
6331 may fail if a rollback is performed.
6330
6332
6331 Returns 0 on success, 1 if no rollback data is available.
6333 Returns 0 on success, 1 if no rollback data is available.
6332 """
6334 """
6333 if not ui.configbool(b'ui', b'rollback'):
6335 if not ui.configbool(b'ui', b'rollback'):
6334 raise error.Abort(
6336 raise error.Abort(
6335 _(b'rollback is disabled because it is unsafe'),
6337 _(b'rollback is disabled because it is unsafe'),
6336 hint=b'see `hg help -v rollback` for information',
6338 hint=b'see `hg help -v rollback` for information',
6337 )
6339 )
6338 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6340 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6339
6341
6340
6342
6341 @command(
6343 @command(
6342 b'root',
6344 b'root',
6343 [] + formatteropts,
6345 [] + formatteropts,
6344 intents={INTENT_READONLY},
6346 intents={INTENT_READONLY},
6345 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6347 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6346 )
6348 )
6347 def root(ui, repo, **opts):
6349 def root(ui, repo, **opts):
6348 """print the root (top) of the current working directory
6350 """print the root (top) of the current working directory
6349
6351
6350 Print the root directory of the current repository.
6352 Print the root directory of the current repository.
6351
6353
6352 .. container:: verbose
6354 .. container:: verbose
6353
6355
6354 Template:
6356 Template:
6355
6357
6356 The following keywords are supported in addition to the common template
6358 The following keywords are supported in addition to the common template
6357 keywords and functions. See also :hg:`help templates`.
6359 keywords and functions. See also :hg:`help templates`.
6358
6360
6359 :hgpath: String. Path to the .hg directory.
6361 :hgpath: String. Path to the .hg directory.
6360 :storepath: String. Path to the directory holding versioned data.
6362 :storepath: String. Path to the directory holding versioned data.
6361
6363
6362 Returns 0 on success.
6364 Returns 0 on success.
6363 """
6365 """
6364 opts = pycompat.byteskwargs(opts)
6366 opts = pycompat.byteskwargs(opts)
6365 with ui.formatter(b'root', opts) as fm:
6367 with ui.formatter(b'root', opts) as fm:
6366 fm.startitem()
6368 fm.startitem()
6367 fm.write(b'reporoot', b'%s\n', repo.root)
6369 fm.write(b'reporoot', b'%s\n', repo.root)
6368 fm.data(hgpath=repo.path, storepath=repo.spath)
6370 fm.data(hgpath=repo.path, storepath=repo.spath)
6369
6371
6370
6372
6371 @command(
6373 @command(
6372 b'serve',
6374 b'serve',
6373 [
6375 [
6374 (
6376 (
6375 b'A',
6377 b'A',
6376 b'accesslog',
6378 b'accesslog',
6377 b'',
6379 b'',
6378 _(b'name of access log file to write to'),
6380 _(b'name of access log file to write to'),
6379 _(b'FILE'),
6381 _(b'FILE'),
6380 ),
6382 ),
6381 (b'd', b'daemon', None, _(b'run server in background')),
6383 (b'd', b'daemon', None, _(b'run server in background')),
6382 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6384 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6383 (
6385 (
6384 b'E',
6386 b'E',
6385 b'errorlog',
6387 b'errorlog',
6386 b'',
6388 b'',
6387 _(b'name of error log file to write to'),
6389 _(b'name of error log file to write to'),
6388 _(b'FILE'),
6390 _(b'FILE'),
6389 ),
6391 ),
6390 # use string type, then we can check if something was passed
6392 # use string type, then we can check if something was passed
6391 (
6393 (
6392 b'p',
6394 b'p',
6393 b'port',
6395 b'port',
6394 b'',
6396 b'',
6395 _(b'port to listen on (default: 8000)'),
6397 _(b'port to listen on (default: 8000)'),
6396 _(b'PORT'),
6398 _(b'PORT'),
6397 ),
6399 ),
6398 (
6400 (
6399 b'a',
6401 b'a',
6400 b'address',
6402 b'address',
6401 b'',
6403 b'',
6402 _(b'address to listen on (default: all interfaces)'),
6404 _(b'address to listen on (default: all interfaces)'),
6403 _(b'ADDR'),
6405 _(b'ADDR'),
6404 ),
6406 ),
6405 (
6407 (
6406 b'',
6408 b'',
6407 b'prefix',
6409 b'prefix',
6408 b'',
6410 b'',
6409 _(b'prefix path to serve from (default: server root)'),
6411 _(b'prefix path to serve from (default: server root)'),
6410 _(b'PREFIX'),
6412 _(b'PREFIX'),
6411 ),
6413 ),
6412 (
6414 (
6413 b'n',
6415 b'n',
6414 b'name',
6416 b'name',
6415 b'',
6417 b'',
6416 _(b'name to show in web pages (default: working directory)'),
6418 _(b'name to show in web pages (default: working directory)'),
6417 _(b'NAME'),
6419 _(b'NAME'),
6418 ),
6420 ),
6419 (
6421 (
6420 b'',
6422 b'',
6421 b'web-conf',
6423 b'web-conf',
6422 b'',
6424 b'',
6423 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6425 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6424 _(b'FILE'),
6426 _(b'FILE'),
6425 ),
6427 ),
6426 (
6428 (
6427 b'',
6429 b'',
6428 b'webdir-conf',
6430 b'webdir-conf',
6429 b'',
6431 b'',
6430 _(b'name of the hgweb config file (DEPRECATED)'),
6432 _(b'name of the hgweb config file (DEPRECATED)'),
6431 _(b'FILE'),
6433 _(b'FILE'),
6432 ),
6434 ),
6433 (
6435 (
6434 b'',
6436 b'',
6435 b'pid-file',
6437 b'pid-file',
6436 b'',
6438 b'',
6437 _(b'name of file to write process ID to'),
6439 _(b'name of file to write process ID to'),
6438 _(b'FILE'),
6440 _(b'FILE'),
6439 ),
6441 ),
6440 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6442 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6441 (
6443 (
6442 b'',
6444 b'',
6443 b'cmdserver',
6445 b'cmdserver',
6444 b'',
6446 b'',
6445 _(b'for remote clients (ADVANCED)'),
6447 _(b'for remote clients (ADVANCED)'),
6446 _(b'MODE'),
6448 _(b'MODE'),
6447 ),
6449 ),
6448 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6450 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6449 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6451 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6450 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6452 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6451 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6453 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6452 (b'', b'print-url', None, _(b'start and print only the URL')),
6454 (b'', b'print-url', None, _(b'start and print only the URL')),
6453 ]
6455 ]
6454 + subrepoopts,
6456 + subrepoopts,
6455 _(b'[OPTION]...'),
6457 _(b'[OPTION]...'),
6456 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6458 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6457 helpbasic=True,
6459 helpbasic=True,
6458 optionalrepo=True,
6460 optionalrepo=True,
6459 )
6461 )
6460 def serve(ui, repo, **opts):
6462 def serve(ui, repo, **opts):
6461 """start stand-alone webserver
6463 """start stand-alone webserver
6462
6464
6463 Start a local HTTP repository browser and pull server. You can use
6465 Start a local HTTP repository browser and pull server. You can use
6464 this for ad-hoc sharing and browsing of repositories. It is
6466 this for ad-hoc sharing and browsing of repositories. It is
6465 recommended to use a real web server to serve a repository for
6467 recommended to use a real web server to serve a repository for
6466 longer periods of time.
6468 longer periods of time.
6467
6469
6468 Please note that the server does not implement access control.
6470 Please note that the server does not implement access control.
6469 This means that, by default, anybody can read from the server and
6471 This means that, by default, anybody can read from the server and
6470 nobody can write to it by default. Set the ``web.allow-push``
6472 nobody can write to it by default. Set the ``web.allow-push``
6471 option to ``*`` to allow everybody to push to the server. You
6473 option to ``*`` to allow everybody to push to the server. You
6472 should use a real web server if you need to authenticate users.
6474 should use a real web server if you need to authenticate users.
6473
6475
6474 By default, the server logs accesses to stdout and errors to
6476 By default, the server logs accesses to stdout and errors to
6475 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6477 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6476 files.
6478 files.
6477
6479
6478 To have the server choose a free port number to listen on, specify
6480 To have the server choose a free port number to listen on, specify
6479 a port number of 0; in this case, the server will print the port
6481 a port number of 0; in this case, the server will print the port
6480 number it uses.
6482 number it uses.
6481
6483
6482 Returns 0 on success.
6484 Returns 0 on success.
6483 """
6485 """
6484
6486
6485 opts = pycompat.byteskwargs(opts)
6487 opts = pycompat.byteskwargs(opts)
6486 if opts[b"stdio"] and opts[b"cmdserver"]:
6488 if opts[b"stdio"] and opts[b"cmdserver"]:
6487 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6489 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6488 if opts[b"print_url"] and ui.verbose:
6490 if opts[b"print_url"] and ui.verbose:
6489 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6491 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6490
6492
6491 if opts[b"stdio"]:
6493 if opts[b"stdio"]:
6492 if repo is None:
6494 if repo is None:
6493 raise error.RepoError(
6495 raise error.RepoError(
6494 _(b"there is no Mercurial repository here (.hg not found)")
6496 _(b"there is no Mercurial repository here (.hg not found)")
6495 )
6497 )
6496 s = wireprotoserver.sshserver(ui, repo)
6498 s = wireprotoserver.sshserver(ui, repo)
6497 s.serve_forever()
6499 s.serve_forever()
6498
6500
6499 service = server.createservice(ui, repo, opts)
6501 service = server.createservice(ui, repo, opts)
6500 return server.runservice(opts, initfn=service.init, runfn=service.run)
6502 return server.runservice(opts, initfn=service.init, runfn=service.run)
6501
6503
6502
6504
6503 @command(
6505 @command(
6504 b'shelve',
6506 b'shelve',
6505 [
6507 [
6506 (
6508 (
6507 b'A',
6509 b'A',
6508 b'addremove',
6510 b'addremove',
6509 None,
6511 None,
6510 _(b'mark new/missing files as added/removed before shelving'),
6512 _(b'mark new/missing files as added/removed before shelving'),
6511 ),
6513 ),
6512 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6514 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6513 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6515 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6514 (
6516 (
6515 b'',
6517 b'',
6516 b'date',
6518 b'date',
6517 b'',
6519 b'',
6518 _(b'shelve with the specified commit date'),
6520 _(b'shelve with the specified commit date'),
6519 _(b'DATE'),
6521 _(b'DATE'),
6520 ),
6522 ),
6521 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6523 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6522 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6524 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6523 (
6525 (
6524 b'k',
6526 b'k',
6525 b'keep',
6527 b'keep',
6526 False,
6528 False,
6527 _(b'shelve, but keep changes in the working directory'),
6529 _(b'shelve, but keep changes in the working directory'),
6528 ),
6530 ),
6529 (b'l', b'list', None, _(b'list current shelves')),
6531 (b'l', b'list', None, _(b'list current shelves')),
6530 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6532 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6531 (
6533 (
6532 b'n',
6534 b'n',
6533 b'name',
6535 b'name',
6534 b'',
6536 b'',
6535 _(b'use the given name for the shelved commit'),
6537 _(b'use the given name for the shelved commit'),
6536 _(b'NAME'),
6538 _(b'NAME'),
6537 ),
6539 ),
6538 (
6540 (
6539 b'p',
6541 b'p',
6540 b'patch',
6542 b'patch',
6541 None,
6543 None,
6542 _(
6544 _(
6543 b'output patches for changes (provide the names of the shelved '
6545 b'output patches for changes (provide the names of the shelved '
6544 b'changes as positional arguments)'
6546 b'changes as positional arguments)'
6545 ),
6547 ),
6546 ),
6548 ),
6547 (b'i', b'interactive', None, _(b'interactive mode')),
6549 (b'i', b'interactive', None, _(b'interactive mode')),
6548 (
6550 (
6549 b'',
6551 b'',
6550 b'stat',
6552 b'stat',
6551 None,
6553 None,
6552 _(
6554 _(
6553 b'output diffstat-style summary of changes (provide the names of '
6555 b'output diffstat-style summary of changes (provide the names of '
6554 b'the shelved changes as positional arguments)'
6556 b'the shelved changes as positional arguments)'
6555 ),
6557 ),
6556 ),
6558 ),
6557 ]
6559 ]
6558 + cmdutil.walkopts,
6560 + cmdutil.walkopts,
6559 _(b'hg shelve [OPTION]... [FILE]...'),
6561 _(b'hg shelve [OPTION]... [FILE]...'),
6560 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6562 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6561 )
6563 )
6562 def shelve(ui, repo, *pats, **opts):
6564 def shelve(ui, repo, *pats, **opts):
6563 '''save and set aside changes from the working directory
6565 '''save and set aside changes from the working directory
6564
6566
6565 Shelving takes files that "hg status" reports as not clean, saves
6567 Shelving takes files that "hg status" reports as not clean, saves
6566 the modifications to a bundle (a shelved change), and reverts the
6568 the modifications to a bundle (a shelved change), and reverts the
6567 files so that their state in the working directory becomes clean.
6569 files so that their state in the working directory becomes clean.
6568
6570
6569 To restore these changes to the working directory, using "hg
6571 To restore these changes to the working directory, using "hg
6570 unshelve"; this will work even if you switch to a different
6572 unshelve"; this will work even if you switch to a different
6571 commit.
6573 commit.
6572
6574
6573 When no files are specified, "hg shelve" saves all not-clean
6575 When no files are specified, "hg shelve" saves all not-clean
6574 files. If specific files or directories are named, only changes to
6576 files. If specific files or directories are named, only changes to
6575 those files are shelved.
6577 those files are shelved.
6576
6578
6577 In bare shelve (when no files are specified, without interactive,
6579 In bare shelve (when no files are specified, without interactive,
6578 include and exclude option), shelving remembers information if the
6580 include and exclude option), shelving remembers information if the
6579 working directory was on newly created branch, in other words working
6581 working directory was on newly created branch, in other words working
6580 directory was on different branch than its first parent. In this
6582 directory was on different branch than its first parent. In this
6581 situation unshelving restores branch information to the working directory.
6583 situation unshelving restores branch information to the working directory.
6582
6584
6583 Each shelved change has a name that makes it easier to find later.
6585 Each shelved change has a name that makes it easier to find later.
6584 The name of a shelved change defaults to being based on the active
6586 The name of a shelved change defaults to being based on the active
6585 bookmark, or if there is no active bookmark, the current named
6587 bookmark, or if there is no active bookmark, the current named
6586 branch. To specify a different name, use ``--name``.
6588 branch. To specify a different name, use ``--name``.
6587
6589
6588 To see a list of existing shelved changes, use the ``--list``
6590 To see a list of existing shelved changes, use the ``--list``
6589 option. For each shelved change, this will print its name, age,
6591 option. For each shelved change, this will print its name, age,
6590 and description; use ``--patch`` or ``--stat`` for more details.
6592 and description; use ``--patch`` or ``--stat`` for more details.
6591
6593
6592 To delete specific shelved changes, use ``--delete``. To delete
6594 To delete specific shelved changes, use ``--delete``. To delete
6593 all shelved changes, use ``--cleanup``.
6595 all shelved changes, use ``--cleanup``.
6594 '''
6596 '''
6595 opts = pycompat.byteskwargs(opts)
6597 opts = pycompat.byteskwargs(opts)
6596 allowables = [
6598 allowables = [
6597 (b'addremove', {b'create'}), # 'create' is pseudo action
6599 (b'addremove', {b'create'}), # 'create' is pseudo action
6598 (b'unknown', {b'create'}),
6600 (b'unknown', {b'create'}),
6599 (b'cleanup', {b'cleanup'}),
6601 (b'cleanup', {b'cleanup'}),
6600 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6602 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6601 (b'delete', {b'delete'}),
6603 (b'delete', {b'delete'}),
6602 (b'edit', {b'create'}),
6604 (b'edit', {b'create'}),
6603 (b'keep', {b'create'}),
6605 (b'keep', {b'create'}),
6604 (b'list', {b'list'}),
6606 (b'list', {b'list'}),
6605 (b'message', {b'create'}),
6607 (b'message', {b'create'}),
6606 (b'name', {b'create'}),
6608 (b'name', {b'create'}),
6607 (b'patch', {b'patch', b'list'}),
6609 (b'patch', {b'patch', b'list'}),
6608 (b'stat', {b'stat', b'list'}),
6610 (b'stat', {b'stat', b'list'}),
6609 ]
6611 ]
6610
6612
6611 def checkopt(opt):
6613 def checkopt(opt):
6612 if opts.get(opt):
6614 if opts.get(opt):
6613 for i, allowable in allowables:
6615 for i, allowable in allowables:
6614 if opts[i] and opt not in allowable:
6616 if opts[i] and opt not in allowable:
6615 raise error.Abort(
6617 raise error.Abort(
6616 _(
6618 _(
6617 b"options '--%s' and '--%s' may not be "
6619 b"options '--%s' and '--%s' may not be "
6618 b"used together"
6620 b"used together"
6619 )
6621 )
6620 % (opt, i)
6622 % (opt, i)
6621 )
6623 )
6622 return True
6624 return True
6623
6625
6624 if checkopt(b'cleanup'):
6626 if checkopt(b'cleanup'):
6625 if pats:
6627 if pats:
6626 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6628 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6627 return shelvemod.cleanupcmd(ui, repo)
6629 return shelvemod.cleanupcmd(ui, repo)
6628 elif checkopt(b'delete'):
6630 elif checkopt(b'delete'):
6629 return shelvemod.deletecmd(ui, repo, pats)
6631 return shelvemod.deletecmd(ui, repo, pats)
6630 elif checkopt(b'list'):
6632 elif checkopt(b'list'):
6631 return shelvemod.listcmd(ui, repo, pats, opts)
6633 return shelvemod.listcmd(ui, repo, pats, opts)
6632 elif checkopt(b'patch') or checkopt(b'stat'):
6634 elif checkopt(b'patch') or checkopt(b'stat'):
6633 return shelvemod.patchcmds(ui, repo, pats, opts)
6635 return shelvemod.patchcmds(ui, repo, pats, opts)
6634 else:
6636 else:
6635 return shelvemod.createcmd(ui, repo, pats, opts)
6637 return shelvemod.createcmd(ui, repo, pats, opts)
6636
6638
6637
6639
6638 _NOTTERSE = b'nothing'
6640 _NOTTERSE = b'nothing'
6639
6641
6640
6642
6641 @command(
6643 @command(
6642 b'status|st',
6644 b'status|st',
6643 [
6645 [
6644 (b'A', b'all', None, _(b'show status of all files')),
6646 (b'A', b'all', None, _(b'show status of all files')),
6645 (b'm', b'modified', None, _(b'show only modified files')),
6647 (b'm', b'modified', None, _(b'show only modified files')),
6646 (b'a', b'added', None, _(b'show only added files')),
6648 (b'a', b'added', None, _(b'show only added files')),
6647 (b'r', b'removed', None, _(b'show only removed files')),
6649 (b'r', b'removed', None, _(b'show only removed files')),
6648 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6650 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6649 (b'c', b'clean', None, _(b'show only files without changes')),
6651 (b'c', b'clean', None, _(b'show only files without changes')),
6650 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6652 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6651 (b'i', b'ignored', None, _(b'show only ignored files')),
6653 (b'i', b'ignored', None, _(b'show only ignored files')),
6652 (b'n', b'no-status', None, _(b'hide status prefix')),
6654 (b'n', b'no-status', None, _(b'hide status prefix')),
6653 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6655 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6654 (b'C', b'copies', None, _(b'show source of copied files')),
6656 (b'C', b'copies', None, _(b'show source of copied files')),
6655 (
6657 (
6656 b'0',
6658 b'0',
6657 b'print0',
6659 b'print0',
6658 None,
6660 None,
6659 _(b'end filenames with NUL, for use with xargs'),
6661 _(b'end filenames with NUL, for use with xargs'),
6660 ),
6662 ),
6661 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6663 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6662 (
6664 (
6663 b'',
6665 b'',
6664 b'change',
6666 b'change',
6665 b'',
6667 b'',
6666 _(b'list the changed files of a revision'),
6668 _(b'list the changed files of a revision'),
6667 _(b'REV'),
6669 _(b'REV'),
6668 ),
6670 ),
6669 ]
6671 ]
6670 + walkopts
6672 + walkopts
6671 + subrepoopts
6673 + subrepoopts
6672 + formatteropts,
6674 + formatteropts,
6673 _(b'[OPTION]... [FILE]...'),
6675 _(b'[OPTION]... [FILE]...'),
6674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6676 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6675 helpbasic=True,
6677 helpbasic=True,
6676 inferrepo=True,
6678 inferrepo=True,
6677 intents={INTENT_READONLY},
6679 intents={INTENT_READONLY},
6678 )
6680 )
6679 def status(ui, repo, *pats, **opts):
6681 def status(ui, repo, *pats, **opts):
6680 """show changed files in the working directory
6682 """show changed files in the working directory
6681
6683
6682 Show status of files in the repository. If names are given, only
6684 Show status of files in the repository. If names are given, only
6683 files that match are shown. Files that are clean or ignored or
6685 files that match are shown. Files that are clean or ignored or
6684 the source of a copy/move operation, are not listed unless
6686 the source of a copy/move operation, are not listed unless
6685 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6687 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6686 Unless options described with "show only ..." are given, the
6688 Unless options described with "show only ..." are given, the
6687 options -mardu are used.
6689 options -mardu are used.
6688
6690
6689 Option -q/--quiet hides untracked (unknown and ignored) files
6691 Option -q/--quiet hides untracked (unknown and ignored) files
6690 unless explicitly requested with -u/--unknown or -i/--ignored.
6692 unless explicitly requested with -u/--unknown or -i/--ignored.
6691
6693
6692 .. note::
6694 .. note::
6693
6695
6694 :hg:`status` may appear to disagree with diff if permissions have
6696 :hg:`status` may appear to disagree with diff if permissions have
6695 changed or a merge has occurred. The standard diff format does
6697 changed or a merge has occurred. The standard diff format does
6696 not report permission changes and diff only reports changes
6698 not report permission changes and diff only reports changes
6697 relative to one merge parent.
6699 relative to one merge parent.
6698
6700
6699 If one revision is given, it is used as the base revision.
6701 If one revision is given, it is used as the base revision.
6700 If two revisions are given, the differences between them are
6702 If two revisions are given, the differences between them are
6701 shown. The --change option can also be used as a shortcut to list
6703 shown. The --change option can also be used as a shortcut to list
6702 the changed files of a revision from its first parent.
6704 the changed files of a revision from its first parent.
6703
6705
6704 The codes used to show the status of files are::
6706 The codes used to show the status of files are::
6705
6707
6706 M = modified
6708 M = modified
6707 A = added
6709 A = added
6708 R = removed
6710 R = removed
6709 C = clean
6711 C = clean
6710 ! = missing (deleted by non-hg command, but still tracked)
6712 ! = missing (deleted by non-hg command, but still tracked)
6711 ? = not tracked
6713 ? = not tracked
6712 I = ignored
6714 I = ignored
6713 = origin of the previous file (with --copies)
6715 = origin of the previous file (with --copies)
6714
6716
6715 .. container:: verbose
6717 .. container:: verbose
6716
6718
6717 The -t/--terse option abbreviates the output by showing only the directory
6719 The -t/--terse option abbreviates the output by showing only the directory
6718 name if all the files in it share the same status. The option takes an
6720 name if all the files in it share the same status. The option takes an
6719 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6721 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6720 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6722 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6721 for 'ignored' and 'c' for clean.
6723 for 'ignored' and 'c' for clean.
6722
6724
6723 It abbreviates only those statuses which are passed. Note that clean and
6725 It abbreviates only those statuses which are passed. Note that clean and
6724 ignored files are not displayed with '--terse ic' unless the -c/--clean
6726 ignored files are not displayed with '--terse ic' unless the -c/--clean
6725 and -i/--ignored options are also used.
6727 and -i/--ignored options are also used.
6726
6728
6727 The -v/--verbose option shows information when the repository is in an
6729 The -v/--verbose option shows information when the repository is in an
6728 unfinished merge, shelve, rebase state etc. You can have this behavior
6730 unfinished merge, shelve, rebase state etc. You can have this behavior
6729 turned on by default by enabling the ``commands.status.verbose`` option.
6731 turned on by default by enabling the ``commands.status.verbose`` option.
6730
6732
6731 You can skip displaying some of these states by setting
6733 You can skip displaying some of these states by setting
6732 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6734 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6733 'histedit', 'merge', 'rebase', or 'unshelve'.
6735 'histedit', 'merge', 'rebase', or 'unshelve'.
6734
6736
6735 Template:
6737 Template:
6736
6738
6737 The following keywords are supported in addition to the common template
6739 The following keywords are supported in addition to the common template
6738 keywords and functions. See also :hg:`help templates`.
6740 keywords and functions. See also :hg:`help templates`.
6739
6741
6740 :path: String. Repository-absolute path of the file.
6742 :path: String. Repository-absolute path of the file.
6741 :source: String. Repository-absolute path of the file originated from.
6743 :source: String. Repository-absolute path of the file originated from.
6742 Available if ``--copies`` is specified.
6744 Available if ``--copies`` is specified.
6743 :status: String. Character denoting file's status.
6745 :status: String. Character denoting file's status.
6744
6746
6745 Examples:
6747 Examples:
6746
6748
6747 - show changes in the working directory relative to a
6749 - show changes in the working directory relative to a
6748 changeset::
6750 changeset::
6749
6751
6750 hg status --rev 9353
6752 hg status --rev 9353
6751
6753
6752 - show changes in the working directory relative to the
6754 - show changes in the working directory relative to the
6753 current directory (see :hg:`help patterns` for more information)::
6755 current directory (see :hg:`help patterns` for more information)::
6754
6756
6755 hg status re:
6757 hg status re:
6756
6758
6757 - show all changes including copies in an existing changeset::
6759 - show all changes including copies in an existing changeset::
6758
6760
6759 hg status --copies --change 9353
6761 hg status --copies --change 9353
6760
6762
6761 - get a NUL separated list of added files, suitable for xargs::
6763 - get a NUL separated list of added files, suitable for xargs::
6762
6764
6763 hg status -an0
6765 hg status -an0
6764
6766
6765 - show more information about the repository status, abbreviating
6767 - show more information about the repository status, abbreviating
6766 added, removed, modified, deleted, and untracked paths::
6768 added, removed, modified, deleted, and untracked paths::
6767
6769
6768 hg status -v -t mardu
6770 hg status -v -t mardu
6769
6771
6770 Returns 0 on success.
6772 Returns 0 on success.
6771
6773
6772 """
6774 """
6773
6775
6774 opts = pycompat.byteskwargs(opts)
6776 opts = pycompat.byteskwargs(opts)
6775 revs = opts.get(b'rev')
6777 revs = opts.get(b'rev')
6776 change = opts.get(b'change')
6778 change = opts.get(b'change')
6777 terse = opts.get(b'terse')
6779 terse = opts.get(b'terse')
6778 if terse is _NOTTERSE:
6780 if terse is _NOTTERSE:
6779 if revs:
6781 if revs:
6780 terse = b''
6782 terse = b''
6781 else:
6783 else:
6782 terse = ui.config(b'commands', b'status.terse')
6784 terse = ui.config(b'commands', b'status.terse')
6783
6785
6784 if revs and change:
6786 if revs and change:
6785 msg = _(b'cannot specify --rev and --change at the same time')
6787 msg = _(b'cannot specify --rev and --change at the same time')
6786 raise error.Abort(msg)
6788 raise error.Abort(msg)
6787 elif revs and terse:
6789 elif revs and terse:
6788 msg = _(b'cannot use --terse with --rev')
6790 msg = _(b'cannot use --terse with --rev')
6789 raise error.Abort(msg)
6791 raise error.Abort(msg)
6790 elif change:
6792 elif change:
6791 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6793 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6792 ctx2 = scmutil.revsingle(repo, change, None)
6794 ctx2 = scmutil.revsingle(repo, change, None)
6793 ctx1 = ctx2.p1()
6795 ctx1 = ctx2.p1()
6794 else:
6796 else:
6795 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6797 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6796 ctx1, ctx2 = scmutil.revpair(repo, revs)
6798 ctx1, ctx2 = scmutil.revpair(repo, revs)
6797
6799
6798 forcerelativevalue = None
6800 forcerelativevalue = None
6799 if ui.hasconfig(b'commands', b'status.relative'):
6801 if ui.hasconfig(b'commands', b'status.relative'):
6800 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6802 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6801 uipathfn = scmutil.getuipathfn(
6803 uipathfn = scmutil.getuipathfn(
6802 repo,
6804 repo,
6803 legacyrelativevalue=bool(pats),
6805 legacyrelativevalue=bool(pats),
6804 forcerelativevalue=forcerelativevalue,
6806 forcerelativevalue=forcerelativevalue,
6805 )
6807 )
6806
6808
6807 if opts.get(b'print0'):
6809 if opts.get(b'print0'):
6808 end = b'\0'
6810 end = b'\0'
6809 else:
6811 else:
6810 end = b'\n'
6812 end = b'\n'
6811 states = b'modified added removed deleted unknown ignored clean'.split()
6813 states = b'modified added removed deleted unknown ignored clean'.split()
6812 show = [k for k in states if opts.get(k)]
6814 show = [k for k in states if opts.get(k)]
6813 if opts.get(b'all'):
6815 if opts.get(b'all'):
6814 show += ui.quiet and (states[:4] + [b'clean']) or states
6816 show += ui.quiet and (states[:4] + [b'clean']) or states
6815
6817
6816 if not show:
6818 if not show:
6817 if ui.quiet:
6819 if ui.quiet:
6818 show = states[:4]
6820 show = states[:4]
6819 else:
6821 else:
6820 show = states[:5]
6822 show = states[:5]
6821
6823
6822 m = scmutil.match(ctx2, pats, opts)
6824 m = scmutil.match(ctx2, pats, opts)
6823 if terse:
6825 if terse:
6824 # we need to compute clean and unknown to terse
6826 # we need to compute clean and unknown to terse
6825 stat = repo.status(
6827 stat = repo.status(
6826 ctx1.node(),
6828 ctx1.node(),
6827 ctx2.node(),
6829 ctx2.node(),
6828 m,
6830 m,
6829 b'ignored' in show or b'i' in terse,
6831 b'ignored' in show or b'i' in terse,
6830 clean=True,
6832 clean=True,
6831 unknown=True,
6833 unknown=True,
6832 listsubrepos=opts.get(b'subrepos'),
6834 listsubrepos=opts.get(b'subrepos'),
6833 )
6835 )
6834
6836
6835 stat = cmdutil.tersedir(stat, terse)
6837 stat = cmdutil.tersedir(stat, terse)
6836 else:
6838 else:
6837 stat = repo.status(
6839 stat = repo.status(
6838 ctx1.node(),
6840 ctx1.node(),
6839 ctx2.node(),
6841 ctx2.node(),
6840 m,
6842 m,
6841 b'ignored' in show,
6843 b'ignored' in show,
6842 b'clean' in show,
6844 b'clean' in show,
6843 b'unknown' in show,
6845 b'unknown' in show,
6844 opts.get(b'subrepos'),
6846 opts.get(b'subrepos'),
6845 )
6847 )
6846
6848
6847 changestates = zip(
6849 changestates = zip(
6848 states,
6850 states,
6849 pycompat.iterbytestr(b'MAR!?IC'),
6851 pycompat.iterbytestr(b'MAR!?IC'),
6850 [getattr(stat, s.decode('utf8')) for s in states],
6852 [getattr(stat, s.decode('utf8')) for s in states],
6851 )
6853 )
6852
6854
6853 copy = {}
6855 copy = {}
6854 if (
6856 if (
6855 opts.get(b'all')
6857 opts.get(b'all')
6856 or opts.get(b'copies')
6858 or opts.get(b'copies')
6857 or ui.configbool(b'ui', b'statuscopies')
6859 or ui.configbool(b'ui', b'statuscopies')
6858 ) and not opts.get(b'no_status'):
6860 ) and not opts.get(b'no_status'):
6859 copy = copies.pathcopies(ctx1, ctx2, m)
6861 copy = copies.pathcopies(ctx1, ctx2, m)
6860
6862
6861 morestatus = None
6863 morestatus = None
6862 if (
6864 if (
6863 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6865 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6864 ) and not ui.plain():
6866 ) and not ui.plain():
6865 morestatus = cmdutil.readmorestatus(repo)
6867 morestatus = cmdutil.readmorestatus(repo)
6866
6868
6867 ui.pager(b'status')
6869 ui.pager(b'status')
6868 fm = ui.formatter(b'status', opts)
6870 fm = ui.formatter(b'status', opts)
6869 fmt = b'%s' + end
6871 fmt = b'%s' + end
6870 showchar = not opts.get(b'no_status')
6872 showchar = not opts.get(b'no_status')
6871
6873
6872 for state, char, files in changestates:
6874 for state, char, files in changestates:
6873 if state in show:
6875 if state in show:
6874 label = b'status.' + state
6876 label = b'status.' + state
6875 for f in files:
6877 for f in files:
6876 fm.startitem()
6878 fm.startitem()
6877 fm.context(ctx=ctx2)
6879 fm.context(ctx=ctx2)
6878 fm.data(itemtype=b'file', path=f)
6880 fm.data(itemtype=b'file', path=f)
6879 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6881 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6880 fm.plain(fmt % uipathfn(f), label=label)
6882 fm.plain(fmt % uipathfn(f), label=label)
6881 if f in copy:
6883 if f in copy:
6882 fm.data(source=copy[f])
6884 fm.data(source=copy[f])
6883 fm.plain(
6885 fm.plain(
6884 (b' %s' + end) % uipathfn(copy[f]),
6886 (b' %s' + end) % uipathfn(copy[f]),
6885 label=b'status.copied',
6887 label=b'status.copied',
6886 )
6888 )
6887 if morestatus:
6889 if morestatus:
6888 morestatus.formatfile(f, fm)
6890 morestatus.formatfile(f, fm)
6889
6891
6890 if morestatus:
6892 if morestatus:
6891 morestatus.formatfooter(fm)
6893 morestatus.formatfooter(fm)
6892 fm.end()
6894 fm.end()
6893
6895
6894
6896
6895 @command(
6897 @command(
6896 b'summary|sum',
6898 b'summary|sum',
6897 [(b'', b'remote', None, _(b'check for push and pull'))],
6899 [(b'', b'remote', None, _(b'check for push and pull'))],
6898 b'[--remote]',
6900 b'[--remote]',
6899 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6901 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6900 helpbasic=True,
6902 helpbasic=True,
6901 intents={INTENT_READONLY},
6903 intents={INTENT_READONLY},
6902 )
6904 )
6903 def summary(ui, repo, **opts):
6905 def summary(ui, repo, **opts):
6904 """summarize working directory state
6906 """summarize working directory state
6905
6907
6906 This generates a brief summary of the working directory state,
6908 This generates a brief summary of the working directory state,
6907 including parents, branch, commit status, phase and available updates.
6909 including parents, branch, commit status, phase and available updates.
6908
6910
6909 With the --remote option, this will check the default paths for
6911 With the --remote option, this will check the default paths for
6910 incoming and outgoing changes. This can be time-consuming.
6912 incoming and outgoing changes. This can be time-consuming.
6911
6913
6912 Returns 0 on success.
6914 Returns 0 on success.
6913 """
6915 """
6914
6916
6915 opts = pycompat.byteskwargs(opts)
6917 opts = pycompat.byteskwargs(opts)
6916 ui.pager(b'summary')
6918 ui.pager(b'summary')
6917 ctx = repo[None]
6919 ctx = repo[None]
6918 parents = ctx.parents()
6920 parents = ctx.parents()
6919 pnode = parents[0].node()
6921 pnode = parents[0].node()
6920 marks = []
6922 marks = []
6921
6923
6922 try:
6924 try:
6923 ms = mergemod.mergestate.read(repo)
6925 ms = mergemod.mergestate.read(repo)
6924 except error.UnsupportedMergeRecords as e:
6926 except error.UnsupportedMergeRecords as e:
6925 s = b' '.join(e.recordtypes)
6927 s = b' '.join(e.recordtypes)
6926 ui.warn(
6928 ui.warn(
6927 _(b'warning: merge state has unsupported record types: %s\n') % s
6929 _(b'warning: merge state has unsupported record types: %s\n') % s
6928 )
6930 )
6929 unresolved = []
6931 unresolved = []
6930 else:
6932 else:
6931 unresolved = list(ms.unresolved())
6933 unresolved = list(ms.unresolved())
6932
6934
6933 for p in parents:
6935 for p in parents:
6934 # label with log.changeset (instead of log.parent) since this
6936 # label with log.changeset (instead of log.parent) since this
6935 # shows a working directory parent *changeset*:
6937 # shows a working directory parent *changeset*:
6936 # i18n: column positioning for "hg summary"
6938 # i18n: column positioning for "hg summary"
6937 ui.write(
6939 ui.write(
6938 _(b'parent: %d:%s ') % (p.rev(), p),
6940 _(b'parent: %d:%s ') % (p.rev(), p),
6939 label=logcmdutil.changesetlabels(p),
6941 label=logcmdutil.changesetlabels(p),
6940 )
6942 )
6941 ui.write(b' '.join(p.tags()), label=b'log.tag')
6943 ui.write(b' '.join(p.tags()), label=b'log.tag')
6942 if p.bookmarks():
6944 if p.bookmarks():
6943 marks.extend(p.bookmarks())
6945 marks.extend(p.bookmarks())
6944 if p.rev() == -1:
6946 if p.rev() == -1:
6945 if not len(repo):
6947 if not len(repo):
6946 ui.write(_(b' (empty repository)'))
6948 ui.write(_(b' (empty repository)'))
6947 else:
6949 else:
6948 ui.write(_(b' (no revision checked out)'))
6950 ui.write(_(b' (no revision checked out)'))
6949 if p.obsolete():
6951 if p.obsolete():
6950 ui.write(_(b' (obsolete)'))
6952 ui.write(_(b' (obsolete)'))
6951 if p.isunstable():
6953 if p.isunstable():
6952 instabilities = (
6954 instabilities = (
6953 ui.label(instability, b'trouble.%s' % instability)
6955 ui.label(instability, b'trouble.%s' % instability)
6954 for instability in p.instabilities()
6956 for instability in p.instabilities()
6955 )
6957 )
6956 ui.write(b' (' + b', '.join(instabilities) + b')')
6958 ui.write(b' (' + b', '.join(instabilities) + b')')
6957 ui.write(b'\n')
6959 ui.write(b'\n')
6958 if p.description():
6960 if p.description():
6959 ui.status(
6961 ui.status(
6960 b' ' + p.description().splitlines()[0].strip() + b'\n',
6962 b' ' + p.description().splitlines()[0].strip() + b'\n',
6961 label=b'log.summary',
6963 label=b'log.summary',
6962 )
6964 )
6963
6965
6964 branch = ctx.branch()
6966 branch = ctx.branch()
6965 bheads = repo.branchheads(branch)
6967 bheads = repo.branchheads(branch)
6966 # i18n: column positioning for "hg summary"
6968 # i18n: column positioning for "hg summary"
6967 m = _(b'branch: %s\n') % branch
6969 m = _(b'branch: %s\n') % branch
6968 if branch != b'default':
6970 if branch != b'default':
6969 ui.write(m, label=b'log.branch')
6971 ui.write(m, label=b'log.branch')
6970 else:
6972 else:
6971 ui.status(m, label=b'log.branch')
6973 ui.status(m, label=b'log.branch')
6972
6974
6973 if marks:
6975 if marks:
6974 active = repo._activebookmark
6976 active = repo._activebookmark
6975 # i18n: column positioning for "hg summary"
6977 # i18n: column positioning for "hg summary"
6976 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6978 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6977 if active is not None:
6979 if active is not None:
6978 if active in marks:
6980 if active in marks:
6979 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6981 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6980 marks.remove(active)
6982 marks.remove(active)
6981 else:
6983 else:
6982 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6984 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6983 for m in marks:
6985 for m in marks:
6984 ui.write(b' ' + m, label=b'log.bookmark')
6986 ui.write(b' ' + m, label=b'log.bookmark')
6985 ui.write(b'\n', label=b'log.bookmark')
6987 ui.write(b'\n', label=b'log.bookmark')
6986
6988
6987 status = repo.status(unknown=True)
6989 status = repo.status(unknown=True)
6988
6990
6989 c = repo.dirstate.copies()
6991 c = repo.dirstate.copies()
6990 copied, renamed = [], []
6992 copied, renamed = [], []
6991 for d, s in pycompat.iteritems(c):
6993 for d, s in pycompat.iteritems(c):
6992 if s in status.removed:
6994 if s in status.removed:
6993 status.removed.remove(s)
6995 status.removed.remove(s)
6994 renamed.append(d)
6996 renamed.append(d)
6995 else:
6997 else:
6996 copied.append(d)
6998 copied.append(d)
6997 if d in status.added:
6999 if d in status.added:
6998 status.added.remove(d)
7000 status.added.remove(d)
6999
7001
7000 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7002 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7001
7003
7002 labels = [
7004 labels = [
7003 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7005 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7004 (ui.label(_(b'%d added'), b'status.added'), status.added),
7006 (ui.label(_(b'%d added'), b'status.added'), status.added),
7005 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7007 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7006 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7008 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7007 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7009 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7008 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7010 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7009 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7011 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7010 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7012 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7011 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7013 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7012 ]
7014 ]
7013 t = []
7015 t = []
7014 for l, s in labels:
7016 for l, s in labels:
7015 if s:
7017 if s:
7016 t.append(l % len(s))
7018 t.append(l % len(s))
7017
7019
7018 t = b', '.join(t)
7020 t = b', '.join(t)
7019 cleanworkdir = False
7021 cleanworkdir = False
7020
7022
7021 if repo.vfs.exists(b'graftstate'):
7023 if repo.vfs.exists(b'graftstate'):
7022 t += _(b' (graft in progress)')
7024 t += _(b' (graft in progress)')
7023 if repo.vfs.exists(b'updatestate'):
7025 if repo.vfs.exists(b'updatestate'):
7024 t += _(b' (interrupted update)')
7026 t += _(b' (interrupted update)')
7025 elif len(parents) > 1:
7027 elif len(parents) > 1:
7026 t += _(b' (merge)')
7028 t += _(b' (merge)')
7027 elif branch != parents[0].branch():
7029 elif branch != parents[0].branch():
7028 t += _(b' (new branch)')
7030 t += _(b' (new branch)')
7029 elif parents[0].closesbranch() and pnode in repo.branchheads(
7031 elif parents[0].closesbranch() and pnode in repo.branchheads(
7030 branch, closed=True
7032 branch, closed=True
7031 ):
7033 ):
7032 t += _(b' (head closed)')
7034 t += _(b' (head closed)')
7033 elif not (
7035 elif not (
7034 status.modified
7036 status.modified
7035 or status.added
7037 or status.added
7036 or status.removed
7038 or status.removed
7037 or renamed
7039 or renamed
7038 or copied
7040 or copied
7039 or subs
7041 or subs
7040 ):
7042 ):
7041 t += _(b' (clean)')
7043 t += _(b' (clean)')
7042 cleanworkdir = True
7044 cleanworkdir = True
7043 elif pnode not in bheads:
7045 elif pnode not in bheads:
7044 t += _(b' (new branch head)')
7046 t += _(b' (new branch head)')
7045
7047
7046 if parents:
7048 if parents:
7047 pendingphase = max(p.phase() for p in parents)
7049 pendingphase = max(p.phase() for p in parents)
7048 else:
7050 else:
7049 pendingphase = phases.public
7051 pendingphase = phases.public
7050
7052
7051 if pendingphase > phases.newcommitphase(ui):
7053 if pendingphase > phases.newcommitphase(ui):
7052 t += b' (%s)' % phases.phasenames[pendingphase]
7054 t += b' (%s)' % phases.phasenames[pendingphase]
7053
7055
7054 if cleanworkdir:
7056 if cleanworkdir:
7055 # i18n: column positioning for "hg summary"
7057 # i18n: column positioning for "hg summary"
7056 ui.status(_(b'commit: %s\n') % t.strip())
7058 ui.status(_(b'commit: %s\n') % t.strip())
7057 else:
7059 else:
7058 # i18n: column positioning for "hg summary"
7060 # i18n: column positioning for "hg summary"
7059 ui.write(_(b'commit: %s\n') % t.strip())
7061 ui.write(_(b'commit: %s\n') % t.strip())
7060
7062
7061 # all ancestors of branch heads - all ancestors of parent = new csets
7063 # all ancestors of branch heads - all ancestors of parent = new csets
7062 new = len(
7064 new = len(
7063 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7065 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7064 )
7066 )
7065
7067
7066 if new == 0:
7068 if new == 0:
7067 # i18n: column positioning for "hg summary"
7069 # i18n: column positioning for "hg summary"
7068 ui.status(_(b'update: (current)\n'))
7070 ui.status(_(b'update: (current)\n'))
7069 elif pnode not in bheads:
7071 elif pnode not in bheads:
7070 # i18n: column positioning for "hg summary"
7072 # i18n: column positioning for "hg summary"
7071 ui.write(_(b'update: %d new changesets (update)\n') % new)
7073 ui.write(_(b'update: %d new changesets (update)\n') % new)
7072 else:
7074 else:
7073 # i18n: column positioning for "hg summary"
7075 # i18n: column positioning for "hg summary"
7074 ui.write(
7076 ui.write(
7075 _(b'update: %d new changesets, %d branch heads (merge)\n')
7077 _(b'update: %d new changesets, %d branch heads (merge)\n')
7076 % (new, len(bheads))
7078 % (new, len(bheads))
7077 )
7079 )
7078
7080
7079 t = []
7081 t = []
7080 draft = len(repo.revs(b'draft()'))
7082 draft = len(repo.revs(b'draft()'))
7081 if draft:
7083 if draft:
7082 t.append(_(b'%d draft') % draft)
7084 t.append(_(b'%d draft') % draft)
7083 secret = len(repo.revs(b'secret()'))
7085 secret = len(repo.revs(b'secret()'))
7084 if secret:
7086 if secret:
7085 t.append(_(b'%d secret') % secret)
7087 t.append(_(b'%d secret') % secret)
7086
7088
7087 if draft or secret:
7089 if draft or secret:
7088 ui.status(_(b'phases: %s\n') % b', '.join(t))
7090 ui.status(_(b'phases: %s\n') % b', '.join(t))
7089
7091
7090 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7092 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7091 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7093 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7092 numtrouble = len(repo.revs(trouble + b"()"))
7094 numtrouble = len(repo.revs(trouble + b"()"))
7093 # We write all the possibilities to ease translation
7095 # We write all the possibilities to ease translation
7094 troublemsg = {
7096 troublemsg = {
7095 b"orphan": _(b"orphan: %d changesets"),
7097 b"orphan": _(b"orphan: %d changesets"),
7096 b"contentdivergent": _(b"content-divergent: %d changesets"),
7098 b"contentdivergent": _(b"content-divergent: %d changesets"),
7097 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7099 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7098 }
7100 }
7099 if numtrouble > 0:
7101 if numtrouble > 0:
7100 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7102 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7101
7103
7102 cmdutil.summaryhooks(ui, repo)
7104 cmdutil.summaryhooks(ui, repo)
7103
7105
7104 if opts.get(b'remote'):
7106 if opts.get(b'remote'):
7105 needsincoming, needsoutgoing = True, True
7107 needsincoming, needsoutgoing = True, True
7106 else:
7108 else:
7107 needsincoming, needsoutgoing = False, False
7109 needsincoming, needsoutgoing = False, False
7108 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7110 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7109 if i:
7111 if i:
7110 needsincoming = True
7112 needsincoming = True
7111 if o:
7113 if o:
7112 needsoutgoing = True
7114 needsoutgoing = True
7113 if not needsincoming and not needsoutgoing:
7115 if not needsincoming and not needsoutgoing:
7114 return
7116 return
7115
7117
7116 def getincoming():
7118 def getincoming():
7117 source, branches = hg.parseurl(ui.expandpath(b'default'))
7119 source, branches = hg.parseurl(ui.expandpath(b'default'))
7118 sbranch = branches[0]
7120 sbranch = branches[0]
7119 try:
7121 try:
7120 other = hg.peer(repo, {}, source)
7122 other = hg.peer(repo, {}, source)
7121 except error.RepoError:
7123 except error.RepoError:
7122 if opts.get(b'remote'):
7124 if opts.get(b'remote'):
7123 raise
7125 raise
7124 return source, sbranch, None, None, None
7126 return source, sbranch, None, None, None
7125 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7127 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7126 if revs:
7128 if revs:
7127 revs = [other.lookup(rev) for rev in revs]
7129 revs = [other.lookup(rev) for rev in revs]
7128 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7130 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7129 repo.ui.pushbuffer()
7131 repo.ui.pushbuffer()
7130 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7132 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7131 repo.ui.popbuffer()
7133 repo.ui.popbuffer()
7132 return source, sbranch, other, commoninc, commoninc[1]
7134 return source, sbranch, other, commoninc, commoninc[1]
7133
7135
7134 if needsincoming:
7136 if needsincoming:
7135 source, sbranch, sother, commoninc, incoming = getincoming()
7137 source, sbranch, sother, commoninc, incoming = getincoming()
7136 else:
7138 else:
7137 source = sbranch = sother = commoninc = incoming = None
7139 source = sbranch = sother = commoninc = incoming = None
7138
7140
7139 def getoutgoing():
7141 def getoutgoing():
7140 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7142 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7141 dbranch = branches[0]
7143 dbranch = branches[0]
7142 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7144 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7143 if source != dest:
7145 if source != dest:
7144 try:
7146 try:
7145 dother = hg.peer(repo, {}, dest)
7147 dother = hg.peer(repo, {}, dest)
7146 except error.RepoError:
7148 except error.RepoError:
7147 if opts.get(b'remote'):
7149 if opts.get(b'remote'):
7148 raise
7150 raise
7149 return dest, dbranch, None, None
7151 return dest, dbranch, None, None
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7152 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7151 elif sother is None:
7153 elif sother is None:
7152 # there is no explicit destination peer, but source one is invalid
7154 # there is no explicit destination peer, but source one is invalid
7153 return dest, dbranch, None, None
7155 return dest, dbranch, None, None
7154 else:
7156 else:
7155 dother = sother
7157 dother = sother
7156 if source != dest or (sbranch is not None and sbranch != dbranch):
7158 if source != dest or (sbranch is not None and sbranch != dbranch):
7157 common = None
7159 common = None
7158 else:
7160 else:
7159 common = commoninc
7161 common = commoninc
7160 if revs:
7162 if revs:
7161 revs = [repo.lookup(rev) for rev in revs]
7163 revs = [repo.lookup(rev) for rev in revs]
7162 repo.ui.pushbuffer()
7164 repo.ui.pushbuffer()
7163 outgoing = discovery.findcommonoutgoing(
7165 outgoing = discovery.findcommonoutgoing(
7164 repo, dother, onlyheads=revs, commoninc=common
7166 repo, dother, onlyheads=revs, commoninc=common
7165 )
7167 )
7166 repo.ui.popbuffer()
7168 repo.ui.popbuffer()
7167 return dest, dbranch, dother, outgoing
7169 return dest, dbranch, dother, outgoing
7168
7170
7169 if needsoutgoing:
7171 if needsoutgoing:
7170 dest, dbranch, dother, outgoing = getoutgoing()
7172 dest, dbranch, dother, outgoing = getoutgoing()
7171 else:
7173 else:
7172 dest = dbranch = dother = outgoing = None
7174 dest = dbranch = dother = outgoing = None
7173
7175
7174 if opts.get(b'remote'):
7176 if opts.get(b'remote'):
7175 t = []
7177 t = []
7176 if incoming:
7178 if incoming:
7177 t.append(_(b'1 or more incoming'))
7179 t.append(_(b'1 or more incoming'))
7178 o = outgoing.missing
7180 o = outgoing.missing
7179 if o:
7181 if o:
7180 t.append(_(b'%d outgoing') % len(o))
7182 t.append(_(b'%d outgoing') % len(o))
7181 other = dother or sother
7183 other = dother or sother
7182 if b'bookmarks' in other.listkeys(b'namespaces'):
7184 if b'bookmarks' in other.listkeys(b'namespaces'):
7183 counts = bookmarks.summary(repo, other)
7185 counts = bookmarks.summary(repo, other)
7184 if counts[0] > 0:
7186 if counts[0] > 0:
7185 t.append(_(b'%d incoming bookmarks') % counts[0])
7187 t.append(_(b'%d incoming bookmarks') % counts[0])
7186 if counts[1] > 0:
7188 if counts[1] > 0:
7187 t.append(_(b'%d outgoing bookmarks') % counts[1])
7189 t.append(_(b'%d outgoing bookmarks') % counts[1])
7188
7190
7189 if t:
7191 if t:
7190 # i18n: column positioning for "hg summary"
7192 # i18n: column positioning for "hg summary"
7191 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7193 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7192 else:
7194 else:
7193 # i18n: column positioning for "hg summary"
7195 # i18n: column positioning for "hg summary"
7194 ui.status(_(b'remote: (synced)\n'))
7196 ui.status(_(b'remote: (synced)\n'))
7195
7197
7196 cmdutil.summaryremotehooks(
7198 cmdutil.summaryremotehooks(
7197 ui,
7199 ui,
7198 repo,
7200 repo,
7199 opts,
7201 opts,
7200 (
7202 (
7201 (source, sbranch, sother, commoninc),
7203 (source, sbranch, sother, commoninc),
7202 (dest, dbranch, dother, outgoing),
7204 (dest, dbranch, dother, outgoing),
7203 ),
7205 ),
7204 )
7206 )
7205
7207
7206
7208
7207 @command(
7209 @command(
7208 b'tag',
7210 b'tag',
7209 [
7211 [
7210 (b'f', b'force', None, _(b'force tag')),
7212 (b'f', b'force', None, _(b'force tag')),
7211 (b'l', b'local', None, _(b'make the tag local')),
7213 (b'l', b'local', None, _(b'make the tag local')),
7212 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7214 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7213 (b'', b'remove', None, _(b'remove a tag')),
7215 (b'', b'remove', None, _(b'remove a tag')),
7214 # -l/--local is already there, commitopts cannot be used
7216 # -l/--local is already there, commitopts cannot be used
7215 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7217 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7216 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7218 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7217 ]
7219 ]
7218 + commitopts2,
7220 + commitopts2,
7219 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7221 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7220 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7222 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7221 )
7223 )
7222 def tag(ui, repo, name1, *names, **opts):
7224 def tag(ui, repo, name1, *names, **opts):
7223 """add one or more tags for the current or given revision
7225 """add one or more tags for the current or given revision
7224
7226
7225 Name a particular revision using <name>.
7227 Name a particular revision using <name>.
7226
7228
7227 Tags are used to name particular revisions of the repository and are
7229 Tags are used to name particular revisions of the repository and are
7228 very useful to compare different revisions, to go back to significant
7230 very useful to compare different revisions, to go back to significant
7229 earlier versions or to mark branch points as releases, etc. Changing
7231 earlier versions or to mark branch points as releases, etc. Changing
7230 an existing tag is normally disallowed; use -f/--force to override.
7232 an existing tag is normally disallowed; use -f/--force to override.
7231
7233
7232 If no revision is given, the parent of the working directory is
7234 If no revision is given, the parent of the working directory is
7233 used.
7235 used.
7234
7236
7235 To facilitate version control, distribution, and merging of tags,
7237 To facilitate version control, distribution, and merging of tags,
7236 they are stored as a file named ".hgtags" which is managed similarly
7238 they are stored as a file named ".hgtags" which is managed similarly
7237 to other project files and can be hand-edited if necessary. This
7239 to other project files and can be hand-edited if necessary. This
7238 also means that tagging creates a new commit. The file
7240 also means that tagging creates a new commit. The file
7239 ".hg/localtags" is used for local tags (not shared among
7241 ".hg/localtags" is used for local tags (not shared among
7240 repositories).
7242 repositories).
7241
7243
7242 Tag commits are usually made at the head of a branch. If the parent
7244 Tag commits are usually made at the head of a branch. If the parent
7243 of the working directory is not a branch head, :hg:`tag` aborts; use
7245 of the working directory is not a branch head, :hg:`tag` aborts; use
7244 -f/--force to force the tag commit to be based on a non-head
7246 -f/--force to force the tag commit to be based on a non-head
7245 changeset.
7247 changeset.
7246
7248
7247 See :hg:`help dates` for a list of formats valid for -d/--date.
7249 See :hg:`help dates` for a list of formats valid for -d/--date.
7248
7250
7249 Since tag names have priority over branch names during revision
7251 Since tag names have priority over branch names during revision
7250 lookup, using an existing branch name as a tag name is discouraged.
7252 lookup, using an existing branch name as a tag name is discouraged.
7251
7253
7252 Returns 0 on success.
7254 Returns 0 on success.
7253 """
7255 """
7254 opts = pycompat.byteskwargs(opts)
7256 opts = pycompat.byteskwargs(opts)
7255 with repo.wlock(), repo.lock():
7257 with repo.wlock(), repo.lock():
7256 rev_ = b"."
7258 rev_ = b"."
7257 names = [t.strip() for t in (name1,) + names]
7259 names = [t.strip() for t in (name1,) + names]
7258 if len(names) != len(set(names)):
7260 if len(names) != len(set(names)):
7259 raise error.Abort(_(b'tag names must be unique'))
7261 raise error.Abort(_(b'tag names must be unique'))
7260 for n in names:
7262 for n in names:
7261 scmutil.checknewlabel(repo, n, b'tag')
7263 scmutil.checknewlabel(repo, n, b'tag')
7262 if not n:
7264 if not n:
7263 raise error.Abort(
7265 raise error.Abort(
7264 _(b'tag names cannot consist entirely of whitespace')
7266 _(b'tag names cannot consist entirely of whitespace')
7265 )
7267 )
7266 if opts.get(b'rev') and opts.get(b'remove'):
7268 if opts.get(b'rev') and opts.get(b'remove'):
7267 raise error.Abort(_(b"--rev and --remove are incompatible"))
7269 raise error.Abort(_(b"--rev and --remove are incompatible"))
7268 if opts.get(b'rev'):
7270 if opts.get(b'rev'):
7269 rev_ = opts[b'rev']
7271 rev_ = opts[b'rev']
7270 message = opts.get(b'message')
7272 message = opts.get(b'message')
7271 if opts.get(b'remove'):
7273 if opts.get(b'remove'):
7272 if opts.get(b'local'):
7274 if opts.get(b'local'):
7273 expectedtype = b'local'
7275 expectedtype = b'local'
7274 else:
7276 else:
7275 expectedtype = b'global'
7277 expectedtype = b'global'
7276
7278
7277 for n in names:
7279 for n in names:
7278 if repo.tagtype(n) == b'global':
7280 if repo.tagtype(n) == b'global':
7279 alltags = tagsmod.findglobaltags(ui, repo)
7281 alltags = tagsmod.findglobaltags(ui, repo)
7280 if alltags[n][0] == nullid:
7282 if alltags[n][0] == nullid:
7281 raise error.Abort(_(b"tag '%s' is already removed") % n)
7283 raise error.Abort(_(b"tag '%s' is already removed") % n)
7282 if not repo.tagtype(n):
7284 if not repo.tagtype(n):
7283 raise error.Abort(_(b"tag '%s' does not exist") % n)
7285 raise error.Abort(_(b"tag '%s' does not exist") % n)
7284 if repo.tagtype(n) != expectedtype:
7286 if repo.tagtype(n) != expectedtype:
7285 if expectedtype == b'global':
7287 if expectedtype == b'global':
7286 raise error.Abort(
7288 raise error.Abort(
7287 _(b"tag '%s' is not a global tag") % n
7289 _(b"tag '%s' is not a global tag") % n
7288 )
7290 )
7289 else:
7291 else:
7290 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7292 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7291 rev_ = b'null'
7293 rev_ = b'null'
7292 if not message:
7294 if not message:
7293 # we don't translate commit messages
7295 # we don't translate commit messages
7294 message = b'Removed tag %s' % b', '.join(names)
7296 message = b'Removed tag %s' % b', '.join(names)
7295 elif not opts.get(b'force'):
7297 elif not opts.get(b'force'):
7296 for n in names:
7298 for n in names:
7297 if n in repo.tags():
7299 if n in repo.tags():
7298 raise error.Abort(
7300 raise error.Abort(
7299 _(b"tag '%s' already exists (use -f to force)") % n
7301 _(b"tag '%s' already exists (use -f to force)") % n
7300 )
7302 )
7301 if not opts.get(b'local'):
7303 if not opts.get(b'local'):
7302 p1, p2 = repo.dirstate.parents()
7304 p1, p2 = repo.dirstate.parents()
7303 if p2 != nullid:
7305 if p2 != nullid:
7304 raise error.Abort(_(b'uncommitted merge'))
7306 raise error.Abort(_(b'uncommitted merge'))
7305 bheads = repo.branchheads()
7307 bheads = repo.branchheads()
7306 if not opts.get(b'force') and bheads and p1 not in bheads:
7308 if not opts.get(b'force') and bheads and p1 not in bheads:
7307 raise error.Abort(
7309 raise error.Abort(
7308 _(
7310 _(
7309 b'working directory is not at a branch head '
7311 b'working directory is not at a branch head '
7310 b'(use -f to force)'
7312 b'(use -f to force)'
7311 )
7313 )
7312 )
7314 )
7313 node = scmutil.revsingle(repo, rev_).node()
7315 node = scmutil.revsingle(repo, rev_).node()
7314
7316
7315 if not message:
7317 if not message:
7316 # we don't translate commit messages
7318 # we don't translate commit messages
7317 message = b'Added tag %s for changeset %s' % (
7319 message = b'Added tag %s for changeset %s' % (
7318 b', '.join(names),
7320 b', '.join(names),
7319 short(node),
7321 short(node),
7320 )
7322 )
7321
7323
7322 date = opts.get(b'date')
7324 date = opts.get(b'date')
7323 if date:
7325 if date:
7324 date = dateutil.parsedate(date)
7326 date = dateutil.parsedate(date)
7325
7327
7326 if opts.get(b'remove'):
7328 if opts.get(b'remove'):
7327 editform = b'tag.remove'
7329 editform = b'tag.remove'
7328 else:
7330 else:
7329 editform = b'tag.add'
7331 editform = b'tag.add'
7330 editor = cmdutil.getcommiteditor(
7332 editor = cmdutil.getcommiteditor(
7331 editform=editform, **pycompat.strkwargs(opts)
7333 editform=editform, **pycompat.strkwargs(opts)
7332 )
7334 )
7333
7335
7334 # don't allow tagging the null rev
7336 # don't allow tagging the null rev
7335 if (
7337 if (
7336 not opts.get(b'remove')
7338 not opts.get(b'remove')
7337 and scmutil.revsingle(repo, rev_).rev() == nullrev
7339 and scmutil.revsingle(repo, rev_).rev() == nullrev
7338 ):
7340 ):
7339 raise error.Abort(_(b"cannot tag null revision"))
7341 raise error.Abort(_(b"cannot tag null revision"))
7340
7342
7341 tagsmod.tag(
7343 tagsmod.tag(
7342 repo,
7344 repo,
7343 names,
7345 names,
7344 node,
7346 node,
7345 message,
7347 message,
7346 opts.get(b'local'),
7348 opts.get(b'local'),
7347 opts.get(b'user'),
7349 opts.get(b'user'),
7348 date,
7350 date,
7349 editor=editor,
7351 editor=editor,
7350 )
7352 )
7351
7353
7352
7354
7353 @command(
7355 @command(
7354 b'tags',
7356 b'tags',
7355 formatteropts,
7357 formatteropts,
7356 b'',
7358 b'',
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7359 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7358 intents={INTENT_READONLY},
7360 intents={INTENT_READONLY},
7359 )
7361 )
7360 def tags(ui, repo, **opts):
7362 def tags(ui, repo, **opts):
7361 """list repository tags
7363 """list repository tags
7362
7364
7363 This lists both regular and local tags. When the -v/--verbose
7365 This lists both regular and local tags. When the -v/--verbose
7364 switch is used, a third column "local" is printed for local tags.
7366 switch is used, a third column "local" is printed for local tags.
7365 When the -q/--quiet switch is used, only the tag name is printed.
7367 When the -q/--quiet switch is used, only the tag name is printed.
7366
7368
7367 .. container:: verbose
7369 .. container:: verbose
7368
7370
7369 Template:
7371 Template:
7370
7372
7371 The following keywords are supported in addition to the common template
7373 The following keywords are supported in addition to the common template
7372 keywords and functions such as ``{tag}``. See also
7374 keywords and functions such as ``{tag}``. See also
7373 :hg:`help templates`.
7375 :hg:`help templates`.
7374
7376
7375 :type: String. ``local`` for local tags.
7377 :type: String. ``local`` for local tags.
7376
7378
7377 Returns 0 on success.
7379 Returns 0 on success.
7378 """
7380 """
7379
7381
7380 opts = pycompat.byteskwargs(opts)
7382 opts = pycompat.byteskwargs(opts)
7381 ui.pager(b'tags')
7383 ui.pager(b'tags')
7382 fm = ui.formatter(b'tags', opts)
7384 fm = ui.formatter(b'tags', opts)
7383 hexfunc = fm.hexfunc
7385 hexfunc = fm.hexfunc
7384
7386
7385 for t, n in reversed(repo.tagslist()):
7387 for t, n in reversed(repo.tagslist()):
7386 hn = hexfunc(n)
7388 hn = hexfunc(n)
7387 label = b'tags.normal'
7389 label = b'tags.normal'
7388 tagtype = b''
7390 tagtype = b''
7389 if repo.tagtype(t) == b'local':
7391 if repo.tagtype(t) == b'local':
7390 label = b'tags.local'
7392 label = b'tags.local'
7391 tagtype = b'local'
7393 tagtype = b'local'
7392
7394
7393 fm.startitem()
7395 fm.startitem()
7394 fm.context(repo=repo)
7396 fm.context(repo=repo)
7395 fm.write(b'tag', b'%s', t, label=label)
7397 fm.write(b'tag', b'%s', t, label=label)
7396 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7398 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7397 fm.condwrite(
7399 fm.condwrite(
7398 not ui.quiet,
7400 not ui.quiet,
7399 b'rev node',
7401 b'rev node',
7400 fmt,
7402 fmt,
7401 repo.changelog.rev(n),
7403 repo.changelog.rev(n),
7402 hn,
7404 hn,
7403 label=label,
7405 label=label,
7404 )
7406 )
7405 fm.condwrite(
7407 fm.condwrite(
7406 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7408 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7407 )
7409 )
7408 fm.plain(b'\n')
7410 fm.plain(b'\n')
7409 fm.end()
7411 fm.end()
7410
7412
7411
7413
7412 @command(
7414 @command(
7413 b'tip',
7415 b'tip',
7414 [
7416 [
7415 (b'p', b'patch', None, _(b'show patch')),
7417 (b'p', b'patch', None, _(b'show patch')),
7416 (b'g', b'git', None, _(b'use git extended diff format')),
7418 (b'g', b'git', None, _(b'use git extended diff format')),
7417 ]
7419 ]
7418 + templateopts,
7420 + templateopts,
7419 _(b'[-p] [-g]'),
7421 _(b'[-p] [-g]'),
7420 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7422 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7421 )
7423 )
7422 def tip(ui, repo, **opts):
7424 def tip(ui, repo, **opts):
7423 """show the tip revision (DEPRECATED)
7425 """show the tip revision (DEPRECATED)
7424
7426
7425 The tip revision (usually just called the tip) is the changeset
7427 The tip revision (usually just called the tip) is the changeset
7426 most recently added to the repository (and therefore the most
7428 most recently added to the repository (and therefore the most
7427 recently changed head).
7429 recently changed head).
7428
7430
7429 If you have just made a commit, that commit will be the tip. If
7431 If you have just made a commit, that commit will be the tip. If
7430 you have just pulled changes from another repository, the tip of
7432 you have just pulled changes from another repository, the tip of
7431 that repository becomes the current tip. The "tip" tag is special
7433 that repository becomes the current tip. The "tip" tag is special
7432 and cannot be renamed or assigned to a different changeset.
7434 and cannot be renamed or assigned to a different changeset.
7433
7435
7434 This command is deprecated, please use :hg:`heads` instead.
7436 This command is deprecated, please use :hg:`heads` instead.
7435
7437
7436 Returns 0 on success.
7438 Returns 0 on success.
7437 """
7439 """
7438 opts = pycompat.byteskwargs(opts)
7440 opts = pycompat.byteskwargs(opts)
7439 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7441 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7440 displayer.show(repo[b'tip'])
7442 displayer.show(repo[b'tip'])
7441 displayer.close()
7443 displayer.close()
7442
7444
7443
7445
7444 @command(
7446 @command(
7445 b'unbundle',
7447 b'unbundle',
7446 [
7448 [
7447 (
7449 (
7448 b'u',
7450 b'u',
7449 b'update',
7451 b'update',
7450 None,
7452 None,
7451 _(b'update to new branch head if changesets were unbundled'),
7453 _(b'update to new branch head if changesets were unbundled'),
7452 )
7454 )
7453 ],
7455 ],
7454 _(b'[-u] FILE...'),
7456 _(b'[-u] FILE...'),
7455 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7457 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7456 )
7458 )
7457 def unbundle(ui, repo, fname1, *fnames, **opts):
7459 def unbundle(ui, repo, fname1, *fnames, **opts):
7458 """apply one or more bundle files
7460 """apply one or more bundle files
7459
7461
7460 Apply one or more bundle files generated by :hg:`bundle`.
7462 Apply one or more bundle files generated by :hg:`bundle`.
7461
7463
7462 Returns 0 on success, 1 if an update has unresolved files.
7464 Returns 0 on success, 1 if an update has unresolved files.
7463 """
7465 """
7464 fnames = (fname1,) + fnames
7466 fnames = (fname1,) + fnames
7465
7467
7466 with repo.lock():
7468 with repo.lock():
7467 for fname in fnames:
7469 for fname in fnames:
7468 f = hg.openpath(ui, fname)
7470 f = hg.openpath(ui, fname)
7469 gen = exchange.readbundle(ui, f, fname)
7471 gen = exchange.readbundle(ui, f, fname)
7470 if isinstance(gen, streamclone.streamcloneapplier):
7472 if isinstance(gen, streamclone.streamcloneapplier):
7471 raise error.Abort(
7473 raise error.Abort(
7472 _(
7474 _(
7473 b'packed bundles cannot be applied with '
7475 b'packed bundles cannot be applied with '
7474 b'"hg unbundle"'
7476 b'"hg unbundle"'
7475 ),
7477 ),
7476 hint=_(b'use "hg debugapplystreamclonebundle"'),
7478 hint=_(b'use "hg debugapplystreamclonebundle"'),
7477 )
7479 )
7478 url = b'bundle:' + fname
7480 url = b'bundle:' + fname
7479 try:
7481 try:
7480 txnname = b'unbundle'
7482 txnname = b'unbundle'
7481 if not isinstance(gen, bundle2.unbundle20):
7483 if not isinstance(gen, bundle2.unbundle20):
7482 txnname = b'unbundle\n%s' % util.hidepassword(url)
7484 txnname = b'unbundle\n%s' % util.hidepassword(url)
7483 with repo.transaction(txnname) as tr:
7485 with repo.transaction(txnname) as tr:
7484 op = bundle2.applybundle(
7486 op = bundle2.applybundle(
7485 repo, gen, tr, source=b'unbundle', url=url
7487 repo, gen, tr, source=b'unbundle', url=url
7486 )
7488 )
7487 except error.BundleUnknownFeatureError as exc:
7489 except error.BundleUnknownFeatureError as exc:
7488 raise error.Abort(
7490 raise error.Abort(
7489 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7491 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7490 hint=_(
7492 hint=_(
7491 b"see https://mercurial-scm.org/"
7493 b"see https://mercurial-scm.org/"
7492 b"wiki/BundleFeature for more "
7494 b"wiki/BundleFeature for more "
7493 b"information"
7495 b"information"
7494 ),
7496 ),
7495 )
7497 )
7496 modheads = bundle2.combinechangegroupresults(op)
7498 modheads = bundle2.combinechangegroupresults(op)
7497
7499
7498 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7500 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7499
7501
7500
7502
7501 @command(
7503 @command(
7502 b'unshelve',
7504 b'unshelve',
7503 [
7505 [
7504 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7506 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7505 (
7507 (
7506 b'c',
7508 b'c',
7507 b'continue',
7509 b'continue',
7508 None,
7510 None,
7509 _(b'continue an incomplete unshelve operation'),
7511 _(b'continue an incomplete unshelve operation'),
7510 ),
7512 ),
7511 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7513 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7512 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7514 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7513 (
7515 (
7514 b'n',
7516 b'n',
7515 b'name',
7517 b'name',
7516 b'',
7518 b'',
7517 _(b'restore shelved change with given name'),
7519 _(b'restore shelved change with given name'),
7518 _(b'NAME'),
7520 _(b'NAME'),
7519 ),
7521 ),
7520 (b't', b'tool', b'', _(b'specify merge tool')),
7522 (b't', b'tool', b'', _(b'specify merge tool')),
7521 (
7523 (
7522 b'',
7524 b'',
7523 b'date',
7525 b'date',
7524 b'',
7526 b'',
7525 _(b'set date for temporary commits (DEPRECATED)'),
7527 _(b'set date for temporary commits (DEPRECATED)'),
7526 _(b'DATE'),
7528 _(b'DATE'),
7527 ),
7529 ),
7528 ],
7530 ],
7529 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7531 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7530 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7532 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7531 )
7533 )
7532 def unshelve(ui, repo, *shelved, **opts):
7534 def unshelve(ui, repo, *shelved, **opts):
7533 """restore a shelved change to the working directory
7535 """restore a shelved change to the working directory
7534
7536
7535 This command accepts an optional name of a shelved change to
7537 This command accepts an optional name of a shelved change to
7536 restore. If none is given, the most recent shelved change is used.
7538 restore. If none is given, the most recent shelved change is used.
7537
7539
7538 If a shelved change is applied successfully, the bundle that
7540 If a shelved change is applied successfully, the bundle that
7539 contains the shelved changes is moved to a backup location
7541 contains the shelved changes is moved to a backup location
7540 (.hg/shelve-backup).
7542 (.hg/shelve-backup).
7541
7543
7542 Since you can restore a shelved change on top of an arbitrary
7544 Since you can restore a shelved change on top of an arbitrary
7543 commit, it is possible that unshelving will result in a conflict
7545 commit, it is possible that unshelving will result in a conflict
7544 between your changes and the commits you are unshelving onto. If
7546 between your changes and the commits you are unshelving onto. If
7545 this occurs, you must resolve the conflict, then use
7547 this occurs, you must resolve the conflict, then use
7546 ``--continue`` to complete the unshelve operation. (The bundle
7548 ``--continue`` to complete the unshelve operation. (The bundle
7547 will not be moved until you successfully complete the unshelve.)
7549 will not be moved until you successfully complete the unshelve.)
7548
7550
7549 (Alternatively, you can use ``--abort`` to abandon an unshelve
7551 (Alternatively, you can use ``--abort`` to abandon an unshelve
7550 that causes a conflict. This reverts the unshelved changes, and
7552 that causes a conflict. This reverts the unshelved changes, and
7551 leaves the bundle in place.)
7553 leaves the bundle in place.)
7552
7554
7553 If bare shelved change (without interactive, include and exclude
7555 If bare shelved change (without interactive, include and exclude
7554 option) was done on newly created branch it would restore branch
7556 option) was done on newly created branch it would restore branch
7555 information to the working directory.
7557 information to the working directory.
7556
7558
7557 After a successful unshelve, the shelved changes are stored in a
7559 After a successful unshelve, the shelved changes are stored in a
7558 backup directory. Only the N most recent backups are kept. N
7560 backup directory. Only the N most recent backups are kept. N
7559 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7561 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7560 configuration option.
7562 configuration option.
7561
7563
7562 .. container:: verbose
7564 .. container:: verbose
7563
7565
7564 Timestamp in seconds is used to decide order of backups. More
7566 Timestamp in seconds is used to decide order of backups. More
7565 than ``maxbackups`` backups are kept, if same timestamp
7567 than ``maxbackups`` backups are kept, if same timestamp
7566 prevents from deciding exact order of them, for safety.
7568 prevents from deciding exact order of them, for safety.
7567
7569
7568 Selected changes can be unshelved with ``--interactive`` flag.
7570 Selected changes can be unshelved with ``--interactive`` flag.
7569 The working directory is updated with the selected changes, and
7571 The working directory is updated with the selected changes, and
7570 only the unselected changes remain shelved.
7572 only the unselected changes remain shelved.
7571 Note: The whole shelve is applied to working directory first before
7573 Note: The whole shelve is applied to working directory first before
7572 running interactively. So, this will bring up all the conflicts between
7574 running interactively. So, this will bring up all the conflicts between
7573 working directory and the shelve, irrespective of which changes will be
7575 working directory and the shelve, irrespective of which changes will be
7574 unshelved.
7576 unshelved.
7575 """
7577 """
7576 with repo.wlock():
7578 with repo.wlock():
7577 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7579 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7578
7580
7579
7581
7580 statemod.addunfinished(
7582 statemod.addunfinished(
7581 b'unshelve',
7583 b'unshelve',
7582 fname=b'shelvedstate',
7584 fname=b'shelvedstate',
7583 continueflag=True,
7585 continueflag=True,
7584 abortfunc=shelvemod.hgabortunshelve,
7586 abortfunc=shelvemod.hgabortunshelve,
7585 continuefunc=shelvemod.hgcontinueunshelve,
7587 continuefunc=shelvemod.hgcontinueunshelve,
7586 cmdmsg=_(b'unshelve already in progress'),
7588 cmdmsg=_(b'unshelve already in progress'),
7587 )
7589 )
7588
7590
7589
7591
7590 @command(
7592 @command(
7591 b'update|up|checkout|co',
7593 b'update|up|checkout|co',
7592 [
7594 [
7593 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7595 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7594 (b'c', b'check', None, _(b'require clean working directory')),
7596 (b'c', b'check', None, _(b'require clean working directory')),
7595 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7597 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7596 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7598 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7597 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7599 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7598 ]
7600 ]
7599 + mergetoolopts,
7601 + mergetoolopts,
7600 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7602 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7601 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7603 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7602 helpbasic=True,
7604 helpbasic=True,
7603 )
7605 )
7604 def update(ui, repo, node=None, **opts):
7606 def update(ui, repo, node=None, **opts):
7605 """update working directory (or switch revisions)
7607 """update working directory (or switch revisions)
7606
7608
7607 Update the repository's working directory to the specified
7609 Update the repository's working directory to the specified
7608 changeset. If no changeset is specified, update to the tip of the
7610 changeset. If no changeset is specified, update to the tip of the
7609 current named branch and move the active bookmark (see :hg:`help
7611 current named branch and move the active bookmark (see :hg:`help
7610 bookmarks`).
7612 bookmarks`).
7611
7613
7612 Update sets the working directory's parent revision to the specified
7614 Update sets the working directory's parent revision to the specified
7613 changeset (see :hg:`help parents`).
7615 changeset (see :hg:`help parents`).
7614
7616
7615 If the changeset is not a descendant or ancestor of the working
7617 If the changeset is not a descendant or ancestor of the working
7616 directory's parent and there are uncommitted changes, the update is
7618 directory's parent and there are uncommitted changes, the update is
7617 aborted. With the -c/--check option, the working directory is checked
7619 aborted. With the -c/--check option, the working directory is checked
7618 for uncommitted changes; if none are found, the working directory is
7620 for uncommitted changes; if none are found, the working directory is
7619 updated to the specified changeset.
7621 updated to the specified changeset.
7620
7622
7621 .. container:: verbose
7623 .. container:: verbose
7622
7624
7623 The -C/--clean, -c/--check, and -m/--merge options control what
7625 The -C/--clean, -c/--check, and -m/--merge options control what
7624 happens if the working directory contains uncommitted changes.
7626 happens if the working directory contains uncommitted changes.
7625 At most of one of them can be specified.
7627 At most of one of them can be specified.
7626
7628
7627 1. If no option is specified, and if
7629 1. If no option is specified, and if
7628 the requested changeset is an ancestor or descendant of
7630 the requested changeset is an ancestor or descendant of
7629 the working directory's parent, the uncommitted changes
7631 the working directory's parent, the uncommitted changes
7630 are merged into the requested changeset and the merged
7632 are merged into the requested changeset and the merged
7631 result is left uncommitted. If the requested changeset is
7633 result is left uncommitted. If the requested changeset is
7632 not an ancestor or descendant (that is, it is on another
7634 not an ancestor or descendant (that is, it is on another
7633 branch), the update is aborted and the uncommitted changes
7635 branch), the update is aborted and the uncommitted changes
7634 are preserved.
7636 are preserved.
7635
7637
7636 2. With the -m/--merge option, the update is allowed even if the
7638 2. With the -m/--merge option, the update is allowed even if the
7637 requested changeset is not an ancestor or descendant of
7639 requested changeset is not an ancestor or descendant of
7638 the working directory's parent.
7640 the working directory's parent.
7639
7641
7640 3. With the -c/--check option, the update is aborted and the
7642 3. With the -c/--check option, the update is aborted and the
7641 uncommitted changes are preserved.
7643 uncommitted changes are preserved.
7642
7644
7643 4. With the -C/--clean option, uncommitted changes are discarded and
7645 4. With the -C/--clean option, uncommitted changes are discarded and
7644 the working directory is updated to the requested changeset.
7646 the working directory is updated to the requested changeset.
7645
7647
7646 To cancel an uncommitted merge (and lose your changes), use
7648 To cancel an uncommitted merge (and lose your changes), use
7647 :hg:`merge --abort`.
7649 :hg:`merge --abort`.
7648
7650
7649 Use null as the changeset to remove the working directory (like
7651 Use null as the changeset to remove the working directory (like
7650 :hg:`clone -U`).
7652 :hg:`clone -U`).
7651
7653
7652 If you want to revert just one file to an older revision, use
7654 If you want to revert just one file to an older revision, use
7653 :hg:`revert [-r REV] NAME`.
7655 :hg:`revert [-r REV] NAME`.
7654
7656
7655 See :hg:`help dates` for a list of formats valid for -d/--date.
7657 See :hg:`help dates` for a list of formats valid for -d/--date.
7656
7658
7657 Returns 0 on success, 1 if there are unresolved files.
7659 Returns 0 on success, 1 if there are unresolved files.
7658 """
7660 """
7659 rev = opts.get('rev')
7661 rev = opts.get('rev')
7660 date = opts.get('date')
7662 date = opts.get('date')
7661 clean = opts.get('clean')
7663 clean = opts.get('clean')
7662 check = opts.get('check')
7664 check = opts.get('check')
7663 merge = opts.get('merge')
7665 merge = opts.get('merge')
7664 if rev and node:
7666 if rev and node:
7665 raise error.Abort(_(b"please specify just one revision"))
7667 raise error.Abort(_(b"please specify just one revision"))
7666
7668
7667 if ui.configbool(b'commands', b'update.requiredest'):
7669 if ui.configbool(b'commands', b'update.requiredest'):
7668 if not node and not rev and not date:
7670 if not node and not rev and not date:
7669 raise error.Abort(
7671 raise error.Abort(
7670 _(b'you must specify a destination'),
7672 _(b'you must specify a destination'),
7671 hint=_(b'for example: hg update ".::"'),
7673 hint=_(b'for example: hg update ".::"'),
7672 )
7674 )
7673
7675
7674 if rev is None or rev == b'':
7676 if rev is None or rev == b'':
7675 rev = node
7677 rev = node
7676
7678
7677 if date and rev is not None:
7679 if date and rev is not None:
7678 raise error.Abort(_(b"you can't specify a revision and a date"))
7680 raise error.Abort(_(b"you can't specify a revision and a date"))
7679
7681
7680 if len([x for x in (clean, check, merge) if x]) > 1:
7682 if len([x for x in (clean, check, merge) if x]) > 1:
7681 raise error.Abort(
7683 raise error.Abort(
7682 _(
7684 _(
7683 b"can only specify one of -C/--clean, -c/--check, "
7685 b"can only specify one of -C/--clean, -c/--check, "
7684 b"or -m/--merge"
7686 b"or -m/--merge"
7685 )
7687 )
7686 )
7688 )
7687
7689
7688 updatecheck = None
7690 updatecheck = None
7689 if check:
7691 if check:
7690 updatecheck = b'abort'
7692 updatecheck = b'abort'
7691 elif merge:
7693 elif merge:
7692 updatecheck = b'none'
7694 updatecheck = b'none'
7693
7695
7694 with repo.wlock():
7696 with repo.wlock():
7695 cmdutil.clearunfinished(repo)
7697 cmdutil.clearunfinished(repo)
7696 if date:
7698 if date:
7697 rev = cmdutil.finddate(ui, repo, date)
7699 rev = cmdutil.finddate(ui, repo, date)
7698
7700
7699 # if we defined a bookmark, we have to remember the original name
7701 # if we defined a bookmark, we have to remember the original name
7700 brev = rev
7702 brev = rev
7701 if rev:
7703 if rev:
7702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7704 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7703 ctx = scmutil.revsingle(repo, rev, default=None)
7705 ctx = scmutil.revsingle(repo, rev, default=None)
7704 rev = ctx.rev()
7706 rev = ctx.rev()
7705 hidden = ctx.hidden()
7707 hidden = ctx.hidden()
7706 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7708 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7707 with ui.configoverride(overrides, b'update'):
7709 with ui.configoverride(overrides, b'update'):
7708 ret = hg.updatetotally(
7710 ret = hg.updatetotally(
7709 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7711 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7710 )
7712 )
7711 if hidden:
7713 if hidden:
7712 ctxstr = ctx.hex()[:12]
7714 ctxstr = ctx.hex()[:12]
7713 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7715 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7714
7716
7715 if ctx.obsolete():
7717 if ctx.obsolete():
7716 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7718 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7717 ui.warn(b"(%s)\n" % obsfatemsg)
7719 ui.warn(b"(%s)\n" % obsfatemsg)
7718 return ret
7720 return ret
7719
7721
7720
7722
7721 @command(
7723 @command(
7722 b'verify',
7724 b'verify',
7723 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7725 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7724 helpcategory=command.CATEGORY_MAINTENANCE,
7726 helpcategory=command.CATEGORY_MAINTENANCE,
7725 )
7727 )
7726 def verify(ui, repo, **opts):
7728 def verify(ui, repo, **opts):
7727 """verify the integrity of the repository
7729 """verify the integrity of the repository
7728
7730
7729 Verify the integrity of the current repository.
7731 Verify the integrity of the current repository.
7730
7732
7731 This will perform an extensive check of the repository's
7733 This will perform an extensive check of the repository's
7732 integrity, validating the hashes and checksums of each entry in
7734 integrity, validating the hashes and checksums of each entry in
7733 the changelog, manifest, and tracked files, as well as the
7735 the changelog, manifest, and tracked files, as well as the
7734 integrity of their crosslinks and indices.
7736 integrity of their crosslinks and indices.
7735
7737
7736 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7738 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7737 for more information about recovery from corruption of the
7739 for more information about recovery from corruption of the
7738 repository.
7740 repository.
7739
7741
7740 Returns 0 on success, 1 if errors are encountered.
7742 Returns 0 on success, 1 if errors are encountered.
7741 """
7743 """
7742 opts = pycompat.byteskwargs(opts)
7744 opts = pycompat.byteskwargs(opts)
7743
7745
7744 level = None
7746 level = None
7745 if opts[b'full']:
7747 if opts[b'full']:
7746 level = verifymod.VERIFY_FULL
7748 level = verifymod.VERIFY_FULL
7747 return hg.verify(repo, level)
7749 return hg.verify(repo, level)
7748
7750
7749
7751
7750 @command(
7752 @command(
7751 b'version',
7753 b'version',
7752 [] + formatteropts,
7754 [] + formatteropts,
7753 helpcategory=command.CATEGORY_HELP,
7755 helpcategory=command.CATEGORY_HELP,
7754 norepo=True,
7756 norepo=True,
7755 intents={INTENT_READONLY},
7757 intents={INTENT_READONLY},
7756 )
7758 )
7757 def version_(ui, **opts):
7759 def version_(ui, **opts):
7758 """output version and copyright information
7760 """output version and copyright information
7759
7761
7760 .. container:: verbose
7762 .. container:: verbose
7761
7763
7762 Template:
7764 Template:
7763
7765
7764 The following keywords are supported. See also :hg:`help templates`.
7766 The following keywords are supported. See also :hg:`help templates`.
7765
7767
7766 :extensions: List of extensions.
7768 :extensions: List of extensions.
7767 :ver: String. Version number.
7769 :ver: String. Version number.
7768
7770
7769 And each entry of ``{extensions}`` provides the following sub-keywords
7771 And each entry of ``{extensions}`` provides the following sub-keywords
7770 in addition to ``{ver}``.
7772 in addition to ``{ver}``.
7771
7773
7772 :bundled: Boolean. True if included in the release.
7774 :bundled: Boolean. True if included in the release.
7773 :name: String. Extension name.
7775 :name: String. Extension name.
7774 """
7776 """
7775 opts = pycompat.byteskwargs(opts)
7777 opts = pycompat.byteskwargs(opts)
7776 if ui.verbose:
7778 if ui.verbose:
7777 ui.pager(b'version')
7779 ui.pager(b'version')
7778 fm = ui.formatter(b"version", opts)
7780 fm = ui.formatter(b"version", opts)
7779 fm.startitem()
7781 fm.startitem()
7780 fm.write(
7782 fm.write(
7781 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7783 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7782 )
7784 )
7783 license = _(
7785 license = _(
7784 b"(see https://mercurial-scm.org for more information)\n"
7786 b"(see https://mercurial-scm.org for more information)\n"
7785 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7787 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7786 b"This is free software; see the source for copying conditions. "
7788 b"This is free software; see the source for copying conditions. "
7787 b"There is NO\nwarranty; "
7789 b"There is NO\nwarranty; "
7788 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7790 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7789 )
7791 )
7790 if not ui.quiet:
7792 if not ui.quiet:
7791 fm.plain(license)
7793 fm.plain(license)
7792
7794
7793 if ui.verbose:
7795 if ui.verbose:
7794 fm.plain(_(b"\nEnabled extensions:\n\n"))
7796 fm.plain(_(b"\nEnabled extensions:\n\n"))
7795 # format names and versions into columns
7797 # format names and versions into columns
7796 names = []
7798 names = []
7797 vers = []
7799 vers = []
7798 isinternals = []
7800 isinternals = []
7799 for name, module in extensions.extensions():
7801 for name, module in extensions.extensions():
7800 names.append(name)
7802 names.append(name)
7801 vers.append(extensions.moduleversion(module) or None)
7803 vers.append(extensions.moduleversion(module) or None)
7802 isinternals.append(extensions.ismoduleinternal(module))
7804 isinternals.append(extensions.ismoduleinternal(module))
7803 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7805 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7804 if names:
7806 if names:
7805 namefmt = b" %%-%ds " % max(len(n) for n in names)
7807 namefmt = b" %%-%ds " % max(len(n) for n in names)
7806 places = [_(b"external"), _(b"internal")]
7808 places = [_(b"external"), _(b"internal")]
7807 for n, v, p in zip(names, vers, isinternals):
7809 for n, v, p in zip(names, vers, isinternals):
7808 fn.startitem()
7810 fn.startitem()
7809 fn.condwrite(ui.verbose, b"name", namefmt, n)
7811 fn.condwrite(ui.verbose, b"name", namefmt, n)
7810 if ui.verbose:
7812 if ui.verbose:
7811 fn.plain(b"%s " % places[p])
7813 fn.plain(b"%s " % places[p])
7812 fn.data(bundled=p)
7814 fn.data(bundled=p)
7813 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7815 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7814 if ui.verbose:
7816 if ui.verbose:
7815 fn.plain(b"\n")
7817 fn.plain(b"\n")
7816 fn.end()
7818 fn.end()
7817 fm.end()
7819 fm.end()
7818
7820
7819
7821
7820 def loadcmdtable(ui, name, cmdtable):
7822 def loadcmdtable(ui, name, cmdtable):
7821 """Load command functions from specified cmdtable
7823 """Load command functions from specified cmdtable
7822 """
7824 """
7823 overrides = [cmd for cmd in cmdtable if cmd in table]
7825 overrides = [cmd for cmd in cmdtable if cmd in table]
7824 if overrides:
7826 if overrides:
7825 ui.warn(
7827 ui.warn(
7826 _(b"extension '%s' overrides commands: %s\n")
7828 _(b"extension '%s' overrides commands: %s\n")
7827 % (name, b" ".join(overrides))
7829 % (name, b" ".join(overrides))
7828 )
7830 )
7829 table.update(cmdtable)
7831 table.update(cmdtable)
@@ -1,106 +1,120 b''
1 # rcutil.py - utilities about config paths, special config sections etc.
1 # rcutil.py - utilities about config paths, special config sections etc.
2 #
2 #
3 # Copyright Mercurial Contributors
3 # Copyright Mercurial Contributors
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 os
10 import os
11
11
12 from . import (
12 from . import (
13 encoding,
13 encoding,
14 pycompat,
14 pycompat,
15 util,
15 util,
16 )
16 )
17
17
18 from .utils import resourceutil
18 from .utils import resourceutil
19
19
20 if pycompat.iswindows:
20 if pycompat.iswindows:
21 from . import scmwindows as scmplatform
21 from . import scmwindows as scmplatform
22 else:
22 else:
23 from . import scmposix as scmplatform
23 from . import scmposix as scmplatform
24
24
25 fallbackpager = scmplatform.fallbackpager
25 fallbackpager = scmplatform.fallbackpager
26 systemrcpath = scmplatform.systemrcpath
26 systemrcpath = scmplatform.systemrcpath
27 userrcpath = scmplatform.userrcpath
27 userrcpath = scmplatform.userrcpath
28
28
29
29
30 def _expandrcpath(path):
30 def _expandrcpath(path):
31 '''path could be a file or a directory. return a list of file paths'''
31 '''path could be a file or a directory. return a list of file paths'''
32 p = util.expandpath(path)
32 p = util.expandpath(path)
33 if os.path.isdir(p):
33 if os.path.isdir(p):
34 join = os.path.join
34 join = os.path.join
35 return sorted(
35 return sorted(
36 join(p, f) for f, k in util.listdir(p) if f.endswith(b'.rc')
36 join(p, f) for f, k in util.listdir(p) if f.endswith(b'.rc')
37 )
37 )
38 return [p]
38 return [p]
39
39
40
40
41 def envrcitems(env=None):
41 def envrcitems(env=None):
42 '''Return [(section, name, value, source)] config items.
42 '''Return [(section, name, value, source)] config items.
43
43
44 The config items are extracted from environment variables specified by env,
44 The config items are extracted from environment variables specified by env,
45 used to override systemrc, but not userrc.
45 used to override systemrc, but not userrc.
46
46
47 If env is not provided, encoding.environ will be used.
47 If env is not provided, encoding.environ will be used.
48 '''
48 '''
49 if env is None:
49 if env is None:
50 env = encoding.environ
50 env = encoding.environ
51 checklist = [
51 checklist = [
52 (b'EDITOR', b'ui', b'editor'),
52 (b'EDITOR', b'ui', b'editor'),
53 (b'VISUAL', b'ui', b'editor'),
53 (b'VISUAL', b'ui', b'editor'),
54 (b'PAGER', b'pager', b'pager'),
54 (b'PAGER', b'pager', b'pager'),
55 ]
55 ]
56 result = []
56 result = []
57 for envname, section, configname in checklist:
57 for envname, section, configname in checklist:
58 if envname not in env:
58 if envname not in env:
59 continue
59 continue
60 result.append((section, configname, env[envname], b'$%s' % envname))
60 result.append((section, configname, env[envname], b'$%s' % envname))
61 return result
61 return result
62
62
63
63
64 def defaultrcpath():
64 def defaultrcpath():
65 '''return rc paths in defaultrc'''
65 '''return rc paths in defaultrc'''
66 defaultpath = os.path.join(resourceutil.datapath, b'defaultrc')
66 defaultpath = os.path.join(resourceutil.datapath, b'defaultrc')
67 return _expandrcpath(defaultpath)
67 return _expandrcpath(defaultpath)
68
68
69
69
70 def default_rc_resources():
71 """return rc resource IDs in defaultrc"""
72 rsrcs = resourceutil.contents(b'mercurial.defaultrc')
73 return [
74 (b'mercurial.defaultrc', r)
75 for r in sorted(rsrcs)
76 if resourceutil.is_resource(b'mercurial.defaultrc', r)
77 and r.endswith(b'.rc')
78 ]
79
80
70 def rccomponents():
81 def rccomponents():
71 '''return an ordered [(type, obj)] about where to load configs.
82 '''return an ordered [(type, obj)] about where to load configs.
72
83
73 respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is
84 respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is
74 used. if $HGRCPATH is not set, the platform default will be used.
85 used. if $HGRCPATH is not set, the platform default will be used.
75
86
76 if a directory is provided, *.rc files under it will be used.
87 if a directory is provided, *.rc files under it will be used.
77
88
78 type could be either 'path' or 'items', if type is 'path', obj is a string,
89 type could be either 'path', 'items' or 'resource'. If type is 'path',
79 and is the config file path. if type is 'items', obj is a list of (section,
90 obj is a string, and is the config file path. if type is 'items', obj is a
80 name, value, source) that should fill the config directly.
91 list of (section, name, value, source) that should fill the config directly.
92 If type is 'resource', obj is a tuple of (package name, resource name).
81 '''
93 '''
82 envrc = (b'items', envrcitems())
94 envrc = (b'items', envrcitems())
83
95
84 if b'HGRCPATH' in encoding.environ:
96 if b'HGRCPATH' in encoding.environ:
85 # assume HGRCPATH is all about user configs so environments can be
97 # assume HGRCPATH is all about user configs so environments can be
86 # overridden.
98 # overridden.
87 _rccomponents = [envrc]
99 _rccomponents = [envrc]
88 for p in encoding.environ[b'HGRCPATH'].split(pycompat.ospathsep):
100 for p in encoding.environ[b'HGRCPATH'].split(pycompat.ospathsep):
89 if not p:
101 if not p:
90 continue
102 continue
91 _rccomponents.extend((b'path', p) for p in _expandrcpath(p))
103 _rccomponents.extend((b'path', p) for p in _expandrcpath(p))
92 else:
104 else:
105 _rccomponents = [(b'resource', r) for r in default_rc_resources()]
106
93 normpaths = lambda paths: [
107 normpaths = lambda paths: [
94 (b'path', os.path.normpath(p)) for p in paths
108 (b'path', os.path.normpath(p)) for p in paths
95 ]
109 ]
96 _rccomponents = normpaths(defaultrcpath() + systemrcpath())
110 _rccomponents.extend(normpaths(defaultrcpath() + systemrcpath()))
97 _rccomponents.append(envrc)
111 _rccomponents.append(envrc)
98 _rccomponents.extend(normpaths(userrcpath()))
112 _rccomponents.extend(normpaths(userrcpath()))
99 return _rccomponents
113 return _rccomponents
100
114
101
115
102 def defaultpagerenv():
116 def defaultpagerenv():
103 '''return a dict of default environment variables and their values,
117 '''return a dict of default environment variables and their values,
104 intended to be set before starting a pager.
118 intended to be set before starting a pager.
105 '''
119 '''
106 return {b'LESS': b'FRX', b'LV': b'-c'}
120 return {b'LESS': b'FRX', b'LV': b'-c'}
@@ -1,2332 +1,2334 b''
1 # ui.py - user interface bits for mercurial
1 # ui.py - user interface bits 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 collections
10 import collections
11 import contextlib
11 import contextlib
12 import errno
12 import errno
13 import getpass
13 import getpass
14 import inspect
14 import inspect
15 import os
15 import os
16 import re
16 import re
17 import signal
17 import signal
18 import socket
18 import socket
19 import subprocess
19 import subprocess
20 import sys
20 import sys
21 import traceback
21 import traceback
22
22
23 from .i18n import _
23 from .i18n import _
24 from .node import hex
24 from .node import hex
25 from .pycompat import (
25 from .pycompat import (
26 getattr,
26 getattr,
27 open,
27 open,
28 setattr,
28 setattr,
29 )
29 )
30
30
31 from . import (
31 from . import (
32 color,
32 color,
33 config,
33 config,
34 configitems,
34 configitems,
35 encoding,
35 encoding,
36 error,
36 error,
37 formatter,
37 formatter,
38 loggingutil,
38 loggingutil,
39 progress,
39 progress,
40 pycompat,
40 pycompat,
41 rcutil,
41 rcutil,
42 scmutil,
42 scmutil,
43 util,
43 util,
44 )
44 )
45 from .utils import (
45 from .utils import (
46 dateutil,
46 dateutil,
47 procutil,
47 procutil,
48 resourceutil,
48 resourceutil,
49 stringutil,
49 stringutil,
50 )
50 )
51
51
52 urlreq = util.urlreq
52 urlreq = util.urlreq
53
53
54 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
54 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
55 _keepalnum = b''.join(
55 _keepalnum = b''.join(
56 c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
56 c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
57 )
57 )
58
58
59 # The config knobs that will be altered (if unset) by ui.tweakdefaults.
59 # The config knobs that will be altered (if unset) by ui.tweakdefaults.
60 tweakrc = b"""
60 tweakrc = b"""
61 [ui]
61 [ui]
62 # The rollback command is dangerous. As a rule, don't use it.
62 # The rollback command is dangerous. As a rule, don't use it.
63 rollback = False
63 rollback = False
64 # Make `hg status` report copy information
64 # Make `hg status` report copy information
65 statuscopies = yes
65 statuscopies = yes
66 # Prefer curses UIs when available. Revert to plain-text with `text`.
66 # Prefer curses UIs when available. Revert to plain-text with `text`.
67 interface = curses
67 interface = curses
68 # Make compatible commands emit cwd-relative paths by default.
68 # Make compatible commands emit cwd-relative paths by default.
69 relative-paths = yes
69 relative-paths = yes
70
70
71 [commands]
71 [commands]
72 # Grep working directory by default.
72 # Grep working directory by default.
73 grep.all-files = True
73 grep.all-files = True
74 # Refuse to perform an `hg update` that would cause a file content merge
74 # Refuse to perform an `hg update` that would cause a file content merge
75 update.check = noconflict
75 update.check = noconflict
76 # Show conflicts information in `hg status`
76 # Show conflicts information in `hg status`
77 status.verbose = True
77 status.verbose = True
78 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
78 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
79 resolve.explicit-re-merge = True
79 resolve.explicit-re-merge = True
80
80
81 [diff]
81 [diff]
82 git = 1
82 git = 1
83 showfunc = 1
83 showfunc = 1
84 word-diff = 1
84 word-diff = 1
85 """
85 """
86
86
87 samplehgrcs = {
87 samplehgrcs = {
88 b'user': b"""# example user config (see 'hg help config' for more info)
88 b'user': b"""# example user config (see 'hg help config' for more info)
89 [ui]
89 [ui]
90 # name and email, e.g.
90 # name and email, e.g.
91 # username = Jane Doe <jdoe@example.com>
91 # username = Jane Doe <jdoe@example.com>
92 username =
92 username =
93
93
94 # We recommend enabling tweakdefaults to get slight improvements to
94 # We recommend enabling tweakdefaults to get slight improvements to
95 # the UI over time. Make sure to set HGPLAIN in the environment when
95 # the UI over time. Make sure to set HGPLAIN in the environment when
96 # writing scripts!
96 # writing scripts!
97 # tweakdefaults = True
97 # tweakdefaults = True
98
98
99 # uncomment to disable color in command output
99 # uncomment to disable color in command output
100 # (see 'hg help color' for details)
100 # (see 'hg help color' for details)
101 # color = never
101 # color = never
102
102
103 # uncomment to disable command output pagination
103 # uncomment to disable command output pagination
104 # (see 'hg help pager' for details)
104 # (see 'hg help pager' for details)
105 # paginate = never
105 # paginate = never
106
106
107 [extensions]
107 [extensions]
108 # uncomment the lines below to enable some popular extensions
108 # uncomment the lines below to enable some popular extensions
109 # (see 'hg help extensions' for more info)
109 # (see 'hg help extensions' for more info)
110 #
110 #
111 # histedit =
111 # histedit =
112 # rebase =
112 # rebase =
113 # uncommit =
113 # uncommit =
114 """,
114 """,
115 b'cloned': b"""# example repository config (see 'hg help config' for more info)
115 b'cloned': b"""# example repository config (see 'hg help config' for more info)
116 [paths]
116 [paths]
117 default = %s
117 default = %s
118
118
119 # path aliases to other clones of this repo in URLs or filesystem paths
119 # path aliases to other clones of this repo in URLs or filesystem paths
120 # (see 'hg help config.paths' for more info)
120 # (see 'hg help config.paths' for more info)
121 #
121 #
122 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
122 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
123 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
123 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
124 # my-clone = /home/jdoe/jdoes-clone
124 # my-clone = /home/jdoe/jdoes-clone
125
125
126 [ui]
126 [ui]
127 # name and email (local to this repository, optional), e.g.
127 # name and email (local to this repository, optional), e.g.
128 # username = Jane Doe <jdoe@example.com>
128 # username = Jane Doe <jdoe@example.com>
129 """,
129 """,
130 b'local': b"""# example repository config (see 'hg help config' for more info)
130 b'local': b"""# example repository config (see 'hg help config' for more info)
131 [paths]
131 [paths]
132 # path aliases to other clones of this repo in URLs or filesystem paths
132 # path aliases to other clones of this repo in URLs or filesystem paths
133 # (see 'hg help config.paths' for more info)
133 # (see 'hg help config.paths' for more info)
134 #
134 #
135 # default = http://example.com/hg/example-repo
135 # default = http://example.com/hg/example-repo
136 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
136 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
137 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
137 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
138 # my-clone = /home/jdoe/jdoes-clone
138 # my-clone = /home/jdoe/jdoes-clone
139
139
140 [ui]
140 [ui]
141 # name and email (local to this repository, optional), e.g.
141 # name and email (local to this repository, optional), e.g.
142 # username = Jane Doe <jdoe@example.com>
142 # username = Jane Doe <jdoe@example.com>
143 """,
143 """,
144 b'global': b"""# example system-wide hg config (see 'hg help config' for more info)
144 b'global': b"""# example system-wide hg config (see 'hg help config' for more info)
145
145
146 [ui]
146 [ui]
147 # uncomment to disable color in command output
147 # uncomment to disable color in command output
148 # (see 'hg help color' for details)
148 # (see 'hg help color' for details)
149 # color = never
149 # color = never
150
150
151 # uncomment to disable command output pagination
151 # uncomment to disable command output pagination
152 # (see 'hg help pager' for details)
152 # (see 'hg help pager' for details)
153 # paginate = never
153 # paginate = never
154
154
155 [extensions]
155 [extensions]
156 # uncomment the lines below to enable some popular extensions
156 # uncomment the lines below to enable some popular extensions
157 # (see 'hg help extensions' for more info)
157 # (see 'hg help extensions' for more info)
158 #
158 #
159 # blackbox =
159 # blackbox =
160 # churn =
160 # churn =
161 """,
161 """,
162 }
162 }
163
163
164
164
165 def _maybestrurl(maybebytes):
165 def _maybestrurl(maybebytes):
166 return pycompat.rapply(pycompat.strurl, maybebytes)
166 return pycompat.rapply(pycompat.strurl, maybebytes)
167
167
168
168
169 def _maybebytesurl(maybestr):
169 def _maybebytesurl(maybestr):
170 return pycompat.rapply(pycompat.bytesurl, maybestr)
170 return pycompat.rapply(pycompat.bytesurl, maybestr)
171
171
172
172
173 class httppasswordmgrdbproxy(object):
173 class httppasswordmgrdbproxy(object):
174 """Delays loading urllib2 until it's needed."""
174 """Delays loading urllib2 until it's needed."""
175
175
176 def __init__(self):
176 def __init__(self):
177 self._mgr = None
177 self._mgr = None
178
178
179 def _get_mgr(self):
179 def _get_mgr(self):
180 if self._mgr is None:
180 if self._mgr is None:
181 self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
181 self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
182 return self._mgr
182 return self._mgr
183
183
184 def add_password(self, realm, uris, user, passwd):
184 def add_password(self, realm, uris, user, passwd):
185 return self._get_mgr().add_password(
185 return self._get_mgr().add_password(
186 _maybestrurl(realm),
186 _maybestrurl(realm),
187 _maybestrurl(uris),
187 _maybestrurl(uris),
188 _maybestrurl(user),
188 _maybestrurl(user),
189 _maybestrurl(passwd),
189 _maybestrurl(passwd),
190 )
190 )
191
191
192 def find_user_password(self, realm, uri):
192 def find_user_password(self, realm, uri):
193 mgr = self._get_mgr()
193 mgr = self._get_mgr()
194 return _maybebytesurl(
194 return _maybebytesurl(
195 mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri))
195 mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri))
196 )
196 )
197
197
198
198
199 def _catchterm(*args):
199 def _catchterm(*args):
200 raise error.SignalInterrupt
200 raise error.SignalInterrupt
201
201
202
202
203 # unique object used to detect no default value has been provided when
203 # unique object used to detect no default value has been provided when
204 # retrieving configuration value.
204 # retrieving configuration value.
205 _unset = object()
205 _unset = object()
206
206
207 # _reqexithandlers: callbacks run at the end of a request
207 # _reqexithandlers: callbacks run at the end of a request
208 _reqexithandlers = []
208 _reqexithandlers = []
209
209
210
210
211 class ui(object):
211 class ui(object):
212 def __init__(self, src=None):
212 def __init__(self, src=None):
213 """Create a fresh new ui object if no src given
213 """Create a fresh new ui object if no src given
214
214
215 Use uimod.ui.load() to create a ui which knows global and user configs.
215 Use uimod.ui.load() to create a ui which knows global and user configs.
216 In most cases, you should use ui.copy() to create a copy of an existing
216 In most cases, you should use ui.copy() to create a copy of an existing
217 ui object.
217 ui object.
218 """
218 """
219 # _buffers: used for temporary capture of output
219 # _buffers: used for temporary capture of output
220 self._buffers = []
220 self._buffers = []
221 # 3-tuple describing how each buffer in the stack behaves.
221 # 3-tuple describing how each buffer in the stack behaves.
222 # Values are (capture stderr, capture subprocesses, apply labels).
222 # Values are (capture stderr, capture subprocesses, apply labels).
223 self._bufferstates = []
223 self._bufferstates = []
224 # When a buffer is active, defines whether we are expanding labels.
224 # When a buffer is active, defines whether we are expanding labels.
225 # This exists to prevent an extra list lookup.
225 # This exists to prevent an extra list lookup.
226 self._bufferapplylabels = None
226 self._bufferapplylabels = None
227 self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
227 self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
228 self._reportuntrusted = True
228 self._reportuntrusted = True
229 self._knownconfig = configitems.coreitems
229 self._knownconfig = configitems.coreitems
230 self._ocfg = config.config() # overlay
230 self._ocfg = config.config() # overlay
231 self._tcfg = config.config() # trusted
231 self._tcfg = config.config() # trusted
232 self._ucfg = config.config() # untrusted
232 self._ucfg = config.config() # untrusted
233 self._trustusers = set()
233 self._trustusers = set()
234 self._trustgroups = set()
234 self._trustgroups = set()
235 self.callhooks = True
235 self.callhooks = True
236 # Insecure server connections requested.
236 # Insecure server connections requested.
237 self.insecureconnections = False
237 self.insecureconnections = False
238 # Blocked time
238 # Blocked time
239 self.logblockedtimes = False
239 self.logblockedtimes = False
240 # color mode: see mercurial/color.py for possible value
240 # color mode: see mercurial/color.py for possible value
241 self._colormode = None
241 self._colormode = None
242 self._terminfoparams = {}
242 self._terminfoparams = {}
243 self._styles = {}
243 self._styles = {}
244 self._uninterruptible = False
244 self._uninterruptible = False
245
245
246 if src:
246 if src:
247 self._fout = src._fout
247 self._fout = src._fout
248 self._ferr = src._ferr
248 self._ferr = src._ferr
249 self._fin = src._fin
249 self._fin = src._fin
250 self._fmsg = src._fmsg
250 self._fmsg = src._fmsg
251 self._fmsgout = src._fmsgout
251 self._fmsgout = src._fmsgout
252 self._fmsgerr = src._fmsgerr
252 self._fmsgerr = src._fmsgerr
253 self._finoutredirected = src._finoutredirected
253 self._finoutredirected = src._finoutredirected
254 self._loggers = src._loggers.copy()
254 self._loggers = src._loggers.copy()
255 self.pageractive = src.pageractive
255 self.pageractive = src.pageractive
256 self._disablepager = src._disablepager
256 self._disablepager = src._disablepager
257 self._tweaked = src._tweaked
257 self._tweaked = src._tweaked
258
258
259 self._tcfg = src._tcfg.copy()
259 self._tcfg = src._tcfg.copy()
260 self._ucfg = src._ucfg.copy()
260 self._ucfg = src._ucfg.copy()
261 self._ocfg = src._ocfg.copy()
261 self._ocfg = src._ocfg.copy()
262 self._trustusers = src._trustusers.copy()
262 self._trustusers = src._trustusers.copy()
263 self._trustgroups = src._trustgroups.copy()
263 self._trustgroups = src._trustgroups.copy()
264 self.environ = src.environ
264 self.environ = src.environ
265 self.callhooks = src.callhooks
265 self.callhooks = src.callhooks
266 self.insecureconnections = src.insecureconnections
266 self.insecureconnections = src.insecureconnections
267 self._colormode = src._colormode
267 self._colormode = src._colormode
268 self._terminfoparams = src._terminfoparams.copy()
268 self._terminfoparams = src._terminfoparams.copy()
269 self._styles = src._styles.copy()
269 self._styles = src._styles.copy()
270
270
271 self.fixconfig()
271 self.fixconfig()
272
272
273 self.httppasswordmgrdb = src.httppasswordmgrdb
273 self.httppasswordmgrdb = src.httppasswordmgrdb
274 self._blockedtimes = src._blockedtimes
274 self._blockedtimes = src._blockedtimes
275 else:
275 else:
276 self._fout = procutil.stdout
276 self._fout = procutil.stdout
277 self._ferr = procutil.stderr
277 self._ferr = procutil.stderr
278 self._fin = procutil.stdin
278 self._fin = procutil.stdin
279 self._fmsg = None
279 self._fmsg = None
280 self._fmsgout = self.fout # configurable
280 self._fmsgout = self.fout # configurable
281 self._fmsgerr = self.ferr # configurable
281 self._fmsgerr = self.ferr # configurable
282 self._finoutredirected = False
282 self._finoutredirected = False
283 self._loggers = {}
283 self._loggers = {}
284 self.pageractive = False
284 self.pageractive = False
285 self._disablepager = False
285 self._disablepager = False
286 self._tweaked = False
286 self._tweaked = False
287
287
288 # shared read-only environment
288 # shared read-only environment
289 self.environ = encoding.environ
289 self.environ = encoding.environ
290
290
291 self.httppasswordmgrdb = httppasswordmgrdbproxy()
291 self.httppasswordmgrdb = httppasswordmgrdbproxy()
292 self._blockedtimes = collections.defaultdict(int)
292 self._blockedtimes = collections.defaultdict(int)
293
293
294 allowed = self.configlist(b'experimental', b'exportableenviron')
294 allowed = self.configlist(b'experimental', b'exportableenviron')
295 if b'*' in allowed:
295 if b'*' in allowed:
296 self._exportableenviron = self.environ
296 self._exportableenviron = self.environ
297 else:
297 else:
298 self._exportableenviron = {}
298 self._exportableenviron = {}
299 for k in allowed:
299 for k in allowed:
300 if k in self.environ:
300 if k in self.environ:
301 self._exportableenviron[k] = self.environ[k]
301 self._exportableenviron[k] = self.environ[k]
302
302
303 @classmethod
303 @classmethod
304 def load(cls):
304 def load(cls):
305 """Create a ui and load global and user configs"""
305 """Create a ui and load global and user configs"""
306 u = cls()
306 u = cls()
307 # we always trust global config files and environment variables
307 # we always trust global config files and environment variables
308 for t, f in rcutil.rccomponents():
308 for t, f in rcutil.rccomponents():
309 if t == b'path':
309 if t == b'path':
310 u.readconfig(f, trust=True)
310 u.readconfig(f, trust=True)
311 elif t == b'resource':
312 u.read_resource_config(f, trust=True)
311 elif t == b'items':
313 elif t == b'items':
312 sections = set()
314 sections = set()
313 for section, name, value, source in f:
315 for section, name, value, source in f:
314 # do not set u._ocfg
316 # do not set u._ocfg
315 # XXX clean this up once immutable config object is a thing
317 # XXX clean this up once immutable config object is a thing
316 u._tcfg.set(section, name, value, source)
318 u._tcfg.set(section, name, value, source)
317 u._ucfg.set(section, name, value, source)
319 u._ucfg.set(section, name, value, source)
318 sections.add(section)
320 sections.add(section)
319 for section in sections:
321 for section in sections:
320 u.fixconfig(section=section)
322 u.fixconfig(section=section)
321 else:
323 else:
322 raise error.ProgrammingError(b'unknown rctype: %s' % t)
324 raise error.ProgrammingError(b'unknown rctype: %s' % t)
323 u._maybetweakdefaults()
325 u._maybetweakdefaults()
324 return u
326 return u
325
327
326 def _maybetweakdefaults(self):
328 def _maybetweakdefaults(self):
327 if not self.configbool(b'ui', b'tweakdefaults'):
329 if not self.configbool(b'ui', b'tweakdefaults'):
328 return
330 return
329 if self._tweaked or self.plain(b'tweakdefaults'):
331 if self._tweaked or self.plain(b'tweakdefaults'):
330 return
332 return
331
333
332 # Note: it is SUPER IMPORTANT that you set self._tweaked to
334 # Note: it is SUPER IMPORTANT that you set self._tweaked to
333 # True *before* any calls to setconfig(), otherwise you'll get
335 # True *before* any calls to setconfig(), otherwise you'll get
334 # infinite recursion between setconfig and this method.
336 # infinite recursion between setconfig and this method.
335 #
337 #
336 # TODO: We should extract an inner method in setconfig() to
338 # TODO: We should extract an inner method in setconfig() to
337 # avoid this weirdness.
339 # avoid this weirdness.
338 self._tweaked = True
340 self._tweaked = True
339 tmpcfg = config.config()
341 tmpcfg = config.config()
340 tmpcfg.parse(b'<tweakdefaults>', tweakrc)
342 tmpcfg.parse(b'<tweakdefaults>', tweakrc)
341 for section in tmpcfg:
343 for section in tmpcfg:
342 for name, value in tmpcfg.items(section):
344 for name, value in tmpcfg.items(section):
343 if not self.hasconfig(section, name):
345 if not self.hasconfig(section, name):
344 self.setconfig(section, name, value, b"<tweakdefaults>")
346 self.setconfig(section, name, value, b"<tweakdefaults>")
345
347
346 def copy(self):
348 def copy(self):
347 return self.__class__(self)
349 return self.__class__(self)
348
350
349 def resetstate(self):
351 def resetstate(self):
350 """Clear internal state that shouldn't persist across commands"""
352 """Clear internal state that shouldn't persist across commands"""
351 if self._progbar:
353 if self._progbar:
352 self._progbar.resetstate() # reset last-print time of progress bar
354 self._progbar.resetstate() # reset last-print time of progress bar
353 self.httppasswordmgrdb = httppasswordmgrdbproxy()
355 self.httppasswordmgrdb = httppasswordmgrdbproxy()
354
356
355 @contextlib.contextmanager
357 @contextlib.contextmanager
356 def timeblockedsection(self, key):
358 def timeblockedsection(self, key):
357 # this is open-coded below - search for timeblockedsection to find them
359 # this is open-coded below - search for timeblockedsection to find them
358 starttime = util.timer()
360 starttime = util.timer()
359 try:
361 try:
360 yield
362 yield
361 finally:
363 finally:
362 self._blockedtimes[key + b'_blocked'] += (
364 self._blockedtimes[key + b'_blocked'] += (
363 util.timer() - starttime
365 util.timer() - starttime
364 ) * 1000
366 ) * 1000
365
367
366 @contextlib.contextmanager
368 @contextlib.contextmanager
367 def uninterruptible(self):
369 def uninterruptible(self):
368 """Mark an operation as unsafe.
370 """Mark an operation as unsafe.
369
371
370 Most operations on a repository are safe to interrupt, but a
372 Most operations on a repository are safe to interrupt, but a
371 few are risky (for example repair.strip). This context manager
373 few are risky (for example repair.strip). This context manager
372 lets you advise Mercurial that something risky is happening so
374 lets you advise Mercurial that something risky is happening so
373 that control-C etc can be blocked if desired.
375 that control-C etc can be blocked if desired.
374 """
376 """
375 enabled = self.configbool(b'experimental', b'nointerrupt')
377 enabled = self.configbool(b'experimental', b'nointerrupt')
376 if enabled and self.configbool(
378 if enabled and self.configbool(
377 b'experimental', b'nointerrupt-interactiveonly'
379 b'experimental', b'nointerrupt-interactiveonly'
378 ):
380 ):
379 enabled = self.interactive()
381 enabled = self.interactive()
380 if self._uninterruptible or not enabled:
382 if self._uninterruptible or not enabled:
381 # if nointerrupt support is turned off, the process isn't
383 # if nointerrupt support is turned off, the process isn't
382 # interactive, or we're already in an uninterruptible
384 # interactive, or we're already in an uninterruptible
383 # block, do nothing.
385 # block, do nothing.
384 yield
386 yield
385 return
387 return
386
388
387 def warn():
389 def warn():
388 self.warn(_(b"shutting down cleanly\n"))
390 self.warn(_(b"shutting down cleanly\n"))
389 self.warn(
391 self.warn(
390 _(b"press ^C again to terminate immediately (dangerous)\n")
392 _(b"press ^C again to terminate immediately (dangerous)\n")
391 )
393 )
392 return True
394 return True
393
395
394 with procutil.uninterruptible(warn):
396 with procutil.uninterruptible(warn):
395 try:
397 try:
396 self._uninterruptible = True
398 self._uninterruptible = True
397 yield
399 yield
398 finally:
400 finally:
399 self._uninterruptible = False
401 self._uninterruptible = False
400
402
401 def formatter(self, topic, opts):
403 def formatter(self, topic, opts):
402 return formatter.formatter(self, self, topic, opts)
404 return formatter.formatter(self, self, topic, opts)
403
405
404 def _trusted(self, fp, f):
406 def _trusted(self, fp, f):
405 st = util.fstat(fp)
407 st = util.fstat(fp)
406 if util.isowner(st):
408 if util.isowner(st):
407 return True
409 return True
408
410
409 tusers, tgroups = self._trustusers, self._trustgroups
411 tusers, tgroups = self._trustusers, self._trustgroups
410 if b'*' in tusers or b'*' in tgroups:
412 if b'*' in tusers or b'*' in tgroups:
411 return True
413 return True
412
414
413 user = util.username(st.st_uid)
415 user = util.username(st.st_uid)
414 group = util.groupname(st.st_gid)
416 group = util.groupname(st.st_gid)
415 if user in tusers or group in tgroups or user == util.username():
417 if user in tusers or group in tgroups or user == util.username():
416 return True
418 return True
417
419
418 if self._reportuntrusted:
420 if self._reportuntrusted:
419 self.warn(
421 self.warn(
420 _(
422 _(
421 b'not trusting file %s from untrusted '
423 b'not trusting file %s from untrusted '
422 b'user %s, group %s\n'
424 b'user %s, group %s\n'
423 )
425 )
424 % (f, user, group)
426 % (f, user, group)
425 )
427 )
426 return False
428 return False
427
429
428 def read_resource_config(
430 def read_resource_config(
429 self, name, root=None, trust=False, sections=None, remap=None
431 self, name, root=None, trust=False, sections=None, remap=None
430 ):
432 ):
431 try:
433 try:
432 fp = resourceutil.open_resource(name[0], name[1])
434 fp = resourceutil.open_resource(name[0], name[1])
433 except IOError:
435 except IOError:
434 if not sections: # ignore unless we were looking for something
436 if not sections: # ignore unless we were looking for something
435 return
437 return
436 raise
438 raise
437
439
438 self._readconfig(
440 self._readconfig(
439 b'resource:%s.%s' % name, fp, root, trust, sections, remap
441 b'resource:%s.%s' % name, fp, root, trust, sections, remap
440 )
442 )
441
443
442 def readconfig(
444 def readconfig(
443 self, filename, root=None, trust=False, sections=None, remap=None
445 self, filename, root=None, trust=False, sections=None, remap=None
444 ):
446 ):
445 try:
447 try:
446 fp = open(filename, 'rb')
448 fp = open(filename, 'rb')
447 except IOError:
449 except IOError:
448 if not sections: # ignore unless we were looking for something
450 if not sections: # ignore unless we were looking for something
449 return
451 return
450 raise
452 raise
451
453
452 self._readconfig(filename, fp, root, trust, sections, remap)
454 self._readconfig(filename, fp, root, trust, sections, remap)
453
455
454 def _readconfig(
456 def _readconfig(
455 self, filename, fp, root=None, trust=False, sections=None, remap=None
457 self, filename, fp, root=None, trust=False, sections=None, remap=None
456 ):
458 ):
457 with fp:
459 with fp:
458 cfg = config.config()
460 cfg = config.config()
459 trusted = sections or trust or self._trusted(fp, filename)
461 trusted = sections or trust or self._trusted(fp, filename)
460
462
461 try:
463 try:
462 cfg.read(filename, fp, sections=sections, remap=remap)
464 cfg.read(filename, fp, sections=sections, remap=remap)
463 except error.ParseError as inst:
465 except error.ParseError as inst:
464 if trusted:
466 if trusted:
465 raise
467 raise
466 self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
468 self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
467
469
468 if self.plain():
470 if self.plain():
469 for k in (
471 for k in (
470 b'debug',
472 b'debug',
471 b'fallbackencoding',
473 b'fallbackencoding',
472 b'quiet',
474 b'quiet',
473 b'slash',
475 b'slash',
474 b'logtemplate',
476 b'logtemplate',
475 b'message-output',
477 b'message-output',
476 b'statuscopies',
478 b'statuscopies',
477 b'style',
479 b'style',
478 b'traceback',
480 b'traceback',
479 b'verbose',
481 b'verbose',
480 ):
482 ):
481 if k in cfg[b'ui']:
483 if k in cfg[b'ui']:
482 del cfg[b'ui'][k]
484 del cfg[b'ui'][k]
483 for k, v in cfg.items(b'defaults'):
485 for k, v in cfg.items(b'defaults'):
484 del cfg[b'defaults'][k]
486 del cfg[b'defaults'][k]
485 for k, v in cfg.items(b'commands'):
487 for k, v in cfg.items(b'commands'):
486 del cfg[b'commands'][k]
488 del cfg[b'commands'][k]
487 # Don't remove aliases from the configuration if in the exceptionlist
489 # Don't remove aliases from the configuration if in the exceptionlist
488 if self.plain(b'alias'):
490 if self.plain(b'alias'):
489 for k, v in cfg.items(b'alias'):
491 for k, v in cfg.items(b'alias'):
490 del cfg[b'alias'][k]
492 del cfg[b'alias'][k]
491 if self.plain(b'revsetalias'):
493 if self.plain(b'revsetalias'):
492 for k, v in cfg.items(b'revsetalias'):
494 for k, v in cfg.items(b'revsetalias'):
493 del cfg[b'revsetalias'][k]
495 del cfg[b'revsetalias'][k]
494 if self.plain(b'templatealias'):
496 if self.plain(b'templatealias'):
495 for k, v in cfg.items(b'templatealias'):
497 for k, v in cfg.items(b'templatealias'):
496 del cfg[b'templatealias'][k]
498 del cfg[b'templatealias'][k]
497
499
498 if trusted:
500 if trusted:
499 self._tcfg.update(cfg)
501 self._tcfg.update(cfg)
500 self._tcfg.update(self._ocfg)
502 self._tcfg.update(self._ocfg)
501 self._ucfg.update(cfg)
503 self._ucfg.update(cfg)
502 self._ucfg.update(self._ocfg)
504 self._ucfg.update(self._ocfg)
503
505
504 if root is None:
506 if root is None:
505 root = os.path.expanduser(b'~')
507 root = os.path.expanduser(b'~')
506 self.fixconfig(root=root)
508 self.fixconfig(root=root)
507
509
508 def fixconfig(self, root=None, section=None):
510 def fixconfig(self, root=None, section=None):
509 if section in (None, b'paths'):
511 if section in (None, b'paths'):
510 # expand vars and ~
512 # expand vars and ~
511 # translate paths relative to root (or home) into absolute paths
513 # translate paths relative to root (or home) into absolute paths
512 root = root or encoding.getcwd()
514 root = root or encoding.getcwd()
513 for c in self._tcfg, self._ucfg, self._ocfg:
515 for c in self._tcfg, self._ucfg, self._ocfg:
514 for n, p in c.items(b'paths'):
516 for n, p in c.items(b'paths'):
515 # Ignore sub-options.
517 # Ignore sub-options.
516 if b':' in n:
518 if b':' in n:
517 continue
519 continue
518 if not p:
520 if not p:
519 continue
521 continue
520 if b'%%' in p:
522 if b'%%' in p:
521 s = self.configsource(b'paths', n) or b'none'
523 s = self.configsource(b'paths', n) or b'none'
522 self.warn(
524 self.warn(
523 _(b"(deprecated '%%' in path %s=%s from %s)\n")
525 _(b"(deprecated '%%' in path %s=%s from %s)\n")
524 % (n, p, s)
526 % (n, p, s)
525 )
527 )
526 p = p.replace(b'%%', b'%')
528 p = p.replace(b'%%', b'%')
527 p = util.expandpath(p)
529 p = util.expandpath(p)
528 if not util.hasscheme(p) and not os.path.isabs(p):
530 if not util.hasscheme(p) and not os.path.isabs(p):
529 p = os.path.normpath(os.path.join(root, p))
531 p = os.path.normpath(os.path.join(root, p))
530 c.set(b"paths", n, p)
532 c.set(b"paths", n, p)
531
533
532 if section in (None, b'ui'):
534 if section in (None, b'ui'):
533 # update ui options
535 # update ui options
534 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
536 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
535 self.debugflag = self.configbool(b'ui', b'debug')
537 self.debugflag = self.configbool(b'ui', b'debug')
536 self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
538 self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
537 self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
539 self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
538 if self.verbose and self.quiet:
540 if self.verbose and self.quiet:
539 self.quiet = self.verbose = False
541 self.quiet = self.verbose = False
540 self._reportuntrusted = self.debugflag or self.configbool(
542 self._reportuntrusted = self.debugflag or self.configbool(
541 b"ui", b"report_untrusted"
543 b"ui", b"report_untrusted"
542 )
544 )
543 self.tracebackflag = self.configbool(b'ui', b'traceback')
545 self.tracebackflag = self.configbool(b'ui', b'traceback')
544 self.logblockedtimes = self.configbool(b'ui', b'logblockedtimes')
546 self.logblockedtimes = self.configbool(b'ui', b'logblockedtimes')
545
547
546 if section in (None, b'trusted'):
548 if section in (None, b'trusted'):
547 # update trust information
549 # update trust information
548 self._trustusers.update(self.configlist(b'trusted', b'users'))
550 self._trustusers.update(self.configlist(b'trusted', b'users'))
549 self._trustgroups.update(self.configlist(b'trusted', b'groups'))
551 self._trustgroups.update(self.configlist(b'trusted', b'groups'))
550
552
551 if section in (None, b'devel', b'ui') and self.debugflag:
553 if section in (None, b'devel', b'ui') and self.debugflag:
552 tracked = set()
554 tracked = set()
553 if self.configbool(b'devel', b'debug.extensions'):
555 if self.configbool(b'devel', b'debug.extensions'):
554 tracked.add(b'extension')
556 tracked.add(b'extension')
555 if tracked:
557 if tracked:
556 logger = loggingutil.fileobjectlogger(self._ferr, tracked)
558 logger = loggingutil.fileobjectlogger(self._ferr, tracked)
557 self.setlogger(b'debug', logger)
559 self.setlogger(b'debug', logger)
558
560
559 def backupconfig(self, section, item):
561 def backupconfig(self, section, item):
560 return (
562 return (
561 self._ocfg.backup(section, item),
563 self._ocfg.backup(section, item),
562 self._tcfg.backup(section, item),
564 self._tcfg.backup(section, item),
563 self._ucfg.backup(section, item),
565 self._ucfg.backup(section, item),
564 )
566 )
565
567
566 def restoreconfig(self, data):
568 def restoreconfig(self, data):
567 self._ocfg.restore(data[0])
569 self._ocfg.restore(data[0])
568 self._tcfg.restore(data[1])
570 self._tcfg.restore(data[1])
569 self._ucfg.restore(data[2])
571 self._ucfg.restore(data[2])
570
572
571 def setconfig(self, section, name, value, source=b''):
573 def setconfig(self, section, name, value, source=b''):
572 for cfg in (self._ocfg, self._tcfg, self._ucfg):
574 for cfg in (self._ocfg, self._tcfg, self._ucfg):
573 cfg.set(section, name, value, source)
575 cfg.set(section, name, value, source)
574 self.fixconfig(section=section)
576 self.fixconfig(section=section)
575 self._maybetweakdefaults()
577 self._maybetweakdefaults()
576
578
577 def _data(self, untrusted):
579 def _data(self, untrusted):
578 return untrusted and self._ucfg or self._tcfg
580 return untrusted and self._ucfg or self._tcfg
579
581
580 def configsource(self, section, name, untrusted=False):
582 def configsource(self, section, name, untrusted=False):
581 return self._data(untrusted).source(section, name)
583 return self._data(untrusted).source(section, name)
582
584
583 def config(self, section, name, default=_unset, untrusted=False):
585 def config(self, section, name, default=_unset, untrusted=False):
584 """return the plain string version of a config"""
586 """return the plain string version of a config"""
585 value = self._config(
587 value = self._config(
586 section, name, default=default, untrusted=untrusted
588 section, name, default=default, untrusted=untrusted
587 )
589 )
588 if value is _unset:
590 if value is _unset:
589 return None
591 return None
590 return value
592 return value
591
593
592 def _config(self, section, name, default=_unset, untrusted=False):
594 def _config(self, section, name, default=_unset, untrusted=False):
593 value = itemdefault = default
595 value = itemdefault = default
594 item = self._knownconfig.get(section, {}).get(name)
596 item = self._knownconfig.get(section, {}).get(name)
595 alternates = [(section, name)]
597 alternates = [(section, name)]
596
598
597 if item is not None:
599 if item is not None:
598 alternates.extend(item.alias)
600 alternates.extend(item.alias)
599 if callable(item.default):
601 if callable(item.default):
600 itemdefault = item.default()
602 itemdefault = item.default()
601 else:
603 else:
602 itemdefault = item.default
604 itemdefault = item.default
603 else:
605 else:
604 msg = b"accessing unregistered config item: '%s.%s'"
606 msg = b"accessing unregistered config item: '%s.%s'"
605 msg %= (section, name)
607 msg %= (section, name)
606 self.develwarn(msg, 2, b'warn-config-unknown')
608 self.develwarn(msg, 2, b'warn-config-unknown')
607
609
608 if default is _unset:
610 if default is _unset:
609 if item is None:
611 if item is None:
610 value = default
612 value = default
611 elif item.default is configitems.dynamicdefault:
613 elif item.default is configitems.dynamicdefault:
612 value = None
614 value = None
613 msg = b"config item requires an explicit default value: '%s.%s'"
615 msg = b"config item requires an explicit default value: '%s.%s'"
614 msg %= (section, name)
616 msg %= (section, name)
615 self.develwarn(msg, 2, b'warn-config-default')
617 self.develwarn(msg, 2, b'warn-config-default')
616 else:
618 else:
617 value = itemdefault
619 value = itemdefault
618 elif (
620 elif (
619 item is not None
621 item is not None
620 and item.default is not configitems.dynamicdefault
622 and item.default is not configitems.dynamicdefault
621 and default != itemdefault
623 and default != itemdefault
622 ):
624 ):
623 msg = (
625 msg = (
624 b"specifying a mismatched default value for a registered "
626 b"specifying a mismatched default value for a registered "
625 b"config item: '%s.%s' '%s'"
627 b"config item: '%s.%s' '%s'"
626 )
628 )
627 msg %= (section, name, pycompat.bytestr(default))
629 msg %= (section, name, pycompat.bytestr(default))
628 self.develwarn(msg, 2, b'warn-config-default')
630 self.develwarn(msg, 2, b'warn-config-default')
629
631
630 for s, n in alternates:
632 for s, n in alternates:
631 candidate = self._data(untrusted).get(s, n, None)
633 candidate = self._data(untrusted).get(s, n, None)
632 if candidate is not None:
634 if candidate is not None:
633 value = candidate
635 value = candidate
634 break
636 break
635
637
636 if self.debugflag and not untrusted and self._reportuntrusted:
638 if self.debugflag and not untrusted and self._reportuntrusted:
637 for s, n in alternates:
639 for s, n in alternates:
638 uvalue = self._ucfg.get(s, n)
640 uvalue = self._ucfg.get(s, n)
639 if uvalue is not None and uvalue != value:
641 if uvalue is not None and uvalue != value:
640 self.debug(
642 self.debug(
641 b"ignoring untrusted configuration option "
643 b"ignoring untrusted configuration option "
642 b"%s.%s = %s\n" % (s, n, uvalue)
644 b"%s.%s = %s\n" % (s, n, uvalue)
643 )
645 )
644 return value
646 return value
645
647
646 def configsuboptions(self, section, name, default=_unset, untrusted=False):
648 def configsuboptions(self, section, name, default=_unset, untrusted=False):
647 """Get a config option and all sub-options.
649 """Get a config option and all sub-options.
648
650
649 Some config options have sub-options that are declared with the
651 Some config options have sub-options that are declared with the
650 format "key:opt = value". This method is used to return the main
652 format "key:opt = value". This method is used to return the main
651 option and all its declared sub-options.
653 option and all its declared sub-options.
652
654
653 Returns a 2-tuple of ``(option, sub-options)``, where `sub-options``
655 Returns a 2-tuple of ``(option, sub-options)``, where `sub-options``
654 is a dict of defined sub-options where keys and values are strings.
656 is a dict of defined sub-options where keys and values are strings.
655 """
657 """
656 main = self.config(section, name, default, untrusted=untrusted)
658 main = self.config(section, name, default, untrusted=untrusted)
657 data = self._data(untrusted)
659 data = self._data(untrusted)
658 sub = {}
660 sub = {}
659 prefix = b'%s:' % name
661 prefix = b'%s:' % name
660 for k, v in data.items(section):
662 for k, v in data.items(section):
661 if k.startswith(prefix):
663 if k.startswith(prefix):
662 sub[k[len(prefix) :]] = v
664 sub[k[len(prefix) :]] = v
663
665
664 if self.debugflag and not untrusted and self._reportuntrusted:
666 if self.debugflag and not untrusted and self._reportuntrusted:
665 for k, v in sub.items():
667 for k, v in sub.items():
666 uvalue = self._ucfg.get(section, b'%s:%s' % (name, k))
668 uvalue = self._ucfg.get(section, b'%s:%s' % (name, k))
667 if uvalue is not None and uvalue != v:
669 if uvalue is not None and uvalue != v:
668 self.debug(
670 self.debug(
669 b'ignoring untrusted configuration option '
671 b'ignoring untrusted configuration option '
670 b'%s:%s.%s = %s\n' % (section, name, k, uvalue)
672 b'%s:%s.%s = %s\n' % (section, name, k, uvalue)
671 )
673 )
672
674
673 return main, sub
675 return main, sub
674
676
675 def configpath(self, section, name, default=_unset, untrusted=False):
677 def configpath(self, section, name, default=_unset, untrusted=False):
676 """get a path config item, expanded relative to repo root or config
678 """get a path config item, expanded relative to repo root or config
677 file"""
679 file"""
678 v = self.config(section, name, default, untrusted)
680 v = self.config(section, name, default, untrusted)
679 if v is None:
681 if v is None:
680 return None
682 return None
681 if not os.path.isabs(v) or b"://" not in v:
683 if not os.path.isabs(v) or b"://" not in v:
682 src = self.configsource(section, name, untrusted)
684 src = self.configsource(section, name, untrusted)
683 if b':' in src:
685 if b':' in src:
684 base = os.path.dirname(src.rsplit(b':')[0])
686 base = os.path.dirname(src.rsplit(b':')[0])
685 v = os.path.join(base, os.path.expanduser(v))
687 v = os.path.join(base, os.path.expanduser(v))
686 return v
688 return v
687
689
688 def configbool(self, section, name, default=_unset, untrusted=False):
690 def configbool(self, section, name, default=_unset, untrusted=False):
689 """parse a configuration element as a boolean
691 """parse a configuration element as a boolean
690
692
691 >>> u = ui(); s = b'foo'
693 >>> u = ui(); s = b'foo'
692 >>> u.setconfig(s, b'true', b'yes')
694 >>> u.setconfig(s, b'true', b'yes')
693 >>> u.configbool(s, b'true')
695 >>> u.configbool(s, b'true')
694 True
696 True
695 >>> u.setconfig(s, b'false', b'no')
697 >>> u.setconfig(s, b'false', b'no')
696 >>> u.configbool(s, b'false')
698 >>> u.configbool(s, b'false')
697 False
699 False
698 >>> u.configbool(s, b'unknown')
700 >>> u.configbool(s, b'unknown')
699 False
701 False
700 >>> u.configbool(s, b'unknown', True)
702 >>> u.configbool(s, b'unknown', True)
701 True
703 True
702 >>> u.setconfig(s, b'invalid', b'somevalue')
704 >>> u.setconfig(s, b'invalid', b'somevalue')
703 >>> u.configbool(s, b'invalid')
705 >>> u.configbool(s, b'invalid')
704 Traceback (most recent call last):
706 Traceback (most recent call last):
705 ...
707 ...
706 ConfigError: foo.invalid is not a boolean ('somevalue')
708 ConfigError: foo.invalid is not a boolean ('somevalue')
707 """
709 """
708
710
709 v = self._config(section, name, default, untrusted=untrusted)
711 v = self._config(section, name, default, untrusted=untrusted)
710 if v is None:
712 if v is None:
711 return v
713 return v
712 if v is _unset:
714 if v is _unset:
713 if default is _unset:
715 if default is _unset:
714 return False
716 return False
715 return default
717 return default
716 if isinstance(v, bool):
718 if isinstance(v, bool):
717 return v
719 return v
718 b = stringutil.parsebool(v)
720 b = stringutil.parsebool(v)
719 if b is None:
721 if b is None:
720 raise error.ConfigError(
722 raise error.ConfigError(
721 _(b"%s.%s is not a boolean ('%s')") % (section, name, v)
723 _(b"%s.%s is not a boolean ('%s')") % (section, name, v)
722 )
724 )
723 return b
725 return b
724
726
725 def configwith(
727 def configwith(
726 self, convert, section, name, default=_unset, desc=None, untrusted=False
728 self, convert, section, name, default=_unset, desc=None, untrusted=False
727 ):
729 ):
728 """parse a configuration element with a conversion function
730 """parse a configuration element with a conversion function
729
731
730 >>> u = ui(); s = b'foo'
732 >>> u = ui(); s = b'foo'
731 >>> u.setconfig(s, b'float1', b'42')
733 >>> u.setconfig(s, b'float1', b'42')
732 >>> u.configwith(float, s, b'float1')
734 >>> u.configwith(float, s, b'float1')
733 42.0
735 42.0
734 >>> u.setconfig(s, b'float2', b'-4.25')
736 >>> u.setconfig(s, b'float2', b'-4.25')
735 >>> u.configwith(float, s, b'float2')
737 >>> u.configwith(float, s, b'float2')
736 -4.25
738 -4.25
737 >>> u.configwith(float, s, b'unknown', 7)
739 >>> u.configwith(float, s, b'unknown', 7)
738 7.0
740 7.0
739 >>> u.setconfig(s, b'invalid', b'somevalue')
741 >>> u.setconfig(s, b'invalid', b'somevalue')
740 >>> u.configwith(float, s, b'invalid')
742 >>> u.configwith(float, s, b'invalid')
741 Traceback (most recent call last):
743 Traceback (most recent call last):
742 ...
744 ...
743 ConfigError: foo.invalid is not a valid float ('somevalue')
745 ConfigError: foo.invalid is not a valid float ('somevalue')
744 >>> u.configwith(float, s, b'invalid', desc=b'womble')
746 >>> u.configwith(float, s, b'invalid', desc=b'womble')
745 Traceback (most recent call last):
747 Traceback (most recent call last):
746 ...
748 ...
747 ConfigError: foo.invalid is not a valid womble ('somevalue')
749 ConfigError: foo.invalid is not a valid womble ('somevalue')
748 """
750 """
749
751
750 v = self.config(section, name, default, untrusted)
752 v = self.config(section, name, default, untrusted)
751 if v is None:
753 if v is None:
752 return v # do not attempt to convert None
754 return v # do not attempt to convert None
753 try:
755 try:
754 return convert(v)
756 return convert(v)
755 except (ValueError, error.ParseError):
757 except (ValueError, error.ParseError):
756 if desc is None:
758 if desc is None:
757 desc = pycompat.sysbytes(convert.__name__)
759 desc = pycompat.sysbytes(convert.__name__)
758 raise error.ConfigError(
760 raise error.ConfigError(
759 _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v)
761 _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v)
760 )
762 )
761
763
762 def configint(self, section, name, default=_unset, untrusted=False):
764 def configint(self, section, name, default=_unset, untrusted=False):
763 """parse a configuration element as an integer
765 """parse a configuration element as an integer
764
766
765 >>> u = ui(); s = b'foo'
767 >>> u = ui(); s = b'foo'
766 >>> u.setconfig(s, b'int1', b'42')
768 >>> u.setconfig(s, b'int1', b'42')
767 >>> u.configint(s, b'int1')
769 >>> u.configint(s, b'int1')
768 42
770 42
769 >>> u.setconfig(s, b'int2', b'-42')
771 >>> u.setconfig(s, b'int2', b'-42')
770 >>> u.configint(s, b'int2')
772 >>> u.configint(s, b'int2')
771 -42
773 -42
772 >>> u.configint(s, b'unknown', 7)
774 >>> u.configint(s, b'unknown', 7)
773 7
775 7
774 >>> u.setconfig(s, b'invalid', b'somevalue')
776 >>> u.setconfig(s, b'invalid', b'somevalue')
775 >>> u.configint(s, b'invalid')
777 >>> u.configint(s, b'invalid')
776 Traceback (most recent call last):
778 Traceback (most recent call last):
777 ...
779 ...
778 ConfigError: foo.invalid is not a valid integer ('somevalue')
780 ConfigError: foo.invalid is not a valid integer ('somevalue')
779 """
781 """
780
782
781 return self.configwith(
783 return self.configwith(
782 int, section, name, default, b'integer', untrusted
784 int, section, name, default, b'integer', untrusted
783 )
785 )
784
786
785 def configbytes(self, section, name, default=_unset, untrusted=False):
787 def configbytes(self, section, name, default=_unset, untrusted=False):
786 """parse a configuration element as a quantity in bytes
788 """parse a configuration element as a quantity in bytes
787
789
788 Units can be specified as b (bytes), k or kb (kilobytes), m or
790 Units can be specified as b (bytes), k or kb (kilobytes), m or
789 mb (megabytes), g or gb (gigabytes).
791 mb (megabytes), g or gb (gigabytes).
790
792
791 >>> u = ui(); s = b'foo'
793 >>> u = ui(); s = b'foo'
792 >>> u.setconfig(s, b'val1', b'42')
794 >>> u.setconfig(s, b'val1', b'42')
793 >>> u.configbytes(s, b'val1')
795 >>> u.configbytes(s, b'val1')
794 42
796 42
795 >>> u.setconfig(s, b'val2', b'42.5 kb')
797 >>> u.setconfig(s, b'val2', b'42.5 kb')
796 >>> u.configbytes(s, b'val2')
798 >>> u.configbytes(s, b'val2')
797 43520
799 43520
798 >>> u.configbytes(s, b'unknown', b'7 MB')
800 >>> u.configbytes(s, b'unknown', b'7 MB')
799 7340032
801 7340032
800 >>> u.setconfig(s, b'invalid', b'somevalue')
802 >>> u.setconfig(s, b'invalid', b'somevalue')
801 >>> u.configbytes(s, b'invalid')
803 >>> u.configbytes(s, b'invalid')
802 Traceback (most recent call last):
804 Traceback (most recent call last):
803 ...
805 ...
804 ConfigError: foo.invalid is not a byte quantity ('somevalue')
806 ConfigError: foo.invalid is not a byte quantity ('somevalue')
805 """
807 """
806
808
807 value = self._config(section, name, default, untrusted)
809 value = self._config(section, name, default, untrusted)
808 if value is _unset:
810 if value is _unset:
809 if default is _unset:
811 if default is _unset:
810 default = 0
812 default = 0
811 value = default
813 value = default
812 if not isinstance(value, bytes):
814 if not isinstance(value, bytes):
813 return value
815 return value
814 try:
816 try:
815 return util.sizetoint(value)
817 return util.sizetoint(value)
816 except error.ParseError:
818 except error.ParseError:
817 raise error.ConfigError(
819 raise error.ConfigError(
818 _(b"%s.%s is not a byte quantity ('%s')")
820 _(b"%s.%s is not a byte quantity ('%s')")
819 % (section, name, value)
821 % (section, name, value)
820 )
822 )
821
823
822 def configlist(self, section, name, default=_unset, untrusted=False):
824 def configlist(self, section, name, default=_unset, untrusted=False):
823 """parse a configuration element as a list of comma/space separated
825 """parse a configuration element as a list of comma/space separated
824 strings
826 strings
825
827
826 >>> u = ui(); s = b'foo'
828 >>> u = ui(); s = b'foo'
827 >>> u.setconfig(s, b'list1', b'this,is "a small" ,test')
829 >>> u.setconfig(s, b'list1', b'this,is "a small" ,test')
828 >>> u.configlist(s, b'list1')
830 >>> u.configlist(s, b'list1')
829 ['this', 'is', 'a small', 'test']
831 ['this', 'is', 'a small', 'test']
830 >>> u.setconfig(s, b'list2', b'this, is "a small" , test ')
832 >>> u.setconfig(s, b'list2', b'this, is "a small" , test ')
831 >>> u.configlist(s, b'list2')
833 >>> u.configlist(s, b'list2')
832 ['this', 'is', 'a small', 'test']
834 ['this', 'is', 'a small', 'test']
833 """
835 """
834 # default is not always a list
836 # default is not always a list
835 v = self.configwith(
837 v = self.configwith(
836 config.parselist, section, name, default, b'list', untrusted
838 config.parselist, section, name, default, b'list', untrusted
837 )
839 )
838 if isinstance(v, bytes):
840 if isinstance(v, bytes):
839 return config.parselist(v)
841 return config.parselist(v)
840 elif v is None:
842 elif v is None:
841 return []
843 return []
842 return v
844 return v
843
845
844 def configdate(self, section, name, default=_unset, untrusted=False):
846 def configdate(self, section, name, default=_unset, untrusted=False):
845 """parse a configuration element as a tuple of ints
847 """parse a configuration element as a tuple of ints
846
848
847 >>> u = ui(); s = b'foo'
849 >>> u = ui(); s = b'foo'
848 >>> u.setconfig(s, b'date', b'0 0')
850 >>> u.setconfig(s, b'date', b'0 0')
849 >>> u.configdate(s, b'date')
851 >>> u.configdate(s, b'date')
850 (0, 0)
852 (0, 0)
851 """
853 """
852 if self.config(section, name, default, untrusted):
854 if self.config(section, name, default, untrusted):
853 return self.configwith(
855 return self.configwith(
854 dateutil.parsedate, section, name, default, b'date', untrusted
856 dateutil.parsedate, section, name, default, b'date', untrusted
855 )
857 )
856 if default is _unset:
858 if default is _unset:
857 return None
859 return None
858 return default
860 return default
859
861
860 def configdefault(self, section, name):
862 def configdefault(self, section, name):
861 """returns the default value of the config item"""
863 """returns the default value of the config item"""
862 item = self._knownconfig.get(section, {}).get(name)
864 item = self._knownconfig.get(section, {}).get(name)
863 itemdefault = None
865 itemdefault = None
864 if item is not None:
866 if item is not None:
865 if callable(item.default):
867 if callable(item.default):
866 itemdefault = item.default()
868 itemdefault = item.default()
867 else:
869 else:
868 itemdefault = item.default
870 itemdefault = item.default
869 return itemdefault
871 return itemdefault
870
872
871 def hasconfig(self, section, name, untrusted=False):
873 def hasconfig(self, section, name, untrusted=False):
872 return self._data(untrusted).hasitem(section, name)
874 return self._data(untrusted).hasitem(section, name)
873
875
874 def has_section(self, section, untrusted=False):
876 def has_section(self, section, untrusted=False):
875 '''tell whether section exists in config.'''
877 '''tell whether section exists in config.'''
876 return section in self._data(untrusted)
878 return section in self._data(untrusted)
877
879
878 def configitems(self, section, untrusted=False, ignoresub=False):
880 def configitems(self, section, untrusted=False, ignoresub=False):
879 items = self._data(untrusted).items(section)
881 items = self._data(untrusted).items(section)
880 if ignoresub:
882 if ignoresub:
881 items = [i for i in items if b':' not in i[0]]
883 items = [i for i in items if b':' not in i[0]]
882 if self.debugflag and not untrusted and self._reportuntrusted:
884 if self.debugflag and not untrusted and self._reportuntrusted:
883 for k, v in self._ucfg.items(section):
885 for k, v in self._ucfg.items(section):
884 if self._tcfg.get(section, k) != v:
886 if self._tcfg.get(section, k) != v:
885 self.debug(
887 self.debug(
886 b"ignoring untrusted configuration option "
888 b"ignoring untrusted configuration option "
887 b"%s.%s = %s\n" % (section, k, v)
889 b"%s.%s = %s\n" % (section, k, v)
888 )
890 )
889 return items
891 return items
890
892
891 def walkconfig(self, untrusted=False):
893 def walkconfig(self, untrusted=False):
892 cfg = self._data(untrusted)
894 cfg = self._data(untrusted)
893 for section in cfg.sections():
895 for section in cfg.sections():
894 for name, value in self.configitems(section, untrusted):
896 for name, value in self.configitems(section, untrusted):
895 yield section, name, value
897 yield section, name, value
896
898
897 def plain(self, feature=None):
899 def plain(self, feature=None):
898 '''is plain mode active?
900 '''is plain mode active?
899
901
900 Plain mode means that all configuration variables which affect
902 Plain mode means that all configuration variables which affect
901 the behavior and output of Mercurial should be
903 the behavior and output of Mercurial should be
902 ignored. Additionally, the output should be stable,
904 ignored. Additionally, the output should be stable,
903 reproducible and suitable for use in scripts or applications.
905 reproducible and suitable for use in scripts or applications.
904
906
905 The only way to trigger plain mode is by setting either the
907 The only way to trigger plain mode is by setting either the
906 `HGPLAIN' or `HGPLAINEXCEPT' environment variables.
908 `HGPLAIN' or `HGPLAINEXCEPT' environment variables.
907
909
908 The return value can either be
910 The return value can either be
909 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
911 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
910 - False if feature is disabled by default and not included in HGPLAIN
912 - False if feature is disabled by default and not included in HGPLAIN
911 - True otherwise
913 - True otherwise
912 '''
914 '''
913 if (
915 if (
914 b'HGPLAIN' not in encoding.environ
916 b'HGPLAIN' not in encoding.environ
915 and b'HGPLAINEXCEPT' not in encoding.environ
917 and b'HGPLAINEXCEPT' not in encoding.environ
916 ):
918 ):
917 return False
919 return False
918 exceptions = (
920 exceptions = (
919 encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',')
921 encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',')
920 )
922 )
921 # TODO: add support for HGPLAIN=+feature,-feature syntax
923 # TODO: add support for HGPLAIN=+feature,-feature syntax
922 if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split(
924 if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split(
923 b','
925 b','
924 ):
926 ):
925 exceptions.append(b'strictflags')
927 exceptions.append(b'strictflags')
926 if feature and exceptions:
928 if feature and exceptions:
927 return feature not in exceptions
929 return feature not in exceptions
928 return True
930 return True
929
931
930 def username(self, acceptempty=False):
932 def username(self, acceptempty=False):
931 """Return default username to be used in commits.
933 """Return default username to be used in commits.
932
934
933 Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
935 Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
934 and stop searching if one of these is set.
936 and stop searching if one of these is set.
935 If not found and acceptempty is True, returns None.
937 If not found and acceptempty is True, returns None.
936 If not found and ui.askusername is True, ask the user, else use
938 If not found and ui.askusername is True, ask the user, else use
937 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
939 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
938 If no username could be found, raise an Abort error.
940 If no username could be found, raise an Abort error.
939 """
941 """
940 user = encoding.environ.get(b"HGUSER")
942 user = encoding.environ.get(b"HGUSER")
941 if user is None:
943 if user is None:
942 user = self.config(b"ui", b"username")
944 user = self.config(b"ui", b"username")
943 if user is not None:
945 if user is not None:
944 user = os.path.expandvars(user)
946 user = os.path.expandvars(user)
945 if user is None:
947 if user is None:
946 user = encoding.environ.get(b"EMAIL")
948 user = encoding.environ.get(b"EMAIL")
947 if user is None and acceptempty:
949 if user is None and acceptempty:
948 return user
950 return user
949 if user is None and self.configbool(b"ui", b"askusername"):
951 if user is None and self.configbool(b"ui", b"askusername"):
950 user = self.prompt(_(b"enter a commit username:"), default=None)
952 user = self.prompt(_(b"enter a commit username:"), default=None)
951 if user is None and not self.interactive():
953 if user is None and not self.interactive():
952 try:
954 try:
953 user = b'%s@%s' % (
955 user = b'%s@%s' % (
954 procutil.getuser(),
956 procutil.getuser(),
955 encoding.strtolocal(socket.getfqdn()),
957 encoding.strtolocal(socket.getfqdn()),
956 )
958 )
957 self.warn(_(b"no username found, using '%s' instead\n") % user)
959 self.warn(_(b"no username found, using '%s' instead\n") % user)
958 except KeyError:
960 except KeyError:
959 pass
961 pass
960 if not user:
962 if not user:
961 raise error.Abort(
963 raise error.Abort(
962 _(b'no username supplied'),
964 _(b'no username supplied'),
963 hint=_(b"use 'hg config --edit' " b'to set your username'),
965 hint=_(b"use 'hg config --edit' " b'to set your username'),
964 )
966 )
965 if b"\n" in user:
967 if b"\n" in user:
966 raise error.Abort(
968 raise error.Abort(
967 _(b"username %r contains a newline\n") % pycompat.bytestr(user)
969 _(b"username %r contains a newline\n") % pycompat.bytestr(user)
968 )
970 )
969 return user
971 return user
970
972
971 def shortuser(self, user):
973 def shortuser(self, user):
972 """Return a short representation of a user name or email address."""
974 """Return a short representation of a user name or email address."""
973 if not self.verbose:
975 if not self.verbose:
974 user = stringutil.shortuser(user)
976 user = stringutil.shortuser(user)
975 return user
977 return user
976
978
977 def expandpath(self, loc, default=None):
979 def expandpath(self, loc, default=None):
978 """Return repository location relative to cwd or from [paths]"""
980 """Return repository location relative to cwd or from [paths]"""
979 try:
981 try:
980 p = self.paths.getpath(loc)
982 p = self.paths.getpath(loc)
981 if p:
983 if p:
982 return p.rawloc
984 return p.rawloc
983 except error.RepoError:
985 except error.RepoError:
984 pass
986 pass
985
987
986 if default:
988 if default:
987 try:
989 try:
988 p = self.paths.getpath(default)
990 p = self.paths.getpath(default)
989 if p:
991 if p:
990 return p.rawloc
992 return p.rawloc
991 except error.RepoError:
993 except error.RepoError:
992 pass
994 pass
993
995
994 return loc
996 return loc
995
997
996 @util.propertycache
998 @util.propertycache
997 def paths(self):
999 def paths(self):
998 return paths(self)
1000 return paths(self)
999
1001
1000 @property
1002 @property
1001 def fout(self):
1003 def fout(self):
1002 return self._fout
1004 return self._fout
1003
1005
1004 @fout.setter
1006 @fout.setter
1005 def fout(self, f):
1007 def fout(self, f):
1006 self._fout = f
1008 self._fout = f
1007 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1009 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1008
1010
1009 @property
1011 @property
1010 def ferr(self):
1012 def ferr(self):
1011 return self._ferr
1013 return self._ferr
1012
1014
1013 @ferr.setter
1015 @ferr.setter
1014 def ferr(self, f):
1016 def ferr(self, f):
1015 self._ferr = f
1017 self._ferr = f
1016 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1018 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1017
1019
1018 @property
1020 @property
1019 def fin(self):
1021 def fin(self):
1020 return self._fin
1022 return self._fin
1021
1023
1022 @fin.setter
1024 @fin.setter
1023 def fin(self, f):
1025 def fin(self, f):
1024 self._fin = f
1026 self._fin = f
1025
1027
1026 @property
1028 @property
1027 def fmsg(self):
1029 def fmsg(self):
1028 """Stream dedicated for status/error messages; may be None if
1030 """Stream dedicated for status/error messages; may be None if
1029 fout/ferr are used"""
1031 fout/ferr are used"""
1030 return self._fmsg
1032 return self._fmsg
1031
1033
1032 @fmsg.setter
1034 @fmsg.setter
1033 def fmsg(self, f):
1035 def fmsg(self, f):
1034 self._fmsg = f
1036 self._fmsg = f
1035 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1037 self._fmsgout, self._fmsgerr = _selectmsgdests(self)
1036
1038
1037 def pushbuffer(self, error=False, subproc=False, labeled=False):
1039 def pushbuffer(self, error=False, subproc=False, labeled=False):
1038 """install a buffer to capture standard output of the ui object
1040 """install a buffer to capture standard output of the ui object
1039
1041
1040 If error is True, the error output will be captured too.
1042 If error is True, the error output will be captured too.
1041
1043
1042 If subproc is True, output from subprocesses (typically hooks) will be
1044 If subproc is True, output from subprocesses (typically hooks) will be
1043 captured too.
1045 captured too.
1044
1046
1045 If labeled is True, any labels associated with buffered
1047 If labeled is True, any labels associated with buffered
1046 output will be handled. By default, this has no effect
1048 output will be handled. By default, this has no effect
1047 on the output returned, but extensions and GUI tools may
1049 on the output returned, but extensions and GUI tools may
1048 handle this argument and returned styled output. If output
1050 handle this argument and returned styled output. If output
1049 is being buffered so it can be captured and parsed or
1051 is being buffered so it can be captured and parsed or
1050 processed, labeled should not be set to True.
1052 processed, labeled should not be set to True.
1051 """
1053 """
1052 self._buffers.append([])
1054 self._buffers.append([])
1053 self._bufferstates.append((error, subproc, labeled))
1055 self._bufferstates.append((error, subproc, labeled))
1054 self._bufferapplylabels = labeled
1056 self._bufferapplylabels = labeled
1055
1057
1056 def popbuffer(self):
1058 def popbuffer(self):
1057 '''pop the last buffer and return the buffered output'''
1059 '''pop the last buffer and return the buffered output'''
1058 self._bufferstates.pop()
1060 self._bufferstates.pop()
1059 if self._bufferstates:
1061 if self._bufferstates:
1060 self._bufferapplylabels = self._bufferstates[-1][2]
1062 self._bufferapplylabels = self._bufferstates[-1][2]
1061 else:
1063 else:
1062 self._bufferapplylabels = None
1064 self._bufferapplylabels = None
1063
1065
1064 return b"".join(self._buffers.pop())
1066 return b"".join(self._buffers.pop())
1065
1067
1066 def _isbuffered(self, dest):
1068 def _isbuffered(self, dest):
1067 if dest is self._fout:
1069 if dest is self._fout:
1068 return bool(self._buffers)
1070 return bool(self._buffers)
1069 if dest is self._ferr:
1071 if dest is self._ferr:
1070 return bool(self._bufferstates and self._bufferstates[-1][0])
1072 return bool(self._bufferstates and self._bufferstates[-1][0])
1071 return False
1073 return False
1072
1074
1073 def canwritewithoutlabels(self):
1075 def canwritewithoutlabels(self):
1074 '''check if write skips the label'''
1076 '''check if write skips the label'''
1075 if self._buffers and not self._bufferapplylabels:
1077 if self._buffers and not self._bufferapplylabels:
1076 return True
1078 return True
1077 return self._colormode is None
1079 return self._colormode is None
1078
1080
1079 def canbatchlabeledwrites(self):
1081 def canbatchlabeledwrites(self):
1080 '''check if write calls with labels are batchable'''
1082 '''check if write calls with labels are batchable'''
1081 # Windows color printing is special, see ``write``.
1083 # Windows color printing is special, see ``write``.
1082 return self._colormode != b'win32'
1084 return self._colormode != b'win32'
1083
1085
1084 def write(self, *args, **opts):
1086 def write(self, *args, **opts):
1085 '''write args to output
1087 '''write args to output
1086
1088
1087 By default, this method simply writes to the buffer or stdout.
1089 By default, this method simply writes to the buffer or stdout.
1088 Color mode can be set on the UI class to have the output decorated
1090 Color mode can be set on the UI class to have the output decorated
1089 with color modifier before being written to stdout.
1091 with color modifier before being written to stdout.
1090
1092
1091 The color used is controlled by an optional keyword argument, "label".
1093 The color used is controlled by an optional keyword argument, "label".
1092 This should be a string containing label names separated by space.
1094 This should be a string containing label names separated by space.
1093 Label names take the form of "topic.type". For example, ui.debug()
1095 Label names take the form of "topic.type". For example, ui.debug()
1094 issues a label of "ui.debug".
1096 issues a label of "ui.debug".
1095
1097
1096 Progress reports via stderr are normally cleared before writing as
1098 Progress reports via stderr are normally cleared before writing as
1097 stdout and stderr go to the same terminal. This can be skipped with
1099 stdout and stderr go to the same terminal. This can be skipped with
1098 the optional keyword argument "keepprogressbar". The progress bar
1100 the optional keyword argument "keepprogressbar". The progress bar
1099 will continue to occupy a partial line on stderr in that case.
1101 will continue to occupy a partial line on stderr in that case.
1100 This functionality is intended when Mercurial acts as data source
1102 This functionality is intended when Mercurial acts as data source
1101 in a pipe.
1103 in a pipe.
1102
1104
1103 When labeling output for a specific command, a label of
1105 When labeling output for a specific command, a label of
1104 "cmdname.type" is recommended. For example, status issues
1106 "cmdname.type" is recommended. For example, status issues
1105 a label of "status.modified" for modified files.
1107 a label of "status.modified" for modified files.
1106 '''
1108 '''
1107 dest = self._fout
1109 dest = self._fout
1108
1110
1109 # inlined _write() for speed
1111 # inlined _write() for speed
1110 if self._buffers:
1112 if self._buffers:
1111 label = opts.get('label', b'')
1113 label = opts.get('label', b'')
1112 if label and self._bufferapplylabels:
1114 if label and self._bufferapplylabels:
1113 self._buffers[-1].extend(self.label(a, label) for a in args)
1115 self._buffers[-1].extend(self.label(a, label) for a in args)
1114 else:
1116 else:
1115 self._buffers[-1].extend(args)
1117 self._buffers[-1].extend(args)
1116 return
1118 return
1117
1119
1118 # inlined _writenobuf() for speed
1120 # inlined _writenobuf() for speed
1119 if not opts.get('keepprogressbar', False):
1121 if not opts.get('keepprogressbar', False):
1120 self._progclear()
1122 self._progclear()
1121 msg = b''.join(args)
1123 msg = b''.join(args)
1122
1124
1123 # opencode timeblockedsection because this is a critical path
1125 # opencode timeblockedsection because this is a critical path
1124 starttime = util.timer()
1126 starttime = util.timer()
1125 try:
1127 try:
1126 if self._colormode == b'win32':
1128 if self._colormode == b'win32':
1127 # windows color printing is its own can of crab, defer to
1129 # windows color printing is its own can of crab, defer to
1128 # the color module and that is it.
1130 # the color module and that is it.
1129 color.win32print(self, dest.write, msg, **opts)
1131 color.win32print(self, dest.write, msg, **opts)
1130 else:
1132 else:
1131 if self._colormode is not None:
1133 if self._colormode is not None:
1132 label = opts.get('label', b'')
1134 label = opts.get('label', b'')
1133 msg = self.label(msg, label)
1135 msg = self.label(msg, label)
1134 dest.write(msg)
1136 dest.write(msg)
1135 except IOError as err:
1137 except IOError as err:
1136 raise error.StdioError(err)
1138 raise error.StdioError(err)
1137 finally:
1139 finally:
1138 self._blockedtimes[b'stdio_blocked'] += (
1140 self._blockedtimes[b'stdio_blocked'] += (
1139 util.timer() - starttime
1141 util.timer() - starttime
1140 ) * 1000
1142 ) * 1000
1141
1143
1142 def write_err(self, *args, **opts):
1144 def write_err(self, *args, **opts):
1143 self._write(self._ferr, *args, **opts)
1145 self._write(self._ferr, *args, **opts)
1144
1146
1145 def _write(self, dest, *args, **opts):
1147 def _write(self, dest, *args, **opts):
1146 # update write() as well if you touch this code
1148 # update write() as well if you touch this code
1147 if self._isbuffered(dest):
1149 if self._isbuffered(dest):
1148 label = opts.get('label', b'')
1150 label = opts.get('label', b'')
1149 if label and self._bufferapplylabels:
1151 if label and self._bufferapplylabels:
1150 self._buffers[-1].extend(self.label(a, label) for a in args)
1152 self._buffers[-1].extend(self.label(a, label) for a in args)
1151 else:
1153 else:
1152 self._buffers[-1].extend(args)
1154 self._buffers[-1].extend(args)
1153 else:
1155 else:
1154 self._writenobuf(dest, *args, **opts)
1156 self._writenobuf(dest, *args, **opts)
1155
1157
1156 def _writenobuf(self, dest, *args, **opts):
1158 def _writenobuf(self, dest, *args, **opts):
1157 # update write() as well if you touch this code
1159 # update write() as well if you touch this code
1158 if not opts.get('keepprogressbar', False):
1160 if not opts.get('keepprogressbar', False):
1159 self._progclear()
1161 self._progclear()
1160 msg = b''.join(args)
1162 msg = b''.join(args)
1161
1163
1162 # opencode timeblockedsection because this is a critical path
1164 # opencode timeblockedsection because this is a critical path
1163 starttime = util.timer()
1165 starttime = util.timer()
1164 try:
1166 try:
1165 if dest is self._ferr and not getattr(self._fout, 'closed', False):
1167 if dest is self._ferr and not getattr(self._fout, 'closed', False):
1166 self._fout.flush()
1168 self._fout.flush()
1167 if getattr(dest, 'structured', False):
1169 if getattr(dest, 'structured', False):
1168 # channel for machine-readable output with metadata, where
1170 # channel for machine-readable output with metadata, where
1169 # no extra colorization is necessary.
1171 # no extra colorization is necessary.
1170 dest.write(msg, **opts)
1172 dest.write(msg, **opts)
1171 elif self._colormode == b'win32':
1173 elif self._colormode == b'win32':
1172 # windows color printing is its own can of crab, defer to
1174 # windows color printing is its own can of crab, defer to
1173 # the color module and that is it.
1175 # the color module and that is it.
1174 color.win32print(self, dest.write, msg, **opts)
1176 color.win32print(self, dest.write, msg, **opts)
1175 else:
1177 else:
1176 if self._colormode is not None:
1178 if self._colormode is not None:
1177 label = opts.get('label', b'')
1179 label = opts.get('label', b'')
1178 msg = self.label(msg, label)
1180 msg = self.label(msg, label)
1179 dest.write(msg)
1181 dest.write(msg)
1180 # stderr may be buffered under win32 when redirected to files,
1182 # stderr may be buffered under win32 when redirected to files,
1181 # including stdout.
1183 # including stdout.
1182 if dest is self._ferr and not getattr(self._ferr, 'closed', False):
1184 if dest is self._ferr and not getattr(self._ferr, 'closed', False):
1183 dest.flush()
1185 dest.flush()
1184 except IOError as err:
1186 except IOError as err:
1185 if dest is self._ferr and err.errno in (
1187 if dest is self._ferr and err.errno in (
1186 errno.EPIPE,
1188 errno.EPIPE,
1187 errno.EIO,
1189 errno.EIO,
1188 errno.EBADF,
1190 errno.EBADF,
1189 ):
1191 ):
1190 # no way to report the error, so ignore it
1192 # no way to report the error, so ignore it
1191 return
1193 return
1192 raise error.StdioError(err)
1194 raise error.StdioError(err)
1193 finally:
1195 finally:
1194 self._blockedtimes[b'stdio_blocked'] += (
1196 self._blockedtimes[b'stdio_blocked'] += (
1195 util.timer() - starttime
1197 util.timer() - starttime
1196 ) * 1000
1198 ) * 1000
1197
1199
1198 def _writemsg(self, dest, *args, **opts):
1200 def _writemsg(self, dest, *args, **opts):
1199 _writemsgwith(self._write, dest, *args, **opts)
1201 _writemsgwith(self._write, dest, *args, **opts)
1200
1202
1201 def _writemsgnobuf(self, dest, *args, **opts):
1203 def _writemsgnobuf(self, dest, *args, **opts):
1202 _writemsgwith(self._writenobuf, dest, *args, **opts)
1204 _writemsgwith(self._writenobuf, dest, *args, **opts)
1203
1205
1204 def flush(self):
1206 def flush(self):
1205 # opencode timeblockedsection because this is a critical path
1207 # opencode timeblockedsection because this is a critical path
1206 starttime = util.timer()
1208 starttime = util.timer()
1207 try:
1209 try:
1208 try:
1210 try:
1209 self._fout.flush()
1211 self._fout.flush()
1210 except IOError as err:
1212 except IOError as err:
1211 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1213 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1212 raise error.StdioError(err)
1214 raise error.StdioError(err)
1213 finally:
1215 finally:
1214 try:
1216 try:
1215 self._ferr.flush()
1217 self._ferr.flush()
1216 except IOError as err:
1218 except IOError as err:
1217 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1219 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
1218 raise error.StdioError(err)
1220 raise error.StdioError(err)
1219 finally:
1221 finally:
1220 self._blockedtimes[b'stdio_blocked'] += (
1222 self._blockedtimes[b'stdio_blocked'] += (
1221 util.timer() - starttime
1223 util.timer() - starttime
1222 ) * 1000
1224 ) * 1000
1223
1225
1224 def _isatty(self, fh):
1226 def _isatty(self, fh):
1225 if self.configbool(b'ui', b'nontty'):
1227 if self.configbool(b'ui', b'nontty'):
1226 return False
1228 return False
1227 return procutil.isatty(fh)
1229 return procutil.isatty(fh)
1228
1230
1229 def protectfinout(self):
1231 def protectfinout(self):
1230 """Duplicate ui streams and redirect original if they are stdio
1232 """Duplicate ui streams and redirect original if they are stdio
1231
1233
1232 Returns (fin, fout) which point to the original ui fds, but may be
1234 Returns (fin, fout) which point to the original ui fds, but may be
1233 copy of them. The returned streams can be considered "owned" in that
1235 copy of them. The returned streams can be considered "owned" in that
1234 print(), exec(), etc. never reach to them.
1236 print(), exec(), etc. never reach to them.
1235 """
1237 """
1236 if self._finoutredirected:
1238 if self._finoutredirected:
1237 # if already redirected, protectstdio() would just create another
1239 # if already redirected, protectstdio() would just create another
1238 # nullfd pair, which is equivalent to returning self._fin/_fout.
1240 # nullfd pair, which is equivalent to returning self._fin/_fout.
1239 return self._fin, self._fout
1241 return self._fin, self._fout
1240 fin, fout = procutil.protectstdio(self._fin, self._fout)
1242 fin, fout = procutil.protectstdio(self._fin, self._fout)
1241 self._finoutredirected = (fin, fout) != (self._fin, self._fout)
1243 self._finoutredirected = (fin, fout) != (self._fin, self._fout)
1242 return fin, fout
1244 return fin, fout
1243
1245
1244 def restorefinout(self, fin, fout):
1246 def restorefinout(self, fin, fout):
1245 """Restore ui streams from possibly duplicated (fin, fout)"""
1247 """Restore ui streams from possibly duplicated (fin, fout)"""
1246 if (fin, fout) == (self._fin, self._fout):
1248 if (fin, fout) == (self._fin, self._fout):
1247 return
1249 return
1248 procutil.restorestdio(self._fin, self._fout, fin, fout)
1250 procutil.restorestdio(self._fin, self._fout, fin, fout)
1249 # protectfinout() won't create more than one duplicated streams,
1251 # protectfinout() won't create more than one duplicated streams,
1250 # so we can just turn the redirection flag off.
1252 # so we can just turn the redirection flag off.
1251 self._finoutredirected = False
1253 self._finoutredirected = False
1252
1254
1253 @contextlib.contextmanager
1255 @contextlib.contextmanager
1254 def protectedfinout(self):
1256 def protectedfinout(self):
1255 """Run code block with protected standard streams"""
1257 """Run code block with protected standard streams"""
1256 fin, fout = self.protectfinout()
1258 fin, fout = self.protectfinout()
1257 try:
1259 try:
1258 yield fin, fout
1260 yield fin, fout
1259 finally:
1261 finally:
1260 self.restorefinout(fin, fout)
1262 self.restorefinout(fin, fout)
1261
1263
1262 def disablepager(self):
1264 def disablepager(self):
1263 self._disablepager = True
1265 self._disablepager = True
1264
1266
1265 def pager(self, command):
1267 def pager(self, command):
1266 """Start a pager for subsequent command output.
1268 """Start a pager for subsequent command output.
1267
1269
1268 Commands which produce a long stream of output should call
1270 Commands which produce a long stream of output should call
1269 this function to activate the user's preferred pagination
1271 this function to activate the user's preferred pagination
1270 mechanism (which may be no pager). Calling this function
1272 mechanism (which may be no pager). Calling this function
1271 precludes any future use of interactive functionality, such as
1273 precludes any future use of interactive functionality, such as
1272 prompting the user or activating curses.
1274 prompting the user or activating curses.
1273
1275
1274 Args:
1276 Args:
1275 command: The full, non-aliased name of the command. That is, "log"
1277 command: The full, non-aliased name of the command. That is, "log"
1276 not "history, "summary" not "summ", etc.
1278 not "history, "summary" not "summ", etc.
1277 """
1279 """
1278 if self._disablepager or self.pageractive:
1280 if self._disablepager or self.pageractive:
1279 # how pager should do is already determined
1281 # how pager should do is already determined
1280 return
1282 return
1281
1283
1282 if not command.startswith(b'internal-always-') and (
1284 if not command.startswith(b'internal-always-') and (
1283 # explicit --pager=on (= 'internal-always-' prefix) should
1285 # explicit --pager=on (= 'internal-always-' prefix) should
1284 # take precedence over disabling factors below
1286 # take precedence over disabling factors below
1285 command in self.configlist(b'pager', b'ignore')
1287 command in self.configlist(b'pager', b'ignore')
1286 or not self.configbool(b'ui', b'paginate')
1288 or not self.configbool(b'ui', b'paginate')
1287 or not self.configbool(b'pager', b'attend-' + command, True)
1289 or not self.configbool(b'pager', b'attend-' + command, True)
1288 or encoding.environ.get(b'TERM') == b'dumb'
1290 or encoding.environ.get(b'TERM') == b'dumb'
1289 # TODO: if we want to allow HGPLAINEXCEPT=pager,
1291 # TODO: if we want to allow HGPLAINEXCEPT=pager,
1290 # formatted() will need some adjustment.
1292 # formatted() will need some adjustment.
1291 or not self.formatted()
1293 or not self.formatted()
1292 or self.plain()
1294 or self.plain()
1293 or self._buffers
1295 or self._buffers
1294 # TODO: expose debugger-enabled on the UI object
1296 # TODO: expose debugger-enabled on the UI object
1295 or b'--debugger' in pycompat.sysargv
1297 or b'--debugger' in pycompat.sysargv
1296 ):
1298 ):
1297 # We only want to paginate if the ui appears to be
1299 # We only want to paginate if the ui appears to be
1298 # interactive, the user didn't say HGPLAIN or
1300 # interactive, the user didn't say HGPLAIN or
1299 # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
1301 # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
1300 return
1302 return
1301
1303
1302 pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager)
1304 pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager)
1303 if not pagercmd:
1305 if not pagercmd:
1304 return
1306 return
1305
1307
1306 pagerenv = {}
1308 pagerenv = {}
1307 for name, value in rcutil.defaultpagerenv().items():
1309 for name, value in rcutil.defaultpagerenv().items():
1308 if name not in encoding.environ:
1310 if name not in encoding.environ:
1309 pagerenv[name] = value
1311 pagerenv[name] = value
1310
1312
1311 self.debug(
1313 self.debug(
1312 b'starting pager for command %s\n' % stringutil.pprint(command)
1314 b'starting pager for command %s\n' % stringutil.pprint(command)
1313 )
1315 )
1314 self.flush()
1316 self.flush()
1315
1317
1316 wasformatted = self.formatted()
1318 wasformatted = self.formatted()
1317 if util.safehasattr(signal, b"SIGPIPE"):
1319 if util.safehasattr(signal, b"SIGPIPE"):
1318 signal.signal(signal.SIGPIPE, _catchterm)
1320 signal.signal(signal.SIGPIPE, _catchterm)
1319 if self._runpager(pagercmd, pagerenv):
1321 if self._runpager(pagercmd, pagerenv):
1320 self.pageractive = True
1322 self.pageractive = True
1321 # Preserve the formatted-ness of the UI. This is important
1323 # Preserve the formatted-ness of the UI. This is important
1322 # because we mess with stdout, which might confuse
1324 # because we mess with stdout, which might confuse
1323 # auto-detection of things being formatted.
1325 # auto-detection of things being formatted.
1324 self.setconfig(b'ui', b'formatted', wasformatted, b'pager')
1326 self.setconfig(b'ui', b'formatted', wasformatted, b'pager')
1325 self.setconfig(b'ui', b'interactive', False, b'pager')
1327 self.setconfig(b'ui', b'interactive', False, b'pager')
1326
1328
1327 # If pagermode differs from color.mode, reconfigure color now that
1329 # If pagermode differs from color.mode, reconfigure color now that
1328 # pageractive is set.
1330 # pageractive is set.
1329 cm = self._colormode
1331 cm = self._colormode
1330 if cm != self.config(b'color', b'pagermode', cm):
1332 if cm != self.config(b'color', b'pagermode', cm):
1331 color.setup(self)
1333 color.setup(self)
1332 else:
1334 else:
1333 # If the pager can't be spawned in dispatch when --pager=on is
1335 # If the pager can't be spawned in dispatch when --pager=on is
1334 # given, don't try again when the command runs, to avoid a duplicate
1336 # given, don't try again when the command runs, to avoid a duplicate
1335 # warning about a missing pager command.
1337 # warning about a missing pager command.
1336 self.disablepager()
1338 self.disablepager()
1337
1339
1338 def _runpager(self, command, env=None):
1340 def _runpager(self, command, env=None):
1339 """Actually start the pager and set up file descriptors.
1341 """Actually start the pager and set up file descriptors.
1340
1342
1341 This is separate in part so that extensions (like chg) can
1343 This is separate in part so that extensions (like chg) can
1342 override how a pager is invoked.
1344 override how a pager is invoked.
1343 """
1345 """
1344 if command == b'cat':
1346 if command == b'cat':
1345 # Save ourselves some work.
1347 # Save ourselves some work.
1346 return False
1348 return False
1347 # If the command doesn't contain any of these characters, we
1349 # If the command doesn't contain any of these characters, we
1348 # assume it's a binary and exec it directly. This means for
1350 # assume it's a binary and exec it directly. This means for
1349 # simple pager command configurations, we can degrade
1351 # simple pager command configurations, we can degrade
1350 # gracefully and tell the user about their broken pager.
1352 # gracefully and tell the user about their broken pager.
1351 shell = any(c in command for c in b"|&;<>()$`\\\"' \t\n*?[#~=%")
1353 shell = any(c in command for c in b"|&;<>()$`\\\"' \t\n*?[#~=%")
1352
1354
1353 if pycompat.iswindows and not shell:
1355 if pycompat.iswindows and not shell:
1354 # Window's built-in `more` cannot be invoked with shell=False, but
1356 # Window's built-in `more` cannot be invoked with shell=False, but
1355 # its `more.com` can. Hide this implementation detail from the
1357 # its `more.com` can. Hide this implementation detail from the
1356 # user so we can also get sane bad PAGER behavior. MSYS has
1358 # user so we can also get sane bad PAGER behavior. MSYS has
1357 # `more.exe`, so do a cmd.exe style resolution of the executable to
1359 # `more.exe`, so do a cmd.exe style resolution of the executable to
1358 # determine which one to use.
1360 # determine which one to use.
1359 fullcmd = procutil.findexe(command)
1361 fullcmd = procutil.findexe(command)
1360 if not fullcmd:
1362 if not fullcmd:
1361 self.warn(
1363 self.warn(
1362 _(b"missing pager command '%s', skipping pager\n") % command
1364 _(b"missing pager command '%s', skipping pager\n") % command
1363 )
1365 )
1364 return False
1366 return False
1365
1367
1366 command = fullcmd
1368 command = fullcmd
1367
1369
1368 try:
1370 try:
1369 pager = subprocess.Popen(
1371 pager = subprocess.Popen(
1370 procutil.tonativestr(command),
1372 procutil.tonativestr(command),
1371 shell=shell,
1373 shell=shell,
1372 bufsize=-1,
1374 bufsize=-1,
1373 close_fds=procutil.closefds,
1375 close_fds=procutil.closefds,
1374 stdin=subprocess.PIPE,
1376 stdin=subprocess.PIPE,
1375 stdout=procutil.stdout,
1377 stdout=procutil.stdout,
1376 stderr=procutil.stderr,
1378 stderr=procutil.stderr,
1377 env=procutil.tonativeenv(procutil.shellenviron(env)),
1379 env=procutil.tonativeenv(procutil.shellenviron(env)),
1378 )
1380 )
1379 except OSError as e:
1381 except OSError as e:
1380 if e.errno == errno.ENOENT and not shell:
1382 if e.errno == errno.ENOENT and not shell:
1381 self.warn(
1383 self.warn(
1382 _(b"missing pager command '%s', skipping pager\n") % command
1384 _(b"missing pager command '%s', skipping pager\n") % command
1383 )
1385 )
1384 return False
1386 return False
1385 raise
1387 raise
1386
1388
1387 # back up original file descriptors
1389 # back up original file descriptors
1388 stdoutfd = os.dup(procutil.stdout.fileno())
1390 stdoutfd = os.dup(procutil.stdout.fileno())
1389 stderrfd = os.dup(procutil.stderr.fileno())
1391 stderrfd = os.dup(procutil.stderr.fileno())
1390
1392
1391 os.dup2(pager.stdin.fileno(), procutil.stdout.fileno())
1393 os.dup2(pager.stdin.fileno(), procutil.stdout.fileno())
1392 if self._isatty(procutil.stderr):
1394 if self._isatty(procutil.stderr):
1393 os.dup2(pager.stdin.fileno(), procutil.stderr.fileno())
1395 os.dup2(pager.stdin.fileno(), procutil.stderr.fileno())
1394
1396
1395 @self.atexit
1397 @self.atexit
1396 def killpager():
1398 def killpager():
1397 if util.safehasattr(signal, b"SIGINT"):
1399 if util.safehasattr(signal, b"SIGINT"):
1398 signal.signal(signal.SIGINT, signal.SIG_IGN)
1400 signal.signal(signal.SIGINT, signal.SIG_IGN)
1399 # restore original fds, closing pager.stdin copies in the process
1401 # restore original fds, closing pager.stdin copies in the process
1400 os.dup2(stdoutfd, procutil.stdout.fileno())
1402 os.dup2(stdoutfd, procutil.stdout.fileno())
1401 os.dup2(stderrfd, procutil.stderr.fileno())
1403 os.dup2(stderrfd, procutil.stderr.fileno())
1402 pager.stdin.close()
1404 pager.stdin.close()
1403 pager.wait()
1405 pager.wait()
1404
1406
1405 return True
1407 return True
1406
1408
1407 @property
1409 @property
1408 def _exithandlers(self):
1410 def _exithandlers(self):
1409 return _reqexithandlers
1411 return _reqexithandlers
1410
1412
1411 def atexit(self, func, *args, **kwargs):
1413 def atexit(self, func, *args, **kwargs):
1412 '''register a function to run after dispatching a request
1414 '''register a function to run after dispatching a request
1413
1415
1414 Handlers do not stay registered across request boundaries.'''
1416 Handlers do not stay registered across request boundaries.'''
1415 self._exithandlers.append((func, args, kwargs))
1417 self._exithandlers.append((func, args, kwargs))
1416 return func
1418 return func
1417
1419
1418 def interface(self, feature):
1420 def interface(self, feature):
1419 """what interface to use for interactive console features?
1421 """what interface to use for interactive console features?
1420
1422
1421 The interface is controlled by the value of `ui.interface` but also by
1423 The interface is controlled by the value of `ui.interface` but also by
1422 the value of feature-specific configuration. For example:
1424 the value of feature-specific configuration. For example:
1423
1425
1424 ui.interface.histedit = text
1426 ui.interface.histedit = text
1425 ui.interface.chunkselector = curses
1427 ui.interface.chunkselector = curses
1426
1428
1427 Here the features are "histedit" and "chunkselector".
1429 Here the features are "histedit" and "chunkselector".
1428
1430
1429 The configuration above means that the default interfaces for commands
1431 The configuration above means that the default interfaces for commands
1430 is curses, the interface for histedit is text and the interface for
1432 is curses, the interface for histedit is text and the interface for
1431 selecting chunk is crecord (the best curses interface available).
1433 selecting chunk is crecord (the best curses interface available).
1432
1434
1433 Consider the following example:
1435 Consider the following example:
1434 ui.interface = curses
1436 ui.interface = curses
1435 ui.interface.histedit = text
1437 ui.interface.histedit = text
1436
1438
1437 Then histedit will use the text interface and chunkselector will use
1439 Then histedit will use the text interface and chunkselector will use
1438 the default curses interface (crecord at the moment).
1440 the default curses interface (crecord at the moment).
1439 """
1441 """
1440 alldefaults = frozenset([b"text", b"curses"])
1442 alldefaults = frozenset([b"text", b"curses"])
1441
1443
1442 featureinterfaces = {
1444 featureinterfaces = {
1443 b"chunkselector": [b"text", b"curses",],
1445 b"chunkselector": [b"text", b"curses",],
1444 b"histedit": [b"text", b"curses",],
1446 b"histedit": [b"text", b"curses",],
1445 }
1447 }
1446
1448
1447 # Feature-specific interface
1449 # Feature-specific interface
1448 if feature not in featureinterfaces.keys():
1450 if feature not in featureinterfaces.keys():
1449 # Programming error, not user error
1451 # Programming error, not user error
1450 raise ValueError(b"Unknown feature requested %s" % feature)
1452 raise ValueError(b"Unknown feature requested %s" % feature)
1451
1453
1452 availableinterfaces = frozenset(featureinterfaces[feature])
1454 availableinterfaces = frozenset(featureinterfaces[feature])
1453 if alldefaults > availableinterfaces:
1455 if alldefaults > availableinterfaces:
1454 # Programming error, not user error. We need a use case to
1456 # Programming error, not user error. We need a use case to
1455 # define the right thing to do here.
1457 # define the right thing to do here.
1456 raise ValueError(
1458 raise ValueError(
1457 b"Feature %s does not handle all default interfaces" % feature
1459 b"Feature %s does not handle all default interfaces" % feature
1458 )
1460 )
1459
1461
1460 if self.plain() or encoding.environ.get(b'TERM') == b'dumb':
1462 if self.plain() or encoding.environ.get(b'TERM') == b'dumb':
1461 return b"text"
1463 return b"text"
1462
1464
1463 # Default interface for all the features
1465 # Default interface for all the features
1464 defaultinterface = b"text"
1466 defaultinterface = b"text"
1465 i = self.config(b"ui", b"interface")
1467 i = self.config(b"ui", b"interface")
1466 if i in alldefaults:
1468 if i in alldefaults:
1467 defaultinterface = i
1469 defaultinterface = i
1468
1470
1469 choseninterface = defaultinterface
1471 choseninterface = defaultinterface
1470 f = self.config(b"ui", b"interface.%s" % feature)
1472 f = self.config(b"ui", b"interface.%s" % feature)
1471 if f in availableinterfaces:
1473 if f in availableinterfaces:
1472 choseninterface = f
1474 choseninterface = f
1473
1475
1474 if i is not None and defaultinterface != i:
1476 if i is not None and defaultinterface != i:
1475 if f is not None:
1477 if f is not None:
1476 self.warn(_(b"invalid value for ui.interface: %s\n") % (i,))
1478 self.warn(_(b"invalid value for ui.interface: %s\n") % (i,))
1477 else:
1479 else:
1478 self.warn(
1480 self.warn(
1479 _(b"invalid value for ui.interface: %s (using %s)\n")
1481 _(b"invalid value for ui.interface: %s (using %s)\n")
1480 % (i, choseninterface)
1482 % (i, choseninterface)
1481 )
1483 )
1482 if f is not None and choseninterface != f:
1484 if f is not None and choseninterface != f:
1483 self.warn(
1485 self.warn(
1484 _(b"invalid value for ui.interface.%s: %s (using %s)\n")
1486 _(b"invalid value for ui.interface.%s: %s (using %s)\n")
1485 % (feature, f, choseninterface)
1487 % (feature, f, choseninterface)
1486 )
1488 )
1487
1489
1488 return choseninterface
1490 return choseninterface
1489
1491
1490 def interactive(self):
1492 def interactive(self):
1491 '''is interactive input allowed?
1493 '''is interactive input allowed?
1492
1494
1493 An interactive session is a session where input can be reasonably read
1495 An interactive session is a session where input can be reasonably read
1494 from `sys.stdin'. If this function returns false, any attempt to read
1496 from `sys.stdin'. If this function returns false, any attempt to read
1495 from stdin should fail with an error, unless a sensible default has been
1497 from stdin should fail with an error, unless a sensible default has been
1496 specified.
1498 specified.
1497
1499
1498 Interactiveness is triggered by the value of the `ui.interactive'
1500 Interactiveness is triggered by the value of the `ui.interactive'
1499 configuration variable or - if it is unset - when `sys.stdin' points
1501 configuration variable or - if it is unset - when `sys.stdin' points
1500 to a terminal device.
1502 to a terminal device.
1501
1503
1502 This function refers to input only; for output, see `ui.formatted()'.
1504 This function refers to input only; for output, see `ui.formatted()'.
1503 '''
1505 '''
1504 i = self.configbool(b"ui", b"interactive")
1506 i = self.configbool(b"ui", b"interactive")
1505 if i is None:
1507 if i is None:
1506 # some environments replace stdin without implementing isatty
1508 # some environments replace stdin without implementing isatty
1507 # usually those are non-interactive
1509 # usually those are non-interactive
1508 return self._isatty(self._fin)
1510 return self._isatty(self._fin)
1509
1511
1510 return i
1512 return i
1511
1513
1512 def termwidth(self):
1514 def termwidth(self):
1513 '''how wide is the terminal in columns?
1515 '''how wide is the terminal in columns?
1514 '''
1516 '''
1515 if b'COLUMNS' in encoding.environ:
1517 if b'COLUMNS' in encoding.environ:
1516 try:
1518 try:
1517 return int(encoding.environ[b'COLUMNS'])
1519 return int(encoding.environ[b'COLUMNS'])
1518 except ValueError:
1520 except ValueError:
1519 pass
1521 pass
1520 return scmutil.termsize(self)[0]
1522 return scmutil.termsize(self)[0]
1521
1523
1522 def formatted(self):
1524 def formatted(self):
1523 '''should formatted output be used?
1525 '''should formatted output be used?
1524
1526
1525 It is often desirable to format the output to suite the output medium.
1527 It is often desirable to format the output to suite the output medium.
1526 Examples of this are truncating long lines or colorizing messages.
1528 Examples of this are truncating long lines or colorizing messages.
1527 However, this is not often not desirable when piping output into other
1529 However, this is not often not desirable when piping output into other
1528 utilities, e.g. `grep'.
1530 utilities, e.g. `grep'.
1529
1531
1530 Formatted output is triggered by the value of the `ui.formatted'
1532 Formatted output is triggered by the value of the `ui.formatted'
1531 configuration variable or - if it is unset - when `sys.stdout' points
1533 configuration variable or - if it is unset - when `sys.stdout' points
1532 to a terminal device. Please note that `ui.formatted' should be
1534 to a terminal device. Please note that `ui.formatted' should be
1533 considered an implementation detail; it is not intended for use outside
1535 considered an implementation detail; it is not intended for use outside
1534 Mercurial or its extensions.
1536 Mercurial or its extensions.
1535
1537
1536 This function refers to output only; for input, see `ui.interactive()'.
1538 This function refers to output only; for input, see `ui.interactive()'.
1537 This function always returns false when in plain mode, see `ui.plain()'.
1539 This function always returns false when in plain mode, see `ui.plain()'.
1538 '''
1540 '''
1539 if self.plain():
1541 if self.plain():
1540 return False
1542 return False
1541
1543
1542 i = self.configbool(b"ui", b"formatted")
1544 i = self.configbool(b"ui", b"formatted")
1543 if i is None:
1545 if i is None:
1544 # some environments replace stdout without implementing isatty
1546 # some environments replace stdout without implementing isatty
1545 # usually those are non-interactive
1547 # usually those are non-interactive
1546 return self._isatty(self._fout)
1548 return self._isatty(self._fout)
1547
1549
1548 return i
1550 return i
1549
1551
1550 def _readline(self, prompt=b' ', promptopts=None):
1552 def _readline(self, prompt=b' ', promptopts=None):
1551 # Replacing stdin/stdout temporarily is a hard problem on Python 3
1553 # Replacing stdin/stdout temporarily is a hard problem on Python 3
1552 # because they have to be text streams with *no buffering*. Instead,
1554 # because they have to be text streams with *no buffering*. Instead,
1553 # we use rawinput() only if call_readline() will be invoked by
1555 # we use rawinput() only if call_readline() will be invoked by
1554 # PyOS_Readline(), so no I/O will be made at Python layer.
1556 # PyOS_Readline(), so no I/O will be made at Python layer.
1555 usereadline = (
1557 usereadline = (
1556 self._isatty(self._fin)
1558 self._isatty(self._fin)
1557 and self._isatty(self._fout)
1559 and self._isatty(self._fout)
1558 and procutil.isstdin(self._fin)
1560 and procutil.isstdin(self._fin)
1559 and procutil.isstdout(self._fout)
1561 and procutil.isstdout(self._fout)
1560 )
1562 )
1561 if usereadline:
1563 if usereadline:
1562 try:
1564 try:
1563 # magically add command line editing support, where
1565 # magically add command line editing support, where
1564 # available
1566 # available
1565 import readline
1567 import readline
1566
1568
1567 # force demandimport to really load the module
1569 # force demandimport to really load the module
1568 readline.read_history_file
1570 readline.read_history_file
1569 # windows sometimes raises something other than ImportError
1571 # windows sometimes raises something other than ImportError
1570 except Exception:
1572 except Exception:
1571 usereadline = False
1573 usereadline = False
1572
1574
1573 if self._colormode == b'win32' or not usereadline:
1575 if self._colormode == b'win32' or not usereadline:
1574 if not promptopts:
1576 if not promptopts:
1575 promptopts = {}
1577 promptopts = {}
1576 self._writemsgnobuf(
1578 self._writemsgnobuf(
1577 self._fmsgout, prompt, type=b'prompt', **promptopts
1579 self._fmsgout, prompt, type=b'prompt', **promptopts
1578 )
1580 )
1579 self.flush()
1581 self.flush()
1580 prompt = b' '
1582 prompt = b' '
1581 else:
1583 else:
1582 prompt = self.label(prompt, b'ui.prompt') + b' '
1584 prompt = self.label(prompt, b'ui.prompt') + b' '
1583
1585
1584 # prompt ' ' must exist; otherwise readline may delete entire line
1586 # prompt ' ' must exist; otherwise readline may delete entire line
1585 # - http://bugs.python.org/issue12833
1587 # - http://bugs.python.org/issue12833
1586 with self.timeblockedsection(b'stdio'):
1588 with self.timeblockedsection(b'stdio'):
1587 if usereadline:
1589 if usereadline:
1588 self.flush()
1590 self.flush()
1589 prompt = encoding.strfromlocal(prompt)
1591 prompt = encoding.strfromlocal(prompt)
1590 line = encoding.strtolocal(pycompat.rawinput(prompt))
1592 line = encoding.strtolocal(pycompat.rawinput(prompt))
1591 # When stdin is in binary mode on Windows, it can cause
1593 # When stdin is in binary mode on Windows, it can cause
1592 # raw_input() to emit an extra trailing carriage return
1594 # raw_input() to emit an extra trailing carriage return
1593 if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'):
1595 if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'):
1594 line = line[:-1]
1596 line = line[:-1]
1595 else:
1597 else:
1596 self._fout.write(pycompat.bytestr(prompt))
1598 self._fout.write(pycompat.bytestr(prompt))
1597 self._fout.flush()
1599 self._fout.flush()
1598 line = self._fin.readline()
1600 line = self._fin.readline()
1599 if not line:
1601 if not line:
1600 raise EOFError
1602 raise EOFError
1601 line = line.rstrip(pycompat.oslinesep)
1603 line = line.rstrip(pycompat.oslinesep)
1602
1604
1603 return line
1605 return line
1604
1606
1605 def prompt(self, msg, default=b"y"):
1607 def prompt(self, msg, default=b"y"):
1606 """Prompt user with msg, read response.
1608 """Prompt user with msg, read response.
1607 If ui is not interactive, the default is returned.
1609 If ui is not interactive, the default is returned.
1608 """
1610 """
1609 return self._prompt(msg, default=default)
1611 return self._prompt(msg, default=default)
1610
1612
1611 def _prompt(self, msg, **opts):
1613 def _prompt(self, msg, **opts):
1612 default = opts['default']
1614 default = opts['default']
1613 if not self.interactive():
1615 if not self.interactive():
1614 self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts)
1616 self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts)
1615 self._writemsg(
1617 self._writemsg(
1616 self._fmsgout, default or b'', b"\n", type=b'promptecho'
1618 self._fmsgout, default or b'', b"\n", type=b'promptecho'
1617 )
1619 )
1618 return default
1620 return default
1619 try:
1621 try:
1620 r = self._readline(prompt=msg, promptopts=opts)
1622 r = self._readline(prompt=msg, promptopts=opts)
1621 if not r:
1623 if not r:
1622 r = default
1624 r = default
1623 if self.configbool(b'ui', b'promptecho'):
1625 if self.configbool(b'ui', b'promptecho'):
1624 self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
1626 self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
1625 return r
1627 return r
1626 except EOFError:
1628 except EOFError:
1627 raise error.ResponseExpected()
1629 raise error.ResponseExpected()
1628
1630
1629 @staticmethod
1631 @staticmethod
1630 def extractchoices(prompt):
1632 def extractchoices(prompt):
1631 """Extract prompt message and list of choices from specified prompt.
1633 """Extract prompt message and list of choices from specified prompt.
1632
1634
1633 This returns tuple "(message, choices)", and "choices" is the
1635 This returns tuple "(message, choices)", and "choices" is the
1634 list of tuple "(response character, text without &)".
1636 list of tuple "(response character, text without &)".
1635
1637
1636 >>> ui.extractchoices(b"awake? $$ &Yes $$ &No")
1638 >>> ui.extractchoices(b"awake? $$ &Yes $$ &No")
1637 ('awake? ', [('y', 'Yes'), ('n', 'No')])
1639 ('awake? ', [('y', 'Yes'), ('n', 'No')])
1638 >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No")
1640 >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No")
1639 ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
1641 ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
1640 >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o")
1642 >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o")
1641 ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
1643 ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
1642 """
1644 """
1643
1645
1644 # Sadly, the prompt string may have been built with a filename
1646 # Sadly, the prompt string may have been built with a filename
1645 # containing "$$" so let's try to find the first valid-looking
1647 # containing "$$" so let's try to find the first valid-looking
1646 # prompt to start parsing. Sadly, we also can't rely on
1648 # prompt to start parsing. Sadly, we also can't rely on
1647 # choices containing spaces, ASCII, or basically anything
1649 # choices containing spaces, ASCII, or basically anything
1648 # except an ampersand followed by a character.
1650 # except an ampersand followed by a character.
1649 m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt)
1651 m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt)
1650 msg = m.group(1)
1652 msg = m.group(1)
1651 choices = [p.strip(b' ') for p in m.group(2).split(b'$$')]
1653 choices = [p.strip(b' ') for p in m.group(2).split(b'$$')]
1652
1654
1653 def choicetuple(s):
1655 def choicetuple(s):
1654 ampidx = s.index(b'&')
1656 ampidx = s.index(b'&')
1655 return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1)
1657 return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1)
1656
1658
1657 return (msg, [choicetuple(s) for s in choices])
1659 return (msg, [choicetuple(s) for s in choices])
1658
1660
1659 def promptchoice(self, prompt, default=0):
1661 def promptchoice(self, prompt, default=0):
1660 """Prompt user with a message, read response, and ensure it matches
1662 """Prompt user with a message, read response, and ensure it matches
1661 one of the provided choices. The prompt is formatted as follows:
1663 one of the provided choices. The prompt is formatted as follows:
1662
1664
1663 "would you like fries with that (Yn)? $$ &Yes $$ &No"
1665 "would you like fries with that (Yn)? $$ &Yes $$ &No"
1664
1666
1665 The index of the choice is returned. Responses are case
1667 The index of the choice is returned. Responses are case
1666 insensitive. If ui is not interactive, the default is
1668 insensitive. If ui is not interactive, the default is
1667 returned.
1669 returned.
1668 """
1670 """
1669
1671
1670 msg, choices = self.extractchoices(prompt)
1672 msg, choices = self.extractchoices(prompt)
1671 resps = [r for r, t in choices]
1673 resps = [r for r, t in choices]
1672 while True:
1674 while True:
1673 r = self._prompt(msg, default=resps[default], choices=choices)
1675 r = self._prompt(msg, default=resps[default], choices=choices)
1674 if r.lower() in resps:
1676 if r.lower() in resps:
1675 return resps.index(r.lower())
1677 return resps.index(r.lower())
1676 # TODO: shouldn't it be a warning?
1678 # TODO: shouldn't it be a warning?
1677 self._writemsg(self._fmsgout, _(b"unrecognized response\n"))
1679 self._writemsg(self._fmsgout, _(b"unrecognized response\n"))
1678
1680
1679 def getpass(self, prompt=None, default=None):
1681 def getpass(self, prompt=None, default=None):
1680 if not self.interactive():
1682 if not self.interactive():
1681 return default
1683 return default
1682 try:
1684 try:
1683 self._writemsg(
1685 self._writemsg(
1684 self._fmsgerr,
1686 self._fmsgerr,
1685 prompt or _(b'password: '),
1687 prompt or _(b'password: '),
1686 type=b'prompt',
1688 type=b'prompt',
1687 password=True,
1689 password=True,
1688 )
1690 )
1689 # disable getpass() only if explicitly specified. it's still valid
1691 # disable getpass() only if explicitly specified. it's still valid
1690 # to interact with tty even if fin is not a tty.
1692 # to interact with tty even if fin is not a tty.
1691 with self.timeblockedsection(b'stdio'):
1693 with self.timeblockedsection(b'stdio'):
1692 if self.configbool(b'ui', b'nontty'):
1694 if self.configbool(b'ui', b'nontty'):
1693 l = self._fin.readline()
1695 l = self._fin.readline()
1694 if not l:
1696 if not l:
1695 raise EOFError
1697 raise EOFError
1696 return l.rstrip(b'\n')
1698 return l.rstrip(b'\n')
1697 else:
1699 else:
1698 return getpass.getpass('')
1700 return getpass.getpass('')
1699 except EOFError:
1701 except EOFError:
1700 raise error.ResponseExpected()
1702 raise error.ResponseExpected()
1701
1703
1702 def status(self, *msg, **opts):
1704 def status(self, *msg, **opts):
1703 '''write status message to output (if ui.quiet is False)
1705 '''write status message to output (if ui.quiet is False)
1704
1706
1705 This adds an output label of "ui.status".
1707 This adds an output label of "ui.status".
1706 '''
1708 '''
1707 if not self.quiet:
1709 if not self.quiet:
1708 self._writemsg(self._fmsgout, type=b'status', *msg, **opts)
1710 self._writemsg(self._fmsgout, type=b'status', *msg, **opts)
1709
1711
1710 def warn(self, *msg, **opts):
1712 def warn(self, *msg, **opts):
1711 '''write warning message to output (stderr)
1713 '''write warning message to output (stderr)
1712
1714
1713 This adds an output label of "ui.warning".
1715 This adds an output label of "ui.warning".
1714 '''
1716 '''
1715 self._writemsg(self._fmsgerr, type=b'warning', *msg, **opts)
1717 self._writemsg(self._fmsgerr, type=b'warning', *msg, **opts)
1716
1718
1717 def error(self, *msg, **opts):
1719 def error(self, *msg, **opts):
1718 '''write error message to output (stderr)
1720 '''write error message to output (stderr)
1719
1721
1720 This adds an output label of "ui.error".
1722 This adds an output label of "ui.error".
1721 '''
1723 '''
1722 self._writemsg(self._fmsgerr, type=b'error', *msg, **opts)
1724 self._writemsg(self._fmsgerr, type=b'error', *msg, **opts)
1723
1725
1724 def note(self, *msg, **opts):
1726 def note(self, *msg, **opts):
1725 '''write note to output (if ui.verbose is True)
1727 '''write note to output (if ui.verbose is True)
1726
1728
1727 This adds an output label of "ui.note".
1729 This adds an output label of "ui.note".
1728 '''
1730 '''
1729 if self.verbose:
1731 if self.verbose:
1730 self._writemsg(self._fmsgout, type=b'note', *msg, **opts)
1732 self._writemsg(self._fmsgout, type=b'note', *msg, **opts)
1731
1733
1732 def debug(self, *msg, **opts):
1734 def debug(self, *msg, **opts):
1733 '''write debug message to output (if ui.debugflag is True)
1735 '''write debug message to output (if ui.debugflag is True)
1734
1736
1735 This adds an output label of "ui.debug".
1737 This adds an output label of "ui.debug".
1736 '''
1738 '''
1737 if self.debugflag:
1739 if self.debugflag:
1738 self._writemsg(self._fmsgout, type=b'debug', *msg, **opts)
1740 self._writemsg(self._fmsgout, type=b'debug', *msg, **opts)
1739 self.log(b'debug', b'%s', b''.join(msg))
1741 self.log(b'debug', b'%s', b''.join(msg))
1740
1742
1741 # Aliases to defeat check-code.
1743 # Aliases to defeat check-code.
1742 statusnoi18n = status
1744 statusnoi18n = status
1743 notenoi18n = note
1745 notenoi18n = note
1744 warnnoi18n = warn
1746 warnnoi18n = warn
1745 writenoi18n = write
1747 writenoi18n = write
1746
1748
1747 def edit(
1749 def edit(
1748 self,
1750 self,
1749 text,
1751 text,
1750 user,
1752 user,
1751 extra=None,
1753 extra=None,
1752 editform=None,
1754 editform=None,
1753 pending=None,
1755 pending=None,
1754 repopath=None,
1756 repopath=None,
1755 action=None,
1757 action=None,
1756 ):
1758 ):
1757 if action is None:
1759 if action is None:
1758 self.develwarn(
1760 self.develwarn(
1759 b'action is None but will soon be a required '
1761 b'action is None but will soon be a required '
1760 b'parameter to ui.edit()'
1762 b'parameter to ui.edit()'
1761 )
1763 )
1762 extra_defaults = {
1764 extra_defaults = {
1763 b'prefix': b'editor',
1765 b'prefix': b'editor',
1764 b'suffix': b'.txt',
1766 b'suffix': b'.txt',
1765 }
1767 }
1766 if extra is not None:
1768 if extra is not None:
1767 if extra.get(b'suffix') is not None:
1769 if extra.get(b'suffix') is not None:
1768 self.develwarn(
1770 self.develwarn(
1769 b'extra.suffix is not None but will soon be '
1771 b'extra.suffix is not None but will soon be '
1770 b'ignored by ui.edit()'
1772 b'ignored by ui.edit()'
1771 )
1773 )
1772 extra_defaults.update(extra)
1774 extra_defaults.update(extra)
1773 extra = extra_defaults
1775 extra = extra_defaults
1774
1776
1775 if action == b'diff':
1777 if action == b'diff':
1776 suffix = b'.diff'
1778 suffix = b'.diff'
1777 elif action:
1779 elif action:
1778 suffix = b'.%s.hg.txt' % action
1780 suffix = b'.%s.hg.txt' % action
1779 else:
1781 else:
1780 suffix = extra[b'suffix']
1782 suffix = extra[b'suffix']
1781
1783
1782 rdir = None
1784 rdir = None
1783 if self.configbool(b'experimental', b'editortmpinhg'):
1785 if self.configbool(b'experimental', b'editortmpinhg'):
1784 rdir = repopath
1786 rdir = repopath
1785 (fd, name) = pycompat.mkstemp(
1787 (fd, name) = pycompat.mkstemp(
1786 prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
1788 prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
1787 )
1789 )
1788 try:
1790 try:
1789 with os.fdopen(fd, 'wb') as f:
1791 with os.fdopen(fd, 'wb') as f:
1790 f.write(util.tonativeeol(text))
1792 f.write(util.tonativeeol(text))
1791
1793
1792 environ = {b'HGUSER': user}
1794 environ = {b'HGUSER': user}
1793 if b'transplant_source' in extra:
1795 if b'transplant_source' in extra:
1794 environ.update(
1796 environ.update(
1795 {b'HGREVISION': hex(extra[b'transplant_source'])}
1797 {b'HGREVISION': hex(extra[b'transplant_source'])}
1796 )
1798 )
1797 for label in (b'intermediate-source', b'source', b'rebase_source'):
1799 for label in (b'intermediate-source', b'source', b'rebase_source'):
1798 if label in extra:
1800 if label in extra:
1799 environ.update({b'HGREVISION': extra[label]})
1801 environ.update({b'HGREVISION': extra[label]})
1800 break
1802 break
1801 if editform:
1803 if editform:
1802 environ.update({b'HGEDITFORM': editform})
1804 environ.update({b'HGEDITFORM': editform})
1803 if pending:
1805 if pending:
1804 environ.update({b'HG_PENDING': pending})
1806 environ.update({b'HG_PENDING': pending})
1805
1807
1806 editor = self.geteditor()
1808 editor = self.geteditor()
1807
1809
1808 self.system(
1810 self.system(
1809 b"%s \"%s\"" % (editor, name),
1811 b"%s \"%s\"" % (editor, name),
1810 environ=environ,
1812 environ=environ,
1811 onerr=error.Abort,
1813 onerr=error.Abort,
1812 errprefix=_(b"edit failed"),
1814 errprefix=_(b"edit failed"),
1813 blockedtag=b'editor',
1815 blockedtag=b'editor',
1814 )
1816 )
1815
1817
1816 with open(name, 'rb') as f:
1818 with open(name, 'rb') as f:
1817 t = util.fromnativeeol(f.read())
1819 t = util.fromnativeeol(f.read())
1818 finally:
1820 finally:
1819 os.unlink(name)
1821 os.unlink(name)
1820
1822
1821 return t
1823 return t
1822
1824
1823 def system(
1825 def system(
1824 self,
1826 self,
1825 cmd,
1827 cmd,
1826 environ=None,
1828 environ=None,
1827 cwd=None,
1829 cwd=None,
1828 onerr=None,
1830 onerr=None,
1829 errprefix=None,
1831 errprefix=None,
1830 blockedtag=None,
1832 blockedtag=None,
1831 ):
1833 ):
1832 '''execute shell command with appropriate output stream. command
1834 '''execute shell command with appropriate output stream. command
1833 output will be redirected if fout is not stdout.
1835 output will be redirected if fout is not stdout.
1834
1836
1835 if command fails and onerr is None, return status, else raise onerr
1837 if command fails and onerr is None, return status, else raise onerr
1836 object as exception.
1838 object as exception.
1837 '''
1839 '''
1838 if blockedtag is None:
1840 if blockedtag is None:
1839 # Long cmds tend to be because of an absolute path on cmd. Keep
1841 # Long cmds tend to be because of an absolute path on cmd. Keep
1840 # the tail end instead
1842 # the tail end instead
1841 cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
1843 cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
1842 blockedtag = b'unknown_system_' + cmdsuffix
1844 blockedtag = b'unknown_system_' + cmdsuffix
1843 out = self._fout
1845 out = self._fout
1844 if any(s[1] for s in self._bufferstates):
1846 if any(s[1] for s in self._bufferstates):
1845 out = self
1847 out = self
1846 with self.timeblockedsection(blockedtag):
1848 with self.timeblockedsection(blockedtag):
1847 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out)
1849 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out)
1848 if rc and onerr:
1850 if rc and onerr:
1849 errmsg = b'%s %s' % (
1851 errmsg = b'%s %s' % (
1850 os.path.basename(cmd.split(None, 1)[0]),
1852 os.path.basename(cmd.split(None, 1)[0]),
1851 procutil.explainexit(rc),
1853 procutil.explainexit(rc),
1852 )
1854 )
1853 if errprefix:
1855 if errprefix:
1854 errmsg = b'%s: %s' % (errprefix, errmsg)
1856 errmsg = b'%s: %s' % (errprefix, errmsg)
1855 raise onerr(errmsg)
1857 raise onerr(errmsg)
1856 return rc
1858 return rc
1857
1859
1858 def _runsystem(self, cmd, environ, cwd, out):
1860 def _runsystem(self, cmd, environ, cwd, out):
1859 """actually execute the given shell command (can be overridden by
1861 """actually execute the given shell command (can be overridden by
1860 extensions like chg)"""
1862 extensions like chg)"""
1861 return procutil.system(cmd, environ=environ, cwd=cwd, out=out)
1863 return procutil.system(cmd, environ=environ, cwd=cwd, out=out)
1862
1864
1863 def traceback(self, exc=None, force=False):
1865 def traceback(self, exc=None, force=False):
1864 '''print exception traceback if traceback printing enabled or forced.
1866 '''print exception traceback if traceback printing enabled or forced.
1865 only to call in exception handler. returns true if traceback
1867 only to call in exception handler. returns true if traceback
1866 printed.'''
1868 printed.'''
1867 if self.tracebackflag or force:
1869 if self.tracebackflag or force:
1868 if exc is None:
1870 if exc is None:
1869 exc = sys.exc_info()
1871 exc = sys.exc_info()
1870 cause = getattr(exc[1], 'cause', None)
1872 cause = getattr(exc[1], 'cause', None)
1871
1873
1872 if cause is not None:
1874 if cause is not None:
1873 causetb = traceback.format_tb(cause[2])
1875 causetb = traceback.format_tb(cause[2])
1874 exctb = traceback.format_tb(exc[2])
1876 exctb = traceback.format_tb(exc[2])
1875 exconly = traceback.format_exception_only(cause[0], cause[1])
1877 exconly = traceback.format_exception_only(cause[0], cause[1])
1876
1878
1877 # exclude frame where 'exc' was chained and rethrown from exctb
1879 # exclude frame where 'exc' was chained and rethrown from exctb
1878 self.write_err(
1880 self.write_err(
1879 b'Traceback (most recent call last):\n',
1881 b'Traceback (most recent call last):\n',
1880 encoding.strtolocal(''.join(exctb[:-1])),
1882 encoding.strtolocal(''.join(exctb[:-1])),
1881 encoding.strtolocal(''.join(causetb)),
1883 encoding.strtolocal(''.join(causetb)),
1882 encoding.strtolocal(''.join(exconly)),
1884 encoding.strtolocal(''.join(exconly)),
1883 )
1885 )
1884 else:
1886 else:
1885 output = traceback.format_exception(exc[0], exc[1], exc[2])
1887 output = traceback.format_exception(exc[0], exc[1], exc[2])
1886 self.write_err(encoding.strtolocal(''.join(output)))
1888 self.write_err(encoding.strtolocal(''.join(output)))
1887 return self.tracebackflag or force
1889 return self.tracebackflag or force
1888
1890
1889 def geteditor(self):
1891 def geteditor(self):
1890 '''return editor to use'''
1892 '''return editor to use'''
1891 if pycompat.sysplatform == b'plan9':
1893 if pycompat.sysplatform == b'plan9':
1892 # vi is the MIPS instruction simulator on Plan 9. We
1894 # vi is the MIPS instruction simulator on Plan 9. We
1893 # instead default to E to plumb commit messages to
1895 # instead default to E to plumb commit messages to
1894 # avoid confusion.
1896 # avoid confusion.
1895 editor = b'E'
1897 editor = b'E'
1896 else:
1898 else:
1897 editor = b'vi'
1899 editor = b'vi'
1898 return encoding.environ.get(b"HGEDITOR") or self.config(
1900 return encoding.environ.get(b"HGEDITOR") or self.config(
1899 b"ui", b"editor", editor
1901 b"ui", b"editor", editor
1900 )
1902 )
1901
1903
1902 @util.propertycache
1904 @util.propertycache
1903 def _progbar(self):
1905 def _progbar(self):
1904 """setup the progbar singleton to the ui object"""
1906 """setup the progbar singleton to the ui object"""
1905 if (
1907 if (
1906 self.quiet
1908 self.quiet
1907 or self.debugflag
1909 or self.debugflag
1908 or self.configbool(b'progress', b'disable')
1910 or self.configbool(b'progress', b'disable')
1909 or not progress.shouldprint(self)
1911 or not progress.shouldprint(self)
1910 ):
1912 ):
1911 return None
1913 return None
1912 return getprogbar(self)
1914 return getprogbar(self)
1913
1915
1914 def _progclear(self):
1916 def _progclear(self):
1915 """clear progress bar output if any. use it before any output"""
1917 """clear progress bar output if any. use it before any output"""
1916 if not haveprogbar(): # nothing loaded yet
1918 if not haveprogbar(): # nothing loaded yet
1917 return
1919 return
1918 if self._progbar is not None and self._progbar.printed:
1920 if self._progbar is not None and self._progbar.printed:
1919 self._progbar.clear()
1921 self._progbar.clear()
1920
1922
1921 def progress(self, topic, pos, item=b"", unit=b"", total=None):
1923 def progress(self, topic, pos, item=b"", unit=b"", total=None):
1922 '''show a progress message
1924 '''show a progress message
1923
1925
1924 By default a textual progress bar will be displayed if an operation
1926 By default a textual progress bar will be displayed if an operation
1925 takes too long. 'topic' is the current operation, 'item' is a
1927 takes too long. 'topic' is the current operation, 'item' is a
1926 non-numeric marker of the current position (i.e. the currently
1928 non-numeric marker of the current position (i.e. the currently
1927 in-process file), 'pos' is the current numeric position (i.e.
1929 in-process file), 'pos' is the current numeric position (i.e.
1928 revision, bytes, etc.), unit is a corresponding unit label,
1930 revision, bytes, etc.), unit is a corresponding unit label,
1929 and total is the highest expected pos.
1931 and total is the highest expected pos.
1930
1932
1931 Multiple nested topics may be active at a time.
1933 Multiple nested topics may be active at a time.
1932
1934
1933 All topics should be marked closed by setting pos to None at
1935 All topics should be marked closed by setting pos to None at
1934 termination.
1936 termination.
1935 '''
1937 '''
1936 self.deprecwarn(
1938 self.deprecwarn(
1937 b"use ui.makeprogress() instead of ui.progress()", b"5.1"
1939 b"use ui.makeprogress() instead of ui.progress()", b"5.1"
1938 )
1940 )
1939 progress = self.makeprogress(topic, unit, total)
1941 progress = self.makeprogress(topic, unit, total)
1940 if pos is not None:
1942 if pos is not None:
1941 progress.update(pos, item=item)
1943 progress.update(pos, item=item)
1942 else:
1944 else:
1943 progress.complete()
1945 progress.complete()
1944
1946
1945 def makeprogress(self, topic, unit=b"", total=None):
1947 def makeprogress(self, topic, unit=b"", total=None):
1946 """Create a progress helper for the specified topic"""
1948 """Create a progress helper for the specified topic"""
1947 if getattr(self._fmsgerr, 'structured', False):
1949 if getattr(self._fmsgerr, 'structured', False):
1948 # channel for machine-readable output with metadata, just send
1950 # channel for machine-readable output with metadata, just send
1949 # raw information
1951 # raw information
1950 # TODO: consider porting some useful information (e.g. estimated
1952 # TODO: consider porting some useful information (e.g. estimated
1951 # time) from progbar. we might want to support update delay to
1953 # time) from progbar. we might want to support update delay to
1952 # reduce the cost of transferring progress messages.
1954 # reduce the cost of transferring progress messages.
1953 def updatebar(topic, pos, item, unit, total):
1955 def updatebar(topic, pos, item, unit, total):
1954 self._fmsgerr.write(
1956 self._fmsgerr.write(
1955 None,
1957 None,
1956 type=b'progress',
1958 type=b'progress',
1957 topic=topic,
1959 topic=topic,
1958 pos=pos,
1960 pos=pos,
1959 item=item,
1961 item=item,
1960 unit=unit,
1962 unit=unit,
1961 total=total,
1963 total=total,
1962 )
1964 )
1963
1965
1964 elif self._progbar is not None:
1966 elif self._progbar is not None:
1965 updatebar = self._progbar.progress
1967 updatebar = self._progbar.progress
1966 else:
1968 else:
1967
1969
1968 def updatebar(topic, pos, item, unit, total):
1970 def updatebar(topic, pos, item, unit, total):
1969 pass
1971 pass
1970
1972
1971 return scmutil.progress(self, updatebar, topic, unit, total)
1973 return scmutil.progress(self, updatebar, topic, unit, total)
1972
1974
1973 def getlogger(self, name):
1975 def getlogger(self, name):
1974 """Returns a logger of the given name; or None if not registered"""
1976 """Returns a logger of the given name; or None if not registered"""
1975 return self._loggers.get(name)
1977 return self._loggers.get(name)
1976
1978
1977 def setlogger(self, name, logger):
1979 def setlogger(self, name, logger):
1978 """Install logger which can be identified later by the given name
1980 """Install logger which can be identified later by the given name
1979
1981
1980 More than one loggers can be registered. Use extension or module
1982 More than one loggers can be registered. Use extension or module
1981 name to uniquely identify the logger instance.
1983 name to uniquely identify the logger instance.
1982 """
1984 """
1983 self._loggers[name] = logger
1985 self._loggers[name] = logger
1984
1986
1985 def log(self, event, msgfmt, *msgargs, **opts):
1987 def log(self, event, msgfmt, *msgargs, **opts):
1986 '''hook for logging facility extensions
1988 '''hook for logging facility extensions
1987
1989
1988 event should be a readily-identifiable subsystem, which will
1990 event should be a readily-identifiable subsystem, which will
1989 allow filtering.
1991 allow filtering.
1990
1992
1991 msgfmt should be a newline-terminated format string to log, and
1993 msgfmt should be a newline-terminated format string to log, and
1992 *msgargs are %-formatted into it.
1994 *msgargs are %-formatted into it.
1993
1995
1994 **opts currently has no defined meanings.
1996 **opts currently has no defined meanings.
1995 '''
1997 '''
1996 if not self._loggers:
1998 if not self._loggers:
1997 return
1999 return
1998 activeloggers = [
2000 activeloggers = [
1999 l for l in pycompat.itervalues(self._loggers) if l.tracked(event)
2001 l for l in pycompat.itervalues(self._loggers) if l.tracked(event)
2000 ]
2002 ]
2001 if not activeloggers:
2003 if not activeloggers:
2002 return
2004 return
2003 msg = msgfmt % msgargs
2005 msg = msgfmt % msgargs
2004 opts = pycompat.byteskwargs(opts)
2006 opts = pycompat.byteskwargs(opts)
2005 # guard against recursion from e.g. ui.debug()
2007 # guard against recursion from e.g. ui.debug()
2006 registeredloggers = self._loggers
2008 registeredloggers = self._loggers
2007 self._loggers = {}
2009 self._loggers = {}
2008 try:
2010 try:
2009 for logger in activeloggers:
2011 for logger in activeloggers:
2010 logger.log(self, event, msg, opts)
2012 logger.log(self, event, msg, opts)
2011 finally:
2013 finally:
2012 self._loggers = registeredloggers
2014 self._loggers = registeredloggers
2013
2015
2014 def label(self, msg, label):
2016 def label(self, msg, label):
2015 '''style msg based on supplied label
2017 '''style msg based on supplied label
2016
2018
2017 If some color mode is enabled, this will add the necessary control
2019 If some color mode is enabled, this will add the necessary control
2018 characters to apply such color. In addition, 'debug' color mode adds
2020 characters to apply such color. In addition, 'debug' color mode adds
2019 markup showing which label affects a piece of text.
2021 markup showing which label affects a piece of text.
2020
2022
2021 ui.write(s, 'label') is equivalent to
2023 ui.write(s, 'label') is equivalent to
2022 ui.write(ui.label(s, 'label')).
2024 ui.write(ui.label(s, 'label')).
2023 '''
2025 '''
2024 if self._colormode is not None:
2026 if self._colormode is not None:
2025 return color.colorlabel(self, msg, label)
2027 return color.colorlabel(self, msg, label)
2026 return msg
2028 return msg
2027
2029
2028 def develwarn(self, msg, stacklevel=1, config=None):
2030 def develwarn(self, msg, stacklevel=1, config=None):
2029 """issue a developer warning message
2031 """issue a developer warning message
2030
2032
2031 Use 'stacklevel' to report the offender some layers further up in the
2033 Use 'stacklevel' to report the offender some layers further up in the
2032 stack.
2034 stack.
2033 """
2035 """
2034 if not self.configbool(b'devel', b'all-warnings'):
2036 if not self.configbool(b'devel', b'all-warnings'):
2035 if config is None or not self.configbool(b'devel', config):
2037 if config is None or not self.configbool(b'devel', config):
2036 return
2038 return
2037 msg = b'devel-warn: ' + msg
2039 msg = b'devel-warn: ' + msg
2038 stacklevel += 1 # get in develwarn
2040 stacklevel += 1 # get in develwarn
2039 if self.tracebackflag:
2041 if self.tracebackflag:
2040 util.debugstacktrace(msg, stacklevel, self._ferr, self._fout)
2042 util.debugstacktrace(msg, stacklevel, self._ferr, self._fout)
2041 self.log(
2043 self.log(
2042 b'develwarn',
2044 b'develwarn',
2043 b'%s at:\n%s'
2045 b'%s at:\n%s'
2044 % (msg, b''.join(util.getstackframes(stacklevel))),
2046 % (msg, b''.join(util.getstackframes(stacklevel))),
2045 )
2047 )
2046 else:
2048 else:
2047 curframe = inspect.currentframe()
2049 curframe = inspect.currentframe()
2048 calframe = inspect.getouterframes(curframe, 2)
2050 calframe = inspect.getouterframes(curframe, 2)
2049 fname, lineno, fmsg = calframe[stacklevel][1:4]
2051 fname, lineno, fmsg = calframe[stacklevel][1:4]
2050 fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg)
2052 fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg)
2051 self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg))
2053 self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg))
2052 self.log(
2054 self.log(
2053 b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg
2055 b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg
2054 )
2056 )
2055
2057
2056 # avoid cycles
2058 # avoid cycles
2057 del curframe
2059 del curframe
2058 del calframe
2060 del calframe
2059
2061
2060 def deprecwarn(self, msg, version, stacklevel=2):
2062 def deprecwarn(self, msg, version, stacklevel=2):
2061 """issue a deprecation warning
2063 """issue a deprecation warning
2062
2064
2063 - msg: message explaining what is deprecated and how to upgrade,
2065 - msg: message explaining what is deprecated and how to upgrade,
2064 - version: last version where the API will be supported,
2066 - version: last version where the API will be supported,
2065 """
2067 """
2066 if not (
2068 if not (
2067 self.configbool(b'devel', b'all-warnings')
2069 self.configbool(b'devel', b'all-warnings')
2068 or self.configbool(b'devel', b'deprec-warn')
2070 or self.configbool(b'devel', b'deprec-warn')
2069 ):
2071 ):
2070 return
2072 return
2071 msg += (
2073 msg += (
2072 b"\n(compatibility will be dropped after Mercurial-%s,"
2074 b"\n(compatibility will be dropped after Mercurial-%s,"
2073 b" update your code.)"
2075 b" update your code.)"
2074 ) % version
2076 ) % version
2075 self.develwarn(msg, stacklevel=stacklevel, config=b'deprec-warn')
2077 self.develwarn(msg, stacklevel=stacklevel, config=b'deprec-warn')
2076
2078
2077 def exportableenviron(self):
2079 def exportableenviron(self):
2078 """The environment variables that are safe to export, e.g. through
2080 """The environment variables that are safe to export, e.g. through
2079 hgweb.
2081 hgweb.
2080 """
2082 """
2081 return self._exportableenviron
2083 return self._exportableenviron
2082
2084
2083 @contextlib.contextmanager
2085 @contextlib.contextmanager
2084 def configoverride(self, overrides, source=b""):
2086 def configoverride(self, overrides, source=b""):
2085 """Context manager for temporary config overrides
2087 """Context manager for temporary config overrides
2086 `overrides` must be a dict of the following structure:
2088 `overrides` must be a dict of the following structure:
2087 {(section, name) : value}"""
2089 {(section, name) : value}"""
2088 backups = {}
2090 backups = {}
2089 try:
2091 try:
2090 for (section, name), value in overrides.items():
2092 for (section, name), value in overrides.items():
2091 backups[(section, name)] = self.backupconfig(section, name)
2093 backups[(section, name)] = self.backupconfig(section, name)
2092 self.setconfig(section, name, value, source)
2094 self.setconfig(section, name, value, source)
2093 yield
2095 yield
2094 finally:
2096 finally:
2095 for __, backup in backups.items():
2097 for __, backup in backups.items():
2096 self.restoreconfig(backup)
2098 self.restoreconfig(backup)
2097 # just restoring ui.quiet config to the previous value is not enough
2099 # just restoring ui.quiet config to the previous value is not enough
2098 # as it does not update ui.quiet class member
2100 # as it does not update ui.quiet class member
2099 if (b'ui', b'quiet') in overrides:
2101 if (b'ui', b'quiet') in overrides:
2100 self.fixconfig(section=b'ui')
2102 self.fixconfig(section=b'ui')
2101
2103
2102
2104
2103 class paths(dict):
2105 class paths(dict):
2104 """Represents a collection of paths and their configs.
2106 """Represents a collection of paths and their configs.
2105
2107
2106 Data is initially derived from ui instances and the config files they have
2108 Data is initially derived from ui instances and the config files they have
2107 loaded.
2109 loaded.
2108 """
2110 """
2109
2111
2110 def __init__(self, ui):
2112 def __init__(self, ui):
2111 dict.__init__(self)
2113 dict.__init__(self)
2112
2114
2113 for name, loc in ui.configitems(b'paths', ignoresub=True):
2115 for name, loc in ui.configitems(b'paths', ignoresub=True):
2114 # No location is the same as not existing.
2116 # No location is the same as not existing.
2115 if not loc:
2117 if not loc:
2116 continue
2118 continue
2117 loc, sub = ui.configsuboptions(b'paths', name)
2119 loc, sub = ui.configsuboptions(b'paths', name)
2118 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
2120 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
2119
2121
2120 def getpath(self, name, default=None):
2122 def getpath(self, name, default=None):
2121 """Return a ``path`` from a string, falling back to default.
2123 """Return a ``path`` from a string, falling back to default.
2122
2124
2123 ``name`` can be a named path or locations. Locations are filesystem
2125 ``name`` can be a named path or locations. Locations are filesystem
2124 paths or URIs.
2126 paths or URIs.
2125
2127
2126 Returns None if ``name`` is not a registered path, a URI, or a local
2128 Returns None if ``name`` is not a registered path, a URI, or a local
2127 path to a repo.
2129 path to a repo.
2128 """
2130 """
2129 # Only fall back to default if no path was requested.
2131 # Only fall back to default if no path was requested.
2130 if name is None:
2132 if name is None:
2131 if not default:
2133 if not default:
2132 default = ()
2134 default = ()
2133 elif not isinstance(default, (tuple, list)):
2135 elif not isinstance(default, (tuple, list)):
2134 default = (default,)
2136 default = (default,)
2135 for k in default:
2137 for k in default:
2136 try:
2138 try:
2137 return self[k]
2139 return self[k]
2138 except KeyError:
2140 except KeyError:
2139 continue
2141 continue
2140 return None
2142 return None
2141
2143
2142 # Most likely empty string.
2144 # Most likely empty string.
2143 # This may need to raise in the future.
2145 # This may need to raise in the future.
2144 if not name:
2146 if not name:
2145 return None
2147 return None
2146
2148
2147 try:
2149 try:
2148 return self[name]
2150 return self[name]
2149 except KeyError:
2151 except KeyError:
2150 # Try to resolve as a local path or URI.
2152 # Try to resolve as a local path or URI.
2151 try:
2153 try:
2152 # We don't pass sub-options in, so no need to pass ui instance.
2154 # We don't pass sub-options in, so no need to pass ui instance.
2153 return path(None, None, rawloc=name)
2155 return path(None, None, rawloc=name)
2154 except ValueError:
2156 except ValueError:
2155 raise error.RepoError(_(b'repository %s does not exist') % name)
2157 raise error.RepoError(_(b'repository %s does not exist') % name)
2156
2158
2157
2159
2158 _pathsuboptions = {}
2160 _pathsuboptions = {}
2159
2161
2160
2162
2161 def pathsuboption(option, attr):
2163 def pathsuboption(option, attr):
2162 """Decorator used to declare a path sub-option.
2164 """Decorator used to declare a path sub-option.
2163
2165
2164 Arguments are the sub-option name and the attribute it should set on
2166 Arguments are the sub-option name and the attribute it should set on
2165 ``path`` instances.
2167 ``path`` instances.
2166
2168
2167 The decorated function will receive as arguments a ``ui`` instance,
2169 The decorated function will receive as arguments a ``ui`` instance,
2168 ``path`` instance, and the string value of this option from the config.
2170 ``path`` instance, and the string value of this option from the config.
2169 The function should return the value that will be set on the ``path``
2171 The function should return the value that will be set on the ``path``
2170 instance.
2172 instance.
2171
2173
2172 This decorator can be used to perform additional verification of
2174 This decorator can be used to perform additional verification of
2173 sub-options and to change the type of sub-options.
2175 sub-options and to change the type of sub-options.
2174 """
2176 """
2175
2177
2176 def register(func):
2178 def register(func):
2177 _pathsuboptions[option] = (attr, func)
2179 _pathsuboptions[option] = (attr, func)
2178 return func
2180 return func
2179
2181
2180 return register
2182 return register
2181
2183
2182
2184
2183 @pathsuboption(b'pushurl', b'pushloc')
2185 @pathsuboption(b'pushurl', b'pushloc')
2184 def pushurlpathoption(ui, path, value):
2186 def pushurlpathoption(ui, path, value):
2185 u = util.url(value)
2187 u = util.url(value)
2186 # Actually require a URL.
2188 # Actually require a URL.
2187 if not u.scheme:
2189 if not u.scheme:
2188 ui.warn(_(b'(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
2190 ui.warn(_(b'(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
2189 return None
2191 return None
2190
2192
2191 # Don't support the #foo syntax in the push URL to declare branch to
2193 # Don't support the #foo syntax in the push URL to declare branch to
2192 # push.
2194 # push.
2193 if u.fragment:
2195 if u.fragment:
2194 ui.warn(
2196 ui.warn(
2195 _(
2197 _(
2196 b'("#fragment" in paths.%s:pushurl not supported; '
2198 b'("#fragment" in paths.%s:pushurl not supported; '
2197 b'ignoring)\n'
2199 b'ignoring)\n'
2198 )
2200 )
2199 % path.name
2201 % path.name
2200 )
2202 )
2201 u.fragment = None
2203 u.fragment = None
2202
2204
2203 return bytes(u)
2205 return bytes(u)
2204
2206
2205
2207
2206 @pathsuboption(b'pushrev', b'pushrev')
2208 @pathsuboption(b'pushrev', b'pushrev')
2207 def pushrevpathoption(ui, path, value):
2209 def pushrevpathoption(ui, path, value):
2208 return value
2210 return value
2209
2211
2210
2212
2211 class path(object):
2213 class path(object):
2212 """Represents an individual path and its configuration."""
2214 """Represents an individual path and its configuration."""
2213
2215
2214 def __init__(self, ui, name, rawloc=None, suboptions=None):
2216 def __init__(self, ui, name, rawloc=None, suboptions=None):
2215 """Construct a path from its config options.
2217 """Construct a path from its config options.
2216
2218
2217 ``ui`` is the ``ui`` instance the path is coming from.
2219 ``ui`` is the ``ui`` instance the path is coming from.
2218 ``name`` is the symbolic name of the path.
2220 ``name`` is the symbolic name of the path.
2219 ``rawloc`` is the raw location, as defined in the config.
2221 ``rawloc`` is the raw location, as defined in the config.
2220 ``pushloc`` is the raw locations pushes should be made to.
2222 ``pushloc`` is the raw locations pushes should be made to.
2221
2223
2222 If ``name`` is not defined, we require that the location be a) a local
2224 If ``name`` is not defined, we require that the location be a) a local
2223 filesystem path with a .hg directory or b) a URL. If not,
2225 filesystem path with a .hg directory or b) a URL. If not,
2224 ``ValueError`` is raised.
2226 ``ValueError`` is raised.
2225 """
2227 """
2226 if not rawloc:
2228 if not rawloc:
2227 raise ValueError(b'rawloc must be defined')
2229 raise ValueError(b'rawloc must be defined')
2228
2230
2229 # Locations may define branches via syntax <base>#<branch>.
2231 # Locations may define branches via syntax <base>#<branch>.
2230 u = util.url(rawloc)
2232 u = util.url(rawloc)
2231 branch = None
2233 branch = None
2232 if u.fragment:
2234 if u.fragment:
2233 branch = u.fragment
2235 branch = u.fragment
2234 u.fragment = None
2236 u.fragment = None
2235
2237
2236 self.url = u
2238 self.url = u
2237 self.branch = branch
2239 self.branch = branch
2238
2240
2239 self.name = name
2241 self.name = name
2240 self.rawloc = rawloc
2242 self.rawloc = rawloc
2241 self.loc = b'%s' % u
2243 self.loc = b'%s' % u
2242
2244
2243 # When given a raw location but not a symbolic name, validate the
2245 # When given a raw location but not a symbolic name, validate the
2244 # location is valid.
2246 # location is valid.
2245 if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
2247 if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
2246 raise ValueError(
2248 raise ValueError(
2247 b'location is not a URL or path to a local '
2249 b'location is not a URL or path to a local '
2248 b'repo: %s' % rawloc
2250 b'repo: %s' % rawloc
2249 )
2251 )
2250
2252
2251 suboptions = suboptions or {}
2253 suboptions = suboptions or {}
2252
2254
2253 # Now process the sub-options. If a sub-option is registered, its
2255 # Now process the sub-options. If a sub-option is registered, its
2254 # attribute will always be present. The value will be None if there
2256 # attribute will always be present. The value will be None if there
2255 # was no valid sub-option.
2257 # was no valid sub-option.
2256 for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
2258 for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
2257 if suboption not in suboptions:
2259 if suboption not in suboptions:
2258 setattr(self, attr, None)
2260 setattr(self, attr, None)
2259 continue
2261 continue
2260
2262
2261 value = func(ui, self, suboptions[suboption])
2263 value = func(ui, self, suboptions[suboption])
2262 setattr(self, attr, value)
2264 setattr(self, attr, value)
2263
2265
2264 def _isvalidlocalpath(self, path):
2266 def _isvalidlocalpath(self, path):
2265 """Returns True if the given path is a potentially valid repository.
2267 """Returns True if the given path is a potentially valid repository.
2266 This is its own function so that extensions can change the definition of
2268 This is its own function so that extensions can change the definition of
2267 'valid' in this case (like when pulling from a git repo into a hg
2269 'valid' in this case (like when pulling from a git repo into a hg
2268 one)."""
2270 one)."""
2269 try:
2271 try:
2270 return os.path.isdir(os.path.join(path, b'.hg'))
2272 return os.path.isdir(os.path.join(path, b'.hg'))
2271 # Python 2 may return TypeError. Python 3, ValueError.
2273 # Python 2 may return TypeError. Python 3, ValueError.
2272 except (TypeError, ValueError):
2274 except (TypeError, ValueError):
2273 return False
2275 return False
2274
2276
2275 @property
2277 @property
2276 def suboptions(self):
2278 def suboptions(self):
2277 """Return sub-options and their values for this path.
2279 """Return sub-options and their values for this path.
2278
2280
2279 This is intended to be used for presentation purposes.
2281 This is intended to be used for presentation purposes.
2280 """
2282 """
2281 d = {}
2283 d = {}
2282 for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
2284 for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
2283 value = getattr(self, attr)
2285 value = getattr(self, attr)
2284 if value is not None:
2286 if value is not None:
2285 d[subopt] = value
2287 d[subopt] = value
2286 return d
2288 return d
2287
2289
2288
2290
2289 # we instantiate one globally shared progress bar to avoid
2291 # we instantiate one globally shared progress bar to avoid
2290 # competing progress bars when multiple UI objects get created
2292 # competing progress bars when multiple UI objects get created
2291 _progresssingleton = None
2293 _progresssingleton = None
2292
2294
2293
2295
2294 def getprogbar(ui):
2296 def getprogbar(ui):
2295 global _progresssingleton
2297 global _progresssingleton
2296 if _progresssingleton is None:
2298 if _progresssingleton is None:
2297 # passing 'ui' object to the singleton is fishy,
2299 # passing 'ui' object to the singleton is fishy,
2298 # this is how the extension used to work but feel free to rework it.
2300 # this is how the extension used to work but feel free to rework it.
2299 _progresssingleton = progress.progbar(ui)
2301 _progresssingleton = progress.progbar(ui)
2300 return _progresssingleton
2302 return _progresssingleton
2301
2303
2302
2304
2303 def haveprogbar():
2305 def haveprogbar():
2304 return _progresssingleton is not None
2306 return _progresssingleton is not None
2305
2307
2306
2308
2307 def _selectmsgdests(ui):
2309 def _selectmsgdests(ui):
2308 name = ui.config(b'ui', b'message-output')
2310 name = ui.config(b'ui', b'message-output')
2309 if name == b'channel':
2311 if name == b'channel':
2310 if ui.fmsg:
2312 if ui.fmsg:
2311 return ui.fmsg, ui.fmsg
2313 return ui.fmsg, ui.fmsg
2312 else:
2314 else:
2313 # fall back to ferr if channel isn't ready so that status/error
2315 # fall back to ferr if channel isn't ready so that status/error
2314 # messages can be printed
2316 # messages can be printed
2315 return ui.ferr, ui.ferr
2317 return ui.ferr, ui.ferr
2316 if name == b'stdio':
2318 if name == b'stdio':
2317 return ui.fout, ui.ferr
2319 return ui.fout, ui.ferr
2318 if name == b'stderr':
2320 if name == b'stderr':
2319 return ui.ferr, ui.ferr
2321 return ui.ferr, ui.ferr
2320 raise error.Abort(b'invalid ui.message-output destination: %s' % name)
2322 raise error.Abort(b'invalid ui.message-output destination: %s' % name)
2321
2323
2322
2324
2323 def _writemsgwith(write, dest, *args, **opts):
2325 def _writemsgwith(write, dest, *args, **opts):
2324 """Write ui message with the given ui._write*() function
2326 """Write ui message with the given ui._write*() function
2325
2327
2326 The specified message type is translated to 'ui.<type>' label if the dest
2328 The specified message type is translated to 'ui.<type>' label if the dest
2327 isn't a structured channel, so that the message will be colorized.
2329 isn't a structured channel, so that the message will be colorized.
2328 """
2330 """
2329 # TODO: maybe change 'type' to a mandatory option
2331 # TODO: maybe change 'type' to a mandatory option
2330 if 'type' in opts and not getattr(dest, 'structured', False):
2332 if 'type' in opts and not getattr(dest, 'structured', False):
2331 opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type')
2333 opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type')
2332 write(dest, *args, **opts)
2334 write(dest, *args, **opts)
@@ -1,59 +1,60 b''
1 # Test the config layer generated by environment variables
1 # Test the config layer generated by environment variables
2
2
3 from __future__ import absolute_import, print_function
3 from __future__ import absolute_import, print_function
4
4
5 import os
5 import os
6
6
7 from mercurial import (
7 from mercurial import (
8 encoding,
8 encoding,
9 extensions,
9 extensions,
10 rcutil,
10 rcutil,
11 ui as uimod,
11 ui as uimod,
12 util,
12 util,
13 )
13 )
14
14
15 from mercurial.utils import procutil
15 from mercurial.utils import procutil
16
16
17 testtmp = encoding.environ[b'TESTTMP']
17 testtmp = encoding.environ[b'TESTTMP']
18
18
19 # prepare hgrc files
19 # prepare hgrc files
20 def join(name):
20 def join(name):
21 return os.path.join(testtmp, name)
21 return os.path.join(testtmp, name)
22
22
23
23
24 with open(join(b'sysrc'), 'wb') as f:
24 with open(join(b'sysrc'), 'wb') as f:
25 f.write(b'[ui]\neditor=e0\n[pager]\npager=p0\n')
25 f.write(b'[ui]\neditor=e0\n[pager]\npager=p0\n')
26
26
27 with open(join(b'userrc'), 'wb') as f:
27 with open(join(b'userrc'), 'wb') as f:
28 f.write(b'[ui]\neditor=e1')
28 f.write(b'[ui]\neditor=e1')
29
29
30 # replace rcpath functions so they point to the files above
30 # replace rcpath functions so they point to the files above
31 def systemrcpath():
31 def systemrcpath():
32 return [join(b'sysrc')]
32 return [join(b'sysrc')]
33
33
34
34
35 def userrcpath():
35 def userrcpath():
36 return [join(b'userrc')]
36 return [join(b'userrc')]
37
37
38
38
39 extensions.wrapfunction(rcutil, 'defaultrcpath', lambda orig: [])
39 extensions.wrapfunction(rcutil, 'defaultrcpath', lambda orig: [])
40 extensions.wrapfunction(rcutil, 'default_rc_resources', lambda orig: [])
40
41
41 rcutil.systemrcpath = systemrcpath
42 rcutil.systemrcpath = systemrcpath
42 rcutil.userrcpath = userrcpath
43 rcutil.userrcpath = userrcpath
43
44
44 # utility to print configs
45 # utility to print configs
45 def printconfigs(env):
46 def printconfigs(env):
46 encoding.environ = env
47 encoding.environ = env
47 rcutil._rccomponents = None # reset cache
48 rcutil._rccomponents = None # reset cache
48 ui = uimod.ui.load()
49 ui = uimod.ui.load()
49 for section, name, value in ui.walkconfig():
50 for section, name, value in ui.walkconfig():
50 source = ui.configsource(section, name)
51 source = ui.configsource(section, name)
51 procutil.stdout.write(
52 procutil.stdout.write(
52 b'%s.%s=%s # %s\n' % (section, name, value, util.pconvert(source))
53 b'%s.%s=%s # %s\n' % (section, name, value, util.pconvert(source))
53 )
54 )
54 procutil.stdout.write(b'\n')
55 procutil.stdout.write(b'\n')
55
56
56
57
57 # environment variable overrides
58 # environment variable overrides
58 printconfigs({})
59 printconfigs({})
59 printconfigs({b'EDITOR': b'e2', b'PAGER': b'p2'})
60 printconfigs({b'EDITOR': b'e2', b'PAGER': b'p2'})
General Comments 0
You need to be logged in to leave comments. Login now