##// END OF EJS Templates
recover: don't verify by default...
Valentin Gatien-Baron -
r44830:7a4e1d24 default
parent child Browse files
Show More
@@ -1,7829 +1,7829 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 (
84 (
85 b'R',
85 b'R',
86 b'repository',
86 b'repository',
87 b'',
87 b'',
88 _(b'repository root directory or name of overlay bundle file'),
88 _(b'repository root directory or name of overlay bundle file'),
89 _(b'REPO'),
89 _(b'REPO'),
90 ),
90 ),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (
92 (
93 b'y',
93 b'y',
94 b'noninteractive',
94 b'noninteractive',
95 None,
95 None,
96 _(
96 _(
97 b'do not prompt, automatically pick the first choice for all prompts'
97 b'do not prompt, automatically pick the first choice for all prompts'
98 ),
98 ),
99 ),
99 ),
100 (b'q', b'quiet', None, _(b'suppress output')),
100 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
102 (
102 (
103 b'',
103 b'',
104 b'color',
104 b'color',
105 b'',
105 b'',
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # and should not be translated
107 # and should not be translated
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b'TYPE'),
109 _(b'TYPE'),
110 ),
110 ),
111 (
111 (
112 b'',
112 b'',
113 b'config',
113 b'config',
114 [],
114 [],
115 _(b'set/override config option (use \'section.name=value\')'),
115 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'CONFIG'),
116 _(b'CONFIG'),
117 ),
117 ),
118 (b'', b'debug', None, _(b'enable debugging output')),
118 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debugger', None, _(b'start debugger')),
119 (b'', b'debugger', None, _(b'start debugger')),
120 (
120 (
121 b'',
121 b'',
122 b'encoding',
122 b'encoding',
123 encoding.encoding,
123 encoding.encoding,
124 _(b'set the charset encoding'),
124 _(b'set the charset encoding'),
125 _(b'ENCODE'),
125 _(b'ENCODE'),
126 ),
126 ),
127 (
127 (
128 b'',
128 b'',
129 b'encodingmode',
129 b'encodingmode',
130 encoding.encodingmode,
130 encoding.encodingmode,
131 _(b'set the charset encoding mode'),
131 _(b'set the charset encoding mode'),
132 _(b'MODE'),
132 _(b'MODE'),
133 ),
133 ),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'time', None, _(b'time how long the command takes')),
135 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'profile', None, _(b'print command execution profile')),
136 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'version', None, _(b'output version information and exit')),
137 (b'', b'version', None, _(b'output version information and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (
140 (
141 b'',
141 b'',
142 b'pager',
142 b'pager',
143 b'auto',
143 b'auto',
144 _(b"when to paginate (boolean, always, auto, or never)"),
144 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b'TYPE'),
145 _(b'TYPE'),
146 ),
146 ),
147 ]
147 ]
148
148
149 dryrunopts = cmdutil.dryrunopts
149 dryrunopts = cmdutil.dryrunopts
150 remoteopts = cmdutil.remoteopts
150 remoteopts = cmdutil.remoteopts
151 walkopts = cmdutil.walkopts
151 walkopts = cmdutil.walkopts
152 commitopts = cmdutil.commitopts
152 commitopts = cmdutil.commitopts
153 commitopts2 = cmdutil.commitopts2
153 commitopts2 = cmdutil.commitopts2
154 commitopts3 = cmdutil.commitopts3
154 commitopts3 = cmdutil.commitopts3
155 formatteropts = cmdutil.formatteropts
155 formatteropts = cmdutil.formatteropts
156 templateopts = cmdutil.templateopts
156 templateopts = cmdutil.templateopts
157 logopts = cmdutil.logopts
157 logopts = cmdutil.logopts
158 diffopts = cmdutil.diffopts
158 diffopts = cmdutil.diffopts
159 diffwsopts = cmdutil.diffwsopts
159 diffwsopts = cmdutil.diffwsopts
160 diffopts2 = cmdutil.diffopts2
160 diffopts2 = cmdutil.diffopts2
161 mergetoolopts = cmdutil.mergetoolopts
161 mergetoolopts = cmdutil.mergetoolopts
162 similarityopts = cmdutil.similarityopts
162 similarityopts = cmdutil.similarityopts
163 subrepoopts = cmdutil.subrepoopts
163 subrepoopts = cmdutil.subrepoopts
164 debugrevlogopts = cmdutil.debugrevlogopts
164 debugrevlogopts = cmdutil.debugrevlogopts
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168
168
169 @command(
169 @command(
170 b'abort',
170 b'abort',
171 dryrunopts,
171 dryrunopts,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpbasic=True,
173 helpbasic=True,
174 )
174 )
175 def abort(ui, repo, **opts):
175 def abort(ui, repo, **opts):
176 """abort an unfinished operation (EXPERIMENTAL)
176 """abort an unfinished operation (EXPERIMENTAL)
177
177
178 Aborts a multistep operation like graft, histedit, rebase, merge,
178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 and unshelve if they are in an unfinished state.
179 and unshelve if they are in an unfinished state.
180
180
181 use --dry-run/-n to dry run the command.
181 use --dry-run/-n to dry run the command.
182 """
182 """
183 dryrun = opts.get('dry_run')
183 dryrun = opts.get('dry_run')
184 abortstate = cmdutil.getunfinishedstate(repo)
184 abortstate = cmdutil.getunfinishedstate(repo)
185 if not abortstate:
185 if not abortstate:
186 raise error.Abort(_(b'no operation in progress'))
186 raise error.Abort(_(b'no operation in progress'))
187 if not abortstate.abortfunc:
187 if not abortstate.abortfunc:
188 raise error.Abort(
188 raise error.Abort(
189 (
189 (
190 _(b"%s in progress but does not support 'hg abort'")
190 _(b"%s in progress but does not support 'hg abort'")
191 % (abortstate._opname)
191 % (abortstate._opname)
192 ),
192 ),
193 hint=abortstate.hint(),
193 hint=abortstate.hint(),
194 )
194 )
195 if dryrun:
195 if dryrun:
196 ui.status(
196 ui.status(
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 )
198 )
199 return
199 return
200 return abortstate.abortfunc(ui, repo)
200 return abortstate.abortfunc(ui, repo)
201
201
202
202
203 @command(
203 @command(
204 b'add',
204 b'add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _(b'[OPTION]... [FILE]...'),
206 _(b'[OPTION]... [FILE]...'),
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpbasic=True,
208 helpbasic=True,
209 inferrepo=True,
209 inferrepo=True,
210 )
210 )
211 def add(ui, repo, *pats, **opts):
211 def add(ui, repo, *pats, **opts):
212 """add the specified files on the next commit
212 """add the specified files on the next commit
213
213
214 Schedule files to be version controlled and added to the
214 Schedule files to be version controlled and added to the
215 repository.
215 repository.
216
216
217 The files will be added to the repository at the next commit. To
217 The files will be added to the repository at the next commit. To
218 undo an add before that, see :hg:`forget`.
218 undo an add before that, see :hg:`forget`.
219
219
220 If no names are given, add all files to the repository (except
220 If no names are given, add all files to the repository (except
221 files matching ``.hgignore``).
221 files matching ``.hgignore``).
222
222
223 .. container:: verbose
223 .. container:: verbose
224
224
225 Examples:
225 Examples:
226
226
227 - New (unknown) files are added
227 - New (unknown) files are added
228 automatically by :hg:`add`::
228 automatically by :hg:`add`::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ? foo.c
233 ? foo.c
234 $ hg add
234 $ hg add
235 adding foo.c
235 adding foo.c
236 $ hg status
236 $ hg status
237 A foo.c
237 A foo.c
238
238
239 - Specific files to be added can be specified::
239 - Specific files to be added can be specified::
240
240
241 $ ls
241 $ ls
242 bar.c foo.c
242 bar.c foo.c
243 $ hg status
243 $ hg status
244 ? bar.c
244 ? bar.c
245 ? foo.c
245 ? foo.c
246 $ hg add bar.c
246 $ hg add bar.c
247 $ hg status
247 $ hg status
248 A bar.c
248 A bar.c
249 ? foo.c
249 ? foo.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253
253
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259
259
260 @command(
260 @command(
261 b'addremove',
261 b'addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _(b'[OPTION]... [FILE]...'),
263 _(b'[OPTION]... [FILE]...'),
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 inferrepo=True,
265 inferrepo=True,
266 )
266 )
267 def addremove(ui, repo, *pats, **opts):
267 def addremove(ui, repo, *pats, **opts):
268 """add all new files, delete all missing files
268 """add all new files, delete all missing files
269
269
270 Add all new files and remove all missing files from the
270 Add all new files and remove all missing files from the
271 repository.
271 repository.
272
272
273 Unless names are given, new files are ignored if they match any of
273 Unless names are given, new files are ignored if they match any of
274 the patterns in ``.hgignore``. As with add, these changes take
274 the patterns in ``.hgignore``. As with add, these changes take
275 effect at the next commit.
275 effect at the next commit.
276
276
277 Use the -s/--similarity option to detect renamed files. This
277 Use the -s/--similarity option to detect renamed files. This
278 option takes a percentage between 0 (disabled) and 100 (files must
278 option takes a percentage between 0 (disabled) and 100 (files must
279 be identical) as its parameter. With a parameter greater than 0,
279 be identical) as its parameter. With a parameter greater than 0,
280 this compares every removed file with every added file and records
280 this compares every removed file with every added file and records
281 those similar enough as renames. Detecting renamed files this way
281 those similar enough as renames. Detecting renamed files this way
282 can be expensive. After using this option, :hg:`status -C` can be
282 can be expensive. After using this option, :hg:`status -C` can be
283 used to check which files were identified as moved or renamed. If
283 used to check which files were identified as moved or renamed. If
284 not specified, -s/--similarity defaults to 100 and only renames of
284 not specified, -s/--similarity defaults to 100 and only renames of
285 identical files are detected.
285 identical files are detected.
286
286
287 .. container:: verbose
287 .. container:: verbose
288
288
289 Examples:
289 Examples:
290
290
291 - A number of files (bar.c and foo.c) are new,
291 - A number of files (bar.c and foo.c) are new,
292 while foobar.c has been removed (without using :hg:`remove`)
292 while foobar.c has been removed (without using :hg:`remove`)
293 from the repository::
293 from the repository::
294
294
295 $ ls
295 $ ls
296 bar.c foo.c
296 bar.c foo.c
297 $ hg status
297 $ hg status
298 ! foobar.c
298 ! foobar.c
299 ? bar.c
299 ? bar.c
300 ? foo.c
300 ? foo.c
301 $ hg addremove
301 $ hg addremove
302 adding bar.c
302 adding bar.c
303 adding foo.c
303 adding foo.c
304 removing foobar.c
304 removing foobar.c
305 $ hg status
305 $ hg status
306 A bar.c
306 A bar.c
307 A foo.c
307 A foo.c
308 R foobar.c
308 R foobar.c
309
309
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 Afterwards, it was edited slightly::
311 Afterwards, it was edited slightly::
312
312
313 $ ls
313 $ ls
314 foo.c
314 foo.c
315 $ hg status
315 $ hg status
316 ! foobar.c
316 ! foobar.c
317 ? foo.c
317 ? foo.c
318 $ hg addremove --similarity 90
318 $ hg addremove --similarity 90
319 removing foobar.c
319 removing foobar.c
320 adding foo.c
320 adding foo.c
321 recording removal of foobar.c as rename to foo.c (94% similar)
321 recording removal of foobar.c as rename to foo.c (94% similar)
322 $ hg status -C
322 $ hg status -C
323 A foo.c
323 A foo.c
324 foobar.c
324 foobar.c
325 R foobar.c
325 R foobar.c
326
326
327 Returns 0 if all files are successfully added.
327 Returns 0 if all files are successfully added.
328 """
328 """
329 opts = pycompat.byteskwargs(opts)
329 opts = pycompat.byteskwargs(opts)
330 if not opts.get(b'similarity'):
330 if not opts.get(b'similarity'):
331 opts[b'similarity'] = b'100'
331 opts[b'similarity'] = b'100'
332 matcher = scmutil.match(repo[None], pats, opts)
332 matcher = scmutil.match(repo[None], pats, opts)
333 relative = scmutil.anypats(pats, opts)
333 relative = scmutil.anypats(pats, opts)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336
336
337
337
338 @command(
338 @command(
339 b'annotate|blame',
339 b'annotate|blame',
340 [
340 [
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (
342 (
343 b'',
343 b'',
344 b'follow',
344 b'follow',
345 None,
345 None,
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 ),
347 ),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'a', b'text', None, _(b'treat all files as text')),
349 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'f', b'file', None, _(b'list the filename')),
351 (b'f', b'file', None, _(b'list the filename')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
355 (
355 (
356 b'l',
356 b'l',
357 b'line-number',
357 b'line-number',
358 None,
358 None,
359 _(b'show line number at the first appearance'),
359 _(b'show line number at the first appearance'),
360 ),
360 ),
361 (
361 (
362 b'',
362 b'',
363 b'skip',
363 b'skip',
364 [],
364 [],
365 _(b'revset to not display (EXPERIMENTAL)'),
365 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'REV'),
366 _(b'REV'),
367 ),
367 ),
368 ]
368 ]
369 + diffwsopts
369 + diffwsopts
370 + walkopts
370 + walkopts
371 + formatteropts,
371 + formatteropts,
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpbasic=True,
374 helpbasic=True,
375 inferrepo=True,
375 inferrepo=True,
376 )
376 )
377 def annotate(ui, repo, *pats, **opts):
377 def annotate(ui, repo, *pats, **opts):
378 """show changeset information by line for each file
378 """show changeset information by line for each file
379
379
380 List changes in files, showing the revision id responsible for
380 List changes in files, showing the revision id responsible for
381 each line.
381 each line.
382
382
383 This command is useful for discovering when a change was made and
383 This command is useful for discovering when a change was made and
384 by whom.
384 by whom.
385
385
386 If you include --file, --user, or --date, the revision number is
386 If you include --file, --user, or --date, the revision number is
387 suppressed unless you also include --number.
387 suppressed unless you also include --number.
388
388
389 Without the -a/--text option, annotate will avoid processing files
389 Without the -a/--text option, annotate will avoid processing files
390 it detects as binary. With -a, annotate will annotate the file
390 it detects as binary. With -a, annotate will annotate the file
391 anyway, although the results will probably be neither useful
391 anyway, although the results will probably be neither useful
392 nor desirable.
392 nor desirable.
393
393
394 .. container:: verbose
394 .. container:: verbose
395
395
396 Template:
396 Template:
397
397
398 The following keywords are supported in addition to the common template
398 The following keywords are supported in addition to the common template
399 keywords and functions. See also :hg:`help templates`.
399 keywords and functions. See also :hg:`help templates`.
400
400
401 :lines: List of lines with annotation data.
401 :lines: List of lines with annotation data.
402 :path: String. Repository-absolute path of the specified file.
402 :path: String. Repository-absolute path of the specified file.
403
403
404 And each entry of ``{lines}`` provides the following sub-keywords in
404 And each entry of ``{lines}`` provides the following sub-keywords in
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406
406
407 :line: String. Line content.
407 :line: String. Line content.
408 :lineno: Integer. Line number at that revision.
408 :lineno: Integer. Line number at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
410
410
411 See :hg:`help templates.operators` for the list expansion syntax.
411 See :hg:`help templates.operators` for the list expansion syntax.
412
412
413 Returns 0 on success.
413 Returns 0 on success.
414 """
414 """
415 opts = pycompat.byteskwargs(opts)
415 opts = pycompat.byteskwargs(opts)
416 if not pats:
416 if not pats:
417 raise error.Abort(_(b'at least one filename or pattern is required'))
417 raise error.Abort(_(b'at least one filename or pattern is required'))
418
418
419 if opts.get(b'follow'):
419 if opts.get(b'follow'):
420 # --follow is deprecated and now just an alias for -f/--file
420 # --follow is deprecated and now just an alias for -f/--file
421 # to mimic the behavior of Mercurial before version 1.5
421 # to mimic the behavior of Mercurial before version 1.5
422 opts[b'file'] = True
422 opts[b'file'] = True
423
423
424 if (
424 if (
425 not opts.get(b'user')
425 not opts.get(b'user')
426 and not opts.get(b'changeset')
426 and not opts.get(b'changeset')
427 and not opts.get(b'date')
427 and not opts.get(b'date')
428 and not opts.get(b'file')
428 and not opts.get(b'file')
429 ):
429 ):
430 opts[b'number'] = True
430 opts[b'number'] = True
431
431
432 linenumber = opts.get(b'line_number') is not None
432 linenumber = opts.get(b'line_number') is not None
433 if (
433 if (
434 linenumber
434 linenumber
435 and (not opts.get(b'changeset'))
435 and (not opts.get(b'changeset'))
436 and (not opts.get(b'number'))
436 and (not opts.get(b'number'))
437 ):
437 ):
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439
439
440 rev = opts.get(b'rev')
440 rev = opts.get(b'rev')
441 if rev:
441 if rev:
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 ctx = scmutil.revsingle(repo, rev)
443 ctx = scmutil.revsingle(repo, rev)
444
444
445 ui.pager(b'annotate')
445 ui.pager(b'annotate')
446 rootfm = ui.formatter(b'annotate', opts)
446 rootfm = ui.formatter(b'annotate', opts)
447 if ui.debugflag:
447 if ui.debugflag:
448 shorthex = pycompat.identity
448 shorthex = pycompat.identity
449 else:
449 else:
450
450
451 def shorthex(h):
451 def shorthex(h):
452 return h[:12]
452 return h[:12]
453
453
454 if ui.quiet:
454 if ui.quiet:
455 datefunc = dateutil.shortdate
455 datefunc = dateutil.shortdate
456 else:
456 else:
457 datefunc = dateutil.datestr
457 datefunc = dateutil.datestr
458 if ctx.rev() is None:
458 if ctx.rev() is None:
459 if opts.get(b'changeset'):
459 if opts.get(b'changeset'):
460 # omit "+" suffix which is appended to node hex
460 # omit "+" suffix which is appended to node hex
461 def formatrev(rev):
461 def formatrev(rev):
462 if rev == wdirrev:
462 if rev == wdirrev:
463 return b'%d' % ctx.p1().rev()
463 return b'%d' % ctx.p1().rev()
464 else:
464 else:
465 return b'%d' % rev
465 return b'%d' % rev
466
466
467 else:
467 else:
468
468
469 def formatrev(rev):
469 def formatrev(rev):
470 if rev == wdirrev:
470 if rev == wdirrev:
471 return b'%d+' % ctx.p1().rev()
471 return b'%d+' % ctx.p1().rev()
472 else:
472 else:
473 return b'%d ' % rev
473 return b'%d ' % rev
474
474
475 def formathex(h):
475 def formathex(h):
476 if h == wdirhex:
476 if h == wdirhex:
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 else:
478 else:
479 return b'%s ' % shorthex(h)
479 return b'%s ' % shorthex(h)
480
480
481 else:
481 else:
482 formatrev = b'%d'.__mod__
482 formatrev = b'%d'.__mod__
483 formathex = shorthex
483 formathex = shorthex
484
484
485 opmap = [
485 opmap = [
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 ]
492 ]
493 opnamemap = {
493 opnamemap = {
494 b'rev': b'number',
494 b'rev': b'number',
495 b'node': b'changeset',
495 b'node': b'changeset',
496 b'path': b'file',
496 b'path': b'file',
497 b'lineno': b'line_number',
497 b'lineno': b'line_number',
498 }
498 }
499
499
500 if rootfm.isplain():
500 if rootfm.isplain():
501
501
502 def makefunc(get, fmt):
502 def makefunc(get, fmt):
503 return lambda x: fmt(get(x))
503 return lambda x: fmt(get(x))
504
504
505 else:
505 else:
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return get
508 return get
509
509
510 datahint = rootfm.datahint()
510 datahint = rootfm.datahint()
511 funcmap = [
511 funcmap = [
512 (makefunc(get, fmt), sep)
512 (makefunc(get, fmt), sep)
513 for fn, sep, get, fmt in opmap
513 for fn, sep, get, fmt in opmap
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 ]
515 ]
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 fields = b' '.join(
517 fields = b' '.join(
518 fn
518 fn
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 )
521 )
522
522
523 def bad(x, y):
523 def bad(x, y):
524 raise error.Abort(b"%s: %s" % (x, y))
524 raise error.Abort(b"%s: %s" % (x, y))
525
525
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527
527
528 follow = not opts.get(b'no_follow')
528 follow = not opts.get(b'no_follow')
529 diffopts = patch.difffeatureopts(
529 diffopts = patch.difffeatureopts(
530 ui, opts, section=b'annotate', whitespace=True
530 ui, opts, section=b'annotate', whitespace=True
531 )
531 )
532 skiprevs = opts.get(b'skip')
532 skiprevs = opts.get(b'skip')
533 if skiprevs:
533 if skiprevs:
534 skiprevs = scmutil.revrange(repo, skiprevs)
534 skiprevs = scmutil.revrange(repo, skiprevs)
535
535
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 for abs in ctx.walk(m):
537 for abs in ctx.walk(m):
538 fctx = ctx[abs]
538 fctx = ctx[abs]
539 rootfm.startitem()
539 rootfm.startitem()
540 rootfm.data(path=abs)
540 rootfm.data(path=abs)
541 if not opts.get(b'text') and fctx.isbinary():
541 if not opts.get(b'text') and fctx.isbinary():
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 continue
543 continue
544
544
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 lines = fctx.annotate(
546 lines = fctx.annotate(
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 )
548 )
549 if not lines:
549 if not lines:
550 fm.end()
550 fm.end()
551 continue
551 continue
552 formats = []
552 formats = []
553 pieces = []
553 pieces = []
554
554
555 for f, sep in funcmap:
555 for f, sep in funcmap:
556 l = [f(n) for n in lines]
556 l = [f(n) for n in lines]
557 if fm.isplain():
557 if fm.isplain():
558 sizes = [encoding.colwidth(x) for x in l]
558 sizes = [encoding.colwidth(x) for x in l]
559 ml = max(sizes)
559 ml = max(sizes)
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 else:
561 else:
562 formats.append([b'%s'] * len(l))
562 formats.append([b'%s'] * len(l))
563 pieces.append(l)
563 pieces.append(l)
564
564
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 fm.startitem()
566 fm.startitem()
567 fm.context(fctx=n.fctx)
567 fm.context(fctx=n.fctx)
568 fm.write(fields, b"".join(f), *p)
568 fm.write(fields, b"".join(f), *p)
569 if n.skip:
569 if n.skip:
570 fmt = b"* %s"
570 fmt = b"* %s"
571 else:
571 else:
572 fmt = b": %s"
572 fmt = b": %s"
573 fm.write(b'line', fmt, n.text)
573 fm.write(b'line', fmt, n.text)
574
574
575 if not lines[-1].text.endswith(b'\n'):
575 if not lines[-1].text.endswith(b'\n'):
576 fm.plain(b'\n')
576 fm.plain(b'\n')
577 fm.end()
577 fm.end()
578
578
579 rootfm.end()
579 rootfm.end()
580
580
581
581
582 @command(
582 @command(
583 b'archive',
583 b'archive',
584 [
584 [
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (
586 (
587 b'p',
587 b'p',
588 b'prefix',
588 b'prefix',
589 b'',
589 b'',
590 _(b'directory prefix for files in archive'),
590 _(b'directory prefix for files in archive'),
591 _(b'PREFIX'),
591 _(b'PREFIX'),
592 ),
592 ),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 ]
595 ]
596 + subrepoopts
596 + subrepoopts
597 + walkopts,
597 + walkopts,
598 _(b'[OPTION]... DEST'),
598 _(b'[OPTION]... DEST'),
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 )
600 )
601 def archive(ui, repo, dest, **opts):
601 def archive(ui, repo, dest, **opts):
602 '''create an unversioned archive of a repository revision
602 '''create an unversioned archive of a repository revision
603
603
604 By default, the revision used is the parent of the working
604 By default, the revision used is the parent of the working
605 directory; use -r/--rev to specify a different revision.
605 directory; use -r/--rev to specify a different revision.
606
606
607 The archive type is automatically detected based on file
607 The archive type is automatically detected based on file
608 extension (to override, use -t/--type).
608 extension (to override, use -t/--type).
609
609
610 .. container:: verbose
610 .. container:: verbose
611
611
612 Examples:
612 Examples:
613
613
614 - create a zip file containing the 1.0 release::
614 - create a zip file containing the 1.0 release::
615
615
616 hg archive -r 1.0 project-1.0.zip
616 hg archive -r 1.0 project-1.0.zip
617
617
618 - create a tarball excluding .hg files::
618 - create a tarball excluding .hg files::
619
619
620 hg archive project.tar.gz -X ".hg*"
620 hg archive project.tar.gz -X ".hg*"
621
621
622 Valid types are:
622 Valid types are:
623
623
624 :``files``: a directory full of files (default)
624 :``files``: a directory full of files (default)
625 :``tar``: tar archive, uncompressed
625 :``tar``: tar archive, uncompressed
626 :``tbz2``: tar archive, compressed using bzip2
626 :``tbz2``: tar archive, compressed using bzip2
627 :``tgz``: tar archive, compressed using gzip
627 :``tgz``: tar archive, compressed using gzip
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``uzip``: zip archive, uncompressed
629 :``uzip``: zip archive, uncompressed
630 :``zip``: zip archive, compressed using deflate
630 :``zip``: zip archive, compressed using deflate
631
631
632 The exact name of the destination archive or directory is given
632 The exact name of the destination archive or directory is given
633 using a format string; see :hg:`help export` for details.
633 using a format string; see :hg:`help export` for details.
634
634
635 Each member added to an archive file has a directory prefix
635 Each member added to an archive file has a directory prefix
636 prepended. Use -p/--prefix to specify a format string for the
636 prepended. Use -p/--prefix to specify a format string for the
637 prefix. The default is the basename of the archive, with suffixes
637 prefix. The default is the basename of the archive, with suffixes
638 removed.
638 removed.
639
639
640 Returns 0 on success.
640 Returns 0 on success.
641 '''
641 '''
642
642
643 opts = pycompat.byteskwargs(opts)
643 opts = pycompat.byteskwargs(opts)
644 rev = opts.get(b'rev')
644 rev = opts.get(b'rev')
645 if rev:
645 if rev:
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 if not ctx:
648 if not ctx:
649 raise error.Abort(_(b'no working directory: please specify a revision'))
649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 node = ctx.node()
650 node = ctx.node()
651 dest = cmdutil.makefilename(ctx, dest)
651 dest = cmdutil.makefilename(ctx, dest)
652 if os.path.realpath(dest) == repo.root:
652 if os.path.realpath(dest) == repo.root:
653 raise error.Abort(_(b'repository root cannot be destination'))
653 raise error.Abort(_(b'repository root cannot be destination'))
654
654
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 prefix = opts.get(b'prefix')
656 prefix = opts.get(b'prefix')
657
657
658 if dest == b'-':
658 if dest == b'-':
659 if kind == b'files':
659 if kind == b'files':
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 dest = cmdutil.makefileobj(ctx, dest)
661 dest = cmdutil.makefileobj(ctx, dest)
662 if not prefix:
662 if not prefix:
663 prefix = os.path.basename(repo.root) + b'-%h'
663 prefix = os.path.basename(repo.root) + b'-%h'
664
664
665 prefix = cmdutil.makefilename(ctx, prefix)
665 prefix = cmdutil.makefilename(ctx, prefix)
666 match = scmutil.match(ctx, [], opts)
666 match = scmutil.match(ctx, [], opts)
667 archival.archive(
667 archival.archive(
668 repo,
668 repo,
669 dest,
669 dest,
670 node,
670 node,
671 kind,
671 kind,
672 not opts.get(b'no_decode'),
672 not opts.get(b'no_decode'),
673 match,
673 match,
674 prefix,
674 prefix,
675 subrepos=opts.get(b'subrepos'),
675 subrepos=opts.get(b'subrepos'),
676 )
676 )
677
677
678
678
679 @command(
679 @command(
680 b'backout',
680 b'backout',
681 [
681 [
682 (
682 (
683 b'',
683 b'',
684 b'merge',
684 b'merge',
685 None,
685 None,
686 _(b'merge with old dirstate parent after backout'),
686 _(b'merge with old dirstate parent after backout'),
687 ),
687 ),
688 (
688 (
689 b'',
689 b'',
690 b'commit',
690 b'commit',
691 None,
691 None,
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 ),
693 ),
694 (b'', b'no-commit', None, _(b'do not commit')),
694 (b'', b'no-commit', None, _(b'do not commit')),
695 (
695 (
696 b'',
696 b'',
697 b'parent',
697 b'parent',
698 b'',
698 b'',
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'REV'),
700 _(b'REV'),
701 ),
701 ),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 ]
704 ]
705 + mergetoolopts
705 + mergetoolopts
706 + walkopts
706 + walkopts
707 + commitopts
707 + commitopts
708 + commitopts2,
708 + commitopts2,
709 _(b'[OPTION]... [-r] REV'),
709 _(b'[OPTION]... [-r] REV'),
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 )
711 )
712 def backout(ui, repo, node=None, rev=None, **opts):
712 def backout(ui, repo, node=None, rev=None, **opts):
713 '''reverse effect of earlier changeset
713 '''reverse effect of earlier changeset
714
714
715 Prepare a new changeset with the effect of REV undone in the
715 Prepare a new changeset with the effect of REV undone in the
716 current working directory. If no conflicts were encountered,
716 current working directory. If no conflicts were encountered,
717 it will be committed immediately.
717 it will be committed immediately.
718
718
719 If REV is the parent of the working directory, then this new changeset
719 If REV is the parent of the working directory, then this new changeset
720 is committed automatically (unless --no-commit is specified).
720 is committed automatically (unless --no-commit is specified).
721
721
722 .. note::
722 .. note::
723
723
724 :hg:`backout` cannot be used to fix either an unwanted or
724 :hg:`backout` cannot be used to fix either an unwanted or
725 incorrect merge.
725 incorrect merge.
726
726
727 .. container:: verbose
727 .. container:: verbose
728
728
729 Examples:
729 Examples:
730
730
731 - Reverse the effect of the parent of the working directory.
731 - Reverse the effect of the parent of the working directory.
732 This backout will be committed immediately::
732 This backout will be committed immediately::
733
733
734 hg backout -r .
734 hg backout -r .
735
735
736 - Reverse the effect of previous bad revision 23::
736 - Reverse the effect of previous bad revision 23::
737
737
738 hg backout -r 23
738 hg backout -r 23
739
739
740 - Reverse the effect of previous bad revision 23 and
740 - Reverse the effect of previous bad revision 23 and
741 leave changes uncommitted::
741 leave changes uncommitted::
742
742
743 hg backout -r 23 --no-commit
743 hg backout -r 23 --no-commit
744 hg commit -m "Backout revision 23"
744 hg commit -m "Backout revision 23"
745
745
746 By default, the pending changeset will have one parent,
746 By default, the pending changeset will have one parent,
747 maintaining a linear history. With --merge, the pending
747 maintaining a linear history. With --merge, the pending
748 changeset will instead have two parents: the old parent of the
748 changeset will instead have two parents: the old parent of the
749 working directory and a new child of REV that simply undoes REV.
749 working directory and a new child of REV that simply undoes REV.
750
750
751 Before version 1.7, the behavior without --merge was equivalent
751 Before version 1.7, the behavior without --merge was equivalent
752 to specifying --merge followed by :hg:`update --clean .` to
752 to specifying --merge followed by :hg:`update --clean .` to
753 cancel the merge and leave the child of REV as a head to be
753 cancel the merge and leave the child of REV as a head to be
754 merged separately.
754 merged separately.
755
755
756 See :hg:`help dates` for a list of formats valid for -d/--date.
756 See :hg:`help dates` for a list of formats valid for -d/--date.
757
757
758 See :hg:`help revert` for a way to restore files to the state
758 See :hg:`help revert` for a way to restore files to the state
759 of another revision.
759 of another revision.
760
760
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 files.
762 files.
763 '''
763 '''
764 with repo.wlock(), repo.lock():
764 with repo.wlock(), repo.lock():
765 return _dobackout(ui, repo, node, rev, **opts)
765 return _dobackout(ui, repo, node, rev, **opts)
766
766
767
767
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 opts = pycompat.byteskwargs(opts)
769 opts = pycompat.byteskwargs(opts)
770 if opts.get(b'commit') and opts.get(b'no_commit'):
770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 if opts.get(b'merge') and opts.get(b'no_commit'):
772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774
774
775 if rev and node:
775 if rev and node:
776 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
777
777
778 if not rev:
778 if not rev:
779 rev = node
779 rev = node
780
780
781 if not rev:
781 if not rev:
782 raise error.Abort(_(b"please specify a revision to backout"))
782 raise error.Abort(_(b"please specify a revision to backout"))
783
783
784 date = opts.get(b'date')
784 date = opts.get(b'date')
785 if date:
785 if date:
786 opts[b'date'] = dateutil.parsedate(date)
786 opts[b'date'] = dateutil.parsedate(date)
787
787
788 cmdutil.checkunfinished(repo)
788 cmdutil.checkunfinished(repo)
789 cmdutil.bailifchanged(repo)
789 cmdutil.bailifchanged(repo)
790 node = scmutil.revsingle(repo, rev).node()
790 node = scmutil.revsingle(repo, rev).node()
791
791
792 op1, op2 = repo.dirstate.parents()
792 op1, op2 = repo.dirstate.parents()
793 if not repo.changelog.isancestor(node, op1):
793 if not repo.changelog.isancestor(node, op1):
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795
795
796 p1, p2 = repo.changelog.parents(node)
796 p1, p2 = repo.changelog.parents(node)
797 if p1 == nullid:
797 if p1 == nullid:
798 raise error.Abort(_(b'cannot backout a change with no parents'))
798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 if p2 != nullid:
799 if p2 != nullid:
800 if not opts.get(b'parent'):
800 if not opts.get(b'parent'):
801 raise error.Abort(_(b'cannot backout a merge changeset'))
801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 p = repo.lookup(opts[b'parent'])
802 p = repo.lookup(opts[b'parent'])
803 if p not in (p1, p2):
803 if p not in (p1, p2):
804 raise error.Abort(
804 raise error.Abort(
805 _(b'%s is not a parent of %s') % (short(p), short(node))
805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 )
806 )
807 parent = p
807 parent = p
808 else:
808 else:
809 if opts.get(b'parent'):
809 if opts.get(b'parent'):
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 parent = p1
811 parent = p1
812
812
813 # the backout should appear on the same branch
813 # the backout should appear on the same branch
814 branch = repo.dirstate.branch()
814 branch = repo.dirstate.branch()
815 bheads = repo.branchheads(branch)
815 bheads = repo.branchheads(branch)
816 rctx = scmutil.revsingle(repo, hex(parent))
816 rctx = scmutil.revsingle(repo, hex(parent))
817 if not opts.get(b'merge') and op1 != node:
817 if not opts.get(b'merge') and op1 != node:
818 with dirstateguard.dirstateguard(repo, b'backout'):
818 with dirstateguard.dirstateguard(repo, b'backout'):
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 with ui.configoverride(overrides, b'backout'):
820 with ui.configoverride(overrides, b'backout'):
821 stats = mergemod.update(
821 stats = mergemod.update(
822 repo,
822 repo,
823 parent,
823 parent,
824 branchmerge=True,
824 branchmerge=True,
825 force=True,
825 force=True,
826 ancestor=node,
826 ancestor=node,
827 mergeancestor=False,
827 mergeancestor=False,
828 )
828 )
829 repo.setparents(op1, op2)
829 repo.setparents(op1, op2)
830 hg._showstats(repo, stats)
830 hg._showstats(repo, stats)
831 if stats.unresolvedcount:
831 if stats.unresolvedcount:
832 repo.ui.status(
832 repo.ui.status(
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 )
834 )
835 return 1
835 return 1
836 else:
836 else:
837 hg.clean(repo, node, show_stats=False)
837 hg.clean(repo, node, show_stats=False)
838 repo.dirstate.setbranch(branch)
838 repo.dirstate.setbranch(branch)
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840
840
841 if opts.get(b'no_commit'):
841 if opts.get(b'no_commit'):
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 ui.status(msg % short(node))
843 ui.status(msg % short(node))
844 return 0
844 return 0
845
845
846 def commitfunc(ui, repo, message, match, opts):
846 def commitfunc(ui, repo, message, match, opts):
847 editform = b'backout'
847 editform = b'backout'
848 e = cmdutil.getcommiteditor(
848 e = cmdutil.getcommiteditor(
849 editform=editform, **pycompat.strkwargs(opts)
849 editform=editform, **pycompat.strkwargs(opts)
850 )
850 )
851 if not message:
851 if not message:
852 # we don't translate commit messages
852 # we don't translate commit messages
853 message = b"Backed out changeset %s" % short(node)
853 message = b"Backed out changeset %s" % short(node)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 return repo.commit(
855 return repo.commit(
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 )
857 )
858
858
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 if not newnode:
860 if not newnode:
861 ui.status(_(b"nothing changed\n"))
861 ui.status(_(b"nothing changed\n"))
862 return 1
862 return 1
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864
864
865 def nice(node):
865 def nice(node):
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867
867
868 ui.status(
868 ui.status(
869 _(b'changeset %s backs out changeset %s\n')
869 _(b'changeset %s backs out changeset %s\n')
870 % (nice(repo.changelog.tip()), nice(node))
870 % (nice(repo.changelog.tip()), nice(node))
871 )
871 )
872 if opts.get(b'merge') and op1 != node:
872 if opts.get(b'merge') and op1 != node:
873 hg.clean(repo, op1, show_stats=False)
873 hg.clean(repo, op1, show_stats=False)
874 ui.status(
874 ui.status(
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 )
876 )
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 with ui.configoverride(overrides, b'backout'):
878 with ui.configoverride(overrides, b'backout'):
879 return hg.merge(repo, hex(repo.changelog.tip()))
879 return hg.merge(repo, hex(repo.changelog.tip()))
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 cmdutil.check_incompatible_arguments(
1239 cmdutil.check_incompatible_arguments(
1240 opts, b'inactive', [b'delete', b'list']
1240 opts, b'inactive', [b'delete', b'list']
1241 )
1241 )
1242 if not names and action in {b'add', b'delete'}:
1242 if not names and action in {b'add', b'delete'}:
1243 raise error.Abort(_(b"bookmark name required"))
1243 raise error.Abort(_(b"bookmark name required"))
1244
1244
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 if action == b'delete':
1247 if action == b'delete':
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 bookmarks.delete(repo, tr, names)
1249 bookmarks.delete(repo, tr, names)
1250 elif action == b'rename':
1250 elif action == b'rename':
1251 if not names:
1251 if not names:
1252 raise error.Abort(_(b"new bookmark name required"))
1252 raise error.Abort(_(b"new bookmark name required"))
1253 elif len(names) > 1:
1253 elif len(names) > 1:
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 elif action == b'add':
1257 elif action == b'add':
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 elif action == b'inactive':
1259 elif action == b'inactive':
1260 if len(repo._bookmarks) == 0:
1260 if len(repo._bookmarks) == 0:
1261 ui.status(_(b"no bookmarks set\n"))
1261 ui.status(_(b"no bookmarks set\n"))
1262 elif not repo._activebookmark:
1262 elif not repo._activebookmark:
1263 ui.status(_(b"no active bookmark\n"))
1263 ui.status(_(b"no active bookmark\n"))
1264 else:
1264 else:
1265 bookmarks.deactivate(repo)
1265 bookmarks.deactivate(repo)
1266 elif action == b'list':
1266 elif action == b'list':
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 with ui.formatter(b'bookmarks', opts) as fm:
1268 with ui.formatter(b'bookmarks', opts) as fm:
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1270 else:
1270 else:
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1272
1272
1273
1273
1274 @command(
1274 @command(
1275 b'branch',
1275 b'branch',
1276 [
1276 [
1277 (
1277 (
1278 b'f',
1278 b'f',
1279 b'force',
1279 b'force',
1280 None,
1280 None,
1281 _(b'set branch name even if it shadows an existing branch'),
1281 _(b'set branch name even if it shadows an existing branch'),
1282 ),
1282 ),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (
1284 (
1285 b'r',
1285 b'r',
1286 b'rev',
1286 b'rev',
1287 [],
1287 [],
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 ),
1289 ),
1290 ],
1290 ],
1291 _(b'[-fC] [NAME]'),
1291 _(b'[-fC] [NAME]'),
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 )
1293 )
1294 def branch(ui, repo, label=None, **opts):
1294 def branch(ui, repo, label=None, **opts):
1295 """set or show the current branch name
1295 """set or show the current branch name
1296
1296
1297 .. note::
1297 .. note::
1298
1298
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1301 information about named branches and bookmarks.
1301 information about named branches and bookmarks.
1302
1302
1303 With no argument, show the current branch name. With one argument,
1303 With no argument, show the current branch name. With one argument,
1304 set the working directory branch name (the branch will not exist
1304 set the working directory branch name (the branch will not exist
1305 in the repository until the next commit). Standard practice
1305 in the repository until the next commit). Standard practice
1306 recommends that primary development take place on the 'default'
1306 recommends that primary development take place on the 'default'
1307 branch.
1307 branch.
1308
1308
1309 Unless -f/--force is specified, branch will not let you set a
1309 Unless -f/--force is specified, branch will not let you set a
1310 branch name that already exists.
1310 branch name that already exists.
1311
1311
1312 Use -C/--clean to reset the working directory branch to that of
1312 Use -C/--clean to reset the working directory branch to that of
1313 the parent of the working directory, negating a previous branch
1313 the parent of the working directory, negating a previous branch
1314 change.
1314 change.
1315
1315
1316 Use the command :hg:`update` to switch to an existing branch. Use
1316 Use the command :hg:`update` to switch to an existing branch. Use
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1318 When all heads of a branch are closed, the branch will be
1318 When all heads of a branch are closed, the branch will be
1319 considered closed.
1319 considered closed.
1320
1320
1321 Returns 0 on success.
1321 Returns 0 on success.
1322 """
1322 """
1323 opts = pycompat.byteskwargs(opts)
1323 opts = pycompat.byteskwargs(opts)
1324 revs = opts.get(b'rev')
1324 revs = opts.get(b'rev')
1325 if label:
1325 if label:
1326 label = label.strip()
1326 label = label.strip()
1327
1327
1328 if not opts.get(b'clean') and not label:
1328 if not opts.get(b'clean') and not label:
1329 if revs:
1329 if revs:
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1332 return
1332 return
1333
1333
1334 with repo.wlock():
1334 with repo.wlock():
1335 if opts.get(b'clean'):
1335 if opts.get(b'clean'):
1336 label = repo[b'.'].branch()
1336 label = repo[b'.'].branch()
1337 repo.dirstate.setbranch(label)
1337 repo.dirstate.setbranch(label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 elif label:
1339 elif label:
1340
1340
1341 scmutil.checknewlabel(repo, label, b'branch')
1341 scmutil.checknewlabel(repo, label, b'branch')
1342 if revs:
1342 if revs:
1343 return cmdutil.changebranch(ui, repo, revs, label)
1343 return cmdutil.changebranch(ui, repo, revs, label)
1344
1344
1345 if not opts.get(b'force') and label in repo.branchmap():
1345 if not opts.get(b'force') and label in repo.branchmap():
1346 if label not in [p.branch() for p in repo[None].parents()]:
1346 if label not in [p.branch() for p in repo[None].parents()]:
1347 raise error.Abort(
1347 raise error.Abort(
1348 _(b'a branch of the same name already exists'),
1348 _(b'a branch of the same name already exists'),
1349 # i18n: "it" refers to an existing branch
1349 # i18n: "it" refers to an existing branch
1350 hint=_(b"use 'hg update' to switch to it"),
1350 hint=_(b"use 'hg update' to switch to it"),
1351 )
1351 )
1352
1352
1353 repo.dirstate.setbranch(label)
1353 repo.dirstate.setbranch(label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1355
1355
1356 # find any open named branches aside from default
1356 # find any open named branches aside from default
1357 for n, h, t, c in repo.branchmap().iterbranches():
1357 for n, h, t, c in repo.branchmap().iterbranches():
1358 if n != b"default" and not c:
1358 if n != b"default" and not c:
1359 return 0
1359 return 0
1360 ui.status(
1360 ui.status(
1361 _(
1361 _(
1362 b'(branches are permanent and global, '
1362 b'(branches are permanent and global, '
1363 b'did you want a bookmark?)\n'
1363 b'did you want a bookmark?)\n'
1364 )
1364 )
1365 )
1365 )
1366
1366
1367
1367
1368 @command(
1368 @command(
1369 b'branches',
1369 b'branches',
1370 [
1370 [
1371 (
1371 (
1372 b'a',
1372 b'a',
1373 b'active',
1373 b'active',
1374 False,
1374 False,
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 ),
1376 ),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 ]
1379 ]
1380 + formatteropts,
1380 + formatteropts,
1381 _(b'[-c]'),
1381 _(b'[-c]'),
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 intents={INTENT_READONLY},
1383 intents={INTENT_READONLY},
1384 )
1384 )
1385 def branches(ui, repo, active=False, closed=False, **opts):
1385 def branches(ui, repo, active=False, closed=False, **opts):
1386 """list repository named branches
1386 """list repository named branches
1387
1387
1388 List the repository's named branches, indicating which ones are
1388 List the repository's named branches, indicating which ones are
1389 inactive. If -c/--closed is specified, also list branches which have
1389 inactive. If -c/--closed is specified, also list branches which have
1390 been marked closed (see :hg:`commit --close-branch`).
1390 been marked closed (see :hg:`commit --close-branch`).
1391
1391
1392 Use the command :hg:`update` to switch to an existing branch.
1392 Use the command :hg:`update` to switch to an existing branch.
1393
1393
1394 .. container:: verbose
1394 .. container:: verbose
1395
1395
1396 Template:
1396 Template:
1397
1397
1398 The following keywords are supported in addition to the common template
1398 The following keywords are supported in addition to the common template
1399 keywords and functions such as ``{branch}``. See also
1399 keywords and functions such as ``{branch}``. See also
1400 :hg:`help templates`.
1400 :hg:`help templates`.
1401
1401
1402 :active: Boolean. True if the branch is active.
1402 :active: Boolean. True if the branch is active.
1403 :closed: Boolean. True if the branch is closed.
1403 :closed: Boolean. True if the branch is closed.
1404 :current: Boolean. True if it is the current branch.
1404 :current: Boolean. True if it is the current branch.
1405
1405
1406 Returns 0.
1406 Returns 0.
1407 """
1407 """
1408
1408
1409 opts = pycompat.byteskwargs(opts)
1409 opts = pycompat.byteskwargs(opts)
1410 revs = opts.get(b'rev')
1410 revs = opts.get(b'rev')
1411 selectedbranches = None
1411 selectedbranches = None
1412 if revs:
1412 if revs:
1413 revs = scmutil.revrange(repo, revs)
1413 revs = scmutil.revrange(repo, revs)
1414 getbi = repo.revbranchcache().branchinfo
1414 getbi = repo.revbranchcache().branchinfo
1415 selectedbranches = {getbi(r)[0] for r in revs}
1415 selectedbranches = {getbi(r)[0] for r in revs}
1416
1416
1417 ui.pager(b'branches')
1417 ui.pager(b'branches')
1418 fm = ui.formatter(b'branches', opts)
1418 fm = ui.formatter(b'branches', opts)
1419 hexfunc = fm.hexfunc
1419 hexfunc = fm.hexfunc
1420
1420
1421 allheads = set(repo.heads())
1421 allheads = set(repo.heads())
1422 branches = []
1422 branches = []
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 if selectedbranches is not None and tag not in selectedbranches:
1424 if selectedbranches is not None and tag not in selectedbranches:
1425 continue
1425 continue
1426 isactive = False
1426 isactive = False
1427 if not isclosed:
1427 if not isclosed:
1428 openheads = set(repo.branchmap().iteropen(heads))
1428 openheads = set(repo.branchmap().iteropen(heads))
1429 isactive = bool(openheads & allheads)
1429 isactive = bool(openheads & allheads)
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432
1432
1433 for tag, ctx, isactive, isopen in branches:
1433 for tag, ctx, isactive, isopen in branches:
1434 if active and not isactive:
1434 if active and not isactive:
1435 continue
1435 continue
1436 if isactive:
1436 if isactive:
1437 label = b'branches.active'
1437 label = b'branches.active'
1438 notice = b''
1438 notice = b''
1439 elif not isopen:
1439 elif not isopen:
1440 if not closed:
1440 if not closed:
1441 continue
1441 continue
1442 label = b'branches.closed'
1442 label = b'branches.closed'
1443 notice = _(b' (closed)')
1443 notice = _(b' (closed)')
1444 else:
1444 else:
1445 label = b'branches.inactive'
1445 label = b'branches.inactive'
1446 notice = _(b' (inactive)')
1446 notice = _(b' (inactive)')
1447 current = tag == repo.dirstate.branch()
1447 current = tag == repo.dirstate.branch()
1448 if current:
1448 if current:
1449 label = b'branches.current'
1449 label = b'branches.current'
1450
1450
1451 fm.startitem()
1451 fm.startitem()
1452 fm.write(b'branch', b'%s', tag, label=label)
1452 fm.write(b'branch', b'%s', tag, label=label)
1453 rev = ctx.rev()
1453 rev = ctx.rev()
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 fmt = b' ' * padsize + b' %d:%s'
1455 fmt = b' ' * padsize + b' %d:%s'
1456 fm.condwrite(
1456 fm.condwrite(
1457 not ui.quiet,
1457 not ui.quiet,
1458 b'rev node',
1458 b'rev node',
1459 fmt,
1459 fmt,
1460 rev,
1460 rev,
1461 hexfunc(ctx.node()),
1461 hexfunc(ctx.node()),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 )
1463 )
1464 fm.context(ctx=ctx)
1464 fm.context(ctx=ctx)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1466 if not ui.quiet:
1466 if not ui.quiet:
1467 fm.plain(notice)
1467 fm.plain(notice)
1468 fm.plain(b'\n')
1468 fm.plain(b'\n')
1469 fm.end()
1469 fm.end()
1470
1470
1471
1471
1472 @command(
1472 @command(
1473 b'bundle',
1473 b'bundle',
1474 [
1474 [
1475 (
1475 (
1476 b'f',
1476 b'f',
1477 b'force',
1477 b'force',
1478 None,
1478 None,
1479 _(b'run even when the destination is unrelated'),
1479 _(b'run even when the destination is unrelated'),
1480 ),
1480 ),
1481 (
1481 (
1482 b'r',
1482 b'r',
1483 b'rev',
1483 b'rev',
1484 [],
1484 [],
1485 _(b'a changeset intended to be added to the destination'),
1485 _(b'a changeset intended to be added to the destination'),
1486 _(b'REV'),
1486 _(b'REV'),
1487 ),
1487 ),
1488 (
1488 (
1489 b'b',
1489 b'b',
1490 b'branch',
1490 b'branch',
1491 [],
1491 [],
1492 _(b'a specific branch you would like to bundle'),
1492 _(b'a specific branch you would like to bundle'),
1493 _(b'BRANCH'),
1493 _(b'BRANCH'),
1494 ),
1494 ),
1495 (
1495 (
1496 b'',
1496 b'',
1497 b'base',
1497 b'base',
1498 [],
1498 [],
1499 _(b'a base changeset assumed to be available at the destination'),
1499 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'REV'),
1500 _(b'REV'),
1501 ),
1501 ),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (
1503 (
1504 b't',
1504 b't',
1505 b'type',
1505 b'type',
1506 b'bzip2',
1506 b'bzip2',
1507 _(b'bundle compression type to use'),
1507 _(b'bundle compression type to use'),
1508 _(b'TYPE'),
1508 _(b'TYPE'),
1509 ),
1509 ),
1510 ]
1510 ]
1511 + remoteopts,
1511 + remoteopts,
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 )
1514 )
1515 def bundle(ui, repo, fname, dest=None, **opts):
1515 def bundle(ui, repo, fname, dest=None, **opts):
1516 """create a bundle file
1516 """create a bundle file
1517
1517
1518 Generate a bundle file containing data to be transferred to another
1518 Generate a bundle file containing data to be transferred to another
1519 repository.
1519 repository.
1520
1520
1521 To create a bundle containing all changesets, use -a/--all
1521 To create a bundle containing all changesets, use -a/--all
1522 (or --base null). Otherwise, hg assumes the destination will have
1522 (or --base null). Otherwise, hg assumes the destination will have
1523 all the nodes you specify with --base parameters. Otherwise, hg
1523 all the nodes you specify with --base parameters. Otherwise, hg
1524 will assume the repository has all the nodes in destination, or
1524 will assume the repository has all the nodes in destination, or
1525 default-push/default if no destination is specified, where destination
1525 default-push/default if no destination is specified, where destination
1526 is the repository you provide through DEST option.
1526 is the repository you provide through DEST option.
1527
1527
1528 You can change bundle format with the -t/--type option. See
1528 You can change bundle format with the -t/--type option. See
1529 :hg:`help bundlespec` for documentation on this format. By default,
1529 :hg:`help bundlespec` for documentation on this format. By default,
1530 the most appropriate format is used and compression defaults to
1530 the most appropriate format is used and compression defaults to
1531 bzip2.
1531 bzip2.
1532
1532
1533 The bundle file can then be transferred using conventional means
1533 The bundle file can then be transferred using conventional means
1534 and applied to another repository with the unbundle or pull
1534 and applied to another repository with the unbundle or pull
1535 command. This is useful when direct push and pull are not
1535 command. This is useful when direct push and pull are not
1536 available or when exporting an entire repository is undesirable.
1536 available or when exporting an entire repository is undesirable.
1537
1537
1538 Applying bundles preserves all changeset contents including
1538 Applying bundles preserves all changeset contents including
1539 permissions, copy/rename information, and revision history.
1539 permissions, copy/rename information, and revision history.
1540
1540
1541 Returns 0 on success, 1 if no changes found.
1541 Returns 0 on success, 1 if no changes found.
1542 """
1542 """
1543 opts = pycompat.byteskwargs(opts)
1543 opts = pycompat.byteskwargs(opts)
1544 revs = None
1544 revs = None
1545 if b'rev' in opts:
1545 if b'rev' in opts:
1546 revstrings = opts[b'rev']
1546 revstrings = opts[b'rev']
1547 revs = scmutil.revrange(repo, revstrings)
1547 revs = scmutil.revrange(repo, revstrings)
1548 if revstrings and not revs:
1548 if revstrings and not revs:
1549 raise error.Abort(_(b'no commits to bundle'))
1549 raise error.Abort(_(b'no commits to bundle'))
1550
1550
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1552 try:
1552 try:
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 except error.UnsupportedBundleSpecification as e:
1554 except error.UnsupportedBundleSpecification as e:
1555 raise error.Abort(
1555 raise error.Abort(
1556 pycompat.bytestr(e),
1556 pycompat.bytestr(e),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 )
1558 )
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1560
1560
1561 # Packed bundles are a pseudo bundle format for now.
1561 # Packed bundles are a pseudo bundle format for now.
1562 if cgversion == b's1':
1562 if cgversion == b's1':
1563 raise error.Abort(
1563 raise error.Abort(
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 )
1566 )
1567
1567
1568 if opts.get(b'all'):
1568 if opts.get(b'all'):
1569 if dest:
1569 if dest:
1570 raise error.Abort(
1570 raise error.Abort(
1571 _(b"--all is incompatible with specifying a destination")
1571 _(b"--all is incompatible with specifying a destination")
1572 )
1572 )
1573 if opts.get(b'base'):
1573 if opts.get(b'base'):
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 base = [nullrev]
1575 base = [nullrev]
1576 else:
1576 else:
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 raise error.Abort(
1579 raise error.Abort(
1580 _(b"repository does not support bundle version %s") % cgversion
1580 _(b"repository does not support bundle version %s") % cgversion
1581 )
1581 )
1582
1582
1583 if base:
1583 if base:
1584 if dest:
1584 if dest:
1585 raise error.Abort(
1585 raise error.Abort(
1586 _(b"--base is incompatible with specifying a destination")
1586 _(b"--base is incompatible with specifying a destination")
1587 )
1587 )
1588 common = [repo[rev].node() for rev in base]
1588 common = [repo[rev].node() for rev in base]
1589 heads = [repo[r].node() for r in revs] if revs else None
1589 heads = [repo[r].node() for r in revs] if revs else None
1590 outgoing = discovery.outgoing(repo, common, heads)
1590 outgoing = discovery.outgoing(repo, common, heads)
1591 else:
1591 else:
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 other = hg.peer(repo, opts, dest)
1594 other = hg.peer(repo, opts, dest)
1595 revs = [repo[r].hex() for r in revs]
1595 revs = [repo[r].hex() for r in revs]
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 outgoing = discovery.findcommonoutgoing(
1598 outgoing = discovery.findcommonoutgoing(
1599 repo,
1599 repo,
1600 other,
1600 other,
1601 onlyheads=heads,
1601 onlyheads=heads,
1602 force=opts.get(b'force'),
1602 force=opts.get(b'force'),
1603 portable=True,
1603 portable=True,
1604 )
1604 )
1605
1605
1606 if not outgoing.missing:
1606 if not outgoing.missing:
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 return 1
1608 return 1
1609
1609
1610 if cgversion == b'01': # bundle1
1610 if cgversion == b'01': # bundle1
1611 bversion = b'HG10' + bundlespec.wirecompression
1611 bversion = b'HG10' + bundlespec.wirecompression
1612 bcompression = None
1612 bcompression = None
1613 elif cgversion in (b'02', b'03'):
1613 elif cgversion in (b'02', b'03'):
1614 bversion = b'HG20'
1614 bversion = b'HG20'
1615 bcompression = bundlespec.wirecompression
1615 bcompression = bundlespec.wirecompression
1616 else:
1616 else:
1617 raise error.ProgrammingError(
1617 raise error.ProgrammingError(
1618 b'bundle: unexpected changegroup version %s' % cgversion
1618 b'bundle: unexpected changegroup version %s' % cgversion
1619 )
1619 )
1620
1620
1621 # TODO compression options should be derived from bundlespec parsing.
1621 # TODO compression options should be derived from bundlespec parsing.
1622 # This is a temporary hack to allow adjusting bundle compression
1622 # This is a temporary hack to allow adjusting bundle compression
1623 # level without a) formalizing the bundlespec changes to declare it
1623 # level without a) formalizing the bundlespec changes to declare it
1624 # b) introducing a command flag.
1624 # b) introducing a command flag.
1625 compopts = {}
1625 compopts = {}
1626 complevel = ui.configint(
1626 complevel = ui.configint(
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 )
1628 )
1629 if complevel is None:
1629 if complevel is None:
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 if complevel is not None:
1631 if complevel is not None:
1632 compopts[b'level'] = complevel
1632 compopts[b'level'] = complevel
1633
1633
1634 # Allow overriding the bundling of obsmarker in phases through
1634 # Allow overriding the bundling of obsmarker in phases through
1635 # configuration while we don't have a bundle version that include them
1635 # configuration while we don't have a bundle version that include them
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 bundlespec.contentopts[b'obsolescence'] = True
1637 bundlespec.contentopts[b'obsolescence'] = True
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 bundlespec.contentopts[b'phases'] = True
1639 bundlespec.contentopts[b'phases'] = True
1640
1640
1641 bundle2.writenewbundle(
1641 bundle2.writenewbundle(
1642 ui,
1642 ui,
1643 repo,
1643 repo,
1644 b'bundle',
1644 b'bundle',
1645 fname,
1645 fname,
1646 bversion,
1646 bversion,
1647 outgoing,
1647 outgoing,
1648 bundlespec.contentopts,
1648 bundlespec.contentopts,
1649 compression=bcompression,
1649 compression=bcompression,
1650 compopts=compopts,
1650 compopts=compopts,
1651 )
1651 )
1652
1652
1653
1653
1654 @command(
1654 @command(
1655 b'cat',
1655 b'cat',
1656 [
1656 [
1657 (
1657 (
1658 b'o',
1658 b'o',
1659 b'output',
1659 b'output',
1660 b'',
1660 b'',
1661 _(b'print output to file with formatted name'),
1661 _(b'print output to file with formatted name'),
1662 _(b'FORMAT'),
1662 _(b'FORMAT'),
1663 ),
1663 ),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 ]
1666 ]
1667 + walkopts
1667 + walkopts
1668 + formatteropts,
1668 + formatteropts,
1669 _(b'[OPTION]... FILE...'),
1669 _(b'[OPTION]... FILE...'),
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 inferrepo=True,
1671 inferrepo=True,
1672 intents={INTENT_READONLY},
1672 intents={INTENT_READONLY},
1673 )
1673 )
1674 def cat(ui, repo, file1, *pats, **opts):
1674 def cat(ui, repo, file1, *pats, **opts):
1675 """output the current or given revision of files
1675 """output the current or given revision of files
1676
1676
1677 Print the specified files as they were at the given revision. If
1677 Print the specified files as they were at the given revision. If
1678 no revision is given, the parent of the working directory is used.
1678 no revision is given, the parent of the working directory is used.
1679
1679
1680 Output may be to a file, in which case the name of the file is
1680 Output may be to a file, in which case the name of the file is
1681 given using a template string. See :hg:`help templates`. In addition
1681 given using a template string. See :hg:`help templates`. In addition
1682 to the common template keywords, the following formatting rules are
1682 to the common template keywords, the following formatting rules are
1683 supported:
1683 supported:
1684
1684
1685 :``%%``: literal "%" character
1685 :``%%``: literal "%" character
1686 :``%s``: basename of file being printed
1686 :``%s``: basename of file being printed
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%p``: root-relative path name of file being printed
1688 :``%p``: root-relative path name of file being printed
1689 :``%H``: changeset hash (40 hexadecimal digits)
1689 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%R``: changeset revision number
1690 :``%R``: changeset revision number
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%r``: zero-padded changeset revision number
1692 :``%r``: zero-padded changeset revision number
1693 :``%b``: basename of the exporting repository
1693 :``%b``: basename of the exporting repository
1694 :``\\``: literal "\\" character
1694 :``\\``: literal "\\" character
1695
1695
1696 .. container:: verbose
1696 .. container:: verbose
1697
1697
1698 Template:
1698 Template:
1699
1699
1700 The following keywords are supported in addition to the common template
1700 The following keywords are supported in addition to the common template
1701 keywords and functions. See also :hg:`help templates`.
1701 keywords and functions. See also :hg:`help templates`.
1702
1702
1703 :data: String. File content.
1703 :data: String. File content.
1704 :path: String. Repository-absolute path of the file.
1704 :path: String. Repository-absolute path of the file.
1705
1705
1706 Returns 0 on success.
1706 Returns 0 on success.
1707 """
1707 """
1708 opts = pycompat.byteskwargs(opts)
1708 opts = pycompat.byteskwargs(opts)
1709 rev = opts.get(b'rev')
1709 rev = opts.get(b'rev')
1710 if rev:
1710 if rev:
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 ctx = scmutil.revsingle(repo, rev)
1712 ctx = scmutil.revsingle(repo, rev)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 fntemplate = opts.pop(b'output', b'')
1714 fntemplate = opts.pop(b'output', b'')
1715 if cmdutil.isstdiofilename(fntemplate):
1715 if cmdutil.isstdiofilename(fntemplate):
1716 fntemplate = b''
1716 fntemplate = b''
1717
1717
1718 if fntemplate:
1718 if fntemplate:
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1720 else:
1720 else:
1721 ui.pager(b'cat')
1721 ui.pager(b'cat')
1722 fm = ui.formatter(b'cat', opts)
1722 fm = ui.formatter(b'cat', opts)
1723 with fm:
1723 with fm:
1724 return cmdutil.cat(
1724 return cmdutil.cat(
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 )
1726 )
1727
1727
1728
1728
1729 @command(
1729 @command(
1730 b'clone',
1730 b'clone',
1731 [
1731 [
1732 (
1732 (
1733 b'U',
1733 b'U',
1734 b'noupdate',
1734 b'noupdate',
1735 None,
1735 None,
1736 _(
1736 _(
1737 b'the clone will include an empty working '
1737 b'the clone will include an empty working '
1738 b'directory (only a repository)'
1738 b'directory (only a repository)'
1739 ),
1739 ),
1740 ),
1740 ),
1741 (
1741 (
1742 b'u',
1742 b'u',
1743 b'updaterev',
1743 b'updaterev',
1744 b'',
1744 b'',
1745 _(b'revision, tag, or branch to check out'),
1745 _(b'revision, tag, or branch to check out'),
1746 _(b'REV'),
1746 _(b'REV'),
1747 ),
1747 ),
1748 (
1748 (
1749 b'r',
1749 b'r',
1750 b'rev',
1750 b'rev',
1751 [],
1751 [],
1752 _(
1752 _(
1753 b'do not clone everything, but include this changeset'
1753 b'do not clone everything, but include this changeset'
1754 b' and its ancestors'
1754 b' and its ancestors'
1755 ),
1755 ),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'b',
1759 b'b',
1760 b'branch',
1760 b'branch',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this branch\'s'
1763 b'do not clone everything, but include this branch\'s'
1764 b' changesets and their ancestors'
1764 b' changesets and their ancestors'
1765 ),
1765 ),
1766 _(b'BRANCH'),
1766 _(b'BRANCH'),
1767 ),
1767 ),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 ]
1771 ]
1772 + remoteopts,
1772 + remoteopts,
1773 _(b'[OPTION]... SOURCE [DEST]'),
1773 _(b'[OPTION]... SOURCE [DEST]'),
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpbasic=True,
1775 helpbasic=True,
1776 norepo=True,
1776 norepo=True,
1777 )
1777 )
1778 def clone(ui, source, dest=None, **opts):
1778 def clone(ui, source, dest=None, **opts):
1779 """make a copy of an existing repository
1779 """make a copy of an existing repository
1780
1780
1781 Create a copy of an existing repository in a new directory.
1781 Create a copy of an existing repository in a new directory.
1782
1782
1783 If no destination directory name is specified, it defaults to the
1783 If no destination directory name is specified, it defaults to the
1784 basename of the source.
1784 basename of the source.
1785
1785
1786 The location of the source is added to the new repository's
1786 The location of the source is added to the new repository's
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788
1788
1789 Only local paths and ``ssh://`` URLs are supported as
1789 Only local paths and ``ssh://`` URLs are supported as
1790 destinations. For ``ssh://`` destinations, no working directory or
1790 destinations. For ``ssh://`` destinations, no working directory or
1791 ``.hg/hgrc`` will be created on the remote side.
1791 ``.hg/hgrc`` will be created on the remote side.
1792
1792
1793 If the source repository has a bookmark called '@' set, that
1793 If the source repository has a bookmark called '@' set, that
1794 revision will be checked out in the new repository by default.
1794 revision will be checked out in the new repository by default.
1795
1795
1796 To check out a particular version, use -u/--update, or
1796 To check out a particular version, use -u/--update, or
1797 -U/--noupdate to create a clone with no working directory.
1797 -U/--noupdate to create a clone with no working directory.
1798
1798
1799 To pull only a subset of changesets, specify one or more revisions
1799 To pull only a subset of changesets, specify one or more revisions
1800 identifiers with -r/--rev or branches with -b/--branch. The
1800 identifiers with -r/--rev or branches with -b/--branch. The
1801 resulting clone will contain only the specified changesets and
1801 resulting clone will contain only the specified changesets and
1802 their ancestors. These options (or 'clone src#rev dest') imply
1802 their ancestors. These options (or 'clone src#rev dest') imply
1803 --pull, even for local source repositories.
1803 --pull, even for local source repositories.
1804
1804
1805 In normal clone mode, the remote normalizes repository data into a common
1805 In normal clone mode, the remote normalizes repository data into a common
1806 exchange format and the receiving end translates this data into its local
1806 exchange format and the receiving end translates this data into its local
1807 storage format. --stream activates a different clone mode that essentially
1807 storage format. --stream activates a different clone mode that essentially
1808 copies repository files from the remote with minimal data processing. This
1808 copies repository files from the remote with minimal data processing. This
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1810 However, it often increases the transferred data size by 30-40%. This can
1810 However, it often increases the transferred data size by 30-40%. This can
1811 result in substantially faster clones where I/O throughput is plentiful,
1811 result in substantially faster clones where I/O throughput is plentiful,
1812 especially for larger repositories. A side-effect of --stream clones is
1812 especially for larger repositories. A side-effect of --stream clones is
1813 that storage settings and requirements on the remote are applied locally:
1813 that storage settings and requirements on the remote are applied locally:
1814 a modern client may inherit legacy or inefficient storage used by the
1814 a modern client may inherit legacy or inefficient storage used by the
1815 remote or a legacy Mercurial client may not be able to clone from a
1815 remote or a legacy Mercurial client may not be able to clone from a
1816 modern Mercurial remote.
1816 modern Mercurial remote.
1817
1817
1818 .. note::
1818 .. note::
1819
1819
1820 Specifying a tag will include the tagged changeset but not the
1820 Specifying a tag will include the tagged changeset but not the
1821 changeset containing the tag.
1821 changeset containing the tag.
1822
1822
1823 .. container:: verbose
1823 .. container:: verbose
1824
1824
1825 For efficiency, hardlinks are used for cloning whenever the
1825 For efficiency, hardlinks are used for cloning whenever the
1826 source and destination are on the same filesystem (note this
1826 source and destination are on the same filesystem (note this
1827 applies only to the repository data, not to the working
1827 applies only to the repository data, not to the working
1828 directory). Some filesystems, such as AFS, implement hardlinking
1828 directory). Some filesystems, such as AFS, implement hardlinking
1829 incorrectly, but do not report errors. In these cases, use the
1829 incorrectly, but do not report errors. In these cases, use the
1830 --pull option to avoid hardlinking.
1830 --pull option to avoid hardlinking.
1831
1831
1832 Mercurial will update the working directory to the first applicable
1832 Mercurial will update the working directory to the first applicable
1833 revision from this list:
1833 revision from this list:
1834
1834
1835 a) null if -U or the source repository has no changesets
1835 a) null if -U or the source repository has no changesets
1836 b) if -u . and the source repository is local, the first parent of
1836 b) if -u . and the source repository is local, the first parent of
1837 the source repository's working directory
1837 the source repository's working directory
1838 c) the changeset specified with -u (if a branch name, this means the
1838 c) the changeset specified with -u (if a branch name, this means the
1839 latest head of that branch)
1839 latest head of that branch)
1840 d) the changeset specified with -r
1840 d) the changeset specified with -r
1841 e) the tipmost head specified with -b
1841 e) the tipmost head specified with -b
1842 f) the tipmost head specified with the url#branch source syntax
1842 f) the tipmost head specified with the url#branch source syntax
1843 g) the revision marked with the '@' bookmark, if present
1843 g) the revision marked with the '@' bookmark, if present
1844 h) the tipmost head of the default branch
1844 h) the tipmost head of the default branch
1845 i) tip
1845 i) tip
1846
1846
1847 When cloning from servers that support it, Mercurial may fetch
1847 When cloning from servers that support it, Mercurial may fetch
1848 pre-generated data from a server-advertised URL or inline from the
1848 pre-generated data from a server-advertised URL or inline from the
1849 same stream. When this is done, hooks operating on incoming changesets
1849 same stream. When this is done, hooks operating on incoming changesets
1850 and changegroups may fire more than once, once for each pre-generated
1850 and changegroups may fire more than once, once for each pre-generated
1851 bundle and as well as for any additional remaining data. In addition,
1851 bundle and as well as for any additional remaining data. In addition,
1852 if an error occurs, the repository may be rolled back to a partial
1852 if an error occurs, the repository may be rolled back to a partial
1853 clone. This behavior may change in future releases.
1853 clone. This behavior may change in future releases.
1854 See :hg:`help -e clonebundles` for more.
1854 See :hg:`help -e clonebundles` for more.
1855
1855
1856 Examples:
1856 Examples:
1857
1857
1858 - clone a remote repository to a new directory named hg/::
1858 - clone a remote repository to a new directory named hg/::
1859
1859
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1861
1861
1862 - create a lightweight local clone::
1862 - create a lightweight local clone::
1863
1863
1864 hg clone project/ project-feature/
1864 hg clone project/ project-feature/
1865
1865
1866 - clone from an absolute path on an ssh server (note double-slash)::
1866 - clone from an absolute path on an ssh server (note double-slash)::
1867
1867
1868 hg clone ssh://user@server//home/projects/alpha/
1868 hg clone ssh://user@server//home/projects/alpha/
1869
1869
1870 - do a streaming clone while checking out a specified version::
1870 - do a streaming clone while checking out a specified version::
1871
1871
1872 hg clone --stream http://server/repo -u 1.5
1872 hg clone --stream http://server/repo -u 1.5
1873
1873
1874 - create a repository without changesets after a particular revision::
1874 - create a repository without changesets after a particular revision::
1875
1875
1876 hg clone -r 04e544 experimental/ good/
1876 hg clone -r 04e544 experimental/ good/
1877
1877
1878 - clone (and track) a particular named branch::
1878 - clone (and track) a particular named branch::
1879
1879
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881
1881
1882 See :hg:`help urls` for details on specifying URLs.
1882 See :hg:`help urls` for details on specifying URLs.
1883
1883
1884 Returns 0 on success.
1884 Returns 0 on success.
1885 """
1885 """
1886 opts = pycompat.byteskwargs(opts)
1886 opts = pycompat.byteskwargs(opts)
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888
1888
1889 # --include/--exclude can come from narrow or sparse.
1889 # --include/--exclude can come from narrow or sparse.
1890 includepats, excludepats = None, None
1890 includepats, excludepats = None, None
1891
1891
1892 # hg.clone() differentiates between None and an empty set. So make sure
1892 # hg.clone() differentiates between None and an empty set. So make sure
1893 # patterns are sets if narrow is requested without patterns.
1893 # patterns are sets if narrow is requested without patterns.
1894 if opts.get(b'narrow'):
1894 if opts.get(b'narrow'):
1895 includepats = set()
1895 includepats = set()
1896 excludepats = set()
1896 excludepats = set()
1897
1897
1898 if opts.get(b'include'):
1898 if opts.get(b'include'):
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 if opts.get(b'exclude'):
1900 if opts.get(b'exclude'):
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902
1902
1903 r = hg.clone(
1903 r = hg.clone(
1904 ui,
1904 ui,
1905 opts,
1905 opts,
1906 source,
1906 source,
1907 dest,
1907 dest,
1908 pull=opts.get(b'pull'),
1908 pull=opts.get(b'pull'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 revs=opts.get(b'rev'),
1910 revs=opts.get(b'rev'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 branch=opts.get(b'branch'),
1912 branch=opts.get(b'branch'),
1913 shareopts=opts.get(b'shareopts'),
1913 shareopts=opts.get(b'shareopts'),
1914 storeincludepats=includepats,
1914 storeincludepats=includepats,
1915 storeexcludepats=excludepats,
1915 storeexcludepats=excludepats,
1916 depth=opts.get(b'depth') or None,
1916 depth=opts.get(b'depth') or None,
1917 )
1917 )
1918
1918
1919 return r is None
1919 return r is None
1920
1920
1921
1921
1922 @command(
1922 @command(
1923 b'commit|ci',
1923 b'commit|ci',
1924 [
1924 [
1925 (
1925 (
1926 b'A',
1926 b'A',
1927 b'addremove',
1927 b'addremove',
1928 None,
1928 None,
1929 _(b'mark new/missing files as added/removed before committing'),
1929 _(b'mark new/missing files as added/removed before committing'),
1930 ),
1930 ),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (
1935 (
1936 b'',
1936 b'',
1937 b'force-close-branch',
1937 b'force-close-branch',
1938 None,
1938 None,
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 ),
1940 ),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 ]
1942 ]
1943 + walkopts
1943 + walkopts
1944 + commitopts
1944 + commitopts
1945 + commitopts2
1945 + commitopts2
1946 + subrepoopts,
1946 + subrepoopts,
1947 _(b'[OPTION]... [FILE]...'),
1947 _(b'[OPTION]... [FILE]...'),
1948 helpcategory=command.CATEGORY_COMMITTING,
1948 helpcategory=command.CATEGORY_COMMITTING,
1949 helpbasic=True,
1949 helpbasic=True,
1950 inferrepo=True,
1950 inferrepo=True,
1951 )
1951 )
1952 def commit(ui, repo, *pats, **opts):
1952 def commit(ui, repo, *pats, **opts):
1953 """commit the specified files or all outstanding changes
1953 """commit the specified files or all outstanding changes
1954
1954
1955 Commit changes to the given files into the repository. Unlike a
1955 Commit changes to the given files into the repository. Unlike a
1956 centralized SCM, this operation is a local operation. See
1956 centralized SCM, this operation is a local operation. See
1957 :hg:`push` for a way to actively distribute your changes.
1957 :hg:`push` for a way to actively distribute your changes.
1958
1958
1959 If a list of files is omitted, all changes reported by :hg:`status`
1959 If a list of files is omitted, all changes reported by :hg:`status`
1960 will be committed.
1960 will be committed.
1961
1961
1962 If you are committing the result of a merge, do not provide any
1962 If you are committing the result of a merge, do not provide any
1963 filenames or -I/-X filters.
1963 filenames or -I/-X filters.
1964
1964
1965 If no commit message is specified, Mercurial starts your
1965 If no commit message is specified, Mercurial starts your
1966 configured editor where you can enter a message. In case your
1966 configured editor where you can enter a message. In case your
1967 commit fails, you will find a backup of your message in
1967 commit fails, you will find a backup of your message in
1968 ``.hg/last-message.txt``.
1968 ``.hg/last-message.txt``.
1969
1969
1970 The --close-branch flag can be used to mark the current branch
1970 The --close-branch flag can be used to mark the current branch
1971 head closed. When all heads of a branch are closed, the branch
1971 head closed. When all heads of a branch are closed, the branch
1972 will be considered closed and no longer listed.
1972 will be considered closed and no longer listed.
1973
1973
1974 The --amend flag can be used to amend the parent of the
1974 The --amend flag can be used to amend the parent of the
1975 working directory with a new commit that contains the changes
1975 working directory with a new commit that contains the changes
1976 in the parent in addition to those currently reported by :hg:`status`,
1976 in the parent in addition to those currently reported by :hg:`status`,
1977 if there are any. The old commit is stored in a backup bundle in
1977 if there are any. The old commit is stored in a backup bundle in
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 on how to restore it).
1979 on how to restore it).
1980
1980
1981 Message, user and date are taken from the amended commit unless
1981 Message, user and date are taken from the amended commit unless
1982 specified. When a message isn't specified on the command line,
1982 specified. When a message isn't specified on the command line,
1983 the editor will open with the message of the amended commit.
1983 the editor will open with the message of the amended commit.
1984
1984
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1986 or changesets that have children.
1986 or changesets that have children.
1987
1987
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1989
1989
1990 Returns 0 on success, 1 if nothing changed.
1990 Returns 0 on success, 1 if nothing changed.
1991
1991
1992 .. container:: verbose
1992 .. container:: verbose
1993
1993
1994 Examples:
1994 Examples:
1995
1995
1996 - commit all files ending in .py::
1996 - commit all files ending in .py::
1997
1997
1998 hg commit --include "set:**.py"
1998 hg commit --include "set:**.py"
1999
1999
2000 - commit all non-binary files::
2000 - commit all non-binary files::
2001
2001
2002 hg commit --exclude "set:binary()"
2002 hg commit --exclude "set:binary()"
2003
2003
2004 - amend the current commit and set the date to now::
2004 - amend the current commit and set the date to now::
2005
2005
2006 hg commit --amend --date now
2006 hg commit --amend --date now
2007 """
2007 """
2008 with repo.wlock(), repo.lock():
2008 with repo.wlock(), repo.lock():
2009 return _docommit(ui, repo, *pats, **opts)
2009 return _docommit(ui, repo, *pats, **opts)
2010
2010
2011
2011
2012 def _docommit(ui, repo, *pats, **opts):
2012 def _docommit(ui, repo, *pats, **opts):
2013 if opts.get('interactive'):
2013 if opts.get('interactive'):
2014 opts.pop('interactive')
2014 opts.pop('interactive')
2015 ret = cmdutil.dorecord(
2015 ret = cmdutil.dorecord(
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 )
2017 )
2018 # ret can be 0 (no changes to record) or the value returned by
2018 # ret can be 0 (no changes to record) or the value returned by
2019 # commit(), 1 if nothing changed or None on success.
2019 # commit(), 1 if nothing changed or None on success.
2020 return 1 if ret == 0 else ret
2020 return 1 if ret == 0 else ret
2021
2021
2022 opts = pycompat.byteskwargs(opts)
2022 opts = pycompat.byteskwargs(opts)
2023 if opts.get(b'subrepos'):
2023 if opts.get(b'subrepos'):
2024 if opts.get(b'amend'):
2024 if opts.get(b'amend'):
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 # Let --subrepos on the command line override config setting.
2026 # Let --subrepos on the command line override config setting.
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028
2028
2029 cmdutil.checkunfinished(repo, commit=True)
2029 cmdutil.checkunfinished(repo, commit=True)
2030
2030
2031 branch = repo[None].branch()
2031 branch = repo[None].branch()
2032 bheads = repo.branchheads(branch)
2032 bheads = repo.branchheads(branch)
2033
2033
2034 extra = {}
2034 extra = {}
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 extra[b'close'] = b'1'
2036 extra[b'close'] = b'1'
2037
2037
2038 if repo[b'.'].closesbranch():
2038 if repo[b'.'].closesbranch():
2039 raise error.Abort(
2039 raise error.Abort(
2040 _(b'current revision is already a branch closing head')
2040 _(b'current revision is already a branch closing head')
2041 )
2041 )
2042 elif not bheads:
2042 elif not bheads:
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 elif (
2044 elif (
2045 branch == repo[b'.'].branch()
2045 branch == repo[b'.'].branch()
2046 and repo[b'.'].node() not in bheads
2046 and repo[b'.'].node() not in bheads
2047 and not opts.get(b'force_close_branch')
2047 and not opts.get(b'force_close_branch')
2048 ):
2048 ):
2049 hint = _(
2049 hint = _(
2050 b'use --force-close-branch to close branch from a non-head'
2050 b'use --force-close-branch to close branch from a non-head'
2051 b' changeset'
2051 b' changeset'
2052 )
2052 )
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 elif opts.get(b'amend'):
2054 elif opts.get(b'amend'):
2055 if (
2055 if (
2056 repo[b'.'].p1().branch() != branch
2056 repo[b'.'].p1().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2058 ):
2058 ):
2059 raise error.Abort(_(b'can only close branch heads'))
2059 raise error.Abort(_(b'can only close branch heads'))
2060
2060
2061 if opts.get(b'amend'):
2061 if opts.get(b'amend'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064
2064
2065 old = repo[b'.']
2065 old = repo[b'.']
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067
2067
2068 # Currently histedit gets confused if an amend happens while histedit
2068 # Currently histedit gets confused if an amend happens while histedit
2069 # is in progress. Since we have a checkunfinished command, we are
2069 # is in progress. Since we have a checkunfinished command, we are
2070 # temporarily honoring it.
2070 # temporarily honoring it.
2071 #
2071 #
2072 # Note: eventually this guard will be removed. Please do not expect
2072 # Note: eventually this guard will be removed. Please do not expect
2073 # this behavior to remain.
2073 # this behavior to remain.
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 cmdutil.checkunfinished(repo)
2075 cmdutil.checkunfinished(repo)
2076
2076
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 if node == old.node():
2078 if node == old.node():
2079 ui.status(_(b"nothing changed\n"))
2079 ui.status(_(b"nothing changed\n"))
2080 return 1
2080 return 1
2081 else:
2081 else:
2082
2082
2083 def commitfunc(ui, repo, message, match, opts):
2083 def commitfunc(ui, repo, message, match, opts):
2084 overrides = {}
2084 overrides = {}
2085 if opts.get(b'secret'):
2085 if opts.get(b'secret'):
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2087
2087
2088 baseui = repo.baseui
2088 baseui = repo.baseui
2089 with baseui.configoverride(overrides, b'commit'):
2089 with baseui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2091 editform = cmdutil.mergeeditform(
2091 editform = cmdutil.mergeeditform(
2092 repo[None], b'commit.normal'
2092 repo[None], b'commit.normal'
2093 )
2093 )
2094 editor = cmdutil.getcommiteditor(
2094 editor = cmdutil.getcommiteditor(
2095 editform=editform, **pycompat.strkwargs(opts)
2095 editform=editform, **pycompat.strkwargs(opts)
2096 )
2096 )
2097 return repo.commit(
2097 return repo.commit(
2098 message,
2098 message,
2099 opts.get(b'user'),
2099 opts.get(b'user'),
2100 opts.get(b'date'),
2100 opts.get(b'date'),
2101 match,
2101 match,
2102 editor=editor,
2102 editor=editor,
2103 extra=extra,
2103 extra=extra,
2104 )
2104 )
2105
2105
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107
2107
2108 if not node:
2108 if not node:
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 if stat.deleted:
2110 if stat.deleted:
2111 ui.status(
2111 ui.status(
2112 _(
2112 _(
2113 b"nothing changed (%d missing files, see "
2113 b"nothing changed (%d missing files, see "
2114 b"'hg status')\n"
2114 b"'hg status')\n"
2115 )
2115 )
2116 % len(stat.deleted)
2116 % len(stat.deleted)
2117 )
2117 )
2118 else:
2118 else:
2119 ui.status(_(b"nothing changed\n"))
2119 ui.status(_(b"nothing changed\n"))
2120 return 1
2120 return 1
2121
2121
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123
2123
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 status(
2125 status(
2126 ui,
2126 ui,
2127 repo,
2127 repo,
2128 modified=True,
2128 modified=True,
2129 added=True,
2129 added=True,
2130 removed=True,
2130 removed=True,
2131 deleted=True,
2131 deleted=True,
2132 unknown=True,
2132 unknown=True,
2133 subrepos=opts.get(b'subrepos'),
2133 subrepos=opts.get(b'subrepos'),
2134 )
2134 )
2135
2135
2136
2136
2137 @command(
2137 @command(
2138 b'config|showconfig|debugconfig',
2138 b'config|showconfig|debugconfig',
2139 [
2139 [
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2144 ]
2144 ]
2145 + formatteropts,
2145 + formatteropts,
2146 _(b'[-u] [NAME]...'),
2146 _(b'[-u] [NAME]...'),
2147 helpcategory=command.CATEGORY_HELP,
2147 helpcategory=command.CATEGORY_HELP,
2148 optionalrepo=True,
2148 optionalrepo=True,
2149 intents={INTENT_READONLY},
2149 intents={INTENT_READONLY},
2150 )
2150 )
2151 def config(ui, repo, *values, **opts):
2151 def config(ui, repo, *values, **opts):
2152 """show combined config settings from all hgrc files
2152 """show combined config settings from all hgrc files
2153
2153
2154 With no arguments, print names and values of all config items.
2154 With no arguments, print names and values of all config items.
2155
2155
2156 With one argument of the form section.name, print just the value
2156 With one argument of the form section.name, print just the value
2157 of that config item.
2157 of that config item.
2158
2158
2159 With multiple arguments, print names and values of all config
2159 With multiple arguments, print names and values of all config
2160 items with matching section names or section.names.
2160 items with matching section names or section.names.
2161
2161
2162 With --edit, start an editor on the user-level config file. With
2162 With --edit, start an editor on the user-level config file. With
2163 --global, edit the system-wide config file. With --local, edit the
2163 --global, edit the system-wide config file. With --local, edit the
2164 repository-level config file.
2164 repository-level config file.
2165
2165
2166 With --debug, the source (filename and line number) is printed
2166 With --debug, the source (filename and line number) is printed
2167 for each config item.
2167 for each config item.
2168
2168
2169 See :hg:`help config` for more information about config files.
2169 See :hg:`help config` for more information about config files.
2170
2170
2171 .. container:: verbose
2171 .. container:: verbose
2172
2172
2173 Template:
2173 Template:
2174
2174
2175 The following keywords are supported. See also :hg:`help templates`.
2175 The following keywords are supported. See also :hg:`help templates`.
2176
2176
2177 :name: String. Config name.
2177 :name: String. Config name.
2178 :source: String. Filename and line number where the item is defined.
2178 :source: String. Filename and line number where the item is defined.
2179 :value: String. Config value.
2179 :value: String. Config value.
2180
2180
2181 Returns 0 on success, 1 if NAME does not exist.
2181 Returns 0 on success, 1 if NAME does not exist.
2182
2182
2183 """
2183 """
2184
2184
2185 opts = pycompat.byteskwargs(opts)
2185 opts = pycompat.byteskwargs(opts)
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2188 raise error.Abort(_(b"can't use --local and --global together"))
2188 raise error.Abort(_(b"can't use --local and --global together"))
2189
2189
2190 if opts.get(b'local'):
2190 if opts.get(b'local'):
2191 if not repo:
2191 if not repo:
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2193 paths = [repo.vfs.join(b'hgrc')]
2193 paths = [repo.vfs.join(b'hgrc')]
2194 elif opts.get(b'global'):
2194 elif opts.get(b'global'):
2195 paths = rcutil.systemrcpath()
2195 paths = rcutil.systemrcpath()
2196 else:
2196 else:
2197 paths = rcutil.userrcpath()
2197 paths = rcutil.userrcpath()
2198
2198
2199 for f in paths:
2199 for f in paths:
2200 if os.path.exists(f):
2200 if os.path.exists(f):
2201 break
2201 break
2202 else:
2202 else:
2203 if opts.get(b'global'):
2203 if opts.get(b'global'):
2204 samplehgrc = uimod.samplehgrcs[b'global']
2204 samplehgrc = uimod.samplehgrcs[b'global']
2205 elif opts.get(b'local'):
2205 elif opts.get(b'local'):
2206 samplehgrc = uimod.samplehgrcs[b'local']
2206 samplehgrc = uimod.samplehgrcs[b'local']
2207 else:
2207 else:
2208 samplehgrc = uimod.samplehgrcs[b'user']
2208 samplehgrc = uimod.samplehgrcs[b'user']
2209
2209
2210 f = paths[0]
2210 f = paths[0]
2211 fp = open(f, b"wb")
2211 fp = open(f, b"wb")
2212 fp.write(util.tonativeeol(samplehgrc))
2212 fp.write(util.tonativeeol(samplehgrc))
2213 fp.close()
2213 fp.close()
2214
2214
2215 editor = ui.geteditor()
2215 editor = ui.geteditor()
2216 ui.system(
2216 ui.system(
2217 b"%s \"%s\"" % (editor, f),
2217 b"%s \"%s\"" % (editor, f),
2218 onerr=error.Abort,
2218 onerr=error.Abort,
2219 errprefix=_(b"edit failed"),
2219 errprefix=_(b"edit failed"),
2220 blockedtag=b'config_edit',
2220 blockedtag=b'config_edit',
2221 )
2221 )
2222 return
2222 return
2223 ui.pager(b'config')
2223 ui.pager(b'config')
2224 fm = ui.formatter(b'config', opts)
2224 fm = ui.formatter(b'config', opts)
2225 for t, f in rcutil.rccomponents():
2225 for t, f in rcutil.rccomponents():
2226 if t == b'path':
2226 if t == b'path':
2227 ui.debug(b'read config from: %s\n' % f)
2227 ui.debug(b'read config from: %s\n' % f)
2228 elif t == b'resource':
2228 elif t == b'resource':
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 elif t == b'items':
2230 elif t == b'items':
2231 # Don't print anything for 'items'.
2231 # Don't print anything for 'items'.
2232 pass
2232 pass
2233 else:
2233 else:
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 untrusted = bool(opts.get(b'untrusted'))
2235 untrusted = bool(opts.get(b'untrusted'))
2236
2236
2237 selsections = selentries = []
2237 selsections = selentries = []
2238 if values:
2238 if values:
2239 selsections = [v for v in values if b'.' not in v]
2239 selsections = [v for v in values if b'.' not in v]
2240 selentries = [v for v in values if b'.' in v]
2240 selentries = [v for v in values if b'.' in v]
2241 uniquesel = len(selentries) == 1 and not selsections
2241 uniquesel = len(selentries) == 1 and not selsections
2242 selsections = set(selsections)
2242 selsections = set(selsections)
2243 selentries = set(selentries)
2243 selentries = set(selentries)
2244
2244
2245 matched = False
2245 matched = False
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 source = ui.configsource(section, name, untrusted)
2247 source = ui.configsource(section, name, untrusted)
2248 value = pycompat.bytestr(value)
2248 value = pycompat.bytestr(value)
2249 defaultvalue = ui.configdefault(section, name)
2249 defaultvalue = ui.configdefault(section, name)
2250 if fm.isplain():
2250 if fm.isplain():
2251 source = source or b'none'
2251 source = source or b'none'
2252 value = value.replace(b'\n', b'\\n')
2252 value = value.replace(b'\n', b'\\n')
2253 entryname = section + b'.' + name
2253 entryname = section + b'.' + name
2254 if values and not (section in selsections or entryname in selentries):
2254 if values and not (section in selsections or entryname in selentries):
2255 continue
2255 continue
2256 fm.startitem()
2256 fm.startitem()
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 if uniquesel:
2258 if uniquesel:
2259 fm.data(name=entryname)
2259 fm.data(name=entryname)
2260 fm.write(b'value', b'%s\n', value)
2260 fm.write(b'value', b'%s\n', value)
2261 else:
2261 else:
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 if formatter.isprintable(defaultvalue):
2263 if formatter.isprintable(defaultvalue):
2264 fm.data(defaultvalue=defaultvalue)
2264 fm.data(defaultvalue=defaultvalue)
2265 elif isinstance(defaultvalue, list) and all(
2265 elif isinstance(defaultvalue, list) and all(
2266 formatter.isprintable(e) for e in defaultvalue
2266 formatter.isprintable(e) for e in defaultvalue
2267 ):
2267 ):
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 # TODO: no idea how to process unsupported defaultvalue types
2269 # TODO: no idea how to process unsupported defaultvalue types
2270 matched = True
2270 matched = True
2271 fm.end()
2271 fm.end()
2272 if matched:
2272 if matched:
2273 return 0
2273 return 0
2274 return 1
2274 return 1
2275
2275
2276
2276
2277 @command(
2277 @command(
2278 b'continue',
2278 b'continue',
2279 dryrunopts,
2279 dryrunopts,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 helpbasic=True,
2281 helpbasic=True,
2282 )
2282 )
2283 def continuecmd(ui, repo, **opts):
2283 def continuecmd(ui, repo, **opts):
2284 """resumes an interrupted operation (EXPERIMENTAL)
2284 """resumes an interrupted operation (EXPERIMENTAL)
2285
2285
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 and unshelve if they are in an interrupted state.
2287 and unshelve if they are in an interrupted state.
2288
2288
2289 use --dry-run/-n to dry run the command.
2289 use --dry-run/-n to dry run the command.
2290 """
2290 """
2291 dryrun = opts.get('dry_run')
2291 dryrun = opts.get('dry_run')
2292 contstate = cmdutil.getunfinishedstate(repo)
2292 contstate = cmdutil.getunfinishedstate(repo)
2293 if not contstate:
2293 if not contstate:
2294 raise error.Abort(_(b'no operation in progress'))
2294 raise error.Abort(_(b'no operation in progress'))
2295 if not contstate.continuefunc:
2295 if not contstate.continuefunc:
2296 raise error.Abort(
2296 raise error.Abort(
2297 (
2297 (
2298 _(b"%s in progress but does not support 'hg continue'")
2298 _(b"%s in progress but does not support 'hg continue'")
2299 % (contstate._opname)
2299 % (contstate._opname)
2300 ),
2300 ),
2301 hint=contstate.continuemsg(),
2301 hint=contstate.continuemsg(),
2302 )
2302 )
2303 if dryrun:
2303 if dryrun:
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 return
2305 return
2306 return contstate.continuefunc(ui, repo)
2306 return contstate.continuefunc(ui, repo)
2307
2307
2308
2308
2309 @command(
2309 @command(
2310 b'copy|cp',
2310 b'copy|cp',
2311 [
2311 [
2312 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2312 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2313 (
2313 (
2314 b'f',
2314 b'f',
2315 b'force',
2315 b'force',
2316 None,
2316 None,
2317 _(b'forcibly copy over an existing managed file'),
2317 _(b'forcibly copy over an existing managed file'),
2318 ),
2318 ),
2319 ]
2319 ]
2320 + walkopts
2320 + walkopts
2321 + dryrunopts,
2321 + dryrunopts,
2322 _(b'[OPTION]... SOURCE... DEST'),
2322 _(b'[OPTION]... SOURCE... DEST'),
2323 helpcategory=command.CATEGORY_FILE_CONTENTS,
2323 helpcategory=command.CATEGORY_FILE_CONTENTS,
2324 )
2324 )
2325 def copy(ui, repo, *pats, **opts):
2325 def copy(ui, repo, *pats, **opts):
2326 """mark files as copied for the next commit
2326 """mark files as copied for the next commit
2327
2327
2328 Mark dest as having copies of source files. If dest is a
2328 Mark dest as having copies of source files. If dest is a
2329 directory, copies are put in that directory. If dest is a file,
2329 directory, copies are put in that directory. If dest is a file,
2330 the source must be a single file.
2330 the source must be a single file.
2331
2331
2332 By default, this command copies the contents of files as they
2332 By default, this command copies the contents of files as they
2333 exist in the working directory. If invoked with -A/--after, the
2333 exist in the working directory. If invoked with -A/--after, the
2334 operation is recorded, but no copying is performed.
2334 operation is recorded, but no copying is performed.
2335
2335
2336 This command takes effect with the next commit. To undo a copy
2336 This command takes effect with the next commit. To undo a copy
2337 before that, see :hg:`revert`.
2337 before that, see :hg:`revert`.
2338
2338
2339 Returns 0 on success, 1 if errors are encountered.
2339 Returns 0 on success, 1 if errors are encountered.
2340 """
2340 """
2341 opts = pycompat.byteskwargs(opts)
2341 opts = pycompat.byteskwargs(opts)
2342 with repo.wlock(False):
2342 with repo.wlock(False):
2343 return cmdutil.copy(ui, repo, pats, opts)
2343 return cmdutil.copy(ui, repo, pats, opts)
2344
2344
2345
2345
2346 @command(
2346 @command(
2347 b'debugcommands',
2347 b'debugcommands',
2348 [],
2348 [],
2349 _(b'[COMMAND]'),
2349 _(b'[COMMAND]'),
2350 helpcategory=command.CATEGORY_HELP,
2350 helpcategory=command.CATEGORY_HELP,
2351 norepo=True,
2351 norepo=True,
2352 )
2352 )
2353 def debugcommands(ui, cmd=b'', *args):
2353 def debugcommands(ui, cmd=b'', *args):
2354 """list all available commands and options"""
2354 """list all available commands and options"""
2355 for cmd, vals in sorted(pycompat.iteritems(table)):
2355 for cmd, vals in sorted(pycompat.iteritems(table)):
2356 cmd = cmd.split(b'|')[0]
2356 cmd = cmd.split(b'|')[0]
2357 opts = b', '.join([i[1] for i in vals[1]])
2357 opts = b', '.join([i[1] for i in vals[1]])
2358 ui.write(b'%s: %s\n' % (cmd, opts))
2358 ui.write(b'%s: %s\n' % (cmd, opts))
2359
2359
2360
2360
2361 @command(
2361 @command(
2362 b'debugcomplete',
2362 b'debugcomplete',
2363 [(b'o', b'options', None, _(b'show the command options'))],
2363 [(b'o', b'options', None, _(b'show the command options'))],
2364 _(b'[-o] CMD'),
2364 _(b'[-o] CMD'),
2365 helpcategory=command.CATEGORY_HELP,
2365 helpcategory=command.CATEGORY_HELP,
2366 norepo=True,
2366 norepo=True,
2367 )
2367 )
2368 def debugcomplete(ui, cmd=b'', **opts):
2368 def debugcomplete(ui, cmd=b'', **opts):
2369 """returns the completion list associated with the given command"""
2369 """returns the completion list associated with the given command"""
2370
2370
2371 if opts.get('options'):
2371 if opts.get('options'):
2372 options = []
2372 options = []
2373 otables = [globalopts]
2373 otables = [globalopts]
2374 if cmd:
2374 if cmd:
2375 aliases, entry = cmdutil.findcmd(cmd, table, False)
2375 aliases, entry = cmdutil.findcmd(cmd, table, False)
2376 otables.append(entry[1])
2376 otables.append(entry[1])
2377 for t in otables:
2377 for t in otables:
2378 for o in t:
2378 for o in t:
2379 if b"(DEPRECATED)" in o[3]:
2379 if b"(DEPRECATED)" in o[3]:
2380 continue
2380 continue
2381 if o[0]:
2381 if o[0]:
2382 options.append(b'-%s' % o[0])
2382 options.append(b'-%s' % o[0])
2383 options.append(b'--%s' % o[1])
2383 options.append(b'--%s' % o[1])
2384 ui.write(b"%s\n" % b"\n".join(options))
2384 ui.write(b"%s\n" % b"\n".join(options))
2385 return
2385 return
2386
2386
2387 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2387 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2388 if ui.verbose:
2388 if ui.verbose:
2389 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2389 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2390 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2390 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2391
2391
2392
2392
2393 @command(
2393 @command(
2394 b'diff',
2394 b'diff',
2395 [
2395 [
2396 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2396 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2397 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2397 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2398 ]
2398 ]
2399 + diffopts
2399 + diffopts
2400 + diffopts2
2400 + diffopts2
2401 + walkopts
2401 + walkopts
2402 + subrepoopts,
2402 + subrepoopts,
2403 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2403 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2404 helpcategory=command.CATEGORY_FILE_CONTENTS,
2404 helpcategory=command.CATEGORY_FILE_CONTENTS,
2405 helpbasic=True,
2405 helpbasic=True,
2406 inferrepo=True,
2406 inferrepo=True,
2407 intents={INTENT_READONLY},
2407 intents={INTENT_READONLY},
2408 )
2408 )
2409 def diff(ui, repo, *pats, **opts):
2409 def diff(ui, repo, *pats, **opts):
2410 """diff repository (or selected files)
2410 """diff repository (or selected files)
2411
2411
2412 Show differences between revisions for the specified files.
2412 Show differences between revisions for the specified files.
2413
2413
2414 Differences between files are shown using the unified diff format.
2414 Differences between files are shown using the unified diff format.
2415
2415
2416 .. note::
2416 .. note::
2417
2417
2418 :hg:`diff` may generate unexpected results for merges, as it will
2418 :hg:`diff` may generate unexpected results for merges, as it will
2419 default to comparing against the working directory's first
2419 default to comparing against the working directory's first
2420 parent changeset if no revisions are specified.
2420 parent changeset if no revisions are specified.
2421
2421
2422 When two revision arguments are given, then changes are shown
2422 When two revision arguments are given, then changes are shown
2423 between those revisions. If only one revision is specified then
2423 between those revisions. If only one revision is specified then
2424 that revision is compared to the working directory, and, when no
2424 that revision is compared to the working directory, and, when no
2425 revisions are specified, the working directory files are compared
2425 revisions are specified, the working directory files are compared
2426 to its first parent.
2426 to its first parent.
2427
2427
2428 Alternatively you can specify -c/--change with a revision to see
2428 Alternatively you can specify -c/--change with a revision to see
2429 the changes in that changeset relative to its first parent.
2429 the changes in that changeset relative to its first parent.
2430
2430
2431 Without the -a/--text option, diff will avoid generating diffs of
2431 Without the -a/--text option, diff will avoid generating diffs of
2432 files it detects as binary. With -a, diff will generate a diff
2432 files it detects as binary. With -a, diff will generate a diff
2433 anyway, probably with undesirable results.
2433 anyway, probably with undesirable results.
2434
2434
2435 Use the -g/--git option to generate diffs in the git extended diff
2435 Use the -g/--git option to generate diffs in the git extended diff
2436 format. For more information, read :hg:`help diffs`.
2436 format. For more information, read :hg:`help diffs`.
2437
2437
2438 .. container:: verbose
2438 .. container:: verbose
2439
2439
2440 Examples:
2440 Examples:
2441
2441
2442 - compare a file in the current working directory to its parent::
2442 - compare a file in the current working directory to its parent::
2443
2443
2444 hg diff foo.c
2444 hg diff foo.c
2445
2445
2446 - compare two historical versions of a directory, with rename info::
2446 - compare two historical versions of a directory, with rename info::
2447
2447
2448 hg diff --git -r 1.0:1.2 lib/
2448 hg diff --git -r 1.0:1.2 lib/
2449
2449
2450 - get change stats relative to the last change on some date::
2450 - get change stats relative to the last change on some date::
2451
2451
2452 hg diff --stat -r "date('may 2')"
2452 hg diff --stat -r "date('may 2')"
2453
2453
2454 - diff all newly-added files that contain a keyword::
2454 - diff all newly-added files that contain a keyword::
2455
2455
2456 hg diff "set:added() and grep(GNU)"
2456 hg diff "set:added() and grep(GNU)"
2457
2457
2458 - compare a revision and its parents::
2458 - compare a revision and its parents::
2459
2459
2460 hg diff -c 9353 # compare against first parent
2460 hg diff -c 9353 # compare against first parent
2461 hg diff -r 9353^:9353 # same using revset syntax
2461 hg diff -r 9353^:9353 # same using revset syntax
2462 hg diff -r 9353^2:9353 # compare against the second parent
2462 hg diff -r 9353^2:9353 # compare against the second parent
2463
2463
2464 Returns 0 on success.
2464 Returns 0 on success.
2465 """
2465 """
2466
2466
2467 opts = pycompat.byteskwargs(opts)
2467 opts = pycompat.byteskwargs(opts)
2468 revs = opts.get(b'rev')
2468 revs = opts.get(b'rev')
2469 change = opts.get(b'change')
2469 change = opts.get(b'change')
2470 stat = opts.get(b'stat')
2470 stat = opts.get(b'stat')
2471 reverse = opts.get(b'reverse')
2471 reverse = opts.get(b'reverse')
2472
2472
2473 if revs and change:
2473 if revs and change:
2474 msg = _(b'cannot specify --rev and --change at the same time')
2474 msg = _(b'cannot specify --rev and --change at the same time')
2475 raise error.Abort(msg)
2475 raise error.Abort(msg)
2476 elif change:
2476 elif change:
2477 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2477 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2478 ctx2 = scmutil.revsingle(repo, change, None)
2478 ctx2 = scmutil.revsingle(repo, change, None)
2479 ctx1 = ctx2.p1()
2479 ctx1 = ctx2.p1()
2480 else:
2480 else:
2481 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2481 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2482 ctx1, ctx2 = scmutil.revpair(repo, revs)
2482 ctx1, ctx2 = scmutil.revpair(repo, revs)
2483 node1, node2 = ctx1.node(), ctx2.node()
2483 node1, node2 = ctx1.node(), ctx2.node()
2484
2484
2485 if reverse:
2485 if reverse:
2486 node1, node2 = node2, node1
2486 node1, node2 = node2, node1
2487
2487
2488 diffopts = patch.diffallopts(ui, opts)
2488 diffopts = patch.diffallopts(ui, opts)
2489 m = scmutil.match(ctx2, pats, opts)
2489 m = scmutil.match(ctx2, pats, opts)
2490 m = repo.narrowmatch(m)
2490 m = repo.narrowmatch(m)
2491 ui.pager(b'diff')
2491 ui.pager(b'diff')
2492 logcmdutil.diffordiffstat(
2492 logcmdutil.diffordiffstat(
2493 ui,
2493 ui,
2494 repo,
2494 repo,
2495 diffopts,
2495 diffopts,
2496 node1,
2496 node1,
2497 node2,
2497 node2,
2498 m,
2498 m,
2499 stat=stat,
2499 stat=stat,
2500 listsubrepos=opts.get(b'subrepos'),
2500 listsubrepos=opts.get(b'subrepos'),
2501 root=opts.get(b'root'),
2501 root=opts.get(b'root'),
2502 )
2502 )
2503
2503
2504
2504
2505 @command(
2505 @command(
2506 b'export',
2506 b'export',
2507 [
2507 [
2508 (
2508 (
2509 b'B',
2509 b'B',
2510 b'bookmark',
2510 b'bookmark',
2511 b'',
2511 b'',
2512 _(b'export changes only reachable by given bookmark'),
2512 _(b'export changes only reachable by given bookmark'),
2513 _(b'BOOKMARK'),
2513 _(b'BOOKMARK'),
2514 ),
2514 ),
2515 (
2515 (
2516 b'o',
2516 b'o',
2517 b'output',
2517 b'output',
2518 b'',
2518 b'',
2519 _(b'print output to file with formatted name'),
2519 _(b'print output to file with formatted name'),
2520 _(b'FORMAT'),
2520 _(b'FORMAT'),
2521 ),
2521 ),
2522 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2522 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2523 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2523 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2524 ]
2524 ]
2525 + diffopts
2525 + diffopts
2526 + formatteropts,
2526 + formatteropts,
2527 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2527 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2528 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2528 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2529 helpbasic=True,
2529 helpbasic=True,
2530 intents={INTENT_READONLY},
2530 intents={INTENT_READONLY},
2531 )
2531 )
2532 def export(ui, repo, *changesets, **opts):
2532 def export(ui, repo, *changesets, **opts):
2533 """dump the header and diffs for one or more changesets
2533 """dump the header and diffs for one or more changesets
2534
2534
2535 Print the changeset header and diffs for one or more revisions.
2535 Print the changeset header and diffs for one or more revisions.
2536 If no revision is given, the parent of the working directory is used.
2536 If no revision is given, the parent of the working directory is used.
2537
2537
2538 The information shown in the changeset header is: author, date,
2538 The information shown in the changeset header is: author, date,
2539 branch name (if non-default), changeset hash, parent(s) and commit
2539 branch name (if non-default), changeset hash, parent(s) and commit
2540 comment.
2540 comment.
2541
2541
2542 .. note::
2542 .. note::
2543
2543
2544 :hg:`export` may generate unexpected diff output for merge
2544 :hg:`export` may generate unexpected diff output for merge
2545 changesets, as it will compare the merge changeset against its
2545 changesets, as it will compare the merge changeset against its
2546 first parent only.
2546 first parent only.
2547
2547
2548 Output may be to a file, in which case the name of the file is
2548 Output may be to a file, in which case the name of the file is
2549 given using a template string. See :hg:`help templates`. In addition
2549 given using a template string. See :hg:`help templates`. In addition
2550 to the common template keywords, the following formatting rules are
2550 to the common template keywords, the following formatting rules are
2551 supported:
2551 supported:
2552
2552
2553 :``%%``: literal "%" character
2553 :``%%``: literal "%" character
2554 :``%H``: changeset hash (40 hexadecimal digits)
2554 :``%H``: changeset hash (40 hexadecimal digits)
2555 :``%N``: number of patches being generated
2555 :``%N``: number of patches being generated
2556 :``%R``: changeset revision number
2556 :``%R``: changeset revision number
2557 :``%b``: basename of the exporting repository
2557 :``%b``: basename of the exporting repository
2558 :``%h``: short-form changeset hash (12 hexadecimal digits)
2558 :``%h``: short-form changeset hash (12 hexadecimal digits)
2559 :``%m``: first line of the commit message (only alphanumeric characters)
2559 :``%m``: first line of the commit message (only alphanumeric characters)
2560 :``%n``: zero-padded sequence number, starting at 1
2560 :``%n``: zero-padded sequence number, starting at 1
2561 :``%r``: zero-padded changeset revision number
2561 :``%r``: zero-padded changeset revision number
2562 :``\\``: literal "\\" character
2562 :``\\``: literal "\\" character
2563
2563
2564 Without the -a/--text option, export will avoid generating diffs
2564 Without the -a/--text option, export will avoid generating diffs
2565 of files it detects as binary. With -a, export will generate a
2565 of files it detects as binary. With -a, export will generate a
2566 diff anyway, probably with undesirable results.
2566 diff anyway, probably with undesirable results.
2567
2567
2568 With -B/--bookmark changesets reachable by the given bookmark are
2568 With -B/--bookmark changesets reachable by the given bookmark are
2569 selected.
2569 selected.
2570
2570
2571 Use the -g/--git option to generate diffs in the git extended diff
2571 Use the -g/--git option to generate diffs in the git extended diff
2572 format. See :hg:`help diffs` for more information.
2572 format. See :hg:`help diffs` for more information.
2573
2573
2574 With the --switch-parent option, the diff will be against the
2574 With the --switch-parent option, the diff will be against the
2575 second parent. It can be useful to review a merge.
2575 second parent. It can be useful to review a merge.
2576
2576
2577 .. container:: verbose
2577 .. container:: verbose
2578
2578
2579 Template:
2579 Template:
2580
2580
2581 The following keywords are supported in addition to the common template
2581 The following keywords are supported in addition to the common template
2582 keywords and functions. See also :hg:`help templates`.
2582 keywords and functions. See also :hg:`help templates`.
2583
2583
2584 :diff: String. Diff content.
2584 :diff: String. Diff content.
2585 :parents: List of strings. Parent nodes of the changeset.
2585 :parents: List of strings. Parent nodes of the changeset.
2586
2586
2587 Examples:
2587 Examples:
2588
2588
2589 - use export and import to transplant a bugfix to the current
2589 - use export and import to transplant a bugfix to the current
2590 branch::
2590 branch::
2591
2591
2592 hg export -r 9353 | hg import -
2592 hg export -r 9353 | hg import -
2593
2593
2594 - export all the changesets between two revisions to a file with
2594 - export all the changesets between two revisions to a file with
2595 rename information::
2595 rename information::
2596
2596
2597 hg export --git -r 123:150 > changes.txt
2597 hg export --git -r 123:150 > changes.txt
2598
2598
2599 - split outgoing changes into a series of patches with
2599 - split outgoing changes into a series of patches with
2600 descriptive names::
2600 descriptive names::
2601
2601
2602 hg export -r "outgoing()" -o "%n-%m.patch"
2602 hg export -r "outgoing()" -o "%n-%m.patch"
2603
2603
2604 Returns 0 on success.
2604 Returns 0 on success.
2605 """
2605 """
2606 opts = pycompat.byteskwargs(opts)
2606 opts = pycompat.byteskwargs(opts)
2607 bookmark = opts.get(b'bookmark')
2607 bookmark = opts.get(b'bookmark')
2608 changesets += tuple(opts.get(b'rev', []))
2608 changesets += tuple(opts.get(b'rev', []))
2609
2609
2610 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2610 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2611
2611
2612 if bookmark:
2612 if bookmark:
2613 if bookmark not in repo._bookmarks:
2613 if bookmark not in repo._bookmarks:
2614 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2614 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2615
2615
2616 revs = scmutil.bookmarkrevs(repo, bookmark)
2616 revs = scmutil.bookmarkrevs(repo, bookmark)
2617 else:
2617 else:
2618 if not changesets:
2618 if not changesets:
2619 changesets = [b'.']
2619 changesets = [b'.']
2620
2620
2621 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2621 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2622 revs = scmutil.revrange(repo, changesets)
2622 revs = scmutil.revrange(repo, changesets)
2623
2623
2624 if not revs:
2624 if not revs:
2625 raise error.Abort(_(b"export requires at least one changeset"))
2625 raise error.Abort(_(b"export requires at least one changeset"))
2626 if len(revs) > 1:
2626 if len(revs) > 1:
2627 ui.note(_(b'exporting patches:\n'))
2627 ui.note(_(b'exporting patches:\n'))
2628 else:
2628 else:
2629 ui.note(_(b'exporting patch:\n'))
2629 ui.note(_(b'exporting patch:\n'))
2630
2630
2631 fntemplate = opts.get(b'output')
2631 fntemplate = opts.get(b'output')
2632 if cmdutil.isstdiofilename(fntemplate):
2632 if cmdutil.isstdiofilename(fntemplate):
2633 fntemplate = b''
2633 fntemplate = b''
2634
2634
2635 if fntemplate:
2635 if fntemplate:
2636 fm = formatter.nullformatter(ui, b'export', opts)
2636 fm = formatter.nullformatter(ui, b'export', opts)
2637 else:
2637 else:
2638 ui.pager(b'export')
2638 ui.pager(b'export')
2639 fm = ui.formatter(b'export', opts)
2639 fm = ui.formatter(b'export', opts)
2640 with fm:
2640 with fm:
2641 cmdutil.export(
2641 cmdutil.export(
2642 repo,
2642 repo,
2643 revs,
2643 revs,
2644 fm,
2644 fm,
2645 fntemplate=fntemplate,
2645 fntemplate=fntemplate,
2646 switch_parent=opts.get(b'switch_parent'),
2646 switch_parent=opts.get(b'switch_parent'),
2647 opts=patch.diffallopts(ui, opts),
2647 opts=patch.diffallopts(ui, opts),
2648 )
2648 )
2649
2649
2650
2650
2651 @command(
2651 @command(
2652 b'files',
2652 b'files',
2653 [
2653 [
2654 (
2654 (
2655 b'r',
2655 b'r',
2656 b'rev',
2656 b'rev',
2657 b'',
2657 b'',
2658 _(b'search the repository as it is in REV'),
2658 _(b'search the repository as it is in REV'),
2659 _(b'REV'),
2659 _(b'REV'),
2660 ),
2660 ),
2661 (
2661 (
2662 b'0',
2662 b'0',
2663 b'print0',
2663 b'print0',
2664 None,
2664 None,
2665 _(b'end filenames with NUL, for use with xargs'),
2665 _(b'end filenames with NUL, for use with xargs'),
2666 ),
2666 ),
2667 ]
2667 ]
2668 + walkopts
2668 + walkopts
2669 + formatteropts
2669 + formatteropts
2670 + subrepoopts,
2670 + subrepoopts,
2671 _(b'[OPTION]... [FILE]...'),
2671 _(b'[OPTION]... [FILE]...'),
2672 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2672 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2673 intents={INTENT_READONLY},
2673 intents={INTENT_READONLY},
2674 )
2674 )
2675 def files(ui, repo, *pats, **opts):
2675 def files(ui, repo, *pats, **opts):
2676 """list tracked files
2676 """list tracked files
2677
2677
2678 Print files under Mercurial control in the working directory or
2678 Print files under Mercurial control in the working directory or
2679 specified revision for given files (excluding removed files).
2679 specified revision for given files (excluding removed files).
2680 Files can be specified as filenames or filesets.
2680 Files can be specified as filenames or filesets.
2681
2681
2682 If no files are given to match, this command prints the names
2682 If no files are given to match, this command prints the names
2683 of all files under Mercurial control.
2683 of all files under Mercurial control.
2684
2684
2685 .. container:: verbose
2685 .. container:: verbose
2686
2686
2687 Template:
2687 Template:
2688
2688
2689 The following keywords are supported in addition to the common template
2689 The following keywords are supported in addition to the common template
2690 keywords and functions. See also :hg:`help templates`.
2690 keywords and functions. See also :hg:`help templates`.
2691
2691
2692 :flags: String. Character denoting file's symlink and executable bits.
2692 :flags: String. Character denoting file's symlink and executable bits.
2693 :path: String. Repository-absolute path of the file.
2693 :path: String. Repository-absolute path of the file.
2694 :size: Integer. Size of the file in bytes.
2694 :size: Integer. Size of the file in bytes.
2695
2695
2696 Examples:
2696 Examples:
2697
2697
2698 - list all files under the current directory::
2698 - list all files under the current directory::
2699
2699
2700 hg files .
2700 hg files .
2701
2701
2702 - shows sizes and flags for current revision::
2702 - shows sizes and flags for current revision::
2703
2703
2704 hg files -vr .
2704 hg files -vr .
2705
2705
2706 - list all files named README::
2706 - list all files named README::
2707
2707
2708 hg files -I "**/README"
2708 hg files -I "**/README"
2709
2709
2710 - list all binary files::
2710 - list all binary files::
2711
2711
2712 hg files "set:binary()"
2712 hg files "set:binary()"
2713
2713
2714 - find files containing a regular expression::
2714 - find files containing a regular expression::
2715
2715
2716 hg files "set:grep('bob')"
2716 hg files "set:grep('bob')"
2717
2717
2718 - search tracked file contents with xargs and grep::
2718 - search tracked file contents with xargs and grep::
2719
2719
2720 hg files -0 | xargs -0 grep foo
2720 hg files -0 | xargs -0 grep foo
2721
2721
2722 See :hg:`help patterns` and :hg:`help filesets` for more information
2722 See :hg:`help patterns` and :hg:`help filesets` for more information
2723 on specifying file patterns.
2723 on specifying file patterns.
2724
2724
2725 Returns 0 if a match is found, 1 otherwise.
2725 Returns 0 if a match is found, 1 otherwise.
2726
2726
2727 """
2727 """
2728
2728
2729 opts = pycompat.byteskwargs(opts)
2729 opts = pycompat.byteskwargs(opts)
2730 rev = opts.get(b'rev')
2730 rev = opts.get(b'rev')
2731 if rev:
2731 if rev:
2732 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2732 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2733 ctx = scmutil.revsingle(repo, rev, None)
2733 ctx = scmutil.revsingle(repo, rev, None)
2734
2734
2735 end = b'\n'
2735 end = b'\n'
2736 if opts.get(b'print0'):
2736 if opts.get(b'print0'):
2737 end = b'\0'
2737 end = b'\0'
2738 fmt = b'%s' + end
2738 fmt = b'%s' + end
2739
2739
2740 m = scmutil.match(ctx, pats, opts)
2740 m = scmutil.match(ctx, pats, opts)
2741 ui.pager(b'files')
2741 ui.pager(b'files')
2742 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2742 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2743 with ui.formatter(b'files', opts) as fm:
2743 with ui.formatter(b'files', opts) as fm:
2744 return cmdutil.files(
2744 return cmdutil.files(
2745 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2745 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2746 )
2746 )
2747
2747
2748
2748
2749 @command(
2749 @command(
2750 b'forget',
2750 b'forget',
2751 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2751 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2752 + walkopts
2752 + walkopts
2753 + dryrunopts,
2753 + dryrunopts,
2754 _(b'[OPTION]... FILE...'),
2754 _(b'[OPTION]... FILE...'),
2755 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2755 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2756 helpbasic=True,
2756 helpbasic=True,
2757 inferrepo=True,
2757 inferrepo=True,
2758 )
2758 )
2759 def forget(ui, repo, *pats, **opts):
2759 def forget(ui, repo, *pats, **opts):
2760 """forget the specified files on the next commit
2760 """forget the specified files on the next commit
2761
2761
2762 Mark the specified files so they will no longer be tracked
2762 Mark the specified files so they will no longer be tracked
2763 after the next commit.
2763 after the next commit.
2764
2764
2765 This only removes files from the current branch, not from the
2765 This only removes files from the current branch, not from the
2766 entire project history, and it does not delete them from the
2766 entire project history, and it does not delete them from the
2767 working directory.
2767 working directory.
2768
2768
2769 To delete the file from the working directory, see :hg:`remove`.
2769 To delete the file from the working directory, see :hg:`remove`.
2770
2770
2771 To undo a forget before the next commit, see :hg:`add`.
2771 To undo a forget before the next commit, see :hg:`add`.
2772
2772
2773 .. container:: verbose
2773 .. container:: verbose
2774
2774
2775 Examples:
2775 Examples:
2776
2776
2777 - forget newly-added binary files::
2777 - forget newly-added binary files::
2778
2778
2779 hg forget "set:added() and binary()"
2779 hg forget "set:added() and binary()"
2780
2780
2781 - forget files that would be excluded by .hgignore::
2781 - forget files that would be excluded by .hgignore::
2782
2782
2783 hg forget "set:hgignore()"
2783 hg forget "set:hgignore()"
2784
2784
2785 Returns 0 on success.
2785 Returns 0 on success.
2786 """
2786 """
2787
2787
2788 opts = pycompat.byteskwargs(opts)
2788 opts = pycompat.byteskwargs(opts)
2789 if not pats:
2789 if not pats:
2790 raise error.Abort(_(b'no files specified'))
2790 raise error.Abort(_(b'no files specified'))
2791
2791
2792 m = scmutil.match(repo[None], pats, opts)
2792 m = scmutil.match(repo[None], pats, opts)
2793 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2793 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2794 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2794 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2795 rejected = cmdutil.forget(
2795 rejected = cmdutil.forget(
2796 ui,
2796 ui,
2797 repo,
2797 repo,
2798 m,
2798 m,
2799 prefix=b"",
2799 prefix=b"",
2800 uipathfn=uipathfn,
2800 uipathfn=uipathfn,
2801 explicitonly=False,
2801 explicitonly=False,
2802 dryrun=dryrun,
2802 dryrun=dryrun,
2803 interactive=interactive,
2803 interactive=interactive,
2804 )[0]
2804 )[0]
2805 return rejected and 1 or 0
2805 return rejected and 1 or 0
2806
2806
2807
2807
2808 @command(
2808 @command(
2809 b'graft',
2809 b'graft',
2810 [
2810 [
2811 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2811 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2812 (
2812 (
2813 b'',
2813 b'',
2814 b'base',
2814 b'base',
2815 b'',
2815 b'',
2816 _(b'base revision when doing the graft merge (ADVANCED)'),
2816 _(b'base revision when doing the graft merge (ADVANCED)'),
2817 _(b'REV'),
2817 _(b'REV'),
2818 ),
2818 ),
2819 (b'c', b'continue', False, _(b'resume interrupted graft')),
2819 (b'c', b'continue', False, _(b'resume interrupted graft')),
2820 (b'', b'stop', False, _(b'stop interrupted graft')),
2820 (b'', b'stop', False, _(b'stop interrupted graft')),
2821 (b'', b'abort', False, _(b'abort interrupted graft')),
2821 (b'', b'abort', False, _(b'abort interrupted graft')),
2822 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2822 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2823 (b'', b'log', None, _(b'append graft info to log message')),
2823 (b'', b'log', None, _(b'append graft info to log message')),
2824 (
2824 (
2825 b'',
2825 b'',
2826 b'no-commit',
2826 b'no-commit',
2827 None,
2827 None,
2828 _(b"don't commit, just apply the changes in working directory"),
2828 _(b"don't commit, just apply the changes in working directory"),
2829 ),
2829 ),
2830 (b'f', b'force', False, _(b'force graft')),
2830 (b'f', b'force', False, _(b'force graft')),
2831 (
2831 (
2832 b'D',
2832 b'D',
2833 b'currentdate',
2833 b'currentdate',
2834 False,
2834 False,
2835 _(b'record the current date as commit date'),
2835 _(b'record the current date as commit date'),
2836 ),
2836 ),
2837 (
2837 (
2838 b'U',
2838 b'U',
2839 b'currentuser',
2839 b'currentuser',
2840 False,
2840 False,
2841 _(b'record the current user as committer'),
2841 _(b'record the current user as committer'),
2842 ),
2842 ),
2843 ]
2843 ]
2844 + commitopts2
2844 + commitopts2
2845 + mergetoolopts
2845 + mergetoolopts
2846 + dryrunopts,
2846 + dryrunopts,
2847 _(b'[OPTION]... [-r REV]... REV...'),
2847 _(b'[OPTION]... [-r REV]... REV...'),
2848 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2848 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2849 )
2849 )
2850 def graft(ui, repo, *revs, **opts):
2850 def graft(ui, repo, *revs, **opts):
2851 '''copy changes from other branches onto the current branch
2851 '''copy changes from other branches onto the current branch
2852
2852
2853 This command uses Mercurial's merge logic to copy individual
2853 This command uses Mercurial's merge logic to copy individual
2854 changes from other branches without merging branches in the
2854 changes from other branches without merging branches in the
2855 history graph. This is sometimes known as 'backporting' or
2855 history graph. This is sometimes known as 'backporting' or
2856 'cherry-picking'. By default, graft will copy user, date, and
2856 'cherry-picking'. By default, graft will copy user, date, and
2857 description from the source changesets.
2857 description from the source changesets.
2858
2858
2859 Changesets that are ancestors of the current revision, that have
2859 Changesets that are ancestors of the current revision, that have
2860 already been grafted, or that are merges will be skipped.
2860 already been grafted, or that are merges will be skipped.
2861
2861
2862 If --log is specified, log messages will have a comment appended
2862 If --log is specified, log messages will have a comment appended
2863 of the form::
2863 of the form::
2864
2864
2865 (grafted from CHANGESETHASH)
2865 (grafted from CHANGESETHASH)
2866
2866
2867 If --force is specified, revisions will be grafted even if they
2867 If --force is specified, revisions will be grafted even if they
2868 are already ancestors of, or have been grafted to, the destination.
2868 are already ancestors of, or have been grafted to, the destination.
2869 This is useful when the revisions have since been backed out.
2869 This is useful when the revisions have since been backed out.
2870
2870
2871 If a graft merge results in conflicts, the graft process is
2871 If a graft merge results in conflicts, the graft process is
2872 interrupted so that the current merge can be manually resolved.
2872 interrupted so that the current merge can be manually resolved.
2873 Once all conflicts are addressed, the graft process can be
2873 Once all conflicts are addressed, the graft process can be
2874 continued with the -c/--continue option.
2874 continued with the -c/--continue option.
2875
2875
2876 The -c/--continue option reapplies all the earlier options.
2876 The -c/--continue option reapplies all the earlier options.
2877
2877
2878 .. container:: verbose
2878 .. container:: verbose
2879
2879
2880 The --base option exposes more of how graft internally uses merge with a
2880 The --base option exposes more of how graft internally uses merge with a
2881 custom base revision. --base can be used to specify another ancestor than
2881 custom base revision. --base can be used to specify another ancestor than
2882 the first and only parent.
2882 the first and only parent.
2883
2883
2884 The command::
2884 The command::
2885
2885
2886 hg graft -r 345 --base 234
2886 hg graft -r 345 --base 234
2887
2887
2888 is thus pretty much the same as::
2888 is thus pretty much the same as::
2889
2889
2890 hg diff -r 234 -r 345 | hg import
2890 hg diff -r 234 -r 345 | hg import
2891
2891
2892 but using merge to resolve conflicts and track moved files.
2892 but using merge to resolve conflicts and track moved files.
2893
2893
2894 The result of a merge can thus be backported as a single commit by
2894 The result of a merge can thus be backported as a single commit by
2895 specifying one of the merge parents as base, and thus effectively
2895 specifying one of the merge parents as base, and thus effectively
2896 grafting the changes from the other side.
2896 grafting the changes from the other side.
2897
2897
2898 It is also possible to collapse multiple changesets and clean up history
2898 It is also possible to collapse multiple changesets and clean up history
2899 by specifying another ancestor as base, much like rebase --collapse
2899 by specifying another ancestor as base, much like rebase --collapse
2900 --keep.
2900 --keep.
2901
2901
2902 The commit message can be tweaked after the fact using commit --amend .
2902 The commit message can be tweaked after the fact using commit --amend .
2903
2903
2904 For using non-ancestors as the base to backout changes, see the backout
2904 For using non-ancestors as the base to backout changes, see the backout
2905 command and the hidden --parent option.
2905 command and the hidden --parent option.
2906
2906
2907 .. container:: verbose
2907 .. container:: verbose
2908
2908
2909 Examples:
2909 Examples:
2910
2910
2911 - copy a single change to the stable branch and edit its description::
2911 - copy a single change to the stable branch and edit its description::
2912
2912
2913 hg update stable
2913 hg update stable
2914 hg graft --edit 9393
2914 hg graft --edit 9393
2915
2915
2916 - graft a range of changesets with one exception, updating dates::
2916 - graft a range of changesets with one exception, updating dates::
2917
2917
2918 hg graft -D "2085::2093 and not 2091"
2918 hg graft -D "2085::2093 and not 2091"
2919
2919
2920 - continue a graft after resolving conflicts::
2920 - continue a graft after resolving conflicts::
2921
2921
2922 hg graft -c
2922 hg graft -c
2923
2923
2924 - show the source of a grafted changeset::
2924 - show the source of a grafted changeset::
2925
2925
2926 hg log --debug -r .
2926 hg log --debug -r .
2927
2927
2928 - show revisions sorted by date::
2928 - show revisions sorted by date::
2929
2929
2930 hg log -r "sort(all(), date)"
2930 hg log -r "sort(all(), date)"
2931
2931
2932 - backport the result of a merge as a single commit::
2932 - backport the result of a merge as a single commit::
2933
2933
2934 hg graft -r 123 --base 123^
2934 hg graft -r 123 --base 123^
2935
2935
2936 - land a feature branch as one changeset::
2936 - land a feature branch as one changeset::
2937
2937
2938 hg up -cr default
2938 hg up -cr default
2939 hg graft -r featureX --base "ancestor('featureX', 'default')"
2939 hg graft -r featureX --base "ancestor('featureX', 'default')"
2940
2940
2941 See :hg:`help revisions` for more about specifying revisions.
2941 See :hg:`help revisions` for more about specifying revisions.
2942
2942
2943 Returns 0 on successful completion.
2943 Returns 0 on successful completion.
2944 '''
2944 '''
2945 with repo.wlock():
2945 with repo.wlock():
2946 return _dograft(ui, repo, *revs, **opts)
2946 return _dograft(ui, repo, *revs, **opts)
2947
2947
2948
2948
2949 def _dograft(ui, repo, *revs, **opts):
2949 def _dograft(ui, repo, *revs, **opts):
2950 opts = pycompat.byteskwargs(opts)
2950 opts = pycompat.byteskwargs(opts)
2951 if revs and opts.get(b'rev'):
2951 if revs and opts.get(b'rev'):
2952 ui.warn(
2952 ui.warn(
2953 _(
2953 _(
2954 b'warning: inconsistent use of --rev might give unexpected '
2954 b'warning: inconsistent use of --rev might give unexpected '
2955 b'revision ordering!\n'
2955 b'revision ordering!\n'
2956 )
2956 )
2957 )
2957 )
2958
2958
2959 revs = list(revs)
2959 revs = list(revs)
2960 revs.extend(opts.get(b'rev'))
2960 revs.extend(opts.get(b'rev'))
2961 basectx = None
2961 basectx = None
2962 if opts.get(b'base'):
2962 if opts.get(b'base'):
2963 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2963 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2964 # a dict of data to be stored in state file
2964 # a dict of data to be stored in state file
2965 statedata = {}
2965 statedata = {}
2966 # list of new nodes created by ongoing graft
2966 # list of new nodes created by ongoing graft
2967 statedata[b'newnodes'] = []
2967 statedata[b'newnodes'] = []
2968
2968
2969 cmdutil.resolvecommitoptions(ui, opts)
2969 cmdutil.resolvecommitoptions(ui, opts)
2970
2970
2971 editor = cmdutil.getcommiteditor(
2971 editor = cmdutil.getcommiteditor(
2972 editform=b'graft', **pycompat.strkwargs(opts)
2972 editform=b'graft', **pycompat.strkwargs(opts)
2973 )
2973 )
2974
2974
2975 cont = False
2975 cont = False
2976 if opts.get(b'no_commit'):
2976 if opts.get(b'no_commit'):
2977 if opts.get(b'edit'):
2977 if opts.get(b'edit'):
2978 raise error.Abort(
2978 raise error.Abort(
2979 _(b"cannot specify --no-commit and --edit together")
2979 _(b"cannot specify --no-commit and --edit together")
2980 )
2980 )
2981 if opts.get(b'currentuser'):
2981 if opts.get(b'currentuser'):
2982 raise error.Abort(
2982 raise error.Abort(
2983 _(b"cannot specify --no-commit and --currentuser together")
2983 _(b"cannot specify --no-commit and --currentuser together")
2984 )
2984 )
2985 if opts.get(b'currentdate'):
2985 if opts.get(b'currentdate'):
2986 raise error.Abort(
2986 raise error.Abort(
2987 _(b"cannot specify --no-commit and --currentdate together")
2987 _(b"cannot specify --no-commit and --currentdate together")
2988 )
2988 )
2989 if opts.get(b'log'):
2989 if opts.get(b'log'):
2990 raise error.Abort(
2990 raise error.Abort(
2991 _(b"cannot specify --no-commit and --log together")
2991 _(b"cannot specify --no-commit and --log together")
2992 )
2992 )
2993
2993
2994 graftstate = statemod.cmdstate(repo, b'graftstate')
2994 graftstate = statemod.cmdstate(repo, b'graftstate')
2995
2995
2996 if opts.get(b'stop'):
2996 if opts.get(b'stop'):
2997 if opts.get(b'continue'):
2997 if opts.get(b'continue'):
2998 raise error.Abort(
2998 raise error.Abort(
2999 _(b"cannot use '--continue' and '--stop' together")
2999 _(b"cannot use '--continue' and '--stop' together")
3000 )
3000 )
3001 if opts.get(b'abort'):
3001 if opts.get(b'abort'):
3002 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3002 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3003
3003
3004 if any(
3004 if any(
3005 (
3005 (
3006 opts.get(b'edit'),
3006 opts.get(b'edit'),
3007 opts.get(b'log'),
3007 opts.get(b'log'),
3008 opts.get(b'user'),
3008 opts.get(b'user'),
3009 opts.get(b'date'),
3009 opts.get(b'date'),
3010 opts.get(b'currentdate'),
3010 opts.get(b'currentdate'),
3011 opts.get(b'currentuser'),
3011 opts.get(b'currentuser'),
3012 opts.get(b'rev'),
3012 opts.get(b'rev'),
3013 )
3013 )
3014 ):
3014 ):
3015 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3015 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3016 return _stopgraft(ui, repo, graftstate)
3016 return _stopgraft(ui, repo, graftstate)
3017 elif opts.get(b'abort'):
3017 elif opts.get(b'abort'):
3018 if opts.get(b'continue'):
3018 if opts.get(b'continue'):
3019 raise error.Abort(
3019 raise error.Abort(
3020 _(b"cannot use '--continue' and '--abort' together")
3020 _(b"cannot use '--continue' and '--abort' together")
3021 )
3021 )
3022 if any(
3022 if any(
3023 (
3023 (
3024 opts.get(b'edit'),
3024 opts.get(b'edit'),
3025 opts.get(b'log'),
3025 opts.get(b'log'),
3026 opts.get(b'user'),
3026 opts.get(b'user'),
3027 opts.get(b'date'),
3027 opts.get(b'date'),
3028 opts.get(b'currentdate'),
3028 opts.get(b'currentdate'),
3029 opts.get(b'currentuser'),
3029 opts.get(b'currentuser'),
3030 opts.get(b'rev'),
3030 opts.get(b'rev'),
3031 )
3031 )
3032 ):
3032 ):
3033 raise error.Abort(
3033 raise error.Abort(
3034 _(b"cannot specify any other flag with '--abort'")
3034 _(b"cannot specify any other flag with '--abort'")
3035 )
3035 )
3036
3036
3037 return cmdutil.abortgraft(ui, repo, graftstate)
3037 return cmdutil.abortgraft(ui, repo, graftstate)
3038 elif opts.get(b'continue'):
3038 elif opts.get(b'continue'):
3039 cont = True
3039 cont = True
3040 if revs:
3040 if revs:
3041 raise error.Abort(_(b"can't specify --continue and revisions"))
3041 raise error.Abort(_(b"can't specify --continue and revisions"))
3042 # read in unfinished revisions
3042 # read in unfinished revisions
3043 if graftstate.exists():
3043 if graftstate.exists():
3044 statedata = cmdutil.readgraftstate(repo, graftstate)
3044 statedata = cmdutil.readgraftstate(repo, graftstate)
3045 if statedata.get(b'date'):
3045 if statedata.get(b'date'):
3046 opts[b'date'] = statedata[b'date']
3046 opts[b'date'] = statedata[b'date']
3047 if statedata.get(b'user'):
3047 if statedata.get(b'user'):
3048 opts[b'user'] = statedata[b'user']
3048 opts[b'user'] = statedata[b'user']
3049 if statedata.get(b'log'):
3049 if statedata.get(b'log'):
3050 opts[b'log'] = True
3050 opts[b'log'] = True
3051 if statedata.get(b'no_commit'):
3051 if statedata.get(b'no_commit'):
3052 opts[b'no_commit'] = statedata.get(b'no_commit')
3052 opts[b'no_commit'] = statedata.get(b'no_commit')
3053 nodes = statedata[b'nodes']
3053 nodes = statedata[b'nodes']
3054 revs = [repo[node].rev() for node in nodes]
3054 revs = [repo[node].rev() for node in nodes]
3055 else:
3055 else:
3056 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3056 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3057 else:
3057 else:
3058 if not revs:
3058 if not revs:
3059 raise error.Abort(_(b'no revisions specified'))
3059 raise error.Abort(_(b'no revisions specified'))
3060 cmdutil.checkunfinished(repo)
3060 cmdutil.checkunfinished(repo)
3061 cmdutil.bailifchanged(repo)
3061 cmdutil.bailifchanged(repo)
3062 revs = scmutil.revrange(repo, revs)
3062 revs = scmutil.revrange(repo, revs)
3063
3063
3064 skipped = set()
3064 skipped = set()
3065 if basectx is None:
3065 if basectx is None:
3066 # check for merges
3066 # check for merges
3067 for rev in repo.revs(b'%ld and merge()', revs):
3067 for rev in repo.revs(b'%ld and merge()', revs):
3068 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3068 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3069 skipped.add(rev)
3069 skipped.add(rev)
3070 revs = [r for r in revs if r not in skipped]
3070 revs = [r for r in revs if r not in skipped]
3071 if not revs:
3071 if not revs:
3072 return -1
3072 return -1
3073 if basectx is not None and len(revs) != 1:
3073 if basectx is not None and len(revs) != 1:
3074 raise error.Abort(_(b'only one revision allowed with --base '))
3074 raise error.Abort(_(b'only one revision allowed with --base '))
3075
3075
3076 # Don't check in the --continue case, in effect retaining --force across
3076 # Don't check in the --continue case, in effect retaining --force across
3077 # --continues. That's because without --force, any revisions we decided to
3077 # --continues. That's because without --force, any revisions we decided to
3078 # skip would have been filtered out here, so they wouldn't have made their
3078 # skip would have been filtered out here, so they wouldn't have made their
3079 # way to the graftstate. With --force, any revisions we would have otherwise
3079 # way to the graftstate. With --force, any revisions we would have otherwise
3080 # skipped would not have been filtered out, and if they hadn't been applied
3080 # skipped would not have been filtered out, and if they hadn't been applied
3081 # already, they'd have been in the graftstate.
3081 # already, they'd have been in the graftstate.
3082 if not (cont or opts.get(b'force')) and basectx is None:
3082 if not (cont or opts.get(b'force')) and basectx is None:
3083 # check for ancestors of dest branch
3083 # check for ancestors of dest branch
3084 ancestors = repo.revs(b'%ld & (::.)', revs)
3084 ancestors = repo.revs(b'%ld & (::.)', revs)
3085 for rev in ancestors:
3085 for rev in ancestors:
3086 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3086 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3087
3087
3088 revs = [r for r in revs if r not in ancestors]
3088 revs = [r for r in revs if r not in ancestors]
3089
3089
3090 if not revs:
3090 if not revs:
3091 return -1
3091 return -1
3092
3092
3093 # analyze revs for earlier grafts
3093 # analyze revs for earlier grafts
3094 ids = {}
3094 ids = {}
3095 for ctx in repo.set(b"%ld", revs):
3095 for ctx in repo.set(b"%ld", revs):
3096 ids[ctx.hex()] = ctx.rev()
3096 ids[ctx.hex()] = ctx.rev()
3097 n = ctx.extra().get(b'source')
3097 n = ctx.extra().get(b'source')
3098 if n:
3098 if n:
3099 ids[n] = ctx.rev()
3099 ids[n] = ctx.rev()
3100
3100
3101 # check ancestors for earlier grafts
3101 # check ancestors for earlier grafts
3102 ui.debug(b'scanning for duplicate grafts\n')
3102 ui.debug(b'scanning for duplicate grafts\n')
3103
3103
3104 # The only changesets we can be sure doesn't contain grafts of any
3104 # The only changesets we can be sure doesn't contain grafts of any
3105 # revs, are the ones that are common ancestors of *all* revs:
3105 # revs, are the ones that are common ancestors of *all* revs:
3106 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3106 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3107 ctx = repo[rev]
3107 ctx = repo[rev]
3108 n = ctx.extra().get(b'source')
3108 n = ctx.extra().get(b'source')
3109 if n in ids:
3109 if n in ids:
3110 try:
3110 try:
3111 r = repo[n].rev()
3111 r = repo[n].rev()
3112 except error.RepoLookupError:
3112 except error.RepoLookupError:
3113 r = None
3113 r = None
3114 if r in revs:
3114 if r in revs:
3115 ui.warn(
3115 ui.warn(
3116 _(
3116 _(
3117 b'skipping revision %d:%s '
3117 b'skipping revision %d:%s '
3118 b'(already grafted to %d:%s)\n'
3118 b'(already grafted to %d:%s)\n'
3119 )
3119 )
3120 % (r, repo[r], rev, ctx)
3120 % (r, repo[r], rev, ctx)
3121 )
3121 )
3122 revs.remove(r)
3122 revs.remove(r)
3123 elif ids[n] in revs:
3123 elif ids[n] in revs:
3124 if r is None:
3124 if r is None:
3125 ui.warn(
3125 ui.warn(
3126 _(
3126 _(
3127 b'skipping already grafted revision %d:%s '
3127 b'skipping already grafted revision %d:%s '
3128 b'(%d:%s also has unknown origin %s)\n'
3128 b'(%d:%s also has unknown origin %s)\n'
3129 )
3129 )
3130 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3130 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3131 )
3131 )
3132 else:
3132 else:
3133 ui.warn(
3133 ui.warn(
3134 _(
3134 _(
3135 b'skipping already grafted revision %d:%s '
3135 b'skipping already grafted revision %d:%s '
3136 b'(%d:%s also has origin %d:%s)\n'
3136 b'(%d:%s also has origin %d:%s)\n'
3137 )
3137 )
3138 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3138 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3139 )
3139 )
3140 revs.remove(ids[n])
3140 revs.remove(ids[n])
3141 elif ctx.hex() in ids:
3141 elif ctx.hex() in ids:
3142 r = ids[ctx.hex()]
3142 r = ids[ctx.hex()]
3143 if r in revs:
3143 if r in revs:
3144 ui.warn(
3144 ui.warn(
3145 _(
3145 _(
3146 b'skipping already grafted revision %d:%s '
3146 b'skipping already grafted revision %d:%s '
3147 b'(was grafted from %d:%s)\n'
3147 b'(was grafted from %d:%s)\n'
3148 )
3148 )
3149 % (r, repo[r], rev, ctx)
3149 % (r, repo[r], rev, ctx)
3150 )
3150 )
3151 revs.remove(r)
3151 revs.remove(r)
3152 if not revs:
3152 if not revs:
3153 return -1
3153 return -1
3154
3154
3155 if opts.get(b'no_commit'):
3155 if opts.get(b'no_commit'):
3156 statedata[b'no_commit'] = True
3156 statedata[b'no_commit'] = True
3157 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3157 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3158 desc = b'%d:%s "%s"' % (
3158 desc = b'%d:%s "%s"' % (
3159 ctx.rev(),
3159 ctx.rev(),
3160 ctx,
3160 ctx,
3161 ctx.description().split(b'\n', 1)[0],
3161 ctx.description().split(b'\n', 1)[0],
3162 )
3162 )
3163 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3163 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3164 if names:
3164 if names:
3165 desc += b' (%s)' % b' '.join(names)
3165 desc += b' (%s)' % b' '.join(names)
3166 ui.status(_(b'grafting %s\n') % desc)
3166 ui.status(_(b'grafting %s\n') % desc)
3167 if opts.get(b'dry_run'):
3167 if opts.get(b'dry_run'):
3168 continue
3168 continue
3169
3169
3170 source = ctx.extra().get(b'source')
3170 source = ctx.extra().get(b'source')
3171 extra = {}
3171 extra = {}
3172 if source:
3172 if source:
3173 extra[b'source'] = source
3173 extra[b'source'] = source
3174 extra[b'intermediate-source'] = ctx.hex()
3174 extra[b'intermediate-source'] = ctx.hex()
3175 else:
3175 else:
3176 extra[b'source'] = ctx.hex()
3176 extra[b'source'] = ctx.hex()
3177 user = ctx.user()
3177 user = ctx.user()
3178 if opts.get(b'user'):
3178 if opts.get(b'user'):
3179 user = opts[b'user']
3179 user = opts[b'user']
3180 statedata[b'user'] = user
3180 statedata[b'user'] = user
3181 date = ctx.date()
3181 date = ctx.date()
3182 if opts.get(b'date'):
3182 if opts.get(b'date'):
3183 date = opts[b'date']
3183 date = opts[b'date']
3184 statedata[b'date'] = date
3184 statedata[b'date'] = date
3185 message = ctx.description()
3185 message = ctx.description()
3186 if opts.get(b'log'):
3186 if opts.get(b'log'):
3187 message += b'\n(grafted from %s)' % ctx.hex()
3187 message += b'\n(grafted from %s)' % ctx.hex()
3188 statedata[b'log'] = True
3188 statedata[b'log'] = True
3189
3189
3190 # we don't merge the first commit when continuing
3190 # we don't merge the first commit when continuing
3191 if not cont:
3191 if not cont:
3192 # perform the graft merge with p1(rev) as 'ancestor'
3192 # perform the graft merge with p1(rev) as 'ancestor'
3193 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3193 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3194 base = ctx.p1() if basectx is None else basectx
3194 base = ctx.p1() if basectx is None else basectx
3195 with ui.configoverride(overrides, b'graft'):
3195 with ui.configoverride(overrides, b'graft'):
3196 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3196 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3197 # report any conflicts
3197 # report any conflicts
3198 if stats.unresolvedcount > 0:
3198 if stats.unresolvedcount > 0:
3199 # write out state for --continue
3199 # write out state for --continue
3200 nodes = [repo[rev].hex() for rev in revs[pos:]]
3200 nodes = [repo[rev].hex() for rev in revs[pos:]]
3201 statedata[b'nodes'] = nodes
3201 statedata[b'nodes'] = nodes
3202 stateversion = 1
3202 stateversion = 1
3203 graftstate.save(stateversion, statedata)
3203 graftstate.save(stateversion, statedata)
3204 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3204 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3205 raise error.Abort(
3205 raise error.Abort(
3206 _(b"unresolved conflicts, can't continue"), hint=hint
3206 _(b"unresolved conflicts, can't continue"), hint=hint
3207 )
3207 )
3208 else:
3208 else:
3209 cont = False
3209 cont = False
3210
3210
3211 # commit if --no-commit is false
3211 # commit if --no-commit is false
3212 if not opts.get(b'no_commit'):
3212 if not opts.get(b'no_commit'):
3213 node = repo.commit(
3213 node = repo.commit(
3214 text=message, user=user, date=date, extra=extra, editor=editor
3214 text=message, user=user, date=date, extra=extra, editor=editor
3215 )
3215 )
3216 if node is None:
3216 if node is None:
3217 ui.warn(
3217 ui.warn(
3218 _(b'note: graft of %d:%s created no changes to commit\n')
3218 _(b'note: graft of %d:%s created no changes to commit\n')
3219 % (ctx.rev(), ctx)
3219 % (ctx.rev(), ctx)
3220 )
3220 )
3221 # checking that newnodes exist because old state files won't have it
3221 # checking that newnodes exist because old state files won't have it
3222 elif statedata.get(b'newnodes') is not None:
3222 elif statedata.get(b'newnodes') is not None:
3223 statedata[b'newnodes'].append(node)
3223 statedata[b'newnodes'].append(node)
3224
3224
3225 # remove state when we complete successfully
3225 # remove state when we complete successfully
3226 if not opts.get(b'dry_run'):
3226 if not opts.get(b'dry_run'):
3227 graftstate.delete()
3227 graftstate.delete()
3228
3228
3229 return 0
3229 return 0
3230
3230
3231
3231
3232 def _stopgraft(ui, repo, graftstate):
3232 def _stopgraft(ui, repo, graftstate):
3233 """stop the interrupted graft"""
3233 """stop the interrupted graft"""
3234 if not graftstate.exists():
3234 if not graftstate.exists():
3235 raise error.Abort(_(b"no interrupted graft found"))
3235 raise error.Abort(_(b"no interrupted graft found"))
3236 pctx = repo[b'.']
3236 pctx = repo[b'.']
3237 hg.updaterepo(repo, pctx.node(), overwrite=True)
3237 hg.updaterepo(repo, pctx.node(), overwrite=True)
3238 graftstate.delete()
3238 graftstate.delete()
3239 ui.status(_(b"stopped the interrupted graft\n"))
3239 ui.status(_(b"stopped the interrupted graft\n"))
3240 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3240 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3241 return 0
3241 return 0
3242
3242
3243
3243
3244 statemod.addunfinished(
3244 statemod.addunfinished(
3245 b'graft',
3245 b'graft',
3246 fname=b'graftstate',
3246 fname=b'graftstate',
3247 clearable=True,
3247 clearable=True,
3248 stopflag=True,
3248 stopflag=True,
3249 continueflag=True,
3249 continueflag=True,
3250 abortfunc=cmdutil.hgabortgraft,
3250 abortfunc=cmdutil.hgabortgraft,
3251 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3251 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3252 )
3252 )
3253
3253
3254
3254
3255 @command(
3255 @command(
3256 b'grep',
3256 b'grep',
3257 [
3257 [
3258 (b'0', b'print0', None, _(b'end fields with NUL')),
3258 (b'0', b'print0', None, _(b'end fields with NUL')),
3259 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3259 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3260 (
3260 (
3261 b'',
3261 b'',
3262 b'diff',
3262 b'diff',
3263 None,
3263 None,
3264 _(
3264 _(
3265 b'search revision differences for when the pattern was added '
3265 b'search revision differences for when the pattern was added '
3266 b'or removed'
3266 b'or removed'
3267 ),
3267 ),
3268 ),
3268 ),
3269 (b'a', b'text', None, _(b'treat all files as text')),
3269 (b'a', b'text', None, _(b'treat all files as text')),
3270 (
3270 (
3271 b'f',
3271 b'f',
3272 b'follow',
3272 b'follow',
3273 None,
3273 None,
3274 _(
3274 _(
3275 b'follow changeset history,'
3275 b'follow changeset history,'
3276 b' or file history across copies and renames'
3276 b' or file history across copies and renames'
3277 ),
3277 ),
3278 ),
3278 ),
3279 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3279 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3280 (
3280 (
3281 b'l',
3281 b'l',
3282 b'files-with-matches',
3282 b'files-with-matches',
3283 None,
3283 None,
3284 _(b'print only filenames and revisions that match'),
3284 _(b'print only filenames and revisions that match'),
3285 ),
3285 ),
3286 (b'n', b'line-number', None, _(b'print matching line numbers')),
3286 (b'n', b'line-number', None, _(b'print matching line numbers')),
3287 (
3287 (
3288 b'r',
3288 b'r',
3289 b'rev',
3289 b'rev',
3290 [],
3290 [],
3291 _(b'search files changed within revision range'),
3291 _(b'search files changed within revision range'),
3292 _(b'REV'),
3292 _(b'REV'),
3293 ),
3293 ),
3294 (
3294 (
3295 b'',
3295 b'',
3296 b'all-files',
3296 b'all-files',
3297 None,
3297 None,
3298 _(
3298 _(
3299 b'include all files in the changeset while grepping (DEPRECATED)'
3299 b'include all files in the changeset while grepping (DEPRECATED)'
3300 ),
3300 ),
3301 ),
3301 ),
3302 (b'u', b'user', None, _(b'list the author (long with -v)')),
3302 (b'u', b'user', None, _(b'list the author (long with -v)')),
3303 (b'd', b'date', None, _(b'list the date (short with -q)')),
3303 (b'd', b'date', None, _(b'list the date (short with -q)')),
3304 ]
3304 ]
3305 + formatteropts
3305 + formatteropts
3306 + walkopts,
3306 + walkopts,
3307 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3307 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3308 helpcategory=command.CATEGORY_FILE_CONTENTS,
3308 helpcategory=command.CATEGORY_FILE_CONTENTS,
3309 inferrepo=True,
3309 inferrepo=True,
3310 intents={INTENT_READONLY},
3310 intents={INTENT_READONLY},
3311 )
3311 )
3312 def grep(ui, repo, pattern, *pats, **opts):
3312 def grep(ui, repo, pattern, *pats, **opts):
3313 """search for a pattern in specified files
3313 """search for a pattern in specified files
3314
3314
3315 Search the working directory or revision history for a regular
3315 Search the working directory or revision history for a regular
3316 expression in the specified files for the entire repository.
3316 expression in the specified files for the entire repository.
3317
3317
3318 By default, grep searches the repository files in the working
3318 By default, grep searches the repository files in the working
3319 directory and prints the files where it finds a match. To specify
3319 directory and prints the files where it finds a match. To specify
3320 historical revisions instead of the working directory, use the
3320 historical revisions instead of the working directory, use the
3321 --rev flag.
3321 --rev flag.
3322
3322
3323 To search instead historical revision differences that contains a
3323 To search instead historical revision differences that contains a
3324 change in match status ("-" for a match that becomes a non-match,
3324 change in match status ("-" for a match that becomes a non-match,
3325 or "+" for a non-match that becomes a match), use the --diff flag.
3325 or "+" for a non-match that becomes a match), use the --diff flag.
3326
3326
3327 PATTERN can be any Python (roughly Perl-compatible) regular
3327 PATTERN can be any Python (roughly Perl-compatible) regular
3328 expression.
3328 expression.
3329
3329
3330 If no FILEs are specified and the --rev flag isn't supplied, all
3330 If no FILEs are specified and the --rev flag isn't supplied, all
3331 files in the working directory are searched. When using the --rev
3331 files in the working directory are searched. When using the --rev
3332 flag and specifying FILEs, use the --follow argument to also
3332 flag and specifying FILEs, use the --follow argument to also
3333 follow the specified FILEs across renames and copies.
3333 follow the specified FILEs across renames and copies.
3334
3334
3335 .. container:: verbose
3335 .. container:: verbose
3336
3336
3337 Template:
3337 Template:
3338
3338
3339 The following keywords are supported in addition to the common template
3339 The following keywords are supported in addition to the common template
3340 keywords and functions. See also :hg:`help templates`.
3340 keywords and functions. See also :hg:`help templates`.
3341
3341
3342 :change: String. Character denoting insertion ``+`` or removal ``-``.
3342 :change: String. Character denoting insertion ``+`` or removal ``-``.
3343 Available if ``--diff`` is specified.
3343 Available if ``--diff`` is specified.
3344 :lineno: Integer. Line number of the match.
3344 :lineno: Integer. Line number of the match.
3345 :path: String. Repository-absolute path of the file.
3345 :path: String. Repository-absolute path of the file.
3346 :texts: List of text chunks.
3346 :texts: List of text chunks.
3347
3347
3348 And each entry of ``{texts}`` provides the following sub-keywords.
3348 And each entry of ``{texts}`` provides the following sub-keywords.
3349
3349
3350 :matched: Boolean. True if the chunk matches the specified pattern.
3350 :matched: Boolean. True if the chunk matches the specified pattern.
3351 :text: String. Chunk content.
3351 :text: String. Chunk content.
3352
3352
3353 See :hg:`help templates.operators` for the list expansion syntax.
3353 See :hg:`help templates.operators` for the list expansion syntax.
3354
3354
3355 Returns 0 if a match is found, 1 otherwise.
3355 Returns 0 if a match is found, 1 otherwise.
3356
3356
3357 """
3357 """
3358 opts = pycompat.byteskwargs(opts)
3358 opts = pycompat.byteskwargs(opts)
3359 diff = opts.get(b'all') or opts.get(b'diff')
3359 diff = opts.get(b'all') or opts.get(b'diff')
3360 if diff and opts.get(b'all_files'):
3360 if diff and opts.get(b'all_files'):
3361 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3361 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3362 if opts.get(b'all_files') is None and not diff:
3362 if opts.get(b'all_files') is None and not diff:
3363 opts[b'all_files'] = True
3363 opts[b'all_files'] = True
3364 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3364 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3365 all_files = opts.get(b'all_files')
3365 all_files = opts.get(b'all_files')
3366 if plaingrep:
3366 if plaingrep:
3367 opts[b'rev'] = [b'wdir()']
3367 opts[b'rev'] = [b'wdir()']
3368
3368
3369 reflags = re.M
3369 reflags = re.M
3370 if opts.get(b'ignore_case'):
3370 if opts.get(b'ignore_case'):
3371 reflags |= re.I
3371 reflags |= re.I
3372 try:
3372 try:
3373 regexp = util.re.compile(pattern, reflags)
3373 regexp = util.re.compile(pattern, reflags)
3374 except re.error as inst:
3374 except re.error as inst:
3375 ui.warn(
3375 ui.warn(
3376 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3376 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3377 )
3377 )
3378 return 1
3378 return 1
3379 sep, eol = b':', b'\n'
3379 sep, eol = b':', b'\n'
3380 if opts.get(b'print0'):
3380 if opts.get(b'print0'):
3381 sep = eol = b'\0'
3381 sep = eol = b'\0'
3382
3382
3383 getfile = util.lrucachefunc(repo.file)
3383 getfile = util.lrucachefunc(repo.file)
3384
3384
3385 def matchlines(body):
3385 def matchlines(body):
3386 begin = 0
3386 begin = 0
3387 linenum = 0
3387 linenum = 0
3388 while begin < len(body):
3388 while begin < len(body):
3389 match = regexp.search(body, begin)
3389 match = regexp.search(body, begin)
3390 if not match:
3390 if not match:
3391 break
3391 break
3392 mstart, mend = match.span()
3392 mstart, mend = match.span()
3393 linenum += body.count(b'\n', begin, mstart) + 1
3393 linenum += body.count(b'\n', begin, mstart) + 1
3394 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3394 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3395 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3395 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3396 lend = begin - 1
3396 lend = begin - 1
3397 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3397 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3398
3398
3399 class linestate(object):
3399 class linestate(object):
3400 def __init__(self, line, linenum, colstart, colend):
3400 def __init__(self, line, linenum, colstart, colend):
3401 self.line = line
3401 self.line = line
3402 self.linenum = linenum
3402 self.linenum = linenum
3403 self.colstart = colstart
3403 self.colstart = colstart
3404 self.colend = colend
3404 self.colend = colend
3405
3405
3406 def __hash__(self):
3406 def __hash__(self):
3407 return hash((self.linenum, self.line))
3407 return hash((self.linenum, self.line))
3408
3408
3409 def __eq__(self, other):
3409 def __eq__(self, other):
3410 return self.line == other.line
3410 return self.line == other.line
3411
3411
3412 def findpos(self):
3412 def findpos(self):
3413 """Iterate all (start, end) indices of matches"""
3413 """Iterate all (start, end) indices of matches"""
3414 yield self.colstart, self.colend
3414 yield self.colstart, self.colend
3415 p = self.colend
3415 p = self.colend
3416 while p < len(self.line):
3416 while p < len(self.line):
3417 m = regexp.search(self.line, p)
3417 m = regexp.search(self.line, p)
3418 if not m:
3418 if not m:
3419 break
3419 break
3420 yield m.span()
3420 yield m.span()
3421 p = m.end()
3421 p = m.end()
3422
3422
3423 matches = {}
3423 matches = {}
3424 copies = {}
3424 copies = {}
3425
3425
3426 def grepbody(fn, rev, body):
3426 def grepbody(fn, rev, body):
3427 matches[rev].setdefault(fn, [])
3427 matches[rev].setdefault(fn, [])
3428 m = matches[rev][fn]
3428 m = matches[rev][fn]
3429 if body is None:
3429 if body is None:
3430 return
3430 return
3431
3431
3432 for lnum, cstart, cend, line in matchlines(body):
3432 for lnum, cstart, cend, line in matchlines(body):
3433 s = linestate(line, lnum, cstart, cend)
3433 s = linestate(line, lnum, cstart, cend)
3434 m.append(s)
3434 m.append(s)
3435
3435
3436 def difflinestates(a, b):
3436 def difflinestates(a, b):
3437 sm = difflib.SequenceMatcher(None, a, b)
3437 sm = difflib.SequenceMatcher(None, a, b)
3438 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3438 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3439 if tag == 'insert':
3439 if tag == 'insert':
3440 for i in pycompat.xrange(blo, bhi):
3440 for i in pycompat.xrange(blo, bhi):
3441 yield (b'+', b[i])
3441 yield (b'+', b[i])
3442 elif tag == 'delete':
3442 elif tag == 'delete':
3443 for i in pycompat.xrange(alo, ahi):
3443 for i in pycompat.xrange(alo, ahi):
3444 yield (b'-', a[i])
3444 yield (b'-', a[i])
3445 elif tag == 'replace':
3445 elif tag == 'replace':
3446 for i in pycompat.xrange(alo, ahi):
3446 for i in pycompat.xrange(alo, ahi):
3447 yield (b'-', a[i])
3447 yield (b'-', a[i])
3448 for i in pycompat.xrange(blo, bhi):
3448 for i in pycompat.xrange(blo, bhi):
3449 yield (b'+', b[i])
3449 yield (b'+', b[i])
3450
3450
3451 uipathfn = scmutil.getuipathfn(repo)
3451 uipathfn = scmutil.getuipathfn(repo)
3452
3452
3453 def display(fm, fn, ctx, pstates, states):
3453 def display(fm, fn, ctx, pstates, states):
3454 rev = scmutil.intrev(ctx)
3454 rev = scmutil.intrev(ctx)
3455 if fm.isplain():
3455 if fm.isplain():
3456 formatuser = ui.shortuser
3456 formatuser = ui.shortuser
3457 else:
3457 else:
3458 formatuser = pycompat.bytestr
3458 formatuser = pycompat.bytestr
3459 if ui.quiet:
3459 if ui.quiet:
3460 datefmt = b'%Y-%m-%d'
3460 datefmt = b'%Y-%m-%d'
3461 else:
3461 else:
3462 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3462 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3463 found = False
3463 found = False
3464
3464
3465 @util.cachefunc
3465 @util.cachefunc
3466 def binary():
3466 def binary():
3467 flog = getfile(fn)
3467 flog = getfile(fn)
3468 try:
3468 try:
3469 return stringutil.binary(flog.read(ctx.filenode(fn)))
3469 return stringutil.binary(flog.read(ctx.filenode(fn)))
3470 except error.WdirUnsupported:
3470 except error.WdirUnsupported:
3471 return ctx[fn].isbinary()
3471 return ctx[fn].isbinary()
3472
3472
3473 fieldnamemap = {b'linenumber': b'lineno'}
3473 fieldnamemap = {b'linenumber': b'lineno'}
3474 if diff:
3474 if diff:
3475 iter = difflinestates(pstates, states)
3475 iter = difflinestates(pstates, states)
3476 else:
3476 else:
3477 iter = [(b'', l) for l in states]
3477 iter = [(b'', l) for l in states]
3478 for change, l in iter:
3478 for change, l in iter:
3479 fm.startitem()
3479 fm.startitem()
3480 fm.context(ctx=ctx)
3480 fm.context(ctx=ctx)
3481 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3481 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3482 fm.plain(uipathfn(fn), label=b'grep.filename')
3482 fm.plain(uipathfn(fn), label=b'grep.filename')
3483
3483
3484 cols = [
3484 cols = [
3485 (b'rev', b'%d', rev, not plaingrep, b''),
3485 (b'rev', b'%d', rev, not plaingrep, b''),
3486 (
3486 (
3487 b'linenumber',
3487 b'linenumber',
3488 b'%d',
3488 b'%d',
3489 l.linenum,
3489 l.linenum,
3490 opts.get(b'line_number'),
3490 opts.get(b'line_number'),
3491 b'',
3491 b'',
3492 ),
3492 ),
3493 ]
3493 ]
3494 if diff:
3494 if diff:
3495 cols.append(
3495 cols.append(
3496 (
3496 (
3497 b'change',
3497 b'change',
3498 b'%s',
3498 b'%s',
3499 change,
3499 change,
3500 True,
3500 True,
3501 b'grep.inserted '
3501 b'grep.inserted '
3502 if change == b'+'
3502 if change == b'+'
3503 else b'grep.deleted ',
3503 else b'grep.deleted ',
3504 )
3504 )
3505 )
3505 )
3506 cols.extend(
3506 cols.extend(
3507 [
3507 [
3508 (
3508 (
3509 b'user',
3509 b'user',
3510 b'%s',
3510 b'%s',
3511 formatuser(ctx.user()),
3511 formatuser(ctx.user()),
3512 opts.get(b'user'),
3512 opts.get(b'user'),
3513 b'',
3513 b'',
3514 ),
3514 ),
3515 (
3515 (
3516 b'date',
3516 b'date',
3517 b'%s',
3517 b'%s',
3518 fm.formatdate(ctx.date(), datefmt),
3518 fm.formatdate(ctx.date(), datefmt),
3519 opts.get(b'date'),
3519 opts.get(b'date'),
3520 b'',
3520 b'',
3521 ),
3521 ),
3522 ]
3522 ]
3523 )
3523 )
3524 for name, fmt, data, cond, extra_label in cols:
3524 for name, fmt, data, cond, extra_label in cols:
3525 if cond:
3525 if cond:
3526 fm.plain(sep, label=b'grep.sep')
3526 fm.plain(sep, label=b'grep.sep')
3527 field = fieldnamemap.get(name, name)
3527 field = fieldnamemap.get(name, name)
3528 label = extra_label + (b'grep.%s' % name)
3528 label = extra_label + (b'grep.%s' % name)
3529 fm.condwrite(cond, field, fmt, data, label=label)
3529 fm.condwrite(cond, field, fmt, data, label=label)
3530 if not opts.get(b'files_with_matches'):
3530 if not opts.get(b'files_with_matches'):
3531 fm.plain(sep, label=b'grep.sep')
3531 fm.plain(sep, label=b'grep.sep')
3532 if not opts.get(b'text') and binary():
3532 if not opts.get(b'text') and binary():
3533 fm.plain(_(b" Binary file matches"))
3533 fm.plain(_(b" Binary file matches"))
3534 else:
3534 else:
3535 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3535 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3536 fm.plain(eol)
3536 fm.plain(eol)
3537 found = True
3537 found = True
3538 if opts.get(b'files_with_matches'):
3538 if opts.get(b'files_with_matches'):
3539 break
3539 break
3540 return found
3540 return found
3541
3541
3542 def displaymatches(fm, l):
3542 def displaymatches(fm, l):
3543 p = 0
3543 p = 0
3544 for s, e in l.findpos():
3544 for s, e in l.findpos():
3545 if p < s:
3545 if p < s:
3546 fm.startitem()
3546 fm.startitem()
3547 fm.write(b'text', b'%s', l.line[p:s])
3547 fm.write(b'text', b'%s', l.line[p:s])
3548 fm.data(matched=False)
3548 fm.data(matched=False)
3549 fm.startitem()
3549 fm.startitem()
3550 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3550 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3551 fm.data(matched=True)
3551 fm.data(matched=True)
3552 p = e
3552 p = e
3553 if p < len(l.line):
3553 if p < len(l.line):
3554 fm.startitem()
3554 fm.startitem()
3555 fm.write(b'text', b'%s', l.line[p:])
3555 fm.write(b'text', b'%s', l.line[p:])
3556 fm.data(matched=False)
3556 fm.data(matched=False)
3557 fm.end()
3557 fm.end()
3558
3558
3559 skip = set()
3559 skip = set()
3560 revfiles = {}
3560 revfiles = {}
3561 match = scmutil.match(repo[None], pats, opts)
3561 match = scmutil.match(repo[None], pats, opts)
3562 found = False
3562 found = False
3563 follow = opts.get(b'follow')
3563 follow = opts.get(b'follow')
3564
3564
3565 getrenamed = scmutil.getrenamedfn(repo)
3565 getrenamed = scmutil.getrenamedfn(repo)
3566
3566
3567 def get_file_content(filename, filelog, filenode, context, revision):
3567 def get_file_content(filename, filelog, filenode, context, revision):
3568 try:
3568 try:
3569 content = filelog.read(filenode)
3569 content = filelog.read(filenode)
3570 except error.WdirUnsupported:
3570 except error.WdirUnsupported:
3571 content = context[filename].data()
3571 content = context[filename].data()
3572 except error.CensoredNodeError:
3572 except error.CensoredNodeError:
3573 content = None
3573 content = None
3574 ui.warn(
3574 ui.warn(
3575 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3575 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3576 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3576 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3577 )
3577 )
3578 return content
3578 return content
3579
3579
3580 def prep(ctx, fns):
3580 def prep(ctx, fns):
3581 rev = ctx.rev()
3581 rev = ctx.rev()
3582 pctx = ctx.p1()
3582 pctx = ctx.p1()
3583 parent = pctx.rev()
3583 parent = pctx.rev()
3584 matches.setdefault(rev, {})
3584 matches.setdefault(rev, {})
3585 matches.setdefault(parent, {})
3585 matches.setdefault(parent, {})
3586 files = revfiles.setdefault(rev, [])
3586 files = revfiles.setdefault(rev, [])
3587 for fn in fns:
3587 for fn in fns:
3588 flog = getfile(fn)
3588 flog = getfile(fn)
3589 try:
3589 try:
3590 fnode = ctx.filenode(fn)
3590 fnode = ctx.filenode(fn)
3591 except error.LookupError:
3591 except error.LookupError:
3592 continue
3592 continue
3593
3593
3594 copy = None
3594 copy = None
3595 if follow:
3595 if follow:
3596 copy = getrenamed(fn, rev)
3596 copy = getrenamed(fn, rev)
3597 if copy:
3597 if copy:
3598 copies.setdefault(rev, {})[fn] = copy
3598 copies.setdefault(rev, {})[fn] = copy
3599 if fn in skip:
3599 if fn in skip:
3600 skip.add(copy)
3600 skip.add(copy)
3601 if fn in skip:
3601 if fn in skip:
3602 continue
3602 continue
3603 files.append(fn)
3603 files.append(fn)
3604
3604
3605 if fn not in matches[rev]:
3605 if fn not in matches[rev]:
3606 content = get_file_content(fn, flog, fnode, ctx, rev)
3606 content = get_file_content(fn, flog, fnode, ctx, rev)
3607 grepbody(fn, rev, content)
3607 grepbody(fn, rev, content)
3608
3608
3609 pfn = copy or fn
3609 pfn = copy or fn
3610 if pfn not in matches[parent]:
3610 if pfn not in matches[parent]:
3611 try:
3611 try:
3612 pfnode = pctx.filenode(pfn)
3612 pfnode = pctx.filenode(pfn)
3613 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3613 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3614 grepbody(pfn, parent, pcontent)
3614 grepbody(pfn, parent, pcontent)
3615 except error.LookupError:
3615 except error.LookupError:
3616 pass
3616 pass
3617
3617
3618 ui.pager(b'grep')
3618 ui.pager(b'grep')
3619 fm = ui.formatter(b'grep', opts)
3619 fm = ui.formatter(b'grep', opts)
3620 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3620 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3621 rev = ctx.rev()
3621 rev = ctx.rev()
3622 parent = ctx.p1().rev()
3622 parent = ctx.p1().rev()
3623 for fn in sorted(revfiles.get(rev, [])):
3623 for fn in sorted(revfiles.get(rev, [])):
3624 states = matches[rev][fn]
3624 states = matches[rev][fn]
3625 copy = copies.get(rev, {}).get(fn)
3625 copy = copies.get(rev, {}).get(fn)
3626 if fn in skip:
3626 if fn in skip:
3627 if copy:
3627 if copy:
3628 skip.add(copy)
3628 skip.add(copy)
3629 continue
3629 continue
3630 pstates = matches.get(parent, {}).get(copy or fn, [])
3630 pstates = matches.get(parent, {}).get(copy or fn, [])
3631 if pstates or states:
3631 if pstates or states:
3632 r = display(fm, fn, ctx, pstates, states)
3632 r = display(fm, fn, ctx, pstates, states)
3633 found = found or r
3633 found = found or r
3634 if r and not diff and not all_files:
3634 if r and not diff and not all_files:
3635 skip.add(fn)
3635 skip.add(fn)
3636 if copy:
3636 if copy:
3637 skip.add(copy)
3637 skip.add(copy)
3638 del revfiles[rev]
3638 del revfiles[rev]
3639 # We will keep the matches dict for the duration of the window
3639 # We will keep the matches dict for the duration of the window
3640 # clear the matches dict once the window is over
3640 # clear the matches dict once the window is over
3641 if not revfiles:
3641 if not revfiles:
3642 matches.clear()
3642 matches.clear()
3643 fm.end()
3643 fm.end()
3644
3644
3645 return not found
3645 return not found
3646
3646
3647
3647
3648 @command(
3648 @command(
3649 b'heads',
3649 b'heads',
3650 [
3650 [
3651 (
3651 (
3652 b'r',
3652 b'r',
3653 b'rev',
3653 b'rev',
3654 b'',
3654 b'',
3655 _(b'show only heads which are descendants of STARTREV'),
3655 _(b'show only heads which are descendants of STARTREV'),
3656 _(b'STARTREV'),
3656 _(b'STARTREV'),
3657 ),
3657 ),
3658 (b't', b'topo', False, _(b'show topological heads only')),
3658 (b't', b'topo', False, _(b'show topological heads only')),
3659 (
3659 (
3660 b'a',
3660 b'a',
3661 b'active',
3661 b'active',
3662 False,
3662 False,
3663 _(b'show active branchheads only (DEPRECATED)'),
3663 _(b'show active branchheads only (DEPRECATED)'),
3664 ),
3664 ),
3665 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3665 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3666 ]
3666 ]
3667 + templateopts,
3667 + templateopts,
3668 _(b'[-ct] [-r STARTREV] [REV]...'),
3668 _(b'[-ct] [-r STARTREV] [REV]...'),
3669 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3669 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3670 intents={INTENT_READONLY},
3670 intents={INTENT_READONLY},
3671 )
3671 )
3672 def heads(ui, repo, *branchrevs, **opts):
3672 def heads(ui, repo, *branchrevs, **opts):
3673 """show branch heads
3673 """show branch heads
3674
3674
3675 With no arguments, show all open branch heads in the repository.
3675 With no arguments, show all open branch heads in the repository.
3676 Branch heads are changesets that have no descendants on the
3676 Branch heads are changesets that have no descendants on the
3677 same branch. They are where development generally takes place and
3677 same branch. They are where development generally takes place and
3678 are the usual targets for update and merge operations.
3678 are the usual targets for update and merge operations.
3679
3679
3680 If one or more REVs are given, only open branch heads on the
3680 If one or more REVs are given, only open branch heads on the
3681 branches associated with the specified changesets are shown. This
3681 branches associated with the specified changesets are shown. This
3682 means that you can use :hg:`heads .` to see the heads on the
3682 means that you can use :hg:`heads .` to see the heads on the
3683 currently checked-out branch.
3683 currently checked-out branch.
3684
3684
3685 If -c/--closed is specified, also show branch heads marked closed
3685 If -c/--closed is specified, also show branch heads marked closed
3686 (see :hg:`commit --close-branch`).
3686 (see :hg:`commit --close-branch`).
3687
3687
3688 If STARTREV is specified, only those heads that are descendants of
3688 If STARTREV is specified, only those heads that are descendants of
3689 STARTREV will be displayed.
3689 STARTREV will be displayed.
3690
3690
3691 If -t/--topo is specified, named branch mechanics will be ignored and only
3691 If -t/--topo is specified, named branch mechanics will be ignored and only
3692 topological heads (changesets with no children) will be shown.
3692 topological heads (changesets with no children) will be shown.
3693
3693
3694 Returns 0 if matching heads are found, 1 if not.
3694 Returns 0 if matching heads are found, 1 if not.
3695 """
3695 """
3696
3696
3697 opts = pycompat.byteskwargs(opts)
3697 opts = pycompat.byteskwargs(opts)
3698 start = None
3698 start = None
3699 rev = opts.get(b'rev')
3699 rev = opts.get(b'rev')
3700 if rev:
3700 if rev:
3701 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3701 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3702 start = scmutil.revsingle(repo, rev, None).node()
3702 start = scmutil.revsingle(repo, rev, None).node()
3703
3703
3704 if opts.get(b'topo'):
3704 if opts.get(b'topo'):
3705 heads = [repo[h] for h in repo.heads(start)]
3705 heads = [repo[h] for h in repo.heads(start)]
3706 else:
3706 else:
3707 heads = []
3707 heads = []
3708 for branch in repo.branchmap():
3708 for branch in repo.branchmap():
3709 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3709 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3710 heads = [repo[h] for h in heads]
3710 heads = [repo[h] for h in heads]
3711
3711
3712 if branchrevs:
3712 if branchrevs:
3713 branches = set(
3713 branches = set(
3714 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3714 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3715 )
3715 )
3716 heads = [h for h in heads if h.branch() in branches]
3716 heads = [h for h in heads if h.branch() in branches]
3717
3717
3718 if opts.get(b'active') and branchrevs:
3718 if opts.get(b'active') and branchrevs:
3719 dagheads = repo.heads(start)
3719 dagheads = repo.heads(start)
3720 heads = [h for h in heads if h.node() in dagheads]
3720 heads = [h for h in heads if h.node() in dagheads]
3721
3721
3722 if branchrevs:
3722 if branchrevs:
3723 haveheads = set(h.branch() for h in heads)
3723 haveheads = set(h.branch() for h in heads)
3724 if branches - haveheads:
3724 if branches - haveheads:
3725 headless = b', '.join(b for b in branches - haveheads)
3725 headless = b', '.join(b for b in branches - haveheads)
3726 msg = _(b'no open branch heads found on branches %s')
3726 msg = _(b'no open branch heads found on branches %s')
3727 if opts.get(b'rev'):
3727 if opts.get(b'rev'):
3728 msg += _(b' (started at %s)') % opts[b'rev']
3728 msg += _(b' (started at %s)') % opts[b'rev']
3729 ui.warn((msg + b'\n') % headless)
3729 ui.warn((msg + b'\n') % headless)
3730
3730
3731 if not heads:
3731 if not heads:
3732 return 1
3732 return 1
3733
3733
3734 ui.pager(b'heads')
3734 ui.pager(b'heads')
3735 heads = sorted(heads, key=lambda x: -(x.rev()))
3735 heads = sorted(heads, key=lambda x: -(x.rev()))
3736 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3736 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3737 for ctx in heads:
3737 for ctx in heads:
3738 displayer.show(ctx)
3738 displayer.show(ctx)
3739 displayer.close()
3739 displayer.close()
3740
3740
3741
3741
3742 @command(
3742 @command(
3743 b'help',
3743 b'help',
3744 [
3744 [
3745 (b'e', b'extension', None, _(b'show only help for extensions')),
3745 (b'e', b'extension', None, _(b'show only help for extensions')),
3746 (b'c', b'command', None, _(b'show only help for commands')),
3746 (b'c', b'command', None, _(b'show only help for commands')),
3747 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3747 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3748 (
3748 (
3749 b's',
3749 b's',
3750 b'system',
3750 b'system',
3751 [],
3751 [],
3752 _(b'show help for specific platform(s)'),
3752 _(b'show help for specific platform(s)'),
3753 _(b'PLATFORM'),
3753 _(b'PLATFORM'),
3754 ),
3754 ),
3755 ],
3755 ],
3756 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3756 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3757 helpcategory=command.CATEGORY_HELP,
3757 helpcategory=command.CATEGORY_HELP,
3758 norepo=True,
3758 norepo=True,
3759 intents={INTENT_READONLY},
3759 intents={INTENT_READONLY},
3760 )
3760 )
3761 def help_(ui, name=None, **opts):
3761 def help_(ui, name=None, **opts):
3762 """show help for a given topic or a help overview
3762 """show help for a given topic or a help overview
3763
3763
3764 With no arguments, print a list of commands with short help messages.
3764 With no arguments, print a list of commands with short help messages.
3765
3765
3766 Given a topic, extension, or command name, print help for that
3766 Given a topic, extension, or command name, print help for that
3767 topic.
3767 topic.
3768
3768
3769 Returns 0 if successful.
3769 Returns 0 if successful.
3770 """
3770 """
3771
3771
3772 keep = opts.get('system') or []
3772 keep = opts.get('system') or []
3773 if len(keep) == 0:
3773 if len(keep) == 0:
3774 if pycompat.sysplatform.startswith(b'win'):
3774 if pycompat.sysplatform.startswith(b'win'):
3775 keep.append(b'windows')
3775 keep.append(b'windows')
3776 elif pycompat.sysplatform == b'OpenVMS':
3776 elif pycompat.sysplatform == b'OpenVMS':
3777 keep.append(b'vms')
3777 keep.append(b'vms')
3778 elif pycompat.sysplatform == b'plan9':
3778 elif pycompat.sysplatform == b'plan9':
3779 keep.append(b'plan9')
3779 keep.append(b'plan9')
3780 else:
3780 else:
3781 keep.append(b'unix')
3781 keep.append(b'unix')
3782 keep.append(pycompat.sysplatform.lower())
3782 keep.append(pycompat.sysplatform.lower())
3783 if ui.verbose:
3783 if ui.verbose:
3784 keep.append(b'verbose')
3784 keep.append(b'verbose')
3785
3785
3786 commands = sys.modules[__name__]
3786 commands = sys.modules[__name__]
3787 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3787 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3788 ui.pager(b'help')
3788 ui.pager(b'help')
3789 ui.write(formatted)
3789 ui.write(formatted)
3790
3790
3791
3791
3792 @command(
3792 @command(
3793 b'identify|id',
3793 b'identify|id',
3794 [
3794 [
3795 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3795 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3796 (b'n', b'num', None, _(b'show local revision number')),
3796 (b'n', b'num', None, _(b'show local revision number')),
3797 (b'i', b'id', None, _(b'show global revision id')),
3797 (b'i', b'id', None, _(b'show global revision id')),
3798 (b'b', b'branch', None, _(b'show branch')),
3798 (b'b', b'branch', None, _(b'show branch')),
3799 (b't', b'tags', None, _(b'show tags')),
3799 (b't', b'tags', None, _(b'show tags')),
3800 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3800 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3801 ]
3801 ]
3802 + remoteopts
3802 + remoteopts
3803 + formatteropts,
3803 + formatteropts,
3804 _(b'[-nibtB] [-r REV] [SOURCE]'),
3804 _(b'[-nibtB] [-r REV] [SOURCE]'),
3805 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3805 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3806 optionalrepo=True,
3806 optionalrepo=True,
3807 intents={INTENT_READONLY},
3807 intents={INTENT_READONLY},
3808 )
3808 )
3809 def identify(
3809 def identify(
3810 ui,
3810 ui,
3811 repo,
3811 repo,
3812 source=None,
3812 source=None,
3813 rev=None,
3813 rev=None,
3814 num=None,
3814 num=None,
3815 id=None,
3815 id=None,
3816 branch=None,
3816 branch=None,
3817 tags=None,
3817 tags=None,
3818 bookmarks=None,
3818 bookmarks=None,
3819 **opts
3819 **opts
3820 ):
3820 ):
3821 """identify the working directory or specified revision
3821 """identify the working directory or specified revision
3822
3822
3823 Print a summary identifying the repository state at REV using one or
3823 Print a summary identifying the repository state at REV using one or
3824 two parent hash identifiers, followed by a "+" if the working
3824 two parent hash identifiers, followed by a "+" if the working
3825 directory has uncommitted changes, the branch name (if not default),
3825 directory has uncommitted changes, the branch name (if not default),
3826 a list of tags, and a list of bookmarks.
3826 a list of tags, and a list of bookmarks.
3827
3827
3828 When REV is not given, print a summary of the current state of the
3828 When REV is not given, print a summary of the current state of the
3829 repository including the working directory. Specify -r. to get information
3829 repository including the working directory. Specify -r. to get information
3830 of the working directory parent without scanning uncommitted changes.
3830 of the working directory parent without scanning uncommitted changes.
3831
3831
3832 Specifying a path to a repository root or Mercurial bundle will
3832 Specifying a path to a repository root or Mercurial bundle will
3833 cause lookup to operate on that repository/bundle.
3833 cause lookup to operate on that repository/bundle.
3834
3834
3835 .. container:: verbose
3835 .. container:: verbose
3836
3836
3837 Template:
3837 Template:
3838
3838
3839 The following keywords are supported in addition to the common template
3839 The following keywords are supported in addition to the common template
3840 keywords and functions. See also :hg:`help templates`.
3840 keywords and functions. See also :hg:`help templates`.
3841
3841
3842 :dirty: String. Character ``+`` denoting if the working directory has
3842 :dirty: String. Character ``+`` denoting if the working directory has
3843 uncommitted changes.
3843 uncommitted changes.
3844 :id: String. One or two nodes, optionally followed by ``+``.
3844 :id: String. One or two nodes, optionally followed by ``+``.
3845 :parents: List of strings. Parent nodes of the changeset.
3845 :parents: List of strings. Parent nodes of the changeset.
3846
3846
3847 Examples:
3847 Examples:
3848
3848
3849 - generate a build identifier for the working directory::
3849 - generate a build identifier for the working directory::
3850
3850
3851 hg id --id > build-id.dat
3851 hg id --id > build-id.dat
3852
3852
3853 - find the revision corresponding to a tag::
3853 - find the revision corresponding to a tag::
3854
3854
3855 hg id -n -r 1.3
3855 hg id -n -r 1.3
3856
3856
3857 - check the most recent revision of a remote repository::
3857 - check the most recent revision of a remote repository::
3858
3858
3859 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3859 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3860
3860
3861 See :hg:`log` for generating more information about specific revisions,
3861 See :hg:`log` for generating more information about specific revisions,
3862 including full hash identifiers.
3862 including full hash identifiers.
3863
3863
3864 Returns 0 if successful.
3864 Returns 0 if successful.
3865 """
3865 """
3866
3866
3867 opts = pycompat.byteskwargs(opts)
3867 opts = pycompat.byteskwargs(opts)
3868 if not repo and not source:
3868 if not repo and not source:
3869 raise error.Abort(
3869 raise error.Abort(
3870 _(b"there is no Mercurial repository here (.hg not found)")
3870 _(b"there is no Mercurial repository here (.hg not found)")
3871 )
3871 )
3872
3872
3873 default = not (num or id or branch or tags or bookmarks)
3873 default = not (num or id or branch or tags or bookmarks)
3874 output = []
3874 output = []
3875 revs = []
3875 revs = []
3876
3876
3877 if source:
3877 if source:
3878 source, branches = hg.parseurl(ui.expandpath(source))
3878 source, branches = hg.parseurl(ui.expandpath(source))
3879 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3879 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3880 repo = peer.local()
3880 repo = peer.local()
3881 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3881 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3882
3882
3883 fm = ui.formatter(b'identify', opts)
3883 fm = ui.formatter(b'identify', opts)
3884 fm.startitem()
3884 fm.startitem()
3885
3885
3886 if not repo:
3886 if not repo:
3887 if num or branch or tags:
3887 if num or branch or tags:
3888 raise error.Abort(
3888 raise error.Abort(
3889 _(b"can't query remote revision number, branch, or tags")
3889 _(b"can't query remote revision number, branch, or tags")
3890 )
3890 )
3891 if not rev and revs:
3891 if not rev and revs:
3892 rev = revs[0]
3892 rev = revs[0]
3893 if not rev:
3893 if not rev:
3894 rev = b"tip"
3894 rev = b"tip"
3895
3895
3896 remoterev = peer.lookup(rev)
3896 remoterev = peer.lookup(rev)
3897 hexrev = fm.hexfunc(remoterev)
3897 hexrev = fm.hexfunc(remoterev)
3898 if default or id:
3898 if default or id:
3899 output = [hexrev]
3899 output = [hexrev]
3900 fm.data(id=hexrev)
3900 fm.data(id=hexrev)
3901
3901
3902 @util.cachefunc
3902 @util.cachefunc
3903 def getbms():
3903 def getbms():
3904 bms = []
3904 bms = []
3905
3905
3906 if b'bookmarks' in peer.listkeys(b'namespaces'):
3906 if b'bookmarks' in peer.listkeys(b'namespaces'):
3907 hexremoterev = hex(remoterev)
3907 hexremoterev = hex(remoterev)
3908 bms = [
3908 bms = [
3909 bm
3909 bm
3910 for bm, bmr in pycompat.iteritems(
3910 for bm, bmr in pycompat.iteritems(
3911 peer.listkeys(b'bookmarks')
3911 peer.listkeys(b'bookmarks')
3912 )
3912 )
3913 if bmr == hexremoterev
3913 if bmr == hexremoterev
3914 ]
3914 ]
3915
3915
3916 return sorted(bms)
3916 return sorted(bms)
3917
3917
3918 if fm.isplain():
3918 if fm.isplain():
3919 if bookmarks:
3919 if bookmarks:
3920 output.extend(getbms())
3920 output.extend(getbms())
3921 elif default and not ui.quiet:
3921 elif default and not ui.quiet:
3922 # multiple bookmarks for a single parent separated by '/'
3922 # multiple bookmarks for a single parent separated by '/'
3923 bm = b'/'.join(getbms())
3923 bm = b'/'.join(getbms())
3924 if bm:
3924 if bm:
3925 output.append(bm)
3925 output.append(bm)
3926 else:
3926 else:
3927 fm.data(node=hex(remoterev))
3927 fm.data(node=hex(remoterev))
3928 if bookmarks or b'bookmarks' in fm.datahint():
3928 if bookmarks or b'bookmarks' in fm.datahint():
3929 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3929 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3930 else:
3930 else:
3931 if rev:
3931 if rev:
3932 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3932 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3933 ctx = scmutil.revsingle(repo, rev, None)
3933 ctx = scmutil.revsingle(repo, rev, None)
3934
3934
3935 if ctx.rev() is None:
3935 if ctx.rev() is None:
3936 ctx = repo[None]
3936 ctx = repo[None]
3937 parents = ctx.parents()
3937 parents = ctx.parents()
3938 taglist = []
3938 taglist = []
3939 for p in parents:
3939 for p in parents:
3940 taglist.extend(p.tags())
3940 taglist.extend(p.tags())
3941
3941
3942 dirty = b""
3942 dirty = b""
3943 if ctx.dirty(missing=True, merge=False, branch=False):
3943 if ctx.dirty(missing=True, merge=False, branch=False):
3944 dirty = b'+'
3944 dirty = b'+'
3945 fm.data(dirty=dirty)
3945 fm.data(dirty=dirty)
3946
3946
3947 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3947 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3948 if default or id:
3948 if default or id:
3949 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3949 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3950 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3950 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3951
3951
3952 if num:
3952 if num:
3953 numoutput = [b"%d" % p.rev() for p in parents]
3953 numoutput = [b"%d" % p.rev() for p in parents]
3954 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3954 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3955
3955
3956 fm.data(
3956 fm.data(
3957 parents=fm.formatlist(
3957 parents=fm.formatlist(
3958 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3958 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3959 )
3959 )
3960 )
3960 )
3961 else:
3961 else:
3962 hexoutput = fm.hexfunc(ctx.node())
3962 hexoutput = fm.hexfunc(ctx.node())
3963 if default or id:
3963 if default or id:
3964 output = [hexoutput]
3964 output = [hexoutput]
3965 fm.data(id=hexoutput)
3965 fm.data(id=hexoutput)
3966
3966
3967 if num:
3967 if num:
3968 output.append(pycompat.bytestr(ctx.rev()))
3968 output.append(pycompat.bytestr(ctx.rev()))
3969 taglist = ctx.tags()
3969 taglist = ctx.tags()
3970
3970
3971 if default and not ui.quiet:
3971 if default and not ui.quiet:
3972 b = ctx.branch()
3972 b = ctx.branch()
3973 if b != b'default':
3973 if b != b'default':
3974 output.append(b"(%s)" % b)
3974 output.append(b"(%s)" % b)
3975
3975
3976 # multiple tags for a single parent separated by '/'
3976 # multiple tags for a single parent separated by '/'
3977 t = b'/'.join(taglist)
3977 t = b'/'.join(taglist)
3978 if t:
3978 if t:
3979 output.append(t)
3979 output.append(t)
3980
3980
3981 # multiple bookmarks for a single parent separated by '/'
3981 # multiple bookmarks for a single parent separated by '/'
3982 bm = b'/'.join(ctx.bookmarks())
3982 bm = b'/'.join(ctx.bookmarks())
3983 if bm:
3983 if bm:
3984 output.append(bm)
3984 output.append(bm)
3985 else:
3985 else:
3986 if branch:
3986 if branch:
3987 output.append(ctx.branch())
3987 output.append(ctx.branch())
3988
3988
3989 if tags:
3989 if tags:
3990 output.extend(taglist)
3990 output.extend(taglist)
3991
3991
3992 if bookmarks:
3992 if bookmarks:
3993 output.extend(ctx.bookmarks())
3993 output.extend(ctx.bookmarks())
3994
3994
3995 fm.data(node=ctx.hex())
3995 fm.data(node=ctx.hex())
3996 fm.data(branch=ctx.branch())
3996 fm.data(branch=ctx.branch())
3997 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3997 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3998 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3998 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3999 fm.context(ctx=ctx)
3999 fm.context(ctx=ctx)
4000
4000
4001 fm.plain(b"%s\n" % b' '.join(output))
4001 fm.plain(b"%s\n" % b' '.join(output))
4002 fm.end()
4002 fm.end()
4003
4003
4004
4004
4005 @command(
4005 @command(
4006 b'import|patch',
4006 b'import|patch',
4007 [
4007 [
4008 (
4008 (
4009 b'p',
4009 b'p',
4010 b'strip',
4010 b'strip',
4011 1,
4011 1,
4012 _(
4012 _(
4013 b'directory strip option for patch. This has the same '
4013 b'directory strip option for patch. This has the same '
4014 b'meaning as the corresponding patch option'
4014 b'meaning as the corresponding patch option'
4015 ),
4015 ),
4016 _(b'NUM'),
4016 _(b'NUM'),
4017 ),
4017 ),
4018 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4018 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4019 (b'', b'secret', None, _(b'use the secret phase for committing')),
4019 (b'', b'secret', None, _(b'use the secret phase for committing')),
4020 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4020 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4021 (
4021 (
4022 b'f',
4022 b'f',
4023 b'force',
4023 b'force',
4024 None,
4024 None,
4025 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4025 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4026 ),
4026 ),
4027 (
4027 (
4028 b'',
4028 b'',
4029 b'no-commit',
4029 b'no-commit',
4030 None,
4030 None,
4031 _(b"don't commit, just update the working directory"),
4031 _(b"don't commit, just update the working directory"),
4032 ),
4032 ),
4033 (
4033 (
4034 b'',
4034 b'',
4035 b'bypass',
4035 b'bypass',
4036 None,
4036 None,
4037 _(b"apply patch without touching the working directory"),
4037 _(b"apply patch without touching the working directory"),
4038 ),
4038 ),
4039 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4039 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4040 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4040 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4041 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4041 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4042 (
4042 (
4043 b'',
4043 b'',
4044 b'import-branch',
4044 b'import-branch',
4045 None,
4045 None,
4046 _(b'use any branch information in patch (implied by --exact)'),
4046 _(b'use any branch information in patch (implied by --exact)'),
4047 ),
4047 ),
4048 ]
4048 ]
4049 + commitopts
4049 + commitopts
4050 + commitopts2
4050 + commitopts2
4051 + similarityopts,
4051 + similarityopts,
4052 _(b'[OPTION]... PATCH...'),
4052 _(b'[OPTION]... PATCH...'),
4053 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4053 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4054 )
4054 )
4055 def import_(ui, repo, patch1=None, *patches, **opts):
4055 def import_(ui, repo, patch1=None, *patches, **opts):
4056 """import an ordered set of patches
4056 """import an ordered set of patches
4057
4057
4058 Import a list of patches and commit them individually (unless
4058 Import a list of patches and commit them individually (unless
4059 --no-commit is specified).
4059 --no-commit is specified).
4060
4060
4061 To read a patch from standard input (stdin), use "-" as the patch
4061 To read a patch from standard input (stdin), use "-" as the patch
4062 name. If a URL is specified, the patch will be downloaded from
4062 name. If a URL is specified, the patch will be downloaded from
4063 there.
4063 there.
4064
4064
4065 Import first applies changes to the working directory (unless
4065 Import first applies changes to the working directory (unless
4066 --bypass is specified), import will abort if there are outstanding
4066 --bypass is specified), import will abort if there are outstanding
4067 changes.
4067 changes.
4068
4068
4069 Use --bypass to apply and commit patches directly to the
4069 Use --bypass to apply and commit patches directly to the
4070 repository, without affecting the working directory. Without
4070 repository, without affecting the working directory. Without
4071 --exact, patches will be applied on top of the working directory
4071 --exact, patches will be applied on top of the working directory
4072 parent revision.
4072 parent revision.
4073
4073
4074 You can import a patch straight from a mail message. Even patches
4074 You can import a patch straight from a mail message. Even patches
4075 as attachments work (to use the body part, it must have type
4075 as attachments work (to use the body part, it must have type
4076 text/plain or text/x-patch). From and Subject headers of email
4076 text/plain or text/x-patch). From and Subject headers of email
4077 message are used as default committer and commit message. All
4077 message are used as default committer and commit message. All
4078 text/plain body parts before first diff are added to the commit
4078 text/plain body parts before first diff are added to the commit
4079 message.
4079 message.
4080
4080
4081 If the imported patch was generated by :hg:`export`, user and
4081 If the imported patch was generated by :hg:`export`, user and
4082 description from patch override values from message headers and
4082 description from patch override values from message headers and
4083 body. Values given on command line with -m/--message and -u/--user
4083 body. Values given on command line with -m/--message and -u/--user
4084 override these.
4084 override these.
4085
4085
4086 If --exact is specified, import will set the working directory to
4086 If --exact is specified, import will set the working directory to
4087 the parent of each patch before applying it, and will abort if the
4087 the parent of each patch before applying it, and will abort if the
4088 resulting changeset has a different ID than the one recorded in
4088 resulting changeset has a different ID than the one recorded in
4089 the patch. This will guard against various ways that portable
4089 the patch. This will guard against various ways that portable
4090 patch formats and mail systems might fail to transfer Mercurial
4090 patch formats and mail systems might fail to transfer Mercurial
4091 data or metadata. See :hg:`bundle` for lossless transmission.
4091 data or metadata. See :hg:`bundle` for lossless transmission.
4092
4092
4093 Use --partial to ensure a changeset will be created from the patch
4093 Use --partial to ensure a changeset will be created from the patch
4094 even if some hunks fail to apply. Hunks that fail to apply will be
4094 even if some hunks fail to apply. Hunks that fail to apply will be
4095 written to a <target-file>.rej file. Conflicts can then be resolved
4095 written to a <target-file>.rej file. Conflicts can then be resolved
4096 by hand before :hg:`commit --amend` is run to update the created
4096 by hand before :hg:`commit --amend` is run to update the created
4097 changeset. This flag exists to let people import patches that
4097 changeset. This flag exists to let people import patches that
4098 partially apply without losing the associated metadata (author,
4098 partially apply without losing the associated metadata (author,
4099 date, description, ...).
4099 date, description, ...).
4100
4100
4101 .. note::
4101 .. note::
4102
4102
4103 When no hunks apply cleanly, :hg:`import --partial` will create
4103 When no hunks apply cleanly, :hg:`import --partial` will create
4104 an empty changeset, importing only the patch metadata.
4104 an empty changeset, importing only the patch metadata.
4105
4105
4106 With -s/--similarity, hg will attempt to discover renames and
4106 With -s/--similarity, hg will attempt to discover renames and
4107 copies in the patch in the same way as :hg:`addremove`.
4107 copies in the patch in the same way as :hg:`addremove`.
4108
4108
4109 It is possible to use external patch programs to perform the patch
4109 It is possible to use external patch programs to perform the patch
4110 by setting the ``ui.patch`` configuration option. For the default
4110 by setting the ``ui.patch`` configuration option. For the default
4111 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4111 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4112 See :hg:`help config` for more information about configuration
4112 See :hg:`help config` for more information about configuration
4113 files and how to use these options.
4113 files and how to use these options.
4114
4114
4115 See :hg:`help dates` for a list of formats valid for -d/--date.
4115 See :hg:`help dates` for a list of formats valid for -d/--date.
4116
4116
4117 .. container:: verbose
4117 .. container:: verbose
4118
4118
4119 Examples:
4119 Examples:
4120
4120
4121 - import a traditional patch from a website and detect renames::
4121 - import a traditional patch from a website and detect renames::
4122
4122
4123 hg import -s 80 http://example.com/bugfix.patch
4123 hg import -s 80 http://example.com/bugfix.patch
4124
4124
4125 - import a changeset from an hgweb server::
4125 - import a changeset from an hgweb server::
4126
4126
4127 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4127 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4128
4128
4129 - import all the patches in an Unix-style mbox::
4129 - import all the patches in an Unix-style mbox::
4130
4130
4131 hg import incoming-patches.mbox
4131 hg import incoming-patches.mbox
4132
4132
4133 - import patches from stdin::
4133 - import patches from stdin::
4134
4134
4135 hg import -
4135 hg import -
4136
4136
4137 - attempt to exactly restore an exported changeset (not always
4137 - attempt to exactly restore an exported changeset (not always
4138 possible)::
4138 possible)::
4139
4139
4140 hg import --exact proposed-fix.patch
4140 hg import --exact proposed-fix.patch
4141
4141
4142 - use an external tool to apply a patch which is too fuzzy for
4142 - use an external tool to apply a patch which is too fuzzy for
4143 the default internal tool.
4143 the default internal tool.
4144
4144
4145 hg import --config ui.patch="patch --merge" fuzzy.patch
4145 hg import --config ui.patch="patch --merge" fuzzy.patch
4146
4146
4147 - change the default fuzzing from 2 to a less strict 7
4147 - change the default fuzzing from 2 to a less strict 7
4148
4148
4149 hg import --config ui.fuzz=7 fuzz.patch
4149 hg import --config ui.fuzz=7 fuzz.patch
4150
4150
4151 Returns 0 on success, 1 on partial success (see --partial).
4151 Returns 0 on success, 1 on partial success (see --partial).
4152 """
4152 """
4153
4153
4154 opts = pycompat.byteskwargs(opts)
4154 opts = pycompat.byteskwargs(opts)
4155 if not patch1:
4155 if not patch1:
4156 raise error.Abort(_(b'need at least one patch to import'))
4156 raise error.Abort(_(b'need at least one patch to import'))
4157
4157
4158 patches = (patch1,) + patches
4158 patches = (patch1,) + patches
4159
4159
4160 date = opts.get(b'date')
4160 date = opts.get(b'date')
4161 if date:
4161 if date:
4162 opts[b'date'] = dateutil.parsedate(date)
4162 opts[b'date'] = dateutil.parsedate(date)
4163
4163
4164 exact = opts.get(b'exact')
4164 exact = opts.get(b'exact')
4165 update = not opts.get(b'bypass')
4165 update = not opts.get(b'bypass')
4166 if not update and opts.get(b'no_commit'):
4166 if not update and opts.get(b'no_commit'):
4167 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4167 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4168 if opts.get(b'secret') and opts.get(b'no_commit'):
4168 if opts.get(b'secret') and opts.get(b'no_commit'):
4169 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4169 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4170 try:
4170 try:
4171 sim = float(opts.get(b'similarity') or 0)
4171 sim = float(opts.get(b'similarity') or 0)
4172 except ValueError:
4172 except ValueError:
4173 raise error.Abort(_(b'similarity must be a number'))
4173 raise error.Abort(_(b'similarity must be a number'))
4174 if sim < 0 or sim > 100:
4174 if sim < 0 or sim > 100:
4175 raise error.Abort(_(b'similarity must be between 0 and 100'))
4175 raise error.Abort(_(b'similarity must be between 0 and 100'))
4176 if sim and not update:
4176 if sim and not update:
4177 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4177 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4178 if exact:
4178 if exact:
4179 if opts.get(b'edit'):
4179 if opts.get(b'edit'):
4180 raise error.Abort(_(b'cannot use --exact with --edit'))
4180 raise error.Abort(_(b'cannot use --exact with --edit'))
4181 if opts.get(b'prefix'):
4181 if opts.get(b'prefix'):
4182 raise error.Abort(_(b'cannot use --exact with --prefix'))
4182 raise error.Abort(_(b'cannot use --exact with --prefix'))
4183
4183
4184 base = opts[b"base"]
4184 base = opts[b"base"]
4185 msgs = []
4185 msgs = []
4186 ret = 0
4186 ret = 0
4187
4187
4188 with repo.wlock():
4188 with repo.wlock():
4189 if update:
4189 if update:
4190 cmdutil.checkunfinished(repo)
4190 cmdutil.checkunfinished(repo)
4191 if exact or not opts.get(b'force'):
4191 if exact or not opts.get(b'force'):
4192 cmdutil.bailifchanged(repo)
4192 cmdutil.bailifchanged(repo)
4193
4193
4194 if not opts.get(b'no_commit'):
4194 if not opts.get(b'no_commit'):
4195 lock = repo.lock
4195 lock = repo.lock
4196 tr = lambda: repo.transaction(b'import')
4196 tr = lambda: repo.transaction(b'import')
4197 dsguard = util.nullcontextmanager
4197 dsguard = util.nullcontextmanager
4198 else:
4198 else:
4199 lock = util.nullcontextmanager
4199 lock = util.nullcontextmanager
4200 tr = util.nullcontextmanager
4200 tr = util.nullcontextmanager
4201 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4201 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 with lock(), tr(), dsguard():
4202 with lock(), tr(), dsguard():
4203 parents = repo[None].parents()
4203 parents = repo[None].parents()
4204 for patchurl in patches:
4204 for patchurl in patches:
4205 if patchurl == b'-':
4205 if patchurl == b'-':
4206 ui.status(_(b'applying patch from stdin\n'))
4206 ui.status(_(b'applying patch from stdin\n'))
4207 patchfile = ui.fin
4207 patchfile = ui.fin
4208 patchurl = b'stdin' # for error message
4208 patchurl = b'stdin' # for error message
4209 else:
4209 else:
4210 patchurl = os.path.join(base, patchurl)
4210 patchurl = os.path.join(base, patchurl)
4211 ui.status(_(b'applying %s\n') % patchurl)
4211 ui.status(_(b'applying %s\n') % patchurl)
4212 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4212 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213
4213
4214 haspatch = False
4214 haspatch = False
4215 for hunk in patch.split(patchfile):
4215 for hunk in patch.split(patchfile):
4216 with patch.extract(ui, hunk) as patchdata:
4216 with patch.extract(ui, hunk) as patchdata:
4217 msg, node, rej = cmdutil.tryimportone(
4217 msg, node, rej = cmdutil.tryimportone(
4218 ui, repo, patchdata, parents, opts, msgs, hg.clean
4218 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 )
4219 )
4220 if msg:
4220 if msg:
4221 haspatch = True
4221 haspatch = True
4222 ui.note(msg + b'\n')
4222 ui.note(msg + b'\n')
4223 if update or exact:
4223 if update or exact:
4224 parents = repo[None].parents()
4224 parents = repo[None].parents()
4225 else:
4225 else:
4226 parents = [repo[node]]
4226 parents = [repo[node]]
4227 if rej:
4227 if rej:
4228 ui.write_err(_(b"patch applied partially\n"))
4228 ui.write_err(_(b"patch applied partially\n"))
4229 ui.write_err(
4229 ui.write_err(
4230 _(
4230 _(
4231 b"(fix the .rej files and run "
4231 b"(fix the .rej files and run "
4232 b"`hg commit --amend`)\n"
4232 b"`hg commit --amend`)\n"
4233 )
4233 )
4234 )
4234 )
4235 ret = 1
4235 ret = 1
4236 break
4236 break
4237
4237
4238 if not haspatch:
4238 if not haspatch:
4239 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4239 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4240
4240
4241 if msgs:
4241 if msgs:
4242 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4242 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 return ret
4243 return ret
4244
4244
4245
4245
4246 @command(
4246 @command(
4247 b'incoming|in',
4247 b'incoming|in',
4248 [
4248 [
4249 (
4249 (
4250 b'f',
4250 b'f',
4251 b'force',
4251 b'force',
4252 None,
4252 None,
4253 _(b'run even if remote repository is unrelated'),
4253 _(b'run even if remote repository is unrelated'),
4254 ),
4254 ),
4255 (b'n', b'newest-first', None, _(b'show newest record first')),
4255 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4256 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 (
4257 (
4258 b'r',
4258 b'r',
4259 b'rev',
4259 b'rev',
4260 [],
4260 [],
4261 _(b'a remote changeset intended to be added'),
4261 _(b'a remote changeset intended to be added'),
4262 _(b'REV'),
4262 _(b'REV'),
4263 ),
4263 ),
4264 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4264 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 (
4265 (
4266 b'b',
4266 b'b',
4267 b'branch',
4267 b'branch',
4268 [],
4268 [],
4269 _(b'a specific branch you would like to pull'),
4269 _(b'a specific branch you would like to pull'),
4270 _(b'BRANCH'),
4270 _(b'BRANCH'),
4271 ),
4271 ),
4272 ]
4272 ]
4273 + logopts
4273 + logopts
4274 + remoteopts
4274 + remoteopts
4275 + subrepoopts,
4275 + subrepoopts,
4276 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4276 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4277 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 )
4278 )
4279 def incoming(ui, repo, source=b"default", **opts):
4279 def incoming(ui, repo, source=b"default", **opts):
4280 """show new changesets found in source
4280 """show new changesets found in source
4281
4281
4282 Show new changesets found in the specified path/URL or the default
4282 Show new changesets found in the specified path/URL or the default
4283 pull location. These are the changesets that would have been pulled
4283 pull location. These are the changesets that would have been pulled
4284 by :hg:`pull` at the time you issued this command.
4284 by :hg:`pull` at the time you issued this command.
4285
4285
4286 See pull for valid source format details.
4286 See pull for valid source format details.
4287
4287
4288 .. container:: verbose
4288 .. container:: verbose
4289
4289
4290 With -B/--bookmarks, the result of bookmark comparison between
4290 With -B/--bookmarks, the result of bookmark comparison between
4291 local and remote repositories is displayed. With -v/--verbose,
4291 local and remote repositories is displayed. With -v/--verbose,
4292 status is also displayed for each bookmark like below::
4292 status is also displayed for each bookmark like below::
4293
4293
4294 BM1 01234567890a added
4294 BM1 01234567890a added
4295 BM2 1234567890ab advanced
4295 BM2 1234567890ab advanced
4296 BM3 234567890abc diverged
4296 BM3 234567890abc diverged
4297 BM4 34567890abcd changed
4297 BM4 34567890abcd changed
4298
4298
4299 The action taken locally when pulling depends on the
4299 The action taken locally when pulling depends on the
4300 status of each bookmark:
4300 status of each bookmark:
4301
4301
4302 :``added``: pull will create it
4302 :``added``: pull will create it
4303 :``advanced``: pull will update it
4303 :``advanced``: pull will update it
4304 :``diverged``: pull will create a divergent bookmark
4304 :``diverged``: pull will create a divergent bookmark
4305 :``changed``: result depends on remote changesets
4305 :``changed``: result depends on remote changesets
4306
4306
4307 From the point of view of pulling behavior, bookmark
4307 From the point of view of pulling behavior, bookmark
4308 existing only in the remote repository are treated as ``added``,
4308 existing only in the remote repository are treated as ``added``,
4309 even if it is in fact locally deleted.
4309 even if it is in fact locally deleted.
4310
4310
4311 .. container:: verbose
4311 .. container:: verbose
4312
4312
4313 For remote repository, using --bundle avoids downloading the
4313 For remote repository, using --bundle avoids downloading the
4314 changesets twice if the incoming is followed by a pull.
4314 changesets twice if the incoming is followed by a pull.
4315
4315
4316 Examples:
4316 Examples:
4317
4317
4318 - show incoming changes with patches and full description::
4318 - show incoming changes with patches and full description::
4319
4319
4320 hg incoming -vp
4320 hg incoming -vp
4321
4321
4322 - show incoming changes excluding merges, store a bundle::
4322 - show incoming changes excluding merges, store a bundle::
4323
4323
4324 hg in -vpM --bundle incoming.hg
4324 hg in -vpM --bundle incoming.hg
4325 hg pull incoming.hg
4325 hg pull incoming.hg
4326
4326
4327 - briefly list changes inside a bundle::
4327 - briefly list changes inside a bundle::
4328
4328
4329 hg in changes.hg -T "{desc|firstline}\\n"
4329 hg in changes.hg -T "{desc|firstline}\\n"
4330
4330
4331 Returns 0 if there are incoming changes, 1 otherwise.
4331 Returns 0 if there are incoming changes, 1 otherwise.
4332 """
4332 """
4333 opts = pycompat.byteskwargs(opts)
4333 opts = pycompat.byteskwargs(opts)
4334 if opts.get(b'graph'):
4334 if opts.get(b'graph'):
4335 logcmdutil.checkunsupportedgraphflags([], opts)
4335 logcmdutil.checkunsupportedgraphflags([], opts)
4336
4336
4337 def display(other, chlist, displayer):
4337 def display(other, chlist, displayer):
4338 revdag = logcmdutil.graphrevs(other, chlist, opts)
4338 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 logcmdutil.displaygraph(
4339 logcmdutil.displaygraph(
4340 ui, repo, revdag, displayer, graphmod.asciiedges
4340 ui, repo, revdag, displayer, graphmod.asciiedges
4341 )
4341 )
4342
4342
4343 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4343 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 return 0
4344 return 0
4345
4345
4346 if opts.get(b'bundle') and opts.get(b'subrepos'):
4346 if opts.get(b'bundle') and opts.get(b'subrepos'):
4347 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4347 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4348
4348
4349 if opts.get(b'bookmarks'):
4349 if opts.get(b'bookmarks'):
4350 source, branches = hg.parseurl(
4350 source, branches = hg.parseurl(
4351 ui.expandpath(source), opts.get(b'branch')
4351 ui.expandpath(source), opts.get(b'branch')
4352 )
4352 )
4353 other = hg.peer(repo, opts, source)
4353 other = hg.peer(repo, opts, source)
4354 if b'bookmarks' not in other.listkeys(b'namespaces'):
4354 if b'bookmarks' not in other.listkeys(b'namespaces'):
4355 ui.warn(_(b"remote doesn't support bookmarks\n"))
4355 ui.warn(_(b"remote doesn't support bookmarks\n"))
4356 return 0
4356 return 0
4357 ui.pager(b'incoming')
4357 ui.pager(b'incoming')
4358 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4358 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4359 return bookmarks.incoming(ui, repo, other)
4359 return bookmarks.incoming(ui, repo, other)
4360
4360
4361 repo._subtoppath = ui.expandpath(source)
4361 repo._subtoppath = ui.expandpath(source)
4362 try:
4362 try:
4363 return hg.incoming(ui, repo, source, opts)
4363 return hg.incoming(ui, repo, source, opts)
4364 finally:
4364 finally:
4365 del repo._subtoppath
4365 del repo._subtoppath
4366
4366
4367
4367
4368 @command(
4368 @command(
4369 b'init',
4369 b'init',
4370 remoteopts,
4370 remoteopts,
4371 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4371 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4372 helpcategory=command.CATEGORY_REPO_CREATION,
4372 helpcategory=command.CATEGORY_REPO_CREATION,
4373 helpbasic=True,
4373 helpbasic=True,
4374 norepo=True,
4374 norepo=True,
4375 )
4375 )
4376 def init(ui, dest=b".", **opts):
4376 def init(ui, dest=b".", **opts):
4377 """create a new repository in the given directory
4377 """create a new repository in the given directory
4378
4378
4379 Initialize a new repository in the given directory. If the given
4379 Initialize a new repository in the given directory. If the given
4380 directory does not exist, it will be created.
4380 directory does not exist, it will be created.
4381
4381
4382 If no directory is given, the current directory is used.
4382 If no directory is given, the current directory is used.
4383
4383
4384 It is possible to specify an ``ssh://`` URL as the destination.
4384 It is possible to specify an ``ssh://`` URL as the destination.
4385 See :hg:`help urls` for more information.
4385 See :hg:`help urls` for more information.
4386
4386
4387 Returns 0 on success.
4387 Returns 0 on success.
4388 """
4388 """
4389 opts = pycompat.byteskwargs(opts)
4389 opts = pycompat.byteskwargs(opts)
4390 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4390 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4391
4391
4392
4392
4393 @command(
4393 @command(
4394 b'locate',
4394 b'locate',
4395 [
4395 [
4396 (
4396 (
4397 b'r',
4397 b'r',
4398 b'rev',
4398 b'rev',
4399 b'',
4399 b'',
4400 _(b'search the repository as it is in REV'),
4400 _(b'search the repository as it is in REV'),
4401 _(b'REV'),
4401 _(b'REV'),
4402 ),
4402 ),
4403 (
4403 (
4404 b'0',
4404 b'0',
4405 b'print0',
4405 b'print0',
4406 None,
4406 None,
4407 _(b'end filenames with NUL, for use with xargs'),
4407 _(b'end filenames with NUL, for use with xargs'),
4408 ),
4408 ),
4409 (
4409 (
4410 b'f',
4410 b'f',
4411 b'fullpath',
4411 b'fullpath',
4412 None,
4412 None,
4413 _(b'print complete paths from the filesystem root'),
4413 _(b'print complete paths from the filesystem root'),
4414 ),
4414 ),
4415 ]
4415 ]
4416 + walkopts,
4416 + walkopts,
4417 _(b'[OPTION]... [PATTERN]...'),
4417 _(b'[OPTION]... [PATTERN]...'),
4418 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4418 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4419 )
4419 )
4420 def locate(ui, repo, *pats, **opts):
4420 def locate(ui, repo, *pats, **opts):
4421 """locate files matching specific patterns (DEPRECATED)
4421 """locate files matching specific patterns (DEPRECATED)
4422
4422
4423 Print files under Mercurial control in the working directory whose
4423 Print files under Mercurial control in the working directory whose
4424 names match the given patterns.
4424 names match the given patterns.
4425
4425
4426 By default, this command searches all directories in the working
4426 By default, this command searches all directories in the working
4427 directory. To search just the current directory and its
4427 directory. To search just the current directory and its
4428 subdirectories, use "--include .".
4428 subdirectories, use "--include .".
4429
4429
4430 If no patterns are given to match, this command prints the names
4430 If no patterns are given to match, this command prints the names
4431 of all files under Mercurial control in the working directory.
4431 of all files under Mercurial control in the working directory.
4432
4432
4433 If you want to feed the output of this command into the "xargs"
4433 If you want to feed the output of this command into the "xargs"
4434 command, use the -0 option to both this command and "xargs". This
4434 command, use the -0 option to both this command and "xargs". This
4435 will avoid the problem of "xargs" treating single filenames that
4435 will avoid the problem of "xargs" treating single filenames that
4436 contain whitespace as multiple filenames.
4436 contain whitespace as multiple filenames.
4437
4437
4438 See :hg:`help files` for a more versatile command.
4438 See :hg:`help files` for a more versatile command.
4439
4439
4440 Returns 0 if a match is found, 1 otherwise.
4440 Returns 0 if a match is found, 1 otherwise.
4441 """
4441 """
4442 opts = pycompat.byteskwargs(opts)
4442 opts = pycompat.byteskwargs(opts)
4443 if opts.get(b'print0'):
4443 if opts.get(b'print0'):
4444 end = b'\0'
4444 end = b'\0'
4445 else:
4445 else:
4446 end = b'\n'
4446 end = b'\n'
4447 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4447 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4448
4448
4449 ret = 1
4449 ret = 1
4450 m = scmutil.match(
4450 m = scmutil.match(
4451 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4451 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4452 )
4452 )
4453
4453
4454 ui.pager(b'locate')
4454 ui.pager(b'locate')
4455 if ctx.rev() is None:
4455 if ctx.rev() is None:
4456 # When run on the working copy, "locate" includes removed files, so
4456 # When run on the working copy, "locate" includes removed files, so
4457 # we get the list of files from the dirstate.
4457 # we get the list of files from the dirstate.
4458 filesgen = sorted(repo.dirstate.matches(m))
4458 filesgen = sorted(repo.dirstate.matches(m))
4459 else:
4459 else:
4460 filesgen = ctx.matches(m)
4460 filesgen = ctx.matches(m)
4461 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4461 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4462 for abs in filesgen:
4462 for abs in filesgen:
4463 if opts.get(b'fullpath'):
4463 if opts.get(b'fullpath'):
4464 ui.write(repo.wjoin(abs), end)
4464 ui.write(repo.wjoin(abs), end)
4465 else:
4465 else:
4466 ui.write(uipathfn(abs), end)
4466 ui.write(uipathfn(abs), end)
4467 ret = 0
4467 ret = 0
4468
4468
4469 return ret
4469 return ret
4470
4470
4471
4471
4472 @command(
4472 @command(
4473 b'log|history',
4473 b'log|history',
4474 [
4474 [
4475 (
4475 (
4476 b'f',
4476 b'f',
4477 b'follow',
4477 b'follow',
4478 None,
4478 None,
4479 _(
4479 _(
4480 b'follow changeset history, or file history across copies and renames'
4480 b'follow changeset history, or file history across copies and renames'
4481 ),
4481 ),
4482 ),
4482 ),
4483 (
4483 (
4484 b'',
4484 b'',
4485 b'follow-first',
4485 b'follow-first',
4486 None,
4486 None,
4487 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4487 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4488 ),
4488 ),
4489 (
4489 (
4490 b'd',
4490 b'd',
4491 b'date',
4491 b'date',
4492 b'',
4492 b'',
4493 _(b'show revisions matching date spec'),
4493 _(b'show revisions matching date spec'),
4494 _(b'DATE'),
4494 _(b'DATE'),
4495 ),
4495 ),
4496 (b'C', b'copies', None, _(b'show copied files')),
4496 (b'C', b'copies', None, _(b'show copied files')),
4497 (
4497 (
4498 b'k',
4498 b'k',
4499 b'keyword',
4499 b'keyword',
4500 [],
4500 [],
4501 _(b'do case-insensitive search for a given text'),
4501 _(b'do case-insensitive search for a given text'),
4502 _(b'TEXT'),
4502 _(b'TEXT'),
4503 ),
4503 ),
4504 (
4504 (
4505 b'r',
4505 b'r',
4506 b'rev',
4506 b'rev',
4507 [],
4507 [],
4508 _(b'show the specified revision or revset'),
4508 _(b'show the specified revision or revset'),
4509 _(b'REV'),
4509 _(b'REV'),
4510 ),
4510 ),
4511 (
4511 (
4512 b'L',
4512 b'L',
4513 b'line-range',
4513 b'line-range',
4514 [],
4514 [],
4515 _(b'follow line range of specified file (EXPERIMENTAL)'),
4515 _(b'follow line range of specified file (EXPERIMENTAL)'),
4516 _(b'FILE,RANGE'),
4516 _(b'FILE,RANGE'),
4517 ),
4517 ),
4518 (
4518 (
4519 b'',
4519 b'',
4520 b'removed',
4520 b'removed',
4521 None,
4521 None,
4522 _(b'include revisions where files were removed'),
4522 _(b'include revisions where files were removed'),
4523 ),
4523 ),
4524 (
4524 (
4525 b'm',
4525 b'm',
4526 b'only-merges',
4526 b'only-merges',
4527 None,
4527 None,
4528 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4528 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4529 ),
4529 ),
4530 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4530 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4531 (
4531 (
4532 b'',
4532 b'',
4533 b'only-branch',
4533 b'only-branch',
4534 [],
4534 [],
4535 _(
4535 _(
4536 b'show only changesets within the given named branch (DEPRECATED)'
4536 b'show only changesets within the given named branch (DEPRECATED)'
4537 ),
4537 ),
4538 _(b'BRANCH'),
4538 _(b'BRANCH'),
4539 ),
4539 ),
4540 (
4540 (
4541 b'b',
4541 b'b',
4542 b'branch',
4542 b'branch',
4543 [],
4543 [],
4544 _(b'show changesets within the given named branch'),
4544 _(b'show changesets within the given named branch'),
4545 _(b'BRANCH'),
4545 _(b'BRANCH'),
4546 ),
4546 ),
4547 (
4547 (
4548 b'P',
4548 b'P',
4549 b'prune',
4549 b'prune',
4550 [],
4550 [],
4551 _(b'do not display revision or any of its ancestors'),
4551 _(b'do not display revision or any of its ancestors'),
4552 _(b'REV'),
4552 _(b'REV'),
4553 ),
4553 ),
4554 ]
4554 ]
4555 + logopts
4555 + logopts
4556 + walkopts,
4556 + walkopts,
4557 _(b'[OPTION]... [FILE]'),
4557 _(b'[OPTION]... [FILE]'),
4558 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4558 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4559 helpbasic=True,
4559 helpbasic=True,
4560 inferrepo=True,
4560 inferrepo=True,
4561 intents={INTENT_READONLY},
4561 intents={INTENT_READONLY},
4562 )
4562 )
4563 def log(ui, repo, *pats, **opts):
4563 def log(ui, repo, *pats, **opts):
4564 """show revision history of entire repository or files
4564 """show revision history of entire repository or files
4565
4565
4566 Print the revision history of the specified files or the entire
4566 Print the revision history of the specified files or the entire
4567 project.
4567 project.
4568
4568
4569 If no revision range is specified, the default is ``tip:0`` unless
4569 If no revision range is specified, the default is ``tip:0`` unless
4570 --follow is set, in which case the working directory parent is
4570 --follow is set, in which case the working directory parent is
4571 used as the starting revision.
4571 used as the starting revision.
4572
4572
4573 File history is shown without following rename or copy history of
4573 File history is shown without following rename or copy history of
4574 files. Use -f/--follow with a filename to follow history across
4574 files. Use -f/--follow with a filename to follow history across
4575 renames and copies. --follow without a filename will only show
4575 renames and copies. --follow without a filename will only show
4576 ancestors of the starting revision.
4576 ancestors of the starting revision.
4577
4577
4578 By default this command prints revision number and changeset id,
4578 By default this command prints revision number and changeset id,
4579 tags, non-trivial parents, user, date and time, and a summary for
4579 tags, non-trivial parents, user, date and time, and a summary for
4580 each commit. When the -v/--verbose switch is used, the list of
4580 each commit. When the -v/--verbose switch is used, the list of
4581 changed files and full commit message are shown.
4581 changed files and full commit message are shown.
4582
4582
4583 With --graph the revisions are shown as an ASCII art DAG with the most
4583 With --graph the revisions are shown as an ASCII art DAG with the most
4584 recent changeset at the top.
4584 recent changeset at the top.
4585 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4585 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4586 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4586 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4587 changeset from the lines below is a parent of the 'o' merge on the same
4587 changeset from the lines below is a parent of the 'o' merge on the same
4588 line.
4588 line.
4589 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4589 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4590 of a '|' indicates one or more revisions in a path are omitted.
4590 of a '|' indicates one or more revisions in a path are omitted.
4591
4591
4592 .. container:: verbose
4592 .. container:: verbose
4593
4593
4594 Use -L/--line-range FILE,M:N options to follow the history of lines
4594 Use -L/--line-range FILE,M:N options to follow the history of lines
4595 from M to N in FILE. With -p/--patch only diff hunks affecting
4595 from M to N in FILE. With -p/--patch only diff hunks affecting
4596 specified line range will be shown. This option requires --follow;
4596 specified line range will be shown. This option requires --follow;
4597 it can be specified multiple times. Currently, this option is not
4597 it can be specified multiple times. Currently, this option is not
4598 compatible with --graph. This option is experimental.
4598 compatible with --graph. This option is experimental.
4599
4599
4600 .. note::
4600 .. note::
4601
4601
4602 :hg:`log --patch` may generate unexpected diff output for merge
4602 :hg:`log --patch` may generate unexpected diff output for merge
4603 changesets, as it will only compare the merge changeset against
4603 changesets, as it will only compare the merge changeset against
4604 its first parent. Also, only files different from BOTH parents
4604 its first parent. Also, only files different from BOTH parents
4605 will appear in files:.
4605 will appear in files:.
4606
4606
4607 .. note::
4607 .. note::
4608
4608
4609 For performance reasons, :hg:`log FILE` may omit duplicate changes
4609 For performance reasons, :hg:`log FILE` may omit duplicate changes
4610 made on branches and will not show removals or mode changes. To
4610 made on branches and will not show removals or mode changes. To
4611 see all such changes, use the --removed switch.
4611 see all such changes, use the --removed switch.
4612
4612
4613 .. container:: verbose
4613 .. container:: verbose
4614
4614
4615 .. note::
4615 .. note::
4616
4616
4617 The history resulting from -L/--line-range options depends on diff
4617 The history resulting from -L/--line-range options depends on diff
4618 options; for instance if white-spaces are ignored, respective changes
4618 options; for instance if white-spaces are ignored, respective changes
4619 with only white-spaces in specified line range will not be listed.
4619 with only white-spaces in specified line range will not be listed.
4620
4620
4621 .. container:: verbose
4621 .. container:: verbose
4622
4622
4623 Some examples:
4623 Some examples:
4624
4624
4625 - changesets with full descriptions and file lists::
4625 - changesets with full descriptions and file lists::
4626
4626
4627 hg log -v
4627 hg log -v
4628
4628
4629 - changesets ancestral to the working directory::
4629 - changesets ancestral to the working directory::
4630
4630
4631 hg log -f
4631 hg log -f
4632
4632
4633 - last 10 commits on the current branch::
4633 - last 10 commits on the current branch::
4634
4634
4635 hg log -l 10 -b .
4635 hg log -l 10 -b .
4636
4636
4637 - changesets showing all modifications of a file, including removals::
4637 - changesets showing all modifications of a file, including removals::
4638
4638
4639 hg log --removed file.c
4639 hg log --removed file.c
4640
4640
4641 - all changesets that touch a directory, with diffs, excluding merges::
4641 - all changesets that touch a directory, with diffs, excluding merges::
4642
4642
4643 hg log -Mp lib/
4643 hg log -Mp lib/
4644
4644
4645 - all revision numbers that match a keyword::
4645 - all revision numbers that match a keyword::
4646
4646
4647 hg log -k bug --template "{rev}\\n"
4647 hg log -k bug --template "{rev}\\n"
4648
4648
4649 - the full hash identifier of the working directory parent::
4649 - the full hash identifier of the working directory parent::
4650
4650
4651 hg log -r . --template "{node}\\n"
4651 hg log -r . --template "{node}\\n"
4652
4652
4653 - list available log templates::
4653 - list available log templates::
4654
4654
4655 hg log -T list
4655 hg log -T list
4656
4656
4657 - check if a given changeset is included in a tagged release::
4657 - check if a given changeset is included in a tagged release::
4658
4658
4659 hg log -r "a21ccf and ancestor(1.9)"
4659 hg log -r "a21ccf and ancestor(1.9)"
4660
4660
4661 - find all changesets by some user in a date range::
4661 - find all changesets by some user in a date range::
4662
4662
4663 hg log -k alice -d "may 2008 to jul 2008"
4663 hg log -k alice -d "may 2008 to jul 2008"
4664
4664
4665 - summary of all changesets after the last tag::
4665 - summary of all changesets after the last tag::
4666
4666
4667 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4667 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4668
4668
4669 - changesets touching lines 13 to 23 for file.c::
4669 - changesets touching lines 13 to 23 for file.c::
4670
4670
4671 hg log -L file.c,13:23
4671 hg log -L file.c,13:23
4672
4672
4673 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4673 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4674 main.c with patch::
4674 main.c with patch::
4675
4675
4676 hg log -L file.c,13:23 -L main.c,2:6 -p
4676 hg log -L file.c,13:23 -L main.c,2:6 -p
4677
4677
4678 See :hg:`help dates` for a list of formats valid for -d/--date.
4678 See :hg:`help dates` for a list of formats valid for -d/--date.
4679
4679
4680 See :hg:`help revisions` for more about specifying and ordering
4680 See :hg:`help revisions` for more about specifying and ordering
4681 revisions.
4681 revisions.
4682
4682
4683 See :hg:`help templates` for more about pre-packaged styles and
4683 See :hg:`help templates` for more about pre-packaged styles and
4684 specifying custom templates. The default template used by the log
4684 specifying custom templates. The default template used by the log
4685 command can be customized via the ``ui.logtemplate`` configuration
4685 command can be customized via the ``ui.logtemplate`` configuration
4686 setting.
4686 setting.
4687
4687
4688 Returns 0 on success.
4688 Returns 0 on success.
4689
4689
4690 """
4690 """
4691 opts = pycompat.byteskwargs(opts)
4691 opts = pycompat.byteskwargs(opts)
4692 linerange = opts.get(b'line_range')
4692 linerange = opts.get(b'line_range')
4693
4693
4694 if linerange and not opts.get(b'follow'):
4694 if linerange and not opts.get(b'follow'):
4695 raise error.Abort(_(b'--line-range requires --follow'))
4695 raise error.Abort(_(b'--line-range requires --follow'))
4696
4696
4697 if linerange and pats:
4697 if linerange and pats:
4698 # TODO: take pats as patterns with no line-range filter
4698 # TODO: take pats as patterns with no line-range filter
4699 raise error.Abort(
4699 raise error.Abort(
4700 _(b'FILE arguments are not compatible with --line-range option')
4700 _(b'FILE arguments are not compatible with --line-range option')
4701 )
4701 )
4702
4702
4703 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4703 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4704 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4704 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4705 if linerange:
4705 if linerange:
4706 # TODO: should follow file history from logcmdutil._initialrevs(),
4706 # TODO: should follow file history from logcmdutil._initialrevs(),
4707 # then filter the result by logcmdutil._makerevset() and --limit
4707 # then filter the result by logcmdutil._makerevset() and --limit
4708 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4708 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4709
4709
4710 getcopies = None
4710 getcopies = None
4711 if opts.get(b'copies'):
4711 if opts.get(b'copies'):
4712 endrev = None
4712 endrev = None
4713 if revs:
4713 if revs:
4714 endrev = revs.max() + 1
4714 endrev = revs.max() + 1
4715 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4715 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4716
4716
4717 ui.pager(b'log')
4717 ui.pager(b'log')
4718 displayer = logcmdutil.changesetdisplayer(
4718 displayer = logcmdutil.changesetdisplayer(
4719 ui, repo, opts, differ, buffered=True
4719 ui, repo, opts, differ, buffered=True
4720 )
4720 )
4721 if opts.get(b'graph'):
4721 if opts.get(b'graph'):
4722 displayfn = logcmdutil.displaygraphrevs
4722 displayfn = logcmdutil.displaygraphrevs
4723 else:
4723 else:
4724 displayfn = logcmdutil.displayrevs
4724 displayfn = logcmdutil.displayrevs
4725 displayfn(ui, repo, revs, displayer, getcopies)
4725 displayfn(ui, repo, revs, displayer, getcopies)
4726
4726
4727
4727
4728 @command(
4728 @command(
4729 b'manifest',
4729 b'manifest',
4730 [
4730 [
4731 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4731 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4732 (b'', b'all', False, _(b"list files from all revisions")),
4732 (b'', b'all', False, _(b"list files from all revisions")),
4733 ]
4733 ]
4734 + formatteropts,
4734 + formatteropts,
4735 _(b'[-r REV]'),
4735 _(b'[-r REV]'),
4736 helpcategory=command.CATEGORY_MAINTENANCE,
4736 helpcategory=command.CATEGORY_MAINTENANCE,
4737 intents={INTENT_READONLY},
4737 intents={INTENT_READONLY},
4738 )
4738 )
4739 def manifest(ui, repo, node=None, rev=None, **opts):
4739 def manifest(ui, repo, node=None, rev=None, **opts):
4740 """output the current or given revision of the project manifest
4740 """output the current or given revision of the project manifest
4741
4741
4742 Print a list of version controlled files for the given revision.
4742 Print a list of version controlled files for the given revision.
4743 If no revision is given, the first parent of the working directory
4743 If no revision is given, the first parent of the working directory
4744 is used, or the null revision if no revision is checked out.
4744 is used, or the null revision if no revision is checked out.
4745
4745
4746 With -v, print file permissions, symlink and executable bits.
4746 With -v, print file permissions, symlink and executable bits.
4747 With --debug, print file revision hashes.
4747 With --debug, print file revision hashes.
4748
4748
4749 If option --all is specified, the list of all files from all revisions
4749 If option --all is specified, the list of all files from all revisions
4750 is printed. This includes deleted and renamed files.
4750 is printed. This includes deleted and renamed files.
4751
4751
4752 Returns 0 on success.
4752 Returns 0 on success.
4753 """
4753 """
4754 opts = pycompat.byteskwargs(opts)
4754 opts = pycompat.byteskwargs(opts)
4755 fm = ui.formatter(b'manifest', opts)
4755 fm = ui.formatter(b'manifest', opts)
4756
4756
4757 if opts.get(b'all'):
4757 if opts.get(b'all'):
4758 if rev or node:
4758 if rev or node:
4759 raise error.Abort(_(b"can't specify a revision with --all"))
4759 raise error.Abort(_(b"can't specify a revision with --all"))
4760
4760
4761 res = set()
4761 res = set()
4762 for rev in repo:
4762 for rev in repo:
4763 ctx = repo[rev]
4763 ctx = repo[rev]
4764 res |= set(ctx.files())
4764 res |= set(ctx.files())
4765
4765
4766 ui.pager(b'manifest')
4766 ui.pager(b'manifest')
4767 for f in sorted(res):
4767 for f in sorted(res):
4768 fm.startitem()
4768 fm.startitem()
4769 fm.write(b"path", b'%s\n', f)
4769 fm.write(b"path", b'%s\n', f)
4770 fm.end()
4770 fm.end()
4771 return
4771 return
4772
4772
4773 if rev and node:
4773 if rev and node:
4774 raise error.Abort(_(b"please specify just one revision"))
4774 raise error.Abort(_(b"please specify just one revision"))
4775
4775
4776 if not node:
4776 if not node:
4777 node = rev
4777 node = rev
4778
4778
4779 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4779 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4780 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4780 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4781 if node:
4781 if node:
4782 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4782 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4783 ctx = scmutil.revsingle(repo, node)
4783 ctx = scmutil.revsingle(repo, node)
4784 mf = ctx.manifest()
4784 mf = ctx.manifest()
4785 ui.pager(b'manifest')
4785 ui.pager(b'manifest')
4786 for f in ctx:
4786 for f in ctx:
4787 fm.startitem()
4787 fm.startitem()
4788 fm.context(ctx=ctx)
4788 fm.context(ctx=ctx)
4789 fl = ctx[f].flags()
4789 fl = ctx[f].flags()
4790 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4790 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4791 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4791 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4792 fm.write(b'path', b'%s\n', f)
4792 fm.write(b'path', b'%s\n', f)
4793 fm.end()
4793 fm.end()
4794
4794
4795
4795
4796 @command(
4796 @command(
4797 b'merge',
4797 b'merge',
4798 [
4798 [
4799 (
4799 (
4800 b'f',
4800 b'f',
4801 b'force',
4801 b'force',
4802 None,
4802 None,
4803 _(b'force a merge including outstanding changes (DEPRECATED)'),
4803 _(b'force a merge including outstanding changes (DEPRECATED)'),
4804 ),
4804 ),
4805 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4805 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4806 (
4806 (
4807 b'P',
4807 b'P',
4808 b'preview',
4808 b'preview',
4809 None,
4809 None,
4810 _(b'review revisions to merge (no merge is performed)'),
4810 _(b'review revisions to merge (no merge is performed)'),
4811 ),
4811 ),
4812 (b'', b'abort', None, _(b'abort the ongoing merge')),
4812 (b'', b'abort', None, _(b'abort the ongoing merge')),
4813 ]
4813 ]
4814 + mergetoolopts,
4814 + mergetoolopts,
4815 _(b'[-P] [[-r] REV]'),
4815 _(b'[-P] [[-r] REV]'),
4816 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4816 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4817 helpbasic=True,
4817 helpbasic=True,
4818 )
4818 )
4819 def merge(ui, repo, node=None, **opts):
4819 def merge(ui, repo, node=None, **opts):
4820 """merge another revision into working directory
4820 """merge another revision into working directory
4821
4821
4822 The current working directory is updated with all changes made in
4822 The current working directory is updated with all changes made in
4823 the requested revision since the last common predecessor revision.
4823 the requested revision since the last common predecessor revision.
4824
4824
4825 Files that changed between either parent are marked as changed for
4825 Files that changed between either parent are marked as changed for
4826 the next commit and a commit must be performed before any further
4826 the next commit and a commit must be performed before any further
4827 updates to the repository are allowed. The next commit will have
4827 updates to the repository are allowed. The next commit will have
4828 two parents.
4828 two parents.
4829
4829
4830 ``--tool`` can be used to specify the merge tool used for file
4830 ``--tool`` can be used to specify the merge tool used for file
4831 merges. It overrides the HGMERGE environment variable and your
4831 merges. It overrides the HGMERGE environment variable and your
4832 configuration files. See :hg:`help merge-tools` for options.
4832 configuration files. See :hg:`help merge-tools` for options.
4833
4833
4834 If no revision is specified, the working directory's parent is a
4834 If no revision is specified, the working directory's parent is a
4835 head revision, and the current branch contains exactly one other
4835 head revision, and the current branch contains exactly one other
4836 head, the other head is merged with by default. Otherwise, an
4836 head, the other head is merged with by default. Otherwise, an
4837 explicit revision with which to merge must be provided.
4837 explicit revision with which to merge must be provided.
4838
4838
4839 See :hg:`help resolve` for information on handling file conflicts.
4839 See :hg:`help resolve` for information on handling file conflicts.
4840
4840
4841 To undo an uncommitted merge, use :hg:`merge --abort` which
4841 To undo an uncommitted merge, use :hg:`merge --abort` which
4842 will check out a clean copy of the original merge parent, losing
4842 will check out a clean copy of the original merge parent, losing
4843 all changes.
4843 all changes.
4844
4844
4845 Returns 0 on success, 1 if there are unresolved files.
4845 Returns 0 on success, 1 if there are unresolved files.
4846 """
4846 """
4847
4847
4848 opts = pycompat.byteskwargs(opts)
4848 opts = pycompat.byteskwargs(opts)
4849 abort = opts.get(b'abort')
4849 abort = opts.get(b'abort')
4850 if abort and repo.dirstate.p2() == nullid:
4850 if abort and repo.dirstate.p2() == nullid:
4851 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4851 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4852 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4852 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4853 if abort:
4853 if abort:
4854 state = cmdutil.getunfinishedstate(repo)
4854 state = cmdutil.getunfinishedstate(repo)
4855 if state and state._opname != b'merge':
4855 if state and state._opname != b'merge':
4856 raise error.Abort(
4856 raise error.Abort(
4857 _(b'cannot abort merge with %s in progress') % (state._opname),
4857 _(b'cannot abort merge with %s in progress') % (state._opname),
4858 hint=state.hint(),
4858 hint=state.hint(),
4859 )
4859 )
4860 if node:
4860 if node:
4861 raise error.Abort(_(b"cannot specify a node with --abort"))
4861 raise error.Abort(_(b"cannot specify a node with --abort"))
4862 return hg.abortmerge(repo.ui, repo)
4862 return hg.abortmerge(repo.ui, repo)
4863
4863
4864 if opts.get(b'rev') and node:
4864 if opts.get(b'rev') and node:
4865 raise error.Abort(_(b"please specify just one revision"))
4865 raise error.Abort(_(b"please specify just one revision"))
4866 if not node:
4866 if not node:
4867 node = opts.get(b'rev')
4867 node = opts.get(b'rev')
4868
4868
4869 if node:
4869 if node:
4870 node = scmutil.revsingle(repo, node).node()
4870 node = scmutil.revsingle(repo, node).node()
4871 else:
4871 else:
4872 if ui.configbool(b'commands', b'merge.require-rev'):
4872 if ui.configbool(b'commands', b'merge.require-rev'):
4873 raise error.Abort(
4873 raise error.Abort(
4874 _(
4874 _(
4875 b'configuration requires specifying revision to merge '
4875 b'configuration requires specifying revision to merge '
4876 b'with'
4876 b'with'
4877 )
4877 )
4878 )
4878 )
4879 node = repo[destutil.destmerge(repo)].node()
4879 node = repo[destutil.destmerge(repo)].node()
4880
4880
4881 if node is None:
4881 if node is None:
4882 raise error.Abort(_(b'merging with the working copy has no effect'))
4882 raise error.Abort(_(b'merging with the working copy has no effect'))
4883
4883
4884 if opts.get(b'preview'):
4884 if opts.get(b'preview'):
4885 # find nodes that are ancestors of p2 but not of p1
4885 # find nodes that are ancestors of p2 but not of p1
4886 p1 = repo[b'.'].node()
4886 p1 = repo[b'.'].node()
4887 p2 = node
4887 p2 = node
4888 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4888 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4889
4889
4890 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4890 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4891 for node in nodes:
4891 for node in nodes:
4892 displayer.show(repo[node])
4892 displayer.show(repo[node])
4893 displayer.close()
4893 displayer.close()
4894 return 0
4894 return 0
4895
4895
4896 # ui.forcemerge is an internal variable, do not document
4896 # ui.forcemerge is an internal variable, do not document
4897 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4897 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4898 with ui.configoverride(overrides, b'merge'):
4898 with ui.configoverride(overrides, b'merge'):
4899 force = opts.get(b'force')
4899 force = opts.get(b'force')
4900 labels = [b'working copy', b'merge rev']
4900 labels = [b'working copy', b'merge rev']
4901 return hg.merge(
4901 return hg.merge(
4902 repo, node, force=force, mergeforce=force, labels=labels
4902 repo, node, force=force, mergeforce=force, labels=labels
4903 )
4903 )
4904
4904
4905
4905
4906 statemod.addunfinished(
4906 statemod.addunfinished(
4907 b'merge',
4907 b'merge',
4908 fname=None,
4908 fname=None,
4909 clearable=True,
4909 clearable=True,
4910 allowcommit=True,
4910 allowcommit=True,
4911 cmdmsg=_(b'outstanding uncommitted merge'),
4911 cmdmsg=_(b'outstanding uncommitted merge'),
4912 abortfunc=hg.abortmerge,
4912 abortfunc=hg.abortmerge,
4913 statushint=_(
4913 statushint=_(
4914 b'To continue: hg commit\nTo abort: hg merge --abort'
4914 b'To continue: hg commit\nTo abort: hg merge --abort'
4915 ),
4915 ),
4916 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4916 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4917 )
4917 )
4918
4918
4919
4919
4920 @command(
4920 @command(
4921 b'outgoing|out',
4921 b'outgoing|out',
4922 [
4922 [
4923 (
4923 (
4924 b'f',
4924 b'f',
4925 b'force',
4925 b'force',
4926 None,
4926 None,
4927 _(b'run even when the destination is unrelated'),
4927 _(b'run even when the destination is unrelated'),
4928 ),
4928 ),
4929 (
4929 (
4930 b'r',
4930 b'r',
4931 b'rev',
4931 b'rev',
4932 [],
4932 [],
4933 _(b'a changeset intended to be included in the destination'),
4933 _(b'a changeset intended to be included in the destination'),
4934 _(b'REV'),
4934 _(b'REV'),
4935 ),
4935 ),
4936 (b'n', b'newest-first', None, _(b'show newest record first')),
4936 (b'n', b'newest-first', None, _(b'show newest record first')),
4937 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4937 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4938 (
4938 (
4939 b'b',
4939 b'b',
4940 b'branch',
4940 b'branch',
4941 [],
4941 [],
4942 _(b'a specific branch you would like to push'),
4942 _(b'a specific branch you would like to push'),
4943 _(b'BRANCH'),
4943 _(b'BRANCH'),
4944 ),
4944 ),
4945 ]
4945 ]
4946 + logopts
4946 + logopts
4947 + remoteopts
4947 + remoteopts
4948 + subrepoopts,
4948 + subrepoopts,
4949 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4949 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4950 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4950 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4951 )
4951 )
4952 def outgoing(ui, repo, dest=None, **opts):
4952 def outgoing(ui, repo, dest=None, **opts):
4953 """show changesets not found in the destination
4953 """show changesets not found in the destination
4954
4954
4955 Show changesets not found in the specified destination repository
4955 Show changesets not found in the specified destination repository
4956 or the default push location. These are the changesets that would
4956 or the default push location. These are the changesets that would
4957 be pushed if a push was requested.
4957 be pushed if a push was requested.
4958
4958
4959 See pull for details of valid destination formats.
4959 See pull for details of valid destination formats.
4960
4960
4961 .. container:: verbose
4961 .. container:: verbose
4962
4962
4963 With -B/--bookmarks, the result of bookmark comparison between
4963 With -B/--bookmarks, the result of bookmark comparison between
4964 local and remote repositories is displayed. With -v/--verbose,
4964 local and remote repositories is displayed. With -v/--verbose,
4965 status is also displayed for each bookmark like below::
4965 status is also displayed for each bookmark like below::
4966
4966
4967 BM1 01234567890a added
4967 BM1 01234567890a added
4968 BM2 deleted
4968 BM2 deleted
4969 BM3 234567890abc advanced
4969 BM3 234567890abc advanced
4970 BM4 34567890abcd diverged
4970 BM4 34567890abcd diverged
4971 BM5 4567890abcde changed
4971 BM5 4567890abcde changed
4972
4972
4973 The action taken when pushing depends on the
4973 The action taken when pushing depends on the
4974 status of each bookmark:
4974 status of each bookmark:
4975
4975
4976 :``added``: push with ``-B`` will create it
4976 :``added``: push with ``-B`` will create it
4977 :``deleted``: push with ``-B`` will delete it
4977 :``deleted``: push with ``-B`` will delete it
4978 :``advanced``: push will update it
4978 :``advanced``: push will update it
4979 :``diverged``: push with ``-B`` will update it
4979 :``diverged``: push with ``-B`` will update it
4980 :``changed``: push with ``-B`` will update it
4980 :``changed``: push with ``-B`` will update it
4981
4981
4982 From the point of view of pushing behavior, bookmarks
4982 From the point of view of pushing behavior, bookmarks
4983 existing only in the remote repository are treated as
4983 existing only in the remote repository are treated as
4984 ``deleted``, even if it is in fact added remotely.
4984 ``deleted``, even if it is in fact added remotely.
4985
4985
4986 Returns 0 if there are outgoing changes, 1 otherwise.
4986 Returns 0 if there are outgoing changes, 1 otherwise.
4987 """
4987 """
4988 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4988 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4989 # style URLs, so don't overwrite dest.
4989 # style URLs, so don't overwrite dest.
4990 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4990 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4991 if not path:
4991 if not path:
4992 raise error.Abort(
4992 raise error.Abort(
4993 _(b'default repository not configured!'),
4993 _(b'default repository not configured!'),
4994 hint=_(b"see 'hg help config.paths'"),
4994 hint=_(b"see 'hg help config.paths'"),
4995 )
4995 )
4996
4996
4997 opts = pycompat.byteskwargs(opts)
4997 opts = pycompat.byteskwargs(opts)
4998 if opts.get(b'graph'):
4998 if opts.get(b'graph'):
4999 logcmdutil.checkunsupportedgraphflags([], opts)
4999 logcmdutil.checkunsupportedgraphflags([], opts)
5000 o, other = hg._outgoing(ui, repo, dest, opts)
5000 o, other = hg._outgoing(ui, repo, dest, opts)
5001 if not o:
5001 if not o:
5002 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5002 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5003 return
5003 return
5004
5004
5005 revdag = logcmdutil.graphrevs(repo, o, opts)
5005 revdag = logcmdutil.graphrevs(repo, o, opts)
5006 ui.pager(b'outgoing')
5006 ui.pager(b'outgoing')
5007 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5007 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5008 logcmdutil.displaygraph(
5008 logcmdutil.displaygraph(
5009 ui, repo, revdag, displayer, graphmod.asciiedges
5009 ui, repo, revdag, displayer, graphmod.asciiedges
5010 )
5010 )
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 return 0
5012 return 0
5013
5013
5014 if opts.get(b'bookmarks'):
5014 if opts.get(b'bookmarks'):
5015 dest = path.pushloc or path.loc
5015 dest = path.pushloc or path.loc
5016 other = hg.peer(repo, opts, dest)
5016 other = hg.peer(repo, opts, dest)
5017 if b'bookmarks' not in other.listkeys(b'namespaces'):
5017 if b'bookmarks' not in other.listkeys(b'namespaces'):
5018 ui.warn(_(b"remote doesn't support bookmarks\n"))
5018 ui.warn(_(b"remote doesn't support bookmarks\n"))
5019 return 0
5019 return 0
5020 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5020 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5021 ui.pager(b'outgoing')
5021 ui.pager(b'outgoing')
5022 return bookmarks.outgoing(ui, repo, other)
5022 return bookmarks.outgoing(ui, repo, other)
5023
5023
5024 repo._subtoppath = path.pushloc or path.loc
5024 repo._subtoppath = path.pushloc or path.loc
5025 try:
5025 try:
5026 return hg.outgoing(ui, repo, dest, opts)
5026 return hg.outgoing(ui, repo, dest, opts)
5027 finally:
5027 finally:
5028 del repo._subtoppath
5028 del repo._subtoppath
5029
5029
5030
5030
5031 @command(
5031 @command(
5032 b'parents',
5032 b'parents',
5033 [
5033 [
5034 (
5034 (
5035 b'r',
5035 b'r',
5036 b'rev',
5036 b'rev',
5037 b'',
5037 b'',
5038 _(b'show parents of the specified revision'),
5038 _(b'show parents of the specified revision'),
5039 _(b'REV'),
5039 _(b'REV'),
5040 ),
5040 ),
5041 ]
5041 ]
5042 + templateopts,
5042 + templateopts,
5043 _(b'[-r REV] [FILE]'),
5043 _(b'[-r REV] [FILE]'),
5044 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5044 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5045 inferrepo=True,
5045 inferrepo=True,
5046 )
5046 )
5047 def parents(ui, repo, file_=None, **opts):
5047 def parents(ui, repo, file_=None, **opts):
5048 """show the parents of the working directory or revision (DEPRECATED)
5048 """show the parents of the working directory or revision (DEPRECATED)
5049
5049
5050 Print the working directory's parent revisions. If a revision is
5050 Print the working directory's parent revisions. If a revision is
5051 given via -r/--rev, the parent of that revision will be printed.
5051 given via -r/--rev, the parent of that revision will be printed.
5052 If a file argument is given, the revision in which the file was
5052 If a file argument is given, the revision in which the file was
5053 last changed (before the working directory revision or the
5053 last changed (before the working directory revision or the
5054 argument to --rev if given) is printed.
5054 argument to --rev if given) is printed.
5055
5055
5056 This command is equivalent to::
5056 This command is equivalent to::
5057
5057
5058 hg log -r "p1()+p2()" or
5058 hg log -r "p1()+p2()" or
5059 hg log -r "p1(REV)+p2(REV)" or
5059 hg log -r "p1(REV)+p2(REV)" or
5060 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5060 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5061 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5061 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5062
5062
5063 See :hg:`summary` and :hg:`help revsets` for related information.
5063 See :hg:`summary` and :hg:`help revsets` for related information.
5064
5064
5065 Returns 0 on success.
5065 Returns 0 on success.
5066 """
5066 """
5067
5067
5068 opts = pycompat.byteskwargs(opts)
5068 opts = pycompat.byteskwargs(opts)
5069 rev = opts.get(b'rev')
5069 rev = opts.get(b'rev')
5070 if rev:
5070 if rev:
5071 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5071 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5072 ctx = scmutil.revsingle(repo, rev, None)
5072 ctx = scmutil.revsingle(repo, rev, None)
5073
5073
5074 if file_:
5074 if file_:
5075 m = scmutil.match(ctx, (file_,), opts)
5075 m = scmutil.match(ctx, (file_,), opts)
5076 if m.anypats() or len(m.files()) != 1:
5076 if m.anypats() or len(m.files()) != 1:
5077 raise error.Abort(_(b'can only specify an explicit filename'))
5077 raise error.Abort(_(b'can only specify an explicit filename'))
5078 file_ = m.files()[0]
5078 file_ = m.files()[0]
5079 filenodes = []
5079 filenodes = []
5080 for cp in ctx.parents():
5080 for cp in ctx.parents():
5081 if not cp:
5081 if not cp:
5082 continue
5082 continue
5083 try:
5083 try:
5084 filenodes.append(cp.filenode(file_))
5084 filenodes.append(cp.filenode(file_))
5085 except error.LookupError:
5085 except error.LookupError:
5086 pass
5086 pass
5087 if not filenodes:
5087 if not filenodes:
5088 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5088 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5089 p = []
5089 p = []
5090 for fn in filenodes:
5090 for fn in filenodes:
5091 fctx = repo.filectx(file_, fileid=fn)
5091 fctx = repo.filectx(file_, fileid=fn)
5092 p.append(fctx.node())
5092 p.append(fctx.node())
5093 else:
5093 else:
5094 p = [cp.node() for cp in ctx.parents()]
5094 p = [cp.node() for cp in ctx.parents()]
5095
5095
5096 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5096 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5097 for n in p:
5097 for n in p:
5098 if n != nullid:
5098 if n != nullid:
5099 displayer.show(repo[n])
5099 displayer.show(repo[n])
5100 displayer.close()
5100 displayer.close()
5101
5101
5102
5102
5103 @command(
5103 @command(
5104 b'paths',
5104 b'paths',
5105 formatteropts,
5105 formatteropts,
5106 _(b'[NAME]'),
5106 _(b'[NAME]'),
5107 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5107 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5108 optionalrepo=True,
5108 optionalrepo=True,
5109 intents={INTENT_READONLY},
5109 intents={INTENT_READONLY},
5110 )
5110 )
5111 def paths(ui, repo, search=None, **opts):
5111 def paths(ui, repo, search=None, **opts):
5112 """show aliases for remote repositories
5112 """show aliases for remote repositories
5113
5113
5114 Show definition of symbolic path name NAME. If no name is given,
5114 Show definition of symbolic path name NAME. If no name is given,
5115 show definition of all available names.
5115 show definition of all available names.
5116
5116
5117 Option -q/--quiet suppresses all output when searching for NAME
5117 Option -q/--quiet suppresses all output when searching for NAME
5118 and shows only the path names when listing all definitions.
5118 and shows only the path names when listing all definitions.
5119
5119
5120 Path names are defined in the [paths] section of your
5120 Path names are defined in the [paths] section of your
5121 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5121 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5122 repository, ``.hg/hgrc`` is used, too.
5122 repository, ``.hg/hgrc`` is used, too.
5123
5123
5124 The path names ``default`` and ``default-push`` have a special
5124 The path names ``default`` and ``default-push`` have a special
5125 meaning. When performing a push or pull operation, they are used
5125 meaning. When performing a push or pull operation, they are used
5126 as fallbacks if no location is specified on the command-line.
5126 as fallbacks if no location is specified on the command-line.
5127 When ``default-push`` is set, it will be used for push and
5127 When ``default-push`` is set, it will be used for push and
5128 ``default`` will be used for pull; otherwise ``default`` is used
5128 ``default`` will be used for pull; otherwise ``default`` is used
5129 as the fallback for both. When cloning a repository, the clone
5129 as the fallback for both. When cloning a repository, the clone
5130 source is written as ``default`` in ``.hg/hgrc``.
5130 source is written as ``default`` in ``.hg/hgrc``.
5131
5131
5132 .. note::
5132 .. note::
5133
5133
5134 ``default`` and ``default-push`` apply to all inbound (e.g.
5134 ``default`` and ``default-push`` apply to all inbound (e.g.
5135 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5135 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5136 and :hg:`bundle`) operations.
5136 and :hg:`bundle`) operations.
5137
5137
5138 See :hg:`help urls` for more information.
5138 See :hg:`help urls` for more information.
5139
5139
5140 .. container:: verbose
5140 .. container:: verbose
5141
5141
5142 Template:
5142 Template:
5143
5143
5144 The following keywords are supported. See also :hg:`help templates`.
5144 The following keywords are supported. See also :hg:`help templates`.
5145
5145
5146 :name: String. Symbolic name of the path alias.
5146 :name: String. Symbolic name of the path alias.
5147 :pushurl: String. URL for push operations.
5147 :pushurl: String. URL for push operations.
5148 :url: String. URL or directory path for the other operations.
5148 :url: String. URL or directory path for the other operations.
5149
5149
5150 Returns 0 on success.
5150 Returns 0 on success.
5151 """
5151 """
5152
5152
5153 opts = pycompat.byteskwargs(opts)
5153 opts = pycompat.byteskwargs(opts)
5154 ui.pager(b'paths')
5154 ui.pager(b'paths')
5155 if search:
5155 if search:
5156 pathitems = [
5156 pathitems = [
5157 (name, path)
5157 (name, path)
5158 for name, path in pycompat.iteritems(ui.paths)
5158 for name, path in pycompat.iteritems(ui.paths)
5159 if name == search
5159 if name == search
5160 ]
5160 ]
5161 else:
5161 else:
5162 pathitems = sorted(pycompat.iteritems(ui.paths))
5162 pathitems = sorted(pycompat.iteritems(ui.paths))
5163
5163
5164 fm = ui.formatter(b'paths', opts)
5164 fm = ui.formatter(b'paths', opts)
5165 if fm.isplain():
5165 if fm.isplain():
5166 hidepassword = util.hidepassword
5166 hidepassword = util.hidepassword
5167 else:
5167 else:
5168 hidepassword = bytes
5168 hidepassword = bytes
5169 if ui.quiet:
5169 if ui.quiet:
5170 namefmt = b'%s\n'
5170 namefmt = b'%s\n'
5171 else:
5171 else:
5172 namefmt = b'%s = '
5172 namefmt = b'%s = '
5173 showsubopts = not search and not ui.quiet
5173 showsubopts = not search and not ui.quiet
5174
5174
5175 for name, path in pathitems:
5175 for name, path in pathitems:
5176 fm.startitem()
5176 fm.startitem()
5177 fm.condwrite(not search, b'name', namefmt, name)
5177 fm.condwrite(not search, b'name', namefmt, name)
5178 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5178 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5179 for subopt, value in sorted(path.suboptions.items()):
5179 for subopt, value in sorted(path.suboptions.items()):
5180 assert subopt not in (b'name', b'url')
5180 assert subopt not in (b'name', b'url')
5181 if showsubopts:
5181 if showsubopts:
5182 fm.plain(b'%s:%s = ' % (name, subopt))
5182 fm.plain(b'%s:%s = ' % (name, subopt))
5183 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5183 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5184
5184
5185 fm.end()
5185 fm.end()
5186
5186
5187 if search and not pathitems:
5187 if search and not pathitems:
5188 if not ui.quiet:
5188 if not ui.quiet:
5189 ui.warn(_(b"not found!\n"))
5189 ui.warn(_(b"not found!\n"))
5190 return 1
5190 return 1
5191 else:
5191 else:
5192 return 0
5192 return 0
5193
5193
5194
5194
5195 @command(
5195 @command(
5196 b'phase',
5196 b'phase',
5197 [
5197 [
5198 (b'p', b'public', False, _(b'set changeset phase to public')),
5198 (b'p', b'public', False, _(b'set changeset phase to public')),
5199 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5199 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5200 (b's', b'secret', False, _(b'set changeset phase to secret')),
5200 (b's', b'secret', False, _(b'set changeset phase to secret')),
5201 (b'f', b'force', False, _(b'allow to move boundary backward')),
5201 (b'f', b'force', False, _(b'allow to move boundary backward')),
5202 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5202 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5203 ],
5203 ],
5204 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5204 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5205 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5205 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5206 )
5206 )
5207 def phase(ui, repo, *revs, **opts):
5207 def phase(ui, repo, *revs, **opts):
5208 """set or show the current phase name
5208 """set or show the current phase name
5209
5209
5210 With no argument, show the phase name of the current revision(s).
5210 With no argument, show the phase name of the current revision(s).
5211
5211
5212 With one of -p/--public, -d/--draft or -s/--secret, change the
5212 With one of -p/--public, -d/--draft or -s/--secret, change the
5213 phase value of the specified revisions.
5213 phase value of the specified revisions.
5214
5214
5215 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5215 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5216 lower phase to a higher phase. Phases are ordered as follows::
5216 lower phase to a higher phase. Phases are ordered as follows::
5217
5217
5218 public < draft < secret
5218 public < draft < secret
5219
5219
5220 Returns 0 on success, 1 if some phases could not be changed.
5220 Returns 0 on success, 1 if some phases could not be changed.
5221
5221
5222 (For more information about the phases concept, see :hg:`help phases`.)
5222 (For more information about the phases concept, see :hg:`help phases`.)
5223 """
5223 """
5224 opts = pycompat.byteskwargs(opts)
5224 opts = pycompat.byteskwargs(opts)
5225 # search for a unique phase argument
5225 # search for a unique phase argument
5226 targetphase = None
5226 targetphase = None
5227 for idx, name in enumerate(phases.cmdphasenames):
5227 for idx, name in enumerate(phases.cmdphasenames):
5228 if opts[name]:
5228 if opts[name]:
5229 if targetphase is not None:
5229 if targetphase is not None:
5230 raise error.Abort(_(b'only one phase can be specified'))
5230 raise error.Abort(_(b'only one phase can be specified'))
5231 targetphase = idx
5231 targetphase = idx
5232
5232
5233 # look for specified revision
5233 # look for specified revision
5234 revs = list(revs)
5234 revs = list(revs)
5235 revs.extend(opts[b'rev'])
5235 revs.extend(opts[b'rev'])
5236 if not revs:
5236 if not revs:
5237 # display both parents as the second parent phase can influence
5237 # display both parents as the second parent phase can influence
5238 # the phase of a merge commit
5238 # the phase of a merge commit
5239 revs = [c.rev() for c in repo[None].parents()]
5239 revs = [c.rev() for c in repo[None].parents()]
5240
5240
5241 revs = scmutil.revrange(repo, revs)
5241 revs = scmutil.revrange(repo, revs)
5242
5242
5243 ret = 0
5243 ret = 0
5244 if targetphase is None:
5244 if targetphase is None:
5245 # display
5245 # display
5246 for r in revs:
5246 for r in revs:
5247 ctx = repo[r]
5247 ctx = repo[r]
5248 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5248 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5249 else:
5249 else:
5250 with repo.lock(), repo.transaction(b"phase") as tr:
5250 with repo.lock(), repo.transaction(b"phase") as tr:
5251 # set phase
5251 # set phase
5252 if not revs:
5252 if not revs:
5253 raise error.Abort(_(b'empty revision set'))
5253 raise error.Abort(_(b'empty revision set'))
5254 nodes = [repo[r].node() for r in revs]
5254 nodes = [repo[r].node() for r in revs]
5255 # moving revision from public to draft may hide them
5255 # moving revision from public to draft may hide them
5256 # We have to check result on an unfiltered repository
5256 # We have to check result on an unfiltered repository
5257 unfi = repo.unfiltered()
5257 unfi = repo.unfiltered()
5258 getphase = unfi._phasecache.phase
5258 getphase = unfi._phasecache.phase
5259 olddata = [getphase(unfi, r) for r in unfi]
5259 olddata = [getphase(unfi, r) for r in unfi]
5260 phases.advanceboundary(repo, tr, targetphase, nodes)
5260 phases.advanceboundary(repo, tr, targetphase, nodes)
5261 if opts[b'force']:
5261 if opts[b'force']:
5262 phases.retractboundary(repo, tr, targetphase, nodes)
5262 phases.retractboundary(repo, tr, targetphase, nodes)
5263 getphase = unfi._phasecache.phase
5263 getphase = unfi._phasecache.phase
5264 newdata = [getphase(unfi, r) for r in unfi]
5264 newdata = [getphase(unfi, r) for r in unfi]
5265 changes = sum(newdata[r] != olddata[r] for r in unfi)
5265 changes = sum(newdata[r] != olddata[r] for r in unfi)
5266 cl = unfi.changelog
5266 cl = unfi.changelog
5267 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5267 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5268 if rejected:
5268 if rejected:
5269 ui.warn(
5269 ui.warn(
5270 _(
5270 _(
5271 b'cannot move %i changesets to a higher '
5271 b'cannot move %i changesets to a higher '
5272 b'phase, use --force\n'
5272 b'phase, use --force\n'
5273 )
5273 )
5274 % len(rejected)
5274 % len(rejected)
5275 )
5275 )
5276 ret = 1
5276 ret = 1
5277 if changes:
5277 if changes:
5278 msg = _(b'phase changed for %i changesets\n') % changes
5278 msg = _(b'phase changed for %i changesets\n') % changes
5279 if ret:
5279 if ret:
5280 ui.status(msg)
5280 ui.status(msg)
5281 else:
5281 else:
5282 ui.note(msg)
5282 ui.note(msg)
5283 else:
5283 else:
5284 ui.warn(_(b'no phases changed\n'))
5284 ui.warn(_(b'no phases changed\n'))
5285 return ret
5285 return ret
5286
5286
5287
5287
5288 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5288 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5289 """Run after a changegroup has been added via pull/unbundle
5289 """Run after a changegroup has been added via pull/unbundle
5290
5290
5291 This takes arguments below:
5291 This takes arguments below:
5292
5292
5293 :modheads: change of heads by pull/unbundle
5293 :modheads: change of heads by pull/unbundle
5294 :optupdate: updating working directory is needed or not
5294 :optupdate: updating working directory is needed or not
5295 :checkout: update destination revision (or None to default destination)
5295 :checkout: update destination revision (or None to default destination)
5296 :brev: a name, which might be a bookmark to be activated after updating
5296 :brev: a name, which might be a bookmark to be activated after updating
5297 """
5297 """
5298 if modheads == 0:
5298 if modheads == 0:
5299 return
5299 return
5300 if optupdate:
5300 if optupdate:
5301 try:
5301 try:
5302 return hg.updatetotally(ui, repo, checkout, brev)
5302 return hg.updatetotally(ui, repo, checkout, brev)
5303 except error.UpdateAbort as inst:
5303 except error.UpdateAbort as inst:
5304 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5304 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5305 hint = inst.hint
5305 hint = inst.hint
5306 raise error.UpdateAbort(msg, hint=hint)
5306 raise error.UpdateAbort(msg, hint=hint)
5307 if modheads is not None and modheads > 1:
5307 if modheads is not None and modheads > 1:
5308 currentbranchheads = len(repo.branchheads())
5308 currentbranchheads = len(repo.branchheads())
5309 if currentbranchheads == modheads:
5309 if currentbranchheads == modheads:
5310 ui.status(
5310 ui.status(
5311 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5311 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5312 )
5312 )
5313 elif currentbranchheads > 1:
5313 elif currentbranchheads > 1:
5314 ui.status(
5314 ui.status(
5315 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5315 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5316 )
5316 )
5317 else:
5317 else:
5318 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5318 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5319 elif not ui.configbool(b'commands', b'update.requiredest'):
5319 elif not ui.configbool(b'commands', b'update.requiredest'):
5320 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5320 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5321
5321
5322
5322
5323 @command(
5323 @command(
5324 b'pull',
5324 b'pull',
5325 [
5325 [
5326 (
5326 (
5327 b'u',
5327 b'u',
5328 b'update',
5328 b'update',
5329 None,
5329 None,
5330 _(b'update to new branch head if new descendants were pulled'),
5330 _(b'update to new branch head if new descendants were pulled'),
5331 ),
5331 ),
5332 (
5332 (
5333 b'f',
5333 b'f',
5334 b'force',
5334 b'force',
5335 None,
5335 None,
5336 _(b'run even when remote repository is unrelated'),
5336 _(b'run even when remote repository is unrelated'),
5337 ),
5337 ),
5338 (
5338 (
5339 b'r',
5339 b'r',
5340 b'rev',
5340 b'rev',
5341 [],
5341 [],
5342 _(b'a remote changeset intended to be added'),
5342 _(b'a remote changeset intended to be added'),
5343 _(b'REV'),
5343 _(b'REV'),
5344 ),
5344 ),
5345 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5345 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5346 (
5346 (
5347 b'b',
5347 b'b',
5348 b'branch',
5348 b'branch',
5349 [],
5349 [],
5350 _(b'a specific branch you would like to pull'),
5350 _(b'a specific branch you would like to pull'),
5351 _(b'BRANCH'),
5351 _(b'BRANCH'),
5352 ),
5352 ),
5353 ]
5353 ]
5354 + remoteopts,
5354 + remoteopts,
5355 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5355 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5356 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5356 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5357 helpbasic=True,
5357 helpbasic=True,
5358 )
5358 )
5359 def pull(ui, repo, source=b"default", **opts):
5359 def pull(ui, repo, source=b"default", **opts):
5360 """pull changes from the specified source
5360 """pull changes from the specified source
5361
5361
5362 Pull changes from a remote repository to a local one.
5362 Pull changes from a remote repository to a local one.
5363
5363
5364 This finds all changes from the repository at the specified path
5364 This finds all changes from the repository at the specified path
5365 or URL and adds them to a local repository (the current one unless
5365 or URL and adds them to a local repository (the current one unless
5366 -R is specified). By default, this does not update the copy of the
5366 -R is specified). By default, this does not update the copy of the
5367 project in the working directory.
5367 project in the working directory.
5368
5368
5369 When cloning from servers that support it, Mercurial may fetch
5369 When cloning from servers that support it, Mercurial may fetch
5370 pre-generated data. When this is done, hooks operating on incoming
5370 pre-generated data. When this is done, hooks operating on incoming
5371 changesets and changegroups may fire more than once, once for each
5371 changesets and changegroups may fire more than once, once for each
5372 pre-generated bundle and as well as for any additional remaining
5372 pre-generated bundle and as well as for any additional remaining
5373 data. See :hg:`help -e clonebundles` for more.
5373 data. See :hg:`help -e clonebundles` for more.
5374
5374
5375 Use :hg:`incoming` if you want to see what would have been added
5375 Use :hg:`incoming` if you want to see what would have been added
5376 by a pull at the time you issued this command. If you then decide
5376 by a pull at the time you issued this command. If you then decide
5377 to add those changes to the repository, you should use :hg:`pull
5377 to add those changes to the repository, you should use :hg:`pull
5378 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5378 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5379
5379
5380 If SOURCE is omitted, the 'default' path will be used.
5380 If SOURCE is omitted, the 'default' path will be used.
5381 See :hg:`help urls` for more information.
5381 See :hg:`help urls` for more information.
5382
5382
5383 Specifying bookmark as ``.`` is equivalent to specifying the active
5383 Specifying bookmark as ``.`` is equivalent to specifying the active
5384 bookmark's name.
5384 bookmark's name.
5385
5385
5386 Returns 0 on success, 1 if an update had unresolved files.
5386 Returns 0 on success, 1 if an update had unresolved files.
5387 """
5387 """
5388
5388
5389 opts = pycompat.byteskwargs(opts)
5389 opts = pycompat.byteskwargs(opts)
5390 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5390 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5391 b'update'
5391 b'update'
5392 ):
5392 ):
5393 msg = _(b'update destination required by configuration')
5393 msg = _(b'update destination required by configuration')
5394 hint = _(b'use hg pull followed by hg update DEST')
5394 hint = _(b'use hg pull followed by hg update DEST')
5395 raise error.Abort(msg, hint=hint)
5395 raise error.Abort(msg, hint=hint)
5396
5396
5397 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5397 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5398 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5398 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5399 other = hg.peer(repo, opts, source)
5399 other = hg.peer(repo, opts, source)
5400 try:
5400 try:
5401 revs, checkout = hg.addbranchrevs(
5401 revs, checkout = hg.addbranchrevs(
5402 repo, other, branches, opts.get(b'rev')
5402 repo, other, branches, opts.get(b'rev')
5403 )
5403 )
5404
5404
5405 pullopargs = {}
5405 pullopargs = {}
5406
5406
5407 nodes = None
5407 nodes = None
5408 if opts.get(b'bookmark') or revs:
5408 if opts.get(b'bookmark') or revs:
5409 # The list of bookmark used here is the same used to actually update
5409 # The list of bookmark used here is the same used to actually update
5410 # the bookmark names, to avoid the race from issue 4689 and we do
5410 # the bookmark names, to avoid the race from issue 4689 and we do
5411 # all lookup and bookmark queries in one go so they see the same
5411 # all lookup and bookmark queries in one go so they see the same
5412 # version of the server state (issue 4700).
5412 # version of the server state (issue 4700).
5413 nodes = []
5413 nodes = []
5414 fnodes = []
5414 fnodes = []
5415 revs = revs or []
5415 revs = revs or []
5416 if revs and not other.capable(b'lookup'):
5416 if revs and not other.capable(b'lookup'):
5417 err = _(
5417 err = _(
5418 b"other repository doesn't support revision lookup, "
5418 b"other repository doesn't support revision lookup, "
5419 b"so a rev cannot be specified."
5419 b"so a rev cannot be specified."
5420 )
5420 )
5421 raise error.Abort(err)
5421 raise error.Abort(err)
5422 with other.commandexecutor() as e:
5422 with other.commandexecutor() as e:
5423 fremotebookmarks = e.callcommand(
5423 fremotebookmarks = e.callcommand(
5424 b'listkeys', {b'namespace': b'bookmarks'}
5424 b'listkeys', {b'namespace': b'bookmarks'}
5425 )
5425 )
5426 for r in revs:
5426 for r in revs:
5427 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5427 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5428 remotebookmarks = fremotebookmarks.result()
5428 remotebookmarks = fremotebookmarks.result()
5429 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5429 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5430 pullopargs[b'remotebookmarks'] = remotebookmarks
5430 pullopargs[b'remotebookmarks'] = remotebookmarks
5431 for b in opts.get(b'bookmark', []):
5431 for b in opts.get(b'bookmark', []):
5432 b = repo._bookmarks.expandname(b)
5432 b = repo._bookmarks.expandname(b)
5433 if b not in remotebookmarks:
5433 if b not in remotebookmarks:
5434 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5434 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5435 nodes.append(remotebookmarks[b])
5435 nodes.append(remotebookmarks[b])
5436 for i, rev in enumerate(revs):
5436 for i, rev in enumerate(revs):
5437 node = fnodes[i].result()
5437 node = fnodes[i].result()
5438 nodes.append(node)
5438 nodes.append(node)
5439 if rev == checkout:
5439 if rev == checkout:
5440 checkout = node
5440 checkout = node
5441
5441
5442 wlock = util.nullcontextmanager()
5442 wlock = util.nullcontextmanager()
5443 if opts.get(b'update'):
5443 if opts.get(b'update'):
5444 wlock = repo.wlock()
5444 wlock = repo.wlock()
5445 with wlock:
5445 with wlock:
5446 pullopargs.update(opts.get(b'opargs', {}))
5446 pullopargs.update(opts.get(b'opargs', {}))
5447 modheads = exchange.pull(
5447 modheads = exchange.pull(
5448 repo,
5448 repo,
5449 other,
5449 other,
5450 heads=nodes,
5450 heads=nodes,
5451 force=opts.get(b'force'),
5451 force=opts.get(b'force'),
5452 bookmarks=opts.get(b'bookmark', ()),
5452 bookmarks=opts.get(b'bookmark', ()),
5453 opargs=pullopargs,
5453 opargs=pullopargs,
5454 ).cgresult
5454 ).cgresult
5455
5455
5456 # brev is a name, which might be a bookmark to be activated at
5456 # brev is a name, which might be a bookmark to be activated at
5457 # the end of the update. In other words, it is an explicit
5457 # the end of the update. In other words, it is an explicit
5458 # destination of the update
5458 # destination of the update
5459 brev = None
5459 brev = None
5460
5460
5461 if checkout:
5461 if checkout:
5462 checkout = repo.unfiltered().changelog.rev(checkout)
5462 checkout = repo.unfiltered().changelog.rev(checkout)
5463
5463
5464 # order below depends on implementation of
5464 # order below depends on implementation of
5465 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5465 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5466 # because 'checkout' is determined without it.
5466 # because 'checkout' is determined without it.
5467 if opts.get(b'rev'):
5467 if opts.get(b'rev'):
5468 brev = opts[b'rev'][0]
5468 brev = opts[b'rev'][0]
5469 elif opts.get(b'branch'):
5469 elif opts.get(b'branch'):
5470 brev = opts[b'branch'][0]
5470 brev = opts[b'branch'][0]
5471 else:
5471 else:
5472 brev = branches[0]
5472 brev = branches[0]
5473 repo._subtoppath = source
5473 repo._subtoppath = source
5474 try:
5474 try:
5475 ret = postincoming(
5475 ret = postincoming(
5476 ui, repo, modheads, opts.get(b'update'), checkout, brev
5476 ui, repo, modheads, opts.get(b'update'), checkout, brev
5477 )
5477 )
5478 except error.FilteredRepoLookupError as exc:
5478 except error.FilteredRepoLookupError as exc:
5479 msg = _(b'cannot update to target: %s') % exc.args[0]
5479 msg = _(b'cannot update to target: %s') % exc.args[0]
5480 exc.args = (msg,) + exc.args[1:]
5480 exc.args = (msg,) + exc.args[1:]
5481 raise
5481 raise
5482 finally:
5482 finally:
5483 del repo._subtoppath
5483 del repo._subtoppath
5484
5484
5485 finally:
5485 finally:
5486 other.close()
5486 other.close()
5487 return ret
5487 return ret
5488
5488
5489
5489
5490 @command(
5490 @command(
5491 b'push',
5491 b'push',
5492 [
5492 [
5493 (b'f', b'force', None, _(b'force push')),
5493 (b'f', b'force', None, _(b'force push')),
5494 (
5494 (
5495 b'r',
5495 b'r',
5496 b'rev',
5496 b'rev',
5497 [],
5497 [],
5498 _(b'a changeset intended to be included in the destination'),
5498 _(b'a changeset intended to be included in the destination'),
5499 _(b'REV'),
5499 _(b'REV'),
5500 ),
5500 ),
5501 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5501 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5502 (
5502 (
5503 b'b',
5503 b'b',
5504 b'branch',
5504 b'branch',
5505 [],
5505 [],
5506 _(b'a specific branch you would like to push'),
5506 _(b'a specific branch you would like to push'),
5507 _(b'BRANCH'),
5507 _(b'BRANCH'),
5508 ),
5508 ),
5509 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5509 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5510 (
5510 (
5511 b'',
5511 b'',
5512 b'pushvars',
5512 b'pushvars',
5513 [],
5513 [],
5514 _(b'variables that can be sent to server (ADVANCED)'),
5514 _(b'variables that can be sent to server (ADVANCED)'),
5515 ),
5515 ),
5516 (
5516 (
5517 b'',
5517 b'',
5518 b'publish',
5518 b'publish',
5519 False,
5519 False,
5520 _(b'push the changeset as public (EXPERIMENTAL)'),
5520 _(b'push the changeset as public (EXPERIMENTAL)'),
5521 ),
5521 ),
5522 ]
5522 ]
5523 + remoteopts,
5523 + remoteopts,
5524 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5524 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5525 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5525 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5526 helpbasic=True,
5526 helpbasic=True,
5527 )
5527 )
5528 def push(ui, repo, dest=None, **opts):
5528 def push(ui, repo, dest=None, **opts):
5529 """push changes to the specified destination
5529 """push changes to the specified destination
5530
5530
5531 Push changesets from the local repository to the specified
5531 Push changesets from the local repository to the specified
5532 destination.
5532 destination.
5533
5533
5534 This operation is symmetrical to pull: it is identical to a pull
5534 This operation is symmetrical to pull: it is identical to a pull
5535 in the destination repository from the current one.
5535 in the destination repository from the current one.
5536
5536
5537 By default, push will not allow creation of new heads at the
5537 By default, push will not allow creation of new heads at the
5538 destination, since multiple heads would make it unclear which head
5538 destination, since multiple heads would make it unclear which head
5539 to use. In this situation, it is recommended to pull and merge
5539 to use. In this situation, it is recommended to pull and merge
5540 before pushing.
5540 before pushing.
5541
5541
5542 Use --new-branch if you want to allow push to create a new named
5542 Use --new-branch if you want to allow push to create a new named
5543 branch that is not present at the destination. This allows you to
5543 branch that is not present at the destination. This allows you to
5544 only create a new branch without forcing other changes.
5544 only create a new branch without forcing other changes.
5545
5545
5546 .. note::
5546 .. note::
5547
5547
5548 Extra care should be taken with the -f/--force option,
5548 Extra care should be taken with the -f/--force option,
5549 which will push all new heads on all branches, an action which will
5549 which will push all new heads on all branches, an action which will
5550 almost always cause confusion for collaborators.
5550 almost always cause confusion for collaborators.
5551
5551
5552 If -r/--rev is used, the specified revision and all its ancestors
5552 If -r/--rev is used, the specified revision and all its ancestors
5553 will be pushed to the remote repository.
5553 will be pushed to the remote repository.
5554
5554
5555 If -B/--bookmark is used, the specified bookmarked revision, its
5555 If -B/--bookmark is used, the specified bookmarked revision, its
5556 ancestors, and the bookmark will be pushed to the remote
5556 ancestors, and the bookmark will be pushed to the remote
5557 repository. Specifying ``.`` is equivalent to specifying the active
5557 repository. Specifying ``.`` is equivalent to specifying the active
5558 bookmark's name.
5558 bookmark's name.
5559
5559
5560 Please see :hg:`help urls` for important details about ``ssh://``
5560 Please see :hg:`help urls` for important details about ``ssh://``
5561 URLs. If DESTINATION is omitted, a default path will be used.
5561 URLs. If DESTINATION is omitted, a default path will be used.
5562
5562
5563 .. container:: verbose
5563 .. container:: verbose
5564
5564
5565 The --pushvars option sends strings to the server that become
5565 The --pushvars option sends strings to the server that become
5566 environment variables prepended with ``HG_USERVAR_``. For example,
5566 environment variables prepended with ``HG_USERVAR_``. For example,
5567 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5567 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5568 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5568 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5569
5569
5570 pushvars can provide for user-overridable hooks as well as set debug
5570 pushvars can provide for user-overridable hooks as well as set debug
5571 levels. One example is having a hook that blocks commits containing
5571 levels. One example is having a hook that blocks commits containing
5572 conflict markers, but enables the user to override the hook if the file
5572 conflict markers, but enables the user to override the hook if the file
5573 is using conflict markers for testing purposes or the file format has
5573 is using conflict markers for testing purposes or the file format has
5574 strings that look like conflict markers.
5574 strings that look like conflict markers.
5575
5575
5576 By default, servers will ignore `--pushvars`. To enable it add the
5576 By default, servers will ignore `--pushvars`. To enable it add the
5577 following to your configuration file::
5577 following to your configuration file::
5578
5578
5579 [push]
5579 [push]
5580 pushvars.server = true
5580 pushvars.server = true
5581
5581
5582 Returns 0 if push was successful, 1 if nothing to push.
5582 Returns 0 if push was successful, 1 if nothing to push.
5583 """
5583 """
5584
5584
5585 opts = pycompat.byteskwargs(opts)
5585 opts = pycompat.byteskwargs(opts)
5586 if opts.get(b'bookmark'):
5586 if opts.get(b'bookmark'):
5587 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5587 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5588 for b in opts[b'bookmark']:
5588 for b in opts[b'bookmark']:
5589 # translate -B options to -r so changesets get pushed
5589 # translate -B options to -r so changesets get pushed
5590 b = repo._bookmarks.expandname(b)
5590 b = repo._bookmarks.expandname(b)
5591 if b in repo._bookmarks:
5591 if b in repo._bookmarks:
5592 opts.setdefault(b'rev', []).append(b)
5592 opts.setdefault(b'rev', []).append(b)
5593 else:
5593 else:
5594 # if we try to push a deleted bookmark, translate it to null
5594 # if we try to push a deleted bookmark, translate it to null
5595 # this lets simultaneous -r, -b options continue working
5595 # this lets simultaneous -r, -b options continue working
5596 opts.setdefault(b'rev', []).append(b"null")
5596 opts.setdefault(b'rev', []).append(b"null")
5597
5597
5598 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5598 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5599 if not path:
5599 if not path:
5600 raise error.Abort(
5600 raise error.Abort(
5601 _(b'default repository not configured!'),
5601 _(b'default repository not configured!'),
5602 hint=_(b"see 'hg help config.paths'"),
5602 hint=_(b"see 'hg help config.paths'"),
5603 )
5603 )
5604 dest = path.pushloc or path.loc
5604 dest = path.pushloc or path.loc
5605 branches = (path.branch, opts.get(b'branch') or [])
5605 branches = (path.branch, opts.get(b'branch') or [])
5606 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5606 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5607 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5607 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5608 other = hg.peer(repo, opts, dest)
5608 other = hg.peer(repo, opts, dest)
5609
5609
5610 if revs:
5610 if revs:
5611 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5611 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5612 if not revs:
5612 if not revs:
5613 raise error.Abort(
5613 raise error.Abort(
5614 _(b"specified revisions evaluate to an empty set"),
5614 _(b"specified revisions evaluate to an empty set"),
5615 hint=_(b"use different revision arguments"),
5615 hint=_(b"use different revision arguments"),
5616 )
5616 )
5617 elif path.pushrev:
5617 elif path.pushrev:
5618 # It doesn't make any sense to specify ancestor revisions. So limit
5618 # It doesn't make any sense to specify ancestor revisions. So limit
5619 # to DAG heads to make discovery simpler.
5619 # to DAG heads to make discovery simpler.
5620 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5620 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5621 revs = scmutil.revrange(repo, [expr])
5621 revs = scmutil.revrange(repo, [expr])
5622 revs = [repo[rev].node() for rev in revs]
5622 revs = [repo[rev].node() for rev in revs]
5623 if not revs:
5623 if not revs:
5624 raise error.Abort(
5624 raise error.Abort(
5625 _(b'default push revset for path evaluates to an empty set')
5625 _(b'default push revset for path evaluates to an empty set')
5626 )
5626 )
5627 elif ui.configbool(b'commands', b'push.require-revs'):
5627 elif ui.configbool(b'commands', b'push.require-revs'):
5628 raise error.Abort(
5628 raise error.Abort(
5629 _(b'no revisions specified to push'),
5629 _(b'no revisions specified to push'),
5630 hint=_(b'did you mean "hg push -r ."?'),
5630 hint=_(b'did you mean "hg push -r ."?'),
5631 )
5631 )
5632
5632
5633 repo._subtoppath = dest
5633 repo._subtoppath = dest
5634 try:
5634 try:
5635 # push subrepos depth-first for coherent ordering
5635 # push subrepos depth-first for coherent ordering
5636 c = repo[b'.']
5636 c = repo[b'.']
5637 subs = c.substate # only repos that are committed
5637 subs = c.substate # only repos that are committed
5638 for s in sorted(subs):
5638 for s in sorted(subs):
5639 result = c.sub(s).push(opts)
5639 result = c.sub(s).push(opts)
5640 if result == 0:
5640 if result == 0:
5641 return not result
5641 return not result
5642 finally:
5642 finally:
5643 del repo._subtoppath
5643 del repo._subtoppath
5644
5644
5645 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5645 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5646 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5646 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5647
5647
5648 pushop = exchange.push(
5648 pushop = exchange.push(
5649 repo,
5649 repo,
5650 other,
5650 other,
5651 opts.get(b'force'),
5651 opts.get(b'force'),
5652 revs=revs,
5652 revs=revs,
5653 newbranch=opts.get(b'new_branch'),
5653 newbranch=opts.get(b'new_branch'),
5654 bookmarks=opts.get(b'bookmark', ()),
5654 bookmarks=opts.get(b'bookmark', ()),
5655 publish=opts.get(b'publish'),
5655 publish=opts.get(b'publish'),
5656 opargs=opargs,
5656 opargs=opargs,
5657 )
5657 )
5658
5658
5659 result = not pushop.cgresult
5659 result = not pushop.cgresult
5660
5660
5661 if pushop.bkresult is not None:
5661 if pushop.bkresult is not None:
5662 if pushop.bkresult == 2:
5662 if pushop.bkresult == 2:
5663 result = 2
5663 result = 2
5664 elif not result and pushop.bkresult:
5664 elif not result and pushop.bkresult:
5665 result = 2
5665 result = 2
5666
5666
5667 return result
5667 return result
5668
5668
5669
5669
5670 @command(
5670 @command(
5671 b'recover',
5671 b'recover',
5672 [(b'', b'verify', True, b"run `hg verify` after successful recover"),],
5672 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5673 helpcategory=command.CATEGORY_MAINTENANCE,
5673 helpcategory=command.CATEGORY_MAINTENANCE,
5674 )
5674 )
5675 def recover(ui, repo, **opts):
5675 def recover(ui, repo, **opts):
5676 """roll back an interrupted transaction
5676 """roll back an interrupted transaction
5677
5677
5678 Recover from an interrupted commit or pull.
5678 Recover from an interrupted commit or pull.
5679
5679
5680 This command tries to fix the repository status after an
5680 This command tries to fix the repository status after an
5681 interrupted operation. It should only be necessary when Mercurial
5681 interrupted operation. It should only be necessary when Mercurial
5682 suggests it.
5682 suggests it.
5683
5683
5684 Returns 0 if successful, 1 if nothing to recover or verify fails.
5684 Returns 0 if successful, 1 if nothing to recover or verify fails.
5685 """
5685 """
5686 ret = repo.recover()
5686 ret = repo.recover()
5687 if ret:
5687 if ret:
5688 if opts['verify']:
5688 if opts['verify']:
5689 return hg.verify(repo)
5689 return hg.verify(repo)
5690 else:
5690 else:
5691 msg = _(
5691 msg = _(
5692 b"(verify step skipped, run `hg verify` to check your "
5692 b"(verify step skipped, run `hg verify` to check your "
5693 b"repository content)\n"
5693 b"repository content)\n"
5694 )
5694 )
5695 ui.warn(msg)
5695 ui.warn(msg)
5696 return 0
5696 return 0
5697 return 1
5697 return 1
5698
5698
5699
5699
5700 @command(
5700 @command(
5701 b'remove|rm',
5701 b'remove|rm',
5702 [
5702 [
5703 (b'A', b'after', None, _(b'record delete for missing files')),
5703 (b'A', b'after', None, _(b'record delete for missing files')),
5704 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5704 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5705 ]
5705 ]
5706 + subrepoopts
5706 + subrepoopts
5707 + walkopts
5707 + walkopts
5708 + dryrunopts,
5708 + dryrunopts,
5709 _(b'[OPTION]... FILE...'),
5709 _(b'[OPTION]... FILE...'),
5710 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5710 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5711 helpbasic=True,
5711 helpbasic=True,
5712 inferrepo=True,
5712 inferrepo=True,
5713 )
5713 )
5714 def remove(ui, repo, *pats, **opts):
5714 def remove(ui, repo, *pats, **opts):
5715 """remove the specified files on the next commit
5715 """remove the specified files on the next commit
5716
5716
5717 Schedule the indicated files for removal from the current branch.
5717 Schedule the indicated files for removal from the current branch.
5718
5718
5719 This command schedules the files to be removed at the next commit.
5719 This command schedules the files to be removed at the next commit.
5720 To undo a remove before that, see :hg:`revert`. To undo added
5720 To undo a remove before that, see :hg:`revert`. To undo added
5721 files, see :hg:`forget`.
5721 files, see :hg:`forget`.
5722
5722
5723 .. container:: verbose
5723 .. container:: verbose
5724
5724
5725 -A/--after can be used to remove only files that have already
5725 -A/--after can be used to remove only files that have already
5726 been deleted, -f/--force can be used to force deletion, and -Af
5726 been deleted, -f/--force can be used to force deletion, and -Af
5727 can be used to remove files from the next revision without
5727 can be used to remove files from the next revision without
5728 deleting them from the working directory.
5728 deleting them from the working directory.
5729
5729
5730 The following table details the behavior of remove for different
5730 The following table details the behavior of remove for different
5731 file states (columns) and option combinations (rows). The file
5731 file states (columns) and option combinations (rows). The file
5732 states are Added [A], Clean [C], Modified [M] and Missing [!]
5732 states are Added [A], Clean [C], Modified [M] and Missing [!]
5733 (as reported by :hg:`status`). The actions are Warn, Remove
5733 (as reported by :hg:`status`). The actions are Warn, Remove
5734 (from branch) and Delete (from disk):
5734 (from branch) and Delete (from disk):
5735
5735
5736 ========= == == == ==
5736 ========= == == == ==
5737 opt/state A C M !
5737 opt/state A C M !
5738 ========= == == == ==
5738 ========= == == == ==
5739 none W RD W R
5739 none W RD W R
5740 -f R RD RD R
5740 -f R RD RD R
5741 -A W W W R
5741 -A W W W R
5742 -Af R R R R
5742 -Af R R R R
5743 ========= == == == ==
5743 ========= == == == ==
5744
5744
5745 .. note::
5745 .. note::
5746
5746
5747 :hg:`remove` never deletes files in Added [A] state from the
5747 :hg:`remove` never deletes files in Added [A] state from the
5748 working directory, not even if ``--force`` is specified.
5748 working directory, not even if ``--force`` is specified.
5749
5749
5750 Returns 0 on success, 1 if any warnings encountered.
5750 Returns 0 on success, 1 if any warnings encountered.
5751 """
5751 """
5752
5752
5753 opts = pycompat.byteskwargs(opts)
5753 opts = pycompat.byteskwargs(opts)
5754 after, force = opts.get(b'after'), opts.get(b'force')
5754 after, force = opts.get(b'after'), opts.get(b'force')
5755 dryrun = opts.get(b'dry_run')
5755 dryrun = opts.get(b'dry_run')
5756 if not pats and not after:
5756 if not pats and not after:
5757 raise error.Abort(_(b'no files specified'))
5757 raise error.Abort(_(b'no files specified'))
5758
5758
5759 m = scmutil.match(repo[None], pats, opts)
5759 m = scmutil.match(repo[None], pats, opts)
5760 subrepos = opts.get(b'subrepos')
5760 subrepos = opts.get(b'subrepos')
5761 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5761 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5762 return cmdutil.remove(
5762 return cmdutil.remove(
5763 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5763 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5764 )
5764 )
5765
5765
5766
5766
5767 @command(
5767 @command(
5768 b'rename|move|mv',
5768 b'rename|move|mv',
5769 [
5769 [
5770 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5770 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5771 (
5771 (
5772 b'f',
5772 b'f',
5773 b'force',
5773 b'force',
5774 None,
5774 None,
5775 _(b'forcibly move over an existing managed file'),
5775 _(b'forcibly move over an existing managed file'),
5776 ),
5776 ),
5777 ]
5777 ]
5778 + walkopts
5778 + walkopts
5779 + dryrunopts,
5779 + dryrunopts,
5780 _(b'[OPTION]... SOURCE... DEST'),
5780 _(b'[OPTION]... SOURCE... DEST'),
5781 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5781 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5782 )
5782 )
5783 def rename(ui, repo, *pats, **opts):
5783 def rename(ui, repo, *pats, **opts):
5784 """rename files; equivalent of copy + remove
5784 """rename files; equivalent of copy + remove
5785
5785
5786 Mark dest as copies of sources; mark sources for deletion. If dest
5786 Mark dest as copies of sources; mark sources for deletion. If dest
5787 is a directory, copies are put in that directory. If dest is a
5787 is a directory, copies are put in that directory. If dest is a
5788 file, there can only be one source.
5788 file, there can only be one source.
5789
5789
5790 By default, this command copies the contents of files as they
5790 By default, this command copies the contents of files as they
5791 exist in the working directory. If invoked with -A/--after, the
5791 exist in the working directory. If invoked with -A/--after, the
5792 operation is recorded, but no copying is performed.
5792 operation is recorded, but no copying is performed.
5793
5793
5794 This command takes effect at the next commit. To undo a rename
5794 This command takes effect at the next commit. To undo a rename
5795 before that, see :hg:`revert`.
5795 before that, see :hg:`revert`.
5796
5796
5797 Returns 0 on success, 1 if errors are encountered.
5797 Returns 0 on success, 1 if errors are encountered.
5798 """
5798 """
5799 opts = pycompat.byteskwargs(opts)
5799 opts = pycompat.byteskwargs(opts)
5800 with repo.wlock(False):
5800 with repo.wlock(False):
5801 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5801 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5802
5802
5803
5803
5804 @command(
5804 @command(
5805 b'resolve',
5805 b'resolve',
5806 [
5806 [
5807 (b'a', b'all', None, _(b'select all unresolved files')),
5807 (b'a', b'all', None, _(b'select all unresolved files')),
5808 (b'l', b'list', None, _(b'list state of files needing merge')),
5808 (b'l', b'list', None, _(b'list state of files needing merge')),
5809 (b'm', b'mark', None, _(b'mark files as resolved')),
5809 (b'm', b'mark', None, _(b'mark files as resolved')),
5810 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5810 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5811 (b'n', b'no-status', None, _(b'hide status prefix')),
5811 (b'n', b'no-status', None, _(b'hide status prefix')),
5812 (b'', b're-merge', None, _(b're-merge files')),
5812 (b'', b're-merge', None, _(b're-merge files')),
5813 ]
5813 ]
5814 + mergetoolopts
5814 + mergetoolopts
5815 + walkopts
5815 + walkopts
5816 + formatteropts,
5816 + formatteropts,
5817 _(b'[OPTION]... [FILE]...'),
5817 _(b'[OPTION]... [FILE]...'),
5818 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5818 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5819 inferrepo=True,
5819 inferrepo=True,
5820 )
5820 )
5821 def resolve(ui, repo, *pats, **opts):
5821 def resolve(ui, repo, *pats, **opts):
5822 """redo merges or set/view the merge status of files
5822 """redo merges or set/view the merge status of files
5823
5823
5824 Merges with unresolved conflicts are often the result of
5824 Merges with unresolved conflicts are often the result of
5825 non-interactive merging using the ``internal:merge`` configuration
5825 non-interactive merging using the ``internal:merge`` configuration
5826 setting, or a command-line merge tool like ``diff3``. The resolve
5826 setting, or a command-line merge tool like ``diff3``. The resolve
5827 command is used to manage the files involved in a merge, after
5827 command is used to manage the files involved in a merge, after
5828 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5828 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5829 working directory must have two parents). See :hg:`help
5829 working directory must have two parents). See :hg:`help
5830 merge-tools` for information on configuring merge tools.
5830 merge-tools` for information on configuring merge tools.
5831
5831
5832 The resolve command can be used in the following ways:
5832 The resolve command can be used in the following ways:
5833
5833
5834 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5834 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5835 the specified files, discarding any previous merge attempts. Re-merging
5835 the specified files, discarding any previous merge attempts. Re-merging
5836 is not performed for files already marked as resolved. Use ``--all/-a``
5836 is not performed for files already marked as resolved. Use ``--all/-a``
5837 to select all unresolved files. ``--tool`` can be used to specify
5837 to select all unresolved files. ``--tool`` can be used to specify
5838 the merge tool used for the given files. It overrides the HGMERGE
5838 the merge tool used for the given files. It overrides the HGMERGE
5839 environment variable and your configuration files. Previous file
5839 environment variable and your configuration files. Previous file
5840 contents are saved with a ``.orig`` suffix.
5840 contents are saved with a ``.orig`` suffix.
5841
5841
5842 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5842 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5843 (e.g. after having manually fixed-up the files). The default is
5843 (e.g. after having manually fixed-up the files). The default is
5844 to mark all unresolved files.
5844 to mark all unresolved files.
5845
5845
5846 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5846 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5847 default is to mark all resolved files.
5847 default is to mark all resolved files.
5848
5848
5849 - :hg:`resolve -l`: list files which had or still have conflicts.
5849 - :hg:`resolve -l`: list files which had or still have conflicts.
5850 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5850 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5851 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5851 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5852 the list. See :hg:`help filesets` for details.
5852 the list. See :hg:`help filesets` for details.
5853
5853
5854 .. note::
5854 .. note::
5855
5855
5856 Mercurial will not let you commit files with unresolved merge
5856 Mercurial will not let you commit files with unresolved merge
5857 conflicts. You must use :hg:`resolve -m ...` before you can
5857 conflicts. You must use :hg:`resolve -m ...` before you can
5858 commit after a conflicting merge.
5858 commit after a conflicting merge.
5859
5859
5860 .. container:: verbose
5860 .. container:: verbose
5861
5861
5862 Template:
5862 Template:
5863
5863
5864 The following keywords are supported in addition to the common template
5864 The following keywords are supported in addition to the common template
5865 keywords and functions. See also :hg:`help templates`.
5865 keywords and functions. See also :hg:`help templates`.
5866
5866
5867 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5867 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5868 :path: String. Repository-absolute path of the file.
5868 :path: String. Repository-absolute path of the file.
5869
5869
5870 Returns 0 on success, 1 if any files fail a resolve attempt.
5870 Returns 0 on success, 1 if any files fail a resolve attempt.
5871 """
5871 """
5872
5872
5873 opts = pycompat.byteskwargs(opts)
5873 opts = pycompat.byteskwargs(opts)
5874 confirm = ui.configbool(b'commands', b'resolve.confirm')
5874 confirm = ui.configbool(b'commands', b'resolve.confirm')
5875 flaglist = b'all mark unmark list no_status re_merge'.split()
5875 flaglist = b'all mark unmark list no_status re_merge'.split()
5876 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5876 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5877
5877
5878 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5878 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5879 if actioncount > 1:
5879 if actioncount > 1:
5880 raise error.Abort(_(b"too many actions specified"))
5880 raise error.Abort(_(b"too many actions specified"))
5881 elif actioncount == 0 and ui.configbool(
5881 elif actioncount == 0 and ui.configbool(
5882 b'commands', b'resolve.explicit-re-merge'
5882 b'commands', b'resolve.explicit-re-merge'
5883 ):
5883 ):
5884 hint = _(b'use --mark, --unmark, --list or --re-merge')
5884 hint = _(b'use --mark, --unmark, --list or --re-merge')
5885 raise error.Abort(_(b'no action specified'), hint=hint)
5885 raise error.Abort(_(b'no action specified'), hint=hint)
5886 if pats and all:
5886 if pats and all:
5887 raise error.Abort(_(b"can't specify --all and patterns"))
5887 raise error.Abort(_(b"can't specify --all and patterns"))
5888 if not (all or pats or show or mark or unmark):
5888 if not (all or pats or show or mark or unmark):
5889 raise error.Abort(
5889 raise error.Abort(
5890 _(b'no files or directories specified'),
5890 _(b'no files or directories specified'),
5891 hint=b'use --all to re-merge all unresolved files',
5891 hint=b'use --all to re-merge all unresolved files',
5892 )
5892 )
5893
5893
5894 if confirm:
5894 if confirm:
5895 if all:
5895 if all:
5896 if ui.promptchoice(
5896 if ui.promptchoice(
5897 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5897 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5898 ):
5898 ):
5899 raise error.Abort(_(b'user quit'))
5899 raise error.Abort(_(b'user quit'))
5900 if mark and not pats:
5900 if mark and not pats:
5901 if ui.promptchoice(
5901 if ui.promptchoice(
5902 _(
5902 _(
5903 b'mark all unresolved files as resolved (yn)?'
5903 b'mark all unresolved files as resolved (yn)?'
5904 b'$$ &Yes $$ &No'
5904 b'$$ &Yes $$ &No'
5905 )
5905 )
5906 ):
5906 ):
5907 raise error.Abort(_(b'user quit'))
5907 raise error.Abort(_(b'user quit'))
5908 if unmark and not pats:
5908 if unmark and not pats:
5909 if ui.promptchoice(
5909 if ui.promptchoice(
5910 _(
5910 _(
5911 b'mark all resolved files as unresolved (yn)?'
5911 b'mark all resolved files as unresolved (yn)?'
5912 b'$$ &Yes $$ &No'
5912 b'$$ &Yes $$ &No'
5913 )
5913 )
5914 ):
5914 ):
5915 raise error.Abort(_(b'user quit'))
5915 raise error.Abort(_(b'user quit'))
5916
5916
5917 uipathfn = scmutil.getuipathfn(repo)
5917 uipathfn = scmutil.getuipathfn(repo)
5918
5918
5919 if show:
5919 if show:
5920 ui.pager(b'resolve')
5920 ui.pager(b'resolve')
5921 fm = ui.formatter(b'resolve', opts)
5921 fm = ui.formatter(b'resolve', opts)
5922 ms = mergemod.mergestate.read(repo)
5922 ms = mergemod.mergestate.read(repo)
5923 wctx = repo[None]
5923 wctx = repo[None]
5924 m = scmutil.match(wctx, pats, opts)
5924 m = scmutil.match(wctx, pats, opts)
5925
5925
5926 # Labels and keys based on merge state. Unresolved path conflicts show
5926 # Labels and keys based on merge state. Unresolved path conflicts show
5927 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5927 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5928 # resolved conflicts.
5928 # resolved conflicts.
5929 mergestateinfo = {
5929 mergestateinfo = {
5930 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5930 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5931 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5931 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5932 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5932 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5933 b'resolve.unresolved',
5933 b'resolve.unresolved',
5934 b'P',
5934 b'P',
5935 ),
5935 ),
5936 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5936 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5937 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5937 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5938 b'resolve.driverresolved',
5938 b'resolve.driverresolved',
5939 b'D',
5939 b'D',
5940 ),
5940 ),
5941 }
5941 }
5942
5942
5943 for f in ms:
5943 for f in ms:
5944 if not m(f):
5944 if not m(f):
5945 continue
5945 continue
5946
5946
5947 label, key = mergestateinfo[ms[f]]
5947 label, key = mergestateinfo[ms[f]]
5948 fm.startitem()
5948 fm.startitem()
5949 fm.context(ctx=wctx)
5949 fm.context(ctx=wctx)
5950 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5950 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5951 fm.data(path=f)
5951 fm.data(path=f)
5952 fm.plain(b'%s\n' % uipathfn(f), label=label)
5952 fm.plain(b'%s\n' % uipathfn(f), label=label)
5953 fm.end()
5953 fm.end()
5954 return 0
5954 return 0
5955
5955
5956 with repo.wlock():
5956 with repo.wlock():
5957 ms = mergemod.mergestate.read(repo)
5957 ms = mergemod.mergestate.read(repo)
5958
5958
5959 if not (ms.active() or repo.dirstate.p2() != nullid):
5959 if not (ms.active() or repo.dirstate.p2() != nullid):
5960 raise error.Abort(
5960 raise error.Abort(
5961 _(b'resolve command not applicable when not merging')
5961 _(b'resolve command not applicable when not merging')
5962 )
5962 )
5963
5963
5964 wctx = repo[None]
5964 wctx = repo[None]
5965
5965
5966 if (
5966 if (
5967 ms.mergedriver
5967 ms.mergedriver
5968 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5968 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5969 ):
5969 ):
5970 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5970 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5971 ms.commit()
5971 ms.commit()
5972 # allow mark and unmark to go through
5972 # allow mark and unmark to go through
5973 if not mark and not unmark and not proceed:
5973 if not mark and not unmark and not proceed:
5974 return 1
5974 return 1
5975
5975
5976 m = scmutil.match(wctx, pats, opts)
5976 m = scmutil.match(wctx, pats, opts)
5977 ret = 0
5977 ret = 0
5978 didwork = False
5978 didwork = False
5979 runconclude = False
5979 runconclude = False
5980
5980
5981 tocomplete = []
5981 tocomplete = []
5982 hasconflictmarkers = []
5982 hasconflictmarkers = []
5983 if mark:
5983 if mark:
5984 markcheck = ui.config(b'commands', b'resolve.mark-check')
5984 markcheck = ui.config(b'commands', b'resolve.mark-check')
5985 if markcheck not in [b'warn', b'abort']:
5985 if markcheck not in [b'warn', b'abort']:
5986 # Treat all invalid / unrecognized values as 'none'.
5986 # Treat all invalid / unrecognized values as 'none'.
5987 markcheck = False
5987 markcheck = False
5988 for f in ms:
5988 for f in ms:
5989 if not m(f):
5989 if not m(f):
5990 continue
5990 continue
5991
5991
5992 didwork = True
5992 didwork = True
5993
5993
5994 # don't let driver-resolved files be marked, and run the conclude
5994 # don't let driver-resolved files be marked, and run the conclude
5995 # step if asked to resolve
5995 # step if asked to resolve
5996 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
5996 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
5997 exact = m.exact(f)
5997 exact = m.exact(f)
5998 if mark:
5998 if mark:
5999 if exact:
5999 if exact:
6000 ui.warn(
6000 ui.warn(
6001 _(b'not marking %s as it is driver-resolved\n')
6001 _(b'not marking %s as it is driver-resolved\n')
6002 % uipathfn(f)
6002 % uipathfn(f)
6003 )
6003 )
6004 elif unmark:
6004 elif unmark:
6005 if exact:
6005 if exact:
6006 ui.warn(
6006 ui.warn(
6007 _(b'not unmarking %s as it is driver-resolved\n')
6007 _(b'not unmarking %s as it is driver-resolved\n')
6008 % uipathfn(f)
6008 % uipathfn(f)
6009 )
6009 )
6010 else:
6010 else:
6011 runconclude = True
6011 runconclude = True
6012 continue
6012 continue
6013
6013
6014 # path conflicts must be resolved manually
6014 # path conflicts must be resolved manually
6015 if ms[f] in (
6015 if ms[f] in (
6016 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6016 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6017 mergemod.MERGE_RECORD_RESOLVED_PATH,
6017 mergemod.MERGE_RECORD_RESOLVED_PATH,
6018 ):
6018 ):
6019 if mark:
6019 if mark:
6020 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6020 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6021 elif unmark:
6021 elif unmark:
6022 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6022 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6023 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6023 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6024 ui.warn(
6024 ui.warn(
6025 _(b'%s: path conflict must be resolved manually\n')
6025 _(b'%s: path conflict must be resolved manually\n')
6026 % uipathfn(f)
6026 % uipathfn(f)
6027 )
6027 )
6028 continue
6028 continue
6029
6029
6030 if mark:
6030 if mark:
6031 if markcheck:
6031 if markcheck:
6032 fdata = repo.wvfs.tryread(f)
6032 fdata = repo.wvfs.tryread(f)
6033 if (
6033 if (
6034 filemerge.hasconflictmarkers(fdata)
6034 filemerge.hasconflictmarkers(fdata)
6035 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6035 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6036 ):
6036 ):
6037 hasconflictmarkers.append(f)
6037 hasconflictmarkers.append(f)
6038 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6038 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6039 elif unmark:
6039 elif unmark:
6040 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6040 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6041 else:
6041 else:
6042 # backup pre-resolve (merge uses .orig for its own purposes)
6042 # backup pre-resolve (merge uses .orig for its own purposes)
6043 a = repo.wjoin(f)
6043 a = repo.wjoin(f)
6044 try:
6044 try:
6045 util.copyfile(a, a + b".resolve")
6045 util.copyfile(a, a + b".resolve")
6046 except (IOError, OSError) as inst:
6046 except (IOError, OSError) as inst:
6047 if inst.errno != errno.ENOENT:
6047 if inst.errno != errno.ENOENT:
6048 raise
6048 raise
6049
6049
6050 try:
6050 try:
6051 # preresolve file
6051 # preresolve file
6052 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6052 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6053 with ui.configoverride(overrides, b'resolve'):
6053 with ui.configoverride(overrides, b'resolve'):
6054 complete, r = ms.preresolve(f, wctx)
6054 complete, r = ms.preresolve(f, wctx)
6055 if not complete:
6055 if not complete:
6056 tocomplete.append(f)
6056 tocomplete.append(f)
6057 elif r:
6057 elif r:
6058 ret = 1
6058 ret = 1
6059 finally:
6059 finally:
6060 ms.commit()
6060 ms.commit()
6061
6061
6062 # replace filemerge's .orig file with our resolve file, but only
6062 # replace filemerge's .orig file with our resolve file, but only
6063 # for merges that are complete
6063 # for merges that are complete
6064 if complete:
6064 if complete:
6065 try:
6065 try:
6066 util.rename(
6066 util.rename(
6067 a + b".resolve", scmutil.backuppath(ui, repo, f)
6067 a + b".resolve", scmutil.backuppath(ui, repo, f)
6068 )
6068 )
6069 except OSError as inst:
6069 except OSError as inst:
6070 if inst.errno != errno.ENOENT:
6070 if inst.errno != errno.ENOENT:
6071 raise
6071 raise
6072
6072
6073 if hasconflictmarkers:
6073 if hasconflictmarkers:
6074 ui.warn(
6074 ui.warn(
6075 _(
6075 _(
6076 b'warning: the following files still have conflict '
6076 b'warning: the following files still have conflict '
6077 b'markers:\n'
6077 b'markers:\n'
6078 )
6078 )
6079 + b''.join(
6079 + b''.join(
6080 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6080 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6081 )
6081 )
6082 )
6082 )
6083 if markcheck == b'abort' and not all and not pats:
6083 if markcheck == b'abort' and not all and not pats:
6084 raise error.Abort(
6084 raise error.Abort(
6085 _(b'conflict markers detected'),
6085 _(b'conflict markers detected'),
6086 hint=_(b'use --all to mark anyway'),
6086 hint=_(b'use --all to mark anyway'),
6087 )
6087 )
6088
6088
6089 for f in tocomplete:
6089 for f in tocomplete:
6090 try:
6090 try:
6091 # resolve file
6091 # resolve file
6092 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6092 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6093 with ui.configoverride(overrides, b'resolve'):
6093 with ui.configoverride(overrides, b'resolve'):
6094 r = ms.resolve(f, wctx)
6094 r = ms.resolve(f, wctx)
6095 if r:
6095 if r:
6096 ret = 1
6096 ret = 1
6097 finally:
6097 finally:
6098 ms.commit()
6098 ms.commit()
6099
6099
6100 # replace filemerge's .orig file with our resolve file
6100 # replace filemerge's .orig file with our resolve file
6101 a = repo.wjoin(f)
6101 a = repo.wjoin(f)
6102 try:
6102 try:
6103 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6103 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6104 except OSError as inst:
6104 except OSError as inst:
6105 if inst.errno != errno.ENOENT:
6105 if inst.errno != errno.ENOENT:
6106 raise
6106 raise
6107
6107
6108 ms.commit()
6108 ms.commit()
6109 ms.recordactions()
6109 ms.recordactions()
6110
6110
6111 if not didwork and pats:
6111 if not didwork and pats:
6112 hint = None
6112 hint = None
6113 if not any([p for p in pats if p.find(b':') >= 0]):
6113 if not any([p for p in pats if p.find(b':') >= 0]):
6114 pats = [b'path:%s' % p for p in pats]
6114 pats = [b'path:%s' % p for p in pats]
6115 m = scmutil.match(wctx, pats, opts)
6115 m = scmutil.match(wctx, pats, opts)
6116 for f in ms:
6116 for f in ms:
6117 if not m(f):
6117 if not m(f):
6118 continue
6118 continue
6119
6119
6120 def flag(o):
6120 def flag(o):
6121 if o == b're_merge':
6121 if o == b're_merge':
6122 return b'--re-merge '
6122 return b'--re-merge '
6123 return b'-%s ' % o[0:1]
6123 return b'-%s ' % o[0:1]
6124
6124
6125 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6125 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6126 hint = _(b"(try: hg resolve %s%s)\n") % (
6126 hint = _(b"(try: hg resolve %s%s)\n") % (
6127 flags,
6127 flags,
6128 b' '.join(pats),
6128 b' '.join(pats),
6129 )
6129 )
6130 break
6130 break
6131 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6131 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6132 if hint:
6132 if hint:
6133 ui.warn(hint)
6133 ui.warn(hint)
6134 elif ms.mergedriver and ms.mdstate() != b's':
6134 elif ms.mergedriver and ms.mdstate() != b's':
6135 # run conclude step when either a driver-resolved file is requested
6135 # run conclude step when either a driver-resolved file is requested
6136 # or there are no driver-resolved files
6136 # or there are no driver-resolved files
6137 # we can't use 'ret' to determine whether any files are unresolved
6137 # we can't use 'ret' to determine whether any files are unresolved
6138 # because we might not have tried to resolve some
6138 # because we might not have tried to resolve some
6139 if (runconclude or not list(ms.driverresolved())) and not list(
6139 if (runconclude or not list(ms.driverresolved())) and not list(
6140 ms.unresolved()
6140 ms.unresolved()
6141 ):
6141 ):
6142 proceed = mergemod.driverconclude(repo, ms, wctx)
6142 proceed = mergemod.driverconclude(repo, ms, wctx)
6143 ms.commit()
6143 ms.commit()
6144 if not proceed:
6144 if not proceed:
6145 return 1
6145 return 1
6146
6146
6147 # Nudge users into finishing an unfinished operation
6147 # Nudge users into finishing an unfinished operation
6148 unresolvedf = list(ms.unresolved())
6148 unresolvedf = list(ms.unresolved())
6149 driverresolvedf = list(ms.driverresolved())
6149 driverresolvedf = list(ms.driverresolved())
6150 if not unresolvedf and not driverresolvedf:
6150 if not unresolvedf and not driverresolvedf:
6151 ui.status(_(b'(no more unresolved files)\n'))
6151 ui.status(_(b'(no more unresolved files)\n'))
6152 cmdutil.checkafterresolved(repo)
6152 cmdutil.checkafterresolved(repo)
6153 elif not unresolvedf:
6153 elif not unresolvedf:
6154 ui.status(
6154 ui.status(
6155 _(
6155 _(
6156 b'(no more unresolved files -- '
6156 b'(no more unresolved files -- '
6157 b'run "hg resolve --all" to conclude)\n'
6157 b'run "hg resolve --all" to conclude)\n'
6158 )
6158 )
6159 )
6159 )
6160
6160
6161 return ret
6161 return ret
6162
6162
6163
6163
6164 @command(
6164 @command(
6165 b'revert',
6165 b'revert',
6166 [
6166 [
6167 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6167 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6168 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6168 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6169 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6169 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6170 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6170 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6171 (b'i', b'interactive', None, _(b'interactively select the changes')),
6171 (b'i', b'interactive', None, _(b'interactively select the changes')),
6172 ]
6172 ]
6173 + walkopts
6173 + walkopts
6174 + dryrunopts,
6174 + dryrunopts,
6175 _(b'[OPTION]... [-r REV] [NAME]...'),
6175 _(b'[OPTION]... [-r REV] [NAME]...'),
6176 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6176 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6177 )
6177 )
6178 def revert(ui, repo, *pats, **opts):
6178 def revert(ui, repo, *pats, **opts):
6179 """restore files to their checkout state
6179 """restore files to their checkout state
6180
6180
6181 .. note::
6181 .. note::
6182
6182
6183 To check out earlier revisions, you should use :hg:`update REV`.
6183 To check out earlier revisions, you should use :hg:`update REV`.
6184 To cancel an uncommitted merge (and lose your changes),
6184 To cancel an uncommitted merge (and lose your changes),
6185 use :hg:`merge --abort`.
6185 use :hg:`merge --abort`.
6186
6186
6187 With no revision specified, revert the specified files or directories
6187 With no revision specified, revert the specified files or directories
6188 to the contents they had in the parent of the working directory.
6188 to the contents they had in the parent of the working directory.
6189 This restores the contents of files to an unmodified
6189 This restores the contents of files to an unmodified
6190 state and unschedules adds, removes, copies, and renames. If the
6190 state and unschedules adds, removes, copies, and renames. If the
6191 working directory has two parents, you must explicitly specify a
6191 working directory has two parents, you must explicitly specify a
6192 revision.
6192 revision.
6193
6193
6194 Using the -r/--rev or -d/--date options, revert the given files or
6194 Using the -r/--rev or -d/--date options, revert the given files or
6195 directories to their states as of a specific revision. Because
6195 directories to their states as of a specific revision. Because
6196 revert does not change the working directory parents, this will
6196 revert does not change the working directory parents, this will
6197 cause these files to appear modified. This can be helpful to "back
6197 cause these files to appear modified. This can be helpful to "back
6198 out" some or all of an earlier change. See :hg:`backout` for a
6198 out" some or all of an earlier change. See :hg:`backout` for a
6199 related method.
6199 related method.
6200
6200
6201 Modified files are saved with a .orig suffix before reverting.
6201 Modified files are saved with a .orig suffix before reverting.
6202 To disable these backups, use --no-backup. It is possible to store
6202 To disable these backups, use --no-backup. It is possible to store
6203 the backup files in a custom directory relative to the root of the
6203 the backup files in a custom directory relative to the root of the
6204 repository by setting the ``ui.origbackuppath`` configuration
6204 repository by setting the ``ui.origbackuppath`` configuration
6205 option.
6205 option.
6206
6206
6207 See :hg:`help dates` for a list of formats valid for -d/--date.
6207 See :hg:`help dates` for a list of formats valid for -d/--date.
6208
6208
6209 See :hg:`help backout` for a way to reverse the effect of an
6209 See :hg:`help backout` for a way to reverse the effect of an
6210 earlier changeset.
6210 earlier changeset.
6211
6211
6212 Returns 0 on success.
6212 Returns 0 on success.
6213 """
6213 """
6214
6214
6215 opts = pycompat.byteskwargs(opts)
6215 opts = pycompat.byteskwargs(opts)
6216 if opts.get(b"date"):
6216 if opts.get(b"date"):
6217 if opts.get(b"rev"):
6217 if opts.get(b"rev"):
6218 raise error.Abort(_(b"you can't specify a revision and a date"))
6218 raise error.Abort(_(b"you can't specify a revision and a date"))
6219 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6219 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6220
6220
6221 parent, p2 = repo.dirstate.parents()
6221 parent, p2 = repo.dirstate.parents()
6222 if not opts.get(b'rev') and p2 != nullid:
6222 if not opts.get(b'rev') and p2 != nullid:
6223 # revert after merge is a trap for new users (issue2915)
6223 # revert after merge is a trap for new users (issue2915)
6224 raise error.Abort(
6224 raise error.Abort(
6225 _(b'uncommitted merge with no revision specified'),
6225 _(b'uncommitted merge with no revision specified'),
6226 hint=_(b"use 'hg update' or see 'hg help revert'"),
6226 hint=_(b"use 'hg update' or see 'hg help revert'"),
6227 )
6227 )
6228
6228
6229 rev = opts.get(b'rev')
6229 rev = opts.get(b'rev')
6230 if rev:
6230 if rev:
6231 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6231 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6232 ctx = scmutil.revsingle(repo, rev)
6232 ctx = scmutil.revsingle(repo, rev)
6233
6233
6234 if not (
6234 if not (
6235 pats
6235 pats
6236 or opts.get(b'include')
6236 or opts.get(b'include')
6237 or opts.get(b'exclude')
6237 or opts.get(b'exclude')
6238 or opts.get(b'all')
6238 or opts.get(b'all')
6239 or opts.get(b'interactive')
6239 or opts.get(b'interactive')
6240 ):
6240 ):
6241 msg = _(b"no files or directories specified")
6241 msg = _(b"no files or directories specified")
6242 if p2 != nullid:
6242 if p2 != nullid:
6243 hint = _(
6243 hint = _(
6244 b"uncommitted merge, use --all to discard all changes,"
6244 b"uncommitted merge, use --all to discard all changes,"
6245 b" or 'hg update -C .' to abort the merge"
6245 b" or 'hg update -C .' to abort the merge"
6246 )
6246 )
6247 raise error.Abort(msg, hint=hint)
6247 raise error.Abort(msg, hint=hint)
6248 dirty = any(repo.status())
6248 dirty = any(repo.status())
6249 node = ctx.node()
6249 node = ctx.node()
6250 if node != parent:
6250 if node != parent:
6251 if dirty:
6251 if dirty:
6252 hint = (
6252 hint = (
6253 _(
6253 _(
6254 b"uncommitted changes, use --all to discard all"
6254 b"uncommitted changes, use --all to discard all"
6255 b" changes, or 'hg update %d' to update"
6255 b" changes, or 'hg update %d' to update"
6256 )
6256 )
6257 % ctx.rev()
6257 % ctx.rev()
6258 )
6258 )
6259 else:
6259 else:
6260 hint = (
6260 hint = (
6261 _(
6261 _(
6262 b"use --all to revert all files,"
6262 b"use --all to revert all files,"
6263 b" or 'hg update %d' to update"
6263 b" or 'hg update %d' to update"
6264 )
6264 )
6265 % ctx.rev()
6265 % ctx.rev()
6266 )
6266 )
6267 elif dirty:
6267 elif dirty:
6268 hint = _(b"uncommitted changes, use --all to discard all changes")
6268 hint = _(b"uncommitted changes, use --all to discard all changes")
6269 else:
6269 else:
6270 hint = _(b"use --all to revert all files")
6270 hint = _(b"use --all to revert all files")
6271 raise error.Abort(msg, hint=hint)
6271 raise error.Abort(msg, hint=hint)
6272
6272
6273 return cmdutil.revert(
6273 return cmdutil.revert(
6274 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6274 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6275 )
6275 )
6276
6276
6277
6277
6278 @command(
6278 @command(
6279 b'rollback',
6279 b'rollback',
6280 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6280 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6281 helpcategory=command.CATEGORY_MAINTENANCE,
6281 helpcategory=command.CATEGORY_MAINTENANCE,
6282 )
6282 )
6283 def rollback(ui, repo, **opts):
6283 def rollback(ui, repo, **opts):
6284 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6284 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6285
6285
6286 Please use :hg:`commit --amend` instead of rollback to correct
6286 Please use :hg:`commit --amend` instead of rollback to correct
6287 mistakes in the last commit.
6287 mistakes in the last commit.
6288
6288
6289 This command should be used with care. There is only one level of
6289 This command should be used with care. There is only one level of
6290 rollback, and there is no way to undo a rollback. It will also
6290 rollback, and there is no way to undo a rollback. It will also
6291 restore the dirstate at the time of the last transaction, losing
6291 restore the dirstate at the time of the last transaction, losing
6292 any dirstate changes since that time. This command does not alter
6292 any dirstate changes since that time. This command does not alter
6293 the working directory.
6293 the working directory.
6294
6294
6295 Transactions are used to encapsulate the effects of all commands
6295 Transactions are used to encapsulate the effects of all commands
6296 that create new changesets or propagate existing changesets into a
6296 that create new changesets or propagate existing changesets into a
6297 repository.
6297 repository.
6298
6298
6299 .. container:: verbose
6299 .. container:: verbose
6300
6300
6301 For example, the following commands are transactional, and their
6301 For example, the following commands are transactional, and their
6302 effects can be rolled back:
6302 effects can be rolled back:
6303
6303
6304 - commit
6304 - commit
6305 - import
6305 - import
6306 - pull
6306 - pull
6307 - push (with this repository as the destination)
6307 - push (with this repository as the destination)
6308 - unbundle
6308 - unbundle
6309
6309
6310 To avoid permanent data loss, rollback will refuse to rollback a
6310 To avoid permanent data loss, rollback will refuse to rollback a
6311 commit transaction if it isn't checked out. Use --force to
6311 commit transaction if it isn't checked out. Use --force to
6312 override this protection.
6312 override this protection.
6313
6313
6314 The rollback command can be entirely disabled by setting the
6314 The rollback command can be entirely disabled by setting the
6315 ``ui.rollback`` configuration setting to false. If you're here
6315 ``ui.rollback`` configuration setting to false. If you're here
6316 because you want to use rollback and it's disabled, you can
6316 because you want to use rollback and it's disabled, you can
6317 re-enable the command by setting ``ui.rollback`` to true.
6317 re-enable the command by setting ``ui.rollback`` to true.
6318
6318
6319 This command is not intended for use on public repositories. Once
6319 This command is not intended for use on public repositories. Once
6320 changes are visible for pull by other users, rolling a transaction
6320 changes are visible for pull by other users, rolling a transaction
6321 back locally is ineffective (someone else may already have pulled
6321 back locally is ineffective (someone else may already have pulled
6322 the changes). Furthermore, a race is possible with readers of the
6322 the changes). Furthermore, a race is possible with readers of the
6323 repository; for example an in-progress pull from the repository
6323 repository; for example an in-progress pull from the repository
6324 may fail if a rollback is performed.
6324 may fail if a rollback is performed.
6325
6325
6326 Returns 0 on success, 1 if no rollback data is available.
6326 Returns 0 on success, 1 if no rollback data is available.
6327 """
6327 """
6328 if not ui.configbool(b'ui', b'rollback'):
6328 if not ui.configbool(b'ui', b'rollback'):
6329 raise error.Abort(
6329 raise error.Abort(
6330 _(b'rollback is disabled because it is unsafe'),
6330 _(b'rollback is disabled because it is unsafe'),
6331 hint=b'see `hg help -v rollback` for information',
6331 hint=b'see `hg help -v rollback` for information',
6332 )
6332 )
6333 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6333 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6334
6334
6335
6335
6336 @command(
6336 @command(
6337 b'root',
6337 b'root',
6338 [] + formatteropts,
6338 [] + formatteropts,
6339 intents={INTENT_READONLY},
6339 intents={INTENT_READONLY},
6340 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6340 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6341 )
6341 )
6342 def root(ui, repo, **opts):
6342 def root(ui, repo, **opts):
6343 """print the root (top) of the current working directory
6343 """print the root (top) of the current working directory
6344
6344
6345 Print the root directory of the current repository.
6345 Print the root directory of the current repository.
6346
6346
6347 .. container:: verbose
6347 .. container:: verbose
6348
6348
6349 Template:
6349 Template:
6350
6350
6351 The following keywords are supported in addition to the common template
6351 The following keywords are supported in addition to the common template
6352 keywords and functions. See also :hg:`help templates`.
6352 keywords and functions. See also :hg:`help templates`.
6353
6353
6354 :hgpath: String. Path to the .hg directory.
6354 :hgpath: String. Path to the .hg directory.
6355 :storepath: String. Path to the directory holding versioned data.
6355 :storepath: String. Path to the directory holding versioned data.
6356
6356
6357 Returns 0 on success.
6357 Returns 0 on success.
6358 """
6358 """
6359 opts = pycompat.byteskwargs(opts)
6359 opts = pycompat.byteskwargs(opts)
6360 with ui.formatter(b'root', opts) as fm:
6360 with ui.formatter(b'root', opts) as fm:
6361 fm.startitem()
6361 fm.startitem()
6362 fm.write(b'reporoot', b'%s\n', repo.root)
6362 fm.write(b'reporoot', b'%s\n', repo.root)
6363 fm.data(hgpath=repo.path, storepath=repo.spath)
6363 fm.data(hgpath=repo.path, storepath=repo.spath)
6364
6364
6365
6365
6366 @command(
6366 @command(
6367 b'serve',
6367 b'serve',
6368 [
6368 [
6369 (
6369 (
6370 b'A',
6370 b'A',
6371 b'accesslog',
6371 b'accesslog',
6372 b'',
6372 b'',
6373 _(b'name of access log file to write to'),
6373 _(b'name of access log file to write to'),
6374 _(b'FILE'),
6374 _(b'FILE'),
6375 ),
6375 ),
6376 (b'd', b'daemon', None, _(b'run server in background')),
6376 (b'd', b'daemon', None, _(b'run server in background')),
6377 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6377 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6378 (
6378 (
6379 b'E',
6379 b'E',
6380 b'errorlog',
6380 b'errorlog',
6381 b'',
6381 b'',
6382 _(b'name of error log file to write to'),
6382 _(b'name of error log file to write to'),
6383 _(b'FILE'),
6383 _(b'FILE'),
6384 ),
6384 ),
6385 # use string type, then we can check if something was passed
6385 # use string type, then we can check if something was passed
6386 (
6386 (
6387 b'p',
6387 b'p',
6388 b'port',
6388 b'port',
6389 b'',
6389 b'',
6390 _(b'port to listen on (default: 8000)'),
6390 _(b'port to listen on (default: 8000)'),
6391 _(b'PORT'),
6391 _(b'PORT'),
6392 ),
6392 ),
6393 (
6393 (
6394 b'a',
6394 b'a',
6395 b'address',
6395 b'address',
6396 b'',
6396 b'',
6397 _(b'address to listen on (default: all interfaces)'),
6397 _(b'address to listen on (default: all interfaces)'),
6398 _(b'ADDR'),
6398 _(b'ADDR'),
6399 ),
6399 ),
6400 (
6400 (
6401 b'',
6401 b'',
6402 b'prefix',
6402 b'prefix',
6403 b'',
6403 b'',
6404 _(b'prefix path to serve from (default: server root)'),
6404 _(b'prefix path to serve from (default: server root)'),
6405 _(b'PREFIX'),
6405 _(b'PREFIX'),
6406 ),
6406 ),
6407 (
6407 (
6408 b'n',
6408 b'n',
6409 b'name',
6409 b'name',
6410 b'',
6410 b'',
6411 _(b'name to show in web pages (default: working directory)'),
6411 _(b'name to show in web pages (default: working directory)'),
6412 _(b'NAME'),
6412 _(b'NAME'),
6413 ),
6413 ),
6414 (
6414 (
6415 b'',
6415 b'',
6416 b'web-conf',
6416 b'web-conf',
6417 b'',
6417 b'',
6418 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6418 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6419 _(b'FILE'),
6419 _(b'FILE'),
6420 ),
6420 ),
6421 (
6421 (
6422 b'',
6422 b'',
6423 b'webdir-conf',
6423 b'webdir-conf',
6424 b'',
6424 b'',
6425 _(b'name of the hgweb config file (DEPRECATED)'),
6425 _(b'name of the hgweb config file (DEPRECATED)'),
6426 _(b'FILE'),
6426 _(b'FILE'),
6427 ),
6427 ),
6428 (
6428 (
6429 b'',
6429 b'',
6430 b'pid-file',
6430 b'pid-file',
6431 b'',
6431 b'',
6432 _(b'name of file to write process ID to'),
6432 _(b'name of file to write process ID to'),
6433 _(b'FILE'),
6433 _(b'FILE'),
6434 ),
6434 ),
6435 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6435 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6436 (
6436 (
6437 b'',
6437 b'',
6438 b'cmdserver',
6438 b'cmdserver',
6439 b'',
6439 b'',
6440 _(b'for remote clients (ADVANCED)'),
6440 _(b'for remote clients (ADVANCED)'),
6441 _(b'MODE'),
6441 _(b'MODE'),
6442 ),
6442 ),
6443 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6443 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6444 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6444 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6445 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6445 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6446 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6446 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6447 (b'', b'print-url', None, _(b'start and print only the URL')),
6447 (b'', b'print-url', None, _(b'start and print only the URL')),
6448 ]
6448 ]
6449 + subrepoopts,
6449 + subrepoopts,
6450 _(b'[OPTION]...'),
6450 _(b'[OPTION]...'),
6451 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6451 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6452 helpbasic=True,
6452 helpbasic=True,
6453 optionalrepo=True,
6453 optionalrepo=True,
6454 )
6454 )
6455 def serve(ui, repo, **opts):
6455 def serve(ui, repo, **opts):
6456 """start stand-alone webserver
6456 """start stand-alone webserver
6457
6457
6458 Start a local HTTP repository browser and pull server. You can use
6458 Start a local HTTP repository browser and pull server. You can use
6459 this for ad-hoc sharing and browsing of repositories. It is
6459 this for ad-hoc sharing and browsing of repositories. It is
6460 recommended to use a real web server to serve a repository for
6460 recommended to use a real web server to serve a repository for
6461 longer periods of time.
6461 longer periods of time.
6462
6462
6463 Please note that the server does not implement access control.
6463 Please note that the server does not implement access control.
6464 This means that, by default, anybody can read from the server and
6464 This means that, by default, anybody can read from the server and
6465 nobody can write to it by default. Set the ``web.allow-push``
6465 nobody can write to it by default. Set the ``web.allow-push``
6466 option to ``*`` to allow everybody to push to the server. You
6466 option to ``*`` to allow everybody to push to the server. You
6467 should use a real web server if you need to authenticate users.
6467 should use a real web server if you need to authenticate users.
6468
6468
6469 By default, the server logs accesses to stdout and errors to
6469 By default, the server logs accesses to stdout and errors to
6470 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6470 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6471 files.
6471 files.
6472
6472
6473 To have the server choose a free port number to listen on, specify
6473 To have the server choose a free port number to listen on, specify
6474 a port number of 0; in this case, the server will print the port
6474 a port number of 0; in this case, the server will print the port
6475 number it uses.
6475 number it uses.
6476
6476
6477 Returns 0 on success.
6477 Returns 0 on success.
6478 """
6478 """
6479
6479
6480 opts = pycompat.byteskwargs(opts)
6480 opts = pycompat.byteskwargs(opts)
6481 if opts[b"stdio"] and opts[b"cmdserver"]:
6481 if opts[b"stdio"] and opts[b"cmdserver"]:
6482 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6482 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6483 if opts[b"print_url"] and ui.verbose:
6483 if opts[b"print_url"] and ui.verbose:
6484 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6484 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6485
6485
6486 if opts[b"stdio"]:
6486 if opts[b"stdio"]:
6487 if repo is None:
6487 if repo is None:
6488 raise error.RepoError(
6488 raise error.RepoError(
6489 _(b"there is no Mercurial repository here (.hg not found)")
6489 _(b"there is no Mercurial repository here (.hg not found)")
6490 )
6490 )
6491 s = wireprotoserver.sshserver(ui, repo)
6491 s = wireprotoserver.sshserver(ui, repo)
6492 s.serve_forever()
6492 s.serve_forever()
6493
6493
6494 service = server.createservice(ui, repo, opts)
6494 service = server.createservice(ui, repo, opts)
6495 return server.runservice(opts, initfn=service.init, runfn=service.run)
6495 return server.runservice(opts, initfn=service.init, runfn=service.run)
6496
6496
6497
6497
6498 @command(
6498 @command(
6499 b'shelve',
6499 b'shelve',
6500 [
6500 [
6501 (
6501 (
6502 b'A',
6502 b'A',
6503 b'addremove',
6503 b'addremove',
6504 None,
6504 None,
6505 _(b'mark new/missing files as added/removed before shelving'),
6505 _(b'mark new/missing files as added/removed before shelving'),
6506 ),
6506 ),
6507 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6507 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6508 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6508 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6509 (
6509 (
6510 b'',
6510 b'',
6511 b'date',
6511 b'date',
6512 b'',
6512 b'',
6513 _(b'shelve with the specified commit date'),
6513 _(b'shelve with the specified commit date'),
6514 _(b'DATE'),
6514 _(b'DATE'),
6515 ),
6515 ),
6516 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6516 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6517 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6517 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6518 (
6518 (
6519 b'k',
6519 b'k',
6520 b'keep',
6520 b'keep',
6521 False,
6521 False,
6522 _(b'shelve, but keep changes in the working directory'),
6522 _(b'shelve, but keep changes in the working directory'),
6523 ),
6523 ),
6524 (b'l', b'list', None, _(b'list current shelves')),
6524 (b'l', b'list', None, _(b'list current shelves')),
6525 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6525 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6526 (
6526 (
6527 b'n',
6527 b'n',
6528 b'name',
6528 b'name',
6529 b'',
6529 b'',
6530 _(b'use the given name for the shelved commit'),
6530 _(b'use the given name for the shelved commit'),
6531 _(b'NAME'),
6531 _(b'NAME'),
6532 ),
6532 ),
6533 (
6533 (
6534 b'p',
6534 b'p',
6535 b'patch',
6535 b'patch',
6536 None,
6536 None,
6537 _(
6537 _(
6538 b'output patches for changes (provide the names of the shelved '
6538 b'output patches for changes (provide the names of the shelved '
6539 b'changes as positional arguments)'
6539 b'changes as positional arguments)'
6540 ),
6540 ),
6541 ),
6541 ),
6542 (b'i', b'interactive', None, _(b'interactive mode')),
6542 (b'i', b'interactive', None, _(b'interactive mode')),
6543 (
6543 (
6544 b'',
6544 b'',
6545 b'stat',
6545 b'stat',
6546 None,
6546 None,
6547 _(
6547 _(
6548 b'output diffstat-style summary of changes (provide the names of '
6548 b'output diffstat-style summary of changes (provide the names of '
6549 b'the shelved changes as positional arguments)'
6549 b'the shelved changes as positional arguments)'
6550 ),
6550 ),
6551 ),
6551 ),
6552 ]
6552 ]
6553 + cmdutil.walkopts,
6553 + cmdutil.walkopts,
6554 _(b'hg shelve [OPTION]... [FILE]...'),
6554 _(b'hg shelve [OPTION]... [FILE]...'),
6555 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6555 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6556 )
6556 )
6557 def shelve(ui, repo, *pats, **opts):
6557 def shelve(ui, repo, *pats, **opts):
6558 '''save and set aside changes from the working directory
6558 '''save and set aside changes from the working directory
6559
6559
6560 Shelving takes files that "hg status" reports as not clean, saves
6560 Shelving takes files that "hg status" reports as not clean, saves
6561 the modifications to a bundle (a shelved change), and reverts the
6561 the modifications to a bundle (a shelved change), and reverts the
6562 files so that their state in the working directory becomes clean.
6562 files so that their state in the working directory becomes clean.
6563
6563
6564 To restore these changes to the working directory, using "hg
6564 To restore these changes to the working directory, using "hg
6565 unshelve"; this will work even if you switch to a different
6565 unshelve"; this will work even if you switch to a different
6566 commit.
6566 commit.
6567
6567
6568 When no files are specified, "hg shelve" saves all not-clean
6568 When no files are specified, "hg shelve" saves all not-clean
6569 files. If specific files or directories are named, only changes to
6569 files. If specific files or directories are named, only changes to
6570 those files are shelved.
6570 those files are shelved.
6571
6571
6572 In bare shelve (when no files are specified, without interactive,
6572 In bare shelve (when no files are specified, without interactive,
6573 include and exclude option), shelving remembers information if the
6573 include and exclude option), shelving remembers information if the
6574 working directory was on newly created branch, in other words working
6574 working directory was on newly created branch, in other words working
6575 directory was on different branch than its first parent. In this
6575 directory was on different branch than its first parent. In this
6576 situation unshelving restores branch information to the working directory.
6576 situation unshelving restores branch information to the working directory.
6577
6577
6578 Each shelved change has a name that makes it easier to find later.
6578 Each shelved change has a name that makes it easier to find later.
6579 The name of a shelved change defaults to being based on the active
6579 The name of a shelved change defaults to being based on the active
6580 bookmark, or if there is no active bookmark, the current named
6580 bookmark, or if there is no active bookmark, the current named
6581 branch. To specify a different name, use ``--name``.
6581 branch. To specify a different name, use ``--name``.
6582
6582
6583 To see a list of existing shelved changes, use the ``--list``
6583 To see a list of existing shelved changes, use the ``--list``
6584 option. For each shelved change, this will print its name, age,
6584 option. For each shelved change, this will print its name, age,
6585 and description; use ``--patch`` or ``--stat`` for more details.
6585 and description; use ``--patch`` or ``--stat`` for more details.
6586
6586
6587 To delete specific shelved changes, use ``--delete``. To delete
6587 To delete specific shelved changes, use ``--delete``. To delete
6588 all shelved changes, use ``--cleanup``.
6588 all shelved changes, use ``--cleanup``.
6589 '''
6589 '''
6590 opts = pycompat.byteskwargs(opts)
6590 opts = pycompat.byteskwargs(opts)
6591 allowables = [
6591 allowables = [
6592 (b'addremove', {b'create'}), # 'create' is pseudo action
6592 (b'addremove', {b'create'}), # 'create' is pseudo action
6593 (b'unknown', {b'create'}),
6593 (b'unknown', {b'create'}),
6594 (b'cleanup', {b'cleanup'}),
6594 (b'cleanup', {b'cleanup'}),
6595 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6595 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6596 (b'delete', {b'delete'}),
6596 (b'delete', {b'delete'}),
6597 (b'edit', {b'create'}),
6597 (b'edit', {b'create'}),
6598 (b'keep', {b'create'}),
6598 (b'keep', {b'create'}),
6599 (b'list', {b'list'}),
6599 (b'list', {b'list'}),
6600 (b'message', {b'create'}),
6600 (b'message', {b'create'}),
6601 (b'name', {b'create'}),
6601 (b'name', {b'create'}),
6602 (b'patch', {b'patch', b'list'}),
6602 (b'patch', {b'patch', b'list'}),
6603 (b'stat', {b'stat', b'list'}),
6603 (b'stat', {b'stat', b'list'}),
6604 ]
6604 ]
6605
6605
6606 def checkopt(opt):
6606 def checkopt(opt):
6607 if opts.get(opt):
6607 if opts.get(opt):
6608 for i, allowable in allowables:
6608 for i, allowable in allowables:
6609 if opts[i] and opt not in allowable:
6609 if opts[i] and opt not in allowable:
6610 raise error.Abort(
6610 raise error.Abort(
6611 _(
6611 _(
6612 b"options '--%s' and '--%s' may not be "
6612 b"options '--%s' and '--%s' may not be "
6613 b"used together"
6613 b"used together"
6614 )
6614 )
6615 % (opt, i)
6615 % (opt, i)
6616 )
6616 )
6617 return True
6617 return True
6618
6618
6619 if checkopt(b'cleanup'):
6619 if checkopt(b'cleanup'):
6620 if pats:
6620 if pats:
6621 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6621 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6622 return shelvemod.cleanupcmd(ui, repo)
6622 return shelvemod.cleanupcmd(ui, repo)
6623 elif checkopt(b'delete'):
6623 elif checkopt(b'delete'):
6624 return shelvemod.deletecmd(ui, repo, pats)
6624 return shelvemod.deletecmd(ui, repo, pats)
6625 elif checkopt(b'list'):
6625 elif checkopt(b'list'):
6626 return shelvemod.listcmd(ui, repo, pats, opts)
6626 return shelvemod.listcmd(ui, repo, pats, opts)
6627 elif checkopt(b'patch') or checkopt(b'stat'):
6627 elif checkopt(b'patch') or checkopt(b'stat'):
6628 return shelvemod.patchcmds(ui, repo, pats, opts)
6628 return shelvemod.patchcmds(ui, repo, pats, opts)
6629 else:
6629 else:
6630 return shelvemod.createcmd(ui, repo, pats, opts)
6630 return shelvemod.createcmd(ui, repo, pats, opts)
6631
6631
6632
6632
6633 _NOTTERSE = b'nothing'
6633 _NOTTERSE = b'nothing'
6634
6634
6635
6635
6636 @command(
6636 @command(
6637 b'status|st',
6637 b'status|st',
6638 [
6638 [
6639 (b'A', b'all', None, _(b'show status of all files')),
6639 (b'A', b'all', None, _(b'show status of all files')),
6640 (b'm', b'modified', None, _(b'show only modified files')),
6640 (b'm', b'modified', None, _(b'show only modified files')),
6641 (b'a', b'added', None, _(b'show only added files')),
6641 (b'a', b'added', None, _(b'show only added files')),
6642 (b'r', b'removed', None, _(b'show only removed files')),
6642 (b'r', b'removed', None, _(b'show only removed files')),
6643 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6643 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6644 (b'c', b'clean', None, _(b'show only files without changes')),
6644 (b'c', b'clean', None, _(b'show only files without changes')),
6645 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6645 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6646 (b'i', b'ignored', None, _(b'show only ignored files')),
6646 (b'i', b'ignored', None, _(b'show only ignored files')),
6647 (b'n', b'no-status', None, _(b'hide status prefix')),
6647 (b'n', b'no-status', None, _(b'hide status prefix')),
6648 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6648 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6649 (
6649 (
6650 b'C',
6650 b'C',
6651 b'copies',
6651 b'copies',
6652 None,
6652 None,
6653 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6653 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6654 ),
6654 ),
6655 (
6655 (
6656 b'0',
6656 b'0',
6657 b'print0',
6657 b'print0',
6658 None,
6658 None,
6659 _(b'end filenames with NUL, for use with xargs'),
6659 _(b'end filenames with NUL, for use with xargs'),
6660 ),
6660 ),
6661 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6661 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6662 (
6662 (
6663 b'',
6663 b'',
6664 b'change',
6664 b'change',
6665 b'',
6665 b'',
6666 _(b'list the changed files of a revision'),
6666 _(b'list the changed files of a revision'),
6667 _(b'REV'),
6667 _(b'REV'),
6668 ),
6668 ),
6669 ]
6669 ]
6670 + walkopts
6670 + walkopts
6671 + subrepoopts
6671 + subrepoopts
6672 + formatteropts,
6672 + formatteropts,
6673 _(b'[OPTION]... [FILE]...'),
6673 _(b'[OPTION]... [FILE]...'),
6674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6675 helpbasic=True,
6675 helpbasic=True,
6676 inferrepo=True,
6676 inferrepo=True,
6677 intents={INTENT_READONLY},
6677 intents={INTENT_READONLY},
6678 )
6678 )
6679 def status(ui, repo, *pats, **opts):
6679 def status(ui, repo, *pats, **opts):
6680 """show changed files in the working directory
6680 """show changed files in the working directory
6681
6681
6682 Show status of files in the repository. If names are given, only
6682 Show status of files in the repository. If names are given, only
6683 files that match are shown. Files that are clean or ignored or
6683 files that match are shown. Files that are clean or ignored or
6684 the source of a copy/move operation, are not listed unless
6684 the source of a copy/move operation, are not listed unless
6685 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6685 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6686 Unless options described with "show only ..." are given, the
6686 Unless options described with "show only ..." are given, the
6687 options -mardu are used.
6687 options -mardu are used.
6688
6688
6689 Option -q/--quiet hides untracked (unknown and ignored) files
6689 Option -q/--quiet hides untracked (unknown and ignored) files
6690 unless explicitly requested with -u/--unknown or -i/--ignored.
6690 unless explicitly requested with -u/--unknown or -i/--ignored.
6691
6691
6692 .. note::
6692 .. note::
6693
6693
6694 :hg:`status` may appear to disagree with diff if permissions have
6694 :hg:`status` may appear to disagree with diff if permissions have
6695 changed or a merge has occurred. The standard diff format does
6695 changed or a merge has occurred. The standard diff format does
6696 not report permission changes and diff only reports changes
6696 not report permission changes and diff only reports changes
6697 relative to one merge parent.
6697 relative to one merge parent.
6698
6698
6699 If one revision is given, it is used as the base revision.
6699 If one revision is given, it is used as the base revision.
6700 If two revisions are given, the differences between them are
6700 If two revisions are given, the differences between them are
6701 shown. The --change option can also be used as a shortcut to list
6701 shown. The --change option can also be used as a shortcut to list
6702 the changed files of a revision from its first parent.
6702 the changed files of a revision from its first parent.
6703
6703
6704 The codes used to show the status of files are::
6704 The codes used to show the status of files are::
6705
6705
6706 M = modified
6706 M = modified
6707 A = added
6707 A = added
6708 R = removed
6708 R = removed
6709 C = clean
6709 C = clean
6710 ! = missing (deleted by non-hg command, but still tracked)
6710 ! = missing (deleted by non-hg command, but still tracked)
6711 ? = not tracked
6711 ? = not tracked
6712 I = ignored
6712 I = ignored
6713 = origin of the previous file (with --copies)
6713 = origin of the previous file (with --copies)
6714
6714
6715 .. container:: verbose
6715 .. container:: verbose
6716
6716
6717 The -t/--terse option abbreviates the output by showing only the directory
6717 The -t/--terse option abbreviates the output by showing only the directory
6718 name if all the files in it share the same status. The option takes an
6718 name if all the files in it share the same status. The option takes an
6719 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6719 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6720 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6720 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6721 for 'ignored' and 'c' for clean.
6721 for 'ignored' and 'c' for clean.
6722
6722
6723 It abbreviates only those statuses which are passed. Note that clean and
6723 It abbreviates only those statuses which are passed. Note that clean and
6724 ignored files are not displayed with '--terse ic' unless the -c/--clean
6724 ignored files are not displayed with '--terse ic' unless the -c/--clean
6725 and -i/--ignored options are also used.
6725 and -i/--ignored options are also used.
6726
6726
6727 The -v/--verbose option shows information when the repository is in an
6727 The -v/--verbose option shows information when the repository is in an
6728 unfinished merge, shelve, rebase state etc. You can have this behavior
6728 unfinished merge, shelve, rebase state etc. You can have this behavior
6729 turned on by default by enabling the ``commands.status.verbose`` option.
6729 turned on by default by enabling the ``commands.status.verbose`` option.
6730
6730
6731 You can skip displaying some of these states by setting
6731 You can skip displaying some of these states by setting
6732 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6732 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6733 'histedit', 'merge', 'rebase', or 'unshelve'.
6733 'histedit', 'merge', 'rebase', or 'unshelve'.
6734
6734
6735 Template:
6735 Template:
6736
6736
6737 The following keywords are supported in addition to the common template
6737 The following keywords are supported in addition to the common template
6738 keywords and functions. See also :hg:`help templates`.
6738 keywords and functions. See also :hg:`help templates`.
6739
6739
6740 :path: String. Repository-absolute path of the file.
6740 :path: String. Repository-absolute path of the file.
6741 :source: String. Repository-absolute path of the file originated from.
6741 :source: String. Repository-absolute path of the file originated from.
6742 Available if ``--copies`` is specified.
6742 Available if ``--copies`` is specified.
6743 :status: String. Character denoting file's status.
6743 :status: String. Character denoting file's status.
6744
6744
6745 Examples:
6745 Examples:
6746
6746
6747 - show changes in the working directory relative to a
6747 - show changes in the working directory relative to a
6748 changeset::
6748 changeset::
6749
6749
6750 hg status --rev 9353
6750 hg status --rev 9353
6751
6751
6752 - show changes in the working directory relative to the
6752 - show changes in the working directory relative to the
6753 current directory (see :hg:`help patterns` for more information)::
6753 current directory (see :hg:`help patterns` for more information)::
6754
6754
6755 hg status re:
6755 hg status re:
6756
6756
6757 - show all changes including copies in an existing changeset::
6757 - show all changes including copies in an existing changeset::
6758
6758
6759 hg status --copies --change 9353
6759 hg status --copies --change 9353
6760
6760
6761 - get a NUL separated list of added files, suitable for xargs::
6761 - get a NUL separated list of added files, suitable for xargs::
6762
6762
6763 hg status -an0
6763 hg status -an0
6764
6764
6765 - show more information about the repository status, abbreviating
6765 - show more information about the repository status, abbreviating
6766 added, removed, modified, deleted, and untracked paths::
6766 added, removed, modified, deleted, and untracked paths::
6767
6767
6768 hg status -v -t mardu
6768 hg status -v -t mardu
6769
6769
6770 Returns 0 on success.
6770 Returns 0 on success.
6771
6771
6772 """
6772 """
6773
6773
6774 opts = pycompat.byteskwargs(opts)
6774 opts = pycompat.byteskwargs(opts)
6775 revs = opts.get(b'rev')
6775 revs = opts.get(b'rev')
6776 change = opts.get(b'change')
6776 change = opts.get(b'change')
6777 terse = opts.get(b'terse')
6777 terse = opts.get(b'terse')
6778 if terse is _NOTTERSE:
6778 if terse is _NOTTERSE:
6779 if revs:
6779 if revs:
6780 terse = b''
6780 terse = b''
6781 else:
6781 else:
6782 terse = ui.config(b'commands', b'status.terse')
6782 terse = ui.config(b'commands', b'status.terse')
6783
6783
6784 if revs and change:
6784 if revs and change:
6785 msg = _(b'cannot specify --rev and --change at the same time')
6785 msg = _(b'cannot specify --rev and --change at the same time')
6786 raise error.Abort(msg)
6786 raise error.Abort(msg)
6787 elif revs and terse:
6787 elif revs and terse:
6788 msg = _(b'cannot use --terse with --rev')
6788 msg = _(b'cannot use --terse with --rev')
6789 raise error.Abort(msg)
6789 raise error.Abort(msg)
6790 elif change:
6790 elif change:
6791 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6791 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6792 ctx2 = scmutil.revsingle(repo, change, None)
6792 ctx2 = scmutil.revsingle(repo, change, None)
6793 ctx1 = ctx2.p1()
6793 ctx1 = ctx2.p1()
6794 else:
6794 else:
6795 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6795 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6796 ctx1, ctx2 = scmutil.revpair(repo, revs)
6796 ctx1, ctx2 = scmutil.revpair(repo, revs)
6797
6797
6798 forcerelativevalue = None
6798 forcerelativevalue = None
6799 if ui.hasconfig(b'commands', b'status.relative'):
6799 if ui.hasconfig(b'commands', b'status.relative'):
6800 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6800 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6801 uipathfn = scmutil.getuipathfn(
6801 uipathfn = scmutil.getuipathfn(
6802 repo,
6802 repo,
6803 legacyrelativevalue=bool(pats),
6803 legacyrelativevalue=bool(pats),
6804 forcerelativevalue=forcerelativevalue,
6804 forcerelativevalue=forcerelativevalue,
6805 )
6805 )
6806
6806
6807 if opts.get(b'print0'):
6807 if opts.get(b'print0'):
6808 end = b'\0'
6808 end = b'\0'
6809 else:
6809 else:
6810 end = b'\n'
6810 end = b'\n'
6811 states = b'modified added removed deleted unknown ignored clean'.split()
6811 states = b'modified added removed deleted unknown ignored clean'.split()
6812 show = [k for k in states if opts.get(k)]
6812 show = [k for k in states if opts.get(k)]
6813 if opts.get(b'all'):
6813 if opts.get(b'all'):
6814 show += ui.quiet and (states[:4] + [b'clean']) or states
6814 show += ui.quiet and (states[:4] + [b'clean']) or states
6815
6815
6816 if not show:
6816 if not show:
6817 if ui.quiet:
6817 if ui.quiet:
6818 show = states[:4]
6818 show = states[:4]
6819 else:
6819 else:
6820 show = states[:5]
6820 show = states[:5]
6821
6821
6822 m = scmutil.match(ctx2, pats, opts)
6822 m = scmutil.match(ctx2, pats, opts)
6823 if terse:
6823 if terse:
6824 # we need to compute clean and unknown to terse
6824 # we need to compute clean and unknown to terse
6825 stat = repo.status(
6825 stat = repo.status(
6826 ctx1.node(),
6826 ctx1.node(),
6827 ctx2.node(),
6827 ctx2.node(),
6828 m,
6828 m,
6829 b'ignored' in show or b'i' in terse,
6829 b'ignored' in show or b'i' in terse,
6830 clean=True,
6830 clean=True,
6831 unknown=True,
6831 unknown=True,
6832 listsubrepos=opts.get(b'subrepos'),
6832 listsubrepos=opts.get(b'subrepos'),
6833 )
6833 )
6834
6834
6835 stat = cmdutil.tersedir(stat, terse)
6835 stat = cmdutil.tersedir(stat, terse)
6836 else:
6836 else:
6837 stat = repo.status(
6837 stat = repo.status(
6838 ctx1.node(),
6838 ctx1.node(),
6839 ctx2.node(),
6839 ctx2.node(),
6840 m,
6840 m,
6841 b'ignored' in show,
6841 b'ignored' in show,
6842 b'clean' in show,
6842 b'clean' in show,
6843 b'unknown' in show,
6843 b'unknown' in show,
6844 opts.get(b'subrepos'),
6844 opts.get(b'subrepos'),
6845 )
6845 )
6846
6846
6847 changestates = zip(
6847 changestates = zip(
6848 states,
6848 states,
6849 pycompat.iterbytestr(b'MAR!?IC'),
6849 pycompat.iterbytestr(b'MAR!?IC'),
6850 [getattr(stat, s.decode('utf8')) for s in states],
6850 [getattr(stat, s.decode('utf8')) for s in states],
6851 )
6851 )
6852
6852
6853 copy = {}
6853 copy = {}
6854 if (
6854 if (
6855 opts.get(b'all')
6855 opts.get(b'all')
6856 or opts.get(b'copies')
6856 or opts.get(b'copies')
6857 or ui.configbool(b'ui', b'statuscopies')
6857 or ui.configbool(b'ui', b'statuscopies')
6858 ) and not opts.get(b'no_status'):
6858 ) and not opts.get(b'no_status'):
6859 copy = copies.pathcopies(ctx1, ctx2, m)
6859 copy = copies.pathcopies(ctx1, ctx2, m)
6860
6860
6861 morestatus = None
6861 morestatus = None
6862 if (
6862 if (
6863 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6863 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6864 ) and not ui.plain():
6864 ) and not ui.plain():
6865 morestatus = cmdutil.readmorestatus(repo)
6865 morestatus = cmdutil.readmorestatus(repo)
6866
6866
6867 ui.pager(b'status')
6867 ui.pager(b'status')
6868 fm = ui.formatter(b'status', opts)
6868 fm = ui.formatter(b'status', opts)
6869 fmt = b'%s' + end
6869 fmt = b'%s' + end
6870 showchar = not opts.get(b'no_status')
6870 showchar = not opts.get(b'no_status')
6871
6871
6872 for state, char, files in changestates:
6872 for state, char, files in changestates:
6873 if state in show:
6873 if state in show:
6874 label = b'status.' + state
6874 label = b'status.' + state
6875 for f in files:
6875 for f in files:
6876 fm.startitem()
6876 fm.startitem()
6877 fm.context(ctx=ctx2)
6877 fm.context(ctx=ctx2)
6878 fm.data(itemtype=b'file', path=f)
6878 fm.data(itemtype=b'file', path=f)
6879 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6879 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6880 fm.plain(fmt % uipathfn(f), label=label)
6880 fm.plain(fmt % uipathfn(f), label=label)
6881 if f in copy:
6881 if f in copy:
6882 fm.data(source=copy[f])
6882 fm.data(source=copy[f])
6883 fm.plain(
6883 fm.plain(
6884 (b' %s' + end) % uipathfn(copy[f]),
6884 (b' %s' + end) % uipathfn(copy[f]),
6885 label=b'status.copied',
6885 label=b'status.copied',
6886 )
6886 )
6887 if morestatus:
6887 if morestatus:
6888 morestatus.formatfile(f, fm)
6888 morestatus.formatfile(f, fm)
6889
6889
6890 if morestatus:
6890 if morestatus:
6891 morestatus.formatfooter(fm)
6891 morestatus.formatfooter(fm)
6892 fm.end()
6892 fm.end()
6893
6893
6894
6894
6895 @command(
6895 @command(
6896 b'summary|sum',
6896 b'summary|sum',
6897 [(b'', b'remote', None, _(b'check for push and pull'))],
6897 [(b'', b'remote', None, _(b'check for push and pull'))],
6898 b'[--remote]',
6898 b'[--remote]',
6899 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6899 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6900 helpbasic=True,
6900 helpbasic=True,
6901 intents={INTENT_READONLY},
6901 intents={INTENT_READONLY},
6902 )
6902 )
6903 def summary(ui, repo, **opts):
6903 def summary(ui, repo, **opts):
6904 """summarize working directory state
6904 """summarize working directory state
6905
6905
6906 This generates a brief summary of the working directory state,
6906 This generates a brief summary of the working directory state,
6907 including parents, branch, commit status, phase and available updates.
6907 including parents, branch, commit status, phase and available updates.
6908
6908
6909 With the --remote option, this will check the default paths for
6909 With the --remote option, this will check the default paths for
6910 incoming and outgoing changes. This can be time-consuming.
6910 incoming and outgoing changes. This can be time-consuming.
6911
6911
6912 Returns 0 on success.
6912 Returns 0 on success.
6913 """
6913 """
6914
6914
6915 opts = pycompat.byteskwargs(opts)
6915 opts = pycompat.byteskwargs(opts)
6916 ui.pager(b'summary')
6916 ui.pager(b'summary')
6917 ctx = repo[None]
6917 ctx = repo[None]
6918 parents = ctx.parents()
6918 parents = ctx.parents()
6919 pnode = parents[0].node()
6919 pnode = parents[0].node()
6920 marks = []
6920 marks = []
6921
6921
6922 try:
6922 try:
6923 ms = mergemod.mergestate.read(repo)
6923 ms = mergemod.mergestate.read(repo)
6924 except error.UnsupportedMergeRecords as e:
6924 except error.UnsupportedMergeRecords as e:
6925 s = b' '.join(e.recordtypes)
6925 s = b' '.join(e.recordtypes)
6926 ui.warn(
6926 ui.warn(
6927 _(b'warning: merge state has unsupported record types: %s\n') % s
6927 _(b'warning: merge state has unsupported record types: %s\n') % s
6928 )
6928 )
6929 unresolved = []
6929 unresolved = []
6930 else:
6930 else:
6931 unresolved = list(ms.unresolved())
6931 unresolved = list(ms.unresolved())
6932
6932
6933 for p in parents:
6933 for p in parents:
6934 # label with log.changeset (instead of log.parent) since this
6934 # label with log.changeset (instead of log.parent) since this
6935 # shows a working directory parent *changeset*:
6935 # shows a working directory parent *changeset*:
6936 # i18n: column positioning for "hg summary"
6936 # i18n: column positioning for "hg summary"
6937 ui.write(
6937 ui.write(
6938 _(b'parent: %d:%s ') % (p.rev(), p),
6938 _(b'parent: %d:%s ') % (p.rev(), p),
6939 label=logcmdutil.changesetlabels(p),
6939 label=logcmdutil.changesetlabels(p),
6940 )
6940 )
6941 ui.write(b' '.join(p.tags()), label=b'log.tag')
6941 ui.write(b' '.join(p.tags()), label=b'log.tag')
6942 if p.bookmarks():
6942 if p.bookmarks():
6943 marks.extend(p.bookmarks())
6943 marks.extend(p.bookmarks())
6944 if p.rev() == -1:
6944 if p.rev() == -1:
6945 if not len(repo):
6945 if not len(repo):
6946 ui.write(_(b' (empty repository)'))
6946 ui.write(_(b' (empty repository)'))
6947 else:
6947 else:
6948 ui.write(_(b' (no revision checked out)'))
6948 ui.write(_(b' (no revision checked out)'))
6949 if p.obsolete():
6949 if p.obsolete():
6950 ui.write(_(b' (obsolete)'))
6950 ui.write(_(b' (obsolete)'))
6951 if p.isunstable():
6951 if p.isunstable():
6952 instabilities = (
6952 instabilities = (
6953 ui.label(instability, b'trouble.%s' % instability)
6953 ui.label(instability, b'trouble.%s' % instability)
6954 for instability in p.instabilities()
6954 for instability in p.instabilities()
6955 )
6955 )
6956 ui.write(b' (' + b', '.join(instabilities) + b')')
6956 ui.write(b' (' + b', '.join(instabilities) + b')')
6957 ui.write(b'\n')
6957 ui.write(b'\n')
6958 if p.description():
6958 if p.description():
6959 ui.status(
6959 ui.status(
6960 b' ' + p.description().splitlines()[0].strip() + b'\n',
6960 b' ' + p.description().splitlines()[0].strip() + b'\n',
6961 label=b'log.summary',
6961 label=b'log.summary',
6962 )
6962 )
6963
6963
6964 branch = ctx.branch()
6964 branch = ctx.branch()
6965 bheads = repo.branchheads(branch)
6965 bheads = repo.branchheads(branch)
6966 # i18n: column positioning for "hg summary"
6966 # i18n: column positioning for "hg summary"
6967 m = _(b'branch: %s\n') % branch
6967 m = _(b'branch: %s\n') % branch
6968 if branch != b'default':
6968 if branch != b'default':
6969 ui.write(m, label=b'log.branch')
6969 ui.write(m, label=b'log.branch')
6970 else:
6970 else:
6971 ui.status(m, label=b'log.branch')
6971 ui.status(m, label=b'log.branch')
6972
6972
6973 if marks:
6973 if marks:
6974 active = repo._activebookmark
6974 active = repo._activebookmark
6975 # i18n: column positioning for "hg summary"
6975 # i18n: column positioning for "hg summary"
6976 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6976 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6977 if active is not None:
6977 if active is not None:
6978 if active in marks:
6978 if active in marks:
6979 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6979 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6980 marks.remove(active)
6980 marks.remove(active)
6981 else:
6981 else:
6982 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6982 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6983 for m in marks:
6983 for m in marks:
6984 ui.write(b' ' + m, label=b'log.bookmark')
6984 ui.write(b' ' + m, label=b'log.bookmark')
6985 ui.write(b'\n', label=b'log.bookmark')
6985 ui.write(b'\n', label=b'log.bookmark')
6986
6986
6987 status = repo.status(unknown=True)
6987 status = repo.status(unknown=True)
6988
6988
6989 c = repo.dirstate.copies()
6989 c = repo.dirstate.copies()
6990 copied, renamed = [], []
6990 copied, renamed = [], []
6991 for d, s in pycompat.iteritems(c):
6991 for d, s in pycompat.iteritems(c):
6992 if s in status.removed:
6992 if s in status.removed:
6993 status.removed.remove(s)
6993 status.removed.remove(s)
6994 renamed.append(d)
6994 renamed.append(d)
6995 else:
6995 else:
6996 copied.append(d)
6996 copied.append(d)
6997 if d in status.added:
6997 if d in status.added:
6998 status.added.remove(d)
6998 status.added.remove(d)
6999
6999
7000 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7000 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7001
7001
7002 labels = [
7002 labels = [
7003 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7003 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7004 (ui.label(_(b'%d added'), b'status.added'), status.added),
7004 (ui.label(_(b'%d added'), b'status.added'), status.added),
7005 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7005 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7006 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7006 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7007 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7007 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7008 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7008 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7009 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7009 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7010 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7010 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7011 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7011 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7012 ]
7012 ]
7013 t = []
7013 t = []
7014 for l, s in labels:
7014 for l, s in labels:
7015 if s:
7015 if s:
7016 t.append(l % len(s))
7016 t.append(l % len(s))
7017
7017
7018 t = b', '.join(t)
7018 t = b', '.join(t)
7019 cleanworkdir = False
7019 cleanworkdir = False
7020
7020
7021 if repo.vfs.exists(b'graftstate'):
7021 if repo.vfs.exists(b'graftstate'):
7022 t += _(b' (graft in progress)')
7022 t += _(b' (graft in progress)')
7023 if repo.vfs.exists(b'updatestate'):
7023 if repo.vfs.exists(b'updatestate'):
7024 t += _(b' (interrupted update)')
7024 t += _(b' (interrupted update)')
7025 elif len(parents) > 1:
7025 elif len(parents) > 1:
7026 t += _(b' (merge)')
7026 t += _(b' (merge)')
7027 elif branch != parents[0].branch():
7027 elif branch != parents[0].branch():
7028 t += _(b' (new branch)')
7028 t += _(b' (new branch)')
7029 elif parents[0].closesbranch() and pnode in repo.branchheads(
7029 elif parents[0].closesbranch() and pnode in repo.branchheads(
7030 branch, closed=True
7030 branch, closed=True
7031 ):
7031 ):
7032 t += _(b' (head closed)')
7032 t += _(b' (head closed)')
7033 elif not (
7033 elif not (
7034 status.modified
7034 status.modified
7035 or status.added
7035 or status.added
7036 or status.removed
7036 or status.removed
7037 or renamed
7037 or renamed
7038 or copied
7038 or copied
7039 or subs
7039 or subs
7040 ):
7040 ):
7041 t += _(b' (clean)')
7041 t += _(b' (clean)')
7042 cleanworkdir = True
7042 cleanworkdir = True
7043 elif pnode not in bheads:
7043 elif pnode not in bheads:
7044 t += _(b' (new branch head)')
7044 t += _(b' (new branch head)')
7045
7045
7046 if parents:
7046 if parents:
7047 pendingphase = max(p.phase() for p in parents)
7047 pendingphase = max(p.phase() for p in parents)
7048 else:
7048 else:
7049 pendingphase = phases.public
7049 pendingphase = phases.public
7050
7050
7051 if pendingphase > phases.newcommitphase(ui):
7051 if pendingphase > phases.newcommitphase(ui):
7052 t += b' (%s)' % phases.phasenames[pendingphase]
7052 t += b' (%s)' % phases.phasenames[pendingphase]
7053
7053
7054 if cleanworkdir:
7054 if cleanworkdir:
7055 # i18n: column positioning for "hg summary"
7055 # i18n: column positioning for "hg summary"
7056 ui.status(_(b'commit: %s\n') % t.strip())
7056 ui.status(_(b'commit: %s\n') % t.strip())
7057 else:
7057 else:
7058 # i18n: column positioning for "hg summary"
7058 # i18n: column positioning for "hg summary"
7059 ui.write(_(b'commit: %s\n') % t.strip())
7059 ui.write(_(b'commit: %s\n') % t.strip())
7060
7060
7061 # all ancestors of branch heads - all ancestors of parent = new csets
7061 # all ancestors of branch heads - all ancestors of parent = new csets
7062 new = len(
7062 new = len(
7063 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7063 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7064 )
7064 )
7065
7065
7066 if new == 0:
7066 if new == 0:
7067 # i18n: column positioning for "hg summary"
7067 # i18n: column positioning for "hg summary"
7068 ui.status(_(b'update: (current)\n'))
7068 ui.status(_(b'update: (current)\n'))
7069 elif pnode not in bheads:
7069 elif pnode not in bheads:
7070 # i18n: column positioning for "hg summary"
7070 # i18n: column positioning for "hg summary"
7071 ui.write(_(b'update: %d new changesets (update)\n') % new)
7071 ui.write(_(b'update: %d new changesets (update)\n') % new)
7072 else:
7072 else:
7073 # i18n: column positioning for "hg summary"
7073 # i18n: column positioning for "hg summary"
7074 ui.write(
7074 ui.write(
7075 _(b'update: %d new changesets, %d branch heads (merge)\n')
7075 _(b'update: %d new changesets, %d branch heads (merge)\n')
7076 % (new, len(bheads))
7076 % (new, len(bheads))
7077 )
7077 )
7078
7078
7079 t = []
7079 t = []
7080 draft = len(repo.revs(b'draft()'))
7080 draft = len(repo.revs(b'draft()'))
7081 if draft:
7081 if draft:
7082 t.append(_(b'%d draft') % draft)
7082 t.append(_(b'%d draft') % draft)
7083 secret = len(repo.revs(b'secret()'))
7083 secret = len(repo.revs(b'secret()'))
7084 if secret:
7084 if secret:
7085 t.append(_(b'%d secret') % secret)
7085 t.append(_(b'%d secret') % secret)
7086
7086
7087 if draft or secret:
7087 if draft or secret:
7088 ui.status(_(b'phases: %s\n') % b', '.join(t))
7088 ui.status(_(b'phases: %s\n') % b', '.join(t))
7089
7089
7090 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7090 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7091 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7091 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7092 numtrouble = len(repo.revs(trouble + b"()"))
7092 numtrouble = len(repo.revs(trouble + b"()"))
7093 # We write all the possibilities to ease translation
7093 # We write all the possibilities to ease translation
7094 troublemsg = {
7094 troublemsg = {
7095 b"orphan": _(b"orphan: %d changesets"),
7095 b"orphan": _(b"orphan: %d changesets"),
7096 b"contentdivergent": _(b"content-divergent: %d changesets"),
7096 b"contentdivergent": _(b"content-divergent: %d changesets"),
7097 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7097 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7098 }
7098 }
7099 if numtrouble > 0:
7099 if numtrouble > 0:
7100 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7100 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7101
7101
7102 cmdutil.summaryhooks(ui, repo)
7102 cmdutil.summaryhooks(ui, repo)
7103
7103
7104 if opts.get(b'remote'):
7104 if opts.get(b'remote'):
7105 needsincoming, needsoutgoing = True, True
7105 needsincoming, needsoutgoing = True, True
7106 else:
7106 else:
7107 needsincoming, needsoutgoing = False, False
7107 needsincoming, needsoutgoing = False, False
7108 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7108 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7109 if i:
7109 if i:
7110 needsincoming = True
7110 needsincoming = True
7111 if o:
7111 if o:
7112 needsoutgoing = True
7112 needsoutgoing = True
7113 if not needsincoming and not needsoutgoing:
7113 if not needsincoming and not needsoutgoing:
7114 return
7114 return
7115
7115
7116 def getincoming():
7116 def getincoming():
7117 source, branches = hg.parseurl(ui.expandpath(b'default'))
7117 source, branches = hg.parseurl(ui.expandpath(b'default'))
7118 sbranch = branches[0]
7118 sbranch = branches[0]
7119 try:
7119 try:
7120 other = hg.peer(repo, {}, source)
7120 other = hg.peer(repo, {}, source)
7121 except error.RepoError:
7121 except error.RepoError:
7122 if opts.get(b'remote'):
7122 if opts.get(b'remote'):
7123 raise
7123 raise
7124 return source, sbranch, None, None, None
7124 return source, sbranch, None, None, None
7125 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7125 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7126 if revs:
7126 if revs:
7127 revs = [other.lookup(rev) for rev in revs]
7127 revs = [other.lookup(rev) for rev in revs]
7128 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7128 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7129 repo.ui.pushbuffer()
7129 repo.ui.pushbuffer()
7130 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7130 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7131 repo.ui.popbuffer()
7131 repo.ui.popbuffer()
7132 return source, sbranch, other, commoninc, commoninc[1]
7132 return source, sbranch, other, commoninc, commoninc[1]
7133
7133
7134 if needsincoming:
7134 if needsincoming:
7135 source, sbranch, sother, commoninc, incoming = getincoming()
7135 source, sbranch, sother, commoninc, incoming = getincoming()
7136 else:
7136 else:
7137 source = sbranch = sother = commoninc = incoming = None
7137 source = sbranch = sother = commoninc = incoming = None
7138
7138
7139 def getoutgoing():
7139 def getoutgoing():
7140 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7140 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7141 dbranch = branches[0]
7141 dbranch = branches[0]
7142 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7142 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7143 if source != dest:
7143 if source != dest:
7144 try:
7144 try:
7145 dother = hg.peer(repo, {}, dest)
7145 dother = hg.peer(repo, {}, dest)
7146 except error.RepoError:
7146 except error.RepoError:
7147 if opts.get(b'remote'):
7147 if opts.get(b'remote'):
7148 raise
7148 raise
7149 return dest, dbranch, None, None
7149 return dest, dbranch, None, None
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7151 elif sother is None:
7151 elif sother is None:
7152 # there is no explicit destination peer, but source one is invalid
7152 # there is no explicit destination peer, but source one is invalid
7153 return dest, dbranch, None, None
7153 return dest, dbranch, None, None
7154 else:
7154 else:
7155 dother = sother
7155 dother = sother
7156 if source != dest or (sbranch is not None and sbranch != dbranch):
7156 if source != dest or (sbranch is not None and sbranch != dbranch):
7157 common = None
7157 common = None
7158 else:
7158 else:
7159 common = commoninc
7159 common = commoninc
7160 if revs:
7160 if revs:
7161 revs = [repo.lookup(rev) for rev in revs]
7161 revs = [repo.lookup(rev) for rev in revs]
7162 repo.ui.pushbuffer()
7162 repo.ui.pushbuffer()
7163 outgoing = discovery.findcommonoutgoing(
7163 outgoing = discovery.findcommonoutgoing(
7164 repo, dother, onlyheads=revs, commoninc=common
7164 repo, dother, onlyheads=revs, commoninc=common
7165 )
7165 )
7166 repo.ui.popbuffer()
7166 repo.ui.popbuffer()
7167 return dest, dbranch, dother, outgoing
7167 return dest, dbranch, dother, outgoing
7168
7168
7169 if needsoutgoing:
7169 if needsoutgoing:
7170 dest, dbranch, dother, outgoing = getoutgoing()
7170 dest, dbranch, dother, outgoing = getoutgoing()
7171 else:
7171 else:
7172 dest = dbranch = dother = outgoing = None
7172 dest = dbranch = dother = outgoing = None
7173
7173
7174 if opts.get(b'remote'):
7174 if opts.get(b'remote'):
7175 t = []
7175 t = []
7176 if incoming:
7176 if incoming:
7177 t.append(_(b'1 or more incoming'))
7177 t.append(_(b'1 or more incoming'))
7178 o = outgoing.missing
7178 o = outgoing.missing
7179 if o:
7179 if o:
7180 t.append(_(b'%d outgoing') % len(o))
7180 t.append(_(b'%d outgoing') % len(o))
7181 other = dother or sother
7181 other = dother or sother
7182 if b'bookmarks' in other.listkeys(b'namespaces'):
7182 if b'bookmarks' in other.listkeys(b'namespaces'):
7183 counts = bookmarks.summary(repo, other)
7183 counts = bookmarks.summary(repo, other)
7184 if counts[0] > 0:
7184 if counts[0] > 0:
7185 t.append(_(b'%d incoming bookmarks') % counts[0])
7185 t.append(_(b'%d incoming bookmarks') % counts[0])
7186 if counts[1] > 0:
7186 if counts[1] > 0:
7187 t.append(_(b'%d outgoing bookmarks') % counts[1])
7187 t.append(_(b'%d outgoing bookmarks') % counts[1])
7188
7188
7189 if t:
7189 if t:
7190 # i18n: column positioning for "hg summary"
7190 # i18n: column positioning for "hg summary"
7191 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7191 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7192 else:
7192 else:
7193 # i18n: column positioning for "hg summary"
7193 # i18n: column positioning for "hg summary"
7194 ui.status(_(b'remote: (synced)\n'))
7194 ui.status(_(b'remote: (synced)\n'))
7195
7195
7196 cmdutil.summaryremotehooks(
7196 cmdutil.summaryremotehooks(
7197 ui,
7197 ui,
7198 repo,
7198 repo,
7199 opts,
7199 opts,
7200 (
7200 (
7201 (source, sbranch, sother, commoninc),
7201 (source, sbranch, sother, commoninc),
7202 (dest, dbranch, dother, outgoing),
7202 (dest, dbranch, dother, outgoing),
7203 ),
7203 ),
7204 )
7204 )
7205
7205
7206
7206
7207 @command(
7207 @command(
7208 b'tag',
7208 b'tag',
7209 [
7209 [
7210 (b'f', b'force', None, _(b'force tag')),
7210 (b'f', b'force', None, _(b'force tag')),
7211 (b'l', b'local', None, _(b'make the tag local')),
7211 (b'l', b'local', None, _(b'make the tag local')),
7212 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7212 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7213 (b'', b'remove', None, _(b'remove a tag')),
7213 (b'', b'remove', None, _(b'remove a tag')),
7214 # -l/--local is already there, commitopts cannot be used
7214 # -l/--local is already there, commitopts cannot be used
7215 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7215 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7216 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7216 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7217 ]
7217 ]
7218 + commitopts2,
7218 + commitopts2,
7219 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7219 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7220 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7220 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7221 )
7221 )
7222 def tag(ui, repo, name1, *names, **opts):
7222 def tag(ui, repo, name1, *names, **opts):
7223 """add one or more tags for the current or given revision
7223 """add one or more tags for the current or given revision
7224
7224
7225 Name a particular revision using <name>.
7225 Name a particular revision using <name>.
7226
7226
7227 Tags are used to name particular revisions of the repository and are
7227 Tags are used to name particular revisions of the repository and are
7228 very useful to compare different revisions, to go back to significant
7228 very useful to compare different revisions, to go back to significant
7229 earlier versions or to mark branch points as releases, etc. Changing
7229 earlier versions or to mark branch points as releases, etc. Changing
7230 an existing tag is normally disallowed; use -f/--force to override.
7230 an existing tag is normally disallowed; use -f/--force to override.
7231
7231
7232 If no revision is given, the parent of the working directory is
7232 If no revision is given, the parent of the working directory is
7233 used.
7233 used.
7234
7234
7235 To facilitate version control, distribution, and merging of tags,
7235 To facilitate version control, distribution, and merging of tags,
7236 they are stored as a file named ".hgtags" which is managed similarly
7236 they are stored as a file named ".hgtags" which is managed similarly
7237 to other project files and can be hand-edited if necessary. This
7237 to other project files and can be hand-edited if necessary. This
7238 also means that tagging creates a new commit. The file
7238 also means that tagging creates a new commit. The file
7239 ".hg/localtags" is used for local tags (not shared among
7239 ".hg/localtags" is used for local tags (not shared among
7240 repositories).
7240 repositories).
7241
7241
7242 Tag commits are usually made at the head of a branch. If the parent
7242 Tag commits are usually made at the head of a branch. If the parent
7243 of the working directory is not a branch head, :hg:`tag` aborts; use
7243 of the working directory is not a branch head, :hg:`tag` aborts; use
7244 -f/--force to force the tag commit to be based on a non-head
7244 -f/--force to force the tag commit to be based on a non-head
7245 changeset.
7245 changeset.
7246
7246
7247 See :hg:`help dates` for a list of formats valid for -d/--date.
7247 See :hg:`help dates` for a list of formats valid for -d/--date.
7248
7248
7249 Since tag names have priority over branch names during revision
7249 Since tag names have priority over branch names during revision
7250 lookup, using an existing branch name as a tag name is discouraged.
7250 lookup, using an existing branch name as a tag name is discouraged.
7251
7251
7252 Returns 0 on success.
7252 Returns 0 on success.
7253 """
7253 """
7254 opts = pycompat.byteskwargs(opts)
7254 opts = pycompat.byteskwargs(opts)
7255 with repo.wlock(), repo.lock():
7255 with repo.wlock(), repo.lock():
7256 rev_ = b"."
7256 rev_ = b"."
7257 names = [t.strip() for t in (name1,) + names]
7257 names = [t.strip() for t in (name1,) + names]
7258 if len(names) != len(set(names)):
7258 if len(names) != len(set(names)):
7259 raise error.Abort(_(b'tag names must be unique'))
7259 raise error.Abort(_(b'tag names must be unique'))
7260 for n in names:
7260 for n in names:
7261 scmutil.checknewlabel(repo, n, b'tag')
7261 scmutil.checknewlabel(repo, n, b'tag')
7262 if not n:
7262 if not n:
7263 raise error.Abort(
7263 raise error.Abort(
7264 _(b'tag names cannot consist entirely of whitespace')
7264 _(b'tag names cannot consist entirely of whitespace')
7265 )
7265 )
7266 if opts.get(b'rev') and opts.get(b'remove'):
7266 if opts.get(b'rev') and opts.get(b'remove'):
7267 raise error.Abort(_(b"--rev and --remove are incompatible"))
7267 raise error.Abort(_(b"--rev and --remove are incompatible"))
7268 if opts.get(b'rev'):
7268 if opts.get(b'rev'):
7269 rev_ = opts[b'rev']
7269 rev_ = opts[b'rev']
7270 message = opts.get(b'message')
7270 message = opts.get(b'message')
7271 if opts.get(b'remove'):
7271 if opts.get(b'remove'):
7272 if opts.get(b'local'):
7272 if opts.get(b'local'):
7273 expectedtype = b'local'
7273 expectedtype = b'local'
7274 else:
7274 else:
7275 expectedtype = b'global'
7275 expectedtype = b'global'
7276
7276
7277 for n in names:
7277 for n in names:
7278 if repo.tagtype(n) == b'global':
7278 if repo.tagtype(n) == b'global':
7279 alltags = tagsmod.findglobaltags(ui, repo)
7279 alltags = tagsmod.findglobaltags(ui, repo)
7280 if alltags[n][0] == nullid:
7280 if alltags[n][0] == nullid:
7281 raise error.Abort(_(b"tag '%s' is already removed") % n)
7281 raise error.Abort(_(b"tag '%s' is already removed") % n)
7282 if not repo.tagtype(n):
7282 if not repo.tagtype(n):
7283 raise error.Abort(_(b"tag '%s' does not exist") % n)
7283 raise error.Abort(_(b"tag '%s' does not exist") % n)
7284 if repo.tagtype(n) != expectedtype:
7284 if repo.tagtype(n) != expectedtype:
7285 if expectedtype == b'global':
7285 if expectedtype == b'global':
7286 raise error.Abort(
7286 raise error.Abort(
7287 _(b"tag '%s' is not a global tag") % n
7287 _(b"tag '%s' is not a global tag") % n
7288 )
7288 )
7289 else:
7289 else:
7290 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7290 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7291 rev_ = b'null'
7291 rev_ = b'null'
7292 if not message:
7292 if not message:
7293 # we don't translate commit messages
7293 # we don't translate commit messages
7294 message = b'Removed tag %s' % b', '.join(names)
7294 message = b'Removed tag %s' % b', '.join(names)
7295 elif not opts.get(b'force'):
7295 elif not opts.get(b'force'):
7296 for n in names:
7296 for n in names:
7297 if n in repo.tags():
7297 if n in repo.tags():
7298 raise error.Abort(
7298 raise error.Abort(
7299 _(b"tag '%s' already exists (use -f to force)") % n
7299 _(b"tag '%s' already exists (use -f to force)") % n
7300 )
7300 )
7301 if not opts.get(b'local'):
7301 if not opts.get(b'local'):
7302 p1, p2 = repo.dirstate.parents()
7302 p1, p2 = repo.dirstate.parents()
7303 if p2 != nullid:
7303 if p2 != nullid:
7304 raise error.Abort(_(b'uncommitted merge'))
7304 raise error.Abort(_(b'uncommitted merge'))
7305 bheads = repo.branchheads()
7305 bheads = repo.branchheads()
7306 if not opts.get(b'force') and bheads and p1 not in bheads:
7306 if not opts.get(b'force') and bheads and p1 not in bheads:
7307 raise error.Abort(
7307 raise error.Abort(
7308 _(
7308 _(
7309 b'working directory is not at a branch head '
7309 b'working directory is not at a branch head '
7310 b'(use -f to force)'
7310 b'(use -f to force)'
7311 )
7311 )
7312 )
7312 )
7313 node = scmutil.revsingle(repo, rev_).node()
7313 node = scmutil.revsingle(repo, rev_).node()
7314
7314
7315 if not message:
7315 if not message:
7316 # we don't translate commit messages
7316 # we don't translate commit messages
7317 message = b'Added tag %s for changeset %s' % (
7317 message = b'Added tag %s for changeset %s' % (
7318 b', '.join(names),
7318 b', '.join(names),
7319 short(node),
7319 short(node),
7320 )
7320 )
7321
7321
7322 date = opts.get(b'date')
7322 date = opts.get(b'date')
7323 if date:
7323 if date:
7324 date = dateutil.parsedate(date)
7324 date = dateutil.parsedate(date)
7325
7325
7326 if opts.get(b'remove'):
7326 if opts.get(b'remove'):
7327 editform = b'tag.remove'
7327 editform = b'tag.remove'
7328 else:
7328 else:
7329 editform = b'tag.add'
7329 editform = b'tag.add'
7330 editor = cmdutil.getcommiteditor(
7330 editor = cmdutil.getcommiteditor(
7331 editform=editform, **pycompat.strkwargs(opts)
7331 editform=editform, **pycompat.strkwargs(opts)
7332 )
7332 )
7333
7333
7334 # don't allow tagging the null rev
7334 # don't allow tagging the null rev
7335 if (
7335 if (
7336 not opts.get(b'remove')
7336 not opts.get(b'remove')
7337 and scmutil.revsingle(repo, rev_).rev() == nullrev
7337 and scmutil.revsingle(repo, rev_).rev() == nullrev
7338 ):
7338 ):
7339 raise error.Abort(_(b"cannot tag null revision"))
7339 raise error.Abort(_(b"cannot tag null revision"))
7340
7340
7341 tagsmod.tag(
7341 tagsmod.tag(
7342 repo,
7342 repo,
7343 names,
7343 names,
7344 node,
7344 node,
7345 message,
7345 message,
7346 opts.get(b'local'),
7346 opts.get(b'local'),
7347 opts.get(b'user'),
7347 opts.get(b'user'),
7348 date,
7348 date,
7349 editor=editor,
7349 editor=editor,
7350 )
7350 )
7351
7351
7352
7352
7353 @command(
7353 @command(
7354 b'tags',
7354 b'tags',
7355 formatteropts,
7355 formatteropts,
7356 b'',
7356 b'',
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7358 intents={INTENT_READONLY},
7358 intents={INTENT_READONLY},
7359 )
7359 )
7360 def tags(ui, repo, **opts):
7360 def tags(ui, repo, **opts):
7361 """list repository tags
7361 """list repository tags
7362
7362
7363 This lists both regular and local tags. When the -v/--verbose
7363 This lists both regular and local tags. When the -v/--verbose
7364 switch is used, a third column "local" is printed for local tags.
7364 switch is used, a third column "local" is printed for local tags.
7365 When the -q/--quiet switch is used, only the tag name is printed.
7365 When the -q/--quiet switch is used, only the tag name is printed.
7366
7366
7367 .. container:: verbose
7367 .. container:: verbose
7368
7368
7369 Template:
7369 Template:
7370
7370
7371 The following keywords are supported in addition to the common template
7371 The following keywords are supported in addition to the common template
7372 keywords and functions such as ``{tag}``. See also
7372 keywords and functions such as ``{tag}``. See also
7373 :hg:`help templates`.
7373 :hg:`help templates`.
7374
7374
7375 :type: String. ``local`` for local tags.
7375 :type: String. ``local`` for local tags.
7376
7376
7377 Returns 0 on success.
7377 Returns 0 on success.
7378 """
7378 """
7379
7379
7380 opts = pycompat.byteskwargs(opts)
7380 opts = pycompat.byteskwargs(opts)
7381 ui.pager(b'tags')
7381 ui.pager(b'tags')
7382 fm = ui.formatter(b'tags', opts)
7382 fm = ui.formatter(b'tags', opts)
7383 hexfunc = fm.hexfunc
7383 hexfunc = fm.hexfunc
7384
7384
7385 for t, n in reversed(repo.tagslist()):
7385 for t, n in reversed(repo.tagslist()):
7386 hn = hexfunc(n)
7386 hn = hexfunc(n)
7387 label = b'tags.normal'
7387 label = b'tags.normal'
7388 tagtype = b''
7388 tagtype = b''
7389 if repo.tagtype(t) == b'local':
7389 if repo.tagtype(t) == b'local':
7390 label = b'tags.local'
7390 label = b'tags.local'
7391 tagtype = b'local'
7391 tagtype = b'local'
7392
7392
7393 fm.startitem()
7393 fm.startitem()
7394 fm.context(repo=repo)
7394 fm.context(repo=repo)
7395 fm.write(b'tag', b'%s', t, label=label)
7395 fm.write(b'tag', b'%s', t, label=label)
7396 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7396 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7397 fm.condwrite(
7397 fm.condwrite(
7398 not ui.quiet,
7398 not ui.quiet,
7399 b'rev node',
7399 b'rev node',
7400 fmt,
7400 fmt,
7401 repo.changelog.rev(n),
7401 repo.changelog.rev(n),
7402 hn,
7402 hn,
7403 label=label,
7403 label=label,
7404 )
7404 )
7405 fm.condwrite(
7405 fm.condwrite(
7406 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7406 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7407 )
7407 )
7408 fm.plain(b'\n')
7408 fm.plain(b'\n')
7409 fm.end()
7409 fm.end()
7410
7410
7411
7411
7412 @command(
7412 @command(
7413 b'tip',
7413 b'tip',
7414 [
7414 [
7415 (b'p', b'patch', None, _(b'show patch')),
7415 (b'p', b'patch', None, _(b'show patch')),
7416 (b'g', b'git', None, _(b'use git extended diff format')),
7416 (b'g', b'git', None, _(b'use git extended diff format')),
7417 ]
7417 ]
7418 + templateopts,
7418 + templateopts,
7419 _(b'[-p] [-g]'),
7419 _(b'[-p] [-g]'),
7420 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7420 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7421 )
7421 )
7422 def tip(ui, repo, **opts):
7422 def tip(ui, repo, **opts):
7423 """show the tip revision (DEPRECATED)
7423 """show the tip revision (DEPRECATED)
7424
7424
7425 The tip revision (usually just called the tip) is the changeset
7425 The tip revision (usually just called the tip) is the changeset
7426 most recently added to the repository (and therefore the most
7426 most recently added to the repository (and therefore the most
7427 recently changed head).
7427 recently changed head).
7428
7428
7429 If you have just made a commit, that commit will be the tip. If
7429 If you have just made a commit, that commit will be the tip. If
7430 you have just pulled changes from another repository, the tip of
7430 you have just pulled changes from another repository, the tip of
7431 that repository becomes the current tip. The "tip" tag is special
7431 that repository becomes the current tip. The "tip" tag is special
7432 and cannot be renamed or assigned to a different changeset.
7432 and cannot be renamed or assigned to a different changeset.
7433
7433
7434 This command is deprecated, please use :hg:`heads` instead.
7434 This command is deprecated, please use :hg:`heads` instead.
7435
7435
7436 Returns 0 on success.
7436 Returns 0 on success.
7437 """
7437 """
7438 opts = pycompat.byteskwargs(opts)
7438 opts = pycompat.byteskwargs(opts)
7439 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7439 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7440 displayer.show(repo[b'tip'])
7440 displayer.show(repo[b'tip'])
7441 displayer.close()
7441 displayer.close()
7442
7442
7443
7443
7444 @command(
7444 @command(
7445 b'unbundle',
7445 b'unbundle',
7446 [
7446 [
7447 (
7447 (
7448 b'u',
7448 b'u',
7449 b'update',
7449 b'update',
7450 None,
7450 None,
7451 _(b'update to new branch head if changesets were unbundled'),
7451 _(b'update to new branch head if changesets were unbundled'),
7452 )
7452 )
7453 ],
7453 ],
7454 _(b'[-u] FILE...'),
7454 _(b'[-u] FILE...'),
7455 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7455 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7456 )
7456 )
7457 def unbundle(ui, repo, fname1, *fnames, **opts):
7457 def unbundle(ui, repo, fname1, *fnames, **opts):
7458 """apply one or more bundle files
7458 """apply one or more bundle files
7459
7459
7460 Apply one or more bundle files generated by :hg:`bundle`.
7460 Apply one or more bundle files generated by :hg:`bundle`.
7461
7461
7462 Returns 0 on success, 1 if an update has unresolved files.
7462 Returns 0 on success, 1 if an update has unresolved files.
7463 """
7463 """
7464 fnames = (fname1,) + fnames
7464 fnames = (fname1,) + fnames
7465
7465
7466 with repo.lock():
7466 with repo.lock():
7467 for fname in fnames:
7467 for fname in fnames:
7468 f = hg.openpath(ui, fname)
7468 f = hg.openpath(ui, fname)
7469 gen = exchange.readbundle(ui, f, fname)
7469 gen = exchange.readbundle(ui, f, fname)
7470 if isinstance(gen, streamclone.streamcloneapplier):
7470 if isinstance(gen, streamclone.streamcloneapplier):
7471 raise error.Abort(
7471 raise error.Abort(
7472 _(
7472 _(
7473 b'packed bundles cannot be applied with '
7473 b'packed bundles cannot be applied with '
7474 b'"hg unbundle"'
7474 b'"hg unbundle"'
7475 ),
7475 ),
7476 hint=_(b'use "hg debugapplystreamclonebundle"'),
7476 hint=_(b'use "hg debugapplystreamclonebundle"'),
7477 )
7477 )
7478 url = b'bundle:' + fname
7478 url = b'bundle:' + fname
7479 try:
7479 try:
7480 txnname = b'unbundle'
7480 txnname = b'unbundle'
7481 if not isinstance(gen, bundle2.unbundle20):
7481 if not isinstance(gen, bundle2.unbundle20):
7482 txnname = b'unbundle\n%s' % util.hidepassword(url)
7482 txnname = b'unbundle\n%s' % util.hidepassword(url)
7483 with repo.transaction(txnname) as tr:
7483 with repo.transaction(txnname) as tr:
7484 op = bundle2.applybundle(
7484 op = bundle2.applybundle(
7485 repo, gen, tr, source=b'unbundle', url=url
7485 repo, gen, tr, source=b'unbundle', url=url
7486 )
7486 )
7487 except error.BundleUnknownFeatureError as exc:
7487 except error.BundleUnknownFeatureError as exc:
7488 raise error.Abort(
7488 raise error.Abort(
7489 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7489 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7490 hint=_(
7490 hint=_(
7491 b"see https://mercurial-scm.org/"
7491 b"see https://mercurial-scm.org/"
7492 b"wiki/BundleFeature for more "
7492 b"wiki/BundleFeature for more "
7493 b"information"
7493 b"information"
7494 ),
7494 ),
7495 )
7495 )
7496 modheads = bundle2.combinechangegroupresults(op)
7496 modheads = bundle2.combinechangegroupresults(op)
7497
7497
7498 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7498 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7499
7499
7500
7500
7501 @command(
7501 @command(
7502 b'unshelve',
7502 b'unshelve',
7503 [
7503 [
7504 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7504 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7505 (
7505 (
7506 b'c',
7506 b'c',
7507 b'continue',
7507 b'continue',
7508 None,
7508 None,
7509 _(b'continue an incomplete unshelve operation'),
7509 _(b'continue an incomplete unshelve operation'),
7510 ),
7510 ),
7511 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7511 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7512 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7512 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7513 (
7513 (
7514 b'n',
7514 b'n',
7515 b'name',
7515 b'name',
7516 b'',
7516 b'',
7517 _(b'restore shelved change with given name'),
7517 _(b'restore shelved change with given name'),
7518 _(b'NAME'),
7518 _(b'NAME'),
7519 ),
7519 ),
7520 (b't', b'tool', b'', _(b'specify merge tool')),
7520 (b't', b'tool', b'', _(b'specify merge tool')),
7521 (
7521 (
7522 b'',
7522 b'',
7523 b'date',
7523 b'date',
7524 b'',
7524 b'',
7525 _(b'set date for temporary commits (DEPRECATED)'),
7525 _(b'set date for temporary commits (DEPRECATED)'),
7526 _(b'DATE'),
7526 _(b'DATE'),
7527 ),
7527 ),
7528 ],
7528 ],
7529 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7529 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7530 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7530 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7531 )
7531 )
7532 def unshelve(ui, repo, *shelved, **opts):
7532 def unshelve(ui, repo, *shelved, **opts):
7533 """restore a shelved change to the working directory
7533 """restore a shelved change to the working directory
7534
7534
7535 This command accepts an optional name of a shelved change to
7535 This command accepts an optional name of a shelved change to
7536 restore. If none is given, the most recent shelved change is used.
7536 restore. If none is given, the most recent shelved change is used.
7537
7537
7538 If a shelved change is applied successfully, the bundle that
7538 If a shelved change is applied successfully, the bundle that
7539 contains the shelved changes is moved to a backup location
7539 contains the shelved changes is moved to a backup location
7540 (.hg/shelve-backup).
7540 (.hg/shelve-backup).
7541
7541
7542 Since you can restore a shelved change on top of an arbitrary
7542 Since you can restore a shelved change on top of an arbitrary
7543 commit, it is possible that unshelving will result in a conflict
7543 commit, it is possible that unshelving will result in a conflict
7544 between your changes and the commits you are unshelving onto. If
7544 between your changes and the commits you are unshelving onto. If
7545 this occurs, you must resolve the conflict, then use
7545 this occurs, you must resolve the conflict, then use
7546 ``--continue`` to complete the unshelve operation. (The bundle
7546 ``--continue`` to complete the unshelve operation. (The bundle
7547 will not be moved until you successfully complete the unshelve.)
7547 will not be moved until you successfully complete the unshelve.)
7548
7548
7549 (Alternatively, you can use ``--abort`` to abandon an unshelve
7549 (Alternatively, you can use ``--abort`` to abandon an unshelve
7550 that causes a conflict. This reverts the unshelved changes, and
7550 that causes a conflict. This reverts the unshelved changes, and
7551 leaves the bundle in place.)
7551 leaves the bundle in place.)
7552
7552
7553 If bare shelved change (without interactive, include and exclude
7553 If bare shelved change (without interactive, include and exclude
7554 option) was done on newly created branch it would restore branch
7554 option) was done on newly created branch it would restore branch
7555 information to the working directory.
7555 information to the working directory.
7556
7556
7557 After a successful unshelve, the shelved changes are stored in a
7557 After a successful unshelve, the shelved changes are stored in a
7558 backup directory. Only the N most recent backups are kept. N
7558 backup directory. Only the N most recent backups are kept. N
7559 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7559 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7560 configuration option.
7560 configuration option.
7561
7561
7562 .. container:: verbose
7562 .. container:: verbose
7563
7563
7564 Timestamp in seconds is used to decide order of backups. More
7564 Timestamp in seconds is used to decide order of backups. More
7565 than ``maxbackups`` backups are kept, if same timestamp
7565 than ``maxbackups`` backups are kept, if same timestamp
7566 prevents from deciding exact order of them, for safety.
7566 prevents from deciding exact order of them, for safety.
7567
7567
7568 Selected changes can be unshelved with ``--interactive`` flag.
7568 Selected changes can be unshelved with ``--interactive`` flag.
7569 The working directory is updated with the selected changes, and
7569 The working directory is updated with the selected changes, and
7570 only the unselected changes remain shelved.
7570 only the unselected changes remain shelved.
7571 Note: The whole shelve is applied to working directory first before
7571 Note: The whole shelve is applied to working directory first before
7572 running interactively. So, this will bring up all the conflicts between
7572 running interactively. So, this will bring up all the conflicts between
7573 working directory and the shelve, irrespective of which changes will be
7573 working directory and the shelve, irrespective of which changes will be
7574 unshelved.
7574 unshelved.
7575 """
7575 """
7576 with repo.wlock():
7576 with repo.wlock():
7577 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7577 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7578
7578
7579
7579
7580 statemod.addunfinished(
7580 statemod.addunfinished(
7581 b'unshelve',
7581 b'unshelve',
7582 fname=b'shelvedstate',
7582 fname=b'shelvedstate',
7583 continueflag=True,
7583 continueflag=True,
7584 abortfunc=shelvemod.hgabortunshelve,
7584 abortfunc=shelvemod.hgabortunshelve,
7585 continuefunc=shelvemod.hgcontinueunshelve,
7585 continuefunc=shelvemod.hgcontinueunshelve,
7586 cmdmsg=_(b'unshelve already in progress'),
7586 cmdmsg=_(b'unshelve already in progress'),
7587 )
7587 )
7588
7588
7589
7589
7590 @command(
7590 @command(
7591 b'update|up|checkout|co',
7591 b'update|up|checkout|co',
7592 [
7592 [
7593 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7593 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7594 (b'c', b'check', None, _(b'require clean working directory')),
7594 (b'c', b'check', None, _(b'require clean working directory')),
7595 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7595 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7596 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7596 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7597 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7597 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7598 ]
7598 ]
7599 + mergetoolopts,
7599 + mergetoolopts,
7600 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7600 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7601 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7601 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7602 helpbasic=True,
7602 helpbasic=True,
7603 )
7603 )
7604 def update(ui, repo, node=None, **opts):
7604 def update(ui, repo, node=None, **opts):
7605 """update working directory (or switch revisions)
7605 """update working directory (or switch revisions)
7606
7606
7607 Update the repository's working directory to the specified
7607 Update the repository's working directory to the specified
7608 changeset. If no changeset is specified, update to the tip of the
7608 changeset. If no changeset is specified, update to the tip of the
7609 current named branch and move the active bookmark (see :hg:`help
7609 current named branch and move the active bookmark (see :hg:`help
7610 bookmarks`).
7610 bookmarks`).
7611
7611
7612 Update sets the working directory's parent revision to the specified
7612 Update sets the working directory's parent revision to the specified
7613 changeset (see :hg:`help parents`).
7613 changeset (see :hg:`help parents`).
7614
7614
7615 If the changeset is not a descendant or ancestor of the working
7615 If the changeset is not a descendant or ancestor of the working
7616 directory's parent and there are uncommitted changes, the update is
7616 directory's parent and there are uncommitted changes, the update is
7617 aborted. With the -c/--check option, the working directory is checked
7617 aborted. With the -c/--check option, the working directory is checked
7618 for uncommitted changes; if none are found, the working directory is
7618 for uncommitted changes; if none are found, the working directory is
7619 updated to the specified changeset.
7619 updated to the specified changeset.
7620
7620
7621 .. container:: verbose
7621 .. container:: verbose
7622
7622
7623 The -C/--clean, -c/--check, and -m/--merge options control what
7623 The -C/--clean, -c/--check, and -m/--merge options control what
7624 happens if the working directory contains uncommitted changes.
7624 happens if the working directory contains uncommitted changes.
7625 At most of one of them can be specified.
7625 At most of one of them can be specified.
7626
7626
7627 1. If no option is specified, and if
7627 1. If no option is specified, and if
7628 the requested changeset is an ancestor or descendant of
7628 the requested changeset is an ancestor or descendant of
7629 the working directory's parent, the uncommitted changes
7629 the working directory's parent, the uncommitted changes
7630 are merged into the requested changeset and the merged
7630 are merged into the requested changeset and the merged
7631 result is left uncommitted. If the requested changeset is
7631 result is left uncommitted. If the requested changeset is
7632 not an ancestor or descendant (that is, it is on another
7632 not an ancestor or descendant (that is, it is on another
7633 branch), the update is aborted and the uncommitted changes
7633 branch), the update is aborted and the uncommitted changes
7634 are preserved.
7634 are preserved.
7635
7635
7636 2. With the -m/--merge option, the update is allowed even if the
7636 2. With the -m/--merge option, the update is allowed even if the
7637 requested changeset is not an ancestor or descendant of
7637 requested changeset is not an ancestor or descendant of
7638 the working directory's parent.
7638 the working directory's parent.
7639
7639
7640 3. With the -c/--check option, the update is aborted and the
7640 3. With the -c/--check option, the update is aborted and the
7641 uncommitted changes are preserved.
7641 uncommitted changes are preserved.
7642
7642
7643 4. With the -C/--clean option, uncommitted changes are discarded and
7643 4. With the -C/--clean option, uncommitted changes are discarded and
7644 the working directory is updated to the requested changeset.
7644 the working directory is updated to the requested changeset.
7645
7645
7646 To cancel an uncommitted merge (and lose your changes), use
7646 To cancel an uncommitted merge (and lose your changes), use
7647 :hg:`merge --abort`.
7647 :hg:`merge --abort`.
7648
7648
7649 Use null as the changeset to remove the working directory (like
7649 Use null as the changeset to remove the working directory (like
7650 :hg:`clone -U`).
7650 :hg:`clone -U`).
7651
7651
7652 If you want to revert just one file to an older revision, use
7652 If you want to revert just one file to an older revision, use
7653 :hg:`revert [-r REV] NAME`.
7653 :hg:`revert [-r REV] NAME`.
7654
7654
7655 See :hg:`help dates` for a list of formats valid for -d/--date.
7655 See :hg:`help dates` for a list of formats valid for -d/--date.
7656
7656
7657 Returns 0 on success, 1 if there are unresolved files.
7657 Returns 0 on success, 1 if there are unresolved files.
7658 """
7658 """
7659 rev = opts.get('rev')
7659 rev = opts.get('rev')
7660 date = opts.get('date')
7660 date = opts.get('date')
7661 clean = opts.get('clean')
7661 clean = opts.get('clean')
7662 check = opts.get('check')
7662 check = opts.get('check')
7663 merge = opts.get('merge')
7663 merge = opts.get('merge')
7664 if rev and node:
7664 if rev and node:
7665 raise error.Abort(_(b"please specify just one revision"))
7665 raise error.Abort(_(b"please specify just one revision"))
7666
7666
7667 if ui.configbool(b'commands', b'update.requiredest'):
7667 if ui.configbool(b'commands', b'update.requiredest'):
7668 if not node and not rev and not date:
7668 if not node and not rev and not date:
7669 raise error.Abort(
7669 raise error.Abort(
7670 _(b'you must specify a destination'),
7670 _(b'you must specify a destination'),
7671 hint=_(b'for example: hg update ".::"'),
7671 hint=_(b'for example: hg update ".::"'),
7672 )
7672 )
7673
7673
7674 if rev is None or rev == b'':
7674 if rev is None or rev == b'':
7675 rev = node
7675 rev = node
7676
7676
7677 if date and rev is not None:
7677 if date and rev is not None:
7678 raise error.Abort(_(b"you can't specify a revision and a date"))
7678 raise error.Abort(_(b"you can't specify a revision and a date"))
7679
7679
7680 if len([x for x in (clean, check, merge) if x]) > 1:
7680 if len([x for x in (clean, check, merge) if x]) > 1:
7681 raise error.Abort(
7681 raise error.Abort(
7682 _(
7682 _(
7683 b"can only specify one of -C/--clean, -c/--check, "
7683 b"can only specify one of -C/--clean, -c/--check, "
7684 b"or -m/--merge"
7684 b"or -m/--merge"
7685 )
7685 )
7686 )
7686 )
7687
7687
7688 updatecheck = None
7688 updatecheck = None
7689 if check:
7689 if check:
7690 updatecheck = b'abort'
7690 updatecheck = b'abort'
7691 elif merge:
7691 elif merge:
7692 updatecheck = b'none'
7692 updatecheck = b'none'
7693
7693
7694 with repo.wlock():
7694 with repo.wlock():
7695 cmdutil.clearunfinished(repo)
7695 cmdutil.clearunfinished(repo)
7696 if date:
7696 if date:
7697 rev = cmdutil.finddate(ui, repo, date)
7697 rev = cmdutil.finddate(ui, repo, date)
7698
7698
7699 # if we defined a bookmark, we have to remember the original name
7699 # if we defined a bookmark, we have to remember the original name
7700 brev = rev
7700 brev = rev
7701 if rev:
7701 if rev:
7702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7703 ctx = scmutil.revsingle(repo, rev, default=None)
7703 ctx = scmutil.revsingle(repo, rev, default=None)
7704 rev = ctx.rev()
7704 rev = ctx.rev()
7705 hidden = ctx.hidden()
7705 hidden = ctx.hidden()
7706 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7706 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7707 with ui.configoverride(overrides, b'update'):
7707 with ui.configoverride(overrides, b'update'):
7708 ret = hg.updatetotally(
7708 ret = hg.updatetotally(
7709 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7709 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7710 )
7710 )
7711 if hidden:
7711 if hidden:
7712 ctxstr = ctx.hex()[:12]
7712 ctxstr = ctx.hex()[:12]
7713 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7713 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7714
7714
7715 if ctx.obsolete():
7715 if ctx.obsolete():
7716 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7716 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7717 ui.warn(b"(%s)\n" % obsfatemsg)
7717 ui.warn(b"(%s)\n" % obsfatemsg)
7718 return ret
7718 return ret
7719
7719
7720
7720
7721 @command(
7721 @command(
7722 b'verify',
7722 b'verify',
7723 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7723 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7724 helpcategory=command.CATEGORY_MAINTENANCE,
7724 helpcategory=command.CATEGORY_MAINTENANCE,
7725 )
7725 )
7726 def verify(ui, repo, **opts):
7726 def verify(ui, repo, **opts):
7727 """verify the integrity of the repository
7727 """verify the integrity of the repository
7728
7728
7729 Verify the integrity of the current repository.
7729 Verify the integrity of the current repository.
7730
7730
7731 This will perform an extensive check of the repository's
7731 This will perform an extensive check of the repository's
7732 integrity, validating the hashes and checksums of each entry in
7732 integrity, validating the hashes and checksums of each entry in
7733 the changelog, manifest, and tracked files, as well as the
7733 the changelog, manifest, and tracked files, as well as the
7734 integrity of their crosslinks and indices.
7734 integrity of their crosslinks and indices.
7735
7735
7736 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7736 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7737 for more information about recovery from corruption of the
7737 for more information about recovery from corruption of the
7738 repository.
7738 repository.
7739
7739
7740 Returns 0 on success, 1 if errors are encountered.
7740 Returns 0 on success, 1 if errors are encountered.
7741 """
7741 """
7742 opts = pycompat.byteskwargs(opts)
7742 opts = pycompat.byteskwargs(opts)
7743
7743
7744 level = None
7744 level = None
7745 if opts[b'full']:
7745 if opts[b'full']:
7746 level = verifymod.VERIFY_FULL
7746 level = verifymod.VERIFY_FULL
7747 return hg.verify(repo, level)
7747 return hg.verify(repo, level)
7748
7748
7749
7749
7750 @command(
7750 @command(
7751 b'version',
7751 b'version',
7752 [] + formatteropts,
7752 [] + formatteropts,
7753 helpcategory=command.CATEGORY_HELP,
7753 helpcategory=command.CATEGORY_HELP,
7754 norepo=True,
7754 norepo=True,
7755 intents={INTENT_READONLY},
7755 intents={INTENT_READONLY},
7756 )
7756 )
7757 def version_(ui, **opts):
7757 def version_(ui, **opts):
7758 """output version and copyright information
7758 """output version and copyright information
7759
7759
7760 .. container:: verbose
7760 .. container:: verbose
7761
7761
7762 Template:
7762 Template:
7763
7763
7764 The following keywords are supported. See also :hg:`help templates`.
7764 The following keywords are supported. See also :hg:`help templates`.
7765
7765
7766 :extensions: List of extensions.
7766 :extensions: List of extensions.
7767 :ver: String. Version number.
7767 :ver: String. Version number.
7768
7768
7769 And each entry of ``{extensions}`` provides the following sub-keywords
7769 And each entry of ``{extensions}`` provides the following sub-keywords
7770 in addition to ``{ver}``.
7770 in addition to ``{ver}``.
7771
7771
7772 :bundled: Boolean. True if included in the release.
7772 :bundled: Boolean. True if included in the release.
7773 :name: String. Extension name.
7773 :name: String. Extension name.
7774 """
7774 """
7775 opts = pycompat.byteskwargs(opts)
7775 opts = pycompat.byteskwargs(opts)
7776 if ui.verbose:
7776 if ui.verbose:
7777 ui.pager(b'version')
7777 ui.pager(b'version')
7778 fm = ui.formatter(b"version", opts)
7778 fm = ui.formatter(b"version", opts)
7779 fm.startitem()
7779 fm.startitem()
7780 fm.write(
7780 fm.write(
7781 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7781 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7782 )
7782 )
7783 license = _(
7783 license = _(
7784 b"(see https://mercurial-scm.org for more information)\n"
7784 b"(see https://mercurial-scm.org for more information)\n"
7785 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7785 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7786 b"This is free software; see the source for copying conditions. "
7786 b"This is free software; see the source for copying conditions. "
7787 b"There is NO\nwarranty; "
7787 b"There is NO\nwarranty; "
7788 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7788 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7789 )
7789 )
7790 if not ui.quiet:
7790 if not ui.quiet:
7791 fm.plain(license)
7791 fm.plain(license)
7792
7792
7793 if ui.verbose:
7793 if ui.verbose:
7794 fm.plain(_(b"\nEnabled extensions:\n\n"))
7794 fm.plain(_(b"\nEnabled extensions:\n\n"))
7795 # format names and versions into columns
7795 # format names and versions into columns
7796 names = []
7796 names = []
7797 vers = []
7797 vers = []
7798 isinternals = []
7798 isinternals = []
7799 for name, module in extensions.extensions():
7799 for name, module in extensions.extensions():
7800 names.append(name)
7800 names.append(name)
7801 vers.append(extensions.moduleversion(module) or None)
7801 vers.append(extensions.moduleversion(module) or None)
7802 isinternals.append(extensions.ismoduleinternal(module))
7802 isinternals.append(extensions.ismoduleinternal(module))
7803 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7803 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7804 if names:
7804 if names:
7805 namefmt = b" %%-%ds " % max(len(n) for n in names)
7805 namefmt = b" %%-%ds " % max(len(n) for n in names)
7806 places = [_(b"external"), _(b"internal")]
7806 places = [_(b"external"), _(b"internal")]
7807 for n, v, p in zip(names, vers, isinternals):
7807 for n, v, p in zip(names, vers, isinternals):
7808 fn.startitem()
7808 fn.startitem()
7809 fn.condwrite(ui.verbose, b"name", namefmt, n)
7809 fn.condwrite(ui.verbose, b"name", namefmt, n)
7810 if ui.verbose:
7810 if ui.verbose:
7811 fn.plain(b"%s " % places[p])
7811 fn.plain(b"%s " % places[p])
7812 fn.data(bundled=p)
7812 fn.data(bundled=p)
7813 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7813 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7814 if ui.verbose:
7814 if ui.verbose:
7815 fn.plain(b"\n")
7815 fn.plain(b"\n")
7816 fn.end()
7816 fn.end()
7817 fm.end()
7817 fm.end()
7818
7818
7819
7819
7820 def loadcmdtable(ui, name, cmdtable):
7820 def loadcmdtable(ui, name, cmdtable):
7821 """Load command functions from specified cmdtable
7821 """Load command functions from specified cmdtable
7822 """
7822 """
7823 overrides = [cmd for cmd in cmdtable if cmd in table]
7823 overrides = [cmd for cmd in cmdtable if cmd in table]
7824 if overrides:
7824 if overrides:
7825 ui.warn(
7825 ui.warn(
7826 _(b"extension '%s' overrides commands: %s\n")
7826 _(b"extension '%s' overrides commands: %s\n")
7827 % (name, b" ".join(overrides))
7827 % (name, b" ".join(overrides))
7828 )
7828 )
7829 table.update(cmdtable)
7829 table.update(cmdtable)
@@ -1,545 +1,545 b''
1 #require repofncache
1 #require repofncache
2
2
3 An extension which will set fncache chunksize to 1 byte to make sure that logic
3 An extension which will set fncache chunksize to 1 byte to make sure that logic
4 does not break
4 does not break
5
5
6 $ cat > chunksize.py <<EOF
6 $ cat > chunksize.py <<EOF
7 > from __future__ import absolute_import
7 > from __future__ import absolute_import
8 > from mercurial import store
8 > from mercurial import store
9 > store.fncache_chunksize = 1
9 > store.fncache_chunksize = 1
10 > EOF
10 > EOF
11
11
12 $ cat >> $HGRCPATH <<EOF
12 $ cat >> $HGRCPATH <<EOF
13 > [extensions]
13 > [extensions]
14 > chunksize = $TESTTMP/chunksize.py
14 > chunksize = $TESTTMP/chunksize.py
15 > EOF
15 > EOF
16
16
17 Init repo1:
17 Init repo1:
18
18
19 $ hg init repo1
19 $ hg init repo1
20 $ cd repo1
20 $ cd repo1
21 $ echo "some text" > a
21 $ echo "some text" > a
22 $ hg add
22 $ hg add
23 adding a
23 adding a
24 $ hg ci -m first
24 $ hg ci -m first
25 $ cat .hg/store/fncache | sort
25 $ cat .hg/store/fncache | sort
26 data/a.i
26 data/a.i
27
27
28 Testing a.i/b:
28 Testing a.i/b:
29
29
30 $ mkdir a.i
30 $ mkdir a.i
31 $ echo "some other text" > a.i/b
31 $ echo "some other text" > a.i/b
32 $ hg add
32 $ hg add
33 adding a.i/b
33 adding a.i/b
34 $ hg ci -m second
34 $ hg ci -m second
35 $ cat .hg/store/fncache | sort
35 $ cat .hg/store/fncache | sort
36 data/a.i
36 data/a.i
37 data/a.i.hg/b.i
37 data/a.i.hg/b.i
38
38
39 Testing a.i.hg/c:
39 Testing a.i.hg/c:
40
40
41 $ mkdir a.i.hg
41 $ mkdir a.i.hg
42 $ echo "yet another text" > a.i.hg/c
42 $ echo "yet another text" > a.i.hg/c
43 $ hg add
43 $ hg add
44 adding a.i.hg/c
44 adding a.i.hg/c
45 $ hg ci -m third
45 $ hg ci -m third
46 $ cat .hg/store/fncache | sort
46 $ cat .hg/store/fncache | sort
47 data/a.i
47 data/a.i
48 data/a.i.hg.hg/c.i
48 data/a.i.hg.hg/c.i
49 data/a.i.hg/b.i
49 data/a.i.hg/b.i
50
50
51 Testing verify:
51 Testing verify:
52
52
53 $ hg verify
53 $ hg verify
54 checking changesets
54 checking changesets
55 checking manifests
55 checking manifests
56 crosschecking files in changesets and manifests
56 crosschecking files in changesets and manifests
57 checking files
57 checking files
58 checked 3 changesets with 3 changes to 3 files
58 checked 3 changesets with 3 changes to 3 files
59
59
60 $ rm .hg/store/fncache
60 $ rm .hg/store/fncache
61
61
62 $ hg verify
62 $ hg verify
63 checking changesets
63 checking changesets
64 checking manifests
64 checking manifests
65 crosschecking files in changesets and manifests
65 crosschecking files in changesets and manifests
66 checking files
66 checking files
67 warning: revlog 'data/a.i' not in fncache!
67 warning: revlog 'data/a.i' not in fncache!
68 warning: revlog 'data/a.i.hg/c.i' not in fncache!
68 warning: revlog 'data/a.i.hg/c.i' not in fncache!
69 warning: revlog 'data/a.i/b.i' not in fncache!
69 warning: revlog 'data/a.i/b.i' not in fncache!
70 checked 3 changesets with 3 changes to 3 files
70 checked 3 changesets with 3 changes to 3 files
71 3 warnings encountered!
71 3 warnings encountered!
72 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
72 hint: run "hg debugrebuildfncache" to recover from corrupt fncache
73
73
74 Follow the hint to make sure it works
74 Follow the hint to make sure it works
75
75
76 $ hg debugrebuildfncache
76 $ hg debugrebuildfncache
77 adding data/a.i
77 adding data/a.i
78 adding data/a.i.hg/c.i
78 adding data/a.i.hg/c.i
79 adding data/a.i/b.i
79 adding data/a.i/b.i
80 3 items added, 0 removed from fncache
80 3 items added, 0 removed from fncache
81
81
82 $ hg verify
82 $ hg verify
83 checking changesets
83 checking changesets
84 checking manifests
84 checking manifests
85 crosschecking files in changesets and manifests
85 crosschecking files in changesets and manifests
86 checking files
86 checking files
87 checked 3 changesets with 3 changes to 3 files
87 checked 3 changesets with 3 changes to 3 files
88
88
89 $ cd ..
89 $ cd ..
90
90
91 Non store repo:
91 Non store repo:
92
92
93 $ hg --config format.usestore=False init foo
93 $ hg --config format.usestore=False init foo
94 $ cd foo
94 $ cd foo
95 $ mkdir tst.d
95 $ mkdir tst.d
96 $ echo foo > tst.d/foo
96 $ echo foo > tst.d/foo
97 $ hg ci -Amfoo
97 $ hg ci -Amfoo
98 adding tst.d/foo
98 adding tst.d/foo
99 $ find .hg | sort
99 $ find .hg | sort
100 .hg
100 .hg
101 .hg/00changelog.i
101 .hg/00changelog.i
102 .hg/00manifest.i
102 .hg/00manifest.i
103 .hg/cache
103 .hg/cache
104 .hg/cache/branch2-served
104 .hg/cache/branch2-served
105 .hg/cache/rbc-names-v1
105 .hg/cache/rbc-names-v1
106 .hg/cache/rbc-revs-v1
106 .hg/cache/rbc-revs-v1
107 .hg/data
107 .hg/data
108 .hg/data/tst.d.hg
108 .hg/data/tst.d.hg
109 .hg/data/tst.d.hg/foo.i
109 .hg/data/tst.d.hg/foo.i
110 .hg/dirstate
110 .hg/dirstate
111 .hg/fsmonitor.state (fsmonitor !)
111 .hg/fsmonitor.state (fsmonitor !)
112 .hg/last-message.txt
112 .hg/last-message.txt
113 .hg/phaseroots
113 .hg/phaseroots
114 .hg/requires
114 .hg/requires
115 .hg/undo
115 .hg/undo
116 .hg/undo.backup.dirstate
116 .hg/undo.backup.dirstate
117 .hg/undo.backupfiles
117 .hg/undo.backupfiles
118 .hg/undo.bookmarks
118 .hg/undo.bookmarks
119 .hg/undo.branch
119 .hg/undo.branch
120 .hg/undo.desc
120 .hg/undo.desc
121 .hg/undo.dirstate
121 .hg/undo.dirstate
122 .hg/undo.phaseroots
122 .hg/undo.phaseroots
123 .hg/wcache
123 .hg/wcache
124 .hg/wcache/checkisexec (execbit !)
124 .hg/wcache/checkisexec (execbit !)
125 .hg/wcache/checklink (symlink !)
125 .hg/wcache/checklink (symlink !)
126 .hg/wcache/checklink-target (symlink !)
126 .hg/wcache/checklink-target (symlink !)
127 .hg/wcache/manifestfulltextcache (reporevlogstore !)
127 .hg/wcache/manifestfulltextcache (reporevlogstore !)
128 $ cd ..
128 $ cd ..
129
129
130 Non fncache repo:
130 Non fncache repo:
131
131
132 $ hg --config format.usefncache=False init bar
132 $ hg --config format.usefncache=False init bar
133 $ cd bar
133 $ cd bar
134 $ mkdir tst.d
134 $ mkdir tst.d
135 $ echo foo > tst.d/Foo
135 $ echo foo > tst.d/Foo
136 $ hg ci -Amfoo
136 $ hg ci -Amfoo
137 adding tst.d/Foo
137 adding tst.d/Foo
138 $ find .hg | sort
138 $ find .hg | sort
139 .hg
139 .hg
140 .hg/00changelog.i
140 .hg/00changelog.i
141 .hg/cache
141 .hg/cache
142 .hg/cache/branch2-served
142 .hg/cache/branch2-served
143 .hg/cache/rbc-names-v1
143 .hg/cache/rbc-names-v1
144 .hg/cache/rbc-revs-v1
144 .hg/cache/rbc-revs-v1
145 .hg/dirstate
145 .hg/dirstate
146 .hg/fsmonitor.state (fsmonitor !)
146 .hg/fsmonitor.state (fsmonitor !)
147 .hg/last-message.txt
147 .hg/last-message.txt
148 .hg/requires
148 .hg/requires
149 .hg/store
149 .hg/store
150 .hg/store/00changelog.i
150 .hg/store/00changelog.i
151 .hg/store/00manifest.i
151 .hg/store/00manifest.i
152 .hg/store/data
152 .hg/store/data
153 .hg/store/data/tst.d.hg
153 .hg/store/data/tst.d.hg
154 .hg/store/data/tst.d.hg/_foo.i
154 .hg/store/data/tst.d.hg/_foo.i
155 .hg/store/phaseroots
155 .hg/store/phaseroots
156 .hg/store/undo
156 .hg/store/undo
157 .hg/store/undo.backupfiles
157 .hg/store/undo.backupfiles
158 .hg/store/undo.phaseroots
158 .hg/store/undo.phaseroots
159 .hg/undo.backup.dirstate
159 .hg/undo.backup.dirstate
160 .hg/undo.bookmarks
160 .hg/undo.bookmarks
161 .hg/undo.branch
161 .hg/undo.branch
162 .hg/undo.desc
162 .hg/undo.desc
163 .hg/undo.dirstate
163 .hg/undo.dirstate
164 .hg/wcache
164 .hg/wcache
165 .hg/wcache/checkisexec (execbit !)
165 .hg/wcache/checkisexec (execbit !)
166 .hg/wcache/checklink (symlink !)
166 .hg/wcache/checklink (symlink !)
167 .hg/wcache/checklink-target (symlink !)
167 .hg/wcache/checklink-target (symlink !)
168 .hg/wcache/manifestfulltextcache (reporevlogstore !)
168 .hg/wcache/manifestfulltextcache (reporevlogstore !)
169 $ cd ..
169 $ cd ..
170
170
171 Encoding of reserved / long paths in the store
171 Encoding of reserved / long paths in the store
172
172
173 $ hg init r2
173 $ hg init r2
174 $ cd r2
174 $ cd r2
175 $ cat <<EOF > .hg/hgrc
175 $ cat <<EOF > .hg/hgrc
176 > [ui]
176 > [ui]
177 > portablefilenames = ignore
177 > portablefilenames = ignore
178 > EOF
178 > EOF
179
179
180 $ hg import -q --bypass - <<EOF
180 $ hg import -q --bypass - <<EOF
181 > # HG changeset patch
181 > # HG changeset patch
182 > # User test
182 > # User test
183 > # Date 0 0
183 > # Date 0 0
184 > # Node ID 1c7a2f7cb77be1a0def34e4c7cabc562ad98fbd7
184 > # Node ID 1c7a2f7cb77be1a0def34e4c7cabc562ad98fbd7
185 > # Parent 0000000000000000000000000000000000000000
185 > # Parent 0000000000000000000000000000000000000000
186 > 1
186 > 1
187 >
187 >
188 > diff --git a/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
188 > diff --git a/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
189 > new file mode 100644
189 > new file mode 100644
190 > --- /dev/null
190 > --- /dev/null
191 > +++ b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
191 > +++ b/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz
192 > @@ -0,0 +1,1 @@
192 > @@ -0,0 +1,1 @@
193 > +foo
193 > +foo
194 > diff --git a/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
194 > diff --git a/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
195 > new file mode 100644
195 > new file mode 100644
196 > --- /dev/null
196 > --- /dev/null
197 > +++ b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
197 > +++ b/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT
198 > @@ -0,0 +1,1 @@
198 > @@ -0,0 +1,1 @@
199 > +foo
199 > +foo
200 > diff --git a/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt
200 > diff --git a/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt
201 > new file mode 100644
201 > new file mode 100644
202 > --- /dev/null
202 > --- /dev/null
203 > +++ b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt
203 > +++ b/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt
204 > @@ -0,0 +1,1 @@
204 > @@ -0,0 +1,1 @@
205 > +foo
205 > +foo
206 > diff --git a/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
206 > diff --git a/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
207 > new file mode 100644
207 > new file mode 100644
208 > --- /dev/null
208 > --- /dev/null
209 > +++ b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
209 > +++ b/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c
210 > @@ -0,0 +1,1 @@
210 > @@ -0,0 +1,1 @@
211 > +foo
211 > +foo
212 > diff --git a/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
212 > diff --git a/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
213 > new file mode 100644
213 > new file mode 100644
214 > --- /dev/null
214 > --- /dev/null
215 > +++ b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
215 > +++ b/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider
216 > @@ -0,0 +1,1 @@
216 > @@ -0,0 +1,1 @@
217 > +foo
217 > +foo
218 > EOF
218 > EOF
219
219
220 $ find .hg/store -name *.i | sort
220 $ find .hg/store -name *.i | sort
221 .hg/store/00changelog.i
221 .hg/store/00changelog.i
222 .hg/store/00manifest.i
222 .hg/store/00manifest.i
223 .hg/store/data/bla.aux/pr~6e/_p_r_n/lpt/co~6d3/nu~6c/coma/foo._n_u_l/normal.c.i
223 .hg/store/data/bla.aux/pr~6e/_p_r_n/lpt/co~6d3/nu~6c/coma/foo._n_u_l/normal.c.i
224 .hg/store/dh/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxx168e07b38e65eff86ab579afaaa8e30bfbe0f35f.i
224 .hg/store/dh/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxx168e07b38e65eff86ab579afaaa8e30bfbe0f35f.i
225 .hg/store/dh/au~78/second/x.prn/fourth/fi~3afth/sixth/seventh/eighth/nineth/tenth/loremia20419e358ddff1bf8751e38288aff1d7c32ec05.i
225 .hg/store/dh/au~78/second/x.prn/fourth/fi~3afth/sixth/seventh/eighth/nineth/tenth/loremia20419e358ddff1bf8751e38288aff1d7c32ec05.i
226 .hg/store/dh/enterpri/openesba/contrib-/corba-bc/netbeans/wsdlexte/src/main/java/org.net7018f27961fdf338a598a40c4683429e7ffb9743.i
226 .hg/store/dh/enterpri/openesba/contrib-/corba-bc/netbeans/wsdlexte/src/main/java/org.net7018f27961fdf338a598a40c4683429e7ffb9743.i
227 .hg/store/dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilename0d8e1f4187c650e2f1fdca9fd90f786bc0976b6b.i
227 .hg/store/dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilename0d8e1f4187c650e2f1fdca9fd90f786bc0976b6b.i
228
228
229 $ cd ..
229 $ cd ..
230
230
231 Aborting lock does not prevent fncache writes
231 Aborting lock does not prevent fncache writes
232
232
233 $ cat > exceptionext.py <<EOF
233 $ cat > exceptionext.py <<EOF
234 > from __future__ import absolute_import
234 > from __future__ import absolute_import
235 > import os
235 > import os
236 > from mercurial import commands, error, extensions
236 > from mercurial import commands, error, extensions
237 >
237 >
238 > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
238 > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
239 > def releasewrap():
239 > def releasewrap():
240 > l.held = False # ensure __del__ is a noop
240 > l.held = False # ensure __del__ is a noop
241 > raise error.Abort("forced lock failure")
241 > raise error.Abort("forced lock failure")
242 > l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
242 > l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
243 > return l
243 > return l
244 >
244 >
245 > def reposetup(ui, repo):
245 > def reposetup(ui, repo):
246 > extensions.wrapfunction(repo, '_lock', lockexception)
246 > extensions.wrapfunction(repo, '_lock', lockexception)
247 >
247 >
248 > cmdtable = {}
248 > cmdtable = {}
249 >
249 >
250 > # wrap "commit" command to prevent wlock from being '__del__()'-ed
250 > # wrap "commit" command to prevent wlock from being '__del__()'-ed
251 > # at the end of dispatching (for intentional "forced lcok failure")
251 > # at the end of dispatching (for intentional "forced lcok failure")
252 > def commitwrap(orig, ui, repo, *pats, **opts):
252 > def commitwrap(orig, ui, repo, *pats, **opts):
253 > repo = repo.unfiltered() # to use replaced repo._lock certainly
253 > repo = repo.unfiltered() # to use replaced repo._lock certainly
254 > wlock = repo.wlock()
254 > wlock = repo.wlock()
255 > try:
255 > try:
256 > return orig(ui, repo, *pats, **opts)
256 > return orig(ui, repo, *pats, **opts)
257 > finally:
257 > finally:
258 > # multiple 'relase()' is needed for complete releasing wlock,
258 > # multiple 'relase()' is needed for complete releasing wlock,
259 > # because "forced" abort at last releasing store lock
259 > # because "forced" abort at last releasing store lock
260 > # prevents wlock from being released at same 'lockmod.release()'
260 > # prevents wlock from being released at same 'lockmod.release()'
261 > for i in range(wlock.held):
261 > for i in range(wlock.held):
262 > wlock.release()
262 > wlock.release()
263 >
263 >
264 > def extsetup(ui):
264 > def extsetup(ui):
265 > extensions.wrapcommand(commands.table, b"commit", commitwrap)
265 > extensions.wrapcommand(commands.table, b"commit", commitwrap)
266 > EOF
266 > EOF
267 $ extpath=`pwd`/exceptionext.py
267 $ extpath=`pwd`/exceptionext.py
268 $ hg init fncachetxn
268 $ hg init fncachetxn
269 $ cd fncachetxn
269 $ cd fncachetxn
270 $ printf "[extensions]\nexceptionext=$extpath\n" >> .hg/hgrc
270 $ printf "[extensions]\nexceptionext=$extpath\n" >> .hg/hgrc
271 $ touch y
271 $ touch y
272 $ hg ci -qAm y
272 $ hg ci -qAm y
273 abort: forced lock failure
273 abort: forced lock failure
274 [255]
274 [255]
275 $ cat .hg/store/fncache
275 $ cat .hg/store/fncache
276 data/y.i
276 data/y.i
277
277
278 Aborting transaction prevents fncache change
278 Aborting transaction prevents fncache change
279
279
280 $ cat > ../exceptionext.py <<EOF
280 $ cat > ../exceptionext.py <<EOF
281 > from __future__ import absolute_import
281 > from __future__ import absolute_import
282 > import os
282 > import os
283 > from mercurial import commands, error, extensions, localrepo
283 > from mercurial import commands, error, extensions, localrepo
284 >
284 >
285 > def wrapper(orig, self, *args, **kwargs):
285 > def wrapper(orig, self, *args, **kwargs):
286 > tr = orig(self, *args, **kwargs)
286 > tr = orig(self, *args, **kwargs)
287 > def fail(tr):
287 > def fail(tr):
288 > raise error.Abort(b"forced transaction failure")
288 > raise error.Abort(b"forced transaction failure")
289 > # zzz prefix to ensure it sorted after store.write
289 > # zzz prefix to ensure it sorted after store.write
290 > tr.addfinalize(b'zzz-forcefails', fail)
290 > tr.addfinalize(b'zzz-forcefails', fail)
291 > return tr
291 > return tr
292 >
292 >
293 > def uisetup(ui):
293 > def uisetup(ui):
294 > extensions.wrapfunction(
294 > extensions.wrapfunction(
295 > localrepo.localrepository, b'transaction', wrapper)
295 > localrepo.localrepository, b'transaction', wrapper)
296 >
296 >
297 > cmdtable = {}
297 > cmdtable = {}
298 >
298 >
299 > EOF
299 > EOF
300
300
301 Clean cached version
301 Clean cached version
302 $ rm -f "${extpath}c"
302 $ rm -f "${extpath}c"
303 $ rm -Rf "`dirname $extpath`/__pycache__"
303 $ rm -Rf "`dirname $extpath`/__pycache__"
304
304
305 $ touch z
305 $ touch z
306 $ hg ci -qAm z
306 $ hg ci -qAm z
307 transaction abort!
307 transaction abort!
308 rollback completed
308 rollback completed
309 abort: forced transaction failure
309 abort: forced transaction failure
310 [255]
310 [255]
311 $ cat .hg/store/fncache
311 $ cat .hg/store/fncache
312 data/y.i
312 data/y.i
313
313
314 Aborted transactions can be recovered later
314 Aborted transactions can be recovered later
315
315
316 $ cat > ../exceptionext.py <<EOF
316 $ cat > ../exceptionext.py <<EOF
317 > from __future__ import absolute_import
317 > from __future__ import absolute_import
318 > import os
318 > import os
319 > from mercurial import (
319 > from mercurial import (
320 > commands,
320 > commands,
321 > error,
321 > error,
322 > extensions,
322 > extensions,
323 > localrepo,
323 > localrepo,
324 > transaction,
324 > transaction,
325 > )
325 > )
326 >
326 >
327 > def trwrapper(orig, self, *args, **kwargs):
327 > def trwrapper(orig, self, *args, **kwargs):
328 > tr = orig(self, *args, **kwargs)
328 > tr = orig(self, *args, **kwargs)
329 > def fail(tr):
329 > def fail(tr):
330 > raise error.Abort(b"forced transaction failure")
330 > raise error.Abort(b"forced transaction failure")
331 > # zzz prefix to ensure it sorted after store.write
331 > # zzz prefix to ensure it sorted after store.write
332 > tr.addfinalize(b'zzz-forcefails', fail)
332 > tr.addfinalize(b'zzz-forcefails', fail)
333 > return tr
333 > return tr
334 >
334 >
335 > def abortwrapper(orig, self, *args, **kwargs):
335 > def abortwrapper(orig, self, *args, **kwargs):
336 > raise error.Abort(b"forced transaction failure")
336 > raise error.Abort(b"forced transaction failure")
337 >
337 >
338 > def uisetup(ui):
338 > def uisetup(ui):
339 > extensions.wrapfunction(localrepo.localrepository, 'transaction',
339 > extensions.wrapfunction(localrepo.localrepository, 'transaction',
340 > trwrapper)
340 > trwrapper)
341 > extensions.wrapfunction(transaction.transaction, '_abort',
341 > extensions.wrapfunction(transaction.transaction, '_abort',
342 > abortwrapper)
342 > abortwrapper)
343 >
343 >
344 > cmdtable = {}
344 > cmdtable = {}
345 >
345 >
346 > EOF
346 > EOF
347
347
348 Clean cached versions
348 Clean cached versions
349 $ rm -f "${extpath}c"
349 $ rm -f "${extpath}c"
350 $ rm -Rf "`dirname $extpath`/__pycache__"
350 $ rm -Rf "`dirname $extpath`/__pycache__"
351
351
352 $ hg up -q 1
352 $ hg up -q 1
353 $ touch z
353 $ touch z
354 $ hg ci -qAm z 2>/dev/null
354 $ hg ci -qAm z 2>/dev/null
355 [255]
355 [255]
356 $ cat .hg/store/fncache | sort
356 $ cat .hg/store/fncache | sort
357 data/y.i
357 data/y.i
358 data/z.i
358 data/z.i
359 $ hg recover
359 $ hg recover --verify
360 rolling back interrupted transaction
360 rolling back interrupted transaction
361 checking changesets
361 checking changesets
362 checking manifests
362 checking manifests
363 crosschecking files in changesets and manifests
363 crosschecking files in changesets and manifests
364 checking files
364 checking files
365 checked 1 changesets with 1 changes to 1 files
365 checked 1 changesets with 1 changes to 1 files
366 $ cat .hg/store/fncache
366 $ cat .hg/store/fncache
367 data/y.i
367 data/y.i
368
368
369 $ cd ..
369 $ cd ..
370
370
371 debugrebuildfncache does nothing unless repo has fncache requirement
371 debugrebuildfncache does nothing unless repo has fncache requirement
372
372
373 $ hg --config format.usefncache=false init nofncache
373 $ hg --config format.usefncache=false init nofncache
374 $ cd nofncache
374 $ cd nofncache
375 $ hg debugrebuildfncache
375 $ hg debugrebuildfncache
376 (not rebuilding fncache because repository does not support fncache)
376 (not rebuilding fncache because repository does not support fncache)
377
377
378 $ cd ..
378 $ cd ..
379
379
380 debugrebuildfncache works on empty repository
380 debugrebuildfncache works on empty repository
381
381
382 $ hg init empty
382 $ hg init empty
383 $ cd empty
383 $ cd empty
384 $ hg debugrebuildfncache
384 $ hg debugrebuildfncache
385 fncache already up to date
385 fncache already up to date
386 $ cd ..
386 $ cd ..
387
387
388 debugrebuildfncache on an up to date repository no-ops
388 debugrebuildfncache on an up to date repository no-ops
389
389
390 $ hg init repo
390 $ hg init repo
391 $ cd repo
391 $ cd repo
392 $ echo initial > foo
392 $ echo initial > foo
393 $ echo initial > .bar
393 $ echo initial > .bar
394 $ hg commit -A -m initial
394 $ hg commit -A -m initial
395 adding .bar
395 adding .bar
396 adding foo
396 adding foo
397
397
398 $ cat .hg/store/fncache | sort
398 $ cat .hg/store/fncache | sort
399 data/.bar.i
399 data/.bar.i
400 data/foo.i
400 data/foo.i
401
401
402 $ hg debugrebuildfncache
402 $ hg debugrebuildfncache
403 fncache already up to date
403 fncache already up to date
404
404
405 debugrebuildfncache restores deleted fncache file
405 debugrebuildfncache restores deleted fncache file
406
406
407 $ rm -f .hg/store/fncache
407 $ rm -f .hg/store/fncache
408 $ hg debugrebuildfncache
408 $ hg debugrebuildfncache
409 adding data/.bar.i
409 adding data/.bar.i
410 adding data/foo.i
410 adding data/foo.i
411 2 items added, 0 removed from fncache
411 2 items added, 0 removed from fncache
412
412
413 $ cat .hg/store/fncache | sort
413 $ cat .hg/store/fncache | sort
414 data/.bar.i
414 data/.bar.i
415 data/foo.i
415 data/foo.i
416
416
417 Rebuild after rebuild should no-op
417 Rebuild after rebuild should no-op
418
418
419 $ hg debugrebuildfncache
419 $ hg debugrebuildfncache
420 fncache already up to date
420 fncache already up to date
421
421
422 A single missing file should get restored, an extra file should be removed
422 A single missing file should get restored, an extra file should be removed
423
423
424 $ cat > .hg/store/fncache << EOF
424 $ cat > .hg/store/fncache << EOF
425 > data/foo.i
425 > data/foo.i
426 > data/bad-entry.i
426 > data/bad-entry.i
427 > EOF
427 > EOF
428
428
429 $ hg debugrebuildfncache
429 $ hg debugrebuildfncache
430 removing data/bad-entry.i
430 removing data/bad-entry.i
431 adding data/.bar.i
431 adding data/.bar.i
432 1 items added, 1 removed from fncache
432 1 items added, 1 removed from fncache
433
433
434 $ cat .hg/store/fncache | sort
434 $ cat .hg/store/fncache | sort
435 data/.bar.i
435 data/.bar.i
436 data/foo.i
436 data/foo.i
437
437
438 debugrebuildfncache recovers from truncated line in fncache
438 debugrebuildfncache recovers from truncated line in fncache
439
439
440 $ printf a > .hg/store/fncache
440 $ printf a > .hg/store/fncache
441 $ hg debugrebuildfncache
441 $ hg debugrebuildfncache
442 fncache does not ends with a newline
442 fncache does not ends with a newline
443 adding data/.bar.i
443 adding data/.bar.i
444 adding data/foo.i
444 adding data/foo.i
445 2 items added, 0 removed from fncache
445 2 items added, 0 removed from fncache
446
446
447 $ cat .hg/store/fncache | sort
447 $ cat .hg/store/fncache | sort
448 data/.bar.i
448 data/.bar.i
449 data/foo.i
449 data/foo.i
450
450
451 $ cd ..
451 $ cd ..
452
452
453 Try a simple variation without dotencode to ensure fncache is ignorant of encoding
453 Try a simple variation without dotencode to ensure fncache is ignorant of encoding
454
454
455 $ hg --config format.dotencode=false init nodotencode
455 $ hg --config format.dotencode=false init nodotencode
456 $ cd nodotencode
456 $ cd nodotencode
457 $ echo initial > foo
457 $ echo initial > foo
458 $ echo initial > .bar
458 $ echo initial > .bar
459 $ hg commit -A -m initial
459 $ hg commit -A -m initial
460 adding .bar
460 adding .bar
461 adding foo
461 adding foo
462
462
463 $ cat .hg/store/fncache | sort
463 $ cat .hg/store/fncache | sort
464 data/.bar.i
464 data/.bar.i
465 data/foo.i
465 data/foo.i
466
466
467 $ rm .hg/store/fncache
467 $ rm .hg/store/fncache
468 $ hg debugrebuildfncache
468 $ hg debugrebuildfncache
469 adding data/.bar.i
469 adding data/.bar.i
470 adding data/foo.i
470 adding data/foo.i
471 2 items added, 0 removed from fncache
471 2 items added, 0 removed from fncache
472
472
473 $ cat .hg/store/fncache | sort
473 $ cat .hg/store/fncache | sort
474 data/.bar.i
474 data/.bar.i
475 data/foo.i
475 data/foo.i
476
476
477 $ cd ..
477 $ cd ..
478
478
479 In repositories that have accumulated a large number of files over time, the
479 In repositories that have accumulated a large number of files over time, the
480 fncache file is going to be large. If we possibly can avoid loading it, so much the better.
480 fncache file is going to be large. If we possibly can avoid loading it, so much the better.
481 The cache should not loaded when committing changes to existing files, or when unbundling
481 The cache should not loaded when committing changes to existing files, or when unbundling
482 changesets that only contain changes to existing files:
482 changesets that only contain changes to existing files:
483
483
484 $ cat > fncacheloadwarn.py << EOF
484 $ cat > fncacheloadwarn.py << EOF
485 > from __future__ import absolute_import
485 > from __future__ import absolute_import
486 > from mercurial import extensions, localrepo
486 > from mercurial import extensions, localrepo
487 >
487 >
488 > def extsetup(ui):
488 > def extsetup(ui):
489 > def wrapstore(orig, requirements, *args):
489 > def wrapstore(orig, requirements, *args):
490 > store = orig(requirements, *args)
490 > store = orig(requirements, *args)
491 > if b'store' in requirements and b'fncache' in requirements:
491 > if b'store' in requirements and b'fncache' in requirements:
492 > instrumentfncachestore(store, ui)
492 > instrumentfncachestore(store, ui)
493 > return store
493 > return store
494 > extensions.wrapfunction(localrepo, 'makestore', wrapstore)
494 > extensions.wrapfunction(localrepo, 'makestore', wrapstore)
495 >
495 >
496 > def instrumentfncachestore(fncachestore, ui):
496 > def instrumentfncachestore(fncachestore, ui):
497 > class instrumentedfncache(type(fncachestore.fncache)):
497 > class instrumentedfncache(type(fncachestore.fncache)):
498 > def _load(self):
498 > def _load(self):
499 > ui.warn(b'fncache load triggered!\n')
499 > ui.warn(b'fncache load triggered!\n')
500 > super(instrumentedfncache, self)._load()
500 > super(instrumentedfncache, self)._load()
501 > fncachestore.fncache.__class__ = instrumentedfncache
501 > fncachestore.fncache.__class__ = instrumentedfncache
502 > EOF
502 > EOF
503
503
504 $ fncachextpath=`pwd`/fncacheloadwarn.py
504 $ fncachextpath=`pwd`/fncacheloadwarn.py
505 $ hg init nofncacheload
505 $ hg init nofncacheload
506 $ cd nofncacheload
506 $ cd nofncacheload
507 $ printf "[extensions]\nfncacheloadwarn=$fncachextpath\n" >> .hg/hgrc
507 $ printf "[extensions]\nfncacheloadwarn=$fncachextpath\n" >> .hg/hgrc
508
508
509 A new file should trigger a load, as we'd want to update the fncache set in that case:
509 A new file should trigger a load, as we'd want to update the fncache set in that case:
510
510
511 $ touch foo
511 $ touch foo
512 $ hg ci -qAm foo
512 $ hg ci -qAm foo
513 fncache load triggered!
513 fncache load triggered!
514
514
515 But modifying that file should not:
515 But modifying that file should not:
516
516
517 $ echo bar >> foo
517 $ echo bar >> foo
518 $ hg ci -qm foo
518 $ hg ci -qm foo
519
519
520 If a transaction has been aborted, the zero-size truncated index file will
520 If a transaction has been aborted, the zero-size truncated index file will
521 not prevent the fncache from being loaded; rather than actually abort
521 not prevent the fncache from being loaded; rather than actually abort
522 a transaction, we simulate the situation by creating a zero-size index file:
522 a transaction, we simulate the situation by creating a zero-size index file:
523
523
524 $ touch .hg/store/data/bar.i
524 $ touch .hg/store/data/bar.i
525 $ touch bar
525 $ touch bar
526 $ hg ci -qAm bar
526 $ hg ci -qAm bar
527 fncache load triggered!
527 fncache load triggered!
528
528
529 Unbundling should follow the same rules; existing files should not cause a load:
529 Unbundling should follow the same rules; existing files should not cause a load:
530
530
531 $ hg clone -q . tobundle
531 $ hg clone -q . tobundle
532 $ echo 'new line' > tobundle/bar
532 $ echo 'new line' > tobundle/bar
533 $ hg -R tobundle ci -qm bar
533 $ hg -R tobundle ci -qm bar
534 $ hg -R tobundle bundle -q barupdated.hg
534 $ hg -R tobundle bundle -q barupdated.hg
535 $ hg unbundle -q barupdated.hg
535 $ hg unbundle -q barupdated.hg
536
536
537 but adding new files should:
537 but adding new files should:
538
538
539 $ touch tobundle/newfile
539 $ touch tobundle/newfile
540 $ hg -R tobundle ci -qAm newfile
540 $ hg -R tobundle ci -qAm newfile
541 $ hg -R tobundle bundle -q newfile.hg
541 $ hg -R tobundle bundle -q newfile.hg
542 $ hg unbundle -q newfile.hg
542 $ hg unbundle -q newfile.hg
543 fncache load triggered!
543 fncache load triggered!
544
544
545 $ cd ..
545 $ cd ..
@@ -1,64 +1,60 b''
1 $ hg init
1 $ hg init
2 $ echo a > a
2 $ echo a > a
3 $ hg ci -Am0
3 $ hg ci -Am0
4 adding a
4 adding a
5
5
6 $ hg -q clone . foo
6 $ hg -q clone . foo
7
7
8 $ touch .hg/store/journal
8 $ touch .hg/store/journal
9
9
10 $ echo foo > a
10 $ echo foo > a
11 $ hg ci -Am0
11 $ hg ci -Am0
12 abort: abandoned transaction found!
12 abort: abandoned transaction found!
13 (run 'hg recover' to clean up transaction)
13 (run 'hg recover' to clean up transaction)
14 [255]
14 [255]
15
15
16 $ hg recover
16 $ hg recover
17 rolling back interrupted transaction
17 rolling back interrupted transaction
18 checking changesets
18 (verify step skipped, run `hg verify` to check your repository content)
19 checking manifests
20 crosschecking files in changesets and manifests
21 checking files
22 checked 1 changesets with 1 changes to 1 files
23
19
24 recover, explicit verify
20 recover, explicit verify
25
21
26 $ touch .hg/store/journal
22 $ touch .hg/store/journal
27 $ hg ci -Am0
23 $ hg ci -Am0
28 abort: abandoned transaction found!
24 abort: abandoned transaction found!
29 (run 'hg recover' to clean up transaction)
25 (run 'hg recover' to clean up transaction)
30 [255]
26 [255]
31 $ hg recover --verify
27 $ hg recover --verify
32 rolling back interrupted transaction
28 rolling back interrupted transaction
33 checking changesets
29 checking changesets
34 checking manifests
30 checking manifests
35 crosschecking files in changesets and manifests
31 crosschecking files in changesets and manifests
36 checking files
32 checking files
37 checked 1 changesets with 1 changes to 1 files
33 checked 1 changesets with 1 changes to 1 files
38
34
39 recover, no verify
35 recover, no verify
40
36
41 $ touch .hg/store/journal
37 $ touch .hg/store/journal
42 $ hg ci -Am0
38 $ hg ci -Am0
43 abort: abandoned transaction found!
39 abort: abandoned transaction found!
44 (run 'hg recover' to clean up transaction)
40 (run 'hg recover' to clean up transaction)
45 [255]
41 [255]
46 $ hg recover --no-verify
42 $ hg recover --no-verify
47 rolling back interrupted transaction
43 rolling back interrupted transaction
48 (verify step skipped, run `hg verify` to check your repository content)
44 (verify step skipped, run `hg verify` to check your repository content)
49
45
50
46
51 Check that zero-size journals are correctly aborted:
47 Check that zero-size journals are correctly aborted:
52
48
53 #if unix-permissions no-root
49 #if unix-permissions no-root
54 $ hg bundle -qa repo.hg
50 $ hg bundle -qa repo.hg
55 $ chmod -w foo/.hg/store/00changelog.i
51 $ chmod -w foo/.hg/store/00changelog.i
56
52
57 $ hg -R foo unbundle repo.hg
53 $ hg -R foo unbundle repo.hg
58 adding changesets
54 adding changesets
59 abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
55 abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
60 [255]
56 [255]
61
57
62 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
58 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
63 #endif
59 #endif
64
60
@@ -1,141 +1,143 b''
1 #require unix-permissions no-root reporevlogstore
1 #require unix-permissions no-root reporevlogstore
2
2
3 $ cat > $TESTTMP/dumpjournal.py <<EOF
3 $ cat > $TESTTMP/dumpjournal.py <<EOF
4 > import sys
4 > import sys
5 > for entry in sys.stdin.read().split('\n'):
5 > for entry in sys.stdin.read().split('\n'):
6 > if entry:
6 > if entry:
7 > print(entry.split('\x00')[0])
7 > print(entry.split('\x00')[0])
8 > EOF
8 > EOF
9
9
10 $ echo "[extensions]" >> $HGRCPATH
10 $ echo "[extensions]" >> $HGRCPATH
11 $ echo "mq=">> $HGRCPATH
11 $ echo "mq=">> $HGRCPATH
12
12
13 $ teststrip() {
13 $ teststrip() {
14 > hg -q up -C $1
14 > hg -q up -C $1
15 > echo % before update $1, strip $2
15 > echo % before update $1, strip $2
16 > hg parents
16 > hg parents
17 > chmod -$3 $4
17 > chmod -$3 $4
18 > hg strip $2 2>&1 | sed 's/\(bundle\).*/\1/' | sed 's/Permission denied.*\.hg\/store\/\(.*\)/Permission denied \.hg\/store\/\1/'
18 > hg strip $2 2>&1 | sed 's/\(bundle\).*/\1/' | sed 's/Permission denied.*\.hg\/store\/\(.*\)/Permission denied \.hg\/store\/\1/'
19 > echo % after update $1, strip $2
19 > echo % after update $1, strip $2
20 > chmod +$3 $4
20 > chmod +$3 $4
21 > hg verify
21 > hg verify
22 > echo % journal contents
22 > echo % journal contents
23 > if [ -f .hg/store/journal ]; then
23 > if [ -f .hg/store/journal ]; then
24 > cat .hg/store/journal | "$PYTHON" $TESTTMP/dumpjournal.py
24 > cat .hg/store/journal | "$PYTHON" $TESTTMP/dumpjournal.py
25 > else
25 > else
26 > echo "(no journal)"
26 > echo "(no journal)"
27 > fi
27 > fi
28 > ls .hg/store/journal >/dev/null 2>&1 && hg recover
28 > if ls .hg/store/journal >/dev/null 2>&1; then
29 > hg recover --verify
30 > fi
29 > ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/*
31 > ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/*
30 > rm -rf .hg/strip-backup
32 > rm -rf .hg/strip-backup
31 > }
33 > }
32
34
33 $ hg init test
35 $ hg init test
34 $ cd test
36 $ cd test
35 $ echo a > a
37 $ echo a > a
36 $ hg -q ci -m "a" -A
38 $ hg -q ci -m "a" -A
37 $ echo b > b
39 $ echo b > b
38 $ hg -q ci -m "b" -A
40 $ hg -q ci -m "b" -A
39 $ echo b2 >> b
41 $ echo b2 >> b
40 $ hg -q ci -m "b2" -A
42 $ hg -q ci -m "b2" -A
41 $ echo c > c
43 $ echo c > c
42 $ hg -q ci -m "c" -A
44 $ hg -q ci -m "c" -A
43 $ teststrip 0 2 w .hg/store/data/b.i
45 $ teststrip 0 2 w .hg/store/data/b.i
44 % before update 0, strip 2
46 % before update 0, strip 2
45 changeset: 0:cb9a9f314b8b
47 changeset: 0:cb9a9f314b8b
46 user: test
48 user: test
47 date: Thu Jan 01 00:00:00 1970 +0000
49 date: Thu Jan 01 00:00:00 1970 +0000
48 summary: a
50 summary: a
49
51
50 saved backup bundle
52 saved backup bundle
51 transaction abort!
53 transaction abort!
52 failed to truncate data/b.i
54 failed to truncate data/b.i
53 rollback failed - please run hg recover
55 rollback failed - please run hg recover
54 (failure reason: [Errno *] Permission denied .hg/store/data/b.i') (glob)
56 (failure reason: [Errno *] Permission denied .hg/store/data/b.i') (glob)
55 strip failed, backup bundle
57 strip failed, backup bundle
56 abort: Permission denied .hg/store/data/b.i'
58 abort: Permission denied .hg/store/data/b.i'
57 % after update 0, strip 2
59 % after update 0, strip 2
58 abandoned transaction found - run hg recover
60 abandoned transaction found - run hg recover
59 checking changesets
61 checking changesets
60 checking manifests
62 checking manifests
61 crosschecking files in changesets and manifests
63 crosschecking files in changesets and manifests
62 checking files
64 checking files
63 b@?: rev 1 points to nonexistent changeset 2
65 b@?: rev 1 points to nonexistent changeset 2
64 (expected 1)
66 (expected 1)
65 b@?: 736c29771fba not in manifests
67 b@?: 736c29771fba not in manifests
66 warning: orphan data file 'data/c.i'
68 warning: orphan data file 'data/c.i'
67 checked 2 changesets with 3 changes to 2 files
69 checked 2 changesets with 3 changes to 2 files
68 2 warnings encountered!
70 2 warnings encountered!
69 2 integrity errors encountered!
71 2 integrity errors encountered!
70 % journal contents
72 % journal contents
71 00changelog.i
73 00changelog.i
72 00manifest.i
74 00manifest.i
73 data/b.i
75 data/b.i
74 data/c.i
76 data/c.i
75 rolling back interrupted transaction
77 rolling back interrupted transaction
76 checking changesets
78 checking changesets
77 checking manifests
79 checking manifests
78 crosschecking files in changesets and manifests
80 crosschecking files in changesets and manifests
79 checking files
81 checking files
80 checked 2 changesets with 2 changes to 2 files
82 checked 2 changesets with 2 changes to 2 files
81 $ teststrip 0 2 r .hg/store/data/b.i
83 $ teststrip 0 2 r .hg/store/data/b.i
82 % before update 0, strip 2
84 % before update 0, strip 2
83 changeset: 0:cb9a9f314b8b
85 changeset: 0:cb9a9f314b8b
84 user: test
86 user: test
85 date: Thu Jan 01 00:00:00 1970 +0000
87 date: Thu Jan 01 00:00:00 1970 +0000
86 summary: a
88 summary: a
87
89
88 abort: Permission denied .hg/store/data/b.i'
90 abort: Permission denied .hg/store/data/b.i'
89 % after update 0, strip 2
91 % after update 0, strip 2
90 checking changesets
92 checking changesets
91 checking manifests
93 checking manifests
92 crosschecking files in changesets and manifests
94 crosschecking files in changesets and manifests
93 checking files
95 checking files
94 checked 4 changesets with 4 changes to 3 files
96 checked 4 changesets with 4 changes to 3 files
95 % journal contents
97 % journal contents
96 (no journal)
98 (no journal)
97 $ teststrip 0 2 w .hg/store/00manifest.i
99 $ teststrip 0 2 w .hg/store/00manifest.i
98 % before update 0, strip 2
100 % before update 0, strip 2
99 changeset: 0:cb9a9f314b8b
101 changeset: 0:cb9a9f314b8b
100 user: test
102 user: test
101 date: Thu Jan 01 00:00:00 1970 +0000
103 date: Thu Jan 01 00:00:00 1970 +0000
102 summary: a
104 summary: a
103
105
104 saved backup bundle
106 saved backup bundle
105 transaction abort!
107 transaction abort!
106 failed to truncate 00manifest.i
108 failed to truncate 00manifest.i
107 rollback failed - please run hg recover
109 rollback failed - please run hg recover
108 (failure reason: [Errno *] Permission denied .hg/store/00manifest.i') (glob)
110 (failure reason: [Errno *] Permission denied .hg/store/00manifest.i') (glob)
109 strip failed, backup bundle
111 strip failed, backup bundle
110 abort: Permission denied .hg/store/00manifest.i'
112 abort: Permission denied .hg/store/00manifest.i'
111 % after update 0, strip 2
113 % after update 0, strip 2
112 abandoned transaction found - run hg recover
114 abandoned transaction found - run hg recover
113 checking changesets
115 checking changesets
114 checking manifests
116 checking manifests
115 manifest@?: rev 2 points to nonexistent changeset 2
117 manifest@?: rev 2 points to nonexistent changeset 2
116 manifest@?: 3362547cdf64 not in changesets
118 manifest@?: 3362547cdf64 not in changesets
117 manifest@?: rev 3 points to nonexistent changeset 3
119 manifest@?: rev 3 points to nonexistent changeset 3
118 manifest@?: 265a85892ecb not in changesets
120 manifest@?: 265a85892ecb not in changesets
119 crosschecking files in changesets and manifests
121 crosschecking files in changesets and manifests
120 c@3: in manifest but not in changeset
122 c@3: in manifest but not in changeset
121 checking files
123 checking files
122 b@?: rev 1 points to nonexistent changeset 2
124 b@?: rev 1 points to nonexistent changeset 2
123 (expected 1)
125 (expected 1)
124 c@?: rev 0 points to nonexistent changeset 3
126 c@?: rev 0 points to nonexistent changeset 3
125 checked 2 changesets with 4 changes to 3 files
127 checked 2 changesets with 4 changes to 3 files
126 1 warnings encountered!
128 1 warnings encountered!
127 7 integrity errors encountered!
129 7 integrity errors encountered!
128 (first damaged changeset appears to be 3)
130 (first damaged changeset appears to be 3)
129 % journal contents
131 % journal contents
130 00changelog.i
132 00changelog.i
131 00manifest.i
133 00manifest.i
132 data/b.i
134 data/b.i
133 data/c.i
135 data/c.i
134 rolling back interrupted transaction
136 rolling back interrupted transaction
135 checking changesets
137 checking changesets
136 checking manifests
138 checking manifests
137 crosschecking files in changesets and manifests
139 crosschecking files in changesets and manifests
138 checking files
140 checking files
139 checked 2 changesets with 2 changes to 2 files
141 checked 2 changesets with 2 changes to 2 files
140
142
141 $ cd ..
143 $ cd ..
@@ -1,467 +1,467 b''
1 setup repo
1 setup repo
2 $ hg init t
2 $ hg init t
3 $ cd t
3 $ cd t
4 $ echo a > a
4 $ echo a > a
5 $ hg commit -Am'add a'
5 $ hg commit -Am'add a'
6 adding a
6 adding a
7 $ hg verify
7 $ hg verify
8 checking changesets
8 checking changesets
9 checking manifests
9 checking manifests
10 crosschecking files in changesets and manifests
10 crosschecking files in changesets and manifests
11 checking files
11 checking files
12 checked 1 changesets with 1 changes to 1 files
12 checked 1 changesets with 1 changes to 1 files
13 $ hg parents
13 $ hg parents
14 changeset: 0:1f0dee641bb7
14 changeset: 0:1f0dee641bb7
15 tag: tip
15 tag: tip
16 user: test
16 user: test
17 date: Thu Jan 01 00:00:00 1970 +0000
17 date: Thu Jan 01 00:00:00 1970 +0000
18 summary: add a
18 summary: add a
19
19
20
20
21 rollback to null revision
21 rollback to null revision
22 $ hg status
22 $ hg status
23 $ hg rollback
23 $ hg rollback
24 repository tip rolled back to revision -1 (undo commit)
24 repository tip rolled back to revision -1 (undo commit)
25 working directory now based on revision -1
25 working directory now based on revision -1
26 $ hg verify
26 $ hg verify
27 checking changesets
27 checking changesets
28 checking manifests
28 checking manifests
29 crosschecking files in changesets and manifests
29 crosschecking files in changesets and manifests
30 checking files
30 checking files
31 checked 0 changesets with 0 changes to 0 files
31 checked 0 changesets with 0 changes to 0 files
32 $ hg parents
32 $ hg parents
33 $ hg status
33 $ hg status
34 A a
34 A a
35
35
36 Two changesets this time so we rollback to a real changeset
36 Two changesets this time so we rollback to a real changeset
37 $ hg commit -m'add a again'
37 $ hg commit -m'add a again'
38 $ echo a >> a
38 $ echo a >> a
39 $ hg commit -m'modify a'
39 $ hg commit -m'modify a'
40
40
41 Test issue 902 (current branch is preserved)
41 Test issue 902 (current branch is preserved)
42 $ hg branch test
42 $ hg branch test
43 marked working directory as branch test
43 marked working directory as branch test
44 (branches are permanent and global, did you want a bookmark?)
44 (branches are permanent and global, did you want a bookmark?)
45 $ hg rollback
45 $ hg rollback
46 repository tip rolled back to revision 0 (undo commit)
46 repository tip rolled back to revision 0 (undo commit)
47 working directory now based on revision 0
47 working directory now based on revision 0
48 $ hg branch
48 $ hg branch
49 default
49 default
50
50
51 Test issue 1635 (commit message saved)
51 Test issue 1635 (commit message saved)
52 $ cat .hg/last-message.txt ; echo
52 $ cat .hg/last-message.txt ; echo
53 modify a
53 modify a
54
54
55 Test rollback of hg before issue 902 was fixed
55 Test rollback of hg before issue 902 was fixed
56
56
57 $ hg commit -m "test3"
57 $ hg commit -m "test3"
58 $ hg branch test
58 $ hg branch test
59 marked working directory as branch test
59 marked working directory as branch test
60 (branches are permanent and global, did you want a bookmark?)
60 (branches are permanent and global, did you want a bookmark?)
61 $ rm .hg/undo.branch
61 $ rm .hg/undo.branch
62 $ hg rollback
62 $ hg rollback
63 repository tip rolled back to revision 0 (undo commit)
63 repository tip rolled back to revision 0 (undo commit)
64 named branch could not be reset: current branch is still 'test'
64 named branch could not be reset: current branch is still 'test'
65 working directory now based on revision 0
65 working directory now based on revision 0
66 $ hg branch
66 $ hg branch
67 test
67 test
68
68
69 working dir unaffected by rollback: do not restore dirstate et. al.
69 working dir unaffected by rollback: do not restore dirstate et. al.
70 $ hg log --template '{rev} {branch} {desc|firstline}\n'
70 $ hg log --template '{rev} {branch} {desc|firstline}\n'
71 0 default add a again
71 0 default add a again
72 $ hg status
72 $ hg status
73 M a
73 M a
74 $ hg bookmark foo
74 $ hg bookmark foo
75 $ hg commit -m'modify a again'
75 $ hg commit -m'modify a again'
76 $ echo b > b
76 $ echo b > b
77 $ hg bookmark bar -r default #making bar active, before the transaction
77 $ hg bookmark bar -r default #making bar active, before the transaction
78 $ hg commit -Am'add b'
78 $ hg commit -Am'add b'
79 adding b
79 adding b
80 $ hg log --template '{rev} {branch} {desc|firstline}\n'
80 $ hg log --template '{rev} {branch} {desc|firstline}\n'
81 2 test add b
81 2 test add b
82 1 test modify a again
82 1 test modify a again
83 0 default add a again
83 0 default add a again
84 $ hg update bar
84 $ hg update bar
85 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
85 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 (activating bookmark bar)
86 (activating bookmark bar)
87 $ cat .hg/undo.branch ; echo
87 $ cat .hg/undo.branch ; echo
88 test
88 test
89 $ hg rollback -f
89 $ hg rollback -f
90 repository tip rolled back to revision 1 (undo commit)
90 repository tip rolled back to revision 1 (undo commit)
91 $ hg id -n
91 $ hg id -n
92 0
92 0
93 $ hg branch
93 $ hg branch
94 default
94 default
95 $ cat .hg/bookmarks.current ; echo
95 $ cat .hg/bookmarks.current ; echo
96 bar
96 bar
97 $ hg bookmark --delete foo bar
97 $ hg bookmark --delete foo bar
98
98
99 rollback by pretxncommit saves commit message (issue1635)
99 rollback by pretxncommit saves commit message (issue1635)
100
100
101 $ echo a >> a
101 $ echo a >> a
102 $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
102 $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
103 transaction abort!
103 transaction abort!
104 rollback completed
104 rollback completed
105 abort: pretxncommit hook exited with status * (glob)
105 abort: pretxncommit hook exited with status * (glob)
106 [255]
106 [255]
107 $ cat .hg/last-message.txt ; echo
107 $ cat .hg/last-message.txt ; echo
108 precious commit message
108 precious commit message
109
109
110 same thing, but run $EDITOR
110 same thing, but run $EDITOR
111
111
112 $ cat > editor.sh << '__EOF__'
112 $ cat > editor.sh << '__EOF__'
113 > echo "another precious commit message" > "$1"
113 > echo "another precious commit message" > "$1"
114 > __EOF__
114 > __EOF__
115 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
115 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
116 transaction abort!
116 transaction abort!
117 rollback completed
117 rollback completed
118 note: commit message saved in .hg/last-message.txt
118 note: commit message saved in .hg/last-message.txt
119 abort: pretxncommit hook exited with status * (glob)
119 abort: pretxncommit hook exited with status * (glob)
120 [255]
120 [255]
121 $ cat .hg/last-message.txt
121 $ cat .hg/last-message.txt
122 another precious commit message
122 another precious commit message
123
123
124 test rollback on served repository
124 test rollback on served repository
125
125
126 #if serve
126 #if serve
127 $ hg commit -m "precious commit message"
127 $ hg commit -m "precious commit message"
128 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
128 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
129 $ cat hg.pid >> $DAEMON_PIDS
129 $ cat hg.pid >> $DAEMON_PIDS
130 $ cd ..
130 $ cd ..
131 $ hg clone http://localhost:$HGPORT u
131 $ hg clone http://localhost:$HGPORT u
132 requesting all changes
132 requesting all changes
133 adding changesets
133 adding changesets
134 adding manifests
134 adding manifests
135 adding file changes
135 adding file changes
136 added 3 changesets with 2 changes to 1 files (+1 heads)
136 added 3 changesets with 2 changes to 1 files (+1 heads)
137 new changesets 23b0221f3370:068774709090
137 new changesets 23b0221f3370:068774709090
138 updating to branch default
138 updating to branch default
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
140 $ cd u
140 $ cd u
141 $ hg id default
141 $ hg id default
142 068774709090
142 068774709090
143
143
144 now rollback and observe that 'hg serve' reloads the repository and
144 now rollback and observe that 'hg serve' reloads the repository and
145 presents the correct tip changeset:
145 presents the correct tip changeset:
146
146
147 $ hg -R ../t rollback
147 $ hg -R ../t rollback
148 repository tip rolled back to revision 1 (undo commit)
148 repository tip rolled back to revision 1 (undo commit)
149 working directory now based on revision 0
149 working directory now based on revision 0
150 $ hg id default
150 $ hg id default
151 791dd2169706
151 791dd2169706
152
152
153 $ killdaemons.py
153 $ killdaemons.py
154 #endif
154 #endif
155
155
156 update to older changeset and then refuse rollback, because
156 update to older changeset and then refuse rollback, because
157 that would lose data (issue2998)
157 that would lose data (issue2998)
158 $ cd ../t
158 $ cd ../t
159 $ hg -q update
159 $ hg -q update
160 $ rm `hg status -un`
160 $ rm `hg status -un`
161 $ template='{rev}:{node|short} [{branch}] {desc|firstline}\n'
161 $ template='{rev}:{node|short} [{branch}] {desc|firstline}\n'
162 $ echo 'valuable new file' > b
162 $ echo 'valuable new file' > b
163 $ echo 'valuable modification' >> a
163 $ echo 'valuable modification' >> a
164 $ hg commit -A -m'a valuable change'
164 $ hg commit -A -m'a valuable change'
165 adding b
165 adding b
166 $ hg update 0
166 $ hg update 0
167 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
167 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
168 $ hg rollback
168 $ hg rollback
169 abort: rollback of last commit while not checked out may lose data
169 abort: rollback of last commit while not checked out may lose data
170 (use -f to force)
170 (use -f to force)
171 [255]
171 [255]
172 $ hg tip -q
172 $ hg tip -q
173 2:4d9cd3795eea
173 2:4d9cd3795eea
174 $ hg rollback -f
174 $ hg rollback -f
175 repository tip rolled back to revision 1 (undo commit)
175 repository tip rolled back to revision 1 (undo commit)
176 $ hg status
176 $ hg status
177 $ hg log --removed b # yep, it's gone
177 $ hg log --removed b # yep, it's gone
178
178
179 same again, but emulate an old client that doesn't write undo.desc
179 same again, but emulate an old client that doesn't write undo.desc
180 $ hg -q update
180 $ hg -q update
181 $ echo 'valuable modification redux' >> a
181 $ echo 'valuable modification redux' >> a
182 $ hg commit -m'a valuable change redux'
182 $ hg commit -m'a valuable change redux'
183 $ rm .hg/undo.desc
183 $ rm .hg/undo.desc
184 $ hg update 0
184 $ hg update 0
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
186 $ hg rollback
186 $ hg rollback
187 rolling back unknown transaction
187 rolling back unknown transaction
188 $ cat a
188 $ cat a
189 a
189 a
190
190
191 corrupt journal test
191 corrupt journal test
192 $ echo "foo" > .hg/store/journal
192 $ echo "foo" > .hg/store/journal
193 $ hg recover
193 $ hg recover --verify
194 rolling back interrupted transaction
194 rolling back interrupted transaction
195 couldn't read journal entry 'foo\n'!
195 couldn't read journal entry 'foo\n'!
196 checking changesets
196 checking changesets
197 checking manifests
197 checking manifests
198 crosschecking files in changesets and manifests
198 crosschecking files in changesets and manifests
199 checking files
199 checking files
200 checked 2 changesets with 2 changes to 1 files
200 checked 2 changesets with 2 changes to 1 files
201
201
202 rollback disabled by config
202 rollback disabled by config
203 $ cat >> $HGRCPATH <<EOF
203 $ cat >> $HGRCPATH <<EOF
204 > [ui]
204 > [ui]
205 > rollback = false
205 > rollback = false
206 > EOF
206 > EOF
207 $ echo narf >> pinky-sayings.txt
207 $ echo narf >> pinky-sayings.txt
208 $ hg add pinky-sayings.txt
208 $ hg add pinky-sayings.txt
209 $ hg ci -m 'First one.'
209 $ hg ci -m 'First one.'
210 $ hg rollback
210 $ hg rollback
211 abort: rollback is disabled because it is unsafe
211 abort: rollback is disabled because it is unsafe
212 (see `hg help -v rollback` for information)
212 (see `hg help -v rollback` for information)
213 [255]
213 [255]
214
214
215 $ cd ..
215 $ cd ..
216
216
217 I/O errors on stdio are handled properly (issue5658)
217 I/O errors on stdio are handled properly (issue5658)
218
218
219 $ cat > badui.py << EOF
219 $ cat > badui.py << EOF
220 > import errno
220 > import errno
221 > from mercurial.i18n import _
221 > from mercurial.i18n import _
222 > from mercurial import (
222 > from mercurial import (
223 > error,
223 > error,
224 > registrar,
224 > registrar,
225 > ui as uimod,
225 > ui as uimod,
226 > )
226 > )
227 >
227 >
228 > configtable = {}
228 > configtable = {}
229 > configitem = registrar.configitem(configtable)
229 > configitem = registrar.configitem(configtable)
230 >
230 >
231 > configitem(b'ui', b'ioerrors',
231 > configitem(b'ui', b'ioerrors',
232 > default=list,
232 > default=list,
233 > )
233 > )
234 >
234 >
235 > def pretxncommit(ui, repo, **kwargs):
235 > def pretxncommit(ui, repo, **kwargs):
236 > ui.warn(b'warn during pretxncommit\n')
236 > ui.warn(b'warn during pretxncommit\n')
237 >
237 >
238 > def pretxnclose(ui, repo, **kwargs):
238 > def pretxnclose(ui, repo, **kwargs):
239 > ui.warn(b'warn during pretxnclose\n')
239 > ui.warn(b'warn during pretxnclose\n')
240 >
240 >
241 > def txnclose(ui, repo, **kwargs):
241 > def txnclose(ui, repo, **kwargs):
242 > ui.warn(b'warn during txnclose\n')
242 > ui.warn(b'warn during txnclose\n')
243 >
243 >
244 > def txnabort(ui, repo, **kwargs):
244 > def txnabort(ui, repo, **kwargs):
245 > ui.warn(b'warn during abort\n')
245 > ui.warn(b'warn during abort\n')
246 >
246 >
247 > class fdproxy(object):
247 > class fdproxy(object):
248 > def __init__(self, ui, o):
248 > def __init__(self, ui, o):
249 > self._ui = ui
249 > self._ui = ui
250 > self._o = o
250 > self._o = o
251 >
251 >
252 > def __getattr__(self, attr):
252 > def __getattr__(self, attr):
253 > return getattr(self._o, attr)
253 > return getattr(self._o, attr)
254 >
254 >
255 > def write(self, msg):
255 > def write(self, msg):
256 > errors = set(self._ui.configlist(b'ui', b'ioerrors'))
256 > errors = set(self._ui.configlist(b'ui', b'ioerrors'))
257 > pretxncommit = msg == b'warn during pretxncommit\n'
257 > pretxncommit = msg == b'warn during pretxncommit\n'
258 > pretxnclose = msg == b'warn during pretxnclose\n'
258 > pretxnclose = msg == b'warn during pretxnclose\n'
259 > txnclose = msg == b'warn during txnclose\n'
259 > txnclose = msg == b'warn during txnclose\n'
260 > txnabort = msg == b'warn during abort\n'
260 > txnabort = msg == b'warn during abort\n'
261 > msgabort = msg == _(b'transaction abort!\n')
261 > msgabort = msg == _(b'transaction abort!\n')
262 > msgrollback = msg == _(b'rollback completed\n')
262 > msgrollback = msg == _(b'rollback completed\n')
263 >
263 >
264 > if pretxncommit and b'pretxncommit' in errors:
264 > if pretxncommit and b'pretxncommit' in errors:
265 > raise IOError(errno.EPIPE, 'simulated epipe')
265 > raise IOError(errno.EPIPE, 'simulated epipe')
266 > if pretxnclose and b'pretxnclose' in errors:
266 > if pretxnclose and b'pretxnclose' in errors:
267 > raise IOError(errno.EIO, 'simulated eio')
267 > raise IOError(errno.EIO, 'simulated eio')
268 > if txnclose and b'txnclose' in errors:
268 > if txnclose and b'txnclose' in errors:
269 > raise IOError(errno.EBADF, 'simulated badf')
269 > raise IOError(errno.EBADF, 'simulated badf')
270 > if txnabort and b'txnabort' in errors:
270 > if txnabort and b'txnabort' in errors:
271 > raise IOError(errno.EPIPE, 'simulated epipe')
271 > raise IOError(errno.EPIPE, 'simulated epipe')
272 > if msgabort and b'msgabort' in errors:
272 > if msgabort and b'msgabort' in errors:
273 > raise IOError(errno.EBADF, 'simulated ebadf')
273 > raise IOError(errno.EBADF, 'simulated ebadf')
274 > if msgrollback and b'msgrollback' in errors:
274 > if msgrollback and b'msgrollback' in errors:
275 > raise IOError(errno.EIO, 'simulated eio')
275 > raise IOError(errno.EIO, 'simulated eio')
276 >
276 >
277 > return self._o.write(msg)
277 > return self._o.write(msg)
278 >
278 >
279 > def uisetup(ui):
279 > def uisetup(ui):
280 > class badui(ui.__class__):
280 > class badui(ui.__class__):
281 > def _write(self, dest, *args, **kwargs):
281 > def _write(self, dest, *args, **kwargs):
282 > olderr = self.ferr
282 > olderr = self.ferr
283 > try:
283 > try:
284 > if dest is self.ferr:
284 > if dest is self.ferr:
285 > self.ferr = dest = fdproxy(self, olderr)
285 > self.ferr = dest = fdproxy(self, olderr)
286 > return super(badui, self)._write(dest, *args, **kwargs)
286 > return super(badui, self)._write(dest, *args, **kwargs)
287 > finally:
287 > finally:
288 > self.ferr = olderr
288 > self.ferr = olderr
289 >
289 >
290 > ui.__class__ = badui
290 > ui.__class__ = badui
291 >
291 >
292 > def reposetup(ui, repo):
292 > def reposetup(ui, repo):
293 > ui.setconfig(b'hooks', b'pretxnclose.badui', pretxnclose, b'badui')
293 > ui.setconfig(b'hooks', b'pretxnclose.badui', pretxnclose, b'badui')
294 > ui.setconfig(b'hooks', b'txnclose.badui', txnclose, b'badui')
294 > ui.setconfig(b'hooks', b'txnclose.badui', txnclose, b'badui')
295 > ui.setconfig(b'hooks', b'pretxncommit.badui', pretxncommit, b'badui')
295 > ui.setconfig(b'hooks', b'pretxncommit.badui', pretxncommit, b'badui')
296 > ui.setconfig(b'hooks', b'txnabort.badui', txnabort, b'badui')
296 > ui.setconfig(b'hooks', b'txnabort.badui', txnabort, b'badui')
297 > EOF
297 > EOF
298
298
299 $ cat >> $HGRCPATH << EOF
299 $ cat >> $HGRCPATH << EOF
300 > [extensions]
300 > [extensions]
301 > badui = $TESTTMP/badui.py
301 > badui = $TESTTMP/badui.py
302 > EOF
302 > EOF
303
303
304 An I/O error during pretxncommit is handled
304 An I/O error during pretxncommit is handled
305
305
306 $ hg init ioerror-pretxncommit
306 $ hg init ioerror-pretxncommit
307 $ cd ioerror-pretxncommit
307 $ cd ioerror-pretxncommit
308 $ echo 0 > foo
308 $ echo 0 > foo
309 $ hg -q commit -A -m initial
309 $ hg -q commit -A -m initial
310 warn during pretxncommit
310 warn during pretxncommit
311 warn during pretxnclose
311 warn during pretxnclose
312 warn during txnclose
312 warn during txnclose
313 $ echo 1 > foo
313 $ echo 1 > foo
314 $ hg --config ui.ioerrors=pretxncommit commit -m 'error during pretxncommit'
314 $ hg --config ui.ioerrors=pretxncommit commit -m 'error during pretxncommit'
315 warn during pretxnclose
315 warn during pretxnclose
316 warn during txnclose
316 warn during txnclose
317
317
318 $ hg commit -m 'commit 1'
318 $ hg commit -m 'commit 1'
319 nothing changed
319 nothing changed
320 [1]
320 [1]
321
321
322 $ cd ..
322 $ cd ..
323
323
324 An I/O error during pretxnclose is handled
324 An I/O error during pretxnclose is handled
325
325
326 $ hg init ioerror-pretxnclose
326 $ hg init ioerror-pretxnclose
327 $ cd ioerror-pretxnclose
327 $ cd ioerror-pretxnclose
328 $ echo 0 > foo
328 $ echo 0 > foo
329 $ hg -q commit -A -m initial
329 $ hg -q commit -A -m initial
330 warn during pretxncommit
330 warn during pretxncommit
331 warn during pretxnclose
331 warn during pretxnclose
332 warn during txnclose
332 warn during txnclose
333
333
334 $ echo 1 > foo
334 $ echo 1 > foo
335 $ hg --config ui.ioerrors=pretxnclose commit -m 'error during pretxnclose'
335 $ hg --config ui.ioerrors=pretxnclose commit -m 'error during pretxnclose'
336 warn during pretxncommit
336 warn during pretxncommit
337 warn during txnclose
337 warn during txnclose
338
338
339 $ hg commit -m 'commit 1'
339 $ hg commit -m 'commit 1'
340 nothing changed
340 nothing changed
341 [1]
341 [1]
342
342
343 $ cd ..
343 $ cd ..
344
344
345 An I/O error during txnclose is handled
345 An I/O error during txnclose is handled
346
346
347 $ hg init ioerror-txnclose
347 $ hg init ioerror-txnclose
348 $ cd ioerror-txnclose
348 $ cd ioerror-txnclose
349 $ echo 0 > foo
349 $ echo 0 > foo
350 $ hg -q commit -A -m initial
350 $ hg -q commit -A -m initial
351 warn during pretxncommit
351 warn during pretxncommit
352 warn during pretxnclose
352 warn during pretxnclose
353 warn during txnclose
353 warn during txnclose
354
354
355 $ echo 1 > foo
355 $ echo 1 > foo
356 $ hg --config ui.ioerrors=txnclose commit -m 'error during txnclose'
356 $ hg --config ui.ioerrors=txnclose commit -m 'error during txnclose'
357 warn during pretxncommit
357 warn during pretxncommit
358 warn during pretxnclose
358 warn during pretxnclose
359
359
360 $ hg commit -m 'commit 1'
360 $ hg commit -m 'commit 1'
361 nothing changed
361 nothing changed
362 [1]
362 [1]
363
363
364 $ cd ..
364 $ cd ..
365
365
366 An I/O error writing "transaction abort" is handled
366 An I/O error writing "transaction abort" is handled
367
367
368 $ hg init ioerror-msgabort
368 $ hg init ioerror-msgabort
369 $ cd ioerror-msgabort
369 $ cd ioerror-msgabort
370
370
371 $ echo 0 > foo
371 $ echo 0 > foo
372 $ hg -q commit -A -m initial
372 $ hg -q commit -A -m initial
373 warn during pretxncommit
373 warn during pretxncommit
374 warn during pretxnclose
374 warn during pretxnclose
375 warn during txnclose
375 warn during txnclose
376
376
377 $ echo 1 > foo
377 $ echo 1 > foo
378 $ hg --config ui.ioerrors=msgabort --config hooks.pretxncommit=false commit -m 'error during abort message'
378 $ hg --config ui.ioerrors=msgabort --config hooks.pretxncommit=false commit -m 'error during abort message'
379 warn during abort
379 warn during abort
380 rollback completed
380 rollback completed
381 abort: pretxncommit hook exited with status 1
381 abort: pretxncommit hook exited with status 1
382 [255]
382 [255]
383
383
384 $ hg commit -m 'commit 1'
384 $ hg commit -m 'commit 1'
385 warn during pretxncommit
385 warn during pretxncommit
386 warn during pretxnclose
386 warn during pretxnclose
387 warn during txnclose
387 warn during txnclose
388
388
389 $ cd ..
389 $ cd ..
390
390
391 An I/O error during txnabort should still result in rollback
391 An I/O error during txnabort should still result in rollback
392
392
393 $ hg init ioerror-txnabort
393 $ hg init ioerror-txnabort
394 $ cd ioerror-txnabort
394 $ cd ioerror-txnabort
395
395
396 $ echo 0 > foo
396 $ echo 0 > foo
397 $ hg -q commit -A -m initial
397 $ hg -q commit -A -m initial
398 warn during pretxncommit
398 warn during pretxncommit
399 warn during pretxnclose
399 warn during pretxnclose
400 warn during txnclose
400 warn during txnclose
401
401
402 $ echo 1 > foo
402 $ echo 1 > foo
403 $ hg --config ui.ioerrors=txnabort --config hooks.pretxncommit=false commit -m 'error during abort'
403 $ hg --config ui.ioerrors=txnabort --config hooks.pretxncommit=false commit -m 'error during abort'
404 transaction abort!
404 transaction abort!
405 rollback completed
405 rollback completed
406 abort: pretxncommit hook exited with status 1
406 abort: pretxncommit hook exited with status 1
407 [255]
407 [255]
408
408
409 $ hg commit -m 'commit 1'
409 $ hg commit -m 'commit 1'
410 warn during pretxncommit
410 warn during pretxncommit
411 warn during pretxnclose
411 warn during pretxnclose
412 warn during txnclose
412 warn during txnclose
413
413
414 $ cd ..
414 $ cd ..
415
415
416 An I/O error writing "rollback completed" is handled
416 An I/O error writing "rollback completed" is handled
417
417
418 $ hg init ioerror-msgrollback
418 $ hg init ioerror-msgrollback
419 $ cd ioerror-msgrollback
419 $ cd ioerror-msgrollback
420
420
421 $ echo 0 > foo
421 $ echo 0 > foo
422 $ hg -q commit -A -m initial
422 $ hg -q commit -A -m initial
423 warn during pretxncommit
423 warn during pretxncommit
424 warn during pretxnclose
424 warn during pretxnclose
425 warn during txnclose
425 warn during txnclose
426
426
427 $ echo 1 > foo
427 $ echo 1 > foo
428
428
429 $ hg --config ui.ioerrors=msgrollback --config hooks.pretxncommit=false commit -m 'error during rollback message'
429 $ hg --config ui.ioerrors=msgrollback --config hooks.pretxncommit=false commit -m 'error during rollback message'
430 transaction abort!
430 transaction abort!
431 warn during abort
431 warn during abort
432 abort: pretxncommit hook exited with status 1
432 abort: pretxncommit hook exited with status 1
433 [255]
433 [255]
434
434
435 $ hg verify
435 $ hg verify
436 checking changesets
436 checking changesets
437 checking manifests
437 checking manifests
438 crosschecking files in changesets and manifests
438 crosschecking files in changesets and manifests
439 checking files
439 checking files
440 checked 1 changesets with 1 changes to 1 files
440 checked 1 changesets with 1 changes to 1 files
441
441
442 $ cd ..
442 $ cd ..
443
443
444 Multiple I/O errors after transaction open are handled.
444 Multiple I/O errors after transaction open are handled.
445 This is effectively what happens if a peer disconnects in the middle
445 This is effectively what happens if a peer disconnects in the middle
446 of a transaction.
446 of a transaction.
447
447
448 $ hg init ioerror-multiple
448 $ hg init ioerror-multiple
449 $ cd ioerror-multiple
449 $ cd ioerror-multiple
450 $ echo 0 > foo
450 $ echo 0 > foo
451 $ hg -q commit -A -m initial
451 $ hg -q commit -A -m initial
452 warn during pretxncommit
452 warn during pretxncommit
453 warn during pretxnclose
453 warn during pretxnclose
454 warn during txnclose
454 warn during txnclose
455
455
456 $ echo 1 > foo
456 $ echo 1 > foo
457
457
458 $ hg --config ui.ioerrors=pretxncommit,pretxnclose,txnclose,txnabort,msgabort,msgrollback commit -m 'multiple errors'
458 $ hg --config ui.ioerrors=pretxncommit,pretxnclose,txnclose,txnabort,msgabort,msgrollback commit -m 'multiple errors'
459
459
460 $ hg verify
460 $ hg verify
461 checking changesets
461 checking changesets
462 checking manifests
462 checking manifests
463 crosschecking files in changesets and manifests
463 crosschecking files in changesets and manifests
464 checking files
464 checking files
465 checked 2 changesets with 2 changes to 1 files
465 checked 2 changesets with 2 changes to 1 files
466
466
467 $ cd ..
467 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now