##// END OF EJS Templates
errors: raise more specific errors when default remote not configured...
Martin von Zweigbergk -
r46446:1bf1dcbc default
parent child Browse files
Show More
@@ -1,7706 +1,7706 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import sys
13 import sys
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 wdirhex,
21 wdirhex,
22 wdirrev,
22 wdirrev,
23 )
23 )
24 from .pycompat import open
24 from .pycompat import open
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 bundlecaches,
29 bundlecaches,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 grep as grepmod,
44 grep as grepmod,
45 hbisect,
45 hbisect,
46 help,
46 help,
47 hg,
47 hg,
48 logcmdutil,
48 logcmdutil,
49 merge as mergemod,
49 merge as mergemod,
50 mergestate as mergestatemod,
50 mergestate as mergestatemod,
51 narrowspec,
51 narrowspec,
52 obsolete,
52 obsolete,
53 obsutil,
53 obsutil,
54 patch,
54 patch,
55 phases,
55 phases,
56 pycompat,
56 pycompat,
57 rcutil,
57 rcutil,
58 registrar,
58 registrar,
59 requirements,
59 requirements,
60 revsetlang,
60 revsetlang,
61 rewriteutil,
61 rewriteutil,
62 scmutil,
62 scmutil,
63 server,
63 server,
64 shelve as shelvemod,
64 shelve as shelvemod,
65 state as statemod,
65 state as statemod,
66 streamclone,
66 streamclone,
67 tags as tagsmod,
67 tags as tagsmod,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 verify as verifymod,
70 verify as verifymod,
71 vfs as vfsmod,
71 vfs as vfsmod,
72 wireprotoserver,
72 wireprotoserver,
73 )
73 )
74 from .utils import (
74 from .utils import (
75 dateutil,
75 dateutil,
76 stringutil,
76 stringutil,
77 )
77 )
78
78
79 table = {}
79 table = {}
80 table.update(debugcommandsmod.command._table)
80 table.update(debugcommandsmod.command._table)
81
81
82 command = registrar.command(table)
82 command = registrar.command(table)
83 INTENT_READONLY = registrar.INTENT_READONLY
83 INTENT_READONLY = registrar.INTENT_READONLY
84
84
85 # common command options
85 # common command options
86
86
87 globalopts = [
87 globalopts = [
88 (
88 (
89 b'R',
89 b'R',
90 b'repository',
90 b'repository',
91 b'',
91 b'',
92 _(b'repository root directory or name of overlay bundle file'),
92 _(b'repository root directory or name of overlay bundle file'),
93 _(b'REPO'),
93 _(b'REPO'),
94 ),
94 ),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
96 (
96 (
97 b'y',
97 b'y',
98 b'noninteractive',
98 b'noninteractive',
99 None,
99 None,
100 _(
100 _(
101 b'do not prompt, automatically pick the first choice for all prompts'
101 b'do not prompt, automatically pick the first choice for all prompts'
102 ),
102 ),
103 ),
103 ),
104 (b'q', b'quiet', None, _(b'suppress output')),
104 (b'q', b'quiet', None, _(b'suppress output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
105 (b'v', b'verbose', None, _(b'enable additional output')),
106 (
106 (
107 b'',
107 b'',
108 b'color',
108 b'color',
109 b'',
109 b'',
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
111 # and should not be translated
111 # and should not be translated
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
113 _(b'TYPE'),
113 _(b'TYPE'),
114 ),
114 ),
115 (
115 (
116 b'',
116 b'',
117 b'config',
117 b'config',
118 [],
118 [],
119 _(b'set/override config option (use \'section.name=value\')'),
119 _(b'set/override config option (use \'section.name=value\')'),
120 _(b'CONFIG'),
120 _(b'CONFIG'),
121 ),
121 ),
122 (b'', b'debug', None, _(b'enable debugging output')),
122 (b'', b'debug', None, _(b'enable debugging output')),
123 (b'', b'debugger', None, _(b'start debugger')),
123 (b'', b'debugger', None, _(b'start debugger')),
124 (
124 (
125 b'',
125 b'',
126 b'encoding',
126 b'encoding',
127 encoding.encoding,
127 encoding.encoding,
128 _(b'set the charset encoding'),
128 _(b'set the charset encoding'),
129 _(b'ENCODE'),
129 _(b'ENCODE'),
130 ),
130 ),
131 (
131 (
132 b'',
132 b'',
133 b'encodingmode',
133 b'encodingmode',
134 encoding.encodingmode,
134 encoding.encodingmode,
135 _(b'set the charset encoding mode'),
135 _(b'set the charset encoding mode'),
136 _(b'MODE'),
136 _(b'MODE'),
137 ),
137 ),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
139 (b'', b'time', None, _(b'time how long the command takes')),
139 (b'', b'time', None, _(b'time how long the command takes')),
140 (b'', b'profile', None, _(b'print command execution profile')),
140 (b'', b'profile', None, _(b'print command execution profile')),
141 (b'', b'version', None, _(b'output version information and exit')),
141 (b'', b'version', None, _(b'output version information and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
142 (b'h', b'help', None, _(b'display help and exit')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
143 (b'', b'hidden', False, _(b'consider hidden changesets')),
144 (
144 (
145 b'',
145 b'',
146 b'pager',
146 b'pager',
147 b'auto',
147 b'auto',
148 _(b"when to paginate (boolean, always, auto, or never)"),
148 _(b"when to paginate (boolean, always, auto, or never)"),
149 _(b'TYPE'),
149 _(b'TYPE'),
150 ),
150 ),
151 ]
151 ]
152
152
153 dryrunopts = cmdutil.dryrunopts
153 dryrunopts = cmdutil.dryrunopts
154 remoteopts = cmdutil.remoteopts
154 remoteopts = cmdutil.remoteopts
155 walkopts = cmdutil.walkopts
155 walkopts = cmdutil.walkopts
156 commitopts = cmdutil.commitopts
156 commitopts = cmdutil.commitopts
157 commitopts2 = cmdutil.commitopts2
157 commitopts2 = cmdutil.commitopts2
158 commitopts3 = cmdutil.commitopts3
158 commitopts3 = cmdutil.commitopts3
159 formatteropts = cmdutil.formatteropts
159 formatteropts = cmdutil.formatteropts
160 templateopts = cmdutil.templateopts
160 templateopts = cmdutil.templateopts
161 logopts = cmdutil.logopts
161 logopts = cmdutil.logopts
162 diffopts = cmdutil.diffopts
162 diffopts = cmdutil.diffopts
163 diffwsopts = cmdutil.diffwsopts
163 diffwsopts = cmdutil.diffwsopts
164 diffopts2 = cmdutil.diffopts2
164 diffopts2 = cmdutil.diffopts2
165 mergetoolopts = cmdutil.mergetoolopts
165 mergetoolopts = cmdutil.mergetoolopts
166 similarityopts = cmdutil.similarityopts
166 similarityopts = cmdutil.similarityopts
167 subrepoopts = cmdutil.subrepoopts
167 subrepoopts = cmdutil.subrepoopts
168 debugrevlogopts = cmdutil.debugrevlogopts
168 debugrevlogopts = cmdutil.debugrevlogopts
169
169
170 # Commands start here, listed alphabetically
170 # Commands start here, listed alphabetically
171
171
172
172
173 @command(
173 @command(
174 b'abort',
174 b'abort',
175 dryrunopts,
175 dryrunopts,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
177 helpbasic=True,
177 helpbasic=True,
178 )
178 )
179 def abort(ui, repo, **opts):
179 def abort(ui, repo, **opts):
180 """abort an unfinished operation (EXPERIMENTAL)
180 """abort an unfinished operation (EXPERIMENTAL)
181
181
182 Aborts a multistep operation like graft, histedit, rebase, merge,
182 Aborts a multistep operation like graft, histedit, rebase, merge,
183 and unshelve if they are in an unfinished state.
183 and unshelve if they are in an unfinished state.
184
184
185 use --dry-run/-n to dry run the command.
185 use --dry-run/-n to dry run the command.
186 """
186 """
187 dryrun = opts.get('dry_run')
187 dryrun = opts.get('dry_run')
188 abortstate = cmdutil.getunfinishedstate(repo)
188 abortstate = cmdutil.getunfinishedstate(repo)
189 if not abortstate:
189 if not abortstate:
190 raise error.StateError(_(b'no operation in progress'))
190 raise error.StateError(_(b'no operation in progress'))
191 if not abortstate.abortfunc:
191 if not abortstate.abortfunc:
192 raise error.InputError(
192 raise error.InputError(
193 (
193 (
194 _(b"%s in progress but does not support 'hg abort'")
194 _(b"%s in progress but does not support 'hg abort'")
195 % (abortstate._opname)
195 % (abortstate._opname)
196 ),
196 ),
197 hint=abortstate.hint(),
197 hint=abortstate.hint(),
198 )
198 )
199 if dryrun:
199 if dryrun:
200 ui.status(
200 ui.status(
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
202 )
202 )
203 return
203 return
204 return abortstate.abortfunc(ui, repo)
204 return abortstate.abortfunc(ui, repo)
205
205
206
206
207 @command(
207 @command(
208 b'add',
208 b'add',
209 walkopts + subrepoopts + dryrunopts,
209 walkopts + subrepoopts + dryrunopts,
210 _(b'[OPTION]... [FILE]...'),
210 _(b'[OPTION]... [FILE]...'),
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
212 helpbasic=True,
212 helpbasic=True,
213 inferrepo=True,
213 inferrepo=True,
214 )
214 )
215 def add(ui, repo, *pats, **opts):
215 def add(ui, repo, *pats, **opts):
216 """add the specified files on the next commit
216 """add the specified files on the next commit
217
217
218 Schedule files to be version controlled and added to the
218 Schedule files to be version controlled and added to the
219 repository.
219 repository.
220
220
221 The files will be added to the repository at the next commit. To
221 The files will be added to the repository at the next commit. To
222 undo an add before that, see :hg:`forget`.
222 undo an add before that, see :hg:`forget`.
223
223
224 If no names are given, add all files to the repository (except
224 If no names are given, add all files to the repository (except
225 files matching ``.hgignore``).
225 files matching ``.hgignore``).
226
226
227 .. container:: verbose
227 .. container:: verbose
228
228
229 Examples:
229 Examples:
230
230
231 - New (unknown) files are added
231 - New (unknown) files are added
232 automatically by :hg:`add`::
232 automatically by :hg:`add`::
233
233
234 $ ls
234 $ ls
235 foo.c
235 foo.c
236 $ hg status
236 $ hg status
237 ? foo.c
237 ? foo.c
238 $ hg add
238 $ hg add
239 adding foo.c
239 adding foo.c
240 $ hg status
240 $ hg status
241 A foo.c
241 A foo.c
242
242
243 - Specific files to be added can be specified::
243 - Specific files to be added can be specified::
244
244
245 $ ls
245 $ ls
246 bar.c foo.c
246 bar.c foo.c
247 $ hg status
247 $ hg status
248 ? bar.c
248 ? bar.c
249 ? foo.c
249 ? foo.c
250 $ hg add bar.c
250 $ hg add bar.c
251 $ hg status
251 $ hg status
252 A bar.c
252 A bar.c
253 ? foo.c
253 ? foo.c
254
254
255 Returns 0 if all files are successfully added.
255 Returns 0 if all files are successfully added.
256 """
256 """
257
257
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
261 return rejected and 1 or 0
261 return rejected and 1 or 0
262
262
263
263
264 @command(
264 @command(
265 b'addremove',
265 b'addremove',
266 similarityopts + subrepoopts + walkopts + dryrunopts,
266 similarityopts + subrepoopts + walkopts + dryrunopts,
267 _(b'[OPTION]... [FILE]...'),
267 _(b'[OPTION]... [FILE]...'),
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
269 inferrepo=True,
269 inferrepo=True,
270 )
270 )
271 def addremove(ui, repo, *pats, **opts):
271 def addremove(ui, repo, *pats, **opts):
272 """add all new files, delete all missing files
272 """add all new files, delete all missing files
273
273
274 Add all new files and remove all missing files from the
274 Add all new files and remove all missing files from the
275 repository.
275 repository.
276
276
277 Unless names are given, new files are ignored if they match any of
277 Unless names are given, new files are ignored if they match any of
278 the patterns in ``.hgignore``. As with add, these changes take
278 the patterns in ``.hgignore``. As with add, these changes take
279 effect at the next commit.
279 effect at the next commit.
280
280
281 Use the -s/--similarity option to detect renamed files. This
281 Use the -s/--similarity option to detect renamed files. This
282 option takes a percentage between 0 (disabled) and 100 (files must
282 option takes a percentage between 0 (disabled) and 100 (files must
283 be identical) as its parameter. With a parameter greater than 0,
283 be identical) as its parameter. With a parameter greater than 0,
284 this compares every removed file with every added file and records
284 this compares every removed file with every added file and records
285 those similar enough as renames. Detecting renamed files this way
285 those similar enough as renames. Detecting renamed files this way
286 can be expensive. After using this option, :hg:`status -C` can be
286 can be expensive. After using this option, :hg:`status -C` can be
287 used to check which files were identified as moved or renamed. If
287 used to check which files were identified as moved or renamed. If
288 not specified, -s/--similarity defaults to 100 and only renames of
288 not specified, -s/--similarity defaults to 100 and only renames of
289 identical files are detected.
289 identical files are detected.
290
290
291 .. container:: verbose
291 .. container:: verbose
292
292
293 Examples:
293 Examples:
294
294
295 - A number of files (bar.c and foo.c) are new,
295 - A number of files (bar.c and foo.c) are new,
296 while foobar.c has been removed (without using :hg:`remove`)
296 while foobar.c has been removed (without using :hg:`remove`)
297 from the repository::
297 from the repository::
298
298
299 $ ls
299 $ ls
300 bar.c foo.c
300 bar.c foo.c
301 $ hg status
301 $ hg status
302 ! foobar.c
302 ! foobar.c
303 ? bar.c
303 ? bar.c
304 ? foo.c
304 ? foo.c
305 $ hg addremove
305 $ hg addremove
306 adding bar.c
306 adding bar.c
307 adding foo.c
307 adding foo.c
308 removing foobar.c
308 removing foobar.c
309 $ hg status
309 $ hg status
310 A bar.c
310 A bar.c
311 A foo.c
311 A foo.c
312 R foobar.c
312 R foobar.c
313
313
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 Afterwards, it was edited slightly::
315 Afterwards, it was edited slightly::
316
316
317 $ ls
317 $ ls
318 foo.c
318 foo.c
319 $ hg status
319 $ hg status
320 ! foobar.c
320 ! foobar.c
321 ? foo.c
321 ? foo.c
322 $ hg addremove --similarity 90
322 $ hg addremove --similarity 90
323 removing foobar.c
323 removing foobar.c
324 adding foo.c
324 adding foo.c
325 recording removal of foobar.c as rename to foo.c (94% similar)
325 recording removal of foobar.c as rename to foo.c (94% similar)
326 $ hg status -C
326 $ hg status -C
327 A foo.c
327 A foo.c
328 foobar.c
328 foobar.c
329 R foobar.c
329 R foobar.c
330
330
331 Returns 0 if all files are successfully added.
331 Returns 0 if all files are successfully added.
332 """
332 """
333 opts = pycompat.byteskwargs(opts)
333 opts = pycompat.byteskwargs(opts)
334 if not opts.get(b'similarity'):
334 if not opts.get(b'similarity'):
335 opts[b'similarity'] = b'100'
335 opts[b'similarity'] = b'100'
336 matcher = scmutil.match(repo[None], pats, opts)
336 matcher = scmutil.match(repo[None], pats, opts)
337 relative = scmutil.anypats(pats, opts)
337 relative = scmutil.anypats(pats, opts)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
340
340
341
341
342 @command(
342 @command(
343 b'annotate|blame',
343 b'annotate|blame',
344 [
344 [
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
346 (
346 (
347 b'',
347 b'',
348 b'follow',
348 b'follow',
349 None,
349 None,
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
351 ),
351 ),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
353 (b'a', b'text', None, _(b'treat all files as text')),
353 (b'a', b'text', None, _(b'treat all files as text')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
354 (b'u', b'user', None, _(b'list the author (long with -v)')),
355 (b'f', b'file', None, _(b'list the filename')),
355 (b'f', b'file', None, _(b'list the filename')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
356 (b'd', b'date', None, _(b'list the date (short with -q)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
357 (b'n', b'number', None, _(b'list the revision number (default)')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
358 (b'c', b'changeset', None, _(b'list the changeset')),
359 (
359 (
360 b'l',
360 b'l',
361 b'line-number',
361 b'line-number',
362 None,
362 None,
363 _(b'show line number at the first appearance'),
363 _(b'show line number at the first appearance'),
364 ),
364 ),
365 (
365 (
366 b'',
366 b'',
367 b'skip',
367 b'skip',
368 [],
368 [],
369 _(b'revset to not display (EXPERIMENTAL)'),
369 _(b'revset to not display (EXPERIMENTAL)'),
370 _(b'REV'),
370 _(b'REV'),
371 ),
371 ),
372 ]
372 ]
373 + diffwsopts
373 + diffwsopts
374 + walkopts
374 + walkopts
375 + formatteropts,
375 + formatteropts,
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
377 helpcategory=command.CATEGORY_FILE_CONTENTS,
378 helpbasic=True,
378 helpbasic=True,
379 inferrepo=True,
379 inferrepo=True,
380 )
380 )
381 def annotate(ui, repo, *pats, **opts):
381 def annotate(ui, repo, *pats, **opts):
382 """show changeset information by line for each file
382 """show changeset information by line for each file
383
383
384 List changes in files, showing the revision id responsible for
384 List changes in files, showing the revision id responsible for
385 each line.
385 each line.
386
386
387 This command is useful for discovering when a change was made and
387 This command is useful for discovering when a change was made and
388 by whom.
388 by whom.
389
389
390 If you include --file, --user, or --date, the revision number is
390 If you include --file, --user, or --date, the revision number is
391 suppressed unless you also include --number.
391 suppressed unless you also include --number.
392
392
393 Without the -a/--text option, annotate will avoid processing files
393 Without the -a/--text option, annotate will avoid processing files
394 it detects as binary. With -a, annotate will annotate the file
394 it detects as binary. With -a, annotate will annotate the file
395 anyway, although the results will probably be neither useful
395 anyway, although the results will probably be neither useful
396 nor desirable.
396 nor desirable.
397
397
398 .. container:: verbose
398 .. container:: verbose
399
399
400 Template:
400 Template:
401
401
402 The following keywords are supported in addition to the common template
402 The following keywords are supported in addition to the common template
403 keywords and functions. See also :hg:`help templates`.
403 keywords and functions. See also :hg:`help templates`.
404
404
405 :lines: List of lines with annotation data.
405 :lines: List of lines with annotation data.
406 :path: String. Repository-absolute path of the specified file.
406 :path: String. Repository-absolute path of the specified file.
407
407
408 And each entry of ``{lines}`` provides the following sub-keywords in
408 And each entry of ``{lines}`` provides the following sub-keywords in
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
410
410
411 :line: String. Line content.
411 :line: String. Line content.
412 :lineno: Integer. Line number at that revision.
412 :lineno: Integer. Line number at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
413 :path: String. Repository-absolute path of the file at that revision.
414
414
415 See :hg:`help templates.operators` for the list expansion syntax.
415 See :hg:`help templates.operators` for the list expansion syntax.
416
416
417 Returns 0 on success.
417 Returns 0 on success.
418 """
418 """
419 opts = pycompat.byteskwargs(opts)
419 opts = pycompat.byteskwargs(opts)
420 if not pats:
420 if not pats:
421 raise error.InputError(
421 raise error.InputError(
422 _(b'at least one filename or pattern is required')
422 _(b'at least one filename or pattern is required')
423 )
423 )
424
424
425 if opts.get(b'follow'):
425 if opts.get(b'follow'):
426 # --follow is deprecated and now just an alias for -f/--file
426 # --follow is deprecated and now just an alias for -f/--file
427 # to mimic the behavior of Mercurial before version 1.5
427 # to mimic the behavior of Mercurial before version 1.5
428 opts[b'file'] = True
428 opts[b'file'] = True
429
429
430 if (
430 if (
431 not opts.get(b'user')
431 not opts.get(b'user')
432 and not opts.get(b'changeset')
432 and not opts.get(b'changeset')
433 and not opts.get(b'date')
433 and not opts.get(b'date')
434 and not opts.get(b'file')
434 and not opts.get(b'file')
435 ):
435 ):
436 opts[b'number'] = True
436 opts[b'number'] = True
437
437
438 linenumber = opts.get(b'line_number') is not None
438 linenumber = opts.get(b'line_number') is not None
439 if (
439 if (
440 linenumber
440 linenumber
441 and (not opts.get(b'changeset'))
441 and (not opts.get(b'changeset'))
442 and (not opts.get(b'number'))
442 and (not opts.get(b'number'))
443 ):
443 ):
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
445
445
446 rev = opts.get(b'rev')
446 rev = opts.get(b'rev')
447 if rev:
447 if rev:
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
449 ctx = scmutil.revsingle(repo, rev)
449 ctx = scmutil.revsingle(repo, rev)
450
450
451 ui.pager(b'annotate')
451 ui.pager(b'annotate')
452 rootfm = ui.formatter(b'annotate', opts)
452 rootfm = ui.formatter(b'annotate', opts)
453 if ui.debugflag:
453 if ui.debugflag:
454 shorthex = pycompat.identity
454 shorthex = pycompat.identity
455 else:
455 else:
456
456
457 def shorthex(h):
457 def shorthex(h):
458 return h[:12]
458 return h[:12]
459
459
460 if ui.quiet:
460 if ui.quiet:
461 datefunc = dateutil.shortdate
461 datefunc = dateutil.shortdate
462 else:
462 else:
463 datefunc = dateutil.datestr
463 datefunc = dateutil.datestr
464 if ctx.rev() is None:
464 if ctx.rev() is None:
465 if opts.get(b'changeset'):
465 if opts.get(b'changeset'):
466 # omit "+" suffix which is appended to node hex
466 # omit "+" suffix which is appended to node hex
467 def formatrev(rev):
467 def formatrev(rev):
468 if rev == wdirrev:
468 if rev == wdirrev:
469 return b'%d' % ctx.p1().rev()
469 return b'%d' % ctx.p1().rev()
470 else:
470 else:
471 return b'%d' % rev
471 return b'%d' % rev
472
472
473 else:
473 else:
474
474
475 def formatrev(rev):
475 def formatrev(rev):
476 if rev == wdirrev:
476 if rev == wdirrev:
477 return b'%d+' % ctx.p1().rev()
477 return b'%d+' % ctx.p1().rev()
478 else:
478 else:
479 return b'%d ' % rev
479 return b'%d ' % rev
480
480
481 def formathex(h):
481 def formathex(h):
482 if h == wdirhex:
482 if h == wdirhex:
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
483 return b'%s+' % shorthex(hex(ctx.p1().node()))
484 else:
484 else:
485 return b'%s ' % shorthex(h)
485 return b'%s ' % shorthex(h)
486
486
487 else:
487 else:
488 formatrev = b'%d'.__mod__
488 formatrev = b'%d'.__mod__
489 formathex = shorthex
489 formathex = shorthex
490
490
491 opmap = [
491 opmap = [
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
498 ]
498 ]
499 opnamemap = {
499 opnamemap = {
500 b'rev': b'number',
500 b'rev': b'number',
501 b'node': b'changeset',
501 b'node': b'changeset',
502 b'path': b'file',
502 b'path': b'file',
503 b'lineno': b'line_number',
503 b'lineno': b'line_number',
504 }
504 }
505
505
506 if rootfm.isplain():
506 if rootfm.isplain():
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return lambda x: fmt(get(x))
509 return lambda x: fmt(get(x))
510
510
511 else:
511 else:
512
512
513 def makefunc(get, fmt):
513 def makefunc(get, fmt):
514 return get
514 return get
515
515
516 datahint = rootfm.datahint()
516 datahint = rootfm.datahint()
517 funcmap = [
517 funcmap = [
518 (makefunc(get, fmt), sep)
518 (makefunc(get, fmt), sep)
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 ]
521 ]
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
523 fields = b' '.join(
523 fields = b' '.join(
524 fn
524 fn
525 for fn, sep, get, fmt in opmap
525 for fn, sep, get, fmt in opmap
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 )
527 )
528
528
529 def bad(x, y):
529 def bad(x, y):
530 raise error.Abort(b"%s: %s" % (x, y))
530 raise error.Abort(b"%s: %s" % (x, y))
531
531
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
532 m = scmutil.match(ctx, pats, opts, badfn=bad)
533
533
534 follow = not opts.get(b'no_follow')
534 follow = not opts.get(b'no_follow')
535 diffopts = patch.difffeatureopts(
535 diffopts = patch.difffeatureopts(
536 ui, opts, section=b'annotate', whitespace=True
536 ui, opts, section=b'annotate', whitespace=True
537 )
537 )
538 skiprevs = opts.get(b'skip')
538 skiprevs = opts.get(b'skip')
539 if skiprevs:
539 if skiprevs:
540 skiprevs = scmutil.revrange(repo, skiprevs)
540 skiprevs = scmutil.revrange(repo, skiprevs)
541
541
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
543 for abs in ctx.walk(m):
543 for abs in ctx.walk(m):
544 fctx = ctx[abs]
544 fctx = ctx[abs]
545 rootfm.startitem()
545 rootfm.startitem()
546 rootfm.data(path=abs)
546 rootfm.data(path=abs)
547 if not opts.get(b'text') and fctx.isbinary():
547 if not opts.get(b'text') and fctx.isbinary():
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
549 continue
549 continue
550
550
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
552 lines = fctx.annotate(
552 lines = fctx.annotate(
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
554 )
554 )
555 if not lines:
555 if not lines:
556 fm.end()
556 fm.end()
557 continue
557 continue
558 formats = []
558 formats = []
559 pieces = []
559 pieces = []
560
560
561 for f, sep in funcmap:
561 for f, sep in funcmap:
562 l = [f(n) for n in lines]
562 l = [f(n) for n in lines]
563 if fm.isplain():
563 if fm.isplain():
564 sizes = [encoding.colwidth(x) for x in l]
564 sizes = [encoding.colwidth(x) for x in l]
565 ml = max(sizes)
565 ml = max(sizes)
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
567 else:
567 else:
568 formats.append([b'%s'] * len(l))
568 formats.append([b'%s'] * len(l))
569 pieces.append(l)
569 pieces.append(l)
570
570
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
572 fm.startitem()
572 fm.startitem()
573 fm.context(fctx=n.fctx)
573 fm.context(fctx=n.fctx)
574 fm.write(fields, b"".join(f), *p)
574 fm.write(fields, b"".join(f), *p)
575 if n.skip:
575 if n.skip:
576 fmt = b"* %s"
576 fmt = b"* %s"
577 else:
577 else:
578 fmt = b": %s"
578 fmt = b": %s"
579 fm.write(b'line', fmt, n.text)
579 fm.write(b'line', fmt, n.text)
580
580
581 if not lines[-1].text.endswith(b'\n'):
581 if not lines[-1].text.endswith(b'\n'):
582 fm.plain(b'\n')
582 fm.plain(b'\n')
583 fm.end()
583 fm.end()
584
584
585 rootfm.end()
585 rootfm.end()
586
586
587
587
588 @command(
588 @command(
589 b'archive',
589 b'archive',
590 [
590 [
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
592 (
592 (
593 b'p',
593 b'p',
594 b'prefix',
594 b'prefix',
595 b'',
595 b'',
596 _(b'directory prefix for files in archive'),
596 _(b'directory prefix for files in archive'),
597 _(b'PREFIX'),
597 _(b'PREFIX'),
598 ),
598 ),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
601 ]
601 ]
602 + subrepoopts
602 + subrepoopts
603 + walkopts,
603 + walkopts,
604 _(b'[OPTION]... DEST'),
604 _(b'[OPTION]... DEST'),
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
606 )
606 )
607 def archive(ui, repo, dest, **opts):
607 def archive(ui, repo, dest, **opts):
608 '''create an unversioned archive of a repository revision
608 '''create an unversioned archive of a repository revision
609
609
610 By default, the revision used is the parent of the working
610 By default, the revision used is the parent of the working
611 directory; use -r/--rev to specify a different revision.
611 directory; use -r/--rev to specify a different revision.
612
612
613 The archive type is automatically detected based on file
613 The archive type is automatically detected based on file
614 extension (to override, use -t/--type).
614 extension (to override, use -t/--type).
615
615
616 .. container:: verbose
616 .. container:: verbose
617
617
618 Examples:
618 Examples:
619
619
620 - create a zip file containing the 1.0 release::
620 - create a zip file containing the 1.0 release::
621
621
622 hg archive -r 1.0 project-1.0.zip
622 hg archive -r 1.0 project-1.0.zip
623
623
624 - create a tarball excluding .hg files::
624 - create a tarball excluding .hg files::
625
625
626 hg archive project.tar.gz -X ".hg*"
626 hg archive project.tar.gz -X ".hg*"
627
627
628 Valid types are:
628 Valid types are:
629
629
630 :``files``: a directory full of files (default)
630 :``files``: a directory full of files (default)
631 :``tar``: tar archive, uncompressed
631 :``tar``: tar archive, uncompressed
632 :``tbz2``: tar archive, compressed using bzip2
632 :``tbz2``: tar archive, compressed using bzip2
633 :``tgz``: tar archive, compressed using gzip
633 :``tgz``: tar archive, compressed using gzip
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
634 :``txz``: tar archive, compressed using lzma (only in Python 3)
635 :``uzip``: zip archive, uncompressed
635 :``uzip``: zip archive, uncompressed
636 :``zip``: zip archive, compressed using deflate
636 :``zip``: zip archive, compressed using deflate
637
637
638 The exact name of the destination archive or directory is given
638 The exact name of the destination archive or directory is given
639 using a format string; see :hg:`help export` for details.
639 using a format string; see :hg:`help export` for details.
640
640
641 Each member added to an archive file has a directory prefix
641 Each member added to an archive file has a directory prefix
642 prepended. Use -p/--prefix to specify a format string for the
642 prepended. Use -p/--prefix to specify a format string for the
643 prefix. The default is the basename of the archive, with suffixes
643 prefix. The default is the basename of the archive, with suffixes
644 removed.
644 removed.
645
645
646 Returns 0 on success.
646 Returns 0 on success.
647 '''
647 '''
648
648
649 opts = pycompat.byteskwargs(opts)
649 opts = pycompat.byteskwargs(opts)
650 rev = opts.get(b'rev')
650 rev = opts.get(b'rev')
651 if rev:
651 if rev:
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
653 ctx = scmutil.revsingle(repo, rev)
653 ctx = scmutil.revsingle(repo, rev)
654 if not ctx:
654 if not ctx:
655 raise error.InputError(
655 raise error.InputError(
656 _(b'no working directory: please specify a revision')
656 _(b'no working directory: please specify a revision')
657 )
657 )
658 node = ctx.node()
658 node = ctx.node()
659 dest = cmdutil.makefilename(ctx, dest)
659 dest = cmdutil.makefilename(ctx, dest)
660 if os.path.realpath(dest) == repo.root:
660 if os.path.realpath(dest) == repo.root:
661 raise error.InputError(_(b'repository root cannot be destination'))
661 raise error.InputError(_(b'repository root cannot be destination'))
662
662
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
664 prefix = opts.get(b'prefix')
664 prefix = opts.get(b'prefix')
665
665
666 if dest == b'-':
666 if dest == b'-':
667 if kind == b'files':
667 if kind == b'files':
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
668 raise error.InputError(_(b'cannot archive plain files to stdout'))
669 dest = cmdutil.makefileobj(ctx, dest)
669 dest = cmdutil.makefileobj(ctx, dest)
670 if not prefix:
670 if not prefix:
671 prefix = os.path.basename(repo.root) + b'-%h'
671 prefix = os.path.basename(repo.root) + b'-%h'
672
672
673 prefix = cmdutil.makefilename(ctx, prefix)
673 prefix = cmdutil.makefilename(ctx, prefix)
674 match = scmutil.match(ctx, [], opts)
674 match = scmutil.match(ctx, [], opts)
675 archival.archive(
675 archival.archive(
676 repo,
676 repo,
677 dest,
677 dest,
678 node,
678 node,
679 kind,
679 kind,
680 not opts.get(b'no_decode'),
680 not opts.get(b'no_decode'),
681 match,
681 match,
682 prefix,
682 prefix,
683 subrepos=opts.get(b'subrepos'),
683 subrepos=opts.get(b'subrepos'),
684 )
684 )
685
685
686
686
687 @command(
687 @command(
688 b'backout',
688 b'backout',
689 [
689 [
690 (
690 (
691 b'',
691 b'',
692 b'merge',
692 b'merge',
693 None,
693 None,
694 _(b'merge with old dirstate parent after backout'),
694 _(b'merge with old dirstate parent after backout'),
695 ),
695 ),
696 (
696 (
697 b'',
697 b'',
698 b'commit',
698 b'commit',
699 None,
699 None,
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
701 ),
701 ),
702 (b'', b'no-commit', None, _(b'do not commit')),
702 (b'', b'no-commit', None, _(b'do not commit')),
703 (
703 (
704 b'',
704 b'',
705 b'parent',
705 b'parent',
706 b'',
706 b'',
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
707 _(b'parent to choose when backing out merge (DEPRECATED)'),
708 _(b'REV'),
708 _(b'REV'),
709 ),
709 ),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
712 ]
712 ]
713 + mergetoolopts
713 + mergetoolopts
714 + walkopts
714 + walkopts
715 + commitopts
715 + commitopts
716 + commitopts2,
716 + commitopts2,
717 _(b'[OPTION]... [-r] REV'),
717 _(b'[OPTION]... [-r] REV'),
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
719 )
719 )
720 def backout(ui, repo, node=None, rev=None, **opts):
720 def backout(ui, repo, node=None, rev=None, **opts):
721 '''reverse effect of earlier changeset
721 '''reverse effect of earlier changeset
722
722
723 Prepare a new changeset with the effect of REV undone in the
723 Prepare a new changeset with the effect of REV undone in the
724 current working directory. If no conflicts were encountered,
724 current working directory. If no conflicts were encountered,
725 it will be committed immediately.
725 it will be committed immediately.
726
726
727 If REV is the parent of the working directory, then this new changeset
727 If REV is the parent of the working directory, then this new changeset
728 is committed automatically (unless --no-commit is specified).
728 is committed automatically (unless --no-commit is specified).
729
729
730 .. note::
730 .. note::
731
731
732 :hg:`backout` cannot be used to fix either an unwanted or
732 :hg:`backout` cannot be used to fix either an unwanted or
733 incorrect merge.
733 incorrect merge.
734
734
735 .. container:: verbose
735 .. container:: verbose
736
736
737 Examples:
737 Examples:
738
738
739 - Reverse the effect of the parent of the working directory.
739 - Reverse the effect of the parent of the working directory.
740 This backout will be committed immediately::
740 This backout will be committed immediately::
741
741
742 hg backout -r .
742 hg backout -r .
743
743
744 - Reverse the effect of previous bad revision 23::
744 - Reverse the effect of previous bad revision 23::
745
745
746 hg backout -r 23
746 hg backout -r 23
747
747
748 - Reverse the effect of previous bad revision 23 and
748 - Reverse the effect of previous bad revision 23 and
749 leave changes uncommitted::
749 leave changes uncommitted::
750
750
751 hg backout -r 23 --no-commit
751 hg backout -r 23 --no-commit
752 hg commit -m "Backout revision 23"
752 hg commit -m "Backout revision 23"
753
753
754 By default, the pending changeset will have one parent,
754 By default, the pending changeset will have one parent,
755 maintaining a linear history. With --merge, the pending
755 maintaining a linear history. With --merge, the pending
756 changeset will instead have two parents: the old parent of the
756 changeset will instead have two parents: the old parent of the
757 working directory and a new child of REV that simply undoes REV.
757 working directory and a new child of REV that simply undoes REV.
758
758
759 Before version 1.7, the behavior without --merge was equivalent
759 Before version 1.7, the behavior without --merge was equivalent
760 to specifying --merge followed by :hg:`update --clean .` to
760 to specifying --merge followed by :hg:`update --clean .` to
761 cancel the merge and leave the child of REV as a head to be
761 cancel the merge and leave the child of REV as a head to be
762 merged separately.
762 merged separately.
763
763
764 See :hg:`help dates` for a list of formats valid for -d/--date.
764 See :hg:`help dates` for a list of formats valid for -d/--date.
765
765
766 See :hg:`help revert` for a way to restore files to the state
766 See :hg:`help revert` for a way to restore files to the state
767 of another revision.
767 of another revision.
768
768
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
769 Returns 0 on success, 1 if nothing to backout or there are unresolved
770 files.
770 files.
771 '''
771 '''
772 with repo.wlock(), repo.lock():
772 with repo.wlock(), repo.lock():
773 return _dobackout(ui, repo, node, rev, **opts)
773 return _dobackout(ui, repo, node, rev, **opts)
774
774
775
775
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
776 def _dobackout(ui, repo, node=None, rev=None, **opts):
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
778 opts = pycompat.byteskwargs(opts)
778 opts = pycompat.byteskwargs(opts)
779
779
780 if rev and node:
780 if rev and node:
781 raise error.InputError(_(b"please specify just one revision"))
781 raise error.InputError(_(b"please specify just one revision"))
782
782
783 if not rev:
783 if not rev:
784 rev = node
784 rev = node
785
785
786 if not rev:
786 if not rev:
787 raise error.InputError(_(b"please specify a revision to backout"))
787 raise error.InputError(_(b"please specify a revision to backout"))
788
788
789 date = opts.get(b'date')
789 date = opts.get(b'date')
790 if date:
790 if date:
791 opts[b'date'] = dateutil.parsedate(date)
791 opts[b'date'] = dateutil.parsedate(date)
792
792
793 cmdutil.checkunfinished(repo)
793 cmdutil.checkunfinished(repo)
794 cmdutil.bailifchanged(repo)
794 cmdutil.bailifchanged(repo)
795 ctx = scmutil.revsingle(repo, rev)
795 ctx = scmutil.revsingle(repo, rev)
796 node = ctx.node()
796 node = ctx.node()
797
797
798 op1, op2 = repo.dirstate.parents()
798 op1, op2 = repo.dirstate.parents()
799 if not repo.changelog.isancestor(node, op1):
799 if not repo.changelog.isancestor(node, op1):
800 raise error.InputError(
800 raise error.InputError(
801 _(b'cannot backout change that is not an ancestor')
801 _(b'cannot backout change that is not an ancestor')
802 )
802 )
803
803
804 p1, p2 = repo.changelog.parents(node)
804 p1, p2 = repo.changelog.parents(node)
805 if p1 == nullid:
805 if p1 == nullid:
806 raise error.InputError(_(b'cannot backout a change with no parents'))
806 raise error.InputError(_(b'cannot backout a change with no parents'))
807 if p2 != nullid:
807 if p2 != nullid:
808 if not opts.get(b'parent'):
808 if not opts.get(b'parent'):
809 raise error.InputError(_(b'cannot backout a merge changeset'))
809 raise error.InputError(_(b'cannot backout a merge changeset'))
810 p = repo.lookup(opts[b'parent'])
810 p = repo.lookup(opts[b'parent'])
811 if p not in (p1, p2):
811 if p not in (p1, p2):
812 raise error.InputError(
812 raise error.InputError(
813 _(b'%s is not a parent of %s') % (short(p), short(node))
813 _(b'%s is not a parent of %s') % (short(p), short(node))
814 )
814 )
815 parent = p
815 parent = p
816 else:
816 else:
817 if opts.get(b'parent'):
817 if opts.get(b'parent'):
818 raise error.InputError(
818 raise error.InputError(
819 _(b'cannot use --parent on non-merge changeset')
819 _(b'cannot use --parent on non-merge changeset')
820 )
820 )
821 parent = p1
821 parent = p1
822
822
823 # the backout should appear on the same branch
823 # the backout should appear on the same branch
824 branch = repo.dirstate.branch()
824 branch = repo.dirstate.branch()
825 bheads = repo.branchheads(branch)
825 bheads = repo.branchheads(branch)
826 rctx = scmutil.revsingle(repo, hex(parent))
826 rctx = scmutil.revsingle(repo, hex(parent))
827 if not opts.get(b'merge') and op1 != node:
827 if not opts.get(b'merge') and op1 != node:
828 with dirstateguard.dirstateguard(repo, b'backout'):
828 with dirstateguard.dirstateguard(repo, b'backout'):
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
830 with ui.configoverride(overrides, b'backout'):
830 with ui.configoverride(overrides, b'backout'):
831 stats = mergemod.back_out(ctx, parent=repo[parent])
831 stats = mergemod.back_out(ctx, parent=repo[parent])
832 repo.setparents(op1, op2)
832 repo.setparents(op1, op2)
833 hg._showstats(repo, stats)
833 hg._showstats(repo, stats)
834 if stats.unresolvedcount:
834 if stats.unresolvedcount:
835 repo.ui.status(
835 repo.ui.status(
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 _(b"use 'hg resolve' to retry unresolved file merges\n")
837 )
837 )
838 return 1
838 return 1
839 else:
839 else:
840 hg.clean(repo, node, show_stats=False)
840 hg.clean(repo, node, show_stats=False)
841 repo.dirstate.setbranch(branch)
841 repo.dirstate.setbranch(branch)
842 cmdutil.revert(ui, repo, rctx)
842 cmdutil.revert(ui, repo, rctx)
843
843
844 if opts.get(b'no_commit'):
844 if opts.get(b'no_commit'):
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
846 ui.status(msg % short(node))
846 ui.status(msg % short(node))
847 return 0
847 return 0
848
848
849 def commitfunc(ui, repo, message, match, opts):
849 def commitfunc(ui, repo, message, match, opts):
850 editform = b'backout'
850 editform = b'backout'
851 e = cmdutil.getcommiteditor(
851 e = cmdutil.getcommiteditor(
852 editform=editform, **pycompat.strkwargs(opts)
852 editform=editform, **pycompat.strkwargs(opts)
853 )
853 )
854 if not message:
854 if not message:
855 # we don't translate commit messages
855 # we don't translate commit messages
856 message = b"Backed out changeset %s" % short(node)
856 message = b"Backed out changeset %s" % short(node)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
858 return repo.commit(
858 return repo.commit(
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
860 )
860 )
861
861
862 # save to detect changes
862 # save to detect changes
863 tip = repo.changelog.tip()
863 tip = repo.changelog.tip()
864
864
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
866 if not newnode:
866 if not newnode:
867 ui.status(_(b"nothing changed\n"))
867 ui.status(_(b"nothing changed\n"))
868 return 1
868 return 1
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
870
870
871 def nice(node):
871 def nice(node):
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
873
873
874 ui.status(
874 ui.status(
875 _(b'changeset %s backs out changeset %s\n')
875 _(b'changeset %s backs out changeset %s\n')
876 % (nice(newnode), nice(node))
876 % (nice(newnode), nice(node))
877 )
877 )
878 if opts.get(b'merge') and op1 != node:
878 if opts.get(b'merge') and op1 != node:
879 hg.clean(repo, op1, show_stats=False)
879 hg.clean(repo, op1, show_stats=False)
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
882 with ui.configoverride(overrides, b'backout'):
882 with ui.configoverride(overrides, b'backout'):
883 return hg.merge(repo[b'tip'])
883 return hg.merge(repo[b'tip'])
884 return 0
884 return 0
885
885
886
886
887 @command(
887 @command(
888 b'bisect',
888 b'bisect',
889 [
889 [
890 (b'r', b'reset', False, _(b'reset bisect state')),
890 (b'r', b'reset', False, _(b'reset bisect state')),
891 (b'g', b'good', False, _(b'mark changeset good')),
891 (b'g', b'good', False, _(b'mark changeset good')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
892 (b'b', b'bad', False, _(b'mark changeset bad')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
893 (b's', b'skip', False, _(b'skip testing changeset')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
894 (b'e', b'extend', False, _(b'extend the bisect range')),
895 (
895 (
896 b'c',
896 b'c',
897 b'command',
897 b'command',
898 b'',
898 b'',
899 _(b'use command to check changeset state'),
899 _(b'use command to check changeset state'),
900 _(b'CMD'),
900 _(b'CMD'),
901 ),
901 ),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
902 (b'U', b'noupdate', False, _(b'do not update to target')),
903 ],
903 ],
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
906 )
906 )
907 def bisect(
907 def bisect(
908 ui,
908 ui,
909 repo,
909 repo,
910 rev=None,
910 rev=None,
911 extra=None,
911 extra=None,
912 command=None,
912 command=None,
913 reset=None,
913 reset=None,
914 good=None,
914 good=None,
915 bad=None,
915 bad=None,
916 skip=None,
916 skip=None,
917 extend=None,
917 extend=None,
918 noupdate=None,
918 noupdate=None,
919 ):
919 ):
920 """subdivision search of changesets
920 """subdivision search of changesets
921
921
922 This command helps to find changesets which introduce problems. To
922 This command helps to find changesets which introduce problems. To
923 use, mark the earliest changeset you know exhibits the problem as
923 use, mark the earliest changeset you know exhibits the problem as
924 bad, then mark the latest changeset which is free from the problem
924 bad, then mark the latest changeset which is free from the problem
925 as good. Bisect will update your working directory to a revision
925 as good. Bisect will update your working directory to a revision
926 for testing (unless the -U/--noupdate option is specified). Once
926 for testing (unless the -U/--noupdate option is specified). Once
927 you have performed tests, mark the working directory as good or
927 you have performed tests, mark the working directory as good or
928 bad, and bisect will either update to another candidate changeset
928 bad, and bisect will either update to another candidate changeset
929 or announce that it has found the bad revision.
929 or announce that it has found the bad revision.
930
930
931 As a shortcut, you can also use the revision argument to mark a
931 As a shortcut, you can also use the revision argument to mark a
932 revision as good or bad without checking it out first.
932 revision as good or bad without checking it out first.
933
933
934 If you supply a command, it will be used for automatic bisection.
934 If you supply a command, it will be used for automatic bisection.
935 The environment variable HG_NODE will contain the ID of the
935 The environment variable HG_NODE will contain the ID of the
936 changeset being tested. The exit status of the command will be
936 changeset being tested. The exit status of the command will be
937 used to mark revisions as good or bad: status 0 means good, 125
937 used to mark revisions as good or bad: status 0 means good, 125
938 means to skip the revision, 127 (command not found) will abort the
938 means to skip the revision, 127 (command not found) will abort the
939 bisection, and any other non-zero exit status means the revision
939 bisection, and any other non-zero exit status means the revision
940 is bad.
940 is bad.
941
941
942 .. container:: verbose
942 .. container:: verbose
943
943
944 Some examples:
944 Some examples:
945
945
946 - start a bisection with known bad revision 34, and good revision 12::
946 - start a bisection with known bad revision 34, and good revision 12::
947
947
948 hg bisect --bad 34
948 hg bisect --bad 34
949 hg bisect --good 12
949 hg bisect --good 12
950
950
951 - advance the current bisection by marking current revision as good or
951 - advance the current bisection by marking current revision as good or
952 bad::
952 bad::
953
953
954 hg bisect --good
954 hg bisect --good
955 hg bisect --bad
955 hg bisect --bad
956
956
957 - mark the current revision, or a known revision, to be skipped (e.g. if
957 - mark the current revision, or a known revision, to be skipped (e.g. if
958 that revision is not usable because of another issue)::
958 that revision is not usable because of another issue)::
959
959
960 hg bisect --skip
960 hg bisect --skip
961 hg bisect --skip 23
961 hg bisect --skip 23
962
962
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
964
964
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
966
966
967 - forget the current bisection::
967 - forget the current bisection::
968
968
969 hg bisect --reset
969 hg bisect --reset
970
970
971 - use 'make && make tests' to automatically find the first broken
971 - use 'make && make tests' to automatically find the first broken
972 revision::
972 revision::
973
973
974 hg bisect --reset
974 hg bisect --reset
975 hg bisect --bad 34
975 hg bisect --bad 34
976 hg bisect --good 12
976 hg bisect --good 12
977 hg bisect --command "make && make tests"
977 hg bisect --command "make && make tests"
978
978
979 - see all changesets whose states are already known in the current
979 - see all changesets whose states are already known in the current
980 bisection::
980 bisection::
981
981
982 hg log -r "bisect(pruned)"
982 hg log -r "bisect(pruned)"
983
983
984 - see the changeset currently being bisected (especially useful
984 - see the changeset currently being bisected (especially useful
985 if running with -U/--noupdate)::
985 if running with -U/--noupdate)::
986
986
987 hg log -r "bisect(current)"
987 hg log -r "bisect(current)"
988
988
989 - see all changesets that took part in the current bisection::
989 - see all changesets that took part in the current bisection::
990
990
991 hg log -r "bisect(range)"
991 hg log -r "bisect(range)"
992
992
993 - you can even get a nice graph::
993 - you can even get a nice graph::
994
994
995 hg log --graph -r "bisect(range)"
995 hg log --graph -r "bisect(range)"
996
996
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
998
998
999 Returns 0 on success.
999 Returns 0 on success.
1000 """
1000 """
1001 # backward compatibility
1001 # backward compatibility
1002 if rev in b"good bad reset init".split():
1002 if rev in b"good bad reset init".split():
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1003 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1004 cmd, rev, extra = rev, extra, None
1004 cmd, rev, extra = rev, extra, None
1005 if cmd == b"good":
1005 if cmd == b"good":
1006 good = True
1006 good = True
1007 elif cmd == b"bad":
1007 elif cmd == b"bad":
1008 bad = True
1008 bad = True
1009 else:
1009 else:
1010 reset = True
1010 reset = True
1011 elif extra:
1011 elif extra:
1012 raise error.InputError(_(b'incompatible arguments'))
1012 raise error.InputError(_(b'incompatible arguments'))
1013
1013
1014 incompatibles = {
1014 incompatibles = {
1015 b'--bad': bad,
1015 b'--bad': bad,
1016 b'--command': bool(command),
1016 b'--command': bool(command),
1017 b'--extend': extend,
1017 b'--extend': extend,
1018 b'--good': good,
1018 b'--good': good,
1019 b'--reset': reset,
1019 b'--reset': reset,
1020 b'--skip': skip,
1020 b'--skip': skip,
1021 }
1021 }
1022
1022
1023 enabled = [x for x in incompatibles if incompatibles[x]]
1023 enabled = [x for x in incompatibles if incompatibles[x]]
1024
1024
1025 if len(enabled) > 1:
1025 if len(enabled) > 1:
1026 raise error.InputError(
1026 raise error.InputError(
1027 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1027 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1028 )
1028 )
1029
1029
1030 if reset:
1030 if reset:
1031 hbisect.resetstate(repo)
1031 hbisect.resetstate(repo)
1032 return
1032 return
1033
1033
1034 state = hbisect.load_state(repo)
1034 state = hbisect.load_state(repo)
1035
1035
1036 # update state
1036 # update state
1037 if good or bad or skip:
1037 if good or bad or skip:
1038 if rev:
1038 if rev:
1039 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1039 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1040 else:
1040 else:
1041 nodes = [repo.lookup(b'.')]
1041 nodes = [repo.lookup(b'.')]
1042 if good:
1042 if good:
1043 state[b'good'] += nodes
1043 state[b'good'] += nodes
1044 elif bad:
1044 elif bad:
1045 state[b'bad'] += nodes
1045 state[b'bad'] += nodes
1046 elif skip:
1046 elif skip:
1047 state[b'skip'] += nodes
1047 state[b'skip'] += nodes
1048 hbisect.save_state(repo, state)
1048 hbisect.save_state(repo, state)
1049 if not (state[b'good'] and state[b'bad']):
1049 if not (state[b'good'] and state[b'bad']):
1050 return
1050 return
1051
1051
1052 def mayupdate(repo, node, show_stats=True):
1052 def mayupdate(repo, node, show_stats=True):
1053 """common used update sequence"""
1053 """common used update sequence"""
1054 if noupdate:
1054 if noupdate:
1055 return
1055 return
1056 cmdutil.checkunfinished(repo)
1056 cmdutil.checkunfinished(repo)
1057 cmdutil.bailifchanged(repo)
1057 cmdutil.bailifchanged(repo)
1058 return hg.clean(repo, node, show_stats=show_stats)
1058 return hg.clean(repo, node, show_stats=show_stats)
1059
1059
1060 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1060 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1061
1061
1062 if command:
1062 if command:
1063 changesets = 1
1063 changesets = 1
1064 if noupdate:
1064 if noupdate:
1065 try:
1065 try:
1066 node = state[b'current'][0]
1066 node = state[b'current'][0]
1067 except LookupError:
1067 except LookupError:
1068 raise error.StateError(
1068 raise error.StateError(
1069 _(
1069 _(
1070 b'current bisect revision is unknown - '
1070 b'current bisect revision is unknown - '
1071 b'start a new bisect to fix'
1071 b'start a new bisect to fix'
1072 )
1072 )
1073 )
1073 )
1074 else:
1074 else:
1075 node, p2 = repo.dirstate.parents()
1075 node, p2 = repo.dirstate.parents()
1076 if p2 != nullid:
1076 if p2 != nullid:
1077 raise error.StateError(_(b'current bisect revision is a merge'))
1077 raise error.StateError(_(b'current bisect revision is a merge'))
1078 if rev:
1078 if rev:
1079 node = repo[scmutil.revsingle(repo, rev, node)].node()
1079 node = repo[scmutil.revsingle(repo, rev, node)].node()
1080 with hbisect.restore_state(repo, state, node):
1080 with hbisect.restore_state(repo, state, node):
1081 while changesets:
1081 while changesets:
1082 # update state
1082 # update state
1083 state[b'current'] = [node]
1083 state[b'current'] = [node]
1084 hbisect.save_state(repo, state)
1084 hbisect.save_state(repo, state)
1085 status = ui.system(
1085 status = ui.system(
1086 command,
1086 command,
1087 environ={b'HG_NODE': hex(node)},
1087 environ={b'HG_NODE': hex(node)},
1088 blockedtag=b'bisect_check',
1088 blockedtag=b'bisect_check',
1089 )
1089 )
1090 if status == 125:
1090 if status == 125:
1091 transition = b"skip"
1091 transition = b"skip"
1092 elif status == 0:
1092 elif status == 0:
1093 transition = b"good"
1093 transition = b"good"
1094 # status < 0 means process was killed
1094 # status < 0 means process was killed
1095 elif status == 127:
1095 elif status == 127:
1096 raise error.Abort(_(b"failed to execute %s") % command)
1096 raise error.Abort(_(b"failed to execute %s") % command)
1097 elif status < 0:
1097 elif status < 0:
1098 raise error.Abort(_(b"%s killed") % command)
1098 raise error.Abort(_(b"%s killed") % command)
1099 else:
1099 else:
1100 transition = b"bad"
1100 transition = b"bad"
1101 state[transition].append(node)
1101 state[transition].append(node)
1102 ctx = repo[node]
1102 ctx = repo[node]
1103 ui.status(
1103 ui.status(
1104 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1104 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1105 )
1105 )
1106 hbisect.checkstate(state)
1106 hbisect.checkstate(state)
1107 # bisect
1107 # bisect
1108 nodes, changesets, bgood = hbisect.bisect(repo, state)
1108 nodes, changesets, bgood = hbisect.bisect(repo, state)
1109 # update to next check
1109 # update to next check
1110 node = nodes[0]
1110 node = nodes[0]
1111 mayupdate(repo, node, show_stats=False)
1111 mayupdate(repo, node, show_stats=False)
1112 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1112 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1113 return
1113 return
1114
1114
1115 hbisect.checkstate(state)
1115 hbisect.checkstate(state)
1116
1116
1117 # actually bisect
1117 # actually bisect
1118 nodes, changesets, good = hbisect.bisect(repo, state)
1118 nodes, changesets, good = hbisect.bisect(repo, state)
1119 if extend:
1119 if extend:
1120 if not changesets:
1120 if not changesets:
1121 extendnode = hbisect.extendrange(repo, state, nodes, good)
1121 extendnode = hbisect.extendrange(repo, state, nodes, good)
1122 if extendnode is not None:
1122 if extendnode is not None:
1123 ui.write(
1123 ui.write(
1124 _(b"Extending search to changeset %d:%s\n")
1124 _(b"Extending search to changeset %d:%s\n")
1125 % (extendnode.rev(), extendnode)
1125 % (extendnode.rev(), extendnode)
1126 )
1126 )
1127 state[b'current'] = [extendnode.node()]
1127 state[b'current'] = [extendnode.node()]
1128 hbisect.save_state(repo, state)
1128 hbisect.save_state(repo, state)
1129 return mayupdate(repo, extendnode.node())
1129 return mayupdate(repo, extendnode.node())
1130 raise error.StateError(_(b"nothing to extend"))
1130 raise error.StateError(_(b"nothing to extend"))
1131
1131
1132 if changesets == 0:
1132 if changesets == 0:
1133 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1133 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1134 else:
1134 else:
1135 assert len(nodes) == 1 # only a single node can be tested next
1135 assert len(nodes) == 1 # only a single node can be tested next
1136 node = nodes[0]
1136 node = nodes[0]
1137 # compute the approximate number of remaining tests
1137 # compute the approximate number of remaining tests
1138 tests, size = 0, 2
1138 tests, size = 0, 2
1139 while size <= changesets:
1139 while size <= changesets:
1140 tests, size = tests + 1, size * 2
1140 tests, size = tests + 1, size * 2
1141 rev = repo.changelog.rev(node)
1141 rev = repo.changelog.rev(node)
1142 ui.write(
1142 ui.write(
1143 _(
1143 _(
1144 b"Testing changeset %d:%s "
1144 b"Testing changeset %d:%s "
1145 b"(%d changesets remaining, ~%d tests)\n"
1145 b"(%d changesets remaining, ~%d tests)\n"
1146 )
1146 )
1147 % (rev, short(node), changesets, tests)
1147 % (rev, short(node), changesets, tests)
1148 )
1148 )
1149 state[b'current'] = [node]
1149 state[b'current'] = [node]
1150 hbisect.save_state(repo, state)
1150 hbisect.save_state(repo, state)
1151 return mayupdate(repo, node)
1151 return mayupdate(repo, node)
1152
1152
1153
1153
1154 @command(
1154 @command(
1155 b'bookmarks|bookmark',
1155 b'bookmarks|bookmark',
1156 [
1156 [
1157 (b'f', b'force', False, _(b'force')),
1157 (b'f', b'force', False, _(b'force')),
1158 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1158 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1159 (b'd', b'delete', False, _(b'delete a given bookmark')),
1159 (b'd', b'delete', False, _(b'delete a given bookmark')),
1160 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1160 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1161 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1161 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1162 (b'l', b'list', False, _(b'list existing bookmarks')),
1162 (b'l', b'list', False, _(b'list existing bookmarks')),
1163 ]
1163 ]
1164 + formatteropts,
1164 + formatteropts,
1165 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1165 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1166 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1166 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1167 )
1167 )
1168 def bookmark(ui, repo, *names, **opts):
1168 def bookmark(ui, repo, *names, **opts):
1169 '''create a new bookmark or list existing bookmarks
1169 '''create a new bookmark or list existing bookmarks
1170
1170
1171 Bookmarks are labels on changesets to help track lines of development.
1171 Bookmarks are labels on changesets to help track lines of development.
1172 Bookmarks are unversioned and can be moved, renamed and deleted.
1172 Bookmarks are unversioned and can be moved, renamed and deleted.
1173 Deleting or moving a bookmark has no effect on the associated changesets.
1173 Deleting or moving a bookmark has no effect on the associated changesets.
1174
1174
1175 Creating or updating to a bookmark causes it to be marked as 'active'.
1175 Creating or updating to a bookmark causes it to be marked as 'active'.
1176 The active bookmark is indicated with a '*'.
1176 The active bookmark is indicated with a '*'.
1177 When a commit is made, the active bookmark will advance to the new commit.
1177 When a commit is made, the active bookmark will advance to the new commit.
1178 A plain :hg:`update` will also advance an active bookmark, if possible.
1178 A plain :hg:`update` will also advance an active bookmark, if possible.
1179 Updating away from a bookmark will cause it to be deactivated.
1179 Updating away from a bookmark will cause it to be deactivated.
1180
1180
1181 Bookmarks can be pushed and pulled between repositories (see
1181 Bookmarks can be pushed and pulled between repositories (see
1182 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1182 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1183 diverged, a new 'divergent bookmark' of the form 'name@path' will
1183 diverged, a new 'divergent bookmark' of the form 'name@path' will
1184 be created. Using :hg:`merge` will resolve the divergence.
1184 be created. Using :hg:`merge` will resolve the divergence.
1185
1185
1186 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1186 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1187 the active bookmark's name.
1187 the active bookmark's name.
1188
1188
1189 A bookmark named '@' has the special property that :hg:`clone` will
1189 A bookmark named '@' has the special property that :hg:`clone` will
1190 check it out by default if it exists.
1190 check it out by default if it exists.
1191
1191
1192 .. container:: verbose
1192 .. container:: verbose
1193
1193
1194 Template:
1194 Template:
1195
1195
1196 The following keywords are supported in addition to the common template
1196 The following keywords are supported in addition to the common template
1197 keywords and functions such as ``{bookmark}``. See also
1197 keywords and functions such as ``{bookmark}``. See also
1198 :hg:`help templates`.
1198 :hg:`help templates`.
1199
1199
1200 :active: Boolean. True if the bookmark is active.
1200 :active: Boolean. True if the bookmark is active.
1201
1201
1202 Examples:
1202 Examples:
1203
1203
1204 - create an active bookmark for a new line of development::
1204 - create an active bookmark for a new line of development::
1205
1205
1206 hg book new-feature
1206 hg book new-feature
1207
1207
1208 - create an inactive bookmark as a place marker::
1208 - create an inactive bookmark as a place marker::
1209
1209
1210 hg book -i reviewed
1210 hg book -i reviewed
1211
1211
1212 - create an inactive bookmark on another changeset::
1212 - create an inactive bookmark on another changeset::
1213
1213
1214 hg book -r .^ tested
1214 hg book -r .^ tested
1215
1215
1216 - rename bookmark turkey to dinner::
1216 - rename bookmark turkey to dinner::
1217
1217
1218 hg book -m turkey dinner
1218 hg book -m turkey dinner
1219
1219
1220 - move the '@' bookmark from another branch::
1220 - move the '@' bookmark from another branch::
1221
1221
1222 hg book -f @
1222 hg book -f @
1223
1223
1224 - print only the active bookmark name::
1224 - print only the active bookmark name::
1225
1225
1226 hg book -ql .
1226 hg book -ql .
1227 '''
1227 '''
1228 opts = pycompat.byteskwargs(opts)
1228 opts = pycompat.byteskwargs(opts)
1229 force = opts.get(b'force')
1229 force = opts.get(b'force')
1230 rev = opts.get(b'rev')
1230 rev = opts.get(b'rev')
1231 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1231 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1232
1232
1233 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1233 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1234 if action:
1234 if action:
1235 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1235 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1236 elif names or rev:
1236 elif names or rev:
1237 action = b'add'
1237 action = b'add'
1238 elif inactive:
1238 elif inactive:
1239 action = b'inactive' # meaning deactivate
1239 action = b'inactive' # meaning deactivate
1240 else:
1240 else:
1241 action = b'list'
1241 action = b'list'
1242
1242
1243 cmdutil.check_incompatible_arguments(
1243 cmdutil.check_incompatible_arguments(
1244 opts, b'inactive', [b'delete', b'list']
1244 opts, b'inactive', [b'delete', b'list']
1245 )
1245 )
1246 if not names and action in {b'add', b'delete'}:
1246 if not names and action in {b'add', b'delete'}:
1247 raise error.InputError(_(b"bookmark name required"))
1247 raise error.InputError(_(b"bookmark name required"))
1248
1248
1249 if action in {b'add', b'delete', b'rename', b'inactive'}:
1249 if action in {b'add', b'delete', b'rename', b'inactive'}:
1250 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1250 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1251 if action == b'delete':
1251 if action == b'delete':
1252 names = pycompat.maplist(repo._bookmarks.expandname, names)
1252 names = pycompat.maplist(repo._bookmarks.expandname, names)
1253 bookmarks.delete(repo, tr, names)
1253 bookmarks.delete(repo, tr, names)
1254 elif action == b'rename':
1254 elif action == b'rename':
1255 if not names:
1255 if not names:
1256 raise error.InputError(_(b"new bookmark name required"))
1256 raise error.InputError(_(b"new bookmark name required"))
1257 elif len(names) > 1:
1257 elif len(names) > 1:
1258 raise error.InputError(
1258 raise error.InputError(
1259 _(b"only one new bookmark name allowed")
1259 _(b"only one new bookmark name allowed")
1260 )
1260 )
1261 oldname = repo._bookmarks.expandname(opts[b'rename'])
1261 oldname = repo._bookmarks.expandname(opts[b'rename'])
1262 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1262 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1263 elif action == b'add':
1263 elif action == b'add':
1264 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1264 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1265 elif action == b'inactive':
1265 elif action == b'inactive':
1266 if len(repo._bookmarks) == 0:
1266 if len(repo._bookmarks) == 0:
1267 ui.status(_(b"no bookmarks set\n"))
1267 ui.status(_(b"no bookmarks set\n"))
1268 elif not repo._activebookmark:
1268 elif not repo._activebookmark:
1269 ui.status(_(b"no active bookmark\n"))
1269 ui.status(_(b"no active bookmark\n"))
1270 else:
1270 else:
1271 bookmarks.deactivate(repo)
1271 bookmarks.deactivate(repo)
1272 elif action == b'list':
1272 elif action == b'list':
1273 names = pycompat.maplist(repo._bookmarks.expandname, names)
1273 names = pycompat.maplist(repo._bookmarks.expandname, names)
1274 with ui.formatter(b'bookmarks', opts) as fm:
1274 with ui.formatter(b'bookmarks', opts) as fm:
1275 bookmarks.printbookmarks(ui, repo, fm, names)
1275 bookmarks.printbookmarks(ui, repo, fm, names)
1276 else:
1276 else:
1277 raise error.ProgrammingError(b'invalid action: %s' % action)
1277 raise error.ProgrammingError(b'invalid action: %s' % action)
1278
1278
1279
1279
1280 @command(
1280 @command(
1281 b'branch',
1281 b'branch',
1282 [
1282 [
1283 (
1283 (
1284 b'f',
1284 b'f',
1285 b'force',
1285 b'force',
1286 None,
1286 None,
1287 _(b'set branch name even if it shadows an existing branch'),
1287 _(b'set branch name even if it shadows an existing branch'),
1288 ),
1288 ),
1289 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1289 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1290 (
1290 (
1291 b'r',
1291 b'r',
1292 b'rev',
1292 b'rev',
1293 [],
1293 [],
1294 _(b'change branches of the given revs (EXPERIMENTAL)'),
1294 _(b'change branches of the given revs (EXPERIMENTAL)'),
1295 ),
1295 ),
1296 ],
1296 ],
1297 _(b'[-fC] [NAME]'),
1297 _(b'[-fC] [NAME]'),
1298 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1298 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1299 )
1299 )
1300 def branch(ui, repo, label=None, **opts):
1300 def branch(ui, repo, label=None, **opts):
1301 """set or show the current branch name
1301 """set or show the current branch name
1302
1302
1303 .. note::
1303 .. note::
1304
1304
1305 Branch names are permanent and global. Use :hg:`bookmark` to create a
1305 Branch names are permanent and global. Use :hg:`bookmark` to create a
1306 light-weight bookmark instead. See :hg:`help glossary` for more
1306 light-weight bookmark instead. See :hg:`help glossary` for more
1307 information about named branches and bookmarks.
1307 information about named branches and bookmarks.
1308
1308
1309 With no argument, show the current branch name. With one argument,
1309 With no argument, show the current branch name. With one argument,
1310 set the working directory branch name (the branch will not exist
1310 set the working directory branch name (the branch will not exist
1311 in the repository until the next commit). Standard practice
1311 in the repository until the next commit). Standard practice
1312 recommends that primary development take place on the 'default'
1312 recommends that primary development take place on the 'default'
1313 branch.
1313 branch.
1314
1314
1315 Unless -f/--force is specified, branch will not let you set a
1315 Unless -f/--force is specified, branch will not let you set a
1316 branch name that already exists.
1316 branch name that already exists.
1317
1317
1318 Use -C/--clean to reset the working directory branch to that of
1318 Use -C/--clean to reset the working directory branch to that of
1319 the parent of the working directory, negating a previous branch
1319 the parent of the working directory, negating a previous branch
1320 change.
1320 change.
1321
1321
1322 Use the command :hg:`update` to switch to an existing branch. Use
1322 Use the command :hg:`update` to switch to an existing branch. Use
1323 :hg:`commit --close-branch` to mark this branch head as closed.
1323 :hg:`commit --close-branch` to mark this branch head as closed.
1324 When all heads of a branch are closed, the branch will be
1324 When all heads of a branch are closed, the branch will be
1325 considered closed.
1325 considered closed.
1326
1326
1327 Returns 0 on success.
1327 Returns 0 on success.
1328 """
1328 """
1329 opts = pycompat.byteskwargs(opts)
1329 opts = pycompat.byteskwargs(opts)
1330 revs = opts.get(b'rev')
1330 revs = opts.get(b'rev')
1331 if label:
1331 if label:
1332 label = label.strip()
1332 label = label.strip()
1333
1333
1334 if not opts.get(b'clean') and not label:
1334 if not opts.get(b'clean') and not label:
1335 if revs:
1335 if revs:
1336 raise error.InputError(
1336 raise error.InputError(
1337 _(b"no branch name specified for the revisions")
1337 _(b"no branch name specified for the revisions")
1338 )
1338 )
1339 ui.write(b"%s\n" % repo.dirstate.branch())
1339 ui.write(b"%s\n" % repo.dirstate.branch())
1340 return
1340 return
1341
1341
1342 with repo.wlock():
1342 with repo.wlock():
1343 if opts.get(b'clean'):
1343 if opts.get(b'clean'):
1344 label = repo[b'.'].branch()
1344 label = repo[b'.'].branch()
1345 repo.dirstate.setbranch(label)
1345 repo.dirstate.setbranch(label)
1346 ui.status(_(b'reset working directory to branch %s\n') % label)
1346 ui.status(_(b'reset working directory to branch %s\n') % label)
1347 elif label:
1347 elif label:
1348
1348
1349 scmutil.checknewlabel(repo, label, b'branch')
1349 scmutil.checknewlabel(repo, label, b'branch')
1350 if revs:
1350 if revs:
1351 return cmdutil.changebranch(ui, repo, revs, label, opts)
1351 return cmdutil.changebranch(ui, repo, revs, label, opts)
1352
1352
1353 if not opts.get(b'force') and label in repo.branchmap():
1353 if not opts.get(b'force') and label in repo.branchmap():
1354 if label not in [p.branch() for p in repo[None].parents()]:
1354 if label not in [p.branch() for p in repo[None].parents()]:
1355 raise error.InputError(
1355 raise error.InputError(
1356 _(b'a branch of the same name already exists'),
1356 _(b'a branch of the same name already exists'),
1357 # i18n: "it" refers to an existing branch
1357 # i18n: "it" refers to an existing branch
1358 hint=_(b"use 'hg update' to switch to it"),
1358 hint=_(b"use 'hg update' to switch to it"),
1359 )
1359 )
1360
1360
1361 repo.dirstate.setbranch(label)
1361 repo.dirstate.setbranch(label)
1362 ui.status(_(b'marked working directory as branch %s\n') % label)
1362 ui.status(_(b'marked working directory as branch %s\n') % label)
1363
1363
1364 # find any open named branches aside from default
1364 # find any open named branches aside from default
1365 for n, h, t, c in repo.branchmap().iterbranches():
1365 for n, h, t, c in repo.branchmap().iterbranches():
1366 if n != b"default" and not c:
1366 if n != b"default" and not c:
1367 return 0
1367 return 0
1368 ui.status(
1368 ui.status(
1369 _(
1369 _(
1370 b'(branches are permanent and global, '
1370 b'(branches are permanent and global, '
1371 b'did you want a bookmark?)\n'
1371 b'did you want a bookmark?)\n'
1372 )
1372 )
1373 )
1373 )
1374
1374
1375
1375
1376 @command(
1376 @command(
1377 b'branches',
1377 b'branches',
1378 [
1378 [
1379 (
1379 (
1380 b'a',
1380 b'a',
1381 b'active',
1381 b'active',
1382 False,
1382 False,
1383 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1383 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1384 ),
1384 ),
1385 (b'c', b'closed', False, _(b'show normal and closed branches')),
1385 (b'c', b'closed', False, _(b'show normal and closed branches')),
1386 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1386 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1387 ]
1387 ]
1388 + formatteropts,
1388 + formatteropts,
1389 _(b'[-c]'),
1389 _(b'[-c]'),
1390 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1390 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1391 intents={INTENT_READONLY},
1391 intents={INTENT_READONLY},
1392 )
1392 )
1393 def branches(ui, repo, active=False, closed=False, **opts):
1393 def branches(ui, repo, active=False, closed=False, **opts):
1394 """list repository named branches
1394 """list repository named branches
1395
1395
1396 List the repository's named branches, indicating which ones are
1396 List the repository's named branches, indicating which ones are
1397 inactive. If -c/--closed is specified, also list branches which have
1397 inactive. If -c/--closed is specified, also list branches which have
1398 been marked closed (see :hg:`commit --close-branch`).
1398 been marked closed (see :hg:`commit --close-branch`).
1399
1399
1400 Use the command :hg:`update` to switch to an existing branch.
1400 Use the command :hg:`update` to switch to an existing branch.
1401
1401
1402 .. container:: verbose
1402 .. container:: verbose
1403
1403
1404 Template:
1404 Template:
1405
1405
1406 The following keywords are supported in addition to the common template
1406 The following keywords are supported in addition to the common template
1407 keywords and functions such as ``{branch}``. See also
1407 keywords and functions such as ``{branch}``. See also
1408 :hg:`help templates`.
1408 :hg:`help templates`.
1409
1409
1410 :active: Boolean. True if the branch is active.
1410 :active: Boolean. True if the branch is active.
1411 :closed: Boolean. True if the branch is closed.
1411 :closed: Boolean. True if the branch is closed.
1412 :current: Boolean. True if it is the current branch.
1412 :current: Boolean. True if it is the current branch.
1413
1413
1414 Returns 0.
1414 Returns 0.
1415 """
1415 """
1416
1416
1417 opts = pycompat.byteskwargs(opts)
1417 opts = pycompat.byteskwargs(opts)
1418 revs = opts.get(b'rev')
1418 revs = opts.get(b'rev')
1419 selectedbranches = None
1419 selectedbranches = None
1420 if revs:
1420 if revs:
1421 revs = scmutil.revrange(repo, revs)
1421 revs = scmutil.revrange(repo, revs)
1422 getbi = repo.revbranchcache().branchinfo
1422 getbi = repo.revbranchcache().branchinfo
1423 selectedbranches = {getbi(r)[0] for r in revs}
1423 selectedbranches = {getbi(r)[0] for r in revs}
1424
1424
1425 ui.pager(b'branches')
1425 ui.pager(b'branches')
1426 fm = ui.formatter(b'branches', opts)
1426 fm = ui.formatter(b'branches', opts)
1427 hexfunc = fm.hexfunc
1427 hexfunc = fm.hexfunc
1428
1428
1429 allheads = set(repo.heads())
1429 allheads = set(repo.heads())
1430 branches = []
1430 branches = []
1431 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1431 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1432 if selectedbranches is not None and tag not in selectedbranches:
1432 if selectedbranches is not None and tag not in selectedbranches:
1433 continue
1433 continue
1434 isactive = False
1434 isactive = False
1435 if not isclosed:
1435 if not isclosed:
1436 openheads = set(repo.branchmap().iteropen(heads))
1436 openheads = set(repo.branchmap().iteropen(heads))
1437 isactive = bool(openheads & allheads)
1437 isactive = bool(openheads & allheads)
1438 branches.append((tag, repo[tip], isactive, not isclosed))
1438 branches.append((tag, repo[tip], isactive, not isclosed))
1439 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1439 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1440
1440
1441 for tag, ctx, isactive, isopen in branches:
1441 for tag, ctx, isactive, isopen in branches:
1442 if active and not isactive:
1442 if active and not isactive:
1443 continue
1443 continue
1444 if isactive:
1444 if isactive:
1445 label = b'branches.active'
1445 label = b'branches.active'
1446 notice = b''
1446 notice = b''
1447 elif not isopen:
1447 elif not isopen:
1448 if not closed:
1448 if not closed:
1449 continue
1449 continue
1450 label = b'branches.closed'
1450 label = b'branches.closed'
1451 notice = _(b' (closed)')
1451 notice = _(b' (closed)')
1452 else:
1452 else:
1453 label = b'branches.inactive'
1453 label = b'branches.inactive'
1454 notice = _(b' (inactive)')
1454 notice = _(b' (inactive)')
1455 current = tag == repo.dirstate.branch()
1455 current = tag == repo.dirstate.branch()
1456 if current:
1456 if current:
1457 label = b'branches.current'
1457 label = b'branches.current'
1458
1458
1459 fm.startitem()
1459 fm.startitem()
1460 fm.write(b'branch', b'%s', tag, label=label)
1460 fm.write(b'branch', b'%s', tag, label=label)
1461 rev = ctx.rev()
1461 rev = ctx.rev()
1462 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1462 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1463 fmt = b' ' * padsize + b' %d:%s'
1463 fmt = b' ' * padsize + b' %d:%s'
1464 fm.condwrite(
1464 fm.condwrite(
1465 not ui.quiet,
1465 not ui.quiet,
1466 b'rev node',
1466 b'rev node',
1467 fmt,
1467 fmt,
1468 rev,
1468 rev,
1469 hexfunc(ctx.node()),
1469 hexfunc(ctx.node()),
1470 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1470 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1471 )
1471 )
1472 fm.context(ctx=ctx)
1472 fm.context(ctx=ctx)
1473 fm.data(active=isactive, closed=not isopen, current=current)
1473 fm.data(active=isactive, closed=not isopen, current=current)
1474 if not ui.quiet:
1474 if not ui.quiet:
1475 fm.plain(notice)
1475 fm.plain(notice)
1476 fm.plain(b'\n')
1476 fm.plain(b'\n')
1477 fm.end()
1477 fm.end()
1478
1478
1479
1479
1480 @command(
1480 @command(
1481 b'bundle',
1481 b'bundle',
1482 [
1482 [
1483 (
1483 (
1484 b'f',
1484 b'f',
1485 b'force',
1485 b'force',
1486 None,
1486 None,
1487 _(b'run even when the destination is unrelated'),
1487 _(b'run even when the destination is unrelated'),
1488 ),
1488 ),
1489 (
1489 (
1490 b'r',
1490 b'r',
1491 b'rev',
1491 b'rev',
1492 [],
1492 [],
1493 _(b'a changeset intended to be added to the destination'),
1493 _(b'a changeset intended to be added to the destination'),
1494 _(b'REV'),
1494 _(b'REV'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'b',
1497 b'b',
1498 b'branch',
1498 b'branch',
1499 [],
1499 [],
1500 _(b'a specific branch you would like to bundle'),
1500 _(b'a specific branch you would like to bundle'),
1501 _(b'BRANCH'),
1501 _(b'BRANCH'),
1502 ),
1502 ),
1503 (
1503 (
1504 b'',
1504 b'',
1505 b'base',
1505 b'base',
1506 [],
1506 [],
1507 _(b'a base changeset assumed to be available at the destination'),
1507 _(b'a base changeset assumed to be available at the destination'),
1508 _(b'REV'),
1508 _(b'REV'),
1509 ),
1509 ),
1510 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1510 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1511 (
1511 (
1512 b't',
1512 b't',
1513 b'type',
1513 b'type',
1514 b'bzip2',
1514 b'bzip2',
1515 _(b'bundle compression type to use'),
1515 _(b'bundle compression type to use'),
1516 _(b'TYPE'),
1516 _(b'TYPE'),
1517 ),
1517 ),
1518 ]
1518 ]
1519 + remoteopts,
1519 + remoteopts,
1520 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1520 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1521 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1521 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1522 )
1522 )
1523 def bundle(ui, repo, fname, dest=None, **opts):
1523 def bundle(ui, repo, fname, dest=None, **opts):
1524 """create a bundle file
1524 """create a bundle file
1525
1525
1526 Generate a bundle file containing data to be transferred to another
1526 Generate a bundle file containing data to be transferred to another
1527 repository.
1527 repository.
1528
1528
1529 To create a bundle containing all changesets, use -a/--all
1529 To create a bundle containing all changesets, use -a/--all
1530 (or --base null). Otherwise, hg assumes the destination will have
1530 (or --base null). Otherwise, hg assumes the destination will have
1531 all the nodes you specify with --base parameters. Otherwise, hg
1531 all the nodes you specify with --base parameters. Otherwise, hg
1532 will assume the repository has all the nodes in destination, or
1532 will assume the repository has all the nodes in destination, or
1533 default-push/default if no destination is specified, where destination
1533 default-push/default if no destination is specified, where destination
1534 is the repository you provide through DEST option.
1534 is the repository you provide through DEST option.
1535
1535
1536 You can change bundle format with the -t/--type option. See
1536 You can change bundle format with the -t/--type option. See
1537 :hg:`help bundlespec` for documentation on this format. By default,
1537 :hg:`help bundlespec` for documentation on this format. By default,
1538 the most appropriate format is used and compression defaults to
1538 the most appropriate format is used and compression defaults to
1539 bzip2.
1539 bzip2.
1540
1540
1541 The bundle file can then be transferred using conventional means
1541 The bundle file can then be transferred using conventional means
1542 and applied to another repository with the unbundle or pull
1542 and applied to another repository with the unbundle or pull
1543 command. This is useful when direct push and pull are not
1543 command. This is useful when direct push and pull are not
1544 available or when exporting an entire repository is undesirable.
1544 available or when exporting an entire repository is undesirable.
1545
1545
1546 Applying bundles preserves all changeset contents including
1546 Applying bundles preserves all changeset contents including
1547 permissions, copy/rename information, and revision history.
1547 permissions, copy/rename information, and revision history.
1548
1548
1549 Returns 0 on success, 1 if no changes found.
1549 Returns 0 on success, 1 if no changes found.
1550 """
1550 """
1551 opts = pycompat.byteskwargs(opts)
1551 opts = pycompat.byteskwargs(opts)
1552 revs = None
1552 revs = None
1553 if b'rev' in opts:
1553 if b'rev' in opts:
1554 revstrings = opts[b'rev']
1554 revstrings = opts[b'rev']
1555 revs = scmutil.revrange(repo, revstrings)
1555 revs = scmutil.revrange(repo, revstrings)
1556 if revstrings and not revs:
1556 if revstrings and not revs:
1557 raise error.InputError(_(b'no commits to bundle'))
1557 raise error.InputError(_(b'no commits to bundle'))
1558
1558
1559 bundletype = opts.get(b'type', b'bzip2').lower()
1559 bundletype = opts.get(b'type', b'bzip2').lower()
1560 try:
1560 try:
1561 bundlespec = bundlecaches.parsebundlespec(
1561 bundlespec = bundlecaches.parsebundlespec(
1562 repo, bundletype, strict=False
1562 repo, bundletype, strict=False
1563 )
1563 )
1564 except error.UnsupportedBundleSpecification as e:
1564 except error.UnsupportedBundleSpecification as e:
1565 raise error.InputError(
1565 raise error.InputError(
1566 pycompat.bytestr(e),
1566 pycompat.bytestr(e),
1567 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1567 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1568 )
1568 )
1569 cgversion = bundlespec.contentopts[b"cg.version"]
1569 cgversion = bundlespec.contentopts[b"cg.version"]
1570
1570
1571 # Packed bundles are a pseudo bundle format for now.
1571 # Packed bundles are a pseudo bundle format for now.
1572 if cgversion == b's1':
1572 if cgversion == b's1':
1573 raise error.InputError(
1573 raise error.InputError(
1574 _(b'packed bundles cannot be produced by "hg bundle"'),
1574 _(b'packed bundles cannot be produced by "hg bundle"'),
1575 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1575 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1576 )
1576 )
1577
1577
1578 if opts.get(b'all'):
1578 if opts.get(b'all'):
1579 if dest:
1579 if dest:
1580 raise error.InputError(
1580 raise error.InputError(
1581 _(b"--all is incompatible with specifying a destination")
1581 _(b"--all is incompatible with specifying a destination")
1582 )
1582 )
1583 if opts.get(b'base'):
1583 if opts.get(b'base'):
1584 ui.warn(_(b"ignoring --base because --all was specified\n"))
1584 ui.warn(_(b"ignoring --base because --all was specified\n"))
1585 base = [nullrev]
1585 base = [nullrev]
1586 else:
1586 else:
1587 base = scmutil.revrange(repo, opts.get(b'base'))
1587 base = scmutil.revrange(repo, opts.get(b'base'))
1588 if cgversion not in changegroup.supportedoutgoingversions(repo):
1588 if cgversion not in changegroup.supportedoutgoingversions(repo):
1589 raise error.Abort(
1589 raise error.Abort(
1590 _(b"repository does not support bundle version %s") % cgversion
1590 _(b"repository does not support bundle version %s") % cgversion
1591 )
1591 )
1592
1592
1593 if base:
1593 if base:
1594 if dest:
1594 if dest:
1595 raise error.InputError(
1595 raise error.InputError(
1596 _(b"--base is incompatible with specifying a destination")
1596 _(b"--base is incompatible with specifying a destination")
1597 )
1597 )
1598 common = [repo[rev].node() for rev in base]
1598 common = [repo[rev].node() for rev in base]
1599 heads = [repo[r].node() for r in revs] if revs else None
1599 heads = [repo[r].node() for r in revs] if revs else None
1600 outgoing = discovery.outgoing(repo, common, heads)
1600 outgoing = discovery.outgoing(repo, common, heads)
1601 else:
1601 else:
1602 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1602 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1603 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1603 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1604 other = hg.peer(repo, opts, dest)
1604 other = hg.peer(repo, opts, dest)
1605 revs = [repo[r].hex() for r in revs]
1605 revs = [repo[r].hex() for r in revs]
1606 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1606 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1607 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1607 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1608 outgoing = discovery.findcommonoutgoing(
1608 outgoing = discovery.findcommonoutgoing(
1609 repo,
1609 repo,
1610 other,
1610 other,
1611 onlyheads=heads,
1611 onlyheads=heads,
1612 force=opts.get(b'force'),
1612 force=opts.get(b'force'),
1613 portable=True,
1613 portable=True,
1614 )
1614 )
1615
1615
1616 if not outgoing.missing:
1616 if not outgoing.missing:
1617 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1617 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1618 return 1
1618 return 1
1619
1619
1620 if cgversion == b'01': # bundle1
1620 if cgversion == b'01': # bundle1
1621 bversion = b'HG10' + bundlespec.wirecompression
1621 bversion = b'HG10' + bundlespec.wirecompression
1622 bcompression = None
1622 bcompression = None
1623 elif cgversion in (b'02', b'03'):
1623 elif cgversion in (b'02', b'03'):
1624 bversion = b'HG20'
1624 bversion = b'HG20'
1625 bcompression = bundlespec.wirecompression
1625 bcompression = bundlespec.wirecompression
1626 else:
1626 else:
1627 raise error.ProgrammingError(
1627 raise error.ProgrammingError(
1628 b'bundle: unexpected changegroup version %s' % cgversion
1628 b'bundle: unexpected changegroup version %s' % cgversion
1629 )
1629 )
1630
1630
1631 # TODO compression options should be derived from bundlespec parsing.
1631 # TODO compression options should be derived from bundlespec parsing.
1632 # This is a temporary hack to allow adjusting bundle compression
1632 # This is a temporary hack to allow adjusting bundle compression
1633 # level without a) formalizing the bundlespec changes to declare it
1633 # level without a) formalizing the bundlespec changes to declare it
1634 # b) introducing a command flag.
1634 # b) introducing a command flag.
1635 compopts = {}
1635 compopts = {}
1636 complevel = ui.configint(
1636 complevel = ui.configint(
1637 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1637 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1638 )
1638 )
1639 if complevel is None:
1639 if complevel is None:
1640 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1640 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1641 if complevel is not None:
1641 if complevel is not None:
1642 compopts[b'level'] = complevel
1642 compopts[b'level'] = complevel
1643
1643
1644 # Allow overriding the bundling of obsmarker in phases through
1644 # Allow overriding the bundling of obsmarker in phases through
1645 # configuration while we don't have a bundle version that include them
1645 # configuration while we don't have a bundle version that include them
1646 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1646 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1647 bundlespec.contentopts[b'obsolescence'] = True
1647 bundlespec.contentopts[b'obsolescence'] = True
1648 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1648 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1649 bundlespec.contentopts[b'phases'] = True
1649 bundlespec.contentopts[b'phases'] = True
1650
1650
1651 bundle2.writenewbundle(
1651 bundle2.writenewbundle(
1652 ui,
1652 ui,
1653 repo,
1653 repo,
1654 b'bundle',
1654 b'bundle',
1655 fname,
1655 fname,
1656 bversion,
1656 bversion,
1657 outgoing,
1657 outgoing,
1658 bundlespec.contentopts,
1658 bundlespec.contentopts,
1659 compression=bcompression,
1659 compression=bcompression,
1660 compopts=compopts,
1660 compopts=compopts,
1661 )
1661 )
1662
1662
1663
1663
1664 @command(
1664 @command(
1665 b'cat',
1665 b'cat',
1666 [
1666 [
1667 (
1667 (
1668 b'o',
1668 b'o',
1669 b'output',
1669 b'output',
1670 b'',
1670 b'',
1671 _(b'print output to file with formatted name'),
1671 _(b'print output to file with formatted name'),
1672 _(b'FORMAT'),
1672 _(b'FORMAT'),
1673 ),
1673 ),
1674 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1674 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1675 (b'', b'decode', None, _(b'apply any matching decode filter')),
1675 (b'', b'decode', None, _(b'apply any matching decode filter')),
1676 ]
1676 ]
1677 + walkopts
1677 + walkopts
1678 + formatteropts,
1678 + formatteropts,
1679 _(b'[OPTION]... FILE...'),
1679 _(b'[OPTION]... FILE...'),
1680 helpcategory=command.CATEGORY_FILE_CONTENTS,
1680 helpcategory=command.CATEGORY_FILE_CONTENTS,
1681 inferrepo=True,
1681 inferrepo=True,
1682 intents={INTENT_READONLY},
1682 intents={INTENT_READONLY},
1683 )
1683 )
1684 def cat(ui, repo, file1, *pats, **opts):
1684 def cat(ui, repo, file1, *pats, **opts):
1685 """output the current or given revision of files
1685 """output the current or given revision of files
1686
1686
1687 Print the specified files as they were at the given revision. If
1687 Print the specified files as they were at the given revision. If
1688 no revision is given, the parent of the working directory is used.
1688 no revision is given, the parent of the working directory is used.
1689
1689
1690 Output may be to a file, in which case the name of the file is
1690 Output may be to a file, in which case the name of the file is
1691 given using a template string. See :hg:`help templates`. In addition
1691 given using a template string. See :hg:`help templates`. In addition
1692 to the common template keywords, the following formatting rules are
1692 to the common template keywords, the following formatting rules are
1693 supported:
1693 supported:
1694
1694
1695 :``%%``: literal "%" character
1695 :``%%``: literal "%" character
1696 :``%s``: basename of file being printed
1696 :``%s``: basename of file being printed
1697 :``%d``: dirname of file being printed, or '.' if in repository root
1697 :``%d``: dirname of file being printed, or '.' if in repository root
1698 :``%p``: root-relative path name of file being printed
1698 :``%p``: root-relative path name of file being printed
1699 :``%H``: changeset hash (40 hexadecimal digits)
1699 :``%H``: changeset hash (40 hexadecimal digits)
1700 :``%R``: changeset revision number
1700 :``%R``: changeset revision number
1701 :``%h``: short-form changeset hash (12 hexadecimal digits)
1701 :``%h``: short-form changeset hash (12 hexadecimal digits)
1702 :``%r``: zero-padded changeset revision number
1702 :``%r``: zero-padded changeset revision number
1703 :``%b``: basename of the exporting repository
1703 :``%b``: basename of the exporting repository
1704 :``\\``: literal "\\" character
1704 :``\\``: literal "\\" character
1705
1705
1706 .. container:: verbose
1706 .. container:: verbose
1707
1707
1708 Template:
1708 Template:
1709
1709
1710 The following keywords are supported in addition to the common template
1710 The following keywords are supported in addition to the common template
1711 keywords and functions. See also :hg:`help templates`.
1711 keywords and functions. See also :hg:`help templates`.
1712
1712
1713 :data: String. File content.
1713 :data: String. File content.
1714 :path: String. Repository-absolute path of the file.
1714 :path: String. Repository-absolute path of the file.
1715
1715
1716 Returns 0 on success.
1716 Returns 0 on success.
1717 """
1717 """
1718 opts = pycompat.byteskwargs(opts)
1718 opts = pycompat.byteskwargs(opts)
1719 rev = opts.get(b'rev')
1719 rev = opts.get(b'rev')
1720 if rev:
1720 if rev:
1721 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1721 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1722 ctx = scmutil.revsingle(repo, rev)
1722 ctx = scmutil.revsingle(repo, rev)
1723 m = scmutil.match(ctx, (file1,) + pats, opts)
1723 m = scmutil.match(ctx, (file1,) + pats, opts)
1724 fntemplate = opts.pop(b'output', b'')
1724 fntemplate = opts.pop(b'output', b'')
1725 if cmdutil.isstdiofilename(fntemplate):
1725 if cmdutil.isstdiofilename(fntemplate):
1726 fntemplate = b''
1726 fntemplate = b''
1727
1727
1728 if fntemplate:
1728 if fntemplate:
1729 fm = formatter.nullformatter(ui, b'cat', opts)
1729 fm = formatter.nullformatter(ui, b'cat', opts)
1730 else:
1730 else:
1731 ui.pager(b'cat')
1731 ui.pager(b'cat')
1732 fm = ui.formatter(b'cat', opts)
1732 fm = ui.formatter(b'cat', opts)
1733 with fm:
1733 with fm:
1734 return cmdutil.cat(
1734 return cmdutil.cat(
1735 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1735 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1736 )
1736 )
1737
1737
1738
1738
1739 @command(
1739 @command(
1740 b'clone',
1740 b'clone',
1741 [
1741 [
1742 (
1742 (
1743 b'U',
1743 b'U',
1744 b'noupdate',
1744 b'noupdate',
1745 None,
1745 None,
1746 _(
1746 _(
1747 b'the clone will include an empty working '
1747 b'the clone will include an empty working '
1748 b'directory (only a repository)'
1748 b'directory (only a repository)'
1749 ),
1749 ),
1750 ),
1750 ),
1751 (
1751 (
1752 b'u',
1752 b'u',
1753 b'updaterev',
1753 b'updaterev',
1754 b'',
1754 b'',
1755 _(b'revision, tag, or branch to check out'),
1755 _(b'revision, tag, or branch to check out'),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'r',
1759 b'r',
1760 b'rev',
1760 b'rev',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this changeset'
1763 b'do not clone everything, but include this changeset'
1764 b' and its ancestors'
1764 b' and its ancestors'
1765 ),
1765 ),
1766 _(b'REV'),
1766 _(b'REV'),
1767 ),
1767 ),
1768 (
1768 (
1769 b'b',
1769 b'b',
1770 b'branch',
1770 b'branch',
1771 [],
1771 [],
1772 _(
1772 _(
1773 b'do not clone everything, but include this branch\'s'
1773 b'do not clone everything, but include this branch\'s'
1774 b' changesets and their ancestors'
1774 b' changesets and their ancestors'
1775 ),
1775 ),
1776 _(b'BRANCH'),
1776 _(b'BRANCH'),
1777 ),
1777 ),
1778 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1778 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1779 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1779 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1780 (b'', b'stream', None, _(b'clone with minimal data processing')),
1780 (b'', b'stream', None, _(b'clone with minimal data processing')),
1781 ]
1781 ]
1782 + remoteopts,
1782 + remoteopts,
1783 _(b'[OPTION]... SOURCE [DEST]'),
1783 _(b'[OPTION]... SOURCE [DEST]'),
1784 helpcategory=command.CATEGORY_REPO_CREATION,
1784 helpcategory=command.CATEGORY_REPO_CREATION,
1785 helpbasic=True,
1785 helpbasic=True,
1786 norepo=True,
1786 norepo=True,
1787 )
1787 )
1788 def clone(ui, source, dest=None, **opts):
1788 def clone(ui, source, dest=None, **opts):
1789 """make a copy of an existing repository
1789 """make a copy of an existing repository
1790
1790
1791 Create a copy of an existing repository in a new directory.
1791 Create a copy of an existing repository in a new directory.
1792
1792
1793 If no destination directory name is specified, it defaults to the
1793 If no destination directory name is specified, it defaults to the
1794 basename of the source.
1794 basename of the source.
1795
1795
1796 The location of the source is added to the new repository's
1796 The location of the source is added to the new repository's
1797 ``.hg/hgrc`` file, as the default to be used for future pulls.
1797 ``.hg/hgrc`` file, as the default to be used for future pulls.
1798
1798
1799 Only local paths and ``ssh://`` URLs are supported as
1799 Only local paths and ``ssh://`` URLs are supported as
1800 destinations. For ``ssh://`` destinations, no working directory or
1800 destinations. For ``ssh://`` destinations, no working directory or
1801 ``.hg/hgrc`` will be created on the remote side.
1801 ``.hg/hgrc`` will be created on the remote side.
1802
1802
1803 If the source repository has a bookmark called '@' set, that
1803 If the source repository has a bookmark called '@' set, that
1804 revision will be checked out in the new repository by default.
1804 revision will be checked out in the new repository by default.
1805
1805
1806 To check out a particular version, use -u/--update, or
1806 To check out a particular version, use -u/--update, or
1807 -U/--noupdate to create a clone with no working directory.
1807 -U/--noupdate to create a clone with no working directory.
1808
1808
1809 To pull only a subset of changesets, specify one or more revisions
1809 To pull only a subset of changesets, specify one or more revisions
1810 identifiers with -r/--rev or branches with -b/--branch. The
1810 identifiers with -r/--rev or branches with -b/--branch. The
1811 resulting clone will contain only the specified changesets and
1811 resulting clone will contain only the specified changesets and
1812 their ancestors. These options (or 'clone src#rev dest') imply
1812 their ancestors. These options (or 'clone src#rev dest') imply
1813 --pull, even for local source repositories.
1813 --pull, even for local source repositories.
1814
1814
1815 In normal clone mode, the remote normalizes repository data into a common
1815 In normal clone mode, the remote normalizes repository data into a common
1816 exchange format and the receiving end translates this data into its local
1816 exchange format and the receiving end translates this data into its local
1817 storage format. --stream activates a different clone mode that essentially
1817 storage format. --stream activates a different clone mode that essentially
1818 copies repository files from the remote with minimal data processing. This
1818 copies repository files from the remote with minimal data processing. This
1819 significantly reduces the CPU cost of a clone both remotely and locally.
1819 significantly reduces the CPU cost of a clone both remotely and locally.
1820 However, it often increases the transferred data size by 30-40%. This can
1820 However, it often increases the transferred data size by 30-40%. This can
1821 result in substantially faster clones where I/O throughput is plentiful,
1821 result in substantially faster clones where I/O throughput is plentiful,
1822 especially for larger repositories. A side-effect of --stream clones is
1822 especially for larger repositories. A side-effect of --stream clones is
1823 that storage settings and requirements on the remote are applied locally:
1823 that storage settings and requirements on the remote are applied locally:
1824 a modern client may inherit legacy or inefficient storage used by the
1824 a modern client may inherit legacy or inefficient storage used by the
1825 remote or a legacy Mercurial client may not be able to clone from a
1825 remote or a legacy Mercurial client may not be able to clone from a
1826 modern Mercurial remote.
1826 modern Mercurial remote.
1827
1827
1828 .. note::
1828 .. note::
1829
1829
1830 Specifying a tag will include the tagged changeset but not the
1830 Specifying a tag will include the tagged changeset but not the
1831 changeset containing the tag.
1831 changeset containing the tag.
1832
1832
1833 .. container:: verbose
1833 .. container:: verbose
1834
1834
1835 For efficiency, hardlinks are used for cloning whenever the
1835 For efficiency, hardlinks are used for cloning whenever the
1836 source and destination are on the same filesystem (note this
1836 source and destination are on the same filesystem (note this
1837 applies only to the repository data, not to the working
1837 applies only to the repository data, not to the working
1838 directory). Some filesystems, such as AFS, implement hardlinking
1838 directory). Some filesystems, such as AFS, implement hardlinking
1839 incorrectly, but do not report errors. In these cases, use the
1839 incorrectly, but do not report errors. In these cases, use the
1840 --pull option to avoid hardlinking.
1840 --pull option to avoid hardlinking.
1841
1841
1842 Mercurial will update the working directory to the first applicable
1842 Mercurial will update the working directory to the first applicable
1843 revision from this list:
1843 revision from this list:
1844
1844
1845 a) null if -U or the source repository has no changesets
1845 a) null if -U or the source repository has no changesets
1846 b) if -u . and the source repository is local, the first parent of
1846 b) if -u . and the source repository is local, the first parent of
1847 the source repository's working directory
1847 the source repository's working directory
1848 c) the changeset specified with -u (if a branch name, this means the
1848 c) the changeset specified with -u (if a branch name, this means the
1849 latest head of that branch)
1849 latest head of that branch)
1850 d) the changeset specified with -r
1850 d) the changeset specified with -r
1851 e) the tipmost head specified with -b
1851 e) the tipmost head specified with -b
1852 f) the tipmost head specified with the url#branch source syntax
1852 f) the tipmost head specified with the url#branch source syntax
1853 g) the revision marked with the '@' bookmark, if present
1853 g) the revision marked with the '@' bookmark, if present
1854 h) the tipmost head of the default branch
1854 h) the tipmost head of the default branch
1855 i) tip
1855 i) tip
1856
1856
1857 When cloning from servers that support it, Mercurial may fetch
1857 When cloning from servers that support it, Mercurial may fetch
1858 pre-generated data from a server-advertised URL or inline from the
1858 pre-generated data from a server-advertised URL or inline from the
1859 same stream. When this is done, hooks operating on incoming changesets
1859 same stream. When this is done, hooks operating on incoming changesets
1860 and changegroups may fire more than once, once for each pre-generated
1860 and changegroups may fire more than once, once for each pre-generated
1861 bundle and as well as for any additional remaining data. In addition,
1861 bundle and as well as for any additional remaining data. In addition,
1862 if an error occurs, the repository may be rolled back to a partial
1862 if an error occurs, the repository may be rolled back to a partial
1863 clone. This behavior may change in future releases.
1863 clone. This behavior may change in future releases.
1864 See :hg:`help -e clonebundles` for more.
1864 See :hg:`help -e clonebundles` for more.
1865
1865
1866 Examples:
1866 Examples:
1867
1867
1868 - clone a remote repository to a new directory named hg/::
1868 - clone a remote repository to a new directory named hg/::
1869
1869
1870 hg clone https://www.mercurial-scm.org/repo/hg/
1870 hg clone https://www.mercurial-scm.org/repo/hg/
1871
1871
1872 - create a lightweight local clone::
1872 - create a lightweight local clone::
1873
1873
1874 hg clone project/ project-feature/
1874 hg clone project/ project-feature/
1875
1875
1876 - clone from an absolute path on an ssh server (note double-slash)::
1876 - clone from an absolute path on an ssh server (note double-slash)::
1877
1877
1878 hg clone ssh://user@server//home/projects/alpha/
1878 hg clone ssh://user@server//home/projects/alpha/
1879
1879
1880 - do a streaming clone while checking out a specified version::
1880 - do a streaming clone while checking out a specified version::
1881
1881
1882 hg clone --stream http://server/repo -u 1.5
1882 hg clone --stream http://server/repo -u 1.5
1883
1883
1884 - create a repository without changesets after a particular revision::
1884 - create a repository without changesets after a particular revision::
1885
1885
1886 hg clone -r 04e544 experimental/ good/
1886 hg clone -r 04e544 experimental/ good/
1887
1887
1888 - clone (and track) a particular named branch::
1888 - clone (and track) a particular named branch::
1889
1889
1890 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1890 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1891
1891
1892 See :hg:`help urls` for details on specifying URLs.
1892 See :hg:`help urls` for details on specifying URLs.
1893
1893
1894 Returns 0 on success.
1894 Returns 0 on success.
1895 """
1895 """
1896 opts = pycompat.byteskwargs(opts)
1896 opts = pycompat.byteskwargs(opts)
1897 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1897 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1898
1898
1899 # --include/--exclude can come from narrow or sparse.
1899 # --include/--exclude can come from narrow or sparse.
1900 includepats, excludepats = None, None
1900 includepats, excludepats = None, None
1901
1901
1902 # hg.clone() differentiates between None and an empty set. So make sure
1902 # hg.clone() differentiates between None and an empty set. So make sure
1903 # patterns are sets if narrow is requested without patterns.
1903 # patterns are sets if narrow is requested without patterns.
1904 if opts.get(b'narrow'):
1904 if opts.get(b'narrow'):
1905 includepats = set()
1905 includepats = set()
1906 excludepats = set()
1906 excludepats = set()
1907
1907
1908 if opts.get(b'include'):
1908 if opts.get(b'include'):
1909 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1909 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1910 if opts.get(b'exclude'):
1910 if opts.get(b'exclude'):
1911 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1911 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1912
1912
1913 r = hg.clone(
1913 r = hg.clone(
1914 ui,
1914 ui,
1915 opts,
1915 opts,
1916 source,
1916 source,
1917 dest,
1917 dest,
1918 pull=opts.get(b'pull'),
1918 pull=opts.get(b'pull'),
1919 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1919 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1920 revs=opts.get(b'rev'),
1920 revs=opts.get(b'rev'),
1921 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1921 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1922 branch=opts.get(b'branch'),
1922 branch=opts.get(b'branch'),
1923 shareopts=opts.get(b'shareopts'),
1923 shareopts=opts.get(b'shareopts'),
1924 storeincludepats=includepats,
1924 storeincludepats=includepats,
1925 storeexcludepats=excludepats,
1925 storeexcludepats=excludepats,
1926 depth=opts.get(b'depth') or None,
1926 depth=opts.get(b'depth') or None,
1927 )
1927 )
1928
1928
1929 return r is None
1929 return r is None
1930
1930
1931
1931
1932 @command(
1932 @command(
1933 b'commit|ci',
1933 b'commit|ci',
1934 [
1934 [
1935 (
1935 (
1936 b'A',
1936 b'A',
1937 b'addremove',
1937 b'addremove',
1938 None,
1938 None,
1939 _(b'mark new/missing files as added/removed before committing'),
1939 _(b'mark new/missing files as added/removed before committing'),
1940 ),
1940 ),
1941 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1941 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1942 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1942 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1943 (b's', b'secret', None, _(b'use the secret phase for committing')),
1943 (b's', b'secret', None, _(b'use the secret phase for committing')),
1944 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1944 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1945 (
1945 (
1946 b'',
1946 b'',
1947 b'force-close-branch',
1947 b'force-close-branch',
1948 None,
1948 None,
1949 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1949 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1950 ),
1950 ),
1951 (b'i', b'interactive', None, _(b'use interactive mode')),
1951 (b'i', b'interactive', None, _(b'use interactive mode')),
1952 ]
1952 ]
1953 + walkopts
1953 + walkopts
1954 + commitopts
1954 + commitopts
1955 + commitopts2
1955 + commitopts2
1956 + subrepoopts,
1956 + subrepoopts,
1957 _(b'[OPTION]... [FILE]...'),
1957 _(b'[OPTION]... [FILE]...'),
1958 helpcategory=command.CATEGORY_COMMITTING,
1958 helpcategory=command.CATEGORY_COMMITTING,
1959 helpbasic=True,
1959 helpbasic=True,
1960 inferrepo=True,
1960 inferrepo=True,
1961 )
1961 )
1962 def commit(ui, repo, *pats, **opts):
1962 def commit(ui, repo, *pats, **opts):
1963 """commit the specified files or all outstanding changes
1963 """commit the specified files or all outstanding changes
1964
1964
1965 Commit changes to the given files into the repository. Unlike a
1965 Commit changes to the given files into the repository. Unlike a
1966 centralized SCM, this operation is a local operation. See
1966 centralized SCM, this operation is a local operation. See
1967 :hg:`push` for a way to actively distribute your changes.
1967 :hg:`push` for a way to actively distribute your changes.
1968
1968
1969 If a list of files is omitted, all changes reported by :hg:`status`
1969 If a list of files is omitted, all changes reported by :hg:`status`
1970 will be committed.
1970 will be committed.
1971
1971
1972 If you are committing the result of a merge, do not provide any
1972 If you are committing the result of a merge, do not provide any
1973 filenames or -I/-X filters.
1973 filenames or -I/-X filters.
1974
1974
1975 If no commit message is specified, Mercurial starts your
1975 If no commit message is specified, Mercurial starts your
1976 configured editor where you can enter a message. In case your
1976 configured editor where you can enter a message. In case your
1977 commit fails, you will find a backup of your message in
1977 commit fails, you will find a backup of your message in
1978 ``.hg/last-message.txt``.
1978 ``.hg/last-message.txt``.
1979
1979
1980 The --close-branch flag can be used to mark the current branch
1980 The --close-branch flag can be used to mark the current branch
1981 head closed. When all heads of a branch are closed, the branch
1981 head closed. When all heads of a branch are closed, the branch
1982 will be considered closed and no longer listed.
1982 will be considered closed and no longer listed.
1983
1983
1984 The --amend flag can be used to amend the parent of the
1984 The --amend flag can be used to amend the parent of the
1985 working directory with a new commit that contains the changes
1985 working directory with a new commit that contains the changes
1986 in the parent in addition to those currently reported by :hg:`status`,
1986 in the parent in addition to those currently reported by :hg:`status`,
1987 if there are any. The old commit is stored in a backup bundle in
1987 if there are any. The old commit is stored in a backup bundle in
1988 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1988 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1989 on how to restore it).
1989 on how to restore it).
1990
1990
1991 Message, user and date are taken from the amended commit unless
1991 Message, user and date are taken from the amended commit unless
1992 specified. When a message isn't specified on the command line,
1992 specified. When a message isn't specified on the command line,
1993 the editor will open with the message of the amended commit.
1993 the editor will open with the message of the amended commit.
1994
1994
1995 It is not possible to amend public changesets (see :hg:`help phases`)
1995 It is not possible to amend public changesets (see :hg:`help phases`)
1996 or changesets that have children.
1996 or changesets that have children.
1997
1997
1998 See :hg:`help dates` for a list of formats valid for -d/--date.
1998 See :hg:`help dates` for a list of formats valid for -d/--date.
1999
1999
2000 Returns 0 on success, 1 if nothing changed.
2000 Returns 0 on success, 1 if nothing changed.
2001
2001
2002 .. container:: verbose
2002 .. container:: verbose
2003
2003
2004 Examples:
2004 Examples:
2005
2005
2006 - commit all files ending in .py::
2006 - commit all files ending in .py::
2007
2007
2008 hg commit --include "set:**.py"
2008 hg commit --include "set:**.py"
2009
2009
2010 - commit all non-binary files::
2010 - commit all non-binary files::
2011
2011
2012 hg commit --exclude "set:binary()"
2012 hg commit --exclude "set:binary()"
2013
2013
2014 - amend the current commit and set the date to now::
2014 - amend the current commit and set the date to now::
2015
2015
2016 hg commit --amend --date now
2016 hg commit --amend --date now
2017 """
2017 """
2018 with repo.wlock(), repo.lock():
2018 with repo.wlock(), repo.lock():
2019 return _docommit(ui, repo, *pats, **opts)
2019 return _docommit(ui, repo, *pats, **opts)
2020
2020
2021
2021
2022 def _docommit(ui, repo, *pats, **opts):
2022 def _docommit(ui, repo, *pats, **opts):
2023 if opts.get('interactive'):
2023 if opts.get('interactive'):
2024 opts.pop('interactive')
2024 opts.pop('interactive')
2025 ret = cmdutil.dorecord(
2025 ret = cmdutil.dorecord(
2026 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2026 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2027 )
2027 )
2028 # ret can be 0 (no changes to record) or the value returned by
2028 # ret can be 0 (no changes to record) or the value returned by
2029 # commit(), 1 if nothing changed or None on success.
2029 # commit(), 1 if nothing changed or None on success.
2030 return 1 if ret == 0 else ret
2030 return 1 if ret == 0 else ret
2031
2031
2032 opts = pycompat.byteskwargs(opts)
2032 opts = pycompat.byteskwargs(opts)
2033 if opts.get(b'subrepos'):
2033 if opts.get(b'subrepos'):
2034 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2034 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2035 # Let --subrepos on the command line override config setting.
2035 # Let --subrepos on the command line override config setting.
2036 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2036 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2037
2037
2038 cmdutil.checkunfinished(repo, commit=True)
2038 cmdutil.checkunfinished(repo, commit=True)
2039
2039
2040 branch = repo[None].branch()
2040 branch = repo[None].branch()
2041 bheads = repo.branchheads(branch)
2041 bheads = repo.branchheads(branch)
2042 tip = repo.changelog.tip()
2042 tip = repo.changelog.tip()
2043
2043
2044 extra = {}
2044 extra = {}
2045 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2045 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2046 extra[b'close'] = b'1'
2046 extra[b'close'] = b'1'
2047
2047
2048 if repo[b'.'].closesbranch():
2048 if repo[b'.'].closesbranch():
2049 raise error.InputError(
2049 raise error.InputError(
2050 _(b'current revision is already a branch closing head')
2050 _(b'current revision is already a branch closing head')
2051 )
2051 )
2052 elif not bheads:
2052 elif not bheads:
2053 raise error.InputError(
2053 raise error.InputError(
2054 _(b'branch "%s" has no heads to close') % branch
2054 _(b'branch "%s" has no heads to close') % branch
2055 )
2055 )
2056 elif (
2056 elif (
2057 branch == repo[b'.'].branch()
2057 branch == repo[b'.'].branch()
2058 and repo[b'.'].node() not in bheads
2058 and repo[b'.'].node() not in bheads
2059 and not opts.get(b'force_close_branch')
2059 and not opts.get(b'force_close_branch')
2060 ):
2060 ):
2061 hint = _(
2061 hint = _(
2062 b'use --force-close-branch to close branch from a non-head'
2062 b'use --force-close-branch to close branch from a non-head'
2063 b' changeset'
2063 b' changeset'
2064 )
2064 )
2065 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2065 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2066 elif opts.get(b'amend'):
2066 elif opts.get(b'amend'):
2067 if (
2067 if (
2068 repo[b'.'].p1().branch() != branch
2068 repo[b'.'].p1().branch() != branch
2069 and repo[b'.'].p2().branch() != branch
2069 and repo[b'.'].p2().branch() != branch
2070 ):
2070 ):
2071 raise error.InputError(_(b'can only close branch heads'))
2071 raise error.InputError(_(b'can only close branch heads'))
2072
2072
2073 if opts.get(b'amend'):
2073 if opts.get(b'amend'):
2074 if ui.configbool(b'ui', b'commitsubrepos'):
2074 if ui.configbool(b'ui', b'commitsubrepos'):
2075 raise error.InputError(
2075 raise error.InputError(
2076 _(b'cannot amend with ui.commitsubrepos enabled')
2076 _(b'cannot amend with ui.commitsubrepos enabled')
2077 )
2077 )
2078
2078
2079 old = repo[b'.']
2079 old = repo[b'.']
2080 rewriteutil.precheck(repo, [old.rev()], b'amend')
2080 rewriteutil.precheck(repo, [old.rev()], b'amend')
2081
2081
2082 # Currently histedit gets confused if an amend happens while histedit
2082 # Currently histedit gets confused if an amend happens while histedit
2083 # is in progress. Since we have a checkunfinished command, we are
2083 # is in progress. Since we have a checkunfinished command, we are
2084 # temporarily honoring it.
2084 # temporarily honoring it.
2085 #
2085 #
2086 # Note: eventually this guard will be removed. Please do not expect
2086 # Note: eventually this guard will be removed. Please do not expect
2087 # this behavior to remain.
2087 # this behavior to remain.
2088 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2088 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2089 cmdutil.checkunfinished(repo)
2089 cmdutil.checkunfinished(repo)
2090
2090
2091 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2091 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2092 if node == old.node():
2092 if node == old.node():
2093 ui.status(_(b"nothing changed\n"))
2093 ui.status(_(b"nothing changed\n"))
2094 return 1
2094 return 1
2095 else:
2095 else:
2096
2096
2097 def commitfunc(ui, repo, message, match, opts):
2097 def commitfunc(ui, repo, message, match, opts):
2098 overrides = {}
2098 overrides = {}
2099 if opts.get(b'secret'):
2099 if opts.get(b'secret'):
2100 overrides[(b'phases', b'new-commit')] = b'secret'
2100 overrides[(b'phases', b'new-commit')] = b'secret'
2101
2101
2102 baseui = repo.baseui
2102 baseui = repo.baseui
2103 with baseui.configoverride(overrides, b'commit'):
2103 with baseui.configoverride(overrides, b'commit'):
2104 with ui.configoverride(overrides, b'commit'):
2104 with ui.configoverride(overrides, b'commit'):
2105 editform = cmdutil.mergeeditform(
2105 editform = cmdutil.mergeeditform(
2106 repo[None], b'commit.normal'
2106 repo[None], b'commit.normal'
2107 )
2107 )
2108 editor = cmdutil.getcommiteditor(
2108 editor = cmdutil.getcommiteditor(
2109 editform=editform, **pycompat.strkwargs(opts)
2109 editform=editform, **pycompat.strkwargs(opts)
2110 )
2110 )
2111 return repo.commit(
2111 return repo.commit(
2112 message,
2112 message,
2113 opts.get(b'user'),
2113 opts.get(b'user'),
2114 opts.get(b'date'),
2114 opts.get(b'date'),
2115 match,
2115 match,
2116 editor=editor,
2116 editor=editor,
2117 extra=extra,
2117 extra=extra,
2118 )
2118 )
2119
2119
2120 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2120 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2121
2121
2122 if not node:
2122 if not node:
2123 stat = cmdutil.postcommitstatus(repo, pats, opts)
2123 stat = cmdutil.postcommitstatus(repo, pats, opts)
2124 if stat.deleted:
2124 if stat.deleted:
2125 ui.status(
2125 ui.status(
2126 _(
2126 _(
2127 b"nothing changed (%d missing files, see "
2127 b"nothing changed (%d missing files, see "
2128 b"'hg status')\n"
2128 b"'hg status')\n"
2129 )
2129 )
2130 % len(stat.deleted)
2130 % len(stat.deleted)
2131 )
2131 )
2132 else:
2132 else:
2133 ui.status(_(b"nothing changed\n"))
2133 ui.status(_(b"nothing changed\n"))
2134 return 1
2134 return 1
2135
2135
2136 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2136 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2137
2137
2138 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2138 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2139 status(
2139 status(
2140 ui,
2140 ui,
2141 repo,
2141 repo,
2142 modified=True,
2142 modified=True,
2143 added=True,
2143 added=True,
2144 removed=True,
2144 removed=True,
2145 deleted=True,
2145 deleted=True,
2146 unknown=True,
2146 unknown=True,
2147 subrepos=opts.get(b'subrepos'),
2147 subrepos=opts.get(b'subrepos'),
2148 )
2148 )
2149
2149
2150
2150
2151 @command(
2151 @command(
2152 b'config|showconfig|debugconfig',
2152 b'config|showconfig|debugconfig',
2153 [
2153 [
2154 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2154 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2155 (b'e', b'edit', None, _(b'edit user config')),
2155 (b'e', b'edit', None, _(b'edit user config')),
2156 (b'l', b'local', None, _(b'edit repository config')),
2156 (b'l', b'local', None, _(b'edit repository config')),
2157 (
2157 (
2158 b'',
2158 b'',
2159 b'shared',
2159 b'shared',
2160 None,
2160 None,
2161 _(b'edit shared source repository config (EXPERIMENTAL)'),
2161 _(b'edit shared source repository config (EXPERIMENTAL)'),
2162 ),
2162 ),
2163 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2163 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2164 (b'g', b'global', None, _(b'edit global config')),
2164 (b'g', b'global', None, _(b'edit global config')),
2165 ]
2165 ]
2166 + formatteropts,
2166 + formatteropts,
2167 _(b'[-u] [NAME]...'),
2167 _(b'[-u] [NAME]...'),
2168 helpcategory=command.CATEGORY_HELP,
2168 helpcategory=command.CATEGORY_HELP,
2169 optionalrepo=True,
2169 optionalrepo=True,
2170 intents={INTENT_READONLY},
2170 intents={INTENT_READONLY},
2171 )
2171 )
2172 def config(ui, repo, *values, **opts):
2172 def config(ui, repo, *values, **opts):
2173 """show combined config settings from all hgrc files
2173 """show combined config settings from all hgrc files
2174
2174
2175 With no arguments, print names and values of all config items.
2175 With no arguments, print names and values of all config items.
2176
2176
2177 With one argument of the form section.name, print just the value
2177 With one argument of the form section.name, print just the value
2178 of that config item.
2178 of that config item.
2179
2179
2180 With multiple arguments, print names and values of all config
2180 With multiple arguments, print names and values of all config
2181 items with matching section names or section.names.
2181 items with matching section names or section.names.
2182
2182
2183 With --edit, start an editor on the user-level config file. With
2183 With --edit, start an editor on the user-level config file. With
2184 --global, edit the system-wide config file. With --local, edit the
2184 --global, edit the system-wide config file. With --local, edit the
2185 repository-level config file.
2185 repository-level config file.
2186
2186
2187 With --debug, the source (filename and line number) is printed
2187 With --debug, the source (filename and line number) is printed
2188 for each config item.
2188 for each config item.
2189
2189
2190 See :hg:`help config` for more information about config files.
2190 See :hg:`help config` for more information about config files.
2191
2191
2192 .. container:: verbose
2192 .. container:: verbose
2193
2193
2194 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2194 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2195 This file is not shared across shares when in share-safe mode.
2195 This file is not shared across shares when in share-safe mode.
2196
2196
2197 Template:
2197 Template:
2198
2198
2199 The following keywords are supported. See also :hg:`help templates`.
2199 The following keywords are supported. See also :hg:`help templates`.
2200
2200
2201 :name: String. Config name.
2201 :name: String. Config name.
2202 :source: String. Filename and line number where the item is defined.
2202 :source: String. Filename and line number where the item is defined.
2203 :value: String. Config value.
2203 :value: String. Config value.
2204
2204
2205 The --shared flag can be used to edit the config file of shared source
2205 The --shared flag can be used to edit the config file of shared source
2206 repository. It only works when you have shared using the experimental
2206 repository. It only works when you have shared using the experimental
2207 share safe feature.
2207 share safe feature.
2208
2208
2209 Returns 0 on success, 1 if NAME does not exist.
2209 Returns 0 on success, 1 if NAME does not exist.
2210
2210
2211 """
2211 """
2212
2212
2213 opts = pycompat.byteskwargs(opts)
2213 opts = pycompat.byteskwargs(opts)
2214 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2214 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2215 if any(opts.get(o) for o in editopts):
2215 if any(opts.get(o) for o in editopts):
2216 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2216 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2217 if opts.get(b'local'):
2217 if opts.get(b'local'):
2218 if not repo:
2218 if not repo:
2219 raise error.InputError(
2219 raise error.InputError(
2220 _(b"can't use --local outside a repository")
2220 _(b"can't use --local outside a repository")
2221 )
2221 )
2222 paths = [repo.vfs.join(b'hgrc')]
2222 paths = [repo.vfs.join(b'hgrc')]
2223 elif opts.get(b'global'):
2223 elif opts.get(b'global'):
2224 paths = rcutil.systemrcpath()
2224 paths = rcutil.systemrcpath()
2225 elif opts.get(b'shared'):
2225 elif opts.get(b'shared'):
2226 if not repo.shared():
2226 if not repo.shared():
2227 raise error.InputError(
2227 raise error.InputError(
2228 _(b"repository is not shared; can't use --shared")
2228 _(b"repository is not shared; can't use --shared")
2229 )
2229 )
2230 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2230 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2231 raise error.InputError(
2231 raise error.InputError(
2232 _(
2232 _(
2233 b"share safe feature not unabled; "
2233 b"share safe feature not unabled; "
2234 b"unable to edit shared source repository config"
2234 b"unable to edit shared source repository config"
2235 )
2235 )
2236 )
2236 )
2237 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2237 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2238 elif opts.get(b'non_shared'):
2238 elif opts.get(b'non_shared'):
2239 paths = [repo.vfs.join(b'hgrc-not-shared')]
2239 paths = [repo.vfs.join(b'hgrc-not-shared')]
2240 else:
2240 else:
2241 paths = rcutil.userrcpath()
2241 paths = rcutil.userrcpath()
2242
2242
2243 for f in paths:
2243 for f in paths:
2244 if os.path.exists(f):
2244 if os.path.exists(f):
2245 break
2245 break
2246 else:
2246 else:
2247 if opts.get(b'global'):
2247 if opts.get(b'global'):
2248 samplehgrc = uimod.samplehgrcs[b'global']
2248 samplehgrc = uimod.samplehgrcs[b'global']
2249 elif opts.get(b'local'):
2249 elif opts.get(b'local'):
2250 samplehgrc = uimod.samplehgrcs[b'local']
2250 samplehgrc = uimod.samplehgrcs[b'local']
2251 else:
2251 else:
2252 samplehgrc = uimod.samplehgrcs[b'user']
2252 samplehgrc = uimod.samplehgrcs[b'user']
2253
2253
2254 f = paths[0]
2254 f = paths[0]
2255 fp = open(f, b"wb")
2255 fp = open(f, b"wb")
2256 fp.write(util.tonativeeol(samplehgrc))
2256 fp.write(util.tonativeeol(samplehgrc))
2257 fp.close()
2257 fp.close()
2258
2258
2259 editor = ui.geteditor()
2259 editor = ui.geteditor()
2260 ui.system(
2260 ui.system(
2261 b"%s \"%s\"" % (editor, f),
2261 b"%s \"%s\"" % (editor, f),
2262 onerr=error.InputError,
2262 onerr=error.InputError,
2263 errprefix=_(b"edit failed"),
2263 errprefix=_(b"edit failed"),
2264 blockedtag=b'config_edit',
2264 blockedtag=b'config_edit',
2265 )
2265 )
2266 return
2266 return
2267 ui.pager(b'config')
2267 ui.pager(b'config')
2268 fm = ui.formatter(b'config', opts)
2268 fm = ui.formatter(b'config', opts)
2269 for t, f in rcutil.rccomponents():
2269 for t, f in rcutil.rccomponents():
2270 if t == b'path':
2270 if t == b'path':
2271 ui.debug(b'read config from: %s\n' % f)
2271 ui.debug(b'read config from: %s\n' % f)
2272 elif t == b'resource':
2272 elif t == b'resource':
2273 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2273 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2274 elif t == b'items':
2274 elif t == b'items':
2275 # Don't print anything for 'items'.
2275 # Don't print anything for 'items'.
2276 pass
2276 pass
2277 else:
2277 else:
2278 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2278 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2279 untrusted = bool(opts.get(b'untrusted'))
2279 untrusted = bool(opts.get(b'untrusted'))
2280
2280
2281 selsections = selentries = []
2281 selsections = selentries = []
2282 if values:
2282 if values:
2283 selsections = [v for v in values if b'.' not in v]
2283 selsections = [v for v in values if b'.' not in v]
2284 selentries = [v for v in values if b'.' in v]
2284 selentries = [v for v in values if b'.' in v]
2285 uniquesel = len(selentries) == 1 and not selsections
2285 uniquesel = len(selentries) == 1 and not selsections
2286 selsections = set(selsections)
2286 selsections = set(selsections)
2287 selentries = set(selentries)
2287 selentries = set(selentries)
2288
2288
2289 matched = False
2289 matched = False
2290 for section, name, value in ui.walkconfig(untrusted=untrusted):
2290 for section, name, value in ui.walkconfig(untrusted=untrusted):
2291 source = ui.configsource(section, name, untrusted)
2291 source = ui.configsource(section, name, untrusted)
2292 value = pycompat.bytestr(value)
2292 value = pycompat.bytestr(value)
2293 defaultvalue = ui.configdefault(section, name)
2293 defaultvalue = ui.configdefault(section, name)
2294 if fm.isplain():
2294 if fm.isplain():
2295 source = source or b'none'
2295 source = source or b'none'
2296 value = value.replace(b'\n', b'\\n')
2296 value = value.replace(b'\n', b'\\n')
2297 entryname = section + b'.' + name
2297 entryname = section + b'.' + name
2298 if values and not (section in selsections or entryname in selentries):
2298 if values and not (section in selsections or entryname in selentries):
2299 continue
2299 continue
2300 fm.startitem()
2300 fm.startitem()
2301 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2301 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2302 if uniquesel:
2302 if uniquesel:
2303 fm.data(name=entryname)
2303 fm.data(name=entryname)
2304 fm.write(b'value', b'%s\n', value)
2304 fm.write(b'value', b'%s\n', value)
2305 else:
2305 else:
2306 fm.write(b'name value', b'%s=%s\n', entryname, value)
2306 fm.write(b'name value', b'%s=%s\n', entryname, value)
2307 if formatter.isprintable(defaultvalue):
2307 if formatter.isprintable(defaultvalue):
2308 fm.data(defaultvalue=defaultvalue)
2308 fm.data(defaultvalue=defaultvalue)
2309 elif isinstance(defaultvalue, list) and all(
2309 elif isinstance(defaultvalue, list) and all(
2310 formatter.isprintable(e) for e in defaultvalue
2310 formatter.isprintable(e) for e in defaultvalue
2311 ):
2311 ):
2312 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2312 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2313 # TODO: no idea how to process unsupported defaultvalue types
2313 # TODO: no idea how to process unsupported defaultvalue types
2314 matched = True
2314 matched = True
2315 fm.end()
2315 fm.end()
2316 if matched:
2316 if matched:
2317 return 0
2317 return 0
2318 return 1
2318 return 1
2319
2319
2320
2320
2321 @command(
2321 @command(
2322 b'continue',
2322 b'continue',
2323 dryrunopts,
2323 dryrunopts,
2324 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2324 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2325 helpbasic=True,
2325 helpbasic=True,
2326 )
2326 )
2327 def continuecmd(ui, repo, **opts):
2327 def continuecmd(ui, repo, **opts):
2328 """resumes an interrupted operation (EXPERIMENTAL)
2328 """resumes an interrupted operation (EXPERIMENTAL)
2329
2329
2330 Finishes a multistep operation like graft, histedit, rebase, merge,
2330 Finishes a multistep operation like graft, histedit, rebase, merge,
2331 and unshelve if they are in an interrupted state.
2331 and unshelve if they are in an interrupted state.
2332
2332
2333 use --dry-run/-n to dry run the command.
2333 use --dry-run/-n to dry run the command.
2334 """
2334 """
2335 dryrun = opts.get('dry_run')
2335 dryrun = opts.get('dry_run')
2336 contstate = cmdutil.getunfinishedstate(repo)
2336 contstate = cmdutil.getunfinishedstate(repo)
2337 if not contstate:
2337 if not contstate:
2338 raise error.StateError(_(b'no operation in progress'))
2338 raise error.StateError(_(b'no operation in progress'))
2339 if not contstate.continuefunc:
2339 if not contstate.continuefunc:
2340 raise error.StateError(
2340 raise error.StateError(
2341 (
2341 (
2342 _(b"%s in progress but does not support 'hg continue'")
2342 _(b"%s in progress but does not support 'hg continue'")
2343 % (contstate._opname)
2343 % (contstate._opname)
2344 ),
2344 ),
2345 hint=contstate.continuemsg(),
2345 hint=contstate.continuemsg(),
2346 )
2346 )
2347 if dryrun:
2347 if dryrun:
2348 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2348 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2349 return
2349 return
2350 return contstate.continuefunc(ui, repo)
2350 return contstate.continuefunc(ui, repo)
2351
2351
2352
2352
2353 @command(
2353 @command(
2354 b'copy|cp',
2354 b'copy|cp',
2355 [
2355 [
2356 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2356 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2357 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2357 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2358 (
2358 (
2359 b'',
2359 b'',
2360 b'at-rev',
2360 b'at-rev',
2361 b'',
2361 b'',
2362 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2362 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2363 _(b'REV'),
2363 _(b'REV'),
2364 ),
2364 ),
2365 (
2365 (
2366 b'f',
2366 b'f',
2367 b'force',
2367 b'force',
2368 None,
2368 None,
2369 _(b'forcibly copy over an existing managed file'),
2369 _(b'forcibly copy over an existing managed file'),
2370 ),
2370 ),
2371 ]
2371 ]
2372 + walkopts
2372 + walkopts
2373 + dryrunopts,
2373 + dryrunopts,
2374 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2374 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2375 helpcategory=command.CATEGORY_FILE_CONTENTS,
2375 helpcategory=command.CATEGORY_FILE_CONTENTS,
2376 )
2376 )
2377 def copy(ui, repo, *pats, **opts):
2377 def copy(ui, repo, *pats, **opts):
2378 """mark files as copied for the next commit
2378 """mark files as copied for the next commit
2379
2379
2380 Mark dest as having copies of source files. If dest is a
2380 Mark dest as having copies of source files. If dest is a
2381 directory, copies are put in that directory. If dest is a file,
2381 directory, copies are put in that directory. If dest is a file,
2382 the source must be a single file.
2382 the source must be a single file.
2383
2383
2384 By default, this command copies the contents of files as they
2384 By default, this command copies the contents of files as they
2385 exist in the working directory. If invoked with -A/--after, the
2385 exist in the working directory. If invoked with -A/--after, the
2386 operation is recorded, but no copying is performed.
2386 operation is recorded, but no copying is performed.
2387
2387
2388 To undo marking a destination file as copied, use --forget. With that
2388 To undo marking a destination file as copied, use --forget. With that
2389 option, all given (positional) arguments are unmarked as copies. The
2389 option, all given (positional) arguments are unmarked as copies. The
2390 destination file(s) will be left in place (still tracked).
2390 destination file(s) will be left in place (still tracked).
2391
2391
2392 This command takes effect with the next commit by default.
2392 This command takes effect with the next commit by default.
2393
2393
2394 Returns 0 on success, 1 if errors are encountered.
2394 Returns 0 on success, 1 if errors are encountered.
2395 """
2395 """
2396 opts = pycompat.byteskwargs(opts)
2396 opts = pycompat.byteskwargs(opts)
2397 with repo.wlock():
2397 with repo.wlock():
2398 return cmdutil.copy(ui, repo, pats, opts)
2398 return cmdutil.copy(ui, repo, pats, opts)
2399
2399
2400
2400
2401 @command(
2401 @command(
2402 b'debugcommands',
2402 b'debugcommands',
2403 [],
2403 [],
2404 _(b'[COMMAND]'),
2404 _(b'[COMMAND]'),
2405 helpcategory=command.CATEGORY_HELP,
2405 helpcategory=command.CATEGORY_HELP,
2406 norepo=True,
2406 norepo=True,
2407 )
2407 )
2408 def debugcommands(ui, cmd=b'', *args):
2408 def debugcommands(ui, cmd=b'', *args):
2409 """list all available commands and options"""
2409 """list all available commands and options"""
2410 for cmd, vals in sorted(pycompat.iteritems(table)):
2410 for cmd, vals in sorted(pycompat.iteritems(table)):
2411 cmd = cmd.split(b'|')[0]
2411 cmd = cmd.split(b'|')[0]
2412 opts = b', '.join([i[1] for i in vals[1]])
2412 opts = b', '.join([i[1] for i in vals[1]])
2413 ui.write(b'%s: %s\n' % (cmd, opts))
2413 ui.write(b'%s: %s\n' % (cmd, opts))
2414
2414
2415
2415
2416 @command(
2416 @command(
2417 b'debugcomplete',
2417 b'debugcomplete',
2418 [(b'o', b'options', None, _(b'show the command options'))],
2418 [(b'o', b'options', None, _(b'show the command options'))],
2419 _(b'[-o] CMD'),
2419 _(b'[-o] CMD'),
2420 helpcategory=command.CATEGORY_HELP,
2420 helpcategory=command.CATEGORY_HELP,
2421 norepo=True,
2421 norepo=True,
2422 )
2422 )
2423 def debugcomplete(ui, cmd=b'', **opts):
2423 def debugcomplete(ui, cmd=b'', **opts):
2424 """returns the completion list associated with the given command"""
2424 """returns the completion list associated with the given command"""
2425
2425
2426 if opts.get('options'):
2426 if opts.get('options'):
2427 options = []
2427 options = []
2428 otables = [globalopts]
2428 otables = [globalopts]
2429 if cmd:
2429 if cmd:
2430 aliases, entry = cmdutil.findcmd(cmd, table, False)
2430 aliases, entry = cmdutil.findcmd(cmd, table, False)
2431 otables.append(entry[1])
2431 otables.append(entry[1])
2432 for t in otables:
2432 for t in otables:
2433 for o in t:
2433 for o in t:
2434 if b"(DEPRECATED)" in o[3]:
2434 if b"(DEPRECATED)" in o[3]:
2435 continue
2435 continue
2436 if o[0]:
2436 if o[0]:
2437 options.append(b'-%s' % o[0])
2437 options.append(b'-%s' % o[0])
2438 options.append(b'--%s' % o[1])
2438 options.append(b'--%s' % o[1])
2439 ui.write(b"%s\n" % b"\n".join(options))
2439 ui.write(b"%s\n" % b"\n".join(options))
2440 return
2440 return
2441
2441
2442 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2442 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2443 if ui.verbose:
2443 if ui.verbose:
2444 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2444 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2445 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2445 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2446
2446
2447
2447
2448 @command(
2448 @command(
2449 b'diff',
2449 b'diff',
2450 [
2450 [
2451 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2451 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2452 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2452 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2453 ]
2453 ]
2454 + diffopts
2454 + diffopts
2455 + diffopts2
2455 + diffopts2
2456 + walkopts
2456 + walkopts
2457 + subrepoopts,
2457 + subrepoopts,
2458 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2458 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2459 helpcategory=command.CATEGORY_FILE_CONTENTS,
2459 helpcategory=command.CATEGORY_FILE_CONTENTS,
2460 helpbasic=True,
2460 helpbasic=True,
2461 inferrepo=True,
2461 inferrepo=True,
2462 intents={INTENT_READONLY},
2462 intents={INTENT_READONLY},
2463 )
2463 )
2464 def diff(ui, repo, *pats, **opts):
2464 def diff(ui, repo, *pats, **opts):
2465 """diff repository (or selected files)
2465 """diff repository (or selected files)
2466
2466
2467 Show differences between revisions for the specified files.
2467 Show differences between revisions for the specified files.
2468
2468
2469 Differences between files are shown using the unified diff format.
2469 Differences between files are shown using the unified diff format.
2470
2470
2471 .. note::
2471 .. note::
2472
2472
2473 :hg:`diff` may generate unexpected results for merges, as it will
2473 :hg:`diff` may generate unexpected results for merges, as it will
2474 default to comparing against the working directory's first
2474 default to comparing against the working directory's first
2475 parent changeset if no revisions are specified.
2475 parent changeset if no revisions are specified.
2476
2476
2477 When two revision arguments are given, then changes are shown
2477 When two revision arguments are given, then changes are shown
2478 between those revisions. If only one revision is specified then
2478 between those revisions. If only one revision is specified then
2479 that revision is compared to the working directory, and, when no
2479 that revision is compared to the working directory, and, when no
2480 revisions are specified, the working directory files are compared
2480 revisions are specified, the working directory files are compared
2481 to its first parent.
2481 to its first parent.
2482
2482
2483 Alternatively you can specify -c/--change with a revision to see
2483 Alternatively you can specify -c/--change with a revision to see
2484 the changes in that changeset relative to its first parent.
2484 the changes in that changeset relative to its first parent.
2485
2485
2486 Without the -a/--text option, diff will avoid generating diffs of
2486 Without the -a/--text option, diff will avoid generating diffs of
2487 files it detects as binary. With -a, diff will generate a diff
2487 files it detects as binary. With -a, diff will generate a diff
2488 anyway, probably with undesirable results.
2488 anyway, probably with undesirable results.
2489
2489
2490 Use the -g/--git option to generate diffs in the git extended diff
2490 Use the -g/--git option to generate diffs in the git extended diff
2491 format. For more information, read :hg:`help diffs`.
2491 format. For more information, read :hg:`help diffs`.
2492
2492
2493 .. container:: verbose
2493 .. container:: verbose
2494
2494
2495 Examples:
2495 Examples:
2496
2496
2497 - compare a file in the current working directory to its parent::
2497 - compare a file in the current working directory to its parent::
2498
2498
2499 hg diff foo.c
2499 hg diff foo.c
2500
2500
2501 - compare two historical versions of a directory, with rename info::
2501 - compare two historical versions of a directory, with rename info::
2502
2502
2503 hg diff --git -r 1.0:1.2 lib/
2503 hg diff --git -r 1.0:1.2 lib/
2504
2504
2505 - get change stats relative to the last change on some date::
2505 - get change stats relative to the last change on some date::
2506
2506
2507 hg diff --stat -r "date('may 2')"
2507 hg diff --stat -r "date('may 2')"
2508
2508
2509 - diff all newly-added files that contain a keyword::
2509 - diff all newly-added files that contain a keyword::
2510
2510
2511 hg diff "set:added() and grep(GNU)"
2511 hg diff "set:added() and grep(GNU)"
2512
2512
2513 - compare a revision and its parents::
2513 - compare a revision and its parents::
2514
2514
2515 hg diff -c 9353 # compare against first parent
2515 hg diff -c 9353 # compare against first parent
2516 hg diff -r 9353^:9353 # same using revset syntax
2516 hg diff -r 9353^:9353 # same using revset syntax
2517 hg diff -r 9353^2:9353 # compare against the second parent
2517 hg diff -r 9353^2:9353 # compare against the second parent
2518
2518
2519 Returns 0 on success.
2519 Returns 0 on success.
2520 """
2520 """
2521
2521
2522 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2522 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2523 opts = pycompat.byteskwargs(opts)
2523 opts = pycompat.byteskwargs(opts)
2524 revs = opts.get(b'rev')
2524 revs = opts.get(b'rev')
2525 change = opts.get(b'change')
2525 change = opts.get(b'change')
2526 stat = opts.get(b'stat')
2526 stat = opts.get(b'stat')
2527 reverse = opts.get(b'reverse')
2527 reverse = opts.get(b'reverse')
2528
2528
2529 if change:
2529 if change:
2530 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2530 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2531 ctx2 = scmutil.revsingle(repo, change, None)
2531 ctx2 = scmutil.revsingle(repo, change, None)
2532 ctx1 = ctx2.p1()
2532 ctx1 = ctx2.p1()
2533 else:
2533 else:
2534 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2534 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2535 ctx1, ctx2 = scmutil.revpair(repo, revs)
2535 ctx1, ctx2 = scmutil.revpair(repo, revs)
2536
2536
2537 if reverse:
2537 if reverse:
2538 ctxleft = ctx2
2538 ctxleft = ctx2
2539 ctxright = ctx1
2539 ctxright = ctx1
2540 else:
2540 else:
2541 ctxleft = ctx1
2541 ctxleft = ctx1
2542 ctxright = ctx2
2542 ctxright = ctx2
2543
2543
2544 diffopts = patch.diffallopts(ui, opts)
2544 diffopts = patch.diffallopts(ui, opts)
2545 m = scmutil.match(ctx2, pats, opts)
2545 m = scmutil.match(ctx2, pats, opts)
2546 m = repo.narrowmatch(m)
2546 m = repo.narrowmatch(m)
2547 ui.pager(b'diff')
2547 ui.pager(b'diff')
2548 logcmdutil.diffordiffstat(
2548 logcmdutil.diffordiffstat(
2549 ui,
2549 ui,
2550 repo,
2550 repo,
2551 diffopts,
2551 diffopts,
2552 ctxleft,
2552 ctxleft,
2553 ctxright,
2553 ctxright,
2554 m,
2554 m,
2555 stat=stat,
2555 stat=stat,
2556 listsubrepos=opts.get(b'subrepos'),
2556 listsubrepos=opts.get(b'subrepos'),
2557 root=opts.get(b'root'),
2557 root=opts.get(b'root'),
2558 )
2558 )
2559
2559
2560
2560
2561 @command(
2561 @command(
2562 b'export',
2562 b'export',
2563 [
2563 [
2564 (
2564 (
2565 b'B',
2565 b'B',
2566 b'bookmark',
2566 b'bookmark',
2567 b'',
2567 b'',
2568 _(b'export changes only reachable by given bookmark'),
2568 _(b'export changes only reachable by given bookmark'),
2569 _(b'BOOKMARK'),
2569 _(b'BOOKMARK'),
2570 ),
2570 ),
2571 (
2571 (
2572 b'o',
2572 b'o',
2573 b'output',
2573 b'output',
2574 b'',
2574 b'',
2575 _(b'print output to file with formatted name'),
2575 _(b'print output to file with formatted name'),
2576 _(b'FORMAT'),
2576 _(b'FORMAT'),
2577 ),
2577 ),
2578 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2578 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2579 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2579 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2580 ]
2580 ]
2581 + diffopts
2581 + diffopts
2582 + formatteropts,
2582 + formatteropts,
2583 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2583 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2584 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2584 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2585 helpbasic=True,
2585 helpbasic=True,
2586 intents={INTENT_READONLY},
2586 intents={INTENT_READONLY},
2587 )
2587 )
2588 def export(ui, repo, *changesets, **opts):
2588 def export(ui, repo, *changesets, **opts):
2589 """dump the header and diffs for one or more changesets
2589 """dump the header and diffs for one or more changesets
2590
2590
2591 Print the changeset header and diffs for one or more revisions.
2591 Print the changeset header and diffs for one or more revisions.
2592 If no revision is given, the parent of the working directory is used.
2592 If no revision is given, the parent of the working directory is used.
2593
2593
2594 The information shown in the changeset header is: author, date,
2594 The information shown in the changeset header is: author, date,
2595 branch name (if non-default), changeset hash, parent(s) and commit
2595 branch name (if non-default), changeset hash, parent(s) and commit
2596 comment.
2596 comment.
2597
2597
2598 .. note::
2598 .. note::
2599
2599
2600 :hg:`export` may generate unexpected diff output for merge
2600 :hg:`export` may generate unexpected diff output for merge
2601 changesets, as it will compare the merge changeset against its
2601 changesets, as it will compare the merge changeset against its
2602 first parent only.
2602 first parent only.
2603
2603
2604 Output may be to a file, in which case the name of the file is
2604 Output may be to a file, in which case the name of the file is
2605 given using a template string. See :hg:`help templates`. In addition
2605 given using a template string. See :hg:`help templates`. In addition
2606 to the common template keywords, the following formatting rules are
2606 to the common template keywords, the following formatting rules are
2607 supported:
2607 supported:
2608
2608
2609 :``%%``: literal "%" character
2609 :``%%``: literal "%" character
2610 :``%H``: changeset hash (40 hexadecimal digits)
2610 :``%H``: changeset hash (40 hexadecimal digits)
2611 :``%N``: number of patches being generated
2611 :``%N``: number of patches being generated
2612 :``%R``: changeset revision number
2612 :``%R``: changeset revision number
2613 :``%b``: basename of the exporting repository
2613 :``%b``: basename of the exporting repository
2614 :``%h``: short-form changeset hash (12 hexadecimal digits)
2614 :``%h``: short-form changeset hash (12 hexadecimal digits)
2615 :``%m``: first line of the commit message (only alphanumeric characters)
2615 :``%m``: first line of the commit message (only alphanumeric characters)
2616 :``%n``: zero-padded sequence number, starting at 1
2616 :``%n``: zero-padded sequence number, starting at 1
2617 :``%r``: zero-padded changeset revision number
2617 :``%r``: zero-padded changeset revision number
2618 :``\\``: literal "\\" character
2618 :``\\``: literal "\\" character
2619
2619
2620 Without the -a/--text option, export will avoid generating diffs
2620 Without the -a/--text option, export will avoid generating diffs
2621 of files it detects as binary. With -a, export will generate a
2621 of files it detects as binary. With -a, export will generate a
2622 diff anyway, probably with undesirable results.
2622 diff anyway, probably with undesirable results.
2623
2623
2624 With -B/--bookmark changesets reachable by the given bookmark are
2624 With -B/--bookmark changesets reachable by the given bookmark are
2625 selected.
2625 selected.
2626
2626
2627 Use the -g/--git option to generate diffs in the git extended diff
2627 Use the -g/--git option to generate diffs in the git extended diff
2628 format. See :hg:`help diffs` for more information.
2628 format. See :hg:`help diffs` for more information.
2629
2629
2630 With the --switch-parent option, the diff will be against the
2630 With the --switch-parent option, the diff will be against the
2631 second parent. It can be useful to review a merge.
2631 second parent. It can be useful to review a merge.
2632
2632
2633 .. container:: verbose
2633 .. container:: verbose
2634
2634
2635 Template:
2635 Template:
2636
2636
2637 The following keywords are supported in addition to the common template
2637 The following keywords are supported in addition to the common template
2638 keywords and functions. See also :hg:`help templates`.
2638 keywords and functions. See also :hg:`help templates`.
2639
2639
2640 :diff: String. Diff content.
2640 :diff: String. Diff content.
2641 :parents: List of strings. Parent nodes of the changeset.
2641 :parents: List of strings. Parent nodes of the changeset.
2642
2642
2643 Examples:
2643 Examples:
2644
2644
2645 - use export and import to transplant a bugfix to the current
2645 - use export and import to transplant a bugfix to the current
2646 branch::
2646 branch::
2647
2647
2648 hg export -r 9353 | hg import -
2648 hg export -r 9353 | hg import -
2649
2649
2650 - export all the changesets between two revisions to a file with
2650 - export all the changesets between two revisions to a file with
2651 rename information::
2651 rename information::
2652
2652
2653 hg export --git -r 123:150 > changes.txt
2653 hg export --git -r 123:150 > changes.txt
2654
2654
2655 - split outgoing changes into a series of patches with
2655 - split outgoing changes into a series of patches with
2656 descriptive names::
2656 descriptive names::
2657
2657
2658 hg export -r "outgoing()" -o "%n-%m.patch"
2658 hg export -r "outgoing()" -o "%n-%m.patch"
2659
2659
2660 Returns 0 on success.
2660 Returns 0 on success.
2661 """
2661 """
2662 opts = pycompat.byteskwargs(opts)
2662 opts = pycompat.byteskwargs(opts)
2663 bookmark = opts.get(b'bookmark')
2663 bookmark = opts.get(b'bookmark')
2664 changesets += tuple(opts.get(b'rev', []))
2664 changesets += tuple(opts.get(b'rev', []))
2665
2665
2666 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2666 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2667
2667
2668 if bookmark:
2668 if bookmark:
2669 if bookmark not in repo._bookmarks:
2669 if bookmark not in repo._bookmarks:
2670 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2670 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2671
2671
2672 revs = scmutil.bookmarkrevs(repo, bookmark)
2672 revs = scmutil.bookmarkrevs(repo, bookmark)
2673 else:
2673 else:
2674 if not changesets:
2674 if not changesets:
2675 changesets = [b'.']
2675 changesets = [b'.']
2676
2676
2677 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2677 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2678 revs = scmutil.revrange(repo, changesets)
2678 revs = scmutil.revrange(repo, changesets)
2679
2679
2680 if not revs:
2680 if not revs:
2681 raise error.InputError(_(b"export requires at least one changeset"))
2681 raise error.InputError(_(b"export requires at least one changeset"))
2682 if len(revs) > 1:
2682 if len(revs) > 1:
2683 ui.note(_(b'exporting patches:\n'))
2683 ui.note(_(b'exporting patches:\n'))
2684 else:
2684 else:
2685 ui.note(_(b'exporting patch:\n'))
2685 ui.note(_(b'exporting patch:\n'))
2686
2686
2687 fntemplate = opts.get(b'output')
2687 fntemplate = opts.get(b'output')
2688 if cmdutil.isstdiofilename(fntemplate):
2688 if cmdutil.isstdiofilename(fntemplate):
2689 fntemplate = b''
2689 fntemplate = b''
2690
2690
2691 if fntemplate:
2691 if fntemplate:
2692 fm = formatter.nullformatter(ui, b'export', opts)
2692 fm = formatter.nullformatter(ui, b'export', opts)
2693 else:
2693 else:
2694 ui.pager(b'export')
2694 ui.pager(b'export')
2695 fm = ui.formatter(b'export', opts)
2695 fm = ui.formatter(b'export', opts)
2696 with fm:
2696 with fm:
2697 cmdutil.export(
2697 cmdutil.export(
2698 repo,
2698 repo,
2699 revs,
2699 revs,
2700 fm,
2700 fm,
2701 fntemplate=fntemplate,
2701 fntemplate=fntemplate,
2702 switch_parent=opts.get(b'switch_parent'),
2702 switch_parent=opts.get(b'switch_parent'),
2703 opts=patch.diffallopts(ui, opts),
2703 opts=patch.diffallopts(ui, opts),
2704 )
2704 )
2705
2705
2706
2706
2707 @command(
2707 @command(
2708 b'files',
2708 b'files',
2709 [
2709 [
2710 (
2710 (
2711 b'r',
2711 b'r',
2712 b'rev',
2712 b'rev',
2713 b'',
2713 b'',
2714 _(b'search the repository as it is in REV'),
2714 _(b'search the repository as it is in REV'),
2715 _(b'REV'),
2715 _(b'REV'),
2716 ),
2716 ),
2717 (
2717 (
2718 b'0',
2718 b'0',
2719 b'print0',
2719 b'print0',
2720 None,
2720 None,
2721 _(b'end filenames with NUL, for use with xargs'),
2721 _(b'end filenames with NUL, for use with xargs'),
2722 ),
2722 ),
2723 ]
2723 ]
2724 + walkopts
2724 + walkopts
2725 + formatteropts
2725 + formatteropts
2726 + subrepoopts,
2726 + subrepoopts,
2727 _(b'[OPTION]... [FILE]...'),
2727 _(b'[OPTION]... [FILE]...'),
2728 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2728 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2729 intents={INTENT_READONLY},
2729 intents={INTENT_READONLY},
2730 )
2730 )
2731 def files(ui, repo, *pats, **opts):
2731 def files(ui, repo, *pats, **opts):
2732 """list tracked files
2732 """list tracked files
2733
2733
2734 Print files under Mercurial control in the working directory or
2734 Print files under Mercurial control in the working directory or
2735 specified revision for given files (excluding removed files).
2735 specified revision for given files (excluding removed files).
2736 Files can be specified as filenames or filesets.
2736 Files can be specified as filenames or filesets.
2737
2737
2738 If no files are given to match, this command prints the names
2738 If no files are given to match, this command prints the names
2739 of all files under Mercurial control.
2739 of all files under Mercurial control.
2740
2740
2741 .. container:: verbose
2741 .. container:: verbose
2742
2742
2743 Template:
2743 Template:
2744
2744
2745 The following keywords are supported in addition to the common template
2745 The following keywords are supported in addition to the common template
2746 keywords and functions. See also :hg:`help templates`.
2746 keywords and functions. See also :hg:`help templates`.
2747
2747
2748 :flags: String. Character denoting file's symlink and executable bits.
2748 :flags: String. Character denoting file's symlink and executable bits.
2749 :path: String. Repository-absolute path of the file.
2749 :path: String. Repository-absolute path of the file.
2750 :size: Integer. Size of the file in bytes.
2750 :size: Integer. Size of the file in bytes.
2751
2751
2752 Examples:
2752 Examples:
2753
2753
2754 - list all files under the current directory::
2754 - list all files under the current directory::
2755
2755
2756 hg files .
2756 hg files .
2757
2757
2758 - shows sizes and flags for current revision::
2758 - shows sizes and flags for current revision::
2759
2759
2760 hg files -vr .
2760 hg files -vr .
2761
2761
2762 - list all files named README::
2762 - list all files named README::
2763
2763
2764 hg files -I "**/README"
2764 hg files -I "**/README"
2765
2765
2766 - list all binary files::
2766 - list all binary files::
2767
2767
2768 hg files "set:binary()"
2768 hg files "set:binary()"
2769
2769
2770 - find files containing a regular expression::
2770 - find files containing a regular expression::
2771
2771
2772 hg files "set:grep('bob')"
2772 hg files "set:grep('bob')"
2773
2773
2774 - search tracked file contents with xargs and grep::
2774 - search tracked file contents with xargs and grep::
2775
2775
2776 hg files -0 | xargs -0 grep foo
2776 hg files -0 | xargs -0 grep foo
2777
2777
2778 See :hg:`help patterns` and :hg:`help filesets` for more information
2778 See :hg:`help patterns` and :hg:`help filesets` for more information
2779 on specifying file patterns.
2779 on specifying file patterns.
2780
2780
2781 Returns 0 if a match is found, 1 otherwise.
2781 Returns 0 if a match is found, 1 otherwise.
2782
2782
2783 """
2783 """
2784
2784
2785 opts = pycompat.byteskwargs(opts)
2785 opts = pycompat.byteskwargs(opts)
2786 rev = opts.get(b'rev')
2786 rev = opts.get(b'rev')
2787 if rev:
2787 if rev:
2788 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2788 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2789 ctx = scmutil.revsingle(repo, rev, None)
2789 ctx = scmutil.revsingle(repo, rev, None)
2790
2790
2791 end = b'\n'
2791 end = b'\n'
2792 if opts.get(b'print0'):
2792 if opts.get(b'print0'):
2793 end = b'\0'
2793 end = b'\0'
2794 fmt = b'%s' + end
2794 fmt = b'%s' + end
2795
2795
2796 m = scmutil.match(ctx, pats, opts)
2796 m = scmutil.match(ctx, pats, opts)
2797 ui.pager(b'files')
2797 ui.pager(b'files')
2798 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2798 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2799 with ui.formatter(b'files', opts) as fm:
2799 with ui.formatter(b'files', opts) as fm:
2800 return cmdutil.files(
2800 return cmdutil.files(
2801 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2801 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2802 )
2802 )
2803
2803
2804
2804
2805 @command(
2805 @command(
2806 b'forget',
2806 b'forget',
2807 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2807 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2808 + walkopts
2808 + walkopts
2809 + dryrunopts,
2809 + dryrunopts,
2810 _(b'[OPTION]... FILE...'),
2810 _(b'[OPTION]... FILE...'),
2811 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2811 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2812 helpbasic=True,
2812 helpbasic=True,
2813 inferrepo=True,
2813 inferrepo=True,
2814 )
2814 )
2815 def forget(ui, repo, *pats, **opts):
2815 def forget(ui, repo, *pats, **opts):
2816 """forget the specified files on the next commit
2816 """forget the specified files on the next commit
2817
2817
2818 Mark the specified files so they will no longer be tracked
2818 Mark the specified files so they will no longer be tracked
2819 after the next commit.
2819 after the next commit.
2820
2820
2821 This only removes files from the current branch, not from the
2821 This only removes files from the current branch, not from the
2822 entire project history, and it does not delete them from the
2822 entire project history, and it does not delete them from the
2823 working directory.
2823 working directory.
2824
2824
2825 To delete the file from the working directory, see :hg:`remove`.
2825 To delete the file from the working directory, see :hg:`remove`.
2826
2826
2827 To undo a forget before the next commit, see :hg:`add`.
2827 To undo a forget before the next commit, see :hg:`add`.
2828
2828
2829 .. container:: verbose
2829 .. container:: verbose
2830
2830
2831 Examples:
2831 Examples:
2832
2832
2833 - forget newly-added binary files::
2833 - forget newly-added binary files::
2834
2834
2835 hg forget "set:added() and binary()"
2835 hg forget "set:added() and binary()"
2836
2836
2837 - forget files that would be excluded by .hgignore::
2837 - forget files that would be excluded by .hgignore::
2838
2838
2839 hg forget "set:hgignore()"
2839 hg forget "set:hgignore()"
2840
2840
2841 Returns 0 on success.
2841 Returns 0 on success.
2842 """
2842 """
2843
2843
2844 opts = pycompat.byteskwargs(opts)
2844 opts = pycompat.byteskwargs(opts)
2845 if not pats:
2845 if not pats:
2846 raise error.InputError(_(b'no files specified'))
2846 raise error.InputError(_(b'no files specified'))
2847
2847
2848 m = scmutil.match(repo[None], pats, opts)
2848 m = scmutil.match(repo[None], pats, opts)
2849 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2849 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2850 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2850 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2851 rejected = cmdutil.forget(
2851 rejected = cmdutil.forget(
2852 ui,
2852 ui,
2853 repo,
2853 repo,
2854 m,
2854 m,
2855 prefix=b"",
2855 prefix=b"",
2856 uipathfn=uipathfn,
2856 uipathfn=uipathfn,
2857 explicitonly=False,
2857 explicitonly=False,
2858 dryrun=dryrun,
2858 dryrun=dryrun,
2859 interactive=interactive,
2859 interactive=interactive,
2860 )[0]
2860 )[0]
2861 return rejected and 1 or 0
2861 return rejected and 1 or 0
2862
2862
2863
2863
2864 @command(
2864 @command(
2865 b'graft',
2865 b'graft',
2866 [
2866 [
2867 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2867 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2868 (
2868 (
2869 b'',
2869 b'',
2870 b'base',
2870 b'base',
2871 b'',
2871 b'',
2872 _(b'base revision when doing the graft merge (ADVANCED)'),
2872 _(b'base revision when doing the graft merge (ADVANCED)'),
2873 _(b'REV'),
2873 _(b'REV'),
2874 ),
2874 ),
2875 (b'c', b'continue', False, _(b'resume interrupted graft')),
2875 (b'c', b'continue', False, _(b'resume interrupted graft')),
2876 (b'', b'stop', False, _(b'stop interrupted graft')),
2876 (b'', b'stop', False, _(b'stop interrupted graft')),
2877 (b'', b'abort', False, _(b'abort interrupted graft')),
2877 (b'', b'abort', False, _(b'abort interrupted graft')),
2878 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2878 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2879 (b'', b'log', None, _(b'append graft info to log message')),
2879 (b'', b'log', None, _(b'append graft info to log message')),
2880 (
2880 (
2881 b'',
2881 b'',
2882 b'no-commit',
2882 b'no-commit',
2883 None,
2883 None,
2884 _(b"don't commit, just apply the changes in working directory"),
2884 _(b"don't commit, just apply the changes in working directory"),
2885 ),
2885 ),
2886 (b'f', b'force', False, _(b'force graft')),
2886 (b'f', b'force', False, _(b'force graft')),
2887 (
2887 (
2888 b'D',
2888 b'D',
2889 b'currentdate',
2889 b'currentdate',
2890 False,
2890 False,
2891 _(b'record the current date as commit date'),
2891 _(b'record the current date as commit date'),
2892 ),
2892 ),
2893 (
2893 (
2894 b'U',
2894 b'U',
2895 b'currentuser',
2895 b'currentuser',
2896 False,
2896 False,
2897 _(b'record the current user as committer'),
2897 _(b'record the current user as committer'),
2898 ),
2898 ),
2899 ]
2899 ]
2900 + commitopts2
2900 + commitopts2
2901 + mergetoolopts
2901 + mergetoolopts
2902 + dryrunopts,
2902 + dryrunopts,
2903 _(b'[OPTION]... [-r REV]... REV...'),
2903 _(b'[OPTION]... [-r REV]... REV...'),
2904 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2904 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2905 )
2905 )
2906 def graft(ui, repo, *revs, **opts):
2906 def graft(ui, repo, *revs, **opts):
2907 '''copy changes from other branches onto the current branch
2907 '''copy changes from other branches onto the current branch
2908
2908
2909 This command uses Mercurial's merge logic to copy individual
2909 This command uses Mercurial's merge logic to copy individual
2910 changes from other branches without merging branches in the
2910 changes from other branches without merging branches in the
2911 history graph. This is sometimes known as 'backporting' or
2911 history graph. This is sometimes known as 'backporting' or
2912 'cherry-picking'. By default, graft will copy user, date, and
2912 'cherry-picking'. By default, graft will copy user, date, and
2913 description from the source changesets.
2913 description from the source changesets.
2914
2914
2915 Changesets that are ancestors of the current revision, that have
2915 Changesets that are ancestors of the current revision, that have
2916 already been grafted, or that are merges will be skipped.
2916 already been grafted, or that are merges will be skipped.
2917
2917
2918 If --log is specified, log messages will have a comment appended
2918 If --log is specified, log messages will have a comment appended
2919 of the form::
2919 of the form::
2920
2920
2921 (grafted from CHANGESETHASH)
2921 (grafted from CHANGESETHASH)
2922
2922
2923 If --force is specified, revisions will be grafted even if they
2923 If --force is specified, revisions will be grafted even if they
2924 are already ancestors of, or have been grafted to, the destination.
2924 are already ancestors of, or have been grafted to, the destination.
2925 This is useful when the revisions have since been backed out.
2925 This is useful when the revisions have since been backed out.
2926
2926
2927 If a graft merge results in conflicts, the graft process is
2927 If a graft merge results in conflicts, the graft process is
2928 interrupted so that the current merge can be manually resolved.
2928 interrupted so that the current merge can be manually resolved.
2929 Once all conflicts are addressed, the graft process can be
2929 Once all conflicts are addressed, the graft process can be
2930 continued with the -c/--continue option.
2930 continued with the -c/--continue option.
2931
2931
2932 The -c/--continue option reapplies all the earlier options.
2932 The -c/--continue option reapplies all the earlier options.
2933
2933
2934 .. container:: verbose
2934 .. container:: verbose
2935
2935
2936 The --base option exposes more of how graft internally uses merge with a
2936 The --base option exposes more of how graft internally uses merge with a
2937 custom base revision. --base can be used to specify another ancestor than
2937 custom base revision. --base can be used to specify another ancestor than
2938 the first and only parent.
2938 the first and only parent.
2939
2939
2940 The command::
2940 The command::
2941
2941
2942 hg graft -r 345 --base 234
2942 hg graft -r 345 --base 234
2943
2943
2944 is thus pretty much the same as::
2944 is thus pretty much the same as::
2945
2945
2946 hg diff -r 234 -r 345 | hg import
2946 hg diff -r 234 -r 345 | hg import
2947
2947
2948 but using merge to resolve conflicts and track moved files.
2948 but using merge to resolve conflicts and track moved files.
2949
2949
2950 The result of a merge can thus be backported as a single commit by
2950 The result of a merge can thus be backported as a single commit by
2951 specifying one of the merge parents as base, and thus effectively
2951 specifying one of the merge parents as base, and thus effectively
2952 grafting the changes from the other side.
2952 grafting the changes from the other side.
2953
2953
2954 It is also possible to collapse multiple changesets and clean up history
2954 It is also possible to collapse multiple changesets and clean up history
2955 by specifying another ancestor as base, much like rebase --collapse
2955 by specifying another ancestor as base, much like rebase --collapse
2956 --keep.
2956 --keep.
2957
2957
2958 The commit message can be tweaked after the fact using commit --amend .
2958 The commit message can be tweaked after the fact using commit --amend .
2959
2959
2960 For using non-ancestors as the base to backout changes, see the backout
2960 For using non-ancestors as the base to backout changes, see the backout
2961 command and the hidden --parent option.
2961 command and the hidden --parent option.
2962
2962
2963 .. container:: verbose
2963 .. container:: verbose
2964
2964
2965 Examples:
2965 Examples:
2966
2966
2967 - copy a single change to the stable branch and edit its description::
2967 - copy a single change to the stable branch and edit its description::
2968
2968
2969 hg update stable
2969 hg update stable
2970 hg graft --edit 9393
2970 hg graft --edit 9393
2971
2971
2972 - graft a range of changesets with one exception, updating dates::
2972 - graft a range of changesets with one exception, updating dates::
2973
2973
2974 hg graft -D "2085::2093 and not 2091"
2974 hg graft -D "2085::2093 and not 2091"
2975
2975
2976 - continue a graft after resolving conflicts::
2976 - continue a graft after resolving conflicts::
2977
2977
2978 hg graft -c
2978 hg graft -c
2979
2979
2980 - show the source of a grafted changeset::
2980 - show the source of a grafted changeset::
2981
2981
2982 hg log --debug -r .
2982 hg log --debug -r .
2983
2983
2984 - show revisions sorted by date::
2984 - show revisions sorted by date::
2985
2985
2986 hg log -r "sort(all(), date)"
2986 hg log -r "sort(all(), date)"
2987
2987
2988 - backport the result of a merge as a single commit::
2988 - backport the result of a merge as a single commit::
2989
2989
2990 hg graft -r 123 --base 123^
2990 hg graft -r 123 --base 123^
2991
2991
2992 - land a feature branch as one changeset::
2992 - land a feature branch as one changeset::
2993
2993
2994 hg up -cr default
2994 hg up -cr default
2995 hg graft -r featureX --base "ancestor('featureX', 'default')"
2995 hg graft -r featureX --base "ancestor('featureX', 'default')"
2996
2996
2997 See :hg:`help revisions` for more about specifying revisions.
2997 See :hg:`help revisions` for more about specifying revisions.
2998
2998
2999 Returns 0 on successful completion, 1 if there are unresolved files.
2999 Returns 0 on successful completion, 1 if there are unresolved files.
3000 '''
3000 '''
3001 with repo.wlock():
3001 with repo.wlock():
3002 return _dograft(ui, repo, *revs, **opts)
3002 return _dograft(ui, repo, *revs, **opts)
3003
3003
3004
3004
3005 def _dograft(ui, repo, *revs, **opts):
3005 def _dograft(ui, repo, *revs, **opts):
3006 opts = pycompat.byteskwargs(opts)
3006 opts = pycompat.byteskwargs(opts)
3007 if revs and opts.get(b'rev'):
3007 if revs and opts.get(b'rev'):
3008 ui.warn(
3008 ui.warn(
3009 _(
3009 _(
3010 b'warning: inconsistent use of --rev might give unexpected '
3010 b'warning: inconsistent use of --rev might give unexpected '
3011 b'revision ordering!\n'
3011 b'revision ordering!\n'
3012 )
3012 )
3013 )
3013 )
3014
3014
3015 revs = list(revs)
3015 revs = list(revs)
3016 revs.extend(opts.get(b'rev'))
3016 revs.extend(opts.get(b'rev'))
3017 # a dict of data to be stored in state file
3017 # a dict of data to be stored in state file
3018 statedata = {}
3018 statedata = {}
3019 # list of new nodes created by ongoing graft
3019 # list of new nodes created by ongoing graft
3020 statedata[b'newnodes'] = []
3020 statedata[b'newnodes'] = []
3021
3021
3022 cmdutil.resolvecommitoptions(ui, opts)
3022 cmdutil.resolvecommitoptions(ui, opts)
3023
3023
3024 editor = cmdutil.getcommiteditor(
3024 editor = cmdutil.getcommiteditor(
3025 editform=b'graft', **pycompat.strkwargs(opts)
3025 editform=b'graft', **pycompat.strkwargs(opts)
3026 )
3026 )
3027
3027
3028 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3028 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3029
3029
3030 cont = False
3030 cont = False
3031 if opts.get(b'no_commit'):
3031 if opts.get(b'no_commit'):
3032 cmdutil.check_incompatible_arguments(
3032 cmdutil.check_incompatible_arguments(
3033 opts,
3033 opts,
3034 b'no_commit',
3034 b'no_commit',
3035 [b'edit', b'currentuser', b'currentdate', b'log'],
3035 [b'edit', b'currentuser', b'currentdate', b'log'],
3036 )
3036 )
3037
3037
3038 graftstate = statemod.cmdstate(repo, b'graftstate')
3038 graftstate = statemod.cmdstate(repo, b'graftstate')
3039
3039
3040 if opts.get(b'stop'):
3040 if opts.get(b'stop'):
3041 cmdutil.check_incompatible_arguments(
3041 cmdutil.check_incompatible_arguments(
3042 opts,
3042 opts,
3043 b'stop',
3043 b'stop',
3044 [
3044 [
3045 b'edit',
3045 b'edit',
3046 b'log',
3046 b'log',
3047 b'user',
3047 b'user',
3048 b'date',
3048 b'date',
3049 b'currentdate',
3049 b'currentdate',
3050 b'currentuser',
3050 b'currentuser',
3051 b'rev',
3051 b'rev',
3052 ],
3052 ],
3053 )
3053 )
3054 return _stopgraft(ui, repo, graftstate)
3054 return _stopgraft(ui, repo, graftstate)
3055 elif opts.get(b'abort'):
3055 elif opts.get(b'abort'):
3056 cmdutil.check_incompatible_arguments(
3056 cmdutil.check_incompatible_arguments(
3057 opts,
3057 opts,
3058 b'abort',
3058 b'abort',
3059 [
3059 [
3060 b'edit',
3060 b'edit',
3061 b'log',
3061 b'log',
3062 b'user',
3062 b'user',
3063 b'date',
3063 b'date',
3064 b'currentdate',
3064 b'currentdate',
3065 b'currentuser',
3065 b'currentuser',
3066 b'rev',
3066 b'rev',
3067 ],
3067 ],
3068 )
3068 )
3069 return cmdutil.abortgraft(ui, repo, graftstate)
3069 return cmdutil.abortgraft(ui, repo, graftstate)
3070 elif opts.get(b'continue'):
3070 elif opts.get(b'continue'):
3071 cont = True
3071 cont = True
3072 if revs:
3072 if revs:
3073 raise error.InputError(_(b"can't specify --continue and revisions"))
3073 raise error.InputError(_(b"can't specify --continue and revisions"))
3074 # read in unfinished revisions
3074 # read in unfinished revisions
3075 if graftstate.exists():
3075 if graftstate.exists():
3076 statedata = cmdutil.readgraftstate(repo, graftstate)
3076 statedata = cmdutil.readgraftstate(repo, graftstate)
3077 if statedata.get(b'date'):
3077 if statedata.get(b'date'):
3078 opts[b'date'] = statedata[b'date']
3078 opts[b'date'] = statedata[b'date']
3079 if statedata.get(b'user'):
3079 if statedata.get(b'user'):
3080 opts[b'user'] = statedata[b'user']
3080 opts[b'user'] = statedata[b'user']
3081 if statedata.get(b'log'):
3081 if statedata.get(b'log'):
3082 opts[b'log'] = True
3082 opts[b'log'] = True
3083 if statedata.get(b'no_commit'):
3083 if statedata.get(b'no_commit'):
3084 opts[b'no_commit'] = statedata.get(b'no_commit')
3084 opts[b'no_commit'] = statedata.get(b'no_commit')
3085 if statedata.get(b'base'):
3085 if statedata.get(b'base'):
3086 opts[b'base'] = statedata.get(b'base')
3086 opts[b'base'] = statedata.get(b'base')
3087 nodes = statedata[b'nodes']
3087 nodes = statedata[b'nodes']
3088 revs = [repo[node].rev() for node in nodes]
3088 revs = [repo[node].rev() for node in nodes]
3089 else:
3089 else:
3090 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3090 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3091 else:
3091 else:
3092 if not revs:
3092 if not revs:
3093 raise error.InputError(_(b'no revisions specified'))
3093 raise error.InputError(_(b'no revisions specified'))
3094 cmdutil.checkunfinished(repo)
3094 cmdutil.checkunfinished(repo)
3095 cmdutil.bailifchanged(repo)
3095 cmdutil.bailifchanged(repo)
3096 revs = scmutil.revrange(repo, revs)
3096 revs = scmutil.revrange(repo, revs)
3097
3097
3098 skipped = set()
3098 skipped = set()
3099 basectx = None
3099 basectx = None
3100 if opts.get(b'base'):
3100 if opts.get(b'base'):
3101 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3101 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3102 if basectx is None:
3102 if basectx is None:
3103 # check for merges
3103 # check for merges
3104 for rev in repo.revs(b'%ld and merge()', revs):
3104 for rev in repo.revs(b'%ld and merge()', revs):
3105 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3105 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3106 skipped.add(rev)
3106 skipped.add(rev)
3107 revs = [r for r in revs if r not in skipped]
3107 revs = [r for r in revs if r not in skipped]
3108 if not revs:
3108 if not revs:
3109 return -1
3109 return -1
3110 if basectx is not None and len(revs) != 1:
3110 if basectx is not None and len(revs) != 1:
3111 raise error.InputError(_(b'only one revision allowed with --base '))
3111 raise error.InputError(_(b'only one revision allowed with --base '))
3112
3112
3113 # Don't check in the --continue case, in effect retaining --force across
3113 # Don't check in the --continue case, in effect retaining --force across
3114 # --continues. That's because without --force, any revisions we decided to
3114 # --continues. That's because without --force, any revisions we decided to
3115 # skip would have been filtered out here, so they wouldn't have made their
3115 # skip would have been filtered out here, so they wouldn't have made their
3116 # way to the graftstate. With --force, any revisions we would have otherwise
3116 # way to the graftstate. With --force, any revisions we would have otherwise
3117 # skipped would not have been filtered out, and if they hadn't been applied
3117 # skipped would not have been filtered out, and if they hadn't been applied
3118 # already, they'd have been in the graftstate.
3118 # already, they'd have been in the graftstate.
3119 if not (cont or opts.get(b'force')) and basectx is None:
3119 if not (cont or opts.get(b'force')) and basectx is None:
3120 # check for ancestors of dest branch
3120 # check for ancestors of dest branch
3121 ancestors = repo.revs(b'%ld & (::.)', revs)
3121 ancestors = repo.revs(b'%ld & (::.)', revs)
3122 for rev in ancestors:
3122 for rev in ancestors:
3123 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3123 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3124
3124
3125 revs = [r for r in revs if r not in ancestors]
3125 revs = [r for r in revs if r not in ancestors]
3126
3126
3127 if not revs:
3127 if not revs:
3128 return -1
3128 return -1
3129
3129
3130 # analyze revs for earlier grafts
3130 # analyze revs for earlier grafts
3131 ids = {}
3131 ids = {}
3132 for ctx in repo.set(b"%ld", revs):
3132 for ctx in repo.set(b"%ld", revs):
3133 ids[ctx.hex()] = ctx.rev()
3133 ids[ctx.hex()] = ctx.rev()
3134 n = ctx.extra().get(b'source')
3134 n = ctx.extra().get(b'source')
3135 if n:
3135 if n:
3136 ids[n] = ctx.rev()
3136 ids[n] = ctx.rev()
3137
3137
3138 # check ancestors for earlier grafts
3138 # check ancestors for earlier grafts
3139 ui.debug(b'scanning for duplicate grafts\n')
3139 ui.debug(b'scanning for duplicate grafts\n')
3140
3140
3141 # The only changesets we can be sure doesn't contain grafts of any
3141 # The only changesets we can be sure doesn't contain grafts of any
3142 # revs, are the ones that are common ancestors of *all* revs:
3142 # revs, are the ones that are common ancestors of *all* revs:
3143 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3143 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3144 ctx = repo[rev]
3144 ctx = repo[rev]
3145 n = ctx.extra().get(b'source')
3145 n = ctx.extra().get(b'source')
3146 if n in ids:
3146 if n in ids:
3147 try:
3147 try:
3148 r = repo[n].rev()
3148 r = repo[n].rev()
3149 except error.RepoLookupError:
3149 except error.RepoLookupError:
3150 r = None
3150 r = None
3151 if r in revs:
3151 if r in revs:
3152 ui.warn(
3152 ui.warn(
3153 _(
3153 _(
3154 b'skipping revision %d:%s '
3154 b'skipping revision %d:%s '
3155 b'(already grafted to %d:%s)\n'
3155 b'(already grafted to %d:%s)\n'
3156 )
3156 )
3157 % (r, repo[r], rev, ctx)
3157 % (r, repo[r], rev, ctx)
3158 )
3158 )
3159 revs.remove(r)
3159 revs.remove(r)
3160 elif ids[n] in revs:
3160 elif ids[n] in revs:
3161 if r is None:
3161 if r is None:
3162 ui.warn(
3162 ui.warn(
3163 _(
3163 _(
3164 b'skipping already grafted revision %d:%s '
3164 b'skipping already grafted revision %d:%s '
3165 b'(%d:%s also has unknown origin %s)\n'
3165 b'(%d:%s also has unknown origin %s)\n'
3166 )
3166 )
3167 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3167 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3168 )
3168 )
3169 else:
3169 else:
3170 ui.warn(
3170 ui.warn(
3171 _(
3171 _(
3172 b'skipping already grafted revision %d:%s '
3172 b'skipping already grafted revision %d:%s '
3173 b'(%d:%s also has origin %d:%s)\n'
3173 b'(%d:%s also has origin %d:%s)\n'
3174 )
3174 )
3175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3175 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3176 )
3176 )
3177 revs.remove(ids[n])
3177 revs.remove(ids[n])
3178 elif ctx.hex() in ids:
3178 elif ctx.hex() in ids:
3179 r = ids[ctx.hex()]
3179 r = ids[ctx.hex()]
3180 if r in revs:
3180 if r in revs:
3181 ui.warn(
3181 ui.warn(
3182 _(
3182 _(
3183 b'skipping already grafted revision %d:%s '
3183 b'skipping already grafted revision %d:%s '
3184 b'(was grafted from %d:%s)\n'
3184 b'(was grafted from %d:%s)\n'
3185 )
3185 )
3186 % (r, repo[r], rev, ctx)
3186 % (r, repo[r], rev, ctx)
3187 )
3187 )
3188 revs.remove(r)
3188 revs.remove(r)
3189 if not revs:
3189 if not revs:
3190 return -1
3190 return -1
3191
3191
3192 if opts.get(b'no_commit'):
3192 if opts.get(b'no_commit'):
3193 statedata[b'no_commit'] = True
3193 statedata[b'no_commit'] = True
3194 if opts.get(b'base'):
3194 if opts.get(b'base'):
3195 statedata[b'base'] = opts[b'base']
3195 statedata[b'base'] = opts[b'base']
3196 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3196 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3197 desc = b'%d:%s "%s"' % (
3197 desc = b'%d:%s "%s"' % (
3198 ctx.rev(),
3198 ctx.rev(),
3199 ctx,
3199 ctx,
3200 ctx.description().split(b'\n', 1)[0],
3200 ctx.description().split(b'\n', 1)[0],
3201 )
3201 )
3202 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3202 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3203 if names:
3203 if names:
3204 desc += b' (%s)' % b' '.join(names)
3204 desc += b' (%s)' % b' '.join(names)
3205 ui.status(_(b'grafting %s\n') % desc)
3205 ui.status(_(b'grafting %s\n') % desc)
3206 if opts.get(b'dry_run'):
3206 if opts.get(b'dry_run'):
3207 continue
3207 continue
3208
3208
3209 source = ctx.extra().get(b'source')
3209 source = ctx.extra().get(b'source')
3210 extra = {}
3210 extra = {}
3211 if source:
3211 if source:
3212 extra[b'source'] = source
3212 extra[b'source'] = source
3213 extra[b'intermediate-source'] = ctx.hex()
3213 extra[b'intermediate-source'] = ctx.hex()
3214 else:
3214 else:
3215 extra[b'source'] = ctx.hex()
3215 extra[b'source'] = ctx.hex()
3216 user = ctx.user()
3216 user = ctx.user()
3217 if opts.get(b'user'):
3217 if opts.get(b'user'):
3218 user = opts[b'user']
3218 user = opts[b'user']
3219 statedata[b'user'] = user
3219 statedata[b'user'] = user
3220 date = ctx.date()
3220 date = ctx.date()
3221 if opts.get(b'date'):
3221 if opts.get(b'date'):
3222 date = opts[b'date']
3222 date = opts[b'date']
3223 statedata[b'date'] = date
3223 statedata[b'date'] = date
3224 message = ctx.description()
3224 message = ctx.description()
3225 if opts.get(b'log'):
3225 if opts.get(b'log'):
3226 message += b'\n(grafted from %s)' % ctx.hex()
3226 message += b'\n(grafted from %s)' % ctx.hex()
3227 statedata[b'log'] = True
3227 statedata[b'log'] = True
3228
3228
3229 # we don't merge the first commit when continuing
3229 # we don't merge the first commit when continuing
3230 if not cont:
3230 if not cont:
3231 # perform the graft merge with p1(rev) as 'ancestor'
3231 # perform the graft merge with p1(rev) as 'ancestor'
3232 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3232 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3233 base = ctx.p1() if basectx is None else basectx
3233 base = ctx.p1() if basectx is None else basectx
3234 with ui.configoverride(overrides, b'graft'):
3234 with ui.configoverride(overrides, b'graft'):
3235 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3235 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3236 # report any conflicts
3236 # report any conflicts
3237 if stats.unresolvedcount > 0:
3237 if stats.unresolvedcount > 0:
3238 # write out state for --continue
3238 # write out state for --continue
3239 nodes = [repo[rev].hex() for rev in revs[pos:]]
3239 nodes = [repo[rev].hex() for rev in revs[pos:]]
3240 statedata[b'nodes'] = nodes
3240 statedata[b'nodes'] = nodes
3241 stateversion = 1
3241 stateversion = 1
3242 graftstate.save(stateversion, statedata)
3242 graftstate.save(stateversion, statedata)
3243 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3243 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3244 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3244 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3245 return 1
3245 return 1
3246 else:
3246 else:
3247 cont = False
3247 cont = False
3248
3248
3249 # commit if --no-commit is false
3249 # commit if --no-commit is false
3250 if not opts.get(b'no_commit'):
3250 if not opts.get(b'no_commit'):
3251 node = repo.commit(
3251 node = repo.commit(
3252 text=message, user=user, date=date, extra=extra, editor=editor
3252 text=message, user=user, date=date, extra=extra, editor=editor
3253 )
3253 )
3254 if node is None:
3254 if node is None:
3255 ui.warn(
3255 ui.warn(
3256 _(b'note: graft of %d:%s created no changes to commit\n')
3256 _(b'note: graft of %d:%s created no changes to commit\n')
3257 % (ctx.rev(), ctx)
3257 % (ctx.rev(), ctx)
3258 )
3258 )
3259 # checking that newnodes exist because old state files won't have it
3259 # checking that newnodes exist because old state files won't have it
3260 elif statedata.get(b'newnodes') is not None:
3260 elif statedata.get(b'newnodes') is not None:
3261 statedata[b'newnodes'].append(node)
3261 statedata[b'newnodes'].append(node)
3262
3262
3263 # remove state when we complete successfully
3263 # remove state when we complete successfully
3264 if not opts.get(b'dry_run'):
3264 if not opts.get(b'dry_run'):
3265 graftstate.delete()
3265 graftstate.delete()
3266
3266
3267 return 0
3267 return 0
3268
3268
3269
3269
3270 def _stopgraft(ui, repo, graftstate):
3270 def _stopgraft(ui, repo, graftstate):
3271 """stop the interrupted graft"""
3271 """stop the interrupted graft"""
3272 if not graftstate.exists():
3272 if not graftstate.exists():
3273 raise error.StateError(_(b"no interrupted graft found"))
3273 raise error.StateError(_(b"no interrupted graft found"))
3274 pctx = repo[b'.']
3274 pctx = repo[b'.']
3275 mergemod.clean_update(pctx)
3275 mergemod.clean_update(pctx)
3276 graftstate.delete()
3276 graftstate.delete()
3277 ui.status(_(b"stopped the interrupted graft\n"))
3277 ui.status(_(b"stopped the interrupted graft\n"))
3278 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3278 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3279 return 0
3279 return 0
3280
3280
3281
3281
3282 statemod.addunfinished(
3282 statemod.addunfinished(
3283 b'graft',
3283 b'graft',
3284 fname=b'graftstate',
3284 fname=b'graftstate',
3285 clearable=True,
3285 clearable=True,
3286 stopflag=True,
3286 stopflag=True,
3287 continueflag=True,
3287 continueflag=True,
3288 abortfunc=cmdutil.hgabortgraft,
3288 abortfunc=cmdutil.hgabortgraft,
3289 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3289 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3290 )
3290 )
3291
3291
3292
3292
3293 @command(
3293 @command(
3294 b'grep',
3294 b'grep',
3295 [
3295 [
3296 (b'0', b'print0', None, _(b'end fields with NUL')),
3296 (b'0', b'print0', None, _(b'end fields with NUL')),
3297 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3297 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3298 (
3298 (
3299 b'',
3299 b'',
3300 b'diff',
3300 b'diff',
3301 None,
3301 None,
3302 _(
3302 _(
3303 b'search revision differences for when the pattern was added '
3303 b'search revision differences for when the pattern was added '
3304 b'or removed'
3304 b'or removed'
3305 ),
3305 ),
3306 ),
3306 ),
3307 (b'a', b'text', None, _(b'treat all files as text')),
3307 (b'a', b'text', None, _(b'treat all files as text')),
3308 (
3308 (
3309 b'f',
3309 b'f',
3310 b'follow',
3310 b'follow',
3311 None,
3311 None,
3312 _(
3312 _(
3313 b'follow changeset history,'
3313 b'follow changeset history,'
3314 b' or file history across copies and renames'
3314 b' or file history across copies and renames'
3315 ),
3315 ),
3316 ),
3316 ),
3317 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3317 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3318 (
3318 (
3319 b'l',
3319 b'l',
3320 b'files-with-matches',
3320 b'files-with-matches',
3321 None,
3321 None,
3322 _(b'print only filenames and revisions that match'),
3322 _(b'print only filenames and revisions that match'),
3323 ),
3323 ),
3324 (b'n', b'line-number', None, _(b'print matching line numbers')),
3324 (b'n', b'line-number', None, _(b'print matching line numbers')),
3325 (
3325 (
3326 b'r',
3326 b'r',
3327 b'rev',
3327 b'rev',
3328 [],
3328 [],
3329 _(b'search files changed within revision range'),
3329 _(b'search files changed within revision range'),
3330 _(b'REV'),
3330 _(b'REV'),
3331 ),
3331 ),
3332 (
3332 (
3333 b'',
3333 b'',
3334 b'all-files',
3334 b'all-files',
3335 None,
3335 None,
3336 _(
3336 _(
3337 b'include all files in the changeset while grepping (DEPRECATED)'
3337 b'include all files in the changeset while grepping (DEPRECATED)'
3338 ),
3338 ),
3339 ),
3339 ),
3340 (b'u', b'user', None, _(b'list the author (long with -v)')),
3340 (b'u', b'user', None, _(b'list the author (long with -v)')),
3341 (b'd', b'date', None, _(b'list the date (short with -q)')),
3341 (b'd', b'date', None, _(b'list the date (short with -q)')),
3342 ]
3342 ]
3343 + formatteropts
3343 + formatteropts
3344 + walkopts,
3344 + walkopts,
3345 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3345 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3346 helpcategory=command.CATEGORY_FILE_CONTENTS,
3346 helpcategory=command.CATEGORY_FILE_CONTENTS,
3347 inferrepo=True,
3347 inferrepo=True,
3348 intents={INTENT_READONLY},
3348 intents={INTENT_READONLY},
3349 )
3349 )
3350 def grep(ui, repo, pattern, *pats, **opts):
3350 def grep(ui, repo, pattern, *pats, **opts):
3351 """search for a pattern in specified files
3351 """search for a pattern in specified files
3352
3352
3353 Search the working directory or revision history for a regular
3353 Search the working directory or revision history for a regular
3354 expression in the specified files for the entire repository.
3354 expression in the specified files for the entire repository.
3355
3355
3356 By default, grep searches the repository files in the working
3356 By default, grep searches the repository files in the working
3357 directory and prints the files where it finds a match. To specify
3357 directory and prints the files where it finds a match. To specify
3358 historical revisions instead of the working directory, use the
3358 historical revisions instead of the working directory, use the
3359 --rev flag.
3359 --rev flag.
3360
3360
3361 To search instead historical revision differences that contains a
3361 To search instead historical revision differences that contains a
3362 change in match status ("-" for a match that becomes a non-match,
3362 change in match status ("-" for a match that becomes a non-match,
3363 or "+" for a non-match that becomes a match), use the --diff flag.
3363 or "+" for a non-match that becomes a match), use the --diff flag.
3364
3364
3365 PATTERN can be any Python (roughly Perl-compatible) regular
3365 PATTERN can be any Python (roughly Perl-compatible) regular
3366 expression.
3366 expression.
3367
3367
3368 If no FILEs are specified and the --rev flag isn't supplied, all
3368 If no FILEs are specified and the --rev flag isn't supplied, all
3369 files in the working directory are searched. When using the --rev
3369 files in the working directory are searched. When using the --rev
3370 flag and specifying FILEs, use the --follow argument to also
3370 flag and specifying FILEs, use the --follow argument to also
3371 follow the specified FILEs across renames and copies.
3371 follow the specified FILEs across renames and copies.
3372
3372
3373 .. container:: verbose
3373 .. container:: verbose
3374
3374
3375 Template:
3375 Template:
3376
3376
3377 The following keywords are supported in addition to the common template
3377 The following keywords are supported in addition to the common template
3378 keywords and functions. See also :hg:`help templates`.
3378 keywords and functions. See also :hg:`help templates`.
3379
3379
3380 :change: String. Character denoting insertion ``+`` or removal ``-``.
3380 :change: String. Character denoting insertion ``+`` or removal ``-``.
3381 Available if ``--diff`` is specified.
3381 Available if ``--diff`` is specified.
3382 :lineno: Integer. Line number of the match.
3382 :lineno: Integer. Line number of the match.
3383 :path: String. Repository-absolute path of the file.
3383 :path: String. Repository-absolute path of the file.
3384 :texts: List of text chunks.
3384 :texts: List of text chunks.
3385
3385
3386 And each entry of ``{texts}`` provides the following sub-keywords.
3386 And each entry of ``{texts}`` provides the following sub-keywords.
3387
3387
3388 :matched: Boolean. True if the chunk matches the specified pattern.
3388 :matched: Boolean. True if the chunk matches the specified pattern.
3389 :text: String. Chunk content.
3389 :text: String. Chunk content.
3390
3390
3391 See :hg:`help templates.operators` for the list expansion syntax.
3391 See :hg:`help templates.operators` for the list expansion syntax.
3392
3392
3393 Returns 0 if a match is found, 1 otherwise.
3393 Returns 0 if a match is found, 1 otherwise.
3394
3394
3395 """
3395 """
3396 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3396 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3397 opts = pycompat.byteskwargs(opts)
3397 opts = pycompat.byteskwargs(opts)
3398 diff = opts.get(b'all') or opts.get(b'diff')
3398 diff = opts.get(b'all') or opts.get(b'diff')
3399 follow = opts.get(b'follow')
3399 follow = opts.get(b'follow')
3400 if opts.get(b'all_files') is None and not diff:
3400 if opts.get(b'all_files') is None and not diff:
3401 opts[b'all_files'] = True
3401 opts[b'all_files'] = True
3402 plaingrep = (
3402 plaingrep = (
3403 opts.get(b'all_files')
3403 opts.get(b'all_files')
3404 and not opts.get(b'rev')
3404 and not opts.get(b'rev')
3405 and not opts.get(b'follow')
3405 and not opts.get(b'follow')
3406 )
3406 )
3407 all_files = opts.get(b'all_files')
3407 all_files = opts.get(b'all_files')
3408 if plaingrep:
3408 if plaingrep:
3409 opts[b'rev'] = [b'wdir()']
3409 opts[b'rev'] = [b'wdir()']
3410
3410
3411 reflags = re.M
3411 reflags = re.M
3412 if opts.get(b'ignore_case'):
3412 if opts.get(b'ignore_case'):
3413 reflags |= re.I
3413 reflags |= re.I
3414 try:
3414 try:
3415 regexp = util.re.compile(pattern, reflags)
3415 regexp = util.re.compile(pattern, reflags)
3416 except re.error as inst:
3416 except re.error as inst:
3417 ui.warn(
3417 ui.warn(
3418 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3418 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3419 )
3419 )
3420 return 1
3420 return 1
3421 sep, eol = b':', b'\n'
3421 sep, eol = b':', b'\n'
3422 if opts.get(b'print0'):
3422 if opts.get(b'print0'):
3423 sep = eol = b'\0'
3423 sep = eol = b'\0'
3424
3424
3425 searcher = grepmod.grepsearcher(
3425 searcher = grepmod.grepsearcher(
3426 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3426 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3427 )
3427 )
3428
3428
3429 getfile = searcher._getfile
3429 getfile = searcher._getfile
3430
3430
3431 uipathfn = scmutil.getuipathfn(repo)
3431 uipathfn = scmutil.getuipathfn(repo)
3432
3432
3433 def display(fm, fn, ctx, pstates, states):
3433 def display(fm, fn, ctx, pstates, states):
3434 rev = scmutil.intrev(ctx)
3434 rev = scmutil.intrev(ctx)
3435 if fm.isplain():
3435 if fm.isplain():
3436 formatuser = ui.shortuser
3436 formatuser = ui.shortuser
3437 else:
3437 else:
3438 formatuser = pycompat.bytestr
3438 formatuser = pycompat.bytestr
3439 if ui.quiet:
3439 if ui.quiet:
3440 datefmt = b'%Y-%m-%d'
3440 datefmt = b'%Y-%m-%d'
3441 else:
3441 else:
3442 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3442 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3443 found = False
3443 found = False
3444
3444
3445 @util.cachefunc
3445 @util.cachefunc
3446 def binary():
3446 def binary():
3447 flog = getfile(fn)
3447 flog = getfile(fn)
3448 try:
3448 try:
3449 return stringutil.binary(flog.read(ctx.filenode(fn)))
3449 return stringutil.binary(flog.read(ctx.filenode(fn)))
3450 except error.WdirUnsupported:
3450 except error.WdirUnsupported:
3451 return ctx[fn].isbinary()
3451 return ctx[fn].isbinary()
3452
3452
3453 fieldnamemap = {b'linenumber': b'lineno'}
3453 fieldnamemap = {b'linenumber': b'lineno'}
3454 if diff:
3454 if diff:
3455 iter = grepmod.difflinestates(pstates, states)
3455 iter = grepmod.difflinestates(pstates, states)
3456 else:
3456 else:
3457 iter = [(b'', l) for l in states]
3457 iter = [(b'', l) for l in states]
3458 for change, l in iter:
3458 for change, l in iter:
3459 fm.startitem()
3459 fm.startitem()
3460 fm.context(ctx=ctx)
3460 fm.context(ctx=ctx)
3461 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3461 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3462 fm.plain(uipathfn(fn), label=b'grep.filename')
3462 fm.plain(uipathfn(fn), label=b'grep.filename')
3463
3463
3464 cols = [
3464 cols = [
3465 (b'rev', b'%d', rev, not plaingrep, b''),
3465 (b'rev', b'%d', rev, not plaingrep, b''),
3466 (
3466 (
3467 b'linenumber',
3467 b'linenumber',
3468 b'%d',
3468 b'%d',
3469 l.linenum,
3469 l.linenum,
3470 opts.get(b'line_number'),
3470 opts.get(b'line_number'),
3471 b'',
3471 b'',
3472 ),
3472 ),
3473 ]
3473 ]
3474 if diff:
3474 if diff:
3475 cols.append(
3475 cols.append(
3476 (
3476 (
3477 b'change',
3477 b'change',
3478 b'%s',
3478 b'%s',
3479 change,
3479 change,
3480 True,
3480 True,
3481 b'grep.inserted '
3481 b'grep.inserted '
3482 if change == b'+'
3482 if change == b'+'
3483 else b'grep.deleted ',
3483 else b'grep.deleted ',
3484 )
3484 )
3485 )
3485 )
3486 cols.extend(
3486 cols.extend(
3487 [
3487 [
3488 (
3488 (
3489 b'user',
3489 b'user',
3490 b'%s',
3490 b'%s',
3491 formatuser(ctx.user()),
3491 formatuser(ctx.user()),
3492 opts.get(b'user'),
3492 opts.get(b'user'),
3493 b'',
3493 b'',
3494 ),
3494 ),
3495 (
3495 (
3496 b'date',
3496 b'date',
3497 b'%s',
3497 b'%s',
3498 fm.formatdate(ctx.date(), datefmt),
3498 fm.formatdate(ctx.date(), datefmt),
3499 opts.get(b'date'),
3499 opts.get(b'date'),
3500 b'',
3500 b'',
3501 ),
3501 ),
3502 ]
3502 ]
3503 )
3503 )
3504 for name, fmt, data, cond, extra_label in cols:
3504 for name, fmt, data, cond, extra_label in cols:
3505 if cond:
3505 if cond:
3506 fm.plain(sep, label=b'grep.sep')
3506 fm.plain(sep, label=b'grep.sep')
3507 field = fieldnamemap.get(name, name)
3507 field = fieldnamemap.get(name, name)
3508 label = extra_label + (b'grep.%s' % name)
3508 label = extra_label + (b'grep.%s' % name)
3509 fm.condwrite(cond, field, fmt, data, label=label)
3509 fm.condwrite(cond, field, fmt, data, label=label)
3510 if not opts.get(b'files_with_matches'):
3510 if not opts.get(b'files_with_matches'):
3511 fm.plain(sep, label=b'grep.sep')
3511 fm.plain(sep, label=b'grep.sep')
3512 if not opts.get(b'text') and binary():
3512 if not opts.get(b'text') and binary():
3513 fm.plain(_(b" Binary file matches"))
3513 fm.plain(_(b" Binary file matches"))
3514 else:
3514 else:
3515 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3515 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3516 fm.plain(eol)
3516 fm.plain(eol)
3517 found = True
3517 found = True
3518 if opts.get(b'files_with_matches'):
3518 if opts.get(b'files_with_matches'):
3519 break
3519 break
3520 return found
3520 return found
3521
3521
3522 def displaymatches(fm, l):
3522 def displaymatches(fm, l):
3523 p = 0
3523 p = 0
3524 for s, e in l.findpos(regexp):
3524 for s, e in l.findpos(regexp):
3525 if p < s:
3525 if p < s:
3526 fm.startitem()
3526 fm.startitem()
3527 fm.write(b'text', b'%s', l.line[p:s])
3527 fm.write(b'text', b'%s', l.line[p:s])
3528 fm.data(matched=False)
3528 fm.data(matched=False)
3529 fm.startitem()
3529 fm.startitem()
3530 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3530 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3531 fm.data(matched=True)
3531 fm.data(matched=True)
3532 p = e
3532 p = e
3533 if p < len(l.line):
3533 if p < len(l.line):
3534 fm.startitem()
3534 fm.startitem()
3535 fm.write(b'text', b'%s', l.line[p:])
3535 fm.write(b'text', b'%s', l.line[p:])
3536 fm.data(matched=False)
3536 fm.data(matched=False)
3537 fm.end()
3537 fm.end()
3538
3538
3539 found = False
3539 found = False
3540
3540
3541 wopts = logcmdutil.walkopts(
3541 wopts = logcmdutil.walkopts(
3542 pats=pats,
3542 pats=pats,
3543 opts=opts,
3543 opts=opts,
3544 revspec=opts[b'rev'],
3544 revspec=opts[b'rev'],
3545 include_pats=opts[b'include'],
3545 include_pats=opts[b'include'],
3546 exclude_pats=opts[b'exclude'],
3546 exclude_pats=opts[b'exclude'],
3547 follow=follow,
3547 follow=follow,
3548 force_changelog_traversal=all_files,
3548 force_changelog_traversal=all_files,
3549 filter_revisions_by_pats=not all_files,
3549 filter_revisions_by_pats=not all_files,
3550 )
3550 )
3551 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3551 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3552
3552
3553 ui.pager(b'grep')
3553 ui.pager(b'grep')
3554 fm = ui.formatter(b'grep', opts)
3554 fm = ui.formatter(b'grep', opts)
3555 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3555 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3556 r = display(fm, fn, ctx, pstates, states)
3556 r = display(fm, fn, ctx, pstates, states)
3557 found = found or r
3557 found = found or r
3558 if r and not diff and not all_files:
3558 if r and not diff and not all_files:
3559 searcher.skipfile(fn, ctx.rev())
3559 searcher.skipfile(fn, ctx.rev())
3560 fm.end()
3560 fm.end()
3561
3561
3562 return not found
3562 return not found
3563
3563
3564
3564
3565 @command(
3565 @command(
3566 b'heads',
3566 b'heads',
3567 [
3567 [
3568 (
3568 (
3569 b'r',
3569 b'r',
3570 b'rev',
3570 b'rev',
3571 b'',
3571 b'',
3572 _(b'show only heads which are descendants of STARTREV'),
3572 _(b'show only heads which are descendants of STARTREV'),
3573 _(b'STARTREV'),
3573 _(b'STARTREV'),
3574 ),
3574 ),
3575 (b't', b'topo', False, _(b'show topological heads only')),
3575 (b't', b'topo', False, _(b'show topological heads only')),
3576 (
3576 (
3577 b'a',
3577 b'a',
3578 b'active',
3578 b'active',
3579 False,
3579 False,
3580 _(b'show active branchheads only (DEPRECATED)'),
3580 _(b'show active branchheads only (DEPRECATED)'),
3581 ),
3581 ),
3582 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3582 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3583 ]
3583 ]
3584 + templateopts,
3584 + templateopts,
3585 _(b'[-ct] [-r STARTREV] [REV]...'),
3585 _(b'[-ct] [-r STARTREV] [REV]...'),
3586 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3586 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3587 intents={INTENT_READONLY},
3587 intents={INTENT_READONLY},
3588 )
3588 )
3589 def heads(ui, repo, *branchrevs, **opts):
3589 def heads(ui, repo, *branchrevs, **opts):
3590 """show branch heads
3590 """show branch heads
3591
3591
3592 With no arguments, show all open branch heads in the repository.
3592 With no arguments, show all open branch heads in the repository.
3593 Branch heads are changesets that have no descendants on the
3593 Branch heads are changesets that have no descendants on the
3594 same branch. They are where development generally takes place and
3594 same branch. They are where development generally takes place and
3595 are the usual targets for update and merge operations.
3595 are the usual targets for update and merge operations.
3596
3596
3597 If one or more REVs are given, only open branch heads on the
3597 If one or more REVs are given, only open branch heads on the
3598 branches associated with the specified changesets are shown. This
3598 branches associated with the specified changesets are shown. This
3599 means that you can use :hg:`heads .` to see the heads on the
3599 means that you can use :hg:`heads .` to see the heads on the
3600 currently checked-out branch.
3600 currently checked-out branch.
3601
3601
3602 If -c/--closed is specified, also show branch heads marked closed
3602 If -c/--closed is specified, also show branch heads marked closed
3603 (see :hg:`commit --close-branch`).
3603 (see :hg:`commit --close-branch`).
3604
3604
3605 If STARTREV is specified, only those heads that are descendants of
3605 If STARTREV is specified, only those heads that are descendants of
3606 STARTREV will be displayed.
3606 STARTREV will be displayed.
3607
3607
3608 If -t/--topo is specified, named branch mechanics will be ignored and only
3608 If -t/--topo is specified, named branch mechanics will be ignored and only
3609 topological heads (changesets with no children) will be shown.
3609 topological heads (changesets with no children) will be shown.
3610
3610
3611 Returns 0 if matching heads are found, 1 if not.
3611 Returns 0 if matching heads are found, 1 if not.
3612 """
3612 """
3613
3613
3614 opts = pycompat.byteskwargs(opts)
3614 opts = pycompat.byteskwargs(opts)
3615 start = None
3615 start = None
3616 rev = opts.get(b'rev')
3616 rev = opts.get(b'rev')
3617 if rev:
3617 if rev:
3618 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3618 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3619 start = scmutil.revsingle(repo, rev, None).node()
3619 start = scmutil.revsingle(repo, rev, None).node()
3620
3620
3621 if opts.get(b'topo'):
3621 if opts.get(b'topo'):
3622 heads = [repo[h] for h in repo.heads(start)]
3622 heads = [repo[h] for h in repo.heads(start)]
3623 else:
3623 else:
3624 heads = []
3624 heads = []
3625 for branch in repo.branchmap():
3625 for branch in repo.branchmap():
3626 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3626 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3627 heads = [repo[h] for h in heads]
3627 heads = [repo[h] for h in heads]
3628
3628
3629 if branchrevs:
3629 if branchrevs:
3630 branches = {
3630 branches = {
3631 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3631 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3632 }
3632 }
3633 heads = [h for h in heads if h.branch() in branches]
3633 heads = [h for h in heads if h.branch() in branches]
3634
3634
3635 if opts.get(b'active') and branchrevs:
3635 if opts.get(b'active') and branchrevs:
3636 dagheads = repo.heads(start)
3636 dagheads = repo.heads(start)
3637 heads = [h for h in heads if h.node() in dagheads]
3637 heads = [h for h in heads if h.node() in dagheads]
3638
3638
3639 if branchrevs:
3639 if branchrevs:
3640 haveheads = {h.branch() for h in heads}
3640 haveheads = {h.branch() for h in heads}
3641 if branches - haveheads:
3641 if branches - haveheads:
3642 headless = b', '.join(b for b in branches - haveheads)
3642 headless = b', '.join(b for b in branches - haveheads)
3643 msg = _(b'no open branch heads found on branches %s')
3643 msg = _(b'no open branch heads found on branches %s')
3644 if opts.get(b'rev'):
3644 if opts.get(b'rev'):
3645 msg += _(b' (started at %s)') % opts[b'rev']
3645 msg += _(b' (started at %s)') % opts[b'rev']
3646 ui.warn((msg + b'\n') % headless)
3646 ui.warn((msg + b'\n') % headless)
3647
3647
3648 if not heads:
3648 if not heads:
3649 return 1
3649 return 1
3650
3650
3651 ui.pager(b'heads')
3651 ui.pager(b'heads')
3652 heads = sorted(heads, key=lambda x: -(x.rev()))
3652 heads = sorted(heads, key=lambda x: -(x.rev()))
3653 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3653 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3654 for ctx in heads:
3654 for ctx in heads:
3655 displayer.show(ctx)
3655 displayer.show(ctx)
3656 displayer.close()
3656 displayer.close()
3657
3657
3658
3658
3659 @command(
3659 @command(
3660 b'help',
3660 b'help',
3661 [
3661 [
3662 (b'e', b'extension', None, _(b'show only help for extensions')),
3662 (b'e', b'extension', None, _(b'show only help for extensions')),
3663 (b'c', b'command', None, _(b'show only help for commands')),
3663 (b'c', b'command', None, _(b'show only help for commands')),
3664 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3664 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3665 (
3665 (
3666 b's',
3666 b's',
3667 b'system',
3667 b'system',
3668 [],
3668 [],
3669 _(b'show help for specific platform(s)'),
3669 _(b'show help for specific platform(s)'),
3670 _(b'PLATFORM'),
3670 _(b'PLATFORM'),
3671 ),
3671 ),
3672 ],
3672 ],
3673 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3673 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3674 helpcategory=command.CATEGORY_HELP,
3674 helpcategory=command.CATEGORY_HELP,
3675 norepo=True,
3675 norepo=True,
3676 intents={INTENT_READONLY},
3676 intents={INTENT_READONLY},
3677 )
3677 )
3678 def help_(ui, name=None, **opts):
3678 def help_(ui, name=None, **opts):
3679 """show help for a given topic or a help overview
3679 """show help for a given topic or a help overview
3680
3680
3681 With no arguments, print a list of commands with short help messages.
3681 With no arguments, print a list of commands with short help messages.
3682
3682
3683 Given a topic, extension, or command name, print help for that
3683 Given a topic, extension, or command name, print help for that
3684 topic.
3684 topic.
3685
3685
3686 Returns 0 if successful.
3686 Returns 0 if successful.
3687 """
3687 """
3688
3688
3689 keep = opts.get('system') or []
3689 keep = opts.get('system') or []
3690 if len(keep) == 0:
3690 if len(keep) == 0:
3691 if pycompat.sysplatform.startswith(b'win'):
3691 if pycompat.sysplatform.startswith(b'win'):
3692 keep.append(b'windows')
3692 keep.append(b'windows')
3693 elif pycompat.sysplatform == b'OpenVMS':
3693 elif pycompat.sysplatform == b'OpenVMS':
3694 keep.append(b'vms')
3694 keep.append(b'vms')
3695 elif pycompat.sysplatform == b'plan9':
3695 elif pycompat.sysplatform == b'plan9':
3696 keep.append(b'plan9')
3696 keep.append(b'plan9')
3697 else:
3697 else:
3698 keep.append(b'unix')
3698 keep.append(b'unix')
3699 keep.append(pycompat.sysplatform.lower())
3699 keep.append(pycompat.sysplatform.lower())
3700 if ui.verbose:
3700 if ui.verbose:
3701 keep.append(b'verbose')
3701 keep.append(b'verbose')
3702
3702
3703 commands = sys.modules[__name__]
3703 commands = sys.modules[__name__]
3704 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3704 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3705 ui.pager(b'help')
3705 ui.pager(b'help')
3706 ui.write(formatted)
3706 ui.write(formatted)
3707
3707
3708
3708
3709 @command(
3709 @command(
3710 b'identify|id',
3710 b'identify|id',
3711 [
3711 [
3712 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3712 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3713 (b'n', b'num', None, _(b'show local revision number')),
3713 (b'n', b'num', None, _(b'show local revision number')),
3714 (b'i', b'id', None, _(b'show global revision id')),
3714 (b'i', b'id', None, _(b'show global revision id')),
3715 (b'b', b'branch', None, _(b'show branch')),
3715 (b'b', b'branch', None, _(b'show branch')),
3716 (b't', b'tags', None, _(b'show tags')),
3716 (b't', b'tags', None, _(b'show tags')),
3717 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3717 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3718 ]
3718 ]
3719 + remoteopts
3719 + remoteopts
3720 + formatteropts,
3720 + formatteropts,
3721 _(b'[-nibtB] [-r REV] [SOURCE]'),
3721 _(b'[-nibtB] [-r REV] [SOURCE]'),
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3722 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3723 optionalrepo=True,
3723 optionalrepo=True,
3724 intents={INTENT_READONLY},
3724 intents={INTENT_READONLY},
3725 )
3725 )
3726 def identify(
3726 def identify(
3727 ui,
3727 ui,
3728 repo,
3728 repo,
3729 source=None,
3729 source=None,
3730 rev=None,
3730 rev=None,
3731 num=None,
3731 num=None,
3732 id=None,
3732 id=None,
3733 branch=None,
3733 branch=None,
3734 tags=None,
3734 tags=None,
3735 bookmarks=None,
3735 bookmarks=None,
3736 **opts
3736 **opts
3737 ):
3737 ):
3738 """identify the working directory or specified revision
3738 """identify the working directory or specified revision
3739
3739
3740 Print a summary identifying the repository state at REV using one or
3740 Print a summary identifying the repository state at REV using one or
3741 two parent hash identifiers, followed by a "+" if the working
3741 two parent hash identifiers, followed by a "+" if the working
3742 directory has uncommitted changes, the branch name (if not default),
3742 directory has uncommitted changes, the branch name (if not default),
3743 a list of tags, and a list of bookmarks.
3743 a list of tags, and a list of bookmarks.
3744
3744
3745 When REV is not given, print a summary of the current state of the
3745 When REV is not given, print a summary of the current state of the
3746 repository including the working directory. Specify -r. to get information
3746 repository including the working directory. Specify -r. to get information
3747 of the working directory parent without scanning uncommitted changes.
3747 of the working directory parent without scanning uncommitted changes.
3748
3748
3749 Specifying a path to a repository root or Mercurial bundle will
3749 Specifying a path to a repository root or Mercurial bundle will
3750 cause lookup to operate on that repository/bundle.
3750 cause lookup to operate on that repository/bundle.
3751
3751
3752 .. container:: verbose
3752 .. container:: verbose
3753
3753
3754 Template:
3754 Template:
3755
3755
3756 The following keywords are supported in addition to the common template
3756 The following keywords are supported in addition to the common template
3757 keywords and functions. See also :hg:`help templates`.
3757 keywords and functions. See also :hg:`help templates`.
3758
3758
3759 :dirty: String. Character ``+`` denoting if the working directory has
3759 :dirty: String. Character ``+`` denoting if the working directory has
3760 uncommitted changes.
3760 uncommitted changes.
3761 :id: String. One or two nodes, optionally followed by ``+``.
3761 :id: String. One or two nodes, optionally followed by ``+``.
3762 :parents: List of strings. Parent nodes of the changeset.
3762 :parents: List of strings. Parent nodes of the changeset.
3763
3763
3764 Examples:
3764 Examples:
3765
3765
3766 - generate a build identifier for the working directory::
3766 - generate a build identifier for the working directory::
3767
3767
3768 hg id --id > build-id.dat
3768 hg id --id > build-id.dat
3769
3769
3770 - find the revision corresponding to a tag::
3770 - find the revision corresponding to a tag::
3771
3771
3772 hg id -n -r 1.3
3772 hg id -n -r 1.3
3773
3773
3774 - check the most recent revision of a remote repository::
3774 - check the most recent revision of a remote repository::
3775
3775
3776 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3776 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3777
3777
3778 See :hg:`log` for generating more information about specific revisions,
3778 See :hg:`log` for generating more information about specific revisions,
3779 including full hash identifiers.
3779 including full hash identifiers.
3780
3780
3781 Returns 0 if successful.
3781 Returns 0 if successful.
3782 """
3782 """
3783
3783
3784 opts = pycompat.byteskwargs(opts)
3784 opts = pycompat.byteskwargs(opts)
3785 if not repo and not source:
3785 if not repo and not source:
3786 raise error.InputError(
3786 raise error.InputError(
3787 _(b"there is no Mercurial repository here (.hg not found)")
3787 _(b"there is no Mercurial repository here (.hg not found)")
3788 )
3788 )
3789
3789
3790 default = not (num or id or branch or tags or bookmarks)
3790 default = not (num or id or branch or tags or bookmarks)
3791 output = []
3791 output = []
3792 revs = []
3792 revs = []
3793
3793
3794 if source:
3794 if source:
3795 source, branches = hg.parseurl(ui.expandpath(source))
3795 source, branches = hg.parseurl(ui.expandpath(source))
3796 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3796 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3797 repo = peer.local()
3797 repo = peer.local()
3798 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3798 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3799
3799
3800 fm = ui.formatter(b'identify', opts)
3800 fm = ui.formatter(b'identify', opts)
3801 fm.startitem()
3801 fm.startitem()
3802
3802
3803 if not repo:
3803 if not repo:
3804 if num or branch or tags:
3804 if num or branch or tags:
3805 raise error.InputError(
3805 raise error.InputError(
3806 _(b"can't query remote revision number, branch, or tags")
3806 _(b"can't query remote revision number, branch, or tags")
3807 )
3807 )
3808 if not rev and revs:
3808 if not rev and revs:
3809 rev = revs[0]
3809 rev = revs[0]
3810 if not rev:
3810 if not rev:
3811 rev = b"tip"
3811 rev = b"tip"
3812
3812
3813 remoterev = peer.lookup(rev)
3813 remoterev = peer.lookup(rev)
3814 hexrev = fm.hexfunc(remoterev)
3814 hexrev = fm.hexfunc(remoterev)
3815 if default or id:
3815 if default or id:
3816 output = [hexrev]
3816 output = [hexrev]
3817 fm.data(id=hexrev)
3817 fm.data(id=hexrev)
3818
3818
3819 @util.cachefunc
3819 @util.cachefunc
3820 def getbms():
3820 def getbms():
3821 bms = []
3821 bms = []
3822
3822
3823 if b'bookmarks' in peer.listkeys(b'namespaces'):
3823 if b'bookmarks' in peer.listkeys(b'namespaces'):
3824 hexremoterev = hex(remoterev)
3824 hexremoterev = hex(remoterev)
3825 bms = [
3825 bms = [
3826 bm
3826 bm
3827 for bm, bmr in pycompat.iteritems(
3827 for bm, bmr in pycompat.iteritems(
3828 peer.listkeys(b'bookmarks')
3828 peer.listkeys(b'bookmarks')
3829 )
3829 )
3830 if bmr == hexremoterev
3830 if bmr == hexremoterev
3831 ]
3831 ]
3832
3832
3833 return sorted(bms)
3833 return sorted(bms)
3834
3834
3835 if fm.isplain():
3835 if fm.isplain():
3836 if bookmarks:
3836 if bookmarks:
3837 output.extend(getbms())
3837 output.extend(getbms())
3838 elif default and not ui.quiet:
3838 elif default and not ui.quiet:
3839 # multiple bookmarks for a single parent separated by '/'
3839 # multiple bookmarks for a single parent separated by '/'
3840 bm = b'/'.join(getbms())
3840 bm = b'/'.join(getbms())
3841 if bm:
3841 if bm:
3842 output.append(bm)
3842 output.append(bm)
3843 else:
3843 else:
3844 fm.data(node=hex(remoterev))
3844 fm.data(node=hex(remoterev))
3845 if bookmarks or b'bookmarks' in fm.datahint():
3845 if bookmarks or b'bookmarks' in fm.datahint():
3846 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3846 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3847 else:
3847 else:
3848 if rev:
3848 if rev:
3849 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3849 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3850 ctx = scmutil.revsingle(repo, rev, None)
3850 ctx = scmutil.revsingle(repo, rev, None)
3851
3851
3852 if ctx.rev() is None:
3852 if ctx.rev() is None:
3853 ctx = repo[None]
3853 ctx = repo[None]
3854 parents = ctx.parents()
3854 parents = ctx.parents()
3855 taglist = []
3855 taglist = []
3856 for p in parents:
3856 for p in parents:
3857 taglist.extend(p.tags())
3857 taglist.extend(p.tags())
3858
3858
3859 dirty = b""
3859 dirty = b""
3860 if ctx.dirty(missing=True, merge=False, branch=False):
3860 if ctx.dirty(missing=True, merge=False, branch=False):
3861 dirty = b'+'
3861 dirty = b'+'
3862 fm.data(dirty=dirty)
3862 fm.data(dirty=dirty)
3863
3863
3864 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3864 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3865 if default or id:
3865 if default or id:
3866 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3866 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3867 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3867 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3868
3868
3869 if num:
3869 if num:
3870 numoutput = [b"%d" % p.rev() for p in parents]
3870 numoutput = [b"%d" % p.rev() for p in parents]
3871 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3871 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3872
3872
3873 fm.data(
3873 fm.data(
3874 parents=fm.formatlist(
3874 parents=fm.formatlist(
3875 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3875 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3876 )
3876 )
3877 )
3877 )
3878 else:
3878 else:
3879 hexoutput = fm.hexfunc(ctx.node())
3879 hexoutput = fm.hexfunc(ctx.node())
3880 if default or id:
3880 if default or id:
3881 output = [hexoutput]
3881 output = [hexoutput]
3882 fm.data(id=hexoutput)
3882 fm.data(id=hexoutput)
3883
3883
3884 if num:
3884 if num:
3885 output.append(pycompat.bytestr(ctx.rev()))
3885 output.append(pycompat.bytestr(ctx.rev()))
3886 taglist = ctx.tags()
3886 taglist = ctx.tags()
3887
3887
3888 if default and not ui.quiet:
3888 if default and not ui.quiet:
3889 b = ctx.branch()
3889 b = ctx.branch()
3890 if b != b'default':
3890 if b != b'default':
3891 output.append(b"(%s)" % b)
3891 output.append(b"(%s)" % b)
3892
3892
3893 # multiple tags for a single parent separated by '/'
3893 # multiple tags for a single parent separated by '/'
3894 t = b'/'.join(taglist)
3894 t = b'/'.join(taglist)
3895 if t:
3895 if t:
3896 output.append(t)
3896 output.append(t)
3897
3897
3898 # multiple bookmarks for a single parent separated by '/'
3898 # multiple bookmarks for a single parent separated by '/'
3899 bm = b'/'.join(ctx.bookmarks())
3899 bm = b'/'.join(ctx.bookmarks())
3900 if bm:
3900 if bm:
3901 output.append(bm)
3901 output.append(bm)
3902 else:
3902 else:
3903 if branch:
3903 if branch:
3904 output.append(ctx.branch())
3904 output.append(ctx.branch())
3905
3905
3906 if tags:
3906 if tags:
3907 output.extend(taglist)
3907 output.extend(taglist)
3908
3908
3909 if bookmarks:
3909 if bookmarks:
3910 output.extend(ctx.bookmarks())
3910 output.extend(ctx.bookmarks())
3911
3911
3912 fm.data(node=ctx.hex())
3912 fm.data(node=ctx.hex())
3913 fm.data(branch=ctx.branch())
3913 fm.data(branch=ctx.branch())
3914 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3914 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3915 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3915 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3916 fm.context(ctx=ctx)
3916 fm.context(ctx=ctx)
3917
3917
3918 fm.plain(b"%s\n" % b' '.join(output))
3918 fm.plain(b"%s\n" % b' '.join(output))
3919 fm.end()
3919 fm.end()
3920
3920
3921
3921
3922 @command(
3922 @command(
3923 b'import|patch',
3923 b'import|patch',
3924 [
3924 [
3925 (
3925 (
3926 b'p',
3926 b'p',
3927 b'strip',
3927 b'strip',
3928 1,
3928 1,
3929 _(
3929 _(
3930 b'directory strip option for patch. This has the same '
3930 b'directory strip option for patch. This has the same '
3931 b'meaning as the corresponding patch option'
3931 b'meaning as the corresponding patch option'
3932 ),
3932 ),
3933 _(b'NUM'),
3933 _(b'NUM'),
3934 ),
3934 ),
3935 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3935 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3936 (b'', b'secret', None, _(b'use the secret phase for committing')),
3936 (b'', b'secret', None, _(b'use the secret phase for committing')),
3937 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3937 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3938 (
3938 (
3939 b'f',
3939 b'f',
3940 b'force',
3940 b'force',
3941 None,
3941 None,
3942 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3942 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3943 ),
3943 ),
3944 (
3944 (
3945 b'',
3945 b'',
3946 b'no-commit',
3946 b'no-commit',
3947 None,
3947 None,
3948 _(b"don't commit, just update the working directory"),
3948 _(b"don't commit, just update the working directory"),
3949 ),
3949 ),
3950 (
3950 (
3951 b'',
3951 b'',
3952 b'bypass',
3952 b'bypass',
3953 None,
3953 None,
3954 _(b"apply patch without touching the working directory"),
3954 _(b"apply patch without touching the working directory"),
3955 ),
3955 ),
3956 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3956 (b'', b'partial', None, _(b'commit even if some hunks fail')),
3957 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3957 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
3958 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3958 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
3959 (
3959 (
3960 b'',
3960 b'',
3961 b'import-branch',
3961 b'import-branch',
3962 None,
3962 None,
3963 _(b'use any branch information in patch (implied by --exact)'),
3963 _(b'use any branch information in patch (implied by --exact)'),
3964 ),
3964 ),
3965 ]
3965 ]
3966 + commitopts
3966 + commitopts
3967 + commitopts2
3967 + commitopts2
3968 + similarityopts,
3968 + similarityopts,
3969 _(b'[OPTION]... PATCH...'),
3969 _(b'[OPTION]... PATCH...'),
3970 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3970 helpcategory=command.CATEGORY_IMPORT_EXPORT,
3971 )
3971 )
3972 def import_(ui, repo, patch1=None, *patches, **opts):
3972 def import_(ui, repo, patch1=None, *patches, **opts):
3973 """import an ordered set of patches
3973 """import an ordered set of patches
3974
3974
3975 Import a list of patches and commit them individually (unless
3975 Import a list of patches and commit them individually (unless
3976 --no-commit is specified).
3976 --no-commit is specified).
3977
3977
3978 To read a patch from standard input (stdin), use "-" as the patch
3978 To read a patch from standard input (stdin), use "-" as the patch
3979 name. If a URL is specified, the patch will be downloaded from
3979 name. If a URL is specified, the patch will be downloaded from
3980 there.
3980 there.
3981
3981
3982 Import first applies changes to the working directory (unless
3982 Import first applies changes to the working directory (unless
3983 --bypass is specified), import will abort if there are outstanding
3983 --bypass is specified), import will abort if there are outstanding
3984 changes.
3984 changes.
3985
3985
3986 Use --bypass to apply and commit patches directly to the
3986 Use --bypass to apply and commit patches directly to the
3987 repository, without affecting the working directory. Without
3987 repository, without affecting the working directory. Without
3988 --exact, patches will be applied on top of the working directory
3988 --exact, patches will be applied on top of the working directory
3989 parent revision.
3989 parent revision.
3990
3990
3991 You can import a patch straight from a mail message. Even patches
3991 You can import a patch straight from a mail message. Even patches
3992 as attachments work (to use the body part, it must have type
3992 as attachments work (to use the body part, it must have type
3993 text/plain or text/x-patch). From and Subject headers of email
3993 text/plain or text/x-patch). From and Subject headers of email
3994 message are used as default committer and commit message. All
3994 message are used as default committer and commit message. All
3995 text/plain body parts before first diff are added to the commit
3995 text/plain body parts before first diff are added to the commit
3996 message.
3996 message.
3997
3997
3998 If the imported patch was generated by :hg:`export`, user and
3998 If the imported patch was generated by :hg:`export`, user and
3999 description from patch override values from message headers and
3999 description from patch override values from message headers and
4000 body. Values given on command line with -m/--message and -u/--user
4000 body. Values given on command line with -m/--message and -u/--user
4001 override these.
4001 override these.
4002
4002
4003 If --exact is specified, import will set the working directory to
4003 If --exact is specified, import will set the working directory to
4004 the parent of each patch before applying it, and will abort if the
4004 the parent of each patch before applying it, and will abort if the
4005 resulting changeset has a different ID than the one recorded in
4005 resulting changeset has a different ID than the one recorded in
4006 the patch. This will guard against various ways that portable
4006 the patch. This will guard against various ways that portable
4007 patch formats and mail systems might fail to transfer Mercurial
4007 patch formats and mail systems might fail to transfer Mercurial
4008 data or metadata. See :hg:`bundle` for lossless transmission.
4008 data or metadata. See :hg:`bundle` for lossless transmission.
4009
4009
4010 Use --partial to ensure a changeset will be created from the patch
4010 Use --partial to ensure a changeset will be created from the patch
4011 even if some hunks fail to apply. Hunks that fail to apply will be
4011 even if some hunks fail to apply. Hunks that fail to apply will be
4012 written to a <target-file>.rej file. Conflicts can then be resolved
4012 written to a <target-file>.rej file. Conflicts can then be resolved
4013 by hand before :hg:`commit --amend` is run to update the created
4013 by hand before :hg:`commit --amend` is run to update the created
4014 changeset. This flag exists to let people import patches that
4014 changeset. This flag exists to let people import patches that
4015 partially apply without losing the associated metadata (author,
4015 partially apply without losing the associated metadata (author,
4016 date, description, ...).
4016 date, description, ...).
4017
4017
4018 .. note::
4018 .. note::
4019
4019
4020 When no hunks apply cleanly, :hg:`import --partial` will create
4020 When no hunks apply cleanly, :hg:`import --partial` will create
4021 an empty changeset, importing only the patch metadata.
4021 an empty changeset, importing only the patch metadata.
4022
4022
4023 With -s/--similarity, hg will attempt to discover renames and
4023 With -s/--similarity, hg will attempt to discover renames and
4024 copies in the patch in the same way as :hg:`addremove`.
4024 copies in the patch in the same way as :hg:`addremove`.
4025
4025
4026 It is possible to use external patch programs to perform the patch
4026 It is possible to use external patch programs to perform the patch
4027 by setting the ``ui.patch`` configuration option. For the default
4027 by setting the ``ui.patch`` configuration option. For the default
4028 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4028 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4029 See :hg:`help config` for more information about configuration
4029 See :hg:`help config` for more information about configuration
4030 files and how to use these options.
4030 files and how to use these options.
4031
4031
4032 See :hg:`help dates` for a list of formats valid for -d/--date.
4032 See :hg:`help dates` for a list of formats valid for -d/--date.
4033
4033
4034 .. container:: verbose
4034 .. container:: verbose
4035
4035
4036 Examples:
4036 Examples:
4037
4037
4038 - import a traditional patch from a website and detect renames::
4038 - import a traditional patch from a website and detect renames::
4039
4039
4040 hg import -s 80 http://example.com/bugfix.patch
4040 hg import -s 80 http://example.com/bugfix.patch
4041
4041
4042 - import a changeset from an hgweb server::
4042 - import a changeset from an hgweb server::
4043
4043
4044 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4044 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4045
4045
4046 - import all the patches in an Unix-style mbox::
4046 - import all the patches in an Unix-style mbox::
4047
4047
4048 hg import incoming-patches.mbox
4048 hg import incoming-patches.mbox
4049
4049
4050 - import patches from stdin::
4050 - import patches from stdin::
4051
4051
4052 hg import -
4052 hg import -
4053
4053
4054 - attempt to exactly restore an exported changeset (not always
4054 - attempt to exactly restore an exported changeset (not always
4055 possible)::
4055 possible)::
4056
4056
4057 hg import --exact proposed-fix.patch
4057 hg import --exact proposed-fix.patch
4058
4058
4059 - use an external tool to apply a patch which is too fuzzy for
4059 - use an external tool to apply a patch which is too fuzzy for
4060 the default internal tool.
4060 the default internal tool.
4061
4061
4062 hg import --config ui.patch="patch --merge" fuzzy.patch
4062 hg import --config ui.patch="patch --merge" fuzzy.patch
4063
4063
4064 - change the default fuzzing from 2 to a less strict 7
4064 - change the default fuzzing from 2 to a less strict 7
4065
4065
4066 hg import --config ui.fuzz=7 fuzz.patch
4066 hg import --config ui.fuzz=7 fuzz.patch
4067
4067
4068 Returns 0 on success, 1 on partial success (see --partial).
4068 Returns 0 on success, 1 on partial success (see --partial).
4069 """
4069 """
4070
4070
4071 cmdutil.check_incompatible_arguments(
4071 cmdutil.check_incompatible_arguments(
4072 opts, 'no_commit', ['bypass', 'secret']
4072 opts, 'no_commit', ['bypass', 'secret']
4073 )
4073 )
4074 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4074 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4075 opts = pycompat.byteskwargs(opts)
4075 opts = pycompat.byteskwargs(opts)
4076 if not patch1:
4076 if not patch1:
4077 raise error.InputError(_(b'need at least one patch to import'))
4077 raise error.InputError(_(b'need at least one patch to import'))
4078
4078
4079 patches = (patch1,) + patches
4079 patches = (patch1,) + patches
4080
4080
4081 date = opts.get(b'date')
4081 date = opts.get(b'date')
4082 if date:
4082 if date:
4083 opts[b'date'] = dateutil.parsedate(date)
4083 opts[b'date'] = dateutil.parsedate(date)
4084
4084
4085 exact = opts.get(b'exact')
4085 exact = opts.get(b'exact')
4086 update = not opts.get(b'bypass')
4086 update = not opts.get(b'bypass')
4087 try:
4087 try:
4088 sim = float(opts.get(b'similarity') or 0)
4088 sim = float(opts.get(b'similarity') or 0)
4089 except ValueError:
4089 except ValueError:
4090 raise error.InputError(_(b'similarity must be a number'))
4090 raise error.InputError(_(b'similarity must be a number'))
4091 if sim < 0 or sim > 100:
4091 if sim < 0 or sim > 100:
4092 raise error.InputError(_(b'similarity must be between 0 and 100'))
4092 raise error.InputError(_(b'similarity must be between 0 and 100'))
4093 if sim and not update:
4093 if sim and not update:
4094 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4094 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4095
4095
4096 base = opts[b"base"]
4096 base = opts[b"base"]
4097 msgs = []
4097 msgs = []
4098 ret = 0
4098 ret = 0
4099
4099
4100 with repo.wlock():
4100 with repo.wlock():
4101 if update:
4101 if update:
4102 cmdutil.checkunfinished(repo)
4102 cmdutil.checkunfinished(repo)
4103 if exact or not opts.get(b'force'):
4103 if exact or not opts.get(b'force'):
4104 cmdutil.bailifchanged(repo)
4104 cmdutil.bailifchanged(repo)
4105
4105
4106 if not opts.get(b'no_commit'):
4106 if not opts.get(b'no_commit'):
4107 lock = repo.lock
4107 lock = repo.lock
4108 tr = lambda: repo.transaction(b'import')
4108 tr = lambda: repo.transaction(b'import')
4109 dsguard = util.nullcontextmanager
4109 dsguard = util.nullcontextmanager
4110 else:
4110 else:
4111 lock = util.nullcontextmanager
4111 lock = util.nullcontextmanager
4112 tr = util.nullcontextmanager
4112 tr = util.nullcontextmanager
4113 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4113 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4114 with lock(), tr(), dsguard():
4114 with lock(), tr(), dsguard():
4115 parents = repo[None].parents()
4115 parents = repo[None].parents()
4116 for patchurl in patches:
4116 for patchurl in patches:
4117 if patchurl == b'-':
4117 if patchurl == b'-':
4118 ui.status(_(b'applying patch from stdin\n'))
4118 ui.status(_(b'applying patch from stdin\n'))
4119 patchfile = ui.fin
4119 patchfile = ui.fin
4120 patchurl = b'stdin' # for error message
4120 patchurl = b'stdin' # for error message
4121 else:
4121 else:
4122 patchurl = os.path.join(base, patchurl)
4122 patchurl = os.path.join(base, patchurl)
4123 ui.status(_(b'applying %s\n') % patchurl)
4123 ui.status(_(b'applying %s\n') % patchurl)
4124 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4124 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4125
4125
4126 haspatch = False
4126 haspatch = False
4127 for hunk in patch.split(patchfile):
4127 for hunk in patch.split(patchfile):
4128 with patch.extract(ui, hunk) as patchdata:
4128 with patch.extract(ui, hunk) as patchdata:
4129 msg, node, rej = cmdutil.tryimportone(
4129 msg, node, rej = cmdutil.tryimportone(
4130 ui, repo, patchdata, parents, opts, msgs, hg.clean
4130 ui, repo, patchdata, parents, opts, msgs, hg.clean
4131 )
4131 )
4132 if msg:
4132 if msg:
4133 haspatch = True
4133 haspatch = True
4134 ui.note(msg + b'\n')
4134 ui.note(msg + b'\n')
4135 if update or exact:
4135 if update or exact:
4136 parents = repo[None].parents()
4136 parents = repo[None].parents()
4137 else:
4137 else:
4138 parents = [repo[node]]
4138 parents = [repo[node]]
4139 if rej:
4139 if rej:
4140 ui.write_err(_(b"patch applied partially\n"))
4140 ui.write_err(_(b"patch applied partially\n"))
4141 ui.write_err(
4141 ui.write_err(
4142 _(
4142 _(
4143 b"(fix the .rej files and run "
4143 b"(fix the .rej files and run "
4144 b"`hg commit --amend`)\n"
4144 b"`hg commit --amend`)\n"
4145 )
4145 )
4146 )
4146 )
4147 ret = 1
4147 ret = 1
4148 break
4148 break
4149
4149
4150 if not haspatch:
4150 if not haspatch:
4151 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4151 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4152
4152
4153 if msgs:
4153 if msgs:
4154 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4154 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4155 return ret
4155 return ret
4156
4156
4157
4157
4158 @command(
4158 @command(
4159 b'incoming|in',
4159 b'incoming|in',
4160 [
4160 [
4161 (
4161 (
4162 b'f',
4162 b'f',
4163 b'force',
4163 b'force',
4164 None,
4164 None,
4165 _(b'run even if remote repository is unrelated'),
4165 _(b'run even if remote repository is unrelated'),
4166 ),
4166 ),
4167 (b'n', b'newest-first', None, _(b'show newest record first')),
4167 (b'n', b'newest-first', None, _(b'show newest record first')),
4168 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4168 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4169 (
4169 (
4170 b'r',
4170 b'r',
4171 b'rev',
4171 b'rev',
4172 [],
4172 [],
4173 _(b'a remote changeset intended to be added'),
4173 _(b'a remote changeset intended to be added'),
4174 _(b'REV'),
4174 _(b'REV'),
4175 ),
4175 ),
4176 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4176 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4177 (
4177 (
4178 b'b',
4178 b'b',
4179 b'branch',
4179 b'branch',
4180 [],
4180 [],
4181 _(b'a specific branch you would like to pull'),
4181 _(b'a specific branch you would like to pull'),
4182 _(b'BRANCH'),
4182 _(b'BRANCH'),
4183 ),
4183 ),
4184 ]
4184 ]
4185 + logopts
4185 + logopts
4186 + remoteopts
4186 + remoteopts
4187 + subrepoopts,
4187 + subrepoopts,
4188 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4188 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4189 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4189 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4190 )
4190 )
4191 def incoming(ui, repo, source=b"default", **opts):
4191 def incoming(ui, repo, source=b"default", **opts):
4192 """show new changesets found in source
4192 """show new changesets found in source
4193
4193
4194 Show new changesets found in the specified path/URL or the default
4194 Show new changesets found in the specified path/URL or the default
4195 pull location. These are the changesets that would have been pulled
4195 pull location. These are the changesets that would have been pulled
4196 by :hg:`pull` at the time you issued this command.
4196 by :hg:`pull` at the time you issued this command.
4197
4197
4198 See pull for valid source format details.
4198 See pull for valid source format details.
4199
4199
4200 .. container:: verbose
4200 .. container:: verbose
4201
4201
4202 With -B/--bookmarks, the result of bookmark comparison between
4202 With -B/--bookmarks, the result of bookmark comparison between
4203 local and remote repositories is displayed. With -v/--verbose,
4203 local and remote repositories is displayed. With -v/--verbose,
4204 status is also displayed for each bookmark like below::
4204 status is also displayed for each bookmark like below::
4205
4205
4206 BM1 01234567890a added
4206 BM1 01234567890a added
4207 BM2 1234567890ab advanced
4207 BM2 1234567890ab advanced
4208 BM3 234567890abc diverged
4208 BM3 234567890abc diverged
4209 BM4 34567890abcd changed
4209 BM4 34567890abcd changed
4210
4210
4211 The action taken locally when pulling depends on the
4211 The action taken locally when pulling depends on the
4212 status of each bookmark:
4212 status of each bookmark:
4213
4213
4214 :``added``: pull will create it
4214 :``added``: pull will create it
4215 :``advanced``: pull will update it
4215 :``advanced``: pull will update it
4216 :``diverged``: pull will create a divergent bookmark
4216 :``diverged``: pull will create a divergent bookmark
4217 :``changed``: result depends on remote changesets
4217 :``changed``: result depends on remote changesets
4218
4218
4219 From the point of view of pulling behavior, bookmark
4219 From the point of view of pulling behavior, bookmark
4220 existing only in the remote repository are treated as ``added``,
4220 existing only in the remote repository are treated as ``added``,
4221 even if it is in fact locally deleted.
4221 even if it is in fact locally deleted.
4222
4222
4223 .. container:: verbose
4223 .. container:: verbose
4224
4224
4225 For remote repository, using --bundle avoids downloading the
4225 For remote repository, using --bundle avoids downloading the
4226 changesets twice if the incoming is followed by a pull.
4226 changesets twice if the incoming is followed by a pull.
4227
4227
4228 Examples:
4228 Examples:
4229
4229
4230 - show incoming changes with patches and full description::
4230 - show incoming changes with patches and full description::
4231
4231
4232 hg incoming -vp
4232 hg incoming -vp
4233
4233
4234 - show incoming changes excluding merges, store a bundle::
4234 - show incoming changes excluding merges, store a bundle::
4235
4235
4236 hg in -vpM --bundle incoming.hg
4236 hg in -vpM --bundle incoming.hg
4237 hg pull incoming.hg
4237 hg pull incoming.hg
4238
4238
4239 - briefly list changes inside a bundle::
4239 - briefly list changes inside a bundle::
4240
4240
4241 hg in changes.hg -T "{desc|firstline}\\n"
4241 hg in changes.hg -T "{desc|firstline}\\n"
4242
4242
4243 Returns 0 if there are incoming changes, 1 otherwise.
4243 Returns 0 if there are incoming changes, 1 otherwise.
4244 """
4244 """
4245 opts = pycompat.byteskwargs(opts)
4245 opts = pycompat.byteskwargs(opts)
4246 if opts.get(b'graph'):
4246 if opts.get(b'graph'):
4247 logcmdutil.checkunsupportedgraphflags([], opts)
4247 logcmdutil.checkunsupportedgraphflags([], opts)
4248
4248
4249 def display(other, chlist, displayer):
4249 def display(other, chlist, displayer):
4250 revdag = logcmdutil.graphrevs(other, chlist, opts)
4250 revdag = logcmdutil.graphrevs(other, chlist, opts)
4251 logcmdutil.displaygraph(
4251 logcmdutil.displaygraph(
4252 ui, repo, revdag, displayer, graphmod.asciiedges
4252 ui, repo, revdag, displayer, graphmod.asciiedges
4253 )
4253 )
4254
4254
4255 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4255 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4256 return 0
4256 return 0
4257
4257
4258 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4258 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4259
4259
4260 if opts.get(b'bookmarks'):
4260 if opts.get(b'bookmarks'):
4261 source, branches = hg.parseurl(
4261 source, branches = hg.parseurl(
4262 ui.expandpath(source), opts.get(b'branch')
4262 ui.expandpath(source), opts.get(b'branch')
4263 )
4263 )
4264 other = hg.peer(repo, opts, source)
4264 other = hg.peer(repo, opts, source)
4265 if b'bookmarks' not in other.listkeys(b'namespaces'):
4265 if b'bookmarks' not in other.listkeys(b'namespaces'):
4266 ui.warn(_(b"remote doesn't support bookmarks\n"))
4266 ui.warn(_(b"remote doesn't support bookmarks\n"))
4267 return 0
4267 return 0
4268 ui.pager(b'incoming')
4268 ui.pager(b'incoming')
4269 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4269 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4270 return bookmarks.incoming(ui, repo, other)
4270 return bookmarks.incoming(ui, repo, other)
4271
4271
4272 repo._subtoppath = ui.expandpath(source)
4272 repo._subtoppath = ui.expandpath(source)
4273 try:
4273 try:
4274 return hg.incoming(ui, repo, source, opts)
4274 return hg.incoming(ui, repo, source, opts)
4275 finally:
4275 finally:
4276 del repo._subtoppath
4276 del repo._subtoppath
4277
4277
4278
4278
4279 @command(
4279 @command(
4280 b'init',
4280 b'init',
4281 remoteopts,
4281 remoteopts,
4282 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4282 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4283 helpcategory=command.CATEGORY_REPO_CREATION,
4283 helpcategory=command.CATEGORY_REPO_CREATION,
4284 helpbasic=True,
4284 helpbasic=True,
4285 norepo=True,
4285 norepo=True,
4286 )
4286 )
4287 def init(ui, dest=b".", **opts):
4287 def init(ui, dest=b".", **opts):
4288 """create a new repository in the given directory
4288 """create a new repository in the given directory
4289
4289
4290 Initialize a new repository in the given directory. If the given
4290 Initialize a new repository in the given directory. If the given
4291 directory does not exist, it will be created.
4291 directory does not exist, it will be created.
4292
4292
4293 If no directory is given, the current directory is used.
4293 If no directory is given, the current directory is used.
4294
4294
4295 It is possible to specify an ``ssh://`` URL as the destination.
4295 It is possible to specify an ``ssh://`` URL as the destination.
4296 See :hg:`help urls` for more information.
4296 See :hg:`help urls` for more information.
4297
4297
4298 Returns 0 on success.
4298 Returns 0 on success.
4299 """
4299 """
4300 opts = pycompat.byteskwargs(opts)
4300 opts = pycompat.byteskwargs(opts)
4301 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4301 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4302
4302
4303
4303
4304 @command(
4304 @command(
4305 b'locate',
4305 b'locate',
4306 [
4306 [
4307 (
4307 (
4308 b'r',
4308 b'r',
4309 b'rev',
4309 b'rev',
4310 b'',
4310 b'',
4311 _(b'search the repository as it is in REV'),
4311 _(b'search the repository as it is in REV'),
4312 _(b'REV'),
4312 _(b'REV'),
4313 ),
4313 ),
4314 (
4314 (
4315 b'0',
4315 b'0',
4316 b'print0',
4316 b'print0',
4317 None,
4317 None,
4318 _(b'end filenames with NUL, for use with xargs'),
4318 _(b'end filenames with NUL, for use with xargs'),
4319 ),
4319 ),
4320 (
4320 (
4321 b'f',
4321 b'f',
4322 b'fullpath',
4322 b'fullpath',
4323 None,
4323 None,
4324 _(b'print complete paths from the filesystem root'),
4324 _(b'print complete paths from the filesystem root'),
4325 ),
4325 ),
4326 ]
4326 ]
4327 + walkopts,
4327 + walkopts,
4328 _(b'[OPTION]... [PATTERN]...'),
4328 _(b'[OPTION]... [PATTERN]...'),
4329 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4329 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4330 )
4330 )
4331 def locate(ui, repo, *pats, **opts):
4331 def locate(ui, repo, *pats, **opts):
4332 """locate files matching specific patterns (DEPRECATED)
4332 """locate files matching specific patterns (DEPRECATED)
4333
4333
4334 Print files under Mercurial control in the working directory whose
4334 Print files under Mercurial control in the working directory whose
4335 names match the given patterns.
4335 names match the given patterns.
4336
4336
4337 By default, this command searches all directories in the working
4337 By default, this command searches all directories in the working
4338 directory. To search just the current directory and its
4338 directory. To search just the current directory and its
4339 subdirectories, use "--include .".
4339 subdirectories, use "--include .".
4340
4340
4341 If no patterns are given to match, this command prints the names
4341 If no patterns are given to match, this command prints the names
4342 of all files under Mercurial control in the working directory.
4342 of all files under Mercurial control in the working directory.
4343
4343
4344 If you want to feed the output of this command into the "xargs"
4344 If you want to feed the output of this command into the "xargs"
4345 command, use the -0 option to both this command and "xargs". This
4345 command, use the -0 option to both this command and "xargs". This
4346 will avoid the problem of "xargs" treating single filenames that
4346 will avoid the problem of "xargs" treating single filenames that
4347 contain whitespace as multiple filenames.
4347 contain whitespace as multiple filenames.
4348
4348
4349 See :hg:`help files` for a more versatile command.
4349 See :hg:`help files` for a more versatile command.
4350
4350
4351 Returns 0 if a match is found, 1 otherwise.
4351 Returns 0 if a match is found, 1 otherwise.
4352 """
4352 """
4353 opts = pycompat.byteskwargs(opts)
4353 opts = pycompat.byteskwargs(opts)
4354 if opts.get(b'print0'):
4354 if opts.get(b'print0'):
4355 end = b'\0'
4355 end = b'\0'
4356 else:
4356 else:
4357 end = b'\n'
4357 end = b'\n'
4358 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4358 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4359
4359
4360 ret = 1
4360 ret = 1
4361 m = scmutil.match(
4361 m = scmutil.match(
4362 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4362 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4363 )
4363 )
4364
4364
4365 ui.pager(b'locate')
4365 ui.pager(b'locate')
4366 if ctx.rev() is None:
4366 if ctx.rev() is None:
4367 # When run on the working copy, "locate" includes removed files, so
4367 # When run on the working copy, "locate" includes removed files, so
4368 # we get the list of files from the dirstate.
4368 # we get the list of files from the dirstate.
4369 filesgen = sorted(repo.dirstate.matches(m))
4369 filesgen = sorted(repo.dirstate.matches(m))
4370 else:
4370 else:
4371 filesgen = ctx.matches(m)
4371 filesgen = ctx.matches(m)
4372 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4372 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4373 for abs in filesgen:
4373 for abs in filesgen:
4374 if opts.get(b'fullpath'):
4374 if opts.get(b'fullpath'):
4375 ui.write(repo.wjoin(abs), end)
4375 ui.write(repo.wjoin(abs), end)
4376 else:
4376 else:
4377 ui.write(uipathfn(abs), end)
4377 ui.write(uipathfn(abs), end)
4378 ret = 0
4378 ret = 0
4379
4379
4380 return ret
4380 return ret
4381
4381
4382
4382
4383 @command(
4383 @command(
4384 b'log|history',
4384 b'log|history',
4385 [
4385 [
4386 (
4386 (
4387 b'f',
4387 b'f',
4388 b'follow',
4388 b'follow',
4389 None,
4389 None,
4390 _(
4390 _(
4391 b'follow changeset history, or file history across copies and renames'
4391 b'follow changeset history, or file history across copies and renames'
4392 ),
4392 ),
4393 ),
4393 ),
4394 (
4394 (
4395 b'',
4395 b'',
4396 b'follow-first',
4396 b'follow-first',
4397 None,
4397 None,
4398 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4398 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4399 ),
4399 ),
4400 (
4400 (
4401 b'd',
4401 b'd',
4402 b'date',
4402 b'date',
4403 b'',
4403 b'',
4404 _(b'show revisions matching date spec'),
4404 _(b'show revisions matching date spec'),
4405 _(b'DATE'),
4405 _(b'DATE'),
4406 ),
4406 ),
4407 (b'C', b'copies', None, _(b'show copied files')),
4407 (b'C', b'copies', None, _(b'show copied files')),
4408 (
4408 (
4409 b'k',
4409 b'k',
4410 b'keyword',
4410 b'keyword',
4411 [],
4411 [],
4412 _(b'do case-insensitive search for a given text'),
4412 _(b'do case-insensitive search for a given text'),
4413 _(b'TEXT'),
4413 _(b'TEXT'),
4414 ),
4414 ),
4415 (
4415 (
4416 b'r',
4416 b'r',
4417 b'rev',
4417 b'rev',
4418 [],
4418 [],
4419 _(b'show the specified revision or revset'),
4419 _(b'show the specified revision or revset'),
4420 _(b'REV'),
4420 _(b'REV'),
4421 ),
4421 ),
4422 (
4422 (
4423 b'L',
4423 b'L',
4424 b'line-range',
4424 b'line-range',
4425 [],
4425 [],
4426 _(b'follow line range of specified file (EXPERIMENTAL)'),
4426 _(b'follow line range of specified file (EXPERIMENTAL)'),
4427 _(b'FILE,RANGE'),
4427 _(b'FILE,RANGE'),
4428 ),
4428 ),
4429 (
4429 (
4430 b'',
4430 b'',
4431 b'removed',
4431 b'removed',
4432 None,
4432 None,
4433 _(b'include revisions where files were removed'),
4433 _(b'include revisions where files were removed'),
4434 ),
4434 ),
4435 (
4435 (
4436 b'm',
4436 b'm',
4437 b'only-merges',
4437 b'only-merges',
4438 None,
4438 None,
4439 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4439 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4440 ),
4440 ),
4441 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4441 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4442 (
4442 (
4443 b'',
4443 b'',
4444 b'only-branch',
4444 b'only-branch',
4445 [],
4445 [],
4446 _(
4446 _(
4447 b'show only changesets within the given named branch (DEPRECATED)'
4447 b'show only changesets within the given named branch (DEPRECATED)'
4448 ),
4448 ),
4449 _(b'BRANCH'),
4449 _(b'BRANCH'),
4450 ),
4450 ),
4451 (
4451 (
4452 b'b',
4452 b'b',
4453 b'branch',
4453 b'branch',
4454 [],
4454 [],
4455 _(b'show changesets within the given named branch'),
4455 _(b'show changesets within the given named branch'),
4456 _(b'BRANCH'),
4456 _(b'BRANCH'),
4457 ),
4457 ),
4458 (
4458 (
4459 b'P',
4459 b'P',
4460 b'prune',
4460 b'prune',
4461 [],
4461 [],
4462 _(b'do not display revision or any of its ancestors'),
4462 _(b'do not display revision or any of its ancestors'),
4463 _(b'REV'),
4463 _(b'REV'),
4464 ),
4464 ),
4465 ]
4465 ]
4466 + logopts
4466 + logopts
4467 + walkopts,
4467 + walkopts,
4468 _(b'[OPTION]... [FILE]'),
4468 _(b'[OPTION]... [FILE]'),
4469 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4469 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4470 helpbasic=True,
4470 helpbasic=True,
4471 inferrepo=True,
4471 inferrepo=True,
4472 intents={INTENT_READONLY},
4472 intents={INTENT_READONLY},
4473 )
4473 )
4474 def log(ui, repo, *pats, **opts):
4474 def log(ui, repo, *pats, **opts):
4475 """show revision history of entire repository or files
4475 """show revision history of entire repository or files
4476
4476
4477 Print the revision history of the specified files or the entire
4477 Print the revision history of the specified files or the entire
4478 project.
4478 project.
4479
4479
4480 If no revision range is specified, the default is ``tip:0`` unless
4480 If no revision range is specified, the default is ``tip:0`` unless
4481 --follow is set, in which case the working directory parent is
4481 --follow is set, in which case the working directory parent is
4482 used as the starting revision.
4482 used as the starting revision.
4483
4483
4484 File history is shown without following rename or copy history of
4484 File history is shown without following rename or copy history of
4485 files. Use -f/--follow with a filename to follow history across
4485 files. Use -f/--follow with a filename to follow history across
4486 renames and copies. --follow without a filename will only show
4486 renames and copies. --follow without a filename will only show
4487 ancestors of the starting revision.
4487 ancestors of the starting revision.
4488
4488
4489 By default this command prints revision number and changeset id,
4489 By default this command prints revision number and changeset id,
4490 tags, non-trivial parents, user, date and time, and a summary for
4490 tags, non-trivial parents, user, date and time, and a summary for
4491 each commit. When the -v/--verbose switch is used, the list of
4491 each commit. When the -v/--verbose switch is used, the list of
4492 changed files and full commit message are shown.
4492 changed files and full commit message are shown.
4493
4493
4494 With --graph the revisions are shown as an ASCII art DAG with the most
4494 With --graph the revisions are shown as an ASCII art DAG with the most
4495 recent changeset at the top.
4495 recent changeset at the top.
4496 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4496 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4497 involved in an unresolved merge conflict, '_' closes a branch,
4497 involved in an unresolved merge conflict, '_' closes a branch,
4498 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4498 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4499 changeset from the lines below is a parent of the 'o' merge on the same
4499 changeset from the lines below is a parent of the 'o' merge on the same
4500 line.
4500 line.
4501 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4501 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4502 of a '|' indicates one or more revisions in a path are omitted.
4502 of a '|' indicates one or more revisions in a path are omitted.
4503
4503
4504 .. container:: verbose
4504 .. container:: verbose
4505
4505
4506 Use -L/--line-range FILE,M:N options to follow the history of lines
4506 Use -L/--line-range FILE,M:N options to follow the history of lines
4507 from M to N in FILE. With -p/--patch only diff hunks affecting
4507 from M to N in FILE. With -p/--patch only diff hunks affecting
4508 specified line range will be shown. This option requires --follow;
4508 specified line range will be shown. This option requires --follow;
4509 it can be specified multiple times. Currently, this option is not
4509 it can be specified multiple times. Currently, this option is not
4510 compatible with --graph. This option is experimental.
4510 compatible with --graph. This option is experimental.
4511
4511
4512 .. note::
4512 .. note::
4513
4513
4514 :hg:`log --patch` may generate unexpected diff output for merge
4514 :hg:`log --patch` may generate unexpected diff output for merge
4515 changesets, as it will only compare the merge changeset against
4515 changesets, as it will only compare the merge changeset against
4516 its first parent. Also, only files different from BOTH parents
4516 its first parent. Also, only files different from BOTH parents
4517 will appear in files:.
4517 will appear in files:.
4518
4518
4519 .. note::
4519 .. note::
4520
4520
4521 For performance reasons, :hg:`log FILE` may omit duplicate changes
4521 For performance reasons, :hg:`log FILE` may omit duplicate changes
4522 made on branches and will not show removals or mode changes. To
4522 made on branches and will not show removals or mode changes. To
4523 see all such changes, use the --removed switch.
4523 see all such changes, use the --removed switch.
4524
4524
4525 .. container:: verbose
4525 .. container:: verbose
4526
4526
4527 .. note::
4527 .. note::
4528
4528
4529 The history resulting from -L/--line-range options depends on diff
4529 The history resulting from -L/--line-range options depends on diff
4530 options; for instance if white-spaces are ignored, respective changes
4530 options; for instance if white-spaces are ignored, respective changes
4531 with only white-spaces in specified line range will not be listed.
4531 with only white-spaces in specified line range will not be listed.
4532
4532
4533 .. container:: verbose
4533 .. container:: verbose
4534
4534
4535 Some examples:
4535 Some examples:
4536
4536
4537 - changesets with full descriptions and file lists::
4537 - changesets with full descriptions and file lists::
4538
4538
4539 hg log -v
4539 hg log -v
4540
4540
4541 - changesets ancestral to the working directory::
4541 - changesets ancestral to the working directory::
4542
4542
4543 hg log -f
4543 hg log -f
4544
4544
4545 - last 10 commits on the current branch::
4545 - last 10 commits on the current branch::
4546
4546
4547 hg log -l 10 -b .
4547 hg log -l 10 -b .
4548
4548
4549 - changesets showing all modifications of a file, including removals::
4549 - changesets showing all modifications of a file, including removals::
4550
4550
4551 hg log --removed file.c
4551 hg log --removed file.c
4552
4552
4553 - all changesets that touch a directory, with diffs, excluding merges::
4553 - all changesets that touch a directory, with diffs, excluding merges::
4554
4554
4555 hg log -Mp lib/
4555 hg log -Mp lib/
4556
4556
4557 - all revision numbers that match a keyword::
4557 - all revision numbers that match a keyword::
4558
4558
4559 hg log -k bug --template "{rev}\\n"
4559 hg log -k bug --template "{rev}\\n"
4560
4560
4561 - the full hash identifier of the working directory parent::
4561 - the full hash identifier of the working directory parent::
4562
4562
4563 hg log -r . --template "{node}\\n"
4563 hg log -r . --template "{node}\\n"
4564
4564
4565 - list available log templates::
4565 - list available log templates::
4566
4566
4567 hg log -T list
4567 hg log -T list
4568
4568
4569 - check if a given changeset is included in a tagged release::
4569 - check if a given changeset is included in a tagged release::
4570
4570
4571 hg log -r "a21ccf and ancestor(1.9)"
4571 hg log -r "a21ccf and ancestor(1.9)"
4572
4572
4573 - find all changesets by some user in a date range::
4573 - find all changesets by some user in a date range::
4574
4574
4575 hg log -k alice -d "may 2008 to jul 2008"
4575 hg log -k alice -d "may 2008 to jul 2008"
4576
4576
4577 - summary of all changesets after the last tag::
4577 - summary of all changesets after the last tag::
4578
4578
4579 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4579 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4580
4580
4581 - changesets touching lines 13 to 23 for file.c::
4581 - changesets touching lines 13 to 23 for file.c::
4582
4582
4583 hg log -L file.c,13:23
4583 hg log -L file.c,13:23
4584
4584
4585 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4585 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4586 main.c with patch::
4586 main.c with patch::
4587
4587
4588 hg log -L file.c,13:23 -L main.c,2:6 -p
4588 hg log -L file.c,13:23 -L main.c,2:6 -p
4589
4589
4590 See :hg:`help dates` for a list of formats valid for -d/--date.
4590 See :hg:`help dates` for a list of formats valid for -d/--date.
4591
4591
4592 See :hg:`help revisions` for more about specifying and ordering
4592 See :hg:`help revisions` for more about specifying and ordering
4593 revisions.
4593 revisions.
4594
4594
4595 See :hg:`help templates` for more about pre-packaged styles and
4595 See :hg:`help templates` for more about pre-packaged styles and
4596 specifying custom templates. The default template used by the log
4596 specifying custom templates. The default template used by the log
4597 command can be customized via the ``command-templates.log`` configuration
4597 command can be customized via the ``command-templates.log`` configuration
4598 setting.
4598 setting.
4599
4599
4600 Returns 0 on success.
4600 Returns 0 on success.
4601
4601
4602 """
4602 """
4603 opts = pycompat.byteskwargs(opts)
4603 opts = pycompat.byteskwargs(opts)
4604 linerange = opts.get(b'line_range')
4604 linerange = opts.get(b'line_range')
4605
4605
4606 if linerange and not opts.get(b'follow'):
4606 if linerange and not opts.get(b'follow'):
4607 raise error.InputError(_(b'--line-range requires --follow'))
4607 raise error.InputError(_(b'--line-range requires --follow'))
4608
4608
4609 if linerange and pats:
4609 if linerange and pats:
4610 # TODO: take pats as patterns with no line-range filter
4610 # TODO: take pats as patterns with no line-range filter
4611 raise error.InputError(
4611 raise error.InputError(
4612 _(b'FILE arguments are not compatible with --line-range option')
4612 _(b'FILE arguments are not compatible with --line-range option')
4613 )
4613 )
4614
4614
4615 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4615 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4616 revs, differ = logcmdutil.getrevs(
4616 revs, differ = logcmdutil.getrevs(
4617 repo, logcmdutil.parseopts(ui, pats, opts)
4617 repo, logcmdutil.parseopts(ui, pats, opts)
4618 )
4618 )
4619 if linerange:
4619 if linerange:
4620 # TODO: should follow file history from logcmdutil._initialrevs(),
4620 # TODO: should follow file history from logcmdutil._initialrevs(),
4621 # then filter the result by logcmdutil._makerevset() and --limit
4621 # then filter the result by logcmdutil._makerevset() and --limit
4622 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4622 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4623
4623
4624 getcopies = None
4624 getcopies = None
4625 if opts.get(b'copies'):
4625 if opts.get(b'copies'):
4626 endrev = None
4626 endrev = None
4627 if revs:
4627 if revs:
4628 endrev = revs.max() + 1
4628 endrev = revs.max() + 1
4629 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4629 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4630
4630
4631 ui.pager(b'log')
4631 ui.pager(b'log')
4632 displayer = logcmdutil.changesetdisplayer(
4632 displayer = logcmdutil.changesetdisplayer(
4633 ui, repo, opts, differ, buffered=True
4633 ui, repo, opts, differ, buffered=True
4634 )
4634 )
4635 if opts.get(b'graph'):
4635 if opts.get(b'graph'):
4636 displayfn = logcmdutil.displaygraphrevs
4636 displayfn = logcmdutil.displaygraphrevs
4637 else:
4637 else:
4638 displayfn = logcmdutil.displayrevs
4638 displayfn = logcmdutil.displayrevs
4639 displayfn(ui, repo, revs, displayer, getcopies)
4639 displayfn(ui, repo, revs, displayer, getcopies)
4640
4640
4641
4641
4642 @command(
4642 @command(
4643 b'manifest',
4643 b'manifest',
4644 [
4644 [
4645 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4645 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4646 (b'', b'all', False, _(b"list files from all revisions")),
4646 (b'', b'all', False, _(b"list files from all revisions")),
4647 ]
4647 ]
4648 + formatteropts,
4648 + formatteropts,
4649 _(b'[-r REV]'),
4649 _(b'[-r REV]'),
4650 helpcategory=command.CATEGORY_MAINTENANCE,
4650 helpcategory=command.CATEGORY_MAINTENANCE,
4651 intents={INTENT_READONLY},
4651 intents={INTENT_READONLY},
4652 )
4652 )
4653 def manifest(ui, repo, node=None, rev=None, **opts):
4653 def manifest(ui, repo, node=None, rev=None, **opts):
4654 """output the current or given revision of the project manifest
4654 """output the current or given revision of the project manifest
4655
4655
4656 Print a list of version controlled files for the given revision.
4656 Print a list of version controlled files for the given revision.
4657 If no revision is given, the first parent of the working directory
4657 If no revision is given, the first parent of the working directory
4658 is used, or the null revision if no revision is checked out.
4658 is used, or the null revision if no revision is checked out.
4659
4659
4660 With -v, print file permissions, symlink and executable bits.
4660 With -v, print file permissions, symlink and executable bits.
4661 With --debug, print file revision hashes.
4661 With --debug, print file revision hashes.
4662
4662
4663 If option --all is specified, the list of all files from all revisions
4663 If option --all is specified, the list of all files from all revisions
4664 is printed. This includes deleted and renamed files.
4664 is printed. This includes deleted and renamed files.
4665
4665
4666 Returns 0 on success.
4666 Returns 0 on success.
4667 """
4667 """
4668 opts = pycompat.byteskwargs(opts)
4668 opts = pycompat.byteskwargs(opts)
4669 fm = ui.formatter(b'manifest', opts)
4669 fm = ui.formatter(b'manifest', opts)
4670
4670
4671 if opts.get(b'all'):
4671 if opts.get(b'all'):
4672 if rev or node:
4672 if rev or node:
4673 raise error.InputError(_(b"can't specify a revision with --all"))
4673 raise error.InputError(_(b"can't specify a revision with --all"))
4674
4674
4675 res = set()
4675 res = set()
4676 for rev in repo:
4676 for rev in repo:
4677 ctx = repo[rev]
4677 ctx = repo[rev]
4678 res |= set(ctx.files())
4678 res |= set(ctx.files())
4679
4679
4680 ui.pager(b'manifest')
4680 ui.pager(b'manifest')
4681 for f in sorted(res):
4681 for f in sorted(res):
4682 fm.startitem()
4682 fm.startitem()
4683 fm.write(b"path", b'%s\n', f)
4683 fm.write(b"path", b'%s\n', f)
4684 fm.end()
4684 fm.end()
4685 return
4685 return
4686
4686
4687 if rev and node:
4687 if rev and node:
4688 raise error.InputError(_(b"please specify just one revision"))
4688 raise error.InputError(_(b"please specify just one revision"))
4689
4689
4690 if not node:
4690 if not node:
4691 node = rev
4691 node = rev
4692
4692
4693 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4693 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4694 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4694 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4695 if node:
4695 if node:
4696 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4696 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4697 ctx = scmutil.revsingle(repo, node)
4697 ctx = scmutil.revsingle(repo, node)
4698 mf = ctx.manifest()
4698 mf = ctx.manifest()
4699 ui.pager(b'manifest')
4699 ui.pager(b'manifest')
4700 for f in ctx:
4700 for f in ctx:
4701 fm.startitem()
4701 fm.startitem()
4702 fm.context(ctx=ctx)
4702 fm.context(ctx=ctx)
4703 fl = ctx[f].flags()
4703 fl = ctx[f].flags()
4704 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4704 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4705 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4705 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4706 fm.write(b'path', b'%s\n', f)
4706 fm.write(b'path', b'%s\n', f)
4707 fm.end()
4707 fm.end()
4708
4708
4709
4709
4710 @command(
4710 @command(
4711 b'merge',
4711 b'merge',
4712 [
4712 [
4713 (
4713 (
4714 b'f',
4714 b'f',
4715 b'force',
4715 b'force',
4716 None,
4716 None,
4717 _(b'force a merge including outstanding changes (DEPRECATED)'),
4717 _(b'force a merge including outstanding changes (DEPRECATED)'),
4718 ),
4718 ),
4719 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4719 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4720 (
4720 (
4721 b'P',
4721 b'P',
4722 b'preview',
4722 b'preview',
4723 None,
4723 None,
4724 _(b'review revisions to merge (no merge is performed)'),
4724 _(b'review revisions to merge (no merge is performed)'),
4725 ),
4725 ),
4726 (b'', b'abort', None, _(b'abort the ongoing merge')),
4726 (b'', b'abort', None, _(b'abort the ongoing merge')),
4727 ]
4727 ]
4728 + mergetoolopts,
4728 + mergetoolopts,
4729 _(b'[-P] [[-r] REV]'),
4729 _(b'[-P] [[-r] REV]'),
4730 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4730 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4731 helpbasic=True,
4731 helpbasic=True,
4732 )
4732 )
4733 def merge(ui, repo, node=None, **opts):
4733 def merge(ui, repo, node=None, **opts):
4734 """merge another revision into working directory
4734 """merge another revision into working directory
4735
4735
4736 The current working directory is updated with all changes made in
4736 The current working directory is updated with all changes made in
4737 the requested revision since the last common predecessor revision.
4737 the requested revision since the last common predecessor revision.
4738
4738
4739 Files that changed between either parent are marked as changed for
4739 Files that changed between either parent are marked as changed for
4740 the next commit and a commit must be performed before any further
4740 the next commit and a commit must be performed before any further
4741 updates to the repository are allowed. The next commit will have
4741 updates to the repository are allowed. The next commit will have
4742 two parents.
4742 two parents.
4743
4743
4744 ``--tool`` can be used to specify the merge tool used for file
4744 ``--tool`` can be used to specify the merge tool used for file
4745 merges. It overrides the HGMERGE environment variable and your
4745 merges. It overrides the HGMERGE environment variable and your
4746 configuration files. See :hg:`help merge-tools` for options.
4746 configuration files. See :hg:`help merge-tools` for options.
4747
4747
4748 If no revision is specified, the working directory's parent is a
4748 If no revision is specified, the working directory's parent is a
4749 head revision, and the current branch contains exactly one other
4749 head revision, and the current branch contains exactly one other
4750 head, the other head is merged with by default. Otherwise, an
4750 head, the other head is merged with by default. Otherwise, an
4751 explicit revision with which to merge must be provided.
4751 explicit revision with which to merge must be provided.
4752
4752
4753 See :hg:`help resolve` for information on handling file conflicts.
4753 See :hg:`help resolve` for information on handling file conflicts.
4754
4754
4755 To undo an uncommitted merge, use :hg:`merge --abort` which
4755 To undo an uncommitted merge, use :hg:`merge --abort` which
4756 will check out a clean copy of the original merge parent, losing
4756 will check out a clean copy of the original merge parent, losing
4757 all changes.
4757 all changes.
4758
4758
4759 Returns 0 on success, 1 if there are unresolved files.
4759 Returns 0 on success, 1 if there are unresolved files.
4760 """
4760 """
4761
4761
4762 opts = pycompat.byteskwargs(opts)
4762 opts = pycompat.byteskwargs(opts)
4763 abort = opts.get(b'abort')
4763 abort = opts.get(b'abort')
4764 if abort and repo.dirstate.p2() == nullid:
4764 if abort and repo.dirstate.p2() == nullid:
4765 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4765 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4766 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4766 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4767 if abort:
4767 if abort:
4768 state = cmdutil.getunfinishedstate(repo)
4768 state = cmdutil.getunfinishedstate(repo)
4769 if state and state._opname != b'merge':
4769 if state and state._opname != b'merge':
4770 raise error.StateError(
4770 raise error.StateError(
4771 _(b'cannot abort merge with %s in progress') % (state._opname),
4771 _(b'cannot abort merge with %s in progress') % (state._opname),
4772 hint=state.hint(),
4772 hint=state.hint(),
4773 )
4773 )
4774 if node:
4774 if node:
4775 raise error.InputError(_(b"cannot specify a node with --abort"))
4775 raise error.InputError(_(b"cannot specify a node with --abort"))
4776 return hg.abortmerge(repo.ui, repo)
4776 return hg.abortmerge(repo.ui, repo)
4777
4777
4778 if opts.get(b'rev') and node:
4778 if opts.get(b'rev') and node:
4779 raise error.InputError(_(b"please specify just one revision"))
4779 raise error.InputError(_(b"please specify just one revision"))
4780 if not node:
4780 if not node:
4781 node = opts.get(b'rev')
4781 node = opts.get(b'rev')
4782
4782
4783 if node:
4783 if node:
4784 ctx = scmutil.revsingle(repo, node)
4784 ctx = scmutil.revsingle(repo, node)
4785 else:
4785 else:
4786 if ui.configbool(b'commands', b'merge.require-rev'):
4786 if ui.configbool(b'commands', b'merge.require-rev'):
4787 raise error.InputError(
4787 raise error.InputError(
4788 _(
4788 _(
4789 b'configuration requires specifying revision to merge '
4789 b'configuration requires specifying revision to merge '
4790 b'with'
4790 b'with'
4791 )
4791 )
4792 )
4792 )
4793 ctx = repo[destutil.destmerge(repo)]
4793 ctx = repo[destutil.destmerge(repo)]
4794
4794
4795 if ctx.node() is None:
4795 if ctx.node() is None:
4796 raise error.InputError(
4796 raise error.InputError(
4797 _(b'merging with the working copy has no effect')
4797 _(b'merging with the working copy has no effect')
4798 )
4798 )
4799
4799
4800 if opts.get(b'preview'):
4800 if opts.get(b'preview'):
4801 # find nodes that are ancestors of p2 but not of p1
4801 # find nodes that are ancestors of p2 but not of p1
4802 p1 = repo[b'.'].node()
4802 p1 = repo[b'.'].node()
4803 p2 = ctx.node()
4803 p2 = ctx.node()
4804 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4804 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4805
4805
4806 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4806 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4807 for node in nodes:
4807 for node in nodes:
4808 displayer.show(repo[node])
4808 displayer.show(repo[node])
4809 displayer.close()
4809 displayer.close()
4810 return 0
4810 return 0
4811
4811
4812 # ui.forcemerge is an internal variable, do not document
4812 # ui.forcemerge is an internal variable, do not document
4813 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4813 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4814 with ui.configoverride(overrides, b'merge'):
4814 with ui.configoverride(overrides, b'merge'):
4815 force = opts.get(b'force')
4815 force = opts.get(b'force')
4816 labels = [b'working copy', b'merge rev']
4816 labels = [b'working copy', b'merge rev']
4817 return hg.merge(ctx, force=force, labels=labels)
4817 return hg.merge(ctx, force=force, labels=labels)
4818
4818
4819
4819
4820 statemod.addunfinished(
4820 statemod.addunfinished(
4821 b'merge',
4821 b'merge',
4822 fname=None,
4822 fname=None,
4823 clearable=True,
4823 clearable=True,
4824 allowcommit=True,
4824 allowcommit=True,
4825 cmdmsg=_(b'outstanding uncommitted merge'),
4825 cmdmsg=_(b'outstanding uncommitted merge'),
4826 abortfunc=hg.abortmerge,
4826 abortfunc=hg.abortmerge,
4827 statushint=_(
4827 statushint=_(
4828 b'To continue: hg commit\nTo abort: hg merge --abort'
4828 b'To continue: hg commit\nTo abort: hg merge --abort'
4829 ),
4829 ),
4830 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4830 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4831 )
4831 )
4832
4832
4833
4833
4834 @command(
4834 @command(
4835 b'outgoing|out',
4835 b'outgoing|out',
4836 [
4836 [
4837 (
4837 (
4838 b'f',
4838 b'f',
4839 b'force',
4839 b'force',
4840 None,
4840 None,
4841 _(b'run even when the destination is unrelated'),
4841 _(b'run even when the destination is unrelated'),
4842 ),
4842 ),
4843 (
4843 (
4844 b'r',
4844 b'r',
4845 b'rev',
4845 b'rev',
4846 [],
4846 [],
4847 _(b'a changeset intended to be included in the destination'),
4847 _(b'a changeset intended to be included in the destination'),
4848 _(b'REV'),
4848 _(b'REV'),
4849 ),
4849 ),
4850 (b'n', b'newest-first', None, _(b'show newest record first')),
4850 (b'n', b'newest-first', None, _(b'show newest record first')),
4851 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4851 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4852 (
4852 (
4853 b'b',
4853 b'b',
4854 b'branch',
4854 b'branch',
4855 [],
4855 [],
4856 _(b'a specific branch you would like to push'),
4856 _(b'a specific branch you would like to push'),
4857 _(b'BRANCH'),
4857 _(b'BRANCH'),
4858 ),
4858 ),
4859 ]
4859 ]
4860 + logopts
4860 + logopts
4861 + remoteopts
4861 + remoteopts
4862 + subrepoopts,
4862 + subrepoopts,
4863 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4863 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4864 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4864 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4865 )
4865 )
4866 def outgoing(ui, repo, dest=None, **opts):
4866 def outgoing(ui, repo, dest=None, **opts):
4867 """show changesets not found in the destination
4867 """show changesets not found in the destination
4868
4868
4869 Show changesets not found in the specified destination repository
4869 Show changesets not found in the specified destination repository
4870 or the default push location. These are the changesets that would
4870 or the default push location. These are the changesets that would
4871 be pushed if a push was requested.
4871 be pushed if a push was requested.
4872
4872
4873 See pull for details of valid destination formats.
4873 See pull for details of valid destination formats.
4874
4874
4875 .. container:: verbose
4875 .. container:: verbose
4876
4876
4877 With -B/--bookmarks, the result of bookmark comparison between
4877 With -B/--bookmarks, the result of bookmark comparison between
4878 local and remote repositories is displayed. With -v/--verbose,
4878 local and remote repositories is displayed. With -v/--verbose,
4879 status is also displayed for each bookmark like below::
4879 status is also displayed for each bookmark like below::
4880
4880
4881 BM1 01234567890a added
4881 BM1 01234567890a added
4882 BM2 deleted
4882 BM2 deleted
4883 BM3 234567890abc advanced
4883 BM3 234567890abc advanced
4884 BM4 34567890abcd diverged
4884 BM4 34567890abcd diverged
4885 BM5 4567890abcde changed
4885 BM5 4567890abcde changed
4886
4886
4887 The action taken when pushing depends on the
4887 The action taken when pushing depends on the
4888 status of each bookmark:
4888 status of each bookmark:
4889
4889
4890 :``added``: push with ``-B`` will create it
4890 :``added``: push with ``-B`` will create it
4891 :``deleted``: push with ``-B`` will delete it
4891 :``deleted``: push with ``-B`` will delete it
4892 :``advanced``: push will update it
4892 :``advanced``: push will update it
4893 :``diverged``: push with ``-B`` will update it
4893 :``diverged``: push with ``-B`` will update it
4894 :``changed``: push with ``-B`` will update it
4894 :``changed``: push with ``-B`` will update it
4895
4895
4896 From the point of view of pushing behavior, bookmarks
4896 From the point of view of pushing behavior, bookmarks
4897 existing only in the remote repository are treated as
4897 existing only in the remote repository are treated as
4898 ``deleted``, even if it is in fact added remotely.
4898 ``deleted``, even if it is in fact added remotely.
4899
4899
4900 Returns 0 if there are outgoing changes, 1 otherwise.
4900 Returns 0 if there are outgoing changes, 1 otherwise.
4901 """
4901 """
4902 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4902 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4903 # style URLs, so don't overwrite dest.
4903 # style URLs, so don't overwrite dest.
4904 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4904 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4905 if not path:
4905 if not path:
4906 raise error.Abort(
4906 raise error.ConfigError(
4907 _(b'default repository not configured!'),
4907 _(b'default repository not configured!'),
4908 hint=_(b"see 'hg help config.paths'"),
4908 hint=_(b"see 'hg help config.paths'"),
4909 )
4909 )
4910
4910
4911 opts = pycompat.byteskwargs(opts)
4911 opts = pycompat.byteskwargs(opts)
4912 if opts.get(b'graph'):
4912 if opts.get(b'graph'):
4913 logcmdutil.checkunsupportedgraphflags([], opts)
4913 logcmdutil.checkunsupportedgraphflags([], opts)
4914 o, other = hg._outgoing(ui, repo, dest, opts)
4914 o, other = hg._outgoing(ui, repo, dest, opts)
4915 if not o:
4915 if not o:
4916 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4916 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4917 return
4917 return
4918
4918
4919 revdag = logcmdutil.graphrevs(repo, o, opts)
4919 revdag = logcmdutil.graphrevs(repo, o, opts)
4920 ui.pager(b'outgoing')
4920 ui.pager(b'outgoing')
4921 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4921 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4922 logcmdutil.displaygraph(
4922 logcmdutil.displaygraph(
4923 ui, repo, revdag, displayer, graphmod.asciiedges
4923 ui, repo, revdag, displayer, graphmod.asciiedges
4924 )
4924 )
4925 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4925 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4926 return 0
4926 return 0
4927
4927
4928 if opts.get(b'bookmarks'):
4928 if opts.get(b'bookmarks'):
4929 dest = path.pushloc or path.loc
4929 dest = path.pushloc or path.loc
4930 other = hg.peer(repo, opts, dest)
4930 other = hg.peer(repo, opts, dest)
4931 if b'bookmarks' not in other.listkeys(b'namespaces'):
4931 if b'bookmarks' not in other.listkeys(b'namespaces'):
4932 ui.warn(_(b"remote doesn't support bookmarks\n"))
4932 ui.warn(_(b"remote doesn't support bookmarks\n"))
4933 return 0
4933 return 0
4934 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4934 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
4935 ui.pager(b'outgoing')
4935 ui.pager(b'outgoing')
4936 return bookmarks.outgoing(ui, repo, other)
4936 return bookmarks.outgoing(ui, repo, other)
4937
4937
4938 repo._subtoppath = path.pushloc or path.loc
4938 repo._subtoppath = path.pushloc or path.loc
4939 try:
4939 try:
4940 return hg.outgoing(ui, repo, dest, opts)
4940 return hg.outgoing(ui, repo, dest, opts)
4941 finally:
4941 finally:
4942 del repo._subtoppath
4942 del repo._subtoppath
4943
4943
4944
4944
4945 @command(
4945 @command(
4946 b'parents',
4946 b'parents',
4947 [
4947 [
4948 (
4948 (
4949 b'r',
4949 b'r',
4950 b'rev',
4950 b'rev',
4951 b'',
4951 b'',
4952 _(b'show parents of the specified revision'),
4952 _(b'show parents of the specified revision'),
4953 _(b'REV'),
4953 _(b'REV'),
4954 ),
4954 ),
4955 ]
4955 ]
4956 + templateopts,
4956 + templateopts,
4957 _(b'[-r REV] [FILE]'),
4957 _(b'[-r REV] [FILE]'),
4958 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4958 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4959 inferrepo=True,
4959 inferrepo=True,
4960 )
4960 )
4961 def parents(ui, repo, file_=None, **opts):
4961 def parents(ui, repo, file_=None, **opts):
4962 """show the parents of the working directory or revision (DEPRECATED)
4962 """show the parents of the working directory or revision (DEPRECATED)
4963
4963
4964 Print the working directory's parent revisions. If a revision is
4964 Print the working directory's parent revisions. If a revision is
4965 given via -r/--rev, the parent of that revision will be printed.
4965 given via -r/--rev, the parent of that revision will be printed.
4966 If a file argument is given, the revision in which the file was
4966 If a file argument is given, the revision in which the file was
4967 last changed (before the working directory revision or the
4967 last changed (before the working directory revision or the
4968 argument to --rev if given) is printed.
4968 argument to --rev if given) is printed.
4969
4969
4970 This command is equivalent to::
4970 This command is equivalent to::
4971
4971
4972 hg log -r "p1()+p2()" or
4972 hg log -r "p1()+p2()" or
4973 hg log -r "p1(REV)+p2(REV)" or
4973 hg log -r "p1(REV)+p2(REV)" or
4974 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4974 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4975 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4975 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4976
4976
4977 See :hg:`summary` and :hg:`help revsets` for related information.
4977 See :hg:`summary` and :hg:`help revsets` for related information.
4978
4978
4979 Returns 0 on success.
4979 Returns 0 on success.
4980 """
4980 """
4981
4981
4982 opts = pycompat.byteskwargs(opts)
4982 opts = pycompat.byteskwargs(opts)
4983 rev = opts.get(b'rev')
4983 rev = opts.get(b'rev')
4984 if rev:
4984 if rev:
4985 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
4985 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
4986 ctx = scmutil.revsingle(repo, rev, None)
4986 ctx = scmutil.revsingle(repo, rev, None)
4987
4987
4988 if file_:
4988 if file_:
4989 m = scmutil.match(ctx, (file_,), opts)
4989 m = scmutil.match(ctx, (file_,), opts)
4990 if m.anypats() or len(m.files()) != 1:
4990 if m.anypats() or len(m.files()) != 1:
4991 raise error.InputError(_(b'can only specify an explicit filename'))
4991 raise error.InputError(_(b'can only specify an explicit filename'))
4992 file_ = m.files()[0]
4992 file_ = m.files()[0]
4993 filenodes = []
4993 filenodes = []
4994 for cp in ctx.parents():
4994 for cp in ctx.parents():
4995 if not cp:
4995 if not cp:
4996 continue
4996 continue
4997 try:
4997 try:
4998 filenodes.append(cp.filenode(file_))
4998 filenodes.append(cp.filenode(file_))
4999 except error.LookupError:
4999 except error.LookupError:
5000 pass
5000 pass
5001 if not filenodes:
5001 if not filenodes:
5002 raise error.InputError(_(b"'%s' not found in manifest!") % file_)
5002 raise error.InputError(_(b"'%s' not found in manifest!") % file_)
5003 p = []
5003 p = []
5004 for fn in filenodes:
5004 for fn in filenodes:
5005 fctx = repo.filectx(file_, fileid=fn)
5005 fctx = repo.filectx(file_, fileid=fn)
5006 p.append(fctx.node())
5006 p.append(fctx.node())
5007 else:
5007 else:
5008 p = [cp.node() for cp in ctx.parents()]
5008 p = [cp.node() for cp in ctx.parents()]
5009
5009
5010 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5010 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5011 for n in p:
5011 for n in p:
5012 if n != nullid:
5012 if n != nullid:
5013 displayer.show(repo[n])
5013 displayer.show(repo[n])
5014 displayer.close()
5014 displayer.close()
5015
5015
5016
5016
5017 @command(
5017 @command(
5018 b'paths',
5018 b'paths',
5019 formatteropts,
5019 formatteropts,
5020 _(b'[NAME]'),
5020 _(b'[NAME]'),
5021 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5021 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5022 optionalrepo=True,
5022 optionalrepo=True,
5023 intents={INTENT_READONLY},
5023 intents={INTENT_READONLY},
5024 )
5024 )
5025 def paths(ui, repo, search=None, **opts):
5025 def paths(ui, repo, search=None, **opts):
5026 """show aliases for remote repositories
5026 """show aliases for remote repositories
5027
5027
5028 Show definition of symbolic path name NAME. If no name is given,
5028 Show definition of symbolic path name NAME. If no name is given,
5029 show definition of all available names.
5029 show definition of all available names.
5030
5030
5031 Option -q/--quiet suppresses all output when searching for NAME
5031 Option -q/--quiet suppresses all output when searching for NAME
5032 and shows only the path names when listing all definitions.
5032 and shows only the path names when listing all definitions.
5033
5033
5034 Path names are defined in the [paths] section of your
5034 Path names are defined in the [paths] section of your
5035 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5035 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5036 repository, ``.hg/hgrc`` is used, too.
5036 repository, ``.hg/hgrc`` is used, too.
5037
5037
5038 The path names ``default`` and ``default-push`` have a special
5038 The path names ``default`` and ``default-push`` have a special
5039 meaning. When performing a push or pull operation, they are used
5039 meaning. When performing a push or pull operation, they are used
5040 as fallbacks if no location is specified on the command-line.
5040 as fallbacks if no location is specified on the command-line.
5041 When ``default-push`` is set, it will be used for push and
5041 When ``default-push`` is set, it will be used for push and
5042 ``default`` will be used for pull; otherwise ``default`` is used
5042 ``default`` will be used for pull; otherwise ``default`` is used
5043 as the fallback for both. When cloning a repository, the clone
5043 as the fallback for both. When cloning a repository, the clone
5044 source is written as ``default`` in ``.hg/hgrc``.
5044 source is written as ``default`` in ``.hg/hgrc``.
5045
5045
5046 .. note::
5046 .. note::
5047
5047
5048 ``default`` and ``default-push`` apply to all inbound (e.g.
5048 ``default`` and ``default-push`` apply to all inbound (e.g.
5049 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5049 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5050 and :hg:`bundle`) operations.
5050 and :hg:`bundle`) operations.
5051
5051
5052 See :hg:`help urls` for more information.
5052 See :hg:`help urls` for more information.
5053
5053
5054 .. container:: verbose
5054 .. container:: verbose
5055
5055
5056 Template:
5056 Template:
5057
5057
5058 The following keywords are supported. See also :hg:`help templates`.
5058 The following keywords are supported. See also :hg:`help templates`.
5059
5059
5060 :name: String. Symbolic name of the path alias.
5060 :name: String. Symbolic name of the path alias.
5061 :pushurl: String. URL for push operations.
5061 :pushurl: String. URL for push operations.
5062 :url: String. URL or directory path for the other operations.
5062 :url: String. URL or directory path for the other operations.
5063
5063
5064 Returns 0 on success.
5064 Returns 0 on success.
5065 """
5065 """
5066
5066
5067 opts = pycompat.byteskwargs(opts)
5067 opts = pycompat.byteskwargs(opts)
5068 ui.pager(b'paths')
5068 ui.pager(b'paths')
5069 if search:
5069 if search:
5070 pathitems = [
5070 pathitems = [
5071 (name, path)
5071 (name, path)
5072 for name, path in pycompat.iteritems(ui.paths)
5072 for name, path in pycompat.iteritems(ui.paths)
5073 if name == search
5073 if name == search
5074 ]
5074 ]
5075 else:
5075 else:
5076 pathitems = sorted(pycompat.iteritems(ui.paths))
5076 pathitems = sorted(pycompat.iteritems(ui.paths))
5077
5077
5078 fm = ui.formatter(b'paths', opts)
5078 fm = ui.formatter(b'paths', opts)
5079 if fm.isplain():
5079 if fm.isplain():
5080 hidepassword = util.hidepassword
5080 hidepassword = util.hidepassword
5081 else:
5081 else:
5082 hidepassword = bytes
5082 hidepassword = bytes
5083 if ui.quiet:
5083 if ui.quiet:
5084 namefmt = b'%s\n'
5084 namefmt = b'%s\n'
5085 else:
5085 else:
5086 namefmt = b'%s = '
5086 namefmt = b'%s = '
5087 showsubopts = not search and not ui.quiet
5087 showsubopts = not search and not ui.quiet
5088
5088
5089 for name, path in pathitems:
5089 for name, path in pathitems:
5090 fm.startitem()
5090 fm.startitem()
5091 fm.condwrite(not search, b'name', namefmt, name)
5091 fm.condwrite(not search, b'name', namefmt, name)
5092 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5092 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5093 for subopt, value in sorted(path.suboptions.items()):
5093 for subopt, value in sorted(path.suboptions.items()):
5094 assert subopt not in (b'name', b'url')
5094 assert subopt not in (b'name', b'url')
5095 if showsubopts:
5095 if showsubopts:
5096 fm.plain(b'%s:%s = ' % (name, subopt))
5096 fm.plain(b'%s:%s = ' % (name, subopt))
5097 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5097 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5098
5098
5099 fm.end()
5099 fm.end()
5100
5100
5101 if search and not pathitems:
5101 if search and not pathitems:
5102 if not ui.quiet:
5102 if not ui.quiet:
5103 ui.warn(_(b"not found!\n"))
5103 ui.warn(_(b"not found!\n"))
5104 return 1
5104 return 1
5105 else:
5105 else:
5106 return 0
5106 return 0
5107
5107
5108
5108
5109 @command(
5109 @command(
5110 b'phase',
5110 b'phase',
5111 [
5111 [
5112 (b'p', b'public', False, _(b'set changeset phase to public')),
5112 (b'p', b'public', False, _(b'set changeset phase to public')),
5113 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5113 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5114 (b's', b'secret', False, _(b'set changeset phase to secret')),
5114 (b's', b'secret', False, _(b'set changeset phase to secret')),
5115 (b'f', b'force', False, _(b'allow to move boundary backward')),
5115 (b'f', b'force', False, _(b'allow to move boundary backward')),
5116 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5116 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5117 ],
5117 ],
5118 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5118 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5119 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5119 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5120 )
5120 )
5121 def phase(ui, repo, *revs, **opts):
5121 def phase(ui, repo, *revs, **opts):
5122 """set or show the current phase name
5122 """set or show the current phase name
5123
5123
5124 With no argument, show the phase name of the current revision(s).
5124 With no argument, show the phase name of the current revision(s).
5125
5125
5126 With one of -p/--public, -d/--draft or -s/--secret, change the
5126 With one of -p/--public, -d/--draft or -s/--secret, change the
5127 phase value of the specified revisions.
5127 phase value of the specified revisions.
5128
5128
5129 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5129 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5130 lower phase to a higher phase. Phases are ordered as follows::
5130 lower phase to a higher phase. Phases are ordered as follows::
5131
5131
5132 public < draft < secret
5132 public < draft < secret
5133
5133
5134 Returns 0 on success, 1 if some phases could not be changed.
5134 Returns 0 on success, 1 if some phases could not be changed.
5135
5135
5136 (For more information about the phases concept, see :hg:`help phases`.)
5136 (For more information about the phases concept, see :hg:`help phases`.)
5137 """
5137 """
5138 opts = pycompat.byteskwargs(opts)
5138 opts = pycompat.byteskwargs(opts)
5139 # search for a unique phase argument
5139 # search for a unique phase argument
5140 targetphase = None
5140 targetphase = None
5141 for idx, name in enumerate(phases.cmdphasenames):
5141 for idx, name in enumerate(phases.cmdphasenames):
5142 if opts[name]:
5142 if opts[name]:
5143 if targetphase is not None:
5143 if targetphase is not None:
5144 raise error.InputError(_(b'only one phase can be specified'))
5144 raise error.InputError(_(b'only one phase can be specified'))
5145 targetphase = idx
5145 targetphase = idx
5146
5146
5147 # look for specified revision
5147 # look for specified revision
5148 revs = list(revs)
5148 revs = list(revs)
5149 revs.extend(opts[b'rev'])
5149 revs.extend(opts[b'rev'])
5150 if not revs:
5150 if not revs:
5151 # display both parents as the second parent phase can influence
5151 # display both parents as the second parent phase can influence
5152 # the phase of a merge commit
5152 # the phase of a merge commit
5153 revs = [c.rev() for c in repo[None].parents()]
5153 revs = [c.rev() for c in repo[None].parents()]
5154
5154
5155 revs = scmutil.revrange(repo, revs)
5155 revs = scmutil.revrange(repo, revs)
5156
5156
5157 ret = 0
5157 ret = 0
5158 if targetphase is None:
5158 if targetphase is None:
5159 # display
5159 # display
5160 for r in revs:
5160 for r in revs:
5161 ctx = repo[r]
5161 ctx = repo[r]
5162 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5162 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5163 else:
5163 else:
5164 with repo.lock(), repo.transaction(b"phase") as tr:
5164 with repo.lock(), repo.transaction(b"phase") as tr:
5165 # set phase
5165 # set phase
5166 if not revs:
5166 if not revs:
5167 raise error.InputError(_(b'empty revision set'))
5167 raise error.InputError(_(b'empty revision set'))
5168 nodes = [repo[r].node() for r in revs]
5168 nodes = [repo[r].node() for r in revs]
5169 # moving revision from public to draft may hide them
5169 # moving revision from public to draft may hide them
5170 # We have to check result on an unfiltered repository
5170 # We have to check result on an unfiltered repository
5171 unfi = repo.unfiltered()
5171 unfi = repo.unfiltered()
5172 getphase = unfi._phasecache.phase
5172 getphase = unfi._phasecache.phase
5173 olddata = [getphase(unfi, r) for r in unfi]
5173 olddata = [getphase(unfi, r) for r in unfi]
5174 phases.advanceboundary(repo, tr, targetphase, nodes)
5174 phases.advanceboundary(repo, tr, targetphase, nodes)
5175 if opts[b'force']:
5175 if opts[b'force']:
5176 phases.retractboundary(repo, tr, targetphase, nodes)
5176 phases.retractboundary(repo, tr, targetphase, nodes)
5177 getphase = unfi._phasecache.phase
5177 getphase = unfi._phasecache.phase
5178 newdata = [getphase(unfi, r) for r in unfi]
5178 newdata = [getphase(unfi, r) for r in unfi]
5179 changes = sum(newdata[r] != olddata[r] for r in unfi)
5179 changes = sum(newdata[r] != olddata[r] for r in unfi)
5180 cl = unfi.changelog
5180 cl = unfi.changelog
5181 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5181 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5182 if rejected:
5182 if rejected:
5183 ui.warn(
5183 ui.warn(
5184 _(
5184 _(
5185 b'cannot move %i changesets to a higher '
5185 b'cannot move %i changesets to a higher '
5186 b'phase, use --force\n'
5186 b'phase, use --force\n'
5187 )
5187 )
5188 % len(rejected)
5188 % len(rejected)
5189 )
5189 )
5190 ret = 1
5190 ret = 1
5191 if changes:
5191 if changes:
5192 msg = _(b'phase changed for %i changesets\n') % changes
5192 msg = _(b'phase changed for %i changesets\n') % changes
5193 if ret:
5193 if ret:
5194 ui.status(msg)
5194 ui.status(msg)
5195 else:
5195 else:
5196 ui.note(msg)
5196 ui.note(msg)
5197 else:
5197 else:
5198 ui.warn(_(b'no phases changed\n'))
5198 ui.warn(_(b'no phases changed\n'))
5199 return ret
5199 return ret
5200
5200
5201
5201
5202 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5202 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5203 """Run after a changegroup has been added via pull/unbundle
5203 """Run after a changegroup has been added via pull/unbundle
5204
5204
5205 This takes arguments below:
5205 This takes arguments below:
5206
5206
5207 :modheads: change of heads by pull/unbundle
5207 :modheads: change of heads by pull/unbundle
5208 :optupdate: updating working directory is needed or not
5208 :optupdate: updating working directory is needed or not
5209 :checkout: update destination revision (or None to default destination)
5209 :checkout: update destination revision (or None to default destination)
5210 :brev: a name, which might be a bookmark to be activated after updating
5210 :brev: a name, which might be a bookmark to be activated after updating
5211 """
5211 """
5212 if modheads == 0:
5212 if modheads == 0:
5213 return
5213 return
5214 if optupdate:
5214 if optupdate:
5215 try:
5215 try:
5216 return hg.updatetotally(ui, repo, checkout, brev)
5216 return hg.updatetotally(ui, repo, checkout, brev)
5217 except error.UpdateAbort as inst:
5217 except error.UpdateAbort as inst:
5218 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5218 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5219 hint = inst.hint
5219 hint = inst.hint
5220 raise error.UpdateAbort(msg, hint=hint)
5220 raise error.UpdateAbort(msg, hint=hint)
5221 if modheads is not None and modheads > 1:
5221 if modheads is not None and modheads > 1:
5222 currentbranchheads = len(repo.branchheads())
5222 currentbranchheads = len(repo.branchheads())
5223 if currentbranchheads == modheads:
5223 if currentbranchheads == modheads:
5224 ui.status(
5224 ui.status(
5225 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5225 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5226 )
5226 )
5227 elif currentbranchheads > 1:
5227 elif currentbranchheads > 1:
5228 ui.status(
5228 ui.status(
5229 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5229 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5230 )
5230 )
5231 else:
5231 else:
5232 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5232 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5233 elif not ui.configbool(b'commands', b'update.requiredest'):
5233 elif not ui.configbool(b'commands', b'update.requiredest'):
5234 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5234 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5235
5235
5236
5236
5237 @command(
5237 @command(
5238 b'pull',
5238 b'pull',
5239 [
5239 [
5240 (
5240 (
5241 b'u',
5241 b'u',
5242 b'update',
5242 b'update',
5243 None,
5243 None,
5244 _(b'update to new branch head if new descendants were pulled'),
5244 _(b'update to new branch head if new descendants were pulled'),
5245 ),
5245 ),
5246 (
5246 (
5247 b'f',
5247 b'f',
5248 b'force',
5248 b'force',
5249 None,
5249 None,
5250 _(b'run even when remote repository is unrelated'),
5250 _(b'run even when remote repository is unrelated'),
5251 ),
5251 ),
5252 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5252 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5253 (
5253 (
5254 b'r',
5254 b'r',
5255 b'rev',
5255 b'rev',
5256 [],
5256 [],
5257 _(b'a remote changeset intended to be added'),
5257 _(b'a remote changeset intended to be added'),
5258 _(b'REV'),
5258 _(b'REV'),
5259 ),
5259 ),
5260 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5260 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5261 (
5261 (
5262 b'b',
5262 b'b',
5263 b'branch',
5263 b'branch',
5264 [],
5264 [],
5265 _(b'a specific branch you would like to pull'),
5265 _(b'a specific branch you would like to pull'),
5266 _(b'BRANCH'),
5266 _(b'BRANCH'),
5267 ),
5267 ),
5268 ]
5268 ]
5269 + remoteopts,
5269 + remoteopts,
5270 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5270 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5271 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5271 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5272 helpbasic=True,
5272 helpbasic=True,
5273 )
5273 )
5274 def pull(ui, repo, source=b"default", **opts):
5274 def pull(ui, repo, source=b"default", **opts):
5275 """pull changes from the specified source
5275 """pull changes from the specified source
5276
5276
5277 Pull changes from a remote repository to a local one.
5277 Pull changes from a remote repository to a local one.
5278
5278
5279 This finds all changes from the repository at the specified path
5279 This finds all changes from the repository at the specified path
5280 or URL and adds them to a local repository (the current one unless
5280 or URL and adds them to a local repository (the current one unless
5281 -R is specified). By default, this does not update the copy of the
5281 -R is specified). By default, this does not update the copy of the
5282 project in the working directory.
5282 project in the working directory.
5283
5283
5284 When cloning from servers that support it, Mercurial may fetch
5284 When cloning from servers that support it, Mercurial may fetch
5285 pre-generated data. When this is done, hooks operating on incoming
5285 pre-generated data. When this is done, hooks operating on incoming
5286 changesets and changegroups may fire more than once, once for each
5286 changesets and changegroups may fire more than once, once for each
5287 pre-generated bundle and as well as for any additional remaining
5287 pre-generated bundle and as well as for any additional remaining
5288 data. See :hg:`help -e clonebundles` for more.
5288 data. See :hg:`help -e clonebundles` for more.
5289
5289
5290 Use :hg:`incoming` if you want to see what would have been added
5290 Use :hg:`incoming` if you want to see what would have been added
5291 by a pull at the time you issued this command. If you then decide
5291 by a pull at the time you issued this command. If you then decide
5292 to add those changes to the repository, you should use :hg:`pull
5292 to add those changes to the repository, you should use :hg:`pull
5293 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5293 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5294
5294
5295 If SOURCE is omitted, the 'default' path will be used.
5295 If SOURCE is omitted, the 'default' path will be used.
5296 See :hg:`help urls` for more information.
5296 See :hg:`help urls` for more information.
5297
5297
5298 Specifying bookmark as ``.`` is equivalent to specifying the active
5298 Specifying bookmark as ``.`` is equivalent to specifying the active
5299 bookmark's name.
5299 bookmark's name.
5300
5300
5301 Returns 0 on success, 1 if an update had unresolved files.
5301 Returns 0 on success, 1 if an update had unresolved files.
5302 """
5302 """
5303
5303
5304 opts = pycompat.byteskwargs(opts)
5304 opts = pycompat.byteskwargs(opts)
5305 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5305 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5306 b'update'
5306 b'update'
5307 ):
5307 ):
5308 msg = _(b'update destination required by configuration')
5308 msg = _(b'update destination required by configuration')
5309 hint = _(b'use hg pull followed by hg update DEST')
5309 hint = _(b'use hg pull followed by hg update DEST')
5310 raise error.InputError(msg, hint=hint)
5310 raise error.InputError(msg, hint=hint)
5311
5311
5312 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5312 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5313 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5313 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5314 other = hg.peer(repo, opts, source)
5314 other = hg.peer(repo, opts, source)
5315 try:
5315 try:
5316 revs, checkout = hg.addbranchrevs(
5316 revs, checkout = hg.addbranchrevs(
5317 repo, other, branches, opts.get(b'rev')
5317 repo, other, branches, opts.get(b'rev')
5318 )
5318 )
5319
5319
5320 pullopargs = {}
5320 pullopargs = {}
5321
5321
5322 nodes = None
5322 nodes = None
5323 if opts.get(b'bookmark') or revs:
5323 if opts.get(b'bookmark') or revs:
5324 # The list of bookmark used here is the same used to actually update
5324 # The list of bookmark used here is the same used to actually update
5325 # the bookmark names, to avoid the race from issue 4689 and we do
5325 # the bookmark names, to avoid the race from issue 4689 and we do
5326 # all lookup and bookmark queries in one go so they see the same
5326 # all lookup and bookmark queries in one go so they see the same
5327 # version of the server state (issue 4700).
5327 # version of the server state (issue 4700).
5328 nodes = []
5328 nodes = []
5329 fnodes = []
5329 fnodes = []
5330 revs = revs or []
5330 revs = revs or []
5331 if revs and not other.capable(b'lookup'):
5331 if revs and not other.capable(b'lookup'):
5332 err = _(
5332 err = _(
5333 b"other repository doesn't support revision lookup, "
5333 b"other repository doesn't support revision lookup, "
5334 b"so a rev cannot be specified."
5334 b"so a rev cannot be specified."
5335 )
5335 )
5336 raise error.Abort(err)
5336 raise error.Abort(err)
5337 with other.commandexecutor() as e:
5337 with other.commandexecutor() as e:
5338 fremotebookmarks = e.callcommand(
5338 fremotebookmarks = e.callcommand(
5339 b'listkeys', {b'namespace': b'bookmarks'}
5339 b'listkeys', {b'namespace': b'bookmarks'}
5340 )
5340 )
5341 for r in revs:
5341 for r in revs:
5342 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5342 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5343 remotebookmarks = fremotebookmarks.result()
5343 remotebookmarks = fremotebookmarks.result()
5344 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5344 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5345 pullopargs[b'remotebookmarks'] = remotebookmarks
5345 pullopargs[b'remotebookmarks'] = remotebookmarks
5346 for b in opts.get(b'bookmark', []):
5346 for b in opts.get(b'bookmark', []):
5347 b = repo._bookmarks.expandname(b)
5347 b = repo._bookmarks.expandname(b)
5348 if b not in remotebookmarks:
5348 if b not in remotebookmarks:
5349 raise error.InputError(
5349 raise error.InputError(
5350 _(b'remote bookmark %s not found!') % b
5350 _(b'remote bookmark %s not found!') % b
5351 )
5351 )
5352 nodes.append(remotebookmarks[b])
5352 nodes.append(remotebookmarks[b])
5353 for i, rev in enumerate(revs):
5353 for i, rev in enumerate(revs):
5354 node = fnodes[i].result()
5354 node = fnodes[i].result()
5355 nodes.append(node)
5355 nodes.append(node)
5356 if rev == checkout:
5356 if rev == checkout:
5357 checkout = node
5357 checkout = node
5358
5358
5359 wlock = util.nullcontextmanager()
5359 wlock = util.nullcontextmanager()
5360 if opts.get(b'update'):
5360 if opts.get(b'update'):
5361 wlock = repo.wlock()
5361 wlock = repo.wlock()
5362 with wlock:
5362 with wlock:
5363 pullopargs.update(opts.get(b'opargs', {}))
5363 pullopargs.update(opts.get(b'opargs', {}))
5364 modheads = exchange.pull(
5364 modheads = exchange.pull(
5365 repo,
5365 repo,
5366 other,
5366 other,
5367 heads=nodes,
5367 heads=nodes,
5368 force=opts.get(b'force'),
5368 force=opts.get(b'force'),
5369 bookmarks=opts.get(b'bookmark', ()),
5369 bookmarks=opts.get(b'bookmark', ()),
5370 opargs=pullopargs,
5370 opargs=pullopargs,
5371 confirm=opts.get(b'confirm'),
5371 confirm=opts.get(b'confirm'),
5372 ).cgresult
5372 ).cgresult
5373
5373
5374 # brev is a name, which might be a bookmark to be activated at
5374 # brev is a name, which might be a bookmark to be activated at
5375 # the end of the update. In other words, it is an explicit
5375 # the end of the update. In other words, it is an explicit
5376 # destination of the update
5376 # destination of the update
5377 brev = None
5377 brev = None
5378
5378
5379 if checkout:
5379 if checkout:
5380 checkout = repo.unfiltered().changelog.rev(checkout)
5380 checkout = repo.unfiltered().changelog.rev(checkout)
5381
5381
5382 # order below depends on implementation of
5382 # order below depends on implementation of
5383 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5383 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5384 # because 'checkout' is determined without it.
5384 # because 'checkout' is determined without it.
5385 if opts.get(b'rev'):
5385 if opts.get(b'rev'):
5386 brev = opts[b'rev'][0]
5386 brev = opts[b'rev'][0]
5387 elif opts.get(b'branch'):
5387 elif opts.get(b'branch'):
5388 brev = opts[b'branch'][0]
5388 brev = opts[b'branch'][0]
5389 else:
5389 else:
5390 brev = branches[0]
5390 brev = branches[0]
5391 repo._subtoppath = source
5391 repo._subtoppath = source
5392 try:
5392 try:
5393 ret = postincoming(
5393 ret = postincoming(
5394 ui, repo, modheads, opts.get(b'update'), checkout, brev
5394 ui, repo, modheads, opts.get(b'update'), checkout, brev
5395 )
5395 )
5396 except error.FilteredRepoLookupError as exc:
5396 except error.FilteredRepoLookupError as exc:
5397 msg = _(b'cannot update to target: %s') % exc.args[0]
5397 msg = _(b'cannot update to target: %s') % exc.args[0]
5398 exc.args = (msg,) + exc.args[1:]
5398 exc.args = (msg,) + exc.args[1:]
5399 raise
5399 raise
5400 finally:
5400 finally:
5401 del repo._subtoppath
5401 del repo._subtoppath
5402
5402
5403 finally:
5403 finally:
5404 other.close()
5404 other.close()
5405 return ret
5405 return ret
5406
5406
5407
5407
5408 @command(
5408 @command(
5409 b'push',
5409 b'push',
5410 [
5410 [
5411 (b'f', b'force', None, _(b'force push')),
5411 (b'f', b'force', None, _(b'force push')),
5412 (
5412 (
5413 b'r',
5413 b'r',
5414 b'rev',
5414 b'rev',
5415 [],
5415 [],
5416 _(b'a changeset intended to be included in the destination'),
5416 _(b'a changeset intended to be included in the destination'),
5417 _(b'REV'),
5417 _(b'REV'),
5418 ),
5418 ),
5419 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5419 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5420 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5420 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5421 (
5421 (
5422 b'b',
5422 b'b',
5423 b'branch',
5423 b'branch',
5424 [],
5424 [],
5425 _(b'a specific branch you would like to push'),
5425 _(b'a specific branch you would like to push'),
5426 _(b'BRANCH'),
5426 _(b'BRANCH'),
5427 ),
5427 ),
5428 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5428 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5429 (
5429 (
5430 b'',
5430 b'',
5431 b'pushvars',
5431 b'pushvars',
5432 [],
5432 [],
5433 _(b'variables that can be sent to server (ADVANCED)'),
5433 _(b'variables that can be sent to server (ADVANCED)'),
5434 ),
5434 ),
5435 (
5435 (
5436 b'',
5436 b'',
5437 b'publish',
5437 b'publish',
5438 False,
5438 False,
5439 _(b'push the changeset as public (EXPERIMENTAL)'),
5439 _(b'push the changeset as public (EXPERIMENTAL)'),
5440 ),
5440 ),
5441 ]
5441 ]
5442 + remoteopts,
5442 + remoteopts,
5443 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5443 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5444 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5444 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5445 helpbasic=True,
5445 helpbasic=True,
5446 )
5446 )
5447 def push(ui, repo, dest=None, **opts):
5447 def push(ui, repo, dest=None, **opts):
5448 """push changes to the specified destination
5448 """push changes to the specified destination
5449
5449
5450 Push changesets from the local repository to the specified
5450 Push changesets from the local repository to the specified
5451 destination.
5451 destination.
5452
5452
5453 This operation is symmetrical to pull: it is identical to a pull
5453 This operation is symmetrical to pull: it is identical to a pull
5454 in the destination repository from the current one.
5454 in the destination repository from the current one.
5455
5455
5456 By default, push will not allow creation of new heads at the
5456 By default, push will not allow creation of new heads at the
5457 destination, since multiple heads would make it unclear which head
5457 destination, since multiple heads would make it unclear which head
5458 to use. In this situation, it is recommended to pull and merge
5458 to use. In this situation, it is recommended to pull and merge
5459 before pushing.
5459 before pushing.
5460
5460
5461 Use --new-branch if you want to allow push to create a new named
5461 Use --new-branch if you want to allow push to create a new named
5462 branch that is not present at the destination. This allows you to
5462 branch that is not present at the destination. This allows you to
5463 only create a new branch without forcing other changes.
5463 only create a new branch without forcing other changes.
5464
5464
5465 .. note::
5465 .. note::
5466
5466
5467 Extra care should be taken with the -f/--force option,
5467 Extra care should be taken with the -f/--force option,
5468 which will push all new heads on all branches, an action which will
5468 which will push all new heads on all branches, an action which will
5469 almost always cause confusion for collaborators.
5469 almost always cause confusion for collaborators.
5470
5470
5471 If -r/--rev is used, the specified revision and all its ancestors
5471 If -r/--rev is used, the specified revision and all its ancestors
5472 will be pushed to the remote repository.
5472 will be pushed to the remote repository.
5473
5473
5474 If -B/--bookmark is used, the specified bookmarked revision, its
5474 If -B/--bookmark is used, the specified bookmarked revision, its
5475 ancestors, and the bookmark will be pushed to the remote
5475 ancestors, and the bookmark will be pushed to the remote
5476 repository. Specifying ``.`` is equivalent to specifying the active
5476 repository. Specifying ``.`` is equivalent to specifying the active
5477 bookmark's name. Use the --all-bookmarks option for pushing all
5477 bookmark's name. Use the --all-bookmarks option for pushing all
5478 current bookmarks.
5478 current bookmarks.
5479
5479
5480 Please see :hg:`help urls` for important details about ``ssh://``
5480 Please see :hg:`help urls` for important details about ``ssh://``
5481 URLs. If DESTINATION is omitted, a default path will be used.
5481 URLs. If DESTINATION is omitted, a default path will be used.
5482
5482
5483 .. container:: verbose
5483 .. container:: verbose
5484
5484
5485 The --pushvars option sends strings to the server that become
5485 The --pushvars option sends strings to the server that become
5486 environment variables prepended with ``HG_USERVAR_``. For example,
5486 environment variables prepended with ``HG_USERVAR_``. For example,
5487 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5487 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5488 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5488 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5489
5489
5490 pushvars can provide for user-overridable hooks as well as set debug
5490 pushvars can provide for user-overridable hooks as well as set debug
5491 levels. One example is having a hook that blocks commits containing
5491 levels. One example is having a hook that blocks commits containing
5492 conflict markers, but enables the user to override the hook if the file
5492 conflict markers, but enables the user to override the hook if the file
5493 is using conflict markers for testing purposes or the file format has
5493 is using conflict markers for testing purposes or the file format has
5494 strings that look like conflict markers.
5494 strings that look like conflict markers.
5495
5495
5496 By default, servers will ignore `--pushvars`. To enable it add the
5496 By default, servers will ignore `--pushvars`. To enable it add the
5497 following to your configuration file::
5497 following to your configuration file::
5498
5498
5499 [push]
5499 [push]
5500 pushvars.server = true
5500 pushvars.server = true
5501
5501
5502 Returns 0 if push was successful, 1 if nothing to push.
5502 Returns 0 if push was successful, 1 if nothing to push.
5503 """
5503 """
5504
5504
5505 opts = pycompat.byteskwargs(opts)
5505 opts = pycompat.byteskwargs(opts)
5506
5506
5507 if opts.get(b'all_bookmarks'):
5507 if opts.get(b'all_bookmarks'):
5508 cmdutil.check_incompatible_arguments(
5508 cmdutil.check_incompatible_arguments(
5509 opts, b'all_bookmarks', [b'bookmark', b'rev'],
5509 opts, b'all_bookmarks', [b'bookmark', b'rev'],
5510 )
5510 )
5511 opts[b'bookmark'] = list(repo._bookmarks)
5511 opts[b'bookmark'] = list(repo._bookmarks)
5512
5512
5513 if opts.get(b'bookmark'):
5513 if opts.get(b'bookmark'):
5514 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5514 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5515 for b in opts[b'bookmark']:
5515 for b in opts[b'bookmark']:
5516 # translate -B options to -r so changesets get pushed
5516 # translate -B options to -r so changesets get pushed
5517 b = repo._bookmarks.expandname(b)
5517 b = repo._bookmarks.expandname(b)
5518 if b in repo._bookmarks:
5518 if b in repo._bookmarks:
5519 opts.setdefault(b'rev', []).append(b)
5519 opts.setdefault(b'rev', []).append(b)
5520 else:
5520 else:
5521 # if we try to push a deleted bookmark, translate it to null
5521 # if we try to push a deleted bookmark, translate it to null
5522 # this lets simultaneous -r, -b options continue working
5522 # this lets simultaneous -r, -b options continue working
5523 opts.setdefault(b'rev', []).append(b"null")
5523 opts.setdefault(b'rev', []).append(b"null")
5524
5524
5525 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5525 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5526 if not path:
5526 if not path:
5527 raise error.Abort(
5527 raise error.ConfigError(
5528 _(b'default repository not configured!'),
5528 _(b'default repository not configured!'),
5529 hint=_(b"see 'hg help config.paths'"),
5529 hint=_(b"see 'hg help config.paths'"),
5530 )
5530 )
5531 dest = path.pushloc or path.loc
5531 dest = path.pushloc or path.loc
5532 branches = (path.branch, opts.get(b'branch') or [])
5532 branches = (path.branch, opts.get(b'branch') or [])
5533 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5533 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5534 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5534 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5535 other = hg.peer(repo, opts, dest)
5535 other = hg.peer(repo, opts, dest)
5536
5536
5537 if revs:
5537 if revs:
5538 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5538 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5539 if not revs:
5539 if not revs:
5540 raise error.InputError(
5540 raise error.InputError(
5541 _(b"specified revisions evaluate to an empty set"),
5541 _(b"specified revisions evaluate to an empty set"),
5542 hint=_(b"use different revision arguments"),
5542 hint=_(b"use different revision arguments"),
5543 )
5543 )
5544 elif path.pushrev:
5544 elif path.pushrev:
5545 # It doesn't make any sense to specify ancestor revisions. So limit
5545 # It doesn't make any sense to specify ancestor revisions. So limit
5546 # to DAG heads to make discovery simpler.
5546 # to DAG heads to make discovery simpler.
5547 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5547 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5548 revs = scmutil.revrange(repo, [expr])
5548 revs = scmutil.revrange(repo, [expr])
5549 revs = [repo[rev].node() for rev in revs]
5549 revs = [repo[rev].node() for rev in revs]
5550 if not revs:
5550 if not revs:
5551 raise error.InputError(
5551 raise error.InputError(
5552 _(b'default push revset for path evaluates to an empty set')
5552 _(b'default push revset for path evaluates to an empty set')
5553 )
5553 )
5554 elif ui.configbool(b'commands', b'push.require-revs'):
5554 elif ui.configbool(b'commands', b'push.require-revs'):
5555 raise error.InputError(
5555 raise error.InputError(
5556 _(b'no revisions specified to push'),
5556 _(b'no revisions specified to push'),
5557 hint=_(b'did you mean "hg push -r ."?'),
5557 hint=_(b'did you mean "hg push -r ."?'),
5558 )
5558 )
5559
5559
5560 repo._subtoppath = dest
5560 repo._subtoppath = dest
5561 try:
5561 try:
5562 # push subrepos depth-first for coherent ordering
5562 # push subrepos depth-first for coherent ordering
5563 c = repo[b'.']
5563 c = repo[b'.']
5564 subs = c.substate # only repos that are committed
5564 subs = c.substate # only repos that are committed
5565 for s in sorted(subs):
5565 for s in sorted(subs):
5566 result = c.sub(s).push(opts)
5566 result = c.sub(s).push(opts)
5567 if result == 0:
5567 if result == 0:
5568 return not result
5568 return not result
5569 finally:
5569 finally:
5570 del repo._subtoppath
5570 del repo._subtoppath
5571
5571
5572 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5572 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5573 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5573 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5574
5574
5575 pushop = exchange.push(
5575 pushop = exchange.push(
5576 repo,
5576 repo,
5577 other,
5577 other,
5578 opts.get(b'force'),
5578 opts.get(b'force'),
5579 revs=revs,
5579 revs=revs,
5580 newbranch=opts.get(b'new_branch'),
5580 newbranch=opts.get(b'new_branch'),
5581 bookmarks=opts.get(b'bookmark', ()),
5581 bookmarks=opts.get(b'bookmark', ()),
5582 publish=opts.get(b'publish'),
5582 publish=opts.get(b'publish'),
5583 opargs=opargs,
5583 opargs=opargs,
5584 )
5584 )
5585
5585
5586 result = not pushop.cgresult
5586 result = not pushop.cgresult
5587
5587
5588 if pushop.bkresult is not None:
5588 if pushop.bkresult is not None:
5589 if pushop.bkresult == 2:
5589 if pushop.bkresult == 2:
5590 result = 2
5590 result = 2
5591 elif not result and pushop.bkresult:
5591 elif not result and pushop.bkresult:
5592 result = 2
5592 result = 2
5593
5593
5594 return result
5594 return result
5595
5595
5596
5596
5597 @command(
5597 @command(
5598 b'recover',
5598 b'recover',
5599 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5599 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5600 helpcategory=command.CATEGORY_MAINTENANCE,
5600 helpcategory=command.CATEGORY_MAINTENANCE,
5601 )
5601 )
5602 def recover(ui, repo, **opts):
5602 def recover(ui, repo, **opts):
5603 """roll back an interrupted transaction
5603 """roll back an interrupted transaction
5604
5604
5605 Recover from an interrupted commit or pull.
5605 Recover from an interrupted commit or pull.
5606
5606
5607 This command tries to fix the repository status after an
5607 This command tries to fix the repository status after an
5608 interrupted operation. It should only be necessary when Mercurial
5608 interrupted operation. It should only be necessary when Mercurial
5609 suggests it.
5609 suggests it.
5610
5610
5611 Returns 0 if successful, 1 if nothing to recover or verify fails.
5611 Returns 0 if successful, 1 if nothing to recover or verify fails.
5612 """
5612 """
5613 ret = repo.recover()
5613 ret = repo.recover()
5614 if ret:
5614 if ret:
5615 if opts['verify']:
5615 if opts['verify']:
5616 return hg.verify(repo)
5616 return hg.verify(repo)
5617 else:
5617 else:
5618 msg = _(
5618 msg = _(
5619 b"(verify step skipped, run `hg verify` to check your "
5619 b"(verify step skipped, run `hg verify` to check your "
5620 b"repository content)\n"
5620 b"repository content)\n"
5621 )
5621 )
5622 ui.warn(msg)
5622 ui.warn(msg)
5623 return 0
5623 return 0
5624 return 1
5624 return 1
5625
5625
5626
5626
5627 @command(
5627 @command(
5628 b'remove|rm',
5628 b'remove|rm',
5629 [
5629 [
5630 (b'A', b'after', None, _(b'record delete for missing files')),
5630 (b'A', b'after', None, _(b'record delete for missing files')),
5631 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5631 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5632 ]
5632 ]
5633 + subrepoopts
5633 + subrepoopts
5634 + walkopts
5634 + walkopts
5635 + dryrunopts,
5635 + dryrunopts,
5636 _(b'[OPTION]... FILE...'),
5636 _(b'[OPTION]... FILE...'),
5637 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5637 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5638 helpbasic=True,
5638 helpbasic=True,
5639 inferrepo=True,
5639 inferrepo=True,
5640 )
5640 )
5641 def remove(ui, repo, *pats, **opts):
5641 def remove(ui, repo, *pats, **opts):
5642 """remove the specified files on the next commit
5642 """remove the specified files on the next commit
5643
5643
5644 Schedule the indicated files for removal from the current branch.
5644 Schedule the indicated files for removal from the current branch.
5645
5645
5646 This command schedules the files to be removed at the next commit.
5646 This command schedules the files to be removed at the next commit.
5647 To undo a remove before that, see :hg:`revert`. To undo added
5647 To undo a remove before that, see :hg:`revert`. To undo added
5648 files, see :hg:`forget`.
5648 files, see :hg:`forget`.
5649
5649
5650 .. container:: verbose
5650 .. container:: verbose
5651
5651
5652 -A/--after can be used to remove only files that have already
5652 -A/--after can be used to remove only files that have already
5653 been deleted, -f/--force can be used to force deletion, and -Af
5653 been deleted, -f/--force can be used to force deletion, and -Af
5654 can be used to remove files from the next revision without
5654 can be used to remove files from the next revision without
5655 deleting them from the working directory.
5655 deleting them from the working directory.
5656
5656
5657 The following table details the behavior of remove for different
5657 The following table details the behavior of remove for different
5658 file states (columns) and option combinations (rows). The file
5658 file states (columns) and option combinations (rows). The file
5659 states are Added [A], Clean [C], Modified [M] and Missing [!]
5659 states are Added [A], Clean [C], Modified [M] and Missing [!]
5660 (as reported by :hg:`status`). The actions are Warn, Remove
5660 (as reported by :hg:`status`). The actions are Warn, Remove
5661 (from branch) and Delete (from disk):
5661 (from branch) and Delete (from disk):
5662
5662
5663 ========= == == == ==
5663 ========= == == == ==
5664 opt/state A C M !
5664 opt/state A C M !
5665 ========= == == == ==
5665 ========= == == == ==
5666 none W RD W R
5666 none W RD W R
5667 -f R RD RD R
5667 -f R RD RD R
5668 -A W W W R
5668 -A W W W R
5669 -Af R R R R
5669 -Af R R R R
5670 ========= == == == ==
5670 ========= == == == ==
5671
5671
5672 .. note::
5672 .. note::
5673
5673
5674 :hg:`remove` never deletes files in Added [A] state from the
5674 :hg:`remove` never deletes files in Added [A] state from the
5675 working directory, not even if ``--force`` is specified.
5675 working directory, not even if ``--force`` is specified.
5676
5676
5677 Returns 0 on success, 1 if any warnings encountered.
5677 Returns 0 on success, 1 if any warnings encountered.
5678 """
5678 """
5679
5679
5680 opts = pycompat.byteskwargs(opts)
5680 opts = pycompat.byteskwargs(opts)
5681 after, force = opts.get(b'after'), opts.get(b'force')
5681 after, force = opts.get(b'after'), opts.get(b'force')
5682 dryrun = opts.get(b'dry_run')
5682 dryrun = opts.get(b'dry_run')
5683 if not pats and not after:
5683 if not pats and not after:
5684 raise error.InputError(_(b'no files specified'))
5684 raise error.InputError(_(b'no files specified'))
5685
5685
5686 m = scmutil.match(repo[None], pats, opts)
5686 m = scmutil.match(repo[None], pats, opts)
5687 subrepos = opts.get(b'subrepos')
5687 subrepos = opts.get(b'subrepos')
5688 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5688 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5689 return cmdutil.remove(
5689 return cmdutil.remove(
5690 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5690 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5691 )
5691 )
5692
5692
5693
5693
5694 @command(
5694 @command(
5695 b'rename|move|mv',
5695 b'rename|move|mv',
5696 [
5696 [
5697 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5697 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5698 (
5698 (
5699 b'',
5699 b'',
5700 b'at-rev',
5700 b'at-rev',
5701 b'',
5701 b'',
5702 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5702 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5703 _(b'REV'),
5703 _(b'REV'),
5704 ),
5704 ),
5705 (
5705 (
5706 b'f',
5706 b'f',
5707 b'force',
5707 b'force',
5708 None,
5708 None,
5709 _(b'forcibly move over an existing managed file'),
5709 _(b'forcibly move over an existing managed file'),
5710 ),
5710 ),
5711 ]
5711 ]
5712 + walkopts
5712 + walkopts
5713 + dryrunopts,
5713 + dryrunopts,
5714 _(b'[OPTION]... SOURCE... DEST'),
5714 _(b'[OPTION]... SOURCE... DEST'),
5715 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5715 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5716 )
5716 )
5717 def rename(ui, repo, *pats, **opts):
5717 def rename(ui, repo, *pats, **opts):
5718 """rename files; equivalent of copy + remove
5718 """rename files; equivalent of copy + remove
5719
5719
5720 Mark dest as copies of sources; mark sources for deletion. If dest
5720 Mark dest as copies of sources; mark sources for deletion. If dest
5721 is a directory, copies are put in that directory. If dest is a
5721 is a directory, copies are put in that directory. If dest is a
5722 file, there can only be one source.
5722 file, there can only be one source.
5723
5723
5724 By default, this command copies the contents of files as they
5724 By default, this command copies the contents of files as they
5725 exist in the working directory. If invoked with -A/--after, the
5725 exist in the working directory. If invoked with -A/--after, the
5726 operation is recorded, but no copying is performed.
5726 operation is recorded, but no copying is performed.
5727
5727
5728 This command takes effect at the next commit. To undo a rename
5728 This command takes effect at the next commit. To undo a rename
5729 before that, see :hg:`revert`.
5729 before that, see :hg:`revert`.
5730
5730
5731 Returns 0 on success, 1 if errors are encountered.
5731 Returns 0 on success, 1 if errors are encountered.
5732 """
5732 """
5733 opts = pycompat.byteskwargs(opts)
5733 opts = pycompat.byteskwargs(opts)
5734 with repo.wlock():
5734 with repo.wlock():
5735 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5735 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5736
5736
5737
5737
5738 @command(
5738 @command(
5739 b'resolve',
5739 b'resolve',
5740 [
5740 [
5741 (b'a', b'all', None, _(b'select all unresolved files')),
5741 (b'a', b'all', None, _(b'select all unresolved files')),
5742 (b'l', b'list', None, _(b'list state of files needing merge')),
5742 (b'l', b'list', None, _(b'list state of files needing merge')),
5743 (b'm', b'mark', None, _(b'mark files as resolved')),
5743 (b'm', b'mark', None, _(b'mark files as resolved')),
5744 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5744 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5745 (b'n', b'no-status', None, _(b'hide status prefix')),
5745 (b'n', b'no-status', None, _(b'hide status prefix')),
5746 (b'', b're-merge', None, _(b're-merge files')),
5746 (b'', b're-merge', None, _(b're-merge files')),
5747 ]
5747 ]
5748 + mergetoolopts
5748 + mergetoolopts
5749 + walkopts
5749 + walkopts
5750 + formatteropts,
5750 + formatteropts,
5751 _(b'[OPTION]... [FILE]...'),
5751 _(b'[OPTION]... [FILE]...'),
5752 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5752 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5753 inferrepo=True,
5753 inferrepo=True,
5754 )
5754 )
5755 def resolve(ui, repo, *pats, **opts):
5755 def resolve(ui, repo, *pats, **opts):
5756 """redo merges or set/view the merge status of files
5756 """redo merges or set/view the merge status of files
5757
5757
5758 Merges with unresolved conflicts are often the result of
5758 Merges with unresolved conflicts are often the result of
5759 non-interactive merging using the ``internal:merge`` configuration
5759 non-interactive merging using the ``internal:merge`` configuration
5760 setting, or a command-line merge tool like ``diff3``. The resolve
5760 setting, or a command-line merge tool like ``diff3``. The resolve
5761 command is used to manage the files involved in a merge, after
5761 command is used to manage the files involved in a merge, after
5762 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5762 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5763 working directory must have two parents). See :hg:`help
5763 working directory must have two parents). See :hg:`help
5764 merge-tools` for information on configuring merge tools.
5764 merge-tools` for information on configuring merge tools.
5765
5765
5766 The resolve command can be used in the following ways:
5766 The resolve command can be used in the following ways:
5767
5767
5768 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5768 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5769 the specified files, discarding any previous merge attempts. Re-merging
5769 the specified files, discarding any previous merge attempts. Re-merging
5770 is not performed for files already marked as resolved. Use ``--all/-a``
5770 is not performed for files already marked as resolved. Use ``--all/-a``
5771 to select all unresolved files. ``--tool`` can be used to specify
5771 to select all unresolved files. ``--tool`` can be used to specify
5772 the merge tool used for the given files. It overrides the HGMERGE
5772 the merge tool used for the given files. It overrides the HGMERGE
5773 environment variable and your configuration files. Previous file
5773 environment variable and your configuration files. Previous file
5774 contents are saved with a ``.orig`` suffix.
5774 contents are saved with a ``.orig`` suffix.
5775
5775
5776 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5776 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5777 (e.g. after having manually fixed-up the files). The default is
5777 (e.g. after having manually fixed-up the files). The default is
5778 to mark all unresolved files.
5778 to mark all unresolved files.
5779
5779
5780 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5780 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5781 default is to mark all resolved files.
5781 default is to mark all resolved files.
5782
5782
5783 - :hg:`resolve -l`: list files which had or still have conflicts.
5783 - :hg:`resolve -l`: list files which had or still have conflicts.
5784 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5784 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5785 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5785 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5786 the list. See :hg:`help filesets` for details.
5786 the list. See :hg:`help filesets` for details.
5787
5787
5788 .. note::
5788 .. note::
5789
5789
5790 Mercurial will not let you commit files with unresolved merge
5790 Mercurial will not let you commit files with unresolved merge
5791 conflicts. You must use :hg:`resolve -m ...` before you can
5791 conflicts. You must use :hg:`resolve -m ...` before you can
5792 commit after a conflicting merge.
5792 commit after a conflicting merge.
5793
5793
5794 .. container:: verbose
5794 .. container:: verbose
5795
5795
5796 Template:
5796 Template:
5797
5797
5798 The following keywords are supported in addition to the common template
5798 The following keywords are supported in addition to the common template
5799 keywords and functions. See also :hg:`help templates`.
5799 keywords and functions. See also :hg:`help templates`.
5800
5800
5801 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5801 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5802 :path: String. Repository-absolute path of the file.
5802 :path: String. Repository-absolute path of the file.
5803
5803
5804 Returns 0 on success, 1 if any files fail a resolve attempt.
5804 Returns 0 on success, 1 if any files fail a resolve attempt.
5805 """
5805 """
5806
5806
5807 opts = pycompat.byteskwargs(opts)
5807 opts = pycompat.byteskwargs(opts)
5808 confirm = ui.configbool(b'commands', b'resolve.confirm')
5808 confirm = ui.configbool(b'commands', b'resolve.confirm')
5809 flaglist = b'all mark unmark list no_status re_merge'.split()
5809 flaglist = b'all mark unmark list no_status re_merge'.split()
5810 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5810 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5811
5811
5812 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5812 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5813 if actioncount > 1:
5813 if actioncount > 1:
5814 raise error.InputError(_(b"too many actions specified"))
5814 raise error.InputError(_(b"too many actions specified"))
5815 elif actioncount == 0 and ui.configbool(
5815 elif actioncount == 0 and ui.configbool(
5816 b'commands', b'resolve.explicit-re-merge'
5816 b'commands', b'resolve.explicit-re-merge'
5817 ):
5817 ):
5818 hint = _(b'use --mark, --unmark, --list or --re-merge')
5818 hint = _(b'use --mark, --unmark, --list or --re-merge')
5819 raise error.InputError(_(b'no action specified'), hint=hint)
5819 raise error.InputError(_(b'no action specified'), hint=hint)
5820 if pats and all:
5820 if pats and all:
5821 raise error.InputError(_(b"can't specify --all and patterns"))
5821 raise error.InputError(_(b"can't specify --all and patterns"))
5822 if not (all or pats or show or mark or unmark):
5822 if not (all or pats or show or mark or unmark):
5823 raise error.InputError(
5823 raise error.InputError(
5824 _(b'no files or directories specified'),
5824 _(b'no files or directories specified'),
5825 hint=b'use --all to re-merge all unresolved files',
5825 hint=b'use --all to re-merge all unresolved files',
5826 )
5826 )
5827
5827
5828 if confirm:
5828 if confirm:
5829 if all:
5829 if all:
5830 if ui.promptchoice(
5830 if ui.promptchoice(
5831 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5831 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5832 ):
5832 ):
5833 raise error.Abort(_(b'user quit'))
5833 raise error.Abort(_(b'user quit'))
5834 if mark and not pats:
5834 if mark and not pats:
5835 if ui.promptchoice(
5835 if ui.promptchoice(
5836 _(
5836 _(
5837 b'mark all unresolved files as resolved (yn)?'
5837 b'mark all unresolved files as resolved (yn)?'
5838 b'$$ &Yes $$ &No'
5838 b'$$ &Yes $$ &No'
5839 )
5839 )
5840 ):
5840 ):
5841 raise error.Abort(_(b'user quit'))
5841 raise error.Abort(_(b'user quit'))
5842 if unmark and not pats:
5842 if unmark and not pats:
5843 if ui.promptchoice(
5843 if ui.promptchoice(
5844 _(
5844 _(
5845 b'mark all resolved files as unresolved (yn)?'
5845 b'mark all resolved files as unresolved (yn)?'
5846 b'$$ &Yes $$ &No'
5846 b'$$ &Yes $$ &No'
5847 )
5847 )
5848 ):
5848 ):
5849 raise error.Abort(_(b'user quit'))
5849 raise error.Abort(_(b'user quit'))
5850
5850
5851 uipathfn = scmutil.getuipathfn(repo)
5851 uipathfn = scmutil.getuipathfn(repo)
5852
5852
5853 if show:
5853 if show:
5854 ui.pager(b'resolve')
5854 ui.pager(b'resolve')
5855 fm = ui.formatter(b'resolve', opts)
5855 fm = ui.formatter(b'resolve', opts)
5856 ms = mergestatemod.mergestate.read(repo)
5856 ms = mergestatemod.mergestate.read(repo)
5857 wctx = repo[None]
5857 wctx = repo[None]
5858 m = scmutil.match(wctx, pats, opts)
5858 m = scmutil.match(wctx, pats, opts)
5859
5859
5860 # Labels and keys based on merge state. Unresolved path conflicts show
5860 # Labels and keys based on merge state. Unresolved path conflicts show
5861 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5861 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5862 # resolved conflicts.
5862 # resolved conflicts.
5863 mergestateinfo = {
5863 mergestateinfo = {
5864 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5864 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5865 b'resolve.unresolved',
5865 b'resolve.unresolved',
5866 b'U',
5866 b'U',
5867 ),
5867 ),
5868 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5868 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5869 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5869 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5870 b'resolve.unresolved',
5870 b'resolve.unresolved',
5871 b'P',
5871 b'P',
5872 ),
5872 ),
5873 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5873 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5874 b'resolve.resolved',
5874 b'resolve.resolved',
5875 b'R',
5875 b'R',
5876 ),
5876 ),
5877 }
5877 }
5878
5878
5879 for f in ms:
5879 for f in ms:
5880 if not m(f):
5880 if not m(f):
5881 continue
5881 continue
5882
5882
5883 label, key = mergestateinfo[ms[f]]
5883 label, key = mergestateinfo[ms[f]]
5884 fm.startitem()
5884 fm.startitem()
5885 fm.context(ctx=wctx)
5885 fm.context(ctx=wctx)
5886 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5886 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5887 fm.data(path=f)
5887 fm.data(path=f)
5888 fm.plain(b'%s\n' % uipathfn(f), label=label)
5888 fm.plain(b'%s\n' % uipathfn(f), label=label)
5889 fm.end()
5889 fm.end()
5890 return 0
5890 return 0
5891
5891
5892 with repo.wlock():
5892 with repo.wlock():
5893 ms = mergestatemod.mergestate.read(repo)
5893 ms = mergestatemod.mergestate.read(repo)
5894
5894
5895 if not (ms.active() or repo.dirstate.p2() != nullid):
5895 if not (ms.active() or repo.dirstate.p2() != nullid):
5896 raise error.StateError(
5896 raise error.StateError(
5897 _(b'resolve command not applicable when not merging')
5897 _(b'resolve command not applicable when not merging')
5898 )
5898 )
5899
5899
5900 wctx = repo[None]
5900 wctx = repo[None]
5901 m = scmutil.match(wctx, pats, opts)
5901 m = scmutil.match(wctx, pats, opts)
5902 ret = 0
5902 ret = 0
5903 didwork = False
5903 didwork = False
5904
5904
5905 tocomplete = []
5905 tocomplete = []
5906 hasconflictmarkers = []
5906 hasconflictmarkers = []
5907 if mark:
5907 if mark:
5908 markcheck = ui.config(b'commands', b'resolve.mark-check')
5908 markcheck = ui.config(b'commands', b'resolve.mark-check')
5909 if markcheck not in [b'warn', b'abort']:
5909 if markcheck not in [b'warn', b'abort']:
5910 # Treat all invalid / unrecognized values as 'none'.
5910 # Treat all invalid / unrecognized values as 'none'.
5911 markcheck = False
5911 markcheck = False
5912 for f in ms:
5912 for f in ms:
5913 if not m(f):
5913 if not m(f):
5914 continue
5914 continue
5915
5915
5916 didwork = True
5916 didwork = True
5917
5917
5918 # path conflicts must be resolved manually
5918 # path conflicts must be resolved manually
5919 if ms[f] in (
5919 if ms[f] in (
5920 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5920 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
5921 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5921 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
5922 ):
5922 ):
5923 if mark:
5923 if mark:
5924 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5924 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
5925 elif unmark:
5925 elif unmark:
5926 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5926 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
5927 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5927 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
5928 ui.warn(
5928 ui.warn(
5929 _(b'%s: path conflict must be resolved manually\n')
5929 _(b'%s: path conflict must be resolved manually\n')
5930 % uipathfn(f)
5930 % uipathfn(f)
5931 )
5931 )
5932 continue
5932 continue
5933
5933
5934 if mark:
5934 if mark:
5935 if markcheck:
5935 if markcheck:
5936 fdata = repo.wvfs.tryread(f)
5936 fdata = repo.wvfs.tryread(f)
5937 if (
5937 if (
5938 filemerge.hasconflictmarkers(fdata)
5938 filemerge.hasconflictmarkers(fdata)
5939 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5939 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
5940 ):
5940 ):
5941 hasconflictmarkers.append(f)
5941 hasconflictmarkers.append(f)
5942 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5942 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
5943 elif unmark:
5943 elif unmark:
5944 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5944 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
5945 else:
5945 else:
5946 # backup pre-resolve (merge uses .orig for its own purposes)
5946 # backup pre-resolve (merge uses .orig for its own purposes)
5947 a = repo.wjoin(f)
5947 a = repo.wjoin(f)
5948 try:
5948 try:
5949 util.copyfile(a, a + b".resolve")
5949 util.copyfile(a, a + b".resolve")
5950 except (IOError, OSError) as inst:
5950 except (IOError, OSError) as inst:
5951 if inst.errno != errno.ENOENT:
5951 if inst.errno != errno.ENOENT:
5952 raise
5952 raise
5953
5953
5954 try:
5954 try:
5955 # preresolve file
5955 # preresolve file
5956 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5956 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5957 with ui.configoverride(overrides, b'resolve'):
5957 with ui.configoverride(overrides, b'resolve'):
5958 complete, r = ms.preresolve(f, wctx)
5958 complete, r = ms.preresolve(f, wctx)
5959 if not complete:
5959 if not complete:
5960 tocomplete.append(f)
5960 tocomplete.append(f)
5961 elif r:
5961 elif r:
5962 ret = 1
5962 ret = 1
5963 finally:
5963 finally:
5964 ms.commit()
5964 ms.commit()
5965
5965
5966 # replace filemerge's .orig file with our resolve file, but only
5966 # replace filemerge's .orig file with our resolve file, but only
5967 # for merges that are complete
5967 # for merges that are complete
5968 if complete:
5968 if complete:
5969 try:
5969 try:
5970 util.rename(
5970 util.rename(
5971 a + b".resolve", scmutil.backuppath(ui, repo, f)
5971 a + b".resolve", scmutil.backuppath(ui, repo, f)
5972 )
5972 )
5973 except OSError as inst:
5973 except OSError as inst:
5974 if inst.errno != errno.ENOENT:
5974 if inst.errno != errno.ENOENT:
5975 raise
5975 raise
5976
5976
5977 if hasconflictmarkers:
5977 if hasconflictmarkers:
5978 ui.warn(
5978 ui.warn(
5979 _(
5979 _(
5980 b'warning: the following files still have conflict '
5980 b'warning: the following files still have conflict '
5981 b'markers:\n'
5981 b'markers:\n'
5982 )
5982 )
5983 + b''.join(
5983 + b''.join(
5984 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
5984 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
5985 )
5985 )
5986 )
5986 )
5987 if markcheck == b'abort' and not all and not pats:
5987 if markcheck == b'abort' and not all and not pats:
5988 raise error.StateError(
5988 raise error.StateError(
5989 _(b'conflict markers detected'),
5989 _(b'conflict markers detected'),
5990 hint=_(b'use --all to mark anyway'),
5990 hint=_(b'use --all to mark anyway'),
5991 )
5991 )
5992
5992
5993 for f in tocomplete:
5993 for f in tocomplete:
5994 try:
5994 try:
5995 # resolve file
5995 # resolve file
5996 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5996 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
5997 with ui.configoverride(overrides, b'resolve'):
5997 with ui.configoverride(overrides, b'resolve'):
5998 r = ms.resolve(f, wctx)
5998 r = ms.resolve(f, wctx)
5999 if r:
5999 if r:
6000 ret = 1
6000 ret = 1
6001 finally:
6001 finally:
6002 ms.commit()
6002 ms.commit()
6003
6003
6004 # replace filemerge's .orig file with our resolve file
6004 # replace filemerge's .orig file with our resolve file
6005 a = repo.wjoin(f)
6005 a = repo.wjoin(f)
6006 try:
6006 try:
6007 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6007 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6008 except OSError as inst:
6008 except OSError as inst:
6009 if inst.errno != errno.ENOENT:
6009 if inst.errno != errno.ENOENT:
6010 raise
6010 raise
6011
6011
6012 ms.commit()
6012 ms.commit()
6013 branchmerge = repo.dirstate.p2() != nullid
6013 branchmerge = repo.dirstate.p2() != nullid
6014 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6014 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6015
6015
6016 if not didwork and pats:
6016 if not didwork and pats:
6017 hint = None
6017 hint = None
6018 if not any([p for p in pats if p.find(b':') >= 0]):
6018 if not any([p for p in pats if p.find(b':') >= 0]):
6019 pats = [b'path:%s' % p for p in pats]
6019 pats = [b'path:%s' % p for p in pats]
6020 m = scmutil.match(wctx, pats, opts)
6020 m = scmutil.match(wctx, pats, opts)
6021 for f in ms:
6021 for f in ms:
6022 if not m(f):
6022 if not m(f):
6023 continue
6023 continue
6024
6024
6025 def flag(o):
6025 def flag(o):
6026 if o == b're_merge':
6026 if o == b're_merge':
6027 return b'--re-merge '
6027 return b'--re-merge '
6028 return b'-%s ' % o[0:1]
6028 return b'-%s ' % o[0:1]
6029
6029
6030 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6030 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6031 hint = _(b"(try: hg resolve %s%s)\n") % (
6031 hint = _(b"(try: hg resolve %s%s)\n") % (
6032 flags,
6032 flags,
6033 b' '.join(pats),
6033 b' '.join(pats),
6034 )
6034 )
6035 break
6035 break
6036 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6036 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6037 if hint:
6037 if hint:
6038 ui.warn(hint)
6038 ui.warn(hint)
6039
6039
6040 unresolvedf = list(ms.unresolved())
6040 unresolvedf = list(ms.unresolved())
6041 if not unresolvedf:
6041 if not unresolvedf:
6042 ui.status(_(b'(no more unresolved files)\n'))
6042 ui.status(_(b'(no more unresolved files)\n'))
6043 cmdutil.checkafterresolved(repo)
6043 cmdutil.checkafterresolved(repo)
6044
6044
6045 return ret
6045 return ret
6046
6046
6047
6047
6048 @command(
6048 @command(
6049 b'revert',
6049 b'revert',
6050 [
6050 [
6051 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6051 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6052 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6052 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6053 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6053 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6054 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6054 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6055 (b'i', b'interactive', None, _(b'interactively select the changes')),
6055 (b'i', b'interactive', None, _(b'interactively select the changes')),
6056 ]
6056 ]
6057 + walkopts
6057 + walkopts
6058 + dryrunopts,
6058 + dryrunopts,
6059 _(b'[OPTION]... [-r REV] [NAME]...'),
6059 _(b'[OPTION]... [-r REV] [NAME]...'),
6060 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6060 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6061 )
6061 )
6062 def revert(ui, repo, *pats, **opts):
6062 def revert(ui, repo, *pats, **opts):
6063 """restore files to their checkout state
6063 """restore files to their checkout state
6064
6064
6065 .. note::
6065 .. note::
6066
6066
6067 To check out earlier revisions, you should use :hg:`update REV`.
6067 To check out earlier revisions, you should use :hg:`update REV`.
6068 To cancel an uncommitted merge (and lose your changes),
6068 To cancel an uncommitted merge (and lose your changes),
6069 use :hg:`merge --abort`.
6069 use :hg:`merge --abort`.
6070
6070
6071 With no revision specified, revert the specified files or directories
6071 With no revision specified, revert the specified files or directories
6072 to the contents they had in the parent of the working directory.
6072 to the contents they had in the parent of the working directory.
6073 This restores the contents of files to an unmodified
6073 This restores the contents of files to an unmodified
6074 state and unschedules adds, removes, copies, and renames. If the
6074 state and unschedules adds, removes, copies, and renames. If the
6075 working directory has two parents, you must explicitly specify a
6075 working directory has two parents, you must explicitly specify a
6076 revision.
6076 revision.
6077
6077
6078 Using the -r/--rev or -d/--date options, revert the given files or
6078 Using the -r/--rev or -d/--date options, revert the given files or
6079 directories to their states as of a specific revision. Because
6079 directories to their states as of a specific revision. Because
6080 revert does not change the working directory parents, this will
6080 revert does not change the working directory parents, this will
6081 cause these files to appear modified. This can be helpful to "back
6081 cause these files to appear modified. This can be helpful to "back
6082 out" some or all of an earlier change. See :hg:`backout` for a
6082 out" some or all of an earlier change. See :hg:`backout` for a
6083 related method.
6083 related method.
6084
6084
6085 Modified files are saved with a .orig suffix before reverting.
6085 Modified files are saved with a .orig suffix before reverting.
6086 To disable these backups, use --no-backup. It is possible to store
6086 To disable these backups, use --no-backup. It is possible to store
6087 the backup files in a custom directory relative to the root of the
6087 the backup files in a custom directory relative to the root of the
6088 repository by setting the ``ui.origbackuppath`` configuration
6088 repository by setting the ``ui.origbackuppath`` configuration
6089 option.
6089 option.
6090
6090
6091 See :hg:`help dates` for a list of formats valid for -d/--date.
6091 See :hg:`help dates` for a list of formats valid for -d/--date.
6092
6092
6093 See :hg:`help backout` for a way to reverse the effect of an
6093 See :hg:`help backout` for a way to reverse the effect of an
6094 earlier changeset.
6094 earlier changeset.
6095
6095
6096 Returns 0 on success.
6096 Returns 0 on success.
6097 """
6097 """
6098
6098
6099 opts = pycompat.byteskwargs(opts)
6099 opts = pycompat.byteskwargs(opts)
6100 if opts.get(b"date"):
6100 if opts.get(b"date"):
6101 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6101 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6102 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6102 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6103
6103
6104 parent, p2 = repo.dirstate.parents()
6104 parent, p2 = repo.dirstate.parents()
6105 if not opts.get(b'rev') and p2 != nullid:
6105 if not opts.get(b'rev') and p2 != nullid:
6106 # revert after merge is a trap for new users (issue2915)
6106 # revert after merge is a trap for new users (issue2915)
6107 raise error.InputError(
6107 raise error.InputError(
6108 _(b'uncommitted merge with no revision specified'),
6108 _(b'uncommitted merge with no revision specified'),
6109 hint=_(b"use 'hg update' or see 'hg help revert'"),
6109 hint=_(b"use 'hg update' or see 'hg help revert'"),
6110 )
6110 )
6111
6111
6112 rev = opts.get(b'rev')
6112 rev = opts.get(b'rev')
6113 if rev:
6113 if rev:
6114 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6114 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6115 ctx = scmutil.revsingle(repo, rev)
6115 ctx = scmutil.revsingle(repo, rev)
6116
6116
6117 if not (
6117 if not (
6118 pats
6118 pats
6119 or opts.get(b'include')
6119 or opts.get(b'include')
6120 or opts.get(b'exclude')
6120 or opts.get(b'exclude')
6121 or opts.get(b'all')
6121 or opts.get(b'all')
6122 or opts.get(b'interactive')
6122 or opts.get(b'interactive')
6123 ):
6123 ):
6124 msg = _(b"no files or directories specified")
6124 msg = _(b"no files or directories specified")
6125 if p2 != nullid:
6125 if p2 != nullid:
6126 hint = _(
6126 hint = _(
6127 b"uncommitted merge, use --all to discard all changes,"
6127 b"uncommitted merge, use --all to discard all changes,"
6128 b" or 'hg update -C .' to abort the merge"
6128 b" or 'hg update -C .' to abort the merge"
6129 )
6129 )
6130 raise error.InputError(msg, hint=hint)
6130 raise error.InputError(msg, hint=hint)
6131 dirty = any(repo.status())
6131 dirty = any(repo.status())
6132 node = ctx.node()
6132 node = ctx.node()
6133 if node != parent:
6133 if node != parent:
6134 if dirty:
6134 if dirty:
6135 hint = (
6135 hint = (
6136 _(
6136 _(
6137 b"uncommitted changes, use --all to discard all"
6137 b"uncommitted changes, use --all to discard all"
6138 b" changes, or 'hg update %d' to update"
6138 b" changes, or 'hg update %d' to update"
6139 )
6139 )
6140 % ctx.rev()
6140 % ctx.rev()
6141 )
6141 )
6142 else:
6142 else:
6143 hint = (
6143 hint = (
6144 _(
6144 _(
6145 b"use --all to revert all files,"
6145 b"use --all to revert all files,"
6146 b" or 'hg update %d' to update"
6146 b" or 'hg update %d' to update"
6147 )
6147 )
6148 % ctx.rev()
6148 % ctx.rev()
6149 )
6149 )
6150 elif dirty:
6150 elif dirty:
6151 hint = _(b"uncommitted changes, use --all to discard all changes")
6151 hint = _(b"uncommitted changes, use --all to discard all changes")
6152 else:
6152 else:
6153 hint = _(b"use --all to revert all files")
6153 hint = _(b"use --all to revert all files")
6154 raise error.InputError(msg, hint=hint)
6154 raise error.InputError(msg, hint=hint)
6155
6155
6156 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6156 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6157
6157
6158
6158
6159 @command(
6159 @command(
6160 b'rollback',
6160 b'rollback',
6161 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6161 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6162 helpcategory=command.CATEGORY_MAINTENANCE,
6162 helpcategory=command.CATEGORY_MAINTENANCE,
6163 )
6163 )
6164 def rollback(ui, repo, **opts):
6164 def rollback(ui, repo, **opts):
6165 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6165 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6166
6166
6167 Please use :hg:`commit --amend` instead of rollback to correct
6167 Please use :hg:`commit --amend` instead of rollback to correct
6168 mistakes in the last commit.
6168 mistakes in the last commit.
6169
6169
6170 This command should be used with care. There is only one level of
6170 This command should be used with care. There is only one level of
6171 rollback, and there is no way to undo a rollback. It will also
6171 rollback, and there is no way to undo a rollback. It will also
6172 restore the dirstate at the time of the last transaction, losing
6172 restore the dirstate at the time of the last transaction, losing
6173 any dirstate changes since that time. This command does not alter
6173 any dirstate changes since that time. This command does not alter
6174 the working directory.
6174 the working directory.
6175
6175
6176 Transactions are used to encapsulate the effects of all commands
6176 Transactions are used to encapsulate the effects of all commands
6177 that create new changesets or propagate existing changesets into a
6177 that create new changesets or propagate existing changesets into a
6178 repository.
6178 repository.
6179
6179
6180 .. container:: verbose
6180 .. container:: verbose
6181
6181
6182 For example, the following commands are transactional, and their
6182 For example, the following commands are transactional, and their
6183 effects can be rolled back:
6183 effects can be rolled back:
6184
6184
6185 - commit
6185 - commit
6186 - import
6186 - import
6187 - pull
6187 - pull
6188 - push (with this repository as the destination)
6188 - push (with this repository as the destination)
6189 - unbundle
6189 - unbundle
6190
6190
6191 To avoid permanent data loss, rollback will refuse to rollback a
6191 To avoid permanent data loss, rollback will refuse to rollback a
6192 commit transaction if it isn't checked out. Use --force to
6192 commit transaction if it isn't checked out. Use --force to
6193 override this protection.
6193 override this protection.
6194
6194
6195 The rollback command can be entirely disabled by setting the
6195 The rollback command can be entirely disabled by setting the
6196 ``ui.rollback`` configuration setting to false. If you're here
6196 ``ui.rollback`` configuration setting to false. If you're here
6197 because you want to use rollback and it's disabled, you can
6197 because you want to use rollback and it's disabled, you can
6198 re-enable the command by setting ``ui.rollback`` to true.
6198 re-enable the command by setting ``ui.rollback`` to true.
6199
6199
6200 This command is not intended for use on public repositories. Once
6200 This command is not intended for use on public repositories. Once
6201 changes are visible for pull by other users, rolling a transaction
6201 changes are visible for pull by other users, rolling a transaction
6202 back locally is ineffective (someone else may already have pulled
6202 back locally is ineffective (someone else may already have pulled
6203 the changes). Furthermore, a race is possible with readers of the
6203 the changes). Furthermore, a race is possible with readers of the
6204 repository; for example an in-progress pull from the repository
6204 repository; for example an in-progress pull from the repository
6205 may fail if a rollback is performed.
6205 may fail if a rollback is performed.
6206
6206
6207 Returns 0 on success, 1 if no rollback data is available.
6207 Returns 0 on success, 1 if no rollback data is available.
6208 """
6208 """
6209 if not ui.configbool(b'ui', b'rollback'):
6209 if not ui.configbool(b'ui', b'rollback'):
6210 raise error.Abort(
6210 raise error.Abort(
6211 _(b'rollback is disabled because it is unsafe'),
6211 _(b'rollback is disabled because it is unsafe'),
6212 hint=b'see `hg help -v rollback` for information',
6212 hint=b'see `hg help -v rollback` for information',
6213 )
6213 )
6214 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6214 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6215
6215
6216
6216
6217 @command(
6217 @command(
6218 b'root',
6218 b'root',
6219 [] + formatteropts,
6219 [] + formatteropts,
6220 intents={INTENT_READONLY},
6220 intents={INTENT_READONLY},
6221 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6221 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6222 )
6222 )
6223 def root(ui, repo, **opts):
6223 def root(ui, repo, **opts):
6224 """print the root (top) of the current working directory
6224 """print the root (top) of the current working directory
6225
6225
6226 Print the root directory of the current repository.
6226 Print the root directory of the current repository.
6227
6227
6228 .. container:: verbose
6228 .. container:: verbose
6229
6229
6230 Template:
6230 Template:
6231
6231
6232 The following keywords are supported in addition to the common template
6232 The following keywords are supported in addition to the common template
6233 keywords and functions. See also :hg:`help templates`.
6233 keywords and functions. See also :hg:`help templates`.
6234
6234
6235 :hgpath: String. Path to the .hg directory.
6235 :hgpath: String. Path to the .hg directory.
6236 :storepath: String. Path to the directory holding versioned data.
6236 :storepath: String. Path to the directory holding versioned data.
6237
6237
6238 Returns 0 on success.
6238 Returns 0 on success.
6239 """
6239 """
6240 opts = pycompat.byteskwargs(opts)
6240 opts = pycompat.byteskwargs(opts)
6241 with ui.formatter(b'root', opts) as fm:
6241 with ui.formatter(b'root', opts) as fm:
6242 fm.startitem()
6242 fm.startitem()
6243 fm.write(b'reporoot', b'%s\n', repo.root)
6243 fm.write(b'reporoot', b'%s\n', repo.root)
6244 fm.data(hgpath=repo.path, storepath=repo.spath)
6244 fm.data(hgpath=repo.path, storepath=repo.spath)
6245
6245
6246
6246
6247 @command(
6247 @command(
6248 b'serve',
6248 b'serve',
6249 [
6249 [
6250 (
6250 (
6251 b'A',
6251 b'A',
6252 b'accesslog',
6252 b'accesslog',
6253 b'',
6253 b'',
6254 _(b'name of access log file to write to'),
6254 _(b'name of access log file to write to'),
6255 _(b'FILE'),
6255 _(b'FILE'),
6256 ),
6256 ),
6257 (b'd', b'daemon', None, _(b'run server in background')),
6257 (b'd', b'daemon', None, _(b'run server in background')),
6258 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6258 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6259 (
6259 (
6260 b'E',
6260 b'E',
6261 b'errorlog',
6261 b'errorlog',
6262 b'',
6262 b'',
6263 _(b'name of error log file to write to'),
6263 _(b'name of error log file to write to'),
6264 _(b'FILE'),
6264 _(b'FILE'),
6265 ),
6265 ),
6266 # use string type, then we can check if something was passed
6266 # use string type, then we can check if something was passed
6267 (
6267 (
6268 b'p',
6268 b'p',
6269 b'port',
6269 b'port',
6270 b'',
6270 b'',
6271 _(b'port to listen on (default: 8000)'),
6271 _(b'port to listen on (default: 8000)'),
6272 _(b'PORT'),
6272 _(b'PORT'),
6273 ),
6273 ),
6274 (
6274 (
6275 b'a',
6275 b'a',
6276 b'address',
6276 b'address',
6277 b'',
6277 b'',
6278 _(b'address to listen on (default: all interfaces)'),
6278 _(b'address to listen on (default: all interfaces)'),
6279 _(b'ADDR'),
6279 _(b'ADDR'),
6280 ),
6280 ),
6281 (
6281 (
6282 b'',
6282 b'',
6283 b'prefix',
6283 b'prefix',
6284 b'',
6284 b'',
6285 _(b'prefix path to serve from (default: server root)'),
6285 _(b'prefix path to serve from (default: server root)'),
6286 _(b'PREFIX'),
6286 _(b'PREFIX'),
6287 ),
6287 ),
6288 (
6288 (
6289 b'n',
6289 b'n',
6290 b'name',
6290 b'name',
6291 b'',
6291 b'',
6292 _(b'name to show in web pages (default: working directory)'),
6292 _(b'name to show in web pages (default: working directory)'),
6293 _(b'NAME'),
6293 _(b'NAME'),
6294 ),
6294 ),
6295 (
6295 (
6296 b'',
6296 b'',
6297 b'web-conf',
6297 b'web-conf',
6298 b'',
6298 b'',
6299 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6299 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6300 _(b'FILE'),
6300 _(b'FILE'),
6301 ),
6301 ),
6302 (
6302 (
6303 b'',
6303 b'',
6304 b'webdir-conf',
6304 b'webdir-conf',
6305 b'',
6305 b'',
6306 _(b'name of the hgweb config file (DEPRECATED)'),
6306 _(b'name of the hgweb config file (DEPRECATED)'),
6307 _(b'FILE'),
6307 _(b'FILE'),
6308 ),
6308 ),
6309 (
6309 (
6310 b'',
6310 b'',
6311 b'pid-file',
6311 b'pid-file',
6312 b'',
6312 b'',
6313 _(b'name of file to write process ID to'),
6313 _(b'name of file to write process ID to'),
6314 _(b'FILE'),
6314 _(b'FILE'),
6315 ),
6315 ),
6316 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6316 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6317 (
6317 (
6318 b'',
6318 b'',
6319 b'cmdserver',
6319 b'cmdserver',
6320 b'',
6320 b'',
6321 _(b'for remote clients (ADVANCED)'),
6321 _(b'for remote clients (ADVANCED)'),
6322 _(b'MODE'),
6322 _(b'MODE'),
6323 ),
6323 ),
6324 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6324 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6325 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6325 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6326 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6326 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6327 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6327 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6328 (b'', b'print-url', None, _(b'start and print only the URL')),
6328 (b'', b'print-url', None, _(b'start and print only the URL')),
6329 ]
6329 ]
6330 + subrepoopts,
6330 + subrepoopts,
6331 _(b'[OPTION]...'),
6331 _(b'[OPTION]...'),
6332 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6332 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6333 helpbasic=True,
6333 helpbasic=True,
6334 optionalrepo=True,
6334 optionalrepo=True,
6335 )
6335 )
6336 def serve(ui, repo, **opts):
6336 def serve(ui, repo, **opts):
6337 """start stand-alone webserver
6337 """start stand-alone webserver
6338
6338
6339 Start a local HTTP repository browser and pull server. You can use
6339 Start a local HTTP repository browser and pull server. You can use
6340 this for ad-hoc sharing and browsing of repositories. It is
6340 this for ad-hoc sharing and browsing of repositories. It is
6341 recommended to use a real web server to serve a repository for
6341 recommended to use a real web server to serve a repository for
6342 longer periods of time.
6342 longer periods of time.
6343
6343
6344 Please note that the server does not implement access control.
6344 Please note that the server does not implement access control.
6345 This means that, by default, anybody can read from the server and
6345 This means that, by default, anybody can read from the server and
6346 nobody can write to it by default. Set the ``web.allow-push``
6346 nobody can write to it by default. Set the ``web.allow-push``
6347 option to ``*`` to allow everybody to push to the server. You
6347 option to ``*`` to allow everybody to push to the server. You
6348 should use a real web server if you need to authenticate users.
6348 should use a real web server if you need to authenticate users.
6349
6349
6350 By default, the server logs accesses to stdout and errors to
6350 By default, the server logs accesses to stdout and errors to
6351 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6351 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6352 files.
6352 files.
6353
6353
6354 To have the server choose a free port number to listen on, specify
6354 To have the server choose a free port number to listen on, specify
6355 a port number of 0; in this case, the server will print the port
6355 a port number of 0; in this case, the server will print the port
6356 number it uses.
6356 number it uses.
6357
6357
6358 Returns 0 on success.
6358 Returns 0 on success.
6359 """
6359 """
6360
6360
6361 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6361 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6362 opts = pycompat.byteskwargs(opts)
6362 opts = pycompat.byteskwargs(opts)
6363 if opts[b"print_url"] and ui.verbose:
6363 if opts[b"print_url"] and ui.verbose:
6364 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6364 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6365
6365
6366 if opts[b"stdio"]:
6366 if opts[b"stdio"]:
6367 if repo is None:
6367 if repo is None:
6368 raise error.RepoError(
6368 raise error.RepoError(
6369 _(b"there is no Mercurial repository here (.hg not found)")
6369 _(b"there is no Mercurial repository here (.hg not found)")
6370 )
6370 )
6371 s = wireprotoserver.sshserver(ui, repo)
6371 s = wireprotoserver.sshserver(ui, repo)
6372 s.serve_forever()
6372 s.serve_forever()
6373 return
6373 return
6374
6374
6375 service = server.createservice(ui, repo, opts)
6375 service = server.createservice(ui, repo, opts)
6376 return server.runservice(opts, initfn=service.init, runfn=service.run)
6376 return server.runservice(opts, initfn=service.init, runfn=service.run)
6377
6377
6378
6378
6379 @command(
6379 @command(
6380 b'shelve',
6380 b'shelve',
6381 [
6381 [
6382 (
6382 (
6383 b'A',
6383 b'A',
6384 b'addremove',
6384 b'addremove',
6385 None,
6385 None,
6386 _(b'mark new/missing files as added/removed before shelving'),
6386 _(b'mark new/missing files as added/removed before shelving'),
6387 ),
6387 ),
6388 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6388 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6389 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6389 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6390 (
6390 (
6391 b'',
6391 b'',
6392 b'date',
6392 b'date',
6393 b'',
6393 b'',
6394 _(b'shelve with the specified commit date'),
6394 _(b'shelve with the specified commit date'),
6395 _(b'DATE'),
6395 _(b'DATE'),
6396 ),
6396 ),
6397 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6397 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6398 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6398 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6399 (
6399 (
6400 b'k',
6400 b'k',
6401 b'keep',
6401 b'keep',
6402 False,
6402 False,
6403 _(b'shelve, but keep changes in the working directory'),
6403 _(b'shelve, but keep changes in the working directory'),
6404 ),
6404 ),
6405 (b'l', b'list', None, _(b'list current shelves')),
6405 (b'l', b'list', None, _(b'list current shelves')),
6406 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6406 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6407 (
6407 (
6408 b'n',
6408 b'n',
6409 b'name',
6409 b'name',
6410 b'',
6410 b'',
6411 _(b'use the given name for the shelved commit'),
6411 _(b'use the given name for the shelved commit'),
6412 _(b'NAME'),
6412 _(b'NAME'),
6413 ),
6413 ),
6414 (
6414 (
6415 b'p',
6415 b'p',
6416 b'patch',
6416 b'patch',
6417 None,
6417 None,
6418 _(
6418 _(
6419 b'output patches for changes (provide the names of the shelved '
6419 b'output patches for changes (provide the names of the shelved '
6420 b'changes as positional arguments)'
6420 b'changes as positional arguments)'
6421 ),
6421 ),
6422 ),
6422 ),
6423 (b'i', b'interactive', None, _(b'interactive mode')),
6423 (b'i', b'interactive', None, _(b'interactive mode')),
6424 (
6424 (
6425 b'',
6425 b'',
6426 b'stat',
6426 b'stat',
6427 None,
6427 None,
6428 _(
6428 _(
6429 b'output diffstat-style summary of changes (provide the names of '
6429 b'output diffstat-style summary of changes (provide the names of '
6430 b'the shelved changes as positional arguments)'
6430 b'the shelved changes as positional arguments)'
6431 ),
6431 ),
6432 ),
6432 ),
6433 ]
6433 ]
6434 + cmdutil.walkopts,
6434 + cmdutil.walkopts,
6435 _(b'hg shelve [OPTION]... [FILE]...'),
6435 _(b'hg shelve [OPTION]... [FILE]...'),
6436 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6436 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6437 )
6437 )
6438 def shelve(ui, repo, *pats, **opts):
6438 def shelve(ui, repo, *pats, **opts):
6439 '''save and set aside changes from the working directory
6439 '''save and set aside changes from the working directory
6440
6440
6441 Shelving takes files that "hg status" reports as not clean, saves
6441 Shelving takes files that "hg status" reports as not clean, saves
6442 the modifications to a bundle (a shelved change), and reverts the
6442 the modifications to a bundle (a shelved change), and reverts the
6443 files so that their state in the working directory becomes clean.
6443 files so that their state in the working directory becomes clean.
6444
6444
6445 To restore these changes to the working directory, using "hg
6445 To restore these changes to the working directory, using "hg
6446 unshelve"; this will work even if you switch to a different
6446 unshelve"; this will work even if you switch to a different
6447 commit.
6447 commit.
6448
6448
6449 When no files are specified, "hg shelve" saves all not-clean
6449 When no files are specified, "hg shelve" saves all not-clean
6450 files. If specific files or directories are named, only changes to
6450 files. If specific files or directories are named, only changes to
6451 those files are shelved.
6451 those files are shelved.
6452
6452
6453 In bare shelve (when no files are specified, without interactive,
6453 In bare shelve (when no files are specified, without interactive,
6454 include and exclude option), shelving remembers information if the
6454 include and exclude option), shelving remembers information if the
6455 working directory was on newly created branch, in other words working
6455 working directory was on newly created branch, in other words working
6456 directory was on different branch than its first parent. In this
6456 directory was on different branch than its first parent. In this
6457 situation unshelving restores branch information to the working directory.
6457 situation unshelving restores branch information to the working directory.
6458
6458
6459 Each shelved change has a name that makes it easier to find later.
6459 Each shelved change has a name that makes it easier to find later.
6460 The name of a shelved change defaults to being based on the active
6460 The name of a shelved change defaults to being based on the active
6461 bookmark, or if there is no active bookmark, the current named
6461 bookmark, or if there is no active bookmark, the current named
6462 branch. To specify a different name, use ``--name``.
6462 branch. To specify a different name, use ``--name``.
6463
6463
6464 To see a list of existing shelved changes, use the ``--list``
6464 To see a list of existing shelved changes, use the ``--list``
6465 option. For each shelved change, this will print its name, age,
6465 option. For each shelved change, this will print its name, age,
6466 and description; use ``--patch`` or ``--stat`` for more details.
6466 and description; use ``--patch`` or ``--stat`` for more details.
6467
6467
6468 To delete specific shelved changes, use ``--delete``. To delete
6468 To delete specific shelved changes, use ``--delete``. To delete
6469 all shelved changes, use ``--cleanup``.
6469 all shelved changes, use ``--cleanup``.
6470 '''
6470 '''
6471 opts = pycompat.byteskwargs(opts)
6471 opts = pycompat.byteskwargs(opts)
6472 allowables = [
6472 allowables = [
6473 (b'addremove', {b'create'}), # 'create' is pseudo action
6473 (b'addremove', {b'create'}), # 'create' is pseudo action
6474 (b'unknown', {b'create'}),
6474 (b'unknown', {b'create'}),
6475 (b'cleanup', {b'cleanup'}),
6475 (b'cleanup', {b'cleanup'}),
6476 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6476 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6477 (b'delete', {b'delete'}),
6477 (b'delete', {b'delete'}),
6478 (b'edit', {b'create'}),
6478 (b'edit', {b'create'}),
6479 (b'keep', {b'create'}),
6479 (b'keep', {b'create'}),
6480 (b'list', {b'list'}),
6480 (b'list', {b'list'}),
6481 (b'message', {b'create'}),
6481 (b'message', {b'create'}),
6482 (b'name', {b'create'}),
6482 (b'name', {b'create'}),
6483 (b'patch', {b'patch', b'list'}),
6483 (b'patch', {b'patch', b'list'}),
6484 (b'stat', {b'stat', b'list'}),
6484 (b'stat', {b'stat', b'list'}),
6485 ]
6485 ]
6486
6486
6487 def checkopt(opt):
6487 def checkopt(opt):
6488 if opts.get(opt):
6488 if opts.get(opt):
6489 for i, allowable in allowables:
6489 for i, allowable in allowables:
6490 if opts[i] and opt not in allowable:
6490 if opts[i] and opt not in allowable:
6491 raise error.InputError(
6491 raise error.InputError(
6492 _(
6492 _(
6493 b"options '--%s' and '--%s' may not be "
6493 b"options '--%s' and '--%s' may not be "
6494 b"used together"
6494 b"used together"
6495 )
6495 )
6496 % (opt, i)
6496 % (opt, i)
6497 )
6497 )
6498 return True
6498 return True
6499
6499
6500 if checkopt(b'cleanup'):
6500 if checkopt(b'cleanup'):
6501 if pats:
6501 if pats:
6502 raise error.InputError(
6502 raise error.InputError(
6503 _(b"cannot specify names when using '--cleanup'")
6503 _(b"cannot specify names when using '--cleanup'")
6504 )
6504 )
6505 return shelvemod.cleanupcmd(ui, repo)
6505 return shelvemod.cleanupcmd(ui, repo)
6506 elif checkopt(b'delete'):
6506 elif checkopt(b'delete'):
6507 return shelvemod.deletecmd(ui, repo, pats)
6507 return shelvemod.deletecmd(ui, repo, pats)
6508 elif checkopt(b'list'):
6508 elif checkopt(b'list'):
6509 return shelvemod.listcmd(ui, repo, pats, opts)
6509 return shelvemod.listcmd(ui, repo, pats, opts)
6510 elif checkopt(b'patch') or checkopt(b'stat'):
6510 elif checkopt(b'patch') or checkopt(b'stat'):
6511 return shelvemod.patchcmds(ui, repo, pats, opts)
6511 return shelvemod.patchcmds(ui, repo, pats, opts)
6512 else:
6512 else:
6513 return shelvemod.createcmd(ui, repo, pats, opts)
6513 return shelvemod.createcmd(ui, repo, pats, opts)
6514
6514
6515
6515
6516 _NOTTERSE = b'nothing'
6516 _NOTTERSE = b'nothing'
6517
6517
6518
6518
6519 @command(
6519 @command(
6520 b'status|st',
6520 b'status|st',
6521 [
6521 [
6522 (b'A', b'all', None, _(b'show status of all files')),
6522 (b'A', b'all', None, _(b'show status of all files')),
6523 (b'm', b'modified', None, _(b'show only modified files')),
6523 (b'm', b'modified', None, _(b'show only modified files')),
6524 (b'a', b'added', None, _(b'show only added files')),
6524 (b'a', b'added', None, _(b'show only added files')),
6525 (b'r', b'removed', None, _(b'show only removed files')),
6525 (b'r', b'removed', None, _(b'show only removed files')),
6526 (b'd', b'deleted', None, _(b'show only missing files')),
6526 (b'd', b'deleted', None, _(b'show only missing files')),
6527 (b'c', b'clean', None, _(b'show only files without changes')),
6527 (b'c', b'clean', None, _(b'show only files without changes')),
6528 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6528 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6529 (b'i', b'ignored', None, _(b'show only ignored files')),
6529 (b'i', b'ignored', None, _(b'show only ignored files')),
6530 (b'n', b'no-status', None, _(b'hide status prefix')),
6530 (b'n', b'no-status', None, _(b'hide status prefix')),
6531 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6531 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6532 (
6532 (
6533 b'C',
6533 b'C',
6534 b'copies',
6534 b'copies',
6535 None,
6535 None,
6536 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6536 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6537 ),
6537 ),
6538 (
6538 (
6539 b'0',
6539 b'0',
6540 b'print0',
6540 b'print0',
6541 None,
6541 None,
6542 _(b'end filenames with NUL, for use with xargs'),
6542 _(b'end filenames with NUL, for use with xargs'),
6543 ),
6543 ),
6544 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6544 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6545 (
6545 (
6546 b'',
6546 b'',
6547 b'change',
6547 b'change',
6548 b'',
6548 b'',
6549 _(b'list the changed files of a revision'),
6549 _(b'list the changed files of a revision'),
6550 _(b'REV'),
6550 _(b'REV'),
6551 ),
6551 ),
6552 ]
6552 ]
6553 + walkopts
6553 + walkopts
6554 + subrepoopts
6554 + subrepoopts
6555 + formatteropts,
6555 + formatteropts,
6556 _(b'[OPTION]... [FILE]...'),
6556 _(b'[OPTION]... [FILE]...'),
6557 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6557 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6558 helpbasic=True,
6558 helpbasic=True,
6559 inferrepo=True,
6559 inferrepo=True,
6560 intents={INTENT_READONLY},
6560 intents={INTENT_READONLY},
6561 )
6561 )
6562 def status(ui, repo, *pats, **opts):
6562 def status(ui, repo, *pats, **opts):
6563 """show changed files in the working directory
6563 """show changed files in the working directory
6564
6564
6565 Show status of files in the repository. If names are given, only
6565 Show status of files in the repository. If names are given, only
6566 files that match are shown. Files that are clean or ignored or
6566 files that match are shown. Files that are clean or ignored or
6567 the source of a copy/move operation, are not listed unless
6567 the source of a copy/move operation, are not listed unless
6568 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6568 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6569 Unless options described with "show only ..." are given, the
6569 Unless options described with "show only ..." are given, the
6570 options -mardu are used.
6570 options -mardu are used.
6571
6571
6572 Option -q/--quiet hides untracked (unknown and ignored) files
6572 Option -q/--quiet hides untracked (unknown and ignored) files
6573 unless explicitly requested with -u/--unknown or -i/--ignored.
6573 unless explicitly requested with -u/--unknown or -i/--ignored.
6574
6574
6575 .. note::
6575 .. note::
6576
6576
6577 :hg:`status` may appear to disagree with diff if permissions have
6577 :hg:`status` may appear to disagree with diff if permissions have
6578 changed or a merge has occurred. The standard diff format does
6578 changed or a merge has occurred. The standard diff format does
6579 not report permission changes and diff only reports changes
6579 not report permission changes and diff only reports changes
6580 relative to one merge parent.
6580 relative to one merge parent.
6581
6581
6582 If one revision is given, it is used as the base revision.
6582 If one revision is given, it is used as the base revision.
6583 If two revisions are given, the differences between them are
6583 If two revisions are given, the differences between them are
6584 shown. The --change option can also be used as a shortcut to list
6584 shown. The --change option can also be used as a shortcut to list
6585 the changed files of a revision from its first parent.
6585 the changed files of a revision from its first parent.
6586
6586
6587 The codes used to show the status of files are::
6587 The codes used to show the status of files are::
6588
6588
6589 M = modified
6589 M = modified
6590 A = added
6590 A = added
6591 R = removed
6591 R = removed
6592 C = clean
6592 C = clean
6593 ! = missing (deleted by non-hg command, but still tracked)
6593 ! = missing (deleted by non-hg command, but still tracked)
6594 ? = not tracked
6594 ? = not tracked
6595 I = ignored
6595 I = ignored
6596 = origin of the previous file (with --copies)
6596 = origin of the previous file (with --copies)
6597
6597
6598 .. container:: verbose
6598 .. container:: verbose
6599
6599
6600 The -t/--terse option abbreviates the output by showing only the directory
6600 The -t/--terse option abbreviates the output by showing only the directory
6601 name if all the files in it share the same status. The option takes an
6601 name if all the files in it share the same status. The option takes an
6602 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6602 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6603 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6603 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6604 for 'ignored' and 'c' for clean.
6604 for 'ignored' and 'c' for clean.
6605
6605
6606 It abbreviates only those statuses which are passed. Note that clean and
6606 It abbreviates only those statuses which are passed. Note that clean and
6607 ignored files are not displayed with '--terse ic' unless the -c/--clean
6607 ignored files are not displayed with '--terse ic' unless the -c/--clean
6608 and -i/--ignored options are also used.
6608 and -i/--ignored options are also used.
6609
6609
6610 The -v/--verbose option shows information when the repository is in an
6610 The -v/--verbose option shows information when the repository is in an
6611 unfinished merge, shelve, rebase state etc. You can have this behavior
6611 unfinished merge, shelve, rebase state etc. You can have this behavior
6612 turned on by default by enabling the ``commands.status.verbose`` option.
6612 turned on by default by enabling the ``commands.status.verbose`` option.
6613
6613
6614 You can skip displaying some of these states by setting
6614 You can skip displaying some of these states by setting
6615 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6615 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6616 'histedit', 'merge', 'rebase', or 'unshelve'.
6616 'histedit', 'merge', 'rebase', or 'unshelve'.
6617
6617
6618 Template:
6618 Template:
6619
6619
6620 The following keywords are supported in addition to the common template
6620 The following keywords are supported in addition to the common template
6621 keywords and functions. See also :hg:`help templates`.
6621 keywords and functions. See also :hg:`help templates`.
6622
6622
6623 :path: String. Repository-absolute path of the file.
6623 :path: String. Repository-absolute path of the file.
6624 :source: String. Repository-absolute path of the file originated from.
6624 :source: String. Repository-absolute path of the file originated from.
6625 Available if ``--copies`` is specified.
6625 Available if ``--copies`` is specified.
6626 :status: String. Character denoting file's status.
6626 :status: String. Character denoting file's status.
6627
6627
6628 Examples:
6628 Examples:
6629
6629
6630 - show changes in the working directory relative to a
6630 - show changes in the working directory relative to a
6631 changeset::
6631 changeset::
6632
6632
6633 hg status --rev 9353
6633 hg status --rev 9353
6634
6634
6635 - show changes in the working directory relative to the
6635 - show changes in the working directory relative to the
6636 current directory (see :hg:`help patterns` for more information)::
6636 current directory (see :hg:`help patterns` for more information)::
6637
6637
6638 hg status re:
6638 hg status re:
6639
6639
6640 - show all changes including copies in an existing changeset::
6640 - show all changes including copies in an existing changeset::
6641
6641
6642 hg status --copies --change 9353
6642 hg status --copies --change 9353
6643
6643
6644 - get a NUL separated list of added files, suitable for xargs::
6644 - get a NUL separated list of added files, suitable for xargs::
6645
6645
6646 hg status -an0
6646 hg status -an0
6647
6647
6648 - show more information about the repository status, abbreviating
6648 - show more information about the repository status, abbreviating
6649 added, removed, modified, deleted, and untracked paths::
6649 added, removed, modified, deleted, and untracked paths::
6650
6650
6651 hg status -v -t mardu
6651 hg status -v -t mardu
6652
6652
6653 Returns 0 on success.
6653 Returns 0 on success.
6654
6654
6655 """
6655 """
6656
6656
6657 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6657 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6658 opts = pycompat.byteskwargs(opts)
6658 opts = pycompat.byteskwargs(opts)
6659 revs = opts.get(b'rev')
6659 revs = opts.get(b'rev')
6660 change = opts.get(b'change')
6660 change = opts.get(b'change')
6661 terse = opts.get(b'terse')
6661 terse = opts.get(b'terse')
6662 if terse is _NOTTERSE:
6662 if terse is _NOTTERSE:
6663 if revs:
6663 if revs:
6664 terse = b''
6664 terse = b''
6665 else:
6665 else:
6666 terse = ui.config(b'commands', b'status.terse')
6666 terse = ui.config(b'commands', b'status.terse')
6667
6667
6668 if revs and terse:
6668 if revs and terse:
6669 msg = _(b'cannot use --terse with --rev')
6669 msg = _(b'cannot use --terse with --rev')
6670 raise error.InputError(msg)
6670 raise error.InputError(msg)
6671 elif change:
6671 elif change:
6672 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6672 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6673 ctx2 = scmutil.revsingle(repo, change, None)
6673 ctx2 = scmutil.revsingle(repo, change, None)
6674 ctx1 = ctx2.p1()
6674 ctx1 = ctx2.p1()
6675 else:
6675 else:
6676 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6676 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6677 ctx1, ctx2 = scmutil.revpair(repo, revs)
6677 ctx1, ctx2 = scmutil.revpair(repo, revs)
6678
6678
6679 forcerelativevalue = None
6679 forcerelativevalue = None
6680 if ui.hasconfig(b'commands', b'status.relative'):
6680 if ui.hasconfig(b'commands', b'status.relative'):
6681 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6681 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6682 uipathfn = scmutil.getuipathfn(
6682 uipathfn = scmutil.getuipathfn(
6683 repo,
6683 repo,
6684 legacyrelativevalue=bool(pats),
6684 legacyrelativevalue=bool(pats),
6685 forcerelativevalue=forcerelativevalue,
6685 forcerelativevalue=forcerelativevalue,
6686 )
6686 )
6687
6687
6688 if opts.get(b'print0'):
6688 if opts.get(b'print0'):
6689 end = b'\0'
6689 end = b'\0'
6690 else:
6690 else:
6691 end = b'\n'
6691 end = b'\n'
6692 states = b'modified added removed deleted unknown ignored clean'.split()
6692 states = b'modified added removed deleted unknown ignored clean'.split()
6693 show = [k for k in states if opts.get(k)]
6693 show = [k for k in states if opts.get(k)]
6694 if opts.get(b'all'):
6694 if opts.get(b'all'):
6695 show += ui.quiet and (states[:4] + [b'clean']) or states
6695 show += ui.quiet and (states[:4] + [b'clean']) or states
6696
6696
6697 if not show:
6697 if not show:
6698 if ui.quiet:
6698 if ui.quiet:
6699 show = states[:4]
6699 show = states[:4]
6700 else:
6700 else:
6701 show = states[:5]
6701 show = states[:5]
6702
6702
6703 m = scmutil.match(ctx2, pats, opts)
6703 m = scmutil.match(ctx2, pats, opts)
6704 if terse:
6704 if terse:
6705 # we need to compute clean and unknown to terse
6705 # we need to compute clean and unknown to terse
6706 stat = repo.status(
6706 stat = repo.status(
6707 ctx1.node(),
6707 ctx1.node(),
6708 ctx2.node(),
6708 ctx2.node(),
6709 m,
6709 m,
6710 b'ignored' in show or b'i' in terse,
6710 b'ignored' in show or b'i' in terse,
6711 clean=True,
6711 clean=True,
6712 unknown=True,
6712 unknown=True,
6713 listsubrepos=opts.get(b'subrepos'),
6713 listsubrepos=opts.get(b'subrepos'),
6714 )
6714 )
6715
6715
6716 stat = cmdutil.tersedir(stat, terse)
6716 stat = cmdutil.tersedir(stat, terse)
6717 else:
6717 else:
6718 stat = repo.status(
6718 stat = repo.status(
6719 ctx1.node(),
6719 ctx1.node(),
6720 ctx2.node(),
6720 ctx2.node(),
6721 m,
6721 m,
6722 b'ignored' in show,
6722 b'ignored' in show,
6723 b'clean' in show,
6723 b'clean' in show,
6724 b'unknown' in show,
6724 b'unknown' in show,
6725 opts.get(b'subrepos'),
6725 opts.get(b'subrepos'),
6726 )
6726 )
6727
6727
6728 changestates = zip(
6728 changestates = zip(
6729 states,
6729 states,
6730 pycompat.iterbytestr(b'MAR!?IC'),
6730 pycompat.iterbytestr(b'MAR!?IC'),
6731 [getattr(stat, s.decode('utf8')) for s in states],
6731 [getattr(stat, s.decode('utf8')) for s in states],
6732 )
6732 )
6733
6733
6734 copy = {}
6734 copy = {}
6735 if (
6735 if (
6736 opts.get(b'all')
6736 opts.get(b'all')
6737 or opts.get(b'copies')
6737 or opts.get(b'copies')
6738 or ui.configbool(b'ui', b'statuscopies')
6738 or ui.configbool(b'ui', b'statuscopies')
6739 ) and not opts.get(b'no_status'):
6739 ) and not opts.get(b'no_status'):
6740 copy = copies.pathcopies(ctx1, ctx2, m)
6740 copy = copies.pathcopies(ctx1, ctx2, m)
6741
6741
6742 morestatus = None
6742 morestatus = None
6743 if (
6743 if (
6744 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6744 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6745 ) and not ui.plain():
6745 ) and not ui.plain():
6746 morestatus = cmdutil.readmorestatus(repo)
6746 morestatus = cmdutil.readmorestatus(repo)
6747
6747
6748 ui.pager(b'status')
6748 ui.pager(b'status')
6749 fm = ui.formatter(b'status', opts)
6749 fm = ui.formatter(b'status', opts)
6750 fmt = b'%s' + end
6750 fmt = b'%s' + end
6751 showchar = not opts.get(b'no_status')
6751 showchar = not opts.get(b'no_status')
6752
6752
6753 for state, char, files in changestates:
6753 for state, char, files in changestates:
6754 if state in show:
6754 if state in show:
6755 label = b'status.' + state
6755 label = b'status.' + state
6756 for f in files:
6756 for f in files:
6757 fm.startitem()
6757 fm.startitem()
6758 fm.context(ctx=ctx2)
6758 fm.context(ctx=ctx2)
6759 fm.data(itemtype=b'file', path=f)
6759 fm.data(itemtype=b'file', path=f)
6760 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6760 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6761 fm.plain(fmt % uipathfn(f), label=label)
6761 fm.plain(fmt % uipathfn(f), label=label)
6762 if f in copy:
6762 if f in copy:
6763 fm.data(source=copy[f])
6763 fm.data(source=copy[f])
6764 fm.plain(
6764 fm.plain(
6765 (b' %s' + end) % uipathfn(copy[f]),
6765 (b' %s' + end) % uipathfn(copy[f]),
6766 label=b'status.copied',
6766 label=b'status.copied',
6767 )
6767 )
6768 if morestatus:
6768 if morestatus:
6769 morestatus.formatfile(f, fm)
6769 morestatus.formatfile(f, fm)
6770
6770
6771 if morestatus:
6771 if morestatus:
6772 morestatus.formatfooter(fm)
6772 morestatus.formatfooter(fm)
6773 fm.end()
6773 fm.end()
6774
6774
6775
6775
6776 @command(
6776 @command(
6777 b'summary|sum',
6777 b'summary|sum',
6778 [(b'', b'remote', None, _(b'check for push and pull'))],
6778 [(b'', b'remote', None, _(b'check for push and pull'))],
6779 b'[--remote]',
6779 b'[--remote]',
6780 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6780 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6781 helpbasic=True,
6781 helpbasic=True,
6782 intents={INTENT_READONLY},
6782 intents={INTENT_READONLY},
6783 )
6783 )
6784 def summary(ui, repo, **opts):
6784 def summary(ui, repo, **opts):
6785 """summarize working directory state
6785 """summarize working directory state
6786
6786
6787 This generates a brief summary of the working directory state,
6787 This generates a brief summary of the working directory state,
6788 including parents, branch, commit status, phase and available updates.
6788 including parents, branch, commit status, phase and available updates.
6789
6789
6790 With the --remote option, this will check the default paths for
6790 With the --remote option, this will check the default paths for
6791 incoming and outgoing changes. This can be time-consuming.
6791 incoming and outgoing changes. This can be time-consuming.
6792
6792
6793 Returns 0 on success.
6793 Returns 0 on success.
6794 """
6794 """
6795
6795
6796 opts = pycompat.byteskwargs(opts)
6796 opts = pycompat.byteskwargs(opts)
6797 ui.pager(b'summary')
6797 ui.pager(b'summary')
6798 ctx = repo[None]
6798 ctx = repo[None]
6799 parents = ctx.parents()
6799 parents = ctx.parents()
6800 pnode = parents[0].node()
6800 pnode = parents[0].node()
6801 marks = []
6801 marks = []
6802
6802
6803 try:
6803 try:
6804 ms = mergestatemod.mergestate.read(repo)
6804 ms = mergestatemod.mergestate.read(repo)
6805 except error.UnsupportedMergeRecords as e:
6805 except error.UnsupportedMergeRecords as e:
6806 s = b' '.join(e.recordtypes)
6806 s = b' '.join(e.recordtypes)
6807 ui.warn(
6807 ui.warn(
6808 _(b'warning: merge state has unsupported record types: %s\n') % s
6808 _(b'warning: merge state has unsupported record types: %s\n') % s
6809 )
6809 )
6810 unresolved = []
6810 unresolved = []
6811 else:
6811 else:
6812 unresolved = list(ms.unresolved())
6812 unresolved = list(ms.unresolved())
6813
6813
6814 for p in parents:
6814 for p in parents:
6815 # label with log.changeset (instead of log.parent) since this
6815 # label with log.changeset (instead of log.parent) since this
6816 # shows a working directory parent *changeset*:
6816 # shows a working directory parent *changeset*:
6817 # i18n: column positioning for "hg summary"
6817 # i18n: column positioning for "hg summary"
6818 ui.write(
6818 ui.write(
6819 _(b'parent: %d:%s ') % (p.rev(), p),
6819 _(b'parent: %d:%s ') % (p.rev(), p),
6820 label=logcmdutil.changesetlabels(p),
6820 label=logcmdutil.changesetlabels(p),
6821 )
6821 )
6822 ui.write(b' '.join(p.tags()), label=b'log.tag')
6822 ui.write(b' '.join(p.tags()), label=b'log.tag')
6823 if p.bookmarks():
6823 if p.bookmarks():
6824 marks.extend(p.bookmarks())
6824 marks.extend(p.bookmarks())
6825 if p.rev() == -1:
6825 if p.rev() == -1:
6826 if not len(repo):
6826 if not len(repo):
6827 ui.write(_(b' (empty repository)'))
6827 ui.write(_(b' (empty repository)'))
6828 else:
6828 else:
6829 ui.write(_(b' (no revision checked out)'))
6829 ui.write(_(b' (no revision checked out)'))
6830 if p.obsolete():
6830 if p.obsolete():
6831 ui.write(_(b' (obsolete)'))
6831 ui.write(_(b' (obsolete)'))
6832 if p.isunstable():
6832 if p.isunstable():
6833 instabilities = (
6833 instabilities = (
6834 ui.label(instability, b'trouble.%s' % instability)
6834 ui.label(instability, b'trouble.%s' % instability)
6835 for instability in p.instabilities()
6835 for instability in p.instabilities()
6836 )
6836 )
6837 ui.write(b' (' + b', '.join(instabilities) + b')')
6837 ui.write(b' (' + b', '.join(instabilities) + b')')
6838 ui.write(b'\n')
6838 ui.write(b'\n')
6839 if p.description():
6839 if p.description():
6840 ui.status(
6840 ui.status(
6841 b' ' + p.description().splitlines()[0].strip() + b'\n',
6841 b' ' + p.description().splitlines()[0].strip() + b'\n',
6842 label=b'log.summary',
6842 label=b'log.summary',
6843 )
6843 )
6844
6844
6845 branch = ctx.branch()
6845 branch = ctx.branch()
6846 bheads = repo.branchheads(branch)
6846 bheads = repo.branchheads(branch)
6847 # i18n: column positioning for "hg summary"
6847 # i18n: column positioning for "hg summary"
6848 m = _(b'branch: %s\n') % branch
6848 m = _(b'branch: %s\n') % branch
6849 if branch != b'default':
6849 if branch != b'default':
6850 ui.write(m, label=b'log.branch')
6850 ui.write(m, label=b'log.branch')
6851 else:
6851 else:
6852 ui.status(m, label=b'log.branch')
6852 ui.status(m, label=b'log.branch')
6853
6853
6854 if marks:
6854 if marks:
6855 active = repo._activebookmark
6855 active = repo._activebookmark
6856 # i18n: column positioning for "hg summary"
6856 # i18n: column positioning for "hg summary"
6857 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6857 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6858 if active is not None:
6858 if active is not None:
6859 if active in marks:
6859 if active in marks:
6860 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6860 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6861 marks.remove(active)
6861 marks.remove(active)
6862 else:
6862 else:
6863 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6863 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6864 for m in marks:
6864 for m in marks:
6865 ui.write(b' ' + m, label=b'log.bookmark')
6865 ui.write(b' ' + m, label=b'log.bookmark')
6866 ui.write(b'\n', label=b'log.bookmark')
6866 ui.write(b'\n', label=b'log.bookmark')
6867
6867
6868 status = repo.status(unknown=True)
6868 status = repo.status(unknown=True)
6869
6869
6870 c = repo.dirstate.copies()
6870 c = repo.dirstate.copies()
6871 copied, renamed = [], []
6871 copied, renamed = [], []
6872 for d, s in pycompat.iteritems(c):
6872 for d, s in pycompat.iteritems(c):
6873 if s in status.removed:
6873 if s in status.removed:
6874 status.removed.remove(s)
6874 status.removed.remove(s)
6875 renamed.append(d)
6875 renamed.append(d)
6876 else:
6876 else:
6877 copied.append(d)
6877 copied.append(d)
6878 if d in status.added:
6878 if d in status.added:
6879 status.added.remove(d)
6879 status.added.remove(d)
6880
6880
6881 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6881 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6882
6882
6883 labels = [
6883 labels = [
6884 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6884 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
6885 (ui.label(_(b'%d added'), b'status.added'), status.added),
6885 (ui.label(_(b'%d added'), b'status.added'), status.added),
6886 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6886 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
6887 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6887 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
6888 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6888 (ui.label(_(b'%d copied'), b'status.copied'), copied),
6889 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6889 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
6890 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6890 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
6891 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6891 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
6892 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6892 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
6893 ]
6893 ]
6894 t = []
6894 t = []
6895 for l, s in labels:
6895 for l, s in labels:
6896 if s:
6896 if s:
6897 t.append(l % len(s))
6897 t.append(l % len(s))
6898
6898
6899 t = b', '.join(t)
6899 t = b', '.join(t)
6900 cleanworkdir = False
6900 cleanworkdir = False
6901
6901
6902 if repo.vfs.exists(b'graftstate'):
6902 if repo.vfs.exists(b'graftstate'):
6903 t += _(b' (graft in progress)')
6903 t += _(b' (graft in progress)')
6904 if repo.vfs.exists(b'updatestate'):
6904 if repo.vfs.exists(b'updatestate'):
6905 t += _(b' (interrupted update)')
6905 t += _(b' (interrupted update)')
6906 elif len(parents) > 1:
6906 elif len(parents) > 1:
6907 t += _(b' (merge)')
6907 t += _(b' (merge)')
6908 elif branch != parents[0].branch():
6908 elif branch != parents[0].branch():
6909 t += _(b' (new branch)')
6909 t += _(b' (new branch)')
6910 elif parents[0].closesbranch() and pnode in repo.branchheads(
6910 elif parents[0].closesbranch() and pnode in repo.branchheads(
6911 branch, closed=True
6911 branch, closed=True
6912 ):
6912 ):
6913 t += _(b' (head closed)')
6913 t += _(b' (head closed)')
6914 elif not (
6914 elif not (
6915 status.modified
6915 status.modified
6916 or status.added
6916 or status.added
6917 or status.removed
6917 or status.removed
6918 or renamed
6918 or renamed
6919 or copied
6919 or copied
6920 or subs
6920 or subs
6921 ):
6921 ):
6922 t += _(b' (clean)')
6922 t += _(b' (clean)')
6923 cleanworkdir = True
6923 cleanworkdir = True
6924 elif pnode not in bheads:
6924 elif pnode not in bheads:
6925 t += _(b' (new branch head)')
6925 t += _(b' (new branch head)')
6926
6926
6927 if parents:
6927 if parents:
6928 pendingphase = max(p.phase() for p in parents)
6928 pendingphase = max(p.phase() for p in parents)
6929 else:
6929 else:
6930 pendingphase = phases.public
6930 pendingphase = phases.public
6931
6931
6932 if pendingphase > phases.newcommitphase(ui):
6932 if pendingphase > phases.newcommitphase(ui):
6933 t += b' (%s)' % phases.phasenames[pendingphase]
6933 t += b' (%s)' % phases.phasenames[pendingphase]
6934
6934
6935 if cleanworkdir:
6935 if cleanworkdir:
6936 # i18n: column positioning for "hg summary"
6936 # i18n: column positioning for "hg summary"
6937 ui.status(_(b'commit: %s\n') % t.strip())
6937 ui.status(_(b'commit: %s\n') % t.strip())
6938 else:
6938 else:
6939 # i18n: column positioning for "hg summary"
6939 # i18n: column positioning for "hg summary"
6940 ui.write(_(b'commit: %s\n') % t.strip())
6940 ui.write(_(b'commit: %s\n') % t.strip())
6941
6941
6942 # all ancestors of branch heads - all ancestors of parent = new csets
6942 # all ancestors of branch heads - all ancestors of parent = new csets
6943 new = len(
6943 new = len(
6944 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6944 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
6945 )
6945 )
6946
6946
6947 if new == 0:
6947 if new == 0:
6948 # i18n: column positioning for "hg summary"
6948 # i18n: column positioning for "hg summary"
6949 ui.status(_(b'update: (current)\n'))
6949 ui.status(_(b'update: (current)\n'))
6950 elif pnode not in bheads:
6950 elif pnode not in bheads:
6951 # i18n: column positioning for "hg summary"
6951 # i18n: column positioning for "hg summary"
6952 ui.write(_(b'update: %d new changesets (update)\n') % new)
6952 ui.write(_(b'update: %d new changesets (update)\n') % new)
6953 else:
6953 else:
6954 # i18n: column positioning for "hg summary"
6954 # i18n: column positioning for "hg summary"
6955 ui.write(
6955 ui.write(
6956 _(b'update: %d new changesets, %d branch heads (merge)\n')
6956 _(b'update: %d new changesets, %d branch heads (merge)\n')
6957 % (new, len(bheads))
6957 % (new, len(bheads))
6958 )
6958 )
6959
6959
6960 t = []
6960 t = []
6961 draft = len(repo.revs(b'draft()'))
6961 draft = len(repo.revs(b'draft()'))
6962 if draft:
6962 if draft:
6963 t.append(_(b'%d draft') % draft)
6963 t.append(_(b'%d draft') % draft)
6964 secret = len(repo.revs(b'secret()'))
6964 secret = len(repo.revs(b'secret()'))
6965 if secret:
6965 if secret:
6966 t.append(_(b'%d secret') % secret)
6966 t.append(_(b'%d secret') % secret)
6967
6967
6968 if draft or secret:
6968 if draft or secret:
6969 ui.status(_(b'phases: %s\n') % b', '.join(t))
6969 ui.status(_(b'phases: %s\n') % b', '.join(t))
6970
6970
6971 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6971 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6972 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
6972 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
6973 numtrouble = len(repo.revs(trouble + b"()"))
6973 numtrouble = len(repo.revs(trouble + b"()"))
6974 # We write all the possibilities to ease translation
6974 # We write all the possibilities to ease translation
6975 troublemsg = {
6975 troublemsg = {
6976 b"orphan": _(b"orphan: %d changesets"),
6976 b"orphan": _(b"orphan: %d changesets"),
6977 b"contentdivergent": _(b"content-divergent: %d changesets"),
6977 b"contentdivergent": _(b"content-divergent: %d changesets"),
6978 b"phasedivergent": _(b"phase-divergent: %d changesets"),
6978 b"phasedivergent": _(b"phase-divergent: %d changesets"),
6979 }
6979 }
6980 if numtrouble > 0:
6980 if numtrouble > 0:
6981 ui.status(troublemsg[trouble] % numtrouble + b"\n")
6981 ui.status(troublemsg[trouble] % numtrouble + b"\n")
6982
6982
6983 cmdutil.summaryhooks(ui, repo)
6983 cmdutil.summaryhooks(ui, repo)
6984
6984
6985 if opts.get(b'remote'):
6985 if opts.get(b'remote'):
6986 needsincoming, needsoutgoing = True, True
6986 needsincoming, needsoutgoing = True, True
6987 else:
6987 else:
6988 needsincoming, needsoutgoing = False, False
6988 needsincoming, needsoutgoing = False, False
6989 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6989 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6990 if i:
6990 if i:
6991 needsincoming = True
6991 needsincoming = True
6992 if o:
6992 if o:
6993 needsoutgoing = True
6993 needsoutgoing = True
6994 if not needsincoming and not needsoutgoing:
6994 if not needsincoming and not needsoutgoing:
6995 return
6995 return
6996
6996
6997 def getincoming():
6997 def getincoming():
6998 source, branches = hg.parseurl(ui.expandpath(b'default'))
6998 source, branches = hg.parseurl(ui.expandpath(b'default'))
6999 sbranch = branches[0]
6999 sbranch = branches[0]
7000 try:
7000 try:
7001 other = hg.peer(repo, {}, source)
7001 other = hg.peer(repo, {}, source)
7002 except error.RepoError:
7002 except error.RepoError:
7003 if opts.get(b'remote'):
7003 if opts.get(b'remote'):
7004 raise
7004 raise
7005 return source, sbranch, None, None, None
7005 return source, sbranch, None, None, None
7006 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7006 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7007 if revs:
7007 if revs:
7008 revs = [other.lookup(rev) for rev in revs]
7008 revs = [other.lookup(rev) for rev in revs]
7009 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7009 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7010 repo.ui.pushbuffer()
7010 repo.ui.pushbuffer()
7011 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7011 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7012 repo.ui.popbuffer()
7012 repo.ui.popbuffer()
7013 return source, sbranch, other, commoninc, commoninc[1]
7013 return source, sbranch, other, commoninc, commoninc[1]
7014
7014
7015 if needsincoming:
7015 if needsincoming:
7016 source, sbranch, sother, commoninc, incoming = getincoming()
7016 source, sbranch, sother, commoninc, incoming = getincoming()
7017 else:
7017 else:
7018 source = sbranch = sother = commoninc = incoming = None
7018 source = sbranch = sother = commoninc = incoming = None
7019
7019
7020 def getoutgoing():
7020 def getoutgoing():
7021 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7021 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7022 dbranch = branches[0]
7022 dbranch = branches[0]
7023 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7023 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7024 if source != dest:
7024 if source != dest:
7025 try:
7025 try:
7026 dother = hg.peer(repo, {}, dest)
7026 dother = hg.peer(repo, {}, dest)
7027 except error.RepoError:
7027 except error.RepoError:
7028 if opts.get(b'remote'):
7028 if opts.get(b'remote'):
7029 raise
7029 raise
7030 return dest, dbranch, None, None
7030 return dest, dbranch, None, None
7031 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7031 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7032 elif sother is None:
7032 elif sother is None:
7033 # there is no explicit destination peer, but source one is invalid
7033 # there is no explicit destination peer, but source one is invalid
7034 return dest, dbranch, None, None
7034 return dest, dbranch, None, None
7035 else:
7035 else:
7036 dother = sother
7036 dother = sother
7037 if source != dest or (sbranch is not None and sbranch != dbranch):
7037 if source != dest or (sbranch is not None and sbranch != dbranch):
7038 common = None
7038 common = None
7039 else:
7039 else:
7040 common = commoninc
7040 common = commoninc
7041 if revs:
7041 if revs:
7042 revs = [repo.lookup(rev) for rev in revs]
7042 revs = [repo.lookup(rev) for rev in revs]
7043 repo.ui.pushbuffer()
7043 repo.ui.pushbuffer()
7044 outgoing = discovery.findcommonoutgoing(
7044 outgoing = discovery.findcommonoutgoing(
7045 repo, dother, onlyheads=revs, commoninc=common
7045 repo, dother, onlyheads=revs, commoninc=common
7046 )
7046 )
7047 repo.ui.popbuffer()
7047 repo.ui.popbuffer()
7048 return dest, dbranch, dother, outgoing
7048 return dest, dbranch, dother, outgoing
7049
7049
7050 if needsoutgoing:
7050 if needsoutgoing:
7051 dest, dbranch, dother, outgoing = getoutgoing()
7051 dest, dbranch, dother, outgoing = getoutgoing()
7052 else:
7052 else:
7053 dest = dbranch = dother = outgoing = None
7053 dest = dbranch = dother = outgoing = None
7054
7054
7055 if opts.get(b'remote'):
7055 if opts.get(b'remote'):
7056 t = []
7056 t = []
7057 if incoming:
7057 if incoming:
7058 t.append(_(b'1 or more incoming'))
7058 t.append(_(b'1 or more incoming'))
7059 o = outgoing.missing
7059 o = outgoing.missing
7060 if o:
7060 if o:
7061 t.append(_(b'%d outgoing') % len(o))
7061 t.append(_(b'%d outgoing') % len(o))
7062 other = dother or sother
7062 other = dother or sother
7063 if b'bookmarks' in other.listkeys(b'namespaces'):
7063 if b'bookmarks' in other.listkeys(b'namespaces'):
7064 counts = bookmarks.summary(repo, other)
7064 counts = bookmarks.summary(repo, other)
7065 if counts[0] > 0:
7065 if counts[0] > 0:
7066 t.append(_(b'%d incoming bookmarks') % counts[0])
7066 t.append(_(b'%d incoming bookmarks') % counts[0])
7067 if counts[1] > 0:
7067 if counts[1] > 0:
7068 t.append(_(b'%d outgoing bookmarks') % counts[1])
7068 t.append(_(b'%d outgoing bookmarks') % counts[1])
7069
7069
7070 if t:
7070 if t:
7071 # i18n: column positioning for "hg summary"
7071 # i18n: column positioning for "hg summary"
7072 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7072 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7073 else:
7073 else:
7074 # i18n: column positioning for "hg summary"
7074 # i18n: column positioning for "hg summary"
7075 ui.status(_(b'remote: (synced)\n'))
7075 ui.status(_(b'remote: (synced)\n'))
7076
7076
7077 cmdutil.summaryremotehooks(
7077 cmdutil.summaryremotehooks(
7078 ui,
7078 ui,
7079 repo,
7079 repo,
7080 opts,
7080 opts,
7081 (
7081 (
7082 (source, sbranch, sother, commoninc),
7082 (source, sbranch, sother, commoninc),
7083 (dest, dbranch, dother, outgoing),
7083 (dest, dbranch, dother, outgoing),
7084 ),
7084 ),
7085 )
7085 )
7086
7086
7087
7087
7088 @command(
7088 @command(
7089 b'tag',
7089 b'tag',
7090 [
7090 [
7091 (b'f', b'force', None, _(b'force tag')),
7091 (b'f', b'force', None, _(b'force tag')),
7092 (b'l', b'local', None, _(b'make the tag local')),
7092 (b'l', b'local', None, _(b'make the tag local')),
7093 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7093 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7094 (b'', b'remove', None, _(b'remove a tag')),
7094 (b'', b'remove', None, _(b'remove a tag')),
7095 # -l/--local is already there, commitopts cannot be used
7095 # -l/--local is already there, commitopts cannot be used
7096 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7096 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7097 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7097 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7098 ]
7098 ]
7099 + commitopts2,
7099 + commitopts2,
7100 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7100 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7101 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7101 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7102 )
7102 )
7103 def tag(ui, repo, name1, *names, **opts):
7103 def tag(ui, repo, name1, *names, **opts):
7104 """add one or more tags for the current or given revision
7104 """add one or more tags for the current or given revision
7105
7105
7106 Name a particular revision using <name>.
7106 Name a particular revision using <name>.
7107
7107
7108 Tags are used to name particular revisions of the repository and are
7108 Tags are used to name particular revisions of the repository and are
7109 very useful to compare different revisions, to go back to significant
7109 very useful to compare different revisions, to go back to significant
7110 earlier versions or to mark branch points as releases, etc. Changing
7110 earlier versions or to mark branch points as releases, etc. Changing
7111 an existing tag is normally disallowed; use -f/--force to override.
7111 an existing tag is normally disallowed; use -f/--force to override.
7112
7112
7113 If no revision is given, the parent of the working directory is
7113 If no revision is given, the parent of the working directory is
7114 used.
7114 used.
7115
7115
7116 To facilitate version control, distribution, and merging of tags,
7116 To facilitate version control, distribution, and merging of tags,
7117 they are stored as a file named ".hgtags" which is managed similarly
7117 they are stored as a file named ".hgtags" which is managed similarly
7118 to other project files and can be hand-edited if necessary. This
7118 to other project files and can be hand-edited if necessary. This
7119 also means that tagging creates a new commit. The file
7119 also means that tagging creates a new commit. The file
7120 ".hg/localtags" is used for local tags (not shared among
7120 ".hg/localtags" is used for local tags (not shared among
7121 repositories).
7121 repositories).
7122
7122
7123 Tag commits are usually made at the head of a branch. If the parent
7123 Tag commits are usually made at the head of a branch. If the parent
7124 of the working directory is not a branch head, :hg:`tag` aborts; use
7124 of the working directory is not a branch head, :hg:`tag` aborts; use
7125 -f/--force to force the tag commit to be based on a non-head
7125 -f/--force to force the tag commit to be based on a non-head
7126 changeset.
7126 changeset.
7127
7127
7128 See :hg:`help dates` for a list of formats valid for -d/--date.
7128 See :hg:`help dates` for a list of formats valid for -d/--date.
7129
7129
7130 Since tag names have priority over branch names during revision
7130 Since tag names have priority over branch names during revision
7131 lookup, using an existing branch name as a tag name is discouraged.
7131 lookup, using an existing branch name as a tag name is discouraged.
7132
7132
7133 Returns 0 on success.
7133 Returns 0 on success.
7134 """
7134 """
7135 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7135 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7136 opts = pycompat.byteskwargs(opts)
7136 opts = pycompat.byteskwargs(opts)
7137 with repo.wlock(), repo.lock():
7137 with repo.wlock(), repo.lock():
7138 rev_ = b"."
7138 rev_ = b"."
7139 names = [t.strip() for t in (name1,) + names]
7139 names = [t.strip() for t in (name1,) + names]
7140 if len(names) != len(set(names)):
7140 if len(names) != len(set(names)):
7141 raise error.InputError(_(b'tag names must be unique'))
7141 raise error.InputError(_(b'tag names must be unique'))
7142 for n in names:
7142 for n in names:
7143 scmutil.checknewlabel(repo, n, b'tag')
7143 scmutil.checknewlabel(repo, n, b'tag')
7144 if not n:
7144 if not n:
7145 raise error.InputError(
7145 raise error.InputError(
7146 _(b'tag names cannot consist entirely of whitespace')
7146 _(b'tag names cannot consist entirely of whitespace')
7147 )
7147 )
7148 if opts.get(b'rev'):
7148 if opts.get(b'rev'):
7149 rev_ = opts[b'rev']
7149 rev_ = opts[b'rev']
7150 message = opts.get(b'message')
7150 message = opts.get(b'message')
7151 if opts.get(b'remove'):
7151 if opts.get(b'remove'):
7152 if opts.get(b'local'):
7152 if opts.get(b'local'):
7153 expectedtype = b'local'
7153 expectedtype = b'local'
7154 else:
7154 else:
7155 expectedtype = b'global'
7155 expectedtype = b'global'
7156
7156
7157 for n in names:
7157 for n in names:
7158 if repo.tagtype(n) == b'global':
7158 if repo.tagtype(n) == b'global':
7159 alltags = tagsmod.findglobaltags(ui, repo)
7159 alltags = tagsmod.findglobaltags(ui, repo)
7160 if alltags[n][0] == nullid:
7160 if alltags[n][0] == nullid:
7161 raise error.InputError(
7161 raise error.InputError(
7162 _(b"tag '%s' is already removed") % n
7162 _(b"tag '%s' is already removed") % n
7163 )
7163 )
7164 if not repo.tagtype(n):
7164 if not repo.tagtype(n):
7165 raise error.InputError(_(b"tag '%s' does not exist") % n)
7165 raise error.InputError(_(b"tag '%s' does not exist") % n)
7166 if repo.tagtype(n) != expectedtype:
7166 if repo.tagtype(n) != expectedtype:
7167 if expectedtype == b'global':
7167 if expectedtype == b'global':
7168 raise error.InputError(
7168 raise error.InputError(
7169 _(b"tag '%s' is not a global tag") % n
7169 _(b"tag '%s' is not a global tag") % n
7170 )
7170 )
7171 else:
7171 else:
7172 raise error.InputError(
7172 raise error.InputError(
7173 _(b"tag '%s' is not a local tag") % n
7173 _(b"tag '%s' is not a local tag") % n
7174 )
7174 )
7175 rev_ = b'null'
7175 rev_ = b'null'
7176 if not message:
7176 if not message:
7177 # we don't translate commit messages
7177 # we don't translate commit messages
7178 message = b'Removed tag %s' % b', '.join(names)
7178 message = b'Removed tag %s' % b', '.join(names)
7179 elif not opts.get(b'force'):
7179 elif not opts.get(b'force'):
7180 for n in names:
7180 for n in names:
7181 if n in repo.tags():
7181 if n in repo.tags():
7182 raise error.InputError(
7182 raise error.InputError(
7183 _(b"tag '%s' already exists (use -f to force)") % n
7183 _(b"tag '%s' already exists (use -f to force)") % n
7184 )
7184 )
7185 if not opts.get(b'local'):
7185 if not opts.get(b'local'):
7186 p1, p2 = repo.dirstate.parents()
7186 p1, p2 = repo.dirstate.parents()
7187 if p2 != nullid:
7187 if p2 != nullid:
7188 raise error.StateError(_(b'uncommitted merge'))
7188 raise error.StateError(_(b'uncommitted merge'))
7189 bheads = repo.branchheads()
7189 bheads = repo.branchheads()
7190 if not opts.get(b'force') and bheads and p1 not in bheads:
7190 if not opts.get(b'force') and bheads and p1 not in bheads:
7191 raise error.InputError(
7191 raise error.InputError(
7192 _(
7192 _(
7193 b'working directory is not at a branch head '
7193 b'working directory is not at a branch head '
7194 b'(use -f to force)'
7194 b'(use -f to force)'
7195 )
7195 )
7196 )
7196 )
7197 node = scmutil.revsingle(repo, rev_).node()
7197 node = scmutil.revsingle(repo, rev_).node()
7198
7198
7199 if not message:
7199 if not message:
7200 # we don't translate commit messages
7200 # we don't translate commit messages
7201 message = b'Added tag %s for changeset %s' % (
7201 message = b'Added tag %s for changeset %s' % (
7202 b', '.join(names),
7202 b', '.join(names),
7203 short(node),
7203 short(node),
7204 )
7204 )
7205
7205
7206 date = opts.get(b'date')
7206 date = opts.get(b'date')
7207 if date:
7207 if date:
7208 date = dateutil.parsedate(date)
7208 date = dateutil.parsedate(date)
7209
7209
7210 if opts.get(b'remove'):
7210 if opts.get(b'remove'):
7211 editform = b'tag.remove'
7211 editform = b'tag.remove'
7212 else:
7212 else:
7213 editform = b'tag.add'
7213 editform = b'tag.add'
7214 editor = cmdutil.getcommiteditor(
7214 editor = cmdutil.getcommiteditor(
7215 editform=editform, **pycompat.strkwargs(opts)
7215 editform=editform, **pycompat.strkwargs(opts)
7216 )
7216 )
7217
7217
7218 # don't allow tagging the null rev
7218 # don't allow tagging the null rev
7219 if (
7219 if (
7220 not opts.get(b'remove')
7220 not opts.get(b'remove')
7221 and scmutil.revsingle(repo, rev_).rev() == nullrev
7221 and scmutil.revsingle(repo, rev_).rev() == nullrev
7222 ):
7222 ):
7223 raise error.InputError(_(b"cannot tag null revision"))
7223 raise error.InputError(_(b"cannot tag null revision"))
7224
7224
7225 tagsmod.tag(
7225 tagsmod.tag(
7226 repo,
7226 repo,
7227 names,
7227 names,
7228 node,
7228 node,
7229 message,
7229 message,
7230 opts.get(b'local'),
7230 opts.get(b'local'),
7231 opts.get(b'user'),
7231 opts.get(b'user'),
7232 date,
7232 date,
7233 editor=editor,
7233 editor=editor,
7234 )
7234 )
7235
7235
7236
7236
7237 @command(
7237 @command(
7238 b'tags',
7238 b'tags',
7239 formatteropts,
7239 formatteropts,
7240 b'',
7240 b'',
7241 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7241 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7242 intents={INTENT_READONLY},
7242 intents={INTENT_READONLY},
7243 )
7243 )
7244 def tags(ui, repo, **opts):
7244 def tags(ui, repo, **opts):
7245 """list repository tags
7245 """list repository tags
7246
7246
7247 This lists both regular and local tags. When the -v/--verbose
7247 This lists both regular and local tags. When the -v/--verbose
7248 switch is used, a third column "local" is printed for local tags.
7248 switch is used, a third column "local" is printed for local tags.
7249 When the -q/--quiet switch is used, only the tag name is printed.
7249 When the -q/--quiet switch is used, only the tag name is printed.
7250
7250
7251 .. container:: verbose
7251 .. container:: verbose
7252
7252
7253 Template:
7253 Template:
7254
7254
7255 The following keywords are supported in addition to the common template
7255 The following keywords are supported in addition to the common template
7256 keywords and functions such as ``{tag}``. See also
7256 keywords and functions such as ``{tag}``. See also
7257 :hg:`help templates`.
7257 :hg:`help templates`.
7258
7258
7259 :type: String. ``local`` for local tags.
7259 :type: String. ``local`` for local tags.
7260
7260
7261 Returns 0 on success.
7261 Returns 0 on success.
7262 """
7262 """
7263
7263
7264 opts = pycompat.byteskwargs(opts)
7264 opts = pycompat.byteskwargs(opts)
7265 ui.pager(b'tags')
7265 ui.pager(b'tags')
7266 fm = ui.formatter(b'tags', opts)
7266 fm = ui.formatter(b'tags', opts)
7267 hexfunc = fm.hexfunc
7267 hexfunc = fm.hexfunc
7268
7268
7269 for t, n in reversed(repo.tagslist()):
7269 for t, n in reversed(repo.tagslist()):
7270 hn = hexfunc(n)
7270 hn = hexfunc(n)
7271 label = b'tags.normal'
7271 label = b'tags.normal'
7272 tagtype = b''
7272 tagtype = b''
7273 if repo.tagtype(t) == b'local':
7273 if repo.tagtype(t) == b'local':
7274 label = b'tags.local'
7274 label = b'tags.local'
7275 tagtype = b'local'
7275 tagtype = b'local'
7276
7276
7277 fm.startitem()
7277 fm.startitem()
7278 fm.context(repo=repo)
7278 fm.context(repo=repo)
7279 fm.write(b'tag', b'%s', t, label=label)
7279 fm.write(b'tag', b'%s', t, label=label)
7280 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7280 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7281 fm.condwrite(
7281 fm.condwrite(
7282 not ui.quiet,
7282 not ui.quiet,
7283 b'rev node',
7283 b'rev node',
7284 fmt,
7284 fmt,
7285 repo.changelog.rev(n),
7285 repo.changelog.rev(n),
7286 hn,
7286 hn,
7287 label=label,
7287 label=label,
7288 )
7288 )
7289 fm.condwrite(
7289 fm.condwrite(
7290 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7290 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7291 )
7291 )
7292 fm.plain(b'\n')
7292 fm.plain(b'\n')
7293 fm.end()
7293 fm.end()
7294
7294
7295
7295
7296 @command(
7296 @command(
7297 b'tip',
7297 b'tip',
7298 [
7298 [
7299 (b'p', b'patch', None, _(b'show patch')),
7299 (b'p', b'patch', None, _(b'show patch')),
7300 (b'g', b'git', None, _(b'use git extended diff format')),
7300 (b'g', b'git', None, _(b'use git extended diff format')),
7301 ]
7301 ]
7302 + templateopts,
7302 + templateopts,
7303 _(b'[-p] [-g]'),
7303 _(b'[-p] [-g]'),
7304 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7304 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7305 )
7305 )
7306 def tip(ui, repo, **opts):
7306 def tip(ui, repo, **opts):
7307 """show the tip revision (DEPRECATED)
7307 """show the tip revision (DEPRECATED)
7308
7308
7309 The tip revision (usually just called the tip) is the changeset
7309 The tip revision (usually just called the tip) is the changeset
7310 most recently added to the repository (and therefore the most
7310 most recently added to the repository (and therefore the most
7311 recently changed head).
7311 recently changed head).
7312
7312
7313 If you have just made a commit, that commit will be the tip. If
7313 If you have just made a commit, that commit will be the tip. If
7314 you have just pulled changes from another repository, the tip of
7314 you have just pulled changes from another repository, the tip of
7315 that repository becomes the current tip. The "tip" tag is special
7315 that repository becomes the current tip. The "tip" tag is special
7316 and cannot be renamed or assigned to a different changeset.
7316 and cannot be renamed or assigned to a different changeset.
7317
7317
7318 This command is deprecated, please use :hg:`heads` instead.
7318 This command is deprecated, please use :hg:`heads` instead.
7319
7319
7320 Returns 0 on success.
7320 Returns 0 on success.
7321 """
7321 """
7322 opts = pycompat.byteskwargs(opts)
7322 opts = pycompat.byteskwargs(opts)
7323 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7323 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7324 displayer.show(repo[b'tip'])
7324 displayer.show(repo[b'tip'])
7325 displayer.close()
7325 displayer.close()
7326
7326
7327
7327
7328 @command(
7328 @command(
7329 b'unbundle',
7329 b'unbundle',
7330 [
7330 [
7331 (
7331 (
7332 b'u',
7332 b'u',
7333 b'update',
7333 b'update',
7334 None,
7334 None,
7335 _(b'update to new branch head if changesets were unbundled'),
7335 _(b'update to new branch head if changesets were unbundled'),
7336 )
7336 )
7337 ],
7337 ],
7338 _(b'[-u] FILE...'),
7338 _(b'[-u] FILE...'),
7339 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7339 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7340 )
7340 )
7341 def unbundle(ui, repo, fname1, *fnames, **opts):
7341 def unbundle(ui, repo, fname1, *fnames, **opts):
7342 """apply one or more bundle files
7342 """apply one or more bundle files
7343
7343
7344 Apply one or more bundle files generated by :hg:`bundle`.
7344 Apply one or more bundle files generated by :hg:`bundle`.
7345
7345
7346 Returns 0 on success, 1 if an update has unresolved files.
7346 Returns 0 on success, 1 if an update has unresolved files.
7347 """
7347 """
7348 fnames = (fname1,) + fnames
7348 fnames = (fname1,) + fnames
7349
7349
7350 with repo.lock():
7350 with repo.lock():
7351 for fname in fnames:
7351 for fname in fnames:
7352 f = hg.openpath(ui, fname)
7352 f = hg.openpath(ui, fname)
7353 gen = exchange.readbundle(ui, f, fname)
7353 gen = exchange.readbundle(ui, f, fname)
7354 if isinstance(gen, streamclone.streamcloneapplier):
7354 if isinstance(gen, streamclone.streamcloneapplier):
7355 raise error.InputError(
7355 raise error.InputError(
7356 _(
7356 _(
7357 b'packed bundles cannot be applied with '
7357 b'packed bundles cannot be applied with '
7358 b'"hg unbundle"'
7358 b'"hg unbundle"'
7359 ),
7359 ),
7360 hint=_(b'use "hg debugapplystreamclonebundle"'),
7360 hint=_(b'use "hg debugapplystreamclonebundle"'),
7361 )
7361 )
7362 url = b'bundle:' + fname
7362 url = b'bundle:' + fname
7363 try:
7363 try:
7364 txnname = b'unbundle'
7364 txnname = b'unbundle'
7365 if not isinstance(gen, bundle2.unbundle20):
7365 if not isinstance(gen, bundle2.unbundle20):
7366 txnname = b'unbundle\n%s' % util.hidepassword(url)
7366 txnname = b'unbundle\n%s' % util.hidepassword(url)
7367 with repo.transaction(txnname) as tr:
7367 with repo.transaction(txnname) as tr:
7368 op = bundle2.applybundle(
7368 op = bundle2.applybundle(
7369 repo, gen, tr, source=b'unbundle', url=url
7369 repo, gen, tr, source=b'unbundle', url=url
7370 )
7370 )
7371 except error.BundleUnknownFeatureError as exc:
7371 except error.BundleUnknownFeatureError as exc:
7372 raise error.Abort(
7372 raise error.Abort(
7373 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7373 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7374 hint=_(
7374 hint=_(
7375 b"see https://mercurial-scm.org/"
7375 b"see https://mercurial-scm.org/"
7376 b"wiki/BundleFeature for more "
7376 b"wiki/BundleFeature for more "
7377 b"information"
7377 b"information"
7378 ),
7378 ),
7379 )
7379 )
7380 modheads = bundle2.combinechangegroupresults(op)
7380 modheads = bundle2.combinechangegroupresults(op)
7381
7381
7382 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7382 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7383
7383
7384
7384
7385 @command(
7385 @command(
7386 b'unshelve',
7386 b'unshelve',
7387 [
7387 [
7388 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7388 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7389 (
7389 (
7390 b'c',
7390 b'c',
7391 b'continue',
7391 b'continue',
7392 None,
7392 None,
7393 _(b'continue an incomplete unshelve operation'),
7393 _(b'continue an incomplete unshelve operation'),
7394 ),
7394 ),
7395 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7395 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7396 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7396 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7397 (
7397 (
7398 b'n',
7398 b'n',
7399 b'name',
7399 b'name',
7400 b'',
7400 b'',
7401 _(b'restore shelved change with given name'),
7401 _(b'restore shelved change with given name'),
7402 _(b'NAME'),
7402 _(b'NAME'),
7403 ),
7403 ),
7404 (b't', b'tool', b'', _(b'specify merge tool')),
7404 (b't', b'tool', b'', _(b'specify merge tool')),
7405 (
7405 (
7406 b'',
7406 b'',
7407 b'date',
7407 b'date',
7408 b'',
7408 b'',
7409 _(b'set date for temporary commits (DEPRECATED)'),
7409 _(b'set date for temporary commits (DEPRECATED)'),
7410 _(b'DATE'),
7410 _(b'DATE'),
7411 ),
7411 ),
7412 ],
7412 ],
7413 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7413 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7414 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7414 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7415 )
7415 )
7416 def unshelve(ui, repo, *shelved, **opts):
7416 def unshelve(ui, repo, *shelved, **opts):
7417 """restore a shelved change to the working directory
7417 """restore a shelved change to the working directory
7418
7418
7419 This command accepts an optional name of a shelved change to
7419 This command accepts an optional name of a shelved change to
7420 restore. If none is given, the most recent shelved change is used.
7420 restore. If none is given, the most recent shelved change is used.
7421
7421
7422 If a shelved change is applied successfully, the bundle that
7422 If a shelved change is applied successfully, the bundle that
7423 contains the shelved changes is moved to a backup location
7423 contains the shelved changes is moved to a backup location
7424 (.hg/shelve-backup).
7424 (.hg/shelve-backup).
7425
7425
7426 Since you can restore a shelved change on top of an arbitrary
7426 Since you can restore a shelved change on top of an arbitrary
7427 commit, it is possible that unshelving will result in a conflict
7427 commit, it is possible that unshelving will result in a conflict
7428 between your changes and the commits you are unshelving onto. If
7428 between your changes and the commits you are unshelving onto. If
7429 this occurs, you must resolve the conflict, then use
7429 this occurs, you must resolve the conflict, then use
7430 ``--continue`` to complete the unshelve operation. (The bundle
7430 ``--continue`` to complete the unshelve operation. (The bundle
7431 will not be moved until you successfully complete the unshelve.)
7431 will not be moved until you successfully complete the unshelve.)
7432
7432
7433 (Alternatively, you can use ``--abort`` to abandon an unshelve
7433 (Alternatively, you can use ``--abort`` to abandon an unshelve
7434 that causes a conflict. This reverts the unshelved changes, and
7434 that causes a conflict. This reverts the unshelved changes, and
7435 leaves the bundle in place.)
7435 leaves the bundle in place.)
7436
7436
7437 If bare shelved change (without interactive, include and exclude
7437 If bare shelved change (without interactive, include and exclude
7438 option) was done on newly created branch it would restore branch
7438 option) was done on newly created branch it would restore branch
7439 information to the working directory.
7439 information to the working directory.
7440
7440
7441 After a successful unshelve, the shelved changes are stored in a
7441 After a successful unshelve, the shelved changes are stored in a
7442 backup directory. Only the N most recent backups are kept. N
7442 backup directory. Only the N most recent backups are kept. N
7443 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7443 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7444 configuration option.
7444 configuration option.
7445
7445
7446 .. container:: verbose
7446 .. container:: verbose
7447
7447
7448 Timestamp in seconds is used to decide order of backups. More
7448 Timestamp in seconds is used to decide order of backups. More
7449 than ``maxbackups`` backups are kept, if same timestamp
7449 than ``maxbackups`` backups are kept, if same timestamp
7450 prevents from deciding exact order of them, for safety.
7450 prevents from deciding exact order of them, for safety.
7451
7451
7452 Selected changes can be unshelved with ``--interactive`` flag.
7452 Selected changes can be unshelved with ``--interactive`` flag.
7453 The working directory is updated with the selected changes, and
7453 The working directory is updated with the selected changes, and
7454 only the unselected changes remain shelved.
7454 only the unselected changes remain shelved.
7455 Note: The whole shelve is applied to working directory first before
7455 Note: The whole shelve is applied to working directory first before
7456 running interactively. So, this will bring up all the conflicts between
7456 running interactively. So, this will bring up all the conflicts between
7457 working directory and the shelve, irrespective of which changes will be
7457 working directory and the shelve, irrespective of which changes will be
7458 unshelved.
7458 unshelved.
7459 """
7459 """
7460 with repo.wlock():
7460 with repo.wlock():
7461 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7461 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7462
7462
7463
7463
7464 statemod.addunfinished(
7464 statemod.addunfinished(
7465 b'unshelve',
7465 b'unshelve',
7466 fname=b'shelvedstate',
7466 fname=b'shelvedstate',
7467 continueflag=True,
7467 continueflag=True,
7468 abortfunc=shelvemod.hgabortunshelve,
7468 abortfunc=shelvemod.hgabortunshelve,
7469 continuefunc=shelvemod.hgcontinueunshelve,
7469 continuefunc=shelvemod.hgcontinueunshelve,
7470 cmdmsg=_(b'unshelve already in progress'),
7470 cmdmsg=_(b'unshelve already in progress'),
7471 )
7471 )
7472
7472
7473
7473
7474 @command(
7474 @command(
7475 b'update|up|checkout|co',
7475 b'update|up|checkout|co',
7476 [
7476 [
7477 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7477 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7478 (b'c', b'check', None, _(b'require clean working directory')),
7478 (b'c', b'check', None, _(b'require clean working directory')),
7479 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7479 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7480 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7480 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7481 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7481 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7482 ]
7482 ]
7483 + mergetoolopts,
7483 + mergetoolopts,
7484 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7484 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7485 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7485 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7486 helpbasic=True,
7486 helpbasic=True,
7487 )
7487 )
7488 def update(ui, repo, node=None, **opts):
7488 def update(ui, repo, node=None, **opts):
7489 """update working directory (or switch revisions)
7489 """update working directory (or switch revisions)
7490
7490
7491 Update the repository's working directory to the specified
7491 Update the repository's working directory to the specified
7492 changeset. If no changeset is specified, update to the tip of the
7492 changeset. If no changeset is specified, update to the tip of the
7493 current named branch and move the active bookmark (see :hg:`help
7493 current named branch and move the active bookmark (see :hg:`help
7494 bookmarks`).
7494 bookmarks`).
7495
7495
7496 Update sets the working directory's parent revision to the specified
7496 Update sets the working directory's parent revision to the specified
7497 changeset (see :hg:`help parents`).
7497 changeset (see :hg:`help parents`).
7498
7498
7499 If the changeset is not a descendant or ancestor of the working
7499 If the changeset is not a descendant or ancestor of the working
7500 directory's parent and there are uncommitted changes, the update is
7500 directory's parent and there are uncommitted changes, the update is
7501 aborted. With the -c/--check option, the working directory is checked
7501 aborted. With the -c/--check option, the working directory is checked
7502 for uncommitted changes; if none are found, the working directory is
7502 for uncommitted changes; if none are found, the working directory is
7503 updated to the specified changeset.
7503 updated to the specified changeset.
7504
7504
7505 .. container:: verbose
7505 .. container:: verbose
7506
7506
7507 The -C/--clean, -c/--check, and -m/--merge options control what
7507 The -C/--clean, -c/--check, and -m/--merge options control what
7508 happens if the working directory contains uncommitted changes.
7508 happens if the working directory contains uncommitted changes.
7509 At most of one of them can be specified.
7509 At most of one of them can be specified.
7510
7510
7511 1. If no option is specified, and if
7511 1. If no option is specified, and if
7512 the requested changeset is an ancestor or descendant of
7512 the requested changeset is an ancestor or descendant of
7513 the working directory's parent, the uncommitted changes
7513 the working directory's parent, the uncommitted changes
7514 are merged into the requested changeset and the merged
7514 are merged into the requested changeset and the merged
7515 result is left uncommitted. If the requested changeset is
7515 result is left uncommitted. If the requested changeset is
7516 not an ancestor or descendant (that is, it is on another
7516 not an ancestor or descendant (that is, it is on another
7517 branch), the update is aborted and the uncommitted changes
7517 branch), the update is aborted and the uncommitted changes
7518 are preserved.
7518 are preserved.
7519
7519
7520 2. With the -m/--merge option, the update is allowed even if the
7520 2. With the -m/--merge option, the update is allowed even if the
7521 requested changeset is not an ancestor or descendant of
7521 requested changeset is not an ancestor or descendant of
7522 the working directory's parent.
7522 the working directory's parent.
7523
7523
7524 3. With the -c/--check option, the update is aborted and the
7524 3. With the -c/--check option, the update is aborted and the
7525 uncommitted changes are preserved.
7525 uncommitted changes are preserved.
7526
7526
7527 4. With the -C/--clean option, uncommitted changes are discarded and
7527 4. With the -C/--clean option, uncommitted changes are discarded and
7528 the working directory is updated to the requested changeset.
7528 the working directory is updated to the requested changeset.
7529
7529
7530 To cancel an uncommitted merge (and lose your changes), use
7530 To cancel an uncommitted merge (and lose your changes), use
7531 :hg:`merge --abort`.
7531 :hg:`merge --abort`.
7532
7532
7533 Use null as the changeset to remove the working directory (like
7533 Use null as the changeset to remove the working directory (like
7534 :hg:`clone -U`).
7534 :hg:`clone -U`).
7535
7535
7536 If you want to revert just one file to an older revision, use
7536 If you want to revert just one file to an older revision, use
7537 :hg:`revert [-r REV] NAME`.
7537 :hg:`revert [-r REV] NAME`.
7538
7538
7539 See :hg:`help dates` for a list of formats valid for -d/--date.
7539 See :hg:`help dates` for a list of formats valid for -d/--date.
7540
7540
7541 Returns 0 on success, 1 if there are unresolved files.
7541 Returns 0 on success, 1 if there are unresolved files.
7542 """
7542 """
7543 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7543 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7544 rev = opts.get('rev')
7544 rev = opts.get('rev')
7545 date = opts.get('date')
7545 date = opts.get('date')
7546 clean = opts.get('clean')
7546 clean = opts.get('clean')
7547 check = opts.get('check')
7547 check = opts.get('check')
7548 merge = opts.get('merge')
7548 merge = opts.get('merge')
7549 if rev and node:
7549 if rev and node:
7550 raise error.InputError(_(b"please specify just one revision"))
7550 raise error.InputError(_(b"please specify just one revision"))
7551
7551
7552 if ui.configbool(b'commands', b'update.requiredest'):
7552 if ui.configbool(b'commands', b'update.requiredest'):
7553 if not node and not rev and not date:
7553 if not node and not rev and not date:
7554 raise error.InputError(
7554 raise error.InputError(
7555 _(b'you must specify a destination'),
7555 _(b'you must specify a destination'),
7556 hint=_(b'for example: hg update ".::"'),
7556 hint=_(b'for example: hg update ".::"'),
7557 )
7557 )
7558
7558
7559 if rev is None or rev == b'':
7559 if rev is None or rev == b'':
7560 rev = node
7560 rev = node
7561
7561
7562 if date and rev is not None:
7562 if date and rev is not None:
7563 raise error.InputError(_(b"you can't specify a revision and a date"))
7563 raise error.InputError(_(b"you can't specify a revision and a date"))
7564
7564
7565 updatecheck = None
7565 updatecheck = None
7566 if check:
7566 if check:
7567 updatecheck = b'abort'
7567 updatecheck = b'abort'
7568 elif merge:
7568 elif merge:
7569 updatecheck = b'none'
7569 updatecheck = b'none'
7570
7570
7571 with repo.wlock():
7571 with repo.wlock():
7572 cmdutil.clearunfinished(repo)
7572 cmdutil.clearunfinished(repo)
7573 if date:
7573 if date:
7574 rev = cmdutil.finddate(ui, repo, date)
7574 rev = cmdutil.finddate(ui, repo, date)
7575
7575
7576 # if we defined a bookmark, we have to remember the original name
7576 # if we defined a bookmark, we have to remember the original name
7577 brev = rev
7577 brev = rev
7578 if rev:
7578 if rev:
7579 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7579 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7580 ctx = scmutil.revsingle(repo, rev, default=None)
7580 ctx = scmutil.revsingle(repo, rev, default=None)
7581 rev = ctx.rev()
7581 rev = ctx.rev()
7582 hidden = ctx.hidden()
7582 hidden = ctx.hidden()
7583 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7583 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7584 with ui.configoverride(overrides, b'update'):
7584 with ui.configoverride(overrides, b'update'):
7585 ret = hg.updatetotally(
7585 ret = hg.updatetotally(
7586 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7586 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7587 )
7587 )
7588 if hidden:
7588 if hidden:
7589 ctxstr = ctx.hex()[:12]
7589 ctxstr = ctx.hex()[:12]
7590 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7590 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7591
7591
7592 if ctx.obsolete():
7592 if ctx.obsolete():
7593 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7593 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7594 ui.warn(b"(%s)\n" % obsfatemsg)
7594 ui.warn(b"(%s)\n" % obsfatemsg)
7595 return ret
7595 return ret
7596
7596
7597
7597
7598 @command(
7598 @command(
7599 b'verify',
7599 b'verify',
7600 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7600 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7601 helpcategory=command.CATEGORY_MAINTENANCE,
7601 helpcategory=command.CATEGORY_MAINTENANCE,
7602 )
7602 )
7603 def verify(ui, repo, **opts):
7603 def verify(ui, repo, **opts):
7604 """verify the integrity of the repository
7604 """verify the integrity of the repository
7605
7605
7606 Verify the integrity of the current repository.
7606 Verify the integrity of the current repository.
7607
7607
7608 This will perform an extensive check of the repository's
7608 This will perform an extensive check of the repository's
7609 integrity, validating the hashes and checksums of each entry in
7609 integrity, validating the hashes and checksums of each entry in
7610 the changelog, manifest, and tracked files, as well as the
7610 the changelog, manifest, and tracked files, as well as the
7611 integrity of their crosslinks and indices.
7611 integrity of their crosslinks and indices.
7612
7612
7613 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7613 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7614 for more information about recovery from corruption of the
7614 for more information about recovery from corruption of the
7615 repository.
7615 repository.
7616
7616
7617 Returns 0 on success, 1 if errors are encountered.
7617 Returns 0 on success, 1 if errors are encountered.
7618 """
7618 """
7619 opts = pycompat.byteskwargs(opts)
7619 opts = pycompat.byteskwargs(opts)
7620
7620
7621 level = None
7621 level = None
7622 if opts[b'full']:
7622 if opts[b'full']:
7623 level = verifymod.VERIFY_FULL
7623 level = verifymod.VERIFY_FULL
7624 return hg.verify(repo, level)
7624 return hg.verify(repo, level)
7625
7625
7626
7626
7627 @command(
7627 @command(
7628 b'version',
7628 b'version',
7629 [] + formatteropts,
7629 [] + formatteropts,
7630 helpcategory=command.CATEGORY_HELP,
7630 helpcategory=command.CATEGORY_HELP,
7631 norepo=True,
7631 norepo=True,
7632 intents={INTENT_READONLY},
7632 intents={INTENT_READONLY},
7633 )
7633 )
7634 def version_(ui, **opts):
7634 def version_(ui, **opts):
7635 """output version and copyright information
7635 """output version and copyright information
7636
7636
7637 .. container:: verbose
7637 .. container:: verbose
7638
7638
7639 Template:
7639 Template:
7640
7640
7641 The following keywords are supported. See also :hg:`help templates`.
7641 The following keywords are supported. See also :hg:`help templates`.
7642
7642
7643 :extensions: List of extensions.
7643 :extensions: List of extensions.
7644 :ver: String. Version number.
7644 :ver: String. Version number.
7645
7645
7646 And each entry of ``{extensions}`` provides the following sub-keywords
7646 And each entry of ``{extensions}`` provides the following sub-keywords
7647 in addition to ``{ver}``.
7647 in addition to ``{ver}``.
7648
7648
7649 :bundled: Boolean. True if included in the release.
7649 :bundled: Boolean. True if included in the release.
7650 :name: String. Extension name.
7650 :name: String. Extension name.
7651 """
7651 """
7652 opts = pycompat.byteskwargs(opts)
7652 opts = pycompat.byteskwargs(opts)
7653 if ui.verbose:
7653 if ui.verbose:
7654 ui.pager(b'version')
7654 ui.pager(b'version')
7655 fm = ui.formatter(b"version", opts)
7655 fm = ui.formatter(b"version", opts)
7656 fm.startitem()
7656 fm.startitem()
7657 fm.write(
7657 fm.write(
7658 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7658 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7659 )
7659 )
7660 license = _(
7660 license = _(
7661 b"(see https://mercurial-scm.org for more information)\n"
7661 b"(see https://mercurial-scm.org for more information)\n"
7662 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7662 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7663 b"This is free software; see the source for copying conditions. "
7663 b"This is free software; see the source for copying conditions. "
7664 b"There is NO\nwarranty; "
7664 b"There is NO\nwarranty; "
7665 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7665 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7666 )
7666 )
7667 if not ui.quiet:
7667 if not ui.quiet:
7668 fm.plain(license)
7668 fm.plain(license)
7669
7669
7670 if ui.verbose:
7670 if ui.verbose:
7671 fm.plain(_(b"\nEnabled extensions:\n\n"))
7671 fm.plain(_(b"\nEnabled extensions:\n\n"))
7672 # format names and versions into columns
7672 # format names and versions into columns
7673 names = []
7673 names = []
7674 vers = []
7674 vers = []
7675 isinternals = []
7675 isinternals = []
7676 for name, module in sorted(extensions.extensions()):
7676 for name, module in sorted(extensions.extensions()):
7677 names.append(name)
7677 names.append(name)
7678 vers.append(extensions.moduleversion(module) or None)
7678 vers.append(extensions.moduleversion(module) or None)
7679 isinternals.append(extensions.ismoduleinternal(module))
7679 isinternals.append(extensions.ismoduleinternal(module))
7680 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7680 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7681 if names:
7681 if names:
7682 namefmt = b" %%-%ds " % max(len(n) for n in names)
7682 namefmt = b" %%-%ds " % max(len(n) for n in names)
7683 places = [_(b"external"), _(b"internal")]
7683 places = [_(b"external"), _(b"internal")]
7684 for n, v, p in zip(names, vers, isinternals):
7684 for n, v, p in zip(names, vers, isinternals):
7685 fn.startitem()
7685 fn.startitem()
7686 fn.condwrite(ui.verbose, b"name", namefmt, n)
7686 fn.condwrite(ui.verbose, b"name", namefmt, n)
7687 if ui.verbose:
7687 if ui.verbose:
7688 fn.plain(b"%s " % places[p])
7688 fn.plain(b"%s " % places[p])
7689 fn.data(bundled=p)
7689 fn.data(bundled=p)
7690 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7690 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7691 if ui.verbose:
7691 if ui.verbose:
7692 fn.plain(b"\n")
7692 fn.plain(b"\n")
7693 fn.end()
7693 fn.end()
7694 fm.end()
7694 fm.end()
7695
7695
7696
7696
7697 def loadcmdtable(ui, name, cmdtable):
7697 def loadcmdtable(ui, name, cmdtable):
7698 """Load command functions from specified cmdtable
7698 """Load command functions from specified cmdtable
7699 """
7699 """
7700 overrides = [cmd for cmd in cmdtable if cmd in table]
7700 overrides = [cmd for cmd in cmdtable if cmd in table]
7701 if overrides:
7701 if overrides:
7702 ui.warn(
7702 ui.warn(
7703 _(b"extension '%s' overrides commands: %s\n")
7703 _(b"extension '%s' overrides commands: %s\n")
7704 % (name, b" ".join(overrides))
7704 % (name, b" ".join(overrides))
7705 )
7705 )
7706 table.update(cmdtable)
7706 table.update(cmdtable)
@@ -1,149 +1,149 b''
1 $ hg init a
1 $ hg init a
2
2
3 $ echo a > a/a
3 $ echo a > a/a
4 $ hg --cwd a ci -Ama
4 $ hg --cwd a ci -Ama
5 adding a
5 adding a
6
6
7 $ hg clone a c
7 $ hg clone a c
8 updating to branch default
8 updating to branch default
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10
10
11 $ hg clone a b
11 $ hg clone a b
12 updating to branch default
12 updating to branch default
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
14
14
15 $ echo b >> b/a
15 $ echo b >> b/a
16 $ hg --cwd b ci -mb
16 $ hg --cwd b ci -mb
17
17
18 Push should provide a hint when both 'default' and 'default-push' not set:
18 Push should provide a hint when both 'default' and 'default-push' not set:
19 $ cd c
19 $ cd c
20 $ hg push --config paths.default=
20 $ hg push --config paths.default=
21 abort: default repository not configured!
21 abort: default repository not configured!
22 (see 'hg help config.paths')
22 (see 'hg help config.paths')
23 [255]
23 [30]
24
24
25 $ cd ..
25 $ cd ..
26
26
27 Push should push to 'default' when 'default-push' not set:
27 Push should push to 'default' when 'default-push' not set:
28
28
29 $ hg --cwd b push
29 $ hg --cwd b push
30 pushing to $TESTTMP/a
30 pushing to $TESTTMP/a
31 searching for changes
31 searching for changes
32 adding changesets
32 adding changesets
33 adding manifests
33 adding manifests
34 adding file changes
34 adding file changes
35 added 1 changesets with 1 changes to 1 files
35 added 1 changesets with 1 changes to 1 files
36
36
37 Push should push to 'default-push' when set:
37 Push should push to 'default-push' when set:
38
38
39 $ echo '[paths]' >> b/.hg/hgrc
39 $ echo '[paths]' >> b/.hg/hgrc
40 $ echo 'default-push = ../c' >> b/.hg/hgrc
40 $ echo 'default-push = ../c' >> b/.hg/hgrc
41 $ hg --cwd b push
41 $ hg --cwd b push
42 pushing to $TESTTMP/c
42 pushing to $TESTTMP/c
43 searching for changes
43 searching for changes
44 adding changesets
44 adding changesets
45 adding manifests
45 adding manifests
46 adding file changes
46 adding file changes
47 added 1 changesets with 1 changes to 1 files
47 added 1 changesets with 1 changes to 1 files
48
48
49 But push should push to 'default' if explicitly specified (issue5000):
49 But push should push to 'default' if explicitly specified (issue5000):
50
50
51 $ hg --cwd b push default
51 $ hg --cwd b push default
52 pushing to $TESTTMP/a
52 pushing to $TESTTMP/a
53 searching for changes
53 searching for changes
54 no changes found
54 no changes found
55 [1]
55 [1]
56
56
57 Push should push to 'default-push' when 'default' is not set
57 Push should push to 'default-push' when 'default' is not set
58
58
59 $ hg -q clone a push-default-only
59 $ hg -q clone a push-default-only
60 $ cd push-default-only
60 $ cd push-default-only
61 $ rm .hg/hgrc
61 $ rm .hg/hgrc
62
62
63 $ touch foo
63 $ touch foo
64 $ hg -q commit -A -m 'add foo'
64 $ hg -q commit -A -m 'add foo'
65 $ hg --config paths.default-push=../a push
65 $ hg --config paths.default-push=../a push
66 pushing to $TESTTMP/a
66 pushing to $TESTTMP/a
67 searching for changes
67 searching for changes
68 adding changesets
68 adding changesets
69 adding manifests
69 adding manifests
70 adding file changes
70 adding file changes
71 added 1 changesets with 1 changes to 1 files
71 added 1 changesets with 1 changes to 1 files
72
72
73 $ cd ..
73 $ cd ..
74
74
75 Pushing to a path that isn't defined should not fall back to default
75 Pushing to a path that isn't defined should not fall back to default
76
76
77 $ hg --cwd b push doesnotexist
77 $ hg --cwd b push doesnotexist
78 abort: repository doesnotexist does not exist!
78 abort: repository doesnotexist does not exist!
79 [255]
79 [255]
80
80
81 :pushurl is used when defined
81 :pushurl is used when defined
82
82
83 $ hg -q clone a pushurlsource
83 $ hg -q clone a pushurlsource
84 $ hg -q clone a pushurldest
84 $ hg -q clone a pushurldest
85 $ cd pushurlsource
85 $ cd pushurlsource
86
86
87 Windows needs a leading slash to make a URL that passes all of the checks
87 Windows needs a leading slash to make a URL that passes all of the checks
88 $ WD=`pwd`
88 $ WD=`pwd`
89 #if windows
89 #if windows
90 $ WD="/$WD"
90 $ WD="/$WD"
91 #endif
91 #endif
92 $ cat > .hg/hgrc << EOF
92 $ cat > .hg/hgrc << EOF
93 > [paths]
93 > [paths]
94 > default = https://example.com/not/relevant
94 > default = https://example.com/not/relevant
95 > default:pushurl = file://$WD/../pushurldest
95 > default:pushurl = file://$WD/../pushurldest
96 > EOF
96 > EOF
97
97
98 $ touch pushurl
98 $ touch pushurl
99 $ hg -q commit -A -m 'add pushurl'
99 $ hg -q commit -A -m 'add pushurl'
100 $ hg push
100 $ hg push
101 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
101 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
102 searching for changes
102 searching for changes
103 adding changesets
103 adding changesets
104 adding manifests
104 adding manifests
105 adding file changes
105 adding file changes
106 added 1 changesets with 1 changes to 1 files
106 added 1 changesets with 1 changes to 1 files
107
107
108 :pushrev is used when no -r is passed
108 :pushrev is used when no -r is passed
109
109
110 $ cat >> .hg/hgrc << EOF
110 $ cat >> .hg/hgrc << EOF
111 > default:pushrev = .
111 > default:pushrev = .
112 > EOF
112 > EOF
113 $ hg -q up -r 0
113 $ hg -q up -r 0
114 $ echo head1 > foo
114 $ echo head1 > foo
115 $ hg -q commit -A -m head1
115 $ hg -q commit -A -m head1
116 $ hg -q up -r 0
116 $ hg -q up -r 0
117 $ echo head2 > foo
117 $ echo head2 > foo
118 $ hg -q commit -A -m head2
118 $ hg -q commit -A -m head2
119 $ hg push -f
119 $ hg push -f
120 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
120 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
121 searching for changes
121 searching for changes
122 adding changesets
122 adding changesets
123 adding manifests
123 adding manifests
124 adding file changes
124 adding file changes
125 added 1 changesets with 1 changes to 1 files (+1 heads)
125 added 1 changesets with 1 changes to 1 files (+1 heads)
126
126
127 $ hg --config 'paths.default:pushrev=draft()' push -f
127 $ hg --config 'paths.default:pushrev=draft()' push -f
128 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
128 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
129 searching for changes
129 searching for changes
130 adding changesets
130 adding changesets
131 adding manifests
131 adding manifests
132 adding file changes
132 adding file changes
133 added 1 changesets with 1 changes to 1 files (+1 heads)
133 added 1 changesets with 1 changes to 1 files (+1 heads)
134
134
135 Invalid :pushrev raises appropriately
135 Invalid :pushrev raises appropriately
136
136
137 $ hg --config 'paths.default:pushrev=notdefined()' push
137 $ hg --config 'paths.default:pushrev=notdefined()' push
138 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
138 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
139 hg: parse error: unknown identifier: notdefined
139 hg: parse error: unknown identifier: notdefined
140 [255]
140 [255]
141
141
142 $ hg --config 'paths.default:pushrev=(' push
142 $ hg --config 'paths.default:pushrev=(' push
143 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
143 pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
144 hg: parse error at 1: not a prefix: end
144 hg: parse error at 1: not a prefix: end
145 ((
145 ((
146 ^ here)
146 ^ here)
147 [255]
147 [255]
148
148
149 $ cd ..
149 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now