##// END OF EJS Templates
grep: don't go in an infinite loop when given empty regex...
Valentin Gatien-Baron -
r45368:f90957c9 default
parent child Browse files
Show More
@@ -1,7836 +1,7839 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 (
84 (
85 b'R',
85 b'R',
86 b'repository',
86 b'repository',
87 b'',
87 b'',
88 _(b'repository root directory or name of overlay bundle file'),
88 _(b'repository root directory or name of overlay bundle file'),
89 _(b'REPO'),
89 _(b'REPO'),
90 ),
90 ),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (
92 (
93 b'y',
93 b'y',
94 b'noninteractive',
94 b'noninteractive',
95 None,
95 None,
96 _(
96 _(
97 b'do not prompt, automatically pick the first choice for all prompts'
97 b'do not prompt, automatically pick the first choice for all prompts'
98 ),
98 ),
99 ),
99 ),
100 (b'q', b'quiet', None, _(b'suppress output')),
100 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
102 (
102 (
103 b'',
103 b'',
104 b'color',
104 b'color',
105 b'',
105 b'',
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # and should not be translated
107 # and should not be translated
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b'TYPE'),
109 _(b'TYPE'),
110 ),
110 ),
111 (
111 (
112 b'',
112 b'',
113 b'config',
113 b'config',
114 [],
114 [],
115 _(b'set/override config option (use \'section.name=value\')'),
115 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'CONFIG'),
116 _(b'CONFIG'),
117 ),
117 ),
118 (b'', b'debug', None, _(b'enable debugging output')),
118 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debugger', None, _(b'start debugger')),
119 (b'', b'debugger', None, _(b'start debugger')),
120 (
120 (
121 b'',
121 b'',
122 b'encoding',
122 b'encoding',
123 encoding.encoding,
123 encoding.encoding,
124 _(b'set the charset encoding'),
124 _(b'set the charset encoding'),
125 _(b'ENCODE'),
125 _(b'ENCODE'),
126 ),
126 ),
127 (
127 (
128 b'',
128 b'',
129 b'encodingmode',
129 b'encodingmode',
130 encoding.encodingmode,
130 encoding.encodingmode,
131 _(b'set the charset encoding mode'),
131 _(b'set the charset encoding mode'),
132 _(b'MODE'),
132 _(b'MODE'),
133 ),
133 ),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'time', None, _(b'time how long the command takes')),
135 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'profile', None, _(b'print command execution profile')),
136 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'version', None, _(b'output version information and exit')),
137 (b'', b'version', None, _(b'output version information and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (
140 (
141 b'',
141 b'',
142 b'pager',
142 b'pager',
143 b'auto',
143 b'auto',
144 _(b"when to paginate (boolean, always, auto, or never)"),
144 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b'TYPE'),
145 _(b'TYPE'),
146 ),
146 ),
147 ]
147 ]
148
148
149 dryrunopts = cmdutil.dryrunopts
149 dryrunopts = cmdutil.dryrunopts
150 remoteopts = cmdutil.remoteopts
150 remoteopts = cmdutil.remoteopts
151 walkopts = cmdutil.walkopts
151 walkopts = cmdutil.walkopts
152 commitopts = cmdutil.commitopts
152 commitopts = cmdutil.commitopts
153 commitopts2 = cmdutil.commitopts2
153 commitopts2 = cmdutil.commitopts2
154 commitopts3 = cmdutil.commitopts3
154 commitopts3 = cmdutil.commitopts3
155 formatteropts = cmdutil.formatteropts
155 formatteropts = cmdutil.formatteropts
156 templateopts = cmdutil.templateopts
156 templateopts = cmdutil.templateopts
157 logopts = cmdutil.logopts
157 logopts = cmdutil.logopts
158 diffopts = cmdutil.diffopts
158 diffopts = cmdutil.diffopts
159 diffwsopts = cmdutil.diffwsopts
159 diffwsopts = cmdutil.diffwsopts
160 diffopts2 = cmdutil.diffopts2
160 diffopts2 = cmdutil.diffopts2
161 mergetoolopts = cmdutil.mergetoolopts
161 mergetoolopts = cmdutil.mergetoolopts
162 similarityopts = cmdutil.similarityopts
162 similarityopts = cmdutil.similarityopts
163 subrepoopts = cmdutil.subrepoopts
163 subrepoopts = cmdutil.subrepoopts
164 debugrevlogopts = cmdutil.debugrevlogopts
164 debugrevlogopts = cmdutil.debugrevlogopts
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168
168
169 @command(
169 @command(
170 b'abort',
170 b'abort',
171 dryrunopts,
171 dryrunopts,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpbasic=True,
173 helpbasic=True,
174 )
174 )
175 def abort(ui, repo, **opts):
175 def abort(ui, repo, **opts):
176 """abort an unfinished operation (EXPERIMENTAL)
176 """abort an unfinished operation (EXPERIMENTAL)
177
177
178 Aborts a multistep operation like graft, histedit, rebase, merge,
178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 and unshelve if they are in an unfinished state.
179 and unshelve if they are in an unfinished state.
180
180
181 use --dry-run/-n to dry run the command.
181 use --dry-run/-n to dry run the command.
182 """
182 """
183 dryrun = opts.get('dry_run')
183 dryrun = opts.get('dry_run')
184 abortstate = cmdutil.getunfinishedstate(repo)
184 abortstate = cmdutil.getunfinishedstate(repo)
185 if not abortstate:
185 if not abortstate:
186 raise error.Abort(_(b'no operation in progress'))
186 raise error.Abort(_(b'no operation in progress'))
187 if not abortstate.abortfunc:
187 if not abortstate.abortfunc:
188 raise error.Abort(
188 raise error.Abort(
189 (
189 (
190 _(b"%s in progress but does not support 'hg abort'")
190 _(b"%s in progress but does not support 'hg abort'")
191 % (abortstate._opname)
191 % (abortstate._opname)
192 ),
192 ),
193 hint=abortstate.hint(),
193 hint=abortstate.hint(),
194 )
194 )
195 if dryrun:
195 if dryrun:
196 ui.status(
196 ui.status(
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 )
198 )
199 return
199 return
200 return abortstate.abortfunc(ui, repo)
200 return abortstate.abortfunc(ui, repo)
201
201
202
202
203 @command(
203 @command(
204 b'add',
204 b'add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _(b'[OPTION]... [FILE]...'),
206 _(b'[OPTION]... [FILE]...'),
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpbasic=True,
208 helpbasic=True,
209 inferrepo=True,
209 inferrepo=True,
210 )
210 )
211 def add(ui, repo, *pats, **opts):
211 def add(ui, repo, *pats, **opts):
212 """add the specified files on the next commit
212 """add the specified files on the next commit
213
213
214 Schedule files to be version controlled and added to the
214 Schedule files to be version controlled and added to the
215 repository.
215 repository.
216
216
217 The files will be added to the repository at the next commit. To
217 The files will be added to the repository at the next commit. To
218 undo an add before that, see :hg:`forget`.
218 undo an add before that, see :hg:`forget`.
219
219
220 If no names are given, add all files to the repository (except
220 If no names are given, add all files to the repository (except
221 files matching ``.hgignore``).
221 files matching ``.hgignore``).
222
222
223 .. container:: verbose
223 .. container:: verbose
224
224
225 Examples:
225 Examples:
226
226
227 - New (unknown) files are added
227 - New (unknown) files are added
228 automatically by :hg:`add`::
228 automatically by :hg:`add`::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ? foo.c
233 ? foo.c
234 $ hg add
234 $ hg add
235 adding foo.c
235 adding foo.c
236 $ hg status
236 $ hg status
237 A foo.c
237 A foo.c
238
238
239 - Specific files to be added can be specified::
239 - Specific files to be added can be specified::
240
240
241 $ ls
241 $ ls
242 bar.c foo.c
242 bar.c foo.c
243 $ hg status
243 $ hg status
244 ? bar.c
244 ? bar.c
245 ? foo.c
245 ? foo.c
246 $ hg add bar.c
246 $ hg add bar.c
247 $ hg status
247 $ hg status
248 A bar.c
248 A bar.c
249 ? foo.c
249 ? foo.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253
253
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259
259
260 @command(
260 @command(
261 b'addremove',
261 b'addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _(b'[OPTION]... [FILE]...'),
263 _(b'[OPTION]... [FILE]...'),
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 inferrepo=True,
265 inferrepo=True,
266 )
266 )
267 def addremove(ui, repo, *pats, **opts):
267 def addremove(ui, repo, *pats, **opts):
268 """add all new files, delete all missing files
268 """add all new files, delete all missing files
269
269
270 Add all new files and remove all missing files from the
270 Add all new files and remove all missing files from the
271 repository.
271 repository.
272
272
273 Unless names are given, new files are ignored if they match any of
273 Unless names are given, new files are ignored if they match any of
274 the patterns in ``.hgignore``. As with add, these changes take
274 the patterns in ``.hgignore``. As with add, these changes take
275 effect at the next commit.
275 effect at the next commit.
276
276
277 Use the -s/--similarity option to detect renamed files. This
277 Use the -s/--similarity option to detect renamed files. This
278 option takes a percentage between 0 (disabled) and 100 (files must
278 option takes a percentage between 0 (disabled) and 100 (files must
279 be identical) as its parameter. With a parameter greater than 0,
279 be identical) as its parameter. With a parameter greater than 0,
280 this compares every removed file with every added file and records
280 this compares every removed file with every added file and records
281 those similar enough as renames. Detecting renamed files this way
281 those similar enough as renames. Detecting renamed files this way
282 can be expensive. After using this option, :hg:`status -C` can be
282 can be expensive. After using this option, :hg:`status -C` can be
283 used to check which files were identified as moved or renamed. If
283 used to check which files were identified as moved or renamed. If
284 not specified, -s/--similarity defaults to 100 and only renames of
284 not specified, -s/--similarity defaults to 100 and only renames of
285 identical files are detected.
285 identical files are detected.
286
286
287 .. container:: verbose
287 .. container:: verbose
288
288
289 Examples:
289 Examples:
290
290
291 - A number of files (bar.c and foo.c) are new,
291 - A number of files (bar.c and foo.c) are new,
292 while foobar.c has been removed (without using :hg:`remove`)
292 while foobar.c has been removed (without using :hg:`remove`)
293 from the repository::
293 from the repository::
294
294
295 $ ls
295 $ ls
296 bar.c foo.c
296 bar.c foo.c
297 $ hg status
297 $ hg status
298 ! foobar.c
298 ! foobar.c
299 ? bar.c
299 ? bar.c
300 ? foo.c
300 ? foo.c
301 $ hg addremove
301 $ hg addremove
302 adding bar.c
302 adding bar.c
303 adding foo.c
303 adding foo.c
304 removing foobar.c
304 removing foobar.c
305 $ hg status
305 $ hg status
306 A bar.c
306 A bar.c
307 A foo.c
307 A foo.c
308 R foobar.c
308 R foobar.c
309
309
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 Afterwards, it was edited slightly::
311 Afterwards, it was edited slightly::
312
312
313 $ ls
313 $ ls
314 foo.c
314 foo.c
315 $ hg status
315 $ hg status
316 ! foobar.c
316 ! foobar.c
317 ? foo.c
317 ? foo.c
318 $ hg addremove --similarity 90
318 $ hg addremove --similarity 90
319 removing foobar.c
319 removing foobar.c
320 adding foo.c
320 adding foo.c
321 recording removal of foobar.c as rename to foo.c (94% similar)
321 recording removal of foobar.c as rename to foo.c (94% similar)
322 $ hg status -C
322 $ hg status -C
323 A foo.c
323 A foo.c
324 foobar.c
324 foobar.c
325 R foobar.c
325 R foobar.c
326
326
327 Returns 0 if all files are successfully added.
327 Returns 0 if all files are successfully added.
328 """
328 """
329 opts = pycompat.byteskwargs(opts)
329 opts = pycompat.byteskwargs(opts)
330 if not opts.get(b'similarity'):
330 if not opts.get(b'similarity'):
331 opts[b'similarity'] = b'100'
331 opts[b'similarity'] = b'100'
332 matcher = scmutil.match(repo[None], pats, opts)
332 matcher = scmutil.match(repo[None], pats, opts)
333 relative = scmutil.anypats(pats, opts)
333 relative = scmutil.anypats(pats, opts)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336
336
337
337
338 @command(
338 @command(
339 b'annotate|blame',
339 b'annotate|blame',
340 [
340 [
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (
342 (
343 b'',
343 b'',
344 b'follow',
344 b'follow',
345 None,
345 None,
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 ),
347 ),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'a', b'text', None, _(b'treat all files as text')),
349 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'f', b'file', None, _(b'list the filename')),
351 (b'f', b'file', None, _(b'list the filename')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
355 (
355 (
356 b'l',
356 b'l',
357 b'line-number',
357 b'line-number',
358 None,
358 None,
359 _(b'show line number at the first appearance'),
359 _(b'show line number at the first appearance'),
360 ),
360 ),
361 (
361 (
362 b'',
362 b'',
363 b'skip',
363 b'skip',
364 [],
364 [],
365 _(b'revset to not display (EXPERIMENTAL)'),
365 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'REV'),
366 _(b'REV'),
367 ),
367 ),
368 ]
368 ]
369 + diffwsopts
369 + diffwsopts
370 + walkopts
370 + walkopts
371 + formatteropts,
371 + formatteropts,
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpbasic=True,
374 helpbasic=True,
375 inferrepo=True,
375 inferrepo=True,
376 )
376 )
377 def annotate(ui, repo, *pats, **opts):
377 def annotate(ui, repo, *pats, **opts):
378 """show changeset information by line for each file
378 """show changeset information by line for each file
379
379
380 List changes in files, showing the revision id responsible for
380 List changes in files, showing the revision id responsible for
381 each line.
381 each line.
382
382
383 This command is useful for discovering when a change was made and
383 This command is useful for discovering when a change was made and
384 by whom.
384 by whom.
385
385
386 If you include --file, --user, or --date, the revision number is
386 If you include --file, --user, or --date, the revision number is
387 suppressed unless you also include --number.
387 suppressed unless you also include --number.
388
388
389 Without the -a/--text option, annotate will avoid processing files
389 Without the -a/--text option, annotate will avoid processing files
390 it detects as binary. With -a, annotate will annotate the file
390 it detects as binary. With -a, annotate will annotate the file
391 anyway, although the results will probably be neither useful
391 anyway, although the results will probably be neither useful
392 nor desirable.
392 nor desirable.
393
393
394 .. container:: verbose
394 .. container:: verbose
395
395
396 Template:
396 Template:
397
397
398 The following keywords are supported in addition to the common template
398 The following keywords are supported in addition to the common template
399 keywords and functions. See also :hg:`help templates`.
399 keywords and functions. See also :hg:`help templates`.
400
400
401 :lines: List of lines with annotation data.
401 :lines: List of lines with annotation data.
402 :path: String. Repository-absolute path of the specified file.
402 :path: String. Repository-absolute path of the specified file.
403
403
404 And each entry of ``{lines}`` provides the following sub-keywords in
404 And each entry of ``{lines}`` provides the following sub-keywords in
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406
406
407 :line: String. Line content.
407 :line: String. Line content.
408 :lineno: Integer. Line number at that revision.
408 :lineno: Integer. Line number at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
410
410
411 See :hg:`help templates.operators` for the list expansion syntax.
411 See :hg:`help templates.operators` for the list expansion syntax.
412
412
413 Returns 0 on success.
413 Returns 0 on success.
414 """
414 """
415 opts = pycompat.byteskwargs(opts)
415 opts = pycompat.byteskwargs(opts)
416 if not pats:
416 if not pats:
417 raise error.Abort(_(b'at least one filename or pattern is required'))
417 raise error.Abort(_(b'at least one filename or pattern is required'))
418
418
419 if opts.get(b'follow'):
419 if opts.get(b'follow'):
420 # --follow is deprecated and now just an alias for -f/--file
420 # --follow is deprecated and now just an alias for -f/--file
421 # to mimic the behavior of Mercurial before version 1.5
421 # to mimic the behavior of Mercurial before version 1.5
422 opts[b'file'] = True
422 opts[b'file'] = True
423
423
424 if (
424 if (
425 not opts.get(b'user')
425 not opts.get(b'user')
426 and not opts.get(b'changeset')
426 and not opts.get(b'changeset')
427 and not opts.get(b'date')
427 and not opts.get(b'date')
428 and not opts.get(b'file')
428 and not opts.get(b'file')
429 ):
429 ):
430 opts[b'number'] = True
430 opts[b'number'] = True
431
431
432 linenumber = opts.get(b'line_number') is not None
432 linenumber = opts.get(b'line_number') is not None
433 if (
433 if (
434 linenumber
434 linenumber
435 and (not opts.get(b'changeset'))
435 and (not opts.get(b'changeset'))
436 and (not opts.get(b'number'))
436 and (not opts.get(b'number'))
437 ):
437 ):
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439
439
440 rev = opts.get(b'rev')
440 rev = opts.get(b'rev')
441 if rev:
441 if rev:
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 ctx = scmutil.revsingle(repo, rev)
443 ctx = scmutil.revsingle(repo, rev)
444
444
445 ui.pager(b'annotate')
445 ui.pager(b'annotate')
446 rootfm = ui.formatter(b'annotate', opts)
446 rootfm = ui.formatter(b'annotate', opts)
447 if ui.debugflag:
447 if ui.debugflag:
448 shorthex = pycompat.identity
448 shorthex = pycompat.identity
449 else:
449 else:
450
450
451 def shorthex(h):
451 def shorthex(h):
452 return h[:12]
452 return h[:12]
453
453
454 if ui.quiet:
454 if ui.quiet:
455 datefunc = dateutil.shortdate
455 datefunc = dateutil.shortdate
456 else:
456 else:
457 datefunc = dateutil.datestr
457 datefunc = dateutil.datestr
458 if ctx.rev() is None:
458 if ctx.rev() is None:
459 if opts.get(b'changeset'):
459 if opts.get(b'changeset'):
460 # omit "+" suffix which is appended to node hex
460 # omit "+" suffix which is appended to node hex
461 def formatrev(rev):
461 def formatrev(rev):
462 if rev == wdirrev:
462 if rev == wdirrev:
463 return b'%d' % ctx.p1().rev()
463 return b'%d' % ctx.p1().rev()
464 else:
464 else:
465 return b'%d' % rev
465 return b'%d' % rev
466
466
467 else:
467 else:
468
468
469 def formatrev(rev):
469 def formatrev(rev):
470 if rev == wdirrev:
470 if rev == wdirrev:
471 return b'%d+' % ctx.p1().rev()
471 return b'%d+' % ctx.p1().rev()
472 else:
472 else:
473 return b'%d ' % rev
473 return b'%d ' % rev
474
474
475 def formathex(h):
475 def formathex(h):
476 if h == wdirhex:
476 if h == wdirhex:
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 else:
478 else:
479 return b'%s ' % shorthex(h)
479 return b'%s ' % shorthex(h)
480
480
481 else:
481 else:
482 formatrev = b'%d'.__mod__
482 formatrev = b'%d'.__mod__
483 formathex = shorthex
483 formathex = shorthex
484
484
485 opmap = [
485 opmap = [
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 ]
492 ]
493 opnamemap = {
493 opnamemap = {
494 b'rev': b'number',
494 b'rev': b'number',
495 b'node': b'changeset',
495 b'node': b'changeset',
496 b'path': b'file',
496 b'path': b'file',
497 b'lineno': b'line_number',
497 b'lineno': b'line_number',
498 }
498 }
499
499
500 if rootfm.isplain():
500 if rootfm.isplain():
501
501
502 def makefunc(get, fmt):
502 def makefunc(get, fmt):
503 return lambda x: fmt(get(x))
503 return lambda x: fmt(get(x))
504
504
505 else:
505 else:
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return get
508 return get
509
509
510 datahint = rootfm.datahint()
510 datahint = rootfm.datahint()
511 funcmap = [
511 funcmap = [
512 (makefunc(get, fmt), sep)
512 (makefunc(get, fmt), sep)
513 for fn, sep, get, fmt in opmap
513 for fn, sep, get, fmt in opmap
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 ]
515 ]
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 fields = b' '.join(
517 fields = b' '.join(
518 fn
518 fn
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 )
521 )
522
522
523 def bad(x, y):
523 def bad(x, y):
524 raise error.Abort(b"%s: %s" % (x, y))
524 raise error.Abort(b"%s: %s" % (x, y))
525
525
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527
527
528 follow = not opts.get(b'no_follow')
528 follow = not opts.get(b'no_follow')
529 diffopts = patch.difffeatureopts(
529 diffopts = patch.difffeatureopts(
530 ui, opts, section=b'annotate', whitespace=True
530 ui, opts, section=b'annotate', whitespace=True
531 )
531 )
532 skiprevs = opts.get(b'skip')
532 skiprevs = opts.get(b'skip')
533 if skiprevs:
533 if skiprevs:
534 skiprevs = scmutil.revrange(repo, skiprevs)
534 skiprevs = scmutil.revrange(repo, skiprevs)
535
535
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 for abs in ctx.walk(m):
537 for abs in ctx.walk(m):
538 fctx = ctx[abs]
538 fctx = ctx[abs]
539 rootfm.startitem()
539 rootfm.startitem()
540 rootfm.data(path=abs)
540 rootfm.data(path=abs)
541 if not opts.get(b'text') and fctx.isbinary():
541 if not opts.get(b'text') and fctx.isbinary():
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 continue
543 continue
544
544
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 lines = fctx.annotate(
546 lines = fctx.annotate(
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 )
548 )
549 if not lines:
549 if not lines:
550 fm.end()
550 fm.end()
551 continue
551 continue
552 formats = []
552 formats = []
553 pieces = []
553 pieces = []
554
554
555 for f, sep in funcmap:
555 for f, sep in funcmap:
556 l = [f(n) for n in lines]
556 l = [f(n) for n in lines]
557 if fm.isplain():
557 if fm.isplain():
558 sizes = [encoding.colwidth(x) for x in l]
558 sizes = [encoding.colwidth(x) for x in l]
559 ml = max(sizes)
559 ml = max(sizes)
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 else:
561 else:
562 formats.append([b'%s'] * len(l))
562 formats.append([b'%s'] * len(l))
563 pieces.append(l)
563 pieces.append(l)
564
564
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 fm.startitem()
566 fm.startitem()
567 fm.context(fctx=n.fctx)
567 fm.context(fctx=n.fctx)
568 fm.write(fields, b"".join(f), *p)
568 fm.write(fields, b"".join(f), *p)
569 if n.skip:
569 if n.skip:
570 fmt = b"* %s"
570 fmt = b"* %s"
571 else:
571 else:
572 fmt = b": %s"
572 fmt = b": %s"
573 fm.write(b'line', fmt, n.text)
573 fm.write(b'line', fmt, n.text)
574
574
575 if not lines[-1].text.endswith(b'\n'):
575 if not lines[-1].text.endswith(b'\n'):
576 fm.plain(b'\n')
576 fm.plain(b'\n')
577 fm.end()
577 fm.end()
578
578
579 rootfm.end()
579 rootfm.end()
580
580
581
581
582 @command(
582 @command(
583 b'archive',
583 b'archive',
584 [
584 [
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (
586 (
587 b'p',
587 b'p',
588 b'prefix',
588 b'prefix',
589 b'',
589 b'',
590 _(b'directory prefix for files in archive'),
590 _(b'directory prefix for files in archive'),
591 _(b'PREFIX'),
591 _(b'PREFIX'),
592 ),
592 ),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 ]
595 ]
596 + subrepoopts
596 + subrepoopts
597 + walkopts,
597 + walkopts,
598 _(b'[OPTION]... DEST'),
598 _(b'[OPTION]... DEST'),
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 )
600 )
601 def archive(ui, repo, dest, **opts):
601 def archive(ui, repo, dest, **opts):
602 '''create an unversioned archive of a repository revision
602 '''create an unversioned archive of a repository revision
603
603
604 By default, the revision used is the parent of the working
604 By default, the revision used is the parent of the working
605 directory; use -r/--rev to specify a different revision.
605 directory; use -r/--rev to specify a different revision.
606
606
607 The archive type is automatically detected based on file
607 The archive type is automatically detected based on file
608 extension (to override, use -t/--type).
608 extension (to override, use -t/--type).
609
609
610 .. container:: verbose
610 .. container:: verbose
611
611
612 Examples:
612 Examples:
613
613
614 - create a zip file containing the 1.0 release::
614 - create a zip file containing the 1.0 release::
615
615
616 hg archive -r 1.0 project-1.0.zip
616 hg archive -r 1.0 project-1.0.zip
617
617
618 - create a tarball excluding .hg files::
618 - create a tarball excluding .hg files::
619
619
620 hg archive project.tar.gz -X ".hg*"
620 hg archive project.tar.gz -X ".hg*"
621
621
622 Valid types are:
622 Valid types are:
623
623
624 :``files``: a directory full of files (default)
624 :``files``: a directory full of files (default)
625 :``tar``: tar archive, uncompressed
625 :``tar``: tar archive, uncompressed
626 :``tbz2``: tar archive, compressed using bzip2
626 :``tbz2``: tar archive, compressed using bzip2
627 :``tgz``: tar archive, compressed using gzip
627 :``tgz``: tar archive, compressed using gzip
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``uzip``: zip archive, uncompressed
629 :``uzip``: zip archive, uncompressed
630 :``zip``: zip archive, compressed using deflate
630 :``zip``: zip archive, compressed using deflate
631
631
632 The exact name of the destination archive or directory is given
632 The exact name of the destination archive or directory is given
633 using a format string; see :hg:`help export` for details.
633 using a format string; see :hg:`help export` for details.
634
634
635 Each member added to an archive file has a directory prefix
635 Each member added to an archive file has a directory prefix
636 prepended. Use -p/--prefix to specify a format string for the
636 prepended. Use -p/--prefix to specify a format string for the
637 prefix. The default is the basename of the archive, with suffixes
637 prefix. The default is the basename of the archive, with suffixes
638 removed.
638 removed.
639
639
640 Returns 0 on success.
640 Returns 0 on success.
641 '''
641 '''
642
642
643 opts = pycompat.byteskwargs(opts)
643 opts = pycompat.byteskwargs(opts)
644 rev = opts.get(b'rev')
644 rev = opts.get(b'rev')
645 if rev:
645 if rev:
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 if not ctx:
648 if not ctx:
649 raise error.Abort(_(b'no working directory: please specify a revision'))
649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 node = ctx.node()
650 node = ctx.node()
651 dest = cmdutil.makefilename(ctx, dest)
651 dest = cmdutil.makefilename(ctx, dest)
652 if os.path.realpath(dest) == repo.root:
652 if os.path.realpath(dest) == repo.root:
653 raise error.Abort(_(b'repository root cannot be destination'))
653 raise error.Abort(_(b'repository root cannot be destination'))
654
654
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 prefix = opts.get(b'prefix')
656 prefix = opts.get(b'prefix')
657
657
658 if dest == b'-':
658 if dest == b'-':
659 if kind == b'files':
659 if kind == b'files':
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 dest = cmdutil.makefileobj(ctx, dest)
661 dest = cmdutil.makefileobj(ctx, dest)
662 if not prefix:
662 if not prefix:
663 prefix = os.path.basename(repo.root) + b'-%h'
663 prefix = os.path.basename(repo.root) + b'-%h'
664
664
665 prefix = cmdutil.makefilename(ctx, prefix)
665 prefix = cmdutil.makefilename(ctx, prefix)
666 match = scmutil.match(ctx, [], opts)
666 match = scmutil.match(ctx, [], opts)
667 archival.archive(
667 archival.archive(
668 repo,
668 repo,
669 dest,
669 dest,
670 node,
670 node,
671 kind,
671 kind,
672 not opts.get(b'no_decode'),
672 not opts.get(b'no_decode'),
673 match,
673 match,
674 prefix,
674 prefix,
675 subrepos=opts.get(b'subrepos'),
675 subrepos=opts.get(b'subrepos'),
676 )
676 )
677
677
678
678
679 @command(
679 @command(
680 b'backout',
680 b'backout',
681 [
681 [
682 (
682 (
683 b'',
683 b'',
684 b'merge',
684 b'merge',
685 None,
685 None,
686 _(b'merge with old dirstate parent after backout'),
686 _(b'merge with old dirstate parent after backout'),
687 ),
687 ),
688 (
688 (
689 b'',
689 b'',
690 b'commit',
690 b'commit',
691 None,
691 None,
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 ),
693 ),
694 (b'', b'no-commit', None, _(b'do not commit')),
694 (b'', b'no-commit', None, _(b'do not commit')),
695 (
695 (
696 b'',
696 b'',
697 b'parent',
697 b'parent',
698 b'',
698 b'',
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'REV'),
700 _(b'REV'),
701 ),
701 ),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 ]
704 ]
705 + mergetoolopts
705 + mergetoolopts
706 + walkopts
706 + walkopts
707 + commitopts
707 + commitopts
708 + commitopts2,
708 + commitopts2,
709 _(b'[OPTION]... [-r] REV'),
709 _(b'[OPTION]... [-r] REV'),
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 )
711 )
712 def backout(ui, repo, node=None, rev=None, **opts):
712 def backout(ui, repo, node=None, rev=None, **opts):
713 '''reverse effect of earlier changeset
713 '''reverse effect of earlier changeset
714
714
715 Prepare a new changeset with the effect of REV undone in the
715 Prepare a new changeset with the effect of REV undone in the
716 current working directory. If no conflicts were encountered,
716 current working directory. If no conflicts were encountered,
717 it will be committed immediately.
717 it will be committed immediately.
718
718
719 If REV is the parent of the working directory, then this new changeset
719 If REV is the parent of the working directory, then this new changeset
720 is committed automatically (unless --no-commit is specified).
720 is committed automatically (unless --no-commit is specified).
721
721
722 .. note::
722 .. note::
723
723
724 :hg:`backout` cannot be used to fix either an unwanted or
724 :hg:`backout` cannot be used to fix either an unwanted or
725 incorrect merge.
725 incorrect merge.
726
726
727 .. container:: verbose
727 .. container:: verbose
728
728
729 Examples:
729 Examples:
730
730
731 - Reverse the effect of the parent of the working directory.
731 - Reverse the effect of the parent of the working directory.
732 This backout will be committed immediately::
732 This backout will be committed immediately::
733
733
734 hg backout -r .
734 hg backout -r .
735
735
736 - Reverse the effect of previous bad revision 23::
736 - Reverse the effect of previous bad revision 23::
737
737
738 hg backout -r 23
738 hg backout -r 23
739
739
740 - Reverse the effect of previous bad revision 23 and
740 - Reverse the effect of previous bad revision 23 and
741 leave changes uncommitted::
741 leave changes uncommitted::
742
742
743 hg backout -r 23 --no-commit
743 hg backout -r 23 --no-commit
744 hg commit -m "Backout revision 23"
744 hg commit -m "Backout revision 23"
745
745
746 By default, the pending changeset will have one parent,
746 By default, the pending changeset will have one parent,
747 maintaining a linear history. With --merge, the pending
747 maintaining a linear history. With --merge, the pending
748 changeset will instead have two parents: the old parent of the
748 changeset will instead have two parents: the old parent of the
749 working directory and a new child of REV that simply undoes REV.
749 working directory and a new child of REV that simply undoes REV.
750
750
751 Before version 1.7, the behavior without --merge was equivalent
751 Before version 1.7, the behavior without --merge was equivalent
752 to specifying --merge followed by :hg:`update --clean .` to
752 to specifying --merge followed by :hg:`update --clean .` to
753 cancel the merge and leave the child of REV as a head to be
753 cancel the merge and leave the child of REV as a head to be
754 merged separately.
754 merged separately.
755
755
756 See :hg:`help dates` for a list of formats valid for -d/--date.
756 See :hg:`help dates` for a list of formats valid for -d/--date.
757
757
758 See :hg:`help revert` for a way to restore files to the state
758 See :hg:`help revert` for a way to restore files to the state
759 of another revision.
759 of another revision.
760
760
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 files.
762 files.
763 '''
763 '''
764 with repo.wlock(), repo.lock():
764 with repo.wlock(), repo.lock():
765 return _dobackout(ui, repo, node, rev, **opts)
765 return _dobackout(ui, repo, node, rev, **opts)
766
766
767
767
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 opts = pycompat.byteskwargs(opts)
769 opts = pycompat.byteskwargs(opts)
770 if opts.get(b'commit') and opts.get(b'no_commit'):
770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 if opts.get(b'merge') and opts.get(b'no_commit'):
772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774
774
775 if rev and node:
775 if rev and node:
776 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
777
777
778 if not rev:
778 if not rev:
779 rev = node
779 rev = node
780
780
781 if not rev:
781 if not rev:
782 raise error.Abort(_(b"please specify a revision to backout"))
782 raise error.Abort(_(b"please specify a revision to backout"))
783
783
784 date = opts.get(b'date')
784 date = opts.get(b'date')
785 if date:
785 if date:
786 opts[b'date'] = dateutil.parsedate(date)
786 opts[b'date'] = dateutil.parsedate(date)
787
787
788 cmdutil.checkunfinished(repo)
788 cmdutil.checkunfinished(repo)
789 cmdutil.bailifchanged(repo)
789 cmdutil.bailifchanged(repo)
790 node = scmutil.revsingle(repo, rev).node()
790 node = scmutil.revsingle(repo, rev).node()
791
791
792 op1, op2 = repo.dirstate.parents()
792 op1, op2 = repo.dirstate.parents()
793 if not repo.changelog.isancestor(node, op1):
793 if not repo.changelog.isancestor(node, op1):
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795
795
796 p1, p2 = repo.changelog.parents(node)
796 p1, p2 = repo.changelog.parents(node)
797 if p1 == nullid:
797 if p1 == nullid:
798 raise error.Abort(_(b'cannot backout a change with no parents'))
798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 if p2 != nullid:
799 if p2 != nullid:
800 if not opts.get(b'parent'):
800 if not opts.get(b'parent'):
801 raise error.Abort(_(b'cannot backout a merge changeset'))
801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 p = repo.lookup(opts[b'parent'])
802 p = repo.lookup(opts[b'parent'])
803 if p not in (p1, p2):
803 if p not in (p1, p2):
804 raise error.Abort(
804 raise error.Abort(
805 _(b'%s is not a parent of %s') % (short(p), short(node))
805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 )
806 )
807 parent = p
807 parent = p
808 else:
808 else:
809 if opts.get(b'parent'):
809 if opts.get(b'parent'):
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 parent = p1
811 parent = p1
812
812
813 # the backout should appear on the same branch
813 # the backout should appear on the same branch
814 branch = repo.dirstate.branch()
814 branch = repo.dirstate.branch()
815 bheads = repo.branchheads(branch)
815 bheads = repo.branchheads(branch)
816 rctx = scmutil.revsingle(repo, hex(parent))
816 rctx = scmutil.revsingle(repo, hex(parent))
817 if not opts.get(b'merge') and op1 != node:
817 if not opts.get(b'merge') and op1 != node:
818 with dirstateguard.dirstateguard(repo, b'backout'):
818 with dirstateguard.dirstateguard(repo, b'backout'):
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 with ui.configoverride(overrides, b'backout'):
820 with ui.configoverride(overrides, b'backout'):
821 stats = mergemod.update(
821 stats = mergemod.update(
822 repo,
822 repo,
823 parent,
823 parent,
824 branchmerge=True,
824 branchmerge=True,
825 force=True,
825 force=True,
826 ancestor=node,
826 ancestor=node,
827 mergeancestor=False,
827 mergeancestor=False,
828 )
828 )
829 repo.setparents(op1, op2)
829 repo.setparents(op1, op2)
830 hg._showstats(repo, stats)
830 hg._showstats(repo, stats)
831 if stats.unresolvedcount:
831 if stats.unresolvedcount:
832 repo.ui.status(
832 repo.ui.status(
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 )
834 )
835 return 1
835 return 1
836 else:
836 else:
837 hg.clean(repo, node, show_stats=False)
837 hg.clean(repo, node, show_stats=False)
838 repo.dirstate.setbranch(branch)
838 repo.dirstate.setbranch(branch)
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840
840
841 if opts.get(b'no_commit'):
841 if opts.get(b'no_commit'):
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 ui.status(msg % short(node))
843 ui.status(msg % short(node))
844 return 0
844 return 0
845
845
846 def commitfunc(ui, repo, message, match, opts):
846 def commitfunc(ui, repo, message, match, opts):
847 editform = b'backout'
847 editform = b'backout'
848 e = cmdutil.getcommiteditor(
848 e = cmdutil.getcommiteditor(
849 editform=editform, **pycompat.strkwargs(opts)
849 editform=editform, **pycompat.strkwargs(opts)
850 )
850 )
851 if not message:
851 if not message:
852 # we don't translate commit messages
852 # we don't translate commit messages
853 message = b"Backed out changeset %s" % short(node)
853 message = b"Backed out changeset %s" % short(node)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 return repo.commit(
855 return repo.commit(
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 )
857 )
858
858
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 if not newnode:
860 if not newnode:
861 ui.status(_(b"nothing changed\n"))
861 ui.status(_(b"nothing changed\n"))
862 return 1
862 return 1
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864
864
865 def nice(node):
865 def nice(node):
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867
867
868 ui.status(
868 ui.status(
869 _(b'changeset %s backs out changeset %s\n')
869 _(b'changeset %s backs out changeset %s\n')
870 % (nice(repo.changelog.tip()), nice(node))
870 % (nice(repo.changelog.tip()), nice(node))
871 )
871 )
872 if opts.get(b'merge') and op1 != node:
872 if opts.get(b'merge') and op1 != node:
873 hg.clean(repo, op1, show_stats=False)
873 hg.clean(repo, op1, show_stats=False)
874 ui.status(
874 ui.status(
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 )
876 )
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 with ui.configoverride(overrides, b'backout'):
878 with ui.configoverride(overrides, b'backout'):
879 return hg.merge(repo[b'tip'])
879 return hg.merge(repo[b'tip'])
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 cmdutil.check_incompatible_arguments(
1239 cmdutil.check_incompatible_arguments(
1240 opts, b'inactive', [b'delete', b'list']
1240 opts, b'inactive', [b'delete', b'list']
1241 )
1241 )
1242 if not names and action in {b'add', b'delete'}:
1242 if not names and action in {b'add', b'delete'}:
1243 raise error.Abort(_(b"bookmark name required"))
1243 raise error.Abort(_(b"bookmark name required"))
1244
1244
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 if action == b'delete':
1247 if action == b'delete':
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 bookmarks.delete(repo, tr, names)
1249 bookmarks.delete(repo, tr, names)
1250 elif action == b'rename':
1250 elif action == b'rename':
1251 if not names:
1251 if not names:
1252 raise error.Abort(_(b"new bookmark name required"))
1252 raise error.Abort(_(b"new bookmark name required"))
1253 elif len(names) > 1:
1253 elif len(names) > 1:
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 elif action == b'add':
1257 elif action == b'add':
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 elif action == b'inactive':
1259 elif action == b'inactive':
1260 if len(repo._bookmarks) == 0:
1260 if len(repo._bookmarks) == 0:
1261 ui.status(_(b"no bookmarks set\n"))
1261 ui.status(_(b"no bookmarks set\n"))
1262 elif not repo._activebookmark:
1262 elif not repo._activebookmark:
1263 ui.status(_(b"no active bookmark\n"))
1263 ui.status(_(b"no active bookmark\n"))
1264 else:
1264 else:
1265 bookmarks.deactivate(repo)
1265 bookmarks.deactivate(repo)
1266 elif action == b'list':
1266 elif action == b'list':
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 with ui.formatter(b'bookmarks', opts) as fm:
1268 with ui.formatter(b'bookmarks', opts) as fm:
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1270 else:
1270 else:
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1272
1272
1273
1273
1274 @command(
1274 @command(
1275 b'branch',
1275 b'branch',
1276 [
1276 [
1277 (
1277 (
1278 b'f',
1278 b'f',
1279 b'force',
1279 b'force',
1280 None,
1280 None,
1281 _(b'set branch name even if it shadows an existing branch'),
1281 _(b'set branch name even if it shadows an existing branch'),
1282 ),
1282 ),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (
1284 (
1285 b'r',
1285 b'r',
1286 b'rev',
1286 b'rev',
1287 [],
1287 [],
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 ),
1289 ),
1290 ],
1290 ],
1291 _(b'[-fC] [NAME]'),
1291 _(b'[-fC] [NAME]'),
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 )
1293 )
1294 def branch(ui, repo, label=None, **opts):
1294 def branch(ui, repo, label=None, **opts):
1295 """set or show the current branch name
1295 """set or show the current branch name
1296
1296
1297 .. note::
1297 .. note::
1298
1298
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1301 information about named branches and bookmarks.
1301 information about named branches and bookmarks.
1302
1302
1303 With no argument, show the current branch name. With one argument,
1303 With no argument, show the current branch name. With one argument,
1304 set the working directory branch name (the branch will not exist
1304 set the working directory branch name (the branch will not exist
1305 in the repository until the next commit). Standard practice
1305 in the repository until the next commit). Standard practice
1306 recommends that primary development take place on the 'default'
1306 recommends that primary development take place on the 'default'
1307 branch.
1307 branch.
1308
1308
1309 Unless -f/--force is specified, branch will not let you set a
1309 Unless -f/--force is specified, branch will not let you set a
1310 branch name that already exists.
1310 branch name that already exists.
1311
1311
1312 Use -C/--clean to reset the working directory branch to that of
1312 Use -C/--clean to reset the working directory branch to that of
1313 the parent of the working directory, negating a previous branch
1313 the parent of the working directory, negating a previous branch
1314 change.
1314 change.
1315
1315
1316 Use the command :hg:`update` to switch to an existing branch. Use
1316 Use the command :hg:`update` to switch to an existing branch. Use
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1318 When all heads of a branch are closed, the branch will be
1318 When all heads of a branch are closed, the branch will be
1319 considered closed.
1319 considered closed.
1320
1320
1321 Returns 0 on success.
1321 Returns 0 on success.
1322 """
1322 """
1323 opts = pycompat.byteskwargs(opts)
1323 opts = pycompat.byteskwargs(opts)
1324 revs = opts.get(b'rev')
1324 revs = opts.get(b'rev')
1325 if label:
1325 if label:
1326 label = label.strip()
1326 label = label.strip()
1327
1327
1328 if not opts.get(b'clean') and not label:
1328 if not opts.get(b'clean') and not label:
1329 if revs:
1329 if revs:
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1332 return
1332 return
1333
1333
1334 with repo.wlock():
1334 with repo.wlock():
1335 if opts.get(b'clean'):
1335 if opts.get(b'clean'):
1336 label = repo[b'.'].branch()
1336 label = repo[b'.'].branch()
1337 repo.dirstate.setbranch(label)
1337 repo.dirstate.setbranch(label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 elif label:
1339 elif label:
1340
1340
1341 scmutil.checknewlabel(repo, label, b'branch')
1341 scmutil.checknewlabel(repo, label, b'branch')
1342 if revs:
1342 if revs:
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344
1344
1345 if not opts.get(b'force') and label in repo.branchmap():
1345 if not opts.get(b'force') and label in repo.branchmap():
1346 if label not in [p.branch() for p in repo[None].parents()]:
1346 if label not in [p.branch() for p in repo[None].parents()]:
1347 raise error.Abort(
1347 raise error.Abort(
1348 _(b'a branch of the same name already exists'),
1348 _(b'a branch of the same name already exists'),
1349 # i18n: "it" refers to an existing branch
1349 # i18n: "it" refers to an existing branch
1350 hint=_(b"use 'hg update' to switch to it"),
1350 hint=_(b"use 'hg update' to switch to it"),
1351 )
1351 )
1352
1352
1353 repo.dirstate.setbranch(label)
1353 repo.dirstate.setbranch(label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1355
1355
1356 # find any open named branches aside from default
1356 # find any open named branches aside from default
1357 for n, h, t, c in repo.branchmap().iterbranches():
1357 for n, h, t, c in repo.branchmap().iterbranches():
1358 if n != b"default" and not c:
1358 if n != b"default" and not c:
1359 return 0
1359 return 0
1360 ui.status(
1360 ui.status(
1361 _(
1361 _(
1362 b'(branches are permanent and global, '
1362 b'(branches are permanent and global, '
1363 b'did you want a bookmark?)\n'
1363 b'did you want a bookmark?)\n'
1364 )
1364 )
1365 )
1365 )
1366
1366
1367
1367
1368 @command(
1368 @command(
1369 b'branches',
1369 b'branches',
1370 [
1370 [
1371 (
1371 (
1372 b'a',
1372 b'a',
1373 b'active',
1373 b'active',
1374 False,
1374 False,
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 ),
1376 ),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 ]
1379 ]
1380 + formatteropts,
1380 + formatteropts,
1381 _(b'[-c]'),
1381 _(b'[-c]'),
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 intents={INTENT_READONLY},
1383 intents={INTENT_READONLY},
1384 )
1384 )
1385 def branches(ui, repo, active=False, closed=False, **opts):
1385 def branches(ui, repo, active=False, closed=False, **opts):
1386 """list repository named branches
1386 """list repository named branches
1387
1387
1388 List the repository's named branches, indicating which ones are
1388 List the repository's named branches, indicating which ones are
1389 inactive. If -c/--closed is specified, also list branches which have
1389 inactive. If -c/--closed is specified, also list branches which have
1390 been marked closed (see :hg:`commit --close-branch`).
1390 been marked closed (see :hg:`commit --close-branch`).
1391
1391
1392 Use the command :hg:`update` to switch to an existing branch.
1392 Use the command :hg:`update` to switch to an existing branch.
1393
1393
1394 .. container:: verbose
1394 .. container:: verbose
1395
1395
1396 Template:
1396 Template:
1397
1397
1398 The following keywords are supported in addition to the common template
1398 The following keywords are supported in addition to the common template
1399 keywords and functions such as ``{branch}``. See also
1399 keywords and functions such as ``{branch}``. See also
1400 :hg:`help templates`.
1400 :hg:`help templates`.
1401
1401
1402 :active: Boolean. True if the branch is active.
1402 :active: Boolean. True if the branch is active.
1403 :closed: Boolean. True if the branch is closed.
1403 :closed: Boolean. True if the branch is closed.
1404 :current: Boolean. True if it is the current branch.
1404 :current: Boolean. True if it is the current branch.
1405
1405
1406 Returns 0.
1406 Returns 0.
1407 """
1407 """
1408
1408
1409 opts = pycompat.byteskwargs(opts)
1409 opts = pycompat.byteskwargs(opts)
1410 revs = opts.get(b'rev')
1410 revs = opts.get(b'rev')
1411 selectedbranches = None
1411 selectedbranches = None
1412 if revs:
1412 if revs:
1413 revs = scmutil.revrange(repo, revs)
1413 revs = scmutil.revrange(repo, revs)
1414 getbi = repo.revbranchcache().branchinfo
1414 getbi = repo.revbranchcache().branchinfo
1415 selectedbranches = {getbi(r)[0] for r in revs}
1415 selectedbranches = {getbi(r)[0] for r in revs}
1416
1416
1417 ui.pager(b'branches')
1417 ui.pager(b'branches')
1418 fm = ui.formatter(b'branches', opts)
1418 fm = ui.formatter(b'branches', opts)
1419 hexfunc = fm.hexfunc
1419 hexfunc = fm.hexfunc
1420
1420
1421 allheads = set(repo.heads())
1421 allheads = set(repo.heads())
1422 branches = []
1422 branches = []
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 if selectedbranches is not None and tag not in selectedbranches:
1424 if selectedbranches is not None and tag not in selectedbranches:
1425 continue
1425 continue
1426 isactive = False
1426 isactive = False
1427 if not isclosed:
1427 if not isclosed:
1428 openheads = set(repo.branchmap().iteropen(heads))
1428 openheads = set(repo.branchmap().iteropen(heads))
1429 isactive = bool(openheads & allheads)
1429 isactive = bool(openheads & allheads)
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432
1432
1433 for tag, ctx, isactive, isopen in branches:
1433 for tag, ctx, isactive, isopen in branches:
1434 if active and not isactive:
1434 if active and not isactive:
1435 continue
1435 continue
1436 if isactive:
1436 if isactive:
1437 label = b'branches.active'
1437 label = b'branches.active'
1438 notice = b''
1438 notice = b''
1439 elif not isopen:
1439 elif not isopen:
1440 if not closed:
1440 if not closed:
1441 continue
1441 continue
1442 label = b'branches.closed'
1442 label = b'branches.closed'
1443 notice = _(b' (closed)')
1443 notice = _(b' (closed)')
1444 else:
1444 else:
1445 label = b'branches.inactive'
1445 label = b'branches.inactive'
1446 notice = _(b' (inactive)')
1446 notice = _(b' (inactive)')
1447 current = tag == repo.dirstate.branch()
1447 current = tag == repo.dirstate.branch()
1448 if current:
1448 if current:
1449 label = b'branches.current'
1449 label = b'branches.current'
1450
1450
1451 fm.startitem()
1451 fm.startitem()
1452 fm.write(b'branch', b'%s', tag, label=label)
1452 fm.write(b'branch', b'%s', tag, label=label)
1453 rev = ctx.rev()
1453 rev = ctx.rev()
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 fmt = b' ' * padsize + b' %d:%s'
1455 fmt = b' ' * padsize + b' %d:%s'
1456 fm.condwrite(
1456 fm.condwrite(
1457 not ui.quiet,
1457 not ui.quiet,
1458 b'rev node',
1458 b'rev node',
1459 fmt,
1459 fmt,
1460 rev,
1460 rev,
1461 hexfunc(ctx.node()),
1461 hexfunc(ctx.node()),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 )
1463 )
1464 fm.context(ctx=ctx)
1464 fm.context(ctx=ctx)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1466 if not ui.quiet:
1466 if not ui.quiet:
1467 fm.plain(notice)
1467 fm.plain(notice)
1468 fm.plain(b'\n')
1468 fm.plain(b'\n')
1469 fm.end()
1469 fm.end()
1470
1470
1471
1471
1472 @command(
1472 @command(
1473 b'bundle',
1473 b'bundle',
1474 [
1474 [
1475 (
1475 (
1476 b'f',
1476 b'f',
1477 b'force',
1477 b'force',
1478 None,
1478 None,
1479 _(b'run even when the destination is unrelated'),
1479 _(b'run even when the destination is unrelated'),
1480 ),
1480 ),
1481 (
1481 (
1482 b'r',
1482 b'r',
1483 b'rev',
1483 b'rev',
1484 [],
1484 [],
1485 _(b'a changeset intended to be added to the destination'),
1485 _(b'a changeset intended to be added to the destination'),
1486 _(b'REV'),
1486 _(b'REV'),
1487 ),
1487 ),
1488 (
1488 (
1489 b'b',
1489 b'b',
1490 b'branch',
1490 b'branch',
1491 [],
1491 [],
1492 _(b'a specific branch you would like to bundle'),
1492 _(b'a specific branch you would like to bundle'),
1493 _(b'BRANCH'),
1493 _(b'BRANCH'),
1494 ),
1494 ),
1495 (
1495 (
1496 b'',
1496 b'',
1497 b'base',
1497 b'base',
1498 [],
1498 [],
1499 _(b'a base changeset assumed to be available at the destination'),
1499 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'REV'),
1500 _(b'REV'),
1501 ),
1501 ),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (
1503 (
1504 b't',
1504 b't',
1505 b'type',
1505 b'type',
1506 b'bzip2',
1506 b'bzip2',
1507 _(b'bundle compression type to use'),
1507 _(b'bundle compression type to use'),
1508 _(b'TYPE'),
1508 _(b'TYPE'),
1509 ),
1509 ),
1510 ]
1510 ]
1511 + remoteopts,
1511 + remoteopts,
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 )
1514 )
1515 def bundle(ui, repo, fname, dest=None, **opts):
1515 def bundle(ui, repo, fname, dest=None, **opts):
1516 """create a bundle file
1516 """create a bundle file
1517
1517
1518 Generate a bundle file containing data to be transferred to another
1518 Generate a bundle file containing data to be transferred to another
1519 repository.
1519 repository.
1520
1520
1521 To create a bundle containing all changesets, use -a/--all
1521 To create a bundle containing all changesets, use -a/--all
1522 (or --base null). Otherwise, hg assumes the destination will have
1522 (or --base null). Otherwise, hg assumes the destination will have
1523 all the nodes you specify with --base parameters. Otherwise, hg
1523 all the nodes you specify with --base parameters. Otherwise, hg
1524 will assume the repository has all the nodes in destination, or
1524 will assume the repository has all the nodes in destination, or
1525 default-push/default if no destination is specified, where destination
1525 default-push/default if no destination is specified, where destination
1526 is the repository you provide through DEST option.
1526 is the repository you provide through DEST option.
1527
1527
1528 You can change bundle format with the -t/--type option. See
1528 You can change bundle format with the -t/--type option. See
1529 :hg:`help bundlespec` for documentation on this format. By default,
1529 :hg:`help bundlespec` for documentation on this format. By default,
1530 the most appropriate format is used and compression defaults to
1530 the most appropriate format is used and compression defaults to
1531 bzip2.
1531 bzip2.
1532
1532
1533 The bundle file can then be transferred using conventional means
1533 The bundle file can then be transferred using conventional means
1534 and applied to another repository with the unbundle or pull
1534 and applied to another repository with the unbundle or pull
1535 command. This is useful when direct push and pull are not
1535 command. This is useful when direct push and pull are not
1536 available or when exporting an entire repository is undesirable.
1536 available or when exporting an entire repository is undesirable.
1537
1537
1538 Applying bundles preserves all changeset contents including
1538 Applying bundles preserves all changeset contents including
1539 permissions, copy/rename information, and revision history.
1539 permissions, copy/rename information, and revision history.
1540
1540
1541 Returns 0 on success, 1 if no changes found.
1541 Returns 0 on success, 1 if no changes found.
1542 """
1542 """
1543 opts = pycompat.byteskwargs(opts)
1543 opts = pycompat.byteskwargs(opts)
1544 revs = None
1544 revs = None
1545 if b'rev' in opts:
1545 if b'rev' in opts:
1546 revstrings = opts[b'rev']
1546 revstrings = opts[b'rev']
1547 revs = scmutil.revrange(repo, revstrings)
1547 revs = scmutil.revrange(repo, revstrings)
1548 if revstrings and not revs:
1548 if revstrings and not revs:
1549 raise error.Abort(_(b'no commits to bundle'))
1549 raise error.Abort(_(b'no commits to bundle'))
1550
1550
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1552 try:
1552 try:
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 except error.UnsupportedBundleSpecification as e:
1554 except error.UnsupportedBundleSpecification as e:
1555 raise error.Abort(
1555 raise error.Abort(
1556 pycompat.bytestr(e),
1556 pycompat.bytestr(e),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 )
1558 )
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1560
1560
1561 # Packed bundles are a pseudo bundle format for now.
1561 # Packed bundles are a pseudo bundle format for now.
1562 if cgversion == b's1':
1562 if cgversion == b's1':
1563 raise error.Abort(
1563 raise error.Abort(
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 )
1566 )
1567
1567
1568 if opts.get(b'all'):
1568 if opts.get(b'all'):
1569 if dest:
1569 if dest:
1570 raise error.Abort(
1570 raise error.Abort(
1571 _(b"--all is incompatible with specifying a destination")
1571 _(b"--all is incompatible with specifying a destination")
1572 )
1572 )
1573 if opts.get(b'base'):
1573 if opts.get(b'base'):
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 base = [nullrev]
1575 base = [nullrev]
1576 else:
1576 else:
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 raise error.Abort(
1579 raise error.Abort(
1580 _(b"repository does not support bundle version %s") % cgversion
1580 _(b"repository does not support bundle version %s") % cgversion
1581 )
1581 )
1582
1582
1583 if base:
1583 if base:
1584 if dest:
1584 if dest:
1585 raise error.Abort(
1585 raise error.Abort(
1586 _(b"--base is incompatible with specifying a destination")
1586 _(b"--base is incompatible with specifying a destination")
1587 )
1587 )
1588 common = [repo[rev].node() for rev in base]
1588 common = [repo[rev].node() for rev in base]
1589 heads = [repo[r].node() for r in revs] if revs else None
1589 heads = [repo[r].node() for r in revs] if revs else None
1590 outgoing = discovery.outgoing(repo, common, heads)
1590 outgoing = discovery.outgoing(repo, common, heads)
1591 else:
1591 else:
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 other = hg.peer(repo, opts, dest)
1594 other = hg.peer(repo, opts, dest)
1595 revs = [repo[r].hex() for r in revs]
1595 revs = [repo[r].hex() for r in revs]
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 outgoing = discovery.findcommonoutgoing(
1598 outgoing = discovery.findcommonoutgoing(
1599 repo,
1599 repo,
1600 other,
1600 other,
1601 onlyheads=heads,
1601 onlyheads=heads,
1602 force=opts.get(b'force'),
1602 force=opts.get(b'force'),
1603 portable=True,
1603 portable=True,
1604 )
1604 )
1605
1605
1606 if not outgoing.missing:
1606 if not outgoing.missing:
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 return 1
1608 return 1
1609
1609
1610 if cgversion == b'01': # bundle1
1610 if cgversion == b'01': # bundle1
1611 bversion = b'HG10' + bundlespec.wirecompression
1611 bversion = b'HG10' + bundlespec.wirecompression
1612 bcompression = None
1612 bcompression = None
1613 elif cgversion in (b'02', b'03'):
1613 elif cgversion in (b'02', b'03'):
1614 bversion = b'HG20'
1614 bversion = b'HG20'
1615 bcompression = bundlespec.wirecompression
1615 bcompression = bundlespec.wirecompression
1616 else:
1616 else:
1617 raise error.ProgrammingError(
1617 raise error.ProgrammingError(
1618 b'bundle: unexpected changegroup version %s' % cgversion
1618 b'bundle: unexpected changegroup version %s' % cgversion
1619 )
1619 )
1620
1620
1621 # TODO compression options should be derived from bundlespec parsing.
1621 # TODO compression options should be derived from bundlespec parsing.
1622 # This is a temporary hack to allow adjusting bundle compression
1622 # This is a temporary hack to allow adjusting bundle compression
1623 # level without a) formalizing the bundlespec changes to declare it
1623 # level without a) formalizing the bundlespec changes to declare it
1624 # b) introducing a command flag.
1624 # b) introducing a command flag.
1625 compopts = {}
1625 compopts = {}
1626 complevel = ui.configint(
1626 complevel = ui.configint(
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 )
1628 )
1629 if complevel is None:
1629 if complevel is None:
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 if complevel is not None:
1631 if complevel is not None:
1632 compopts[b'level'] = complevel
1632 compopts[b'level'] = complevel
1633
1633
1634 # Allow overriding the bundling of obsmarker in phases through
1634 # Allow overriding the bundling of obsmarker in phases through
1635 # configuration while we don't have a bundle version that include them
1635 # configuration while we don't have a bundle version that include them
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 bundlespec.contentopts[b'obsolescence'] = True
1637 bundlespec.contentopts[b'obsolescence'] = True
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 bundlespec.contentopts[b'phases'] = True
1639 bundlespec.contentopts[b'phases'] = True
1640
1640
1641 bundle2.writenewbundle(
1641 bundle2.writenewbundle(
1642 ui,
1642 ui,
1643 repo,
1643 repo,
1644 b'bundle',
1644 b'bundle',
1645 fname,
1645 fname,
1646 bversion,
1646 bversion,
1647 outgoing,
1647 outgoing,
1648 bundlespec.contentopts,
1648 bundlespec.contentopts,
1649 compression=bcompression,
1649 compression=bcompression,
1650 compopts=compopts,
1650 compopts=compopts,
1651 )
1651 )
1652
1652
1653
1653
1654 @command(
1654 @command(
1655 b'cat',
1655 b'cat',
1656 [
1656 [
1657 (
1657 (
1658 b'o',
1658 b'o',
1659 b'output',
1659 b'output',
1660 b'',
1660 b'',
1661 _(b'print output to file with formatted name'),
1661 _(b'print output to file with formatted name'),
1662 _(b'FORMAT'),
1662 _(b'FORMAT'),
1663 ),
1663 ),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 ]
1666 ]
1667 + walkopts
1667 + walkopts
1668 + formatteropts,
1668 + formatteropts,
1669 _(b'[OPTION]... FILE...'),
1669 _(b'[OPTION]... FILE...'),
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 inferrepo=True,
1671 inferrepo=True,
1672 intents={INTENT_READONLY},
1672 intents={INTENT_READONLY},
1673 )
1673 )
1674 def cat(ui, repo, file1, *pats, **opts):
1674 def cat(ui, repo, file1, *pats, **opts):
1675 """output the current or given revision of files
1675 """output the current or given revision of files
1676
1676
1677 Print the specified files as they were at the given revision. If
1677 Print the specified files as they were at the given revision. If
1678 no revision is given, the parent of the working directory is used.
1678 no revision is given, the parent of the working directory is used.
1679
1679
1680 Output may be to a file, in which case the name of the file is
1680 Output may be to a file, in which case the name of the file is
1681 given using a template string. See :hg:`help templates`. In addition
1681 given using a template string. See :hg:`help templates`. In addition
1682 to the common template keywords, the following formatting rules are
1682 to the common template keywords, the following formatting rules are
1683 supported:
1683 supported:
1684
1684
1685 :``%%``: literal "%" character
1685 :``%%``: literal "%" character
1686 :``%s``: basename of file being printed
1686 :``%s``: basename of file being printed
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%p``: root-relative path name of file being printed
1688 :``%p``: root-relative path name of file being printed
1689 :``%H``: changeset hash (40 hexadecimal digits)
1689 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%R``: changeset revision number
1690 :``%R``: changeset revision number
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%r``: zero-padded changeset revision number
1692 :``%r``: zero-padded changeset revision number
1693 :``%b``: basename of the exporting repository
1693 :``%b``: basename of the exporting repository
1694 :``\\``: literal "\\" character
1694 :``\\``: literal "\\" character
1695
1695
1696 .. container:: verbose
1696 .. container:: verbose
1697
1697
1698 Template:
1698 Template:
1699
1699
1700 The following keywords are supported in addition to the common template
1700 The following keywords are supported in addition to the common template
1701 keywords and functions. See also :hg:`help templates`.
1701 keywords and functions. See also :hg:`help templates`.
1702
1702
1703 :data: String. File content.
1703 :data: String. File content.
1704 :path: String. Repository-absolute path of the file.
1704 :path: String. Repository-absolute path of the file.
1705
1705
1706 Returns 0 on success.
1706 Returns 0 on success.
1707 """
1707 """
1708 opts = pycompat.byteskwargs(opts)
1708 opts = pycompat.byteskwargs(opts)
1709 rev = opts.get(b'rev')
1709 rev = opts.get(b'rev')
1710 if rev:
1710 if rev:
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 ctx = scmutil.revsingle(repo, rev)
1712 ctx = scmutil.revsingle(repo, rev)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 fntemplate = opts.pop(b'output', b'')
1714 fntemplate = opts.pop(b'output', b'')
1715 if cmdutil.isstdiofilename(fntemplate):
1715 if cmdutil.isstdiofilename(fntemplate):
1716 fntemplate = b''
1716 fntemplate = b''
1717
1717
1718 if fntemplate:
1718 if fntemplate:
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1720 else:
1720 else:
1721 ui.pager(b'cat')
1721 ui.pager(b'cat')
1722 fm = ui.formatter(b'cat', opts)
1722 fm = ui.formatter(b'cat', opts)
1723 with fm:
1723 with fm:
1724 return cmdutil.cat(
1724 return cmdutil.cat(
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 )
1726 )
1727
1727
1728
1728
1729 @command(
1729 @command(
1730 b'clone',
1730 b'clone',
1731 [
1731 [
1732 (
1732 (
1733 b'U',
1733 b'U',
1734 b'noupdate',
1734 b'noupdate',
1735 None,
1735 None,
1736 _(
1736 _(
1737 b'the clone will include an empty working '
1737 b'the clone will include an empty working '
1738 b'directory (only a repository)'
1738 b'directory (only a repository)'
1739 ),
1739 ),
1740 ),
1740 ),
1741 (
1741 (
1742 b'u',
1742 b'u',
1743 b'updaterev',
1743 b'updaterev',
1744 b'',
1744 b'',
1745 _(b'revision, tag, or branch to check out'),
1745 _(b'revision, tag, or branch to check out'),
1746 _(b'REV'),
1746 _(b'REV'),
1747 ),
1747 ),
1748 (
1748 (
1749 b'r',
1749 b'r',
1750 b'rev',
1750 b'rev',
1751 [],
1751 [],
1752 _(
1752 _(
1753 b'do not clone everything, but include this changeset'
1753 b'do not clone everything, but include this changeset'
1754 b' and its ancestors'
1754 b' and its ancestors'
1755 ),
1755 ),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'b',
1759 b'b',
1760 b'branch',
1760 b'branch',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this branch\'s'
1763 b'do not clone everything, but include this branch\'s'
1764 b' changesets and their ancestors'
1764 b' changesets and their ancestors'
1765 ),
1765 ),
1766 _(b'BRANCH'),
1766 _(b'BRANCH'),
1767 ),
1767 ),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 ]
1771 ]
1772 + remoteopts,
1772 + remoteopts,
1773 _(b'[OPTION]... SOURCE [DEST]'),
1773 _(b'[OPTION]... SOURCE [DEST]'),
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpbasic=True,
1775 helpbasic=True,
1776 norepo=True,
1776 norepo=True,
1777 )
1777 )
1778 def clone(ui, source, dest=None, **opts):
1778 def clone(ui, source, dest=None, **opts):
1779 """make a copy of an existing repository
1779 """make a copy of an existing repository
1780
1780
1781 Create a copy of an existing repository in a new directory.
1781 Create a copy of an existing repository in a new directory.
1782
1782
1783 If no destination directory name is specified, it defaults to the
1783 If no destination directory name is specified, it defaults to the
1784 basename of the source.
1784 basename of the source.
1785
1785
1786 The location of the source is added to the new repository's
1786 The location of the source is added to the new repository's
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788
1788
1789 Only local paths and ``ssh://`` URLs are supported as
1789 Only local paths and ``ssh://`` URLs are supported as
1790 destinations. For ``ssh://`` destinations, no working directory or
1790 destinations. For ``ssh://`` destinations, no working directory or
1791 ``.hg/hgrc`` will be created on the remote side.
1791 ``.hg/hgrc`` will be created on the remote side.
1792
1792
1793 If the source repository has a bookmark called '@' set, that
1793 If the source repository has a bookmark called '@' set, that
1794 revision will be checked out in the new repository by default.
1794 revision will be checked out in the new repository by default.
1795
1795
1796 To check out a particular version, use -u/--update, or
1796 To check out a particular version, use -u/--update, or
1797 -U/--noupdate to create a clone with no working directory.
1797 -U/--noupdate to create a clone with no working directory.
1798
1798
1799 To pull only a subset of changesets, specify one or more revisions
1799 To pull only a subset of changesets, specify one or more revisions
1800 identifiers with -r/--rev or branches with -b/--branch. The
1800 identifiers with -r/--rev or branches with -b/--branch. The
1801 resulting clone will contain only the specified changesets and
1801 resulting clone will contain only the specified changesets and
1802 their ancestors. These options (or 'clone src#rev dest') imply
1802 their ancestors. These options (or 'clone src#rev dest') imply
1803 --pull, even for local source repositories.
1803 --pull, even for local source repositories.
1804
1804
1805 In normal clone mode, the remote normalizes repository data into a common
1805 In normal clone mode, the remote normalizes repository data into a common
1806 exchange format and the receiving end translates this data into its local
1806 exchange format and the receiving end translates this data into its local
1807 storage format. --stream activates a different clone mode that essentially
1807 storage format. --stream activates a different clone mode that essentially
1808 copies repository files from the remote with minimal data processing. This
1808 copies repository files from the remote with minimal data processing. This
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1810 However, it often increases the transferred data size by 30-40%. This can
1810 However, it often increases the transferred data size by 30-40%. This can
1811 result in substantially faster clones where I/O throughput is plentiful,
1811 result in substantially faster clones where I/O throughput is plentiful,
1812 especially for larger repositories. A side-effect of --stream clones is
1812 especially for larger repositories. A side-effect of --stream clones is
1813 that storage settings and requirements on the remote are applied locally:
1813 that storage settings and requirements on the remote are applied locally:
1814 a modern client may inherit legacy or inefficient storage used by the
1814 a modern client may inherit legacy or inefficient storage used by the
1815 remote or a legacy Mercurial client may not be able to clone from a
1815 remote or a legacy Mercurial client may not be able to clone from a
1816 modern Mercurial remote.
1816 modern Mercurial remote.
1817
1817
1818 .. note::
1818 .. note::
1819
1819
1820 Specifying a tag will include the tagged changeset but not the
1820 Specifying a tag will include the tagged changeset but not the
1821 changeset containing the tag.
1821 changeset containing the tag.
1822
1822
1823 .. container:: verbose
1823 .. container:: verbose
1824
1824
1825 For efficiency, hardlinks are used for cloning whenever the
1825 For efficiency, hardlinks are used for cloning whenever the
1826 source and destination are on the same filesystem (note this
1826 source and destination are on the same filesystem (note this
1827 applies only to the repository data, not to the working
1827 applies only to the repository data, not to the working
1828 directory). Some filesystems, such as AFS, implement hardlinking
1828 directory). Some filesystems, such as AFS, implement hardlinking
1829 incorrectly, but do not report errors. In these cases, use the
1829 incorrectly, but do not report errors. In these cases, use the
1830 --pull option to avoid hardlinking.
1830 --pull option to avoid hardlinking.
1831
1831
1832 Mercurial will update the working directory to the first applicable
1832 Mercurial will update the working directory to the first applicable
1833 revision from this list:
1833 revision from this list:
1834
1834
1835 a) null if -U or the source repository has no changesets
1835 a) null if -U or the source repository has no changesets
1836 b) if -u . and the source repository is local, the first parent of
1836 b) if -u . and the source repository is local, the first parent of
1837 the source repository's working directory
1837 the source repository's working directory
1838 c) the changeset specified with -u (if a branch name, this means the
1838 c) the changeset specified with -u (if a branch name, this means the
1839 latest head of that branch)
1839 latest head of that branch)
1840 d) the changeset specified with -r
1840 d) the changeset specified with -r
1841 e) the tipmost head specified with -b
1841 e) the tipmost head specified with -b
1842 f) the tipmost head specified with the url#branch source syntax
1842 f) the tipmost head specified with the url#branch source syntax
1843 g) the revision marked with the '@' bookmark, if present
1843 g) the revision marked with the '@' bookmark, if present
1844 h) the tipmost head of the default branch
1844 h) the tipmost head of the default branch
1845 i) tip
1845 i) tip
1846
1846
1847 When cloning from servers that support it, Mercurial may fetch
1847 When cloning from servers that support it, Mercurial may fetch
1848 pre-generated data from a server-advertised URL or inline from the
1848 pre-generated data from a server-advertised URL or inline from the
1849 same stream. When this is done, hooks operating on incoming changesets
1849 same stream. When this is done, hooks operating on incoming changesets
1850 and changegroups may fire more than once, once for each pre-generated
1850 and changegroups may fire more than once, once for each pre-generated
1851 bundle and as well as for any additional remaining data. In addition,
1851 bundle and as well as for any additional remaining data. In addition,
1852 if an error occurs, the repository may be rolled back to a partial
1852 if an error occurs, the repository may be rolled back to a partial
1853 clone. This behavior may change in future releases.
1853 clone. This behavior may change in future releases.
1854 See :hg:`help -e clonebundles` for more.
1854 See :hg:`help -e clonebundles` for more.
1855
1855
1856 Examples:
1856 Examples:
1857
1857
1858 - clone a remote repository to a new directory named hg/::
1858 - clone a remote repository to a new directory named hg/::
1859
1859
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1861
1861
1862 - create a lightweight local clone::
1862 - create a lightweight local clone::
1863
1863
1864 hg clone project/ project-feature/
1864 hg clone project/ project-feature/
1865
1865
1866 - clone from an absolute path on an ssh server (note double-slash)::
1866 - clone from an absolute path on an ssh server (note double-slash)::
1867
1867
1868 hg clone ssh://user@server//home/projects/alpha/
1868 hg clone ssh://user@server//home/projects/alpha/
1869
1869
1870 - do a streaming clone while checking out a specified version::
1870 - do a streaming clone while checking out a specified version::
1871
1871
1872 hg clone --stream http://server/repo -u 1.5
1872 hg clone --stream http://server/repo -u 1.5
1873
1873
1874 - create a repository without changesets after a particular revision::
1874 - create a repository without changesets after a particular revision::
1875
1875
1876 hg clone -r 04e544 experimental/ good/
1876 hg clone -r 04e544 experimental/ good/
1877
1877
1878 - clone (and track) a particular named branch::
1878 - clone (and track) a particular named branch::
1879
1879
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881
1881
1882 See :hg:`help urls` for details on specifying URLs.
1882 See :hg:`help urls` for details on specifying URLs.
1883
1883
1884 Returns 0 on success.
1884 Returns 0 on success.
1885 """
1885 """
1886 opts = pycompat.byteskwargs(opts)
1886 opts = pycompat.byteskwargs(opts)
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888
1888
1889 # --include/--exclude can come from narrow or sparse.
1889 # --include/--exclude can come from narrow or sparse.
1890 includepats, excludepats = None, None
1890 includepats, excludepats = None, None
1891
1891
1892 # hg.clone() differentiates between None and an empty set. So make sure
1892 # hg.clone() differentiates between None and an empty set. So make sure
1893 # patterns are sets if narrow is requested without patterns.
1893 # patterns are sets if narrow is requested without patterns.
1894 if opts.get(b'narrow'):
1894 if opts.get(b'narrow'):
1895 includepats = set()
1895 includepats = set()
1896 excludepats = set()
1896 excludepats = set()
1897
1897
1898 if opts.get(b'include'):
1898 if opts.get(b'include'):
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 if opts.get(b'exclude'):
1900 if opts.get(b'exclude'):
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902
1902
1903 r = hg.clone(
1903 r = hg.clone(
1904 ui,
1904 ui,
1905 opts,
1905 opts,
1906 source,
1906 source,
1907 dest,
1907 dest,
1908 pull=opts.get(b'pull'),
1908 pull=opts.get(b'pull'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 revs=opts.get(b'rev'),
1910 revs=opts.get(b'rev'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 branch=opts.get(b'branch'),
1912 branch=opts.get(b'branch'),
1913 shareopts=opts.get(b'shareopts'),
1913 shareopts=opts.get(b'shareopts'),
1914 storeincludepats=includepats,
1914 storeincludepats=includepats,
1915 storeexcludepats=excludepats,
1915 storeexcludepats=excludepats,
1916 depth=opts.get(b'depth') or None,
1916 depth=opts.get(b'depth') or None,
1917 )
1917 )
1918
1918
1919 return r is None
1919 return r is None
1920
1920
1921
1921
1922 @command(
1922 @command(
1923 b'commit|ci',
1923 b'commit|ci',
1924 [
1924 [
1925 (
1925 (
1926 b'A',
1926 b'A',
1927 b'addremove',
1927 b'addremove',
1928 None,
1928 None,
1929 _(b'mark new/missing files as added/removed before committing'),
1929 _(b'mark new/missing files as added/removed before committing'),
1930 ),
1930 ),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (
1935 (
1936 b'',
1936 b'',
1937 b'force-close-branch',
1937 b'force-close-branch',
1938 None,
1938 None,
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 ),
1940 ),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 ]
1942 ]
1943 + walkopts
1943 + walkopts
1944 + commitopts
1944 + commitopts
1945 + commitopts2
1945 + commitopts2
1946 + subrepoopts,
1946 + subrepoopts,
1947 _(b'[OPTION]... [FILE]...'),
1947 _(b'[OPTION]... [FILE]...'),
1948 helpcategory=command.CATEGORY_COMMITTING,
1948 helpcategory=command.CATEGORY_COMMITTING,
1949 helpbasic=True,
1949 helpbasic=True,
1950 inferrepo=True,
1950 inferrepo=True,
1951 )
1951 )
1952 def commit(ui, repo, *pats, **opts):
1952 def commit(ui, repo, *pats, **opts):
1953 """commit the specified files or all outstanding changes
1953 """commit the specified files or all outstanding changes
1954
1954
1955 Commit changes to the given files into the repository. Unlike a
1955 Commit changes to the given files into the repository. Unlike a
1956 centralized SCM, this operation is a local operation. See
1956 centralized SCM, this operation is a local operation. See
1957 :hg:`push` for a way to actively distribute your changes.
1957 :hg:`push` for a way to actively distribute your changes.
1958
1958
1959 If a list of files is omitted, all changes reported by :hg:`status`
1959 If a list of files is omitted, all changes reported by :hg:`status`
1960 will be committed.
1960 will be committed.
1961
1961
1962 If you are committing the result of a merge, do not provide any
1962 If you are committing the result of a merge, do not provide any
1963 filenames or -I/-X filters.
1963 filenames or -I/-X filters.
1964
1964
1965 If no commit message is specified, Mercurial starts your
1965 If no commit message is specified, Mercurial starts your
1966 configured editor where you can enter a message. In case your
1966 configured editor where you can enter a message. In case your
1967 commit fails, you will find a backup of your message in
1967 commit fails, you will find a backup of your message in
1968 ``.hg/last-message.txt``.
1968 ``.hg/last-message.txt``.
1969
1969
1970 The --close-branch flag can be used to mark the current branch
1970 The --close-branch flag can be used to mark the current branch
1971 head closed. When all heads of a branch are closed, the branch
1971 head closed. When all heads of a branch are closed, the branch
1972 will be considered closed and no longer listed.
1972 will be considered closed and no longer listed.
1973
1973
1974 The --amend flag can be used to amend the parent of the
1974 The --amend flag can be used to amend the parent of the
1975 working directory with a new commit that contains the changes
1975 working directory with a new commit that contains the changes
1976 in the parent in addition to those currently reported by :hg:`status`,
1976 in the parent in addition to those currently reported by :hg:`status`,
1977 if there are any. The old commit is stored in a backup bundle in
1977 if there are any. The old commit is stored in a backup bundle in
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 on how to restore it).
1979 on how to restore it).
1980
1980
1981 Message, user and date are taken from the amended commit unless
1981 Message, user and date are taken from the amended commit unless
1982 specified. When a message isn't specified on the command line,
1982 specified. When a message isn't specified on the command line,
1983 the editor will open with the message of the amended commit.
1983 the editor will open with the message of the amended commit.
1984
1984
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1986 or changesets that have children.
1986 or changesets that have children.
1987
1987
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1989
1989
1990 Returns 0 on success, 1 if nothing changed.
1990 Returns 0 on success, 1 if nothing changed.
1991
1991
1992 .. container:: verbose
1992 .. container:: verbose
1993
1993
1994 Examples:
1994 Examples:
1995
1995
1996 - commit all files ending in .py::
1996 - commit all files ending in .py::
1997
1997
1998 hg commit --include "set:**.py"
1998 hg commit --include "set:**.py"
1999
1999
2000 - commit all non-binary files::
2000 - commit all non-binary files::
2001
2001
2002 hg commit --exclude "set:binary()"
2002 hg commit --exclude "set:binary()"
2003
2003
2004 - amend the current commit and set the date to now::
2004 - amend the current commit and set the date to now::
2005
2005
2006 hg commit --amend --date now
2006 hg commit --amend --date now
2007 """
2007 """
2008 with repo.wlock(), repo.lock():
2008 with repo.wlock(), repo.lock():
2009 return _docommit(ui, repo, *pats, **opts)
2009 return _docommit(ui, repo, *pats, **opts)
2010
2010
2011
2011
2012 def _docommit(ui, repo, *pats, **opts):
2012 def _docommit(ui, repo, *pats, **opts):
2013 if opts.get('interactive'):
2013 if opts.get('interactive'):
2014 opts.pop('interactive')
2014 opts.pop('interactive')
2015 ret = cmdutil.dorecord(
2015 ret = cmdutil.dorecord(
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 )
2017 )
2018 # ret can be 0 (no changes to record) or the value returned by
2018 # ret can be 0 (no changes to record) or the value returned by
2019 # commit(), 1 if nothing changed or None on success.
2019 # commit(), 1 if nothing changed or None on success.
2020 return 1 if ret == 0 else ret
2020 return 1 if ret == 0 else ret
2021
2021
2022 opts = pycompat.byteskwargs(opts)
2022 opts = pycompat.byteskwargs(opts)
2023 if opts.get(b'subrepos'):
2023 if opts.get(b'subrepos'):
2024 if opts.get(b'amend'):
2024 if opts.get(b'amend'):
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 # Let --subrepos on the command line override config setting.
2026 # Let --subrepos on the command line override config setting.
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028
2028
2029 cmdutil.checkunfinished(repo, commit=True)
2029 cmdutil.checkunfinished(repo, commit=True)
2030
2030
2031 branch = repo[None].branch()
2031 branch = repo[None].branch()
2032 bheads = repo.branchheads(branch)
2032 bheads = repo.branchheads(branch)
2033
2033
2034 extra = {}
2034 extra = {}
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 extra[b'close'] = b'1'
2036 extra[b'close'] = b'1'
2037
2037
2038 if repo[b'.'].closesbranch():
2038 if repo[b'.'].closesbranch():
2039 raise error.Abort(
2039 raise error.Abort(
2040 _(b'current revision is already a branch closing head')
2040 _(b'current revision is already a branch closing head')
2041 )
2041 )
2042 elif not bheads:
2042 elif not bheads:
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 elif (
2044 elif (
2045 branch == repo[b'.'].branch()
2045 branch == repo[b'.'].branch()
2046 and repo[b'.'].node() not in bheads
2046 and repo[b'.'].node() not in bheads
2047 and not opts.get(b'force_close_branch')
2047 and not opts.get(b'force_close_branch')
2048 ):
2048 ):
2049 hint = _(
2049 hint = _(
2050 b'use --force-close-branch to close branch from a non-head'
2050 b'use --force-close-branch to close branch from a non-head'
2051 b' changeset'
2051 b' changeset'
2052 )
2052 )
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 elif opts.get(b'amend'):
2054 elif opts.get(b'amend'):
2055 if (
2055 if (
2056 repo[b'.'].p1().branch() != branch
2056 repo[b'.'].p1().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2058 ):
2058 ):
2059 raise error.Abort(_(b'can only close branch heads'))
2059 raise error.Abort(_(b'can only close branch heads'))
2060
2060
2061 if opts.get(b'amend'):
2061 if opts.get(b'amend'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064
2064
2065 old = repo[b'.']
2065 old = repo[b'.']
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067
2067
2068 # Currently histedit gets confused if an amend happens while histedit
2068 # Currently histedit gets confused if an amend happens while histedit
2069 # is in progress. Since we have a checkunfinished command, we are
2069 # is in progress. Since we have a checkunfinished command, we are
2070 # temporarily honoring it.
2070 # temporarily honoring it.
2071 #
2071 #
2072 # Note: eventually this guard will be removed. Please do not expect
2072 # Note: eventually this guard will be removed. Please do not expect
2073 # this behavior to remain.
2073 # this behavior to remain.
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 cmdutil.checkunfinished(repo)
2075 cmdutil.checkunfinished(repo)
2076
2076
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 if node == old.node():
2078 if node == old.node():
2079 ui.status(_(b"nothing changed\n"))
2079 ui.status(_(b"nothing changed\n"))
2080 return 1
2080 return 1
2081 else:
2081 else:
2082
2082
2083 def commitfunc(ui, repo, message, match, opts):
2083 def commitfunc(ui, repo, message, match, opts):
2084 overrides = {}
2084 overrides = {}
2085 if opts.get(b'secret'):
2085 if opts.get(b'secret'):
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2087
2087
2088 baseui = repo.baseui
2088 baseui = repo.baseui
2089 with baseui.configoverride(overrides, b'commit'):
2089 with baseui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2091 editform = cmdutil.mergeeditform(
2091 editform = cmdutil.mergeeditform(
2092 repo[None], b'commit.normal'
2092 repo[None], b'commit.normal'
2093 )
2093 )
2094 editor = cmdutil.getcommiteditor(
2094 editor = cmdutil.getcommiteditor(
2095 editform=editform, **pycompat.strkwargs(opts)
2095 editform=editform, **pycompat.strkwargs(opts)
2096 )
2096 )
2097 return repo.commit(
2097 return repo.commit(
2098 message,
2098 message,
2099 opts.get(b'user'),
2099 opts.get(b'user'),
2100 opts.get(b'date'),
2100 opts.get(b'date'),
2101 match,
2101 match,
2102 editor=editor,
2102 editor=editor,
2103 extra=extra,
2103 extra=extra,
2104 )
2104 )
2105
2105
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107
2107
2108 if not node:
2108 if not node:
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 if stat.deleted:
2110 if stat.deleted:
2111 ui.status(
2111 ui.status(
2112 _(
2112 _(
2113 b"nothing changed (%d missing files, see "
2113 b"nothing changed (%d missing files, see "
2114 b"'hg status')\n"
2114 b"'hg status')\n"
2115 )
2115 )
2116 % len(stat.deleted)
2116 % len(stat.deleted)
2117 )
2117 )
2118 else:
2118 else:
2119 ui.status(_(b"nothing changed\n"))
2119 ui.status(_(b"nothing changed\n"))
2120 return 1
2120 return 1
2121
2121
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123
2123
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 status(
2125 status(
2126 ui,
2126 ui,
2127 repo,
2127 repo,
2128 modified=True,
2128 modified=True,
2129 added=True,
2129 added=True,
2130 removed=True,
2130 removed=True,
2131 deleted=True,
2131 deleted=True,
2132 unknown=True,
2132 unknown=True,
2133 subrepos=opts.get(b'subrepos'),
2133 subrepos=opts.get(b'subrepos'),
2134 )
2134 )
2135
2135
2136
2136
2137 @command(
2137 @command(
2138 b'config|showconfig|debugconfig',
2138 b'config|showconfig|debugconfig',
2139 [
2139 [
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2144 ]
2144 ]
2145 + formatteropts,
2145 + formatteropts,
2146 _(b'[-u] [NAME]...'),
2146 _(b'[-u] [NAME]...'),
2147 helpcategory=command.CATEGORY_HELP,
2147 helpcategory=command.CATEGORY_HELP,
2148 optionalrepo=True,
2148 optionalrepo=True,
2149 intents={INTENT_READONLY},
2149 intents={INTENT_READONLY},
2150 )
2150 )
2151 def config(ui, repo, *values, **opts):
2151 def config(ui, repo, *values, **opts):
2152 """show combined config settings from all hgrc files
2152 """show combined config settings from all hgrc files
2153
2153
2154 With no arguments, print names and values of all config items.
2154 With no arguments, print names and values of all config items.
2155
2155
2156 With one argument of the form section.name, print just the value
2156 With one argument of the form section.name, print just the value
2157 of that config item.
2157 of that config item.
2158
2158
2159 With multiple arguments, print names and values of all config
2159 With multiple arguments, print names and values of all config
2160 items with matching section names or section.names.
2160 items with matching section names or section.names.
2161
2161
2162 With --edit, start an editor on the user-level config file. With
2162 With --edit, start an editor on the user-level config file. With
2163 --global, edit the system-wide config file. With --local, edit the
2163 --global, edit the system-wide config file. With --local, edit the
2164 repository-level config file.
2164 repository-level config file.
2165
2165
2166 With --debug, the source (filename and line number) is printed
2166 With --debug, the source (filename and line number) is printed
2167 for each config item.
2167 for each config item.
2168
2168
2169 See :hg:`help config` for more information about config files.
2169 See :hg:`help config` for more information about config files.
2170
2170
2171 .. container:: verbose
2171 .. container:: verbose
2172
2172
2173 Template:
2173 Template:
2174
2174
2175 The following keywords are supported. See also :hg:`help templates`.
2175 The following keywords are supported. See also :hg:`help templates`.
2176
2176
2177 :name: String. Config name.
2177 :name: String. Config name.
2178 :source: String. Filename and line number where the item is defined.
2178 :source: String. Filename and line number where the item is defined.
2179 :value: String. Config value.
2179 :value: String. Config value.
2180
2180
2181 Returns 0 on success, 1 if NAME does not exist.
2181 Returns 0 on success, 1 if NAME does not exist.
2182
2182
2183 """
2183 """
2184
2184
2185 opts = pycompat.byteskwargs(opts)
2185 opts = pycompat.byteskwargs(opts)
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2188 raise error.Abort(_(b"can't use --local and --global together"))
2188 raise error.Abort(_(b"can't use --local and --global together"))
2189
2189
2190 if opts.get(b'local'):
2190 if opts.get(b'local'):
2191 if not repo:
2191 if not repo:
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2193 paths = [repo.vfs.join(b'hgrc')]
2193 paths = [repo.vfs.join(b'hgrc')]
2194 elif opts.get(b'global'):
2194 elif opts.get(b'global'):
2195 paths = rcutil.systemrcpath()
2195 paths = rcutil.systemrcpath()
2196 else:
2196 else:
2197 paths = rcutil.userrcpath()
2197 paths = rcutil.userrcpath()
2198
2198
2199 for f in paths:
2199 for f in paths:
2200 if os.path.exists(f):
2200 if os.path.exists(f):
2201 break
2201 break
2202 else:
2202 else:
2203 if opts.get(b'global'):
2203 if opts.get(b'global'):
2204 samplehgrc = uimod.samplehgrcs[b'global']
2204 samplehgrc = uimod.samplehgrcs[b'global']
2205 elif opts.get(b'local'):
2205 elif opts.get(b'local'):
2206 samplehgrc = uimod.samplehgrcs[b'local']
2206 samplehgrc = uimod.samplehgrcs[b'local']
2207 else:
2207 else:
2208 samplehgrc = uimod.samplehgrcs[b'user']
2208 samplehgrc = uimod.samplehgrcs[b'user']
2209
2209
2210 f = paths[0]
2210 f = paths[0]
2211 fp = open(f, b"wb")
2211 fp = open(f, b"wb")
2212 fp.write(util.tonativeeol(samplehgrc))
2212 fp.write(util.tonativeeol(samplehgrc))
2213 fp.close()
2213 fp.close()
2214
2214
2215 editor = ui.geteditor()
2215 editor = ui.geteditor()
2216 ui.system(
2216 ui.system(
2217 b"%s \"%s\"" % (editor, f),
2217 b"%s \"%s\"" % (editor, f),
2218 onerr=error.Abort,
2218 onerr=error.Abort,
2219 errprefix=_(b"edit failed"),
2219 errprefix=_(b"edit failed"),
2220 blockedtag=b'config_edit',
2220 blockedtag=b'config_edit',
2221 )
2221 )
2222 return
2222 return
2223 ui.pager(b'config')
2223 ui.pager(b'config')
2224 fm = ui.formatter(b'config', opts)
2224 fm = ui.formatter(b'config', opts)
2225 for t, f in rcutil.rccomponents():
2225 for t, f in rcutil.rccomponents():
2226 if t == b'path':
2226 if t == b'path':
2227 ui.debug(b'read config from: %s\n' % f)
2227 ui.debug(b'read config from: %s\n' % f)
2228 elif t == b'resource':
2228 elif t == b'resource':
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 elif t == b'items':
2230 elif t == b'items':
2231 # Don't print anything for 'items'.
2231 # Don't print anything for 'items'.
2232 pass
2232 pass
2233 else:
2233 else:
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 untrusted = bool(opts.get(b'untrusted'))
2235 untrusted = bool(opts.get(b'untrusted'))
2236
2236
2237 selsections = selentries = []
2237 selsections = selentries = []
2238 if values:
2238 if values:
2239 selsections = [v for v in values if b'.' not in v]
2239 selsections = [v for v in values if b'.' not in v]
2240 selentries = [v for v in values if b'.' in v]
2240 selentries = [v for v in values if b'.' in v]
2241 uniquesel = len(selentries) == 1 and not selsections
2241 uniquesel = len(selentries) == 1 and not selsections
2242 selsections = set(selsections)
2242 selsections = set(selsections)
2243 selentries = set(selentries)
2243 selentries = set(selentries)
2244
2244
2245 matched = False
2245 matched = False
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 source = ui.configsource(section, name, untrusted)
2247 source = ui.configsource(section, name, untrusted)
2248 value = pycompat.bytestr(value)
2248 value = pycompat.bytestr(value)
2249 defaultvalue = ui.configdefault(section, name)
2249 defaultvalue = ui.configdefault(section, name)
2250 if fm.isplain():
2250 if fm.isplain():
2251 source = source or b'none'
2251 source = source or b'none'
2252 value = value.replace(b'\n', b'\\n')
2252 value = value.replace(b'\n', b'\\n')
2253 entryname = section + b'.' + name
2253 entryname = section + b'.' + name
2254 if values and not (section in selsections or entryname in selentries):
2254 if values and not (section in selsections or entryname in selentries):
2255 continue
2255 continue
2256 fm.startitem()
2256 fm.startitem()
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 if uniquesel:
2258 if uniquesel:
2259 fm.data(name=entryname)
2259 fm.data(name=entryname)
2260 fm.write(b'value', b'%s\n', value)
2260 fm.write(b'value', b'%s\n', value)
2261 else:
2261 else:
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 if formatter.isprintable(defaultvalue):
2263 if formatter.isprintable(defaultvalue):
2264 fm.data(defaultvalue=defaultvalue)
2264 fm.data(defaultvalue=defaultvalue)
2265 elif isinstance(defaultvalue, list) and all(
2265 elif isinstance(defaultvalue, list) and all(
2266 formatter.isprintable(e) for e in defaultvalue
2266 formatter.isprintable(e) for e in defaultvalue
2267 ):
2267 ):
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 # TODO: no idea how to process unsupported defaultvalue types
2269 # TODO: no idea how to process unsupported defaultvalue types
2270 matched = True
2270 matched = True
2271 fm.end()
2271 fm.end()
2272 if matched:
2272 if matched:
2273 return 0
2273 return 0
2274 return 1
2274 return 1
2275
2275
2276
2276
2277 @command(
2277 @command(
2278 b'continue',
2278 b'continue',
2279 dryrunopts,
2279 dryrunopts,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 helpbasic=True,
2281 helpbasic=True,
2282 )
2282 )
2283 def continuecmd(ui, repo, **opts):
2283 def continuecmd(ui, repo, **opts):
2284 """resumes an interrupted operation (EXPERIMENTAL)
2284 """resumes an interrupted operation (EXPERIMENTAL)
2285
2285
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 and unshelve if they are in an interrupted state.
2287 and unshelve if they are in an interrupted state.
2288
2288
2289 use --dry-run/-n to dry run the command.
2289 use --dry-run/-n to dry run the command.
2290 """
2290 """
2291 dryrun = opts.get('dry_run')
2291 dryrun = opts.get('dry_run')
2292 contstate = cmdutil.getunfinishedstate(repo)
2292 contstate = cmdutil.getunfinishedstate(repo)
2293 if not contstate:
2293 if not contstate:
2294 raise error.Abort(_(b'no operation in progress'))
2294 raise error.Abort(_(b'no operation in progress'))
2295 if not contstate.continuefunc:
2295 if not contstate.continuefunc:
2296 raise error.Abort(
2296 raise error.Abort(
2297 (
2297 (
2298 _(b"%s in progress but does not support 'hg continue'")
2298 _(b"%s in progress but does not support 'hg continue'")
2299 % (contstate._opname)
2299 % (contstate._opname)
2300 ),
2300 ),
2301 hint=contstate.continuemsg(),
2301 hint=contstate.continuemsg(),
2302 )
2302 )
2303 if dryrun:
2303 if dryrun:
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 return
2305 return
2306 return contstate.continuefunc(ui, repo)
2306 return contstate.continuefunc(ui, repo)
2307
2307
2308
2308
2309 @command(
2309 @command(
2310 b'copy|cp',
2310 b'copy|cp',
2311 [
2311 [
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2314 (
2314 (
2315 b'',
2315 b'',
2316 b'at-rev',
2316 b'at-rev',
2317 b'',
2317 b'',
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2319 _(b'REV'),
2319 _(b'REV'),
2320 ),
2320 ),
2321 (
2321 (
2322 b'f',
2322 b'f',
2323 b'force',
2323 b'force',
2324 None,
2324 None,
2325 _(b'forcibly copy over an existing managed file'),
2325 _(b'forcibly copy over an existing managed file'),
2326 ),
2326 ),
2327 ]
2327 ]
2328 + walkopts
2328 + walkopts
2329 + dryrunopts,
2329 + dryrunopts,
2330 _(b'[OPTION]... SOURCE... DEST'),
2330 _(b'[OPTION]... SOURCE... DEST'),
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2332 )
2332 )
2333 def copy(ui, repo, *pats, **opts):
2333 def copy(ui, repo, *pats, **opts):
2334 """mark files as copied for the next commit
2334 """mark files as copied for the next commit
2335
2335
2336 Mark dest as having copies of source files. If dest is a
2336 Mark dest as having copies of source files. If dest is a
2337 directory, copies are put in that directory. If dest is a file,
2337 directory, copies are put in that directory. If dest is a file,
2338 the source must be a single file.
2338 the source must be a single file.
2339
2339
2340 By default, this command copies the contents of files as they
2340 By default, this command copies the contents of files as they
2341 exist in the working directory. If invoked with -A/--after, the
2341 exist in the working directory. If invoked with -A/--after, the
2342 operation is recorded, but no copying is performed.
2342 operation is recorded, but no copying is performed.
2343
2343
2344 To undo marking a file as copied, use --forget. With that option,
2344 To undo marking a file as copied, use --forget. With that option,
2345 all given (positional) arguments are unmarked as copies. The destination
2345 all given (positional) arguments are unmarked as copies. The destination
2346 file(s) will be left in place (still tracked).
2346 file(s) will be left in place (still tracked).
2347
2347
2348 This command takes effect with the next commit by default.
2348 This command takes effect with the next commit by default.
2349
2349
2350 Returns 0 on success, 1 if errors are encountered.
2350 Returns 0 on success, 1 if errors are encountered.
2351 """
2351 """
2352 opts = pycompat.byteskwargs(opts)
2352 opts = pycompat.byteskwargs(opts)
2353 with repo.wlock():
2353 with repo.wlock():
2354 return cmdutil.copy(ui, repo, pats, opts)
2354 return cmdutil.copy(ui, repo, pats, opts)
2355
2355
2356
2356
2357 @command(
2357 @command(
2358 b'debugcommands',
2358 b'debugcommands',
2359 [],
2359 [],
2360 _(b'[COMMAND]'),
2360 _(b'[COMMAND]'),
2361 helpcategory=command.CATEGORY_HELP,
2361 helpcategory=command.CATEGORY_HELP,
2362 norepo=True,
2362 norepo=True,
2363 )
2363 )
2364 def debugcommands(ui, cmd=b'', *args):
2364 def debugcommands(ui, cmd=b'', *args):
2365 """list all available commands and options"""
2365 """list all available commands and options"""
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2367 cmd = cmd.split(b'|')[0]
2367 cmd = cmd.split(b'|')[0]
2368 opts = b', '.join([i[1] for i in vals[1]])
2368 opts = b', '.join([i[1] for i in vals[1]])
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2370
2370
2371
2371
2372 @command(
2372 @command(
2373 b'debugcomplete',
2373 b'debugcomplete',
2374 [(b'o', b'options', None, _(b'show the command options'))],
2374 [(b'o', b'options', None, _(b'show the command options'))],
2375 _(b'[-o] CMD'),
2375 _(b'[-o] CMD'),
2376 helpcategory=command.CATEGORY_HELP,
2376 helpcategory=command.CATEGORY_HELP,
2377 norepo=True,
2377 norepo=True,
2378 )
2378 )
2379 def debugcomplete(ui, cmd=b'', **opts):
2379 def debugcomplete(ui, cmd=b'', **opts):
2380 """returns the completion list associated with the given command"""
2380 """returns the completion list associated with the given command"""
2381
2381
2382 if opts.get('options'):
2382 if opts.get('options'):
2383 options = []
2383 options = []
2384 otables = [globalopts]
2384 otables = [globalopts]
2385 if cmd:
2385 if cmd:
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2387 otables.append(entry[1])
2387 otables.append(entry[1])
2388 for t in otables:
2388 for t in otables:
2389 for o in t:
2389 for o in t:
2390 if b"(DEPRECATED)" in o[3]:
2390 if b"(DEPRECATED)" in o[3]:
2391 continue
2391 continue
2392 if o[0]:
2392 if o[0]:
2393 options.append(b'-%s' % o[0])
2393 options.append(b'-%s' % o[0])
2394 options.append(b'--%s' % o[1])
2394 options.append(b'--%s' % o[1])
2395 ui.write(b"%s\n" % b"\n".join(options))
2395 ui.write(b"%s\n" % b"\n".join(options))
2396 return
2396 return
2397
2397
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2399 if ui.verbose:
2399 if ui.verbose:
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2402
2402
2403
2403
2404 @command(
2404 @command(
2405 b'diff',
2405 b'diff',
2406 [
2406 [
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2409 ]
2409 ]
2410 + diffopts
2410 + diffopts
2411 + diffopts2
2411 + diffopts2
2412 + walkopts
2412 + walkopts
2413 + subrepoopts,
2413 + subrepoopts,
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2416 helpbasic=True,
2416 helpbasic=True,
2417 inferrepo=True,
2417 inferrepo=True,
2418 intents={INTENT_READONLY},
2418 intents={INTENT_READONLY},
2419 )
2419 )
2420 def diff(ui, repo, *pats, **opts):
2420 def diff(ui, repo, *pats, **opts):
2421 """diff repository (or selected files)
2421 """diff repository (or selected files)
2422
2422
2423 Show differences between revisions for the specified files.
2423 Show differences between revisions for the specified files.
2424
2424
2425 Differences between files are shown using the unified diff format.
2425 Differences between files are shown using the unified diff format.
2426
2426
2427 .. note::
2427 .. note::
2428
2428
2429 :hg:`diff` may generate unexpected results for merges, as it will
2429 :hg:`diff` may generate unexpected results for merges, as it will
2430 default to comparing against the working directory's first
2430 default to comparing against the working directory's first
2431 parent changeset if no revisions are specified.
2431 parent changeset if no revisions are specified.
2432
2432
2433 When two revision arguments are given, then changes are shown
2433 When two revision arguments are given, then changes are shown
2434 between those revisions. If only one revision is specified then
2434 between those revisions. If only one revision is specified then
2435 that revision is compared to the working directory, and, when no
2435 that revision is compared to the working directory, and, when no
2436 revisions are specified, the working directory files are compared
2436 revisions are specified, the working directory files are compared
2437 to its first parent.
2437 to its first parent.
2438
2438
2439 Alternatively you can specify -c/--change with a revision to see
2439 Alternatively you can specify -c/--change with a revision to see
2440 the changes in that changeset relative to its first parent.
2440 the changes in that changeset relative to its first parent.
2441
2441
2442 Without the -a/--text option, diff will avoid generating diffs of
2442 Without the -a/--text option, diff will avoid generating diffs of
2443 files it detects as binary. With -a, diff will generate a diff
2443 files it detects as binary. With -a, diff will generate a diff
2444 anyway, probably with undesirable results.
2444 anyway, probably with undesirable results.
2445
2445
2446 Use the -g/--git option to generate diffs in the git extended diff
2446 Use the -g/--git option to generate diffs in the git extended diff
2447 format. For more information, read :hg:`help diffs`.
2447 format. For more information, read :hg:`help diffs`.
2448
2448
2449 .. container:: verbose
2449 .. container:: verbose
2450
2450
2451 Examples:
2451 Examples:
2452
2452
2453 - compare a file in the current working directory to its parent::
2453 - compare a file in the current working directory to its parent::
2454
2454
2455 hg diff foo.c
2455 hg diff foo.c
2456
2456
2457 - compare two historical versions of a directory, with rename info::
2457 - compare two historical versions of a directory, with rename info::
2458
2458
2459 hg diff --git -r 1.0:1.2 lib/
2459 hg diff --git -r 1.0:1.2 lib/
2460
2460
2461 - get change stats relative to the last change on some date::
2461 - get change stats relative to the last change on some date::
2462
2462
2463 hg diff --stat -r "date('may 2')"
2463 hg diff --stat -r "date('may 2')"
2464
2464
2465 - diff all newly-added files that contain a keyword::
2465 - diff all newly-added files that contain a keyword::
2466
2466
2467 hg diff "set:added() and grep(GNU)"
2467 hg diff "set:added() and grep(GNU)"
2468
2468
2469 - compare a revision and its parents::
2469 - compare a revision and its parents::
2470
2470
2471 hg diff -c 9353 # compare against first parent
2471 hg diff -c 9353 # compare against first parent
2472 hg diff -r 9353^:9353 # same using revset syntax
2472 hg diff -r 9353^:9353 # same using revset syntax
2473 hg diff -r 9353^2:9353 # compare against the second parent
2473 hg diff -r 9353^2:9353 # compare against the second parent
2474
2474
2475 Returns 0 on success.
2475 Returns 0 on success.
2476 """
2476 """
2477
2477
2478 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2478 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2479 opts = pycompat.byteskwargs(opts)
2479 opts = pycompat.byteskwargs(opts)
2480 revs = opts.get(b'rev')
2480 revs = opts.get(b'rev')
2481 change = opts.get(b'change')
2481 change = opts.get(b'change')
2482 stat = opts.get(b'stat')
2482 stat = opts.get(b'stat')
2483 reverse = opts.get(b'reverse')
2483 reverse = opts.get(b'reverse')
2484
2484
2485 if change:
2485 if change:
2486 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2486 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2487 ctx2 = scmutil.revsingle(repo, change, None)
2487 ctx2 = scmutil.revsingle(repo, change, None)
2488 ctx1 = ctx2.p1()
2488 ctx1 = ctx2.p1()
2489 else:
2489 else:
2490 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2490 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2491 ctx1, ctx2 = scmutil.revpair(repo, revs)
2491 ctx1, ctx2 = scmutil.revpair(repo, revs)
2492
2492
2493 if reverse:
2493 if reverse:
2494 ctxleft = ctx2
2494 ctxleft = ctx2
2495 ctxright = ctx1
2495 ctxright = ctx1
2496 else:
2496 else:
2497 ctxleft = ctx1
2497 ctxleft = ctx1
2498 ctxright = ctx2
2498 ctxright = ctx2
2499
2499
2500 diffopts = patch.diffallopts(ui, opts)
2500 diffopts = patch.diffallopts(ui, opts)
2501 m = scmutil.match(ctx2, pats, opts)
2501 m = scmutil.match(ctx2, pats, opts)
2502 m = repo.narrowmatch(m)
2502 m = repo.narrowmatch(m)
2503 ui.pager(b'diff')
2503 ui.pager(b'diff')
2504 logcmdutil.diffordiffstat(
2504 logcmdutil.diffordiffstat(
2505 ui,
2505 ui,
2506 repo,
2506 repo,
2507 diffopts,
2507 diffopts,
2508 ctxleft,
2508 ctxleft,
2509 ctxright,
2509 ctxright,
2510 m,
2510 m,
2511 stat=stat,
2511 stat=stat,
2512 listsubrepos=opts.get(b'subrepos'),
2512 listsubrepos=opts.get(b'subrepos'),
2513 root=opts.get(b'root'),
2513 root=opts.get(b'root'),
2514 )
2514 )
2515
2515
2516
2516
2517 @command(
2517 @command(
2518 b'export',
2518 b'export',
2519 [
2519 [
2520 (
2520 (
2521 b'B',
2521 b'B',
2522 b'bookmark',
2522 b'bookmark',
2523 b'',
2523 b'',
2524 _(b'export changes only reachable by given bookmark'),
2524 _(b'export changes only reachable by given bookmark'),
2525 _(b'BOOKMARK'),
2525 _(b'BOOKMARK'),
2526 ),
2526 ),
2527 (
2527 (
2528 b'o',
2528 b'o',
2529 b'output',
2529 b'output',
2530 b'',
2530 b'',
2531 _(b'print output to file with formatted name'),
2531 _(b'print output to file with formatted name'),
2532 _(b'FORMAT'),
2532 _(b'FORMAT'),
2533 ),
2533 ),
2534 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2534 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2535 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2535 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2536 ]
2536 ]
2537 + diffopts
2537 + diffopts
2538 + formatteropts,
2538 + formatteropts,
2539 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2539 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2541 helpbasic=True,
2541 helpbasic=True,
2542 intents={INTENT_READONLY},
2542 intents={INTENT_READONLY},
2543 )
2543 )
2544 def export(ui, repo, *changesets, **opts):
2544 def export(ui, repo, *changesets, **opts):
2545 """dump the header and diffs for one or more changesets
2545 """dump the header and diffs for one or more changesets
2546
2546
2547 Print the changeset header and diffs for one or more revisions.
2547 Print the changeset header and diffs for one or more revisions.
2548 If no revision is given, the parent of the working directory is used.
2548 If no revision is given, the parent of the working directory is used.
2549
2549
2550 The information shown in the changeset header is: author, date,
2550 The information shown in the changeset header is: author, date,
2551 branch name (if non-default), changeset hash, parent(s) and commit
2551 branch name (if non-default), changeset hash, parent(s) and commit
2552 comment.
2552 comment.
2553
2553
2554 .. note::
2554 .. note::
2555
2555
2556 :hg:`export` may generate unexpected diff output for merge
2556 :hg:`export` may generate unexpected diff output for merge
2557 changesets, as it will compare the merge changeset against its
2557 changesets, as it will compare the merge changeset against its
2558 first parent only.
2558 first parent only.
2559
2559
2560 Output may be to a file, in which case the name of the file is
2560 Output may be to a file, in which case the name of the file is
2561 given using a template string. See :hg:`help templates`. In addition
2561 given using a template string. See :hg:`help templates`. In addition
2562 to the common template keywords, the following formatting rules are
2562 to the common template keywords, the following formatting rules are
2563 supported:
2563 supported:
2564
2564
2565 :``%%``: literal "%" character
2565 :``%%``: literal "%" character
2566 :``%H``: changeset hash (40 hexadecimal digits)
2566 :``%H``: changeset hash (40 hexadecimal digits)
2567 :``%N``: number of patches being generated
2567 :``%N``: number of patches being generated
2568 :``%R``: changeset revision number
2568 :``%R``: changeset revision number
2569 :``%b``: basename of the exporting repository
2569 :``%b``: basename of the exporting repository
2570 :``%h``: short-form changeset hash (12 hexadecimal digits)
2570 :``%h``: short-form changeset hash (12 hexadecimal digits)
2571 :``%m``: first line of the commit message (only alphanumeric characters)
2571 :``%m``: first line of the commit message (only alphanumeric characters)
2572 :``%n``: zero-padded sequence number, starting at 1
2572 :``%n``: zero-padded sequence number, starting at 1
2573 :``%r``: zero-padded changeset revision number
2573 :``%r``: zero-padded changeset revision number
2574 :``\\``: literal "\\" character
2574 :``\\``: literal "\\" character
2575
2575
2576 Without the -a/--text option, export will avoid generating diffs
2576 Without the -a/--text option, export will avoid generating diffs
2577 of files it detects as binary. With -a, export will generate a
2577 of files it detects as binary. With -a, export will generate a
2578 diff anyway, probably with undesirable results.
2578 diff anyway, probably with undesirable results.
2579
2579
2580 With -B/--bookmark changesets reachable by the given bookmark are
2580 With -B/--bookmark changesets reachable by the given bookmark are
2581 selected.
2581 selected.
2582
2582
2583 Use the -g/--git option to generate diffs in the git extended diff
2583 Use the -g/--git option to generate diffs in the git extended diff
2584 format. See :hg:`help diffs` for more information.
2584 format. See :hg:`help diffs` for more information.
2585
2585
2586 With the --switch-parent option, the diff will be against the
2586 With the --switch-parent option, the diff will be against the
2587 second parent. It can be useful to review a merge.
2587 second parent. It can be useful to review a merge.
2588
2588
2589 .. container:: verbose
2589 .. container:: verbose
2590
2590
2591 Template:
2591 Template:
2592
2592
2593 The following keywords are supported in addition to the common template
2593 The following keywords are supported in addition to the common template
2594 keywords and functions. See also :hg:`help templates`.
2594 keywords and functions. See also :hg:`help templates`.
2595
2595
2596 :diff: String. Diff content.
2596 :diff: String. Diff content.
2597 :parents: List of strings. Parent nodes of the changeset.
2597 :parents: List of strings. Parent nodes of the changeset.
2598
2598
2599 Examples:
2599 Examples:
2600
2600
2601 - use export and import to transplant a bugfix to the current
2601 - use export and import to transplant a bugfix to the current
2602 branch::
2602 branch::
2603
2603
2604 hg export -r 9353 | hg import -
2604 hg export -r 9353 | hg import -
2605
2605
2606 - export all the changesets between two revisions to a file with
2606 - export all the changesets between two revisions to a file with
2607 rename information::
2607 rename information::
2608
2608
2609 hg export --git -r 123:150 > changes.txt
2609 hg export --git -r 123:150 > changes.txt
2610
2610
2611 - split outgoing changes into a series of patches with
2611 - split outgoing changes into a series of patches with
2612 descriptive names::
2612 descriptive names::
2613
2613
2614 hg export -r "outgoing()" -o "%n-%m.patch"
2614 hg export -r "outgoing()" -o "%n-%m.patch"
2615
2615
2616 Returns 0 on success.
2616 Returns 0 on success.
2617 """
2617 """
2618 opts = pycompat.byteskwargs(opts)
2618 opts = pycompat.byteskwargs(opts)
2619 bookmark = opts.get(b'bookmark')
2619 bookmark = opts.get(b'bookmark')
2620 changesets += tuple(opts.get(b'rev', []))
2620 changesets += tuple(opts.get(b'rev', []))
2621
2621
2622 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2622 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2623
2623
2624 if bookmark:
2624 if bookmark:
2625 if bookmark not in repo._bookmarks:
2625 if bookmark not in repo._bookmarks:
2626 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2626 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2627
2627
2628 revs = scmutil.bookmarkrevs(repo, bookmark)
2628 revs = scmutil.bookmarkrevs(repo, bookmark)
2629 else:
2629 else:
2630 if not changesets:
2630 if not changesets:
2631 changesets = [b'.']
2631 changesets = [b'.']
2632
2632
2633 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2633 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2634 revs = scmutil.revrange(repo, changesets)
2634 revs = scmutil.revrange(repo, changesets)
2635
2635
2636 if not revs:
2636 if not revs:
2637 raise error.Abort(_(b"export requires at least one changeset"))
2637 raise error.Abort(_(b"export requires at least one changeset"))
2638 if len(revs) > 1:
2638 if len(revs) > 1:
2639 ui.note(_(b'exporting patches:\n'))
2639 ui.note(_(b'exporting patches:\n'))
2640 else:
2640 else:
2641 ui.note(_(b'exporting patch:\n'))
2641 ui.note(_(b'exporting patch:\n'))
2642
2642
2643 fntemplate = opts.get(b'output')
2643 fntemplate = opts.get(b'output')
2644 if cmdutil.isstdiofilename(fntemplate):
2644 if cmdutil.isstdiofilename(fntemplate):
2645 fntemplate = b''
2645 fntemplate = b''
2646
2646
2647 if fntemplate:
2647 if fntemplate:
2648 fm = formatter.nullformatter(ui, b'export', opts)
2648 fm = formatter.nullformatter(ui, b'export', opts)
2649 else:
2649 else:
2650 ui.pager(b'export')
2650 ui.pager(b'export')
2651 fm = ui.formatter(b'export', opts)
2651 fm = ui.formatter(b'export', opts)
2652 with fm:
2652 with fm:
2653 cmdutil.export(
2653 cmdutil.export(
2654 repo,
2654 repo,
2655 revs,
2655 revs,
2656 fm,
2656 fm,
2657 fntemplate=fntemplate,
2657 fntemplate=fntemplate,
2658 switch_parent=opts.get(b'switch_parent'),
2658 switch_parent=opts.get(b'switch_parent'),
2659 opts=patch.diffallopts(ui, opts),
2659 opts=patch.diffallopts(ui, opts),
2660 )
2660 )
2661
2661
2662
2662
2663 @command(
2663 @command(
2664 b'files',
2664 b'files',
2665 [
2665 [
2666 (
2666 (
2667 b'r',
2667 b'r',
2668 b'rev',
2668 b'rev',
2669 b'',
2669 b'',
2670 _(b'search the repository as it is in REV'),
2670 _(b'search the repository as it is in REV'),
2671 _(b'REV'),
2671 _(b'REV'),
2672 ),
2672 ),
2673 (
2673 (
2674 b'0',
2674 b'0',
2675 b'print0',
2675 b'print0',
2676 None,
2676 None,
2677 _(b'end filenames with NUL, for use with xargs'),
2677 _(b'end filenames with NUL, for use with xargs'),
2678 ),
2678 ),
2679 ]
2679 ]
2680 + walkopts
2680 + walkopts
2681 + formatteropts
2681 + formatteropts
2682 + subrepoopts,
2682 + subrepoopts,
2683 _(b'[OPTION]... [FILE]...'),
2683 _(b'[OPTION]... [FILE]...'),
2684 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2684 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2685 intents={INTENT_READONLY},
2685 intents={INTENT_READONLY},
2686 )
2686 )
2687 def files(ui, repo, *pats, **opts):
2687 def files(ui, repo, *pats, **opts):
2688 """list tracked files
2688 """list tracked files
2689
2689
2690 Print files under Mercurial control in the working directory or
2690 Print files under Mercurial control in the working directory or
2691 specified revision for given files (excluding removed files).
2691 specified revision for given files (excluding removed files).
2692 Files can be specified as filenames or filesets.
2692 Files can be specified as filenames or filesets.
2693
2693
2694 If no files are given to match, this command prints the names
2694 If no files are given to match, this command prints the names
2695 of all files under Mercurial control.
2695 of all files under Mercurial control.
2696
2696
2697 .. container:: verbose
2697 .. container:: verbose
2698
2698
2699 Template:
2699 Template:
2700
2700
2701 The following keywords are supported in addition to the common template
2701 The following keywords are supported in addition to the common template
2702 keywords and functions. See also :hg:`help templates`.
2702 keywords and functions. See also :hg:`help templates`.
2703
2703
2704 :flags: String. Character denoting file's symlink and executable bits.
2704 :flags: String. Character denoting file's symlink and executable bits.
2705 :path: String. Repository-absolute path of the file.
2705 :path: String. Repository-absolute path of the file.
2706 :size: Integer. Size of the file in bytes.
2706 :size: Integer. Size of the file in bytes.
2707
2707
2708 Examples:
2708 Examples:
2709
2709
2710 - list all files under the current directory::
2710 - list all files under the current directory::
2711
2711
2712 hg files .
2712 hg files .
2713
2713
2714 - shows sizes and flags for current revision::
2714 - shows sizes and flags for current revision::
2715
2715
2716 hg files -vr .
2716 hg files -vr .
2717
2717
2718 - list all files named README::
2718 - list all files named README::
2719
2719
2720 hg files -I "**/README"
2720 hg files -I "**/README"
2721
2721
2722 - list all binary files::
2722 - list all binary files::
2723
2723
2724 hg files "set:binary()"
2724 hg files "set:binary()"
2725
2725
2726 - find files containing a regular expression::
2726 - find files containing a regular expression::
2727
2727
2728 hg files "set:grep('bob')"
2728 hg files "set:grep('bob')"
2729
2729
2730 - search tracked file contents with xargs and grep::
2730 - search tracked file contents with xargs and grep::
2731
2731
2732 hg files -0 | xargs -0 grep foo
2732 hg files -0 | xargs -0 grep foo
2733
2733
2734 See :hg:`help patterns` and :hg:`help filesets` for more information
2734 See :hg:`help patterns` and :hg:`help filesets` for more information
2735 on specifying file patterns.
2735 on specifying file patterns.
2736
2736
2737 Returns 0 if a match is found, 1 otherwise.
2737 Returns 0 if a match is found, 1 otherwise.
2738
2738
2739 """
2739 """
2740
2740
2741 opts = pycompat.byteskwargs(opts)
2741 opts = pycompat.byteskwargs(opts)
2742 rev = opts.get(b'rev')
2742 rev = opts.get(b'rev')
2743 if rev:
2743 if rev:
2744 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2744 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2745 ctx = scmutil.revsingle(repo, rev, None)
2745 ctx = scmutil.revsingle(repo, rev, None)
2746
2746
2747 end = b'\n'
2747 end = b'\n'
2748 if opts.get(b'print0'):
2748 if opts.get(b'print0'):
2749 end = b'\0'
2749 end = b'\0'
2750 fmt = b'%s' + end
2750 fmt = b'%s' + end
2751
2751
2752 m = scmutil.match(ctx, pats, opts)
2752 m = scmutil.match(ctx, pats, opts)
2753 ui.pager(b'files')
2753 ui.pager(b'files')
2754 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2754 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2755 with ui.formatter(b'files', opts) as fm:
2755 with ui.formatter(b'files', opts) as fm:
2756 return cmdutil.files(
2756 return cmdutil.files(
2757 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2757 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2758 )
2758 )
2759
2759
2760
2760
2761 @command(
2761 @command(
2762 b'forget',
2762 b'forget',
2763 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2763 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2764 + walkopts
2764 + walkopts
2765 + dryrunopts,
2765 + dryrunopts,
2766 _(b'[OPTION]... FILE...'),
2766 _(b'[OPTION]... FILE...'),
2767 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2767 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2768 helpbasic=True,
2768 helpbasic=True,
2769 inferrepo=True,
2769 inferrepo=True,
2770 )
2770 )
2771 def forget(ui, repo, *pats, **opts):
2771 def forget(ui, repo, *pats, **opts):
2772 """forget the specified files on the next commit
2772 """forget the specified files on the next commit
2773
2773
2774 Mark the specified files so they will no longer be tracked
2774 Mark the specified files so they will no longer be tracked
2775 after the next commit.
2775 after the next commit.
2776
2776
2777 This only removes files from the current branch, not from the
2777 This only removes files from the current branch, not from the
2778 entire project history, and it does not delete them from the
2778 entire project history, and it does not delete them from the
2779 working directory.
2779 working directory.
2780
2780
2781 To delete the file from the working directory, see :hg:`remove`.
2781 To delete the file from the working directory, see :hg:`remove`.
2782
2782
2783 To undo a forget before the next commit, see :hg:`add`.
2783 To undo a forget before the next commit, see :hg:`add`.
2784
2784
2785 .. container:: verbose
2785 .. container:: verbose
2786
2786
2787 Examples:
2787 Examples:
2788
2788
2789 - forget newly-added binary files::
2789 - forget newly-added binary files::
2790
2790
2791 hg forget "set:added() and binary()"
2791 hg forget "set:added() and binary()"
2792
2792
2793 - forget files that would be excluded by .hgignore::
2793 - forget files that would be excluded by .hgignore::
2794
2794
2795 hg forget "set:hgignore()"
2795 hg forget "set:hgignore()"
2796
2796
2797 Returns 0 on success.
2797 Returns 0 on success.
2798 """
2798 """
2799
2799
2800 opts = pycompat.byteskwargs(opts)
2800 opts = pycompat.byteskwargs(opts)
2801 if not pats:
2801 if not pats:
2802 raise error.Abort(_(b'no files specified'))
2802 raise error.Abort(_(b'no files specified'))
2803
2803
2804 m = scmutil.match(repo[None], pats, opts)
2804 m = scmutil.match(repo[None], pats, opts)
2805 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2805 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2806 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2806 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2807 rejected = cmdutil.forget(
2807 rejected = cmdutil.forget(
2808 ui,
2808 ui,
2809 repo,
2809 repo,
2810 m,
2810 m,
2811 prefix=b"",
2811 prefix=b"",
2812 uipathfn=uipathfn,
2812 uipathfn=uipathfn,
2813 explicitonly=False,
2813 explicitonly=False,
2814 dryrun=dryrun,
2814 dryrun=dryrun,
2815 interactive=interactive,
2815 interactive=interactive,
2816 )[0]
2816 )[0]
2817 return rejected and 1 or 0
2817 return rejected and 1 or 0
2818
2818
2819
2819
2820 @command(
2820 @command(
2821 b'graft',
2821 b'graft',
2822 [
2822 [
2823 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2823 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2824 (
2824 (
2825 b'',
2825 b'',
2826 b'base',
2826 b'base',
2827 b'',
2827 b'',
2828 _(b'base revision when doing the graft merge (ADVANCED)'),
2828 _(b'base revision when doing the graft merge (ADVANCED)'),
2829 _(b'REV'),
2829 _(b'REV'),
2830 ),
2830 ),
2831 (b'c', b'continue', False, _(b'resume interrupted graft')),
2831 (b'c', b'continue', False, _(b'resume interrupted graft')),
2832 (b'', b'stop', False, _(b'stop interrupted graft')),
2832 (b'', b'stop', False, _(b'stop interrupted graft')),
2833 (b'', b'abort', False, _(b'abort interrupted graft')),
2833 (b'', b'abort', False, _(b'abort interrupted graft')),
2834 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2834 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2835 (b'', b'log', None, _(b'append graft info to log message')),
2835 (b'', b'log', None, _(b'append graft info to log message')),
2836 (
2836 (
2837 b'',
2837 b'',
2838 b'no-commit',
2838 b'no-commit',
2839 None,
2839 None,
2840 _(b"don't commit, just apply the changes in working directory"),
2840 _(b"don't commit, just apply the changes in working directory"),
2841 ),
2841 ),
2842 (b'f', b'force', False, _(b'force graft')),
2842 (b'f', b'force', False, _(b'force graft')),
2843 (
2843 (
2844 b'D',
2844 b'D',
2845 b'currentdate',
2845 b'currentdate',
2846 False,
2846 False,
2847 _(b'record the current date as commit date'),
2847 _(b'record the current date as commit date'),
2848 ),
2848 ),
2849 (
2849 (
2850 b'U',
2850 b'U',
2851 b'currentuser',
2851 b'currentuser',
2852 False,
2852 False,
2853 _(b'record the current user as committer'),
2853 _(b'record the current user as committer'),
2854 ),
2854 ),
2855 ]
2855 ]
2856 + commitopts2
2856 + commitopts2
2857 + mergetoolopts
2857 + mergetoolopts
2858 + dryrunopts,
2858 + dryrunopts,
2859 _(b'[OPTION]... [-r REV]... REV...'),
2859 _(b'[OPTION]... [-r REV]... REV...'),
2860 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2860 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2861 )
2861 )
2862 def graft(ui, repo, *revs, **opts):
2862 def graft(ui, repo, *revs, **opts):
2863 '''copy changes from other branches onto the current branch
2863 '''copy changes from other branches onto the current branch
2864
2864
2865 This command uses Mercurial's merge logic to copy individual
2865 This command uses Mercurial's merge logic to copy individual
2866 changes from other branches without merging branches in the
2866 changes from other branches without merging branches in the
2867 history graph. This is sometimes known as 'backporting' or
2867 history graph. This is sometimes known as 'backporting' or
2868 'cherry-picking'. By default, graft will copy user, date, and
2868 'cherry-picking'. By default, graft will copy user, date, and
2869 description from the source changesets.
2869 description from the source changesets.
2870
2870
2871 Changesets that are ancestors of the current revision, that have
2871 Changesets that are ancestors of the current revision, that have
2872 already been grafted, or that are merges will be skipped.
2872 already been grafted, or that are merges will be skipped.
2873
2873
2874 If --log is specified, log messages will have a comment appended
2874 If --log is specified, log messages will have a comment appended
2875 of the form::
2875 of the form::
2876
2876
2877 (grafted from CHANGESETHASH)
2877 (grafted from CHANGESETHASH)
2878
2878
2879 If --force is specified, revisions will be grafted even if they
2879 If --force is specified, revisions will be grafted even if they
2880 are already ancestors of, or have been grafted to, the destination.
2880 are already ancestors of, or have been grafted to, the destination.
2881 This is useful when the revisions have since been backed out.
2881 This is useful when the revisions have since been backed out.
2882
2882
2883 If a graft merge results in conflicts, the graft process is
2883 If a graft merge results in conflicts, the graft process is
2884 interrupted so that the current merge can be manually resolved.
2884 interrupted so that the current merge can be manually resolved.
2885 Once all conflicts are addressed, the graft process can be
2885 Once all conflicts are addressed, the graft process can be
2886 continued with the -c/--continue option.
2886 continued with the -c/--continue option.
2887
2887
2888 The -c/--continue option reapplies all the earlier options.
2888 The -c/--continue option reapplies all the earlier options.
2889
2889
2890 .. container:: verbose
2890 .. container:: verbose
2891
2891
2892 The --base option exposes more of how graft internally uses merge with a
2892 The --base option exposes more of how graft internally uses merge with a
2893 custom base revision. --base can be used to specify another ancestor than
2893 custom base revision. --base can be used to specify another ancestor than
2894 the first and only parent.
2894 the first and only parent.
2895
2895
2896 The command::
2896 The command::
2897
2897
2898 hg graft -r 345 --base 234
2898 hg graft -r 345 --base 234
2899
2899
2900 is thus pretty much the same as::
2900 is thus pretty much the same as::
2901
2901
2902 hg diff -r 234 -r 345 | hg import
2902 hg diff -r 234 -r 345 | hg import
2903
2903
2904 but using merge to resolve conflicts and track moved files.
2904 but using merge to resolve conflicts and track moved files.
2905
2905
2906 The result of a merge can thus be backported as a single commit by
2906 The result of a merge can thus be backported as a single commit by
2907 specifying one of the merge parents as base, and thus effectively
2907 specifying one of the merge parents as base, and thus effectively
2908 grafting the changes from the other side.
2908 grafting the changes from the other side.
2909
2909
2910 It is also possible to collapse multiple changesets and clean up history
2910 It is also possible to collapse multiple changesets and clean up history
2911 by specifying another ancestor as base, much like rebase --collapse
2911 by specifying another ancestor as base, much like rebase --collapse
2912 --keep.
2912 --keep.
2913
2913
2914 The commit message can be tweaked after the fact using commit --amend .
2914 The commit message can be tweaked after the fact using commit --amend .
2915
2915
2916 For using non-ancestors as the base to backout changes, see the backout
2916 For using non-ancestors as the base to backout changes, see the backout
2917 command and the hidden --parent option.
2917 command and the hidden --parent option.
2918
2918
2919 .. container:: verbose
2919 .. container:: verbose
2920
2920
2921 Examples:
2921 Examples:
2922
2922
2923 - copy a single change to the stable branch and edit its description::
2923 - copy a single change to the stable branch and edit its description::
2924
2924
2925 hg update stable
2925 hg update stable
2926 hg graft --edit 9393
2926 hg graft --edit 9393
2927
2927
2928 - graft a range of changesets with one exception, updating dates::
2928 - graft a range of changesets with one exception, updating dates::
2929
2929
2930 hg graft -D "2085::2093 and not 2091"
2930 hg graft -D "2085::2093 and not 2091"
2931
2931
2932 - continue a graft after resolving conflicts::
2932 - continue a graft after resolving conflicts::
2933
2933
2934 hg graft -c
2934 hg graft -c
2935
2935
2936 - show the source of a grafted changeset::
2936 - show the source of a grafted changeset::
2937
2937
2938 hg log --debug -r .
2938 hg log --debug -r .
2939
2939
2940 - show revisions sorted by date::
2940 - show revisions sorted by date::
2941
2941
2942 hg log -r "sort(all(), date)"
2942 hg log -r "sort(all(), date)"
2943
2943
2944 - backport the result of a merge as a single commit::
2944 - backport the result of a merge as a single commit::
2945
2945
2946 hg graft -r 123 --base 123^
2946 hg graft -r 123 --base 123^
2947
2947
2948 - land a feature branch as one changeset::
2948 - land a feature branch as one changeset::
2949
2949
2950 hg up -cr default
2950 hg up -cr default
2951 hg graft -r featureX --base "ancestor('featureX', 'default')"
2951 hg graft -r featureX --base "ancestor('featureX', 'default')"
2952
2952
2953 See :hg:`help revisions` for more about specifying revisions.
2953 See :hg:`help revisions` for more about specifying revisions.
2954
2954
2955 Returns 0 on successful completion, 1 if there are unresolved files.
2955 Returns 0 on successful completion, 1 if there are unresolved files.
2956 '''
2956 '''
2957 with repo.wlock():
2957 with repo.wlock():
2958 return _dograft(ui, repo, *revs, **opts)
2958 return _dograft(ui, repo, *revs, **opts)
2959
2959
2960
2960
2961 def _dograft(ui, repo, *revs, **opts):
2961 def _dograft(ui, repo, *revs, **opts):
2962 opts = pycompat.byteskwargs(opts)
2962 opts = pycompat.byteskwargs(opts)
2963 if revs and opts.get(b'rev'):
2963 if revs and opts.get(b'rev'):
2964 ui.warn(
2964 ui.warn(
2965 _(
2965 _(
2966 b'warning: inconsistent use of --rev might give unexpected '
2966 b'warning: inconsistent use of --rev might give unexpected '
2967 b'revision ordering!\n'
2967 b'revision ordering!\n'
2968 )
2968 )
2969 )
2969 )
2970
2970
2971 revs = list(revs)
2971 revs = list(revs)
2972 revs.extend(opts.get(b'rev'))
2972 revs.extend(opts.get(b'rev'))
2973 basectx = None
2973 basectx = None
2974 if opts.get(b'base'):
2974 if opts.get(b'base'):
2975 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2975 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2976 # a dict of data to be stored in state file
2976 # a dict of data to be stored in state file
2977 statedata = {}
2977 statedata = {}
2978 # list of new nodes created by ongoing graft
2978 # list of new nodes created by ongoing graft
2979 statedata[b'newnodes'] = []
2979 statedata[b'newnodes'] = []
2980
2980
2981 cmdutil.resolvecommitoptions(ui, opts)
2981 cmdutil.resolvecommitoptions(ui, opts)
2982
2982
2983 editor = cmdutil.getcommiteditor(
2983 editor = cmdutil.getcommiteditor(
2984 editform=b'graft', **pycompat.strkwargs(opts)
2984 editform=b'graft', **pycompat.strkwargs(opts)
2985 )
2985 )
2986
2986
2987 cont = False
2987 cont = False
2988 if opts.get(b'no_commit'):
2988 if opts.get(b'no_commit'):
2989 if opts.get(b'edit'):
2989 if opts.get(b'edit'):
2990 raise error.Abort(
2990 raise error.Abort(
2991 _(b"cannot specify --no-commit and --edit together")
2991 _(b"cannot specify --no-commit and --edit together")
2992 )
2992 )
2993 if opts.get(b'currentuser'):
2993 if opts.get(b'currentuser'):
2994 raise error.Abort(
2994 raise error.Abort(
2995 _(b"cannot specify --no-commit and --currentuser together")
2995 _(b"cannot specify --no-commit and --currentuser together")
2996 )
2996 )
2997 if opts.get(b'currentdate'):
2997 if opts.get(b'currentdate'):
2998 raise error.Abort(
2998 raise error.Abort(
2999 _(b"cannot specify --no-commit and --currentdate together")
2999 _(b"cannot specify --no-commit and --currentdate together")
3000 )
3000 )
3001 if opts.get(b'log'):
3001 if opts.get(b'log'):
3002 raise error.Abort(
3002 raise error.Abort(
3003 _(b"cannot specify --no-commit and --log together")
3003 _(b"cannot specify --no-commit and --log together")
3004 )
3004 )
3005
3005
3006 graftstate = statemod.cmdstate(repo, b'graftstate')
3006 graftstate = statemod.cmdstate(repo, b'graftstate')
3007
3007
3008 if opts.get(b'stop'):
3008 if opts.get(b'stop'):
3009 if opts.get(b'continue'):
3009 if opts.get(b'continue'):
3010 raise error.Abort(
3010 raise error.Abort(
3011 _(b"cannot use '--continue' and '--stop' together")
3011 _(b"cannot use '--continue' and '--stop' together")
3012 )
3012 )
3013 if opts.get(b'abort'):
3013 if opts.get(b'abort'):
3014 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3014 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3015
3015
3016 if any(
3016 if any(
3017 (
3017 (
3018 opts.get(b'edit'),
3018 opts.get(b'edit'),
3019 opts.get(b'log'),
3019 opts.get(b'log'),
3020 opts.get(b'user'),
3020 opts.get(b'user'),
3021 opts.get(b'date'),
3021 opts.get(b'date'),
3022 opts.get(b'currentdate'),
3022 opts.get(b'currentdate'),
3023 opts.get(b'currentuser'),
3023 opts.get(b'currentuser'),
3024 opts.get(b'rev'),
3024 opts.get(b'rev'),
3025 )
3025 )
3026 ):
3026 ):
3027 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3027 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3028 return _stopgraft(ui, repo, graftstate)
3028 return _stopgraft(ui, repo, graftstate)
3029 elif opts.get(b'abort'):
3029 elif opts.get(b'abort'):
3030 if opts.get(b'continue'):
3030 if opts.get(b'continue'):
3031 raise error.Abort(
3031 raise error.Abort(
3032 _(b"cannot use '--continue' and '--abort' together")
3032 _(b"cannot use '--continue' and '--abort' together")
3033 )
3033 )
3034 if any(
3034 if any(
3035 (
3035 (
3036 opts.get(b'edit'),
3036 opts.get(b'edit'),
3037 opts.get(b'log'),
3037 opts.get(b'log'),
3038 opts.get(b'user'),
3038 opts.get(b'user'),
3039 opts.get(b'date'),
3039 opts.get(b'date'),
3040 opts.get(b'currentdate'),
3040 opts.get(b'currentdate'),
3041 opts.get(b'currentuser'),
3041 opts.get(b'currentuser'),
3042 opts.get(b'rev'),
3042 opts.get(b'rev'),
3043 )
3043 )
3044 ):
3044 ):
3045 raise error.Abort(
3045 raise error.Abort(
3046 _(b"cannot specify any other flag with '--abort'")
3046 _(b"cannot specify any other flag with '--abort'")
3047 )
3047 )
3048
3048
3049 return cmdutil.abortgraft(ui, repo, graftstate)
3049 return cmdutil.abortgraft(ui, repo, graftstate)
3050 elif opts.get(b'continue'):
3050 elif opts.get(b'continue'):
3051 cont = True
3051 cont = True
3052 if revs:
3052 if revs:
3053 raise error.Abort(_(b"can't specify --continue and revisions"))
3053 raise error.Abort(_(b"can't specify --continue and revisions"))
3054 # read in unfinished revisions
3054 # read in unfinished revisions
3055 if graftstate.exists():
3055 if graftstate.exists():
3056 statedata = cmdutil.readgraftstate(repo, graftstate)
3056 statedata = cmdutil.readgraftstate(repo, graftstate)
3057 if statedata.get(b'date'):
3057 if statedata.get(b'date'):
3058 opts[b'date'] = statedata[b'date']
3058 opts[b'date'] = statedata[b'date']
3059 if statedata.get(b'user'):
3059 if statedata.get(b'user'):
3060 opts[b'user'] = statedata[b'user']
3060 opts[b'user'] = statedata[b'user']
3061 if statedata.get(b'log'):
3061 if statedata.get(b'log'):
3062 opts[b'log'] = True
3062 opts[b'log'] = True
3063 if statedata.get(b'no_commit'):
3063 if statedata.get(b'no_commit'):
3064 opts[b'no_commit'] = statedata.get(b'no_commit')
3064 opts[b'no_commit'] = statedata.get(b'no_commit')
3065 nodes = statedata[b'nodes']
3065 nodes = statedata[b'nodes']
3066 revs = [repo[node].rev() for node in nodes]
3066 revs = [repo[node].rev() for node in nodes]
3067 else:
3067 else:
3068 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3068 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3069 else:
3069 else:
3070 if not revs:
3070 if not revs:
3071 raise error.Abort(_(b'no revisions specified'))
3071 raise error.Abort(_(b'no revisions specified'))
3072 cmdutil.checkunfinished(repo)
3072 cmdutil.checkunfinished(repo)
3073 cmdutil.bailifchanged(repo)
3073 cmdutil.bailifchanged(repo)
3074 revs = scmutil.revrange(repo, revs)
3074 revs = scmutil.revrange(repo, revs)
3075
3075
3076 skipped = set()
3076 skipped = set()
3077 if basectx is None:
3077 if basectx is None:
3078 # check for merges
3078 # check for merges
3079 for rev in repo.revs(b'%ld and merge()', revs):
3079 for rev in repo.revs(b'%ld and merge()', revs):
3080 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3080 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3081 skipped.add(rev)
3081 skipped.add(rev)
3082 revs = [r for r in revs if r not in skipped]
3082 revs = [r for r in revs if r not in skipped]
3083 if not revs:
3083 if not revs:
3084 return -1
3084 return -1
3085 if basectx is not None and len(revs) != 1:
3085 if basectx is not None and len(revs) != 1:
3086 raise error.Abort(_(b'only one revision allowed with --base '))
3086 raise error.Abort(_(b'only one revision allowed with --base '))
3087
3087
3088 # Don't check in the --continue case, in effect retaining --force across
3088 # Don't check in the --continue case, in effect retaining --force across
3089 # --continues. That's because without --force, any revisions we decided to
3089 # --continues. That's because without --force, any revisions we decided to
3090 # skip would have been filtered out here, so they wouldn't have made their
3090 # skip would have been filtered out here, so they wouldn't have made their
3091 # way to the graftstate. With --force, any revisions we would have otherwise
3091 # way to the graftstate. With --force, any revisions we would have otherwise
3092 # skipped would not have been filtered out, and if they hadn't been applied
3092 # skipped would not have been filtered out, and if they hadn't been applied
3093 # already, they'd have been in the graftstate.
3093 # already, they'd have been in the graftstate.
3094 if not (cont or opts.get(b'force')) and basectx is None:
3094 if not (cont or opts.get(b'force')) and basectx is None:
3095 # check for ancestors of dest branch
3095 # check for ancestors of dest branch
3096 ancestors = repo.revs(b'%ld & (::.)', revs)
3096 ancestors = repo.revs(b'%ld & (::.)', revs)
3097 for rev in ancestors:
3097 for rev in ancestors:
3098 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3098 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3099
3099
3100 revs = [r for r in revs if r not in ancestors]
3100 revs = [r for r in revs if r not in ancestors]
3101
3101
3102 if not revs:
3102 if not revs:
3103 return -1
3103 return -1
3104
3104
3105 # analyze revs for earlier grafts
3105 # analyze revs for earlier grafts
3106 ids = {}
3106 ids = {}
3107 for ctx in repo.set(b"%ld", revs):
3107 for ctx in repo.set(b"%ld", revs):
3108 ids[ctx.hex()] = ctx.rev()
3108 ids[ctx.hex()] = ctx.rev()
3109 n = ctx.extra().get(b'source')
3109 n = ctx.extra().get(b'source')
3110 if n:
3110 if n:
3111 ids[n] = ctx.rev()
3111 ids[n] = ctx.rev()
3112
3112
3113 # check ancestors for earlier grafts
3113 # check ancestors for earlier grafts
3114 ui.debug(b'scanning for duplicate grafts\n')
3114 ui.debug(b'scanning for duplicate grafts\n')
3115
3115
3116 # The only changesets we can be sure doesn't contain grafts of any
3116 # The only changesets we can be sure doesn't contain grafts of any
3117 # revs, are the ones that are common ancestors of *all* revs:
3117 # revs, are the ones that are common ancestors of *all* revs:
3118 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3118 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3119 ctx = repo[rev]
3119 ctx = repo[rev]
3120 n = ctx.extra().get(b'source')
3120 n = ctx.extra().get(b'source')
3121 if n in ids:
3121 if n in ids:
3122 try:
3122 try:
3123 r = repo[n].rev()
3123 r = repo[n].rev()
3124 except error.RepoLookupError:
3124 except error.RepoLookupError:
3125 r = None
3125 r = None
3126 if r in revs:
3126 if r in revs:
3127 ui.warn(
3127 ui.warn(
3128 _(
3128 _(
3129 b'skipping revision %d:%s '
3129 b'skipping revision %d:%s '
3130 b'(already grafted to %d:%s)\n'
3130 b'(already grafted to %d:%s)\n'
3131 )
3131 )
3132 % (r, repo[r], rev, ctx)
3132 % (r, repo[r], rev, ctx)
3133 )
3133 )
3134 revs.remove(r)
3134 revs.remove(r)
3135 elif ids[n] in revs:
3135 elif ids[n] in revs:
3136 if r is None:
3136 if r is None:
3137 ui.warn(
3137 ui.warn(
3138 _(
3138 _(
3139 b'skipping already grafted revision %d:%s '
3139 b'skipping already grafted revision %d:%s '
3140 b'(%d:%s also has unknown origin %s)\n'
3140 b'(%d:%s also has unknown origin %s)\n'
3141 )
3141 )
3142 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3142 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3143 )
3143 )
3144 else:
3144 else:
3145 ui.warn(
3145 ui.warn(
3146 _(
3146 _(
3147 b'skipping already grafted revision %d:%s '
3147 b'skipping already grafted revision %d:%s '
3148 b'(%d:%s also has origin %d:%s)\n'
3148 b'(%d:%s also has origin %d:%s)\n'
3149 )
3149 )
3150 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3150 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3151 )
3151 )
3152 revs.remove(ids[n])
3152 revs.remove(ids[n])
3153 elif ctx.hex() in ids:
3153 elif ctx.hex() in ids:
3154 r = ids[ctx.hex()]
3154 r = ids[ctx.hex()]
3155 if r in revs:
3155 if r in revs:
3156 ui.warn(
3156 ui.warn(
3157 _(
3157 _(
3158 b'skipping already grafted revision %d:%s '
3158 b'skipping already grafted revision %d:%s '
3159 b'(was grafted from %d:%s)\n'
3159 b'(was grafted from %d:%s)\n'
3160 )
3160 )
3161 % (r, repo[r], rev, ctx)
3161 % (r, repo[r], rev, ctx)
3162 )
3162 )
3163 revs.remove(r)
3163 revs.remove(r)
3164 if not revs:
3164 if not revs:
3165 return -1
3165 return -1
3166
3166
3167 if opts.get(b'no_commit'):
3167 if opts.get(b'no_commit'):
3168 statedata[b'no_commit'] = True
3168 statedata[b'no_commit'] = True
3169 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3169 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3170 desc = b'%d:%s "%s"' % (
3170 desc = b'%d:%s "%s"' % (
3171 ctx.rev(),
3171 ctx.rev(),
3172 ctx,
3172 ctx,
3173 ctx.description().split(b'\n', 1)[0],
3173 ctx.description().split(b'\n', 1)[0],
3174 )
3174 )
3175 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3175 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3176 if names:
3176 if names:
3177 desc += b' (%s)' % b' '.join(names)
3177 desc += b' (%s)' % b' '.join(names)
3178 ui.status(_(b'grafting %s\n') % desc)
3178 ui.status(_(b'grafting %s\n') % desc)
3179 if opts.get(b'dry_run'):
3179 if opts.get(b'dry_run'):
3180 continue
3180 continue
3181
3181
3182 source = ctx.extra().get(b'source')
3182 source = ctx.extra().get(b'source')
3183 extra = {}
3183 extra = {}
3184 if source:
3184 if source:
3185 extra[b'source'] = source
3185 extra[b'source'] = source
3186 extra[b'intermediate-source'] = ctx.hex()
3186 extra[b'intermediate-source'] = ctx.hex()
3187 else:
3187 else:
3188 extra[b'source'] = ctx.hex()
3188 extra[b'source'] = ctx.hex()
3189 user = ctx.user()
3189 user = ctx.user()
3190 if opts.get(b'user'):
3190 if opts.get(b'user'):
3191 user = opts[b'user']
3191 user = opts[b'user']
3192 statedata[b'user'] = user
3192 statedata[b'user'] = user
3193 date = ctx.date()
3193 date = ctx.date()
3194 if opts.get(b'date'):
3194 if opts.get(b'date'):
3195 date = opts[b'date']
3195 date = opts[b'date']
3196 statedata[b'date'] = date
3196 statedata[b'date'] = date
3197 message = ctx.description()
3197 message = ctx.description()
3198 if opts.get(b'log'):
3198 if opts.get(b'log'):
3199 message += b'\n(grafted from %s)' % ctx.hex()
3199 message += b'\n(grafted from %s)' % ctx.hex()
3200 statedata[b'log'] = True
3200 statedata[b'log'] = True
3201
3201
3202 # we don't merge the first commit when continuing
3202 # we don't merge the first commit when continuing
3203 if not cont:
3203 if not cont:
3204 # perform the graft merge with p1(rev) as 'ancestor'
3204 # perform the graft merge with p1(rev) as 'ancestor'
3205 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3205 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3206 base = ctx.p1() if basectx is None else basectx
3206 base = ctx.p1() if basectx is None else basectx
3207 with ui.configoverride(overrides, b'graft'):
3207 with ui.configoverride(overrides, b'graft'):
3208 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3208 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3209 # report any conflicts
3209 # report any conflicts
3210 if stats.unresolvedcount > 0:
3210 if stats.unresolvedcount > 0:
3211 # write out state for --continue
3211 # write out state for --continue
3212 nodes = [repo[rev].hex() for rev in revs[pos:]]
3212 nodes = [repo[rev].hex() for rev in revs[pos:]]
3213 statedata[b'nodes'] = nodes
3213 statedata[b'nodes'] = nodes
3214 stateversion = 1
3214 stateversion = 1
3215 graftstate.save(stateversion, statedata)
3215 graftstate.save(stateversion, statedata)
3216 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3216 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3217 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3217 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3218 return 1
3218 return 1
3219 else:
3219 else:
3220 cont = False
3220 cont = False
3221
3221
3222 # commit if --no-commit is false
3222 # commit if --no-commit is false
3223 if not opts.get(b'no_commit'):
3223 if not opts.get(b'no_commit'):
3224 node = repo.commit(
3224 node = repo.commit(
3225 text=message, user=user, date=date, extra=extra, editor=editor
3225 text=message, user=user, date=date, extra=extra, editor=editor
3226 )
3226 )
3227 if node is None:
3227 if node is None:
3228 ui.warn(
3228 ui.warn(
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3230 % (ctx.rev(), ctx)
3230 % (ctx.rev(), ctx)
3231 )
3231 )
3232 # checking that newnodes exist because old state files won't have it
3232 # checking that newnodes exist because old state files won't have it
3233 elif statedata.get(b'newnodes') is not None:
3233 elif statedata.get(b'newnodes') is not None:
3234 statedata[b'newnodes'].append(node)
3234 statedata[b'newnodes'].append(node)
3235
3235
3236 # remove state when we complete successfully
3236 # remove state when we complete successfully
3237 if not opts.get(b'dry_run'):
3237 if not opts.get(b'dry_run'):
3238 graftstate.delete()
3238 graftstate.delete()
3239
3239
3240 return 0
3240 return 0
3241
3241
3242
3242
3243 def _stopgraft(ui, repo, graftstate):
3243 def _stopgraft(ui, repo, graftstate):
3244 """stop the interrupted graft"""
3244 """stop the interrupted graft"""
3245 if not graftstate.exists():
3245 if not graftstate.exists():
3246 raise error.Abort(_(b"no interrupted graft found"))
3246 raise error.Abort(_(b"no interrupted graft found"))
3247 pctx = repo[b'.']
3247 pctx = repo[b'.']
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3249 graftstate.delete()
3249 graftstate.delete()
3250 ui.status(_(b"stopped the interrupted graft\n"))
3250 ui.status(_(b"stopped the interrupted graft\n"))
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3252 return 0
3252 return 0
3253
3253
3254
3254
3255 statemod.addunfinished(
3255 statemod.addunfinished(
3256 b'graft',
3256 b'graft',
3257 fname=b'graftstate',
3257 fname=b'graftstate',
3258 clearable=True,
3258 clearable=True,
3259 stopflag=True,
3259 stopflag=True,
3260 continueflag=True,
3260 continueflag=True,
3261 abortfunc=cmdutil.hgabortgraft,
3261 abortfunc=cmdutil.hgabortgraft,
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3263 )
3263 )
3264
3264
3265
3265
3266 @command(
3266 @command(
3267 b'grep',
3267 b'grep',
3268 [
3268 [
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3271 (
3271 (
3272 b'',
3272 b'',
3273 b'diff',
3273 b'diff',
3274 None,
3274 None,
3275 _(
3275 _(
3276 b'search revision differences for when the pattern was added '
3276 b'search revision differences for when the pattern was added '
3277 b'or removed'
3277 b'or removed'
3278 ),
3278 ),
3279 ),
3279 ),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3281 (
3281 (
3282 b'f',
3282 b'f',
3283 b'follow',
3283 b'follow',
3284 None,
3284 None,
3285 _(
3285 _(
3286 b'follow changeset history,'
3286 b'follow changeset history,'
3287 b' or file history across copies and renames'
3287 b' or file history across copies and renames'
3288 ),
3288 ),
3289 ),
3289 ),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3291 (
3291 (
3292 b'l',
3292 b'l',
3293 b'files-with-matches',
3293 b'files-with-matches',
3294 None,
3294 None,
3295 _(b'print only filenames and revisions that match'),
3295 _(b'print only filenames and revisions that match'),
3296 ),
3296 ),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3298 (
3298 (
3299 b'r',
3299 b'r',
3300 b'rev',
3300 b'rev',
3301 [],
3301 [],
3302 _(b'search files changed within revision range'),
3302 _(b'search files changed within revision range'),
3303 _(b'REV'),
3303 _(b'REV'),
3304 ),
3304 ),
3305 (
3305 (
3306 b'',
3306 b'',
3307 b'all-files',
3307 b'all-files',
3308 None,
3308 None,
3309 _(
3309 _(
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3311 ),
3311 ),
3312 ),
3312 ),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3315 ]
3315 ]
3316 + formatteropts
3316 + formatteropts
3317 + walkopts,
3317 + walkopts,
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3320 inferrepo=True,
3320 inferrepo=True,
3321 intents={INTENT_READONLY},
3321 intents={INTENT_READONLY},
3322 )
3322 )
3323 def grep(ui, repo, pattern, *pats, **opts):
3323 def grep(ui, repo, pattern, *pats, **opts):
3324 """search for a pattern in specified files
3324 """search for a pattern in specified files
3325
3325
3326 Search the working directory or revision history for a regular
3326 Search the working directory or revision history for a regular
3327 expression in the specified files for the entire repository.
3327 expression in the specified files for the entire repository.
3328
3328
3329 By default, grep searches the repository files in the working
3329 By default, grep searches the repository files in the working
3330 directory and prints the files where it finds a match. To specify
3330 directory and prints the files where it finds a match. To specify
3331 historical revisions instead of the working directory, use the
3331 historical revisions instead of the working directory, use the
3332 --rev flag.
3332 --rev flag.
3333
3333
3334 To search instead historical revision differences that contains a
3334 To search instead historical revision differences that contains a
3335 change in match status ("-" for a match that becomes a non-match,
3335 change in match status ("-" for a match that becomes a non-match,
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3337
3337
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3339 expression.
3339 expression.
3340
3340
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3342 files in the working directory are searched. When using the --rev
3342 files in the working directory are searched. When using the --rev
3343 flag and specifying FILEs, use the --follow argument to also
3343 flag and specifying FILEs, use the --follow argument to also
3344 follow the specified FILEs across renames and copies.
3344 follow the specified FILEs across renames and copies.
3345
3345
3346 .. container:: verbose
3346 .. container:: verbose
3347
3347
3348 Template:
3348 Template:
3349
3349
3350 The following keywords are supported in addition to the common template
3350 The following keywords are supported in addition to the common template
3351 keywords and functions. See also :hg:`help templates`.
3351 keywords and functions. See also :hg:`help templates`.
3352
3352
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3354 Available if ``--diff`` is specified.
3354 Available if ``--diff`` is specified.
3355 :lineno: Integer. Line number of the match.
3355 :lineno: Integer. Line number of the match.
3356 :path: String. Repository-absolute path of the file.
3356 :path: String. Repository-absolute path of the file.
3357 :texts: List of text chunks.
3357 :texts: List of text chunks.
3358
3358
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3360
3360
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3362 :text: String. Chunk content.
3362 :text: String. Chunk content.
3363
3363
3364 See :hg:`help templates.operators` for the list expansion syntax.
3364 See :hg:`help templates.operators` for the list expansion syntax.
3365
3365
3366 Returns 0 if a match is found, 1 otherwise.
3366 Returns 0 if a match is found, 1 otherwise.
3367
3367
3368 """
3368 """
3369 opts = pycompat.byteskwargs(opts)
3369 opts = pycompat.byteskwargs(opts)
3370 diff = opts.get(b'all') or opts.get(b'diff')
3370 diff = opts.get(b'all') or opts.get(b'diff')
3371 if diff and opts.get(b'all_files'):
3371 if diff and opts.get(b'all_files'):
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3373 if opts.get(b'all_files') is None and not diff:
3373 if opts.get(b'all_files') is None and not diff:
3374 opts[b'all_files'] = True
3374 opts[b'all_files'] = True
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3376 all_files = opts.get(b'all_files')
3376 all_files = opts.get(b'all_files')
3377 if plaingrep:
3377 if plaingrep:
3378 opts[b'rev'] = [b'wdir()']
3378 opts[b'rev'] = [b'wdir()']
3379
3379
3380 reflags = re.M
3380 reflags = re.M
3381 if opts.get(b'ignore_case'):
3381 if opts.get(b'ignore_case'):
3382 reflags |= re.I
3382 reflags |= re.I
3383 try:
3383 try:
3384 regexp = util.re.compile(pattern, reflags)
3384 regexp = util.re.compile(pattern, reflags)
3385 except re.error as inst:
3385 except re.error as inst:
3386 ui.warn(
3386 ui.warn(
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3388 )
3388 )
3389 return 1
3389 return 1
3390 sep, eol = b':', b'\n'
3390 sep, eol = b':', b'\n'
3391 if opts.get(b'print0'):
3391 if opts.get(b'print0'):
3392 sep = eol = b'\0'
3392 sep = eol = b'\0'
3393
3393
3394 getfile = util.lrucachefunc(repo.file)
3394 getfile = util.lrucachefunc(repo.file)
3395
3395
3396 def matchlines(body):
3396 def matchlines(body):
3397 begin = 0
3397 begin = 0
3398 linenum = 0
3398 linenum = 0
3399 while begin < len(body):
3399 while begin < len(body):
3400 match = regexp.search(body, begin)
3400 match = regexp.search(body, begin)
3401 if not match:
3401 if not match:
3402 break
3402 break
3403 mstart, mend = match.span()
3403 mstart, mend = match.span()
3404 linenum += body.count(b'\n', begin, mstart) + 1
3404 linenum += body.count(b'\n', begin, mstart) + 1
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3407 lend = begin - 1
3407 lend = begin - 1
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3409
3409
3410 class linestate(object):
3410 class linestate(object):
3411 def __init__(self, line, linenum, colstart, colend):
3411 def __init__(self, line, linenum, colstart, colend):
3412 self.line = line
3412 self.line = line
3413 self.linenum = linenum
3413 self.linenum = linenum
3414 self.colstart = colstart
3414 self.colstart = colstart
3415 self.colend = colend
3415 self.colend = colend
3416
3416
3417 def __hash__(self):
3417 def __hash__(self):
3418 return hash((self.linenum, self.line))
3418 return hash((self.linenum, self.line))
3419
3419
3420 def __eq__(self, other):
3420 def __eq__(self, other):
3421 return self.line == other.line
3421 return self.line == other.line
3422
3422
3423 def findpos(self):
3423 def findpos(self):
3424 """Iterate all (start, end) indices of matches"""
3424 """Iterate all (start, end) indices of matches"""
3425 yield self.colstart, self.colend
3425 yield self.colstart, self.colend
3426 p = self.colend
3426 p = self.colend
3427 while p < len(self.line):
3427 while p < len(self.line):
3428 m = regexp.search(self.line, p)
3428 m = regexp.search(self.line, p)
3429 if not m:
3429 if not m:
3430 break
3430 break
3431 yield m.span()
3431 if m.end() == p:
3432 p = m.end()
3432 p += 1
3433 else:
3434 yield m.span()
3435 p = m.end()
3433
3436
3434 matches = {}
3437 matches = {}
3435 copies = {}
3438 copies = {}
3436
3439
3437 def grepbody(fn, rev, body):
3440 def grepbody(fn, rev, body):
3438 matches[rev].setdefault(fn, [])
3441 matches[rev].setdefault(fn, [])
3439 m = matches[rev][fn]
3442 m = matches[rev][fn]
3440 if body is None:
3443 if body is None:
3441 return
3444 return
3442
3445
3443 for lnum, cstart, cend, line in matchlines(body):
3446 for lnum, cstart, cend, line in matchlines(body):
3444 s = linestate(line, lnum, cstart, cend)
3447 s = linestate(line, lnum, cstart, cend)
3445 m.append(s)
3448 m.append(s)
3446
3449
3447 def difflinestates(a, b):
3450 def difflinestates(a, b):
3448 sm = difflib.SequenceMatcher(None, a, b)
3451 sm = difflib.SequenceMatcher(None, a, b)
3449 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3452 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3450 if tag == 'insert':
3453 if tag == 'insert':
3451 for i in pycompat.xrange(blo, bhi):
3454 for i in pycompat.xrange(blo, bhi):
3452 yield (b'+', b[i])
3455 yield (b'+', b[i])
3453 elif tag == 'delete':
3456 elif tag == 'delete':
3454 for i in pycompat.xrange(alo, ahi):
3457 for i in pycompat.xrange(alo, ahi):
3455 yield (b'-', a[i])
3458 yield (b'-', a[i])
3456 elif tag == 'replace':
3459 elif tag == 'replace':
3457 for i in pycompat.xrange(alo, ahi):
3460 for i in pycompat.xrange(alo, ahi):
3458 yield (b'-', a[i])
3461 yield (b'-', a[i])
3459 for i in pycompat.xrange(blo, bhi):
3462 for i in pycompat.xrange(blo, bhi):
3460 yield (b'+', b[i])
3463 yield (b'+', b[i])
3461
3464
3462 uipathfn = scmutil.getuipathfn(repo)
3465 uipathfn = scmutil.getuipathfn(repo)
3463
3466
3464 def display(fm, fn, ctx, pstates, states):
3467 def display(fm, fn, ctx, pstates, states):
3465 rev = scmutil.intrev(ctx)
3468 rev = scmutil.intrev(ctx)
3466 if fm.isplain():
3469 if fm.isplain():
3467 formatuser = ui.shortuser
3470 formatuser = ui.shortuser
3468 else:
3471 else:
3469 formatuser = pycompat.bytestr
3472 formatuser = pycompat.bytestr
3470 if ui.quiet:
3473 if ui.quiet:
3471 datefmt = b'%Y-%m-%d'
3474 datefmt = b'%Y-%m-%d'
3472 else:
3475 else:
3473 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3476 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3474 found = False
3477 found = False
3475
3478
3476 @util.cachefunc
3479 @util.cachefunc
3477 def binary():
3480 def binary():
3478 flog = getfile(fn)
3481 flog = getfile(fn)
3479 try:
3482 try:
3480 return stringutil.binary(flog.read(ctx.filenode(fn)))
3483 return stringutil.binary(flog.read(ctx.filenode(fn)))
3481 except error.WdirUnsupported:
3484 except error.WdirUnsupported:
3482 return ctx[fn].isbinary()
3485 return ctx[fn].isbinary()
3483
3486
3484 fieldnamemap = {b'linenumber': b'lineno'}
3487 fieldnamemap = {b'linenumber': b'lineno'}
3485 if diff:
3488 if diff:
3486 iter = difflinestates(pstates, states)
3489 iter = difflinestates(pstates, states)
3487 else:
3490 else:
3488 iter = [(b'', l) for l in states]
3491 iter = [(b'', l) for l in states]
3489 for change, l in iter:
3492 for change, l in iter:
3490 fm.startitem()
3493 fm.startitem()
3491 fm.context(ctx=ctx)
3494 fm.context(ctx=ctx)
3492 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3495 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3493 fm.plain(uipathfn(fn), label=b'grep.filename')
3496 fm.plain(uipathfn(fn), label=b'grep.filename')
3494
3497
3495 cols = [
3498 cols = [
3496 (b'rev', b'%d', rev, not plaingrep, b''),
3499 (b'rev', b'%d', rev, not plaingrep, b''),
3497 (
3500 (
3498 b'linenumber',
3501 b'linenumber',
3499 b'%d',
3502 b'%d',
3500 l.linenum,
3503 l.linenum,
3501 opts.get(b'line_number'),
3504 opts.get(b'line_number'),
3502 b'',
3505 b'',
3503 ),
3506 ),
3504 ]
3507 ]
3505 if diff:
3508 if diff:
3506 cols.append(
3509 cols.append(
3507 (
3510 (
3508 b'change',
3511 b'change',
3509 b'%s',
3512 b'%s',
3510 change,
3513 change,
3511 True,
3514 True,
3512 b'grep.inserted '
3515 b'grep.inserted '
3513 if change == b'+'
3516 if change == b'+'
3514 else b'grep.deleted ',
3517 else b'grep.deleted ',
3515 )
3518 )
3516 )
3519 )
3517 cols.extend(
3520 cols.extend(
3518 [
3521 [
3519 (
3522 (
3520 b'user',
3523 b'user',
3521 b'%s',
3524 b'%s',
3522 formatuser(ctx.user()),
3525 formatuser(ctx.user()),
3523 opts.get(b'user'),
3526 opts.get(b'user'),
3524 b'',
3527 b'',
3525 ),
3528 ),
3526 (
3529 (
3527 b'date',
3530 b'date',
3528 b'%s',
3531 b'%s',
3529 fm.formatdate(ctx.date(), datefmt),
3532 fm.formatdate(ctx.date(), datefmt),
3530 opts.get(b'date'),
3533 opts.get(b'date'),
3531 b'',
3534 b'',
3532 ),
3535 ),
3533 ]
3536 ]
3534 )
3537 )
3535 for name, fmt, data, cond, extra_label in cols:
3538 for name, fmt, data, cond, extra_label in cols:
3536 if cond:
3539 if cond:
3537 fm.plain(sep, label=b'grep.sep')
3540 fm.plain(sep, label=b'grep.sep')
3538 field = fieldnamemap.get(name, name)
3541 field = fieldnamemap.get(name, name)
3539 label = extra_label + (b'grep.%s' % name)
3542 label = extra_label + (b'grep.%s' % name)
3540 fm.condwrite(cond, field, fmt, data, label=label)
3543 fm.condwrite(cond, field, fmt, data, label=label)
3541 if not opts.get(b'files_with_matches'):
3544 if not opts.get(b'files_with_matches'):
3542 fm.plain(sep, label=b'grep.sep')
3545 fm.plain(sep, label=b'grep.sep')
3543 if not opts.get(b'text') and binary():
3546 if not opts.get(b'text') and binary():
3544 fm.plain(_(b" Binary file matches"))
3547 fm.plain(_(b" Binary file matches"))
3545 else:
3548 else:
3546 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3549 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3547 fm.plain(eol)
3550 fm.plain(eol)
3548 found = True
3551 found = True
3549 if opts.get(b'files_with_matches'):
3552 if opts.get(b'files_with_matches'):
3550 break
3553 break
3551 return found
3554 return found
3552
3555
3553 def displaymatches(fm, l):
3556 def displaymatches(fm, l):
3554 p = 0
3557 p = 0
3555 for s, e in l.findpos():
3558 for s, e in l.findpos():
3556 if p < s:
3559 if p < s:
3557 fm.startitem()
3560 fm.startitem()
3558 fm.write(b'text', b'%s', l.line[p:s])
3561 fm.write(b'text', b'%s', l.line[p:s])
3559 fm.data(matched=False)
3562 fm.data(matched=False)
3560 fm.startitem()
3563 fm.startitem()
3561 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3564 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3562 fm.data(matched=True)
3565 fm.data(matched=True)
3563 p = e
3566 p = e
3564 if p < len(l.line):
3567 if p < len(l.line):
3565 fm.startitem()
3568 fm.startitem()
3566 fm.write(b'text', b'%s', l.line[p:])
3569 fm.write(b'text', b'%s', l.line[p:])
3567 fm.data(matched=False)
3570 fm.data(matched=False)
3568 fm.end()
3571 fm.end()
3569
3572
3570 skip = set()
3573 skip = set()
3571 revfiles = {}
3574 revfiles = {}
3572 match = scmutil.match(repo[None], pats, opts)
3575 match = scmutil.match(repo[None], pats, opts)
3573 found = False
3576 found = False
3574 follow = opts.get(b'follow')
3577 follow = opts.get(b'follow')
3575
3578
3576 getrenamed = scmutil.getrenamedfn(repo)
3579 getrenamed = scmutil.getrenamedfn(repo)
3577
3580
3578 def get_file_content(filename, filelog, filenode, context, revision):
3581 def get_file_content(filename, filelog, filenode, context, revision):
3579 try:
3582 try:
3580 content = filelog.read(filenode)
3583 content = filelog.read(filenode)
3581 except error.WdirUnsupported:
3584 except error.WdirUnsupported:
3582 content = context[filename].data()
3585 content = context[filename].data()
3583 except error.CensoredNodeError:
3586 except error.CensoredNodeError:
3584 content = None
3587 content = None
3585 ui.warn(
3588 ui.warn(
3586 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3589 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3587 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3590 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3588 )
3591 )
3589 return content
3592 return content
3590
3593
3591 def prep(ctx, fns):
3594 def prep(ctx, fns):
3592 rev = ctx.rev()
3595 rev = ctx.rev()
3593 pctx = ctx.p1()
3596 pctx = ctx.p1()
3594 parent = pctx.rev()
3597 parent = pctx.rev()
3595 matches.setdefault(rev, {})
3598 matches.setdefault(rev, {})
3596 matches.setdefault(parent, {})
3599 matches.setdefault(parent, {})
3597 files = revfiles.setdefault(rev, [])
3600 files = revfiles.setdefault(rev, [])
3598 for fn in fns:
3601 for fn in fns:
3599 flog = getfile(fn)
3602 flog = getfile(fn)
3600 try:
3603 try:
3601 fnode = ctx.filenode(fn)
3604 fnode = ctx.filenode(fn)
3602 except error.LookupError:
3605 except error.LookupError:
3603 continue
3606 continue
3604
3607
3605 copy = None
3608 copy = None
3606 if follow:
3609 if follow:
3607 copy = getrenamed(fn, rev)
3610 copy = getrenamed(fn, rev)
3608 if copy:
3611 if copy:
3609 copies.setdefault(rev, {})[fn] = copy
3612 copies.setdefault(rev, {})[fn] = copy
3610 if fn in skip:
3613 if fn in skip:
3611 skip.add(copy)
3614 skip.add(copy)
3612 if fn in skip:
3615 if fn in skip:
3613 continue
3616 continue
3614 files.append(fn)
3617 files.append(fn)
3615
3618
3616 if fn not in matches[rev]:
3619 if fn not in matches[rev]:
3617 content = get_file_content(fn, flog, fnode, ctx, rev)
3620 content = get_file_content(fn, flog, fnode, ctx, rev)
3618 grepbody(fn, rev, content)
3621 grepbody(fn, rev, content)
3619
3622
3620 pfn = copy or fn
3623 pfn = copy or fn
3621 if pfn not in matches[parent]:
3624 if pfn not in matches[parent]:
3622 try:
3625 try:
3623 pfnode = pctx.filenode(pfn)
3626 pfnode = pctx.filenode(pfn)
3624 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3627 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3625 grepbody(pfn, parent, pcontent)
3628 grepbody(pfn, parent, pcontent)
3626 except error.LookupError:
3629 except error.LookupError:
3627 pass
3630 pass
3628
3631
3629 ui.pager(b'grep')
3632 ui.pager(b'grep')
3630 fm = ui.formatter(b'grep', opts)
3633 fm = ui.formatter(b'grep', opts)
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3634 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3632 rev = ctx.rev()
3635 rev = ctx.rev()
3633 parent = ctx.p1().rev()
3636 parent = ctx.p1().rev()
3634 for fn in sorted(revfiles.get(rev, [])):
3637 for fn in sorted(revfiles.get(rev, [])):
3635 states = matches[rev][fn]
3638 states = matches[rev][fn]
3636 copy = copies.get(rev, {}).get(fn)
3639 copy = copies.get(rev, {}).get(fn)
3637 if fn in skip:
3640 if fn in skip:
3638 if copy:
3641 if copy:
3639 skip.add(copy)
3642 skip.add(copy)
3640 continue
3643 continue
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3644 pstates = matches.get(parent, {}).get(copy or fn, [])
3642 if pstates or states:
3645 if pstates or states:
3643 r = display(fm, fn, ctx, pstates, states)
3646 r = display(fm, fn, ctx, pstates, states)
3644 found = found or r
3647 found = found or r
3645 if r and not diff and not all_files:
3648 if r and not diff and not all_files:
3646 skip.add(fn)
3649 skip.add(fn)
3647 if copy:
3650 if copy:
3648 skip.add(copy)
3651 skip.add(copy)
3649 del revfiles[rev]
3652 del revfiles[rev]
3650 # We will keep the matches dict for the duration of the window
3653 # We will keep the matches dict for the duration of the window
3651 # clear the matches dict once the window is over
3654 # clear the matches dict once the window is over
3652 if not revfiles:
3655 if not revfiles:
3653 matches.clear()
3656 matches.clear()
3654 fm.end()
3657 fm.end()
3655
3658
3656 return not found
3659 return not found
3657
3660
3658
3661
3659 @command(
3662 @command(
3660 b'heads',
3663 b'heads',
3661 [
3664 [
3662 (
3665 (
3663 b'r',
3666 b'r',
3664 b'rev',
3667 b'rev',
3665 b'',
3668 b'',
3666 _(b'show only heads which are descendants of STARTREV'),
3669 _(b'show only heads which are descendants of STARTREV'),
3667 _(b'STARTREV'),
3670 _(b'STARTREV'),
3668 ),
3671 ),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3672 (b't', b'topo', False, _(b'show topological heads only')),
3670 (
3673 (
3671 b'a',
3674 b'a',
3672 b'active',
3675 b'active',
3673 False,
3676 False,
3674 _(b'show active branchheads only (DEPRECATED)'),
3677 _(b'show active branchheads only (DEPRECATED)'),
3675 ),
3678 ),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3679 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3677 ]
3680 ]
3678 + templateopts,
3681 + templateopts,
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3682 _(b'[-ct] [-r STARTREV] [REV]...'),
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3683 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3681 intents={INTENT_READONLY},
3684 intents={INTENT_READONLY},
3682 )
3685 )
3683 def heads(ui, repo, *branchrevs, **opts):
3686 def heads(ui, repo, *branchrevs, **opts):
3684 """show branch heads
3687 """show branch heads
3685
3688
3686 With no arguments, show all open branch heads in the repository.
3689 With no arguments, show all open branch heads in the repository.
3687 Branch heads are changesets that have no descendants on the
3690 Branch heads are changesets that have no descendants on the
3688 same branch. They are where development generally takes place and
3691 same branch. They are where development generally takes place and
3689 are the usual targets for update and merge operations.
3692 are the usual targets for update and merge operations.
3690
3693
3691 If one or more REVs are given, only open branch heads on the
3694 If one or more REVs are given, only open branch heads on the
3692 branches associated with the specified changesets are shown. This
3695 branches associated with the specified changesets are shown. This
3693 means that you can use :hg:`heads .` to see the heads on the
3696 means that you can use :hg:`heads .` to see the heads on the
3694 currently checked-out branch.
3697 currently checked-out branch.
3695
3698
3696 If -c/--closed is specified, also show branch heads marked closed
3699 If -c/--closed is specified, also show branch heads marked closed
3697 (see :hg:`commit --close-branch`).
3700 (see :hg:`commit --close-branch`).
3698
3701
3699 If STARTREV is specified, only those heads that are descendants of
3702 If STARTREV is specified, only those heads that are descendants of
3700 STARTREV will be displayed.
3703 STARTREV will be displayed.
3701
3704
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3705 If -t/--topo is specified, named branch mechanics will be ignored and only
3703 topological heads (changesets with no children) will be shown.
3706 topological heads (changesets with no children) will be shown.
3704
3707
3705 Returns 0 if matching heads are found, 1 if not.
3708 Returns 0 if matching heads are found, 1 if not.
3706 """
3709 """
3707
3710
3708 opts = pycompat.byteskwargs(opts)
3711 opts = pycompat.byteskwargs(opts)
3709 start = None
3712 start = None
3710 rev = opts.get(b'rev')
3713 rev = opts.get(b'rev')
3711 if rev:
3714 if rev:
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3715 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3713 start = scmutil.revsingle(repo, rev, None).node()
3716 start = scmutil.revsingle(repo, rev, None).node()
3714
3717
3715 if opts.get(b'topo'):
3718 if opts.get(b'topo'):
3716 heads = [repo[h] for h in repo.heads(start)]
3719 heads = [repo[h] for h in repo.heads(start)]
3717 else:
3720 else:
3718 heads = []
3721 heads = []
3719 for branch in repo.branchmap():
3722 for branch in repo.branchmap():
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3723 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3721 heads = [repo[h] for h in heads]
3724 heads = [repo[h] for h in heads]
3722
3725
3723 if branchrevs:
3726 if branchrevs:
3724 branches = {
3727 branches = {
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3728 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3726 }
3729 }
3727 heads = [h for h in heads if h.branch() in branches]
3730 heads = [h for h in heads if h.branch() in branches]
3728
3731
3729 if opts.get(b'active') and branchrevs:
3732 if opts.get(b'active') and branchrevs:
3730 dagheads = repo.heads(start)
3733 dagheads = repo.heads(start)
3731 heads = [h for h in heads if h.node() in dagheads]
3734 heads = [h for h in heads if h.node() in dagheads]
3732
3735
3733 if branchrevs:
3736 if branchrevs:
3734 haveheads = {h.branch() for h in heads}
3737 haveheads = {h.branch() for h in heads}
3735 if branches - haveheads:
3738 if branches - haveheads:
3736 headless = b', '.join(b for b in branches - haveheads)
3739 headless = b', '.join(b for b in branches - haveheads)
3737 msg = _(b'no open branch heads found on branches %s')
3740 msg = _(b'no open branch heads found on branches %s')
3738 if opts.get(b'rev'):
3741 if opts.get(b'rev'):
3739 msg += _(b' (started at %s)') % opts[b'rev']
3742 msg += _(b' (started at %s)') % opts[b'rev']
3740 ui.warn((msg + b'\n') % headless)
3743 ui.warn((msg + b'\n') % headless)
3741
3744
3742 if not heads:
3745 if not heads:
3743 return 1
3746 return 1
3744
3747
3745 ui.pager(b'heads')
3748 ui.pager(b'heads')
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3749 heads = sorted(heads, key=lambda x: -(x.rev()))
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3750 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3748 for ctx in heads:
3751 for ctx in heads:
3749 displayer.show(ctx)
3752 displayer.show(ctx)
3750 displayer.close()
3753 displayer.close()
3751
3754
3752
3755
3753 @command(
3756 @command(
3754 b'help',
3757 b'help',
3755 [
3758 [
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3759 (b'e', b'extension', None, _(b'show only help for extensions')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3760 (b'c', b'command', None, _(b'show only help for commands')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3761 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3759 (
3762 (
3760 b's',
3763 b's',
3761 b'system',
3764 b'system',
3762 [],
3765 [],
3763 _(b'show help for specific platform(s)'),
3766 _(b'show help for specific platform(s)'),
3764 _(b'PLATFORM'),
3767 _(b'PLATFORM'),
3765 ),
3768 ),
3766 ],
3769 ],
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3770 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3768 helpcategory=command.CATEGORY_HELP,
3771 helpcategory=command.CATEGORY_HELP,
3769 norepo=True,
3772 norepo=True,
3770 intents={INTENT_READONLY},
3773 intents={INTENT_READONLY},
3771 )
3774 )
3772 def help_(ui, name=None, **opts):
3775 def help_(ui, name=None, **opts):
3773 """show help for a given topic or a help overview
3776 """show help for a given topic or a help overview
3774
3777
3775 With no arguments, print a list of commands with short help messages.
3778 With no arguments, print a list of commands with short help messages.
3776
3779
3777 Given a topic, extension, or command name, print help for that
3780 Given a topic, extension, or command name, print help for that
3778 topic.
3781 topic.
3779
3782
3780 Returns 0 if successful.
3783 Returns 0 if successful.
3781 """
3784 """
3782
3785
3783 keep = opts.get('system') or []
3786 keep = opts.get('system') or []
3784 if len(keep) == 0:
3787 if len(keep) == 0:
3785 if pycompat.sysplatform.startswith(b'win'):
3788 if pycompat.sysplatform.startswith(b'win'):
3786 keep.append(b'windows')
3789 keep.append(b'windows')
3787 elif pycompat.sysplatform == b'OpenVMS':
3790 elif pycompat.sysplatform == b'OpenVMS':
3788 keep.append(b'vms')
3791 keep.append(b'vms')
3789 elif pycompat.sysplatform == b'plan9':
3792 elif pycompat.sysplatform == b'plan9':
3790 keep.append(b'plan9')
3793 keep.append(b'plan9')
3791 else:
3794 else:
3792 keep.append(b'unix')
3795 keep.append(b'unix')
3793 keep.append(pycompat.sysplatform.lower())
3796 keep.append(pycompat.sysplatform.lower())
3794 if ui.verbose:
3797 if ui.verbose:
3795 keep.append(b'verbose')
3798 keep.append(b'verbose')
3796
3799
3797 commands = sys.modules[__name__]
3800 commands = sys.modules[__name__]
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3801 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3799 ui.pager(b'help')
3802 ui.pager(b'help')
3800 ui.write(formatted)
3803 ui.write(formatted)
3801
3804
3802
3805
3803 @command(
3806 @command(
3804 b'identify|id',
3807 b'identify|id',
3805 [
3808 [
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3809 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3810 (b'n', b'num', None, _(b'show local revision number')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3811 (b'i', b'id', None, _(b'show global revision id')),
3809 (b'b', b'branch', None, _(b'show branch')),
3812 (b'b', b'branch', None, _(b'show branch')),
3810 (b't', b'tags', None, _(b'show tags')),
3813 (b't', b'tags', None, _(b'show tags')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3814 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3812 ]
3815 ]
3813 + remoteopts
3816 + remoteopts
3814 + formatteropts,
3817 + formatteropts,
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3818 _(b'[-nibtB] [-r REV] [SOURCE]'),
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3819 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3817 optionalrepo=True,
3820 optionalrepo=True,
3818 intents={INTENT_READONLY},
3821 intents={INTENT_READONLY},
3819 )
3822 )
3820 def identify(
3823 def identify(
3821 ui,
3824 ui,
3822 repo,
3825 repo,
3823 source=None,
3826 source=None,
3824 rev=None,
3827 rev=None,
3825 num=None,
3828 num=None,
3826 id=None,
3829 id=None,
3827 branch=None,
3830 branch=None,
3828 tags=None,
3831 tags=None,
3829 bookmarks=None,
3832 bookmarks=None,
3830 **opts
3833 **opts
3831 ):
3834 ):
3832 """identify the working directory or specified revision
3835 """identify the working directory or specified revision
3833
3836
3834 Print a summary identifying the repository state at REV using one or
3837 Print a summary identifying the repository state at REV using one or
3835 two parent hash identifiers, followed by a "+" if the working
3838 two parent hash identifiers, followed by a "+" if the working
3836 directory has uncommitted changes, the branch name (if not default),
3839 directory has uncommitted changes, the branch name (if not default),
3837 a list of tags, and a list of bookmarks.
3840 a list of tags, and a list of bookmarks.
3838
3841
3839 When REV is not given, print a summary of the current state of the
3842 When REV is not given, print a summary of the current state of the
3840 repository including the working directory. Specify -r. to get information
3843 repository including the working directory. Specify -r. to get information
3841 of the working directory parent without scanning uncommitted changes.
3844 of the working directory parent without scanning uncommitted changes.
3842
3845
3843 Specifying a path to a repository root or Mercurial bundle will
3846 Specifying a path to a repository root or Mercurial bundle will
3844 cause lookup to operate on that repository/bundle.
3847 cause lookup to operate on that repository/bundle.
3845
3848
3846 .. container:: verbose
3849 .. container:: verbose
3847
3850
3848 Template:
3851 Template:
3849
3852
3850 The following keywords are supported in addition to the common template
3853 The following keywords are supported in addition to the common template
3851 keywords and functions. See also :hg:`help templates`.
3854 keywords and functions. See also :hg:`help templates`.
3852
3855
3853 :dirty: String. Character ``+`` denoting if the working directory has
3856 :dirty: String. Character ``+`` denoting if the working directory has
3854 uncommitted changes.
3857 uncommitted changes.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3858 :id: String. One or two nodes, optionally followed by ``+``.
3856 :parents: List of strings. Parent nodes of the changeset.
3859 :parents: List of strings. Parent nodes of the changeset.
3857
3860
3858 Examples:
3861 Examples:
3859
3862
3860 - generate a build identifier for the working directory::
3863 - generate a build identifier for the working directory::
3861
3864
3862 hg id --id > build-id.dat
3865 hg id --id > build-id.dat
3863
3866
3864 - find the revision corresponding to a tag::
3867 - find the revision corresponding to a tag::
3865
3868
3866 hg id -n -r 1.3
3869 hg id -n -r 1.3
3867
3870
3868 - check the most recent revision of a remote repository::
3871 - check the most recent revision of a remote repository::
3869
3872
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3873 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3871
3874
3872 See :hg:`log` for generating more information about specific revisions,
3875 See :hg:`log` for generating more information about specific revisions,
3873 including full hash identifiers.
3876 including full hash identifiers.
3874
3877
3875 Returns 0 if successful.
3878 Returns 0 if successful.
3876 """
3879 """
3877
3880
3878 opts = pycompat.byteskwargs(opts)
3881 opts = pycompat.byteskwargs(opts)
3879 if not repo and not source:
3882 if not repo and not source:
3880 raise error.Abort(
3883 raise error.Abort(
3881 _(b"there is no Mercurial repository here (.hg not found)")
3884 _(b"there is no Mercurial repository here (.hg not found)")
3882 )
3885 )
3883
3886
3884 default = not (num or id or branch or tags or bookmarks)
3887 default = not (num or id or branch or tags or bookmarks)
3885 output = []
3888 output = []
3886 revs = []
3889 revs = []
3887
3890
3888 if source:
3891 if source:
3889 source, branches = hg.parseurl(ui.expandpath(source))
3892 source, branches = hg.parseurl(ui.expandpath(source))
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3893 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3891 repo = peer.local()
3894 repo = peer.local()
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3895 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3893
3896
3894 fm = ui.formatter(b'identify', opts)
3897 fm = ui.formatter(b'identify', opts)
3895 fm.startitem()
3898 fm.startitem()
3896
3899
3897 if not repo:
3900 if not repo:
3898 if num or branch or tags:
3901 if num or branch or tags:
3899 raise error.Abort(
3902 raise error.Abort(
3900 _(b"can't query remote revision number, branch, or tags")
3903 _(b"can't query remote revision number, branch, or tags")
3901 )
3904 )
3902 if not rev and revs:
3905 if not rev and revs:
3903 rev = revs[0]
3906 rev = revs[0]
3904 if not rev:
3907 if not rev:
3905 rev = b"tip"
3908 rev = b"tip"
3906
3909
3907 remoterev = peer.lookup(rev)
3910 remoterev = peer.lookup(rev)
3908 hexrev = fm.hexfunc(remoterev)
3911 hexrev = fm.hexfunc(remoterev)
3909 if default or id:
3912 if default or id:
3910 output = [hexrev]
3913 output = [hexrev]
3911 fm.data(id=hexrev)
3914 fm.data(id=hexrev)
3912
3915
3913 @util.cachefunc
3916 @util.cachefunc
3914 def getbms():
3917 def getbms():
3915 bms = []
3918 bms = []
3916
3919
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3920 if b'bookmarks' in peer.listkeys(b'namespaces'):
3918 hexremoterev = hex(remoterev)
3921 hexremoterev = hex(remoterev)
3919 bms = [
3922 bms = [
3920 bm
3923 bm
3921 for bm, bmr in pycompat.iteritems(
3924 for bm, bmr in pycompat.iteritems(
3922 peer.listkeys(b'bookmarks')
3925 peer.listkeys(b'bookmarks')
3923 )
3926 )
3924 if bmr == hexremoterev
3927 if bmr == hexremoterev
3925 ]
3928 ]
3926
3929
3927 return sorted(bms)
3930 return sorted(bms)
3928
3931
3929 if fm.isplain():
3932 if fm.isplain():
3930 if bookmarks:
3933 if bookmarks:
3931 output.extend(getbms())
3934 output.extend(getbms())
3932 elif default and not ui.quiet:
3935 elif default and not ui.quiet:
3933 # multiple bookmarks for a single parent separated by '/'
3936 # multiple bookmarks for a single parent separated by '/'
3934 bm = b'/'.join(getbms())
3937 bm = b'/'.join(getbms())
3935 if bm:
3938 if bm:
3936 output.append(bm)
3939 output.append(bm)
3937 else:
3940 else:
3938 fm.data(node=hex(remoterev))
3941 fm.data(node=hex(remoterev))
3939 if bookmarks or b'bookmarks' in fm.datahint():
3942 if bookmarks or b'bookmarks' in fm.datahint():
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3943 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3941 else:
3944 else:
3942 if rev:
3945 if rev:
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3946 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3944 ctx = scmutil.revsingle(repo, rev, None)
3947 ctx = scmutil.revsingle(repo, rev, None)
3945
3948
3946 if ctx.rev() is None:
3949 if ctx.rev() is None:
3947 ctx = repo[None]
3950 ctx = repo[None]
3948 parents = ctx.parents()
3951 parents = ctx.parents()
3949 taglist = []
3952 taglist = []
3950 for p in parents:
3953 for p in parents:
3951 taglist.extend(p.tags())
3954 taglist.extend(p.tags())
3952
3955
3953 dirty = b""
3956 dirty = b""
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3957 if ctx.dirty(missing=True, merge=False, branch=False):
3955 dirty = b'+'
3958 dirty = b'+'
3956 fm.data(dirty=dirty)
3959 fm.data(dirty=dirty)
3957
3960
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3961 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3959 if default or id:
3962 if default or id:
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3963 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3964 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3962
3965
3963 if num:
3966 if num:
3964 numoutput = [b"%d" % p.rev() for p in parents]
3967 numoutput = [b"%d" % p.rev() for p in parents]
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3968 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3966
3969
3967 fm.data(
3970 fm.data(
3968 parents=fm.formatlist(
3971 parents=fm.formatlist(
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3972 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3970 )
3973 )
3971 )
3974 )
3972 else:
3975 else:
3973 hexoutput = fm.hexfunc(ctx.node())
3976 hexoutput = fm.hexfunc(ctx.node())
3974 if default or id:
3977 if default or id:
3975 output = [hexoutput]
3978 output = [hexoutput]
3976 fm.data(id=hexoutput)
3979 fm.data(id=hexoutput)
3977
3980
3978 if num:
3981 if num:
3979 output.append(pycompat.bytestr(ctx.rev()))
3982 output.append(pycompat.bytestr(ctx.rev()))
3980 taglist = ctx.tags()
3983 taglist = ctx.tags()
3981
3984
3982 if default and not ui.quiet:
3985 if default and not ui.quiet:
3983 b = ctx.branch()
3986 b = ctx.branch()
3984 if b != b'default':
3987 if b != b'default':
3985 output.append(b"(%s)" % b)
3988 output.append(b"(%s)" % b)
3986
3989
3987 # multiple tags for a single parent separated by '/'
3990 # multiple tags for a single parent separated by '/'
3988 t = b'/'.join(taglist)
3991 t = b'/'.join(taglist)
3989 if t:
3992 if t:
3990 output.append(t)
3993 output.append(t)
3991
3994
3992 # multiple bookmarks for a single parent separated by '/'
3995 # multiple bookmarks for a single parent separated by '/'
3993 bm = b'/'.join(ctx.bookmarks())
3996 bm = b'/'.join(ctx.bookmarks())
3994 if bm:
3997 if bm:
3995 output.append(bm)
3998 output.append(bm)
3996 else:
3999 else:
3997 if branch:
4000 if branch:
3998 output.append(ctx.branch())
4001 output.append(ctx.branch())
3999
4002
4000 if tags:
4003 if tags:
4001 output.extend(taglist)
4004 output.extend(taglist)
4002
4005
4003 if bookmarks:
4006 if bookmarks:
4004 output.extend(ctx.bookmarks())
4007 output.extend(ctx.bookmarks())
4005
4008
4006 fm.data(node=ctx.hex())
4009 fm.data(node=ctx.hex())
4007 fm.data(branch=ctx.branch())
4010 fm.data(branch=ctx.branch())
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4011 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4012 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4010 fm.context(ctx=ctx)
4013 fm.context(ctx=ctx)
4011
4014
4012 fm.plain(b"%s\n" % b' '.join(output))
4015 fm.plain(b"%s\n" % b' '.join(output))
4013 fm.end()
4016 fm.end()
4014
4017
4015
4018
4016 @command(
4019 @command(
4017 b'import|patch',
4020 b'import|patch',
4018 [
4021 [
4019 (
4022 (
4020 b'p',
4023 b'p',
4021 b'strip',
4024 b'strip',
4022 1,
4025 1,
4023 _(
4026 _(
4024 b'directory strip option for patch. This has the same '
4027 b'directory strip option for patch. This has the same '
4025 b'meaning as the corresponding patch option'
4028 b'meaning as the corresponding patch option'
4026 ),
4029 ),
4027 _(b'NUM'),
4030 _(b'NUM'),
4028 ),
4031 ),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4032 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4033 (b'', b'secret', None, _(b'use the secret phase for committing')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4034 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4032 (
4035 (
4033 b'f',
4036 b'f',
4034 b'force',
4037 b'force',
4035 None,
4038 None,
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4039 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4037 ),
4040 ),
4038 (
4041 (
4039 b'',
4042 b'',
4040 b'no-commit',
4043 b'no-commit',
4041 None,
4044 None,
4042 _(b"don't commit, just update the working directory"),
4045 _(b"don't commit, just update the working directory"),
4043 ),
4046 ),
4044 (
4047 (
4045 b'',
4048 b'',
4046 b'bypass',
4049 b'bypass',
4047 None,
4050 None,
4048 _(b"apply patch without touching the working directory"),
4051 _(b"apply patch without touching the working directory"),
4049 ),
4052 ),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4053 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4054 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4055 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4053 (
4056 (
4054 b'',
4057 b'',
4055 b'import-branch',
4058 b'import-branch',
4056 None,
4059 None,
4057 _(b'use any branch information in patch (implied by --exact)'),
4060 _(b'use any branch information in patch (implied by --exact)'),
4058 ),
4061 ),
4059 ]
4062 ]
4060 + commitopts
4063 + commitopts
4061 + commitopts2
4064 + commitopts2
4062 + similarityopts,
4065 + similarityopts,
4063 _(b'[OPTION]... PATCH...'),
4066 _(b'[OPTION]... PATCH...'),
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4067 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4065 )
4068 )
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4069 def import_(ui, repo, patch1=None, *patches, **opts):
4067 """import an ordered set of patches
4070 """import an ordered set of patches
4068
4071
4069 Import a list of patches and commit them individually (unless
4072 Import a list of patches and commit them individually (unless
4070 --no-commit is specified).
4073 --no-commit is specified).
4071
4074
4072 To read a patch from standard input (stdin), use "-" as the patch
4075 To read a patch from standard input (stdin), use "-" as the patch
4073 name. If a URL is specified, the patch will be downloaded from
4076 name. If a URL is specified, the patch will be downloaded from
4074 there.
4077 there.
4075
4078
4076 Import first applies changes to the working directory (unless
4079 Import first applies changes to the working directory (unless
4077 --bypass is specified), import will abort if there are outstanding
4080 --bypass is specified), import will abort if there are outstanding
4078 changes.
4081 changes.
4079
4082
4080 Use --bypass to apply and commit patches directly to the
4083 Use --bypass to apply and commit patches directly to the
4081 repository, without affecting the working directory. Without
4084 repository, without affecting the working directory. Without
4082 --exact, patches will be applied on top of the working directory
4085 --exact, patches will be applied on top of the working directory
4083 parent revision.
4086 parent revision.
4084
4087
4085 You can import a patch straight from a mail message. Even patches
4088 You can import a patch straight from a mail message. Even patches
4086 as attachments work (to use the body part, it must have type
4089 as attachments work (to use the body part, it must have type
4087 text/plain or text/x-patch). From and Subject headers of email
4090 text/plain or text/x-patch). From and Subject headers of email
4088 message are used as default committer and commit message. All
4091 message are used as default committer and commit message. All
4089 text/plain body parts before first diff are added to the commit
4092 text/plain body parts before first diff are added to the commit
4090 message.
4093 message.
4091
4094
4092 If the imported patch was generated by :hg:`export`, user and
4095 If the imported patch was generated by :hg:`export`, user and
4093 description from patch override values from message headers and
4096 description from patch override values from message headers and
4094 body. Values given on command line with -m/--message and -u/--user
4097 body. Values given on command line with -m/--message and -u/--user
4095 override these.
4098 override these.
4096
4099
4097 If --exact is specified, import will set the working directory to
4100 If --exact is specified, import will set the working directory to
4098 the parent of each patch before applying it, and will abort if the
4101 the parent of each patch before applying it, and will abort if the
4099 resulting changeset has a different ID than the one recorded in
4102 resulting changeset has a different ID than the one recorded in
4100 the patch. This will guard against various ways that portable
4103 the patch. This will guard against various ways that portable
4101 patch formats and mail systems might fail to transfer Mercurial
4104 patch formats and mail systems might fail to transfer Mercurial
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4105 data or metadata. See :hg:`bundle` for lossless transmission.
4103
4106
4104 Use --partial to ensure a changeset will be created from the patch
4107 Use --partial to ensure a changeset will be created from the patch
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4108 even if some hunks fail to apply. Hunks that fail to apply will be
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4109 written to a <target-file>.rej file. Conflicts can then be resolved
4107 by hand before :hg:`commit --amend` is run to update the created
4110 by hand before :hg:`commit --amend` is run to update the created
4108 changeset. This flag exists to let people import patches that
4111 changeset. This flag exists to let people import patches that
4109 partially apply without losing the associated metadata (author,
4112 partially apply without losing the associated metadata (author,
4110 date, description, ...).
4113 date, description, ...).
4111
4114
4112 .. note::
4115 .. note::
4113
4116
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4117 When no hunks apply cleanly, :hg:`import --partial` will create
4115 an empty changeset, importing only the patch metadata.
4118 an empty changeset, importing only the patch metadata.
4116
4119
4117 With -s/--similarity, hg will attempt to discover renames and
4120 With -s/--similarity, hg will attempt to discover renames and
4118 copies in the patch in the same way as :hg:`addremove`.
4121 copies in the patch in the same way as :hg:`addremove`.
4119
4122
4120 It is possible to use external patch programs to perform the patch
4123 It is possible to use external patch programs to perform the patch
4121 by setting the ``ui.patch`` configuration option. For the default
4124 by setting the ``ui.patch`` configuration option. For the default
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4125 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4123 See :hg:`help config` for more information about configuration
4126 See :hg:`help config` for more information about configuration
4124 files and how to use these options.
4127 files and how to use these options.
4125
4128
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4129 See :hg:`help dates` for a list of formats valid for -d/--date.
4127
4130
4128 .. container:: verbose
4131 .. container:: verbose
4129
4132
4130 Examples:
4133 Examples:
4131
4134
4132 - import a traditional patch from a website and detect renames::
4135 - import a traditional patch from a website and detect renames::
4133
4136
4134 hg import -s 80 http://example.com/bugfix.patch
4137 hg import -s 80 http://example.com/bugfix.patch
4135
4138
4136 - import a changeset from an hgweb server::
4139 - import a changeset from an hgweb server::
4137
4140
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4141 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4139
4142
4140 - import all the patches in an Unix-style mbox::
4143 - import all the patches in an Unix-style mbox::
4141
4144
4142 hg import incoming-patches.mbox
4145 hg import incoming-patches.mbox
4143
4146
4144 - import patches from stdin::
4147 - import patches from stdin::
4145
4148
4146 hg import -
4149 hg import -
4147
4150
4148 - attempt to exactly restore an exported changeset (not always
4151 - attempt to exactly restore an exported changeset (not always
4149 possible)::
4152 possible)::
4150
4153
4151 hg import --exact proposed-fix.patch
4154 hg import --exact proposed-fix.patch
4152
4155
4153 - use an external tool to apply a patch which is too fuzzy for
4156 - use an external tool to apply a patch which is too fuzzy for
4154 the default internal tool.
4157 the default internal tool.
4155
4158
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4159 hg import --config ui.patch="patch --merge" fuzzy.patch
4157
4160
4158 - change the default fuzzing from 2 to a less strict 7
4161 - change the default fuzzing from 2 to a less strict 7
4159
4162
4160 hg import --config ui.fuzz=7 fuzz.patch
4163 hg import --config ui.fuzz=7 fuzz.patch
4161
4164
4162 Returns 0 on success, 1 on partial success (see --partial).
4165 Returns 0 on success, 1 on partial success (see --partial).
4163 """
4166 """
4164
4167
4165 opts = pycompat.byteskwargs(opts)
4168 opts = pycompat.byteskwargs(opts)
4166 if not patch1:
4169 if not patch1:
4167 raise error.Abort(_(b'need at least one patch to import'))
4170 raise error.Abort(_(b'need at least one patch to import'))
4168
4171
4169 patches = (patch1,) + patches
4172 patches = (patch1,) + patches
4170
4173
4171 date = opts.get(b'date')
4174 date = opts.get(b'date')
4172 if date:
4175 if date:
4173 opts[b'date'] = dateutil.parsedate(date)
4176 opts[b'date'] = dateutil.parsedate(date)
4174
4177
4175 exact = opts.get(b'exact')
4178 exact = opts.get(b'exact')
4176 update = not opts.get(b'bypass')
4179 update = not opts.get(b'bypass')
4177 if not update and opts.get(b'no_commit'):
4180 if not update and opts.get(b'no_commit'):
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4181 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4182 if opts.get(b'secret') and opts.get(b'no_commit'):
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4183 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4181 try:
4184 try:
4182 sim = float(opts.get(b'similarity') or 0)
4185 sim = float(opts.get(b'similarity') or 0)
4183 except ValueError:
4186 except ValueError:
4184 raise error.Abort(_(b'similarity must be a number'))
4187 raise error.Abort(_(b'similarity must be a number'))
4185 if sim < 0 or sim > 100:
4188 if sim < 0 or sim > 100:
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4189 raise error.Abort(_(b'similarity must be between 0 and 100'))
4187 if sim and not update:
4190 if sim and not update:
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4191 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4189 if exact:
4192 if exact:
4190 if opts.get(b'edit'):
4193 if opts.get(b'edit'):
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4194 raise error.Abort(_(b'cannot use --exact with --edit'))
4192 if opts.get(b'prefix'):
4195 if opts.get(b'prefix'):
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4196 raise error.Abort(_(b'cannot use --exact with --prefix'))
4194
4197
4195 base = opts[b"base"]
4198 base = opts[b"base"]
4196 msgs = []
4199 msgs = []
4197 ret = 0
4200 ret = 0
4198
4201
4199 with repo.wlock():
4202 with repo.wlock():
4200 if update:
4203 if update:
4201 cmdutil.checkunfinished(repo)
4204 cmdutil.checkunfinished(repo)
4202 if exact or not opts.get(b'force'):
4205 if exact or not opts.get(b'force'):
4203 cmdutil.bailifchanged(repo)
4206 cmdutil.bailifchanged(repo)
4204
4207
4205 if not opts.get(b'no_commit'):
4208 if not opts.get(b'no_commit'):
4206 lock = repo.lock
4209 lock = repo.lock
4207 tr = lambda: repo.transaction(b'import')
4210 tr = lambda: repo.transaction(b'import')
4208 dsguard = util.nullcontextmanager
4211 dsguard = util.nullcontextmanager
4209 else:
4212 else:
4210 lock = util.nullcontextmanager
4213 lock = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4214 tr = util.nullcontextmanager
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4215 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4213 with lock(), tr(), dsguard():
4216 with lock(), tr(), dsguard():
4214 parents = repo[None].parents()
4217 parents = repo[None].parents()
4215 for patchurl in patches:
4218 for patchurl in patches:
4216 if patchurl == b'-':
4219 if patchurl == b'-':
4217 ui.status(_(b'applying patch from stdin\n'))
4220 ui.status(_(b'applying patch from stdin\n'))
4218 patchfile = ui.fin
4221 patchfile = ui.fin
4219 patchurl = b'stdin' # for error message
4222 patchurl = b'stdin' # for error message
4220 else:
4223 else:
4221 patchurl = os.path.join(base, patchurl)
4224 patchurl = os.path.join(base, patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4225 ui.status(_(b'applying %s\n') % patchurl)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4226 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4224
4227
4225 haspatch = False
4228 haspatch = False
4226 for hunk in patch.split(patchfile):
4229 for hunk in patch.split(patchfile):
4227 with patch.extract(ui, hunk) as patchdata:
4230 with patch.extract(ui, hunk) as patchdata:
4228 msg, node, rej = cmdutil.tryimportone(
4231 msg, node, rej = cmdutil.tryimportone(
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4232 ui, repo, patchdata, parents, opts, msgs, hg.clean
4230 )
4233 )
4231 if msg:
4234 if msg:
4232 haspatch = True
4235 haspatch = True
4233 ui.note(msg + b'\n')
4236 ui.note(msg + b'\n')
4234 if update or exact:
4237 if update or exact:
4235 parents = repo[None].parents()
4238 parents = repo[None].parents()
4236 else:
4239 else:
4237 parents = [repo[node]]
4240 parents = [repo[node]]
4238 if rej:
4241 if rej:
4239 ui.write_err(_(b"patch applied partially\n"))
4242 ui.write_err(_(b"patch applied partially\n"))
4240 ui.write_err(
4243 ui.write_err(
4241 _(
4244 _(
4242 b"(fix the .rej files and run "
4245 b"(fix the .rej files and run "
4243 b"`hg commit --amend`)\n"
4246 b"`hg commit --amend`)\n"
4244 )
4247 )
4245 )
4248 )
4246 ret = 1
4249 ret = 1
4247 break
4250 break
4248
4251
4249 if not haspatch:
4252 if not haspatch:
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4253 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4251
4254
4252 if msgs:
4255 if msgs:
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4256 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4254 return ret
4257 return ret
4255
4258
4256
4259
4257 @command(
4260 @command(
4258 b'incoming|in',
4261 b'incoming|in',
4259 [
4262 [
4260 (
4263 (
4261 b'f',
4264 b'f',
4262 b'force',
4265 b'force',
4263 None,
4266 None,
4264 _(b'run even if remote repository is unrelated'),
4267 _(b'run even if remote repository is unrelated'),
4265 ),
4268 ),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4269 (b'n', b'newest-first', None, _(b'show newest record first')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4270 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4268 (
4271 (
4269 b'r',
4272 b'r',
4270 b'rev',
4273 b'rev',
4271 [],
4274 [],
4272 _(b'a remote changeset intended to be added'),
4275 _(b'a remote changeset intended to be added'),
4273 _(b'REV'),
4276 _(b'REV'),
4274 ),
4277 ),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4278 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4276 (
4279 (
4277 b'b',
4280 b'b',
4278 b'branch',
4281 b'branch',
4279 [],
4282 [],
4280 _(b'a specific branch you would like to pull'),
4283 _(b'a specific branch you would like to pull'),
4281 _(b'BRANCH'),
4284 _(b'BRANCH'),
4282 ),
4285 ),
4283 ]
4286 ]
4284 + logopts
4287 + logopts
4285 + remoteopts
4288 + remoteopts
4286 + subrepoopts,
4289 + subrepoopts,
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4290 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4291 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4289 )
4292 )
4290 def incoming(ui, repo, source=b"default", **opts):
4293 def incoming(ui, repo, source=b"default", **opts):
4291 """show new changesets found in source
4294 """show new changesets found in source
4292
4295
4293 Show new changesets found in the specified path/URL or the default
4296 Show new changesets found in the specified path/URL or the default
4294 pull location. These are the changesets that would have been pulled
4297 pull location. These are the changesets that would have been pulled
4295 by :hg:`pull` at the time you issued this command.
4298 by :hg:`pull` at the time you issued this command.
4296
4299
4297 See pull for valid source format details.
4300 See pull for valid source format details.
4298
4301
4299 .. container:: verbose
4302 .. container:: verbose
4300
4303
4301 With -B/--bookmarks, the result of bookmark comparison between
4304 With -B/--bookmarks, the result of bookmark comparison between
4302 local and remote repositories is displayed. With -v/--verbose,
4305 local and remote repositories is displayed. With -v/--verbose,
4303 status is also displayed for each bookmark like below::
4306 status is also displayed for each bookmark like below::
4304
4307
4305 BM1 01234567890a added
4308 BM1 01234567890a added
4306 BM2 1234567890ab advanced
4309 BM2 1234567890ab advanced
4307 BM3 234567890abc diverged
4310 BM3 234567890abc diverged
4308 BM4 34567890abcd changed
4311 BM4 34567890abcd changed
4309
4312
4310 The action taken locally when pulling depends on the
4313 The action taken locally when pulling depends on the
4311 status of each bookmark:
4314 status of each bookmark:
4312
4315
4313 :``added``: pull will create it
4316 :``added``: pull will create it
4314 :``advanced``: pull will update it
4317 :``advanced``: pull will update it
4315 :``diverged``: pull will create a divergent bookmark
4318 :``diverged``: pull will create a divergent bookmark
4316 :``changed``: result depends on remote changesets
4319 :``changed``: result depends on remote changesets
4317
4320
4318 From the point of view of pulling behavior, bookmark
4321 From the point of view of pulling behavior, bookmark
4319 existing only in the remote repository are treated as ``added``,
4322 existing only in the remote repository are treated as ``added``,
4320 even if it is in fact locally deleted.
4323 even if it is in fact locally deleted.
4321
4324
4322 .. container:: verbose
4325 .. container:: verbose
4323
4326
4324 For remote repository, using --bundle avoids downloading the
4327 For remote repository, using --bundle avoids downloading the
4325 changesets twice if the incoming is followed by a pull.
4328 changesets twice if the incoming is followed by a pull.
4326
4329
4327 Examples:
4330 Examples:
4328
4331
4329 - show incoming changes with patches and full description::
4332 - show incoming changes with patches and full description::
4330
4333
4331 hg incoming -vp
4334 hg incoming -vp
4332
4335
4333 - show incoming changes excluding merges, store a bundle::
4336 - show incoming changes excluding merges, store a bundle::
4334
4337
4335 hg in -vpM --bundle incoming.hg
4338 hg in -vpM --bundle incoming.hg
4336 hg pull incoming.hg
4339 hg pull incoming.hg
4337
4340
4338 - briefly list changes inside a bundle::
4341 - briefly list changes inside a bundle::
4339
4342
4340 hg in changes.hg -T "{desc|firstline}\\n"
4343 hg in changes.hg -T "{desc|firstline}\\n"
4341
4344
4342 Returns 0 if there are incoming changes, 1 otherwise.
4345 Returns 0 if there are incoming changes, 1 otherwise.
4343 """
4346 """
4344 opts = pycompat.byteskwargs(opts)
4347 opts = pycompat.byteskwargs(opts)
4345 if opts.get(b'graph'):
4348 if opts.get(b'graph'):
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4349 logcmdutil.checkunsupportedgraphflags([], opts)
4347
4350
4348 def display(other, chlist, displayer):
4351 def display(other, chlist, displayer):
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4352 revdag = logcmdutil.graphrevs(other, chlist, opts)
4350 logcmdutil.displaygraph(
4353 logcmdutil.displaygraph(
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4354 ui, repo, revdag, displayer, graphmod.asciiedges
4352 )
4355 )
4353
4356
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4357 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4355 return 0
4358 return 0
4356
4359
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4360 if opts.get(b'bundle') and opts.get(b'subrepos'):
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4361 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4359
4362
4360 if opts.get(b'bookmarks'):
4363 if opts.get(b'bookmarks'):
4361 source, branches = hg.parseurl(
4364 source, branches = hg.parseurl(
4362 ui.expandpath(source), opts.get(b'branch')
4365 ui.expandpath(source), opts.get(b'branch')
4363 )
4366 )
4364 other = hg.peer(repo, opts, source)
4367 other = hg.peer(repo, opts, source)
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4368 if b'bookmarks' not in other.listkeys(b'namespaces'):
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4369 ui.warn(_(b"remote doesn't support bookmarks\n"))
4367 return 0
4370 return 0
4368 ui.pager(b'incoming')
4371 ui.pager(b'incoming')
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4372 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4370 return bookmarks.incoming(ui, repo, other)
4373 return bookmarks.incoming(ui, repo, other)
4371
4374
4372 repo._subtoppath = ui.expandpath(source)
4375 repo._subtoppath = ui.expandpath(source)
4373 try:
4376 try:
4374 return hg.incoming(ui, repo, source, opts)
4377 return hg.incoming(ui, repo, source, opts)
4375 finally:
4378 finally:
4376 del repo._subtoppath
4379 del repo._subtoppath
4377
4380
4378
4381
4379 @command(
4382 @command(
4380 b'init',
4383 b'init',
4381 remoteopts,
4384 remoteopts,
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4385 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4386 helpcategory=command.CATEGORY_REPO_CREATION,
4384 helpbasic=True,
4387 helpbasic=True,
4385 norepo=True,
4388 norepo=True,
4386 )
4389 )
4387 def init(ui, dest=b".", **opts):
4390 def init(ui, dest=b".", **opts):
4388 """create a new repository in the given directory
4391 """create a new repository in the given directory
4389
4392
4390 Initialize a new repository in the given directory. If the given
4393 Initialize a new repository in the given directory. If the given
4391 directory does not exist, it will be created.
4394 directory does not exist, it will be created.
4392
4395
4393 If no directory is given, the current directory is used.
4396 If no directory is given, the current directory is used.
4394
4397
4395 It is possible to specify an ``ssh://`` URL as the destination.
4398 It is possible to specify an ``ssh://`` URL as the destination.
4396 See :hg:`help urls` for more information.
4399 See :hg:`help urls` for more information.
4397
4400
4398 Returns 0 on success.
4401 Returns 0 on success.
4399 """
4402 """
4400 opts = pycompat.byteskwargs(opts)
4403 opts = pycompat.byteskwargs(opts)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4404 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4402
4405
4403
4406
4404 @command(
4407 @command(
4405 b'locate',
4408 b'locate',
4406 [
4409 [
4407 (
4410 (
4408 b'r',
4411 b'r',
4409 b'rev',
4412 b'rev',
4410 b'',
4413 b'',
4411 _(b'search the repository as it is in REV'),
4414 _(b'search the repository as it is in REV'),
4412 _(b'REV'),
4415 _(b'REV'),
4413 ),
4416 ),
4414 (
4417 (
4415 b'0',
4418 b'0',
4416 b'print0',
4419 b'print0',
4417 None,
4420 None,
4418 _(b'end filenames with NUL, for use with xargs'),
4421 _(b'end filenames with NUL, for use with xargs'),
4419 ),
4422 ),
4420 (
4423 (
4421 b'f',
4424 b'f',
4422 b'fullpath',
4425 b'fullpath',
4423 None,
4426 None,
4424 _(b'print complete paths from the filesystem root'),
4427 _(b'print complete paths from the filesystem root'),
4425 ),
4428 ),
4426 ]
4429 ]
4427 + walkopts,
4430 + walkopts,
4428 _(b'[OPTION]... [PATTERN]...'),
4431 _(b'[OPTION]... [PATTERN]...'),
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4432 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4430 )
4433 )
4431 def locate(ui, repo, *pats, **opts):
4434 def locate(ui, repo, *pats, **opts):
4432 """locate files matching specific patterns (DEPRECATED)
4435 """locate files matching specific patterns (DEPRECATED)
4433
4436
4434 Print files under Mercurial control in the working directory whose
4437 Print files under Mercurial control in the working directory whose
4435 names match the given patterns.
4438 names match the given patterns.
4436
4439
4437 By default, this command searches all directories in the working
4440 By default, this command searches all directories in the working
4438 directory. To search just the current directory and its
4441 directory. To search just the current directory and its
4439 subdirectories, use "--include .".
4442 subdirectories, use "--include .".
4440
4443
4441 If no patterns are given to match, this command prints the names
4444 If no patterns are given to match, this command prints the names
4442 of all files under Mercurial control in the working directory.
4445 of all files under Mercurial control in the working directory.
4443
4446
4444 If you want to feed the output of this command into the "xargs"
4447 If you want to feed the output of this command into the "xargs"
4445 command, use the -0 option to both this command and "xargs". This
4448 command, use the -0 option to both this command and "xargs". This
4446 will avoid the problem of "xargs" treating single filenames that
4449 will avoid the problem of "xargs" treating single filenames that
4447 contain whitespace as multiple filenames.
4450 contain whitespace as multiple filenames.
4448
4451
4449 See :hg:`help files` for a more versatile command.
4452 See :hg:`help files` for a more versatile command.
4450
4453
4451 Returns 0 if a match is found, 1 otherwise.
4454 Returns 0 if a match is found, 1 otherwise.
4452 """
4455 """
4453 opts = pycompat.byteskwargs(opts)
4456 opts = pycompat.byteskwargs(opts)
4454 if opts.get(b'print0'):
4457 if opts.get(b'print0'):
4455 end = b'\0'
4458 end = b'\0'
4456 else:
4459 else:
4457 end = b'\n'
4460 end = b'\n'
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4461 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4459
4462
4460 ret = 1
4463 ret = 1
4461 m = scmutil.match(
4464 m = scmutil.match(
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4465 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4463 )
4466 )
4464
4467
4465 ui.pager(b'locate')
4468 ui.pager(b'locate')
4466 if ctx.rev() is None:
4469 if ctx.rev() is None:
4467 # When run on the working copy, "locate" includes removed files, so
4470 # When run on the working copy, "locate" includes removed files, so
4468 # we get the list of files from the dirstate.
4471 # we get the list of files from the dirstate.
4469 filesgen = sorted(repo.dirstate.matches(m))
4472 filesgen = sorted(repo.dirstate.matches(m))
4470 else:
4473 else:
4471 filesgen = ctx.matches(m)
4474 filesgen = ctx.matches(m)
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4475 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4473 for abs in filesgen:
4476 for abs in filesgen:
4474 if opts.get(b'fullpath'):
4477 if opts.get(b'fullpath'):
4475 ui.write(repo.wjoin(abs), end)
4478 ui.write(repo.wjoin(abs), end)
4476 else:
4479 else:
4477 ui.write(uipathfn(abs), end)
4480 ui.write(uipathfn(abs), end)
4478 ret = 0
4481 ret = 0
4479
4482
4480 return ret
4483 return ret
4481
4484
4482
4485
4483 @command(
4486 @command(
4484 b'log|history',
4487 b'log|history',
4485 [
4488 [
4486 (
4489 (
4487 b'f',
4490 b'f',
4488 b'follow',
4491 b'follow',
4489 None,
4492 None,
4490 _(
4493 _(
4491 b'follow changeset history, or file history across copies and renames'
4494 b'follow changeset history, or file history across copies and renames'
4492 ),
4495 ),
4493 ),
4496 ),
4494 (
4497 (
4495 b'',
4498 b'',
4496 b'follow-first',
4499 b'follow-first',
4497 None,
4500 None,
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4501 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4499 ),
4502 ),
4500 (
4503 (
4501 b'd',
4504 b'd',
4502 b'date',
4505 b'date',
4503 b'',
4506 b'',
4504 _(b'show revisions matching date spec'),
4507 _(b'show revisions matching date spec'),
4505 _(b'DATE'),
4508 _(b'DATE'),
4506 ),
4509 ),
4507 (b'C', b'copies', None, _(b'show copied files')),
4510 (b'C', b'copies', None, _(b'show copied files')),
4508 (
4511 (
4509 b'k',
4512 b'k',
4510 b'keyword',
4513 b'keyword',
4511 [],
4514 [],
4512 _(b'do case-insensitive search for a given text'),
4515 _(b'do case-insensitive search for a given text'),
4513 _(b'TEXT'),
4516 _(b'TEXT'),
4514 ),
4517 ),
4515 (
4518 (
4516 b'r',
4519 b'r',
4517 b'rev',
4520 b'rev',
4518 [],
4521 [],
4519 _(b'show the specified revision or revset'),
4522 _(b'show the specified revision or revset'),
4520 _(b'REV'),
4523 _(b'REV'),
4521 ),
4524 ),
4522 (
4525 (
4523 b'L',
4526 b'L',
4524 b'line-range',
4527 b'line-range',
4525 [],
4528 [],
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4529 _(b'follow line range of specified file (EXPERIMENTAL)'),
4527 _(b'FILE,RANGE'),
4530 _(b'FILE,RANGE'),
4528 ),
4531 ),
4529 (
4532 (
4530 b'',
4533 b'',
4531 b'removed',
4534 b'removed',
4532 None,
4535 None,
4533 _(b'include revisions where files were removed'),
4536 _(b'include revisions where files were removed'),
4534 ),
4537 ),
4535 (
4538 (
4536 b'm',
4539 b'm',
4537 b'only-merges',
4540 b'only-merges',
4538 None,
4541 None,
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4542 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4540 ),
4543 ),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4544 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4542 (
4545 (
4543 b'',
4546 b'',
4544 b'only-branch',
4547 b'only-branch',
4545 [],
4548 [],
4546 _(
4549 _(
4547 b'show only changesets within the given named branch (DEPRECATED)'
4550 b'show only changesets within the given named branch (DEPRECATED)'
4548 ),
4551 ),
4549 _(b'BRANCH'),
4552 _(b'BRANCH'),
4550 ),
4553 ),
4551 (
4554 (
4552 b'b',
4555 b'b',
4553 b'branch',
4556 b'branch',
4554 [],
4557 [],
4555 _(b'show changesets within the given named branch'),
4558 _(b'show changesets within the given named branch'),
4556 _(b'BRANCH'),
4559 _(b'BRANCH'),
4557 ),
4560 ),
4558 (
4561 (
4559 b'P',
4562 b'P',
4560 b'prune',
4563 b'prune',
4561 [],
4564 [],
4562 _(b'do not display revision or any of its ancestors'),
4565 _(b'do not display revision or any of its ancestors'),
4563 _(b'REV'),
4566 _(b'REV'),
4564 ),
4567 ),
4565 ]
4568 ]
4566 + logopts
4569 + logopts
4567 + walkopts,
4570 + walkopts,
4568 _(b'[OPTION]... [FILE]'),
4571 _(b'[OPTION]... [FILE]'),
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4572 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4570 helpbasic=True,
4573 helpbasic=True,
4571 inferrepo=True,
4574 inferrepo=True,
4572 intents={INTENT_READONLY},
4575 intents={INTENT_READONLY},
4573 )
4576 )
4574 def log(ui, repo, *pats, **opts):
4577 def log(ui, repo, *pats, **opts):
4575 """show revision history of entire repository or files
4578 """show revision history of entire repository or files
4576
4579
4577 Print the revision history of the specified files or the entire
4580 Print the revision history of the specified files or the entire
4578 project.
4581 project.
4579
4582
4580 If no revision range is specified, the default is ``tip:0`` unless
4583 If no revision range is specified, the default is ``tip:0`` unless
4581 --follow is set, in which case the working directory parent is
4584 --follow is set, in which case the working directory parent is
4582 used as the starting revision.
4585 used as the starting revision.
4583
4586
4584 File history is shown without following rename or copy history of
4587 File history is shown without following rename or copy history of
4585 files. Use -f/--follow with a filename to follow history across
4588 files. Use -f/--follow with a filename to follow history across
4586 renames and copies. --follow without a filename will only show
4589 renames and copies. --follow without a filename will only show
4587 ancestors of the starting revision.
4590 ancestors of the starting revision.
4588
4591
4589 By default this command prints revision number and changeset id,
4592 By default this command prints revision number and changeset id,
4590 tags, non-trivial parents, user, date and time, and a summary for
4593 tags, non-trivial parents, user, date and time, and a summary for
4591 each commit. When the -v/--verbose switch is used, the list of
4594 each commit. When the -v/--verbose switch is used, the list of
4592 changed files and full commit message are shown.
4595 changed files and full commit message are shown.
4593
4596
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4597 With --graph the revisions are shown as an ASCII art DAG with the most
4595 recent changeset at the top.
4598 recent changeset at the top.
4596 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4599 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4597 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4600 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4598 changeset from the lines below is a parent of the 'o' merge on the same
4601 changeset from the lines below is a parent of the 'o' merge on the same
4599 line.
4602 line.
4600 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4603 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4601 of a '|' indicates one or more revisions in a path are omitted.
4604 of a '|' indicates one or more revisions in a path are omitted.
4602
4605
4603 .. container:: verbose
4606 .. container:: verbose
4604
4607
4605 Use -L/--line-range FILE,M:N options to follow the history of lines
4608 Use -L/--line-range FILE,M:N options to follow the history of lines
4606 from M to N in FILE. With -p/--patch only diff hunks affecting
4609 from M to N in FILE. With -p/--patch only diff hunks affecting
4607 specified line range will be shown. This option requires --follow;
4610 specified line range will be shown. This option requires --follow;
4608 it can be specified multiple times. Currently, this option is not
4611 it can be specified multiple times. Currently, this option is not
4609 compatible with --graph. This option is experimental.
4612 compatible with --graph. This option is experimental.
4610
4613
4611 .. note::
4614 .. note::
4612
4615
4613 :hg:`log --patch` may generate unexpected diff output for merge
4616 :hg:`log --patch` may generate unexpected diff output for merge
4614 changesets, as it will only compare the merge changeset against
4617 changesets, as it will only compare the merge changeset against
4615 its first parent. Also, only files different from BOTH parents
4618 its first parent. Also, only files different from BOTH parents
4616 will appear in files:.
4619 will appear in files:.
4617
4620
4618 .. note::
4621 .. note::
4619
4622
4620 For performance reasons, :hg:`log FILE` may omit duplicate changes
4623 For performance reasons, :hg:`log FILE` may omit duplicate changes
4621 made on branches and will not show removals or mode changes. To
4624 made on branches and will not show removals or mode changes. To
4622 see all such changes, use the --removed switch.
4625 see all such changes, use the --removed switch.
4623
4626
4624 .. container:: verbose
4627 .. container:: verbose
4625
4628
4626 .. note::
4629 .. note::
4627
4630
4628 The history resulting from -L/--line-range options depends on diff
4631 The history resulting from -L/--line-range options depends on diff
4629 options; for instance if white-spaces are ignored, respective changes
4632 options; for instance if white-spaces are ignored, respective changes
4630 with only white-spaces in specified line range will not be listed.
4633 with only white-spaces in specified line range will not be listed.
4631
4634
4632 .. container:: verbose
4635 .. container:: verbose
4633
4636
4634 Some examples:
4637 Some examples:
4635
4638
4636 - changesets with full descriptions and file lists::
4639 - changesets with full descriptions and file lists::
4637
4640
4638 hg log -v
4641 hg log -v
4639
4642
4640 - changesets ancestral to the working directory::
4643 - changesets ancestral to the working directory::
4641
4644
4642 hg log -f
4645 hg log -f
4643
4646
4644 - last 10 commits on the current branch::
4647 - last 10 commits on the current branch::
4645
4648
4646 hg log -l 10 -b .
4649 hg log -l 10 -b .
4647
4650
4648 - changesets showing all modifications of a file, including removals::
4651 - changesets showing all modifications of a file, including removals::
4649
4652
4650 hg log --removed file.c
4653 hg log --removed file.c
4651
4654
4652 - all changesets that touch a directory, with diffs, excluding merges::
4655 - all changesets that touch a directory, with diffs, excluding merges::
4653
4656
4654 hg log -Mp lib/
4657 hg log -Mp lib/
4655
4658
4656 - all revision numbers that match a keyword::
4659 - all revision numbers that match a keyword::
4657
4660
4658 hg log -k bug --template "{rev}\\n"
4661 hg log -k bug --template "{rev}\\n"
4659
4662
4660 - the full hash identifier of the working directory parent::
4663 - the full hash identifier of the working directory parent::
4661
4664
4662 hg log -r . --template "{node}\\n"
4665 hg log -r . --template "{node}\\n"
4663
4666
4664 - list available log templates::
4667 - list available log templates::
4665
4668
4666 hg log -T list
4669 hg log -T list
4667
4670
4668 - check if a given changeset is included in a tagged release::
4671 - check if a given changeset is included in a tagged release::
4669
4672
4670 hg log -r "a21ccf and ancestor(1.9)"
4673 hg log -r "a21ccf and ancestor(1.9)"
4671
4674
4672 - find all changesets by some user in a date range::
4675 - find all changesets by some user in a date range::
4673
4676
4674 hg log -k alice -d "may 2008 to jul 2008"
4677 hg log -k alice -d "may 2008 to jul 2008"
4675
4678
4676 - summary of all changesets after the last tag::
4679 - summary of all changesets after the last tag::
4677
4680
4678 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4681 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4679
4682
4680 - changesets touching lines 13 to 23 for file.c::
4683 - changesets touching lines 13 to 23 for file.c::
4681
4684
4682 hg log -L file.c,13:23
4685 hg log -L file.c,13:23
4683
4686
4684 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4687 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4685 main.c with patch::
4688 main.c with patch::
4686
4689
4687 hg log -L file.c,13:23 -L main.c,2:6 -p
4690 hg log -L file.c,13:23 -L main.c,2:6 -p
4688
4691
4689 See :hg:`help dates` for a list of formats valid for -d/--date.
4692 See :hg:`help dates` for a list of formats valid for -d/--date.
4690
4693
4691 See :hg:`help revisions` for more about specifying and ordering
4694 See :hg:`help revisions` for more about specifying and ordering
4692 revisions.
4695 revisions.
4693
4696
4694 See :hg:`help templates` for more about pre-packaged styles and
4697 See :hg:`help templates` for more about pre-packaged styles and
4695 specifying custom templates. The default template used by the log
4698 specifying custom templates. The default template used by the log
4696 command can be customized via the ``ui.logtemplate`` configuration
4699 command can be customized via the ``ui.logtemplate`` configuration
4697 setting.
4700 setting.
4698
4701
4699 Returns 0 on success.
4702 Returns 0 on success.
4700
4703
4701 """
4704 """
4702 opts = pycompat.byteskwargs(opts)
4705 opts = pycompat.byteskwargs(opts)
4703 linerange = opts.get(b'line_range')
4706 linerange = opts.get(b'line_range')
4704
4707
4705 if linerange and not opts.get(b'follow'):
4708 if linerange and not opts.get(b'follow'):
4706 raise error.Abort(_(b'--line-range requires --follow'))
4709 raise error.Abort(_(b'--line-range requires --follow'))
4707
4710
4708 if linerange and pats:
4711 if linerange and pats:
4709 # TODO: take pats as patterns with no line-range filter
4712 # TODO: take pats as patterns with no line-range filter
4710 raise error.Abort(
4713 raise error.Abort(
4711 _(b'FILE arguments are not compatible with --line-range option')
4714 _(b'FILE arguments are not compatible with --line-range option')
4712 )
4715 )
4713
4716
4714 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4717 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4715 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4718 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4716 if linerange:
4719 if linerange:
4717 # TODO: should follow file history from logcmdutil._initialrevs(),
4720 # TODO: should follow file history from logcmdutil._initialrevs(),
4718 # then filter the result by logcmdutil._makerevset() and --limit
4721 # then filter the result by logcmdutil._makerevset() and --limit
4719 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4722 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4720
4723
4721 getcopies = None
4724 getcopies = None
4722 if opts.get(b'copies'):
4725 if opts.get(b'copies'):
4723 endrev = None
4726 endrev = None
4724 if revs:
4727 if revs:
4725 endrev = revs.max() + 1
4728 endrev = revs.max() + 1
4726 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4729 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4727
4730
4728 ui.pager(b'log')
4731 ui.pager(b'log')
4729 displayer = logcmdutil.changesetdisplayer(
4732 displayer = logcmdutil.changesetdisplayer(
4730 ui, repo, opts, differ, buffered=True
4733 ui, repo, opts, differ, buffered=True
4731 )
4734 )
4732 if opts.get(b'graph'):
4735 if opts.get(b'graph'):
4733 displayfn = logcmdutil.displaygraphrevs
4736 displayfn = logcmdutil.displaygraphrevs
4734 else:
4737 else:
4735 displayfn = logcmdutil.displayrevs
4738 displayfn = logcmdutil.displayrevs
4736 displayfn(ui, repo, revs, displayer, getcopies)
4739 displayfn(ui, repo, revs, displayer, getcopies)
4737
4740
4738
4741
4739 @command(
4742 @command(
4740 b'manifest',
4743 b'manifest',
4741 [
4744 [
4742 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4745 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4743 (b'', b'all', False, _(b"list files from all revisions")),
4746 (b'', b'all', False, _(b"list files from all revisions")),
4744 ]
4747 ]
4745 + formatteropts,
4748 + formatteropts,
4746 _(b'[-r REV]'),
4749 _(b'[-r REV]'),
4747 helpcategory=command.CATEGORY_MAINTENANCE,
4750 helpcategory=command.CATEGORY_MAINTENANCE,
4748 intents={INTENT_READONLY},
4751 intents={INTENT_READONLY},
4749 )
4752 )
4750 def manifest(ui, repo, node=None, rev=None, **opts):
4753 def manifest(ui, repo, node=None, rev=None, **opts):
4751 """output the current or given revision of the project manifest
4754 """output the current or given revision of the project manifest
4752
4755
4753 Print a list of version controlled files for the given revision.
4756 Print a list of version controlled files for the given revision.
4754 If no revision is given, the first parent of the working directory
4757 If no revision is given, the first parent of the working directory
4755 is used, or the null revision if no revision is checked out.
4758 is used, or the null revision if no revision is checked out.
4756
4759
4757 With -v, print file permissions, symlink and executable bits.
4760 With -v, print file permissions, symlink and executable bits.
4758 With --debug, print file revision hashes.
4761 With --debug, print file revision hashes.
4759
4762
4760 If option --all is specified, the list of all files from all revisions
4763 If option --all is specified, the list of all files from all revisions
4761 is printed. This includes deleted and renamed files.
4764 is printed. This includes deleted and renamed files.
4762
4765
4763 Returns 0 on success.
4766 Returns 0 on success.
4764 """
4767 """
4765 opts = pycompat.byteskwargs(opts)
4768 opts = pycompat.byteskwargs(opts)
4766 fm = ui.formatter(b'manifest', opts)
4769 fm = ui.formatter(b'manifest', opts)
4767
4770
4768 if opts.get(b'all'):
4771 if opts.get(b'all'):
4769 if rev or node:
4772 if rev or node:
4770 raise error.Abort(_(b"can't specify a revision with --all"))
4773 raise error.Abort(_(b"can't specify a revision with --all"))
4771
4774
4772 res = set()
4775 res = set()
4773 for rev in repo:
4776 for rev in repo:
4774 ctx = repo[rev]
4777 ctx = repo[rev]
4775 res |= set(ctx.files())
4778 res |= set(ctx.files())
4776
4779
4777 ui.pager(b'manifest')
4780 ui.pager(b'manifest')
4778 for f in sorted(res):
4781 for f in sorted(res):
4779 fm.startitem()
4782 fm.startitem()
4780 fm.write(b"path", b'%s\n', f)
4783 fm.write(b"path", b'%s\n', f)
4781 fm.end()
4784 fm.end()
4782 return
4785 return
4783
4786
4784 if rev and node:
4787 if rev and node:
4785 raise error.Abort(_(b"please specify just one revision"))
4788 raise error.Abort(_(b"please specify just one revision"))
4786
4789
4787 if not node:
4790 if not node:
4788 node = rev
4791 node = rev
4789
4792
4790 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4793 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4791 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4794 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4792 if node:
4795 if node:
4793 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4796 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4794 ctx = scmutil.revsingle(repo, node)
4797 ctx = scmutil.revsingle(repo, node)
4795 mf = ctx.manifest()
4798 mf = ctx.manifest()
4796 ui.pager(b'manifest')
4799 ui.pager(b'manifest')
4797 for f in ctx:
4800 for f in ctx:
4798 fm.startitem()
4801 fm.startitem()
4799 fm.context(ctx=ctx)
4802 fm.context(ctx=ctx)
4800 fl = ctx[f].flags()
4803 fl = ctx[f].flags()
4801 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4804 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4802 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4805 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4803 fm.write(b'path', b'%s\n', f)
4806 fm.write(b'path', b'%s\n', f)
4804 fm.end()
4807 fm.end()
4805
4808
4806
4809
4807 @command(
4810 @command(
4808 b'merge',
4811 b'merge',
4809 [
4812 [
4810 (
4813 (
4811 b'f',
4814 b'f',
4812 b'force',
4815 b'force',
4813 None,
4816 None,
4814 _(b'force a merge including outstanding changes (DEPRECATED)'),
4817 _(b'force a merge including outstanding changes (DEPRECATED)'),
4815 ),
4818 ),
4816 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4819 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4817 (
4820 (
4818 b'P',
4821 b'P',
4819 b'preview',
4822 b'preview',
4820 None,
4823 None,
4821 _(b'review revisions to merge (no merge is performed)'),
4824 _(b'review revisions to merge (no merge is performed)'),
4822 ),
4825 ),
4823 (b'', b'abort', None, _(b'abort the ongoing merge')),
4826 (b'', b'abort', None, _(b'abort the ongoing merge')),
4824 ]
4827 ]
4825 + mergetoolopts,
4828 + mergetoolopts,
4826 _(b'[-P] [[-r] REV]'),
4829 _(b'[-P] [[-r] REV]'),
4827 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4830 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4828 helpbasic=True,
4831 helpbasic=True,
4829 )
4832 )
4830 def merge(ui, repo, node=None, **opts):
4833 def merge(ui, repo, node=None, **opts):
4831 """merge another revision into working directory
4834 """merge another revision into working directory
4832
4835
4833 The current working directory is updated with all changes made in
4836 The current working directory is updated with all changes made in
4834 the requested revision since the last common predecessor revision.
4837 the requested revision since the last common predecessor revision.
4835
4838
4836 Files that changed between either parent are marked as changed for
4839 Files that changed between either parent are marked as changed for
4837 the next commit and a commit must be performed before any further
4840 the next commit and a commit must be performed before any further
4838 updates to the repository are allowed. The next commit will have
4841 updates to the repository are allowed. The next commit will have
4839 two parents.
4842 two parents.
4840
4843
4841 ``--tool`` can be used to specify the merge tool used for file
4844 ``--tool`` can be used to specify the merge tool used for file
4842 merges. It overrides the HGMERGE environment variable and your
4845 merges. It overrides the HGMERGE environment variable and your
4843 configuration files. See :hg:`help merge-tools` for options.
4846 configuration files. See :hg:`help merge-tools` for options.
4844
4847
4845 If no revision is specified, the working directory's parent is a
4848 If no revision is specified, the working directory's parent is a
4846 head revision, and the current branch contains exactly one other
4849 head revision, and the current branch contains exactly one other
4847 head, the other head is merged with by default. Otherwise, an
4850 head, the other head is merged with by default. Otherwise, an
4848 explicit revision with which to merge must be provided.
4851 explicit revision with which to merge must be provided.
4849
4852
4850 See :hg:`help resolve` for information on handling file conflicts.
4853 See :hg:`help resolve` for information on handling file conflicts.
4851
4854
4852 To undo an uncommitted merge, use :hg:`merge --abort` which
4855 To undo an uncommitted merge, use :hg:`merge --abort` which
4853 will check out a clean copy of the original merge parent, losing
4856 will check out a clean copy of the original merge parent, losing
4854 all changes.
4857 all changes.
4855
4858
4856 Returns 0 on success, 1 if there are unresolved files.
4859 Returns 0 on success, 1 if there are unresolved files.
4857 """
4860 """
4858
4861
4859 opts = pycompat.byteskwargs(opts)
4862 opts = pycompat.byteskwargs(opts)
4860 abort = opts.get(b'abort')
4863 abort = opts.get(b'abort')
4861 if abort and repo.dirstate.p2() == nullid:
4864 if abort and repo.dirstate.p2() == nullid:
4862 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4865 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4863 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4866 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4864 if abort:
4867 if abort:
4865 state = cmdutil.getunfinishedstate(repo)
4868 state = cmdutil.getunfinishedstate(repo)
4866 if state and state._opname != b'merge':
4869 if state and state._opname != b'merge':
4867 raise error.Abort(
4870 raise error.Abort(
4868 _(b'cannot abort merge with %s in progress') % (state._opname),
4871 _(b'cannot abort merge with %s in progress') % (state._opname),
4869 hint=state.hint(),
4872 hint=state.hint(),
4870 )
4873 )
4871 if node:
4874 if node:
4872 raise error.Abort(_(b"cannot specify a node with --abort"))
4875 raise error.Abort(_(b"cannot specify a node with --abort"))
4873 return hg.abortmerge(repo.ui, repo)
4876 return hg.abortmerge(repo.ui, repo)
4874
4877
4875 if opts.get(b'rev') and node:
4878 if opts.get(b'rev') and node:
4876 raise error.Abort(_(b"please specify just one revision"))
4879 raise error.Abort(_(b"please specify just one revision"))
4877 if not node:
4880 if not node:
4878 node = opts.get(b'rev')
4881 node = opts.get(b'rev')
4879
4882
4880 if node:
4883 if node:
4881 ctx = scmutil.revsingle(repo, node)
4884 ctx = scmutil.revsingle(repo, node)
4882 else:
4885 else:
4883 if ui.configbool(b'commands', b'merge.require-rev'):
4886 if ui.configbool(b'commands', b'merge.require-rev'):
4884 raise error.Abort(
4887 raise error.Abort(
4885 _(
4888 _(
4886 b'configuration requires specifying revision to merge '
4889 b'configuration requires specifying revision to merge '
4887 b'with'
4890 b'with'
4888 )
4891 )
4889 )
4892 )
4890 ctx = repo[destutil.destmerge(repo)]
4893 ctx = repo[destutil.destmerge(repo)]
4891
4894
4892 if ctx.node() is None:
4895 if ctx.node() is None:
4893 raise error.Abort(_(b'merging with the working copy has no effect'))
4896 raise error.Abort(_(b'merging with the working copy has no effect'))
4894
4897
4895 if opts.get(b'preview'):
4898 if opts.get(b'preview'):
4896 # find nodes that are ancestors of p2 but not of p1
4899 # find nodes that are ancestors of p2 but not of p1
4897 p1 = repo[b'.'].node()
4900 p1 = repo[b'.'].node()
4898 p2 = ctx.node()
4901 p2 = ctx.node()
4899 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4902 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4900
4903
4901 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4904 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4902 for node in nodes:
4905 for node in nodes:
4903 displayer.show(repo[node])
4906 displayer.show(repo[node])
4904 displayer.close()
4907 displayer.close()
4905 return 0
4908 return 0
4906
4909
4907 # ui.forcemerge is an internal variable, do not document
4910 # ui.forcemerge is an internal variable, do not document
4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4911 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4909 with ui.configoverride(overrides, b'merge'):
4912 with ui.configoverride(overrides, b'merge'):
4910 force = opts.get(b'force')
4913 force = opts.get(b'force')
4911 labels = [b'working copy', b'merge rev']
4914 labels = [b'working copy', b'merge rev']
4912 return hg.merge(ctx, force=force, labels=labels)
4915 return hg.merge(ctx, force=force, labels=labels)
4913
4916
4914
4917
4915 statemod.addunfinished(
4918 statemod.addunfinished(
4916 b'merge',
4919 b'merge',
4917 fname=None,
4920 fname=None,
4918 clearable=True,
4921 clearable=True,
4919 allowcommit=True,
4922 allowcommit=True,
4920 cmdmsg=_(b'outstanding uncommitted merge'),
4923 cmdmsg=_(b'outstanding uncommitted merge'),
4921 abortfunc=hg.abortmerge,
4924 abortfunc=hg.abortmerge,
4922 statushint=_(
4925 statushint=_(
4923 b'To continue: hg commit\nTo abort: hg merge --abort'
4926 b'To continue: hg commit\nTo abort: hg merge --abort'
4924 ),
4927 ),
4925 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4928 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4926 )
4929 )
4927
4930
4928
4931
4929 @command(
4932 @command(
4930 b'outgoing|out',
4933 b'outgoing|out',
4931 [
4934 [
4932 (
4935 (
4933 b'f',
4936 b'f',
4934 b'force',
4937 b'force',
4935 None,
4938 None,
4936 _(b'run even when the destination is unrelated'),
4939 _(b'run even when the destination is unrelated'),
4937 ),
4940 ),
4938 (
4941 (
4939 b'r',
4942 b'r',
4940 b'rev',
4943 b'rev',
4941 [],
4944 [],
4942 _(b'a changeset intended to be included in the destination'),
4945 _(b'a changeset intended to be included in the destination'),
4943 _(b'REV'),
4946 _(b'REV'),
4944 ),
4947 ),
4945 (b'n', b'newest-first', None, _(b'show newest record first')),
4948 (b'n', b'newest-first', None, _(b'show newest record first')),
4946 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4949 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4947 (
4950 (
4948 b'b',
4951 b'b',
4949 b'branch',
4952 b'branch',
4950 [],
4953 [],
4951 _(b'a specific branch you would like to push'),
4954 _(b'a specific branch you would like to push'),
4952 _(b'BRANCH'),
4955 _(b'BRANCH'),
4953 ),
4956 ),
4954 ]
4957 ]
4955 + logopts
4958 + logopts
4956 + remoteopts
4959 + remoteopts
4957 + subrepoopts,
4960 + subrepoopts,
4958 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4961 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4959 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4962 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4960 )
4963 )
4961 def outgoing(ui, repo, dest=None, **opts):
4964 def outgoing(ui, repo, dest=None, **opts):
4962 """show changesets not found in the destination
4965 """show changesets not found in the destination
4963
4966
4964 Show changesets not found in the specified destination repository
4967 Show changesets not found in the specified destination repository
4965 or the default push location. These are the changesets that would
4968 or the default push location. These are the changesets that would
4966 be pushed if a push was requested.
4969 be pushed if a push was requested.
4967
4970
4968 See pull for details of valid destination formats.
4971 See pull for details of valid destination formats.
4969
4972
4970 .. container:: verbose
4973 .. container:: verbose
4971
4974
4972 With -B/--bookmarks, the result of bookmark comparison between
4975 With -B/--bookmarks, the result of bookmark comparison between
4973 local and remote repositories is displayed. With -v/--verbose,
4976 local and remote repositories is displayed. With -v/--verbose,
4974 status is also displayed for each bookmark like below::
4977 status is also displayed for each bookmark like below::
4975
4978
4976 BM1 01234567890a added
4979 BM1 01234567890a added
4977 BM2 deleted
4980 BM2 deleted
4978 BM3 234567890abc advanced
4981 BM3 234567890abc advanced
4979 BM4 34567890abcd diverged
4982 BM4 34567890abcd diverged
4980 BM5 4567890abcde changed
4983 BM5 4567890abcde changed
4981
4984
4982 The action taken when pushing depends on the
4985 The action taken when pushing depends on the
4983 status of each bookmark:
4986 status of each bookmark:
4984
4987
4985 :``added``: push with ``-B`` will create it
4988 :``added``: push with ``-B`` will create it
4986 :``deleted``: push with ``-B`` will delete it
4989 :``deleted``: push with ``-B`` will delete it
4987 :``advanced``: push will update it
4990 :``advanced``: push will update it
4988 :``diverged``: push with ``-B`` will update it
4991 :``diverged``: push with ``-B`` will update it
4989 :``changed``: push with ``-B`` will update it
4992 :``changed``: push with ``-B`` will update it
4990
4993
4991 From the point of view of pushing behavior, bookmarks
4994 From the point of view of pushing behavior, bookmarks
4992 existing only in the remote repository are treated as
4995 existing only in the remote repository are treated as
4993 ``deleted``, even if it is in fact added remotely.
4996 ``deleted``, even if it is in fact added remotely.
4994
4997
4995 Returns 0 if there are outgoing changes, 1 otherwise.
4998 Returns 0 if there are outgoing changes, 1 otherwise.
4996 """
4999 """
4997 # hg._outgoing() needs to re-resolve the path in order to handle #branch
5000 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4998 # style URLs, so don't overwrite dest.
5001 # style URLs, so don't overwrite dest.
4999 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5002 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5000 if not path:
5003 if not path:
5001 raise error.Abort(
5004 raise error.Abort(
5002 _(b'default repository not configured!'),
5005 _(b'default repository not configured!'),
5003 hint=_(b"see 'hg help config.paths'"),
5006 hint=_(b"see 'hg help config.paths'"),
5004 )
5007 )
5005
5008
5006 opts = pycompat.byteskwargs(opts)
5009 opts = pycompat.byteskwargs(opts)
5007 if opts.get(b'graph'):
5010 if opts.get(b'graph'):
5008 logcmdutil.checkunsupportedgraphflags([], opts)
5011 logcmdutil.checkunsupportedgraphflags([], opts)
5009 o, other = hg._outgoing(ui, repo, dest, opts)
5012 o, other = hg._outgoing(ui, repo, dest, opts)
5010 if not o:
5013 if not o:
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5014 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 return
5015 return
5013
5016
5014 revdag = logcmdutil.graphrevs(repo, o, opts)
5017 revdag = logcmdutil.graphrevs(repo, o, opts)
5015 ui.pager(b'outgoing')
5018 ui.pager(b'outgoing')
5016 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5019 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5017 logcmdutil.displaygraph(
5020 logcmdutil.displaygraph(
5018 ui, repo, revdag, displayer, graphmod.asciiedges
5021 ui, repo, revdag, displayer, graphmod.asciiedges
5019 )
5022 )
5020 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5023 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5021 return 0
5024 return 0
5022
5025
5023 if opts.get(b'bookmarks'):
5026 if opts.get(b'bookmarks'):
5024 dest = path.pushloc or path.loc
5027 dest = path.pushloc or path.loc
5025 other = hg.peer(repo, opts, dest)
5028 other = hg.peer(repo, opts, dest)
5026 if b'bookmarks' not in other.listkeys(b'namespaces'):
5029 if b'bookmarks' not in other.listkeys(b'namespaces'):
5027 ui.warn(_(b"remote doesn't support bookmarks\n"))
5030 ui.warn(_(b"remote doesn't support bookmarks\n"))
5028 return 0
5031 return 0
5029 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5032 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5030 ui.pager(b'outgoing')
5033 ui.pager(b'outgoing')
5031 return bookmarks.outgoing(ui, repo, other)
5034 return bookmarks.outgoing(ui, repo, other)
5032
5035
5033 repo._subtoppath = path.pushloc or path.loc
5036 repo._subtoppath = path.pushloc or path.loc
5034 try:
5037 try:
5035 return hg.outgoing(ui, repo, dest, opts)
5038 return hg.outgoing(ui, repo, dest, opts)
5036 finally:
5039 finally:
5037 del repo._subtoppath
5040 del repo._subtoppath
5038
5041
5039
5042
5040 @command(
5043 @command(
5041 b'parents',
5044 b'parents',
5042 [
5045 [
5043 (
5046 (
5044 b'r',
5047 b'r',
5045 b'rev',
5048 b'rev',
5046 b'',
5049 b'',
5047 _(b'show parents of the specified revision'),
5050 _(b'show parents of the specified revision'),
5048 _(b'REV'),
5051 _(b'REV'),
5049 ),
5052 ),
5050 ]
5053 ]
5051 + templateopts,
5054 + templateopts,
5052 _(b'[-r REV] [FILE]'),
5055 _(b'[-r REV] [FILE]'),
5053 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5056 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5054 inferrepo=True,
5057 inferrepo=True,
5055 )
5058 )
5056 def parents(ui, repo, file_=None, **opts):
5059 def parents(ui, repo, file_=None, **opts):
5057 """show the parents of the working directory or revision (DEPRECATED)
5060 """show the parents of the working directory or revision (DEPRECATED)
5058
5061
5059 Print the working directory's parent revisions. If a revision is
5062 Print the working directory's parent revisions. If a revision is
5060 given via -r/--rev, the parent of that revision will be printed.
5063 given via -r/--rev, the parent of that revision will be printed.
5061 If a file argument is given, the revision in which the file was
5064 If a file argument is given, the revision in which the file was
5062 last changed (before the working directory revision or the
5065 last changed (before the working directory revision or the
5063 argument to --rev if given) is printed.
5066 argument to --rev if given) is printed.
5064
5067
5065 This command is equivalent to::
5068 This command is equivalent to::
5066
5069
5067 hg log -r "p1()+p2()" or
5070 hg log -r "p1()+p2()" or
5068 hg log -r "p1(REV)+p2(REV)" or
5071 hg log -r "p1(REV)+p2(REV)" or
5069 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5072 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5070 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5073 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5071
5074
5072 See :hg:`summary` and :hg:`help revsets` for related information.
5075 See :hg:`summary` and :hg:`help revsets` for related information.
5073
5076
5074 Returns 0 on success.
5077 Returns 0 on success.
5075 """
5078 """
5076
5079
5077 opts = pycompat.byteskwargs(opts)
5080 opts = pycompat.byteskwargs(opts)
5078 rev = opts.get(b'rev')
5081 rev = opts.get(b'rev')
5079 if rev:
5082 if rev:
5080 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5083 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5081 ctx = scmutil.revsingle(repo, rev, None)
5084 ctx = scmutil.revsingle(repo, rev, None)
5082
5085
5083 if file_:
5086 if file_:
5084 m = scmutil.match(ctx, (file_,), opts)
5087 m = scmutil.match(ctx, (file_,), opts)
5085 if m.anypats() or len(m.files()) != 1:
5088 if m.anypats() or len(m.files()) != 1:
5086 raise error.Abort(_(b'can only specify an explicit filename'))
5089 raise error.Abort(_(b'can only specify an explicit filename'))
5087 file_ = m.files()[0]
5090 file_ = m.files()[0]
5088 filenodes = []
5091 filenodes = []
5089 for cp in ctx.parents():
5092 for cp in ctx.parents():
5090 if not cp:
5093 if not cp:
5091 continue
5094 continue
5092 try:
5095 try:
5093 filenodes.append(cp.filenode(file_))
5096 filenodes.append(cp.filenode(file_))
5094 except error.LookupError:
5097 except error.LookupError:
5095 pass
5098 pass
5096 if not filenodes:
5099 if not filenodes:
5097 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5100 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5098 p = []
5101 p = []
5099 for fn in filenodes:
5102 for fn in filenodes:
5100 fctx = repo.filectx(file_, fileid=fn)
5103 fctx = repo.filectx(file_, fileid=fn)
5101 p.append(fctx.node())
5104 p.append(fctx.node())
5102 else:
5105 else:
5103 p = [cp.node() for cp in ctx.parents()]
5106 p = [cp.node() for cp in ctx.parents()]
5104
5107
5105 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5108 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5106 for n in p:
5109 for n in p:
5107 if n != nullid:
5110 if n != nullid:
5108 displayer.show(repo[n])
5111 displayer.show(repo[n])
5109 displayer.close()
5112 displayer.close()
5110
5113
5111
5114
5112 @command(
5115 @command(
5113 b'paths',
5116 b'paths',
5114 formatteropts,
5117 formatteropts,
5115 _(b'[NAME]'),
5118 _(b'[NAME]'),
5116 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5119 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5117 optionalrepo=True,
5120 optionalrepo=True,
5118 intents={INTENT_READONLY},
5121 intents={INTENT_READONLY},
5119 )
5122 )
5120 def paths(ui, repo, search=None, **opts):
5123 def paths(ui, repo, search=None, **opts):
5121 """show aliases for remote repositories
5124 """show aliases for remote repositories
5122
5125
5123 Show definition of symbolic path name NAME. If no name is given,
5126 Show definition of symbolic path name NAME. If no name is given,
5124 show definition of all available names.
5127 show definition of all available names.
5125
5128
5126 Option -q/--quiet suppresses all output when searching for NAME
5129 Option -q/--quiet suppresses all output when searching for NAME
5127 and shows only the path names when listing all definitions.
5130 and shows only the path names when listing all definitions.
5128
5131
5129 Path names are defined in the [paths] section of your
5132 Path names are defined in the [paths] section of your
5130 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5133 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5131 repository, ``.hg/hgrc`` is used, too.
5134 repository, ``.hg/hgrc`` is used, too.
5132
5135
5133 The path names ``default`` and ``default-push`` have a special
5136 The path names ``default`` and ``default-push`` have a special
5134 meaning. When performing a push or pull operation, they are used
5137 meaning. When performing a push or pull operation, they are used
5135 as fallbacks if no location is specified on the command-line.
5138 as fallbacks if no location is specified on the command-line.
5136 When ``default-push`` is set, it will be used for push and
5139 When ``default-push`` is set, it will be used for push and
5137 ``default`` will be used for pull; otherwise ``default`` is used
5140 ``default`` will be used for pull; otherwise ``default`` is used
5138 as the fallback for both. When cloning a repository, the clone
5141 as the fallback for both. When cloning a repository, the clone
5139 source is written as ``default`` in ``.hg/hgrc``.
5142 source is written as ``default`` in ``.hg/hgrc``.
5140
5143
5141 .. note::
5144 .. note::
5142
5145
5143 ``default`` and ``default-push`` apply to all inbound (e.g.
5146 ``default`` and ``default-push`` apply to all inbound (e.g.
5144 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5147 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5145 and :hg:`bundle`) operations.
5148 and :hg:`bundle`) operations.
5146
5149
5147 See :hg:`help urls` for more information.
5150 See :hg:`help urls` for more information.
5148
5151
5149 .. container:: verbose
5152 .. container:: verbose
5150
5153
5151 Template:
5154 Template:
5152
5155
5153 The following keywords are supported. See also :hg:`help templates`.
5156 The following keywords are supported. See also :hg:`help templates`.
5154
5157
5155 :name: String. Symbolic name of the path alias.
5158 :name: String. Symbolic name of the path alias.
5156 :pushurl: String. URL for push operations.
5159 :pushurl: String. URL for push operations.
5157 :url: String. URL or directory path for the other operations.
5160 :url: String. URL or directory path for the other operations.
5158
5161
5159 Returns 0 on success.
5162 Returns 0 on success.
5160 """
5163 """
5161
5164
5162 opts = pycompat.byteskwargs(opts)
5165 opts = pycompat.byteskwargs(opts)
5163 ui.pager(b'paths')
5166 ui.pager(b'paths')
5164 if search:
5167 if search:
5165 pathitems = [
5168 pathitems = [
5166 (name, path)
5169 (name, path)
5167 for name, path in pycompat.iteritems(ui.paths)
5170 for name, path in pycompat.iteritems(ui.paths)
5168 if name == search
5171 if name == search
5169 ]
5172 ]
5170 else:
5173 else:
5171 pathitems = sorted(pycompat.iteritems(ui.paths))
5174 pathitems = sorted(pycompat.iteritems(ui.paths))
5172
5175
5173 fm = ui.formatter(b'paths', opts)
5176 fm = ui.formatter(b'paths', opts)
5174 if fm.isplain():
5177 if fm.isplain():
5175 hidepassword = util.hidepassword
5178 hidepassword = util.hidepassword
5176 else:
5179 else:
5177 hidepassword = bytes
5180 hidepassword = bytes
5178 if ui.quiet:
5181 if ui.quiet:
5179 namefmt = b'%s\n'
5182 namefmt = b'%s\n'
5180 else:
5183 else:
5181 namefmt = b'%s = '
5184 namefmt = b'%s = '
5182 showsubopts = not search and not ui.quiet
5185 showsubopts = not search and not ui.quiet
5183
5186
5184 for name, path in pathitems:
5187 for name, path in pathitems:
5185 fm.startitem()
5188 fm.startitem()
5186 fm.condwrite(not search, b'name', namefmt, name)
5189 fm.condwrite(not search, b'name', namefmt, name)
5187 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5190 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5188 for subopt, value in sorted(path.suboptions.items()):
5191 for subopt, value in sorted(path.suboptions.items()):
5189 assert subopt not in (b'name', b'url')
5192 assert subopt not in (b'name', b'url')
5190 if showsubopts:
5193 if showsubopts:
5191 fm.plain(b'%s:%s = ' % (name, subopt))
5194 fm.plain(b'%s:%s = ' % (name, subopt))
5192 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5195 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5193
5196
5194 fm.end()
5197 fm.end()
5195
5198
5196 if search and not pathitems:
5199 if search and not pathitems:
5197 if not ui.quiet:
5200 if not ui.quiet:
5198 ui.warn(_(b"not found!\n"))
5201 ui.warn(_(b"not found!\n"))
5199 return 1
5202 return 1
5200 else:
5203 else:
5201 return 0
5204 return 0
5202
5205
5203
5206
5204 @command(
5207 @command(
5205 b'phase',
5208 b'phase',
5206 [
5209 [
5207 (b'p', b'public', False, _(b'set changeset phase to public')),
5210 (b'p', b'public', False, _(b'set changeset phase to public')),
5208 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5211 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5209 (b's', b'secret', False, _(b'set changeset phase to secret')),
5212 (b's', b'secret', False, _(b'set changeset phase to secret')),
5210 (b'f', b'force', False, _(b'allow to move boundary backward')),
5213 (b'f', b'force', False, _(b'allow to move boundary backward')),
5211 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5214 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5212 ],
5215 ],
5213 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5216 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5214 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5217 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5215 )
5218 )
5216 def phase(ui, repo, *revs, **opts):
5219 def phase(ui, repo, *revs, **opts):
5217 """set or show the current phase name
5220 """set or show the current phase name
5218
5221
5219 With no argument, show the phase name of the current revision(s).
5222 With no argument, show the phase name of the current revision(s).
5220
5223
5221 With one of -p/--public, -d/--draft or -s/--secret, change the
5224 With one of -p/--public, -d/--draft or -s/--secret, change the
5222 phase value of the specified revisions.
5225 phase value of the specified revisions.
5223
5226
5224 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5227 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5225 lower phase to a higher phase. Phases are ordered as follows::
5228 lower phase to a higher phase. Phases are ordered as follows::
5226
5229
5227 public < draft < secret
5230 public < draft < secret
5228
5231
5229 Returns 0 on success, 1 if some phases could not be changed.
5232 Returns 0 on success, 1 if some phases could not be changed.
5230
5233
5231 (For more information about the phases concept, see :hg:`help phases`.)
5234 (For more information about the phases concept, see :hg:`help phases`.)
5232 """
5235 """
5233 opts = pycompat.byteskwargs(opts)
5236 opts = pycompat.byteskwargs(opts)
5234 # search for a unique phase argument
5237 # search for a unique phase argument
5235 targetphase = None
5238 targetphase = None
5236 for idx, name in enumerate(phases.cmdphasenames):
5239 for idx, name in enumerate(phases.cmdphasenames):
5237 if opts[name]:
5240 if opts[name]:
5238 if targetphase is not None:
5241 if targetphase is not None:
5239 raise error.Abort(_(b'only one phase can be specified'))
5242 raise error.Abort(_(b'only one phase can be specified'))
5240 targetphase = idx
5243 targetphase = idx
5241
5244
5242 # look for specified revision
5245 # look for specified revision
5243 revs = list(revs)
5246 revs = list(revs)
5244 revs.extend(opts[b'rev'])
5247 revs.extend(opts[b'rev'])
5245 if not revs:
5248 if not revs:
5246 # display both parents as the second parent phase can influence
5249 # display both parents as the second parent phase can influence
5247 # the phase of a merge commit
5250 # the phase of a merge commit
5248 revs = [c.rev() for c in repo[None].parents()]
5251 revs = [c.rev() for c in repo[None].parents()]
5249
5252
5250 revs = scmutil.revrange(repo, revs)
5253 revs = scmutil.revrange(repo, revs)
5251
5254
5252 ret = 0
5255 ret = 0
5253 if targetphase is None:
5256 if targetphase is None:
5254 # display
5257 # display
5255 for r in revs:
5258 for r in revs:
5256 ctx = repo[r]
5259 ctx = repo[r]
5257 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5260 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5258 else:
5261 else:
5259 with repo.lock(), repo.transaction(b"phase") as tr:
5262 with repo.lock(), repo.transaction(b"phase") as tr:
5260 # set phase
5263 # set phase
5261 if not revs:
5264 if not revs:
5262 raise error.Abort(_(b'empty revision set'))
5265 raise error.Abort(_(b'empty revision set'))
5263 nodes = [repo[r].node() for r in revs]
5266 nodes = [repo[r].node() for r in revs]
5264 # moving revision from public to draft may hide them
5267 # moving revision from public to draft may hide them
5265 # We have to check result on an unfiltered repository
5268 # We have to check result on an unfiltered repository
5266 unfi = repo.unfiltered()
5269 unfi = repo.unfiltered()
5267 getphase = unfi._phasecache.phase
5270 getphase = unfi._phasecache.phase
5268 olddata = [getphase(unfi, r) for r in unfi]
5271 olddata = [getphase(unfi, r) for r in unfi]
5269 phases.advanceboundary(repo, tr, targetphase, nodes)
5272 phases.advanceboundary(repo, tr, targetphase, nodes)
5270 if opts[b'force']:
5273 if opts[b'force']:
5271 phases.retractboundary(repo, tr, targetphase, nodes)
5274 phases.retractboundary(repo, tr, targetphase, nodes)
5272 getphase = unfi._phasecache.phase
5275 getphase = unfi._phasecache.phase
5273 newdata = [getphase(unfi, r) for r in unfi]
5276 newdata = [getphase(unfi, r) for r in unfi]
5274 changes = sum(newdata[r] != olddata[r] for r in unfi)
5277 changes = sum(newdata[r] != olddata[r] for r in unfi)
5275 cl = unfi.changelog
5278 cl = unfi.changelog
5276 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5279 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5277 if rejected:
5280 if rejected:
5278 ui.warn(
5281 ui.warn(
5279 _(
5282 _(
5280 b'cannot move %i changesets to a higher '
5283 b'cannot move %i changesets to a higher '
5281 b'phase, use --force\n'
5284 b'phase, use --force\n'
5282 )
5285 )
5283 % len(rejected)
5286 % len(rejected)
5284 )
5287 )
5285 ret = 1
5288 ret = 1
5286 if changes:
5289 if changes:
5287 msg = _(b'phase changed for %i changesets\n') % changes
5290 msg = _(b'phase changed for %i changesets\n') % changes
5288 if ret:
5291 if ret:
5289 ui.status(msg)
5292 ui.status(msg)
5290 else:
5293 else:
5291 ui.note(msg)
5294 ui.note(msg)
5292 else:
5295 else:
5293 ui.warn(_(b'no phases changed\n'))
5296 ui.warn(_(b'no phases changed\n'))
5294 return ret
5297 return ret
5295
5298
5296
5299
5297 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5300 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5298 """Run after a changegroup has been added via pull/unbundle
5301 """Run after a changegroup has been added via pull/unbundle
5299
5302
5300 This takes arguments below:
5303 This takes arguments below:
5301
5304
5302 :modheads: change of heads by pull/unbundle
5305 :modheads: change of heads by pull/unbundle
5303 :optupdate: updating working directory is needed or not
5306 :optupdate: updating working directory is needed or not
5304 :checkout: update destination revision (or None to default destination)
5307 :checkout: update destination revision (or None to default destination)
5305 :brev: a name, which might be a bookmark to be activated after updating
5308 :brev: a name, which might be a bookmark to be activated after updating
5306 """
5309 """
5307 if modheads == 0:
5310 if modheads == 0:
5308 return
5311 return
5309 if optupdate:
5312 if optupdate:
5310 try:
5313 try:
5311 return hg.updatetotally(ui, repo, checkout, brev)
5314 return hg.updatetotally(ui, repo, checkout, brev)
5312 except error.UpdateAbort as inst:
5315 except error.UpdateAbort as inst:
5313 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5316 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5314 hint = inst.hint
5317 hint = inst.hint
5315 raise error.UpdateAbort(msg, hint=hint)
5318 raise error.UpdateAbort(msg, hint=hint)
5316 if modheads is not None and modheads > 1:
5319 if modheads is not None and modheads > 1:
5317 currentbranchheads = len(repo.branchheads())
5320 currentbranchheads = len(repo.branchheads())
5318 if currentbranchheads == modheads:
5321 if currentbranchheads == modheads:
5319 ui.status(
5322 ui.status(
5320 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5323 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5321 )
5324 )
5322 elif currentbranchheads > 1:
5325 elif currentbranchheads > 1:
5323 ui.status(
5326 ui.status(
5324 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5327 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5325 )
5328 )
5326 else:
5329 else:
5327 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5330 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5328 elif not ui.configbool(b'commands', b'update.requiredest'):
5331 elif not ui.configbool(b'commands', b'update.requiredest'):
5329 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5332 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5330
5333
5331
5334
5332 @command(
5335 @command(
5333 b'pull',
5336 b'pull',
5334 [
5337 [
5335 (
5338 (
5336 b'u',
5339 b'u',
5337 b'update',
5340 b'update',
5338 None,
5341 None,
5339 _(b'update to new branch head if new descendants were pulled'),
5342 _(b'update to new branch head if new descendants were pulled'),
5340 ),
5343 ),
5341 (
5344 (
5342 b'f',
5345 b'f',
5343 b'force',
5346 b'force',
5344 None,
5347 None,
5345 _(b'run even when remote repository is unrelated'),
5348 _(b'run even when remote repository is unrelated'),
5346 ),
5349 ),
5347 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5350 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5348 (
5351 (
5349 b'r',
5352 b'r',
5350 b'rev',
5353 b'rev',
5351 [],
5354 [],
5352 _(b'a remote changeset intended to be added'),
5355 _(b'a remote changeset intended to be added'),
5353 _(b'REV'),
5356 _(b'REV'),
5354 ),
5357 ),
5355 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5358 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5356 (
5359 (
5357 b'b',
5360 b'b',
5358 b'branch',
5361 b'branch',
5359 [],
5362 [],
5360 _(b'a specific branch you would like to pull'),
5363 _(b'a specific branch you would like to pull'),
5361 _(b'BRANCH'),
5364 _(b'BRANCH'),
5362 ),
5365 ),
5363 ]
5366 ]
5364 + remoteopts,
5367 + remoteopts,
5365 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5368 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5366 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5369 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5367 helpbasic=True,
5370 helpbasic=True,
5368 )
5371 )
5369 def pull(ui, repo, source=b"default", **opts):
5372 def pull(ui, repo, source=b"default", **opts):
5370 """pull changes from the specified source
5373 """pull changes from the specified source
5371
5374
5372 Pull changes from a remote repository to a local one.
5375 Pull changes from a remote repository to a local one.
5373
5376
5374 This finds all changes from the repository at the specified path
5377 This finds all changes from the repository at the specified path
5375 or URL and adds them to a local repository (the current one unless
5378 or URL and adds them to a local repository (the current one unless
5376 -R is specified). By default, this does not update the copy of the
5379 -R is specified). By default, this does not update the copy of the
5377 project in the working directory.
5380 project in the working directory.
5378
5381
5379 When cloning from servers that support it, Mercurial may fetch
5382 When cloning from servers that support it, Mercurial may fetch
5380 pre-generated data. When this is done, hooks operating on incoming
5383 pre-generated data. When this is done, hooks operating on incoming
5381 changesets and changegroups may fire more than once, once for each
5384 changesets and changegroups may fire more than once, once for each
5382 pre-generated bundle and as well as for any additional remaining
5385 pre-generated bundle and as well as for any additional remaining
5383 data. See :hg:`help -e clonebundles` for more.
5386 data. See :hg:`help -e clonebundles` for more.
5384
5387
5385 Use :hg:`incoming` if you want to see what would have been added
5388 Use :hg:`incoming` if you want to see what would have been added
5386 by a pull at the time you issued this command. If you then decide
5389 by a pull at the time you issued this command. If you then decide
5387 to add those changes to the repository, you should use :hg:`pull
5390 to add those changes to the repository, you should use :hg:`pull
5388 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5391 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5389
5392
5390 If SOURCE is omitted, the 'default' path will be used.
5393 If SOURCE is omitted, the 'default' path will be used.
5391 See :hg:`help urls` for more information.
5394 See :hg:`help urls` for more information.
5392
5395
5393 Specifying bookmark as ``.`` is equivalent to specifying the active
5396 Specifying bookmark as ``.`` is equivalent to specifying the active
5394 bookmark's name.
5397 bookmark's name.
5395
5398
5396 Returns 0 on success, 1 if an update had unresolved files.
5399 Returns 0 on success, 1 if an update had unresolved files.
5397 """
5400 """
5398
5401
5399 opts = pycompat.byteskwargs(opts)
5402 opts = pycompat.byteskwargs(opts)
5400 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5403 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5401 b'update'
5404 b'update'
5402 ):
5405 ):
5403 msg = _(b'update destination required by configuration')
5406 msg = _(b'update destination required by configuration')
5404 hint = _(b'use hg pull followed by hg update DEST')
5407 hint = _(b'use hg pull followed by hg update DEST')
5405 raise error.Abort(msg, hint=hint)
5408 raise error.Abort(msg, hint=hint)
5406
5409
5407 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5410 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5408 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5411 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5409 other = hg.peer(repo, opts, source)
5412 other = hg.peer(repo, opts, source)
5410 try:
5413 try:
5411 revs, checkout = hg.addbranchrevs(
5414 revs, checkout = hg.addbranchrevs(
5412 repo, other, branches, opts.get(b'rev')
5415 repo, other, branches, opts.get(b'rev')
5413 )
5416 )
5414
5417
5415 pullopargs = {}
5418 pullopargs = {}
5416
5419
5417 nodes = None
5420 nodes = None
5418 if opts.get(b'bookmark') or revs:
5421 if opts.get(b'bookmark') or revs:
5419 # The list of bookmark used here is the same used to actually update
5422 # The list of bookmark used here is the same used to actually update
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5423 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # all lookup and bookmark queries in one go so they see the same
5424 # all lookup and bookmark queries in one go so they see the same
5422 # version of the server state (issue 4700).
5425 # version of the server state (issue 4700).
5423 nodes = []
5426 nodes = []
5424 fnodes = []
5427 fnodes = []
5425 revs = revs or []
5428 revs = revs or []
5426 if revs and not other.capable(b'lookup'):
5429 if revs and not other.capable(b'lookup'):
5427 err = _(
5430 err = _(
5428 b"other repository doesn't support revision lookup, "
5431 b"other repository doesn't support revision lookup, "
5429 b"so a rev cannot be specified."
5432 b"so a rev cannot be specified."
5430 )
5433 )
5431 raise error.Abort(err)
5434 raise error.Abort(err)
5432 with other.commandexecutor() as e:
5435 with other.commandexecutor() as e:
5433 fremotebookmarks = e.callcommand(
5436 fremotebookmarks = e.callcommand(
5434 b'listkeys', {b'namespace': b'bookmarks'}
5437 b'listkeys', {b'namespace': b'bookmarks'}
5435 )
5438 )
5436 for r in revs:
5439 for r in revs:
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5440 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 remotebookmarks = fremotebookmarks.result()
5441 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5442 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5443 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 for b in opts.get(b'bookmark', []):
5444 for b in opts.get(b'bookmark', []):
5442 b = repo._bookmarks.expandname(b)
5445 b = repo._bookmarks.expandname(b)
5443 if b not in remotebookmarks:
5446 if b not in remotebookmarks:
5444 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5447 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5445 nodes.append(remotebookmarks[b])
5448 nodes.append(remotebookmarks[b])
5446 for i, rev in enumerate(revs):
5449 for i, rev in enumerate(revs):
5447 node = fnodes[i].result()
5450 node = fnodes[i].result()
5448 nodes.append(node)
5451 nodes.append(node)
5449 if rev == checkout:
5452 if rev == checkout:
5450 checkout = node
5453 checkout = node
5451
5454
5452 wlock = util.nullcontextmanager()
5455 wlock = util.nullcontextmanager()
5453 if opts.get(b'update'):
5456 if opts.get(b'update'):
5454 wlock = repo.wlock()
5457 wlock = repo.wlock()
5455 with wlock:
5458 with wlock:
5456 pullopargs.update(opts.get(b'opargs', {}))
5459 pullopargs.update(opts.get(b'opargs', {}))
5457 modheads = exchange.pull(
5460 modheads = exchange.pull(
5458 repo,
5461 repo,
5459 other,
5462 other,
5460 heads=nodes,
5463 heads=nodes,
5461 force=opts.get(b'force'),
5464 force=opts.get(b'force'),
5462 bookmarks=opts.get(b'bookmark', ()),
5465 bookmarks=opts.get(b'bookmark', ()),
5463 opargs=pullopargs,
5466 opargs=pullopargs,
5464 confirm=opts.get(b'confirm'),
5467 confirm=opts.get(b'confirm'),
5465 ).cgresult
5468 ).cgresult
5466
5469
5467 # brev is a name, which might be a bookmark to be activated at
5470 # brev is a name, which might be a bookmark to be activated at
5468 # the end of the update. In other words, it is an explicit
5471 # the end of the update. In other words, it is an explicit
5469 # destination of the update
5472 # destination of the update
5470 brev = None
5473 brev = None
5471
5474
5472 if checkout:
5475 if checkout:
5473 checkout = repo.unfiltered().changelog.rev(checkout)
5476 checkout = repo.unfiltered().changelog.rev(checkout)
5474
5477
5475 # order below depends on implementation of
5478 # order below depends on implementation of
5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5479 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 # because 'checkout' is determined without it.
5480 # because 'checkout' is determined without it.
5478 if opts.get(b'rev'):
5481 if opts.get(b'rev'):
5479 brev = opts[b'rev'][0]
5482 brev = opts[b'rev'][0]
5480 elif opts.get(b'branch'):
5483 elif opts.get(b'branch'):
5481 brev = opts[b'branch'][0]
5484 brev = opts[b'branch'][0]
5482 else:
5485 else:
5483 brev = branches[0]
5486 brev = branches[0]
5484 repo._subtoppath = source
5487 repo._subtoppath = source
5485 try:
5488 try:
5486 ret = postincoming(
5489 ret = postincoming(
5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5490 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 )
5491 )
5489 except error.FilteredRepoLookupError as exc:
5492 except error.FilteredRepoLookupError as exc:
5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5493 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 exc.args = (msg,) + exc.args[1:]
5494 exc.args = (msg,) + exc.args[1:]
5492 raise
5495 raise
5493 finally:
5496 finally:
5494 del repo._subtoppath
5497 del repo._subtoppath
5495
5498
5496 finally:
5499 finally:
5497 other.close()
5500 other.close()
5498 return ret
5501 return ret
5499
5502
5500
5503
5501 @command(
5504 @command(
5502 b'push',
5505 b'push',
5503 [
5506 [
5504 (b'f', b'force', None, _(b'force push')),
5507 (b'f', b'force', None, _(b'force push')),
5505 (
5508 (
5506 b'r',
5509 b'r',
5507 b'rev',
5510 b'rev',
5508 [],
5511 [],
5509 _(b'a changeset intended to be included in the destination'),
5512 _(b'a changeset intended to be included in the destination'),
5510 _(b'REV'),
5513 _(b'REV'),
5511 ),
5514 ),
5512 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5515 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5513 (
5516 (
5514 b'b',
5517 b'b',
5515 b'branch',
5518 b'branch',
5516 [],
5519 [],
5517 _(b'a specific branch you would like to push'),
5520 _(b'a specific branch you would like to push'),
5518 _(b'BRANCH'),
5521 _(b'BRANCH'),
5519 ),
5522 ),
5520 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5523 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5521 (
5524 (
5522 b'',
5525 b'',
5523 b'pushvars',
5526 b'pushvars',
5524 [],
5527 [],
5525 _(b'variables that can be sent to server (ADVANCED)'),
5528 _(b'variables that can be sent to server (ADVANCED)'),
5526 ),
5529 ),
5527 (
5530 (
5528 b'',
5531 b'',
5529 b'publish',
5532 b'publish',
5530 False,
5533 False,
5531 _(b'push the changeset as public (EXPERIMENTAL)'),
5534 _(b'push the changeset as public (EXPERIMENTAL)'),
5532 ),
5535 ),
5533 ]
5536 ]
5534 + remoteopts,
5537 + remoteopts,
5535 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5538 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5536 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5539 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5537 helpbasic=True,
5540 helpbasic=True,
5538 )
5541 )
5539 def push(ui, repo, dest=None, **opts):
5542 def push(ui, repo, dest=None, **opts):
5540 """push changes to the specified destination
5543 """push changes to the specified destination
5541
5544
5542 Push changesets from the local repository to the specified
5545 Push changesets from the local repository to the specified
5543 destination.
5546 destination.
5544
5547
5545 This operation is symmetrical to pull: it is identical to a pull
5548 This operation is symmetrical to pull: it is identical to a pull
5546 in the destination repository from the current one.
5549 in the destination repository from the current one.
5547
5550
5548 By default, push will not allow creation of new heads at the
5551 By default, push will not allow creation of new heads at the
5549 destination, since multiple heads would make it unclear which head
5552 destination, since multiple heads would make it unclear which head
5550 to use. In this situation, it is recommended to pull and merge
5553 to use. In this situation, it is recommended to pull and merge
5551 before pushing.
5554 before pushing.
5552
5555
5553 Use --new-branch if you want to allow push to create a new named
5556 Use --new-branch if you want to allow push to create a new named
5554 branch that is not present at the destination. This allows you to
5557 branch that is not present at the destination. This allows you to
5555 only create a new branch without forcing other changes.
5558 only create a new branch without forcing other changes.
5556
5559
5557 .. note::
5560 .. note::
5558
5561
5559 Extra care should be taken with the -f/--force option,
5562 Extra care should be taken with the -f/--force option,
5560 which will push all new heads on all branches, an action which will
5563 which will push all new heads on all branches, an action which will
5561 almost always cause confusion for collaborators.
5564 almost always cause confusion for collaborators.
5562
5565
5563 If -r/--rev is used, the specified revision and all its ancestors
5566 If -r/--rev is used, the specified revision and all its ancestors
5564 will be pushed to the remote repository.
5567 will be pushed to the remote repository.
5565
5568
5566 If -B/--bookmark is used, the specified bookmarked revision, its
5569 If -B/--bookmark is used, the specified bookmarked revision, its
5567 ancestors, and the bookmark will be pushed to the remote
5570 ancestors, and the bookmark will be pushed to the remote
5568 repository. Specifying ``.`` is equivalent to specifying the active
5571 repository. Specifying ``.`` is equivalent to specifying the active
5569 bookmark's name.
5572 bookmark's name.
5570
5573
5571 Please see :hg:`help urls` for important details about ``ssh://``
5574 Please see :hg:`help urls` for important details about ``ssh://``
5572 URLs. If DESTINATION is omitted, a default path will be used.
5575 URLs. If DESTINATION is omitted, a default path will be used.
5573
5576
5574 .. container:: verbose
5577 .. container:: verbose
5575
5578
5576 The --pushvars option sends strings to the server that become
5579 The --pushvars option sends strings to the server that become
5577 environment variables prepended with ``HG_USERVAR_``. For example,
5580 environment variables prepended with ``HG_USERVAR_``. For example,
5578 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5581 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5579 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5582 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5580
5583
5581 pushvars can provide for user-overridable hooks as well as set debug
5584 pushvars can provide for user-overridable hooks as well as set debug
5582 levels. One example is having a hook that blocks commits containing
5585 levels. One example is having a hook that blocks commits containing
5583 conflict markers, but enables the user to override the hook if the file
5586 conflict markers, but enables the user to override the hook if the file
5584 is using conflict markers for testing purposes or the file format has
5587 is using conflict markers for testing purposes or the file format has
5585 strings that look like conflict markers.
5588 strings that look like conflict markers.
5586
5589
5587 By default, servers will ignore `--pushvars`. To enable it add the
5590 By default, servers will ignore `--pushvars`. To enable it add the
5588 following to your configuration file::
5591 following to your configuration file::
5589
5592
5590 [push]
5593 [push]
5591 pushvars.server = true
5594 pushvars.server = true
5592
5595
5593 Returns 0 if push was successful, 1 if nothing to push.
5596 Returns 0 if push was successful, 1 if nothing to push.
5594 """
5597 """
5595
5598
5596 opts = pycompat.byteskwargs(opts)
5599 opts = pycompat.byteskwargs(opts)
5597 if opts.get(b'bookmark'):
5600 if opts.get(b'bookmark'):
5598 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5601 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5599 for b in opts[b'bookmark']:
5602 for b in opts[b'bookmark']:
5600 # translate -B options to -r so changesets get pushed
5603 # translate -B options to -r so changesets get pushed
5601 b = repo._bookmarks.expandname(b)
5604 b = repo._bookmarks.expandname(b)
5602 if b in repo._bookmarks:
5605 if b in repo._bookmarks:
5603 opts.setdefault(b'rev', []).append(b)
5606 opts.setdefault(b'rev', []).append(b)
5604 else:
5607 else:
5605 # if we try to push a deleted bookmark, translate it to null
5608 # if we try to push a deleted bookmark, translate it to null
5606 # this lets simultaneous -r, -b options continue working
5609 # this lets simultaneous -r, -b options continue working
5607 opts.setdefault(b'rev', []).append(b"null")
5610 opts.setdefault(b'rev', []).append(b"null")
5608
5611
5609 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5612 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5610 if not path:
5613 if not path:
5611 raise error.Abort(
5614 raise error.Abort(
5612 _(b'default repository not configured!'),
5615 _(b'default repository not configured!'),
5613 hint=_(b"see 'hg help config.paths'"),
5616 hint=_(b"see 'hg help config.paths'"),
5614 )
5617 )
5615 dest = path.pushloc or path.loc
5618 dest = path.pushloc or path.loc
5616 branches = (path.branch, opts.get(b'branch') or [])
5619 branches = (path.branch, opts.get(b'branch') or [])
5617 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5620 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5618 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5621 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5619 other = hg.peer(repo, opts, dest)
5622 other = hg.peer(repo, opts, dest)
5620
5623
5621 if revs:
5624 if revs:
5622 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5625 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5623 if not revs:
5626 if not revs:
5624 raise error.Abort(
5627 raise error.Abort(
5625 _(b"specified revisions evaluate to an empty set"),
5628 _(b"specified revisions evaluate to an empty set"),
5626 hint=_(b"use different revision arguments"),
5629 hint=_(b"use different revision arguments"),
5627 )
5630 )
5628 elif path.pushrev:
5631 elif path.pushrev:
5629 # It doesn't make any sense to specify ancestor revisions. So limit
5632 # It doesn't make any sense to specify ancestor revisions. So limit
5630 # to DAG heads to make discovery simpler.
5633 # to DAG heads to make discovery simpler.
5631 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5634 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5632 revs = scmutil.revrange(repo, [expr])
5635 revs = scmutil.revrange(repo, [expr])
5633 revs = [repo[rev].node() for rev in revs]
5636 revs = [repo[rev].node() for rev in revs]
5634 if not revs:
5637 if not revs:
5635 raise error.Abort(
5638 raise error.Abort(
5636 _(b'default push revset for path evaluates to an empty set')
5639 _(b'default push revset for path evaluates to an empty set')
5637 )
5640 )
5638 elif ui.configbool(b'commands', b'push.require-revs'):
5641 elif ui.configbool(b'commands', b'push.require-revs'):
5639 raise error.Abort(
5642 raise error.Abort(
5640 _(b'no revisions specified to push'),
5643 _(b'no revisions specified to push'),
5641 hint=_(b'did you mean "hg push -r ."?'),
5644 hint=_(b'did you mean "hg push -r ."?'),
5642 )
5645 )
5643
5646
5644 repo._subtoppath = dest
5647 repo._subtoppath = dest
5645 try:
5648 try:
5646 # push subrepos depth-first for coherent ordering
5649 # push subrepos depth-first for coherent ordering
5647 c = repo[b'.']
5650 c = repo[b'.']
5648 subs = c.substate # only repos that are committed
5651 subs = c.substate # only repos that are committed
5649 for s in sorted(subs):
5652 for s in sorted(subs):
5650 result = c.sub(s).push(opts)
5653 result = c.sub(s).push(opts)
5651 if result == 0:
5654 if result == 0:
5652 return not result
5655 return not result
5653 finally:
5656 finally:
5654 del repo._subtoppath
5657 del repo._subtoppath
5655
5658
5656 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5659 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5657 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5660 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5658
5661
5659 pushop = exchange.push(
5662 pushop = exchange.push(
5660 repo,
5663 repo,
5661 other,
5664 other,
5662 opts.get(b'force'),
5665 opts.get(b'force'),
5663 revs=revs,
5666 revs=revs,
5664 newbranch=opts.get(b'new_branch'),
5667 newbranch=opts.get(b'new_branch'),
5665 bookmarks=opts.get(b'bookmark', ()),
5668 bookmarks=opts.get(b'bookmark', ()),
5666 publish=opts.get(b'publish'),
5669 publish=opts.get(b'publish'),
5667 opargs=opargs,
5670 opargs=opargs,
5668 )
5671 )
5669
5672
5670 result = not pushop.cgresult
5673 result = not pushop.cgresult
5671
5674
5672 if pushop.bkresult is not None:
5675 if pushop.bkresult is not None:
5673 if pushop.bkresult == 2:
5676 if pushop.bkresult == 2:
5674 result = 2
5677 result = 2
5675 elif not result and pushop.bkresult:
5678 elif not result and pushop.bkresult:
5676 result = 2
5679 result = 2
5677
5680
5678 return result
5681 return result
5679
5682
5680
5683
5681 @command(
5684 @command(
5682 b'recover',
5685 b'recover',
5683 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5686 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5684 helpcategory=command.CATEGORY_MAINTENANCE,
5687 helpcategory=command.CATEGORY_MAINTENANCE,
5685 )
5688 )
5686 def recover(ui, repo, **opts):
5689 def recover(ui, repo, **opts):
5687 """roll back an interrupted transaction
5690 """roll back an interrupted transaction
5688
5691
5689 Recover from an interrupted commit or pull.
5692 Recover from an interrupted commit or pull.
5690
5693
5691 This command tries to fix the repository status after an
5694 This command tries to fix the repository status after an
5692 interrupted operation. It should only be necessary when Mercurial
5695 interrupted operation. It should only be necessary when Mercurial
5693 suggests it.
5696 suggests it.
5694
5697
5695 Returns 0 if successful, 1 if nothing to recover or verify fails.
5698 Returns 0 if successful, 1 if nothing to recover or verify fails.
5696 """
5699 """
5697 ret = repo.recover()
5700 ret = repo.recover()
5698 if ret:
5701 if ret:
5699 if opts['verify']:
5702 if opts['verify']:
5700 return hg.verify(repo)
5703 return hg.verify(repo)
5701 else:
5704 else:
5702 msg = _(
5705 msg = _(
5703 b"(verify step skipped, run `hg verify` to check your "
5706 b"(verify step skipped, run `hg verify` to check your "
5704 b"repository content)\n"
5707 b"repository content)\n"
5705 )
5708 )
5706 ui.warn(msg)
5709 ui.warn(msg)
5707 return 0
5710 return 0
5708 return 1
5711 return 1
5709
5712
5710
5713
5711 @command(
5714 @command(
5712 b'remove|rm',
5715 b'remove|rm',
5713 [
5716 [
5714 (b'A', b'after', None, _(b'record delete for missing files')),
5717 (b'A', b'after', None, _(b'record delete for missing files')),
5715 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5718 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5716 ]
5719 ]
5717 + subrepoopts
5720 + subrepoopts
5718 + walkopts
5721 + walkopts
5719 + dryrunopts,
5722 + dryrunopts,
5720 _(b'[OPTION]... FILE...'),
5723 _(b'[OPTION]... FILE...'),
5721 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5724 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5722 helpbasic=True,
5725 helpbasic=True,
5723 inferrepo=True,
5726 inferrepo=True,
5724 )
5727 )
5725 def remove(ui, repo, *pats, **opts):
5728 def remove(ui, repo, *pats, **opts):
5726 """remove the specified files on the next commit
5729 """remove the specified files on the next commit
5727
5730
5728 Schedule the indicated files for removal from the current branch.
5731 Schedule the indicated files for removal from the current branch.
5729
5732
5730 This command schedules the files to be removed at the next commit.
5733 This command schedules the files to be removed at the next commit.
5731 To undo a remove before that, see :hg:`revert`. To undo added
5734 To undo a remove before that, see :hg:`revert`. To undo added
5732 files, see :hg:`forget`.
5735 files, see :hg:`forget`.
5733
5736
5734 .. container:: verbose
5737 .. container:: verbose
5735
5738
5736 -A/--after can be used to remove only files that have already
5739 -A/--after can be used to remove only files that have already
5737 been deleted, -f/--force can be used to force deletion, and -Af
5740 been deleted, -f/--force can be used to force deletion, and -Af
5738 can be used to remove files from the next revision without
5741 can be used to remove files from the next revision without
5739 deleting them from the working directory.
5742 deleting them from the working directory.
5740
5743
5741 The following table details the behavior of remove for different
5744 The following table details the behavior of remove for different
5742 file states (columns) and option combinations (rows). The file
5745 file states (columns) and option combinations (rows). The file
5743 states are Added [A], Clean [C], Modified [M] and Missing [!]
5746 states are Added [A], Clean [C], Modified [M] and Missing [!]
5744 (as reported by :hg:`status`). The actions are Warn, Remove
5747 (as reported by :hg:`status`). The actions are Warn, Remove
5745 (from branch) and Delete (from disk):
5748 (from branch) and Delete (from disk):
5746
5749
5747 ========= == == == ==
5750 ========= == == == ==
5748 opt/state A C M !
5751 opt/state A C M !
5749 ========= == == == ==
5752 ========= == == == ==
5750 none W RD W R
5753 none W RD W R
5751 -f R RD RD R
5754 -f R RD RD R
5752 -A W W W R
5755 -A W W W R
5753 -Af R R R R
5756 -Af R R R R
5754 ========= == == == ==
5757 ========= == == == ==
5755
5758
5756 .. note::
5759 .. note::
5757
5760
5758 :hg:`remove` never deletes files in Added [A] state from the
5761 :hg:`remove` never deletes files in Added [A] state from the
5759 working directory, not even if ``--force`` is specified.
5762 working directory, not even if ``--force`` is specified.
5760
5763
5761 Returns 0 on success, 1 if any warnings encountered.
5764 Returns 0 on success, 1 if any warnings encountered.
5762 """
5765 """
5763
5766
5764 opts = pycompat.byteskwargs(opts)
5767 opts = pycompat.byteskwargs(opts)
5765 after, force = opts.get(b'after'), opts.get(b'force')
5768 after, force = opts.get(b'after'), opts.get(b'force')
5766 dryrun = opts.get(b'dry_run')
5769 dryrun = opts.get(b'dry_run')
5767 if not pats and not after:
5770 if not pats and not after:
5768 raise error.Abort(_(b'no files specified'))
5771 raise error.Abort(_(b'no files specified'))
5769
5772
5770 m = scmutil.match(repo[None], pats, opts)
5773 m = scmutil.match(repo[None], pats, opts)
5771 subrepos = opts.get(b'subrepos')
5774 subrepos = opts.get(b'subrepos')
5772 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5775 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5773 return cmdutil.remove(
5776 return cmdutil.remove(
5774 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5777 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5775 )
5778 )
5776
5779
5777
5780
5778 @command(
5781 @command(
5779 b'rename|move|mv',
5782 b'rename|move|mv',
5780 [
5783 [
5781 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5784 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5782 (
5785 (
5783 b'f',
5786 b'f',
5784 b'force',
5787 b'force',
5785 None,
5788 None,
5786 _(b'forcibly move over an existing managed file'),
5789 _(b'forcibly move over an existing managed file'),
5787 ),
5790 ),
5788 ]
5791 ]
5789 + walkopts
5792 + walkopts
5790 + dryrunopts,
5793 + dryrunopts,
5791 _(b'[OPTION]... SOURCE... DEST'),
5794 _(b'[OPTION]... SOURCE... DEST'),
5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5793 )
5796 )
5794 def rename(ui, repo, *pats, **opts):
5797 def rename(ui, repo, *pats, **opts):
5795 """rename files; equivalent of copy + remove
5798 """rename files; equivalent of copy + remove
5796
5799
5797 Mark dest as copies of sources; mark sources for deletion. If dest
5800 Mark dest as copies of sources; mark sources for deletion. If dest
5798 is a directory, copies are put in that directory. If dest is a
5801 is a directory, copies are put in that directory. If dest is a
5799 file, there can only be one source.
5802 file, there can only be one source.
5800
5803
5801 By default, this command copies the contents of files as they
5804 By default, this command copies the contents of files as they
5802 exist in the working directory. If invoked with -A/--after, the
5805 exist in the working directory. If invoked with -A/--after, the
5803 operation is recorded, but no copying is performed.
5806 operation is recorded, but no copying is performed.
5804
5807
5805 This command takes effect at the next commit. To undo a rename
5808 This command takes effect at the next commit. To undo a rename
5806 before that, see :hg:`revert`.
5809 before that, see :hg:`revert`.
5807
5810
5808 Returns 0 on success, 1 if errors are encountered.
5811 Returns 0 on success, 1 if errors are encountered.
5809 """
5812 """
5810 opts = pycompat.byteskwargs(opts)
5813 opts = pycompat.byteskwargs(opts)
5811 with repo.wlock():
5814 with repo.wlock():
5812 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5815 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5813
5816
5814
5817
5815 @command(
5818 @command(
5816 b'resolve',
5819 b'resolve',
5817 [
5820 [
5818 (b'a', b'all', None, _(b'select all unresolved files')),
5821 (b'a', b'all', None, _(b'select all unresolved files')),
5819 (b'l', b'list', None, _(b'list state of files needing merge')),
5822 (b'l', b'list', None, _(b'list state of files needing merge')),
5820 (b'm', b'mark', None, _(b'mark files as resolved')),
5823 (b'm', b'mark', None, _(b'mark files as resolved')),
5821 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5824 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5822 (b'n', b'no-status', None, _(b'hide status prefix')),
5825 (b'n', b'no-status', None, _(b'hide status prefix')),
5823 (b'', b're-merge', None, _(b're-merge files')),
5826 (b'', b're-merge', None, _(b're-merge files')),
5824 ]
5827 ]
5825 + mergetoolopts
5828 + mergetoolopts
5826 + walkopts
5829 + walkopts
5827 + formatteropts,
5830 + formatteropts,
5828 _(b'[OPTION]... [FILE]...'),
5831 _(b'[OPTION]... [FILE]...'),
5829 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5832 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5830 inferrepo=True,
5833 inferrepo=True,
5831 )
5834 )
5832 def resolve(ui, repo, *pats, **opts):
5835 def resolve(ui, repo, *pats, **opts):
5833 """redo merges or set/view the merge status of files
5836 """redo merges or set/view the merge status of files
5834
5837
5835 Merges with unresolved conflicts are often the result of
5838 Merges with unresolved conflicts are often the result of
5836 non-interactive merging using the ``internal:merge`` configuration
5839 non-interactive merging using the ``internal:merge`` configuration
5837 setting, or a command-line merge tool like ``diff3``. The resolve
5840 setting, or a command-line merge tool like ``diff3``. The resolve
5838 command is used to manage the files involved in a merge, after
5841 command is used to manage the files involved in a merge, after
5839 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5842 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5840 working directory must have two parents). See :hg:`help
5843 working directory must have two parents). See :hg:`help
5841 merge-tools` for information on configuring merge tools.
5844 merge-tools` for information on configuring merge tools.
5842
5845
5843 The resolve command can be used in the following ways:
5846 The resolve command can be used in the following ways:
5844
5847
5845 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5848 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5846 the specified files, discarding any previous merge attempts. Re-merging
5849 the specified files, discarding any previous merge attempts. Re-merging
5847 is not performed for files already marked as resolved. Use ``--all/-a``
5850 is not performed for files already marked as resolved. Use ``--all/-a``
5848 to select all unresolved files. ``--tool`` can be used to specify
5851 to select all unresolved files. ``--tool`` can be used to specify
5849 the merge tool used for the given files. It overrides the HGMERGE
5852 the merge tool used for the given files. It overrides the HGMERGE
5850 environment variable and your configuration files. Previous file
5853 environment variable and your configuration files. Previous file
5851 contents are saved with a ``.orig`` suffix.
5854 contents are saved with a ``.orig`` suffix.
5852
5855
5853 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5856 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5854 (e.g. after having manually fixed-up the files). The default is
5857 (e.g. after having manually fixed-up the files). The default is
5855 to mark all unresolved files.
5858 to mark all unresolved files.
5856
5859
5857 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5860 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5858 default is to mark all resolved files.
5861 default is to mark all resolved files.
5859
5862
5860 - :hg:`resolve -l`: list files which had or still have conflicts.
5863 - :hg:`resolve -l`: list files which had or still have conflicts.
5861 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5864 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5862 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5865 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5863 the list. See :hg:`help filesets` for details.
5866 the list. See :hg:`help filesets` for details.
5864
5867
5865 .. note::
5868 .. note::
5866
5869
5867 Mercurial will not let you commit files with unresolved merge
5870 Mercurial will not let you commit files with unresolved merge
5868 conflicts. You must use :hg:`resolve -m ...` before you can
5871 conflicts. You must use :hg:`resolve -m ...` before you can
5869 commit after a conflicting merge.
5872 commit after a conflicting merge.
5870
5873
5871 .. container:: verbose
5874 .. container:: verbose
5872
5875
5873 Template:
5876 Template:
5874
5877
5875 The following keywords are supported in addition to the common template
5878 The following keywords are supported in addition to the common template
5876 keywords and functions. See also :hg:`help templates`.
5879 keywords and functions. See also :hg:`help templates`.
5877
5880
5878 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5881 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5879 :path: String. Repository-absolute path of the file.
5882 :path: String. Repository-absolute path of the file.
5880
5883
5881 Returns 0 on success, 1 if any files fail a resolve attempt.
5884 Returns 0 on success, 1 if any files fail a resolve attempt.
5882 """
5885 """
5883
5886
5884 opts = pycompat.byteskwargs(opts)
5887 opts = pycompat.byteskwargs(opts)
5885 confirm = ui.configbool(b'commands', b'resolve.confirm')
5888 confirm = ui.configbool(b'commands', b'resolve.confirm')
5886 flaglist = b'all mark unmark list no_status re_merge'.split()
5889 flaglist = b'all mark unmark list no_status re_merge'.split()
5887 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5890 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5888
5891
5889 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5892 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5890 if actioncount > 1:
5893 if actioncount > 1:
5891 raise error.Abort(_(b"too many actions specified"))
5894 raise error.Abort(_(b"too many actions specified"))
5892 elif actioncount == 0 and ui.configbool(
5895 elif actioncount == 0 and ui.configbool(
5893 b'commands', b'resolve.explicit-re-merge'
5896 b'commands', b'resolve.explicit-re-merge'
5894 ):
5897 ):
5895 hint = _(b'use --mark, --unmark, --list or --re-merge')
5898 hint = _(b'use --mark, --unmark, --list or --re-merge')
5896 raise error.Abort(_(b'no action specified'), hint=hint)
5899 raise error.Abort(_(b'no action specified'), hint=hint)
5897 if pats and all:
5900 if pats and all:
5898 raise error.Abort(_(b"can't specify --all and patterns"))
5901 raise error.Abort(_(b"can't specify --all and patterns"))
5899 if not (all or pats or show or mark or unmark):
5902 if not (all or pats or show or mark or unmark):
5900 raise error.Abort(
5903 raise error.Abort(
5901 _(b'no files or directories specified'),
5904 _(b'no files or directories specified'),
5902 hint=b'use --all to re-merge all unresolved files',
5905 hint=b'use --all to re-merge all unresolved files',
5903 )
5906 )
5904
5907
5905 if confirm:
5908 if confirm:
5906 if all:
5909 if all:
5907 if ui.promptchoice(
5910 if ui.promptchoice(
5908 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5911 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5909 ):
5912 ):
5910 raise error.Abort(_(b'user quit'))
5913 raise error.Abort(_(b'user quit'))
5911 if mark and not pats:
5914 if mark and not pats:
5912 if ui.promptchoice(
5915 if ui.promptchoice(
5913 _(
5916 _(
5914 b'mark all unresolved files as resolved (yn)?'
5917 b'mark all unresolved files as resolved (yn)?'
5915 b'$$ &Yes $$ &No'
5918 b'$$ &Yes $$ &No'
5916 )
5919 )
5917 ):
5920 ):
5918 raise error.Abort(_(b'user quit'))
5921 raise error.Abort(_(b'user quit'))
5919 if unmark and not pats:
5922 if unmark and not pats:
5920 if ui.promptchoice(
5923 if ui.promptchoice(
5921 _(
5924 _(
5922 b'mark all resolved files as unresolved (yn)?'
5925 b'mark all resolved files as unresolved (yn)?'
5923 b'$$ &Yes $$ &No'
5926 b'$$ &Yes $$ &No'
5924 )
5927 )
5925 ):
5928 ):
5926 raise error.Abort(_(b'user quit'))
5929 raise error.Abort(_(b'user quit'))
5927
5930
5928 uipathfn = scmutil.getuipathfn(repo)
5931 uipathfn = scmutil.getuipathfn(repo)
5929
5932
5930 if show:
5933 if show:
5931 ui.pager(b'resolve')
5934 ui.pager(b'resolve')
5932 fm = ui.formatter(b'resolve', opts)
5935 fm = ui.formatter(b'resolve', opts)
5933 ms = mergemod.mergestate.read(repo)
5936 ms = mergemod.mergestate.read(repo)
5934 wctx = repo[None]
5937 wctx = repo[None]
5935 m = scmutil.match(wctx, pats, opts)
5938 m = scmutil.match(wctx, pats, opts)
5936
5939
5937 # Labels and keys based on merge state. Unresolved path conflicts show
5940 # Labels and keys based on merge state. Unresolved path conflicts show
5938 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5941 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5939 # resolved conflicts.
5942 # resolved conflicts.
5940 mergestateinfo = {
5943 mergestateinfo = {
5941 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5944 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5942 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5945 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5943 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5946 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5944 b'resolve.unresolved',
5947 b'resolve.unresolved',
5945 b'P',
5948 b'P',
5946 ),
5949 ),
5947 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5950 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5948 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5951 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5949 b'resolve.driverresolved',
5952 b'resolve.driverresolved',
5950 b'D',
5953 b'D',
5951 ),
5954 ),
5952 }
5955 }
5953
5956
5954 for f in ms:
5957 for f in ms:
5955 if not m(f):
5958 if not m(f):
5956 continue
5959 continue
5957
5960
5958 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
5961 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
5959 continue
5962 continue
5960 label, key = mergestateinfo[ms[f]]
5963 label, key = mergestateinfo[ms[f]]
5961 fm.startitem()
5964 fm.startitem()
5962 fm.context(ctx=wctx)
5965 fm.context(ctx=wctx)
5963 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5966 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5964 fm.data(path=f)
5967 fm.data(path=f)
5965 fm.plain(b'%s\n' % uipathfn(f), label=label)
5968 fm.plain(b'%s\n' % uipathfn(f), label=label)
5966 fm.end()
5969 fm.end()
5967 return 0
5970 return 0
5968
5971
5969 with repo.wlock():
5972 with repo.wlock():
5970 ms = mergemod.mergestate.read(repo)
5973 ms = mergemod.mergestate.read(repo)
5971
5974
5972 if not (ms.active() or repo.dirstate.p2() != nullid):
5975 if not (ms.active() or repo.dirstate.p2() != nullid):
5973 raise error.Abort(
5976 raise error.Abort(
5974 _(b'resolve command not applicable when not merging')
5977 _(b'resolve command not applicable when not merging')
5975 )
5978 )
5976
5979
5977 wctx = repo[None]
5980 wctx = repo[None]
5978
5981
5979 if (
5982 if (
5980 ms.mergedriver
5983 ms.mergedriver
5981 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5984 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5982 ):
5985 ):
5983 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5986 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5984 ms.commit()
5987 ms.commit()
5985 # allow mark and unmark to go through
5988 # allow mark and unmark to go through
5986 if not mark and not unmark and not proceed:
5989 if not mark and not unmark and not proceed:
5987 return 1
5990 return 1
5988
5991
5989 m = scmutil.match(wctx, pats, opts)
5992 m = scmutil.match(wctx, pats, opts)
5990 ret = 0
5993 ret = 0
5991 didwork = False
5994 didwork = False
5992 runconclude = False
5995 runconclude = False
5993
5996
5994 tocomplete = []
5997 tocomplete = []
5995 hasconflictmarkers = []
5998 hasconflictmarkers = []
5996 if mark:
5999 if mark:
5997 markcheck = ui.config(b'commands', b'resolve.mark-check')
6000 markcheck = ui.config(b'commands', b'resolve.mark-check')
5998 if markcheck not in [b'warn', b'abort']:
6001 if markcheck not in [b'warn', b'abort']:
5999 # Treat all invalid / unrecognized values as 'none'.
6002 # Treat all invalid / unrecognized values as 'none'.
6000 markcheck = False
6003 markcheck = False
6001 for f in ms:
6004 for f in ms:
6002 if not m(f):
6005 if not m(f):
6003 continue
6006 continue
6004
6007
6005 didwork = True
6008 didwork = True
6006
6009
6007 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
6010 if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
6008 continue
6011 continue
6009
6012
6010 # don't let driver-resolved files be marked, and run the conclude
6013 # don't let driver-resolved files be marked, and run the conclude
6011 # step if asked to resolve
6014 # step if asked to resolve
6012 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6015 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6013 exact = m.exact(f)
6016 exact = m.exact(f)
6014 if mark:
6017 if mark:
6015 if exact:
6018 if exact:
6016 ui.warn(
6019 ui.warn(
6017 _(b'not marking %s as it is driver-resolved\n')
6020 _(b'not marking %s as it is driver-resolved\n')
6018 % uipathfn(f)
6021 % uipathfn(f)
6019 )
6022 )
6020 elif unmark:
6023 elif unmark:
6021 if exact:
6024 if exact:
6022 ui.warn(
6025 ui.warn(
6023 _(b'not unmarking %s as it is driver-resolved\n')
6026 _(b'not unmarking %s as it is driver-resolved\n')
6024 % uipathfn(f)
6027 % uipathfn(f)
6025 )
6028 )
6026 else:
6029 else:
6027 runconclude = True
6030 runconclude = True
6028 continue
6031 continue
6029
6032
6030 # path conflicts must be resolved manually
6033 # path conflicts must be resolved manually
6031 if ms[f] in (
6034 if ms[f] in (
6032 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6035 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6033 mergemod.MERGE_RECORD_RESOLVED_PATH,
6036 mergemod.MERGE_RECORD_RESOLVED_PATH,
6034 ):
6037 ):
6035 if mark:
6038 if mark:
6036 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6039 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6037 elif unmark:
6040 elif unmark:
6038 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6041 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6039 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6042 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6040 ui.warn(
6043 ui.warn(
6041 _(b'%s: path conflict must be resolved manually\n')
6044 _(b'%s: path conflict must be resolved manually\n')
6042 % uipathfn(f)
6045 % uipathfn(f)
6043 )
6046 )
6044 continue
6047 continue
6045
6048
6046 if mark:
6049 if mark:
6047 if markcheck:
6050 if markcheck:
6048 fdata = repo.wvfs.tryread(f)
6051 fdata = repo.wvfs.tryread(f)
6049 if (
6052 if (
6050 filemerge.hasconflictmarkers(fdata)
6053 filemerge.hasconflictmarkers(fdata)
6051 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6054 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6052 ):
6055 ):
6053 hasconflictmarkers.append(f)
6056 hasconflictmarkers.append(f)
6054 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6057 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6055 elif unmark:
6058 elif unmark:
6056 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6059 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6057 else:
6060 else:
6058 # backup pre-resolve (merge uses .orig for its own purposes)
6061 # backup pre-resolve (merge uses .orig for its own purposes)
6059 a = repo.wjoin(f)
6062 a = repo.wjoin(f)
6060 try:
6063 try:
6061 util.copyfile(a, a + b".resolve")
6064 util.copyfile(a, a + b".resolve")
6062 except (IOError, OSError) as inst:
6065 except (IOError, OSError) as inst:
6063 if inst.errno != errno.ENOENT:
6066 if inst.errno != errno.ENOENT:
6064 raise
6067 raise
6065
6068
6066 try:
6069 try:
6067 # preresolve file
6070 # preresolve file
6068 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6071 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6069 with ui.configoverride(overrides, b'resolve'):
6072 with ui.configoverride(overrides, b'resolve'):
6070 complete, r = ms.preresolve(f, wctx)
6073 complete, r = ms.preresolve(f, wctx)
6071 if not complete:
6074 if not complete:
6072 tocomplete.append(f)
6075 tocomplete.append(f)
6073 elif r:
6076 elif r:
6074 ret = 1
6077 ret = 1
6075 finally:
6078 finally:
6076 ms.commit()
6079 ms.commit()
6077
6080
6078 # replace filemerge's .orig file with our resolve file, but only
6081 # replace filemerge's .orig file with our resolve file, but only
6079 # for merges that are complete
6082 # for merges that are complete
6080 if complete:
6083 if complete:
6081 try:
6084 try:
6082 util.rename(
6085 util.rename(
6083 a + b".resolve", scmutil.backuppath(ui, repo, f)
6086 a + b".resolve", scmutil.backuppath(ui, repo, f)
6084 )
6087 )
6085 except OSError as inst:
6088 except OSError as inst:
6086 if inst.errno != errno.ENOENT:
6089 if inst.errno != errno.ENOENT:
6087 raise
6090 raise
6088
6091
6089 if hasconflictmarkers:
6092 if hasconflictmarkers:
6090 ui.warn(
6093 ui.warn(
6091 _(
6094 _(
6092 b'warning: the following files still have conflict '
6095 b'warning: the following files still have conflict '
6093 b'markers:\n'
6096 b'markers:\n'
6094 )
6097 )
6095 + b''.join(
6098 + b''.join(
6096 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6099 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6097 )
6100 )
6098 )
6101 )
6099 if markcheck == b'abort' and not all and not pats:
6102 if markcheck == b'abort' and not all and not pats:
6100 raise error.Abort(
6103 raise error.Abort(
6101 _(b'conflict markers detected'),
6104 _(b'conflict markers detected'),
6102 hint=_(b'use --all to mark anyway'),
6105 hint=_(b'use --all to mark anyway'),
6103 )
6106 )
6104
6107
6105 for f in tocomplete:
6108 for f in tocomplete:
6106 try:
6109 try:
6107 # resolve file
6110 # resolve file
6108 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6111 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6109 with ui.configoverride(overrides, b'resolve'):
6112 with ui.configoverride(overrides, b'resolve'):
6110 r = ms.resolve(f, wctx)
6113 r = ms.resolve(f, wctx)
6111 if r:
6114 if r:
6112 ret = 1
6115 ret = 1
6113 finally:
6116 finally:
6114 ms.commit()
6117 ms.commit()
6115
6118
6116 # replace filemerge's .orig file with our resolve file
6119 # replace filemerge's .orig file with our resolve file
6117 a = repo.wjoin(f)
6120 a = repo.wjoin(f)
6118 try:
6121 try:
6119 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6122 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6120 except OSError as inst:
6123 except OSError as inst:
6121 if inst.errno != errno.ENOENT:
6124 if inst.errno != errno.ENOENT:
6122 raise
6125 raise
6123
6126
6124 ms.commit()
6127 ms.commit()
6125 ms.recordactions()
6128 ms.recordactions()
6126
6129
6127 if not didwork and pats:
6130 if not didwork and pats:
6128 hint = None
6131 hint = None
6129 if not any([p for p in pats if p.find(b':') >= 0]):
6132 if not any([p for p in pats if p.find(b':') >= 0]):
6130 pats = [b'path:%s' % p for p in pats]
6133 pats = [b'path:%s' % p for p in pats]
6131 m = scmutil.match(wctx, pats, opts)
6134 m = scmutil.match(wctx, pats, opts)
6132 for f in ms:
6135 for f in ms:
6133 if not m(f):
6136 if not m(f):
6134 continue
6137 continue
6135
6138
6136 def flag(o):
6139 def flag(o):
6137 if o == b're_merge':
6140 if o == b're_merge':
6138 return b'--re-merge '
6141 return b'--re-merge '
6139 return b'-%s ' % o[0:1]
6142 return b'-%s ' % o[0:1]
6140
6143
6141 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6144 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6142 hint = _(b"(try: hg resolve %s%s)\n") % (
6145 hint = _(b"(try: hg resolve %s%s)\n") % (
6143 flags,
6146 flags,
6144 b' '.join(pats),
6147 b' '.join(pats),
6145 )
6148 )
6146 break
6149 break
6147 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6150 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6148 if hint:
6151 if hint:
6149 ui.warn(hint)
6152 ui.warn(hint)
6150 elif ms.mergedriver and ms.mdstate() != b's':
6153 elif ms.mergedriver and ms.mdstate() != b's':
6151 # run conclude step when either a driver-resolved file is requested
6154 # run conclude step when either a driver-resolved file is requested
6152 # or there are no driver-resolved files
6155 # or there are no driver-resolved files
6153 # we can't use 'ret' to determine whether any files are unresolved
6156 # we can't use 'ret' to determine whether any files are unresolved
6154 # because we might not have tried to resolve some
6157 # because we might not have tried to resolve some
6155 if (runconclude or not list(ms.driverresolved())) and not list(
6158 if (runconclude or not list(ms.driverresolved())) and not list(
6156 ms.unresolved()
6159 ms.unresolved()
6157 ):
6160 ):
6158 proceed = mergemod.driverconclude(repo, ms, wctx)
6161 proceed = mergemod.driverconclude(repo, ms, wctx)
6159 ms.commit()
6162 ms.commit()
6160 if not proceed:
6163 if not proceed:
6161 return 1
6164 return 1
6162
6165
6163 # Nudge users into finishing an unfinished operation
6166 # Nudge users into finishing an unfinished operation
6164 unresolvedf = list(ms.unresolved())
6167 unresolvedf = list(ms.unresolved())
6165 driverresolvedf = list(ms.driverresolved())
6168 driverresolvedf = list(ms.driverresolved())
6166 if not unresolvedf and not driverresolvedf:
6169 if not unresolvedf and not driverresolvedf:
6167 ui.status(_(b'(no more unresolved files)\n'))
6170 ui.status(_(b'(no more unresolved files)\n'))
6168 cmdutil.checkafterresolved(repo)
6171 cmdutil.checkafterresolved(repo)
6169 elif not unresolvedf:
6172 elif not unresolvedf:
6170 ui.status(
6173 ui.status(
6171 _(
6174 _(
6172 b'(no more unresolved files -- '
6175 b'(no more unresolved files -- '
6173 b'run "hg resolve --all" to conclude)\n'
6176 b'run "hg resolve --all" to conclude)\n'
6174 )
6177 )
6175 )
6178 )
6176
6179
6177 return ret
6180 return ret
6178
6181
6179
6182
6180 @command(
6183 @command(
6181 b'revert',
6184 b'revert',
6182 [
6185 [
6183 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6186 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6184 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6187 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6185 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6188 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6186 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6189 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6187 (b'i', b'interactive', None, _(b'interactively select the changes')),
6190 (b'i', b'interactive', None, _(b'interactively select the changes')),
6188 ]
6191 ]
6189 + walkopts
6192 + walkopts
6190 + dryrunopts,
6193 + dryrunopts,
6191 _(b'[OPTION]... [-r REV] [NAME]...'),
6194 _(b'[OPTION]... [-r REV] [NAME]...'),
6192 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6195 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6193 )
6196 )
6194 def revert(ui, repo, *pats, **opts):
6197 def revert(ui, repo, *pats, **opts):
6195 """restore files to their checkout state
6198 """restore files to their checkout state
6196
6199
6197 .. note::
6200 .. note::
6198
6201
6199 To check out earlier revisions, you should use :hg:`update REV`.
6202 To check out earlier revisions, you should use :hg:`update REV`.
6200 To cancel an uncommitted merge (and lose your changes),
6203 To cancel an uncommitted merge (and lose your changes),
6201 use :hg:`merge --abort`.
6204 use :hg:`merge --abort`.
6202
6205
6203 With no revision specified, revert the specified files or directories
6206 With no revision specified, revert the specified files or directories
6204 to the contents they had in the parent of the working directory.
6207 to the contents they had in the parent of the working directory.
6205 This restores the contents of files to an unmodified
6208 This restores the contents of files to an unmodified
6206 state and unschedules adds, removes, copies, and renames. If the
6209 state and unschedules adds, removes, copies, and renames. If the
6207 working directory has two parents, you must explicitly specify a
6210 working directory has two parents, you must explicitly specify a
6208 revision.
6211 revision.
6209
6212
6210 Using the -r/--rev or -d/--date options, revert the given files or
6213 Using the -r/--rev or -d/--date options, revert the given files or
6211 directories to their states as of a specific revision. Because
6214 directories to their states as of a specific revision. Because
6212 revert does not change the working directory parents, this will
6215 revert does not change the working directory parents, this will
6213 cause these files to appear modified. This can be helpful to "back
6216 cause these files to appear modified. This can be helpful to "back
6214 out" some or all of an earlier change. See :hg:`backout` for a
6217 out" some or all of an earlier change. See :hg:`backout` for a
6215 related method.
6218 related method.
6216
6219
6217 Modified files are saved with a .orig suffix before reverting.
6220 Modified files are saved with a .orig suffix before reverting.
6218 To disable these backups, use --no-backup. It is possible to store
6221 To disable these backups, use --no-backup. It is possible to store
6219 the backup files in a custom directory relative to the root of the
6222 the backup files in a custom directory relative to the root of the
6220 repository by setting the ``ui.origbackuppath`` configuration
6223 repository by setting the ``ui.origbackuppath`` configuration
6221 option.
6224 option.
6222
6225
6223 See :hg:`help dates` for a list of formats valid for -d/--date.
6226 See :hg:`help dates` for a list of formats valid for -d/--date.
6224
6227
6225 See :hg:`help backout` for a way to reverse the effect of an
6228 See :hg:`help backout` for a way to reverse the effect of an
6226 earlier changeset.
6229 earlier changeset.
6227
6230
6228 Returns 0 on success.
6231 Returns 0 on success.
6229 """
6232 """
6230
6233
6231 opts = pycompat.byteskwargs(opts)
6234 opts = pycompat.byteskwargs(opts)
6232 if opts.get(b"date"):
6235 if opts.get(b"date"):
6233 if opts.get(b"rev"):
6236 if opts.get(b"rev"):
6234 raise error.Abort(_(b"you can't specify a revision and a date"))
6237 raise error.Abort(_(b"you can't specify a revision and a date"))
6235 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6238 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6236
6239
6237 parent, p2 = repo.dirstate.parents()
6240 parent, p2 = repo.dirstate.parents()
6238 if not opts.get(b'rev') and p2 != nullid:
6241 if not opts.get(b'rev') and p2 != nullid:
6239 # revert after merge is a trap for new users (issue2915)
6242 # revert after merge is a trap for new users (issue2915)
6240 raise error.Abort(
6243 raise error.Abort(
6241 _(b'uncommitted merge with no revision specified'),
6244 _(b'uncommitted merge with no revision specified'),
6242 hint=_(b"use 'hg update' or see 'hg help revert'"),
6245 hint=_(b"use 'hg update' or see 'hg help revert'"),
6243 )
6246 )
6244
6247
6245 rev = opts.get(b'rev')
6248 rev = opts.get(b'rev')
6246 if rev:
6249 if rev:
6247 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6250 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6248 ctx = scmutil.revsingle(repo, rev)
6251 ctx = scmutil.revsingle(repo, rev)
6249
6252
6250 if not (
6253 if not (
6251 pats
6254 pats
6252 or opts.get(b'include')
6255 or opts.get(b'include')
6253 or opts.get(b'exclude')
6256 or opts.get(b'exclude')
6254 or opts.get(b'all')
6257 or opts.get(b'all')
6255 or opts.get(b'interactive')
6258 or opts.get(b'interactive')
6256 ):
6259 ):
6257 msg = _(b"no files or directories specified")
6260 msg = _(b"no files or directories specified")
6258 if p2 != nullid:
6261 if p2 != nullid:
6259 hint = _(
6262 hint = _(
6260 b"uncommitted merge, use --all to discard all changes,"
6263 b"uncommitted merge, use --all to discard all changes,"
6261 b" or 'hg update -C .' to abort the merge"
6264 b" or 'hg update -C .' to abort the merge"
6262 )
6265 )
6263 raise error.Abort(msg, hint=hint)
6266 raise error.Abort(msg, hint=hint)
6264 dirty = any(repo.status())
6267 dirty = any(repo.status())
6265 node = ctx.node()
6268 node = ctx.node()
6266 if node != parent:
6269 if node != parent:
6267 if dirty:
6270 if dirty:
6268 hint = (
6271 hint = (
6269 _(
6272 _(
6270 b"uncommitted changes, use --all to discard all"
6273 b"uncommitted changes, use --all to discard all"
6271 b" changes, or 'hg update %d' to update"
6274 b" changes, or 'hg update %d' to update"
6272 )
6275 )
6273 % ctx.rev()
6276 % ctx.rev()
6274 )
6277 )
6275 else:
6278 else:
6276 hint = (
6279 hint = (
6277 _(
6280 _(
6278 b"use --all to revert all files,"
6281 b"use --all to revert all files,"
6279 b" or 'hg update %d' to update"
6282 b" or 'hg update %d' to update"
6280 )
6283 )
6281 % ctx.rev()
6284 % ctx.rev()
6282 )
6285 )
6283 elif dirty:
6286 elif dirty:
6284 hint = _(b"uncommitted changes, use --all to discard all changes")
6287 hint = _(b"uncommitted changes, use --all to discard all changes")
6285 else:
6288 else:
6286 hint = _(b"use --all to revert all files")
6289 hint = _(b"use --all to revert all files")
6287 raise error.Abort(msg, hint=hint)
6290 raise error.Abort(msg, hint=hint)
6288
6291
6289 return cmdutil.revert(
6292 return cmdutil.revert(
6290 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6293 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6291 )
6294 )
6292
6295
6293
6296
6294 @command(
6297 @command(
6295 b'rollback',
6298 b'rollback',
6296 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6299 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6297 helpcategory=command.CATEGORY_MAINTENANCE,
6300 helpcategory=command.CATEGORY_MAINTENANCE,
6298 )
6301 )
6299 def rollback(ui, repo, **opts):
6302 def rollback(ui, repo, **opts):
6300 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6303 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6301
6304
6302 Please use :hg:`commit --amend` instead of rollback to correct
6305 Please use :hg:`commit --amend` instead of rollback to correct
6303 mistakes in the last commit.
6306 mistakes in the last commit.
6304
6307
6305 This command should be used with care. There is only one level of
6308 This command should be used with care. There is only one level of
6306 rollback, and there is no way to undo a rollback. It will also
6309 rollback, and there is no way to undo a rollback. It will also
6307 restore the dirstate at the time of the last transaction, losing
6310 restore the dirstate at the time of the last transaction, losing
6308 any dirstate changes since that time. This command does not alter
6311 any dirstate changes since that time. This command does not alter
6309 the working directory.
6312 the working directory.
6310
6313
6311 Transactions are used to encapsulate the effects of all commands
6314 Transactions are used to encapsulate the effects of all commands
6312 that create new changesets or propagate existing changesets into a
6315 that create new changesets or propagate existing changesets into a
6313 repository.
6316 repository.
6314
6317
6315 .. container:: verbose
6318 .. container:: verbose
6316
6319
6317 For example, the following commands are transactional, and their
6320 For example, the following commands are transactional, and their
6318 effects can be rolled back:
6321 effects can be rolled back:
6319
6322
6320 - commit
6323 - commit
6321 - import
6324 - import
6322 - pull
6325 - pull
6323 - push (with this repository as the destination)
6326 - push (with this repository as the destination)
6324 - unbundle
6327 - unbundle
6325
6328
6326 To avoid permanent data loss, rollback will refuse to rollback a
6329 To avoid permanent data loss, rollback will refuse to rollback a
6327 commit transaction if it isn't checked out. Use --force to
6330 commit transaction if it isn't checked out. Use --force to
6328 override this protection.
6331 override this protection.
6329
6332
6330 The rollback command can be entirely disabled by setting the
6333 The rollback command can be entirely disabled by setting the
6331 ``ui.rollback`` configuration setting to false. If you're here
6334 ``ui.rollback`` configuration setting to false. If you're here
6332 because you want to use rollback and it's disabled, you can
6335 because you want to use rollback and it's disabled, you can
6333 re-enable the command by setting ``ui.rollback`` to true.
6336 re-enable the command by setting ``ui.rollback`` to true.
6334
6337
6335 This command is not intended for use on public repositories. Once
6338 This command is not intended for use on public repositories. Once
6336 changes are visible for pull by other users, rolling a transaction
6339 changes are visible for pull by other users, rolling a transaction
6337 back locally is ineffective (someone else may already have pulled
6340 back locally is ineffective (someone else may already have pulled
6338 the changes). Furthermore, a race is possible with readers of the
6341 the changes). Furthermore, a race is possible with readers of the
6339 repository; for example an in-progress pull from the repository
6342 repository; for example an in-progress pull from the repository
6340 may fail if a rollback is performed.
6343 may fail if a rollback is performed.
6341
6344
6342 Returns 0 on success, 1 if no rollback data is available.
6345 Returns 0 on success, 1 if no rollback data is available.
6343 """
6346 """
6344 if not ui.configbool(b'ui', b'rollback'):
6347 if not ui.configbool(b'ui', b'rollback'):
6345 raise error.Abort(
6348 raise error.Abort(
6346 _(b'rollback is disabled because it is unsafe'),
6349 _(b'rollback is disabled because it is unsafe'),
6347 hint=b'see `hg help -v rollback` for information',
6350 hint=b'see `hg help -v rollback` for information',
6348 )
6351 )
6349 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6352 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6350
6353
6351
6354
6352 @command(
6355 @command(
6353 b'root',
6356 b'root',
6354 [] + formatteropts,
6357 [] + formatteropts,
6355 intents={INTENT_READONLY},
6358 intents={INTENT_READONLY},
6356 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6359 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6357 )
6360 )
6358 def root(ui, repo, **opts):
6361 def root(ui, repo, **opts):
6359 """print the root (top) of the current working directory
6362 """print the root (top) of the current working directory
6360
6363
6361 Print the root directory of the current repository.
6364 Print the root directory of the current repository.
6362
6365
6363 .. container:: verbose
6366 .. container:: verbose
6364
6367
6365 Template:
6368 Template:
6366
6369
6367 The following keywords are supported in addition to the common template
6370 The following keywords are supported in addition to the common template
6368 keywords and functions. See also :hg:`help templates`.
6371 keywords and functions. See also :hg:`help templates`.
6369
6372
6370 :hgpath: String. Path to the .hg directory.
6373 :hgpath: String. Path to the .hg directory.
6371 :storepath: String. Path to the directory holding versioned data.
6374 :storepath: String. Path to the directory holding versioned data.
6372
6375
6373 Returns 0 on success.
6376 Returns 0 on success.
6374 """
6377 """
6375 opts = pycompat.byteskwargs(opts)
6378 opts = pycompat.byteskwargs(opts)
6376 with ui.formatter(b'root', opts) as fm:
6379 with ui.formatter(b'root', opts) as fm:
6377 fm.startitem()
6380 fm.startitem()
6378 fm.write(b'reporoot', b'%s\n', repo.root)
6381 fm.write(b'reporoot', b'%s\n', repo.root)
6379 fm.data(hgpath=repo.path, storepath=repo.spath)
6382 fm.data(hgpath=repo.path, storepath=repo.spath)
6380
6383
6381
6384
6382 @command(
6385 @command(
6383 b'serve',
6386 b'serve',
6384 [
6387 [
6385 (
6388 (
6386 b'A',
6389 b'A',
6387 b'accesslog',
6390 b'accesslog',
6388 b'',
6391 b'',
6389 _(b'name of access log file to write to'),
6392 _(b'name of access log file to write to'),
6390 _(b'FILE'),
6393 _(b'FILE'),
6391 ),
6394 ),
6392 (b'd', b'daemon', None, _(b'run server in background')),
6395 (b'd', b'daemon', None, _(b'run server in background')),
6393 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6396 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6394 (
6397 (
6395 b'E',
6398 b'E',
6396 b'errorlog',
6399 b'errorlog',
6397 b'',
6400 b'',
6398 _(b'name of error log file to write to'),
6401 _(b'name of error log file to write to'),
6399 _(b'FILE'),
6402 _(b'FILE'),
6400 ),
6403 ),
6401 # use string type, then we can check if something was passed
6404 # use string type, then we can check if something was passed
6402 (
6405 (
6403 b'p',
6406 b'p',
6404 b'port',
6407 b'port',
6405 b'',
6408 b'',
6406 _(b'port to listen on (default: 8000)'),
6409 _(b'port to listen on (default: 8000)'),
6407 _(b'PORT'),
6410 _(b'PORT'),
6408 ),
6411 ),
6409 (
6412 (
6410 b'a',
6413 b'a',
6411 b'address',
6414 b'address',
6412 b'',
6415 b'',
6413 _(b'address to listen on (default: all interfaces)'),
6416 _(b'address to listen on (default: all interfaces)'),
6414 _(b'ADDR'),
6417 _(b'ADDR'),
6415 ),
6418 ),
6416 (
6419 (
6417 b'',
6420 b'',
6418 b'prefix',
6421 b'prefix',
6419 b'',
6422 b'',
6420 _(b'prefix path to serve from (default: server root)'),
6423 _(b'prefix path to serve from (default: server root)'),
6421 _(b'PREFIX'),
6424 _(b'PREFIX'),
6422 ),
6425 ),
6423 (
6426 (
6424 b'n',
6427 b'n',
6425 b'name',
6428 b'name',
6426 b'',
6429 b'',
6427 _(b'name to show in web pages (default: working directory)'),
6430 _(b'name to show in web pages (default: working directory)'),
6428 _(b'NAME'),
6431 _(b'NAME'),
6429 ),
6432 ),
6430 (
6433 (
6431 b'',
6434 b'',
6432 b'web-conf',
6435 b'web-conf',
6433 b'',
6436 b'',
6434 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6437 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6435 _(b'FILE'),
6438 _(b'FILE'),
6436 ),
6439 ),
6437 (
6440 (
6438 b'',
6441 b'',
6439 b'webdir-conf',
6442 b'webdir-conf',
6440 b'',
6443 b'',
6441 _(b'name of the hgweb config file (DEPRECATED)'),
6444 _(b'name of the hgweb config file (DEPRECATED)'),
6442 _(b'FILE'),
6445 _(b'FILE'),
6443 ),
6446 ),
6444 (
6447 (
6445 b'',
6448 b'',
6446 b'pid-file',
6449 b'pid-file',
6447 b'',
6450 b'',
6448 _(b'name of file to write process ID to'),
6451 _(b'name of file to write process ID to'),
6449 _(b'FILE'),
6452 _(b'FILE'),
6450 ),
6453 ),
6451 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6454 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6452 (
6455 (
6453 b'',
6456 b'',
6454 b'cmdserver',
6457 b'cmdserver',
6455 b'',
6458 b'',
6456 _(b'for remote clients (ADVANCED)'),
6459 _(b'for remote clients (ADVANCED)'),
6457 _(b'MODE'),
6460 _(b'MODE'),
6458 ),
6461 ),
6459 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6462 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6460 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6463 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6461 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6464 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6462 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6465 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6463 (b'', b'print-url', None, _(b'start and print only the URL')),
6466 (b'', b'print-url', None, _(b'start and print only the URL')),
6464 ]
6467 ]
6465 + subrepoopts,
6468 + subrepoopts,
6466 _(b'[OPTION]...'),
6469 _(b'[OPTION]...'),
6467 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6470 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6468 helpbasic=True,
6471 helpbasic=True,
6469 optionalrepo=True,
6472 optionalrepo=True,
6470 )
6473 )
6471 def serve(ui, repo, **opts):
6474 def serve(ui, repo, **opts):
6472 """start stand-alone webserver
6475 """start stand-alone webserver
6473
6476
6474 Start a local HTTP repository browser and pull server. You can use
6477 Start a local HTTP repository browser and pull server. You can use
6475 this for ad-hoc sharing and browsing of repositories. It is
6478 this for ad-hoc sharing and browsing of repositories. It is
6476 recommended to use a real web server to serve a repository for
6479 recommended to use a real web server to serve a repository for
6477 longer periods of time.
6480 longer periods of time.
6478
6481
6479 Please note that the server does not implement access control.
6482 Please note that the server does not implement access control.
6480 This means that, by default, anybody can read from the server and
6483 This means that, by default, anybody can read from the server and
6481 nobody can write to it by default. Set the ``web.allow-push``
6484 nobody can write to it by default. Set the ``web.allow-push``
6482 option to ``*`` to allow everybody to push to the server. You
6485 option to ``*`` to allow everybody to push to the server. You
6483 should use a real web server if you need to authenticate users.
6486 should use a real web server if you need to authenticate users.
6484
6487
6485 By default, the server logs accesses to stdout and errors to
6488 By default, the server logs accesses to stdout and errors to
6486 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6489 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6487 files.
6490 files.
6488
6491
6489 To have the server choose a free port number to listen on, specify
6492 To have the server choose a free port number to listen on, specify
6490 a port number of 0; in this case, the server will print the port
6493 a port number of 0; in this case, the server will print the port
6491 number it uses.
6494 number it uses.
6492
6495
6493 Returns 0 on success.
6496 Returns 0 on success.
6494 """
6497 """
6495
6498
6496 opts = pycompat.byteskwargs(opts)
6499 opts = pycompat.byteskwargs(opts)
6497 if opts[b"stdio"] and opts[b"cmdserver"]:
6500 if opts[b"stdio"] and opts[b"cmdserver"]:
6498 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6501 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6499 if opts[b"print_url"] and ui.verbose:
6502 if opts[b"print_url"] and ui.verbose:
6500 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6503 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6501
6504
6502 if opts[b"stdio"]:
6505 if opts[b"stdio"]:
6503 if repo is None:
6506 if repo is None:
6504 raise error.RepoError(
6507 raise error.RepoError(
6505 _(b"there is no Mercurial repository here (.hg not found)")
6508 _(b"there is no Mercurial repository here (.hg not found)")
6506 )
6509 )
6507 s = wireprotoserver.sshserver(ui, repo)
6510 s = wireprotoserver.sshserver(ui, repo)
6508 s.serve_forever()
6511 s.serve_forever()
6509
6512
6510 service = server.createservice(ui, repo, opts)
6513 service = server.createservice(ui, repo, opts)
6511 return server.runservice(opts, initfn=service.init, runfn=service.run)
6514 return server.runservice(opts, initfn=service.init, runfn=service.run)
6512
6515
6513
6516
6514 @command(
6517 @command(
6515 b'shelve',
6518 b'shelve',
6516 [
6519 [
6517 (
6520 (
6518 b'A',
6521 b'A',
6519 b'addremove',
6522 b'addremove',
6520 None,
6523 None,
6521 _(b'mark new/missing files as added/removed before shelving'),
6524 _(b'mark new/missing files as added/removed before shelving'),
6522 ),
6525 ),
6523 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6526 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6524 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6527 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6525 (
6528 (
6526 b'',
6529 b'',
6527 b'date',
6530 b'date',
6528 b'',
6531 b'',
6529 _(b'shelve with the specified commit date'),
6532 _(b'shelve with the specified commit date'),
6530 _(b'DATE'),
6533 _(b'DATE'),
6531 ),
6534 ),
6532 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6535 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6533 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6536 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6534 (
6537 (
6535 b'k',
6538 b'k',
6536 b'keep',
6539 b'keep',
6537 False,
6540 False,
6538 _(b'shelve, but keep changes in the working directory'),
6541 _(b'shelve, but keep changes in the working directory'),
6539 ),
6542 ),
6540 (b'l', b'list', None, _(b'list current shelves')),
6543 (b'l', b'list', None, _(b'list current shelves')),
6541 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6544 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6542 (
6545 (
6543 b'n',
6546 b'n',
6544 b'name',
6547 b'name',
6545 b'',
6548 b'',
6546 _(b'use the given name for the shelved commit'),
6549 _(b'use the given name for the shelved commit'),
6547 _(b'NAME'),
6550 _(b'NAME'),
6548 ),
6551 ),
6549 (
6552 (
6550 b'p',
6553 b'p',
6551 b'patch',
6554 b'patch',
6552 None,
6555 None,
6553 _(
6556 _(
6554 b'output patches for changes (provide the names of the shelved '
6557 b'output patches for changes (provide the names of the shelved '
6555 b'changes as positional arguments)'
6558 b'changes as positional arguments)'
6556 ),
6559 ),
6557 ),
6560 ),
6558 (b'i', b'interactive', None, _(b'interactive mode')),
6561 (b'i', b'interactive', None, _(b'interactive mode')),
6559 (
6562 (
6560 b'',
6563 b'',
6561 b'stat',
6564 b'stat',
6562 None,
6565 None,
6563 _(
6566 _(
6564 b'output diffstat-style summary of changes (provide the names of '
6567 b'output diffstat-style summary of changes (provide the names of '
6565 b'the shelved changes as positional arguments)'
6568 b'the shelved changes as positional arguments)'
6566 ),
6569 ),
6567 ),
6570 ),
6568 ]
6571 ]
6569 + cmdutil.walkopts,
6572 + cmdutil.walkopts,
6570 _(b'hg shelve [OPTION]... [FILE]...'),
6573 _(b'hg shelve [OPTION]... [FILE]...'),
6571 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6574 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6572 )
6575 )
6573 def shelve(ui, repo, *pats, **opts):
6576 def shelve(ui, repo, *pats, **opts):
6574 '''save and set aside changes from the working directory
6577 '''save and set aside changes from the working directory
6575
6578
6576 Shelving takes files that "hg status" reports as not clean, saves
6579 Shelving takes files that "hg status" reports as not clean, saves
6577 the modifications to a bundle (a shelved change), and reverts the
6580 the modifications to a bundle (a shelved change), and reverts the
6578 files so that their state in the working directory becomes clean.
6581 files so that their state in the working directory becomes clean.
6579
6582
6580 To restore these changes to the working directory, using "hg
6583 To restore these changes to the working directory, using "hg
6581 unshelve"; this will work even if you switch to a different
6584 unshelve"; this will work even if you switch to a different
6582 commit.
6585 commit.
6583
6586
6584 When no files are specified, "hg shelve" saves all not-clean
6587 When no files are specified, "hg shelve" saves all not-clean
6585 files. If specific files or directories are named, only changes to
6588 files. If specific files or directories are named, only changes to
6586 those files are shelved.
6589 those files are shelved.
6587
6590
6588 In bare shelve (when no files are specified, without interactive,
6591 In bare shelve (when no files are specified, without interactive,
6589 include and exclude option), shelving remembers information if the
6592 include and exclude option), shelving remembers information if the
6590 working directory was on newly created branch, in other words working
6593 working directory was on newly created branch, in other words working
6591 directory was on different branch than its first parent. In this
6594 directory was on different branch than its first parent. In this
6592 situation unshelving restores branch information to the working directory.
6595 situation unshelving restores branch information to the working directory.
6593
6596
6594 Each shelved change has a name that makes it easier to find later.
6597 Each shelved change has a name that makes it easier to find later.
6595 The name of a shelved change defaults to being based on the active
6598 The name of a shelved change defaults to being based on the active
6596 bookmark, or if there is no active bookmark, the current named
6599 bookmark, or if there is no active bookmark, the current named
6597 branch. To specify a different name, use ``--name``.
6600 branch. To specify a different name, use ``--name``.
6598
6601
6599 To see a list of existing shelved changes, use the ``--list``
6602 To see a list of existing shelved changes, use the ``--list``
6600 option. For each shelved change, this will print its name, age,
6603 option. For each shelved change, this will print its name, age,
6601 and description; use ``--patch`` or ``--stat`` for more details.
6604 and description; use ``--patch`` or ``--stat`` for more details.
6602
6605
6603 To delete specific shelved changes, use ``--delete``. To delete
6606 To delete specific shelved changes, use ``--delete``. To delete
6604 all shelved changes, use ``--cleanup``.
6607 all shelved changes, use ``--cleanup``.
6605 '''
6608 '''
6606 opts = pycompat.byteskwargs(opts)
6609 opts = pycompat.byteskwargs(opts)
6607 allowables = [
6610 allowables = [
6608 (b'addremove', {b'create'}), # 'create' is pseudo action
6611 (b'addremove', {b'create'}), # 'create' is pseudo action
6609 (b'unknown', {b'create'}),
6612 (b'unknown', {b'create'}),
6610 (b'cleanup', {b'cleanup'}),
6613 (b'cleanup', {b'cleanup'}),
6611 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6614 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6612 (b'delete', {b'delete'}),
6615 (b'delete', {b'delete'}),
6613 (b'edit', {b'create'}),
6616 (b'edit', {b'create'}),
6614 (b'keep', {b'create'}),
6617 (b'keep', {b'create'}),
6615 (b'list', {b'list'}),
6618 (b'list', {b'list'}),
6616 (b'message', {b'create'}),
6619 (b'message', {b'create'}),
6617 (b'name', {b'create'}),
6620 (b'name', {b'create'}),
6618 (b'patch', {b'patch', b'list'}),
6621 (b'patch', {b'patch', b'list'}),
6619 (b'stat', {b'stat', b'list'}),
6622 (b'stat', {b'stat', b'list'}),
6620 ]
6623 ]
6621
6624
6622 def checkopt(opt):
6625 def checkopt(opt):
6623 if opts.get(opt):
6626 if opts.get(opt):
6624 for i, allowable in allowables:
6627 for i, allowable in allowables:
6625 if opts[i] and opt not in allowable:
6628 if opts[i] and opt not in allowable:
6626 raise error.Abort(
6629 raise error.Abort(
6627 _(
6630 _(
6628 b"options '--%s' and '--%s' may not be "
6631 b"options '--%s' and '--%s' may not be "
6629 b"used together"
6632 b"used together"
6630 )
6633 )
6631 % (opt, i)
6634 % (opt, i)
6632 )
6635 )
6633 return True
6636 return True
6634
6637
6635 if checkopt(b'cleanup'):
6638 if checkopt(b'cleanup'):
6636 if pats:
6639 if pats:
6637 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6640 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6638 return shelvemod.cleanupcmd(ui, repo)
6641 return shelvemod.cleanupcmd(ui, repo)
6639 elif checkopt(b'delete'):
6642 elif checkopt(b'delete'):
6640 return shelvemod.deletecmd(ui, repo, pats)
6643 return shelvemod.deletecmd(ui, repo, pats)
6641 elif checkopt(b'list'):
6644 elif checkopt(b'list'):
6642 return shelvemod.listcmd(ui, repo, pats, opts)
6645 return shelvemod.listcmd(ui, repo, pats, opts)
6643 elif checkopt(b'patch') or checkopt(b'stat'):
6646 elif checkopt(b'patch') or checkopt(b'stat'):
6644 return shelvemod.patchcmds(ui, repo, pats, opts)
6647 return shelvemod.patchcmds(ui, repo, pats, opts)
6645 else:
6648 else:
6646 return shelvemod.createcmd(ui, repo, pats, opts)
6649 return shelvemod.createcmd(ui, repo, pats, opts)
6647
6650
6648
6651
6649 _NOTTERSE = b'nothing'
6652 _NOTTERSE = b'nothing'
6650
6653
6651
6654
6652 @command(
6655 @command(
6653 b'status|st',
6656 b'status|st',
6654 [
6657 [
6655 (b'A', b'all', None, _(b'show status of all files')),
6658 (b'A', b'all', None, _(b'show status of all files')),
6656 (b'm', b'modified', None, _(b'show only modified files')),
6659 (b'm', b'modified', None, _(b'show only modified files')),
6657 (b'a', b'added', None, _(b'show only added files')),
6660 (b'a', b'added', None, _(b'show only added files')),
6658 (b'r', b'removed', None, _(b'show only removed files')),
6661 (b'r', b'removed', None, _(b'show only removed files')),
6659 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6662 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6660 (b'c', b'clean', None, _(b'show only files without changes')),
6663 (b'c', b'clean', None, _(b'show only files without changes')),
6661 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6664 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6662 (b'i', b'ignored', None, _(b'show only ignored files')),
6665 (b'i', b'ignored', None, _(b'show only ignored files')),
6663 (b'n', b'no-status', None, _(b'hide status prefix')),
6666 (b'n', b'no-status', None, _(b'hide status prefix')),
6664 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6667 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6665 (
6668 (
6666 b'C',
6669 b'C',
6667 b'copies',
6670 b'copies',
6668 None,
6671 None,
6669 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6672 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6670 ),
6673 ),
6671 (
6674 (
6672 b'0',
6675 b'0',
6673 b'print0',
6676 b'print0',
6674 None,
6677 None,
6675 _(b'end filenames with NUL, for use with xargs'),
6678 _(b'end filenames with NUL, for use with xargs'),
6676 ),
6679 ),
6677 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6680 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6678 (
6681 (
6679 b'',
6682 b'',
6680 b'change',
6683 b'change',
6681 b'',
6684 b'',
6682 _(b'list the changed files of a revision'),
6685 _(b'list the changed files of a revision'),
6683 _(b'REV'),
6686 _(b'REV'),
6684 ),
6687 ),
6685 ]
6688 ]
6686 + walkopts
6689 + walkopts
6687 + subrepoopts
6690 + subrepoopts
6688 + formatteropts,
6691 + formatteropts,
6689 _(b'[OPTION]... [FILE]...'),
6692 _(b'[OPTION]... [FILE]...'),
6690 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6693 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6691 helpbasic=True,
6694 helpbasic=True,
6692 inferrepo=True,
6695 inferrepo=True,
6693 intents={INTENT_READONLY},
6696 intents={INTENT_READONLY},
6694 )
6697 )
6695 def status(ui, repo, *pats, **opts):
6698 def status(ui, repo, *pats, **opts):
6696 """show changed files in the working directory
6699 """show changed files in the working directory
6697
6700
6698 Show status of files in the repository. If names are given, only
6701 Show status of files in the repository. If names are given, only
6699 files that match are shown. Files that are clean or ignored or
6702 files that match are shown. Files that are clean or ignored or
6700 the source of a copy/move operation, are not listed unless
6703 the source of a copy/move operation, are not listed unless
6701 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6704 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6702 Unless options described with "show only ..." are given, the
6705 Unless options described with "show only ..." are given, the
6703 options -mardu are used.
6706 options -mardu are used.
6704
6707
6705 Option -q/--quiet hides untracked (unknown and ignored) files
6708 Option -q/--quiet hides untracked (unknown and ignored) files
6706 unless explicitly requested with -u/--unknown or -i/--ignored.
6709 unless explicitly requested with -u/--unknown or -i/--ignored.
6707
6710
6708 .. note::
6711 .. note::
6709
6712
6710 :hg:`status` may appear to disagree with diff if permissions have
6713 :hg:`status` may appear to disagree with diff if permissions have
6711 changed or a merge has occurred. The standard diff format does
6714 changed or a merge has occurred. The standard diff format does
6712 not report permission changes and diff only reports changes
6715 not report permission changes and diff only reports changes
6713 relative to one merge parent.
6716 relative to one merge parent.
6714
6717
6715 If one revision is given, it is used as the base revision.
6718 If one revision is given, it is used as the base revision.
6716 If two revisions are given, the differences between them are
6719 If two revisions are given, the differences between them are
6717 shown. The --change option can also be used as a shortcut to list
6720 shown. The --change option can also be used as a shortcut to list
6718 the changed files of a revision from its first parent.
6721 the changed files of a revision from its first parent.
6719
6722
6720 The codes used to show the status of files are::
6723 The codes used to show the status of files are::
6721
6724
6722 M = modified
6725 M = modified
6723 A = added
6726 A = added
6724 R = removed
6727 R = removed
6725 C = clean
6728 C = clean
6726 ! = missing (deleted by non-hg command, but still tracked)
6729 ! = missing (deleted by non-hg command, but still tracked)
6727 ? = not tracked
6730 ? = not tracked
6728 I = ignored
6731 I = ignored
6729 = origin of the previous file (with --copies)
6732 = origin of the previous file (with --copies)
6730
6733
6731 .. container:: verbose
6734 .. container:: verbose
6732
6735
6733 The -t/--terse option abbreviates the output by showing only the directory
6736 The -t/--terse option abbreviates the output by showing only the directory
6734 name if all the files in it share the same status. The option takes an
6737 name if all the files in it share the same status. The option takes an
6735 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6738 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6736 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6739 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6737 for 'ignored' and 'c' for clean.
6740 for 'ignored' and 'c' for clean.
6738
6741
6739 It abbreviates only those statuses which are passed. Note that clean and
6742 It abbreviates only those statuses which are passed. Note that clean and
6740 ignored files are not displayed with '--terse ic' unless the -c/--clean
6743 ignored files are not displayed with '--terse ic' unless the -c/--clean
6741 and -i/--ignored options are also used.
6744 and -i/--ignored options are also used.
6742
6745
6743 The -v/--verbose option shows information when the repository is in an
6746 The -v/--verbose option shows information when the repository is in an
6744 unfinished merge, shelve, rebase state etc. You can have this behavior
6747 unfinished merge, shelve, rebase state etc. You can have this behavior
6745 turned on by default by enabling the ``commands.status.verbose`` option.
6748 turned on by default by enabling the ``commands.status.verbose`` option.
6746
6749
6747 You can skip displaying some of these states by setting
6750 You can skip displaying some of these states by setting
6748 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6751 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6749 'histedit', 'merge', 'rebase', or 'unshelve'.
6752 'histedit', 'merge', 'rebase', or 'unshelve'.
6750
6753
6751 Template:
6754 Template:
6752
6755
6753 The following keywords are supported in addition to the common template
6756 The following keywords are supported in addition to the common template
6754 keywords and functions. See also :hg:`help templates`.
6757 keywords and functions. See also :hg:`help templates`.
6755
6758
6756 :path: String. Repository-absolute path of the file.
6759 :path: String. Repository-absolute path of the file.
6757 :source: String. Repository-absolute path of the file originated from.
6760 :source: String. Repository-absolute path of the file originated from.
6758 Available if ``--copies`` is specified.
6761 Available if ``--copies`` is specified.
6759 :status: String. Character denoting file's status.
6762 :status: String. Character denoting file's status.
6760
6763
6761 Examples:
6764 Examples:
6762
6765
6763 - show changes in the working directory relative to a
6766 - show changes in the working directory relative to a
6764 changeset::
6767 changeset::
6765
6768
6766 hg status --rev 9353
6769 hg status --rev 9353
6767
6770
6768 - show changes in the working directory relative to the
6771 - show changes in the working directory relative to the
6769 current directory (see :hg:`help patterns` for more information)::
6772 current directory (see :hg:`help patterns` for more information)::
6770
6773
6771 hg status re:
6774 hg status re:
6772
6775
6773 - show all changes including copies in an existing changeset::
6776 - show all changes including copies in an existing changeset::
6774
6777
6775 hg status --copies --change 9353
6778 hg status --copies --change 9353
6776
6779
6777 - get a NUL separated list of added files, suitable for xargs::
6780 - get a NUL separated list of added files, suitable for xargs::
6778
6781
6779 hg status -an0
6782 hg status -an0
6780
6783
6781 - show more information about the repository status, abbreviating
6784 - show more information about the repository status, abbreviating
6782 added, removed, modified, deleted, and untracked paths::
6785 added, removed, modified, deleted, and untracked paths::
6783
6786
6784 hg status -v -t mardu
6787 hg status -v -t mardu
6785
6788
6786 Returns 0 on success.
6789 Returns 0 on success.
6787
6790
6788 """
6791 """
6789
6792
6790 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6793 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6791 opts = pycompat.byteskwargs(opts)
6794 opts = pycompat.byteskwargs(opts)
6792 revs = opts.get(b'rev')
6795 revs = opts.get(b'rev')
6793 change = opts.get(b'change')
6796 change = opts.get(b'change')
6794 terse = opts.get(b'terse')
6797 terse = opts.get(b'terse')
6795 if terse is _NOTTERSE:
6798 if terse is _NOTTERSE:
6796 if revs:
6799 if revs:
6797 terse = b''
6800 terse = b''
6798 else:
6801 else:
6799 terse = ui.config(b'commands', b'status.terse')
6802 terse = ui.config(b'commands', b'status.terse')
6800
6803
6801 if revs and terse:
6804 if revs and terse:
6802 msg = _(b'cannot use --terse with --rev')
6805 msg = _(b'cannot use --terse with --rev')
6803 raise error.Abort(msg)
6806 raise error.Abort(msg)
6804 elif change:
6807 elif change:
6805 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6808 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6806 ctx2 = scmutil.revsingle(repo, change, None)
6809 ctx2 = scmutil.revsingle(repo, change, None)
6807 ctx1 = ctx2.p1()
6810 ctx1 = ctx2.p1()
6808 else:
6811 else:
6809 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6812 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6810 ctx1, ctx2 = scmutil.revpair(repo, revs)
6813 ctx1, ctx2 = scmutil.revpair(repo, revs)
6811
6814
6812 forcerelativevalue = None
6815 forcerelativevalue = None
6813 if ui.hasconfig(b'commands', b'status.relative'):
6816 if ui.hasconfig(b'commands', b'status.relative'):
6814 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6817 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6815 uipathfn = scmutil.getuipathfn(
6818 uipathfn = scmutil.getuipathfn(
6816 repo,
6819 repo,
6817 legacyrelativevalue=bool(pats),
6820 legacyrelativevalue=bool(pats),
6818 forcerelativevalue=forcerelativevalue,
6821 forcerelativevalue=forcerelativevalue,
6819 )
6822 )
6820
6823
6821 if opts.get(b'print0'):
6824 if opts.get(b'print0'):
6822 end = b'\0'
6825 end = b'\0'
6823 else:
6826 else:
6824 end = b'\n'
6827 end = b'\n'
6825 states = b'modified added removed deleted unknown ignored clean'.split()
6828 states = b'modified added removed deleted unknown ignored clean'.split()
6826 show = [k for k in states if opts.get(k)]
6829 show = [k for k in states if opts.get(k)]
6827 if opts.get(b'all'):
6830 if opts.get(b'all'):
6828 show += ui.quiet and (states[:4] + [b'clean']) or states
6831 show += ui.quiet and (states[:4] + [b'clean']) or states
6829
6832
6830 if not show:
6833 if not show:
6831 if ui.quiet:
6834 if ui.quiet:
6832 show = states[:4]
6835 show = states[:4]
6833 else:
6836 else:
6834 show = states[:5]
6837 show = states[:5]
6835
6838
6836 m = scmutil.match(ctx2, pats, opts)
6839 m = scmutil.match(ctx2, pats, opts)
6837 if terse:
6840 if terse:
6838 # we need to compute clean and unknown to terse
6841 # we need to compute clean and unknown to terse
6839 stat = repo.status(
6842 stat = repo.status(
6840 ctx1.node(),
6843 ctx1.node(),
6841 ctx2.node(),
6844 ctx2.node(),
6842 m,
6845 m,
6843 b'ignored' in show or b'i' in terse,
6846 b'ignored' in show or b'i' in terse,
6844 clean=True,
6847 clean=True,
6845 unknown=True,
6848 unknown=True,
6846 listsubrepos=opts.get(b'subrepos'),
6849 listsubrepos=opts.get(b'subrepos'),
6847 )
6850 )
6848
6851
6849 stat = cmdutil.tersedir(stat, terse)
6852 stat = cmdutil.tersedir(stat, terse)
6850 else:
6853 else:
6851 stat = repo.status(
6854 stat = repo.status(
6852 ctx1.node(),
6855 ctx1.node(),
6853 ctx2.node(),
6856 ctx2.node(),
6854 m,
6857 m,
6855 b'ignored' in show,
6858 b'ignored' in show,
6856 b'clean' in show,
6859 b'clean' in show,
6857 b'unknown' in show,
6860 b'unknown' in show,
6858 opts.get(b'subrepos'),
6861 opts.get(b'subrepos'),
6859 )
6862 )
6860
6863
6861 changestates = zip(
6864 changestates = zip(
6862 states,
6865 states,
6863 pycompat.iterbytestr(b'MAR!?IC'),
6866 pycompat.iterbytestr(b'MAR!?IC'),
6864 [getattr(stat, s.decode('utf8')) for s in states],
6867 [getattr(stat, s.decode('utf8')) for s in states],
6865 )
6868 )
6866
6869
6867 copy = {}
6870 copy = {}
6868 if (
6871 if (
6869 opts.get(b'all')
6872 opts.get(b'all')
6870 or opts.get(b'copies')
6873 or opts.get(b'copies')
6871 or ui.configbool(b'ui', b'statuscopies')
6874 or ui.configbool(b'ui', b'statuscopies')
6872 ) and not opts.get(b'no_status'):
6875 ) and not opts.get(b'no_status'):
6873 copy = copies.pathcopies(ctx1, ctx2, m)
6876 copy = copies.pathcopies(ctx1, ctx2, m)
6874
6877
6875 morestatus = None
6878 morestatus = None
6876 if (
6879 if (
6877 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6880 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6878 ) and not ui.plain():
6881 ) and not ui.plain():
6879 morestatus = cmdutil.readmorestatus(repo)
6882 morestatus = cmdutil.readmorestatus(repo)
6880
6883
6881 ui.pager(b'status')
6884 ui.pager(b'status')
6882 fm = ui.formatter(b'status', opts)
6885 fm = ui.formatter(b'status', opts)
6883 fmt = b'%s' + end
6886 fmt = b'%s' + end
6884 showchar = not opts.get(b'no_status')
6887 showchar = not opts.get(b'no_status')
6885
6888
6886 for state, char, files in changestates:
6889 for state, char, files in changestates:
6887 if state in show:
6890 if state in show:
6888 label = b'status.' + state
6891 label = b'status.' + state
6889 for f in files:
6892 for f in files:
6890 fm.startitem()
6893 fm.startitem()
6891 fm.context(ctx=ctx2)
6894 fm.context(ctx=ctx2)
6892 fm.data(itemtype=b'file', path=f)
6895 fm.data(itemtype=b'file', path=f)
6893 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6896 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6894 fm.plain(fmt % uipathfn(f), label=label)
6897 fm.plain(fmt % uipathfn(f), label=label)
6895 if f in copy:
6898 if f in copy:
6896 fm.data(source=copy[f])
6899 fm.data(source=copy[f])
6897 fm.plain(
6900 fm.plain(
6898 (b' %s' + end) % uipathfn(copy[f]),
6901 (b' %s' + end) % uipathfn(copy[f]),
6899 label=b'status.copied',
6902 label=b'status.copied',
6900 )
6903 )
6901 if morestatus:
6904 if morestatus:
6902 morestatus.formatfile(f, fm)
6905 morestatus.formatfile(f, fm)
6903
6906
6904 if morestatus:
6907 if morestatus:
6905 morestatus.formatfooter(fm)
6908 morestatus.formatfooter(fm)
6906 fm.end()
6909 fm.end()
6907
6910
6908
6911
6909 @command(
6912 @command(
6910 b'summary|sum',
6913 b'summary|sum',
6911 [(b'', b'remote', None, _(b'check for push and pull'))],
6914 [(b'', b'remote', None, _(b'check for push and pull'))],
6912 b'[--remote]',
6915 b'[--remote]',
6913 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6916 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6914 helpbasic=True,
6917 helpbasic=True,
6915 intents={INTENT_READONLY},
6918 intents={INTENT_READONLY},
6916 )
6919 )
6917 def summary(ui, repo, **opts):
6920 def summary(ui, repo, **opts):
6918 """summarize working directory state
6921 """summarize working directory state
6919
6922
6920 This generates a brief summary of the working directory state,
6923 This generates a brief summary of the working directory state,
6921 including parents, branch, commit status, phase and available updates.
6924 including parents, branch, commit status, phase and available updates.
6922
6925
6923 With the --remote option, this will check the default paths for
6926 With the --remote option, this will check the default paths for
6924 incoming and outgoing changes. This can be time-consuming.
6927 incoming and outgoing changes. This can be time-consuming.
6925
6928
6926 Returns 0 on success.
6929 Returns 0 on success.
6927 """
6930 """
6928
6931
6929 opts = pycompat.byteskwargs(opts)
6932 opts = pycompat.byteskwargs(opts)
6930 ui.pager(b'summary')
6933 ui.pager(b'summary')
6931 ctx = repo[None]
6934 ctx = repo[None]
6932 parents = ctx.parents()
6935 parents = ctx.parents()
6933 pnode = parents[0].node()
6936 pnode = parents[0].node()
6934 marks = []
6937 marks = []
6935
6938
6936 try:
6939 try:
6937 ms = mergemod.mergestate.read(repo)
6940 ms = mergemod.mergestate.read(repo)
6938 except error.UnsupportedMergeRecords as e:
6941 except error.UnsupportedMergeRecords as e:
6939 s = b' '.join(e.recordtypes)
6942 s = b' '.join(e.recordtypes)
6940 ui.warn(
6943 ui.warn(
6941 _(b'warning: merge state has unsupported record types: %s\n') % s
6944 _(b'warning: merge state has unsupported record types: %s\n') % s
6942 )
6945 )
6943 unresolved = []
6946 unresolved = []
6944 else:
6947 else:
6945 unresolved = list(ms.unresolved())
6948 unresolved = list(ms.unresolved())
6946
6949
6947 for p in parents:
6950 for p in parents:
6948 # label with log.changeset (instead of log.parent) since this
6951 # label with log.changeset (instead of log.parent) since this
6949 # shows a working directory parent *changeset*:
6952 # shows a working directory parent *changeset*:
6950 # i18n: column positioning for "hg summary"
6953 # i18n: column positioning for "hg summary"
6951 ui.write(
6954 ui.write(
6952 _(b'parent: %d:%s ') % (p.rev(), p),
6955 _(b'parent: %d:%s ') % (p.rev(), p),
6953 label=logcmdutil.changesetlabels(p),
6956 label=logcmdutil.changesetlabels(p),
6954 )
6957 )
6955 ui.write(b' '.join(p.tags()), label=b'log.tag')
6958 ui.write(b' '.join(p.tags()), label=b'log.tag')
6956 if p.bookmarks():
6959 if p.bookmarks():
6957 marks.extend(p.bookmarks())
6960 marks.extend(p.bookmarks())
6958 if p.rev() == -1:
6961 if p.rev() == -1:
6959 if not len(repo):
6962 if not len(repo):
6960 ui.write(_(b' (empty repository)'))
6963 ui.write(_(b' (empty repository)'))
6961 else:
6964 else:
6962 ui.write(_(b' (no revision checked out)'))
6965 ui.write(_(b' (no revision checked out)'))
6963 if p.obsolete():
6966 if p.obsolete():
6964 ui.write(_(b' (obsolete)'))
6967 ui.write(_(b' (obsolete)'))
6965 if p.isunstable():
6968 if p.isunstable():
6966 instabilities = (
6969 instabilities = (
6967 ui.label(instability, b'trouble.%s' % instability)
6970 ui.label(instability, b'trouble.%s' % instability)
6968 for instability in p.instabilities()
6971 for instability in p.instabilities()
6969 )
6972 )
6970 ui.write(b' (' + b', '.join(instabilities) + b')')
6973 ui.write(b' (' + b', '.join(instabilities) + b')')
6971 ui.write(b'\n')
6974 ui.write(b'\n')
6972 if p.description():
6975 if p.description():
6973 ui.status(
6976 ui.status(
6974 b' ' + p.description().splitlines()[0].strip() + b'\n',
6977 b' ' + p.description().splitlines()[0].strip() + b'\n',
6975 label=b'log.summary',
6978 label=b'log.summary',
6976 )
6979 )
6977
6980
6978 branch = ctx.branch()
6981 branch = ctx.branch()
6979 bheads = repo.branchheads(branch)
6982 bheads = repo.branchheads(branch)
6980 # i18n: column positioning for "hg summary"
6983 # i18n: column positioning for "hg summary"
6981 m = _(b'branch: %s\n') % branch
6984 m = _(b'branch: %s\n') % branch
6982 if branch != b'default':
6985 if branch != b'default':
6983 ui.write(m, label=b'log.branch')
6986 ui.write(m, label=b'log.branch')
6984 else:
6987 else:
6985 ui.status(m, label=b'log.branch')
6988 ui.status(m, label=b'log.branch')
6986
6989
6987 if marks:
6990 if marks:
6988 active = repo._activebookmark
6991 active = repo._activebookmark
6989 # i18n: column positioning for "hg summary"
6992 # i18n: column positioning for "hg summary"
6990 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6993 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6991 if active is not None:
6994 if active is not None:
6992 if active in marks:
6995 if active in marks:
6993 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6996 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6994 marks.remove(active)
6997 marks.remove(active)
6995 else:
6998 else:
6996 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6999 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6997 for m in marks:
7000 for m in marks:
6998 ui.write(b' ' + m, label=b'log.bookmark')
7001 ui.write(b' ' + m, label=b'log.bookmark')
6999 ui.write(b'\n', label=b'log.bookmark')
7002 ui.write(b'\n', label=b'log.bookmark')
7000
7003
7001 status = repo.status(unknown=True)
7004 status = repo.status(unknown=True)
7002
7005
7003 c = repo.dirstate.copies()
7006 c = repo.dirstate.copies()
7004 copied, renamed = [], []
7007 copied, renamed = [], []
7005 for d, s in pycompat.iteritems(c):
7008 for d, s in pycompat.iteritems(c):
7006 if s in status.removed:
7009 if s in status.removed:
7007 status.removed.remove(s)
7010 status.removed.remove(s)
7008 renamed.append(d)
7011 renamed.append(d)
7009 else:
7012 else:
7010 copied.append(d)
7013 copied.append(d)
7011 if d in status.added:
7014 if d in status.added:
7012 status.added.remove(d)
7015 status.added.remove(d)
7013
7016
7014 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7017 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7015
7018
7016 labels = [
7019 labels = [
7017 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7020 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7018 (ui.label(_(b'%d added'), b'status.added'), status.added),
7021 (ui.label(_(b'%d added'), b'status.added'), status.added),
7019 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7022 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7020 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7023 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7021 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7024 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7022 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7025 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7023 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7026 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7024 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7027 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7025 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7028 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7026 ]
7029 ]
7027 t = []
7030 t = []
7028 for l, s in labels:
7031 for l, s in labels:
7029 if s:
7032 if s:
7030 t.append(l % len(s))
7033 t.append(l % len(s))
7031
7034
7032 t = b', '.join(t)
7035 t = b', '.join(t)
7033 cleanworkdir = False
7036 cleanworkdir = False
7034
7037
7035 if repo.vfs.exists(b'graftstate'):
7038 if repo.vfs.exists(b'graftstate'):
7036 t += _(b' (graft in progress)')
7039 t += _(b' (graft in progress)')
7037 if repo.vfs.exists(b'updatestate'):
7040 if repo.vfs.exists(b'updatestate'):
7038 t += _(b' (interrupted update)')
7041 t += _(b' (interrupted update)')
7039 elif len(parents) > 1:
7042 elif len(parents) > 1:
7040 t += _(b' (merge)')
7043 t += _(b' (merge)')
7041 elif branch != parents[0].branch():
7044 elif branch != parents[0].branch():
7042 t += _(b' (new branch)')
7045 t += _(b' (new branch)')
7043 elif parents[0].closesbranch() and pnode in repo.branchheads(
7046 elif parents[0].closesbranch() and pnode in repo.branchheads(
7044 branch, closed=True
7047 branch, closed=True
7045 ):
7048 ):
7046 t += _(b' (head closed)')
7049 t += _(b' (head closed)')
7047 elif not (
7050 elif not (
7048 status.modified
7051 status.modified
7049 or status.added
7052 or status.added
7050 or status.removed
7053 or status.removed
7051 or renamed
7054 or renamed
7052 or copied
7055 or copied
7053 or subs
7056 or subs
7054 ):
7057 ):
7055 t += _(b' (clean)')
7058 t += _(b' (clean)')
7056 cleanworkdir = True
7059 cleanworkdir = True
7057 elif pnode not in bheads:
7060 elif pnode not in bheads:
7058 t += _(b' (new branch head)')
7061 t += _(b' (new branch head)')
7059
7062
7060 if parents:
7063 if parents:
7061 pendingphase = max(p.phase() for p in parents)
7064 pendingphase = max(p.phase() for p in parents)
7062 else:
7065 else:
7063 pendingphase = phases.public
7066 pendingphase = phases.public
7064
7067
7065 if pendingphase > phases.newcommitphase(ui):
7068 if pendingphase > phases.newcommitphase(ui):
7066 t += b' (%s)' % phases.phasenames[pendingphase]
7069 t += b' (%s)' % phases.phasenames[pendingphase]
7067
7070
7068 if cleanworkdir:
7071 if cleanworkdir:
7069 # i18n: column positioning for "hg summary"
7072 # i18n: column positioning for "hg summary"
7070 ui.status(_(b'commit: %s\n') % t.strip())
7073 ui.status(_(b'commit: %s\n') % t.strip())
7071 else:
7074 else:
7072 # i18n: column positioning for "hg summary"
7075 # i18n: column positioning for "hg summary"
7073 ui.write(_(b'commit: %s\n') % t.strip())
7076 ui.write(_(b'commit: %s\n') % t.strip())
7074
7077
7075 # all ancestors of branch heads - all ancestors of parent = new csets
7078 # all ancestors of branch heads - all ancestors of parent = new csets
7076 new = len(
7079 new = len(
7077 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7080 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7078 )
7081 )
7079
7082
7080 if new == 0:
7083 if new == 0:
7081 # i18n: column positioning for "hg summary"
7084 # i18n: column positioning for "hg summary"
7082 ui.status(_(b'update: (current)\n'))
7085 ui.status(_(b'update: (current)\n'))
7083 elif pnode not in bheads:
7086 elif pnode not in bheads:
7084 # i18n: column positioning for "hg summary"
7087 # i18n: column positioning for "hg summary"
7085 ui.write(_(b'update: %d new changesets (update)\n') % new)
7088 ui.write(_(b'update: %d new changesets (update)\n') % new)
7086 else:
7089 else:
7087 # i18n: column positioning for "hg summary"
7090 # i18n: column positioning for "hg summary"
7088 ui.write(
7091 ui.write(
7089 _(b'update: %d new changesets, %d branch heads (merge)\n')
7092 _(b'update: %d new changesets, %d branch heads (merge)\n')
7090 % (new, len(bheads))
7093 % (new, len(bheads))
7091 )
7094 )
7092
7095
7093 t = []
7096 t = []
7094 draft = len(repo.revs(b'draft()'))
7097 draft = len(repo.revs(b'draft()'))
7095 if draft:
7098 if draft:
7096 t.append(_(b'%d draft') % draft)
7099 t.append(_(b'%d draft') % draft)
7097 secret = len(repo.revs(b'secret()'))
7100 secret = len(repo.revs(b'secret()'))
7098 if secret:
7101 if secret:
7099 t.append(_(b'%d secret') % secret)
7102 t.append(_(b'%d secret') % secret)
7100
7103
7101 if draft or secret:
7104 if draft or secret:
7102 ui.status(_(b'phases: %s\n') % b', '.join(t))
7105 ui.status(_(b'phases: %s\n') % b', '.join(t))
7103
7106
7104 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7107 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7105 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7108 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7106 numtrouble = len(repo.revs(trouble + b"()"))
7109 numtrouble = len(repo.revs(trouble + b"()"))
7107 # We write all the possibilities to ease translation
7110 # We write all the possibilities to ease translation
7108 troublemsg = {
7111 troublemsg = {
7109 b"orphan": _(b"orphan: %d changesets"),
7112 b"orphan": _(b"orphan: %d changesets"),
7110 b"contentdivergent": _(b"content-divergent: %d changesets"),
7113 b"contentdivergent": _(b"content-divergent: %d changesets"),
7111 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7114 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7112 }
7115 }
7113 if numtrouble > 0:
7116 if numtrouble > 0:
7114 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7117 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7115
7118
7116 cmdutil.summaryhooks(ui, repo)
7119 cmdutil.summaryhooks(ui, repo)
7117
7120
7118 if opts.get(b'remote'):
7121 if opts.get(b'remote'):
7119 needsincoming, needsoutgoing = True, True
7122 needsincoming, needsoutgoing = True, True
7120 else:
7123 else:
7121 needsincoming, needsoutgoing = False, False
7124 needsincoming, needsoutgoing = False, False
7122 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7125 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7123 if i:
7126 if i:
7124 needsincoming = True
7127 needsincoming = True
7125 if o:
7128 if o:
7126 needsoutgoing = True
7129 needsoutgoing = True
7127 if not needsincoming and not needsoutgoing:
7130 if not needsincoming and not needsoutgoing:
7128 return
7131 return
7129
7132
7130 def getincoming():
7133 def getincoming():
7131 source, branches = hg.parseurl(ui.expandpath(b'default'))
7134 source, branches = hg.parseurl(ui.expandpath(b'default'))
7132 sbranch = branches[0]
7135 sbranch = branches[0]
7133 try:
7136 try:
7134 other = hg.peer(repo, {}, source)
7137 other = hg.peer(repo, {}, source)
7135 except error.RepoError:
7138 except error.RepoError:
7136 if opts.get(b'remote'):
7139 if opts.get(b'remote'):
7137 raise
7140 raise
7138 return source, sbranch, None, None, None
7141 return source, sbranch, None, None, None
7139 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7142 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7140 if revs:
7143 if revs:
7141 revs = [other.lookup(rev) for rev in revs]
7144 revs = [other.lookup(rev) for rev in revs]
7142 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7145 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7143 repo.ui.pushbuffer()
7146 repo.ui.pushbuffer()
7144 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7147 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7145 repo.ui.popbuffer()
7148 repo.ui.popbuffer()
7146 return source, sbranch, other, commoninc, commoninc[1]
7149 return source, sbranch, other, commoninc, commoninc[1]
7147
7150
7148 if needsincoming:
7151 if needsincoming:
7149 source, sbranch, sother, commoninc, incoming = getincoming()
7152 source, sbranch, sother, commoninc, incoming = getincoming()
7150 else:
7153 else:
7151 source = sbranch = sother = commoninc = incoming = None
7154 source = sbranch = sother = commoninc = incoming = None
7152
7155
7153 def getoutgoing():
7156 def getoutgoing():
7154 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7157 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7155 dbranch = branches[0]
7158 dbranch = branches[0]
7156 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7159 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7157 if source != dest:
7160 if source != dest:
7158 try:
7161 try:
7159 dother = hg.peer(repo, {}, dest)
7162 dother = hg.peer(repo, {}, dest)
7160 except error.RepoError:
7163 except error.RepoError:
7161 if opts.get(b'remote'):
7164 if opts.get(b'remote'):
7162 raise
7165 raise
7163 return dest, dbranch, None, None
7166 return dest, dbranch, None, None
7164 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7167 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7165 elif sother is None:
7168 elif sother is None:
7166 # there is no explicit destination peer, but source one is invalid
7169 # there is no explicit destination peer, but source one is invalid
7167 return dest, dbranch, None, None
7170 return dest, dbranch, None, None
7168 else:
7171 else:
7169 dother = sother
7172 dother = sother
7170 if source != dest or (sbranch is not None and sbranch != dbranch):
7173 if source != dest or (sbranch is not None and sbranch != dbranch):
7171 common = None
7174 common = None
7172 else:
7175 else:
7173 common = commoninc
7176 common = commoninc
7174 if revs:
7177 if revs:
7175 revs = [repo.lookup(rev) for rev in revs]
7178 revs = [repo.lookup(rev) for rev in revs]
7176 repo.ui.pushbuffer()
7179 repo.ui.pushbuffer()
7177 outgoing = discovery.findcommonoutgoing(
7180 outgoing = discovery.findcommonoutgoing(
7178 repo, dother, onlyheads=revs, commoninc=common
7181 repo, dother, onlyheads=revs, commoninc=common
7179 )
7182 )
7180 repo.ui.popbuffer()
7183 repo.ui.popbuffer()
7181 return dest, dbranch, dother, outgoing
7184 return dest, dbranch, dother, outgoing
7182
7185
7183 if needsoutgoing:
7186 if needsoutgoing:
7184 dest, dbranch, dother, outgoing = getoutgoing()
7187 dest, dbranch, dother, outgoing = getoutgoing()
7185 else:
7188 else:
7186 dest = dbranch = dother = outgoing = None
7189 dest = dbranch = dother = outgoing = None
7187
7190
7188 if opts.get(b'remote'):
7191 if opts.get(b'remote'):
7189 t = []
7192 t = []
7190 if incoming:
7193 if incoming:
7191 t.append(_(b'1 or more incoming'))
7194 t.append(_(b'1 or more incoming'))
7192 o = outgoing.missing
7195 o = outgoing.missing
7193 if o:
7196 if o:
7194 t.append(_(b'%d outgoing') % len(o))
7197 t.append(_(b'%d outgoing') % len(o))
7195 other = dother or sother
7198 other = dother or sother
7196 if b'bookmarks' in other.listkeys(b'namespaces'):
7199 if b'bookmarks' in other.listkeys(b'namespaces'):
7197 counts = bookmarks.summary(repo, other)
7200 counts = bookmarks.summary(repo, other)
7198 if counts[0] > 0:
7201 if counts[0] > 0:
7199 t.append(_(b'%d incoming bookmarks') % counts[0])
7202 t.append(_(b'%d incoming bookmarks') % counts[0])
7200 if counts[1] > 0:
7203 if counts[1] > 0:
7201 t.append(_(b'%d outgoing bookmarks') % counts[1])
7204 t.append(_(b'%d outgoing bookmarks') % counts[1])
7202
7205
7203 if t:
7206 if t:
7204 # i18n: column positioning for "hg summary"
7207 # i18n: column positioning for "hg summary"
7205 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7208 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7206 else:
7209 else:
7207 # i18n: column positioning for "hg summary"
7210 # i18n: column positioning for "hg summary"
7208 ui.status(_(b'remote: (synced)\n'))
7211 ui.status(_(b'remote: (synced)\n'))
7209
7212
7210 cmdutil.summaryremotehooks(
7213 cmdutil.summaryremotehooks(
7211 ui,
7214 ui,
7212 repo,
7215 repo,
7213 opts,
7216 opts,
7214 (
7217 (
7215 (source, sbranch, sother, commoninc),
7218 (source, sbranch, sother, commoninc),
7216 (dest, dbranch, dother, outgoing),
7219 (dest, dbranch, dother, outgoing),
7217 ),
7220 ),
7218 )
7221 )
7219
7222
7220
7223
7221 @command(
7224 @command(
7222 b'tag',
7225 b'tag',
7223 [
7226 [
7224 (b'f', b'force', None, _(b'force tag')),
7227 (b'f', b'force', None, _(b'force tag')),
7225 (b'l', b'local', None, _(b'make the tag local')),
7228 (b'l', b'local', None, _(b'make the tag local')),
7226 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7229 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7227 (b'', b'remove', None, _(b'remove a tag')),
7230 (b'', b'remove', None, _(b'remove a tag')),
7228 # -l/--local is already there, commitopts cannot be used
7231 # -l/--local is already there, commitopts cannot be used
7229 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7232 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7230 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7233 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7231 ]
7234 ]
7232 + commitopts2,
7235 + commitopts2,
7233 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7236 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7234 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7237 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7235 )
7238 )
7236 def tag(ui, repo, name1, *names, **opts):
7239 def tag(ui, repo, name1, *names, **opts):
7237 """add one or more tags for the current or given revision
7240 """add one or more tags for the current or given revision
7238
7241
7239 Name a particular revision using <name>.
7242 Name a particular revision using <name>.
7240
7243
7241 Tags are used to name particular revisions of the repository and are
7244 Tags are used to name particular revisions of the repository and are
7242 very useful to compare different revisions, to go back to significant
7245 very useful to compare different revisions, to go back to significant
7243 earlier versions or to mark branch points as releases, etc. Changing
7246 earlier versions or to mark branch points as releases, etc. Changing
7244 an existing tag is normally disallowed; use -f/--force to override.
7247 an existing tag is normally disallowed; use -f/--force to override.
7245
7248
7246 If no revision is given, the parent of the working directory is
7249 If no revision is given, the parent of the working directory is
7247 used.
7250 used.
7248
7251
7249 To facilitate version control, distribution, and merging of tags,
7252 To facilitate version control, distribution, and merging of tags,
7250 they are stored as a file named ".hgtags" which is managed similarly
7253 they are stored as a file named ".hgtags" which is managed similarly
7251 to other project files and can be hand-edited if necessary. This
7254 to other project files and can be hand-edited if necessary. This
7252 also means that tagging creates a new commit. The file
7255 also means that tagging creates a new commit. The file
7253 ".hg/localtags" is used for local tags (not shared among
7256 ".hg/localtags" is used for local tags (not shared among
7254 repositories).
7257 repositories).
7255
7258
7256 Tag commits are usually made at the head of a branch. If the parent
7259 Tag commits are usually made at the head of a branch. If the parent
7257 of the working directory is not a branch head, :hg:`tag` aborts; use
7260 of the working directory is not a branch head, :hg:`tag` aborts; use
7258 -f/--force to force the tag commit to be based on a non-head
7261 -f/--force to force the tag commit to be based on a non-head
7259 changeset.
7262 changeset.
7260
7263
7261 See :hg:`help dates` for a list of formats valid for -d/--date.
7264 See :hg:`help dates` for a list of formats valid for -d/--date.
7262
7265
7263 Since tag names have priority over branch names during revision
7266 Since tag names have priority over branch names during revision
7264 lookup, using an existing branch name as a tag name is discouraged.
7267 lookup, using an existing branch name as a tag name is discouraged.
7265
7268
7266 Returns 0 on success.
7269 Returns 0 on success.
7267 """
7270 """
7268 opts = pycompat.byteskwargs(opts)
7271 opts = pycompat.byteskwargs(opts)
7269 with repo.wlock(), repo.lock():
7272 with repo.wlock(), repo.lock():
7270 rev_ = b"."
7273 rev_ = b"."
7271 names = [t.strip() for t in (name1,) + names]
7274 names = [t.strip() for t in (name1,) + names]
7272 if len(names) != len(set(names)):
7275 if len(names) != len(set(names)):
7273 raise error.Abort(_(b'tag names must be unique'))
7276 raise error.Abort(_(b'tag names must be unique'))
7274 for n in names:
7277 for n in names:
7275 scmutil.checknewlabel(repo, n, b'tag')
7278 scmutil.checknewlabel(repo, n, b'tag')
7276 if not n:
7279 if not n:
7277 raise error.Abort(
7280 raise error.Abort(
7278 _(b'tag names cannot consist entirely of whitespace')
7281 _(b'tag names cannot consist entirely of whitespace')
7279 )
7282 )
7280 if opts.get(b'rev') and opts.get(b'remove'):
7283 if opts.get(b'rev') and opts.get(b'remove'):
7281 raise error.Abort(_(b"--rev and --remove are incompatible"))
7284 raise error.Abort(_(b"--rev and --remove are incompatible"))
7282 if opts.get(b'rev'):
7285 if opts.get(b'rev'):
7283 rev_ = opts[b'rev']
7286 rev_ = opts[b'rev']
7284 message = opts.get(b'message')
7287 message = opts.get(b'message')
7285 if opts.get(b'remove'):
7288 if opts.get(b'remove'):
7286 if opts.get(b'local'):
7289 if opts.get(b'local'):
7287 expectedtype = b'local'
7290 expectedtype = b'local'
7288 else:
7291 else:
7289 expectedtype = b'global'
7292 expectedtype = b'global'
7290
7293
7291 for n in names:
7294 for n in names:
7292 if repo.tagtype(n) == b'global':
7295 if repo.tagtype(n) == b'global':
7293 alltags = tagsmod.findglobaltags(ui, repo)
7296 alltags = tagsmod.findglobaltags(ui, repo)
7294 if alltags[n][0] == nullid:
7297 if alltags[n][0] == nullid:
7295 raise error.Abort(_(b"tag '%s' is already removed") % n)
7298 raise error.Abort(_(b"tag '%s' is already removed") % n)
7296 if not repo.tagtype(n):
7299 if not repo.tagtype(n):
7297 raise error.Abort(_(b"tag '%s' does not exist") % n)
7300 raise error.Abort(_(b"tag '%s' does not exist") % n)
7298 if repo.tagtype(n) != expectedtype:
7301 if repo.tagtype(n) != expectedtype:
7299 if expectedtype == b'global':
7302 if expectedtype == b'global':
7300 raise error.Abort(
7303 raise error.Abort(
7301 _(b"tag '%s' is not a global tag") % n
7304 _(b"tag '%s' is not a global tag") % n
7302 )
7305 )
7303 else:
7306 else:
7304 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7307 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7305 rev_ = b'null'
7308 rev_ = b'null'
7306 if not message:
7309 if not message:
7307 # we don't translate commit messages
7310 # we don't translate commit messages
7308 message = b'Removed tag %s' % b', '.join(names)
7311 message = b'Removed tag %s' % b', '.join(names)
7309 elif not opts.get(b'force'):
7312 elif not opts.get(b'force'):
7310 for n in names:
7313 for n in names:
7311 if n in repo.tags():
7314 if n in repo.tags():
7312 raise error.Abort(
7315 raise error.Abort(
7313 _(b"tag '%s' already exists (use -f to force)") % n
7316 _(b"tag '%s' already exists (use -f to force)") % n
7314 )
7317 )
7315 if not opts.get(b'local'):
7318 if not opts.get(b'local'):
7316 p1, p2 = repo.dirstate.parents()
7319 p1, p2 = repo.dirstate.parents()
7317 if p2 != nullid:
7320 if p2 != nullid:
7318 raise error.Abort(_(b'uncommitted merge'))
7321 raise error.Abort(_(b'uncommitted merge'))
7319 bheads = repo.branchheads()
7322 bheads = repo.branchheads()
7320 if not opts.get(b'force') and bheads and p1 not in bheads:
7323 if not opts.get(b'force') and bheads and p1 not in bheads:
7321 raise error.Abort(
7324 raise error.Abort(
7322 _(
7325 _(
7323 b'working directory is not at a branch head '
7326 b'working directory is not at a branch head '
7324 b'(use -f to force)'
7327 b'(use -f to force)'
7325 )
7328 )
7326 )
7329 )
7327 node = scmutil.revsingle(repo, rev_).node()
7330 node = scmutil.revsingle(repo, rev_).node()
7328
7331
7329 if not message:
7332 if not message:
7330 # we don't translate commit messages
7333 # we don't translate commit messages
7331 message = b'Added tag %s for changeset %s' % (
7334 message = b'Added tag %s for changeset %s' % (
7332 b', '.join(names),
7335 b', '.join(names),
7333 short(node),
7336 short(node),
7334 )
7337 )
7335
7338
7336 date = opts.get(b'date')
7339 date = opts.get(b'date')
7337 if date:
7340 if date:
7338 date = dateutil.parsedate(date)
7341 date = dateutil.parsedate(date)
7339
7342
7340 if opts.get(b'remove'):
7343 if opts.get(b'remove'):
7341 editform = b'tag.remove'
7344 editform = b'tag.remove'
7342 else:
7345 else:
7343 editform = b'tag.add'
7346 editform = b'tag.add'
7344 editor = cmdutil.getcommiteditor(
7347 editor = cmdutil.getcommiteditor(
7345 editform=editform, **pycompat.strkwargs(opts)
7348 editform=editform, **pycompat.strkwargs(opts)
7346 )
7349 )
7347
7350
7348 # don't allow tagging the null rev
7351 # don't allow tagging the null rev
7349 if (
7352 if (
7350 not opts.get(b'remove')
7353 not opts.get(b'remove')
7351 and scmutil.revsingle(repo, rev_).rev() == nullrev
7354 and scmutil.revsingle(repo, rev_).rev() == nullrev
7352 ):
7355 ):
7353 raise error.Abort(_(b"cannot tag null revision"))
7356 raise error.Abort(_(b"cannot tag null revision"))
7354
7357
7355 tagsmod.tag(
7358 tagsmod.tag(
7356 repo,
7359 repo,
7357 names,
7360 names,
7358 node,
7361 node,
7359 message,
7362 message,
7360 opts.get(b'local'),
7363 opts.get(b'local'),
7361 opts.get(b'user'),
7364 opts.get(b'user'),
7362 date,
7365 date,
7363 editor=editor,
7366 editor=editor,
7364 )
7367 )
7365
7368
7366
7369
7367 @command(
7370 @command(
7368 b'tags',
7371 b'tags',
7369 formatteropts,
7372 formatteropts,
7370 b'',
7373 b'',
7371 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7374 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7372 intents={INTENT_READONLY},
7375 intents={INTENT_READONLY},
7373 )
7376 )
7374 def tags(ui, repo, **opts):
7377 def tags(ui, repo, **opts):
7375 """list repository tags
7378 """list repository tags
7376
7379
7377 This lists both regular and local tags. When the -v/--verbose
7380 This lists both regular and local tags. When the -v/--verbose
7378 switch is used, a third column "local" is printed for local tags.
7381 switch is used, a third column "local" is printed for local tags.
7379 When the -q/--quiet switch is used, only the tag name is printed.
7382 When the -q/--quiet switch is used, only the tag name is printed.
7380
7383
7381 .. container:: verbose
7384 .. container:: verbose
7382
7385
7383 Template:
7386 Template:
7384
7387
7385 The following keywords are supported in addition to the common template
7388 The following keywords are supported in addition to the common template
7386 keywords and functions such as ``{tag}``. See also
7389 keywords and functions such as ``{tag}``. See also
7387 :hg:`help templates`.
7390 :hg:`help templates`.
7388
7391
7389 :type: String. ``local`` for local tags.
7392 :type: String. ``local`` for local tags.
7390
7393
7391 Returns 0 on success.
7394 Returns 0 on success.
7392 """
7395 """
7393
7396
7394 opts = pycompat.byteskwargs(opts)
7397 opts = pycompat.byteskwargs(opts)
7395 ui.pager(b'tags')
7398 ui.pager(b'tags')
7396 fm = ui.formatter(b'tags', opts)
7399 fm = ui.formatter(b'tags', opts)
7397 hexfunc = fm.hexfunc
7400 hexfunc = fm.hexfunc
7398
7401
7399 for t, n in reversed(repo.tagslist()):
7402 for t, n in reversed(repo.tagslist()):
7400 hn = hexfunc(n)
7403 hn = hexfunc(n)
7401 label = b'tags.normal'
7404 label = b'tags.normal'
7402 tagtype = b''
7405 tagtype = b''
7403 if repo.tagtype(t) == b'local':
7406 if repo.tagtype(t) == b'local':
7404 label = b'tags.local'
7407 label = b'tags.local'
7405 tagtype = b'local'
7408 tagtype = b'local'
7406
7409
7407 fm.startitem()
7410 fm.startitem()
7408 fm.context(repo=repo)
7411 fm.context(repo=repo)
7409 fm.write(b'tag', b'%s', t, label=label)
7412 fm.write(b'tag', b'%s', t, label=label)
7410 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7413 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7411 fm.condwrite(
7414 fm.condwrite(
7412 not ui.quiet,
7415 not ui.quiet,
7413 b'rev node',
7416 b'rev node',
7414 fmt,
7417 fmt,
7415 repo.changelog.rev(n),
7418 repo.changelog.rev(n),
7416 hn,
7419 hn,
7417 label=label,
7420 label=label,
7418 )
7421 )
7419 fm.condwrite(
7422 fm.condwrite(
7420 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7423 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7421 )
7424 )
7422 fm.plain(b'\n')
7425 fm.plain(b'\n')
7423 fm.end()
7426 fm.end()
7424
7427
7425
7428
7426 @command(
7429 @command(
7427 b'tip',
7430 b'tip',
7428 [
7431 [
7429 (b'p', b'patch', None, _(b'show patch')),
7432 (b'p', b'patch', None, _(b'show patch')),
7430 (b'g', b'git', None, _(b'use git extended diff format')),
7433 (b'g', b'git', None, _(b'use git extended diff format')),
7431 ]
7434 ]
7432 + templateopts,
7435 + templateopts,
7433 _(b'[-p] [-g]'),
7436 _(b'[-p] [-g]'),
7434 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7437 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7435 )
7438 )
7436 def tip(ui, repo, **opts):
7439 def tip(ui, repo, **opts):
7437 """show the tip revision (DEPRECATED)
7440 """show the tip revision (DEPRECATED)
7438
7441
7439 The tip revision (usually just called the tip) is the changeset
7442 The tip revision (usually just called the tip) is the changeset
7440 most recently added to the repository (and therefore the most
7443 most recently added to the repository (and therefore the most
7441 recently changed head).
7444 recently changed head).
7442
7445
7443 If you have just made a commit, that commit will be the tip. If
7446 If you have just made a commit, that commit will be the tip. If
7444 you have just pulled changes from another repository, the tip of
7447 you have just pulled changes from another repository, the tip of
7445 that repository becomes the current tip. The "tip" tag is special
7448 that repository becomes the current tip. The "tip" tag is special
7446 and cannot be renamed or assigned to a different changeset.
7449 and cannot be renamed or assigned to a different changeset.
7447
7450
7448 This command is deprecated, please use :hg:`heads` instead.
7451 This command is deprecated, please use :hg:`heads` instead.
7449
7452
7450 Returns 0 on success.
7453 Returns 0 on success.
7451 """
7454 """
7452 opts = pycompat.byteskwargs(opts)
7455 opts = pycompat.byteskwargs(opts)
7453 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7456 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7454 displayer.show(repo[b'tip'])
7457 displayer.show(repo[b'tip'])
7455 displayer.close()
7458 displayer.close()
7456
7459
7457
7460
7458 @command(
7461 @command(
7459 b'unbundle',
7462 b'unbundle',
7460 [
7463 [
7461 (
7464 (
7462 b'u',
7465 b'u',
7463 b'update',
7466 b'update',
7464 None,
7467 None,
7465 _(b'update to new branch head if changesets were unbundled'),
7468 _(b'update to new branch head if changesets were unbundled'),
7466 )
7469 )
7467 ],
7470 ],
7468 _(b'[-u] FILE...'),
7471 _(b'[-u] FILE...'),
7469 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7472 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7470 )
7473 )
7471 def unbundle(ui, repo, fname1, *fnames, **opts):
7474 def unbundle(ui, repo, fname1, *fnames, **opts):
7472 """apply one or more bundle files
7475 """apply one or more bundle files
7473
7476
7474 Apply one or more bundle files generated by :hg:`bundle`.
7477 Apply one or more bundle files generated by :hg:`bundle`.
7475
7478
7476 Returns 0 on success, 1 if an update has unresolved files.
7479 Returns 0 on success, 1 if an update has unresolved files.
7477 """
7480 """
7478 fnames = (fname1,) + fnames
7481 fnames = (fname1,) + fnames
7479
7482
7480 with repo.lock():
7483 with repo.lock():
7481 for fname in fnames:
7484 for fname in fnames:
7482 f = hg.openpath(ui, fname)
7485 f = hg.openpath(ui, fname)
7483 gen = exchange.readbundle(ui, f, fname)
7486 gen = exchange.readbundle(ui, f, fname)
7484 if isinstance(gen, streamclone.streamcloneapplier):
7487 if isinstance(gen, streamclone.streamcloneapplier):
7485 raise error.Abort(
7488 raise error.Abort(
7486 _(
7489 _(
7487 b'packed bundles cannot be applied with '
7490 b'packed bundles cannot be applied with '
7488 b'"hg unbundle"'
7491 b'"hg unbundle"'
7489 ),
7492 ),
7490 hint=_(b'use "hg debugapplystreamclonebundle"'),
7493 hint=_(b'use "hg debugapplystreamclonebundle"'),
7491 )
7494 )
7492 url = b'bundle:' + fname
7495 url = b'bundle:' + fname
7493 try:
7496 try:
7494 txnname = b'unbundle'
7497 txnname = b'unbundle'
7495 if not isinstance(gen, bundle2.unbundle20):
7498 if not isinstance(gen, bundle2.unbundle20):
7496 txnname = b'unbundle\n%s' % util.hidepassword(url)
7499 txnname = b'unbundle\n%s' % util.hidepassword(url)
7497 with repo.transaction(txnname) as tr:
7500 with repo.transaction(txnname) as tr:
7498 op = bundle2.applybundle(
7501 op = bundle2.applybundle(
7499 repo, gen, tr, source=b'unbundle', url=url
7502 repo, gen, tr, source=b'unbundle', url=url
7500 )
7503 )
7501 except error.BundleUnknownFeatureError as exc:
7504 except error.BundleUnknownFeatureError as exc:
7502 raise error.Abort(
7505 raise error.Abort(
7503 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7506 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7504 hint=_(
7507 hint=_(
7505 b"see https://mercurial-scm.org/"
7508 b"see https://mercurial-scm.org/"
7506 b"wiki/BundleFeature for more "
7509 b"wiki/BundleFeature for more "
7507 b"information"
7510 b"information"
7508 ),
7511 ),
7509 )
7512 )
7510 modheads = bundle2.combinechangegroupresults(op)
7513 modheads = bundle2.combinechangegroupresults(op)
7511
7514
7512 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7515 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7513
7516
7514
7517
7515 @command(
7518 @command(
7516 b'unshelve',
7519 b'unshelve',
7517 [
7520 [
7518 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7521 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7519 (
7522 (
7520 b'c',
7523 b'c',
7521 b'continue',
7524 b'continue',
7522 None,
7525 None,
7523 _(b'continue an incomplete unshelve operation'),
7526 _(b'continue an incomplete unshelve operation'),
7524 ),
7527 ),
7525 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7528 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7526 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7529 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7527 (
7530 (
7528 b'n',
7531 b'n',
7529 b'name',
7532 b'name',
7530 b'',
7533 b'',
7531 _(b'restore shelved change with given name'),
7534 _(b'restore shelved change with given name'),
7532 _(b'NAME'),
7535 _(b'NAME'),
7533 ),
7536 ),
7534 (b't', b'tool', b'', _(b'specify merge tool')),
7537 (b't', b'tool', b'', _(b'specify merge tool')),
7535 (
7538 (
7536 b'',
7539 b'',
7537 b'date',
7540 b'date',
7538 b'',
7541 b'',
7539 _(b'set date for temporary commits (DEPRECATED)'),
7542 _(b'set date for temporary commits (DEPRECATED)'),
7540 _(b'DATE'),
7543 _(b'DATE'),
7541 ),
7544 ),
7542 ],
7545 ],
7543 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7546 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7544 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7547 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7545 )
7548 )
7546 def unshelve(ui, repo, *shelved, **opts):
7549 def unshelve(ui, repo, *shelved, **opts):
7547 """restore a shelved change to the working directory
7550 """restore a shelved change to the working directory
7548
7551
7549 This command accepts an optional name of a shelved change to
7552 This command accepts an optional name of a shelved change to
7550 restore. If none is given, the most recent shelved change is used.
7553 restore. If none is given, the most recent shelved change is used.
7551
7554
7552 If a shelved change is applied successfully, the bundle that
7555 If a shelved change is applied successfully, the bundle that
7553 contains the shelved changes is moved to a backup location
7556 contains the shelved changes is moved to a backup location
7554 (.hg/shelve-backup).
7557 (.hg/shelve-backup).
7555
7558
7556 Since you can restore a shelved change on top of an arbitrary
7559 Since you can restore a shelved change on top of an arbitrary
7557 commit, it is possible that unshelving will result in a conflict
7560 commit, it is possible that unshelving will result in a conflict
7558 between your changes and the commits you are unshelving onto. If
7561 between your changes and the commits you are unshelving onto. If
7559 this occurs, you must resolve the conflict, then use
7562 this occurs, you must resolve the conflict, then use
7560 ``--continue`` to complete the unshelve operation. (The bundle
7563 ``--continue`` to complete the unshelve operation. (The bundle
7561 will not be moved until you successfully complete the unshelve.)
7564 will not be moved until you successfully complete the unshelve.)
7562
7565
7563 (Alternatively, you can use ``--abort`` to abandon an unshelve
7566 (Alternatively, you can use ``--abort`` to abandon an unshelve
7564 that causes a conflict. This reverts the unshelved changes, and
7567 that causes a conflict. This reverts the unshelved changes, and
7565 leaves the bundle in place.)
7568 leaves the bundle in place.)
7566
7569
7567 If bare shelved change (without interactive, include and exclude
7570 If bare shelved change (without interactive, include and exclude
7568 option) was done on newly created branch it would restore branch
7571 option) was done on newly created branch it would restore branch
7569 information to the working directory.
7572 information to the working directory.
7570
7573
7571 After a successful unshelve, the shelved changes are stored in a
7574 After a successful unshelve, the shelved changes are stored in a
7572 backup directory. Only the N most recent backups are kept. N
7575 backup directory. Only the N most recent backups are kept. N
7573 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7576 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7574 configuration option.
7577 configuration option.
7575
7578
7576 .. container:: verbose
7579 .. container:: verbose
7577
7580
7578 Timestamp in seconds is used to decide order of backups. More
7581 Timestamp in seconds is used to decide order of backups. More
7579 than ``maxbackups`` backups are kept, if same timestamp
7582 than ``maxbackups`` backups are kept, if same timestamp
7580 prevents from deciding exact order of them, for safety.
7583 prevents from deciding exact order of them, for safety.
7581
7584
7582 Selected changes can be unshelved with ``--interactive`` flag.
7585 Selected changes can be unshelved with ``--interactive`` flag.
7583 The working directory is updated with the selected changes, and
7586 The working directory is updated with the selected changes, and
7584 only the unselected changes remain shelved.
7587 only the unselected changes remain shelved.
7585 Note: The whole shelve is applied to working directory first before
7588 Note: The whole shelve is applied to working directory first before
7586 running interactively. So, this will bring up all the conflicts between
7589 running interactively. So, this will bring up all the conflicts between
7587 working directory and the shelve, irrespective of which changes will be
7590 working directory and the shelve, irrespective of which changes will be
7588 unshelved.
7591 unshelved.
7589 """
7592 """
7590 with repo.wlock():
7593 with repo.wlock():
7591 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7594 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7592
7595
7593
7596
7594 statemod.addunfinished(
7597 statemod.addunfinished(
7595 b'unshelve',
7598 b'unshelve',
7596 fname=b'shelvedstate',
7599 fname=b'shelvedstate',
7597 continueflag=True,
7600 continueflag=True,
7598 abortfunc=shelvemod.hgabortunshelve,
7601 abortfunc=shelvemod.hgabortunshelve,
7599 continuefunc=shelvemod.hgcontinueunshelve,
7602 continuefunc=shelvemod.hgcontinueunshelve,
7600 cmdmsg=_(b'unshelve already in progress'),
7603 cmdmsg=_(b'unshelve already in progress'),
7601 )
7604 )
7602
7605
7603
7606
7604 @command(
7607 @command(
7605 b'update|up|checkout|co',
7608 b'update|up|checkout|co',
7606 [
7609 [
7607 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7610 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7608 (b'c', b'check', None, _(b'require clean working directory')),
7611 (b'c', b'check', None, _(b'require clean working directory')),
7609 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7612 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7610 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7613 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7611 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7614 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7612 ]
7615 ]
7613 + mergetoolopts,
7616 + mergetoolopts,
7614 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7617 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7615 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7618 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7616 helpbasic=True,
7619 helpbasic=True,
7617 )
7620 )
7618 def update(ui, repo, node=None, **opts):
7621 def update(ui, repo, node=None, **opts):
7619 """update working directory (or switch revisions)
7622 """update working directory (or switch revisions)
7620
7623
7621 Update the repository's working directory to the specified
7624 Update the repository's working directory to the specified
7622 changeset. If no changeset is specified, update to the tip of the
7625 changeset. If no changeset is specified, update to the tip of the
7623 current named branch and move the active bookmark (see :hg:`help
7626 current named branch and move the active bookmark (see :hg:`help
7624 bookmarks`).
7627 bookmarks`).
7625
7628
7626 Update sets the working directory's parent revision to the specified
7629 Update sets the working directory's parent revision to the specified
7627 changeset (see :hg:`help parents`).
7630 changeset (see :hg:`help parents`).
7628
7631
7629 If the changeset is not a descendant or ancestor of the working
7632 If the changeset is not a descendant or ancestor of the working
7630 directory's parent and there are uncommitted changes, the update is
7633 directory's parent and there are uncommitted changes, the update is
7631 aborted. With the -c/--check option, the working directory is checked
7634 aborted. With the -c/--check option, the working directory is checked
7632 for uncommitted changes; if none are found, the working directory is
7635 for uncommitted changes; if none are found, the working directory is
7633 updated to the specified changeset.
7636 updated to the specified changeset.
7634
7637
7635 .. container:: verbose
7638 .. container:: verbose
7636
7639
7637 The -C/--clean, -c/--check, and -m/--merge options control what
7640 The -C/--clean, -c/--check, and -m/--merge options control what
7638 happens if the working directory contains uncommitted changes.
7641 happens if the working directory contains uncommitted changes.
7639 At most of one of them can be specified.
7642 At most of one of them can be specified.
7640
7643
7641 1. If no option is specified, and if
7644 1. If no option is specified, and if
7642 the requested changeset is an ancestor or descendant of
7645 the requested changeset is an ancestor or descendant of
7643 the working directory's parent, the uncommitted changes
7646 the working directory's parent, the uncommitted changes
7644 are merged into the requested changeset and the merged
7647 are merged into the requested changeset and the merged
7645 result is left uncommitted. If the requested changeset is
7648 result is left uncommitted. If the requested changeset is
7646 not an ancestor or descendant (that is, it is on another
7649 not an ancestor or descendant (that is, it is on another
7647 branch), the update is aborted and the uncommitted changes
7650 branch), the update is aborted and the uncommitted changes
7648 are preserved.
7651 are preserved.
7649
7652
7650 2. With the -m/--merge option, the update is allowed even if the
7653 2. With the -m/--merge option, the update is allowed even if the
7651 requested changeset is not an ancestor or descendant of
7654 requested changeset is not an ancestor or descendant of
7652 the working directory's parent.
7655 the working directory's parent.
7653
7656
7654 3. With the -c/--check option, the update is aborted and the
7657 3. With the -c/--check option, the update is aborted and the
7655 uncommitted changes are preserved.
7658 uncommitted changes are preserved.
7656
7659
7657 4. With the -C/--clean option, uncommitted changes are discarded and
7660 4. With the -C/--clean option, uncommitted changes are discarded and
7658 the working directory is updated to the requested changeset.
7661 the working directory is updated to the requested changeset.
7659
7662
7660 To cancel an uncommitted merge (and lose your changes), use
7663 To cancel an uncommitted merge (and lose your changes), use
7661 :hg:`merge --abort`.
7664 :hg:`merge --abort`.
7662
7665
7663 Use null as the changeset to remove the working directory (like
7666 Use null as the changeset to remove the working directory (like
7664 :hg:`clone -U`).
7667 :hg:`clone -U`).
7665
7668
7666 If you want to revert just one file to an older revision, use
7669 If you want to revert just one file to an older revision, use
7667 :hg:`revert [-r REV] NAME`.
7670 :hg:`revert [-r REV] NAME`.
7668
7671
7669 See :hg:`help dates` for a list of formats valid for -d/--date.
7672 See :hg:`help dates` for a list of formats valid for -d/--date.
7670
7673
7671 Returns 0 on success, 1 if there are unresolved files.
7674 Returns 0 on success, 1 if there are unresolved files.
7672 """
7675 """
7673 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7676 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7674 rev = opts.get('rev')
7677 rev = opts.get('rev')
7675 date = opts.get('date')
7678 date = opts.get('date')
7676 clean = opts.get('clean')
7679 clean = opts.get('clean')
7677 check = opts.get('check')
7680 check = opts.get('check')
7678 merge = opts.get('merge')
7681 merge = opts.get('merge')
7679 if rev and node:
7682 if rev and node:
7680 raise error.Abort(_(b"please specify just one revision"))
7683 raise error.Abort(_(b"please specify just one revision"))
7681
7684
7682 if ui.configbool(b'commands', b'update.requiredest'):
7685 if ui.configbool(b'commands', b'update.requiredest'):
7683 if not node and not rev and not date:
7686 if not node and not rev and not date:
7684 raise error.Abort(
7687 raise error.Abort(
7685 _(b'you must specify a destination'),
7688 _(b'you must specify a destination'),
7686 hint=_(b'for example: hg update ".::"'),
7689 hint=_(b'for example: hg update ".::"'),
7687 )
7690 )
7688
7691
7689 if rev is None or rev == b'':
7692 if rev is None or rev == b'':
7690 rev = node
7693 rev = node
7691
7694
7692 if date and rev is not None:
7695 if date and rev is not None:
7693 raise error.Abort(_(b"you can't specify a revision and a date"))
7696 raise error.Abort(_(b"you can't specify a revision and a date"))
7694
7697
7695 updatecheck = None
7698 updatecheck = None
7696 if check:
7699 if check:
7697 updatecheck = b'abort'
7700 updatecheck = b'abort'
7698 elif merge:
7701 elif merge:
7699 updatecheck = b'none'
7702 updatecheck = b'none'
7700
7703
7701 with repo.wlock():
7704 with repo.wlock():
7702 cmdutil.clearunfinished(repo)
7705 cmdutil.clearunfinished(repo)
7703 if date:
7706 if date:
7704 rev = cmdutil.finddate(ui, repo, date)
7707 rev = cmdutil.finddate(ui, repo, date)
7705
7708
7706 # if we defined a bookmark, we have to remember the original name
7709 # if we defined a bookmark, we have to remember the original name
7707 brev = rev
7710 brev = rev
7708 if rev:
7711 if rev:
7709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7710 ctx = scmutil.revsingle(repo, rev, default=None)
7713 ctx = scmutil.revsingle(repo, rev, default=None)
7711 rev = ctx.rev()
7714 rev = ctx.rev()
7712 hidden = ctx.hidden()
7715 hidden = ctx.hidden()
7713 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7716 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7714 with ui.configoverride(overrides, b'update'):
7717 with ui.configoverride(overrides, b'update'):
7715 ret = hg.updatetotally(
7718 ret = hg.updatetotally(
7716 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7719 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7717 )
7720 )
7718 if hidden:
7721 if hidden:
7719 ctxstr = ctx.hex()[:12]
7722 ctxstr = ctx.hex()[:12]
7720 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7723 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7721
7724
7722 if ctx.obsolete():
7725 if ctx.obsolete():
7723 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7726 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7724 ui.warn(b"(%s)\n" % obsfatemsg)
7727 ui.warn(b"(%s)\n" % obsfatemsg)
7725 return ret
7728 return ret
7726
7729
7727
7730
7728 @command(
7731 @command(
7729 b'verify',
7732 b'verify',
7730 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7733 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7731 helpcategory=command.CATEGORY_MAINTENANCE,
7734 helpcategory=command.CATEGORY_MAINTENANCE,
7732 )
7735 )
7733 def verify(ui, repo, **opts):
7736 def verify(ui, repo, **opts):
7734 """verify the integrity of the repository
7737 """verify the integrity of the repository
7735
7738
7736 Verify the integrity of the current repository.
7739 Verify the integrity of the current repository.
7737
7740
7738 This will perform an extensive check of the repository's
7741 This will perform an extensive check of the repository's
7739 integrity, validating the hashes and checksums of each entry in
7742 integrity, validating the hashes and checksums of each entry in
7740 the changelog, manifest, and tracked files, as well as the
7743 the changelog, manifest, and tracked files, as well as the
7741 integrity of their crosslinks and indices.
7744 integrity of their crosslinks and indices.
7742
7745
7743 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7746 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7744 for more information about recovery from corruption of the
7747 for more information about recovery from corruption of the
7745 repository.
7748 repository.
7746
7749
7747 Returns 0 on success, 1 if errors are encountered.
7750 Returns 0 on success, 1 if errors are encountered.
7748 """
7751 """
7749 opts = pycompat.byteskwargs(opts)
7752 opts = pycompat.byteskwargs(opts)
7750
7753
7751 level = None
7754 level = None
7752 if opts[b'full']:
7755 if opts[b'full']:
7753 level = verifymod.VERIFY_FULL
7756 level = verifymod.VERIFY_FULL
7754 return hg.verify(repo, level)
7757 return hg.verify(repo, level)
7755
7758
7756
7759
7757 @command(
7760 @command(
7758 b'version',
7761 b'version',
7759 [] + formatteropts,
7762 [] + formatteropts,
7760 helpcategory=command.CATEGORY_HELP,
7763 helpcategory=command.CATEGORY_HELP,
7761 norepo=True,
7764 norepo=True,
7762 intents={INTENT_READONLY},
7765 intents={INTENT_READONLY},
7763 )
7766 )
7764 def version_(ui, **opts):
7767 def version_(ui, **opts):
7765 """output version and copyright information
7768 """output version and copyright information
7766
7769
7767 .. container:: verbose
7770 .. container:: verbose
7768
7771
7769 Template:
7772 Template:
7770
7773
7771 The following keywords are supported. See also :hg:`help templates`.
7774 The following keywords are supported. See also :hg:`help templates`.
7772
7775
7773 :extensions: List of extensions.
7776 :extensions: List of extensions.
7774 :ver: String. Version number.
7777 :ver: String. Version number.
7775
7778
7776 And each entry of ``{extensions}`` provides the following sub-keywords
7779 And each entry of ``{extensions}`` provides the following sub-keywords
7777 in addition to ``{ver}``.
7780 in addition to ``{ver}``.
7778
7781
7779 :bundled: Boolean. True if included in the release.
7782 :bundled: Boolean. True if included in the release.
7780 :name: String. Extension name.
7783 :name: String. Extension name.
7781 """
7784 """
7782 opts = pycompat.byteskwargs(opts)
7785 opts = pycompat.byteskwargs(opts)
7783 if ui.verbose:
7786 if ui.verbose:
7784 ui.pager(b'version')
7787 ui.pager(b'version')
7785 fm = ui.formatter(b"version", opts)
7788 fm = ui.formatter(b"version", opts)
7786 fm.startitem()
7789 fm.startitem()
7787 fm.write(
7790 fm.write(
7788 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7791 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7789 )
7792 )
7790 license = _(
7793 license = _(
7791 b"(see https://mercurial-scm.org for more information)\n"
7794 b"(see https://mercurial-scm.org for more information)\n"
7792 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7795 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7793 b"This is free software; see the source for copying conditions. "
7796 b"This is free software; see the source for copying conditions. "
7794 b"There is NO\nwarranty; "
7797 b"There is NO\nwarranty; "
7795 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7798 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7796 )
7799 )
7797 if not ui.quiet:
7800 if not ui.quiet:
7798 fm.plain(license)
7801 fm.plain(license)
7799
7802
7800 if ui.verbose:
7803 if ui.verbose:
7801 fm.plain(_(b"\nEnabled extensions:\n\n"))
7804 fm.plain(_(b"\nEnabled extensions:\n\n"))
7802 # format names and versions into columns
7805 # format names and versions into columns
7803 names = []
7806 names = []
7804 vers = []
7807 vers = []
7805 isinternals = []
7808 isinternals = []
7806 for name, module in extensions.extensions():
7809 for name, module in extensions.extensions():
7807 names.append(name)
7810 names.append(name)
7808 vers.append(extensions.moduleversion(module) or None)
7811 vers.append(extensions.moduleversion(module) or None)
7809 isinternals.append(extensions.ismoduleinternal(module))
7812 isinternals.append(extensions.ismoduleinternal(module))
7810 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7813 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7811 if names:
7814 if names:
7812 namefmt = b" %%-%ds " % max(len(n) for n in names)
7815 namefmt = b" %%-%ds " % max(len(n) for n in names)
7813 places = [_(b"external"), _(b"internal")]
7816 places = [_(b"external"), _(b"internal")]
7814 for n, v, p in zip(names, vers, isinternals):
7817 for n, v, p in zip(names, vers, isinternals):
7815 fn.startitem()
7818 fn.startitem()
7816 fn.condwrite(ui.verbose, b"name", namefmt, n)
7819 fn.condwrite(ui.verbose, b"name", namefmt, n)
7817 if ui.verbose:
7820 if ui.verbose:
7818 fn.plain(b"%s " % places[p])
7821 fn.plain(b"%s " % places[p])
7819 fn.data(bundled=p)
7822 fn.data(bundled=p)
7820 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7823 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7821 if ui.verbose:
7824 if ui.verbose:
7822 fn.plain(b"\n")
7825 fn.plain(b"\n")
7823 fn.end()
7826 fn.end()
7824 fm.end()
7827 fm.end()
7825
7828
7826
7829
7827 def loadcmdtable(ui, name, cmdtable):
7830 def loadcmdtable(ui, name, cmdtable):
7828 """Load command functions from specified cmdtable
7831 """Load command functions from specified cmdtable
7829 """
7832 """
7830 overrides = [cmd for cmd in cmdtable if cmd in table]
7833 overrides = [cmd for cmd in cmdtable if cmd in table]
7831 if overrides:
7834 if overrides:
7832 ui.warn(
7835 ui.warn(
7833 _(b"extension '%s' overrides commands: %s\n")
7836 _(b"extension '%s' overrides commands: %s\n")
7834 % (name, b" ".join(overrides))
7837 % (name, b" ".join(overrides))
7835 )
7838 )
7836 table.update(cmdtable)
7839 table.update(cmdtable)
@@ -1,730 +1,730 b''
1 $ hg init t
1 $ hg init t
2 $ cd t
2 $ cd t
3 $ echo import > port
3 $ echo import > port
4 $ hg add port
4 $ hg add port
5 $ hg commit -m 0 -u spam -d '0 0'
5 $ hg commit -m 0 -u spam -d '0 0'
6 $ echo export >> port
6 $ echo export >> port
7 $ hg commit -m 1 -u eggs -d '1 0'
7 $ hg commit -m 1 -u eggs -d '1 0'
8 $ echo export > port
8 $ echo export > port
9 $ echo vaportight >> port
9 $ echo vaportight >> port
10 $ echo 'import/export' >> port
10 $ echo 'import/export' >> port
11 $ hg commit -m 2 -u spam -d '2 0'
11 $ hg commit -m 2 -u spam -d '2 0'
12 $ echo 'import/export' >> port
12 $ echo 'import/export' >> port
13 $ hg commit -m 3 -u eggs -d '3 0'
13 $ hg commit -m 3 -u eggs -d '3 0'
14 $ head -n 3 port > port1
14 $ head -n 3 port > port1
15 $ mv port1 port
15 $ mv port1 port
16 $ hg commit -m 4 -u spam -d '4 0'
16 $ hg commit -m 4 -u spam -d '4 0'
17
17
18 pattern error
18 pattern error
19
19
20 $ hg grep '**test**'
20 $ hg grep '**test**'
21 grep: invalid match pattern: nothing to repeat* (glob)
21 grep: invalid match pattern: nothing to repeat* (glob)
22 [1]
22 [1]
23
23
24 simple
24 simple
25
25
26 $ hg grep -r tip:0 '.*'
26 $ hg grep -r tip:0 '.*'
27 port:4:export
27 port:4:export
28 port:4:vaportight
28 port:4:vaportight
29 port:4:import/export
29 port:4:import/export
30 port:3:export
30 port:3:export
31 port:3:vaportight
31 port:3:vaportight
32 port:3:import/export
32 port:3:import/export
33 port:3:import/export
33 port:3:import/export
34 port:2:export
34 port:2:export
35 port:2:vaportight
35 port:2:vaportight
36 port:2:import/export
36 port:2:import/export
37 port:1:import
37 port:1:import
38 port:1:export
38 port:1:export
39 port:0:import
39 port:0:import
40 $ hg grep -r tip:0 port port
40 $ hg grep -r tip:0 port port
41 port:4:export
41 port:4:export
42 port:4:vaportight
42 port:4:vaportight
43 port:4:import/export
43 port:4:import/export
44 port:3:export
44 port:3:export
45 port:3:vaportight
45 port:3:vaportight
46 port:3:import/export
46 port:3:import/export
47 port:3:import/export
47 port:3:import/export
48 port:2:export
48 port:2:export
49 port:2:vaportight
49 port:2:vaportight
50 port:2:import/export
50 port:2:import/export
51 port:1:import
51 port:1:import
52 port:1:export
52 port:1:export
53 port:0:import
53 port:0:import
54
54
55 simple from subdirectory
55 simple from subdirectory
56
56
57 $ mkdir dir
57 $ mkdir dir
58 $ cd dir
58 $ cd dir
59 $ hg grep -r tip:0 port
59 $ hg grep -r tip:0 port
60 port:4:export
60 port:4:export
61 port:4:vaportight
61 port:4:vaportight
62 port:4:import/export
62 port:4:import/export
63 port:3:export
63 port:3:export
64 port:3:vaportight
64 port:3:vaportight
65 port:3:import/export
65 port:3:import/export
66 port:3:import/export
66 port:3:import/export
67 port:2:export
67 port:2:export
68 port:2:vaportight
68 port:2:vaportight
69 port:2:import/export
69 port:2:import/export
70 port:1:import
70 port:1:import
71 port:1:export
71 port:1:export
72 port:0:import
72 port:0:import
73 $ hg grep -r tip:0 port --config ui.relative-paths=yes
73 $ hg grep -r tip:0 port --config ui.relative-paths=yes
74 ../port:4:export
74 ../port:4:export
75 ../port:4:vaportight
75 ../port:4:vaportight
76 ../port:4:import/export
76 ../port:4:import/export
77 ../port:3:export
77 ../port:3:export
78 ../port:3:vaportight
78 ../port:3:vaportight
79 ../port:3:import/export
79 ../port:3:import/export
80 ../port:3:import/export
80 ../port:3:import/export
81 ../port:2:export
81 ../port:2:export
82 ../port:2:vaportight
82 ../port:2:vaportight
83 ../port:2:import/export
83 ../port:2:import/export
84 ../port:1:import
84 ../port:1:import
85 ../port:1:export
85 ../port:1:export
86 ../port:0:import
86 ../port:0:import
87 $ cd ..
87 $ cd ..
88
88
89 simple with color
89 simple with color
90
90
91 $ hg --config extensions.color= grep --config color.mode=ansi \
91 $ hg --config extensions.color= grep --config color.mode=ansi \
92 > --color=always port port -r tip:0
92 > --color=always port port -r tip:0
93 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
93 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
94 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
94 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
95 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
95 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
96 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
96 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
97 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
97 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
98 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
98 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
99 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
99 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
100 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
100 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
101 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
101 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
102 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
102 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
103 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
103 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
104 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
104 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
105 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m0\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
105 \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m0\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
106
106
107 simple templated
107 simple templated
108
108
109 $ hg grep port -r tip:0 \
109 $ hg grep port -r tip:0 \
110 > -T '{path}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
110 > -T '{path}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
111 port:4:914fa752cdea:exPORT
111 port:4:914fa752cdea:exPORT
112 port:4:914fa752cdea:vaPORTight
112 port:4:914fa752cdea:vaPORTight
113 port:4:914fa752cdea:imPORT/exPORT
113 port:4:914fa752cdea:imPORT/exPORT
114 port:3:95040cfd017d:exPORT
114 port:3:95040cfd017d:exPORT
115 port:3:95040cfd017d:vaPORTight
115 port:3:95040cfd017d:vaPORTight
116 port:3:95040cfd017d:imPORT/exPORT
116 port:3:95040cfd017d:imPORT/exPORT
117 port:3:95040cfd017d:imPORT/exPORT
117 port:3:95040cfd017d:imPORT/exPORT
118 port:2:3b325e3481a1:exPORT
118 port:2:3b325e3481a1:exPORT
119 port:2:3b325e3481a1:vaPORTight
119 port:2:3b325e3481a1:vaPORTight
120 port:2:3b325e3481a1:imPORT/exPORT
120 port:2:3b325e3481a1:imPORT/exPORT
121 port:1:8b20f75c1585:imPORT
121 port:1:8b20f75c1585:imPORT
122 port:1:8b20f75c1585:exPORT
122 port:1:8b20f75c1585:exPORT
123 port:0:f31323c92170:imPORT
123 port:0:f31323c92170:imPORT
124
124
125 $ hg grep port -r tip:0 -T '{path}:{rev}:{texts}\n'
125 $ hg grep port -r tip:0 -T '{path}:{rev}:{texts}\n'
126 port:4:export
126 port:4:export
127 port:4:vaportight
127 port:4:vaportight
128 port:4:import/export
128 port:4:import/export
129 port:3:export
129 port:3:export
130 port:3:vaportight
130 port:3:vaportight
131 port:3:import/export
131 port:3:import/export
132 port:3:import/export
132 port:3:import/export
133 port:2:export
133 port:2:export
134 port:2:vaportight
134 port:2:vaportight
135 port:2:import/export
135 port:2:import/export
136 port:1:import
136 port:1:import
137 port:1:export
137 port:1:export
138 port:0:import
138 port:0:import
139
139
140 $ hg grep port -r tip:0 -T '{path}:{tags}:{texts}\n'
140 $ hg grep port -r tip:0 -T '{path}:{tags}:{texts}\n'
141 port:tip:export
141 port:tip:export
142 port:tip:vaportight
142 port:tip:vaportight
143 port:tip:import/export
143 port:tip:import/export
144 port::export
144 port::export
145 port::vaportight
145 port::vaportight
146 port::import/export
146 port::import/export
147 port::import/export
147 port::import/export
148 port::export
148 port::export
149 port::vaportight
149 port::vaportight
150 port::import/export
150 port::import/export
151 port::import
151 port::import
152 port::export
152 port::export
153 port::import
153 port::import
154
154
155 simple JSON (no "change" field)
155 simple JSON (no "change" field)
156
156
157 $ hg grep -r tip:0 -Tjson port
157 $ hg grep -r tip:0 -Tjson port
158 [
158 [
159 {
159 {
160 "date": [4, 0],
160 "date": [4, 0],
161 "lineno": 1,
161 "lineno": 1,
162 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
162 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
163 "path": "port",
163 "path": "port",
164 "rev": 4,
164 "rev": 4,
165 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
165 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
166 "user": "spam"
166 "user": "spam"
167 },
167 },
168 {
168 {
169 "date": [4, 0],
169 "date": [4, 0],
170 "lineno": 2,
170 "lineno": 2,
171 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
171 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
172 "path": "port",
172 "path": "port",
173 "rev": 4,
173 "rev": 4,
174 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
174 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
175 "user": "spam"
175 "user": "spam"
176 },
176 },
177 {
177 {
178 "date": [4, 0],
178 "date": [4, 0],
179 "lineno": 3,
179 "lineno": 3,
180 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
180 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
181 "path": "port",
181 "path": "port",
182 "rev": 4,
182 "rev": 4,
183 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
183 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
184 "user": "spam"
184 "user": "spam"
185 },
185 },
186 {
186 {
187 "date": [3, 0],
187 "date": [3, 0],
188 "lineno": 1,
188 "lineno": 1,
189 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
189 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
190 "path": "port",
190 "path": "port",
191 "rev": 3,
191 "rev": 3,
192 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
192 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
193 "user": "eggs"
193 "user": "eggs"
194 },
194 },
195 {
195 {
196 "date": [3, 0],
196 "date": [3, 0],
197 "lineno": 2,
197 "lineno": 2,
198 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
198 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
199 "path": "port",
199 "path": "port",
200 "rev": 3,
200 "rev": 3,
201 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
201 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
202 "user": "eggs"
202 "user": "eggs"
203 },
203 },
204 {
204 {
205 "date": [3, 0],
205 "date": [3, 0],
206 "lineno": 3,
206 "lineno": 3,
207 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
207 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
208 "path": "port",
208 "path": "port",
209 "rev": 3,
209 "rev": 3,
210 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
210 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
211 "user": "eggs"
211 "user": "eggs"
212 },
212 },
213 {
213 {
214 "date": [3, 0],
214 "date": [3, 0],
215 "lineno": 4,
215 "lineno": 4,
216 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
216 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
217 "path": "port",
217 "path": "port",
218 "rev": 3,
218 "rev": 3,
219 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
219 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
220 "user": "eggs"
220 "user": "eggs"
221 },
221 },
222 {
222 {
223 "date": [2, 0],
223 "date": [2, 0],
224 "lineno": 1,
224 "lineno": 1,
225 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
225 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
226 "path": "port",
226 "path": "port",
227 "rev": 2,
227 "rev": 2,
228 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
228 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
229 "user": "spam"
229 "user": "spam"
230 },
230 },
231 {
231 {
232 "date": [2, 0],
232 "date": [2, 0],
233 "lineno": 2,
233 "lineno": 2,
234 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
234 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
235 "path": "port",
235 "path": "port",
236 "rev": 2,
236 "rev": 2,
237 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
237 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
238 "user": "spam"
238 "user": "spam"
239 },
239 },
240 {
240 {
241 "date": [2, 0],
241 "date": [2, 0],
242 "lineno": 3,
242 "lineno": 3,
243 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
243 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
244 "path": "port",
244 "path": "port",
245 "rev": 2,
245 "rev": 2,
246 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
246 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
247 "user": "spam"
247 "user": "spam"
248 },
248 },
249 {
249 {
250 "date": [1, 0],
250 "date": [1, 0],
251 "lineno": 1,
251 "lineno": 1,
252 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
252 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
253 "path": "port",
253 "path": "port",
254 "rev": 1,
254 "rev": 1,
255 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
255 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
256 "user": "eggs"
256 "user": "eggs"
257 },
257 },
258 {
258 {
259 "date": [1, 0],
259 "date": [1, 0],
260 "lineno": 2,
260 "lineno": 2,
261 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
261 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
262 "path": "port",
262 "path": "port",
263 "rev": 1,
263 "rev": 1,
264 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
264 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
265 "user": "eggs"
265 "user": "eggs"
266 },
266 },
267 {
267 {
268 "date": [0, 0],
268 "date": [0, 0],
269 "lineno": 1,
269 "lineno": 1,
270 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
270 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
271 "path": "port",
271 "path": "port",
272 "rev": 0,
272 "rev": 0,
273 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
273 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
274 "user": "spam"
274 "user": "spam"
275 }
275 }
276 ]
276 ]
277
277
278 simple JSON without matching lines
278 simple JSON without matching lines
279
279
280 $ hg grep -r tip:0 -Tjson -l port
280 $ hg grep -r tip:0 -Tjson -l port
281 [
281 [
282 {
282 {
283 "date": [4, 0],
283 "date": [4, 0],
284 "lineno": 1,
284 "lineno": 1,
285 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
285 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
286 "path": "port",
286 "path": "port",
287 "rev": 4,
287 "rev": 4,
288 "user": "spam"
288 "user": "spam"
289 },
289 },
290 {
290 {
291 "date": [3, 0],
291 "date": [3, 0],
292 "lineno": 1,
292 "lineno": 1,
293 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
293 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
294 "path": "port",
294 "path": "port",
295 "rev": 3,
295 "rev": 3,
296 "user": "eggs"
296 "user": "eggs"
297 },
297 },
298 {
298 {
299 "date": [2, 0],
299 "date": [2, 0],
300 "lineno": 1,
300 "lineno": 1,
301 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
301 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
302 "path": "port",
302 "path": "port",
303 "rev": 2,
303 "rev": 2,
304 "user": "spam"
304 "user": "spam"
305 },
305 },
306 {
306 {
307 "date": [1, 0],
307 "date": [1, 0],
308 "lineno": 1,
308 "lineno": 1,
309 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
309 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
310 "path": "port",
310 "path": "port",
311 "rev": 1,
311 "rev": 1,
312 "user": "eggs"
312 "user": "eggs"
313 },
313 },
314 {
314 {
315 "date": [0, 0],
315 "date": [0, 0],
316 "lineno": 1,
316 "lineno": 1,
317 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
317 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
318 "path": "port",
318 "path": "port",
319 "rev": 0,
319 "rev": 0,
320 "user": "spam"
320 "user": "spam"
321 }
321 }
322 ]
322 ]
323
323
324 all
324 all
325
325
326 $ hg grep --traceback --all -nu port port
326 $ hg grep --traceback --all -nu port port
327 port:4:4:-:spam:import/export
327 port:4:4:-:spam:import/export
328 port:3:4:+:eggs:import/export
328 port:3:4:+:eggs:import/export
329 port:2:1:-:spam:import
329 port:2:1:-:spam:import
330 port:2:2:-:spam:export
330 port:2:2:-:spam:export
331 port:2:1:+:spam:export
331 port:2:1:+:spam:export
332 port:2:2:+:spam:vaportight
332 port:2:2:+:spam:vaportight
333 port:2:3:+:spam:import/export
333 port:2:3:+:spam:import/export
334 port:1:2:+:eggs:export
334 port:1:2:+:eggs:export
335 port:0:1:+:spam:import
335 port:0:1:+:spam:import
336
336
337 all JSON
337 all JSON
338
338
339 $ hg grep --all -Tjson port port
339 $ hg grep --all -Tjson port port
340 [
340 [
341 {
341 {
342 "change": "-",
342 "change": "-",
343 "date": [4, 0],
343 "date": [4, 0],
344 "lineno": 4,
344 "lineno": 4,
345 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
345 "node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
346 "path": "port",
346 "path": "port",
347 "rev": 4,
347 "rev": 4,
348 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
348 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
349 "user": "spam"
349 "user": "spam"
350 },
350 },
351 {
351 {
352 "change": "+",
352 "change": "+",
353 "date": [3, 0],
353 "date": [3, 0],
354 "lineno": 4,
354 "lineno": 4,
355 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
355 "node": "95040cfd017d658c536071c6290230a613c4c2a6",
356 "path": "port",
356 "path": "port",
357 "rev": 3,
357 "rev": 3,
358 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
358 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
359 "user": "eggs"
359 "user": "eggs"
360 },
360 },
361 {
361 {
362 "change": "-",
362 "change": "-",
363 "date": [2, 0],
363 "date": [2, 0],
364 "lineno": 1,
364 "lineno": 1,
365 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
365 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
366 "path": "port",
366 "path": "port",
367 "rev": 2,
367 "rev": 2,
368 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
368 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
369 "user": "spam"
369 "user": "spam"
370 },
370 },
371 {
371 {
372 "change": "-",
372 "change": "-",
373 "date": [2, 0],
373 "date": [2, 0],
374 "lineno": 2,
374 "lineno": 2,
375 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
375 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
376 "path": "port",
376 "path": "port",
377 "rev": 2,
377 "rev": 2,
378 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
378 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
379 "user": "spam"
379 "user": "spam"
380 },
380 },
381 {
381 {
382 "change": "+",
382 "change": "+",
383 "date": [2, 0],
383 "date": [2, 0],
384 "lineno": 1,
384 "lineno": 1,
385 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
385 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
386 "path": "port",
386 "path": "port",
387 "rev": 2,
387 "rev": 2,
388 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
388 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
389 "user": "spam"
389 "user": "spam"
390 },
390 },
391 {
391 {
392 "change": "+",
392 "change": "+",
393 "date": [2, 0],
393 "date": [2, 0],
394 "lineno": 2,
394 "lineno": 2,
395 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
395 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
396 "path": "port",
396 "path": "port",
397 "rev": 2,
397 "rev": 2,
398 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
398 "texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
399 "user": "spam"
399 "user": "spam"
400 },
400 },
401 {
401 {
402 "change": "+",
402 "change": "+",
403 "date": [2, 0],
403 "date": [2, 0],
404 "lineno": 3,
404 "lineno": 3,
405 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
405 "node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
406 "path": "port",
406 "path": "port",
407 "rev": 2,
407 "rev": 2,
408 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
408 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
409 "user": "spam"
409 "user": "spam"
410 },
410 },
411 {
411 {
412 "change": "+",
412 "change": "+",
413 "date": [1, 0],
413 "date": [1, 0],
414 "lineno": 2,
414 "lineno": 2,
415 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
415 "node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
416 "path": "port",
416 "path": "port",
417 "rev": 1,
417 "rev": 1,
418 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
418 "texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
419 "user": "eggs"
419 "user": "eggs"
420 },
420 },
421 {
421 {
422 "change": "+",
422 "change": "+",
423 "date": [0, 0],
423 "date": [0, 0],
424 "lineno": 1,
424 "lineno": 1,
425 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
425 "node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
426 "path": "port",
426 "path": "port",
427 "rev": 0,
427 "rev": 0,
428 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
428 "texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
429 "user": "spam"
429 "user": "spam"
430 }
430 }
431 ]
431 ]
432
432
433 other
433 other
434
434
435 $ hg grep -r tip:0 -l port port
435 $ hg grep -r tip:0 -l port port
436 port:4
436 port:4
437 port:3
437 port:3
438 port:2
438 port:2
439 port:1
439 port:1
440 port:0
440 port:0
441 $ hg grep -r tip:0 import port
441 $ hg grep -r tip:0 import port
442 port:4:import/export
442 port:4:import/export
443 port:3:import/export
443 port:3:import/export
444 port:3:import/export
444 port:3:import/export
445 port:2:import/export
445 port:2:import/export
446 port:1:import
446 port:1:import
447 port:0:import
447 port:0:import
448
448
449 $ hg cp port port2
449 $ hg cp port port2
450 $ hg commit -m 4 -u spam -d '5 0'
450 $ hg commit -m 4 -u spam -d '5 0'
451
451
452 follow
452 follow
453
453
454 $ hg grep -r tip:0 --traceback -f 'import\n\Z' port2
454 $ hg grep -r tip:0 --traceback -f 'import\n\Z' port2
455 [1]
455 [1]
456 $ echo deport >> port2
456 $ echo deport >> port2
457 $ hg commit -m 5 -u eggs -d '6 0'
457 $ hg commit -m 5 -u eggs -d '6 0'
458 $ hg grep -f --all -nu port port2
458 $ hg grep -f --all -nu port port2
459 port2:6:4:+:eggs:deport
459 port2:6:4:+:eggs:deport
460 port:4:4:-:spam:import/export
460 port:4:4:-:spam:import/export
461 port:3:4:+:eggs:import/export
461 port:3:4:+:eggs:import/export
462 port:2:1:-:spam:import
462 port:2:1:-:spam:import
463 port:2:2:-:spam:export
463 port:2:2:-:spam:export
464 port:2:1:+:spam:export
464 port:2:1:+:spam:export
465 port:2:2:+:spam:vaportight
465 port:2:2:+:spam:vaportight
466 port:2:3:+:spam:import/export
466 port:2:3:+:spam:import/export
467 port:1:2:+:eggs:export
467 port:1:2:+:eggs:export
468 port:0:1:+:spam:import
468 port:0:1:+:spam:import
469
469
470 $ hg up -q null
470 $ hg up -q null
471 $ hg grep -r 'reverse(:.)' -f port
471 $ hg grep -r 'reverse(:.)' -f port
472 port:0:import
472 port:0:import
473
473
474 Test wdir
474 Test wdir
475 (at least, this shouldn't crash)
475 (at least, this shouldn't crash)
476
476
477 $ hg up -q
477 $ hg up -q
478 $ echo wport >> port2
478 $ echo wport >> port2
479 $ hg stat
479 $ hg stat
480 M port2
480 M port2
481 $ hg grep -r 'wdir()' port
481 $ hg grep -r 'wdir()' port
482 port:2147483647:export
482 port:2147483647:export
483 port:2147483647:vaportight
483 port:2147483647:vaportight
484 port:2147483647:import/export
484 port:2147483647:import/export
485 port2:2147483647:export
485 port2:2147483647:export
486 port2:2147483647:vaportight
486 port2:2147483647:vaportight
487 port2:2147483647:import/export
487 port2:2147483647:import/export
488 port2:2147483647:deport
488 port2:2147483647:deport
489 port2:2147483647:wport
489 port2:2147483647:wport
490
490
491 $ cd ..
491 $ cd ..
492 $ hg init t2
492 $ hg init t2
493 $ cd t2
493 $ cd t2
494 $ hg grep -r tip:0 foobar foo
494 $ hg grep -r tip:0 foobar foo
495 [1]
495 [1]
496 $ hg grep -r tip:0 foobar
496 $ hg grep -r tip:0 foobar
497 [1]
497 [1]
498 $ echo blue >> color
498 $ echo blue >> color
499 $ echo black >> color
499 $ echo black >> color
500 $ hg add color
500 $ hg add color
501 $ hg ci -m 0
501 $ hg ci -m 0
502 $ echo orange >> color
502 $ echo orange >> color
503 $ hg ci -m 1
503 $ hg ci -m 1
504 $ echo black > color
504 $ echo black > color
505 $ hg ci -m 2
505 $ hg ci -m 2
506 $ echo orange >> color
506 $ echo orange >> color
507 $ echo blue >> color
507 $ echo blue >> color
508 $ hg ci -m 3
508 $ hg ci -m 3
509 $ hg grep -r tip:0 orange
509 $ hg grep -r tip:0 orange
510 color:3:orange
510 color:3:orange
511 color:1:orange
511 color:1:orange
512 $ hg grep --all orange
512 $ hg grep --all orange
513 color:3:+:orange
513 color:3:+:orange
514 color:2:-:orange
514 color:2:-:orange
515 color:1:+:orange
515 color:1:+:orange
516 $ hg grep --diff orange --color=debug
516 $ hg grep --diff orange --color=debug
517 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
517 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
518 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange]
518 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange]
519 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
519 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
520
520
521 $ hg grep --diff orange --color=yes
521 $ hg grep --diff orange --color=yes
522 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
522 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
523 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1m-\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
523 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1m-\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
524 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
524 \x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
525
525
526 $ hg grep --diff orange
526 $ hg grep --diff orange
527 color:3:+:orange
527 color:3:+:orange
528 color:2:-:orange
528 color:2:-:orange
529 color:1:+:orange
529 color:1:+:orange
530
530
531 test substring match: '^' should only match at the beginning
531 test substring match: '^' should only match at the beginning
532
532
533 $ hg grep -r tip:0 '^.' --config extensions.color= --color debug
533 $ hg grep -r tip:0 '^.' --config extensions.color= --color debug
534 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
534 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
535 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
535 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
536 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
536 [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
537 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.match|b]lack
537 [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.match|b]lack
538 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lue
538 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lue
539 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lack
539 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lack
540 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|o]range
540 [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|o]range
541 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lue
541 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lue
542 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lack
542 [grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lack
543
543
544 match in last "line" without newline
544 match in last "line" without newline
545
545
546 $ "$PYTHON" -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
546 $ "$PYTHON" -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
547 $ hg ci -Amnoeol
547 $ hg ci -Amnoeol
548 adding noeol
548 adding noeol
549 $ hg grep -r tip:0 loop
549 $ hg grep -r tip:0 loop
550 noeol:4:no infinite loop
550 noeol:4:no infinite loop
551
551
552 $ cd ..
552 $ cd ..
553
553
554 Issue685: traceback in grep -r after rename
554 Issue685: traceback in grep -r after rename
555
555
556 Got a traceback when using grep on a single
556 Got a traceback when using grep on a single
557 revision with renamed files.
557 revision with renamed files.
558
558
559 $ hg init issue685
559 $ hg init issue685
560 $ cd issue685
560 $ cd issue685
561 $ echo octarine > color
561 $ echo octarine > color
562 $ hg ci -Amcolor
562 $ hg ci -Amcolor
563 adding color
563 adding color
564 $ hg rename color colour
564 $ hg rename color colour
565 $ hg ci -Am rename
565 $ hg ci -Am rename
566 $ hg grep -r tip:0 octarine
566 $ hg grep -r tip:0 octarine
567 colour:1:octarine
567 colour:1:octarine
568 color:0:octarine
568 color:0:octarine
569
569
570 Used to crash here
570 Used to crash here
571
571
572 $ hg grep -r 1 octarine
572 $ hg grep -r 1 octarine
573 colour:1:octarine
573 colour:1:octarine
574 $ cd ..
574 $ cd ..
575
575
576
576
577 Issue337: test that grep follows parent-child relationships instead
577 Issue337: test that grep follows parent-child relationships instead
578 of just using revision numbers.
578 of just using revision numbers.
579
579
580 $ hg init issue337
580 $ hg init issue337
581 $ cd issue337
581 $ cd issue337
582
582
583 $ echo white > color
583 $ echo white > color
584 $ hg commit -A -m "0 white"
584 $ hg commit -A -m "0 white"
585 adding color
585 adding color
586
586
587 $ echo red > color
587 $ echo red > color
588 $ hg commit -A -m "1 red"
588 $ hg commit -A -m "1 red"
589
589
590 $ hg update 0
590 $ hg update 0
591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
592 $ echo black > color
592 $ echo black > color
593 $ hg commit -A -m "2 black"
593 $ hg commit -A -m "2 black"
594 created new head
594 created new head
595
595
596 $ hg update --clean 1
596 $ hg update --clean 1
597 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
597 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
598 $ echo blue > color
598 $ echo blue > color
599 $ hg commit -A -m "3 blue"
599 $ hg commit -A -m "3 blue"
600
600
601 $ hg grep --all red
601 $ hg grep --all red
602 color:3:-:red
602 color:3:-:red
603 color:1:+:red
603 color:1:+:red
604
604
605 $ hg grep --diff red
605 $ hg grep --diff red
606 color:3:-:red
606 color:3:-:red
607 color:1:+:red
607 color:1:+:red
608
608
609 Issue3885: test that changing revision order does not alter the
609 Issue3885: test that changing revision order does not alter the
610 revisions printed, just their order.
610 revisions printed, just their order.
611
611
612 $ hg grep --all red -r "all()"
612 $ hg grep --all red -r "all()"
613 color:1:+:red
613 color:1:+:red
614 color:3:-:red
614 color:3:-:red
615
615
616 $ hg grep --all red -r "reverse(all())"
616 $ hg grep --all red -r "reverse(all())"
617 color:3:-:red
617 color:3:-:red
618 color:1:+:red
618 color:1:+:red
619
619
620 $ hg grep --diff red -r "all()"
620 $ hg grep --diff red -r "all()"
621 color:1:+:red
621 color:1:+:red
622 color:3:-:red
622 color:3:-:red
623
623
624 $ hg grep --diff red -r "reverse(all())"
624 $ hg grep --diff red -r "reverse(all())"
625 color:3:-:red
625 color:3:-:red
626 color:1:+:red
626 color:1:+:red
627
627
628 $ cd ..
628 $ cd ..
629
629
630 $ hg init a
630 $ hg init a
631 $ cd a
631 $ cd a
632 $ cp "$TESTDIR/binfile.bin" .
632 $ cp "$TESTDIR/binfile.bin" .
633 $ hg add binfile.bin
633 $ hg add binfile.bin
634 $ hg ci -m 'add binfile.bin'
634 $ hg ci -m 'add binfile.bin'
635 $ hg grep "MaCam" --all
635 $ hg grep "MaCam" --all
636 binfile.bin:0:+: Binary file matches
636 binfile.bin:0:+: Binary file matches
637
637
638 $ hg grep "MaCam" --diff
638 $ hg grep "MaCam" --diff
639 binfile.bin:0:+: Binary file matches
639 binfile.bin:0:+: Binary file matches
640
640
641 $ cd ..
641 $ cd ..
642
642
643 Test for showing working of allfiles flag
643 Test for showing working of allfiles flag
644
644
645 $ hg init sng
645 $ hg init sng
646 $ cd sng
646 $ cd sng
647 $ echo "unmod" >> um
647 $ echo "unmod" >> um
648 $ echo old > old
648 $ echo old > old
649 $ hg ci -q -A -m "adds unmod to um"
649 $ hg ci -q -A -m "adds unmod to um"
650 $ echo "something else" >> new
650 $ echo "something else" >> new
651 $ hg ci -A -m "second commit"
651 $ hg ci -A -m "second commit"
652 adding new
652 adding new
653 $ hg grep -r "." "unmod"
653 $ hg grep -r "." "unmod"
654 um:1:unmod
654 um:1:unmod
655
655
656 Existing tracked files in the working directory are searched by default
656 Existing tracked files in the working directory are searched by default
657
657
658 $ echo modified >> new
658 $ echo modified >> new
659 $ echo 'added' > added; hg add added
659 $ echo 'added' > added; hg add added
660 $ echo 'added, missing' > added-missing; hg add added-missing; rm added-missing
660 $ echo 'added, missing' > added-missing; hg add added-missing; rm added-missing
661 $ echo 'untracked' > untracked
661 $ echo 'untracked' > untracked
662 $ hg rm old
662 $ hg rm old
663 $ hg grep '[^Z]'
663 $ hg grep ''
664 added:added
664 added:added
665 new:something else
665 new:something else
666 new:modified
666 new:modified
667 um:unmod
667 um:unmod
668
668
669 which can be overridden by -rREV
669 which can be overridden by -rREV
670
670
671 $ hg grep -r. mod
671 $ hg grep -r. mod
672 um:1:unmod
672 um:1:unmod
673
673
674 $ hg grep --diff mod
674 $ hg grep --diff mod
675 um:0:+:unmod
675 um:0:+:unmod
676
676
677 $ cd ..
677 $ cd ..
678
678
679 Change Default of grep by ui.tweakdefaults, that is, the files not in current
679 Change Default of grep by ui.tweakdefaults, that is, the files not in current
680 working directory should not be grepp-ed on
680 working directory should not be grepp-ed on
681
681
682 $ hg init ab
682 $ hg init ab
683 $ cd ab
683 $ cd ab
684 $ cat <<'EOF' >> .hg/hgrc
684 $ cat <<'EOF' >> .hg/hgrc
685 > [ui]
685 > [ui]
686 > tweakdefaults = True
686 > tweakdefaults = True
687 > EOF
687 > EOF
688 $ echo "some text">>file1
688 $ echo "some text">>file1
689 $ hg add file1
689 $ hg add file1
690 $ hg commit -m "adds file1"
690 $ hg commit -m "adds file1"
691 $ hg mv file1 file2
691 $ hg mv file1 file2
692
692
693 wdir revision is hidden by default:
693 wdir revision is hidden by default:
694
694
695 $ hg grep "some"
695 $ hg grep "some"
696 file2:some text
696 file2:some text
697
697
698 but it should be available in template dict:
698 but it should be available in template dict:
699
699
700 $ hg grep "some" -Tjson
700 $ hg grep "some" -Tjson
701 [
701 [
702 {
702 {
703 "date": [0, 0],
703 "date": [0, 0],
704 "lineno": 1,
704 "lineno": 1,
705 "node": "ffffffffffffffffffffffffffffffffffffffff",
705 "node": "ffffffffffffffffffffffffffffffffffffffff",
706 "path": "file2",
706 "path": "file2",
707 "rev": 2147483647,
707 "rev": 2147483647,
708 "texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}],
708 "texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}],
709 "user": "test"
709 "user": "test"
710 }
710 }
711 ]
711 ]
712
712
713 $ cd ..
713 $ cd ..
714
714
715 test -rMULTIREV
715 test -rMULTIREV
716
716
717 $ cd sng
717 $ cd sng
718 $ hg rm um
718 $ hg rm um
719 $ hg commit -m "deletes um"
719 $ hg commit -m "deletes um"
720 $ hg grep -r "0:2" "unmod"
720 $ hg grep -r "0:2" "unmod"
721 um:0:unmod
721 um:0:unmod
722 um:1:unmod
722 um:1:unmod
723 $ hg grep -r "0:2" "unmod" um
723 $ hg grep -r "0:2" "unmod" um
724 um:0:unmod
724 um:0:unmod
725 um:1:unmod
725 um:1:unmod
726 $ hg grep -r "0:2" "unmod" "glob:**/um" # Check that patterns also work
726 $ hg grep -r "0:2" "unmod" "glob:**/um" # Check that patterns also work
727 um:0:unmod
727 um:0:unmod
728 um:1:unmod
728 um:1:unmod
729 $ cd ..
729 $ cd ..
730
730
General Comments 0
You need to be logged in to leave comments. Login now