##// END OF EJS Templates
shelve: split up dounshelve() in unshelvecmd() and _dounshelve()...
Martin von Zweigbergk -
r45086:47c12264 default
parent child Browse files
Show More
@@ -1,7833 +1,7833 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 (
84 (
85 b'R',
85 b'R',
86 b'repository',
86 b'repository',
87 b'',
87 b'',
88 _(b'repository root directory or name of overlay bundle file'),
88 _(b'repository root directory or name of overlay bundle file'),
89 _(b'REPO'),
89 _(b'REPO'),
90 ),
90 ),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (
92 (
93 b'y',
93 b'y',
94 b'noninteractive',
94 b'noninteractive',
95 None,
95 None,
96 _(
96 _(
97 b'do not prompt, automatically pick the first choice for all prompts'
97 b'do not prompt, automatically pick the first choice for all prompts'
98 ),
98 ),
99 ),
99 ),
100 (b'q', b'quiet', None, _(b'suppress output')),
100 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
102 (
102 (
103 b'',
103 b'',
104 b'color',
104 b'color',
105 b'',
105 b'',
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # and should not be translated
107 # and should not be translated
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b'TYPE'),
109 _(b'TYPE'),
110 ),
110 ),
111 (
111 (
112 b'',
112 b'',
113 b'config',
113 b'config',
114 [],
114 [],
115 _(b'set/override config option (use \'section.name=value\')'),
115 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'CONFIG'),
116 _(b'CONFIG'),
117 ),
117 ),
118 (b'', b'debug', None, _(b'enable debugging output')),
118 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debugger', None, _(b'start debugger')),
119 (b'', b'debugger', None, _(b'start debugger')),
120 (
120 (
121 b'',
121 b'',
122 b'encoding',
122 b'encoding',
123 encoding.encoding,
123 encoding.encoding,
124 _(b'set the charset encoding'),
124 _(b'set the charset encoding'),
125 _(b'ENCODE'),
125 _(b'ENCODE'),
126 ),
126 ),
127 (
127 (
128 b'',
128 b'',
129 b'encodingmode',
129 b'encodingmode',
130 encoding.encodingmode,
130 encoding.encodingmode,
131 _(b'set the charset encoding mode'),
131 _(b'set the charset encoding mode'),
132 _(b'MODE'),
132 _(b'MODE'),
133 ),
133 ),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'time', None, _(b'time how long the command takes')),
135 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'profile', None, _(b'print command execution profile')),
136 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'version', None, _(b'output version information and exit')),
137 (b'', b'version', None, _(b'output version information and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (
140 (
141 b'',
141 b'',
142 b'pager',
142 b'pager',
143 b'auto',
143 b'auto',
144 _(b"when to paginate (boolean, always, auto, or never)"),
144 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b'TYPE'),
145 _(b'TYPE'),
146 ),
146 ),
147 ]
147 ]
148
148
149 dryrunopts = cmdutil.dryrunopts
149 dryrunopts = cmdutil.dryrunopts
150 remoteopts = cmdutil.remoteopts
150 remoteopts = cmdutil.remoteopts
151 walkopts = cmdutil.walkopts
151 walkopts = cmdutil.walkopts
152 commitopts = cmdutil.commitopts
152 commitopts = cmdutil.commitopts
153 commitopts2 = cmdutil.commitopts2
153 commitopts2 = cmdutil.commitopts2
154 commitopts3 = cmdutil.commitopts3
154 commitopts3 = cmdutil.commitopts3
155 formatteropts = cmdutil.formatteropts
155 formatteropts = cmdutil.formatteropts
156 templateopts = cmdutil.templateopts
156 templateopts = cmdutil.templateopts
157 logopts = cmdutil.logopts
157 logopts = cmdutil.logopts
158 diffopts = cmdutil.diffopts
158 diffopts = cmdutil.diffopts
159 diffwsopts = cmdutil.diffwsopts
159 diffwsopts = cmdutil.diffwsopts
160 diffopts2 = cmdutil.diffopts2
160 diffopts2 = cmdutil.diffopts2
161 mergetoolopts = cmdutil.mergetoolopts
161 mergetoolopts = cmdutil.mergetoolopts
162 similarityopts = cmdutil.similarityopts
162 similarityopts = cmdutil.similarityopts
163 subrepoopts = cmdutil.subrepoopts
163 subrepoopts = cmdutil.subrepoopts
164 debugrevlogopts = cmdutil.debugrevlogopts
164 debugrevlogopts = cmdutil.debugrevlogopts
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168
168
169 @command(
169 @command(
170 b'abort',
170 b'abort',
171 dryrunopts,
171 dryrunopts,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpbasic=True,
173 helpbasic=True,
174 )
174 )
175 def abort(ui, repo, **opts):
175 def abort(ui, repo, **opts):
176 """abort an unfinished operation (EXPERIMENTAL)
176 """abort an unfinished operation (EXPERIMENTAL)
177
177
178 Aborts a multistep operation like graft, histedit, rebase, merge,
178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 and unshelve if they are in an unfinished state.
179 and unshelve if they are in an unfinished state.
180
180
181 use --dry-run/-n to dry run the command.
181 use --dry-run/-n to dry run the command.
182 """
182 """
183 dryrun = opts.get('dry_run')
183 dryrun = opts.get('dry_run')
184 abortstate = cmdutil.getunfinishedstate(repo)
184 abortstate = cmdutil.getunfinishedstate(repo)
185 if not abortstate:
185 if not abortstate:
186 raise error.Abort(_(b'no operation in progress'))
186 raise error.Abort(_(b'no operation in progress'))
187 if not abortstate.abortfunc:
187 if not abortstate.abortfunc:
188 raise error.Abort(
188 raise error.Abort(
189 (
189 (
190 _(b"%s in progress but does not support 'hg abort'")
190 _(b"%s in progress but does not support 'hg abort'")
191 % (abortstate._opname)
191 % (abortstate._opname)
192 ),
192 ),
193 hint=abortstate.hint(),
193 hint=abortstate.hint(),
194 )
194 )
195 if dryrun:
195 if dryrun:
196 ui.status(
196 ui.status(
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 )
198 )
199 return
199 return
200 return abortstate.abortfunc(ui, repo)
200 return abortstate.abortfunc(ui, repo)
201
201
202
202
203 @command(
203 @command(
204 b'add',
204 b'add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _(b'[OPTION]... [FILE]...'),
206 _(b'[OPTION]... [FILE]...'),
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpbasic=True,
208 helpbasic=True,
209 inferrepo=True,
209 inferrepo=True,
210 )
210 )
211 def add(ui, repo, *pats, **opts):
211 def add(ui, repo, *pats, **opts):
212 """add the specified files on the next commit
212 """add the specified files on the next commit
213
213
214 Schedule files to be version controlled and added to the
214 Schedule files to be version controlled and added to the
215 repository.
215 repository.
216
216
217 The files will be added to the repository at the next commit. To
217 The files will be added to the repository at the next commit. To
218 undo an add before that, see :hg:`forget`.
218 undo an add before that, see :hg:`forget`.
219
219
220 If no names are given, add all files to the repository (except
220 If no names are given, add all files to the repository (except
221 files matching ``.hgignore``).
221 files matching ``.hgignore``).
222
222
223 .. container:: verbose
223 .. container:: verbose
224
224
225 Examples:
225 Examples:
226
226
227 - New (unknown) files are added
227 - New (unknown) files are added
228 automatically by :hg:`add`::
228 automatically by :hg:`add`::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ? foo.c
233 ? foo.c
234 $ hg add
234 $ hg add
235 adding foo.c
235 adding foo.c
236 $ hg status
236 $ hg status
237 A foo.c
237 A foo.c
238
238
239 - Specific files to be added can be specified::
239 - Specific files to be added can be specified::
240
240
241 $ ls
241 $ ls
242 bar.c foo.c
242 bar.c foo.c
243 $ hg status
243 $ hg status
244 ? bar.c
244 ? bar.c
245 ? foo.c
245 ? foo.c
246 $ hg add bar.c
246 $ hg add bar.c
247 $ hg status
247 $ hg status
248 A bar.c
248 A bar.c
249 ? foo.c
249 ? foo.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253
253
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259
259
260 @command(
260 @command(
261 b'addremove',
261 b'addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _(b'[OPTION]... [FILE]...'),
263 _(b'[OPTION]... [FILE]...'),
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 inferrepo=True,
265 inferrepo=True,
266 )
266 )
267 def addremove(ui, repo, *pats, **opts):
267 def addremove(ui, repo, *pats, **opts):
268 """add all new files, delete all missing files
268 """add all new files, delete all missing files
269
269
270 Add all new files and remove all missing files from the
270 Add all new files and remove all missing files from the
271 repository.
271 repository.
272
272
273 Unless names are given, new files are ignored if they match any of
273 Unless names are given, new files are ignored if they match any of
274 the patterns in ``.hgignore``. As with add, these changes take
274 the patterns in ``.hgignore``. As with add, these changes take
275 effect at the next commit.
275 effect at the next commit.
276
276
277 Use the -s/--similarity option to detect renamed files. This
277 Use the -s/--similarity option to detect renamed files. This
278 option takes a percentage between 0 (disabled) and 100 (files must
278 option takes a percentage between 0 (disabled) and 100 (files must
279 be identical) as its parameter. With a parameter greater than 0,
279 be identical) as its parameter. With a parameter greater than 0,
280 this compares every removed file with every added file and records
280 this compares every removed file with every added file and records
281 those similar enough as renames. Detecting renamed files this way
281 those similar enough as renames. Detecting renamed files this way
282 can be expensive. After using this option, :hg:`status -C` can be
282 can be expensive. After using this option, :hg:`status -C` can be
283 used to check which files were identified as moved or renamed. If
283 used to check which files were identified as moved or renamed. If
284 not specified, -s/--similarity defaults to 100 and only renames of
284 not specified, -s/--similarity defaults to 100 and only renames of
285 identical files are detected.
285 identical files are detected.
286
286
287 .. container:: verbose
287 .. container:: verbose
288
288
289 Examples:
289 Examples:
290
290
291 - A number of files (bar.c and foo.c) are new,
291 - A number of files (bar.c and foo.c) are new,
292 while foobar.c has been removed (without using :hg:`remove`)
292 while foobar.c has been removed (without using :hg:`remove`)
293 from the repository::
293 from the repository::
294
294
295 $ ls
295 $ ls
296 bar.c foo.c
296 bar.c foo.c
297 $ hg status
297 $ hg status
298 ! foobar.c
298 ! foobar.c
299 ? bar.c
299 ? bar.c
300 ? foo.c
300 ? foo.c
301 $ hg addremove
301 $ hg addremove
302 adding bar.c
302 adding bar.c
303 adding foo.c
303 adding foo.c
304 removing foobar.c
304 removing foobar.c
305 $ hg status
305 $ hg status
306 A bar.c
306 A bar.c
307 A foo.c
307 A foo.c
308 R foobar.c
308 R foobar.c
309
309
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 Afterwards, it was edited slightly::
311 Afterwards, it was edited slightly::
312
312
313 $ ls
313 $ ls
314 foo.c
314 foo.c
315 $ hg status
315 $ hg status
316 ! foobar.c
316 ! foobar.c
317 ? foo.c
317 ? foo.c
318 $ hg addremove --similarity 90
318 $ hg addremove --similarity 90
319 removing foobar.c
319 removing foobar.c
320 adding foo.c
320 adding foo.c
321 recording removal of foobar.c as rename to foo.c (94% similar)
321 recording removal of foobar.c as rename to foo.c (94% similar)
322 $ hg status -C
322 $ hg status -C
323 A foo.c
323 A foo.c
324 foobar.c
324 foobar.c
325 R foobar.c
325 R foobar.c
326
326
327 Returns 0 if all files are successfully added.
327 Returns 0 if all files are successfully added.
328 """
328 """
329 opts = pycompat.byteskwargs(opts)
329 opts = pycompat.byteskwargs(opts)
330 if not opts.get(b'similarity'):
330 if not opts.get(b'similarity'):
331 opts[b'similarity'] = b'100'
331 opts[b'similarity'] = b'100'
332 matcher = scmutil.match(repo[None], pats, opts)
332 matcher = scmutil.match(repo[None], pats, opts)
333 relative = scmutil.anypats(pats, opts)
333 relative = scmutil.anypats(pats, opts)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336
336
337
337
338 @command(
338 @command(
339 b'annotate|blame',
339 b'annotate|blame',
340 [
340 [
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (
342 (
343 b'',
343 b'',
344 b'follow',
344 b'follow',
345 None,
345 None,
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 ),
347 ),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'a', b'text', None, _(b'treat all files as text')),
349 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'f', b'file', None, _(b'list the filename')),
351 (b'f', b'file', None, _(b'list the filename')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
355 (
355 (
356 b'l',
356 b'l',
357 b'line-number',
357 b'line-number',
358 None,
358 None,
359 _(b'show line number at the first appearance'),
359 _(b'show line number at the first appearance'),
360 ),
360 ),
361 (
361 (
362 b'',
362 b'',
363 b'skip',
363 b'skip',
364 [],
364 [],
365 _(b'revset to not display (EXPERIMENTAL)'),
365 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'REV'),
366 _(b'REV'),
367 ),
367 ),
368 ]
368 ]
369 + diffwsopts
369 + diffwsopts
370 + walkopts
370 + walkopts
371 + formatteropts,
371 + formatteropts,
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpbasic=True,
374 helpbasic=True,
375 inferrepo=True,
375 inferrepo=True,
376 )
376 )
377 def annotate(ui, repo, *pats, **opts):
377 def annotate(ui, repo, *pats, **opts):
378 """show changeset information by line for each file
378 """show changeset information by line for each file
379
379
380 List changes in files, showing the revision id responsible for
380 List changes in files, showing the revision id responsible for
381 each line.
381 each line.
382
382
383 This command is useful for discovering when a change was made and
383 This command is useful for discovering when a change was made and
384 by whom.
384 by whom.
385
385
386 If you include --file, --user, or --date, the revision number is
386 If you include --file, --user, or --date, the revision number is
387 suppressed unless you also include --number.
387 suppressed unless you also include --number.
388
388
389 Without the -a/--text option, annotate will avoid processing files
389 Without the -a/--text option, annotate will avoid processing files
390 it detects as binary. With -a, annotate will annotate the file
390 it detects as binary. With -a, annotate will annotate the file
391 anyway, although the results will probably be neither useful
391 anyway, although the results will probably be neither useful
392 nor desirable.
392 nor desirable.
393
393
394 .. container:: verbose
394 .. container:: verbose
395
395
396 Template:
396 Template:
397
397
398 The following keywords are supported in addition to the common template
398 The following keywords are supported in addition to the common template
399 keywords and functions. See also :hg:`help templates`.
399 keywords and functions. See also :hg:`help templates`.
400
400
401 :lines: List of lines with annotation data.
401 :lines: List of lines with annotation data.
402 :path: String. Repository-absolute path of the specified file.
402 :path: String. Repository-absolute path of the specified file.
403
403
404 And each entry of ``{lines}`` provides the following sub-keywords in
404 And each entry of ``{lines}`` provides the following sub-keywords in
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406
406
407 :line: String. Line content.
407 :line: String. Line content.
408 :lineno: Integer. Line number at that revision.
408 :lineno: Integer. Line number at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
410
410
411 See :hg:`help templates.operators` for the list expansion syntax.
411 See :hg:`help templates.operators` for the list expansion syntax.
412
412
413 Returns 0 on success.
413 Returns 0 on success.
414 """
414 """
415 opts = pycompat.byteskwargs(opts)
415 opts = pycompat.byteskwargs(opts)
416 if not pats:
416 if not pats:
417 raise error.Abort(_(b'at least one filename or pattern is required'))
417 raise error.Abort(_(b'at least one filename or pattern is required'))
418
418
419 if opts.get(b'follow'):
419 if opts.get(b'follow'):
420 # --follow is deprecated and now just an alias for -f/--file
420 # --follow is deprecated and now just an alias for -f/--file
421 # to mimic the behavior of Mercurial before version 1.5
421 # to mimic the behavior of Mercurial before version 1.5
422 opts[b'file'] = True
422 opts[b'file'] = True
423
423
424 if (
424 if (
425 not opts.get(b'user')
425 not opts.get(b'user')
426 and not opts.get(b'changeset')
426 and not opts.get(b'changeset')
427 and not opts.get(b'date')
427 and not opts.get(b'date')
428 and not opts.get(b'file')
428 and not opts.get(b'file')
429 ):
429 ):
430 opts[b'number'] = True
430 opts[b'number'] = True
431
431
432 linenumber = opts.get(b'line_number') is not None
432 linenumber = opts.get(b'line_number') is not None
433 if (
433 if (
434 linenumber
434 linenumber
435 and (not opts.get(b'changeset'))
435 and (not opts.get(b'changeset'))
436 and (not opts.get(b'number'))
436 and (not opts.get(b'number'))
437 ):
437 ):
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439
439
440 rev = opts.get(b'rev')
440 rev = opts.get(b'rev')
441 if rev:
441 if rev:
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 ctx = scmutil.revsingle(repo, rev)
443 ctx = scmutil.revsingle(repo, rev)
444
444
445 ui.pager(b'annotate')
445 ui.pager(b'annotate')
446 rootfm = ui.formatter(b'annotate', opts)
446 rootfm = ui.formatter(b'annotate', opts)
447 if ui.debugflag:
447 if ui.debugflag:
448 shorthex = pycompat.identity
448 shorthex = pycompat.identity
449 else:
449 else:
450
450
451 def shorthex(h):
451 def shorthex(h):
452 return h[:12]
452 return h[:12]
453
453
454 if ui.quiet:
454 if ui.quiet:
455 datefunc = dateutil.shortdate
455 datefunc = dateutil.shortdate
456 else:
456 else:
457 datefunc = dateutil.datestr
457 datefunc = dateutil.datestr
458 if ctx.rev() is None:
458 if ctx.rev() is None:
459 if opts.get(b'changeset'):
459 if opts.get(b'changeset'):
460 # omit "+" suffix which is appended to node hex
460 # omit "+" suffix which is appended to node hex
461 def formatrev(rev):
461 def formatrev(rev):
462 if rev == wdirrev:
462 if rev == wdirrev:
463 return b'%d' % ctx.p1().rev()
463 return b'%d' % ctx.p1().rev()
464 else:
464 else:
465 return b'%d' % rev
465 return b'%d' % rev
466
466
467 else:
467 else:
468
468
469 def formatrev(rev):
469 def formatrev(rev):
470 if rev == wdirrev:
470 if rev == wdirrev:
471 return b'%d+' % ctx.p1().rev()
471 return b'%d+' % ctx.p1().rev()
472 else:
472 else:
473 return b'%d ' % rev
473 return b'%d ' % rev
474
474
475 def formathex(h):
475 def formathex(h):
476 if h == wdirhex:
476 if h == wdirhex:
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 else:
478 else:
479 return b'%s ' % shorthex(h)
479 return b'%s ' % shorthex(h)
480
480
481 else:
481 else:
482 formatrev = b'%d'.__mod__
482 formatrev = b'%d'.__mod__
483 formathex = shorthex
483 formathex = shorthex
484
484
485 opmap = [
485 opmap = [
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 ]
492 ]
493 opnamemap = {
493 opnamemap = {
494 b'rev': b'number',
494 b'rev': b'number',
495 b'node': b'changeset',
495 b'node': b'changeset',
496 b'path': b'file',
496 b'path': b'file',
497 b'lineno': b'line_number',
497 b'lineno': b'line_number',
498 }
498 }
499
499
500 if rootfm.isplain():
500 if rootfm.isplain():
501
501
502 def makefunc(get, fmt):
502 def makefunc(get, fmt):
503 return lambda x: fmt(get(x))
503 return lambda x: fmt(get(x))
504
504
505 else:
505 else:
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return get
508 return get
509
509
510 datahint = rootfm.datahint()
510 datahint = rootfm.datahint()
511 funcmap = [
511 funcmap = [
512 (makefunc(get, fmt), sep)
512 (makefunc(get, fmt), sep)
513 for fn, sep, get, fmt in opmap
513 for fn, sep, get, fmt in opmap
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 ]
515 ]
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 fields = b' '.join(
517 fields = b' '.join(
518 fn
518 fn
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 )
521 )
522
522
523 def bad(x, y):
523 def bad(x, y):
524 raise error.Abort(b"%s: %s" % (x, y))
524 raise error.Abort(b"%s: %s" % (x, y))
525
525
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527
527
528 follow = not opts.get(b'no_follow')
528 follow = not opts.get(b'no_follow')
529 diffopts = patch.difffeatureopts(
529 diffopts = patch.difffeatureopts(
530 ui, opts, section=b'annotate', whitespace=True
530 ui, opts, section=b'annotate', whitespace=True
531 )
531 )
532 skiprevs = opts.get(b'skip')
532 skiprevs = opts.get(b'skip')
533 if skiprevs:
533 if skiprevs:
534 skiprevs = scmutil.revrange(repo, skiprevs)
534 skiprevs = scmutil.revrange(repo, skiprevs)
535
535
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 for abs in ctx.walk(m):
537 for abs in ctx.walk(m):
538 fctx = ctx[abs]
538 fctx = ctx[abs]
539 rootfm.startitem()
539 rootfm.startitem()
540 rootfm.data(path=abs)
540 rootfm.data(path=abs)
541 if not opts.get(b'text') and fctx.isbinary():
541 if not opts.get(b'text') and fctx.isbinary():
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 continue
543 continue
544
544
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 lines = fctx.annotate(
546 lines = fctx.annotate(
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 )
548 )
549 if not lines:
549 if not lines:
550 fm.end()
550 fm.end()
551 continue
551 continue
552 formats = []
552 formats = []
553 pieces = []
553 pieces = []
554
554
555 for f, sep in funcmap:
555 for f, sep in funcmap:
556 l = [f(n) for n in lines]
556 l = [f(n) for n in lines]
557 if fm.isplain():
557 if fm.isplain():
558 sizes = [encoding.colwidth(x) for x in l]
558 sizes = [encoding.colwidth(x) for x in l]
559 ml = max(sizes)
559 ml = max(sizes)
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 else:
561 else:
562 formats.append([b'%s'] * len(l))
562 formats.append([b'%s'] * len(l))
563 pieces.append(l)
563 pieces.append(l)
564
564
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 fm.startitem()
566 fm.startitem()
567 fm.context(fctx=n.fctx)
567 fm.context(fctx=n.fctx)
568 fm.write(fields, b"".join(f), *p)
568 fm.write(fields, b"".join(f), *p)
569 if n.skip:
569 if n.skip:
570 fmt = b"* %s"
570 fmt = b"* %s"
571 else:
571 else:
572 fmt = b": %s"
572 fmt = b": %s"
573 fm.write(b'line', fmt, n.text)
573 fm.write(b'line', fmt, n.text)
574
574
575 if not lines[-1].text.endswith(b'\n'):
575 if not lines[-1].text.endswith(b'\n'):
576 fm.plain(b'\n')
576 fm.plain(b'\n')
577 fm.end()
577 fm.end()
578
578
579 rootfm.end()
579 rootfm.end()
580
580
581
581
582 @command(
582 @command(
583 b'archive',
583 b'archive',
584 [
584 [
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (
586 (
587 b'p',
587 b'p',
588 b'prefix',
588 b'prefix',
589 b'',
589 b'',
590 _(b'directory prefix for files in archive'),
590 _(b'directory prefix for files in archive'),
591 _(b'PREFIX'),
591 _(b'PREFIX'),
592 ),
592 ),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 ]
595 ]
596 + subrepoopts
596 + subrepoopts
597 + walkopts,
597 + walkopts,
598 _(b'[OPTION]... DEST'),
598 _(b'[OPTION]... DEST'),
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 )
600 )
601 def archive(ui, repo, dest, **opts):
601 def archive(ui, repo, dest, **opts):
602 '''create an unversioned archive of a repository revision
602 '''create an unversioned archive of a repository revision
603
603
604 By default, the revision used is the parent of the working
604 By default, the revision used is the parent of the working
605 directory; use -r/--rev to specify a different revision.
605 directory; use -r/--rev to specify a different revision.
606
606
607 The archive type is automatically detected based on file
607 The archive type is automatically detected based on file
608 extension (to override, use -t/--type).
608 extension (to override, use -t/--type).
609
609
610 .. container:: verbose
610 .. container:: verbose
611
611
612 Examples:
612 Examples:
613
613
614 - create a zip file containing the 1.0 release::
614 - create a zip file containing the 1.0 release::
615
615
616 hg archive -r 1.0 project-1.0.zip
616 hg archive -r 1.0 project-1.0.zip
617
617
618 - create a tarball excluding .hg files::
618 - create a tarball excluding .hg files::
619
619
620 hg archive project.tar.gz -X ".hg*"
620 hg archive project.tar.gz -X ".hg*"
621
621
622 Valid types are:
622 Valid types are:
623
623
624 :``files``: a directory full of files (default)
624 :``files``: a directory full of files (default)
625 :``tar``: tar archive, uncompressed
625 :``tar``: tar archive, uncompressed
626 :``tbz2``: tar archive, compressed using bzip2
626 :``tbz2``: tar archive, compressed using bzip2
627 :``tgz``: tar archive, compressed using gzip
627 :``tgz``: tar archive, compressed using gzip
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``uzip``: zip archive, uncompressed
629 :``uzip``: zip archive, uncompressed
630 :``zip``: zip archive, compressed using deflate
630 :``zip``: zip archive, compressed using deflate
631
631
632 The exact name of the destination archive or directory is given
632 The exact name of the destination archive or directory is given
633 using a format string; see :hg:`help export` for details.
633 using a format string; see :hg:`help export` for details.
634
634
635 Each member added to an archive file has a directory prefix
635 Each member added to an archive file has a directory prefix
636 prepended. Use -p/--prefix to specify a format string for the
636 prepended. Use -p/--prefix to specify a format string for the
637 prefix. The default is the basename of the archive, with suffixes
637 prefix. The default is the basename of the archive, with suffixes
638 removed.
638 removed.
639
639
640 Returns 0 on success.
640 Returns 0 on success.
641 '''
641 '''
642
642
643 opts = pycompat.byteskwargs(opts)
643 opts = pycompat.byteskwargs(opts)
644 rev = opts.get(b'rev')
644 rev = opts.get(b'rev')
645 if rev:
645 if rev:
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 if not ctx:
648 if not ctx:
649 raise error.Abort(_(b'no working directory: please specify a revision'))
649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 node = ctx.node()
650 node = ctx.node()
651 dest = cmdutil.makefilename(ctx, dest)
651 dest = cmdutil.makefilename(ctx, dest)
652 if os.path.realpath(dest) == repo.root:
652 if os.path.realpath(dest) == repo.root:
653 raise error.Abort(_(b'repository root cannot be destination'))
653 raise error.Abort(_(b'repository root cannot be destination'))
654
654
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 prefix = opts.get(b'prefix')
656 prefix = opts.get(b'prefix')
657
657
658 if dest == b'-':
658 if dest == b'-':
659 if kind == b'files':
659 if kind == b'files':
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 dest = cmdutil.makefileobj(ctx, dest)
661 dest = cmdutil.makefileobj(ctx, dest)
662 if not prefix:
662 if not prefix:
663 prefix = os.path.basename(repo.root) + b'-%h'
663 prefix = os.path.basename(repo.root) + b'-%h'
664
664
665 prefix = cmdutil.makefilename(ctx, prefix)
665 prefix = cmdutil.makefilename(ctx, prefix)
666 match = scmutil.match(ctx, [], opts)
666 match = scmutil.match(ctx, [], opts)
667 archival.archive(
667 archival.archive(
668 repo,
668 repo,
669 dest,
669 dest,
670 node,
670 node,
671 kind,
671 kind,
672 not opts.get(b'no_decode'),
672 not opts.get(b'no_decode'),
673 match,
673 match,
674 prefix,
674 prefix,
675 subrepos=opts.get(b'subrepos'),
675 subrepos=opts.get(b'subrepos'),
676 )
676 )
677
677
678
678
679 @command(
679 @command(
680 b'backout',
680 b'backout',
681 [
681 [
682 (
682 (
683 b'',
683 b'',
684 b'merge',
684 b'merge',
685 None,
685 None,
686 _(b'merge with old dirstate parent after backout'),
686 _(b'merge with old dirstate parent after backout'),
687 ),
687 ),
688 (
688 (
689 b'',
689 b'',
690 b'commit',
690 b'commit',
691 None,
691 None,
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 ),
693 ),
694 (b'', b'no-commit', None, _(b'do not commit')),
694 (b'', b'no-commit', None, _(b'do not commit')),
695 (
695 (
696 b'',
696 b'',
697 b'parent',
697 b'parent',
698 b'',
698 b'',
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'REV'),
700 _(b'REV'),
701 ),
701 ),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 ]
704 ]
705 + mergetoolopts
705 + mergetoolopts
706 + walkopts
706 + walkopts
707 + commitopts
707 + commitopts
708 + commitopts2,
708 + commitopts2,
709 _(b'[OPTION]... [-r] REV'),
709 _(b'[OPTION]... [-r] REV'),
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 )
711 )
712 def backout(ui, repo, node=None, rev=None, **opts):
712 def backout(ui, repo, node=None, rev=None, **opts):
713 '''reverse effect of earlier changeset
713 '''reverse effect of earlier changeset
714
714
715 Prepare a new changeset with the effect of REV undone in the
715 Prepare a new changeset with the effect of REV undone in the
716 current working directory. If no conflicts were encountered,
716 current working directory. If no conflicts were encountered,
717 it will be committed immediately.
717 it will be committed immediately.
718
718
719 If REV is the parent of the working directory, then this new changeset
719 If REV is the parent of the working directory, then this new changeset
720 is committed automatically (unless --no-commit is specified).
720 is committed automatically (unless --no-commit is specified).
721
721
722 .. note::
722 .. note::
723
723
724 :hg:`backout` cannot be used to fix either an unwanted or
724 :hg:`backout` cannot be used to fix either an unwanted or
725 incorrect merge.
725 incorrect merge.
726
726
727 .. container:: verbose
727 .. container:: verbose
728
728
729 Examples:
729 Examples:
730
730
731 - Reverse the effect of the parent of the working directory.
731 - Reverse the effect of the parent of the working directory.
732 This backout will be committed immediately::
732 This backout will be committed immediately::
733
733
734 hg backout -r .
734 hg backout -r .
735
735
736 - Reverse the effect of previous bad revision 23::
736 - Reverse the effect of previous bad revision 23::
737
737
738 hg backout -r 23
738 hg backout -r 23
739
739
740 - Reverse the effect of previous bad revision 23 and
740 - Reverse the effect of previous bad revision 23 and
741 leave changes uncommitted::
741 leave changes uncommitted::
742
742
743 hg backout -r 23 --no-commit
743 hg backout -r 23 --no-commit
744 hg commit -m "Backout revision 23"
744 hg commit -m "Backout revision 23"
745
745
746 By default, the pending changeset will have one parent,
746 By default, the pending changeset will have one parent,
747 maintaining a linear history. With --merge, the pending
747 maintaining a linear history. With --merge, the pending
748 changeset will instead have two parents: the old parent of the
748 changeset will instead have two parents: the old parent of the
749 working directory and a new child of REV that simply undoes REV.
749 working directory and a new child of REV that simply undoes REV.
750
750
751 Before version 1.7, the behavior without --merge was equivalent
751 Before version 1.7, the behavior without --merge was equivalent
752 to specifying --merge followed by :hg:`update --clean .` to
752 to specifying --merge followed by :hg:`update --clean .` to
753 cancel the merge and leave the child of REV as a head to be
753 cancel the merge and leave the child of REV as a head to be
754 merged separately.
754 merged separately.
755
755
756 See :hg:`help dates` for a list of formats valid for -d/--date.
756 See :hg:`help dates` for a list of formats valid for -d/--date.
757
757
758 See :hg:`help revert` for a way to restore files to the state
758 See :hg:`help revert` for a way to restore files to the state
759 of another revision.
759 of another revision.
760
760
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 files.
762 files.
763 '''
763 '''
764 with repo.wlock(), repo.lock():
764 with repo.wlock(), repo.lock():
765 return _dobackout(ui, repo, node, rev, **opts)
765 return _dobackout(ui, repo, node, rev, **opts)
766
766
767
767
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 opts = pycompat.byteskwargs(opts)
769 opts = pycompat.byteskwargs(opts)
770 if opts.get(b'commit') and opts.get(b'no_commit'):
770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 if opts.get(b'merge') and opts.get(b'no_commit'):
772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774
774
775 if rev and node:
775 if rev and node:
776 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
777
777
778 if not rev:
778 if not rev:
779 rev = node
779 rev = node
780
780
781 if not rev:
781 if not rev:
782 raise error.Abort(_(b"please specify a revision to backout"))
782 raise error.Abort(_(b"please specify a revision to backout"))
783
783
784 date = opts.get(b'date')
784 date = opts.get(b'date')
785 if date:
785 if date:
786 opts[b'date'] = dateutil.parsedate(date)
786 opts[b'date'] = dateutil.parsedate(date)
787
787
788 cmdutil.checkunfinished(repo)
788 cmdutil.checkunfinished(repo)
789 cmdutil.bailifchanged(repo)
789 cmdutil.bailifchanged(repo)
790 node = scmutil.revsingle(repo, rev).node()
790 node = scmutil.revsingle(repo, rev).node()
791
791
792 op1, op2 = repo.dirstate.parents()
792 op1, op2 = repo.dirstate.parents()
793 if not repo.changelog.isancestor(node, op1):
793 if not repo.changelog.isancestor(node, op1):
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795
795
796 p1, p2 = repo.changelog.parents(node)
796 p1, p2 = repo.changelog.parents(node)
797 if p1 == nullid:
797 if p1 == nullid:
798 raise error.Abort(_(b'cannot backout a change with no parents'))
798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 if p2 != nullid:
799 if p2 != nullid:
800 if not opts.get(b'parent'):
800 if not opts.get(b'parent'):
801 raise error.Abort(_(b'cannot backout a merge changeset'))
801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 p = repo.lookup(opts[b'parent'])
802 p = repo.lookup(opts[b'parent'])
803 if p not in (p1, p2):
803 if p not in (p1, p2):
804 raise error.Abort(
804 raise error.Abort(
805 _(b'%s is not a parent of %s') % (short(p), short(node))
805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 )
806 )
807 parent = p
807 parent = p
808 else:
808 else:
809 if opts.get(b'parent'):
809 if opts.get(b'parent'):
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 parent = p1
811 parent = p1
812
812
813 # the backout should appear on the same branch
813 # the backout should appear on the same branch
814 branch = repo.dirstate.branch()
814 branch = repo.dirstate.branch()
815 bheads = repo.branchheads(branch)
815 bheads = repo.branchheads(branch)
816 rctx = scmutil.revsingle(repo, hex(parent))
816 rctx = scmutil.revsingle(repo, hex(parent))
817 if not opts.get(b'merge') and op1 != node:
817 if not opts.get(b'merge') and op1 != node:
818 with dirstateguard.dirstateguard(repo, b'backout'):
818 with dirstateguard.dirstateguard(repo, b'backout'):
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 with ui.configoverride(overrides, b'backout'):
820 with ui.configoverride(overrides, b'backout'):
821 stats = mergemod.update(
821 stats = mergemod.update(
822 repo,
822 repo,
823 parent,
823 parent,
824 branchmerge=True,
824 branchmerge=True,
825 force=True,
825 force=True,
826 ancestor=node,
826 ancestor=node,
827 mergeancestor=False,
827 mergeancestor=False,
828 )
828 )
829 repo.setparents(op1, op2)
829 repo.setparents(op1, op2)
830 hg._showstats(repo, stats)
830 hg._showstats(repo, stats)
831 if stats.unresolvedcount:
831 if stats.unresolvedcount:
832 repo.ui.status(
832 repo.ui.status(
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 )
834 )
835 return 1
835 return 1
836 else:
836 else:
837 hg.clean(repo, node, show_stats=False)
837 hg.clean(repo, node, show_stats=False)
838 repo.dirstate.setbranch(branch)
838 repo.dirstate.setbranch(branch)
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840
840
841 if opts.get(b'no_commit'):
841 if opts.get(b'no_commit'):
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 ui.status(msg % short(node))
843 ui.status(msg % short(node))
844 return 0
844 return 0
845
845
846 def commitfunc(ui, repo, message, match, opts):
846 def commitfunc(ui, repo, message, match, opts):
847 editform = b'backout'
847 editform = b'backout'
848 e = cmdutil.getcommiteditor(
848 e = cmdutil.getcommiteditor(
849 editform=editform, **pycompat.strkwargs(opts)
849 editform=editform, **pycompat.strkwargs(opts)
850 )
850 )
851 if not message:
851 if not message:
852 # we don't translate commit messages
852 # we don't translate commit messages
853 message = b"Backed out changeset %s" % short(node)
853 message = b"Backed out changeset %s" % short(node)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 return repo.commit(
855 return repo.commit(
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 )
857 )
858
858
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 if not newnode:
860 if not newnode:
861 ui.status(_(b"nothing changed\n"))
861 ui.status(_(b"nothing changed\n"))
862 return 1
862 return 1
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864
864
865 def nice(node):
865 def nice(node):
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867
867
868 ui.status(
868 ui.status(
869 _(b'changeset %s backs out changeset %s\n')
869 _(b'changeset %s backs out changeset %s\n')
870 % (nice(repo.changelog.tip()), nice(node))
870 % (nice(repo.changelog.tip()), nice(node))
871 )
871 )
872 if opts.get(b'merge') and op1 != node:
872 if opts.get(b'merge') and op1 != node:
873 hg.clean(repo, op1, show_stats=False)
873 hg.clean(repo, op1, show_stats=False)
874 ui.status(
874 ui.status(
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 )
876 )
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 with ui.configoverride(overrides, b'backout'):
878 with ui.configoverride(overrides, b'backout'):
879 return hg.merge(repo[b'tip'])
879 return hg.merge(repo[b'tip'])
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1231 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 cmdutil.check_incompatible_arguments(
1239 cmdutil.check_incompatible_arguments(
1240 opts, b'inactive', [b'delete', b'list']
1240 opts, b'inactive', [b'delete', b'list']
1241 )
1241 )
1242 if not names and action in {b'add', b'delete'}:
1242 if not names and action in {b'add', b'delete'}:
1243 raise error.Abort(_(b"bookmark name required"))
1243 raise error.Abort(_(b"bookmark name required"))
1244
1244
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1245 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1246 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 if action == b'delete':
1247 if action == b'delete':
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1248 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 bookmarks.delete(repo, tr, names)
1249 bookmarks.delete(repo, tr, names)
1250 elif action == b'rename':
1250 elif action == b'rename':
1251 if not names:
1251 if not names:
1252 raise error.Abort(_(b"new bookmark name required"))
1252 raise error.Abort(_(b"new bookmark name required"))
1253 elif len(names) > 1:
1253 elif len(names) > 1:
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1254 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1255 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1256 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 elif action == b'add':
1257 elif action == b'add':
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1258 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 elif action == b'inactive':
1259 elif action == b'inactive':
1260 if len(repo._bookmarks) == 0:
1260 if len(repo._bookmarks) == 0:
1261 ui.status(_(b"no bookmarks set\n"))
1261 ui.status(_(b"no bookmarks set\n"))
1262 elif not repo._activebookmark:
1262 elif not repo._activebookmark:
1263 ui.status(_(b"no active bookmark\n"))
1263 ui.status(_(b"no active bookmark\n"))
1264 else:
1264 else:
1265 bookmarks.deactivate(repo)
1265 bookmarks.deactivate(repo)
1266 elif action == b'list':
1266 elif action == b'list':
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 with ui.formatter(b'bookmarks', opts) as fm:
1268 with ui.formatter(b'bookmarks', opts) as fm:
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1269 bookmarks.printbookmarks(ui, repo, fm, names)
1270 else:
1270 else:
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1271 raise error.ProgrammingError(b'invalid action: %s' % action)
1272
1272
1273
1273
1274 @command(
1274 @command(
1275 b'branch',
1275 b'branch',
1276 [
1276 [
1277 (
1277 (
1278 b'f',
1278 b'f',
1279 b'force',
1279 b'force',
1280 None,
1280 None,
1281 _(b'set branch name even if it shadows an existing branch'),
1281 _(b'set branch name even if it shadows an existing branch'),
1282 ),
1282 ),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1283 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (
1284 (
1285 b'r',
1285 b'r',
1286 b'rev',
1286 b'rev',
1287 [],
1287 [],
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1288 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 ),
1289 ),
1290 ],
1290 ],
1291 _(b'[-fC] [NAME]'),
1291 _(b'[-fC] [NAME]'),
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1292 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 )
1293 )
1294 def branch(ui, repo, label=None, **opts):
1294 def branch(ui, repo, label=None, **opts):
1295 """set or show the current branch name
1295 """set or show the current branch name
1296
1296
1297 .. note::
1297 .. note::
1298
1298
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1299 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1300 light-weight bookmark instead. See :hg:`help glossary` for more
1301 information about named branches and bookmarks.
1301 information about named branches and bookmarks.
1302
1302
1303 With no argument, show the current branch name. With one argument,
1303 With no argument, show the current branch name. With one argument,
1304 set the working directory branch name (the branch will not exist
1304 set the working directory branch name (the branch will not exist
1305 in the repository until the next commit). Standard practice
1305 in the repository until the next commit). Standard practice
1306 recommends that primary development take place on the 'default'
1306 recommends that primary development take place on the 'default'
1307 branch.
1307 branch.
1308
1308
1309 Unless -f/--force is specified, branch will not let you set a
1309 Unless -f/--force is specified, branch will not let you set a
1310 branch name that already exists.
1310 branch name that already exists.
1311
1311
1312 Use -C/--clean to reset the working directory branch to that of
1312 Use -C/--clean to reset the working directory branch to that of
1313 the parent of the working directory, negating a previous branch
1313 the parent of the working directory, negating a previous branch
1314 change.
1314 change.
1315
1315
1316 Use the command :hg:`update` to switch to an existing branch. Use
1316 Use the command :hg:`update` to switch to an existing branch. Use
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1317 :hg:`commit --close-branch` to mark this branch head as closed.
1318 When all heads of a branch are closed, the branch will be
1318 When all heads of a branch are closed, the branch will be
1319 considered closed.
1319 considered closed.
1320
1320
1321 Returns 0 on success.
1321 Returns 0 on success.
1322 """
1322 """
1323 opts = pycompat.byteskwargs(opts)
1323 opts = pycompat.byteskwargs(opts)
1324 revs = opts.get(b'rev')
1324 revs = opts.get(b'rev')
1325 if label:
1325 if label:
1326 label = label.strip()
1326 label = label.strip()
1327
1327
1328 if not opts.get(b'clean') and not label:
1328 if not opts.get(b'clean') and not label:
1329 if revs:
1329 if revs:
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1330 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1331 ui.write(b"%s\n" % repo.dirstate.branch())
1332 return
1332 return
1333
1333
1334 with repo.wlock():
1334 with repo.wlock():
1335 if opts.get(b'clean'):
1335 if opts.get(b'clean'):
1336 label = repo[b'.'].branch()
1336 label = repo[b'.'].branch()
1337 repo.dirstate.setbranch(label)
1337 repo.dirstate.setbranch(label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1338 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 elif label:
1339 elif label:
1340
1340
1341 scmutil.checknewlabel(repo, label, b'branch')
1341 scmutil.checknewlabel(repo, label, b'branch')
1342 if revs:
1342 if revs:
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1343 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344
1344
1345 if not opts.get(b'force') and label in repo.branchmap():
1345 if not opts.get(b'force') and label in repo.branchmap():
1346 if label not in [p.branch() for p in repo[None].parents()]:
1346 if label not in [p.branch() for p in repo[None].parents()]:
1347 raise error.Abort(
1347 raise error.Abort(
1348 _(b'a branch of the same name already exists'),
1348 _(b'a branch of the same name already exists'),
1349 # i18n: "it" refers to an existing branch
1349 # i18n: "it" refers to an existing branch
1350 hint=_(b"use 'hg update' to switch to it"),
1350 hint=_(b"use 'hg update' to switch to it"),
1351 )
1351 )
1352
1352
1353 repo.dirstate.setbranch(label)
1353 repo.dirstate.setbranch(label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1354 ui.status(_(b'marked working directory as branch %s\n') % label)
1355
1355
1356 # find any open named branches aside from default
1356 # find any open named branches aside from default
1357 for n, h, t, c in repo.branchmap().iterbranches():
1357 for n, h, t, c in repo.branchmap().iterbranches():
1358 if n != b"default" and not c:
1358 if n != b"default" and not c:
1359 return 0
1359 return 0
1360 ui.status(
1360 ui.status(
1361 _(
1361 _(
1362 b'(branches are permanent and global, '
1362 b'(branches are permanent and global, '
1363 b'did you want a bookmark?)\n'
1363 b'did you want a bookmark?)\n'
1364 )
1364 )
1365 )
1365 )
1366
1366
1367
1367
1368 @command(
1368 @command(
1369 b'branches',
1369 b'branches',
1370 [
1370 [
1371 (
1371 (
1372 b'a',
1372 b'a',
1373 b'active',
1373 b'active',
1374 False,
1374 False,
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1375 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 ),
1376 ),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1377 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1378 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 ]
1379 ]
1380 + formatteropts,
1380 + formatteropts,
1381 _(b'[-c]'),
1381 _(b'[-c]'),
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1382 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 intents={INTENT_READONLY},
1383 intents={INTENT_READONLY},
1384 )
1384 )
1385 def branches(ui, repo, active=False, closed=False, **opts):
1385 def branches(ui, repo, active=False, closed=False, **opts):
1386 """list repository named branches
1386 """list repository named branches
1387
1387
1388 List the repository's named branches, indicating which ones are
1388 List the repository's named branches, indicating which ones are
1389 inactive. If -c/--closed is specified, also list branches which have
1389 inactive. If -c/--closed is specified, also list branches which have
1390 been marked closed (see :hg:`commit --close-branch`).
1390 been marked closed (see :hg:`commit --close-branch`).
1391
1391
1392 Use the command :hg:`update` to switch to an existing branch.
1392 Use the command :hg:`update` to switch to an existing branch.
1393
1393
1394 .. container:: verbose
1394 .. container:: verbose
1395
1395
1396 Template:
1396 Template:
1397
1397
1398 The following keywords are supported in addition to the common template
1398 The following keywords are supported in addition to the common template
1399 keywords and functions such as ``{branch}``. See also
1399 keywords and functions such as ``{branch}``. See also
1400 :hg:`help templates`.
1400 :hg:`help templates`.
1401
1401
1402 :active: Boolean. True if the branch is active.
1402 :active: Boolean. True if the branch is active.
1403 :closed: Boolean. True if the branch is closed.
1403 :closed: Boolean. True if the branch is closed.
1404 :current: Boolean. True if it is the current branch.
1404 :current: Boolean. True if it is the current branch.
1405
1405
1406 Returns 0.
1406 Returns 0.
1407 """
1407 """
1408
1408
1409 opts = pycompat.byteskwargs(opts)
1409 opts = pycompat.byteskwargs(opts)
1410 revs = opts.get(b'rev')
1410 revs = opts.get(b'rev')
1411 selectedbranches = None
1411 selectedbranches = None
1412 if revs:
1412 if revs:
1413 revs = scmutil.revrange(repo, revs)
1413 revs = scmutil.revrange(repo, revs)
1414 getbi = repo.revbranchcache().branchinfo
1414 getbi = repo.revbranchcache().branchinfo
1415 selectedbranches = {getbi(r)[0] for r in revs}
1415 selectedbranches = {getbi(r)[0] for r in revs}
1416
1416
1417 ui.pager(b'branches')
1417 ui.pager(b'branches')
1418 fm = ui.formatter(b'branches', opts)
1418 fm = ui.formatter(b'branches', opts)
1419 hexfunc = fm.hexfunc
1419 hexfunc = fm.hexfunc
1420
1420
1421 allheads = set(repo.heads())
1421 allheads = set(repo.heads())
1422 branches = []
1422 branches = []
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1423 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 if selectedbranches is not None and tag not in selectedbranches:
1424 if selectedbranches is not None and tag not in selectedbranches:
1425 continue
1425 continue
1426 isactive = False
1426 isactive = False
1427 if not isclosed:
1427 if not isclosed:
1428 openheads = set(repo.branchmap().iteropen(heads))
1428 openheads = set(repo.branchmap().iteropen(heads))
1429 isactive = bool(openheads & allheads)
1429 isactive = bool(openheads & allheads)
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1430 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1431 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432
1432
1433 for tag, ctx, isactive, isopen in branches:
1433 for tag, ctx, isactive, isopen in branches:
1434 if active and not isactive:
1434 if active and not isactive:
1435 continue
1435 continue
1436 if isactive:
1436 if isactive:
1437 label = b'branches.active'
1437 label = b'branches.active'
1438 notice = b''
1438 notice = b''
1439 elif not isopen:
1439 elif not isopen:
1440 if not closed:
1440 if not closed:
1441 continue
1441 continue
1442 label = b'branches.closed'
1442 label = b'branches.closed'
1443 notice = _(b' (closed)')
1443 notice = _(b' (closed)')
1444 else:
1444 else:
1445 label = b'branches.inactive'
1445 label = b'branches.inactive'
1446 notice = _(b' (inactive)')
1446 notice = _(b' (inactive)')
1447 current = tag == repo.dirstate.branch()
1447 current = tag == repo.dirstate.branch()
1448 if current:
1448 if current:
1449 label = b'branches.current'
1449 label = b'branches.current'
1450
1450
1451 fm.startitem()
1451 fm.startitem()
1452 fm.write(b'branch', b'%s', tag, label=label)
1452 fm.write(b'branch', b'%s', tag, label=label)
1453 rev = ctx.rev()
1453 rev = ctx.rev()
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1454 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 fmt = b' ' * padsize + b' %d:%s'
1455 fmt = b' ' * padsize + b' %d:%s'
1456 fm.condwrite(
1456 fm.condwrite(
1457 not ui.quiet,
1457 not ui.quiet,
1458 b'rev node',
1458 b'rev node',
1459 fmt,
1459 fmt,
1460 rev,
1460 rev,
1461 hexfunc(ctx.node()),
1461 hexfunc(ctx.node()),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1462 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 )
1463 )
1464 fm.context(ctx=ctx)
1464 fm.context(ctx=ctx)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1465 fm.data(active=isactive, closed=not isopen, current=current)
1466 if not ui.quiet:
1466 if not ui.quiet:
1467 fm.plain(notice)
1467 fm.plain(notice)
1468 fm.plain(b'\n')
1468 fm.plain(b'\n')
1469 fm.end()
1469 fm.end()
1470
1470
1471
1471
1472 @command(
1472 @command(
1473 b'bundle',
1473 b'bundle',
1474 [
1474 [
1475 (
1475 (
1476 b'f',
1476 b'f',
1477 b'force',
1477 b'force',
1478 None,
1478 None,
1479 _(b'run even when the destination is unrelated'),
1479 _(b'run even when the destination is unrelated'),
1480 ),
1480 ),
1481 (
1481 (
1482 b'r',
1482 b'r',
1483 b'rev',
1483 b'rev',
1484 [],
1484 [],
1485 _(b'a changeset intended to be added to the destination'),
1485 _(b'a changeset intended to be added to the destination'),
1486 _(b'REV'),
1486 _(b'REV'),
1487 ),
1487 ),
1488 (
1488 (
1489 b'b',
1489 b'b',
1490 b'branch',
1490 b'branch',
1491 [],
1491 [],
1492 _(b'a specific branch you would like to bundle'),
1492 _(b'a specific branch you would like to bundle'),
1493 _(b'BRANCH'),
1493 _(b'BRANCH'),
1494 ),
1494 ),
1495 (
1495 (
1496 b'',
1496 b'',
1497 b'base',
1497 b'base',
1498 [],
1498 [],
1499 _(b'a base changeset assumed to be available at the destination'),
1499 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'REV'),
1500 _(b'REV'),
1501 ),
1501 ),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1502 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (
1503 (
1504 b't',
1504 b't',
1505 b'type',
1505 b'type',
1506 b'bzip2',
1506 b'bzip2',
1507 _(b'bundle compression type to use'),
1507 _(b'bundle compression type to use'),
1508 _(b'TYPE'),
1508 _(b'TYPE'),
1509 ),
1509 ),
1510 ]
1510 ]
1511 + remoteopts,
1511 + remoteopts,
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1512 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1513 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 )
1514 )
1515 def bundle(ui, repo, fname, dest=None, **opts):
1515 def bundle(ui, repo, fname, dest=None, **opts):
1516 """create a bundle file
1516 """create a bundle file
1517
1517
1518 Generate a bundle file containing data to be transferred to another
1518 Generate a bundle file containing data to be transferred to another
1519 repository.
1519 repository.
1520
1520
1521 To create a bundle containing all changesets, use -a/--all
1521 To create a bundle containing all changesets, use -a/--all
1522 (or --base null). Otherwise, hg assumes the destination will have
1522 (or --base null). Otherwise, hg assumes the destination will have
1523 all the nodes you specify with --base parameters. Otherwise, hg
1523 all the nodes you specify with --base parameters. Otherwise, hg
1524 will assume the repository has all the nodes in destination, or
1524 will assume the repository has all the nodes in destination, or
1525 default-push/default if no destination is specified, where destination
1525 default-push/default if no destination is specified, where destination
1526 is the repository you provide through DEST option.
1526 is the repository you provide through DEST option.
1527
1527
1528 You can change bundle format with the -t/--type option. See
1528 You can change bundle format with the -t/--type option. See
1529 :hg:`help bundlespec` for documentation on this format. By default,
1529 :hg:`help bundlespec` for documentation on this format. By default,
1530 the most appropriate format is used and compression defaults to
1530 the most appropriate format is used and compression defaults to
1531 bzip2.
1531 bzip2.
1532
1532
1533 The bundle file can then be transferred using conventional means
1533 The bundle file can then be transferred using conventional means
1534 and applied to another repository with the unbundle or pull
1534 and applied to another repository with the unbundle or pull
1535 command. This is useful when direct push and pull are not
1535 command. This is useful when direct push and pull are not
1536 available or when exporting an entire repository is undesirable.
1536 available or when exporting an entire repository is undesirable.
1537
1537
1538 Applying bundles preserves all changeset contents including
1538 Applying bundles preserves all changeset contents including
1539 permissions, copy/rename information, and revision history.
1539 permissions, copy/rename information, and revision history.
1540
1540
1541 Returns 0 on success, 1 if no changes found.
1541 Returns 0 on success, 1 if no changes found.
1542 """
1542 """
1543 opts = pycompat.byteskwargs(opts)
1543 opts = pycompat.byteskwargs(opts)
1544 revs = None
1544 revs = None
1545 if b'rev' in opts:
1545 if b'rev' in opts:
1546 revstrings = opts[b'rev']
1546 revstrings = opts[b'rev']
1547 revs = scmutil.revrange(repo, revstrings)
1547 revs = scmutil.revrange(repo, revstrings)
1548 if revstrings and not revs:
1548 if revstrings and not revs:
1549 raise error.Abort(_(b'no commits to bundle'))
1549 raise error.Abort(_(b'no commits to bundle'))
1550
1550
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1552 try:
1552 try:
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1553 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 except error.UnsupportedBundleSpecification as e:
1554 except error.UnsupportedBundleSpecification as e:
1555 raise error.Abort(
1555 raise error.Abort(
1556 pycompat.bytestr(e),
1556 pycompat.bytestr(e),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1557 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 )
1558 )
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1559 cgversion = bundlespec.contentopts[b"cg.version"]
1560
1560
1561 # Packed bundles are a pseudo bundle format for now.
1561 # Packed bundles are a pseudo bundle format for now.
1562 if cgversion == b's1':
1562 if cgversion == b's1':
1563 raise error.Abort(
1563 raise error.Abort(
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1564 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1565 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 )
1566 )
1567
1567
1568 if opts.get(b'all'):
1568 if opts.get(b'all'):
1569 if dest:
1569 if dest:
1570 raise error.Abort(
1570 raise error.Abort(
1571 _(b"--all is incompatible with specifying a destination")
1571 _(b"--all is incompatible with specifying a destination")
1572 )
1572 )
1573 if opts.get(b'base'):
1573 if opts.get(b'base'):
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1574 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 base = [nullrev]
1575 base = [nullrev]
1576 else:
1576 else:
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1577 base = scmutil.revrange(repo, opts.get(b'base'))
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1578 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 raise error.Abort(
1579 raise error.Abort(
1580 _(b"repository does not support bundle version %s") % cgversion
1580 _(b"repository does not support bundle version %s") % cgversion
1581 )
1581 )
1582
1582
1583 if base:
1583 if base:
1584 if dest:
1584 if dest:
1585 raise error.Abort(
1585 raise error.Abort(
1586 _(b"--base is incompatible with specifying a destination")
1586 _(b"--base is incompatible with specifying a destination")
1587 )
1587 )
1588 common = [repo[rev].node() for rev in base]
1588 common = [repo[rev].node() for rev in base]
1589 heads = [repo[r].node() for r in revs] if revs else None
1589 heads = [repo[r].node() for r in revs] if revs else None
1590 outgoing = discovery.outgoing(repo, common, heads)
1590 outgoing = discovery.outgoing(repo, common, heads)
1591 else:
1591 else:
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1592 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1593 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 other = hg.peer(repo, opts, dest)
1594 other = hg.peer(repo, opts, dest)
1595 revs = [repo[r].hex() for r in revs]
1595 revs = [repo[r].hex() for r in revs]
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1596 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1597 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 outgoing = discovery.findcommonoutgoing(
1598 outgoing = discovery.findcommonoutgoing(
1599 repo,
1599 repo,
1600 other,
1600 other,
1601 onlyheads=heads,
1601 onlyheads=heads,
1602 force=opts.get(b'force'),
1602 force=opts.get(b'force'),
1603 portable=True,
1603 portable=True,
1604 )
1604 )
1605
1605
1606 if not outgoing.missing:
1606 if not outgoing.missing:
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1607 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 return 1
1608 return 1
1609
1609
1610 if cgversion == b'01': # bundle1
1610 if cgversion == b'01': # bundle1
1611 bversion = b'HG10' + bundlespec.wirecompression
1611 bversion = b'HG10' + bundlespec.wirecompression
1612 bcompression = None
1612 bcompression = None
1613 elif cgversion in (b'02', b'03'):
1613 elif cgversion in (b'02', b'03'):
1614 bversion = b'HG20'
1614 bversion = b'HG20'
1615 bcompression = bundlespec.wirecompression
1615 bcompression = bundlespec.wirecompression
1616 else:
1616 else:
1617 raise error.ProgrammingError(
1617 raise error.ProgrammingError(
1618 b'bundle: unexpected changegroup version %s' % cgversion
1618 b'bundle: unexpected changegroup version %s' % cgversion
1619 )
1619 )
1620
1620
1621 # TODO compression options should be derived from bundlespec parsing.
1621 # TODO compression options should be derived from bundlespec parsing.
1622 # This is a temporary hack to allow adjusting bundle compression
1622 # This is a temporary hack to allow adjusting bundle compression
1623 # level without a) formalizing the bundlespec changes to declare it
1623 # level without a) formalizing the bundlespec changes to declare it
1624 # b) introducing a command flag.
1624 # b) introducing a command flag.
1625 compopts = {}
1625 compopts = {}
1626 complevel = ui.configint(
1626 complevel = ui.configint(
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1627 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 )
1628 )
1629 if complevel is None:
1629 if complevel is None:
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1630 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 if complevel is not None:
1631 if complevel is not None:
1632 compopts[b'level'] = complevel
1632 compopts[b'level'] = complevel
1633
1633
1634 # Allow overriding the bundling of obsmarker in phases through
1634 # Allow overriding the bundling of obsmarker in phases through
1635 # configuration while we don't have a bundle version that include them
1635 # configuration while we don't have a bundle version that include them
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1636 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 bundlespec.contentopts[b'obsolescence'] = True
1637 bundlespec.contentopts[b'obsolescence'] = True
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1638 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 bundlespec.contentopts[b'phases'] = True
1639 bundlespec.contentopts[b'phases'] = True
1640
1640
1641 bundle2.writenewbundle(
1641 bundle2.writenewbundle(
1642 ui,
1642 ui,
1643 repo,
1643 repo,
1644 b'bundle',
1644 b'bundle',
1645 fname,
1645 fname,
1646 bversion,
1646 bversion,
1647 outgoing,
1647 outgoing,
1648 bundlespec.contentopts,
1648 bundlespec.contentopts,
1649 compression=bcompression,
1649 compression=bcompression,
1650 compopts=compopts,
1650 compopts=compopts,
1651 )
1651 )
1652
1652
1653
1653
1654 @command(
1654 @command(
1655 b'cat',
1655 b'cat',
1656 [
1656 [
1657 (
1657 (
1658 b'o',
1658 b'o',
1659 b'output',
1659 b'output',
1660 b'',
1660 b'',
1661 _(b'print output to file with formatted name'),
1661 _(b'print output to file with formatted name'),
1662 _(b'FORMAT'),
1662 _(b'FORMAT'),
1663 ),
1663 ),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1664 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1665 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 ]
1666 ]
1667 + walkopts
1667 + walkopts
1668 + formatteropts,
1668 + formatteropts,
1669 _(b'[OPTION]... FILE...'),
1669 _(b'[OPTION]... FILE...'),
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1670 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 inferrepo=True,
1671 inferrepo=True,
1672 intents={INTENT_READONLY},
1672 intents={INTENT_READONLY},
1673 )
1673 )
1674 def cat(ui, repo, file1, *pats, **opts):
1674 def cat(ui, repo, file1, *pats, **opts):
1675 """output the current or given revision of files
1675 """output the current or given revision of files
1676
1676
1677 Print the specified files as they were at the given revision. If
1677 Print the specified files as they were at the given revision. If
1678 no revision is given, the parent of the working directory is used.
1678 no revision is given, the parent of the working directory is used.
1679
1679
1680 Output may be to a file, in which case the name of the file is
1680 Output may be to a file, in which case the name of the file is
1681 given using a template string. See :hg:`help templates`. In addition
1681 given using a template string. See :hg:`help templates`. In addition
1682 to the common template keywords, the following formatting rules are
1682 to the common template keywords, the following formatting rules are
1683 supported:
1683 supported:
1684
1684
1685 :``%%``: literal "%" character
1685 :``%%``: literal "%" character
1686 :``%s``: basename of file being printed
1686 :``%s``: basename of file being printed
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1687 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%p``: root-relative path name of file being printed
1688 :``%p``: root-relative path name of file being printed
1689 :``%H``: changeset hash (40 hexadecimal digits)
1689 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%R``: changeset revision number
1690 :``%R``: changeset revision number
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1691 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%r``: zero-padded changeset revision number
1692 :``%r``: zero-padded changeset revision number
1693 :``%b``: basename of the exporting repository
1693 :``%b``: basename of the exporting repository
1694 :``\\``: literal "\\" character
1694 :``\\``: literal "\\" character
1695
1695
1696 .. container:: verbose
1696 .. container:: verbose
1697
1697
1698 Template:
1698 Template:
1699
1699
1700 The following keywords are supported in addition to the common template
1700 The following keywords are supported in addition to the common template
1701 keywords and functions. See also :hg:`help templates`.
1701 keywords and functions. See also :hg:`help templates`.
1702
1702
1703 :data: String. File content.
1703 :data: String. File content.
1704 :path: String. Repository-absolute path of the file.
1704 :path: String. Repository-absolute path of the file.
1705
1705
1706 Returns 0 on success.
1706 Returns 0 on success.
1707 """
1707 """
1708 opts = pycompat.byteskwargs(opts)
1708 opts = pycompat.byteskwargs(opts)
1709 rev = opts.get(b'rev')
1709 rev = opts.get(b'rev')
1710 if rev:
1710 if rev:
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 ctx = scmutil.revsingle(repo, rev)
1712 ctx = scmutil.revsingle(repo, rev)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1713 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 fntemplate = opts.pop(b'output', b'')
1714 fntemplate = opts.pop(b'output', b'')
1715 if cmdutil.isstdiofilename(fntemplate):
1715 if cmdutil.isstdiofilename(fntemplate):
1716 fntemplate = b''
1716 fntemplate = b''
1717
1717
1718 if fntemplate:
1718 if fntemplate:
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1719 fm = formatter.nullformatter(ui, b'cat', opts)
1720 else:
1720 else:
1721 ui.pager(b'cat')
1721 ui.pager(b'cat')
1722 fm = ui.formatter(b'cat', opts)
1722 fm = ui.formatter(b'cat', opts)
1723 with fm:
1723 with fm:
1724 return cmdutil.cat(
1724 return cmdutil.cat(
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1725 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 )
1726 )
1727
1727
1728
1728
1729 @command(
1729 @command(
1730 b'clone',
1730 b'clone',
1731 [
1731 [
1732 (
1732 (
1733 b'U',
1733 b'U',
1734 b'noupdate',
1734 b'noupdate',
1735 None,
1735 None,
1736 _(
1736 _(
1737 b'the clone will include an empty working '
1737 b'the clone will include an empty working '
1738 b'directory (only a repository)'
1738 b'directory (only a repository)'
1739 ),
1739 ),
1740 ),
1740 ),
1741 (
1741 (
1742 b'u',
1742 b'u',
1743 b'updaterev',
1743 b'updaterev',
1744 b'',
1744 b'',
1745 _(b'revision, tag, or branch to check out'),
1745 _(b'revision, tag, or branch to check out'),
1746 _(b'REV'),
1746 _(b'REV'),
1747 ),
1747 ),
1748 (
1748 (
1749 b'r',
1749 b'r',
1750 b'rev',
1750 b'rev',
1751 [],
1751 [],
1752 _(
1752 _(
1753 b'do not clone everything, but include this changeset'
1753 b'do not clone everything, but include this changeset'
1754 b' and its ancestors'
1754 b' and its ancestors'
1755 ),
1755 ),
1756 _(b'REV'),
1756 _(b'REV'),
1757 ),
1757 ),
1758 (
1758 (
1759 b'b',
1759 b'b',
1760 b'branch',
1760 b'branch',
1761 [],
1761 [],
1762 _(
1762 _(
1763 b'do not clone everything, but include this branch\'s'
1763 b'do not clone everything, but include this branch\'s'
1764 b' changesets and their ancestors'
1764 b' changesets and their ancestors'
1765 ),
1765 ),
1766 _(b'BRANCH'),
1766 _(b'BRANCH'),
1767 ),
1767 ),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1768 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1769 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1770 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 ]
1771 ]
1772 + remoteopts,
1772 + remoteopts,
1773 _(b'[OPTION]... SOURCE [DEST]'),
1773 _(b'[OPTION]... SOURCE [DEST]'),
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1774 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpbasic=True,
1775 helpbasic=True,
1776 norepo=True,
1776 norepo=True,
1777 )
1777 )
1778 def clone(ui, source, dest=None, **opts):
1778 def clone(ui, source, dest=None, **opts):
1779 """make a copy of an existing repository
1779 """make a copy of an existing repository
1780
1780
1781 Create a copy of an existing repository in a new directory.
1781 Create a copy of an existing repository in a new directory.
1782
1782
1783 If no destination directory name is specified, it defaults to the
1783 If no destination directory name is specified, it defaults to the
1784 basename of the source.
1784 basename of the source.
1785
1785
1786 The location of the source is added to the new repository's
1786 The location of the source is added to the new repository's
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1787 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788
1788
1789 Only local paths and ``ssh://`` URLs are supported as
1789 Only local paths and ``ssh://`` URLs are supported as
1790 destinations. For ``ssh://`` destinations, no working directory or
1790 destinations. For ``ssh://`` destinations, no working directory or
1791 ``.hg/hgrc`` will be created on the remote side.
1791 ``.hg/hgrc`` will be created on the remote side.
1792
1792
1793 If the source repository has a bookmark called '@' set, that
1793 If the source repository has a bookmark called '@' set, that
1794 revision will be checked out in the new repository by default.
1794 revision will be checked out in the new repository by default.
1795
1795
1796 To check out a particular version, use -u/--update, or
1796 To check out a particular version, use -u/--update, or
1797 -U/--noupdate to create a clone with no working directory.
1797 -U/--noupdate to create a clone with no working directory.
1798
1798
1799 To pull only a subset of changesets, specify one or more revisions
1799 To pull only a subset of changesets, specify one or more revisions
1800 identifiers with -r/--rev or branches with -b/--branch. The
1800 identifiers with -r/--rev or branches with -b/--branch. The
1801 resulting clone will contain only the specified changesets and
1801 resulting clone will contain only the specified changesets and
1802 their ancestors. These options (or 'clone src#rev dest') imply
1802 their ancestors. These options (or 'clone src#rev dest') imply
1803 --pull, even for local source repositories.
1803 --pull, even for local source repositories.
1804
1804
1805 In normal clone mode, the remote normalizes repository data into a common
1805 In normal clone mode, the remote normalizes repository data into a common
1806 exchange format and the receiving end translates this data into its local
1806 exchange format and the receiving end translates this data into its local
1807 storage format. --stream activates a different clone mode that essentially
1807 storage format. --stream activates a different clone mode that essentially
1808 copies repository files from the remote with minimal data processing. This
1808 copies repository files from the remote with minimal data processing. This
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1809 significantly reduces the CPU cost of a clone both remotely and locally.
1810 However, it often increases the transferred data size by 30-40%. This can
1810 However, it often increases the transferred data size by 30-40%. This can
1811 result in substantially faster clones where I/O throughput is plentiful,
1811 result in substantially faster clones where I/O throughput is plentiful,
1812 especially for larger repositories. A side-effect of --stream clones is
1812 especially for larger repositories. A side-effect of --stream clones is
1813 that storage settings and requirements on the remote are applied locally:
1813 that storage settings and requirements on the remote are applied locally:
1814 a modern client may inherit legacy or inefficient storage used by the
1814 a modern client may inherit legacy or inefficient storage used by the
1815 remote or a legacy Mercurial client may not be able to clone from a
1815 remote or a legacy Mercurial client may not be able to clone from a
1816 modern Mercurial remote.
1816 modern Mercurial remote.
1817
1817
1818 .. note::
1818 .. note::
1819
1819
1820 Specifying a tag will include the tagged changeset but not the
1820 Specifying a tag will include the tagged changeset but not the
1821 changeset containing the tag.
1821 changeset containing the tag.
1822
1822
1823 .. container:: verbose
1823 .. container:: verbose
1824
1824
1825 For efficiency, hardlinks are used for cloning whenever the
1825 For efficiency, hardlinks are used for cloning whenever the
1826 source and destination are on the same filesystem (note this
1826 source and destination are on the same filesystem (note this
1827 applies only to the repository data, not to the working
1827 applies only to the repository data, not to the working
1828 directory). Some filesystems, such as AFS, implement hardlinking
1828 directory). Some filesystems, such as AFS, implement hardlinking
1829 incorrectly, but do not report errors. In these cases, use the
1829 incorrectly, but do not report errors. In these cases, use the
1830 --pull option to avoid hardlinking.
1830 --pull option to avoid hardlinking.
1831
1831
1832 Mercurial will update the working directory to the first applicable
1832 Mercurial will update the working directory to the first applicable
1833 revision from this list:
1833 revision from this list:
1834
1834
1835 a) null if -U or the source repository has no changesets
1835 a) null if -U or the source repository has no changesets
1836 b) if -u . and the source repository is local, the first parent of
1836 b) if -u . and the source repository is local, the first parent of
1837 the source repository's working directory
1837 the source repository's working directory
1838 c) the changeset specified with -u (if a branch name, this means the
1838 c) the changeset specified with -u (if a branch name, this means the
1839 latest head of that branch)
1839 latest head of that branch)
1840 d) the changeset specified with -r
1840 d) the changeset specified with -r
1841 e) the tipmost head specified with -b
1841 e) the tipmost head specified with -b
1842 f) the tipmost head specified with the url#branch source syntax
1842 f) the tipmost head specified with the url#branch source syntax
1843 g) the revision marked with the '@' bookmark, if present
1843 g) the revision marked with the '@' bookmark, if present
1844 h) the tipmost head of the default branch
1844 h) the tipmost head of the default branch
1845 i) tip
1845 i) tip
1846
1846
1847 When cloning from servers that support it, Mercurial may fetch
1847 When cloning from servers that support it, Mercurial may fetch
1848 pre-generated data from a server-advertised URL or inline from the
1848 pre-generated data from a server-advertised URL or inline from the
1849 same stream. When this is done, hooks operating on incoming changesets
1849 same stream. When this is done, hooks operating on incoming changesets
1850 and changegroups may fire more than once, once for each pre-generated
1850 and changegroups may fire more than once, once for each pre-generated
1851 bundle and as well as for any additional remaining data. In addition,
1851 bundle and as well as for any additional remaining data. In addition,
1852 if an error occurs, the repository may be rolled back to a partial
1852 if an error occurs, the repository may be rolled back to a partial
1853 clone. This behavior may change in future releases.
1853 clone. This behavior may change in future releases.
1854 See :hg:`help -e clonebundles` for more.
1854 See :hg:`help -e clonebundles` for more.
1855
1855
1856 Examples:
1856 Examples:
1857
1857
1858 - clone a remote repository to a new directory named hg/::
1858 - clone a remote repository to a new directory named hg/::
1859
1859
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1860 hg clone https://www.mercurial-scm.org/repo/hg/
1861
1861
1862 - create a lightweight local clone::
1862 - create a lightweight local clone::
1863
1863
1864 hg clone project/ project-feature/
1864 hg clone project/ project-feature/
1865
1865
1866 - clone from an absolute path on an ssh server (note double-slash)::
1866 - clone from an absolute path on an ssh server (note double-slash)::
1867
1867
1868 hg clone ssh://user@server//home/projects/alpha/
1868 hg clone ssh://user@server//home/projects/alpha/
1869
1869
1870 - do a streaming clone while checking out a specified version::
1870 - do a streaming clone while checking out a specified version::
1871
1871
1872 hg clone --stream http://server/repo -u 1.5
1872 hg clone --stream http://server/repo -u 1.5
1873
1873
1874 - create a repository without changesets after a particular revision::
1874 - create a repository without changesets after a particular revision::
1875
1875
1876 hg clone -r 04e544 experimental/ good/
1876 hg clone -r 04e544 experimental/ good/
1877
1877
1878 - clone (and track) a particular named branch::
1878 - clone (and track) a particular named branch::
1879
1879
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1880 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881
1881
1882 See :hg:`help urls` for details on specifying URLs.
1882 See :hg:`help urls` for details on specifying URLs.
1883
1883
1884 Returns 0 on success.
1884 Returns 0 on success.
1885 """
1885 """
1886 opts = pycompat.byteskwargs(opts)
1886 opts = pycompat.byteskwargs(opts)
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1887 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888
1888
1889 # --include/--exclude can come from narrow or sparse.
1889 # --include/--exclude can come from narrow or sparse.
1890 includepats, excludepats = None, None
1890 includepats, excludepats = None, None
1891
1891
1892 # hg.clone() differentiates between None and an empty set. So make sure
1892 # hg.clone() differentiates between None and an empty set. So make sure
1893 # patterns are sets if narrow is requested without patterns.
1893 # patterns are sets if narrow is requested without patterns.
1894 if opts.get(b'narrow'):
1894 if opts.get(b'narrow'):
1895 includepats = set()
1895 includepats = set()
1896 excludepats = set()
1896 excludepats = set()
1897
1897
1898 if opts.get(b'include'):
1898 if opts.get(b'include'):
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1899 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 if opts.get(b'exclude'):
1900 if opts.get(b'exclude'):
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1901 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902
1902
1903 r = hg.clone(
1903 r = hg.clone(
1904 ui,
1904 ui,
1905 opts,
1905 opts,
1906 source,
1906 source,
1907 dest,
1907 dest,
1908 pull=opts.get(b'pull'),
1908 pull=opts.get(b'pull'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1909 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 revs=opts.get(b'rev'),
1910 revs=opts.get(b'rev'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1911 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 branch=opts.get(b'branch'),
1912 branch=opts.get(b'branch'),
1913 shareopts=opts.get(b'shareopts'),
1913 shareopts=opts.get(b'shareopts'),
1914 storeincludepats=includepats,
1914 storeincludepats=includepats,
1915 storeexcludepats=excludepats,
1915 storeexcludepats=excludepats,
1916 depth=opts.get(b'depth') or None,
1916 depth=opts.get(b'depth') or None,
1917 )
1917 )
1918
1918
1919 return r is None
1919 return r is None
1920
1920
1921
1921
1922 @command(
1922 @command(
1923 b'commit|ci',
1923 b'commit|ci',
1924 [
1924 [
1925 (
1925 (
1926 b'A',
1926 b'A',
1927 b'addremove',
1927 b'addremove',
1928 None,
1928 None,
1929 _(b'mark new/missing files as added/removed before committing'),
1929 _(b'mark new/missing files as added/removed before committing'),
1930 ),
1930 ),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1931 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1932 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1933 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1934 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (
1935 (
1936 b'',
1936 b'',
1937 b'force-close-branch',
1937 b'force-close-branch',
1938 None,
1938 None,
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1939 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 ),
1940 ),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1941 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 ]
1942 ]
1943 + walkopts
1943 + walkopts
1944 + commitopts
1944 + commitopts
1945 + commitopts2
1945 + commitopts2
1946 + subrepoopts,
1946 + subrepoopts,
1947 _(b'[OPTION]... [FILE]...'),
1947 _(b'[OPTION]... [FILE]...'),
1948 helpcategory=command.CATEGORY_COMMITTING,
1948 helpcategory=command.CATEGORY_COMMITTING,
1949 helpbasic=True,
1949 helpbasic=True,
1950 inferrepo=True,
1950 inferrepo=True,
1951 )
1951 )
1952 def commit(ui, repo, *pats, **opts):
1952 def commit(ui, repo, *pats, **opts):
1953 """commit the specified files or all outstanding changes
1953 """commit the specified files or all outstanding changes
1954
1954
1955 Commit changes to the given files into the repository. Unlike a
1955 Commit changes to the given files into the repository. Unlike a
1956 centralized SCM, this operation is a local operation. See
1956 centralized SCM, this operation is a local operation. See
1957 :hg:`push` for a way to actively distribute your changes.
1957 :hg:`push` for a way to actively distribute your changes.
1958
1958
1959 If a list of files is omitted, all changes reported by :hg:`status`
1959 If a list of files is omitted, all changes reported by :hg:`status`
1960 will be committed.
1960 will be committed.
1961
1961
1962 If you are committing the result of a merge, do not provide any
1962 If you are committing the result of a merge, do not provide any
1963 filenames or -I/-X filters.
1963 filenames or -I/-X filters.
1964
1964
1965 If no commit message is specified, Mercurial starts your
1965 If no commit message is specified, Mercurial starts your
1966 configured editor where you can enter a message. In case your
1966 configured editor where you can enter a message. In case your
1967 commit fails, you will find a backup of your message in
1967 commit fails, you will find a backup of your message in
1968 ``.hg/last-message.txt``.
1968 ``.hg/last-message.txt``.
1969
1969
1970 The --close-branch flag can be used to mark the current branch
1970 The --close-branch flag can be used to mark the current branch
1971 head closed. When all heads of a branch are closed, the branch
1971 head closed. When all heads of a branch are closed, the branch
1972 will be considered closed and no longer listed.
1972 will be considered closed and no longer listed.
1973
1973
1974 The --amend flag can be used to amend the parent of the
1974 The --amend flag can be used to amend the parent of the
1975 working directory with a new commit that contains the changes
1975 working directory with a new commit that contains the changes
1976 in the parent in addition to those currently reported by :hg:`status`,
1976 in the parent in addition to those currently reported by :hg:`status`,
1977 if there are any. The old commit is stored in a backup bundle in
1977 if there are any. The old commit is stored in a backup bundle in
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1978 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 on how to restore it).
1979 on how to restore it).
1980
1980
1981 Message, user and date are taken from the amended commit unless
1981 Message, user and date are taken from the amended commit unless
1982 specified. When a message isn't specified on the command line,
1982 specified. When a message isn't specified on the command line,
1983 the editor will open with the message of the amended commit.
1983 the editor will open with the message of the amended commit.
1984
1984
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1985 It is not possible to amend public changesets (see :hg:`help phases`)
1986 or changesets that have children.
1986 or changesets that have children.
1987
1987
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1988 See :hg:`help dates` for a list of formats valid for -d/--date.
1989
1989
1990 Returns 0 on success, 1 if nothing changed.
1990 Returns 0 on success, 1 if nothing changed.
1991
1991
1992 .. container:: verbose
1992 .. container:: verbose
1993
1993
1994 Examples:
1994 Examples:
1995
1995
1996 - commit all files ending in .py::
1996 - commit all files ending in .py::
1997
1997
1998 hg commit --include "set:**.py"
1998 hg commit --include "set:**.py"
1999
1999
2000 - commit all non-binary files::
2000 - commit all non-binary files::
2001
2001
2002 hg commit --exclude "set:binary()"
2002 hg commit --exclude "set:binary()"
2003
2003
2004 - amend the current commit and set the date to now::
2004 - amend the current commit and set the date to now::
2005
2005
2006 hg commit --amend --date now
2006 hg commit --amend --date now
2007 """
2007 """
2008 with repo.wlock(), repo.lock():
2008 with repo.wlock(), repo.lock():
2009 return _docommit(ui, repo, *pats, **opts)
2009 return _docommit(ui, repo, *pats, **opts)
2010
2010
2011
2011
2012 def _docommit(ui, repo, *pats, **opts):
2012 def _docommit(ui, repo, *pats, **opts):
2013 if opts.get('interactive'):
2013 if opts.get('interactive'):
2014 opts.pop('interactive')
2014 opts.pop('interactive')
2015 ret = cmdutil.dorecord(
2015 ret = cmdutil.dorecord(
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2016 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 )
2017 )
2018 # ret can be 0 (no changes to record) or the value returned by
2018 # ret can be 0 (no changes to record) or the value returned by
2019 # commit(), 1 if nothing changed or None on success.
2019 # commit(), 1 if nothing changed or None on success.
2020 return 1 if ret == 0 else ret
2020 return 1 if ret == 0 else ret
2021
2021
2022 opts = pycompat.byteskwargs(opts)
2022 opts = pycompat.byteskwargs(opts)
2023 if opts.get(b'subrepos'):
2023 if opts.get(b'subrepos'):
2024 if opts.get(b'amend'):
2024 if opts.get(b'amend'):
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2025 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 # Let --subrepos on the command line override config setting.
2026 # Let --subrepos on the command line override config setting.
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2027 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028
2028
2029 cmdutil.checkunfinished(repo, commit=True)
2029 cmdutil.checkunfinished(repo, commit=True)
2030
2030
2031 branch = repo[None].branch()
2031 branch = repo[None].branch()
2032 bheads = repo.branchheads(branch)
2032 bheads = repo.branchheads(branch)
2033
2033
2034 extra = {}
2034 extra = {}
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2035 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 extra[b'close'] = b'1'
2036 extra[b'close'] = b'1'
2037
2037
2038 if repo[b'.'].closesbranch():
2038 if repo[b'.'].closesbranch():
2039 raise error.Abort(
2039 raise error.Abort(
2040 _(b'current revision is already a branch closing head')
2040 _(b'current revision is already a branch closing head')
2041 )
2041 )
2042 elif not bheads:
2042 elif not bheads:
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2043 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 elif (
2044 elif (
2045 branch == repo[b'.'].branch()
2045 branch == repo[b'.'].branch()
2046 and repo[b'.'].node() not in bheads
2046 and repo[b'.'].node() not in bheads
2047 and not opts.get(b'force_close_branch')
2047 and not opts.get(b'force_close_branch')
2048 ):
2048 ):
2049 hint = _(
2049 hint = _(
2050 b'use --force-close-branch to close branch from a non-head'
2050 b'use --force-close-branch to close branch from a non-head'
2051 b' changeset'
2051 b' changeset'
2052 )
2052 )
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2053 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 elif opts.get(b'amend'):
2054 elif opts.get(b'amend'):
2055 if (
2055 if (
2056 repo[b'.'].p1().branch() != branch
2056 repo[b'.'].p1().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2057 and repo[b'.'].p2().branch() != branch
2058 ):
2058 ):
2059 raise error.Abort(_(b'can only close branch heads'))
2059 raise error.Abort(_(b'can only close branch heads'))
2060
2060
2061 if opts.get(b'amend'):
2061 if opts.get(b'amend'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2062 if ui.configbool(b'ui', b'commitsubrepos'):
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2063 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064
2064
2065 old = repo[b'.']
2065 old = repo[b'.']
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2066 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067
2067
2068 # Currently histedit gets confused if an amend happens while histedit
2068 # Currently histedit gets confused if an amend happens while histedit
2069 # is in progress. Since we have a checkunfinished command, we are
2069 # is in progress. Since we have a checkunfinished command, we are
2070 # temporarily honoring it.
2070 # temporarily honoring it.
2071 #
2071 #
2072 # Note: eventually this guard will be removed. Please do not expect
2072 # Note: eventually this guard will be removed. Please do not expect
2073 # this behavior to remain.
2073 # this behavior to remain.
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2074 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 cmdutil.checkunfinished(repo)
2075 cmdutil.checkunfinished(repo)
2076
2076
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2077 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 if node == old.node():
2078 if node == old.node():
2079 ui.status(_(b"nothing changed\n"))
2079 ui.status(_(b"nothing changed\n"))
2080 return 1
2080 return 1
2081 else:
2081 else:
2082
2082
2083 def commitfunc(ui, repo, message, match, opts):
2083 def commitfunc(ui, repo, message, match, opts):
2084 overrides = {}
2084 overrides = {}
2085 if opts.get(b'secret'):
2085 if opts.get(b'secret'):
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2086 overrides[(b'phases', b'new-commit')] = b'secret'
2087
2087
2088 baseui = repo.baseui
2088 baseui = repo.baseui
2089 with baseui.configoverride(overrides, b'commit'):
2089 with baseui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2090 with ui.configoverride(overrides, b'commit'):
2091 editform = cmdutil.mergeeditform(
2091 editform = cmdutil.mergeeditform(
2092 repo[None], b'commit.normal'
2092 repo[None], b'commit.normal'
2093 )
2093 )
2094 editor = cmdutil.getcommiteditor(
2094 editor = cmdutil.getcommiteditor(
2095 editform=editform, **pycompat.strkwargs(opts)
2095 editform=editform, **pycompat.strkwargs(opts)
2096 )
2096 )
2097 return repo.commit(
2097 return repo.commit(
2098 message,
2098 message,
2099 opts.get(b'user'),
2099 opts.get(b'user'),
2100 opts.get(b'date'),
2100 opts.get(b'date'),
2101 match,
2101 match,
2102 editor=editor,
2102 editor=editor,
2103 extra=extra,
2103 extra=extra,
2104 )
2104 )
2105
2105
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2106 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107
2107
2108 if not node:
2108 if not node:
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2109 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 if stat.deleted:
2110 if stat.deleted:
2111 ui.status(
2111 ui.status(
2112 _(
2112 _(
2113 b"nothing changed (%d missing files, see "
2113 b"nothing changed (%d missing files, see "
2114 b"'hg status')\n"
2114 b"'hg status')\n"
2115 )
2115 )
2116 % len(stat.deleted)
2116 % len(stat.deleted)
2117 )
2117 )
2118 else:
2118 else:
2119 ui.status(_(b"nothing changed\n"))
2119 ui.status(_(b"nothing changed\n"))
2120 return 1
2120 return 1
2121
2121
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2122 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123
2123
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2124 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 status(
2125 status(
2126 ui,
2126 ui,
2127 repo,
2127 repo,
2128 modified=True,
2128 modified=True,
2129 added=True,
2129 added=True,
2130 removed=True,
2130 removed=True,
2131 deleted=True,
2131 deleted=True,
2132 unknown=True,
2132 unknown=True,
2133 subrepos=opts.get(b'subrepos'),
2133 subrepos=opts.get(b'subrepos'),
2134 )
2134 )
2135
2135
2136
2136
2137 @command(
2137 @command(
2138 b'config|showconfig|debugconfig',
2138 b'config|showconfig|debugconfig',
2139 [
2139 [
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2140 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2141 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2142 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2143 (b'g', b'global', None, _(b'edit global config')),
2144 ]
2144 ]
2145 + formatteropts,
2145 + formatteropts,
2146 _(b'[-u] [NAME]...'),
2146 _(b'[-u] [NAME]...'),
2147 helpcategory=command.CATEGORY_HELP,
2147 helpcategory=command.CATEGORY_HELP,
2148 optionalrepo=True,
2148 optionalrepo=True,
2149 intents={INTENT_READONLY},
2149 intents={INTENT_READONLY},
2150 )
2150 )
2151 def config(ui, repo, *values, **opts):
2151 def config(ui, repo, *values, **opts):
2152 """show combined config settings from all hgrc files
2152 """show combined config settings from all hgrc files
2153
2153
2154 With no arguments, print names and values of all config items.
2154 With no arguments, print names and values of all config items.
2155
2155
2156 With one argument of the form section.name, print just the value
2156 With one argument of the form section.name, print just the value
2157 of that config item.
2157 of that config item.
2158
2158
2159 With multiple arguments, print names and values of all config
2159 With multiple arguments, print names and values of all config
2160 items with matching section names or section.names.
2160 items with matching section names or section.names.
2161
2161
2162 With --edit, start an editor on the user-level config file. With
2162 With --edit, start an editor on the user-level config file. With
2163 --global, edit the system-wide config file. With --local, edit the
2163 --global, edit the system-wide config file. With --local, edit the
2164 repository-level config file.
2164 repository-level config file.
2165
2165
2166 With --debug, the source (filename and line number) is printed
2166 With --debug, the source (filename and line number) is printed
2167 for each config item.
2167 for each config item.
2168
2168
2169 See :hg:`help config` for more information about config files.
2169 See :hg:`help config` for more information about config files.
2170
2170
2171 .. container:: verbose
2171 .. container:: verbose
2172
2172
2173 Template:
2173 Template:
2174
2174
2175 The following keywords are supported. See also :hg:`help templates`.
2175 The following keywords are supported. See also :hg:`help templates`.
2176
2176
2177 :name: String. Config name.
2177 :name: String. Config name.
2178 :source: String. Filename and line number where the item is defined.
2178 :source: String. Filename and line number where the item is defined.
2179 :value: String. Config value.
2179 :value: String. Config value.
2180
2180
2181 Returns 0 on success, 1 if NAME does not exist.
2181 Returns 0 on success, 1 if NAME does not exist.
2182
2182
2183 """
2183 """
2184
2184
2185 opts = pycompat.byteskwargs(opts)
2185 opts = pycompat.byteskwargs(opts)
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2186 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2187 if opts.get(b'local') and opts.get(b'global'):
2188 raise error.Abort(_(b"can't use --local and --global together"))
2188 raise error.Abort(_(b"can't use --local and --global together"))
2189
2189
2190 if opts.get(b'local'):
2190 if opts.get(b'local'):
2191 if not repo:
2191 if not repo:
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2192 raise error.Abort(_(b"can't use --local outside a repository"))
2193 paths = [repo.vfs.join(b'hgrc')]
2193 paths = [repo.vfs.join(b'hgrc')]
2194 elif opts.get(b'global'):
2194 elif opts.get(b'global'):
2195 paths = rcutil.systemrcpath()
2195 paths = rcutil.systemrcpath()
2196 else:
2196 else:
2197 paths = rcutil.userrcpath()
2197 paths = rcutil.userrcpath()
2198
2198
2199 for f in paths:
2199 for f in paths:
2200 if os.path.exists(f):
2200 if os.path.exists(f):
2201 break
2201 break
2202 else:
2202 else:
2203 if opts.get(b'global'):
2203 if opts.get(b'global'):
2204 samplehgrc = uimod.samplehgrcs[b'global']
2204 samplehgrc = uimod.samplehgrcs[b'global']
2205 elif opts.get(b'local'):
2205 elif opts.get(b'local'):
2206 samplehgrc = uimod.samplehgrcs[b'local']
2206 samplehgrc = uimod.samplehgrcs[b'local']
2207 else:
2207 else:
2208 samplehgrc = uimod.samplehgrcs[b'user']
2208 samplehgrc = uimod.samplehgrcs[b'user']
2209
2209
2210 f = paths[0]
2210 f = paths[0]
2211 fp = open(f, b"wb")
2211 fp = open(f, b"wb")
2212 fp.write(util.tonativeeol(samplehgrc))
2212 fp.write(util.tonativeeol(samplehgrc))
2213 fp.close()
2213 fp.close()
2214
2214
2215 editor = ui.geteditor()
2215 editor = ui.geteditor()
2216 ui.system(
2216 ui.system(
2217 b"%s \"%s\"" % (editor, f),
2217 b"%s \"%s\"" % (editor, f),
2218 onerr=error.Abort,
2218 onerr=error.Abort,
2219 errprefix=_(b"edit failed"),
2219 errprefix=_(b"edit failed"),
2220 blockedtag=b'config_edit',
2220 blockedtag=b'config_edit',
2221 )
2221 )
2222 return
2222 return
2223 ui.pager(b'config')
2223 ui.pager(b'config')
2224 fm = ui.formatter(b'config', opts)
2224 fm = ui.formatter(b'config', opts)
2225 for t, f in rcutil.rccomponents():
2225 for t, f in rcutil.rccomponents():
2226 if t == b'path':
2226 if t == b'path':
2227 ui.debug(b'read config from: %s\n' % f)
2227 ui.debug(b'read config from: %s\n' % f)
2228 elif t == b'resource':
2228 elif t == b'resource':
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2229 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 elif t == b'items':
2230 elif t == b'items':
2231 # Don't print anything for 'items'.
2231 # Don't print anything for 'items'.
2232 pass
2232 pass
2233 else:
2233 else:
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2234 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 untrusted = bool(opts.get(b'untrusted'))
2235 untrusted = bool(opts.get(b'untrusted'))
2236
2236
2237 selsections = selentries = []
2237 selsections = selentries = []
2238 if values:
2238 if values:
2239 selsections = [v for v in values if b'.' not in v]
2239 selsections = [v for v in values if b'.' not in v]
2240 selentries = [v for v in values if b'.' in v]
2240 selentries = [v for v in values if b'.' in v]
2241 uniquesel = len(selentries) == 1 and not selsections
2241 uniquesel = len(selentries) == 1 and not selsections
2242 selsections = set(selsections)
2242 selsections = set(selsections)
2243 selentries = set(selentries)
2243 selentries = set(selentries)
2244
2244
2245 matched = False
2245 matched = False
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2246 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 source = ui.configsource(section, name, untrusted)
2247 source = ui.configsource(section, name, untrusted)
2248 value = pycompat.bytestr(value)
2248 value = pycompat.bytestr(value)
2249 defaultvalue = ui.configdefault(section, name)
2249 defaultvalue = ui.configdefault(section, name)
2250 if fm.isplain():
2250 if fm.isplain():
2251 source = source or b'none'
2251 source = source or b'none'
2252 value = value.replace(b'\n', b'\\n')
2252 value = value.replace(b'\n', b'\\n')
2253 entryname = section + b'.' + name
2253 entryname = section + b'.' + name
2254 if values and not (section in selsections or entryname in selentries):
2254 if values and not (section in selsections or entryname in selentries):
2255 continue
2255 continue
2256 fm.startitem()
2256 fm.startitem()
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2257 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 if uniquesel:
2258 if uniquesel:
2259 fm.data(name=entryname)
2259 fm.data(name=entryname)
2260 fm.write(b'value', b'%s\n', value)
2260 fm.write(b'value', b'%s\n', value)
2261 else:
2261 else:
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2262 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 if formatter.isprintable(defaultvalue):
2263 if formatter.isprintable(defaultvalue):
2264 fm.data(defaultvalue=defaultvalue)
2264 fm.data(defaultvalue=defaultvalue)
2265 elif isinstance(defaultvalue, list) and all(
2265 elif isinstance(defaultvalue, list) and all(
2266 formatter.isprintable(e) for e in defaultvalue
2266 formatter.isprintable(e) for e in defaultvalue
2267 ):
2267 ):
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2268 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 # TODO: no idea how to process unsupported defaultvalue types
2269 # TODO: no idea how to process unsupported defaultvalue types
2270 matched = True
2270 matched = True
2271 fm.end()
2271 fm.end()
2272 if matched:
2272 if matched:
2273 return 0
2273 return 0
2274 return 1
2274 return 1
2275
2275
2276
2276
2277 @command(
2277 @command(
2278 b'continue',
2278 b'continue',
2279 dryrunopts,
2279 dryrunopts,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2280 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 helpbasic=True,
2281 helpbasic=True,
2282 )
2282 )
2283 def continuecmd(ui, repo, **opts):
2283 def continuecmd(ui, repo, **opts):
2284 """resumes an interrupted operation (EXPERIMENTAL)
2284 """resumes an interrupted operation (EXPERIMENTAL)
2285
2285
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2286 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 and unshelve if they are in an interrupted state.
2287 and unshelve if they are in an interrupted state.
2288
2288
2289 use --dry-run/-n to dry run the command.
2289 use --dry-run/-n to dry run the command.
2290 """
2290 """
2291 dryrun = opts.get('dry_run')
2291 dryrun = opts.get('dry_run')
2292 contstate = cmdutil.getunfinishedstate(repo)
2292 contstate = cmdutil.getunfinishedstate(repo)
2293 if not contstate:
2293 if not contstate:
2294 raise error.Abort(_(b'no operation in progress'))
2294 raise error.Abort(_(b'no operation in progress'))
2295 if not contstate.continuefunc:
2295 if not contstate.continuefunc:
2296 raise error.Abort(
2296 raise error.Abort(
2297 (
2297 (
2298 _(b"%s in progress but does not support 'hg continue'")
2298 _(b"%s in progress but does not support 'hg continue'")
2299 % (contstate._opname)
2299 % (contstate._opname)
2300 ),
2300 ),
2301 hint=contstate.continuemsg(),
2301 hint=contstate.continuemsg(),
2302 )
2302 )
2303 if dryrun:
2303 if dryrun:
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2304 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 return
2305 return
2306 return contstate.continuefunc(ui, repo)
2306 return contstate.continuefunc(ui, repo)
2307
2307
2308
2308
2309 @command(
2309 @command(
2310 b'copy|cp',
2310 b'copy|cp',
2311 [
2311 [
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2314 (
2314 (
2315 b'',
2315 b'',
2316 b'at-rev',
2316 b'at-rev',
2317 b'',
2317 b'',
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2318 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2319 _(b'REV'),
2319 _(b'REV'),
2320 ),
2320 ),
2321 (
2321 (
2322 b'f',
2322 b'f',
2323 b'force',
2323 b'force',
2324 None,
2324 None,
2325 _(b'forcibly copy over an existing managed file'),
2325 _(b'forcibly copy over an existing managed file'),
2326 ),
2326 ),
2327 ]
2327 ]
2328 + walkopts
2328 + walkopts
2329 + dryrunopts,
2329 + dryrunopts,
2330 _(b'[OPTION]... SOURCE... DEST'),
2330 _(b'[OPTION]... SOURCE... DEST'),
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2331 helpcategory=command.CATEGORY_FILE_CONTENTS,
2332 )
2332 )
2333 def copy(ui, repo, *pats, **opts):
2333 def copy(ui, repo, *pats, **opts):
2334 """mark files as copied for the next commit
2334 """mark files as copied for the next commit
2335
2335
2336 Mark dest as having copies of source files. If dest is a
2336 Mark dest as having copies of source files. If dest is a
2337 directory, copies are put in that directory. If dest is a file,
2337 directory, copies are put in that directory. If dest is a file,
2338 the source must be a single file.
2338 the source must be a single file.
2339
2339
2340 By default, this command copies the contents of files as they
2340 By default, this command copies the contents of files as they
2341 exist in the working directory. If invoked with -A/--after, the
2341 exist in the working directory. If invoked with -A/--after, the
2342 operation is recorded, but no copying is performed.
2342 operation is recorded, but no copying is performed.
2343
2343
2344 To undo marking a file as copied, use --forget. With that option,
2344 To undo marking a file as copied, use --forget. With that option,
2345 all given (positional) arguments are unmarked as copies. The destination
2345 all given (positional) arguments are unmarked as copies. The destination
2346 file(s) will be left in place (still tracked).
2346 file(s) will be left in place (still tracked).
2347
2347
2348 This command takes effect with the next commit by default.
2348 This command takes effect with the next commit by default.
2349
2349
2350 Returns 0 on success, 1 if errors are encountered.
2350 Returns 0 on success, 1 if errors are encountered.
2351 """
2351 """
2352 opts = pycompat.byteskwargs(opts)
2352 opts = pycompat.byteskwargs(opts)
2353 with repo.wlock(False):
2353 with repo.wlock(False):
2354 return cmdutil.copy(ui, repo, pats, opts)
2354 return cmdutil.copy(ui, repo, pats, opts)
2355
2355
2356
2356
2357 @command(
2357 @command(
2358 b'debugcommands',
2358 b'debugcommands',
2359 [],
2359 [],
2360 _(b'[COMMAND]'),
2360 _(b'[COMMAND]'),
2361 helpcategory=command.CATEGORY_HELP,
2361 helpcategory=command.CATEGORY_HELP,
2362 norepo=True,
2362 norepo=True,
2363 )
2363 )
2364 def debugcommands(ui, cmd=b'', *args):
2364 def debugcommands(ui, cmd=b'', *args):
2365 """list all available commands and options"""
2365 """list all available commands and options"""
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2366 for cmd, vals in sorted(pycompat.iteritems(table)):
2367 cmd = cmd.split(b'|')[0]
2367 cmd = cmd.split(b'|')[0]
2368 opts = b', '.join([i[1] for i in vals[1]])
2368 opts = b', '.join([i[1] for i in vals[1]])
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2369 ui.write(b'%s: %s\n' % (cmd, opts))
2370
2370
2371
2371
2372 @command(
2372 @command(
2373 b'debugcomplete',
2373 b'debugcomplete',
2374 [(b'o', b'options', None, _(b'show the command options'))],
2374 [(b'o', b'options', None, _(b'show the command options'))],
2375 _(b'[-o] CMD'),
2375 _(b'[-o] CMD'),
2376 helpcategory=command.CATEGORY_HELP,
2376 helpcategory=command.CATEGORY_HELP,
2377 norepo=True,
2377 norepo=True,
2378 )
2378 )
2379 def debugcomplete(ui, cmd=b'', **opts):
2379 def debugcomplete(ui, cmd=b'', **opts):
2380 """returns the completion list associated with the given command"""
2380 """returns the completion list associated with the given command"""
2381
2381
2382 if opts.get('options'):
2382 if opts.get('options'):
2383 options = []
2383 options = []
2384 otables = [globalopts]
2384 otables = [globalopts]
2385 if cmd:
2385 if cmd:
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2386 aliases, entry = cmdutil.findcmd(cmd, table, False)
2387 otables.append(entry[1])
2387 otables.append(entry[1])
2388 for t in otables:
2388 for t in otables:
2389 for o in t:
2389 for o in t:
2390 if b"(DEPRECATED)" in o[3]:
2390 if b"(DEPRECATED)" in o[3]:
2391 continue
2391 continue
2392 if o[0]:
2392 if o[0]:
2393 options.append(b'-%s' % o[0])
2393 options.append(b'-%s' % o[0])
2394 options.append(b'--%s' % o[1])
2394 options.append(b'--%s' % o[1])
2395 ui.write(b"%s\n" % b"\n".join(options))
2395 ui.write(b"%s\n" % b"\n".join(options))
2396 return
2396 return
2397
2397
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2398 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2399 if ui.verbose:
2399 if ui.verbose:
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2400 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2401 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2402
2402
2403
2403
2404 @command(
2404 @command(
2405 b'diff',
2405 b'diff',
2406 [
2406 [
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2407 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2408 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2409 ]
2409 ]
2410 + diffopts
2410 + diffopts
2411 + diffopts2
2411 + diffopts2
2412 + walkopts
2412 + walkopts
2413 + subrepoopts,
2413 + subrepoopts,
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2414 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2415 helpcategory=command.CATEGORY_FILE_CONTENTS,
2416 helpbasic=True,
2416 helpbasic=True,
2417 inferrepo=True,
2417 inferrepo=True,
2418 intents={INTENT_READONLY},
2418 intents={INTENT_READONLY},
2419 )
2419 )
2420 def diff(ui, repo, *pats, **opts):
2420 def diff(ui, repo, *pats, **opts):
2421 """diff repository (or selected files)
2421 """diff repository (or selected files)
2422
2422
2423 Show differences between revisions for the specified files.
2423 Show differences between revisions for the specified files.
2424
2424
2425 Differences between files are shown using the unified diff format.
2425 Differences between files are shown using the unified diff format.
2426
2426
2427 .. note::
2427 .. note::
2428
2428
2429 :hg:`diff` may generate unexpected results for merges, as it will
2429 :hg:`diff` may generate unexpected results for merges, as it will
2430 default to comparing against the working directory's first
2430 default to comparing against the working directory's first
2431 parent changeset if no revisions are specified.
2431 parent changeset if no revisions are specified.
2432
2432
2433 When two revision arguments are given, then changes are shown
2433 When two revision arguments are given, then changes are shown
2434 between those revisions. If only one revision is specified then
2434 between those revisions. If only one revision is specified then
2435 that revision is compared to the working directory, and, when no
2435 that revision is compared to the working directory, and, when no
2436 revisions are specified, the working directory files are compared
2436 revisions are specified, the working directory files are compared
2437 to its first parent.
2437 to its first parent.
2438
2438
2439 Alternatively you can specify -c/--change with a revision to see
2439 Alternatively you can specify -c/--change with a revision to see
2440 the changes in that changeset relative to its first parent.
2440 the changes in that changeset relative to its first parent.
2441
2441
2442 Without the -a/--text option, diff will avoid generating diffs of
2442 Without the -a/--text option, diff will avoid generating diffs of
2443 files it detects as binary. With -a, diff will generate a diff
2443 files it detects as binary. With -a, diff will generate a diff
2444 anyway, probably with undesirable results.
2444 anyway, probably with undesirable results.
2445
2445
2446 Use the -g/--git option to generate diffs in the git extended diff
2446 Use the -g/--git option to generate diffs in the git extended diff
2447 format. For more information, read :hg:`help diffs`.
2447 format. For more information, read :hg:`help diffs`.
2448
2448
2449 .. container:: verbose
2449 .. container:: verbose
2450
2450
2451 Examples:
2451 Examples:
2452
2452
2453 - compare a file in the current working directory to its parent::
2453 - compare a file in the current working directory to its parent::
2454
2454
2455 hg diff foo.c
2455 hg diff foo.c
2456
2456
2457 - compare two historical versions of a directory, with rename info::
2457 - compare two historical versions of a directory, with rename info::
2458
2458
2459 hg diff --git -r 1.0:1.2 lib/
2459 hg diff --git -r 1.0:1.2 lib/
2460
2460
2461 - get change stats relative to the last change on some date::
2461 - get change stats relative to the last change on some date::
2462
2462
2463 hg diff --stat -r "date('may 2')"
2463 hg diff --stat -r "date('may 2')"
2464
2464
2465 - diff all newly-added files that contain a keyword::
2465 - diff all newly-added files that contain a keyword::
2466
2466
2467 hg diff "set:added() and grep(GNU)"
2467 hg diff "set:added() and grep(GNU)"
2468
2468
2469 - compare a revision and its parents::
2469 - compare a revision and its parents::
2470
2470
2471 hg diff -c 9353 # compare against first parent
2471 hg diff -c 9353 # compare against first parent
2472 hg diff -r 9353^:9353 # same using revset syntax
2472 hg diff -r 9353^:9353 # same using revset syntax
2473 hg diff -r 9353^2:9353 # compare against the second parent
2473 hg diff -r 9353^2:9353 # compare against the second parent
2474
2474
2475 Returns 0 on success.
2475 Returns 0 on success.
2476 """
2476 """
2477
2477
2478 opts = pycompat.byteskwargs(opts)
2478 opts = pycompat.byteskwargs(opts)
2479 revs = opts.get(b'rev')
2479 revs = opts.get(b'rev')
2480 change = opts.get(b'change')
2480 change = opts.get(b'change')
2481 stat = opts.get(b'stat')
2481 stat = opts.get(b'stat')
2482 reverse = opts.get(b'reverse')
2482 reverse = opts.get(b'reverse')
2483
2483
2484 if revs and change:
2484 if revs and change:
2485 msg = _(b'cannot specify --rev and --change at the same time')
2485 msg = _(b'cannot specify --rev and --change at the same time')
2486 raise error.Abort(msg)
2486 raise error.Abort(msg)
2487 elif change:
2487 elif change:
2488 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2488 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2489 ctx2 = scmutil.revsingle(repo, change, None)
2489 ctx2 = scmutil.revsingle(repo, change, None)
2490 ctx1 = ctx2.p1()
2490 ctx1 = ctx2.p1()
2491 else:
2491 else:
2492 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2492 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2493 ctx1, ctx2 = scmutil.revpair(repo, revs)
2493 ctx1, ctx2 = scmutil.revpair(repo, revs)
2494 node1, node2 = ctx1.node(), ctx2.node()
2494 node1, node2 = ctx1.node(), ctx2.node()
2495
2495
2496 if reverse:
2496 if reverse:
2497 node1, node2 = node2, node1
2497 node1, node2 = node2, node1
2498
2498
2499 diffopts = patch.diffallopts(ui, opts)
2499 diffopts = patch.diffallopts(ui, opts)
2500 m = scmutil.match(ctx2, pats, opts)
2500 m = scmutil.match(ctx2, pats, opts)
2501 m = repo.narrowmatch(m)
2501 m = repo.narrowmatch(m)
2502 ui.pager(b'diff')
2502 ui.pager(b'diff')
2503 logcmdutil.diffordiffstat(
2503 logcmdutil.diffordiffstat(
2504 ui,
2504 ui,
2505 repo,
2505 repo,
2506 diffopts,
2506 diffopts,
2507 node1,
2507 node1,
2508 node2,
2508 node2,
2509 m,
2509 m,
2510 stat=stat,
2510 stat=stat,
2511 listsubrepos=opts.get(b'subrepos'),
2511 listsubrepos=opts.get(b'subrepos'),
2512 root=opts.get(b'root'),
2512 root=opts.get(b'root'),
2513 )
2513 )
2514
2514
2515
2515
2516 @command(
2516 @command(
2517 b'export',
2517 b'export',
2518 [
2518 [
2519 (
2519 (
2520 b'B',
2520 b'B',
2521 b'bookmark',
2521 b'bookmark',
2522 b'',
2522 b'',
2523 _(b'export changes only reachable by given bookmark'),
2523 _(b'export changes only reachable by given bookmark'),
2524 _(b'BOOKMARK'),
2524 _(b'BOOKMARK'),
2525 ),
2525 ),
2526 (
2526 (
2527 b'o',
2527 b'o',
2528 b'output',
2528 b'output',
2529 b'',
2529 b'',
2530 _(b'print output to file with formatted name'),
2530 _(b'print output to file with formatted name'),
2531 _(b'FORMAT'),
2531 _(b'FORMAT'),
2532 ),
2532 ),
2533 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2533 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2534 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2534 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2535 ]
2535 ]
2536 + diffopts
2536 + diffopts
2537 + formatteropts,
2537 + formatteropts,
2538 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2538 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2539 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2539 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2540 helpbasic=True,
2540 helpbasic=True,
2541 intents={INTENT_READONLY},
2541 intents={INTENT_READONLY},
2542 )
2542 )
2543 def export(ui, repo, *changesets, **opts):
2543 def export(ui, repo, *changesets, **opts):
2544 """dump the header and diffs for one or more changesets
2544 """dump the header and diffs for one or more changesets
2545
2545
2546 Print the changeset header and diffs for one or more revisions.
2546 Print the changeset header and diffs for one or more revisions.
2547 If no revision is given, the parent of the working directory is used.
2547 If no revision is given, the parent of the working directory is used.
2548
2548
2549 The information shown in the changeset header is: author, date,
2549 The information shown in the changeset header is: author, date,
2550 branch name (if non-default), changeset hash, parent(s) and commit
2550 branch name (if non-default), changeset hash, parent(s) and commit
2551 comment.
2551 comment.
2552
2552
2553 .. note::
2553 .. note::
2554
2554
2555 :hg:`export` may generate unexpected diff output for merge
2555 :hg:`export` may generate unexpected diff output for merge
2556 changesets, as it will compare the merge changeset against its
2556 changesets, as it will compare the merge changeset against its
2557 first parent only.
2557 first parent only.
2558
2558
2559 Output may be to a file, in which case the name of the file is
2559 Output may be to a file, in which case the name of the file is
2560 given using a template string. See :hg:`help templates`. In addition
2560 given using a template string. See :hg:`help templates`. In addition
2561 to the common template keywords, the following formatting rules are
2561 to the common template keywords, the following formatting rules are
2562 supported:
2562 supported:
2563
2563
2564 :``%%``: literal "%" character
2564 :``%%``: literal "%" character
2565 :``%H``: changeset hash (40 hexadecimal digits)
2565 :``%H``: changeset hash (40 hexadecimal digits)
2566 :``%N``: number of patches being generated
2566 :``%N``: number of patches being generated
2567 :``%R``: changeset revision number
2567 :``%R``: changeset revision number
2568 :``%b``: basename of the exporting repository
2568 :``%b``: basename of the exporting repository
2569 :``%h``: short-form changeset hash (12 hexadecimal digits)
2569 :``%h``: short-form changeset hash (12 hexadecimal digits)
2570 :``%m``: first line of the commit message (only alphanumeric characters)
2570 :``%m``: first line of the commit message (only alphanumeric characters)
2571 :``%n``: zero-padded sequence number, starting at 1
2571 :``%n``: zero-padded sequence number, starting at 1
2572 :``%r``: zero-padded changeset revision number
2572 :``%r``: zero-padded changeset revision number
2573 :``\\``: literal "\\" character
2573 :``\\``: literal "\\" character
2574
2574
2575 Without the -a/--text option, export will avoid generating diffs
2575 Without the -a/--text option, export will avoid generating diffs
2576 of files it detects as binary. With -a, export will generate a
2576 of files it detects as binary. With -a, export will generate a
2577 diff anyway, probably with undesirable results.
2577 diff anyway, probably with undesirable results.
2578
2578
2579 With -B/--bookmark changesets reachable by the given bookmark are
2579 With -B/--bookmark changesets reachable by the given bookmark are
2580 selected.
2580 selected.
2581
2581
2582 Use the -g/--git option to generate diffs in the git extended diff
2582 Use the -g/--git option to generate diffs in the git extended diff
2583 format. See :hg:`help diffs` for more information.
2583 format. See :hg:`help diffs` for more information.
2584
2584
2585 With the --switch-parent option, the diff will be against the
2585 With the --switch-parent option, the diff will be against the
2586 second parent. It can be useful to review a merge.
2586 second parent. It can be useful to review a merge.
2587
2587
2588 .. container:: verbose
2588 .. container:: verbose
2589
2589
2590 Template:
2590 Template:
2591
2591
2592 The following keywords are supported in addition to the common template
2592 The following keywords are supported in addition to the common template
2593 keywords and functions. See also :hg:`help templates`.
2593 keywords and functions. See also :hg:`help templates`.
2594
2594
2595 :diff: String. Diff content.
2595 :diff: String. Diff content.
2596 :parents: List of strings. Parent nodes of the changeset.
2596 :parents: List of strings. Parent nodes of the changeset.
2597
2597
2598 Examples:
2598 Examples:
2599
2599
2600 - use export and import to transplant a bugfix to the current
2600 - use export and import to transplant a bugfix to the current
2601 branch::
2601 branch::
2602
2602
2603 hg export -r 9353 | hg import -
2603 hg export -r 9353 | hg import -
2604
2604
2605 - export all the changesets between two revisions to a file with
2605 - export all the changesets between two revisions to a file with
2606 rename information::
2606 rename information::
2607
2607
2608 hg export --git -r 123:150 > changes.txt
2608 hg export --git -r 123:150 > changes.txt
2609
2609
2610 - split outgoing changes into a series of patches with
2610 - split outgoing changes into a series of patches with
2611 descriptive names::
2611 descriptive names::
2612
2612
2613 hg export -r "outgoing()" -o "%n-%m.patch"
2613 hg export -r "outgoing()" -o "%n-%m.patch"
2614
2614
2615 Returns 0 on success.
2615 Returns 0 on success.
2616 """
2616 """
2617 opts = pycompat.byteskwargs(opts)
2617 opts = pycompat.byteskwargs(opts)
2618 bookmark = opts.get(b'bookmark')
2618 bookmark = opts.get(b'bookmark')
2619 changesets += tuple(opts.get(b'rev', []))
2619 changesets += tuple(opts.get(b'rev', []))
2620
2620
2621 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2621 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2622
2622
2623 if bookmark:
2623 if bookmark:
2624 if bookmark not in repo._bookmarks:
2624 if bookmark not in repo._bookmarks:
2625 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2625 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2626
2626
2627 revs = scmutil.bookmarkrevs(repo, bookmark)
2627 revs = scmutil.bookmarkrevs(repo, bookmark)
2628 else:
2628 else:
2629 if not changesets:
2629 if not changesets:
2630 changesets = [b'.']
2630 changesets = [b'.']
2631
2631
2632 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2632 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2633 revs = scmutil.revrange(repo, changesets)
2633 revs = scmutil.revrange(repo, changesets)
2634
2634
2635 if not revs:
2635 if not revs:
2636 raise error.Abort(_(b"export requires at least one changeset"))
2636 raise error.Abort(_(b"export requires at least one changeset"))
2637 if len(revs) > 1:
2637 if len(revs) > 1:
2638 ui.note(_(b'exporting patches:\n'))
2638 ui.note(_(b'exporting patches:\n'))
2639 else:
2639 else:
2640 ui.note(_(b'exporting patch:\n'))
2640 ui.note(_(b'exporting patch:\n'))
2641
2641
2642 fntemplate = opts.get(b'output')
2642 fntemplate = opts.get(b'output')
2643 if cmdutil.isstdiofilename(fntemplate):
2643 if cmdutil.isstdiofilename(fntemplate):
2644 fntemplate = b''
2644 fntemplate = b''
2645
2645
2646 if fntemplate:
2646 if fntemplate:
2647 fm = formatter.nullformatter(ui, b'export', opts)
2647 fm = formatter.nullformatter(ui, b'export', opts)
2648 else:
2648 else:
2649 ui.pager(b'export')
2649 ui.pager(b'export')
2650 fm = ui.formatter(b'export', opts)
2650 fm = ui.formatter(b'export', opts)
2651 with fm:
2651 with fm:
2652 cmdutil.export(
2652 cmdutil.export(
2653 repo,
2653 repo,
2654 revs,
2654 revs,
2655 fm,
2655 fm,
2656 fntemplate=fntemplate,
2656 fntemplate=fntemplate,
2657 switch_parent=opts.get(b'switch_parent'),
2657 switch_parent=opts.get(b'switch_parent'),
2658 opts=patch.diffallopts(ui, opts),
2658 opts=patch.diffallopts(ui, opts),
2659 )
2659 )
2660
2660
2661
2661
2662 @command(
2662 @command(
2663 b'files',
2663 b'files',
2664 [
2664 [
2665 (
2665 (
2666 b'r',
2666 b'r',
2667 b'rev',
2667 b'rev',
2668 b'',
2668 b'',
2669 _(b'search the repository as it is in REV'),
2669 _(b'search the repository as it is in REV'),
2670 _(b'REV'),
2670 _(b'REV'),
2671 ),
2671 ),
2672 (
2672 (
2673 b'0',
2673 b'0',
2674 b'print0',
2674 b'print0',
2675 None,
2675 None,
2676 _(b'end filenames with NUL, for use with xargs'),
2676 _(b'end filenames with NUL, for use with xargs'),
2677 ),
2677 ),
2678 ]
2678 ]
2679 + walkopts
2679 + walkopts
2680 + formatteropts
2680 + formatteropts
2681 + subrepoopts,
2681 + subrepoopts,
2682 _(b'[OPTION]... [FILE]...'),
2682 _(b'[OPTION]... [FILE]...'),
2683 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2683 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2684 intents={INTENT_READONLY},
2684 intents={INTENT_READONLY},
2685 )
2685 )
2686 def files(ui, repo, *pats, **opts):
2686 def files(ui, repo, *pats, **opts):
2687 """list tracked files
2687 """list tracked files
2688
2688
2689 Print files under Mercurial control in the working directory or
2689 Print files under Mercurial control in the working directory or
2690 specified revision for given files (excluding removed files).
2690 specified revision for given files (excluding removed files).
2691 Files can be specified as filenames or filesets.
2691 Files can be specified as filenames or filesets.
2692
2692
2693 If no files are given to match, this command prints the names
2693 If no files are given to match, this command prints the names
2694 of all files under Mercurial control.
2694 of all files under Mercurial control.
2695
2695
2696 .. container:: verbose
2696 .. container:: verbose
2697
2697
2698 Template:
2698 Template:
2699
2699
2700 The following keywords are supported in addition to the common template
2700 The following keywords are supported in addition to the common template
2701 keywords and functions. See also :hg:`help templates`.
2701 keywords and functions. See also :hg:`help templates`.
2702
2702
2703 :flags: String. Character denoting file's symlink and executable bits.
2703 :flags: String. Character denoting file's symlink and executable bits.
2704 :path: String. Repository-absolute path of the file.
2704 :path: String. Repository-absolute path of the file.
2705 :size: Integer. Size of the file in bytes.
2705 :size: Integer. Size of the file in bytes.
2706
2706
2707 Examples:
2707 Examples:
2708
2708
2709 - list all files under the current directory::
2709 - list all files under the current directory::
2710
2710
2711 hg files .
2711 hg files .
2712
2712
2713 - shows sizes and flags for current revision::
2713 - shows sizes and flags for current revision::
2714
2714
2715 hg files -vr .
2715 hg files -vr .
2716
2716
2717 - list all files named README::
2717 - list all files named README::
2718
2718
2719 hg files -I "**/README"
2719 hg files -I "**/README"
2720
2720
2721 - list all binary files::
2721 - list all binary files::
2722
2722
2723 hg files "set:binary()"
2723 hg files "set:binary()"
2724
2724
2725 - find files containing a regular expression::
2725 - find files containing a regular expression::
2726
2726
2727 hg files "set:grep('bob')"
2727 hg files "set:grep('bob')"
2728
2728
2729 - search tracked file contents with xargs and grep::
2729 - search tracked file contents with xargs and grep::
2730
2730
2731 hg files -0 | xargs -0 grep foo
2731 hg files -0 | xargs -0 grep foo
2732
2732
2733 See :hg:`help patterns` and :hg:`help filesets` for more information
2733 See :hg:`help patterns` and :hg:`help filesets` for more information
2734 on specifying file patterns.
2734 on specifying file patterns.
2735
2735
2736 Returns 0 if a match is found, 1 otherwise.
2736 Returns 0 if a match is found, 1 otherwise.
2737
2737
2738 """
2738 """
2739
2739
2740 opts = pycompat.byteskwargs(opts)
2740 opts = pycompat.byteskwargs(opts)
2741 rev = opts.get(b'rev')
2741 rev = opts.get(b'rev')
2742 if rev:
2742 if rev:
2743 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2743 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2744 ctx = scmutil.revsingle(repo, rev, None)
2744 ctx = scmutil.revsingle(repo, rev, None)
2745
2745
2746 end = b'\n'
2746 end = b'\n'
2747 if opts.get(b'print0'):
2747 if opts.get(b'print0'):
2748 end = b'\0'
2748 end = b'\0'
2749 fmt = b'%s' + end
2749 fmt = b'%s' + end
2750
2750
2751 m = scmutil.match(ctx, pats, opts)
2751 m = scmutil.match(ctx, pats, opts)
2752 ui.pager(b'files')
2752 ui.pager(b'files')
2753 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2753 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2754 with ui.formatter(b'files', opts) as fm:
2754 with ui.formatter(b'files', opts) as fm:
2755 return cmdutil.files(
2755 return cmdutil.files(
2756 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2756 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2757 )
2757 )
2758
2758
2759
2759
2760 @command(
2760 @command(
2761 b'forget',
2761 b'forget',
2762 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2762 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2763 + walkopts
2763 + walkopts
2764 + dryrunopts,
2764 + dryrunopts,
2765 _(b'[OPTION]... FILE...'),
2765 _(b'[OPTION]... FILE...'),
2766 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2766 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2767 helpbasic=True,
2767 helpbasic=True,
2768 inferrepo=True,
2768 inferrepo=True,
2769 )
2769 )
2770 def forget(ui, repo, *pats, **opts):
2770 def forget(ui, repo, *pats, **opts):
2771 """forget the specified files on the next commit
2771 """forget the specified files on the next commit
2772
2772
2773 Mark the specified files so they will no longer be tracked
2773 Mark the specified files so they will no longer be tracked
2774 after the next commit.
2774 after the next commit.
2775
2775
2776 This only removes files from the current branch, not from the
2776 This only removes files from the current branch, not from the
2777 entire project history, and it does not delete them from the
2777 entire project history, and it does not delete them from the
2778 working directory.
2778 working directory.
2779
2779
2780 To delete the file from the working directory, see :hg:`remove`.
2780 To delete the file from the working directory, see :hg:`remove`.
2781
2781
2782 To undo a forget before the next commit, see :hg:`add`.
2782 To undo a forget before the next commit, see :hg:`add`.
2783
2783
2784 .. container:: verbose
2784 .. container:: verbose
2785
2785
2786 Examples:
2786 Examples:
2787
2787
2788 - forget newly-added binary files::
2788 - forget newly-added binary files::
2789
2789
2790 hg forget "set:added() and binary()"
2790 hg forget "set:added() and binary()"
2791
2791
2792 - forget files that would be excluded by .hgignore::
2792 - forget files that would be excluded by .hgignore::
2793
2793
2794 hg forget "set:hgignore()"
2794 hg forget "set:hgignore()"
2795
2795
2796 Returns 0 on success.
2796 Returns 0 on success.
2797 """
2797 """
2798
2798
2799 opts = pycompat.byteskwargs(opts)
2799 opts = pycompat.byteskwargs(opts)
2800 if not pats:
2800 if not pats:
2801 raise error.Abort(_(b'no files specified'))
2801 raise error.Abort(_(b'no files specified'))
2802
2802
2803 m = scmutil.match(repo[None], pats, opts)
2803 m = scmutil.match(repo[None], pats, opts)
2804 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2804 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2805 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2805 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2806 rejected = cmdutil.forget(
2806 rejected = cmdutil.forget(
2807 ui,
2807 ui,
2808 repo,
2808 repo,
2809 m,
2809 m,
2810 prefix=b"",
2810 prefix=b"",
2811 uipathfn=uipathfn,
2811 uipathfn=uipathfn,
2812 explicitonly=False,
2812 explicitonly=False,
2813 dryrun=dryrun,
2813 dryrun=dryrun,
2814 interactive=interactive,
2814 interactive=interactive,
2815 )[0]
2815 )[0]
2816 return rejected and 1 or 0
2816 return rejected and 1 or 0
2817
2817
2818
2818
2819 @command(
2819 @command(
2820 b'graft',
2820 b'graft',
2821 [
2821 [
2822 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2822 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2823 (
2823 (
2824 b'',
2824 b'',
2825 b'base',
2825 b'base',
2826 b'',
2826 b'',
2827 _(b'base revision when doing the graft merge (ADVANCED)'),
2827 _(b'base revision when doing the graft merge (ADVANCED)'),
2828 _(b'REV'),
2828 _(b'REV'),
2829 ),
2829 ),
2830 (b'c', b'continue', False, _(b'resume interrupted graft')),
2830 (b'c', b'continue', False, _(b'resume interrupted graft')),
2831 (b'', b'stop', False, _(b'stop interrupted graft')),
2831 (b'', b'stop', False, _(b'stop interrupted graft')),
2832 (b'', b'abort', False, _(b'abort interrupted graft')),
2832 (b'', b'abort', False, _(b'abort interrupted graft')),
2833 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2833 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2834 (b'', b'log', None, _(b'append graft info to log message')),
2834 (b'', b'log', None, _(b'append graft info to log message')),
2835 (
2835 (
2836 b'',
2836 b'',
2837 b'no-commit',
2837 b'no-commit',
2838 None,
2838 None,
2839 _(b"don't commit, just apply the changes in working directory"),
2839 _(b"don't commit, just apply the changes in working directory"),
2840 ),
2840 ),
2841 (b'f', b'force', False, _(b'force graft')),
2841 (b'f', b'force', False, _(b'force graft')),
2842 (
2842 (
2843 b'D',
2843 b'D',
2844 b'currentdate',
2844 b'currentdate',
2845 False,
2845 False,
2846 _(b'record the current date as commit date'),
2846 _(b'record the current date as commit date'),
2847 ),
2847 ),
2848 (
2848 (
2849 b'U',
2849 b'U',
2850 b'currentuser',
2850 b'currentuser',
2851 False,
2851 False,
2852 _(b'record the current user as committer'),
2852 _(b'record the current user as committer'),
2853 ),
2853 ),
2854 ]
2854 ]
2855 + commitopts2
2855 + commitopts2
2856 + mergetoolopts
2856 + mergetoolopts
2857 + dryrunopts,
2857 + dryrunopts,
2858 _(b'[OPTION]... [-r REV]... REV...'),
2858 _(b'[OPTION]... [-r REV]... REV...'),
2859 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2859 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2860 )
2860 )
2861 def graft(ui, repo, *revs, **opts):
2861 def graft(ui, repo, *revs, **opts):
2862 '''copy changes from other branches onto the current branch
2862 '''copy changes from other branches onto the current branch
2863
2863
2864 This command uses Mercurial's merge logic to copy individual
2864 This command uses Mercurial's merge logic to copy individual
2865 changes from other branches without merging branches in the
2865 changes from other branches without merging branches in the
2866 history graph. This is sometimes known as 'backporting' or
2866 history graph. This is sometimes known as 'backporting' or
2867 'cherry-picking'. By default, graft will copy user, date, and
2867 'cherry-picking'. By default, graft will copy user, date, and
2868 description from the source changesets.
2868 description from the source changesets.
2869
2869
2870 Changesets that are ancestors of the current revision, that have
2870 Changesets that are ancestors of the current revision, that have
2871 already been grafted, or that are merges will be skipped.
2871 already been grafted, or that are merges will be skipped.
2872
2872
2873 If --log is specified, log messages will have a comment appended
2873 If --log is specified, log messages will have a comment appended
2874 of the form::
2874 of the form::
2875
2875
2876 (grafted from CHANGESETHASH)
2876 (grafted from CHANGESETHASH)
2877
2877
2878 If --force is specified, revisions will be grafted even if they
2878 If --force is specified, revisions will be grafted even if they
2879 are already ancestors of, or have been grafted to, the destination.
2879 are already ancestors of, or have been grafted to, the destination.
2880 This is useful when the revisions have since been backed out.
2880 This is useful when the revisions have since been backed out.
2881
2881
2882 If a graft merge results in conflicts, the graft process is
2882 If a graft merge results in conflicts, the graft process is
2883 interrupted so that the current merge can be manually resolved.
2883 interrupted so that the current merge can be manually resolved.
2884 Once all conflicts are addressed, the graft process can be
2884 Once all conflicts are addressed, the graft process can be
2885 continued with the -c/--continue option.
2885 continued with the -c/--continue option.
2886
2886
2887 The -c/--continue option reapplies all the earlier options.
2887 The -c/--continue option reapplies all the earlier options.
2888
2888
2889 .. container:: verbose
2889 .. container:: verbose
2890
2890
2891 The --base option exposes more of how graft internally uses merge with a
2891 The --base option exposes more of how graft internally uses merge with a
2892 custom base revision. --base can be used to specify another ancestor than
2892 custom base revision. --base can be used to specify another ancestor than
2893 the first and only parent.
2893 the first and only parent.
2894
2894
2895 The command::
2895 The command::
2896
2896
2897 hg graft -r 345 --base 234
2897 hg graft -r 345 --base 234
2898
2898
2899 is thus pretty much the same as::
2899 is thus pretty much the same as::
2900
2900
2901 hg diff -r 234 -r 345 | hg import
2901 hg diff -r 234 -r 345 | hg import
2902
2902
2903 but using merge to resolve conflicts and track moved files.
2903 but using merge to resolve conflicts and track moved files.
2904
2904
2905 The result of a merge can thus be backported as a single commit by
2905 The result of a merge can thus be backported as a single commit by
2906 specifying one of the merge parents as base, and thus effectively
2906 specifying one of the merge parents as base, and thus effectively
2907 grafting the changes from the other side.
2907 grafting the changes from the other side.
2908
2908
2909 It is also possible to collapse multiple changesets and clean up history
2909 It is also possible to collapse multiple changesets and clean up history
2910 by specifying another ancestor as base, much like rebase --collapse
2910 by specifying another ancestor as base, much like rebase --collapse
2911 --keep.
2911 --keep.
2912
2912
2913 The commit message can be tweaked after the fact using commit --amend .
2913 The commit message can be tweaked after the fact using commit --amend .
2914
2914
2915 For using non-ancestors as the base to backout changes, see the backout
2915 For using non-ancestors as the base to backout changes, see the backout
2916 command and the hidden --parent option.
2916 command and the hidden --parent option.
2917
2917
2918 .. container:: verbose
2918 .. container:: verbose
2919
2919
2920 Examples:
2920 Examples:
2921
2921
2922 - copy a single change to the stable branch and edit its description::
2922 - copy a single change to the stable branch and edit its description::
2923
2923
2924 hg update stable
2924 hg update stable
2925 hg graft --edit 9393
2925 hg graft --edit 9393
2926
2926
2927 - graft a range of changesets with one exception, updating dates::
2927 - graft a range of changesets with one exception, updating dates::
2928
2928
2929 hg graft -D "2085::2093 and not 2091"
2929 hg graft -D "2085::2093 and not 2091"
2930
2930
2931 - continue a graft after resolving conflicts::
2931 - continue a graft after resolving conflicts::
2932
2932
2933 hg graft -c
2933 hg graft -c
2934
2934
2935 - show the source of a grafted changeset::
2935 - show the source of a grafted changeset::
2936
2936
2937 hg log --debug -r .
2937 hg log --debug -r .
2938
2938
2939 - show revisions sorted by date::
2939 - show revisions sorted by date::
2940
2940
2941 hg log -r "sort(all(), date)"
2941 hg log -r "sort(all(), date)"
2942
2942
2943 - backport the result of a merge as a single commit::
2943 - backport the result of a merge as a single commit::
2944
2944
2945 hg graft -r 123 --base 123^
2945 hg graft -r 123 --base 123^
2946
2946
2947 - land a feature branch as one changeset::
2947 - land a feature branch as one changeset::
2948
2948
2949 hg up -cr default
2949 hg up -cr default
2950 hg graft -r featureX --base "ancestor('featureX', 'default')"
2950 hg graft -r featureX --base "ancestor('featureX', 'default')"
2951
2951
2952 See :hg:`help revisions` for more about specifying revisions.
2952 See :hg:`help revisions` for more about specifying revisions.
2953
2953
2954 Returns 0 on successful completion.
2954 Returns 0 on successful completion.
2955 '''
2955 '''
2956 with repo.wlock():
2956 with repo.wlock():
2957 return _dograft(ui, repo, *revs, **opts)
2957 return _dograft(ui, repo, *revs, **opts)
2958
2958
2959
2959
2960 def _dograft(ui, repo, *revs, **opts):
2960 def _dograft(ui, repo, *revs, **opts):
2961 opts = pycompat.byteskwargs(opts)
2961 opts = pycompat.byteskwargs(opts)
2962 if revs and opts.get(b'rev'):
2962 if revs and opts.get(b'rev'):
2963 ui.warn(
2963 ui.warn(
2964 _(
2964 _(
2965 b'warning: inconsistent use of --rev might give unexpected '
2965 b'warning: inconsistent use of --rev might give unexpected '
2966 b'revision ordering!\n'
2966 b'revision ordering!\n'
2967 )
2967 )
2968 )
2968 )
2969
2969
2970 revs = list(revs)
2970 revs = list(revs)
2971 revs.extend(opts.get(b'rev'))
2971 revs.extend(opts.get(b'rev'))
2972 basectx = None
2972 basectx = None
2973 if opts.get(b'base'):
2973 if opts.get(b'base'):
2974 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2974 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2975 # a dict of data to be stored in state file
2975 # a dict of data to be stored in state file
2976 statedata = {}
2976 statedata = {}
2977 # list of new nodes created by ongoing graft
2977 # list of new nodes created by ongoing graft
2978 statedata[b'newnodes'] = []
2978 statedata[b'newnodes'] = []
2979
2979
2980 cmdutil.resolvecommitoptions(ui, opts)
2980 cmdutil.resolvecommitoptions(ui, opts)
2981
2981
2982 editor = cmdutil.getcommiteditor(
2982 editor = cmdutil.getcommiteditor(
2983 editform=b'graft', **pycompat.strkwargs(opts)
2983 editform=b'graft', **pycompat.strkwargs(opts)
2984 )
2984 )
2985
2985
2986 cont = False
2986 cont = False
2987 if opts.get(b'no_commit'):
2987 if opts.get(b'no_commit'):
2988 if opts.get(b'edit'):
2988 if opts.get(b'edit'):
2989 raise error.Abort(
2989 raise error.Abort(
2990 _(b"cannot specify --no-commit and --edit together")
2990 _(b"cannot specify --no-commit and --edit together")
2991 )
2991 )
2992 if opts.get(b'currentuser'):
2992 if opts.get(b'currentuser'):
2993 raise error.Abort(
2993 raise error.Abort(
2994 _(b"cannot specify --no-commit and --currentuser together")
2994 _(b"cannot specify --no-commit and --currentuser together")
2995 )
2995 )
2996 if opts.get(b'currentdate'):
2996 if opts.get(b'currentdate'):
2997 raise error.Abort(
2997 raise error.Abort(
2998 _(b"cannot specify --no-commit and --currentdate together")
2998 _(b"cannot specify --no-commit and --currentdate together")
2999 )
2999 )
3000 if opts.get(b'log'):
3000 if opts.get(b'log'):
3001 raise error.Abort(
3001 raise error.Abort(
3002 _(b"cannot specify --no-commit and --log together")
3002 _(b"cannot specify --no-commit and --log together")
3003 )
3003 )
3004
3004
3005 graftstate = statemod.cmdstate(repo, b'graftstate')
3005 graftstate = statemod.cmdstate(repo, b'graftstate')
3006
3006
3007 if opts.get(b'stop'):
3007 if opts.get(b'stop'):
3008 if opts.get(b'continue'):
3008 if opts.get(b'continue'):
3009 raise error.Abort(
3009 raise error.Abort(
3010 _(b"cannot use '--continue' and '--stop' together")
3010 _(b"cannot use '--continue' and '--stop' together")
3011 )
3011 )
3012 if opts.get(b'abort'):
3012 if opts.get(b'abort'):
3013 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3013 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3014
3014
3015 if any(
3015 if any(
3016 (
3016 (
3017 opts.get(b'edit'),
3017 opts.get(b'edit'),
3018 opts.get(b'log'),
3018 opts.get(b'log'),
3019 opts.get(b'user'),
3019 opts.get(b'user'),
3020 opts.get(b'date'),
3020 opts.get(b'date'),
3021 opts.get(b'currentdate'),
3021 opts.get(b'currentdate'),
3022 opts.get(b'currentuser'),
3022 opts.get(b'currentuser'),
3023 opts.get(b'rev'),
3023 opts.get(b'rev'),
3024 )
3024 )
3025 ):
3025 ):
3026 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3026 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3027 return _stopgraft(ui, repo, graftstate)
3027 return _stopgraft(ui, repo, graftstate)
3028 elif opts.get(b'abort'):
3028 elif opts.get(b'abort'):
3029 if opts.get(b'continue'):
3029 if opts.get(b'continue'):
3030 raise error.Abort(
3030 raise error.Abort(
3031 _(b"cannot use '--continue' and '--abort' together")
3031 _(b"cannot use '--continue' and '--abort' together")
3032 )
3032 )
3033 if any(
3033 if any(
3034 (
3034 (
3035 opts.get(b'edit'),
3035 opts.get(b'edit'),
3036 opts.get(b'log'),
3036 opts.get(b'log'),
3037 opts.get(b'user'),
3037 opts.get(b'user'),
3038 opts.get(b'date'),
3038 opts.get(b'date'),
3039 opts.get(b'currentdate'),
3039 opts.get(b'currentdate'),
3040 opts.get(b'currentuser'),
3040 opts.get(b'currentuser'),
3041 opts.get(b'rev'),
3041 opts.get(b'rev'),
3042 )
3042 )
3043 ):
3043 ):
3044 raise error.Abort(
3044 raise error.Abort(
3045 _(b"cannot specify any other flag with '--abort'")
3045 _(b"cannot specify any other flag with '--abort'")
3046 )
3046 )
3047
3047
3048 return cmdutil.abortgraft(ui, repo, graftstate)
3048 return cmdutil.abortgraft(ui, repo, graftstate)
3049 elif opts.get(b'continue'):
3049 elif opts.get(b'continue'):
3050 cont = True
3050 cont = True
3051 if revs:
3051 if revs:
3052 raise error.Abort(_(b"can't specify --continue and revisions"))
3052 raise error.Abort(_(b"can't specify --continue and revisions"))
3053 # read in unfinished revisions
3053 # read in unfinished revisions
3054 if graftstate.exists():
3054 if graftstate.exists():
3055 statedata = cmdutil.readgraftstate(repo, graftstate)
3055 statedata = cmdutil.readgraftstate(repo, graftstate)
3056 if statedata.get(b'date'):
3056 if statedata.get(b'date'):
3057 opts[b'date'] = statedata[b'date']
3057 opts[b'date'] = statedata[b'date']
3058 if statedata.get(b'user'):
3058 if statedata.get(b'user'):
3059 opts[b'user'] = statedata[b'user']
3059 opts[b'user'] = statedata[b'user']
3060 if statedata.get(b'log'):
3060 if statedata.get(b'log'):
3061 opts[b'log'] = True
3061 opts[b'log'] = True
3062 if statedata.get(b'no_commit'):
3062 if statedata.get(b'no_commit'):
3063 opts[b'no_commit'] = statedata.get(b'no_commit')
3063 opts[b'no_commit'] = statedata.get(b'no_commit')
3064 nodes = statedata[b'nodes']
3064 nodes = statedata[b'nodes']
3065 revs = [repo[node].rev() for node in nodes]
3065 revs = [repo[node].rev() for node in nodes]
3066 else:
3066 else:
3067 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3067 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3068 else:
3068 else:
3069 if not revs:
3069 if not revs:
3070 raise error.Abort(_(b'no revisions specified'))
3070 raise error.Abort(_(b'no revisions specified'))
3071 cmdutil.checkunfinished(repo)
3071 cmdutil.checkunfinished(repo)
3072 cmdutil.bailifchanged(repo)
3072 cmdutil.bailifchanged(repo)
3073 revs = scmutil.revrange(repo, revs)
3073 revs = scmutil.revrange(repo, revs)
3074
3074
3075 skipped = set()
3075 skipped = set()
3076 if basectx is None:
3076 if basectx is None:
3077 # check for merges
3077 # check for merges
3078 for rev in repo.revs(b'%ld and merge()', revs):
3078 for rev in repo.revs(b'%ld and merge()', revs):
3079 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3079 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3080 skipped.add(rev)
3080 skipped.add(rev)
3081 revs = [r for r in revs if r not in skipped]
3081 revs = [r for r in revs if r not in skipped]
3082 if not revs:
3082 if not revs:
3083 return -1
3083 return -1
3084 if basectx is not None and len(revs) != 1:
3084 if basectx is not None and len(revs) != 1:
3085 raise error.Abort(_(b'only one revision allowed with --base '))
3085 raise error.Abort(_(b'only one revision allowed with --base '))
3086
3086
3087 # Don't check in the --continue case, in effect retaining --force across
3087 # Don't check in the --continue case, in effect retaining --force across
3088 # --continues. That's because without --force, any revisions we decided to
3088 # --continues. That's because without --force, any revisions we decided to
3089 # skip would have been filtered out here, so they wouldn't have made their
3089 # skip would have been filtered out here, so they wouldn't have made their
3090 # way to the graftstate. With --force, any revisions we would have otherwise
3090 # way to the graftstate. With --force, any revisions we would have otherwise
3091 # skipped would not have been filtered out, and if they hadn't been applied
3091 # skipped would not have been filtered out, and if they hadn't been applied
3092 # already, they'd have been in the graftstate.
3092 # already, they'd have been in the graftstate.
3093 if not (cont or opts.get(b'force')) and basectx is None:
3093 if not (cont or opts.get(b'force')) and basectx is None:
3094 # check for ancestors of dest branch
3094 # check for ancestors of dest branch
3095 ancestors = repo.revs(b'%ld & (::.)', revs)
3095 ancestors = repo.revs(b'%ld & (::.)', revs)
3096 for rev in ancestors:
3096 for rev in ancestors:
3097 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3097 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3098
3098
3099 revs = [r for r in revs if r not in ancestors]
3099 revs = [r for r in revs if r not in ancestors]
3100
3100
3101 if not revs:
3101 if not revs:
3102 return -1
3102 return -1
3103
3103
3104 # analyze revs for earlier grafts
3104 # analyze revs for earlier grafts
3105 ids = {}
3105 ids = {}
3106 for ctx in repo.set(b"%ld", revs):
3106 for ctx in repo.set(b"%ld", revs):
3107 ids[ctx.hex()] = ctx.rev()
3107 ids[ctx.hex()] = ctx.rev()
3108 n = ctx.extra().get(b'source')
3108 n = ctx.extra().get(b'source')
3109 if n:
3109 if n:
3110 ids[n] = ctx.rev()
3110 ids[n] = ctx.rev()
3111
3111
3112 # check ancestors for earlier grafts
3112 # check ancestors for earlier grafts
3113 ui.debug(b'scanning for duplicate grafts\n')
3113 ui.debug(b'scanning for duplicate grafts\n')
3114
3114
3115 # The only changesets we can be sure doesn't contain grafts of any
3115 # The only changesets we can be sure doesn't contain grafts of any
3116 # revs, are the ones that are common ancestors of *all* revs:
3116 # revs, are the ones that are common ancestors of *all* revs:
3117 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3117 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3118 ctx = repo[rev]
3118 ctx = repo[rev]
3119 n = ctx.extra().get(b'source')
3119 n = ctx.extra().get(b'source')
3120 if n in ids:
3120 if n in ids:
3121 try:
3121 try:
3122 r = repo[n].rev()
3122 r = repo[n].rev()
3123 except error.RepoLookupError:
3123 except error.RepoLookupError:
3124 r = None
3124 r = None
3125 if r in revs:
3125 if r in revs:
3126 ui.warn(
3126 ui.warn(
3127 _(
3127 _(
3128 b'skipping revision %d:%s '
3128 b'skipping revision %d:%s '
3129 b'(already grafted to %d:%s)\n'
3129 b'(already grafted to %d:%s)\n'
3130 )
3130 )
3131 % (r, repo[r], rev, ctx)
3131 % (r, repo[r], rev, ctx)
3132 )
3132 )
3133 revs.remove(r)
3133 revs.remove(r)
3134 elif ids[n] in revs:
3134 elif ids[n] in revs:
3135 if r is None:
3135 if r is None:
3136 ui.warn(
3136 ui.warn(
3137 _(
3137 _(
3138 b'skipping already grafted revision %d:%s '
3138 b'skipping already grafted revision %d:%s '
3139 b'(%d:%s also has unknown origin %s)\n'
3139 b'(%d:%s also has unknown origin %s)\n'
3140 )
3140 )
3141 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3141 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3142 )
3142 )
3143 else:
3143 else:
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'(%d:%s also has origin %d:%s)\n'
3147 b'(%d:%s also has origin %d:%s)\n'
3148 )
3148 )
3149 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3149 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3150 )
3150 )
3151 revs.remove(ids[n])
3151 revs.remove(ids[n])
3152 elif ctx.hex() in ids:
3152 elif ctx.hex() in ids:
3153 r = ids[ctx.hex()]
3153 r = ids[ctx.hex()]
3154 if r in revs:
3154 if r in revs:
3155 ui.warn(
3155 ui.warn(
3156 _(
3156 _(
3157 b'skipping already grafted revision %d:%s '
3157 b'skipping already grafted revision %d:%s '
3158 b'(was grafted from %d:%s)\n'
3158 b'(was grafted from %d:%s)\n'
3159 )
3159 )
3160 % (r, repo[r], rev, ctx)
3160 % (r, repo[r], rev, ctx)
3161 )
3161 )
3162 revs.remove(r)
3162 revs.remove(r)
3163 if not revs:
3163 if not revs:
3164 return -1
3164 return -1
3165
3165
3166 if opts.get(b'no_commit'):
3166 if opts.get(b'no_commit'):
3167 statedata[b'no_commit'] = True
3167 statedata[b'no_commit'] = True
3168 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3168 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3169 desc = b'%d:%s "%s"' % (
3169 desc = b'%d:%s "%s"' % (
3170 ctx.rev(),
3170 ctx.rev(),
3171 ctx,
3171 ctx,
3172 ctx.description().split(b'\n', 1)[0],
3172 ctx.description().split(b'\n', 1)[0],
3173 )
3173 )
3174 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3174 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3175 if names:
3175 if names:
3176 desc += b' (%s)' % b' '.join(names)
3176 desc += b' (%s)' % b' '.join(names)
3177 ui.status(_(b'grafting %s\n') % desc)
3177 ui.status(_(b'grafting %s\n') % desc)
3178 if opts.get(b'dry_run'):
3178 if opts.get(b'dry_run'):
3179 continue
3179 continue
3180
3180
3181 source = ctx.extra().get(b'source')
3181 source = ctx.extra().get(b'source')
3182 extra = {}
3182 extra = {}
3183 if source:
3183 if source:
3184 extra[b'source'] = source
3184 extra[b'source'] = source
3185 extra[b'intermediate-source'] = ctx.hex()
3185 extra[b'intermediate-source'] = ctx.hex()
3186 else:
3186 else:
3187 extra[b'source'] = ctx.hex()
3187 extra[b'source'] = ctx.hex()
3188 user = ctx.user()
3188 user = ctx.user()
3189 if opts.get(b'user'):
3189 if opts.get(b'user'):
3190 user = opts[b'user']
3190 user = opts[b'user']
3191 statedata[b'user'] = user
3191 statedata[b'user'] = user
3192 date = ctx.date()
3192 date = ctx.date()
3193 if opts.get(b'date'):
3193 if opts.get(b'date'):
3194 date = opts[b'date']
3194 date = opts[b'date']
3195 statedata[b'date'] = date
3195 statedata[b'date'] = date
3196 message = ctx.description()
3196 message = ctx.description()
3197 if opts.get(b'log'):
3197 if opts.get(b'log'):
3198 message += b'\n(grafted from %s)' % ctx.hex()
3198 message += b'\n(grafted from %s)' % ctx.hex()
3199 statedata[b'log'] = True
3199 statedata[b'log'] = True
3200
3200
3201 # we don't merge the first commit when continuing
3201 # we don't merge the first commit when continuing
3202 if not cont:
3202 if not cont:
3203 # perform the graft merge with p1(rev) as 'ancestor'
3203 # perform the graft merge with p1(rev) as 'ancestor'
3204 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3204 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3205 base = ctx.p1() if basectx is None else basectx
3205 base = ctx.p1() if basectx is None else basectx
3206 with ui.configoverride(overrides, b'graft'):
3206 with ui.configoverride(overrides, b'graft'):
3207 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3207 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3208 # report any conflicts
3208 # report any conflicts
3209 if stats.unresolvedcount > 0:
3209 if stats.unresolvedcount > 0:
3210 # write out state for --continue
3210 # write out state for --continue
3211 nodes = [repo[rev].hex() for rev in revs[pos:]]
3211 nodes = [repo[rev].hex() for rev in revs[pos:]]
3212 statedata[b'nodes'] = nodes
3212 statedata[b'nodes'] = nodes
3213 stateversion = 1
3213 stateversion = 1
3214 graftstate.save(stateversion, statedata)
3214 graftstate.save(stateversion, statedata)
3215 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3215 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3216 raise error.Abort(
3216 raise error.Abort(
3217 _(b"unresolved conflicts, can't continue"), hint=hint
3217 _(b"unresolved conflicts, can't continue"), hint=hint
3218 )
3218 )
3219 else:
3219 else:
3220 cont = False
3220 cont = False
3221
3221
3222 # commit if --no-commit is false
3222 # commit if --no-commit is false
3223 if not opts.get(b'no_commit'):
3223 if not opts.get(b'no_commit'):
3224 node = repo.commit(
3224 node = repo.commit(
3225 text=message, user=user, date=date, extra=extra, editor=editor
3225 text=message, user=user, date=date, extra=extra, editor=editor
3226 )
3226 )
3227 if node is None:
3227 if node is None:
3228 ui.warn(
3228 ui.warn(
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3229 _(b'note: graft of %d:%s created no changes to commit\n')
3230 % (ctx.rev(), ctx)
3230 % (ctx.rev(), ctx)
3231 )
3231 )
3232 # checking that newnodes exist because old state files won't have it
3232 # checking that newnodes exist because old state files won't have it
3233 elif statedata.get(b'newnodes') is not None:
3233 elif statedata.get(b'newnodes') is not None:
3234 statedata[b'newnodes'].append(node)
3234 statedata[b'newnodes'].append(node)
3235
3235
3236 # remove state when we complete successfully
3236 # remove state when we complete successfully
3237 if not opts.get(b'dry_run'):
3237 if not opts.get(b'dry_run'):
3238 graftstate.delete()
3238 graftstate.delete()
3239
3239
3240 return 0
3240 return 0
3241
3241
3242
3242
3243 def _stopgraft(ui, repo, graftstate):
3243 def _stopgraft(ui, repo, graftstate):
3244 """stop the interrupted graft"""
3244 """stop the interrupted graft"""
3245 if not graftstate.exists():
3245 if not graftstate.exists():
3246 raise error.Abort(_(b"no interrupted graft found"))
3246 raise error.Abort(_(b"no interrupted graft found"))
3247 pctx = repo[b'.']
3247 pctx = repo[b'.']
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3248 hg.updaterepo(repo, pctx.node(), overwrite=True)
3249 graftstate.delete()
3249 graftstate.delete()
3250 ui.status(_(b"stopped the interrupted graft\n"))
3250 ui.status(_(b"stopped the interrupted graft\n"))
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3251 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3252 return 0
3252 return 0
3253
3253
3254
3254
3255 statemod.addunfinished(
3255 statemod.addunfinished(
3256 b'graft',
3256 b'graft',
3257 fname=b'graftstate',
3257 fname=b'graftstate',
3258 clearable=True,
3258 clearable=True,
3259 stopflag=True,
3259 stopflag=True,
3260 continueflag=True,
3260 continueflag=True,
3261 abortfunc=cmdutil.hgabortgraft,
3261 abortfunc=cmdutil.hgabortgraft,
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3262 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3263 )
3263 )
3264
3264
3265
3265
3266 @command(
3266 @command(
3267 b'grep',
3267 b'grep',
3268 [
3268 [
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3269 (b'0', b'print0', None, _(b'end fields with NUL')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3270 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3271 (
3271 (
3272 b'',
3272 b'',
3273 b'diff',
3273 b'diff',
3274 None,
3274 None,
3275 _(
3275 _(
3276 b'search revision differences for when the pattern was added '
3276 b'search revision differences for when the pattern was added '
3277 b'or removed'
3277 b'or removed'
3278 ),
3278 ),
3279 ),
3279 ),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3280 (b'a', b'text', None, _(b'treat all files as text')),
3281 (
3281 (
3282 b'f',
3282 b'f',
3283 b'follow',
3283 b'follow',
3284 None,
3284 None,
3285 _(
3285 _(
3286 b'follow changeset history,'
3286 b'follow changeset history,'
3287 b' or file history across copies and renames'
3287 b' or file history across copies and renames'
3288 ),
3288 ),
3289 ),
3289 ),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3290 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3291 (
3291 (
3292 b'l',
3292 b'l',
3293 b'files-with-matches',
3293 b'files-with-matches',
3294 None,
3294 None,
3295 _(b'print only filenames and revisions that match'),
3295 _(b'print only filenames and revisions that match'),
3296 ),
3296 ),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3297 (b'n', b'line-number', None, _(b'print matching line numbers')),
3298 (
3298 (
3299 b'r',
3299 b'r',
3300 b'rev',
3300 b'rev',
3301 [],
3301 [],
3302 _(b'search files changed within revision range'),
3302 _(b'search files changed within revision range'),
3303 _(b'REV'),
3303 _(b'REV'),
3304 ),
3304 ),
3305 (
3305 (
3306 b'',
3306 b'',
3307 b'all-files',
3307 b'all-files',
3308 None,
3308 None,
3309 _(
3309 _(
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3310 b'include all files in the changeset while grepping (DEPRECATED)'
3311 ),
3311 ),
3312 ),
3312 ),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3313 (b'u', b'user', None, _(b'list the author (long with -v)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3314 (b'd', b'date', None, _(b'list the date (short with -q)')),
3315 ]
3315 ]
3316 + formatteropts
3316 + formatteropts
3317 + walkopts,
3317 + walkopts,
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3318 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3319 helpcategory=command.CATEGORY_FILE_CONTENTS,
3320 inferrepo=True,
3320 inferrepo=True,
3321 intents={INTENT_READONLY},
3321 intents={INTENT_READONLY},
3322 )
3322 )
3323 def grep(ui, repo, pattern, *pats, **opts):
3323 def grep(ui, repo, pattern, *pats, **opts):
3324 """search for a pattern in specified files
3324 """search for a pattern in specified files
3325
3325
3326 Search the working directory or revision history for a regular
3326 Search the working directory or revision history for a regular
3327 expression in the specified files for the entire repository.
3327 expression in the specified files for the entire repository.
3328
3328
3329 By default, grep searches the repository files in the working
3329 By default, grep searches the repository files in the working
3330 directory and prints the files where it finds a match. To specify
3330 directory and prints the files where it finds a match. To specify
3331 historical revisions instead of the working directory, use the
3331 historical revisions instead of the working directory, use the
3332 --rev flag.
3332 --rev flag.
3333
3333
3334 To search instead historical revision differences that contains a
3334 To search instead historical revision differences that contains a
3335 change in match status ("-" for a match that becomes a non-match,
3335 change in match status ("-" for a match that becomes a non-match,
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3336 or "+" for a non-match that becomes a match), use the --diff flag.
3337
3337
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3338 PATTERN can be any Python (roughly Perl-compatible) regular
3339 expression.
3339 expression.
3340
3340
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3341 If no FILEs are specified and the --rev flag isn't supplied, all
3342 files in the working directory are searched. When using the --rev
3342 files in the working directory are searched. When using the --rev
3343 flag and specifying FILEs, use the --follow argument to also
3343 flag and specifying FILEs, use the --follow argument to also
3344 follow the specified FILEs across renames and copies.
3344 follow the specified FILEs across renames and copies.
3345
3345
3346 .. container:: verbose
3346 .. container:: verbose
3347
3347
3348 Template:
3348 Template:
3349
3349
3350 The following keywords are supported in addition to the common template
3350 The following keywords are supported in addition to the common template
3351 keywords and functions. See also :hg:`help templates`.
3351 keywords and functions. See also :hg:`help templates`.
3352
3352
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3353 :change: String. Character denoting insertion ``+`` or removal ``-``.
3354 Available if ``--diff`` is specified.
3354 Available if ``--diff`` is specified.
3355 :lineno: Integer. Line number of the match.
3355 :lineno: Integer. Line number of the match.
3356 :path: String. Repository-absolute path of the file.
3356 :path: String. Repository-absolute path of the file.
3357 :texts: List of text chunks.
3357 :texts: List of text chunks.
3358
3358
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3359 And each entry of ``{texts}`` provides the following sub-keywords.
3360
3360
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3361 :matched: Boolean. True if the chunk matches the specified pattern.
3362 :text: String. Chunk content.
3362 :text: String. Chunk content.
3363
3363
3364 See :hg:`help templates.operators` for the list expansion syntax.
3364 See :hg:`help templates.operators` for the list expansion syntax.
3365
3365
3366 Returns 0 if a match is found, 1 otherwise.
3366 Returns 0 if a match is found, 1 otherwise.
3367
3367
3368 """
3368 """
3369 opts = pycompat.byteskwargs(opts)
3369 opts = pycompat.byteskwargs(opts)
3370 diff = opts.get(b'all') or opts.get(b'diff')
3370 diff = opts.get(b'all') or opts.get(b'diff')
3371 if diff and opts.get(b'all_files'):
3371 if diff and opts.get(b'all_files'):
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3372 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3373 if opts.get(b'all_files') is None and not diff:
3373 if opts.get(b'all_files') is None and not diff:
3374 opts[b'all_files'] = True
3374 opts[b'all_files'] = True
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3375 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3376 all_files = opts.get(b'all_files')
3376 all_files = opts.get(b'all_files')
3377 if plaingrep:
3377 if plaingrep:
3378 opts[b'rev'] = [b'wdir()']
3378 opts[b'rev'] = [b'wdir()']
3379
3379
3380 reflags = re.M
3380 reflags = re.M
3381 if opts.get(b'ignore_case'):
3381 if opts.get(b'ignore_case'):
3382 reflags |= re.I
3382 reflags |= re.I
3383 try:
3383 try:
3384 regexp = util.re.compile(pattern, reflags)
3384 regexp = util.re.compile(pattern, reflags)
3385 except re.error as inst:
3385 except re.error as inst:
3386 ui.warn(
3386 ui.warn(
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3387 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3388 )
3388 )
3389 return 1
3389 return 1
3390 sep, eol = b':', b'\n'
3390 sep, eol = b':', b'\n'
3391 if opts.get(b'print0'):
3391 if opts.get(b'print0'):
3392 sep = eol = b'\0'
3392 sep = eol = b'\0'
3393
3393
3394 getfile = util.lrucachefunc(repo.file)
3394 getfile = util.lrucachefunc(repo.file)
3395
3395
3396 def matchlines(body):
3396 def matchlines(body):
3397 begin = 0
3397 begin = 0
3398 linenum = 0
3398 linenum = 0
3399 while begin < len(body):
3399 while begin < len(body):
3400 match = regexp.search(body, begin)
3400 match = regexp.search(body, begin)
3401 if not match:
3401 if not match:
3402 break
3402 break
3403 mstart, mend = match.span()
3403 mstart, mend = match.span()
3404 linenum += body.count(b'\n', begin, mstart) + 1
3404 linenum += body.count(b'\n', begin, mstart) + 1
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3405 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3406 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3407 lend = begin - 1
3407 lend = begin - 1
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3408 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3409
3409
3410 class linestate(object):
3410 class linestate(object):
3411 def __init__(self, line, linenum, colstart, colend):
3411 def __init__(self, line, linenum, colstart, colend):
3412 self.line = line
3412 self.line = line
3413 self.linenum = linenum
3413 self.linenum = linenum
3414 self.colstart = colstart
3414 self.colstart = colstart
3415 self.colend = colend
3415 self.colend = colend
3416
3416
3417 def __hash__(self):
3417 def __hash__(self):
3418 return hash((self.linenum, self.line))
3418 return hash((self.linenum, self.line))
3419
3419
3420 def __eq__(self, other):
3420 def __eq__(self, other):
3421 return self.line == other.line
3421 return self.line == other.line
3422
3422
3423 def findpos(self):
3423 def findpos(self):
3424 """Iterate all (start, end) indices of matches"""
3424 """Iterate all (start, end) indices of matches"""
3425 yield self.colstart, self.colend
3425 yield self.colstart, self.colend
3426 p = self.colend
3426 p = self.colend
3427 while p < len(self.line):
3427 while p < len(self.line):
3428 m = regexp.search(self.line, p)
3428 m = regexp.search(self.line, p)
3429 if not m:
3429 if not m:
3430 break
3430 break
3431 yield m.span()
3431 yield m.span()
3432 p = m.end()
3432 p = m.end()
3433
3433
3434 matches = {}
3434 matches = {}
3435 copies = {}
3435 copies = {}
3436
3436
3437 def grepbody(fn, rev, body):
3437 def grepbody(fn, rev, body):
3438 matches[rev].setdefault(fn, [])
3438 matches[rev].setdefault(fn, [])
3439 m = matches[rev][fn]
3439 m = matches[rev][fn]
3440 if body is None:
3440 if body is None:
3441 return
3441 return
3442
3442
3443 for lnum, cstart, cend, line in matchlines(body):
3443 for lnum, cstart, cend, line in matchlines(body):
3444 s = linestate(line, lnum, cstart, cend)
3444 s = linestate(line, lnum, cstart, cend)
3445 m.append(s)
3445 m.append(s)
3446
3446
3447 def difflinestates(a, b):
3447 def difflinestates(a, b):
3448 sm = difflib.SequenceMatcher(None, a, b)
3448 sm = difflib.SequenceMatcher(None, a, b)
3449 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3449 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3450 if tag == 'insert':
3450 if tag == 'insert':
3451 for i in pycompat.xrange(blo, bhi):
3451 for i in pycompat.xrange(blo, bhi):
3452 yield (b'+', b[i])
3452 yield (b'+', b[i])
3453 elif tag == 'delete':
3453 elif tag == 'delete':
3454 for i in pycompat.xrange(alo, ahi):
3454 for i in pycompat.xrange(alo, ahi):
3455 yield (b'-', a[i])
3455 yield (b'-', a[i])
3456 elif tag == 'replace':
3456 elif tag == 'replace':
3457 for i in pycompat.xrange(alo, ahi):
3457 for i in pycompat.xrange(alo, ahi):
3458 yield (b'-', a[i])
3458 yield (b'-', a[i])
3459 for i in pycompat.xrange(blo, bhi):
3459 for i in pycompat.xrange(blo, bhi):
3460 yield (b'+', b[i])
3460 yield (b'+', b[i])
3461
3461
3462 uipathfn = scmutil.getuipathfn(repo)
3462 uipathfn = scmutil.getuipathfn(repo)
3463
3463
3464 def display(fm, fn, ctx, pstates, states):
3464 def display(fm, fn, ctx, pstates, states):
3465 rev = scmutil.intrev(ctx)
3465 rev = scmutil.intrev(ctx)
3466 if fm.isplain():
3466 if fm.isplain():
3467 formatuser = ui.shortuser
3467 formatuser = ui.shortuser
3468 else:
3468 else:
3469 formatuser = pycompat.bytestr
3469 formatuser = pycompat.bytestr
3470 if ui.quiet:
3470 if ui.quiet:
3471 datefmt = b'%Y-%m-%d'
3471 datefmt = b'%Y-%m-%d'
3472 else:
3472 else:
3473 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3473 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3474 found = False
3474 found = False
3475
3475
3476 @util.cachefunc
3476 @util.cachefunc
3477 def binary():
3477 def binary():
3478 flog = getfile(fn)
3478 flog = getfile(fn)
3479 try:
3479 try:
3480 return stringutil.binary(flog.read(ctx.filenode(fn)))
3480 return stringutil.binary(flog.read(ctx.filenode(fn)))
3481 except error.WdirUnsupported:
3481 except error.WdirUnsupported:
3482 return ctx[fn].isbinary()
3482 return ctx[fn].isbinary()
3483
3483
3484 fieldnamemap = {b'linenumber': b'lineno'}
3484 fieldnamemap = {b'linenumber': b'lineno'}
3485 if diff:
3485 if diff:
3486 iter = difflinestates(pstates, states)
3486 iter = difflinestates(pstates, states)
3487 else:
3487 else:
3488 iter = [(b'', l) for l in states]
3488 iter = [(b'', l) for l in states]
3489 for change, l in iter:
3489 for change, l in iter:
3490 fm.startitem()
3490 fm.startitem()
3491 fm.context(ctx=ctx)
3491 fm.context(ctx=ctx)
3492 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3492 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3493 fm.plain(uipathfn(fn), label=b'grep.filename')
3493 fm.plain(uipathfn(fn), label=b'grep.filename')
3494
3494
3495 cols = [
3495 cols = [
3496 (b'rev', b'%d', rev, not plaingrep, b''),
3496 (b'rev', b'%d', rev, not plaingrep, b''),
3497 (
3497 (
3498 b'linenumber',
3498 b'linenumber',
3499 b'%d',
3499 b'%d',
3500 l.linenum,
3500 l.linenum,
3501 opts.get(b'line_number'),
3501 opts.get(b'line_number'),
3502 b'',
3502 b'',
3503 ),
3503 ),
3504 ]
3504 ]
3505 if diff:
3505 if diff:
3506 cols.append(
3506 cols.append(
3507 (
3507 (
3508 b'change',
3508 b'change',
3509 b'%s',
3509 b'%s',
3510 change,
3510 change,
3511 True,
3511 True,
3512 b'grep.inserted '
3512 b'grep.inserted '
3513 if change == b'+'
3513 if change == b'+'
3514 else b'grep.deleted ',
3514 else b'grep.deleted ',
3515 )
3515 )
3516 )
3516 )
3517 cols.extend(
3517 cols.extend(
3518 [
3518 [
3519 (
3519 (
3520 b'user',
3520 b'user',
3521 b'%s',
3521 b'%s',
3522 formatuser(ctx.user()),
3522 formatuser(ctx.user()),
3523 opts.get(b'user'),
3523 opts.get(b'user'),
3524 b'',
3524 b'',
3525 ),
3525 ),
3526 (
3526 (
3527 b'date',
3527 b'date',
3528 b'%s',
3528 b'%s',
3529 fm.formatdate(ctx.date(), datefmt),
3529 fm.formatdate(ctx.date(), datefmt),
3530 opts.get(b'date'),
3530 opts.get(b'date'),
3531 b'',
3531 b'',
3532 ),
3532 ),
3533 ]
3533 ]
3534 )
3534 )
3535 for name, fmt, data, cond, extra_label in cols:
3535 for name, fmt, data, cond, extra_label in cols:
3536 if cond:
3536 if cond:
3537 fm.plain(sep, label=b'grep.sep')
3537 fm.plain(sep, label=b'grep.sep')
3538 field = fieldnamemap.get(name, name)
3538 field = fieldnamemap.get(name, name)
3539 label = extra_label + (b'grep.%s' % name)
3539 label = extra_label + (b'grep.%s' % name)
3540 fm.condwrite(cond, field, fmt, data, label=label)
3540 fm.condwrite(cond, field, fmt, data, label=label)
3541 if not opts.get(b'files_with_matches'):
3541 if not opts.get(b'files_with_matches'):
3542 fm.plain(sep, label=b'grep.sep')
3542 fm.plain(sep, label=b'grep.sep')
3543 if not opts.get(b'text') and binary():
3543 if not opts.get(b'text') and binary():
3544 fm.plain(_(b" Binary file matches"))
3544 fm.plain(_(b" Binary file matches"))
3545 else:
3545 else:
3546 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3546 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3547 fm.plain(eol)
3547 fm.plain(eol)
3548 found = True
3548 found = True
3549 if opts.get(b'files_with_matches'):
3549 if opts.get(b'files_with_matches'):
3550 break
3550 break
3551 return found
3551 return found
3552
3552
3553 def displaymatches(fm, l):
3553 def displaymatches(fm, l):
3554 p = 0
3554 p = 0
3555 for s, e in l.findpos():
3555 for s, e in l.findpos():
3556 if p < s:
3556 if p < s:
3557 fm.startitem()
3557 fm.startitem()
3558 fm.write(b'text', b'%s', l.line[p:s])
3558 fm.write(b'text', b'%s', l.line[p:s])
3559 fm.data(matched=False)
3559 fm.data(matched=False)
3560 fm.startitem()
3560 fm.startitem()
3561 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3561 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3562 fm.data(matched=True)
3562 fm.data(matched=True)
3563 p = e
3563 p = e
3564 if p < len(l.line):
3564 if p < len(l.line):
3565 fm.startitem()
3565 fm.startitem()
3566 fm.write(b'text', b'%s', l.line[p:])
3566 fm.write(b'text', b'%s', l.line[p:])
3567 fm.data(matched=False)
3567 fm.data(matched=False)
3568 fm.end()
3568 fm.end()
3569
3569
3570 skip = set()
3570 skip = set()
3571 revfiles = {}
3571 revfiles = {}
3572 match = scmutil.match(repo[None], pats, opts)
3572 match = scmutil.match(repo[None], pats, opts)
3573 found = False
3573 found = False
3574 follow = opts.get(b'follow')
3574 follow = opts.get(b'follow')
3575
3575
3576 getrenamed = scmutil.getrenamedfn(repo)
3576 getrenamed = scmutil.getrenamedfn(repo)
3577
3577
3578 def get_file_content(filename, filelog, filenode, context, revision):
3578 def get_file_content(filename, filelog, filenode, context, revision):
3579 try:
3579 try:
3580 content = filelog.read(filenode)
3580 content = filelog.read(filenode)
3581 except error.WdirUnsupported:
3581 except error.WdirUnsupported:
3582 content = context[filename].data()
3582 content = context[filename].data()
3583 except error.CensoredNodeError:
3583 except error.CensoredNodeError:
3584 content = None
3584 content = None
3585 ui.warn(
3585 ui.warn(
3586 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3586 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3587 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3587 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3588 )
3588 )
3589 return content
3589 return content
3590
3590
3591 def prep(ctx, fns):
3591 def prep(ctx, fns):
3592 rev = ctx.rev()
3592 rev = ctx.rev()
3593 pctx = ctx.p1()
3593 pctx = ctx.p1()
3594 parent = pctx.rev()
3594 parent = pctx.rev()
3595 matches.setdefault(rev, {})
3595 matches.setdefault(rev, {})
3596 matches.setdefault(parent, {})
3596 matches.setdefault(parent, {})
3597 files = revfiles.setdefault(rev, [])
3597 files = revfiles.setdefault(rev, [])
3598 for fn in fns:
3598 for fn in fns:
3599 flog = getfile(fn)
3599 flog = getfile(fn)
3600 try:
3600 try:
3601 fnode = ctx.filenode(fn)
3601 fnode = ctx.filenode(fn)
3602 except error.LookupError:
3602 except error.LookupError:
3603 continue
3603 continue
3604
3604
3605 copy = None
3605 copy = None
3606 if follow:
3606 if follow:
3607 copy = getrenamed(fn, rev)
3607 copy = getrenamed(fn, rev)
3608 if copy:
3608 if copy:
3609 copies.setdefault(rev, {})[fn] = copy
3609 copies.setdefault(rev, {})[fn] = copy
3610 if fn in skip:
3610 if fn in skip:
3611 skip.add(copy)
3611 skip.add(copy)
3612 if fn in skip:
3612 if fn in skip:
3613 continue
3613 continue
3614 files.append(fn)
3614 files.append(fn)
3615
3615
3616 if fn not in matches[rev]:
3616 if fn not in matches[rev]:
3617 content = get_file_content(fn, flog, fnode, ctx, rev)
3617 content = get_file_content(fn, flog, fnode, ctx, rev)
3618 grepbody(fn, rev, content)
3618 grepbody(fn, rev, content)
3619
3619
3620 pfn = copy or fn
3620 pfn = copy or fn
3621 if pfn not in matches[parent]:
3621 if pfn not in matches[parent]:
3622 try:
3622 try:
3623 pfnode = pctx.filenode(pfn)
3623 pfnode = pctx.filenode(pfn)
3624 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3624 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3625 grepbody(pfn, parent, pcontent)
3625 grepbody(pfn, parent, pcontent)
3626 except error.LookupError:
3626 except error.LookupError:
3627 pass
3627 pass
3628
3628
3629 ui.pager(b'grep')
3629 ui.pager(b'grep')
3630 fm = ui.formatter(b'grep', opts)
3630 fm = ui.formatter(b'grep', opts)
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3632 rev = ctx.rev()
3632 rev = ctx.rev()
3633 parent = ctx.p1().rev()
3633 parent = ctx.p1().rev()
3634 for fn in sorted(revfiles.get(rev, [])):
3634 for fn in sorted(revfiles.get(rev, [])):
3635 states = matches[rev][fn]
3635 states = matches[rev][fn]
3636 copy = copies.get(rev, {}).get(fn)
3636 copy = copies.get(rev, {}).get(fn)
3637 if fn in skip:
3637 if fn in skip:
3638 if copy:
3638 if copy:
3639 skip.add(copy)
3639 skip.add(copy)
3640 continue
3640 continue
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3642 if pstates or states:
3642 if pstates or states:
3643 r = display(fm, fn, ctx, pstates, states)
3643 r = display(fm, fn, ctx, pstates, states)
3644 found = found or r
3644 found = found or r
3645 if r and not diff and not all_files:
3645 if r and not diff and not all_files:
3646 skip.add(fn)
3646 skip.add(fn)
3647 if copy:
3647 if copy:
3648 skip.add(copy)
3648 skip.add(copy)
3649 del revfiles[rev]
3649 del revfiles[rev]
3650 # We will keep the matches dict for the duration of the window
3650 # We will keep the matches dict for the duration of the window
3651 # clear the matches dict once the window is over
3651 # clear the matches dict once the window is over
3652 if not revfiles:
3652 if not revfiles:
3653 matches.clear()
3653 matches.clear()
3654 fm.end()
3654 fm.end()
3655
3655
3656 return not found
3656 return not found
3657
3657
3658
3658
3659 @command(
3659 @command(
3660 b'heads',
3660 b'heads',
3661 [
3661 [
3662 (
3662 (
3663 b'r',
3663 b'r',
3664 b'rev',
3664 b'rev',
3665 b'',
3665 b'',
3666 _(b'show only heads which are descendants of STARTREV'),
3666 _(b'show only heads which are descendants of STARTREV'),
3667 _(b'STARTREV'),
3667 _(b'STARTREV'),
3668 ),
3668 ),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3670 (
3670 (
3671 b'a',
3671 b'a',
3672 b'active',
3672 b'active',
3673 False,
3673 False,
3674 _(b'show active branchheads only (DEPRECATED)'),
3674 _(b'show active branchheads only (DEPRECATED)'),
3675 ),
3675 ),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3677 ]
3677 ]
3678 + templateopts,
3678 + templateopts,
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3681 intents={INTENT_READONLY},
3681 intents={INTENT_READONLY},
3682 )
3682 )
3683 def heads(ui, repo, *branchrevs, **opts):
3683 def heads(ui, repo, *branchrevs, **opts):
3684 """show branch heads
3684 """show branch heads
3685
3685
3686 With no arguments, show all open branch heads in the repository.
3686 With no arguments, show all open branch heads in the repository.
3687 Branch heads are changesets that have no descendants on the
3687 Branch heads are changesets that have no descendants on the
3688 same branch. They are where development generally takes place and
3688 same branch. They are where development generally takes place and
3689 are the usual targets for update and merge operations.
3689 are the usual targets for update and merge operations.
3690
3690
3691 If one or more REVs are given, only open branch heads on the
3691 If one or more REVs are given, only open branch heads on the
3692 branches associated with the specified changesets are shown. This
3692 branches associated with the specified changesets are shown. This
3693 means that you can use :hg:`heads .` to see the heads on the
3693 means that you can use :hg:`heads .` to see the heads on the
3694 currently checked-out branch.
3694 currently checked-out branch.
3695
3695
3696 If -c/--closed is specified, also show branch heads marked closed
3696 If -c/--closed is specified, also show branch heads marked closed
3697 (see :hg:`commit --close-branch`).
3697 (see :hg:`commit --close-branch`).
3698
3698
3699 If STARTREV is specified, only those heads that are descendants of
3699 If STARTREV is specified, only those heads that are descendants of
3700 STARTREV will be displayed.
3700 STARTREV will be displayed.
3701
3701
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3703 topological heads (changesets with no children) will be shown.
3703 topological heads (changesets with no children) will be shown.
3704
3704
3705 Returns 0 if matching heads are found, 1 if not.
3705 Returns 0 if matching heads are found, 1 if not.
3706 """
3706 """
3707
3707
3708 opts = pycompat.byteskwargs(opts)
3708 opts = pycompat.byteskwargs(opts)
3709 start = None
3709 start = None
3710 rev = opts.get(b'rev')
3710 rev = opts.get(b'rev')
3711 if rev:
3711 if rev:
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3713 start = scmutil.revsingle(repo, rev, None).node()
3713 start = scmutil.revsingle(repo, rev, None).node()
3714
3714
3715 if opts.get(b'topo'):
3715 if opts.get(b'topo'):
3716 heads = [repo[h] for h in repo.heads(start)]
3716 heads = [repo[h] for h in repo.heads(start)]
3717 else:
3717 else:
3718 heads = []
3718 heads = []
3719 for branch in repo.branchmap():
3719 for branch in repo.branchmap():
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3721 heads = [repo[h] for h in heads]
3721 heads = [repo[h] for h in heads]
3722
3722
3723 if branchrevs:
3723 if branchrevs:
3724 branches = {
3724 branches = {
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3726 }
3726 }
3727 heads = [h for h in heads if h.branch() in branches]
3727 heads = [h for h in heads if h.branch() in branches]
3728
3728
3729 if opts.get(b'active') and branchrevs:
3729 if opts.get(b'active') and branchrevs:
3730 dagheads = repo.heads(start)
3730 dagheads = repo.heads(start)
3731 heads = [h for h in heads if h.node() in dagheads]
3731 heads = [h for h in heads if h.node() in dagheads]
3732
3732
3733 if branchrevs:
3733 if branchrevs:
3734 haveheads = {h.branch() for h in heads}
3734 haveheads = {h.branch() for h in heads}
3735 if branches - haveheads:
3735 if branches - haveheads:
3736 headless = b', '.join(b for b in branches - haveheads)
3736 headless = b', '.join(b for b in branches - haveheads)
3737 msg = _(b'no open branch heads found on branches %s')
3737 msg = _(b'no open branch heads found on branches %s')
3738 if opts.get(b'rev'):
3738 if opts.get(b'rev'):
3739 msg += _(b' (started at %s)') % opts[b'rev']
3739 msg += _(b' (started at %s)') % opts[b'rev']
3740 ui.warn((msg + b'\n') % headless)
3740 ui.warn((msg + b'\n') % headless)
3741
3741
3742 if not heads:
3742 if not heads:
3743 return 1
3743 return 1
3744
3744
3745 ui.pager(b'heads')
3745 ui.pager(b'heads')
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3748 for ctx in heads:
3748 for ctx in heads:
3749 displayer.show(ctx)
3749 displayer.show(ctx)
3750 displayer.close()
3750 displayer.close()
3751
3751
3752
3752
3753 @command(
3753 @command(
3754 b'help',
3754 b'help',
3755 [
3755 [
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3759 (
3759 (
3760 b's',
3760 b's',
3761 b'system',
3761 b'system',
3762 [],
3762 [],
3763 _(b'show help for specific platform(s)'),
3763 _(b'show help for specific platform(s)'),
3764 _(b'PLATFORM'),
3764 _(b'PLATFORM'),
3765 ),
3765 ),
3766 ],
3766 ],
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3768 helpcategory=command.CATEGORY_HELP,
3768 helpcategory=command.CATEGORY_HELP,
3769 norepo=True,
3769 norepo=True,
3770 intents={INTENT_READONLY},
3770 intents={INTENT_READONLY},
3771 )
3771 )
3772 def help_(ui, name=None, **opts):
3772 def help_(ui, name=None, **opts):
3773 """show help for a given topic or a help overview
3773 """show help for a given topic or a help overview
3774
3774
3775 With no arguments, print a list of commands with short help messages.
3775 With no arguments, print a list of commands with short help messages.
3776
3776
3777 Given a topic, extension, or command name, print help for that
3777 Given a topic, extension, or command name, print help for that
3778 topic.
3778 topic.
3779
3779
3780 Returns 0 if successful.
3780 Returns 0 if successful.
3781 """
3781 """
3782
3782
3783 keep = opts.get('system') or []
3783 keep = opts.get('system') or []
3784 if len(keep) == 0:
3784 if len(keep) == 0:
3785 if pycompat.sysplatform.startswith(b'win'):
3785 if pycompat.sysplatform.startswith(b'win'):
3786 keep.append(b'windows')
3786 keep.append(b'windows')
3787 elif pycompat.sysplatform == b'OpenVMS':
3787 elif pycompat.sysplatform == b'OpenVMS':
3788 keep.append(b'vms')
3788 keep.append(b'vms')
3789 elif pycompat.sysplatform == b'plan9':
3789 elif pycompat.sysplatform == b'plan9':
3790 keep.append(b'plan9')
3790 keep.append(b'plan9')
3791 else:
3791 else:
3792 keep.append(b'unix')
3792 keep.append(b'unix')
3793 keep.append(pycompat.sysplatform.lower())
3793 keep.append(pycompat.sysplatform.lower())
3794 if ui.verbose:
3794 if ui.verbose:
3795 keep.append(b'verbose')
3795 keep.append(b'verbose')
3796
3796
3797 commands = sys.modules[__name__]
3797 commands = sys.modules[__name__]
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3799 ui.pager(b'help')
3799 ui.pager(b'help')
3800 ui.write(formatted)
3800 ui.write(formatted)
3801
3801
3802
3802
3803 @command(
3803 @command(
3804 b'identify|id',
3804 b'identify|id',
3805 [
3805 [
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3809 (b'b', b'branch', None, _(b'show branch')),
3809 (b'b', b'branch', None, _(b'show branch')),
3810 (b't', b'tags', None, _(b'show tags')),
3810 (b't', b'tags', None, _(b'show tags')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3812 ]
3812 ]
3813 + remoteopts
3813 + remoteopts
3814 + formatteropts,
3814 + formatteropts,
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3817 optionalrepo=True,
3817 optionalrepo=True,
3818 intents={INTENT_READONLY},
3818 intents={INTENT_READONLY},
3819 )
3819 )
3820 def identify(
3820 def identify(
3821 ui,
3821 ui,
3822 repo,
3822 repo,
3823 source=None,
3823 source=None,
3824 rev=None,
3824 rev=None,
3825 num=None,
3825 num=None,
3826 id=None,
3826 id=None,
3827 branch=None,
3827 branch=None,
3828 tags=None,
3828 tags=None,
3829 bookmarks=None,
3829 bookmarks=None,
3830 **opts
3830 **opts
3831 ):
3831 ):
3832 """identify the working directory or specified revision
3832 """identify the working directory or specified revision
3833
3833
3834 Print a summary identifying the repository state at REV using one or
3834 Print a summary identifying the repository state at REV using one or
3835 two parent hash identifiers, followed by a "+" if the working
3835 two parent hash identifiers, followed by a "+" if the working
3836 directory has uncommitted changes, the branch name (if not default),
3836 directory has uncommitted changes, the branch name (if not default),
3837 a list of tags, and a list of bookmarks.
3837 a list of tags, and a list of bookmarks.
3838
3838
3839 When REV is not given, print a summary of the current state of the
3839 When REV is not given, print a summary of the current state of the
3840 repository including the working directory. Specify -r. to get information
3840 repository including the working directory. Specify -r. to get information
3841 of the working directory parent without scanning uncommitted changes.
3841 of the working directory parent without scanning uncommitted changes.
3842
3842
3843 Specifying a path to a repository root or Mercurial bundle will
3843 Specifying a path to a repository root or Mercurial bundle will
3844 cause lookup to operate on that repository/bundle.
3844 cause lookup to operate on that repository/bundle.
3845
3845
3846 .. container:: verbose
3846 .. container:: verbose
3847
3847
3848 Template:
3848 Template:
3849
3849
3850 The following keywords are supported in addition to the common template
3850 The following keywords are supported in addition to the common template
3851 keywords and functions. See also :hg:`help templates`.
3851 keywords and functions. See also :hg:`help templates`.
3852
3852
3853 :dirty: String. Character ``+`` denoting if the working directory has
3853 :dirty: String. Character ``+`` denoting if the working directory has
3854 uncommitted changes.
3854 uncommitted changes.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3856 :parents: List of strings. Parent nodes of the changeset.
3856 :parents: List of strings. Parent nodes of the changeset.
3857
3857
3858 Examples:
3858 Examples:
3859
3859
3860 - generate a build identifier for the working directory::
3860 - generate a build identifier for the working directory::
3861
3861
3862 hg id --id > build-id.dat
3862 hg id --id > build-id.dat
3863
3863
3864 - find the revision corresponding to a tag::
3864 - find the revision corresponding to a tag::
3865
3865
3866 hg id -n -r 1.3
3866 hg id -n -r 1.3
3867
3867
3868 - check the most recent revision of a remote repository::
3868 - check the most recent revision of a remote repository::
3869
3869
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3871
3871
3872 See :hg:`log` for generating more information about specific revisions,
3872 See :hg:`log` for generating more information about specific revisions,
3873 including full hash identifiers.
3873 including full hash identifiers.
3874
3874
3875 Returns 0 if successful.
3875 Returns 0 if successful.
3876 """
3876 """
3877
3877
3878 opts = pycompat.byteskwargs(opts)
3878 opts = pycompat.byteskwargs(opts)
3879 if not repo and not source:
3879 if not repo and not source:
3880 raise error.Abort(
3880 raise error.Abort(
3881 _(b"there is no Mercurial repository here (.hg not found)")
3881 _(b"there is no Mercurial repository here (.hg not found)")
3882 )
3882 )
3883
3883
3884 default = not (num or id or branch or tags or bookmarks)
3884 default = not (num or id or branch or tags or bookmarks)
3885 output = []
3885 output = []
3886 revs = []
3886 revs = []
3887
3887
3888 if source:
3888 if source:
3889 source, branches = hg.parseurl(ui.expandpath(source))
3889 source, branches = hg.parseurl(ui.expandpath(source))
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3891 repo = peer.local()
3891 repo = peer.local()
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3893
3893
3894 fm = ui.formatter(b'identify', opts)
3894 fm = ui.formatter(b'identify', opts)
3895 fm.startitem()
3895 fm.startitem()
3896
3896
3897 if not repo:
3897 if not repo:
3898 if num or branch or tags:
3898 if num or branch or tags:
3899 raise error.Abort(
3899 raise error.Abort(
3900 _(b"can't query remote revision number, branch, or tags")
3900 _(b"can't query remote revision number, branch, or tags")
3901 )
3901 )
3902 if not rev and revs:
3902 if not rev and revs:
3903 rev = revs[0]
3903 rev = revs[0]
3904 if not rev:
3904 if not rev:
3905 rev = b"tip"
3905 rev = b"tip"
3906
3906
3907 remoterev = peer.lookup(rev)
3907 remoterev = peer.lookup(rev)
3908 hexrev = fm.hexfunc(remoterev)
3908 hexrev = fm.hexfunc(remoterev)
3909 if default or id:
3909 if default or id:
3910 output = [hexrev]
3910 output = [hexrev]
3911 fm.data(id=hexrev)
3911 fm.data(id=hexrev)
3912
3912
3913 @util.cachefunc
3913 @util.cachefunc
3914 def getbms():
3914 def getbms():
3915 bms = []
3915 bms = []
3916
3916
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3918 hexremoterev = hex(remoterev)
3918 hexremoterev = hex(remoterev)
3919 bms = [
3919 bms = [
3920 bm
3920 bm
3921 for bm, bmr in pycompat.iteritems(
3921 for bm, bmr in pycompat.iteritems(
3922 peer.listkeys(b'bookmarks')
3922 peer.listkeys(b'bookmarks')
3923 )
3923 )
3924 if bmr == hexremoterev
3924 if bmr == hexremoterev
3925 ]
3925 ]
3926
3926
3927 return sorted(bms)
3927 return sorted(bms)
3928
3928
3929 if fm.isplain():
3929 if fm.isplain():
3930 if bookmarks:
3930 if bookmarks:
3931 output.extend(getbms())
3931 output.extend(getbms())
3932 elif default and not ui.quiet:
3932 elif default and not ui.quiet:
3933 # multiple bookmarks for a single parent separated by '/'
3933 # multiple bookmarks for a single parent separated by '/'
3934 bm = b'/'.join(getbms())
3934 bm = b'/'.join(getbms())
3935 if bm:
3935 if bm:
3936 output.append(bm)
3936 output.append(bm)
3937 else:
3937 else:
3938 fm.data(node=hex(remoterev))
3938 fm.data(node=hex(remoterev))
3939 if bookmarks or b'bookmarks' in fm.datahint():
3939 if bookmarks or b'bookmarks' in fm.datahint():
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3941 else:
3941 else:
3942 if rev:
3942 if rev:
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3944 ctx = scmutil.revsingle(repo, rev, None)
3944 ctx = scmutil.revsingle(repo, rev, None)
3945
3945
3946 if ctx.rev() is None:
3946 if ctx.rev() is None:
3947 ctx = repo[None]
3947 ctx = repo[None]
3948 parents = ctx.parents()
3948 parents = ctx.parents()
3949 taglist = []
3949 taglist = []
3950 for p in parents:
3950 for p in parents:
3951 taglist.extend(p.tags())
3951 taglist.extend(p.tags())
3952
3952
3953 dirty = b""
3953 dirty = b""
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3955 dirty = b'+'
3955 dirty = b'+'
3956 fm.data(dirty=dirty)
3956 fm.data(dirty=dirty)
3957
3957
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3959 if default or id:
3959 if default or id:
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3962
3962
3963 if num:
3963 if num:
3964 numoutput = [b"%d" % p.rev() for p in parents]
3964 numoutput = [b"%d" % p.rev() for p in parents]
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3966
3966
3967 fm.data(
3967 fm.data(
3968 parents=fm.formatlist(
3968 parents=fm.formatlist(
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3970 )
3970 )
3971 )
3971 )
3972 else:
3972 else:
3973 hexoutput = fm.hexfunc(ctx.node())
3973 hexoutput = fm.hexfunc(ctx.node())
3974 if default or id:
3974 if default or id:
3975 output = [hexoutput]
3975 output = [hexoutput]
3976 fm.data(id=hexoutput)
3976 fm.data(id=hexoutput)
3977
3977
3978 if num:
3978 if num:
3979 output.append(pycompat.bytestr(ctx.rev()))
3979 output.append(pycompat.bytestr(ctx.rev()))
3980 taglist = ctx.tags()
3980 taglist = ctx.tags()
3981
3981
3982 if default and not ui.quiet:
3982 if default and not ui.quiet:
3983 b = ctx.branch()
3983 b = ctx.branch()
3984 if b != b'default':
3984 if b != b'default':
3985 output.append(b"(%s)" % b)
3985 output.append(b"(%s)" % b)
3986
3986
3987 # multiple tags for a single parent separated by '/'
3987 # multiple tags for a single parent separated by '/'
3988 t = b'/'.join(taglist)
3988 t = b'/'.join(taglist)
3989 if t:
3989 if t:
3990 output.append(t)
3990 output.append(t)
3991
3991
3992 # multiple bookmarks for a single parent separated by '/'
3992 # multiple bookmarks for a single parent separated by '/'
3993 bm = b'/'.join(ctx.bookmarks())
3993 bm = b'/'.join(ctx.bookmarks())
3994 if bm:
3994 if bm:
3995 output.append(bm)
3995 output.append(bm)
3996 else:
3996 else:
3997 if branch:
3997 if branch:
3998 output.append(ctx.branch())
3998 output.append(ctx.branch())
3999
3999
4000 if tags:
4000 if tags:
4001 output.extend(taglist)
4001 output.extend(taglist)
4002
4002
4003 if bookmarks:
4003 if bookmarks:
4004 output.extend(ctx.bookmarks())
4004 output.extend(ctx.bookmarks())
4005
4005
4006 fm.data(node=ctx.hex())
4006 fm.data(node=ctx.hex())
4007 fm.data(branch=ctx.branch())
4007 fm.data(branch=ctx.branch())
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4010 fm.context(ctx=ctx)
4010 fm.context(ctx=ctx)
4011
4011
4012 fm.plain(b"%s\n" % b' '.join(output))
4012 fm.plain(b"%s\n" % b' '.join(output))
4013 fm.end()
4013 fm.end()
4014
4014
4015
4015
4016 @command(
4016 @command(
4017 b'import|patch',
4017 b'import|patch',
4018 [
4018 [
4019 (
4019 (
4020 b'p',
4020 b'p',
4021 b'strip',
4021 b'strip',
4022 1,
4022 1,
4023 _(
4023 _(
4024 b'directory strip option for patch. This has the same '
4024 b'directory strip option for patch. This has the same '
4025 b'meaning as the corresponding patch option'
4025 b'meaning as the corresponding patch option'
4026 ),
4026 ),
4027 _(b'NUM'),
4027 _(b'NUM'),
4028 ),
4028 ),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4032 (
4032 (
4033 b'f',
4033 b'f',
4034 b'force',
4034 b'force',
4035 None,
4035 None,
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4037 ),
4037 ),
4038 (
4038 (
4039 b'',
4039 b'',
4040 b'no-commit',
4040 b'no-commit',
4041 None,
4041 None,
4042 _(b"don't commit, just update the working directory"),
4042 _(b"don't commit, just update the working directory"),
4043 ),
4043 ),
4044 (
4044 (
4045 b'',
4045 b'',
4046 b'bypass',
4046 b'bypass',
4047 None,
4047 None,
4048 _(b"apply patch without touching the working directory"),
4048 _(b"apply patch without touching the working directory"),
4049 ),
4049 ),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4053 (
4053 (
4054 b'',
4054 b'',
4055 b'import-branch',
4055 b'import-branch',
4056 None,
4056 None,
4057 _(b'use any branch information in patch (implied by --exact)'),
4057 _(b'use any branch information in patch (implied by --exact)'),
4058 ),
4058 ),
4059 ]
4059 ]
4060 + commitopts
4060 + commitopts
4061 + commitopts2
4061 + commitopts2
4062 + similarityopts,
4062 + similarityopts,
4063 _(b'[OPTION]... PATCH...'),
4063 _(b'[OPTION]... PATCH...'),
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4065 )
4065 )
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4067 """import an ordered set of patches
4067 """import an ordered set of patches
4068
4068
4069 Import a list of patches and commit them individually (unless
4069 Import a list of patches and commit them individually (unless
4070 --no-commit is specified).
4070 --no-commit is specified).
4071
4071
4072 To read a patch from standard input (stdin), use "-" as the patch
4072 To read a patch from standard input (stdin), use "-" as the patch
4073 name. If a URL is specified, the patch will be downloaded from
4073 name. If a URL is specified, the patch will be downloaded from
4074 there.
4074 there.
4075
4075
4076 Import first applies changes to the working directory (unless
4076 Import first applies changes to the working directory (unless
4077 --bypass is specified), import will abort if there are outstanding
4077 --bypass is specified), import will abort if there are outstanding
4078 changes.
4078 changes.
4079
4079
4080 Use --bypass to apply and commit patches directly to the
4080 Use --bypass to apply and commit patches directly to the
4081 repository, without affecting the working directory. Without
4081 repository, without affecting the working directory. Without
4082 --exact, patches will be applied on top of the working directory
4082 --exact, patches will be applied on top of the working directory
4083 parent revision.
4083 parent revision.
4084
4084
4085 You can import a patch straight from a mail message. Even patches
4085 You can import a patch straight from a mail message. Even patches
4086 as attachments work (to use the body part, it must have type
4086 as attachments work (to use the body part, it must have type
4087 text/plain or text/x-patch). From and Subject headers of email
4087 text/plain or text/x-patch). From and Subject headers of email
4088 message are used as default committer and commit message. All
4088 message are used as default committer and commit message. All
4089 text/plain body parts before first diff are added to the commit
4089 text/plain body parts before first diff are added to the commit
4090 message.
4090 message.
4091
4091
4092 If the imported patch was generated by :hg:`export`, user and
4092 If the imported patch was generated by :hg:`export`, user and
4093 description from patch override values from message headers and
4093 description from patch override values from message headers and
4094 body. Values given on command line with -m/--message and -u/--user
4094 body. Values given on command line with -m/--message and -u/--user
4095 override these.
4095 override these.
4096
4096
4097 If --exact is specified, import will set the working directory to
4097 If --exact is specified, import will set the working directory to
4098 the parent of each patch before applying it, and will abort if the
4098 the parent of each patch before applying it, and will abort if the
4099 resulting changeset has a different ID than the one recorded in
4099 resulting changeset has a different ID than the one recorded in
4100 the patch. This will guard against various ways that portable
4100 the patch. This will guard against various ways that portable
4101 patch formats and mail systems might fail to transfer Mercurial
4101 patch formats and mail systems might fail to transfer Mercurial
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4103
4103
4104 Use --partial to ensure a changeset will be created from the patch
4104 Use --partial to ensure a changeset will be created from the patch
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4107 by hand before :hg:`commit --amend` is run to update the created
4107 by hand before :hg:`commit --amend` is run to update the created
4108 changeset. This flag exists to let people import patches that
4108 changeset. This flag exists to let people import patches that
4109 partially apply without losing the associated metadata (author,
4109 partially apply without losing the associated metadata (author,
4110 date, description, ...).
4110 date, description, ...).
4111
4111
4112 .. note::
4112 .. note::
4113
4113
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4115 an empty changeset, importing only the patch metadata.
4115 an empty changeset, importing only the patch metadata.
4116
4116
4117 With -s/--similarity, hg will attempt to discover renames and
4117 With -s/--similarity, hg will attempt to discover renames and
4118 copies in the patch in the same way as :hg:`addremove`.
4118 copies in the patch in the same way as :hg:`addremove`.
4119
4119
4120 It is possible to use external patch programs to perform the patch
4120 It is possible to use external patch programs to perform the patch
4121 by setting the ``ui.patch`` configuration option. For the default
4121 by setting the ``ui.patch`` configuration option. For the default
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4123 See :hg:`help config` for more information about configuration
4123 See :hg:`help config` for more information about configuration
4124 files and how to use these options.
4124 files and how to use these options.
4125
4125
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4127
4127
4128 .. container:: verbose
4128 .. container:: verbose
4129
4129
4130 Examples:
4130 Examples:
4131
4131
4132 - import a traditional patch from a website and detect renames::
4132 - import a traditional patch from a website and detect renames::
4133
4133
4134 hg import -s 80 http://example.com/bugfix.patch
4134 hg import -s 80 http://example.com/bugfix.patch
4135
4135
4136 - import a changeset from an hgweb server::
4136 - import a changeset from an hgweb server::
4137
4137
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4139
4139
4140 - import all the patches in an Unix-style mbox::
4140 - import all the patches in an Unix-style mbox::
4141
4141
4142 hg import incoming-patches.mbox
4142 hg import incoming-patches.mbox
4143
4143
4144 - import patches from stdin::
4144 - import patches from stdin::
4145
4145
4146 hg import -
4146 hg import -
4147
4147
4148 - attempt to exactly restore an exported changeset (not always
4148 - attempt to exactly restore an exported changeset (not always
4149 possible)::
4149 possible)::
4150
4150
4151 hg import --exact proposed-fix.patch
4151 hg import --exact proposed-fix.patch
4152
4152
4153 - use an external tool to apply a patch which is too fuzzy for
4153 - use an external tool to apply a patch which is too fuzzy for
4154 the default internal tool.
4154 the default internal tool.
4155
4155
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4157
4157
4158 - change the default fuzzing from 2 to a less strict 7
4158 - change the default fuzzing from 2 to a less strict 7
4159
4159
4160 hg import --config ui.fuzz=7 fuzz.patch
4160 hg import --config ui.fuzz=7 fuzz.patch
4161
4161
4162 Returns 0 on success, 1 on partial success (see --partial).
4162 Returns 0 on success, 1 on partial success (see --partial).
4163 """
4163 """
4164
4164
4165 opts = pycompat.byteskwargs(opts)
4165 opts = pycompat.byteskwargs(opts)
4166 if not patch1:
4166 if not patch1:
4167 raise error.Abort(_(b'need at least one patch to import'))
4167 raise error.Abort(_(b'need at least one patch to import'))
4168
4168
4169 patches = (patch1,) + patches
4169 patches = (patch1,) + patches
4170
4170
4171 date = opts.get(b'date')
4171 date = opts.get(b'date')
4172 if date:
4172 if date:
4173 opts[b'date'] = dateutil.parsedate(date)
4173 opts[b'date'] = dateutil.parsedate(date)
4174
4174
4175 exact = opts.get(b'exact')
4175 exact = opts.get(b'exact')
4176 update = not opts.get(b'bypass')
4176 update = not opts.get(b'bypass')
4177 if not update and opts.get(b'no_commit'):
4177 if not update and opts.get(b'no_commit'):
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4181 try:
4181 try:
4182 sim = float(opts.get(b'similarity') or 0)
4182 sim = float(opts.get(b'similarity') or 0)
4183 except ValueError:
4183 except ValueError:
4184 raise error.Abort(_(b'similarity must be a number'))
4184 raise error.Abort(_(b'similarity must be a number'))
4185 if sim < 0 or sim > 100:
4185 if sim < 0 or sim > 100:
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4187 if sim and not update:
4187 if sim and not update:
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4189 if exact:
4189 if exact:
4190 if opts.get(b'edit'):
4190 if opts.get(b'edit'):
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4192 if opts.get(b'prefix'):
4192 if opts.get(b'prefix'):
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4194
4194
4195 base = opts[b"base"]
4195 base = opts[b"base"]
4196 msgs = []
4196 msgs = []
4197 ret = 0
4197 ret = 0
4198
4198
4199 with repo.wlock():
4199 with repo.wlock():
4200 if update:
4200 if update:
4201 cmdutil.checkunfinished(repo)
4201 cmdutil.checkunfinished(repo)
4202 if exact or not opts.get(b'force'):
4202 if exact or not opts.get(b'force'):
4203 cmdutil.bailifchanged(repo)
4203 cmdutil.bailifchanged(repo)
4204
4204
4205 if not opts.get(b'no_commit'):
4205 if not opts.get(b'no_commit'):
4206 lock = repo.lock
4206 lock = repo.lock
4207 tr = lambda: repo.transaction(b'import')
4207 tr = lambda: repo.transaction(b'import')
4208 dsguard = util.nullcontextmanager
4208 dsguard = util.nullcontextmanager
4209 else:
4209 else:
4210 lock = util.nullcontextmanager
4210 lock = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4213 with lock(), tr(), dsguard():
4213 with lock(), tr(), dsguard():
4214 parents = repo[None].parents()
4214 parents = repo[None].parents()
4215 for patchurl in patches:
4215 for patchurl in patches:
4216 if patchurl == b'-':
4216 if patchurl == b'-':
4217 ui.status(_(b'applying patch from stdin\n'))
4217 ui.status(_(b'applying patch from stdin\n'))
4218 patchfile = ui.fin
4218 patchfile = ui.fin
4219 patchurl = b'stdin' # for error message
4219 patchurl = b'stdin' # for error message
4220 else:
4220 else:
4221 patchurl = os.path.join(base, patchurl)
4221 patchurl = os.path.join(base, patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4224
4224
4225 haspatch = False
4225 haspatch = False
4226 for hunk in patch.split(patchfile):
4226 for hunk in patch.split(patchfile):
4227 with patch.extract(ui, hunk) as patchdata:
4227 with patch.extract(ui, hunk) as patchdata:
4228 msg, node, rej = cmdutil.tryimportone(
4228 msg, node, rej = cmdutil.tryimportone(
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4230 )
4230 )
4231 if msg:
4231 if msg:
4232 haspatch = True
4232 haspatch = True
4233 ui.note(msg + b'\n')
4233 ui.note(msg + b'\n')
4234 if update or exact:
4234 if update or exact:
4235 parents = repo[None].parents()
4235 parents = repo[None].parents()
4236 else:
4236 else:
4237 parents = [repo[node]]
4237 parents = [repo[node]]
4238 if rej:
4238 if rej:
4239 ui.write_err(_(b"patch applied partially\n"))
4239 ui.write_err(_(b"patch applied partially\n"))
4240 ui.write_err(
4240 ui.write_err(
4241 _(
4241 _(
4242 b"(fix the .rej files and run "
4242 b"(fix the .rej files and run "
4243 b"`hg commit --amend`)\n"
4243 b"`hg commit --amend`)\n"
4244 )
4244 )
4245 )
4245 )
4246 ret = 1
4246 ret = 1
4247 break
4247 break
4248
4248
4249 if not haspatch:
4249 if not haspatch:
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4251
4251
4252 if msgs:
4252 if msgs:
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4254 return ret
4254 return ret
4255
4255
4256
4256
4257 @command(
4257 @command(
4258 b'incoming|in',
4258 b'incoming|in',
4259 [
4259 [
4260 (
4260 (
4261 b'f',
4261 b'f',
4262 b'force',
4262 b'force',
4263 None,
4263 None,
4264 _(b'run even if remote repository is unrelated'),
4264 _(b'run even if remote repository is unrelated'),
4265 ),
4265 ),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4268 (
4268 (
4269 b'r',
4269 b'r',
4270 b'rev',
4270 b'rev',
4271 [],
4271 [],
4272 _(b'a remote changeset intended to be added'),
4272 _(b'a remote changeset intended to be added'),
4273 _(b'REV'),
4273 _(b'REV'),
4274 ),
4274 ),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4276 (
4276 (
4277 b'b',
4277 b'b',
4278 b'branch',
4278 b'branch',
4279 [],
4279 [],
4280 _(b'a specific branch you would like to pull'),
4280 _(b'a specific branch you would like to pull'),
4281 _(b'BRANCH'),
4281 _(b'BRANCH'),
4282 ),
4282 ),
4283 ]
4283 ]
4284 + logopts
4284 + logopts
4285 + remoteopts
4285 + remoteopts
4286 + subrepoopts,
4286 + subrepoopts,
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4289 )
4289 )
4290 def incoming(ui, repo, source=b"default", **opts):
4290 def incoming(ui, repo, source=b"default", **opts):
4291 """show new changesets found in source
4291 """show new changesets found in source
4292
4292
4293 Show new changesets found in the specified path/URL or the default
4293 Show new changesets found in the specified path/URL or the default
4294 pull location. These are the changesets that would have been pulled
4294 pull location. These are the changesets that would have been pulled
4295 by :hg:`pull` at the time you issued this command.
4295 by :hg:`pull` at the time you issued this command.
4296
4296
4297 See pull for valid source format details.
4297 See pull for valid source format details.
4298
4298
4299 .. container:: verbose
4299 .. container:: verbose
4300
4300
4301 With -B/--bookmarks, the result of bookmark comparison between
4301 With -B/--bookmarks, the result of bookmark comparison between
4302 local and remote repositories is displayed. With -v/--verbose,
4302 local and remote repositories is displayed. With -v/--verbose,
4303 status is also displayed for each bookmark like below::
4303 status is also displayed for each bookmark like below::
4304
4304
4305 BM1 01234567890a added
4305 BM1 01234567890a added
4306 BM2 1234567890ab advanced
4306 BM2 1234567890ab advanced
4307 BM3 234567890abc diverged
4307 BM3 234567890abc diverged
4308 BM4 34567890abcd changed
4308 BM4 34567890abcd changed
4309
4309
4310 The action taken locally when pulling depends on the
4310 The action taken locally when pulling depends on the
4311 status of each bookmark:
4311 status of each bookmark:
4312
4312
4313 :``added``: pull will create it
4313 :``added``: pull will create it
4314 :``advanced``: pull will update it
4314 :``advanced``: pull will update it
4315 :``diverged``: pull will create a divergent bookmark
4315 :``diverged``: pull will create a divergent bookmark
4316 :``changed``: result depends on remote changesets
4316 :``changed``: result depends on remote changesets
4317
4317
4318 From the point of view of pulling behavior, bookmark
4318 From the point of view of pulling behavior, bookmark
4319 existing only in the remote repository are treated as ``added``,
4319 existing only in the remote repository are treated as ``added``,
4320 even if it is in fact locally deleted.
4320 even if it is in fact locally deleted.
4321
4321
4322 .. container:: verbose
4322 .. container:: verbose
4323
4323
4324 For remote repository, using --bundle avoids downloading the
4324 For remote repository, using --bundle avoids downloading the
4325 changesets twice if the incoming is followed by a pull.
4325 changesets twice if the incoming is followed by a pull.
4326
4326
4327 Examples:
4327 Examples:
4328
4328
4329 - show incoming changes with patches and full description::
4329 - show incoming changes with patches and full description::
4330
4330
4331 hg incoming -vp
4331 hg incoming -vp
4332
4332
4333 - show incoming changes excluding merges, store a bundle::
4333 - show incoming changes excluding merges, store a bundle::
4334
4334
4335 hg in -vpM --bundle incoming.hg
4335 hg in -vpM --bundle incoming.hg
4336 hg pull incoming.hg
4336 hg pull incoming.hg
4337
4337
4338 - briefly list changes inside a bundle::
4338 - briefly list changes inside a bundle::
4339
4339
4340 hg in changes.hg -T "{desc|firstline}\\n"
4340 hg in changes.hg -T "{desc|firstline}\\n"
4341
4341
4342 Returns 0 if there are incoming changes, 1 otherwise.
4342 Returns 0 if there are incoming changes, 1 otherwise.
4343 """
4343 """
4344 opts = pycompat.byteskwargs(opts)
4344 opts = pycompat.byteskwargs(opts)
4345 if opts.get(b'graph'):
4345 if opts.get(b'graph'):
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4347
4347
4348 def display(other, chlist, displayer):
4348 def display(other, chlist, displayer):
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4350 logcmdutil.displaygraph(
4350 logcmdutil.displaygraph(
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4352 )
4352 )
4353
4353
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4355 return 0
4355 return 0
4356
4356
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4359
4359
4360 if opts.get(b'bookmarks'):
4360 if opts.get(b'bookmarks'):
4361 source, branches = hg.parseurl(
4361 source, branches = hg.parseurl(
4362 ui.expandpath(source), opts.get(b'branch')
4362 ui.expandpath(source), opts.get(b'branch')
4363 )
4363 )
4364 other = hg.peer(repo, opts, source)
4364 other = hg.peer(repo, opts, source)
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4367 return 0
4367 return 0
4368 ui.pager(b'incoming')
4368 ui.pager(b'incoming')
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4370 return bookmarks.incoming(ui, repo, other)
4370 return bookmarks.incoming(ui, repo, other)
4371
4371
4372 repo._subtoppath = ui.expandpath(source)
4372 repo._subtoppath = ui.expandpath(source)
4373 try:
4373 try:
4374 return hg.incoming(ui, repo, source, opts)
4374 return hg.incoming(ui, repo, source, opts)
4375 finally:
4375 finally:
4376 del repo._subtoppath
4376 del repo._subtoppath
4377
4377
4378
4378
4379 @command(
4379 @command(
4380 b'init',
4380 b'init',
4381 remoteopts,
4381 remoteopts,
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4384 helpbasic=True,
4384 helpbasic=True,
4385 norepo=True,
4385 norepo=True,
4386 )
4386 )
4387 def init(ui, dest=b".", **opts):
4387 def init(ui, dest=b".", **opts):
4388 """create a new repository in the given directory
4388 """create a new repository in the given directory
4389
4389
4390 Initialize a new repository in the given directory. If the given
4390 Initialize a new repository in the given directory. If the given
4391 directory does not exist, it will be created.
4391 directory does not exist, it will be created.
4392
4392
4393 If no directory is given, the current directory is used.
4393 If no directory is given, the current directory is used.
4394
4394
4395 It is possible to specify an ``ssh://`` URL as the destination.
4395 It is possible to specify an ``ssh://`` URL as the destination.
4396 See :hg:`help urls` for more information.
4396 See :hg:`help urls` for more information.
4397
4397
4398 Returns 0 on success.
4398 Returns 0 on success.
4399 """
4399 """
4400 opts = pycompat.byteskwargs(opts)
4400 opts = pycompat.byteskwargs(opts)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4402
4402
4403
4403
4404 @command(
4404 @command(
4405 b'locate',
4405 b'locate',
4406 [
4406 [
4407 (
4407 (
4408 b'r',
4408 b'r',
4409 b'rev',
4409 b'rev',
4410 b'',
4410 b'',
4411 _(b'search the repository as it is in REV'),
4411 _(b'search the repository as it is in REV'),
4412 _(b'REV'),
4412 _(b'REV'),
4413 ),
4413 ),
4414 (
4414 (
4415 b'0',
4415 b'0',
4416 b'print0',
4416 b'print0',
4417 None,
4417 None,
4418 _(b'end filenames with NUL, for use with xargs'),
4418 _(b'end filenames with NUL, for use with xargs'),
4419 ),
4419 ),
4420 (
4420 (
4421 b'f',
4421 b'f',
4422 b'fullpath',
4422 b'fullpath',
4423 None,
4423 None,
4424 _(b'print complete paths from the filesystem root'),
4424 _(b'print complete paths from the filesystem root'),
4425 ),
4425 ),
4426 ]
4426 ]
4427 + walkopts,
4427 + walkopts,
4428 _(b'[OPTION]... [PATTERN]...'),
4428 _(b'[OPTION]... [PATTERN]...'),
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4430 )
4430 )
4431 def locate(ui, repo, *pats, **opts):
4431 def locate(ui, repo, *pats, **opts):
4432 """locate files matching specific patterns (DEPRECATED)
4432 """locate files matching specific patterns (DEPRECATED)
4433
4433
4434 Print files under Mercurial control in the working directory whose
4434 Print files under Mercurial control in the working directory whose
4435 names match the given patterns.
4435 names match the given patterns.
4436
4436
4437 By default, this command searches all directories in the working
4437 By default, this command searches all directories in the working
4438 directory. To search just the current directory and its
4438 directory. To search just the current directory and its
4439 subdirectories, use "--include .".
4439 subdirectories, use "--include .".
4440
4440
4441 If no patterns are given to match, this command prints the names
4441 If no patterns are given to match, this command prints the names
4442 of all files under Mercurial control in the working directory.
4442 of all files under Mercurial control in the working directory.
4443
4443
4444 If you want to feed the output of this command into the "xargs"
4444 If you want to feed the output of this command into the "xargs"
4445 command, use the -0 option to both this command and "xargs". This
4445 command, use the -0 option to both this command and "xargs". This
4446 will avoid the problem of "xargs" treating single filenames that
4446 will avoid the problem of "xargs" treating single filenames that
4447 contain whitespace as multiple filenames.
4447 contain whitespace as multiple filenames.
4448
4448
4449 See :hg:`help files` for a more versatile command.
4449 See :hg:`help files` for a more versatile command.
4450
4450
4451 Returns 0 if a match is found, 1 otherwise.
4451 Returns 0 if a match is found, 1 otherwise.
4452 """
4452 """
4453 opts = pycompat.byteskwargs(opts)
4453 opts = pycompat.byteskwargs(opts)
4454 if opts.get(b'print0'):
4454 if opts.get(b'print0'):
4455 end = b'\0'
4455 end = b'\0'
4456 else:
4456 else:
4457 end = b'\n'
4457 end = b'\n'
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4459
4459
4460 ret = 1
4460 ret = 1
4461 m = scmutil.match(
4461 m = scmutil.match(
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4463 )
4463 )
4464
4464
4465 ui.pager(b'locate')
4465 ui.pager(b'locate')
4466 if ctx.rev() is None:
4466 if ctx.rev() is None:
4467 # When run on the working copy, "locate" includes removed files, so
4467 # When run on the working copy, "locate" includes removed files, so
4468 # we get the list of files from the dirstate.
4468 # we get the list of files from the dirstate.
4469 filesgen = sorted(repo.dirstate.matches(m))
4469 filesgen = sorted(repo.dirstate.matches(m))
4470 else:
4470 else:
4471 filesgen = ctx.matches(m)
4471 filesgen = ctx.matches(m)
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4473 for abs in filesgen:
4473 for abs in filesgen:
4474 if opts.get(b'fullpath'):
4474 if opts.get(b'fullpath'):
4475 ui.write(repo.wjoin(abs), end)
4475 ui.write(repo.wjoin(abs), end)
4476 else:
4476 else:
4477 ui.write(uipathfn(abs), end)
4477 ui.write(uipathfn(abs), end)
4478 ret = 0
4478 ret = 0
4479
4479
4480 return ret
4480 return ret
4481
4481
4482
4482
4483 @command(
4483 @command(
4484 b'log|history',
4484 b'log|history',
4485 [
4485 [
4486 (
4486 (
4487 b'f',
4487 b'f',
4488 b'follow',
4488 b'follow',
4489 None,
4489 None,
4490 _(
4490 _(
4491 b'follow changeset history, or file history across copies and renames'
4491 b'follow changeset history, or file history across copies and renames'
4492 ),
4492 ),
4493 ),
4493 ),
4494 (
4494 (
4495 b'',
4495 b'',
4496 b'follow-first',
4496 b'follow-first',
4497 None,
4497 None,
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4499 ),
4499 ),
4500 (
4500 (
4501 b'd',
4501 b'd',
4502 b'date',
4502 b'date',
4503 b'',
4503 b'',
4504 _(b'show revisions matching date spec'),
4504 _(b'show revisions matching date spec'),
4505 _(b'DATE'),
4505 _(b'DATE'),
4506 ),
4506 ),
4507 (b'C', b'copies', None, _(b'show copied files')),
4507 (b'C', b'copies', None, _(b'show copied files')),
4508 (
4508 (
4509 b'k',
4509 b'k',
4510 b'keyword',
4510 b'keyword',
4511 [],
4511 [],
4512 _(b'do case-insensitive search for a given text'),
4512 _(b'do case-insensitive search for a given text'),
4513 _(b'TEXT'),
4513 _(b'TEXT'),
4514 ),
4514 ),
4515 (
4515 (
4516 b'r',
4516 b'r',
4517 b'rev',
4517 b'rev',
4518 [],
4518 [],
4519 _(b'show the specified revision or revset'),
4519 _(b'show the specified revision or revset'),
4520 _(b'REV'),
4520 _(b'REV'),
4521 ),
4521 ),
4522 (
4522 (
4523 b'L',
4523 b'L',
4524 b'line-range',
4524 b'line-range',
4525 [],
4525 [],
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4527 _(b'FILE,RANGE'),
4527 _(b'FILE,RANGE'),
4528 ),
4528 ),
4529 (
4529 (
4530 b'',
4530 b'',
4531 b'removed',
4531 b'removed',
4532 None,
4532 None,
4533 _(b'include revisions where files were removed'),
4533 _(b'include revisions where files were removed'),
4534 ),
4534 ),
4535 (
4535 (
4536 b'm',
4536 b'm',
4537 b'only-merges',
4537 b'only-merges',
4538 None,
4538 None,
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4540 ),
4540 ),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4542 (
4542 (
4543 b'',
4543 b'',
4544 b'only-branch',
4544 b'only-branch',
4545 [],
4545 [],
4546 _(
4546 _(
4547 b'show only changesets within the given named branch (DEPRECATED)'
4547 b'show only changesets within the given named branch (DEPRECATED)'
4548 ),
4548 ),
4549 _(b'BRANCH'),
4549 _(b'BRANCH'),
4550 ),
4550 ),
4551 (
4551 (
4552 b'b',
4552 b'b',
4553 b'branch',
4553 b'branch',
4554 [],
4554 [],
4555 _(b'show changesets within the given named branch'),
4555 _(b'show changesets within the given named branch'),
4556 _(b'BRANCH'),
4556 _(b'BRANCH'),
4557 ),
4557 ),
4558 (
4558 (
4559 b'P',
4559 b'P',
4560 b'prune',
4560 b'prune',
4561 [],
4561 [],
4562 _(b'do not display revision or any of its ancestors'),
4562 _(b'do not display revision or any of its ancestors'),
4563 _(b'REV'),
4563 _(b'REV'),
4564 ),
4564 ),
4565 ]
4565 ]
4566 + logopts
4566 + logopts
4567 + walkopts,
4567 + walkopts,
4568 _(b'[OPTION]... [FILE]'),
4568 _(b'[OPTION]... [FILE]'),
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4570 helpbasic=True,
4570 helpbasic=True,
4571 inferrepo=True,
4571 inferrepo=True,
4572 intents={INTENT_READONLY},
4572 intents={INTENT_READONLY},
4573 )
4573 )
4574 def log(ui, repo, *pats, **opts):
4574 def log(ui, repo, *pats, **opts):
4575 """show revision history of entire repository or files
4575 """show revision history of entire repository or files
4576
4576
4577 Print the revision history of the specified files or the entire
4577 Print the revision history of the specified files or the entire
4578 project.
4578 project.
4579
4579
4580 If no revision range is specified, the default is ``tip:0`` unless
4580 If no revision range is specified, the default is ``tip:0`` unless
4581 --follow is set, in which case the working directory parent is
4581 --follow is set, in which case the working directory parent is
4582 used as the starting revision.
4582 used as the starting revision.
4583
4583
4584 File history is shown without following rename or copy history of
4584 File history is shown without following rename or copy history of
4585 files. Use -f/--follow with a filename to follow history across
4585 files. Use -f/--follow with a filename to follow history across
4586 renames and copies. --follow without a filename will only show
4586 renames and copies. --follow without a filename will only show
4587 ancestors of the starting revision.
4587 ancestors of the starting revision.
4588
4588
4589 By default this command prints revision number and changeset id,
4589 By default this command prints revision number and changeset id,
4590 tags, non-trivial parents, user, date and time, and a summary for
4590 tags, non-trivial parents, user, date and time, and a summary for
4591 each commit. When the -v/--verbose switch is used, the list of
4591 each commit. When the -v/--verbose switch is used, the list of
4592 changed files and full commit message are shown.
4592 changed files and full commit message are shown.
4593
4593
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4595 recent changeset at the top.
4595 recent changeset at the top.
4596 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4596 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4597 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4597 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4598 changeset from the lines below is a parent of the 'o' merge on the same
4598 changeset from the lines below is a parent of the 'o' merge on the same
4599 line.
4599 line.
4600 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4600 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4601 of a '|' indicates one or more revisions in a path are omitted.
4601 of a '|' indicates one or more revisions in a path are omitted.
4602
4602
4603 .. container:: verbose
4603 .. container:: verbose
4604
4604
4605 Use -L/--line-range FILE,M:N options to follow the history of lines
4605 Use -L/--line-range FILE,M:N options to follow the history of lines
4606 from M to N in FILE. With -p/--patch only diff hunks affecting
4606 from M to N in FILE. With -p/--patch only diff hunks affecting
4607 specified line range will be shown. This option requires --follow;
4607 specified line range will be shown. This option requires --follow;
4608 it can be specified multiple times. Currently, this option is not
4608 it can be specified multiple times. Currently, this option is not
4609 compatible with --graph. This option is experimental.
4609 compatible with --graph. This option is experimental.
4610
4610
4611 .. note::
4611 .. note::
4612
4612
4613 :hg:`log --patch` may generate unexpected diff output for merge
4613 :hg:`log --patch` may generate unexpected diff output for merge
4614 changesets, as it will only compare the merge changeset against
4614 changesets, as it will only compare the merge changeset against
4615 its first parent. Also, only files different from BOTH parents
4615 its first parent. Also, only files different from BOTH parents
4616 will appear in files:.
4616 will appear in files:.
4617
4617
4618 .. note::
4618 .. note::
4619
4619
4620 For performance reasons, :hg:`log FILE` may omit duplicate changes
4620 For performance reasons, :hg:`log FILE` may omit duplicate changes
4621 made on branches and will not show removals or mode changes. To
4621 made on branches and will not show removals or mode changes. To
4622 see all such changes, use the --removed switch.
4622 see all such changes, use the --removed switch.
4623
4623
4624 .. container:: verbose
4624 .. container:: verbose
4625
4625
4626 .. note::
4626 .. note::
4627
4627
4628 The history resulting from -L/--line-range options depends on diff
4628 The history resulting from -L/--line-range options depends on diff
4629 options; for instance if white-spaces are ignored, respective changes
4629 options; for instance if white-spaces are ignored, respective changes
4630 with only white-spaces in specified line range will not be listed.
4630 with only white-spaces in specified line range will not be listed.
4631
4631
4632 .. container:: verbose
4632 .. container:: verbose
4633
4633
4634 Some examples:
4634 Some examples:
4635
4635
4636 - changesets with full descriptions and file lists::
4636 - changesets with full descriptions and file lists::
4637
4637
4638 hg log -v
4638 hg log -v
4639
4639
4640 - changesets ancestral to the working directory::
4640 - changesets ancestral to the working directory::
4641
4641
4642 hg log -f
4642 hg log -f
4643
4643
4644 - last 10 commits on the current branch::
4644 - last 10 commits on the current branch::
4645
4645
4646 hg log -l 10 -b .
4646 hg log -l 10 -b .
4647
4647
4648 - changesets showing all modifications of a file, including removals::
4648 - changesets showing all modifications of a file, including removals::
4649
4649
4650 hg log --removed file.c
4650 hg log --removed file.c
4651
4651
4652 - all changesets that touch a directory, with diffs, excluding merges::
4652 - all changesets that touch a directory, with diffs, excluding merges::
4653
4653
4654 hg log -Mp lib/
4654 hg log -Mp lib/
4655
4655
4656 - all revision numbers that match a keyword::
4656 - all revision numbers that match a keyword::
4657
4657
4658 hg log -k bug --template "{rev}\\n"
4658 hg log -k bug --template "{rev}\\n"
4659
4659
4660 - the full hash identifier of the working directory parent::
4660 - the full hash identifier of the working directory parent::
4661
4661
4662 hg log -r . --template "{node}\\n"
4662 hg log -r . --template "{node}\\n"
4663
4663
4664 - list available log templates::
4664 - list available log templates::
4665
4665
4666 hg log -T list
4666 hg log -T list
4667
4667
4668 - check if a given changeset is included in a tagged release::
4668 - check if a given changeset is included in a tagged release::
4669
4669
4670 hg log -r "a21ccf and ancestor(1.9)"
4670 hg log -r "a21ccf and ancestor(1.9)"
4671
4671
4672 - find all changesets by some user in a date range::
4672 - find all changesets by some user in a date range::
4673
4673
4674 hg log -k alice -d "may 2008 to jul 2008"
4674 hg log -k alice -d "may 2008 to jul 2008"
4675
4675
4676 - summary of all changesets after the last tag::
4676 - summary of all changesets after the last tag::
4677
4677
4678 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4678 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4679
4679
4680 - changesets touching lines 13 to 23 for file.c::
4680 - changesets touching lines 13 to 23 for file.c::
4681
4681
4682 hg log -L file.c,13:23
4682 hg log -L file.c,13:23
4683
4683
4684 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4684 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4685 main.c with patch::
4685 main.c with patch::
4686
4686
4687 hg log -L file.c,13:23 -L main.c,2:6 -p
4687 hg log -L file.c,13:23 -L main.c,2:6 -p
4688
4688
4689 See :hg:`help dates` for a list of formats valid for -d/--date.
4689 See :hg:`help dates` for a list of formats valid for -d/--date.
4690
4690
4691 See :hg:`help revisions` for more about specifying and ordering
4691 See :hg:`help revisions` for more about specifying and ordering
4692 revisions.
4692 revisions.
4693
4693
4694 See :hg:`help templates` for more about pre-packaged styles and
4694 See :hg:`help templates` for more about pre-packaged styles and
4695 specifying custom templates. The default template used by the log
4695 specifying custom templates. The default template used by the log
4696 command can be customized via the ``ui.logtemplate`` configuration
4696 command can be customized via the ``ui.logtemplate`` configuration
4697 setting.
4697 setting.
4698
4698
4699 Returns 0 on success.
4699 Returns 0 on success.
4700
4700
4701 """
4701 """
4702 opts = pycompat.byteskwargs(opts)
4702 opts = pycompat.byteskwargs(opts)
4703 linerange = opts.get(b'line_range')
4703 linerange = opts.get(b'line_range')
4704
4704
4705 if linerange and not opts.get(b'follow'):
4705 if linerange and not opts.get(b'follow'):
4706 raise error.Abort(_(b'--line-range requires --follow'))
4706 raise error.Abort(_(b'--line-range requires --follow'))
4707
4707
4708 if linerange and pats:
4708 if linerange and pats:
4709 # TODO: take pats as patterns with no line-range filter
4709 # TODO: take pats as patterns with no line-range filter
4710 raise error.Abort(
4710 raise error.Abort(
4711 _(b'FILE arguments are not compatible with --line-range option')
4711 _(b'FILE arguments are not compatible with --line-range option')
4712 )
4712 )
4713
4713
4714 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4714 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4715 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4715 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4716 if linerange:
4716 if linerange:
4717 # TODO: should follow file history from logcmdutil._initialrevs(),
4717 # TODO: should follow file history from logcmdutil._initialrevs(),
4718 # then filter the result by logcmdutil._makerevset() and --limit
4718 # then filter the result by logcmdutil._makerevset() and --limit
4719 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4719 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4720
4720
4721 getcopies = None
4721 getcopies = None
4722 if opts.get(b'copies'):
4722 if opts.get(b'copies'):
4723 endrev = None
4723 endrev = None
4724 if revs:
4724 if revs:
4725 endrev = revs.max() + 1
4725 endrev = revs.max() + 1
4726 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4726 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4727
4727
4728 ui.pager(b'log')
4728 ui.pager(b'log')
4729 displayer = logcmdutil.changesetdisplayer(
4729 displayer = logcmdutil.changesetdisplayer(
4730 ui, repo, opts, differ, buffered=True
4730 ui, repo, opts, differ, buffered=True
4731 )
4731 )
4732 if opts.get(b'graph'):
4732 if opts.get(b'graph'):
4733 displayfn = logcmdutil.displaygraphrevs
4733 displayfn = logcmdutil.displaygraphrevs
4734 else:
4734 else:
4735 displayfn = logcmdutil.displayrevs
4735 displayfn = logcmdutil.displayrevs
4736 displayfn(ui, repo, revs, displayer, getcopies)
4736 displayfn(ui, repo, revs, displayer, getcopies)
4737
4737
4738
4738
4739 @command(
4739 @command(
4740 b'manifest',
4740 b'manifest',
4741 [
4741 [
4742 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4742 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4743 (b'', b'all', False, _(b"list files from all revisions")),
4743 (b'', b'all', False, _(b"list files from all revisions")),
4744 ]
4744 ]
4745 + formatteropts,
4745 + formatteropts,
4746 _(b'[-r REV]'),
4746 _(b'[-r REV]'),
4747 helpcategory=command.CATEGORY_MAINTENANCE,
4747 helpcategory=command.CATEGORY_MAINTENANCE,
4748 intents={INTENT_READONLY},
4748 intents={INTENT_READONLY},
4749 )
4749 )
4750 def manifest(ui, repo, node=None, rev=None, **opts):
4750 def manifest(ui, repo, node=None, rev=None, **opts):
4751 """output the current or given revision of the project manifest
4751 """output the current or given revision of the project manifest
4752
4752
4753 Print a list of version controlled files for the given revision.
4753 Print a list of version controlled files for the given revision.
4754 If no revision is given, the first parent of the working directory
4754 If no revision is given, the first parent of the working directory
4755 is used, or the null revision if no revision is checked out.
4755 is used, or the null revision if no revision is checked out.
4756
4756
4757 With -v, print file permissions, symlink and executable bits.
4757 With -v, print file permissions, symlink and executable bits.
4758 With --debug, print file revision hashes.
4758 With --debug, print file revision hashes.
4759
4759
4760 If option --all is specified, the list of all files from all revisions
4760 If option --all is specified, the list of all files from all revisions
4761 is printed. This includes deleted and renamed files.
4761 is printed. This includes deleted and renamed files.
4762
4762
4763 Returns 0 on success.
4763 Returns 0 on success.
4764 """
4764 """
4765 opts = pycompat.byteskwargs(opts)
4765 opts = pycompat.byteskwargs(opts)
4766 fm = ui.formatter(b'manifest', opts)
4766 fm = ui.formatter(b'manifest', opts)
4767
4767
4768 if opts.get(b'all'):
4768 if opts.get(b'all'):
4769 if rev or node:
4769 if rev or node:
4770 raise error.Abort(_(b"can't specify a revision with --all"))
4770 raise error.Abort(_(b"can't specify a revision with --all"))
4771
4771
4772 res = set()
4772 res = set()
4773 for rev in repo:
4773 for rev in repo:
4774 ctx = repo[rev]
4774 ctx = repo[rev]
4775 res |= set(ctx.files())
4775 res |= set(ctx.files())
4776
4776
4777 ui.pager(b'manifest')
4777 ui.pager(b'manifest')
4778 for f in sorted(res):
4778 for f in sorted(res):
4779 fm.startitem()
4779 fm.startitem()
4780 fm.write(b"path", b'%s\n', f)
4780 fm.write(b"path", b'%s\n', f)
4781 fm.end()
4781 fm.end()
4782 return
4782 return
4783
4783
4784 if rev and node:
4784 if rev and node:
4785 raise error.Abort(_(b"please specify just one revision"))
4785 raise error.Abort(_(b"please specify just one revision"))
4786
4786
4787 if not node:
4787 if not node:
4788 node = rev
4788 node = rev
4789
4789
4790 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4790 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4791 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4791 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4792 if node:
4792 if node:
4793 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4793 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4794 ctx = scmutil.revsingle(repo, node)
4794 ctx = scmutil.revsingle(repo, node)
4795 mf = ctx.manifest()
4795 mf = ctx.manifest()
4796 ui.pager(b'manifest')
4796 ui.pager(b'manifest')
4797 for f in ctx:
4797 for f in ctx:
4798 fm.startitem()
4798 fm.startitem()
4799 fm.context(ctx=ctx)
4799 fm.context(ctx=ctx)
4800 fl = ctx[f].flags()
4800 fl = ctx[f].flags()
4801 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4801 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4802 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4802 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4803 fm.write(b'path', b'%s\n', f)
4803 fm.write(b'path', b'%s\n', f)
4804 fm.end()
4804 fm.end()
4805
4805
4806
4806
4807 @command(
4807 @command(
4808 b'merge',
4808 b'merge',
4809 [
4809 [
4810 (
4810 (
4811 b'f',
4811 b'f',
4812 b'force',
4812 b'force',
4813 None,
4813 None,
4814 _(b'force a merge including outstanding changes (DEPRECATED)'),
4814 _(b'force a merge including outstanding changes (DEPRECATED)'),
4815 ),
4815 ),
4816 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4816 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4817 (
4817 (
4818 b'P',
4818 b'P',
4819 b'preview',
4819 b'preview',
4820 None,
4820 None,
4821 _(b'review revisions to merge (no merge is performed)'),
4821 _(b'review revisions to merge (no merge is performed)'),
4822 ),
4822 ),
4823 (b'', b'abort', None, _(b'abort the ongoing merge')),
4823 (b'', b'abort', None, _(b'abort the ongoing merge')),
4824 ]
4824 ]
4825 + mergetoolopts,
4825 + mergetoolopts,
4826 _(b'[-P] [[-r] REV]'),
4826 _(b'[-P] [[-r] REV]'),
4827 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4827 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4828 helpbasic=True,
4828 helpbasic=True,
4829 )
4829 )
4830 def merge(ui, repo, node=None, **opts):
4830 def merge(ui, repo, node=None, **opts):
4831 """merge another revision into working directory
4831 """merge another revision into working directory
4832
4832
4833 The current working directory is updated with all changes made in
4833 The current working directory is updated with all changes made in
4834 the requested revision since the last common predecessor revision.
4834 the requested revision since the last common predecessor revision.
4835
4835
4836 Files that changed between either parent are marked as changed for
4836 Files that changed between either parent are marked as changed for
4837 the next commit and a commit must be performed before any further
4837 the next commit and a commit must be performed before any further
4838 updates to the repository are allowed. The next commit will have
4838 updates to the repository are allowed. The next commit will have
4839 two parents.
4839 two parents.
4840
4840
4841 ``--tool`` can be used to specify the merge tool used for file
4841 ``--tool`` can be used to specify the merge tool used for file
4842 merges. It overrides the HGMERGE environment variable and your
4842 merges. It overrides the HGMERGE environment variable and your
4843 configuration files. See :hg:`help merge-tools` for options.
4843 configuration files. See :hg:`help merge-tools` for options.
4844
4844
4845 If no revision is specified, the working directory's parent is a
4845 If no revision is specified, the working directory's parent is a
4846 head revision, and the current branch contains exactly one other
4846 head revision, and the current branch contains exactly one other
4847 head, the other head is merged with by default. Otherwise, an
4847 head, the other head is merged with by default. Otherwise, an
4848 explicit revision with which to merge must be provided.
4848 explicit revision with which to merge must be provided.
4849
4849
4850 See :hg:`help resolve` for information on handling file conflicts.
4850 See :hg:`help resolve` for information on handling file conflicts.
4851
4851
4852 To undo an uncommitted merge, use :hg:`merge --abort` which
4852 To undo an uncommitted merge, use :hg:`merge --abort` which
4853 will check out a clean copy of the original merge parent, losing
4853 will check out a clean copy of the original merge parent, losing
4854 all changes.
4854 all changes.
4855
4855
4856 Returns 0 on success, 1 if there are unresolved files.
4856 Returns 0 on success, 1 if there are unresolved files.
4857 """
4857 """
4858
4858
4859 opts = pycompat.byteskwargs(opts)
4859 opts = pycompat.byteskwargs(opts)
4860 abort = opts.get(b'abort')
4860 abort = opts.get(b'abort')
4861 if abort and repo.dirstate.p2() == nullid:
4861 if abort and repo.dirstate.p2() == nullid:
4862 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4862 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4863 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4863 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4864 if abort:
4864 if abort:
4865 state = cmdutil.getunfinishedstate(repo)
4865 state = cmdutil.getunfinishedstate(repo)
4866 if state and state._opname != b'merge':
4866 if state and state._opname != b'merge':
4867 raise error.Abort(
4867 raise error.Abort(
4868 _(b'cannot abort merge with %s in progress') % (state._opname),
4868 _(b'cannot abort merge with %s in progress') % (state._opname),
4869 hint=state.hint(),
4869 hint=state.hint(),
4870 )
4870 )
4871 if node:
4871 if node:
4872 raise error.Abort(_(b"cannot specify a node with --abort"))
4872 raise error.Abort(_(b"cannot specify a node with --abort"))
4873 return hg.abortmerge(repo.ui, repo)
4873 return hg.abortmerge(repo.ui, repo)
4874
4874
4875 if opts.get(b'rev') and node:
4875 if opts.get(b'rev') and node:
4876 raise error.Abort(_(b"please specify just one revision"))
4876 raise error.Abort(_(b"please specify just one revision"))
4877 if not node:
4877 if not node:
4878 node = opts.get(b'rev')
4878 node = opts.get(b'rev')
4879
4879
4880 if node:
4880 if node:
4881 ctx = scmutil.revsingle(repo, node)
4881 ctx = scmutil.revsingle(repo, node)
4882 else:
4882 else:
4883 if ui.configbool(b'commands', b'merge.require-rev'):
4883 if ui.configbool(b'commands', b'merge.require-rev'):
4884 raise error.Abort(
4884 raise error.Abort(
4885 _(
4885 _(
4886 b'configuration requires specifying revision to merge '
4886 b'configuration requires specifying revision to merge '
4887 b'with'
4887 b'with'
4888 )
4888 )
4889 )
4889 )
4890 ctx = repo[destutil.destmerge(repo)]
4890 ctx = repo[destutil.destmerge(repo)]
4891
4891
4892 if ctx.node() is None:
4892 if ctx.node() is None:
4893 raise error.Abort(_(b'merging with the working copy has no effect'))
4893 raise error.Abort(_(b'merging with the working copy has no effect'))
4894
4894
4895 if opts.get(b'preview'):
4895 if opts.get(b'preview'):
4896 # find nodes that are ancestors of p2 but not of p1
4896 # find nodes that are ancestors of p2 but not of p1
4897 p1 = repo[b'.'].node()
4897 p1 = repo[b'.'].node()
4898 p2 = ctx.node()
4898 p2 = ctx.node()
4899 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4899 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4900
4900
4901 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4901 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4902 for node in nodes:
4902 for node in nodes:
4903 displayer.show(repo[node])
4903 displayer.show(repo[node])
4904 displayer.close()
4904 displayer.close()
4905 return 0
4905 return 0
4906
4906
4907 # ui.forcemerge is an internal variable, do not document
4907 # ui.forcemerge is an internal variable, do not document
4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4909 with ui.configoverride(overrides, b'merge'):
4909 with ui.configoverride(overrides, b'merge'):
4910 force = opts.get(b'force')
4910 force = opts.get(b'force')
4911 labels = [b'working copy', b'merge rev']
4911 labels = [b'working copy', b'merge rev']
4912 return hg.merge(ctx, force=force, labels=labels)
4912 return hg.merge(ctx, force=force, labels=labels)
4913
4913
4914
4914
4915 statemod.addunfinished(
4915 statemod.addunfinished(
4916 b'merge',
4916 b'merge',
4917 fname=None,
4917 fname=None,
4918 clearable=True,
4918 clearable=True,
4919 allowcommit=True,
4919 allowcommit=True,
4920 cmdmsg=_(b'outstanding uncommitted merge'),
4920 cmdmsg=_(b'outstanding uncommitted merge'),
4921 abortfunc=hg.abortmerge,
4921 abortfunc=hg.abortmerge,
4922 statushint=_(
4922 statushint=_(
4923 b'To continue: hg commit\nTo abort: hg merge --abort'
4923 b'To continue: hg commit\nTo abort: hg merge --abort'
4924 ),
4924 ),
4925 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4925 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4926 )
4926 )
4927
4927
4928
4928
4929 @command(
4929 @command(
4930 b'outgoing|out',
4930 b'outgoing|out',
4931 [
4931 [
4932 (
4932 (
4933 b'f',
4933 b'f',
4934 b'force',
4934 b'force',
4935 None,
4935 None,
4936 _(b'run even when the destination is unrelated'),
4936 _(b'run even when the destination is unrelated'),
4937 ),
4937 ),
4938 (
4938 (
4939 b'r',
4939 b'r',
4940 b'rev',
4940 b'rev',
4941 [],
4941 [],
4942 _(b'a changeset intended to be included in the destination'),
4942 _(b'a changeset intended to be included in the destination'),
4943 _(b'REV'),
4943 _(b'REV'),
4944 ),
4944 ),
4945 (b'n', b'newest-first', None, _(b'show newest record first')),
4945 (b'n', b'newest-first', None, _(b'show newest record first')),
4946 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4946 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4947 (
4947 (
4948 b'b',
4948 b'b',
4949 b'branch',
4949 b'branch',
4950 [],
4950 [],
4951 _(b'a specific branch you would like to push'),
4951 _(b'a specific branch you would like to push'),
4952 _(b'BRANCH'),
4952 _(b'BRANCH'),
4953 ),
4953 ),
4954 ]
4954 ]
4955 + logopts
4955 + logopts
4956 + remoteopts
4956 + remoteopts
4957 + subrepoopts,
4957 + subrepoopts,
4958 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4958 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4959 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4959 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4960 )
4960 )
4961 def outgoing(ui, repo, dest=None, **opts):
4961 def outgoing(ui, repo, dest=None, **opts):
4962 """show changesets not found in the destination
4962 """show changesets not found in the destination
4963
4963
4964 Show changesets not found in the specified destination repository
4964 Show changesets not found in the specified destination repository
4965 or the default push location. These are the changesets that would
4965 or the default push location. These are the changesets that would
4966 be pushed if a push was requested.
4966 be pushed if a push was requested.
4967
4967
4968 See pull for details of valid destination formats.
4968 See pull for details of valid destination formats.
4969
4969
4970 .. container:: verbose
4970 .. container:: verbose
4971
4971
4972 With -B/--bookmarks, the result of bookmark comparison between
4972 With -B/--bookmarks, the result of bookmark comparison between
4973 local and remote repositories is displayed. With -v/--verbose,
4973 local and remote repositories is displayed. With -v/--verbose,
4974 status is also displayed for each bookmark like below::
4974 status is also displayed for each bookmark like below::
4975
4975
4976 BM1 01234567890a added
4976 BM1 01234567890a added
4977 BM2 deleted
4977 BM2 deleted
4978 BM3 234567890abc advanced
4978 BM3 234567890abc advanced
4979 BM4 34567890abcd diverged
4979 BM4 34567890abcd diverged
4980 BM5 4567890abcde changed
4980 BM5 4567890abcde changed
4981
4981
4982 The action taken when pushing depends on the
4982 The action taken when pushing depends on the
4983 status of each bookmark:
4983 status of each bookmark:
4984
4984
4985 :``added``: push with ``-B`` will create it
4985 :``added``: push with ``-B`` will create it
4986 :``deleted``: push with ``-B`` will delete it
4986 :``deleted``: push with ``-B`` will delete it
4987 :``advanced``: push will update it
4987 :``advanced``: push will update it
4988 :``diverged``: push with ``-B`` will update it
4988 :``diverged``: push with ``-B`` will update it
4989 :``changed``: push with ``-B`` will update it
4989 :``changed``: push with ``-B`` will update it
4990
4990
4991 From the point of view of pushing behavior, bookmarks
4991 From the point of view of pushing behavior, bookmarks
4992 existing only in the remote repository are treated as
4992 existing only in the remote repository are treated as
4993 ``deleted``, even if it is in fact added remotely.
4993 ``deleted``, even if it is in fact added remotely.
4994
4994
4995 Returns 0 if there are outgoing changes, 1 otherwise.
4995 Returns 0 if there are outgoing changes, 1 otherwise.
4996 """
4996 """
4997 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4997 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4998 # style URLs, so don't overwrite dest.
4998 # style URLs, so don't overwrite dest.
4999 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4999 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5000 if not path:
5000 if not path:
5001 raise error.Abort(
5001 raise error.Abort(
5002 _(b'default repository not configured!'),
5002 _(b'default repository not configured!'),
5003 hint=_(b"see 'hg help config.paths'"),
5003 hint=_(b"see 'hg help config.paths'"),
5004 )
5004 )
5005
5005
5006 opts = pycompat.byteskwargs(opts)
5006 opts = pycompat.byteskwargs(opts)
5007 if opts.get(b'graph'):
5007 if opts.get(b'graph'):
5008 logcmdutil.checkunsupportedgraphflags([], opts)
5008 logcmdutil.checkunsupportedgraphflags([], opts)
5009 o, other = hg._outgoing(ui, repo, dest, opts)
5009 o, other = hg._outgoing(ui, repo, dest, opts)
5010 if not o:
5010 if not o:
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5012 return
5012 return
5013
5013
5014 revdag = logcmdutil.graphrevs(repo, o, opts)
5014 revdag = logcmdutil.graphrevs(repo, o, opts)
5015 ui.pager(b'outgoing')
5015 ui.pager(b'outgoing')
5016 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5016 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5017 logcmdutil.displaygraph(
5017 logcmdutil.displaygraph(
5018 ui, repo, revdag, displayer, graphmod.asciiedges
5018 ui, repo, revdag, displayer, graphmod.asciiedges
5019 )
5019 )
5020 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5020 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5021 return 0
5021 return 0
5022
5022
5023 if opts.get(b'bookmarks'):
5023 if opts.get(b'bookmarks'):
5024 dest = path.pushloc or path.loc
5024 dest = path.pushloc or path.loc
5025 other = hg.peer(repo, opts, dest)
5025 other = hg.peer(repo, opts, dest)
5026 if b'bookmarks' not in other.listkeys(b'namespaces'):
5026 if b'bookmarks' not in other.listkeys(b'namespaces'):
5027 ui.warn(_(b"remote doesn't support bookmarks\n"))
5027 ui.warn(_(b"remote doesn't support bookmarks\n"))
5028 return 0
5028 return 0
5029 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5029 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5030 ui.pager(b'outgoing')
5030 ui.pager(b'outgoing')
5031 return bookmarks.outgoing(ui, repo, other)
5031 return bookmarks.outgoing(ui, repo, other)
5032
5032
5033 repo._subtoppath = path.pushloc or path.loc
5033 repo._subtoppath = path.pushloc or path.loc
5034 try:
5034 try:
5035 return hg.outgoing(ui, repo, dest, opts)
5035 return hg.outgoing(ui, repo, dest, opts)
5036 finally:
5036 finally:
5037 del repo._subtoppath
5037 del repo._subtoppath
5038
5038
5039
5039
5040 @command(
5040 @command(
5041 b'parents',
5041 b'parents',
5042 [
5042 [
5043 (
5043 (
5044 b'r',
5044 b'r',
5045 b'rev',
5045 b'rev',
5046 b'',
5046 b'',
5047 _(b'show parents of the specified revision'),
5047 _(b'show parents of the specified revision'),
5048 _(b'REV'),
5048 _(b'REV'),
5049 ),
5049 ),
5050 ]
5050 ]
5051 + templateopts,
5051 + templateopts,
5052 _(b'[-r REV] [FILE]'),
5052 _(b'[-r REV] [FILE]'),
5053 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5053 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5054 inferrepo=True,
5054 inferrepo=True,
5055 )
5055 )
5056 def parents(ui, repo, file_=None, **opts):
5056 def parents(ui, repo, file_=None, **opts):
5057 """show the parents of the working directory or revision (DEPRECATED)
5057 """show the parents of the working directory or revision (DEPRECATED)
5058
5058
5059 Print the working directory's parent revisions. If a revision is
5059 Print the working directory's parent revisions. If a revision is
5060 given via -r/--rev, the parent of that revision will be printed.
5060 given via -r/--rev, the parent of that revision will be printed.
5061 If a file argument is given, the revision in which the file was
5061 If a file argument is given, the revision in which the file was
5062 last changed (before the working directory revision or the
5062 last changed (before the working directory revision or the
5063 argument to --rev if given) is printed.
5063 argument to --rev if given) is printed.
5064
5064
5065 This command is equivalent to::
5065 This command is equivalent to::
5066
5066
5067 hg log -r "p1()+p2()" or
5067 hg log -r "p1()+p2()" or
5068 hg log -r "p1(REV)+p2(REV)" or
5068 hg log -r "p1(REV)+p2(REV)" or
5069 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5069 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5070 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5070 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5071
5071
5072 See :hg:`summary` and :hg:`help revsets` for related information.
5072 See :hg:`summary` and :hg:`help revsets` for related information.
5073
5073
5074 Returns 0 on success.
5074 Returns 0 on success.
5075 """
5075 """
5076
5076
5077 opts = pycompat.byteskwargs(opts)
5077 opts = pycompat.byteskwargs(opts)
5078 rev = opts.get(b'rev')
5078 rev = opts.get(b'rev')
5079 if rev:
5079 if rev:
5080 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5080 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5081 ctx = scmutil.revsingle(repo, rev, None)
5081 ctx = scmutil.revsingle(repo, rev, None)
5082
5082
5083 if file_:
5083 if file_:
5084 m = scmutil.match(ctx, (file_,), opts)
5084 m = scmutil.match(ctx, (file_,), opts)
5085 if m.anypats() or len(m.files()) != 1:
5085 if m.anypats() or len(m.files()) != 1:
5086 raise error.Abort(_(b'can only specify an explicit filename'))
5086 raise error.Abort(_(b'can only specify an explicit filename'))
5087 file_ = m.files()[0]
5087 file_ = m.files()[0]
5088 filenodes = []
5088 filenodes = []
5089 for cp in ctx.parents():
5089 for cp in ctx.parents():
5090 if not cp:
5090 if not cp:
5091 continue
5091 continue
5092 try:
5092 try:
5093 filenodes.append(cp.filenode(file_))
5093 filenodes.append(cp.filenode(file_))
5094 except error.LookupError:
5094 except error.LookupError:
5095 pass
5095 pass
5096 if not filenodes:
5096 if not filenodes:
5097 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5097 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5098 p = []
5098 p = []
5099 for fn in filenodes:
5099 for fn in filenodes:
5100 fctx = repo.filectx(file_, fileid=fn)
5100 fctx = repo.filectx(file_, fileid=fn)
5101 p.append(fctx.node())
5101 p.append(fctx.node())
5102 else:
5102 else:
5103 p = [cp.node() for cp in ctx.parents()]
5103 p = [cp.node() for cp in ctx.parents()]
5104
5104
5105 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5105 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5106 for n in p:
5106 for n in p:
5107 if n != nullid:
5107 if n != nullid:
5108 displayer.show(repo[n])
5108 displayer.show(repo[n])
5109 displayer.close()
5109 displayer.close()
5110
5110
5111
5111
5112 @command(
5112 @command(
5113 b'paths',
5113 b'paths',
5114 formatteropts,
5114 formatteropts,
5115 _(b'[NAME]'),
5115 _(b'[NAME]'),
5116 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5116 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5117 optionalrepo=True,
5117 optionalrepo=True,
5118 intents={INTENT_READONLY},
5118 intents={INTENT_READONLY},
5119 )
5119 )
5120 def paths(ui, repo, search=None, **opts):
5120 def paths(ui, repo, search=None, **opts):
5121 """show aliases for remote repositories
5121 """show aliases for remote repositories
5122
5122
5123 Show definition of symbolic path name NAME. If no name is given,
5123 Show definition of symbolic path name NAME. If no name is given,
5124 show definition of all available names.
5124 show definition of all available names.
5125
5125
5126 Option -q/--quiet suppresses all output when searching for NAME
5126 Option -q/--quiet suppresses all output when searching for NAME
5127 and shows only the path names when listing all definitions.
5127 and shows only the path names when listing all definitions.
5128
5128
5129 Path names are defined in the [paths] section of your
5129 Path names are defined in the [paths] section of your
5130 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5130 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5131 repository, ``.hg/hgrc`` is used, too.
5131 repository, ``.hg/hgrc`` is used, too.
5132
5132
5133 The path names ``default`` and ``default-push`` have a special
5133 The path names ``default`` and ``default-push`` have a special
5134 meaning. When performing a push or pull operation, they are used
5134 meaning. When performing a push or pull operation, they are used
5135 as fallbacks if no location is specified on the command-line.
5135 as fallbacks if no location is specified on the command-line.
5136 When ``default-push`` is set, it will be used for push and
5136 When ``default-push`` is set, it will be used for push and
5137 ``default`` will be used for pull; otherwise ``default`` is used
5137 ``default`` will be used for pull; otherwise ``default`` is used
5138 as the fallback for both. When cloning a repository, the clone
5138 as the fallback for both. When cloning a repository, the clone
5139 source is written as ``default`` in ``.hg/hgrc``.
5139 source is written as ``default`` in ``.hg/hgrc``.
5140
5140
5141 .. note::
5141 .. note::
5142
5142
5143 ``default`` and ``default-push`` apply to all inbound (e.g.
5143 ``default`` and ``default-push`` apply to all inbound (e.g.
5144 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5144 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5145 and :hg:`bundle`) operations.
5145 and :hg:`bundle`) operations.
5146
5146
5147 See :hg:`help urls` for more information.
5147 See :hg:`help urls` for more information.
5148
5148
5149 .. container:: verbose
5149 .. container:: verbose
5150
5150
5151 Template:
5151 Template:
5152
5152
5153 The following keywords are supported. See also :hg:`help templates`.
5153 The following keywords are supported. See also :hg:`help templates`.
5154
5154
5155 :name: String. Symbolic name of the path alias.
5155 :name: String. Symbolic name of the path alias.
5156 :pushurl: String. URL for push operations.
5156 :pushurl: String. URL for push operations.
5157 :url: String. URL or directory path for the other operations.
5157 :url: String. URL or directory path for the other operations.
5158
5158
5159 Returns 0 on success.
5159 Returns 0 on success.
5160 """
5160 """
5161
5161
5162 opts = pycompat.byteskwargs(opts)
5162 opts = pycompat.byteskwargs(opts)
5163 ui.pager(b'paths')
5163 ui.pager(b'paths')
5164 if search:
5164 if search:
5165 pathitems = [
5165 pathitems = [
5166 (name, path)
5166 (name, path)
5167 for name, path in pycompat.iteritems(ui.paths)
5167 for name, path in pycompat.iteritems(ui.paths)
5168 if name == search
5168 if name == search
5169 ]
5169 ]
5170 else:
5170 else:
5171 pathitems = sorted(pycompat.iteritems(ui.paths))
5171 pathitems = sorted(pycompat.iteritems(ui.paths))
5172
5172
5173 fm = ui.formatter(b'paths', opts)
5173 fm = ui.formatter(b'paths', opts)
5174 if fm.isplain():
5174 if fm.isplain():
5175 hidepassword = util.hidepassword
5175 hidepassword = util.hidepassword
5176 else:
5176 else:
5177 hidepassword = bytes
5177 hidepassword = bytes
5178 if ui.quiet:
5178 if ui.quiet:
5179 namefmt = b'%s\n'
5179 namefmt = b'%s\n'
5180 else:
5180 else:
5181 namefmt = b'%s = '
5181 namefmt = b'%s = '
5182 showsubopts = not search and not ui.quiet
5182 showsubopts = not search and not ui.quiet
5183
5183
5184 for name, path in pathitems:
5184 for name, path in pathitems:
5185 fm.startitem()
5185 fm.startitem()
5186 fm.condwrite(not search, b'name', namefmt, name)
5186 fm.condwrite(not search, b'name', namefmt, name)
5187 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5187 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5188 for subopt, value in sorted(path.suboptions.items()):
5188 for subopt, value in sorted(path.suboptions.items()):
5189 assert subopt not in (b'name', b'url')
5189 assert subopt not in (b'name', b'url')
5190 if showsubopts:
5190 if showsubopts:
5191 fm.plain(b'%s:%s = ' % (name, subopt))
5191 fm.plain(b'%s:%s = ' % (name, subopt))
5192 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5192 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5193
5193
5194 fm.end()
5194 fm.end()
5195
5195
5196 if search and not pathitems:
5196 if search and not pathitems:
5197 if not ui.quiet:
5197 if not ui.quiet:
5198 ui.warn(_(b"not found!\n"))
5198 ui.warn(_(b"not found!\n"))
5199 return 1
5199 return 1
5200 else:
5200 else:
5201 return 0
5201 return 0
5202
5202
5203
5203
5204 @command(
5204 @command(
5205 b'phase',
5205 b'phase',
5206 [
5206 [
5207 (b'p', b'public', False, _(b'set changeset phase to public')),
5207 (b'p', b'public', False, _(b'set changeset phase to public')),
5208 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5208 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5209 (b's', b'secret', False, _(b'set changeset phase to secret')),
5209 (b's', b'secret', False, _(b'set changeset phase to secret')),
5210 (b'f', b'force', False, _(b'allow to move boundary backward')),
5210 (b'f', b'force', False, _(b'allow to move boundary backward')),
5211 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5211 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5212 ],
5212 ],
5213 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5213 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5214 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5214 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5215 )
5215 )
5216 def phase(ui, repo, *revs, **opts):
5216 def phase(ui, repo, *revs, **opts):
5217 """set or show the current phase name
5217 """set or show the current phase name
5218
5218
5219 With no argument, show the phase name of the current revision(s).
5219 With no argument, show the phase name of the current revision(s).
5220
5220
5221 With one of -p/--public, -d/--draft or -s/--secret, change the
5221 With one of -p/--public, -d/--draft or -s/--secret, change the
5222 phase value of the specified revisions.
5222 phase value of the specified revisions.
5223
5223
5224 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5224 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5225 lower phase to a higher phase. Phases are ordered as follows::
5225 lower phase to a higher phase. Phases are ordered as follows::
5226
5226
5227 public < draft < secret
5227 public < draft < secret
5228
5228
5229 Returns 0 on success, 1 if some phases could not be changed.
5229 Returns 0 on success, 1 if some phases could not be changed.
5230
5230
5231 (For more information about the phases concept, see :hg:`help phases`.)
5231 (For more information about the phases concept, see :hg:`help phases`.)
5232 """
5232 """
5233 opts = pycompat.byteskwargs(opts)
5233 opts = pycompat.byteskwargs(opts)
5234 # search for a unique phase argument
5234 # search for a unique phase argument
5235 targetphase = None
5235 targetphase = None
5236 for idx, name in enumerate(phases.cmdphasenames):
5236 for idx, name in enumerate(phases.cmdphasenames):
5237 if opts[name]:
5237 if opts[name]:
5238 if targetphase is not None:
5238 if targetphase is not None:
5239 raise error.Abort(_(b'only one phase can be specified'))
5239 raise error.Abort(_(b'only one phase can be specified'))
5240 targetphase = idx
5240 targetphase = idx
5241
5241
5242 # look for specified revision
5242 # look for specified revision
5243 revs = list(revs)
5243 revs = list(revs)
5244 revs.extend(opts[b'rev'])
5244 revs.extend(opts[b'rev'])
5245 if not revs:
5245 if not revs:
5246 # display both parents as the second parent phase can influence
5246 # display both parents as the second parent phase can influence
5247 # the phase of a merge commit
5247 # the phase of a merge commit
5248 revs = [c.rev() for c in repo[None].parents()]
5248 revs = [c.rev() for c in repo[None].parents()]
5249
5249
5250 revs = scmutil.revrange(repo, revs)
5250 revs = scmutil.revrange(repo, revs)
5251
5251
5252 ret = 0
5252 ret = 0
5253 if targetphase is None:
5253 if targetphase is None:
5254 # display
5254 # display
5255 for r in revs:
5255 for r in revs:
5256 ctx = repo[r]
5256 ctx = repo[r]
5257 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5257 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5258 else:
5258 else:
5259 with repo.lock(), repo.transaction(b"phase") as tr:
5259 with repo.lock(), repo.transaction(b"phase") as tr:
5260 # set phase
5260 # set phase
5261 if not revs:
5261 if not revs:
5262 raise error.Abort(_(b'empty revision set'))
5262 raise error.Abort(_(b'empty revision set'))
5263 nodes = [repo[r].node() for r in revs]
5263 nodes = [repo[r].node() for r in revs]
5264 # moving revision from public to draft may hide them
5264 # moving revision from public to draft may hide them
5265 # We have to check result on an unfiltered repository
5265 # We have to check result on an unfiltered repository
5266 unfi = repo.unfiltered()
5266 unfi = repo.unfiltered()
5267 getphase = unfi._phasecache.phase
5267 getphase = unfi._phasecache.phase
5268 olddata = [getphase(unfi, r) for r in unfi]
5268 olddata = [getphase(unfi, r) for r in unfi]
5269 phases.advanceboundary(repo, tr, targetphase, nodes)
5269 phases.advanceboundary(repo, tr, targetphase, nodes)
5270 if opts[b'force']:
5270 if opts[b'force']:
5271 phases.retractboundary(repo, tr, targetphase, nodes)
5271 phases.retractboundary(repo, tr, targetphase, nodes)
5272 getphase = unfi._phasecache.phase
5272 getphase = unfi._phasecache.phase
5273 newdata = [getphase(unfi, r) for r in unfi]
5273 newdata = [getphase(unfi, r) for r in unfi]
5274 changes = sum(newdata[r] != olddata[r] for r in unfi)
5274 changes = sum(newdata[r] != olddata[r] for r in unfi)
5275 cl = unfi.changelog
5275 cl = unfi.changelog
5276 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5276 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5277 if rejected:
5277 if rejected:
5278 ui.warn(
5278 ui.warn(
5279 _(
5279 _(
5280 b'cannot move %i changesets to a higher '
5280 b'cannot move %i changesets to a higher '
5281 b'phase, use --force\n'
5281 b'phase, use --force\n'
5282 )
5282 )
5283 % len(rejected)
5283 % len(rejected)
5284 )
5284 )
5285 ret = 1
5285 ret = 1
5286 if changes:
5286 if changes:
5287 msg = _(b'phase changed for %i changesets\n') % changes
5287 msg = _(b'phase changed for %i changesets\n') % changes
5288 if ret:
5288 if ret:
5289 ui.status(msg)
5289 ui.status(msg)
5290 else:
5290 else:
5291 ui.note(msg)
5291 ui.note(msg)
5292 else:
5292 else:
5293 ui.warn(_(b'no phases changed\n'))
5293 ui.warn(_(b'no phases changed\n'))
5294 return ret
5294 return ret
5295
5295
5296
5296
5297 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5297 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5298 """Run after a changegroup has been added via pull/unbundle
5298 """Run after a changegroup has been added via pull/unbundle
5299
5299
5300 This takes arguments below:
5300 This takes arguments below:
5301
5301
5302 :modheads: change of heads by pull/unbundle
5302 :modheads: change of heads by pull/unbundle
5303 :optupdate: updating working directory is needed or not
5303 :optupdate: updating working directory is needed or not
5304 :checkout: update destination revision (or None to default destination)
5304 :checkout: update destination revision (or None to default destination)
5305 :brev: a name, which might be a bookmark to be activated after updating
5305 :brev: a name, which might be a bookmark to be activated after updating
5306 """
5306 """
5307 if modheads == 0:
5307 if modheads == 0:
5308 return
5308 return
5309 if optupdate:
5309 if optupdate:
5310 try:
5310 try:
5311 return hg.updatetotally(ui, repo, checkout, brev)
5311 return hg.updatetotally(ui, repo, checkout, brev)
5312 except error.UpdateAbort as inst:
5312 except error.UpdateAbort as inst:
5313 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5313 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5314 hint = inst.hint
5314 hint = inst.hint
5315 raise error.UpdateAbort(msg, hint=hint)
5315 raise error.UpdateAbort(msg, hint=hint)
5316 if modheads is not None and modheads > 1:
5316 if modheads is not None and modheads > 1:
5317 currentbranchheads = len(repo.branchheads())
5317 currentbranchheads = len(repo.branchheads())
5318 if currentbranchheads == modheads:
5318 if currentbranchheads == modheads:
5319 ui.status(
5319 ui.status(
5320 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5320 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5321 )
5321 )
5322 elif currentbranchheads > 1:
5322 elif currentbranchheads > 1:
5323 ui.status(
5323 ui.status(
5324 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5324 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5325 )
5325 )
5326 else:
5326 else:
5327 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5327 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5328 elif not ui.configbool(b'commands', b'update.requiredest'):
5328 elif not ui.configbool(b'commands', b'update.requiredest'):
5329 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5329 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5330
5330
5331
5331
5332 @command(
5332 @command(
5333 b'pull',
5333 b'pull',
5334 [
5334 [
5335 (
5335 (
5336 b'u',
5336 b'u',
5337 b'update',
5337 b'update',
5338 None,
5338 None,
5339 _(b'update to new branch head if new descendants were pulled'),
5339 _(b'update to new branch head if new descendants were pulled'),
5340 ),
5340 ),
5341 (
5341 (
5342 b'f',
5342 b'f',
5343 b'force',
5343 b'force',
5344 None,
5344 None,
5345 _(b'run even when remote repository is unrelated'),
5345 _(b'run even when remote repository is unrelated'),
5346 ),
5346 ),
5347 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5347 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5348 (
5348 (
5349 b'r',
5349 b'r',
5350 b'rev',
5350 b'rev',
5351 [],
5351 [],
5352 _(b'a remote changeset intended to be added'),
5352 _(b'a remote changeset intended to be added'),
5353 _(b'REV'),
5353 _(b'REV'),
5354 ),
5354 ),
5355 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5355 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5356 (
5356 (
5357 b'b',
5357 b'b',
5358 b'branch',
5358 b'branch',
5359 [],
5359 [],
5360 _(b'a specific branch you would like to pull'),
5360 _(b'a specific branch you would like to pull'),
5361 _(b'BRANCH'),
5361 _(b'BRANCH'),
5362 ),
5362 ),
5363 ]
5363 ]
5364 + remoteopts,
5364 + remoteopts,
5365 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5365 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5366 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5366 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5367 helpbasic=True,
5367 helpbasic=True,
5368 )
5368 )
5369 def pull(ui, repo, source=b"default", **opts):
5369 def pull(ui, repo, source=b"default", **opts):
5370 """pull changes from the specified source
5370 """pull changes from the specified source
5371
5371
5372 Pull changes from a remote repository to a local one.
5372 Pull changes from a remote repository to a local one.
5373
5373
5374 This finds all changes from the repository at the specified path
5374 This finds all changes from the repository at the specified path
5375 or URL and adds them to a local repository (the current one unless
5375 or URL and adds them to a local repository (the current one unless
5376 -R is specified). By default, this does not update the copy of the
5376 -R is specified). By default, this does not update the copy of the
5377 project in the working directory.
5377 project in the working directory.
5378
5378
5379 When cloning from servers that support it, Mercurial may fetch
5379 When cloning from servers that support it, Mercurial may fetch
5380 pre-generated data. When this is done, hooks operating on incoming
5380 pre-generated data. When this is done, hooks operating on incoming
5381 changesets and changegroups may fire more than once, once for each
5381 changesets and changegroups may fire more than once, once for each
5382 pre-generated bundle and as well as for any additional remaining
5382 pre-generated bundle and as well as for any additional remaining
5383 data. See :hg:`help -e clonebundles` for more.
5383 data. See :hg:`help -e clonebundles` for more.
5384
5384
5385 Use :hg:`incoming` if you want to see what would have been added
5385 Use :hg:`incoming` if you want to see what would have been added
5386 by a pull at the time you issued this command. If you then decide
5386 by a pull at the time you issued this command. If you then decide
5387 to add those changes to the repository, you should use :hg:`pull
5387 to add those changes to the repository, you should use :hg:`pull
5388 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5388 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5389
5389
5390 If SOURCE is omitted, the 'default' path will be used.
5390 If SOURCE is omitted, the 'default' path will be used.
5391 See :hg:`help urls` for more information.
5391 See :hg:`help urls` for more information.
5392
5392
5393 Specifying bookmark as ``.`` is equivalent to specifying the active
5393 Specifying bookmark as ``.`` is equivalent to specifying the active
5394 bookmark's name.
5394 bookmark's name.
5395
5395
5396 Returns 0 on success, 1 if an update had unresolved files.
5396 Returns 0 on success, 1 if an update had unresolved files.
5397 """
5397 """
5398
5398
5399 opts = pycompat.byteskwargs(opts)
5399 opts = pycompat.byteskwargs(opts)
5400 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5400 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5401 b'update'
5401 b'update'
5402 ):
5402 ):
5403 msg = _(b'update destination required by configuration')
5403 msg = _(b'update destination required by configuration')
5404 hint = _(b'use hg pull followed by hg update DEST')
5404 hint = _(b'use hg pull followed by hg update DEST')
5405 raise error.Abort(msg, hint=hint)
5405 raise error.Abort(msg, hint=hint)
5406
5406
5407 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5407 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5408 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5408 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5409 other = hg.peer(repo, opts, source)
5409 other = hg.peer(repo, opts, source)
5410 try:
5410 try:
5411 revs, checkout = hg.addbranchrevs(
5411 revs, checkout = hg.addbranchrevs(
5412 repo, other, branches, opts.get(b'rev')
5412 repo, other, branches, opts.get(b'rev')
5413 )
5413 )
5414
5414
5415 pullopargs = {}
5415 pullopargs = {}
5416
5416
5417 nodes = None
5417 nodes = None
5418 if opts.get(b'bookmark') or revs:
5418 if opts.get(b'bookmark') or revs:
5419 # The list of bookmark used here is the same used to actually update
5419 # The list of bookmark used here is the same used to actually update
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # all lookup and bookmark queries in one go so they see the same
5421 # all lookup and bookmark queries in one go so they see the same
5422 # version of the server state (issue 4700).
5422 # version of the server state (issue 4700).
5423 nodes = []
5423 nodes = []
5424 fnodes = []
5424 fnodes = []
5425 revs = revs or []
5425 revs = revs or []
5426 if revs and not other.capable(b'lookup'):
5426 if revs and not other.capable(b'lookup'):
5427 err = _(
5427 err = _(
5428 b"other repository doesn't support revision lookup, "
5428 b"other repository doesn't support revision lookup, "
5429 b"so a rev cannot be specified."
5429 b"so a rev cannot be specified."
5430 )
5430 )
5431 raise error.Abort(err)
5431 raise error.Abort(err)
5432 with other.commandexecutor() as e:
5432 with other.commandexecutor() as e:
5433 fremotebookmarks = e.callcommand(
5433 fremotebookmarks = e.callcommand(
5434 b'listkeys', {b'namespace': b'bookmarks'}
5434 b'listkeys', {b'namespace': b'bookmarks'}
5435 )
5435 )
5436 for r in revs:
5436 for r in revs:
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 remotebookmarks = fremotebookmarks.result()
5438 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 for b in opts.get(b'bookmark', []):
5441 for b in opts.get(b'bookmark', []):
5442 b = repo._bookmarks.expandname(b)
5442 b = repo._bookmarks.expandname(b)
5443 if b not in remotebookmarks:
5443 if b not in remotebookmarks:
5444 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5444 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5445 nodes.append(remotebookmarks[b])
5445 nodes.append(remotebookmarks[b])
5446 for i, rev in enumerate(revs):
5446 for i, rev in enumerate(revs):
5447 node = fnodes[i].result()
5447 node = fnodes[i].result()
5448 nodes.append(node)
5448 nodes.append(node)
5449 if rev == checkout:
5449 if rev == checkout:
5450 checkout = node
5450 checkout = node
5451
5451
5452 wlock = util.nullcontextmanager()
5452 wlock = util.nullcontextmanager()
5453 if opts.get(b'update'):
5453 if opts.get(b'update'):
5454 wlock = repo.wlock()
5454 wlock = repo.wlock()
5455 with wlock:
5455 with wlock:
5456 pullopargs.update(opts.get(b'opargs', {}))
5456 pullopargs.update(opts.get(b'opargs', {}))
5457 modheads = exchange.pull(
5457 modheads = exchange.pull(
5458 repo,
5458 repo,
5459 other,
5459 other,
5460 heads=nodes,
5460 heads=nodes,
5461 force=opts.get(b'force'),
5461 force=opts.get(b'force'),
5462 bookmarks=opts.get(b'bookmark', ()),
5462 bookmarks=opts.get(b'bookmark', ()),
5463 opargs=pullopargs,
5463 opargs=pullopargs,
5464 confirm=opts.get(b'confirm'),
5464 confirm=opts.get(b'confirm'),
5465 ).cgresult
5465 ).cgresult
5466
5466
5467 # brev is a name, which might be a bookmark to be activated at
5467 # brev is a name, which might be a bookmark to be activated at
5468 # the end of the update. In other words, it is an explicit
5468 # the end of the update. In other words, it is an explicit
5469 # destination of the update
5469 # destination of the update
5470 brev = None
5470 brev = None
5471
5471
5472 if checkout:
5472 if checkout:
5473 checkout = repo.unfiltered().changelog.rev(checkout)
5473 checkout = repo.unfiltered().changelog.rev(checkout)
5474
5474
5475 # order below depends on implementation of
5475 # order below depends on implementation of
5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5477 # because 'checkout' is determined without it.
5477 # because 'checkout' is determined without it.
5478 if opts.get(b'rev'):
5478 if opts.get(b'rev'):
5479 brev = opts[b'rev'][0]
5479 brev = opts[b'rev'][0]
5480 elif opts.get(b'branch'):
5480 elif opts.get(b'branch'):
5481 brev = opts[b'branch'][0]
5481 brev = opts[b'branch'][0]
5482 else:
5482 else:
5483 brev = branches[0]
5483 brev = branches[0]
5484 repo._subtoppath = source
5484 repo._subtoppath = source
5485 try:
5485 try:
5486 ret = postincoming(
5486 ret = postincoming(
5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5488 )
5488 )
5489 except error.FilteredRepoLookupError as exc:
5489 except error.FilteredRepoLookupError as exc:
5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5491 exc.args = (msg,) + exc.args[1:]
5491 exc.args = (msg,) + exc.args[1:]
5492 raise
5492 raise
5493 finally:
5493 finally:
5494 del repo._subtoppath
5494 del repo._subtoppath
5495
5495
5496 finally:
5496 finally:
5497 other.close()
5497 other.close()
5498 return ret
5498 return ret
5499
5499
5500
5500
5501 @command(
5501 @command(
5502 b'push',
5502 b'push',
5503 [
5503 [
5504 (b'f', b'force', None, _(b'force push')),
5504 (b'f', b'force', None, _(b'force push')),
5505 (
5505 (
5506 b'r',
5506 b'r',
5507 b'rev',
5507 b'rev',
5508 [],
5508 [],
5509 _(b'a changeset intended to be included in the destination'),
5509 _(b'a changeset intended to be included in the destination'),
5510 _(b'REV'),
5510 _(b'REV'),
5511 ),
5511 ),
5512 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5512 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5513 (
5513 (
5514 b'b',
5514 b'b',
5515 b'branch',
5515 b'branch',
5516 [],
5516 [],
5517 _(b'a specific branch you would like to push'),
5517 _(b'a specific branch you would like to push'),
5518 _(b'BRANCH'),
5518 _(b'BRANCH'),
5519 ),
5519 ),
5520 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5520 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5521 (
5521 (
5522 b'',
5522 b'',
5523 b'pushvars',
5523 b'pushvars',
5524 [],
5524 [],
5525 _(b'variables that can be sent to server (ADVANCED)'),
5525 _(b'variables that can be sent to server (ADVANCED)'),
5526 ),
5526 ),
5527 (
5527 (
5528 b'',
5528 b'',
5529 b'publish',
5529 b'publish',
5530 False,
5530 False,
5531 _(b'push the changeset as public (EXPERIMENTAL)'),
5531 _(b'push the changeset as public (EXPERIMENTAL)'),
5532 ),
5532 ),
5533 ]
5533 ]
5534 + remoteopts,
5534 + remoteopts,
5535 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5535 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5536 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5536 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5537 helpbasic=True,
5537 helpbasic=True,
5538 )
5538 )
5539 def push(ui, repo, dest=None, **opts):
5539 def push(ui, repo, dest=None, **opts):
5540 """push changes to the specified destination
5540 """push changes to the specified destination
5541
5541
5542 Push changesets from the local repository to the specified
5542 Push changesets from the local repository to the specified
5543 destination.
5543 destination.
5544
5544
5545 This operation is symmetrical to pull: it is identical to a pull
5545 This operation is symmetrical to pull: it is identical to a pull
5546 in the destination repository from the current one.
5546 in the destination repository from the current one.
5547
5547
5548 By default, push will not allow creation of new heads at the
5548 By default, push will not allow creation of new heads at the
5549 destination, since multiple heads would make it unclear which head
5549 destination, since multiple heads would make it unclear which head
5550 to use. In this situation, it is recommended to pull and merge
5550 to use. In this situation, it is recommended to pull and merge
5551 before pushing.
5551 before pushing.
5552
5552
5553 Use --new-branch if you want to allow push to create a new named
5553 Use --new-branch if you want to allow push to create a new named
5554 branch that is not present at the destination. This allows you to
5554 branch that is not present at the destination. This allows you to
5555 only create a new branch without forcing other changes.
5555 only create a new branch without forcing other changes.
5556
5556
5557 .. note::
5557 .. note::
5558
5558
5559 Extra care should be taken with the -f/--force option,
5559 Extra care should be taken with the -f/--force option,
5560 which will push all new heads on all branches, an action which will
5560 which will push all new heads on all branches, an action which will
5561 almost always cause confusion for collaborators.
5561 almost always cause confusion for collaborators.
5562
5562
5563 If -r/--rev is used, the specified revision and all its ancestors
5563 If -r/--rev is used, the specified revision and all its ancestors
5564 will be pushed to the remote repository.
5564 will be pushed to the remote repository.
5565
5565
5566 If -B/--bookmark is used, the specified bookmarked revision, its
5566 If -B/--bookmark is used, the specified bookmarked revision, its
5567 ancestors, and the bookmark will be pushed to the remote
5567 ancestors, and the bookmark will be pushed to the remote
5568 repository. Specifying ``.`` is equivalent to specifying the active
5568 repository. Specifying ``.`` is equivalent to specifying the active
5569 bookmark's name.
5569 bookmark's name.
5570
5570
5571 Please see :hg:`help urls` for important details about ``ssh://``
5571 Please see :hg:`help urls` for important details about ``ssh://``
5572 URLs. If DESTINATION is omitted, a default path will be used.
5572 URLs. If DESTINATION is omitted, a default path will be used.
5573
5573
5574 .. container:: verbose
5574 .. container:: verbose
5575
5575
5576 The --pushvars option sends strings to the server that become
5576 The --pushvars option sends strings to the server that become
5577 environment variables prepended with ``HG_USERVAR_``. For example,
5577 environment variables prepended with ``HG_USERVAR_``. For example,
5578 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5578 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5579 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5579 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5580
5580
5581 pushvars can provide for user-overridable hooks as well as set debug
5581 pushvars can provide for user-overridable hooks as well as set debug
5582 levels. One example is having a hook that blocks commits containing
5582 levels. One example is having a hook that blocks commits containing
5583 conflict markers, but enables the user to override the hook if the file
5583 conflict markers, but enables the user to override the hook if the file
5584 is using conflict markers for testing purposes or the file format has
5584 is using conflict markers for testing purposes or the file format has
5585 strings that look like conflict markers.
5585 strings that look like conflict markers.
5586
5586
5587 By default, servers will ignore `--pushvars`. To enable it add the
5587 By default, servers will ignore `--pushvars`. To enable it add the
5588 following to your configuration file::
5588 following to your configuration file::
5589
5589
5590 [push]
5590 [push]
5591 pushvars.server = true
5591 pushvars.server = true
5592
5592
5593 Returns 0 if push was successful, 1 if nothing to push.
5593 Returns 0 if push was successful, 1 if nothing to push.
5594 """
5594 """
5595
5595
5596 opts = pycompat.byteskwargs(opts)
5596 opts = pycompat.byteskwargs(opts)
5597 if opts.get(b'bookmark'):
5597 if opts.get(b'bookmark'):
5598 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5598 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5599 for b in opts[b'bookmark']:
5599 for b in opts[b'bookmark']:
5600 # translate -B options to -r so changesets get pushed
5600 # translate -B options to -r so changesets get pushed
5601 b = repo._bookmarks.expandname(b)
5601 b = repo._bookmarks.expandname(b)
5602 if b in repo._bookmarks:
5602 if b in repo._bookmarks:
5603 opts.setdefault(b'rev', []).append(b)
5603 opts.setdefault(b'rev', []).append(b)
5604 else:
5604 else:
5605 # if we try to push a deleted bookmark, translate it to null
5605 # if we try to push a deleted bookmark, translate it to null
5606 # this lets simultaneous -r, -b options continue working
5606 # this lets simultaneous -r, -b options continue working
5607 opts.setdefault(b'rev', []).append(b"null")
5607 opts.setdefault(b'rev', []).append(b"null")
5608
5608
5609 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5609 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5610 if not path:
5610 if not path:
5611 raise error.Abort(
5611 raise error.Abort(
5612 _(b'default repository not configured!'),
5612 _(b'default repository not configured!'),
5613 hint=_(b"see 'hg help config.paths'"),
5613 hint=_(b"see 'hg help config.paths'"),
5614 )
5614 )
5615 dest = path.pushloc or path.loc
5615 dest = path.pushloc or path.loc
5616 branches = (path.branch, opts.get(b'branch') or [])
5616 branches = (path.branch, opts.get(b'branch') or [])
5617 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5617 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5618 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5618 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5619 other = hg.peer(repo, opts, dest)
5619 other = hg.peer(repo, opts, dest)
5620
5620
5621 if revs:
5621 if revs:
5622 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5622 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5623 if not revs:
5623 if not revs:
5624 raise error.Abort(
5624 raise error.Abort(
5625 _(b"specified revisions evaluate to an empty set"),
5625 _(b"specified revisions evaluate to an empty set"),
5626 hint=_(b"use different revision arguments"),
5626 hint=_(b"use different revision arguments"),
5627 )
5627 )
5628 elif path.pushrev:
5628 elif path.pushrev:
5629 # It doesn't make any sense to specify ancestor revisions. So limit
5629 # It doesn't make any sense to specify ancestor revisions. So limit
5630 # to DAG heads to make discovery simpler.
5630 # to DAG heads to make discovery simpler.
5631 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5631 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5632 revs = scmutil.revrange(repo, [expr])
5632 revs = scmutil.revrange(repo, [expr])
5633 revs = [repo[rev].node() for rev in revs]
5633 revs = [repo[rev].node() for rev in revs]
5634 if not revs:
5634 if not revs:
5635 raise error.Abort(
5635 raise error.Abort(
5636 _(b'default push revset for path evaluates to an empty set')
5636 _(b'default push revset for path evaluates to an empty set')
5637 )
5637 )
5638 elif ui.configbool(b'commands', b'push.require-revs'):
5638 elif ui.configbool(b'commands', b'push.require-revs'):
5639 raise error.Abort(
5639 raise error.Abort(
5640 _(b'no revisions specified to push'),
5640 _(b'no revisions specified to push'),
5641 hint=_(b'did you mean "hg push -r ."?'),
5641 hint=_(b'did you mean "hg push -r ."?'),
5642 )
5642 )
5643
5643
5644 repo._subtoppath = dest
5644 repo._subtoppath = dest
5645 try:
5645 try:
5646 # push subrepos depth-first for coherent ordering
5646 # push subrepos depth-first for coherent ordering
5647 c = repo[b'.']
5647 c = repo[b'.']
5648 subs = c.substate # only repos that are committed
5648 subs = c.substate # only repos that are committed
5649 for s in sorted(subs):
5649 for s in sorted(subs):
5650 result = c.sub(s).push(opts)
5650 result = c.sub(s).push(opts)
5651 if result == 0:
5651 if result == 0:
5652 return not result
5652 return not result
5653 finally:
5653 finally:
5654 del repo._subtoppath
5654 del repo._subtoppath
5655
5655
5656 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5656 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5657 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5657 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5658
5658
5659 pushop = exchange.push(
5659 pushop = exchange.push(
5660 repo,
5660 repo,
5661 other,
5661 other,
5662 opts.get(b'force'),
5662 opts.get(b'force'),
5663 revs=revs,
5663 revs=revs,
5664 newbranch=opts.get(b'new_branch'),
5664 newbranch=opts.get(b'new_branch'),
5665 bookmarks=opts.get(b'bookmark', ()),
5665 bookmarks=opts.get(b'bookmark', ()),
5666 publish=opts.get(b'publish'),
5666 publish=opts.get(b'publish'),
5667 opargs=opargs,
5667 opargs=opargs,
5668 )
5668 )
5669
5669
5670 result = not pushop.cgresult
5670 result = not pushop.cgresult
5671
5671
5672 if pushop.bkresult is not None:
5672 if pushop.bkresult is not None:
5673 if pushop.bkresult == 2:
5673 if pushop.bkresult == 2:
5674 result = 2
5674 result = 2
5675 elif not result and pushop.bkresult:
5675 elif not result and pushop.bkresult:
5676 result = 2
5676 result = 2
5677
5677
5678 return result
5678 return result
5679
5679
5680
5680
5681 @command(
5681 @command(
5682 b'recover',
5682 b'recover',
5683 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5683 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5684 helpcategory=command.CATEGORY_MAINTENANCE,
5684 helpcategory=command.CATEGORY_MAINTENANCE,
5685 )
5685 )
5686 def recover(ui, repo, **opts):
5686 def recover(ui, repo, **opts):
5687 """roll back an interrupted transaction
5687 """roll back an interrupted transaction
5688
5688
5689 Recover from an interrupted commit or pull.
5689 Recover from an interrupted commit or pull.
5690
5690
5691 This command tries to fix the repository status after an
5691 This command tries to fix the repository status after an
5692 interrupted operation. It should only be necessary when Mercurial
5692 interrupted operation. It should only be necessary when Mercurial
5693 suggests it.
5693 suggests it.
5694
5694
5695 Returns 0 if successful, 1 if nothing to recover or verify fails.
5695 Returns 0 if successful, 1 if nothing to recover or verify fails.
5696 """
5696 """
5697 ret = repo.recover()
5697 ret = repo.recover()
5698 if ret:
5698 if ret:
5699 if opts['verify']:
5699 if opts['verify']:
5700 return hg.verify(repo)
5700 return hg.verify(repo)
5701 else:
5701 else:
5702 msg = _(
5702 msg = _(
5703 b"(verify step skipped, run `hg verify` to check your "
5703 b"(verify step skipped, run `hg verify` to check your "
5704 b"repository content)\n"
5704 b"repository content)\n"
5705 )
5705 )
5706 ui.warn(msg)
5706 ui.warn(msg)
5707 return 0
5707 return 0
5708 return 1
5708 return 1
5709
5709
5710
5710
5711 @command(
5711 @command(
5712 b'remove|rm',
5712 b'remove|rm',
5713 [
5713 [
5714 (b'A', b'after', None, _(b'record delete for missing files')),
5714 (b'A', b'after', None, _(b'record delete for missing files')),
5715 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5715 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5716 ]
5716 ]
5717 + subrepoopts
5717 + subrepoopts
5718 + walkopts
5718 + walkopts
5719 + dryrunopts,
5719 + dryrunopts,
5720 _(b'[OPTION]... FILE...'),
5720 _(b'[OPTION]... FILE...'),
5721 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5721 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5722 helpbasic=True,
5722 helpbasic=True,
5723 inferrepo=True,
5723 inferrepo=True,
5724 )
5724 )
5725 def remove(ui, repo, *pats, **opts):
5725 def remove(ui, repo, *pats, **opts):
5726 """remove the specified files on the next commit
5726 """remove the specified files on the next commit
5727
5727
5728 Schedule the indicated files for removal from the current branch.
5728 Schedule the indicated files for removal from the current branch.
5729
5729
5730 This command schedules the files to be removed at the next commit.
5730 This command schedules the files to be removed at the next commit.
5731 To undo a remove before that, see :hg:`revert`. To undo added
5731 To undo a remove before that, see :hg:`revert`. To undo added
5732 files, see :hg:`forget`.
5732 files, see :hg:`forget`.
5733
5733
5734 .. container:: verbose
5734 .. container:: verbose
5735
5735
5736 -A/--after can be used to remove only files that have already
5736 -A/--after can be used to remove only files that have already
5737 been deleted, -f/--force can be used to force deletion, and -Af
5737 been deleted, -f/--force can be used to force deletion, and -Af
5738 can be used to remove files from the next revision without
5738 can be used to remove files from the next revision without
5739 deleting them from the working directory.
5739 deleting them from the working directory.
5740
5740
5741 The following table details the behavior of remove for different
5741 The following table details the behavior of remove for different
5742 file states (columns) and option combinations (rows). The file
5742 file states (columns) and option combinations (rows). The file
5743 states are Added [A], Clean [C], Modified [M] and Missing [!]
5743 states are Added [A], Clean [C], Modified [M] and Missing [!]
5744 (as reported by :hg:`status`). The actions are Warn, Remove
5744 (as reported by :hg:`status`). The actions are Warn, Remove
5745 (from branch) and Delete (from disk):
5745 (from branch) and Delete (from disk):
5746
5746
5747 ========= == == == ==
5747 ========= == == == ==
5748 opt/state A C M !
5748 opt/state A C M !
5749 ========= == == == ==
5749 ========= == == == ==
5750 none W RD W R
5750 none W RD W R
5751 -f R RD RD R
5751 -f R RD RD R
5752 -A W W W R
5752 -A W W W R
5753 -Af R R R R
5753 -Af R R R R
5754 ========= == == == ==
5754 ========= == == == ==
5755
5755
5756 .. note::
5756 .. note::
5757
5757
5758 :hg:`remove` never deletes files in Added [A] state from the
5758 :hg:`remove` never deletes files in Added [A] state from the
5759 working directory, not even if ``--force`` is specified.
5759 working directory, not even if ``--force`` is specified.
5760
5760
5761 Returns 0 on success, 1 if any warnings encountered.
5761 Returns 0 on success, 1 if any warnings encountered.
5762 """
5762 """
5763
5763
5764 opts = pycompat.byteskwargs(opts)
5764 opts = pycompat.byteskwargs(opts)
5765 after, force = opts.get(b'after'), opts.get(b'force')
5765 after, force = opts.get(b'after'), opts.get(b'force')
5766 dryrun = opts.get(b'dry_run')
5766 dryrun = opts.get(b'dry_run')
5767 if not pats and not after:
5767 if not pats and not after:
5768 raise error.Abort(_(b'no files specified'))
5768 raise error.Abort(_(b'no files specified'))
5769
5769
5770 m = scmutil.match(repo[None], pats, opts)
5770 m = scmutil.match(repo[None], pats, opts)
5771 subrepos = opts.get(b'subrepos')
5771 subrepos = opts.get(b'subrepos')
5772 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5772 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5773 return cmdutil.remove(
5773 return cmdutil.remove(
5774 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5774 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5775 )
5775 )
5776
5776
5777
5777
5778 @command(
5778 @command(
5779 b'rename|move|mv',
5779 b'rename|move|mv',
5780 [
5780 [
5781 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5781 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5782 (
5782 (
5783 b'f',
5783 b'f',
5784 b'force',
5784 b'force',
5785 None,
5785 None,
5786 _(b'forcibly move over an existing managed file'),
5786 _(b'forcibly move over an existing managed file'),
5787 ),
5787 ),
5788 ]
5788 ]
5789 + walkopts
5789 + walkopts
5790 + dryrunopts,
5790 + dryrunopts,
5791 _(b'[OPTION]... SOURCE... DEST'),
5791 _(b'[OPTION]... SOURCE... DEST'),
5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5793 )
5793 )
5794 def rename(ui, repo, *pats, **opts):
5794 def rename(ui, repo, *pats, **opts):
5795 """rename files; equivalent of copy + remove
5795 """rename files; equivalent of copy + remove
5796
5796
5797 Mark dest as copies of sources; mark sources for deletion. If dest
5797 Mark dest as copies of sources; mark sources for deletion. If dest
5798 is a directory, copies are put in that directory. If dest is a
5798 is a directory, copies are put in that directory. If dest is a
5799 file, there can only be one source.
5799 file, there can only be one source.
5800
5800
5801 By default, this command copies the contents of files as they
5801 By default, this command copies the contents of files as they
5802 exist in the working directory. If invoked with -A/--after, the
5802 exist in the working directory. If invoked with -A/--after, the
5803 operation is recorded, but no copying is performed.
5803 operation is recorded, but no copying is performed.
5804
5804
5805 This command takes effect at the next commit. To undo a rename
5805 This command takes effect at the next commit. To undo a rename
5806 before that, see :hg:`revert`.
5806 before that, see :hg:`revert`.
5807
5807
5808 Returns 0 on success, 1 if errors are encountered.
5808 Returns 0 on success, 1 if errors are encountered.
5809 """
5809 """
5810 opts = pycompat.byteskwargs(opts)
5810 opts = pycompat.byteskwargs(opts)
5811 with repo.wlock(False):
5811 with repo.wlock(False):
5812 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5812 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5813
5813
5814
5814
5815 @command(
5815 @command(
5816 b'resolve',
5816 b'resolve',
5817 [
5817 [
5818 (b'a', b'all', None, _(b'select all unresolved files')),
5818 (b'a', b'all', None, _(b'select all unresolved files')),
5819 (b'l', b'list', None, _(b'list state of files needing merge')),
5819 (b'l', b'list', None, _(b'list state of files needing merge')),
5820 (b'm', b'mark', None, _(b'mark files as resolved')),
5820 (b'm', b'mark', None, _(b'mark files as resolved')),
5821 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5821 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5822 (b'n', b'no-status', None, _(b'hide status prefix')),
5822 (b'n', b'no-status', None, _(b'hide status prefix')),
5823 (b'', b're-merge', None, _(b're-merge files')),
5823 (b'', b're-merge', None, _(b're-merge files')),
5824 ]
5824 ]
5825 + mergetoolopts
5825 + mergetoolopts
5826 + walkopts
5826 + walkopts
5827 + formatteropts,
5827 + formatteropts,
5828 _(b'[OPTION]... [FILE]...'),
5828 _(b'[OPTION]... [FILE]...'),
5829 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5829 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5830 inferrepo=True,
5830 inferrepo=True,
5831 )
5831 )
5832 def resolve(ui, repo, *pats, **opts):
5832 def resolve(ui, repo, *pats, **opts):
5833 """redo merges or set/view the merge status of files
5833 """redo merges or set/view the merge status of files
5834
5834
5835 Merges with unresolved conflicts are often the result of
5835 Merges with unresolved conflicts are often the result of
5836 non-interactive merging using the ``internal:merge`` configuration
5836 non-interactive merging using the ``internal:merge`` configuration
5837 setting, or a command-line merge tool like ``diff3``. The resolve
5837 setting, or a command-line merge tool like ``diff3``. The resolve
5838 command is used to manage the files involved in a merge, after
5838 command is used to manage the files involved in a merge, after
5839 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5839 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5840 working directory must have two parents). See :hg:`help
5840 working directory must have two parents). See :hg:`help
5841 merge-tools` for information on configuring merge tools.
5841 merge-tools` for information on configuring merge tools.
5842
5842
5843 The resolve command can be used in the following ways:
5843 The resolve command can be used in the following ways:
5844
5844
5845 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5845 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5846 the specified files, discarding any previous merge attempts. Re-merging
5846 the specified files, discarding any previous merge attempts. Re-merging
5847 is not performed for files already marked as resolved. Use ``--all/-a``
5847 is not performed for files already marked as resolved. Use ``--all/-a``
5848 to select all unresolved files. ``--tool`` can be used to specify
5848 to select all unresolved files. ``--tool`` can be used to specify
5849 the merge tool used for the given files. It overrides the HGMERGE
5849 the merge tool used for the given files. It overrides the HGMERGE
5850 environment variable and your configuration files. Previous file
5850 environment variable and your configuration files. Previous file
5851 contents are saved with a ``.orig`` suffix.
5851 contents are saved with a ``.orig`` suffix.
5852
5852
5853 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5853 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5854 (e.g. after having manually fixed-up the files). The default is
5854 (e.g. after having manually fixed-up the files). The default is
5855 to mark all unresolved files.
5855 to mark all unresolved files.
5856
5856
5857 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5857 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5858 default is to mark all resolved files.
5858 default is to mark all resolved files.
5859
5859
5860 - :hg:`resolve -l`: list files which had or still have conflicts.
5860 - :hg:`resolve -l`: list files which had or still have conflicts.
5861 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5861 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5862 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5862 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5863 the list. See :hg:`help filesets` for details.
5863 the list. See :hg:`help filesets` for details.
5864
5864
5865 .. note::
5865 .. note::
5866
5866
5867 Mercurial will not let you commit files with unresolved merge
5867 Mercurial will not let you commit files with unresolved merge
5868 conflicts. You must use :hg:`resolve -m ...` before you can
5868 conflicts. You must use :hg:`resolve -m ...` before you can
5869 commit after a conflicting merge.
5869 commit after a conflicting merge.
5870
5870
5871 .. container:: verbose
5871 .. container:: verbose
5872
5872
5873 Template:
5873 Template:
5874
5874
5875 The following keywords are supported in addition to the common template
5875 The following keywords are supported in addition to the common template
5876 keywords and functions. See also :hg:`help templates`.
5876 keywords and functions. See also :hg:`help templates`.
5877
5877
5878 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5878 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5879 :path: String. Repository-absolute path of the file.
5879 :path: String. Repository-absolute path of the file.
5880
5880
5881 Returns 0 on success, 1 if any files fail a resolve attempt.
5881 Returns 0 on success, 1 if any files fail a resolve attempt.
5882 """
5882 """
5883
5883
5884 opts = pycompat.byteskwargs(opts)
5884 opts = pycompat.byteskwargs(opts)
5885 confirm = ui.configbool(b'commands', b'resolve.confirm')
5885 confirm = ui.configbool(b'commands', b'resolve.confirm')
5886 flaglist = b'all mark unmark list no_status re_merge'.split()
5886 flaglist = b'all mark unmark list no_status re_merge'.split()
5887 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5887 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5888
5888
5889 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5889 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5890 if actioncount > 1:
5890 if actioncount > 1:
5891 raise error.Abort(_(b"too many actions specified"))
5891 raise error.Abort(_(b"too many actions specified"))
5892 elif actioncount == 0 and ui.configbool(
5892 elif actioncount == 0 and ui.configbool(
5893 b'commands', b'resolve.explicit-re-merge'
5893 b'commands', b'resolve.explicit-re-merge'
5894 ):
5894 ):
5895 hint = _(b'use --mark, --unmark, --list or --re-merge')
5895 hint = _(b'use --mark, --unmark, --list or --re-merge')
5896 raise error.Abort(_(b'no action specified'), hint=hint)
5896 raise error.Abort(_(b'no action specified'), hint=hint)
5897 if pats and all:
5897 if pats and all:
5898 raise error.Abort(_(b"can't specify --all and patterns"))
5898 raise error.Abort(_(b"can't specify --all and patterns"))
5899 if not (all or pats or show or mark or unmark):
5899 if not (all or pats or show or mark or unmark):
5900 raise error.Abort(
5900 raise error.Abort(
5901 _(b'no files or directories specified'),
5901 _(b'no files or directories specified'),
5902 hint=b'use --all to re-merge all unresolved files',
5902 hint=b'use --all to re-merge all unresolved files',
5903 )
5903 )
5904
5904
5905 if confirm:
5905 if confirm:
5906 if all:
5906 if all:
5907 if ui.promptchoice(
5907 if ui.promptchoice(
5908 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5908 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5909 ):
5909 ):
5910 raise error.Abort(_(b'user quit'))
5910 raise error.Abort(_(b'user quit'))
5911 if mark and not pats:
5911 if mark and not pats:
5912 if ui.promptchoice(
5912 if ui.promptchoice(
5913 _(
5913 _(
5914 b'mark all unresolved files as resolved (yn)?'
5914 b'mark all unresolved files as resolved (yn)?'
5915 b'$$ &Yes $$ &No'
5915 b'$$ &Yes $$ &No'
5916 )
5916 )
5917 ):
5917 ):
5918 raise error.Abort(_(b'user quit'))
5918 raise error.Abort(_(b'user quit'))
5919 if unmark and not pats:
5919 if unmark and not pats:
5920 if ui.promptchoice(
5920 if ui.promptchoice(
5921 _(
5921 _(
5922 b'mark all resolved files as unresolved (yn)?'
5922 b'mark all resolved files as unresolved (yn)?'
5923 b'$$ &Yes $$ &No'
5923 b'$$ &Yes $$ &No'
5924 )
5924 )
5925 ):
5925 ):
5926 raise error.Abort(_(b'user quit'))
5926 raise error.Abort(_(b'user quit'))
5927
5927
5928 uipathfn = scmutil.getuipathfn(repo)
5928 uipathfn = scmutil.getuipathfn(repo)
5929
5929
5930 if show:
5930 if show:
5931 ui.pager(b'resolve')
5931 ui.pager(b'resolve')
5932 fm = ui.formatter(b'resolve', opts)
5932 fm = ui.formatter(b'resolve', opts)
5933 ms = mergemod.mergestate.read(repo)
5933 ms = mergemod.mergestate.read(repo)
5934 wctx = repo[None]
5934 wctx = repo[None]
5935 m = scmutil.match(wctx, pats, opts)
5935 m = scmutil.match(wctx, pats, opts)
5936
5936
5937 # Labels and keys based on merge state. Unresolved path conflicts show
5937 # Labels and keys based on merge state. Unresolved path conflicts show
5938 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5938 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5939 # resolved conflicts.
5939 # resolved conflicts.
5940 mergestateinfo = {
5940 mergestateinfo = {
5941 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5941 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5942 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5942 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5943 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5943 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5944 b'resolve.unresolved',
5944 b'resolve.unresolved',
5945 b'P',
5945 b'P',
5946 ),
5946 ),
5947 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5947 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5948 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5948 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5949 b'resolve.driverresolved',
5949 b'resolve.driverresolved',
5950 b'D',
5950 b'D',
5951 ),
5951 ),
5952 }
5952 }
5953
5953
5954 for f in ms:
5954 for f in ms:
5955 if not m(f):
5955 if not m(f):
5956 continue
5956 continue
5957
5957
5958 label, key = mergestateinfo[ms[f]]
5958 label, key = mergestateinfo[ms[f]]
5959 fm.startitem()
5959 fm.startitem()
5960 fm.context(ctx=wctx)
5960 fm.context(ctx=wctx)
5961 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5961 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5962 fm.data(path=f)
5962 fm.data(path=f)
5963 fm.plain(b'%s\n' % uipathfn(f), label=label)
5963 fm.plain(b'%s\n' % uipathfn(f), label=label)
5964 fm.end()
5964 fm.end()
5965 return 0
5965 return 0
5966
5966
5967 with repo.wlock():
5967 with repo.wlock():
5968 ms = mergemod.mergestate.read(repo)
5968 ms = mergemod.mergestate.read(repo)
5969
5969
5970 if not (ms.active() or repo.dirstate.p2() != nullid):
5970 if not (ms.active() or repo.dirstate.p2() != nullid):
5971 raise error.Abort(
5971 raise error.Abort(
5972 _(b'resolve command not applicable when not merging')
5972 _(b'resolve command not applicable when not merging')
5973 )
5973 )
5974
5974
5975 wctx = repo[None]
5975 wctx = repo[None]
5976
5976
5977 if (
5977 if (
5978 ms.mergedriver
5978 ms.mergedriver
5979 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5979 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5980 ):
5980 ):
5981 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5981 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5982 ms.commit()
5982 ms.commit()
5983 # allow mark and unmark to go through
5983 # allow mark and unmark to go through
5984 if not mark and not unmark and not proceed:
5984 if not mark and not unmark and not proceed:
5985 return 1
5985 return 1
5986
5986
5987 m = scmutil.match(wctx, pats, opts)
5987 m = scmutil.match(wctx, pats, opts)
5988 ret = 0
5988 ret = 0
5989 didwork = False
5989 didwork = False
5990 runconclude = False
5990 runconclude = False
5991
5991
5992 tocomplete = []
5992 tocomplete = []
5993 hasconflictmarkers = []
5993 hasconflictmarkers = []
5994 if mark:
5994 if mark:
5995 markcheck = ui.config(b'commands', b'resolve.mark-check')
5995 markcheck = ui.config(b'commands', b'resolve.mark-check')
5996 if markcheck not in [b'warn', b'abort']:
5996 if markcheck not in [b'warn', b'abort']:
5997 # Treat all invalid / unrecognized values as 'none'.
5997 # Treat all invalid / unrecognized values as 'none'.
5998 markcheck = False
5998 markcheck = False
5999 for f in ms:
5999 for f in ms:
6000 if not m(f):
6000 if not m(f):
6001 continue
6001 continue
6002
6002
6003 didwork = True
6003 didwork = True
6004
6004
6005 # don't let driver-resolved files be marked, and run the conclude
6005 # don't let driver-resolved files be marked, and run the conclude
6006 # step if asked to resolve
6006 # step if asked to resolve
6007 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6007 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6008 exact = m.exact(f)
6008 exact = m.exact(f)
6009 if mark:
6009 if mark:
6010 if exact:
6010 if exact:
6011 ui.warn(
6011 ui.warn(
6012 _(b'not marking %s as it is driver-resolved\n')
6012 _(b'not marking %s as it is driver-resolved\n')
6013 % uipathfn(f)
6013 % uipathfn(f)
6014 )
6014 )
6015 elif unmark:
6015 elif unmark:
6016 if exact:
6016 if exact:
6017 ui.warn(
6017 ui.warn(
6018 _(b'not unmarking %s as it is driver-resolved\n')
6018 _(b'not unmarking %s as it is driver-resolved\n')
6019 % uipathfn(f)
6019 % uipathfn(f)
6020 )
6020 )
6021 else:
6021 else:
6022 runconclude = True
6022 runconclude = True
6023 continue
6023 continue
6024
6024
6025 # path conflicts must be resolved manually
6025 # path conflicts must be resolved manually
6026 if ms[f] in (
6026 if ms[f] in (
6027 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6027 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6028 mergemod.MERGE_RECORD_RESOLVED_PATH,
6028 mergemod.MERGE_RECORD_RESOLVED_PATH,
6029 ):
6029 ):
6030 if mark:
6030 if mark:
6031 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6031 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6032 elif unmark:
6032 elif unmark:
6033 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6033 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6034 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6034 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6035 ui.warn(
6035 ui.warn(
6036 _(b'%s: path conflict must be resolved manually\n')
6036 _(b'%s: path conflict must be resolved manually\n')
6037 % uipathfn(f)
6037 % uipathfn(f)
6038 )
6038 )
6039 continue
6039 continue
6040
6040
6041 if mark:
6041 if mark:
6042 if markcheck:
6042 if markcheck:
6043 fdata = repo.wvfs.tryread(f)
6043 fdata = repo.wvfs.tryread(f)
6044 if (
6044 if (
6045 filemerge.hasconflictmarkers(fdata)
6045 filemerge.hasconflictmarkers(fdata)
6046 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6046 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6047 ):
6047 ):
6048 hasconflictmarkers.append(f)
6048 hasconflictmarkers.append(f)
6049 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6049 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6050 elif unmark:
6050 elif unmark:
6051 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6051 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6052 else:
6052 else:
6053 # backup pre-resolve (merge uses .orig for its own purposes)
6053 # backup pre-resolve (merge uses .orig for its own purposes)
6054 a = repo.wjoin(f)
6054 a = repo.wjoin(f)
6055 try:
6055 try:
6056 util.copyfile(a, a + b".resolve")
6056 util.copyfile(a, a + b".resolve")
6057 except (IOError, OSError) as inst:
6057 except (IOError, OSError) as inst:
6058 if inst.errno != errno.ENOENT:
6058 if inst.errno != errno.ENOENT:
6059 raise
6059 raise
6060
6060
6061 try:
6061 try:
6062 # preresolve file
6062 # preresolve file
6063 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6063 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6064 with ui.configoverride(overrides, b'resolve'):
6064 with ui.configoverride(overrides, b'resolve'):
6065 complete, r = ms.preresolve(f, wctx)
6065 complete, r = ms.preresolve(f, wctx)
6066 if not complete:
6066 if not complete:
6067 tocomplete.append(f)
6067 tocomplete.append(f)
6068 elif r:
6068 elif r:
6069 ret = 1
6069 ret = 1
6070 finally:
6070 finally:
6071 ms.commit()
6071 ms.commit()
6072
6072
6073 # replace filemerge's .orig file with our resolve file, but only
6073 # replace filemerge's .orig file with our resolve file, but only
6074 # for merges that are complete
6074 # for merges that are complete
6075 if complete:
6075 if complete:
6076 try:
6076 try:
6077 util.rename(
6077 util.rename(
6078 a + b".resolve", scmutil.backuppath(ui, repo, f)
6078 a + b".resolve", scmutil.backuppath(ui, repo, f)
6079 )
6079 )
6080 except OSError as inst:
6080 except OSError as inst:
6081 if inst.errno != errno.ENOENT:
6081 if inst.errno != errno.ENOENT:
6082 raise
6082 raise
6083
6083
6084 if hasconflictmarkers:
6084 if hasconflictmarkers:
6085 ui.warn(
6085 ui.warn(
6086 _(
6086 _(
6087 b'warning: the following files still have conflict '
6087 b'warning: the following files still have conflict '
6088 b'markers:\n'
6088 b'markers:\n'
6089 )
6089 )
6090 + b''.join(
6090 + b''.join(
6091 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6091 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6092 )
6092 )
6093 )
6093 )
6094 if markcheck == b'abort' and not all and not pats:
6094 if markcheck == b'abort' and not all and not pats:
6095 raise error.Abort(
6095 raise error.Abort(
6096 _(b'conflict markers detected'),
6096 _(b'conflict markers detected'),
6097 hint=_(b'use --all to mark anyway'),
6097 hint=_(b'use --all to mark anyway'),
6098 )
6098 )
6099
6099
6100 for f in tocomplete:
6100 for f in tocomplete:
6101 try:
6101 try:
6102 # resolve file
6102 # resolve file
6103 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6103 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6104 with ui.configoverride(overrides, b'resolve'):
6104 with ui.configoverride(overrides, b'resolve'):
6105 r = ms.resolve(f, wctx)
6105 r = ms.resolve(f, wctx)
6106 if r:
6106 if r:
6107 ret = 1
6107 ret = 1
6108 finally:
6108 finally:
6109 ms.commit()
6109 ms.commit()
6110
6110
6111 # replace filemerge's .orig file with our resolve file
6111 # replace filemerge's .orig file with our resolve file
6112 a = repo.wjoin(f)
6112 a = repo.wjoin(f)
6113 try:
6113 try:
6114 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6114 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6115 except OSError as inst:
6115 except OSError as inst:
6116 if inst.errno != errno.ENOENT:
6116 if inst.errno != errno.ENOENT:
6117 raise
6117 raise
6118
6118
6119 ms.commit()
6119 ms.commit()
6120 ms.recordactions()
6120 ms.recordactions()
6121
6121
6122 if not didwork and pats:
6122 if not didwork and pats:
6123 hint = None
6123 hint = None
6124 if not any([p for p in pats if p.find(b':') >= 0]):
6124 if not any([p for p in pats if p.find(b':') >= 0]):
6125 pats = [b'path:%s' % p for p in pats]
6125 pats = [b'path:%s' % p for p in pats]
6126 m = scmutil.match(wctx, pats, opts)
6126 m = scmutil.match(wctx, pats, opts)
6127 for f in ms:
6127 for f in ms:
6128 if not m(f):
6128 if not m(f):
6129 continue
6129 continue
6130
6130
6131 def flag(o):
6131 def flag(o):
6132 if o == b're_merge':
6132 if o == b're_merge':
6133 return b'--re-merge '
6133 return b'--re-merge '
6134 return b'-%s ' % o[0:1]
6134 return b'-%s ' % o[0:1]
6135
6135
6136 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6136 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6137 hint = _(b"(try: hg resolve %s%s)\n") % (
6137 hint = _(b"(try: hg resolve %s%s)\n") % (
6138 flags,
6138 flags,
6139 b' '.join(pats),
6139 b' '.join(pats),
6140 )
6140 )
6141 break
6141 break
6142 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6142 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6143 if hint:
6143 if hint:
6144 ui.warn(hint)
6144 ui.warn(hint)
6145 elif ms.mergedriver and ms.mdstate() != b's':
6145 elif ms.mergedriver and ms.mdstate() != b's':
6146 # run conclude step when either a driver-resolved file is requested
6146 # run conclude step when either a driver-resolved file is requested
6147 # or there are no driver-resolved files
6147 # or there are no driver-resolved files
6148 # we can't use 'ret' to determine whether any files are unresolved
6148 # we can't use 'ret' to determine whether any files are unresolved
6149 # because we might not have tried to resolve some
6149 # because we might not have tried to resolve some
6150 if (runconclude or not list(ms.driverresolved())) and not list(
6150 if (runconclude or not list(ms.driverresolved())) and not list(
6151 ms.unresolved()
6151 ms.unresolved()
6152 ):
6152 ):
6153 proceed = mergemod.driverconclude(repo, ms, wctx)
6153 proceed = mergemod.driverconclude(repo, ms, wctx)
6154 ms.commit()
6154 ms.commit()
6155 if not proceed:
6155 if not proceed:
6156 return 1
6156 return 1
6157
6157
6158 # Nudge users into finishing an unfinished operation
6158 # Nudge users into finishing an unfinished operation
6159 unresolvedf = list(ms.unresolved())
6159 unresolvedf = list(ms.unresolved())
6160 driverresolvedf = list(ms.driverresolved())
6160 driverresolvedf = list(ms.driverresolved())
6161 if not unresolvedf and not driverresolvedf:
6161 if not unresolvedf and not driverresolvedf:
6162 ui.status(_(b'(no more unresolved files)\n'))
6162 ui.status(_(b'(no more unresolved files)\n'))
6163 cmdutil.checkafterresolved(repo)
6163 cmdutil.checkafterresolved(repo)
6164 elif not unresolvedf:
6164 elif not unresolvedf:
6165 ui.status(
6165 ui.status(
6166 _(
6166 _(
6167 b'(no more unresolved files -- '
6167 b'(no more unresolved files -- '
6168 b'run "hg resolve --all" to conclude)\n'
6168 b'run "hg resolve --all" to conclude)\n'
6169 )
6169 )
6170 )
6170 )
6171
6171
6172 return ret
6172 return ret
6173
6173
6174
6174
6175 @command(
6175 @command(
6176 b'revert',
6176 b'revert',
6177 [
6177 [
6178 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6178 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6179 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6179 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6180 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6180 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6181 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6181 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6182 (b'i', b'interactive', None, _(b'interactively select the changes')),
6182 (b'i', b'interactive', None, _(b'interactively select the changes')),
6183 ]
6183 ]
6184 + walkopts
6184 + walkopts
6185 + dryrunopts,
6185 + dryrunopts,
6186 _(b'[OPTION]... [-r REV] [NAME]...'),
6186 _(b'[OPTION]... [-r REV] [NAME]...'),
6187 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6187 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6188 )
6188 )
6189 def revert(ui, repo, *pats, **opts):
6189 def revert(ui, repo, *pats, **opts):
6190 """restore files to their checkout state
6190 """restore files to their checkout state
6191
6191
6192 .. note::
6192 .. note::
6193
6193
6194 To check out earlier revisions, you should use :hg:`update REV`.
6194 To check out earlier revisions, you should use :hg:`update REV`.
6195 To cancel an uncommitted merge (and lose your changes),
6195 To cancel an uncommitted merge (and lose your changes),
6196 use :hg:`merge --abort`.
6196 use :hg:`merge --abort`.
6197
6197
6198 With no revision specified, revert the specified files or directories
6198 With no revision specified, revert the specified files or directories
6199 to the contents they had in the parent of the working directory.
6199 to the contents they had in the parent of the working directory.
6200 This restores the contents of files to an unmodified
6200 This restores the contents of files to an unmodified
6201 state and unschedules adds, removes, copies, and renames. If the
6201 state and unschedules adds, removes, copies, and renames. If the
6202 working directory has two parents, you must explicitly specify a
6202 working directory has two parents, you must explicitly specify a
6203 revision.
6203 revision.
6204
6204
6205 Using the -r/--rev or -d/--date options, revert the given files or
6205 Using the -r/--rev or -d/--date options, revert the given files or
6206 directories to their states as of a specific revision. Because
6206 directories to their states as of a specific revision. Because
6207 revert does not change the working directory parents, this will
6207 revert does not change the working directory parents, this will
6208 cause these files to appear modified. This can be helpful to "back
6208 cause these files to appear modified. This can be helpful to "back
6209 out" some or all of an earlier change. See :hg:`backout` for a
6209 out" some or all of an earlier change. See :hg:`backout` for a
6210 related method.
6210 related method.
6211
6211
6212 Modified files are saved with a .orig suffix before reverting.
6212 Modified files are saved with a .orig suffix before reverting.
6213 To disable these backups, use --no-backup. It is possible to store
6213 To disable these backups, use --no-backup. It is possible to store
6214 the backup files in a custom directory relative to the root of the
6214 the backup files in a custom directory relative to the root of the
6215 repository by setting the ``ui.origbackuppath`` configuration
6215 repository by setting the ``ui.origbackuppath`` configuration
6216 option.
6216 option.
6217
6217
6218 See :hg:`help dates` for a list of formats valid for -d/--date.
6218 See :hg:`help dates` for a list of formats valid for -d/--date.
6219
6219
6220 See :hg:`help backout` for a way to reverse the effect of an
6220 See :hg:`help backout` for a way to reverse the effect of an
6221 earlier changeset.
6221 earlier changeset.
6222
6222
6223 Returns 0 on success.
6223 Returns 0 on success.
6224 """
6224 """
6225
6225
6226 opts = pycompat.byteskwargs(opts)
6226 opts = pycompat.byteskwargs(opts)
6227 if opts.get(b"date"):
6227 if opts.get(b"date"):
6228 if opts.get(b"rev"):
6228 if opts.get(b"rev"):
6229 raise error.Abort(_(b"you can't specify a revision and a date"))
6229 raise error.Abort(_(b"you can't specify a revision and a date"))
6230 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6230 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6231
6231
6232 parent, p2 = repo.dirstate.parents()
6232 parent, p2 = repo.dirstate.parents()
6233 if not opts.get(b'rev') and p2 != nullid:
6233 if not opts.get(b'rev') and p2 != nullid:
6234 # revert after merge is a trap for new users (issue2915)
6234 # revert after merge is a trap for new users (issue2915)
6235 raise error.Abort(
6235 raise error.Abort(
6236 _(b'uncommitted merge with no revision specified'),
6236 _(b'uncommitted merge with no revision specified'),
6237 hint=_(b"use 'hg update' or see 'hg help revert'"),
6237 hint=_(b"use 'hg update' or see 'hg help revert'"),
6238 )
6238 )
6239
6239
6240 rev = opts.get(b'rev')
6240 rev = opts.get(b'rev')
6241 if rev:
6241 if rev:
6242 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6242 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6243 ctx = scmutil.revsingle(repo, rev)
6243 ctx = scmutil.revsingle(repo, rev)
6244
6244
6245 if not (
6245 if not (
6246 pats
6246 pats
6247 or opts.get(b'include')
6247 or opts.get(b'include')
6248 or opts.get(b'exclude')
6248 or opts.get(b'exclude')
6249 or opts.get(b'all')
6249 or opts.get(b'all')
6250 or opts.get(b'interactive')
6250 or opts.get(b'interactive')
6251 ):
6251 ):
6252 msg = _(b"no files or directories specified")
6252 msg = _(b"no files or directories specified")
6253 if p2 != nullid:
6253 if p2 != nullid:
6254 hint = _(
6254 hint = _(
6255 b"uncommitted merge, use --all to discard all changes,"
6255 b"uncommitted merge, use --all to discard all changes,"
6256 b" or 'hg update -C .' to abort the merge"
6256 b" or 'hg update -C .' to abort the merge"
6257 )
6257 )
6258 raise error.Abort(msg, hint=hint)
6258 raise error.Abort(msg, hint=hint)
6259 dirty = any(repo.status())
6259 dirty = any(repo.status())
6260 node = ctx.node()
6260 node = ctx.node()
6261 if node != parent:
6261 if node != parent:
6262 if dirty:
6262 if dirty:
6263 hint = (
6263 hint = (
6264 _(
6264 _(
6265 b"uncommitted changes, use --all to discard all"
6265 b"uncommitted changes, use --all to discard all"
6266 b" changes, or 'hg update %d' to update"
6266 b" changes, or 'hg update %d' to update"
6267 )
6267 )
6268 % ctx.rev()
6268 % ctx.rev()
6269 )
6269 )
6270 else:
6270 else:
6271 hint = (
6271 hint = (
6272 _(
6272 _(
6273 b"use --all to revert all files,"
6273 b"use --all to revert all files,"
6274 b" or 'hg update %d' to update"
6274 b" or 'hg update %d' to update"
6275 )
6275 )
6276 % ctx.rev()
6276 % ctx.rev()
6277 )
6277 )
6278 elif dirty:
6278 elif dirty:
6279 hint = _(b"uncommitted changes, use --all to discard all changes")
6279 hint = _(b"uncommitted changes, use --all to discard all changes")
6280 else:
6280 else:
6281 hint = _(b"use --all to revert all files")
6281 hint = _(b"use --all to revert all files")
6282 raise error.Abort(msg, hint=hint)
6282 raise error.Abort(msg, hint=hint)
6283
6283
6284 return cmdutil.revert(
6284 return cmdutil.revert(
6285 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6285 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6286 )
6286 )
6287
6287
6288
6288
6289 @command(
6289 @command(
6290 b'rollback',
6290 b'rollback',
6291 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6291 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6292 helpcategory=command.CATEGORY_MAINTENANCE,
6292 helpcategory=command.CATEGORY_MAINTENANCE,
6293 )
6293 )
6294 def rollback(ui, repo, **opts):
6294 def rollback(ui, repo, **opts):
6295 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6295 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6296
6296
6297 Please use :hg:`commit --amend` instead of rollback to correct
6297 Please use :hg:`commit --amend` instead of rollback to correct
6298 mistakes in the last commit.
6298 mistakes in the last commit.
6299
6299
6300 This command should be used with care. There is only one level of
6300 This command should be used with care. There is only one level of
6301 rollback, and there is no way to undo a rollback. It will also
6301 rollback, and there is no way to undo a rollback. It will also
6302 restore the dirstate at the time of the last transaction, losing
6302 restore the dirstate at the time of the last transaction, losing
6303 any dirstate changes since that time. This command does not alter
6303 any dirstate changes since that time. This command does not alter
6304 the working directory.
6304 the working directory.
6305
6305
6306 Transactions are used to encapsulate the effects of all commands
6306 Transactions are used to encapsulate the effects of all commands
6307 that create new changesets or propagate existing changesets into a
6307 that create new changesets or propagate existing changesets into a
6308 repository.
6308 repository.
6309
6309
6310 .. container:: verbose
6310 .. container:: verbose
6311
6311
6312 For example, the following commands are transactional, and their
6312 For example, the following commands are transactional, and their
6313 effects can be rolled back:
6313 effects can be rolled back:
6314
6314
6315 - commit
6315 - commit
6316 - import
6316 - import
6317 - pull
6317 - pull
6318 - push (with this repository as the destination)
6318 - push (with this repository as the destination)
6319 - unbundle
6319 - unbundle
6320
6320
6321 To avoid permanent data loss, rollback will refuse to rollback a
6321 To avoid permanent data loss, rollback will refuse to rollback a
6322 commit transaction if it isn't checked out. Use --force to
6322 commit transaction if it isn't checked out. Use --force to
6323 override this protection.
6323 override this protection.
6324
6324
6325 The rollback command can be entirely disabled by setting the
6325 The rollback command can be entirely disabled by setting the
6326 ``ui.rollback`` configuration setting to false. If you're here
6326 ``ui.rollback`` configuration setting to false. If you're here
6327 because you want to use rollback and it's disabled, you can
6327 because you want to use rollback and it's disabled, you can
6328 re-enable the command by setting ``ui.rollback`` to true.
6328 re-enable the command by setting ``ui.rollback`` to true.
6329
6329
6330 This command is not intended for use on public repositories. Once
6330 This command is not intended for use on public repositories. Once
6331 changes are visible for pull by other users, rolling a transaction
6331 changes are visible for pull by other users, rolling a transaction
6332 back locally is ineffective (someone else may already have pulled
6332 back locally is ineffective (someone else may already have pulled
6333 the changes). Furthermore, a race is possible with readers of the
6333 the changes). Furthermore, a race is possible with readers of the
6334 repository; for example an in-progress pull from the repository
6334 repository; for example an in-progress pull from the repository
6335 may fail if a rollback is performed.
6335 may fail if a rollback is performed.
6336
6336
6337 Returns 0 on success, 1 if no rollback data is available.
6337 Returns 0 on success, 1 if no rollback data is available.
6338 """
6338 """
6339 if not ui.configbool(b'ui', b'rollback'):
6339 if not ui.configbool(b'ui', b'rollback'):
6340 raise error.Abort(
6340 raise error.Abort(
6341 _(b'rollback is disabled because it is unsafe'),
6341 _(b'rollback is disabled because it is unsafe'),
6342 hint=b'see `hg help -v rollback` for information',
6342 hint=b'see `hg help -v rollback` for information',
6343 )
6343 )
6344 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6344 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6345
6345
6346
6346
6347 @command(
6347 @command(
6348 b'root',
6348 b'root',
6349 [] + formatteropts,
6349 [] + formatteropts,
6350 intents={INTENT_READONLY},
6350 intents={INTENT_READONLY},
6351 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6351 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6352 )
6352 )
6353 def root(ui, repo, **opts):
6353 def root(ui, repo, **opts):
6354 """print the root (top) of the current working directory
6354 """print the root (top) of the current working directory
6355
6355
6356 Print the root directory of the current repository.
6356 Print the root directory of the current repository.
6357
6357
6358 .. container:: verbose
6358 .. container:: verbose
6359
6359
6360 Template:
6360 Template:
6361
6361
6362 The following keywords are supported in addition to the common template
6362 The following keywords are supported in addition to the common template
6363 keywords and functions. See also :hg:`help templates`.
6363 keywords and functions. See also :hg:`help templates`.
6364
6364
6365 :hgpath: String. Path to the .hg directory.
6365 :hgpath: String. Path to the .hg directory.
6366 :storepath: String. Path to the directory holding versioned data.
6366 :storepath: String. Path to the directory holding versioned data.
6367
6367
6368 Returns 0 on success.
6368 Returns 0 on success.
6369 """
6369 """
6370 opts = pycompat.byteskwargs(opts)
6370 opts = pycompat.byteskwargs(opts)
6371 with ui.formatter(b'root', opts) as fm:
6371 with ui.formatter(b'root', opts) as fm:
6372 fm.startitem()
6372 fm.startitem()
6373 fm.write(b'reporoot', b'%s\n', repo.root)
6373 fm.write(b'reporoot', b'%s\n', repo.root)
6374 fm.data(hgpath=repo.path, storepath=repo.spath)
6374 fm.data(hgpath=repo.path, storepath=repo.spath)
6375
6375
6376
6376
6377 @command(
6377 @command(
6378 b'serve',
6378 b'serve',
6379 [
6379 [
6380 (
6380 (
6381 b'A',
6381 b'A',
6382 b'accesslog',
6382 b'accesslog',
6383 b'',
6383 b'',
6384 _(b'name of access log file to write to'),
6384 _(b'name of access log file to write to'),
6385 _(b'FILE'),
6385 _(b'FILE'),
6386 ),
6386 ),
6387 (b'd', b'daemon', None, _(b'run server in background')),
6387 (b'd', b'daemon', None, _(b'run server in background')),
6388 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6388 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6389 (
6389 (
6390 b'E',
6390 b'E',
6391 b'errorlog',
6391 b'errorlog',
6392 b'',
6392 b'',
6393 _(b'name of error log file to write to'),
6393 _(b'name of error log file to write to'),
6394 _(b'FILE'),
6394 _(b'FILE'),
6395 ),
6395 ),
6396 # use string type, then we can check if something was passed
6396 # use string type, then we can check if something was passed
6397 (
6397 (
6398 b'p',
6398 b'p',
6399 b'port',
6399 b'port',
6400 b'',
6400 b'',
6401 _(b'port to listen on (default: 8000)'),
6401 _(b'port to listen on (default: 8000)'),
6402 _(b'PORT'),
6402 _(b'PORT'),
6403 ),
6403 ),
6404 (
6404 (
6405 b'a',
6405 b'a',
6406 b'address',
6406 b'address',
6407 b'',
6407 b'',
6408 _(b'address to listen on (default: all interfaces)'),
6408 _(b'address to listen on (default: all interfaces)'),
6409 _(b'ADDR'),
6409 _(b'ADDR'),
6410 ),
6410 ),
6411 (
6411 (
6412 b'',
6412 b'',
6413 b'prefix',
6413 b'prefix',
6414 b'',
6414 b'',
6415 _(b'prefix path to serve from (default: server root)'),
6415 _(b'prefix path to serve from (default: server root)'),
6416 _(b'PREFIX'),
6416 _(b'PREFIX'),
6417 ),
6417 ),
6418 (
6418 (
6419 b'n',
6419 b'n',
6420 b'name',
6420 b'name',
6421 b'',
6421 b'',
6422 _(b'name to show in web pages (default: working directory)'),
6422 _(b'name to show in web pages (default: working directory)'),
6423 _(b'NAME'),
6423 _(b'NAME'),
6424 ),
6424 ),
6425 (
6425 (
6426 b'',
6426 b'',
6427 b'web-conf',
6427 b'web-conf',
6428 b'',
6428 b'',
6429 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6429 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6430 _(b'FILE'),
6430 _(b'FILE'),
6431 ),
6431 ),
6432 (
6432 (
6433 b'',
6433 b'',
6434 b'webdir-conf',
6434 b'webdir-conf',
6435 b'',
6435 b'',
6436 _(b'name of the hgweb config file (DEPRECATED)'),
6436 _(b'name of the hgweb config file (DEPRECATED)'),
6437 _(b'FILE'),
6437 _(b'FILE'),
6438 ),
6438 ),
6439 (
6439 (
6440 b'',
6440 b'',
6441 b'pid-file',
6441 b'pid-file',
6442 b'',
6442 b'',
6443 _(b'name of file to write process ID to'),
6443 _(b'name of file to write process ID to'),
6444 _(b'FILE'),
6444 _(b'FILE'),
6445 ),
6445 ),
6446 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6446 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6447 (
6447 (
6448 b'',
6448 b'',
6449 b'cmdserver',
6449 b'cmdserver',
6450 b'',
6450 b'',
6451 _(b'for remote clients (ADVANCED)'),
6451 _(b'for remote clients (ADVANCED)'),
6452 _(b'MODE'),
6452 _(b'MODE'),
6453 ),
6453 ),
6454 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6454 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6455 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6455 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6456 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6456 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6457 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6457 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6458 (b'', b'print-url', None, _(b'start and print only the URL')),
6458 (b'', b'print-url', None, _(b'start and print only the URL')),
6459 ]
6459 ]
6460 + subrepoopts,
6460 + subrepoopts,
6461 _(b'[OPTION]...'),
6461 _(b'[OPTION]...'),
6462 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6462 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6463 helpbasic=True,
6463 helpbasic=True,
6464 optionalrepo=True,
6464 optionalrepo=True,
6465 )
6465 )
6466 def serve(ui, repo, **opts):
6466 def serve(ui, repo, **opts):
6467 """start stand-alone webserver
6467 """start stand-alone webserver
6468
6468
6469 Start a local HTTP repository browser and pull server. You can use
6469 Start a local HTTP repository browser and pull server. You can use
6470 this for ad-hoc sharing and browsing of repositories. It is
6470 this for ad-hoc sharing and browsing of repositories. It is
6471 recommended to use a real web server to serve a repository for
6471 recommended to use a real web server to serve a repository for
6472 longer periods of time.
6472 longer periods of time.
6473
6473
6474 Please note that the server does not implement access control.
6474 Please note that the server does not implement access control.
6475 This means that, by default, anybody can read from the server and
6475 This means that, by default, anybody can read from the server and
6476 nobody can write to it by default. Set the ``web.allow-push``
6476 nobody can write to it by default. Set the ``web.allow-push``
6477 option to ``*`` to allow everybody to push to the server. You
6477 option to ``*`` to allow everybody to push to the server. You
6478 should use a real web server if you need to authenticate users.
6478 should use a real web server if you need to authenticate users.
6479
6479
6480 By default, the server logs accesses to stdout and errors to
6480 By default, the server logs accesses to stdout and errors to
6481 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6481 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6482 files.
6482 files.
6483
6483
6484 To have the server choose a free port number to listen on, specify
6484 To have the server choose a free port number to listen on, specify
6485 a port number of 0; in this case, the server will print the port
6485 a port number of 0; in this case, the server will print the port
6486 number it uses.
6486 number it uses.
6487
6487
6488 Returns 0 on success.
6488 Returns 0 on success.
6489 """
6489 """
6490
6490
6491 opts = pycompat.byteskwargs(opts)
6491 opts = pycompat.byteskwargs(opts)
6492 if opts[b"stdio"] and opts[b"cmdserver"]:
6492 if opts[b"stdio"] and opts[b"cmdserver"]:
6493 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6493 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6494 if opts[b"print_url"] and ui.verbose:
6494 if opts[b"print_url"] and ui.verbose:
6495 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6495 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6496
6496
6497 if opts[b"stdio"]:
6497 if opts[b"stdio"]:
6498 if repo is None:
6498 if repo is None:
6499 raise error.RepoError(
6499 raise error.RepoError(
6500 _(b"there is no Mercurial repository here (.hg not found)")
6500 _(b"there is no Mercurial repository here (.hg not found)")
6501 )
6501 )
6502 s = wireprotoserver.sshserver(ui, repo)
6502 s = wireprotoserver.sshserver(ui, repo)
6503 s.serve_forever()
6503 s.serve_forever()
6504
6504
6505 service = server.createservice(ui, repo, opts)
6505 service = server.createservice(ui, repo, opts)
6506 return server.runservice(opts, initfn=service.init, runfn=service.run)
6506 return server.runservice(opts, initfn=service.init, runfn=service.run)
6507
6507
6508
6508
6509 @command(
6509 @command(
6510 b'shelve',
6510 b'shelve',
6511 [
6511 [
6512 (
6512 (
6513 b'A',
6513 b'A',
6514 b'addremove',
6514 b'addremove',
6515 None,
6515 None,
6516 _(b'mark new/missing files as added/removed before shelving'),
6516 _(b'mark new/missing files as added/removed before shelving'),
6517 ),
6517 ),
6518 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6518 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6519 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6519 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6520 (
6520 (
6521 b'',
6521 b'',
6522 b'date',
6522 b'date',
6523 b'',
6523 b'',
6524 _(b'shelve with the specified commit date'),
6524 _(b'shelve with the specified commit date'),
6525 _(b'DATE'),
6525 _(b'DATE'),
6526 ),
6526 ),
6527 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6527 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6528 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6528 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6529 (
6529 (
6530 b'k',
6530 b'k',
6531 b'keep',
6531 b'keep',
6532 False,
6532 False,
6533 _(b'shelve, but keep changes in the working directory'),
6533 _(b'shelve, but keep changes in the working directory'),
6534 ),
6534 ),
6535 (b'l', b'list', None, _(b'list current shelves')),
6535 (b'l', b'list', None, _(b'list current shelves')),
6536 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6536 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6537 (
6537 (
6538 b'n',
6538 b'n',
6539 b'name',
6539 b'name',
6540 b'',
6540 b'',
6541 _(b'use the given name for the shelved commit'),
6541 _(b'use the given name for the shelved commit'),
6542 _(b'NAME'),
6542 _(b'NAME'),
6543 ),
6543 ),
6544 (
6544 (
6545 b'p',
6545 b'p',
6546 b'patch',
6546 b'patch',
6547 None,
6547 None,
6548 _(
6548 _(
6549 b'output patches for changes (provide the names of the shelved '
6549 b'output patches for changes (provide the names of the shelved '
6550 b'changes as positional arguments)'
6550 b'changes as positional arguments)'
6551 ),
6551 ),
6552 ),
6552 ),
6553 (b'i', b'interactive', None, _(b'interactive mode')),
6553 (b'i', b'interactive', None, _(b'interactive mode')),
6554 (
6554 (
6555 b'',
6555 b'',
6556 b'stat',
6556 b'stat',
6557 None,
6557 None,
6558 _(
6558 _(
6559 b'output diffstat-style summary of changes (provide the names of '
6559 b'output diffstat-style summary of changes (provide the names of '
6560 b'the shelved changes as positional arguments)'
6560 b'the shelved changes as positional arguments)'
6561 ),
6561 ),
6562 ),
6562 ),
6563 ]
6563 ]
6564 + cmdutil.walkopts,
6564 + cmdutil.walkopts,
6565 _(b'hg shelve [OPTION]... [FILE]...'),
6565 _(b'hg shelve [OPTION]... [FILE]...'),
6566 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6566 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6567 )
6567 )
6568 def shelve(ui, repo, *pats, **opts):
6568 def shelve(ui, repo, *pats, **opts):
6569 '''save and set aside changes from the working directory
6569 '''save and set aside changes from the working directory
6570
6570
6571 Shelving takes files that "hg status" reports as not clean, saves
6571 Shelving takes files that "hg status" reports as not clean, saves
6572 the modifications to a bundle (a shelved change), and reverts the
6572 the modifications to a bundle (a shelved change), and reverts the
6573 files so that their state in the working directory becomes clean.
6573 files so that their state in the working directory becomes clean.
6574
6574
6575 To restore these changes to the working directory, using "hg
6575 To restore these changes to the working directory, using "hg
6576 unshelve"; this will work even if you switch to a different
6576 unshelve"; this will work even if you switch to a different
6577 commit.
6577 commit.
6578
6578
6579 When no files are specified, "hg shelve" saves all not-clean
6579 When no files are specified, "hg shelve" saves all not-clean
6580 files. If specific files or directories are named, only changes to
6580 files. If specific files or directories are named, only changes to
6581 those files are shelved.
6581 those files are shelved.
6582
6582
6583 In bare shelve (when no files are specified, without interactive,
6583 In bare shelve (when no files are specified, without interactive,
6584 include and exclude option), shelving remembers information if the
6584 include and exclude option), shelving remembers information if the
6585 working directory was on newly created branch, in other words working
6585 working directory was on newly created branch, in other words working
6586 directory was on different branch than its first parent. In this
6586 directory was on different branch than its first parent. In this
6587 situation unshelving restores branch information to the working directory.
6587 situation unshelving restores branch information to the working directory.
6588
6588
6589 Each shelved change has a name that makes it easier to find later.
6589 Each shelved change has a name that makes it easier to find later.
6590 The name of a shelved change defaults to being based on the active
6590 The name of a shelved change defaults to being based on the active
6591 bookmark, or if there is no active bookmark, the current named
6591 bookmark, or if there is no active bookmark, the current named
6592 branch. To specify a different name, use ``--name``.
6592 branch. To specify a different name, use ``--name``.
6593
6593
6594 To see a list of existing shelved changes, use the ``--list``
6594 To see a list of existing shelved changes, use the ``--list``
6595 option. For each shelved change, this will print its name, age,
6595 option. For each shelved change, this will print its name, age,
6596 and description; use ``--patch`` or ``--stat`` for more details.
6596 and description; use ``--patch`` or ``--stat`` for more details.
6597
6597
6598 To delete specific shelved changes, use ``--delete``. To delete
6598 To delete specific shelved changes, use ``--delete``. To delete
6599 all shelved changes, use ``--cleanup``.
6599 all shelved changes, use ``--cleanup``.
6600 '''
6600 '''
6601 opts = pycompat.byteskwargs(opts)
6601 opts = pycompat.byteskwargs(opts)
6602 allowables = [
6602 allowables = [
6603 (b'addremove', {b'create'}), # 'create' is pseudo action
6603 (b'addremove', {b'create'}), # 'create' is pseudo action
6604 (b'unknown', {b'create'}),
6604 (b'unknown', {b'create'}),
6605 (b'cleanup', {b'cleanup'}),
6605 (b'cleanup', {b'cleanup'}),
6606 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6606 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6607 (b'delete', {b'delete'}),
6607 (b'delete', {b'delete'}),
6608 (b'edit', {b'create'}),
6608 (b'edit', {b'create'}),
6609 (b'keep', {b'create'}),
6609 (b'keep', {b'create'}),
6610 (b'list', {b'list'}),
6610 (b'list', {b'list'}),
6611 (b'message', {b'create'}),
6611 (b'message', {b'create'}),
6612 (b'name', {b'create'}),
6612 (b'name', {b'create'}),
6613 (b'patch', {b'patch', b'list'}),
6613 (b'patch', {b'patch', b'list'}),
6614 (b'stat', {b'stat', b'list'}),
6614 (b'stat', {b'stat', b'list'}),
6615 ]
6615 ]
6616
6616
6617 def checkopt(opt):
6617 def checkopt(opt):
6618 if opts.get(opt):
6618 if opts.get(opt):
6619 for i, allowable in allowables:
6619 for i, allowable in allowables:
6620 if opts[i] and opt not in allowable:
6620 if opts[i] and opt not in allowable:
6621 raise error.Abort(
6621 raise error.Abort(
6622 _(
6622 _(
6623 b"options '--%s' and '--%s' may not be "
6623 b"options '--%s' and '--%s' may not be "
6624 b"used together"
6624 b"used together"
6625 )
6625 )
6626 % (opt, i)
6626 % (opt, i)
6627 )
6627 )
6628 return True
6628 return True
6629
6629
6630 if checkopt(b'cleanup'):
6630 if checkopt(b'cleanup'):
6631 if pats:
6631 if pats:
6632 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6632 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6633 return shelvemod.cleanupcmd(ui, repo)
6633 return shelvemod.cleanupcmd(ui, repo)
6634 elif checkopt(b'delete'):
6634 elif checkopt(b'delete'):
6635 return shelvemod.deletecmd(ui, repo, pats)
6635 return shelvemod.deletecmd(ui, repo, pats)
6636 elif checkopt(b'list'):
6636 elif checkopt(b'list'):
6637 return shelvemod.listcmd(ui, repo, pats, opts)
6637 return shelvemod.listcmd(ui, repo, pats, opts)
6638 elif checkopt(b'patch') or checkopt(b'stat'):
6638 elif checkopt(b'patch') or checkopt(b'stat'):
6639 return shelvemod.patchcmds(ui, repo, pats, opts)
6639 return shelvemod.patchcmds(ui, repo, pats, opts)
6640 else:
6640 else:
6641 return shelvemod.createcmd(ui, repo, pats, opts)
6641 return shelvemod.createcmd(ui, repo, pats, opts)
6642
6642
6643
6643
6644 _NOTTERSE = b'nothing'
6644 _NOTTERSE = b'nothing'
6645
6645
6646
6646
6647 @command(
6647 @command(
6648 b'status|st',
6648 b'status|st',
6649 [
6649 [
6650 (b'A', b'all', None, _(b'show status of all files')),
6650 (b'A', b'all', None, _(b'show status of all files')),
6651 (b'm', b'modified', None, _(b'show only modified files')),
6651 (b'm', b'modified', None, _(b'show only modified files')),
6652 (b'a', b'added', None, _(b'show only added files')),
6652 (b'a', b'added', None, _(b'show only added files')),
6653 (b'r', b'removed', None, _(b'show only removed files')),
6653 (b'r', b'removed', None, _(b'show only removed files')),
6654 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6654 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6655 (b'c', b'clean', None, _(b'show only files without changes')),
6655 (b'c', b'clean', None, _(b'show only files without changes')),
6656 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6656 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6657 (b'i', b'ignored', None, _(b'show only ignored files')),
6657 (b'i', b'ignored', None, _(b'show only ignored files')),
6658 (b'n', b'no-status', None, _(b'hide status prefix')),
6658 (b'n', b'no-status', None, _(b'hide status prefix')),
6659 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6659 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6660 (
6660 (
6661 b'C',
6661 b'C',
6662 b'copies',
6662 b'copies',
6663 None,
6663 None,
6664 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6664 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6665 ),
6665 ),
6666 (
6666 (
6667 b'0',
6667 b'0',
6668 b'print0',
6668 b'print0',
6669 None,
6669 None,
6670 _(b'end filenames with NUL, for use with xargs'),
6670 _(b'end filenames with NUL, for use with xargs'),
6671 ),
6671 ),
6672 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6672 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6673 (
6673 (
6674 b'',
6674 b'',
6675 b'change',
6675 b'change',
6676 b'',
6676 b'',
6677 _(b'list the changed files of a revision'),
6677 _(b'list the changed files of a revision'),
6678 _(b'REV'),
6678 _(b'REV'),
6679 ),
6679 ),
6680 ]
6680 ]
6681 + walkopts
6681 + walkopts
6682 + subrepoopts
6682 + subrepoopts
6683 + formatteropts,
6683 + formatteropts,
6684 _(b'[OPTION]... [FILE]...'),
6684 _(b'[OPTION]... [FILE]...'),
6685 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6685 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6686 helpbasic=True,
6686 helpbasic=True,
6687 inferrepo=True,
6687 inferrepo=True,
6688 intents={INTENT_READONLY},
6688 intents={INTENT_READONLY},
6689 )
6689 )
6690 def status(ui, repo, *pats, **opts):
6690 def status(ui, repo, *pats, **opts):
6691 """show changed files in the working directory
6691 """show changed files in the working directory
6692
6692
6693 Show status of files in the repository. If names are given, only
6693 Show status of files in the repository. If names are given, only
6694 files that match are shown. Files that are clean or ignored or
6694 files that match are shown. Files that are clean or ignored or
6695 the source of a copy/move operation, are not listed unless
6695 the source of a copy/move operation, are not listed unless
6696 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6696 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6697 Unless options described with "show only ..." are given, the
6697 Unless options described with "show only ..." are given, the
6698 options -mardu are used.
6698 options -mardu are used.
6699
6699
6700 Option -q/--quiet hides untracked (unknown and ignored) files
6700 Option -q/--quiet hides untracked (unknown and ignored) files
6701 unless explicitly requested with -u/--unknown or -i/--ignored.
6701 unless explicitly requested with -u/--unknown or -i/--ignored.
6702
6702
6703 .. note::
6703 .. note::
6704
6704
6705 :hg:`status` may appear to disagree with diff if permissions have
6705 :hg:`status` may appear to disagree with diff if permissions have
6706 changed or a merge has occurred. The standard diff format does
6706 changed or a merge has occurred. The standard diff format does
6707 not report permission changes and diff only reports changes
6707 not report permission changes and diff only reports changes
6708 relative to one merge parent.
6708 relative to one merge parent.
6709
6709
6710 If one revision is given, it is used as the base revision.
6710 If one revision is given, it is used as the base revision.
6711 If two revisions are given, the differences between them are
6711 If two revisions are given, the differences between them are
6712 shown. The --change option can also be used as a shortcut to list
6712 shown. The --change option can also be used as a shortcut to list
6713 the changed files of a revision from its first parent.
6713 the changed files of a revision from its first parent.
6714
6714
6715 The codes used to show the status of files are::
6715 The codes used to show the status of files are::
6716
6716
6717 M = modified
6717 M = modified
6718 A = added
6718 A = added
6719 R = removed
6719 R = removed
6720 C = clean
6720 C = clean
6721 ! = missing (deleted by non-hg command, but still tracked)
6721 ! = missing (deleted by non-hg command, but still tracked)
6722 ? = not tracked
6722 ? = not tracked
6723 I = ignored
6723 I = ignored
6724 = origin of the previous file (with --copies)
6724 = origin of the previous file (with --copies)
6725
6725
6726 .. container:: verbose
6726 .. container:: verbose
6727
6727
6728 The -t/--terse option abbreviates the output by showing only the directory
6728 The -t/--terse option abbreviates the output by showing only the directory
6729 name if all the files in it share the same status. The option takes an
6729 name if all the files in it share the same status. The option takes an
6730 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6730 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6731 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6731 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6732 for 'ignored' and 'c' for clean.
6732 for 'ignored' and 'c' for clean.
6733
6733
6734 It abbreviates only those statuses which are passed. Note that clean and
6734 It abbreviates only those statuses which are passed. Note that clean and
6735 ignored files are not displayed with '--terse ic' unless the -c/--clean
6735 ignored files are not displayed with '--terse ic' unless the -c/--clean
6736 and -i/--ignored options are also used.
6736 and -i/--ignored options are also used.
6737
6737
6738 The -v/--verbose option shows information when the repository is in an
6738 The -v/--verbose option shows information when the repository is in an
6739 unfinished merge, shelve, rebase state etc. You can have this behavior
6739 unfinished merge, shelve, rebase state etc. You can have this behavior
6740 turned on by default by enabling the ``commands.status.verbose`` option.
6740 turned on by default by enabling the ``commands.status.verbose`` option.
6741
6741
6742 You can skip displaying some of these states by setting
6742 You can skip displaying some of these states by setting
6743 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6743 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6744 'histedit', 'merge', 'rebase', or 'unshelve'.
6744 'histedit', 'merge', 'rebase', or 'unshelve'.
6745
6745
6746 Template:
6746 Template:
6747
6747
6748 The following keywords are supported in addition to the common template
6748 The following keywords are supported in addition to the common template
6749 keywords and functions. See also :hg:`help templates`.
6749 keywords and functions. See also :hg:`help templates`.
6750
6750
6751 :path: String. Repository-absolute path of the file.
6751 :path: String. Repository-absolute path of the file.
6752 :source: String. Repository-absolute path of the file originated from.
6752 :source: String. Repository-absolute path of the file originated from.
6753 Available if ``--copies`` is specified.
6753 Available if ``--copies`` is specified.
6754 :status: String. Character denoting file's status.
6754 :status: String. Character denoting file's status.
6755
6755
6756 Examples:
6756 Examples:
6757
6757
6758 - show changes in the working directory relative to a
6758 - show changes in the working directory relative to a
6759 changeset::
6759 changeset::
6760
6760
6761 hg status --rev 9353
6761 hg status --rev 9353
6762
6762
6763 - show changes in the working directory relative to the
6763 - show changes in the working directory relative to the
6764 current directory (see :hg:`help patterns` for more information)::
6764 current directory (see :hg:`help patterns` for more information)::
6765
6765
6766 hg status re:
6766 hg status re:
6767
6767
6768 - show all changes including copies in an existing changeset::
6768 - show all changes including copies in an existing changeset::
6769
6769
6770 hg status --copies --change 9353
6770 hg status --copies --change 9353
6771
6771
6772 - get a NUL separated list of added files, suitable for xargs::
6772 - get a NUL separated list of added files, suitable for xargs::
6773
6773
6774 hg status -an0
6774 hg status -an0
6775
6775
6776 - show more information about the repository status, abbreviating
6776 - show more information about the repository status, abbreviating
6777 added, removed, modified, deleted, and untracked paths::
6777 added, removed, modified, deleted, and untracked paths::
6778
6778
6779 hg status -v -t mardu
6779 hg status -v -t mardu
6780
6780
6781 Returns 0 on success.
6781 Returns 0 on success.
6782
6782
6783 """
6783 """
6784
6784
6785 opts = pycompat.byteskwargs(opts)
6785 opts = pycompat.byteskwargs(opts)
6786 revs = opts.get(b'rev')
6786 revs = opts.get(b'rev')
6787 change = opts.get(b'change')
6787 change = opts.get(b'change')
6788 terse = opts.get(b'terse')
6788 terse = opts.get(b'terse')
6789 if terse is _NOTTERSE:
6789 if terse is _NOTTERSE:
6790 if revs:
6790 if revs:
6791 terse = b''
6791 terse = b''
6792 else:
6792 else:
6793 terse = ui.config(b'commands', b'status.terse')
6793 terse = ui.config(b'commands', b'status.terse')
6794
6794
6795 if revs and change:
6795 if revs and change:
6796 msg = _(b'cannot specify --rev and --change at the same time')
6796 msg = _(b'cannot specify --rev and --change at the same time')
6797 raise error.Abort(msg)
6797 raise error.Abort(msg)
6798 elif revs and terse:
6798 elif revs and terse:
6799 msg = _(b'cannot use --terse with --rev')
6799 msg = _(b'cannot use --terse with --rev')
6800 raise error.Abort(msg)
6800 raise error.Abort(msg)
6801 elif change:
6801 elif change:
6802 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6802 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6803 ctx2 = scmutil.revsingle(repo, change, None)
6803 ctx2 = scmutil.revsingle(repo, change, None)
6804 ctx1 = ctx2.p1()
6804 ctx1 = ctx2.p1()
6805 else:
6805 else:
6806 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6806 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6807 ctx1, ctx2 = scmutil.revpair(repo, revs)
6807 ctx1, ctx2 = scmutil.revpair(repo, revs)
6808
6808
6809 forcerelativevalue = None
6809 forcerelativevalue = None
6810 if ui.hasconfig(b'commands', b'status.relative'):
6810 if ui.hasconfig(b'commands', b'status.relative'):
6811 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6811 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6812 uipathfn = scmutil.getuipathfn(
6812 uipathfn = scmutil.getuipathfn(
6813 repo,
6813 repo,
6814 legacyrelativevalue=bool(pats),
6814 legacyrelativevalue=bool(pats),
6815 forcerelativevalue=forcerelativevalue,
6815 forcerelativevalue=forcerelativevalue,
6816 )
6816 )
6817
6817
6818 if opts.get(b'print0'):
6818 if opts.get(b'print0'):
6819 end = b'\0'
6819 end = b'\0'
6820 else:
6820 else:
6821 end = b'\n'
6821 end = b'\n'
6822 states = b'modified added removed deleted unknown ignored clean'.split()
6822 states = b'modified added removed deleted unknown ignored clean'.split()
6823 show = [k for k in states if opts.get(k)]
6823 show = [k for k in states if opts.get(k)]
6824 if opts.get(b'all'):
6824 if opts.get(b'all'):
6825 show += ui.quiet and (states[:4] + [b'clean']) or states
6825 show += ui.quiet and (states[:4] + [b'clean']) or states
6826
6826
6827 if not show:
6827 if not show:
6828 if ui.quiet:
6828 if ui.quiet:
6829 show = states[:4]
6829 show = states[:4]
6830 else:
6830 else:
6831 show = states[:5]
6831 show = states[:5]
6832
6832
6833 m = scmutil.match(ctx2, pats, opts)
6833 m = scmutil.match(ctx2, pats, opts)
6834 if terse:
6834 if terse:
6835 # we need to compute clean and unknown to terse
6835 # we need to compute clean and unknown to terse
6836 stat = repo.status(
6836 stat = repo.status(
6837 ctx1.node(),
6837 ctx1.node(),
6838 ctx2.node(),
6838 ctx2.node(),
6839 m,
6839 m,
6840 b'ignored' in show or b'i' in terse,
6840 b'ignored' in show or b'i' in terse,
6841 clean=True,
6841 clean=True,
6842 unknown=True,
6842 unknown=True,
6843 listsubrepos=opts.get(b'subrepos'),
6843 listsubrepos=opts.get(b'subrepos'),
6844 )
6844 )
6845
6845
6846 stat = cmdutil.tersedir(stat, terse)
6846 stat = cmdutil.tersedir(stat, terse)
6847 else:
6847 else:
6848 stat = repo.status(
6848 stat = repo.status(
6849 ctx1.node(),
6849 ctx1.node(),
6850 ctx2.node(),
6850 ctx2.node(),
6851 m,
6851 m,
6852 b'ignored' in show,
6852 b'ignored' in show,
6853 b'clean' in show,
6853 b'clean' in show,
6854 b'unknown' in show,
6854 b'unknown' in show,
6855 opts.get(b'subrepos'),
6855 opts.get(b'subrepos'),
6856 )
6856 )
6857
6857
6858 changestates = zip(
6858 changestates = zip(
6859 states,
6859 states,
6860 pycompat.iterbytestr(b'MAR!?IC'),
6860 pycompat.iterbytestr(b'MAR!?IC'),
6861 [getattr(stat, s.decode('utf8')) for s in states],
6861 [getattr(stat, s.decode('utf8')) for s in states],
6862 )
6862 )
6863
6863
6864 copy = {}
6864 copy = {}
6865 if (
6865 if (
6866 opts.get(b'all')
6866 opts.get(b'all')
6867 or opts.get(b'copies')
6867 or opts.get(b'copies')
6868 or ui.configbool(b'ui', b'statuscopies')
6868 or ui.configbool(b'ui', b'statuscopies')
6869 ) and not opts.get(b'no_status'):
6869 ) and not opts.get(b'no_status'):
6870 copy = copies.pathcopies(ctx1, ctx2, m)
6870 copy = copies.pathcopies(ctx1, ctx2, m)
6871
6871
6872 morestatus = None
6872 morestatus = None
6873 if (
6873 if (
6874 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6874 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6875 ) and not ui.plain():
6875 ) and not ui.plain():
6876 morestatus = cmdutil.readmorestatus(repo)
6876 morestatus = cmdutil.readmorestatus(repo)
6877
6877
6878 ui.pager(b'status')
6878 ui.pager(b'status')
6879 fm = ui.formatter(b'status', opts)
6879 fm = ui.formatter(b'status', opts)
6880 fmt = b'%s' + end
6880 fmt = b'%s' + end
6881 showchar = not opts.get(b'no_status')
6881 showchar = not opts.get(b'no_status')
6882
6882
6883 for state, char, files in changestates:
6883 for state, char, files in changestates:
6884 if state in show:
6884 if state in show:
6885 label = b'status.' + state
6885 label = b'status.' + state
6886 for f in files:
6886 for f in files:
6887 fm.startitem()
6887 fm.startitem()
6888 fm.context(ctx=ctx2)
6888 fm.context(ctx=ctx2)
6889 fm.data(itemtype=b'file', path=f)
6889 fm.data(itemtype=b'file', path=f)
6890 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6890 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6891 fm.plain(fmt % uipathfn(f), label=label)
6891 fm.plain(fmt % uipathfn(f), label=label)
6892 if f in copy:
6892 if f in copy:
6893 fm.data(source=copy[f])
6893 fm.data(source=copy[f])
6894 fm.plain(
6894 fm.plain(
6895 (b' %s' + end) % uipathfn(copy[f]),
6895 (b' %s' + end) % uipathfn(copy[f]),
6896 label=b'status.copied',
6896 label=b'status.copied',
6897 )
6897 )
6898 if morestatus:
6898 if morestatus:
6899 morestatus.formatfile(f, fm)
6899 morestatus.formatfile(f, fm)
6900
6900
6901 if morestatus:
6901 if morestatus:
6902 morestatus.formatfooter(fm)
6902 morestatus.formatfooter(fm)
6903 fm.end()
6903 fm.end()
6904
6904
6905
6905
6906 @command(
6906 @command(
6907 b'summary|sum',
6907 b'summary|sum',
6908 [(b'', b'remote', None, _(b'check for push and pull'))],
6908 [(b'', b'remote', None, _(b'check for push and pull'))],
6909 b'[--remote]',
6909 b'[--remote]',
6910 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6910 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6911 helpbasic=True,
6911 helpbasic=True,
6912 intents={INTENT_READONLY},
6912 intents={INTENT_READONLY},
6913 )
6913 )
6914 def summary(ui, repo, **opts):
6914 def summary(ui, repo, **opts):
6915 """summarize working directory state
6915 """summarize working directory state
6916
6916
6917 This generates a brief summary of the working directory state,
6917 This generates a brief summary of the working directory state,
6918 including parents, branch, commit status, phase and available updates.
6918 including parents, branch, commit status, phase and available updates.
6919
6919
6920 With the --remote option, this will check the default paths for
6920 With the --remote option, this will check the default paths for
6921 incoming and outgoing changes. This can be time-consuming.
6921 incoming and outgoing changes. This can be time-consuming.
6922
6922
6923 Returns 0 on success.
6923 Returns 0 on success.
6924 """
6924 """
6925
6925
6926 opts = pycompat.byteskwargs(opts)
6926 opts = pycompat.byteskwargs(opts)
6927 ui.pager(b'summary')
6927 ui.pager(b'summary')
6928 ctx = repo[None]
6928 ctx = repo[None]
6929 parents = ctx.parents()
6929 parents = ctx.parents()
6930 pnode = parents[0].node()
6930 pnode = parents[0].node()
6931 marks = []
6931 marks = []
6932
6932
6933 try:
6933 try:
6934 ms = mergemod.mergestate.read(repo)
6934 ms = mergemod.mergestate.read(repo)
6935 except error.UnsupportedMergeRecords as e:
6935 except error.UnsupportedMergeRecords as e:
6936 s = b' '.join(e.recordtypes)
6936 s = b' '.join(e.recordtypes)
6937 ui.warn(
6937 ui.warn(
6938 _(b'warning: merge state has unsupported record types: %s\n') % s
6938 _(b'warning: merge state has unsupported record types: %s\n') % s
6939 )
6939 )
6940 unresolved = []
6940 unresolved = []
6941 else:
6941 else:
6942 unresolved = list(ms.unresolved())
6942 unresolved = list(ms.unresolved())
6943
6943
6944 for p in parents:
6944 for p in parents:
6945 # label with log.changeset (instead of log.parent) since this
6945 # label with log.changeset (instead of log.parent) since this
6946 # shows a working directory parent *changeset*:
6946 # shows a working directory parent *changeset*:
6947 # i18n: column positioning for "hg summary"
6947 # i18n: column positioning for "hg summary"
6948 ui.write(
6948 ui.write(
6949 _(b'parent: %d:%s ') % (p.rev(), p),
6949 _(b'parent: %d:%s ') % (p.rev(), p),
6950 label=logcmdutil.changesetlabels(p),
6950 label=logcmdutil.changesetlabels(p),
6951 )
6951 )
6952 ui.write(b' '.join(p.tags()), label=b'log.tag')
6952 ui.write(b' '.join(p.tags()), label=b'log.tag')
6953 if p.bookmarks():
6953 if p.bookmarks():
6954 marks.extend(p.bookmarks())
6954 marks.extend(p.bookmarks())
6955 if p.rev() == -1:
6955 if p.rev() == -1:
6956 if not len(repo):
6956 if not len(repo):
6957 ui.write(_(b' (empty repository)'))
6957 ui.write(_(b' (empty repository)'))
6958 else:
6958 else:
6959 ui.write(_(b' (no revision checked out)'))
6959 ui.write(_(b' (no revision checked out)'))
6960 if p.obsolete():
6960 if p.obsolete():
6961 ui.write(_(b' (obsolete)'))
6961 ui.write(_(b' (obsolete)'))
6962 if p.isunstable():
6962 if p.isunstable():
6963 instabilities = (
6963 instabilities = (
6964 ui.label(instability, b'trouble.%s' % instability)
6964 ui.label(instability, b'trouble.%s' % instability)
6965 for instability in p.instabilities()
6965 for instability in p.instabilities()
6966 )
6966 )
6967 ui.write(b' (' + b', '.join(instabilities) + b')')
6967 ui.write(b' (' + b', '.join(instabilities) + b')')
6968 ui.write(b'\n')
6968 ui.write(b'\n')
6969 if p.description():
6969 if p.description():
6970 ui.status(
6970 ui.status(
6971 b' ' + p.description().splitlines()[0].strip() + b'\n',
6971 b' ' + p.description().splitlines()[0].strip() + b'\n',
6972 label=b'log.summary',
6972 label=b'log.summary',
6973 )
6973 )
6974
6974
6975 branch = ctx.branch()
6975 branch = ctx.branch()
6976 bheads = repo.branchheads(branch)
6976 bheads = repo.branchheads(branch)
6977 # i18n: column positioning for "hg summary"
6977 # i18n: column positioning for "hg summary"
6978 m = _(b'branch: %s\n') % branch
6978 m = _(b'branch: %s\n') % branch
6979 if branch != b'default':
6979 if branch != b'default':
6980 ui.write(m, label=b'log.branch')
6980 ui.write(m, label=b'log.branch')
6981 else:
6981 else:
6982 ui.status(m, label=b'log.branch')
6982 ui.status(m, label=b'log.branch')
6983
6983
6984 if marks:
6984 if marks:
6985 active = repo._activebookmark
6985 active = repo._activebookmark
6986 # i18n: column positioning for "hg summary"
6986 # i18n: column positioning for "hg summary"
6987 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6987 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6988 if active is not None:
6988 if active is not None:
6989 if active in marks:
6989 if active in marks:
6990 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6990 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6991 marks.remove(active)
6991 marks.remove(active)
6992 else:
6992 else:
6993 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6993 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6994 for m in marks:
6994 for m in marks:
6995 ui.write(b' ' + m, label=b'log.bookmark')
6995 ui.write(b' ' + m, label=b'log.bookmark')
6996 ui.write(b'\n', label=b'log.bookmark')
6996 ui.write(b'\n', label=b'log.bookmark')
6997
6997
6998 status = repo.status(unknown=True)
6998 status = repo.status(unknown=True)
6999
6999
7000 c = repo.dirstate.copies()
7000 c = repo.dirstate.copies()
7001 copied, renamed = [], []
7001 copied, renamed = [], []
7002 for d, s in pycompat.iteritems(c):
7002 for d, s in pycompat.iteritems(c):
7003 if s in status.removed:
7003 if s in status.removed:
7004 status.removed.remove(s)
7004 status.removed.remove(s)
7005 renamed.append(d)
7005 renamed.append(d)
7006 else:
7006 else:
7007 copied.append(d)
7007 copied.append(d)
7008 if d in status.added:
7008 if d in status.added:
7009 status.added.remove(d)
7009 status.added.remove(d)
7010
7010
7011 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7011 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7012
7012
7013 labels = [
7013 labels = [
7014 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7014 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7015 (ui.label(_(b'%d added'), b'status.added'), status.added),
7015 (ui.label(_(b'%d added'), b'status.added'), status.added),
7016 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7016 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7017 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7017 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7018 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7018 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7019 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7019 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7020 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7020 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7021 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7021 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7022 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7022 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7023 ]
7023 ]
7024 t = []
7024 t = []
7025 for l, s in labels:
7025 for l, s in labels:
7026 if s:
7026 if s:
7027 t.append(l % len(s))
7027 t.append(l % len(s))
7028
7028
7029 t = b', '.join(t)
7029 t = b', '.join(t)
7030 cleanworkdir = False
7030 cleanworkdir = False
7031
7031
7032 if repo.vfs.exists(b'graftstate'):
7032 if repo.vfs.exists(b'graftstate'):
7033 t += _(b' (graft in progress)')
7033 t += _(b' (graft in progress)')
7034 if repo.vfs.exists(b'updatestate'):
7034 if repo.vfs.exists(b'updatestate'):
7035 t += _(b' (interrupted update)')
7035 t += _(b' (interrupted update)')
7036 elif len(parents) > 1:
7036 elif len(parents) > 1:
7037 t += _(b' (merge)')
7037 t += _(b' (merge)')
7038 elif branch != parents[0].branch():
7038 elif branch != parents[0].branch():
7039 t += _(b' (new branch)')
7039 t += _(b' (new branch)')
7040 elif parents[0].closesbranch() and pnode in repo.branchheads(
7040 elif parents[0].closesbranch() and pnode in repo.branchheads(
7041 branch, closed=True
7041 branch, closed=True
7042 ):
7042 ):
7043 t += _(b' (head closed)')
7043 t += _(b' (head closed)')
7044 elif not (
7044 elif not (
7045 status.modified
7045 status.modified
7046 or status.added
7046 or status.added
7047 or status.removed
7047 or status.removed
7048 or renamed
7048 or renamed
7049 or copied
7049 or copied
7050 or subs
7050 or subs
7051 ):
7051 ):
7052 t += _(b' (clean)')
7052 t += _(b' (clean)')
7053 cleanworkdir = True
7053 cleanworkdir = True
7054 elif pnode not in bheads:
7054 elif pnode not in bheads:
7055 t += _(b' (new branch head)')
7055 t += _(b' (new branch head)')
7056
7056
7057 if parents:
7057 if parents:
7058 pendingphase = max(p.phase() for p in parents)
7058 pendingphase = max(p.phase() for p in parents)
7059 else:
7059 else:
7060 pendingphase = phases.public
7060 pendingphase = phases.public
7061
7061
7062 if pendingphase > phases.newcommitphase(ui):
7062 if pendingphase > phases.newcommitphase(ui):
7063 t += b' (%s)' % phases.phasenames[pendingphase]
7063 t += b' (%s)' % phases.phasenames[pendingphase]
7064
7064
7065 if cleanworkdir:
7065 if cleanworkdir:
7066 # i18n: column positioning for "hg summary"
7066 # i18n: column positioning for "hg summary"
7067 ui.status(_(b'commit: %s\n') % t.strip())
7067 ui.status(_(b'commit: %s\n') % t.strip())
7068 else:
7068 else:
7069 # i18n: column positioning for "hg summary"
7069 # i18n: column positioning for "hg summary"
7070 ui.write(_(b'commit: %s\n') % t.strip())
7070 ui.write(_(b'commit: %s\n') % t.strip())
7071
7071
7072 # all ancestors of branch heads - all ancestors of parent = new csets
7072 # all ancestors of branch heads - all ancestors of parent = new csets
7073 new = len(
7073 new = len(
7074 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7074 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7075 )
7075 )
7076
7076
7077 if new == 0:
7077 if new == 0:
7078 # i18n: column positioning for "hg summary"
7078 # i18n: column positioning for "hg summary"
7079 ui.status(_(b'update: (current)\n'))
7079 ui.status(_(b'update: (current)\n'))
7080 elif pnode not in bheads:
7080 elif pnode not in bheads:
7081 # i18n: column positioning for "hg summary"
7081 # i18n: column positioning for "hg summary"
7082 ui.write(_(b'update: %d new changesets (update)\n') % new)
7082 ui.write(_(b'update: %d new changesets (update)\n') % new)
7083 else:
7083 else:
7084 # i18n: column positioning for "hg summary"
7084 # i18n: column positioning for "hg summary"
7085 ui.write(
7085 ui.write(
7086 _(b'update: %d new changesets, %d branch heads (merge)\n')
7086 _(b'update: %d new changesets, %d branch heads (merge)\n')
7087 % (new, len(bheads))
7087 % (new, len(bheads))
7088 )
7088 )
7089
7089
7090 t = []
7090 t = []
7091 draft = len(repo.revs(b'draft()'))
7091 draft = len(repo.revs(b'draft()'))
7092 if draft:
7092 if draft:
7093 t.append(_(b'%d draft') % draft)
7093 t.append(_(b'%d draft') % draft)
7094 secret = len(repo.revs(b'secret()'))
7094 secret = len(repo.revs(b'secret()'))
7095 if secret:
7095 if secret:
7096 t.append(_(b'%d secret') % secret)
7096 t.append(_(b'%d secret') % secret)
7097
7097
7098 if draft or secret:
7098 if draft or secret:
7099 ui.status(_(b'phases: %s\n') % b', '.join(t))
7099 ui.status(_(b'phases: %s\n') % b', '.join(t))
7100
7100
7101 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7101 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7102 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7102 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7103 numtrouble = len(repo.revs(trouble + b"()"))
7103 numtrouble = len(repo.revs(trouble + b"()"))
7104 # We write all the possibilities to ease translation
7104 # We write all the possibilities to ease translation
7105 troublemsg = {
7105 troublemsg = {
7106 b"orphan": _(b"orphan: %d changesets"),
7106 b"orphan": _(b"orphan: %d changesets"),
7107 b"contentdivergent": _(b"content-divergent: %d changesets"),
7107 b"contentdivergent": _(b"content-divergent: %d changesets"),
7108 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7108 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7109 }
7109 }
7110 if numtrouble > 0:
7110 if numtrouble > 0:
7111 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7111 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7112
7112
7113 cmdutil.summaryhooks(ui, repo)
7113 cmdutil.summaryhooks(ui, repo)
7114
7114
7115 if opts.get(b'remote'):
7115 if opts.get(b'remote'):
7116 needsincoming, needsoutgoing = True, True
7116 needsincoming, needsoutgoing = True, True
7117 else:
7117 else:
7118 needsincoming, needsoutgoing = False, False
7118 needsincoming, needsoutgoing = False, False
7119 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7119 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7120 if i:
7120 if i:
7121 needsincoming = True
7121 needsincoming = True
7122 if o:
7122 if o:
7123 needsoutgoing = True
7123 needsoutgoing = True
7124 if not needsincoming and not needsoutgoing:
7124 if not needsincoming and not needsoutgoing:
7125 return
7125 return
7126
7126
7127 def getincoming():
7127 def getincoming():
7128 source, branches = hg.parseurl(ui.expandpath(b'default'))
7128 source, branches = hg.parseurl(ui.expandpath(b'default'))
7129 sbranch = branches[0]
7129 sbranch = branches[0]
7130 try:
7130 try:
7131 other = hg.peer(repo, {}, source)
7131 other = hg.peer(repo, {}, source)
7132 except error.RepoError:
7132 except error.RepoError:
7133 if opts.get(b'remote'):
7133 if opts.get(b'remote'):
7134 raise
7134 raise
7135 return source, sbranch, None, None, None
7135 return source, sbranch, None, None, None
7136 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7136 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7137 if revs:
7137 if revs:
7138 revs = [other.lookup(rev) for rev in revs]
7138 revs = [other.lookup(rev) for rev in revs]
7139 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7139 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7140 repo.ui.pushbuffer()
7140 repo.ui.pushbuffer()
7141 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7141 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7142 repo.ui.popbuffer()
7142 repo.ui.popbuffer()
7143 return source, sbranch, other, commoninc, commoninc[1]
7143 return source, sbranch, other, commoninc, commoninc[1]
7144
7144
7145 if needsincoming:
7145 if needsincoming:
7146 source, sbranch, sother, commoninc, incoming = getincoming()
7146 source, sbranch, sother, commoninc, incoming = getincoming()
7147 else:
7147 else:
7148 source = sbranch = sother = commoninc = incoming = None
7148 source = sbranch = sother = commoninc = incoming = None
7149
7149
7150 def getoutgoing():
7150 def getoutgoing():
7151 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7151 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7152 dbranch = branches[0]
7152 dbranch = branches[0]
7153 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7153 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7154 if source != dest:
7154 if source != dest:
7155 try:
7155 try:
7156 dother = hg.peer(repo, {}, dest)
7156 dother = hg.peer(repo, {}, dest)
7157 except error.RepoError:
7157 except error.RepoError:
7158 if opts.get(b'remote'):
7158 if opts.get(b'remote'):
7159 raise
7159 raise
7160 return dest, dbranch, None, None
7160 return dest, dbranch, None, None
7161 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7161 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7162 elif sother is None:
7162 elif sother is None:
7163 # there is no explicit destination peer, but source one is invalid
7163 # there is no explicit destination peer, but source one is invalid
7164 return dest, dbranch, None, None
7164 return dest, dbranch, None, None
7165 else:
7165 else:
7166 dother = sother
7166 dother = sother
7167 if source != dest or (sbranch is not None and sbranch != dbranch):
7167 if source != dest or (sbranch is not None and sbranch != dbranch):
7168 common = None
7168 common = None
7169 else:
7169 else:
7170 common = commoninc
7170 common = commoninc
7171 if revs:
7171 if revs:
7172 revs = [repo.lookup(rev) for rev in revs]
7172 revs = [repo.lookup(rev) for rev in revs]
7173 repo.ui.pushbuffer()
7173 repo.ui.pushbuffer()
7174 outgoing = discovery.findcommonoutgoing(
7174 outgoing = discovery.findcommonoutgoing(
7175 repo, dother, onlyheads=revs, commoninc=common
7175 repo, dother, onlyheads=revs, commoninc=common
7176 )
7176 )
7177 repo.ui.popbuffer()
7177 repo.ui.popbuffer()
7178 return dest, dbranch, dother, outgoing
7178 return dest, dbranch, dother, outgoing
7179
7179
7180 if needsoutgoing:
7180 if needsoutgoing:
7181 dest, dbranch, dother, outgoing = getoutgoing()
7181 dest, dbranch, dother, outgoing = getoutgoing()
7182 else:
7182 else:
7183 dest = dbranch = dother = outgoing = None
7183 dest = dbranch = dother = outgoing = None
7184
7184
7185 if opts.get(b'remote'):
7185 if opts.get(b'remote'):
7186 t = []
7186 t = []
7187 if incoming:
7187 if incoming:
7188 t.append(_(b'1 or more incoming'))
7188 t.append(_(b'1 or more incoming'))
7189 o = outgoing.missing
7189 o = outgoing.missing
7190 if o:
7190 if o:
7191 t.append(_(b'%d outgoing') % len(o))
7191 t.append(_(b'%d outgoing') % len(o))
7192 other = dother or sother
7192 other = dother or sother
7193 if b'bookmarks' in other.listkeys(b'namespaces'):
7193 if b'bookmarks' in other.listkeys(b'namespaces'):
7194 counts = bookmarks.summary(repo, other)
7194 counts = bookmarks.summary(repo, other)
7195 if counts[0] > 0:
7195 if counts[0] > 0:
7196 t.append(_(b'%d incoming bookmarks') % counts[0])
7196 t.append(_(b'%d incoming bookmarks') % counts[0])
7197 if counts[1] > 0:
7197 if counts[1] > 0:
7198 t.append(_(b'%d outgoing bookmarks') % counts[1])
7198 t.append(_(b'%d outgoing bookmarks') % counts[1])
7199
7199
7200 if t:
7200 if t:
7201 # i18n: column positioning for "hg summary"
7201 # i18n: column positioning for "hg summary"
7202 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7202 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7203 else:
7203 else:
7204 # i18n: column positioning for "hg summary"
7204 # i18n: column positioning for "hg summary"
7205 ui.status(_(b'remote: (synced)\n'))
7205 ui.status(_(b'remote: (synced)\n'))
7206
7206
7207 cmdutil.summaryremotehooks(
7207 cmdutil.summaryremotehooks(
7208 ui,
7208 ui,
7209 repo,
7209 repo,
7210 opts,
7210 opts,
7211 (
7211 (
7212 (source, sbranch, sother, commoninc),
7212 (source, sbranch, sother, commoninc),
7213 (dest, dbranch, dother, outgoing),
7213 (dest, dbranch, dother, outgoing),
7214 ),
7214 ),
7215 )
7215 )
7216
7216
7217
7217
7218 @command(
7218 @command(
7219 b'tag',
7219 b'tag',
7220 [
7220 [
7221 (b'f', b'force', None, _(b'force tag')),
7221 (b'f', b'force', None, _(b'force tag')),
7222 (b'l', b'local', None, _(b'make the tag local')),
7222 (b'l', b'local', None, _(b'make the tag local')),
7223 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7223 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7224 (b'', b'remove', None, _(b'remove a tag')),
7224 (b'', b'remove', None, _(b'remove a tag')),
7225 # -l/--local is already there, commitopts cannot be used
7225 # -l/--local is already there, commitopts cannot be used
7226 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7226 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7227 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7227 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7228 ]
7228 ]
7229 + commitopts2,
7229 + commitopts2,
7230 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7230 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7231 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7231 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7232 )
7232 )
7233 def tag(ui, repo, name1, *names, **opts):
7233 def tag(ui, repo, name1, *names, **opts):
7234 """add one or more tags for the current or given revision
7234 """add one or more tags for the current or given revision
7235
7235
7236 Name a particular revision using <name>.
7236 Name a particular revision using <name>.
7237
7237
7238 Tags are used to name particular revisions of the repository and are
7238 Tags are used to name particular revisions of the repository and are
7239 very useful to compare different revisions, to go back to significant
7239 very useful to compare different revisions, to go back to significant
7240 earlier versions or to mark branch points as releases, etc. Changing
7240 earlier versions or to mark branch points as releases, etc. Changing
7241 an existing tag is normally disallowed; use -f/--force to override.
7241 an existing tag is normally disallowed; use -f/--force to override.
7242
7242
7243 If no revision is given, the parent of the working directory is
7243 If no revision is given, the parent of the working directory is
7244 used.
7244 used.
7245
7245
7246 To facilitate version control, distribution, and merging of tags,
7246 To facilitate version control, distribution, and merging of tags,
7247 they are stored as a file named ".hgtags" which is managed similarly
7247 they are stored as a file named ".hgtags" which is managed similarly
7248 to other project files and can be hand-edited if necessary. This
7248 to other project files and can be hand-edited if necessary. This
7249 also means that tagging creates a new commit. The file
7249 also means that tagging creates a new commit. The file
7250 ".hg/localtags" is used for local tags (not shared among
7250 ".hg/localtags" is used for local tags (not shared among
7251 repositories).
7251 repositories).
7252
7252
7253 Tag commits are usually made at the head of a branch. If the parent
7253 Tag commits are usually made at the head of a branch. If the parent
7254 of the working directory is not a branch head, :hg:`tag` aborts; use
7254 of the working directory is not a branch head, :hg:`tag` aborts; use
7255 -f/--force to force the tag commit to be based on a non-head
7255 -f/--force to force the tag commit to be based on a non-head
7256 changeset.
7256 changeset.
7257
7257
7258 See :hg:`help dates` for a list of formats valid for -d/--date.
7258 See :hg:`help dates` for a list of formats valid for -d/--date.
7259
7259
7260 Since tag names have priority over branch names during revision
7260 Since tag names have priority over branch names during revision
7261 lookup, using an existing branch name as a tag name is discouraged.
7261 lookup, using an existing branch name as a tag name is discouraged.
7262
7262
7263 Returns 0 on success.
7263 Returns 0 on success.
7264 """
7264 """
7265 opts = pycompat.byteskwargs(opts)
7265 opts = pycompat.byteskwargs(opts)
7266 with repo.wlock(), repo.lock():
7266 with repo.wlock(), repo.lock():
7267 rev_ = b"."
7267 rev_ = b"."
7268 names = [t.strip() for t in (name1,) + names]
7268 names = [t.strip() for t in (name1,) + names]
7269 if len(names) != len(set(names)):
7269 if len(names) != len(set(names)):
7270 raise error.Abort(_(b'tag names must be unique'))
7270 raise error.Abort(_(b'tag names must be unique'))
7271 for n in names:
7271 for n in names:
7272 scmutil.checknewlabel(repo, n, b'tag')
7272 scmutil.checknewlabel(repo, n, b'tag')
7273 if not n:
7273 if not n:
7274 raise error.Abort(
7274 raise error.Abort(
7275 _(b'tag names cannot consist entirely of whitespace')
7275 _(b'tag names cannot consist entirely of whitespace')
7276 )
7276 )
7277 if opts.get(b'rev') and opts.get(b'remove'):
7277 if opts.get(b'rev') and opts.get(b'remove'):
7278 raise error.Abort(_(b"--rev and --remove are incompatible"))
7278 raise error.Abort(_(b"--rev and --remove are incompatible"))
7279 if opts.get(b'rev'):
7279 if opts.get(b'rev'):
7280 rev_ = opts[b'rev']
7280 rev_ = opts[b'rev']
7281 message = opts.get(b'message')
7281 message = opts.get(b'message')
7282 if opts.get(b'remove'):
7282 if opts.get(b'remove'):
7283 if opts.get(b'local'):
7283 if opts.get(b'local'):
7284 expectedtype = b'local'
7284 expectedtype = b'local'
7285 else:
7285 else:
7286 expectedtype = b'global'
7286 expectedtype = b'global'
7287
7287
7288 for n in names:
7288 for n in names:
7289 if repo.tagtype(n) == b'global':
7289 if repo.tagtype(n) == b'global':
7290 alltags = tagsmod.findglobaltags(ui, repo)
7290 alltags = tagsmod.findglobaltags(ui, repo)
7291 if alltags[n][0] == nullid:
7291 if alltags[n][0] == nullid:
7292 raise error.Abort(_(b"tag '%s' is already removed") % n)
7292 raise error.Abort(_(b"tag '%s' is already removed") % n)
7293 if not repo.tagtype(n):
7293 if not repo.tagtype(n):
7294 raise error.Abort(_(b"tag '%s' does not exist") % n)
7294 raise error.Abort(_(b"tag '%s' does not exist") % n)
7295 if repo.tagtype(n) != expectedtype:
7295 if repo.tagtype(n) != expectedtype:
7296 if expectedtype == b'global':
7296 if expectedtype == b'global':
7297 raise error.Abort(
7297 raise error.Abort(
7298 _(b"tag '%s' is not a global tag") % n
7298 _(b"tag '%s' is not a global tag") % n
7299 )
7299 )
7300 else:
7300 else:
7301 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7301 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7302 rev_ = b'null'
7302 rev_ = b'null'
7303 if not message:
7303 if not message:
7304 # we don't translate commit messages
7304 # we don't translate commit messages
7305 message = b'Removed tag %s' % b', '.join(names)
7305 message = b'Removed tag %s' % b', '.join(names)
7306 elif not opts.get(b'force'):
7306 elif not opts.get(b'force'):
7307 for n in names:
7307 for n in names:
7308 if n in repo.tags():
7308 if n in repo.tags():
7309 raise error.Abort(
7309 raise error.Abort(
7310 _(b"tag '%s' already exists (use -f to force)") % n
7310 _(b"tag '%s' already exists (use -f to force)") % n
7311 )
7311 )
7312 if not opts.get(b'local'):
7312 if not opts.get(b'local'):
7313 p1, p2 = repo.dirstate.parents()
7313 p1, p2 = repo.dirstate.parents()
7314 if p2 != nullid:
7314 if p2 != nullid:
7315 raise error.Abort(_(b'uncommitted merge'))
7315 raise error.Abort(_(b'uncommitted merge'))
7316 bheads = repo.branchheads()
7316 bheads = repo.branchheads()
7317 if not opts.get(b'force') and bheads and p1 not in bheads:
7317 if not opts.get(b'force') and bheads and p1 not in bheads:
7318 raise error.Abort(
7318 raise error.Abort(
7319 _(
7319 _(
7320 b'working directory is not at a branch head '
7320 b'working directory is not at a branch head '
7321 b'(use -f to force)'
7321 b'(use -f to force)'
7322 )
7322 )
7323 )
7323 )
7324 node = scmutil.revsingle(repo, rev_).node()
7324 node = scmutil.revsingle(repo, rev_).node()
7325
7325
7326 if not message:
7326 if not message:
7327 # we don't translate commit messages
7327 # we don't translate commit messages
7328 message = b'Added tag %s for changeset %s' % (
7328 message = b'Added tag %s for changeset %s' % (
7329 b', '.join(names),
7329 b', '.join(names),
7330 short(node),
7330 short(node),
7331 )
7331 )
7332
7332
7333 date = opts.get(b'date')
7333 date = opts.get(b'date')
7334 if date:
7334 if date:
7335 date = dateutil.parsedate(date)
7335 date = dateutil.parsedate(date)
7336
7336
7337 if opts.get(b'remove'):
7337 if opts.get(b'remove'):
7338 editform = b'tag.remove'
7338 editform = b'tag.remove'
7339 else:
7339 else:
7340 editform = b'tag.add'
7340 editform = b'tag.add'
7341 editor = cmdutil.getcommiteditor(
7341 editor = cmdutil.getcommiteditor(
7342 editform=editform, **pycompat.strkwargs(opts)
7342 editform=editform, **pycompat.strkwargs(opts)
7343 )
7343 )
7344
7344
7345 # don't allow tagging the null rev
7345 # don't allow tagging the null rev
7346 if (
7346 if (
7347 not opts.get(b'remove')
7347 not opts.get(b'remove')
7348 and scmutil.revsingle(repo, rev_).rev() == nullrev
7348 and scmutil.revsingle(repo, rev_).rev() == nullrev
7349 ):
7349 ):
7350 raise error.Abort(_(b"cannot tag null revision"))
7350 raise error.Abort(_(b"cannot tag null revision"))
7351
7351
7352 tagsmod.tag(
7352 tagsmod.tag(
7353 repo,
7353 repo,
7354 names,
7354 names,
7355 node,
7355 node,
7356 message,
7356 message,
7357 opts.get(b'local'),
7357 opts.get(b'local'),
7358 opts.get(b'user'),
7358 opts.get(b'user'),
7359 date,
7359 date,
7360 editor=editor,
7360 editor=editor,
7361 )
7361 )
7362
7362
7363
7363
7364 @command(
7364 @command(
7365 b'tags',
7365 b'tags',
7366 formatteropts,
7366 formatteropts,
7367 b'',
7367 b'',
7368 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7368 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7369 intents={INTENT_READONLY},
7369 intents={INTENT_READONLY},
7370 )
7370 )
7371 def tags(ui, repo, **opts):
7371 def tags(ui, repo, **opts):
7372 """list repository tags
7372 """list repository tags
7373
7373
7374 This lists both regular and local tags. When the -v/--verbose
7374 This lists both regular and local tags. When the -v/--verbose
7375 switch is used, a third column "local" is printed for local tags.
7375 switch is used, a third column "local" is printed for local tags.
7376 When the -q/--quiet switch is used, only the tag name is printed.
7376 When the -q/--quiet switch is used, only the tag name is printed.
7377
7377
7378 .. container:: verbose
7378 .. container:: verbose
7379
7379
7380 Template:
7380 Template:
7381
7381
7382 The following keywords are supported in addition to the common template
7382 The following keywords are supported in addition to the common template
7383 keywords and functions such as ``{tag}``. See also
7383 keywords and functions such as ``{tag}``. See also
7384 :hg:`help templates`.
7384 :hg:`help templates`.
7385
7385
7386 :type: String. ``local`` for local tags.
7386 :type: String. ``local`` for local tags.
7387
7387
7388 Returns 0 on success.
7388 Returns 0 on success.
7389 """
7389 """
7390
7390
7391 opts = pycompat.byteskwargs(opts)
7391 opts = pycompat.byteskwargs(opts)
7392 ui.pager(b'tags')
7392 ui.pager(b'tags')
7393 fm = ui.formatter(b'tags', opts)
7393 fm = ui.formatter(b'tags', opts)
7394 hexfunc = fm.hexfunc
7394 hexfunc = fm.hexfunc
7395
7395
7396 for t, n in reversed(repo.tagslist()):
7396 for t, n in reversed(repo.tagslist()):
7397 hn = hexfunc(n)
7397 hn = hexfunc(n)
7398 label = b'tags.normal'
7398 label = b'tags.normal'
7399 tagtype = b''
7399 tagtype = b''
7400 if repo.tagtype(t) == b'local':
7400 if repo.tagtype(t) == b'local':
7401 label = b'tags.local'
7401 label = b'tags.local'
7402 tagtype = b'local'
7402 tagtype = b'local'
7403
7403
7404 fm.startitem()
7404 fm.startitem()
7405 fm.context(repo=repo)
7405 fm.context(repo=repo)
7406 fm.write(b'tag', b'%s', t, label=label)
7406 fm.write(b'tag', b'%s', t, label=label)
7407 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7407 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7408 fm.condwrite(
7408 fm.condwrite(
7409 not ui.quiet,
7409 not ui.quiet,
7410 b'rev node',
7410 b'rev node',
7411 fmt,
7411 fmt,
7412 repo.changelog.rev(n),
7412 repo.changelog.rev(n),
7413 hn,
7413 hn,
7414 label=label,
7414 label=label,
7415 )
7415 )
7416 fm.condwrite(
7416 fm.condwrite(
7417 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7417 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7418 )
7418 )
7419 fm.plain(b'\n')
7419 fm.plain(b'\n')
7420 fm.end()
7420 fm.end()
7421
7421
7422
7422
7423 @command(
7423 @command(
7424 b'tip',
7424 b'tip',
7425 [
7425 [
7426 (b'p', b'patch', None, _(b'show patch')),
7426 (b'p', b'patch', None, _(b'show patch')),
7427 (b'g', b'git', None, _(b'use git extended diff format')),
7427 (b'g', b'git', None, _(b'use git extended diff format')),
7428 ]
7428 ]
7429 + templateopts,
7429 + templateopts,
7430 _(b'[-p] [-g]'),
7430 _(b'[-p] [-g]'),
7431 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7431 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7432 )
7432 )
7433 def tip(ui, repo, **opts):
7433 def tip(ui, repo, **opts):
7434 """show the tip revision (DEPRECATED)
7434 """show the tip revision (DEPRECATED)
7435
7435
7436 The tip revision (usually just called the tip) is the changeset
7436 The tip revision (usually just called the tip) is the changeset
7437 most recently added to the repository (and therefore the most
7437 most recently added to the repository (and therefore the most
7438 recently changed head).
7438 recently changed head).
7439
7439
7440 If you have just made a commit, that commit will be the tip. If
7440 If you have just made a commit, that commit will be the tip. If
7441 you have just pulled changes from another repository, the tip of
7441 you have just pulled changes from another repository, the tip of
7442 that repository becomes the current tip. The "tip" tag is special
7442 that repository becomes the current tip. The "tip" tag is special
7443 and cannot be renamed or assigned to a different changeset.
7443 and cannot be renamed or assigned to a different changeset.
7444
7444
7445 This command is deprecated, please use :hg:`heads` instead.
7445 This command is deprecated, please use :hg:`heads` instead.
7446
7446
7447 Returns 0 on success.
7447 Returns 0 on success.
7448 """
7448 """
7449 opts = pycompat.byteskwargs(opts)
7449 opts = pycompat.byteskwargs(opts)
7450 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7450 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7451 displayer.show(repo[b'tip'])
7451 displayer.show(repo[b'tip'])
7452 displayer.close()
7452 displayer.close()
7453
7453
7454
7454
7455 @command(
7455 @command(
7456 b'unbundle',
7456 b'unbundle',
7457 [
7457 [
7458 (
7458 (
7459 b'u',
7459 b'u',
7460 b'update',
7460 b'update',
7461 None,
7461 None,
7462 _(b'update to new branch head if changesets were unbundled'),
7462 _(b'update to new branch head if changesets were unbundled'),
7463 )
7463 )
7464 ],
7464 ],
7465 _(b'[-u] FILE...'),
7465 _(b'[-u] FILE...'),
7466 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7466 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7467 )
7467 )
7468 def unbundle(ui, repo, fname1, *fnames, **opts):
7468 def unbundle(ui, repo, fname1, *fnames, **opts):
7469 """apply one or more bundle files
7469 """apply one or more bundle files
7470
7470
7471 Apply one or more bundle files generated by :hg:`bundle`.
7471 Apply one or more bundle files generated by :hg:`bundle`.
7472
7472
7473 Returns 0 on success, 1 if an update has unresolved files.
7473 Returns 0 on success, 1 if an update has unresolved files.
7474 """
7474 """
7475 fnames = (fname1,) + fnames
7475 fnames = (fname1,) + fnames
7476
7476
7477 with repo.lock():
7477 with repo.lock():
7478 for fname in fnames:
7478 for fname in fnames:
7479 f = hg.openpath(ui, fname)
7479 f = hg.openpath(ui, fname)
7480 gen = exchange.readbundle(ui, f, fname)
7480 gen = exchange.readbundle(ui, f, fname)
7481 if isinstance(gen, streamclone.streamcloneapplier):
7481 if isinstance(gen, streamclone.streamcloneapplier):
7482 raise error.Abort(
7482 raise error.Abort(
7483 _(
7483 _(
7484 b'packed bundles cannot be applied with '
7484 b'packed bundles cannot be applied with '
7485 b'"hg unbundle"'
7485 b'"hg unbundle"'
7486 ),
7486 ),
7487 hint=_(b'use "hg debugapplystreamclonebundle"'),
7487 hint=_(b'use "hg debugapplystreamclonebundle"'),
7488 )
7488 )
7489 url = b'bundle:' + fname
7489 url = b'bundle:' + fname
7490 try:
7490 try:
7491 txnname = b'unbundle'
7491 txnname = b'unbundle'
7492 if not isinstance(gen, bundle2.unbundle20):
7492 if not isinstance(gen, bundle2.unbundle20):
7493 txnname = b'unbundle\n%s' % util.hidepassword(url)
7493 txnname = b'unbundle\n%s' % util.hidepassword(url)
7494 with repo.transaction(txnname) as tr:
7494 with repo.transaction(txnname) as tr:
7495 op = bundle2.applybundle(
7495 op = bundle2.applybundle(
7496 repo, gen, tr, source=b'unbundle', url=url
7496 repo, gen, tr, source=b'unbundle', url=url
7497 )
7497 )
7498 except error.BundleUnknownFeatureError as exc:
7498 except error.BundleUnknownFeatureError as exc:
7499 raise error.Abort(
7499 raise error.Abort(
7500 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7500 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7501 hint=_(
7501 hint=_(
7502 b"see https://mercurial-scm.org/"
7502 b"see https://mercurial-scm.org/"
7503 b"wiki/BundleFeature for more "
7503 b"wiki/BundleFeature for more "
7504 b"information"
7504 b"information"
7505 ),
7505 ),
7506 )
7506 )
7507 modheads = bundle2.combinechangegroupresults(op)
7507 modheads = bundle2.combinechangegroupresults(op)
7508
7508
7509 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7509 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7510
7510
7511
7511
7512 @command(
7512 @command(
7513 b'unshelve',
7513 b'unshelve',
7514 [
7514 [
7515 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7515 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7516 (
7516 (
7517 b'c',
7517 b'c',
7518 b'continue',
7518 b'continue',
7519 None,
7519 None,
7520 _(b'continue an incomplete unshelve operation'),
7520 _(b'continue an incomplete unshelve operation'),
7521 ),
7521 ),
7522 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7522 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7523 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7523 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7524 (
7524 (
7525 b'n',
7525 b'n',
7526 b'name',
7526 b'name',
7527 b'',
7527 b'',
7528 _(b'restore shelved change with given name'),
7528 _(b'restore shelved change with given name'),
7529 _(b'NAME'),
7529 _(b'NAME'),
7530 ),
7530 ),
7531 (b't', b'tool', b'', _(b'specify merge tool')),
7531 (b't', b'tool', b'', _(b'specify merge tool')),
7532 (
7532 (
7533 b'',
7533 b'',
7534 b'date',
7534 b'date',
7535 b'',
7535 b'',
7536 _(b'set date for temporary commits (DEPRECATED)'),
7536 _(b'set date for temporary commits (DEPRECATED)'),
7537 _(b'DATE'),
7537 _(b'DATE'),
7538 ),
7538 ),
7539 ],
7539 ],
7540 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7540 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7541 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7541 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7542 )
7542 )
7543 def unshelve(ui, repo, *shelved, **opts):
7543 def unshelve(ui, repo, *shelved, **opts):
7544 """restore a shelved change to the working directory
7544 """restore a shelved change to the working directory
7545
7545
7546 This command accepts an optional name of a shelved change to
7546 This command accepts an optional name of a shelved change to
7547 restore. If none is given, the most recent shelved change is used.
7547 restore. If none is given, the most recent shelved change is used.
7548
7548
7549 If a shelved change is applied successfully, the bundle that
7549 If a shelved change is applied successfully, the bundle that
7550 contains the shelved changes is moved to a backup location
7550 contains the shelved changes is moved to a backup location
7551 (.hg/shelve-backup).
7551 (.hg/shelve-backup).
7552
7552
7553 Since you can restore a shelved change on top of an arbitrary
7553 Since you can restore a shelved change on top of an arbitrary
7554 commit, it is possible that unshelving will result in a conflict
7554 commit, it is possible that unshelving will result in a conflict
7555 between your changes and the commits you are unshelving onto. If
7555 between your changes and the commits you are unshelving onto. If
7556 this occurs, you must resolve the conflict, then use
7556 this occurs, you must resolve the conflict, then use
7557 ``--continue`` to complete the unshelve operation. (The bundle
7557 ``--continue`` to complete the unshelve operation. (The bundle
7558 will not be moved until you successfully complete the unshelve.)
7558 will not be moved until you successfully complete the unshelve.)
7559
7559
7560 (Alternatively, you can use ``--abort`` to abandon an unshelve
7560 (Alternatively, you can use ``--abort`` to abandon an unshelve
7561 that causes a conflict. This reverts the unshelved changes, and
7561 that causes a conflict. This reverts the unshelved changes, and
7562 leaves the bundle in place.)
7562 leaves the bundle in place.)
7563
7563
7564 If bare shelved change (without interactive, include and exclude
7564 If bare shelved change (without interactive, include and exclude
7565 option) was done on newly created branch it would restore branch
7565 option) was done on newly created branch it would restore branch
7566 information to the working directory.
7566 information to the working directory.
7567
7567
7568 After a successful unshelve, the shelved changes are stored in a
7568 After a successful unshelve, the shelved changes are stored in a
7569 backup directory. Only the N most recent backups are kept. N
7569 backup directory. Only the N most recent backups are kept. N
7570 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7570 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7571 configuration option.
7571 configuration option.
7572
7572
7573 .. container:: verbose
7573 .. container:: verbose
7574
7574
7575 Timestamp in seconds is used to decide order of backups. More
7575 Timestamp in seconds is used to decide order of backups. More
7576 than ``maxbackups`` backups are kept, if same timestamp
7576 than ``maxbackups`` backups are kept, if same timestamp
7577 prevents from deciding exact order of them, for safety.
7577 prevents from deciding exact order of them, for safety.
7578
7578
7579 Selected changes can be unshelved with ``--interactive`` flag.
7579 Selected changes can be unshelved with ``--interactive`` flag.
7580 The working directory is updated with the selected changes, and
7580 The working directory is updated with the selected changes, and
7581 only the unselected changes remain shelved.
7581 only the unselected changes remain shelved.
7582 Note: The whole shelve is applied to working directory first before
7582 Note: The whole shelve is applied to working directory first before
7583 running interactively. So, this will bring up all the conflicts between
7583 running interactively. So, this will bring up all the conflicts between
7584 working directory and the shelve, irrespective of which changes will be
7584 working directory and the shelve, irrespective of which changes will be
7585 unshelved.
7585 unshelved.
7586 """
7586 """
7587 with repo.wlock():
7587 with repo.wlock():
7588 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7588 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7589
7589
7590
7590
7591 statemod.addunfinished(
7591 statemod.addunfinished(
7592 b'unshelve',
7592 b'unshelve',
7593 fname=b'shelvedstate',
7593 fname=b'shelvedstate',
7594 continueflag=True,
7594 continueflag=True,
7595 abortfunc=shelvemod.hgabortunshelve,
7595 abortfunc=shelvemod.hgabortunshelve,
7596 continuefunc=shelvemod.hgcontinueunshelve,
7596 continuefunc=shelvemod.hgcontinueunshelve,
7597 cmdmsg=_(b'unshelve already in progress'),
7597 cmdmsg=_(b'unshelve already in progress'),
7598 )
7598 )
7599
7599
7600
7600
7601 @command(
7601 @command(
7602 b'update|up|checkout|co',
7602 b'update|up|checkout|co',
7603 [
7603 [
7604 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7604 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7605 (b'c', b'check', None, _(b'require clean working directory')),
7605 (b'c', b'check', None, _(b'require clean working directory')),
7606 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7606 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7607 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7607 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7608 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7608 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7609 ]
7609 ]
7610 + mergetoolopts,
7610 + mergetoolopts,
7611 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7611 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7612 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7612 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7613 helpbasic=True,
7613 helpbasic=True,
7614 )
7614 )
7615 def update(ui, repo, node=None, **opts):
7615 def update(ui, repo, node=None, **opts):
7616 """update working directory (or switch revisions)
7616 """update working directory (or switch revisions)
7617
7617
7618 Update the repository's working directory to the specified
7618 Update the repository's working directory to the specified
7619 changeset. If no changeset is specified, update to the tip of the
7619 changeset. If no changeset is specified, update to the tip of the
7620 current named branch and move the active bookmark (see :hg:`help
7620 current named branch and move the active bookmark (see :hg:`help
7621 bookmarks`).
7621 bookmarks`).
7622
7622
7623 Update sets the working directory's parent revision to the specified
7623 Update sets the working directory's parent revision to the specified
7624 changeset (see :hg:`help parents`).
7624 changeset (see :hg:`help parents`).
7625
7625
7626 If the changeset is not a descendant or ancestor of the working
7626 If the changeset is not a descendant or ancestor of the working
7627 directory's parent and there are uncommitted changes, the update is
7627 directory's parent and there are uncommitted changes, the update is
7628 aborted. With the -c/--check option, the working directory is checked
7628 aborted. With the -c/--check option, the working directory is checked
7629 for uncommitted changes; if none are found, the working directory is
7629 for uncommitted changes; if none are found, the working directory is
7630 updated to the specified changeset.
7630 updated to the specified changeset.
7631
7631
7632 .. container:: verbose
7632 .. container:: verbose
7633
7633
7634 The -C/--clean, -c/--check, and -m/--merge options control what
7634 The -C/--clean, -c/--check, and -m/--merge options control what
7635 happens if the working directory contains uncommitted changes.
7635 happens if the working directory contains uncommitted changes.
7636 At most of one of them can be specified.
7636 At most of one of them can be specified.
7637
7637
7638 1. If no option is specified, and if
7638 1. If no option is specified, and if
7639 the requested changeset is an ancestor or descendant of
7639 the requested changeset is an ancestor or descendant of
7640 the working directory's parent, the uncommitted changes
7640 the working directory's parent, the uncommitted changes
7641 are merged into the requested changeset and the merged
7641 are merged into the requested changeset and the merged
7642 result is left uncommitted. If the requested changeset is
7642 result is left uncommitted. If the requested changeset is
7643 not an ancestor or descendant (that is, it is on another
7643 not an ancestor or descendant (that is, it is on another
7644 branch), the update is aborted and the uncommitted changes
7644 branch), the update is aborted and the uncommitted changes
7645 are preserved.
7645 are preserved.
7646
7646
7647 2. With the -m/--merge option, the update is allowed even if the
7647 2. With the -m/--merge option, the update is allowed even if the
7648 requested changeset is not an ancestor or descendant of
7648 requested changeset is not an ancestor or descendant of
7649 the working directory's parent.
7649 the working directory's parent.
7650
7650
7651 3. With the -c/--check option, the update is aborted and the
7651 3. With the -c/--check option, the update is aborted and the
7652 uncommitted changes are preserved.
7652 uncommitted changes are preserved.
7653
7653
7654 4. With the -C/--clean option, uncommitted changes are discarded and
7654 4. With the -C/--clean option, uncommitted changes are discarded and
7655 the working directory is updated to the requested changeset.
7655 the working directory is updated to the requested changeset.
7656
7656
7657 To cancel an uncommitted merge (and lose your changes), use
7657 To cancel an uncommitted merge (and lose your changes), use
7658 :hg:`merge --abort`.
7658 :hg:`merge --abort`.
7659
7659
7660 Use null as the changeset to remove the working directory (like
7660 Use null as the changeset to remove the working directory (like
7661 :hg:`clone -U`).
7661 :hg:`clone -U`).
7662
7662
7663 If you want to revert just one file to an older revision, use
7663 If you want to revert just one file to an older revision, use
7664 :hg:`revert [-r REV] NAME`.
7664 :hg:`revert [-r REV] NAME`.
7665
7665
7666 See :hg:`help dates` for a list of formats valid for -d/--date.
7666 See :hg:`help dates` for a list of formats valid for -d/--date.
7667
7667
7668 Returns 0 on success, 1 if there are unresolved files.
7668 Returns 0 on success, 1 if there are unresolved files.
7669 """
7669 """
7670 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7670 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7671 rev = opts.get('rev')
7671 rev = opts.get('rev')
7672 date = opts.get('date')
7672 date = opts.get('date')
7673 clean = opts.get('clean')
7673 clean = opts.get('clean')
7674 check = opts.get('check')
7674 check = opts.get('check')
7675 merge = opts.get('merge')
7675 merge = opts.get('merge')
7676 if rev and node:
7676 if rev and node:
7677 raise error.Abort(_(b"please specify just one revision"))
7677 raise error.Abort(_(b"please specify just one revision"))
7678
7678
7679 if ui.configbool(b'commands', b'update.requiredest'):
7679 if ui.configbool(b'commands', b'update.requiredest'):
7680 if not node and not rev and not date:
7680 if not node and not rev and not date:
7681 raise error.Abort(
7681 raise error.Abort(
7682 _(b'you must specify a destination'),
7682 _(b'you must specify a destination'),
7683 hint=_(b'for example: hg update ".::"'),
7683 hint=_(b'for example: hg update ".::"'),
7684 )
7684 )
7685
7685
7686 if rev is None or rev == b'':
7686 if rev is None or rev == b'':
7687 rev = node
7687 rev = node
7688
7688
7689 if date and rev is not None:
7689 if date and rev is not None:
7690 raise error.Abort(_(b"you can't specify a revision and a date"))
7690 raise error.Abort(_(b"you can't specify a revision and a date"))
7691
7691
7692 updatecheck = None
7692 updatecheck = None
7693 if check:
7693 if check:
7694 updatecheck = b'abort'
7694 updatecheck = b'abort'
7695 elif merge:
7695 elif merge:
7696 updatecheck = b'none'
7696 updatecheck = b'none'
7697
7697
7698 with repo.wlock():
7698 with repo.wlock():
7699 cmdutil.clearunfinished(repo)
7699 cmdutil.clearunfinished(repo)
7700 if date:
7700 if date:
7701 rev = cmdutil.finddate(ui, repo, date)
7701 rev = cmdutil.finddate(ui, repo, date)
7702
7702
7703 # if we defined a bookmark, we have to remember the original name
7703 # if we defined a bookmark, we have to remember the original name
7704 brev = rev
7704 brev = rev
7705 if rev:
7705 if rev:
7706 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7706 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7707 ctx = scmutil.revsingle(repo, rev, default=None)
7707 ctx = scmutil.revsingle(repo, rev, default=None)
7708 rev = ctx.rev()
7708 rev = ctx.rev()
7709 hidden = ctx.hidden()
7709 hidden = ctx.hidden()
7710 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7710 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7711 with ui.configoverride(overrides, b'update'):
7711 with ui.configoverride(overrides, b'update'):
7712 ret = hg.updatetotally(
7712 ret = hg.updatetotally(
7713 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7713 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7714 )
7714 )
7715 if hidden:
7715 if hidden:
7716 ctxstr = ctx.hex()[:12]
7716 ctxstr = ctx.hex()[:12]
7717 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7717 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7718
7718
7719 if ctx.obsolete():
7719 if ctx.obsolete():
7720 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7720 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7721 ui.warn(b"(%s)\n" % obsfatemsg)
7721 ui.warn(b"(%s)\n" % obsfatemsg)
7722 return ret
7722 return ret
7723
7723
7724
7724
7725 @command(
7725 @command(
7726 b'verify',
7726 b'verify',
7727 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7727 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7728 helpcategory=command.CATEGORY_MAINTENANCE,
7728 helpcategory=command.CATEGORY_MAINTENANCE,
7729 )
7729 )
7730 def verify(ui, repo, **opts):
7730 def verify(ui, repo, **opts):
7731 """verify the integrity of the repository
7731 """verify the integrity of the repository
7732
7732
7733 Verify the integrity of the current repository.
7733 Verify the integrity of the current repository.
7734
7734
7735 This will perform an extensive check of the repository's
7735 This will perform an extensive check of the repository's
7736 integrity, validating the hashes and checksums of each entry in
7736 integrity, validating the hashes and checksums of each entry in
7737 the changelog, manifest, and tracked files, as well as the
7737 the changelog, manifest, and tracked files, as well as the
7738 integrity of their crosslinks and indices.
7738 integrity of their crosslinks and indices.
7739
7739
7740 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7740 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7741 for more information about recovery from corruption of the
7741 for more information about recovery from corruption of the
7742 repository.
7742 repository.
7743
7743
7744 Returns 0 on success, 1 if errors are encountered.
7744 Returns 0 on success, 1 if errors are encountered.
7745 """
7745 """
7746 opts = pycompat.byteskwargs(opts)
7746 opts = pycompat.byteskwargs(opts)
7747
7747
7748 level = None
7748 level = None
7749 if opts[b'full']:
7749 if opts[b'full']:
7750 level = verifymod.VERIFY_FULL
7750 level = verifymod.VERIFY_FULL
7751 return hg.verify(repo, level)
7751 return hg.verify(repo, level)
7752
7752
7753
7753
7754 @command(
7754 @command(
7755 b'version',
7755 b'version',
7756 [] + formatteropts,
7756 [] + formatteropts,
7757 helpcategory=command.CATEGORY_HELP,
7757 helpcategory=command.CATEGORY_HELP,
7758 norepo=True,
7758 norepo=True,
7759 intents={INTENT_READONLY},
7759 intents={INTENT_READONLY},
7760 )
7760 )
7761 def version_(ui, **opts):
7761 def version_(ui, **opts):
7762 """output version and copyright information
7762 """output version and copyright information
7763
7763
7764 .. container:: verbose
7764 .. container:: verbose
7765
7765
7766 Template:
7766 Template:
7767
7767
7768 The following keywords are supported. See also :hg:`help templates`.
7768 The following keywords are supported. See also :hg:`help templates`.
7769
7769
7770 :extensions: List of extensions.
7770 :extensions: List of extensions.
7771 :ver: String. Version number.
7771 :ver: String. Version number.
7772
7772
7773 And each entry of ``{extensions}`` provides the following sub-keywords
7773 And each entry of ``{extensions}`` provides the following sub-keywords
7774 in addition to ``{ver}``.
7774 in addition to ``{ver}``.
7775
7775
7776 :bundled: Boolean. True if included in the release.
7776 :bundled: Boolean. True if included in the release.
7777 :name: String. Extension name.
7777 :name: String. Extension name.
7778 """
7778 """
7779 opts = pycompat.byteskwargs(opts)
7779 opts = pycompat.byteskwargs(opts)
7780 if ui.verbose:
7780 if ui.verbose:
7781 ui.pager(b'version')
7781 ui.pager(b'version')
7782 fm = ui.formatter(b"version", opts)
7782 fm = ui.formatter(b"version", opts)
7783 fm.startitem()
7783 fm.startitem()
7784 fm.write(
7784 fm.write(
7785 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7785 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7786 )
7786 )
7787 license = _(
7787 license = _(
7788 b"(see https://mercurial-scm.org for more information)\n"
7788 b"(see https://mercurial-scm.org for more information)\n"
7789 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7789 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7790 b"This is free software; see the source for copying conditions. "
7790 b"This is free software; see the source for copying conditions. "
7791 b"There is NO\nwarranty; "
7791 b"There is NO\nwarranty; "
7792 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7792 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7793 )
7793 )
7794 if not ui.quiet:
7794 if not ui.quiet:
7795 fm.plain(license)
7795 fm.plain(license)
7796
7796
7797 if ui.verbose:
7797 if ui.verbose:
7798 fm.plain(_(b"\nEnabled extensions:\n\n"))
7798 fm.plain(_(b"\nEnabled extensions:\n\n"))
7799 # format names and versions into columns
7799 # format names and versions into columns
7800 names = []
7800 names = []
7801 vers = []
7801 vers = []
7802 isinternals = []
7802 isinternals = []
7803 for name, module in extensions.extensions():
7803 for name, module in extensions.extensions():
7804 names.append(name)
7804 names.append(name)
7805 vers.append(extensions.moduleversion(module) or None)
7805 vers.append(extensions.moduleversion(module) or None)
7806 isinternals.append(extensions.ismoduleinternal(module))
7806 isinternals.append(extensions.ismoduleinternal(module))
7807 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7807 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7808 if names:
7808 if names:
7809 namefmt = b" %%-%ds " % max(len(n) for n in names)
7809 namefmt = b" %%-%ds " % max(len(n) for n in names)
7810 places = [_(b"external"), _(b"internal")]
7810 places = [_(b"external"), _(b"internal")]
7811 for n, v, p in zip(names, vers, isinternals):
7811 for n, v, p in zip(names, vers, isinternals):
7812 fn.startitem()
7812 fn.startitem()
7813 fn.condwrite(ui.verbose, b"name", namefmt, n)
7813 fn.condwrite(ui.verbose, b"name", namefmt, n)
7814 if ui.verbose:
7814 if ui.verbose:
7815 fn.plain(b"%s " % places[p])
7815 fn.plain(b"%s " % places[p])
7816 fn.data(bundled=p)
7816 fn.data(bundled=p)
7817 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7817 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7818 if ui.verbose:
7818 if ui.verbose:
7819 fn.plain(b"\n")
7819 fn.plain(b"\n")
7820 fn.end()
7820 fn.end()
7821 fm.end()
7821 fm.end()
7822
7822
7823
7823
7824 def loadcmdtable(ui, name, cmdtable):
7824 def loadcmdtable(ui, name, cmdtable):
7825 """Load command functions from specified cmdtable
7825 """Load command functions from specified cmdtable
7826 """
7826 """
7827 overrides = [cmd for cmd in cmdtable if cmd in table]
7827 overrides = [cmd for cmd in cmdtable if cmd in table]
7828 if overrides:
7828 if overrides:
7829 ui.warn(
7829 ui.warn(
7830 _(b"extension '%s' overrides commands: %s\n")
7830 _(b"extension '%s' overrides commands: %s\n")
7831 % (name, b" ".join(overrides))
7831 % (name, b" ".join(overrides))
7832 )
7832 )
7833 table.update(cmdtable)
7833 table.update(cmdtable)
@@ -1,1174 +1,1178 b''
1 # shelve.py - save/restore working directory state
1 # shelve.py - save/restore working directory state
2 #
2 #
3 # Copyright 2013 Facebook, Inc.
3 # Copyright 2013 Facebook, Inc.
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 """save and restore changes to the working directory
8 """save and restore changes to the working directory
9
9
10 The "hg shelve" command saves changes made to the working directory
10 The "hg shelve" command saves changes made to the working directory
11 and reverts those changes, resetting the working directory to a clean
11 and reverts those changes, resetting the working directory to a clean
12 state.
12 state.
13
13
14 Later on, the "hg unshelve" command restores the changes saved by "hg
14 Later on, the "hg unshelve" command restores the changes saved by "hg
15 shelve". Changes can be restored even after updating to a different
15 shelve". Changes can be restored even after updating to a different
16 parent, in which case Mercurial's merge machinery will resolve any
16 parent, in which case Mercurial's merge machinery will resolve any
17 conflicts if necessary.
17 conflicts if necessary.
18
18
19 You can have more than one shelved change outstanding at a time; each
19 You can have more than one shelved change outstanding at a time; each
20 shelved change has a distinct name. For details, see the help for "hg
20 shelved change has a distinct name. For details, see the help for "hg
21 shelve".
21 shelve".
22 """
22 """
23 from __future__ import absolute_import
23 from __future__ import absolute_import
24
24
25 import collections
25 import collections
26 import errno
26 import errno
27 import itertools
27 import itertools
28 import stat
28 import stat
29
29
30 from .i18n import _
30 from .i18n import _
31 from .pycompat import open
31 from .pycompat import open
32 from . import (
32 from . import (
33 bookmarks,
33 bookmarks,
34 bundle2,
34 bundle2,
35 bundlerepo,
35 bundlerepo,
36 changegroup,
36 changegroup,
37 cmdutil,
37 cmdutil,
38 discovery,
38 discovery,
39 error,
39 error,
40 exchange,
40 exchange,
41 hg,
41 hg,
42 lock as lockmod,
42 lock as lockmod,
43 mdiff,
43 mdiff,
44 merge,
44 merge,
45 node as nodemod,
45 node as nodemod,
46 patch,
46 patch,
47 phases,
47 phases,
48 pycompat,
48 pycompat,
49 repair,
49 repair,
50 scmutil,
50 scmutil,
51 templatefilters,
51 templatefilters,
52 util,
52 util,
53 vfs as vfsmod,
53 vfs as vfsmod,
54 )
54 )
55 from .utils import (
55 from .utils import (
56 dateutil,
56 dateutil,
57 stringutil,
57 stringutil,
58 )
58 )
59
59
60 backupdir = b'shelve-backup'
60 backupdir = b'shelve-backup'
61 shelvedir = b'shelved'
61 shelvedir = b'shelved'
62 shelvefileextensions = [b'hg', b'patch', b'shelve']
62 shelvefileextensions = [b'hg', b'patch', b'shelve']
63 # universal extension is present in all types of shelves
63 # universal extension is present in all types of shelves
64 patchextension = b'patch'
64 patchextension = b'patch'
65
65
66 # we never need the user, so we use a
66 # we never need the user, so we use a
67 # generic user for all shelve operations
67 # generic user for all shelve operations
68 shelveuser = b'shelve@localhost'
68 shelveuser = b'shelve@localhost'
69
69
70
70
71 class shelvedfile(object):
71 class shelvedfile(object):
72 """Helper for the file storing a single shelve
72 """Helper for the file storing a single shelve
73
73
74 Handles common functions on shelve files (.hg/.patch) using
74 Handles common functions on shelve files (.hg/.patch) using
75 the vfs layer"""
75 the vfs layer"""
76
76
77 def __init__(self, repo, name, filetype=None):
77 def __init__(self, repo, name, filetype=None):
78 self.repo = repo
78 self.repo = repo
79 self.name = name
79 self.name = name
80 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
80 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
81 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
81 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
82 self.ui = self.repo.ui
82 self.ui = self.repo.ui
83 if filetype:
83 if filetype:
84 self.fname = name + b'.' + filetype
84 self.fname = name + b'.' + filetype
85 else:
85 else:
86 self.fname = name
86 self.fname = name
87
87
88 def exists(self):
88 def exists(self):
89 return self.vfs.exists(self.fname)
89 return self.vfs.exists(self.fname)
90
90
91 def filename(self):
91 def filename(self):
92 return self.vfs.join(self.fname)
92 return self.vfs.join(self.fname)
93
93
94 def backupfilename(self):
94 def backupfilename(self):
95 def gennames(base):
95 def gennames(base):
96 yield base
96 yield base
97 base, ext = base.rsplit(b'.', 1)
97 base, ext = base.rsplit(b'.', 1)
98 for i in itertools.count(1):
98 for i in itertools.count(1):
99 yield b'%s-%d.%s' % (base, i, ext)
99 yield b'%s-%d.%s' % (base, i, ext)
100
100
101 name = self.backupvfs.join(self.fname)
101 name = self.backupvfs.join(self.fname)
102 for n in gennames(name):
102 for n in gennames(name):
103 if not self.backupvfs.exists(n):
103 if not self.backupvfs.exists(n):
104 return n
104 return n
105
105
106 def movetobackup(self):
106 def movetobackup(self):
107 if not self.backupvfs.isdir():
107 if not self.backupvfs.isdir():
108 self.backupvfs.makedir()
108 self.backupvfs.makedir()
109 util.rename(self.filename(), self.backupfilename())
109 util.rename(self.filename(), self.backupfilename())
110
110
111 def stat(self):
111 def stat(self):
112 return self.vfs.stat(self.fname)
112 return self.vfs.stat(self.fname)
113
113
114 def opener(self, mode=b'rb'):
114 def opener(self, mode=b'rb'):
115 try:
115 try:
116 return self.vfs(self.fname, mode)
116 return self.vfs(self.fname, mode)
117 except IOError as err:
117 except IOError as err:
118 if err.errno != errno.ENOENT:
118 if err.errno != errno.ENOENT:
119 raise
119 raise
120 raise error.Abort(_(b"shelved change '%s' not found") % self.name)
120 raise error.Abort(_(b"shelved change '%s' not found") % self.name)
121
121
122 def applybundle(self, tr):
122 def applybundle(self, tr):
123 fp = self.opener()
123 fp = self.opener()
124 try:
124 try:
125 targetphase = phases.internal
125 targetphase = phases.internal
126 if not phases.supportinternal(self.repo):
126 if not phases.supportinternal(self.repo):
127 targetphase = phases.secret
127 targetphase = phases.secret
128 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
128 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
129 pretip = self.repo[b'tip']
129 pretip = self.repo[b'tip']
130 bundle2.applybundle(
130 bundle2.applybundle(
131 self.repo,
131 self.repo,
132 gen,
132 gen,
133 tr,
133 tr,
134 source=b'unshelve',
134 source=b'unshelve',
135 url=b'bundle:' + self.vfs.join(self.fname),
135 url=b'bundle:' + self.vfs.join(self.fname),
136 targetphase=targetphase,
136 targetphase=targetphase,
137 )
137 )
138 shelvectx = self.repo[b'tip']
138 shelvectx = self.repo[b'tip']
139 if pretip == shelvectx:
139 if pretip == shelvectx:
140 shelverev = tr.changes[b'revduplicates'][-1]
140 shelverev = tr.changes[b'revduplicates'][-1]
141 shelvectx = self.repo[shelverev]
141 shelvectx = self.repo[shelverev]
142 return shelvectx
142 return shelvectx
143 finally:
143 finally:
144 fp.close()
144 fp.close()
145
145
146 def bundlerepo(self):
146 def bundlerepo(self):
147 path = self.vfs.join(self.fname)
147 path = self.vfs.join(self.fname)
148 return bundlerepo.instance(
148 return bundlerepo.instance(
149 self.repo.baseui, b'bundle://%s+%s' % (self.repo.root, path), False
149 self.repo.baseui, b'bundle://%s+%s' % (self.repo.root, path), False
150 )
150 )
151
151
152 def writebundle(self, bases, node):
152 def writebundle(self, bases, node):
153 cgversion = changegroup.safeversion(self.repo)
153 cgversion = changegroup.safeversion(self.repo)
154 if cgversion == b'01':
154 if cgversion == b'01':
155 btype = b'HG10BZ'
155 btype = b'HG10BZ'
156 compression = None
156 compression = None
157 else:
157 else:
158 btype = b'HG20'
158 btype = b'HG20'
159 compression = b'BZ'
159 compression = b'BZ'
160
160
161 repo = self.repo.unfiltered()
161 repo = self.repo.unfiltered()
162
162
163 outgoing = discovery.outgoing(
163 outgoing = discovery.outgoing(
164 repo, missingroots=bases, missingheads=[node]
164 repo, missingroots=bases, missingheads=[node]
165 )
165 )
166 cg = changegroup.makechangegroup(repo, outgoing, cgversion, b'shelve')
166 cg = changegroup.makechangegroup(repo, outgoing, cgversion, b'shelve')
167
167
168 bundle2.writebundle(
168 bundle2.writebundle(
169 self.ui, cg, self.fname, btype, self.vfs, compression=compression
169 self.ui, cg, self.fname, btype, self.vfs, compression=compression
170 )
170 )
171
171
172 def writeinfo(self, info):
172 def writeinfo(self, info):
173 scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info)
173 scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info)
174
174
175 def readinfo(self):
175 def readinfo(self):
176 return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
176 return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
177
177
178
178
179 class shelvedstate(object):
179 class shelvedstate(object):
180 """Handle persistence during unshelving operations.
180 """Handle persistence during unshelving operations.
181
181
182 Handles saving and restoring a shelved state. Ensures that different
182 Handles saving and restoring a shelved state. Ensures that different
183 versions of a shelved state are possible and handles them appropriately.
183 versions of a shelved state are possible and handles them appropriately.
184 """
184 """
185
185
186 _version = 2
186 _version = 2
187 _filename = b'shelvedstate'
187 _filename = b'shelvedstate'
188 _keep = b'keep'
188 _keep = b'keep'
189 _nokeep = b'nokeep'
189 _nokeep = b'nokeep'
190 # colon is essential to differentiate from a real bookmark name
190 # colon is essential to differentiate from a real bookmark name
191 _noactivebook = b':no-active-bookmark'
191 _noactivebook = b':no-active-bookmark'
192 _interactive = b'interactive'
192 _interactive = b'interactive'
193
193
194 @classmethod
194 @classmethod
195 def _verifyandtransform(cls, d):
195 def _verifyandtransform(cls, d):
196 """Some basic shelvestate syntactic verification and transformation"""
196 """Some basic shelvestate syntactic verification and transformation"""
197 try:
197 try:
198 d[b'originalwctx'] = nodemod.bin(d[b'originalwctx'])
198 d[b'originalwctx'] = nodemod.bin(d[b'originalwctx'])
199 d[b'pendingctx'] = nodemod.bin(d[b'pendingctx'])
199 d[b'pendingctx'] = nodemod.bin(d[b'pendingctx'])
200 d[b'parents'] = [nodemod.bin(h) for h in d[b'parents'].split(b' ')]
200 d[b'parents'] = [nodemod.bin(h) for h in d[b'parents'].split(b' ')]
201 d[b'nodestoremove'] = [
201 d[b'nodestoremove'] = [
202 nodemod.bin(h) for h in d[b'nodestoremove'].split(b' ')
202 nodemod.bin(h) for h in d[b'nodestoremove'].split(b' ')
203 ]
203 ]
204 except (ValueError, TypeError, KeyError) as err:
204 except (ValueError, TypeError, KeyError) as err:
205 raise error.CorruptedState(pycompat.bytestr(err))
205 raise error.CorruptedState(pycompat.bytestr(err))
206
206
207 @classmethod
207 @classmethod
208 def _getversion(cls, repo):
208 def _getversion(cls, repo):
209 """Read version information from shelvestate file"""
209 """Read version information from shelvestate file"""
210 fp = repo.vfs(cls._filename)
210 fp = repo.vfs(cls._filename)
211 try:
211 try:
212 version = int(fp.readline().strip())
212 version = int(fp.readline().strip())
213 except ValueError as err:
213 except ValueError as err:
214 raise error.CorruptedState(pycompat.bytestr(err))
214 raise error.CorruptedState(pycompat.bytestr(err))
215 finally:
215 finally:
216 fp.close()
216 fp.close()
217 return version
217 return version
218
218
219 @classmethod
219 @classmethod
220 def _readold(cls, repo):
220 def _readold(cls, repo):
221 """Read the old position-based version of a shelvestate file"""
221 """Read the old position-based version of a shelvestate file"""
222 # Order is important, because old shelvestate file uses it
222 # Order is important, because old shelvestate file uses it
223 # to detemine values of fields (i.g. name is on the second line,
223 # to detemine values of fields (i.g. name is on the second line,
224 # originalwctx is on the third and so forth). Please do not change.
224 # originalwctx is on the third and so forth). Please do not change.
225 keys = [
225 keys = [
226 b'version',
226 b'version',
227 b'name',
227 b'name',
228 b'originalwctx',
228 b'originalwctx',
229 b'pendingctx',
229 b'pendingctx',
230 b'parents',
230 b'parents',
231 b'nodestoremove',
231 b'nodestoremove',
232 b'branchtorestore',
232 b'branchtorestore',
233 b'keep',
233 b'keep',
234 b'activebook',
234 b'activebook',
235 ]
235 ]
236 # this is executed only seldomly, so it is not a big deal
236 # this is executed only seldomly, so it is not a big deal
237 # that we open this file twice
237 # that we open this file twice
238 fp = repo.vfs(cls._filename)
238 fp = repo.vfs(cls._filename)
239 d = {}
239 d = {}
240 try:
240 try:
241 for key in keys:
241 for key in keys:
242 d[key] = fp.readline().strip()
242 d[key] = fp.readline().strip()
243 finally:
243 finally:
244 fp.close()
244 fp.close()
245 return d
245 return d
246
246
247 @classmethod
247 @classmethod
248 def load(cls, repo):
248 def load(cls, repo):
249 version = cls._getversion(repo)
249 version = cls._getversion(repo)
250 if version < cls._version:
250 if version < cls._version:
251 d = cls._readold(repo)
251 d = cls._readold(repo)
252 elif version == cls._version:
252 elif version == cls._version:
253 d = scmutil.simplekeyvaluefile(repo.vfs, cls._filename).read(
253 d = scmutil.simplekeyvaluefile(repo.vfs, cls._filename).read(
254 firstlinenonkeyval=True
254 firstlinenonkeyval=True
255 )
255 )
256 else:
256 else:
257 raise error.Abort(
257 raise error.Abort(
258 _(
258 _(
259 b'this version of shelve is incompatible '
259 b'this version of shelve is incompatible '
260 b'with the version used in this repo'
260 b'with the version used in this repo'
261 )
261 )
262 )
262 )
263
263
264 cls._verifyandtransform(d)
264 cls._verifyandtransform(d)
265 try:
265 try:
266 obj = cls()
266 obj = cls()
267 obj.name = d[b'name']
267 obj.name = d[b'name']
268 obj.wctx = repo[d[b'originalwctx']]
268 obj.wctx = repo[d[b'originalwctx']]
269 obj.pendingctx = repo[d[b'pendingctx']]
269 obj.pendingctx = repo[d[b'pendingctx']]
270 obj.parents = d[b'parents']
270 obj.parents = d[b'parents']
271 obj.nodestoremove = d[b'nodestoremove']
271 obj.nodestoremove = d[b'nodestoremove']
272 obj.branchtorestore = d.get(b'branchtorestore', b'')
272 obj.branchtorestore = d.get(b'branchtorestore', b'')
273 obj.keep = d.get(b'keep') == cls._keep
273 obj.keep = d.get(b'keep') == cls._keep
274 obj.activebookmark = b''
274 obj.activebookmark = b''
275 if d.get(b'activebook', b'') != cls._noactivebook:
275 if d.get(b'activebook', b'') != cls._noactivebook:
276 obj.activebookmark = d.get(b'activebook', b'')
276 obj.activebookmark = d.get(b'activebook', b'')
277 obj.interactive = d.get(b'interactive') == cls._interactive
277 obj.interactive = d.get(b'interactive') == cls._interactive
278 except (error.RepoLookupError, KeyError) as err:
278 except (error.RepoLookupError, KeyError) as err:
279 raise error.CorruptedState(pycompat.bytestr(err))
279 raise error.CorruptedState(pycompat.bytestr(err))
280
280
281 return obj
281 return obj
282
282
283 @classmethod
283 @classmethod
284 def save(
284 def save(
285 cls,
285 cls,
286 repo,
286 repo,
287 name,
287 name,
288 originalwctx,
288 originalwctx,
289 pendingctx,
289 pendingctx,
290 nodestoremove,
290 nodestoremove,
291 branchtorestore,
291 branchtorestore,
292 keep=False,
292 keep=False,
293 activebook=b'',
293 activebook=b'',
294 interactive=False,
294 interactive=False,
295 ):
295 ):
296 info = {
296 info = {
297 b"name": name,
297 b"name": name,
298 b"originalwctx": nodemod.hex(originalwctx.node()),
298 b"originalwctx": nodemod.hex(originalwctx.node()),
299 b"pendingctx": nodemod.hex(pendingctx.node()),
299 b"pendingctx": nodemod.hex(pendingctx.node()),
300 b"parents": b' '.join(
300 b"parents": b' '.join(
301 [nodemod.hex(p) for p in repo.dirstate.parents()]
301 [nodemod.hex(p) for p in repo.dirstate.parents()]
302 ),
302 ),
303 b"nodestoremove": b' '.join(
303 b"nodestoremove": b' '.join(
304 [nodemod.hex(n) for n in nodestoremove]
304 [nodemod.hex(n) for n in nodestoremove]
305 ),
305 ),
306 b"branchtorestore": branchtorestore,
306 b"branchtorestore": branchtorestore,
307 b"keep": cls._keep if keep else cls._nokeep,
307 b"keep": cls._keep if keep else cls._nokeep,
308 b"activebook": activebook or cls._noactivebook,
308 b"activebook": activebook or cls._noactivebook,
309 }
309 }
310 if interactive:
310 if interactive:
311 info[b'interactive'] = cls._interactive
311 info[b'interactive'] = cls._interactive
312 scmutil.simplekeyvaluefile(repo.vfs, cls._filename).write(
312 scmutil.simplekeyvaluefile(repo.vfs, cls._filename).write(
313 info, firstline=(b"%d" % cls._version)
313 info, firstline=(b"%d" % cls._version)
314 )
314 )
315
315
316 @classmethod
316 @classmethod
317 def clear(cls, repo):
317 def clear(cls, repo):
318 repo.vfs.unlinkpath(cls._filename, ignoremissing=True)
318 repo.vfs.unlinkpath(cls._filename, ignoremissing=True)
319
319
320
320
321 def cleanupoldbackups(repo):
321 def cleanupoldbackups(repo):
322 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
322 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
323 maxbackups = repo.ui.configint(b'shelve', b'maxbackups')
323 maxbackups = repo.ui.configint(b'shelve', b'maxbackups')
324 hgfiles = [f for f in vfs.listdir() if f.endswith(b'.' + patchextension)]
324 hgfiles = [f for f in vfs.listdir() if f.endswith(b'.' + patchextension)]
325 hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
325 hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
326 if maxbackups > 0 and maxbackups < len(hgfiles):
326 if maxbackups > 0 and maxbackups < len(hgfiles):
327 bordermtime = hgfiles[-maxbackups][0]
327 bordermtime = hgfiles[-maxbackups][0]
328 else:
328 else:
329 bordermtime = None
329 bordermtime = None
330 for mtime, f in hgfiles[: len(hgfiles) - maxbackups]:
330 for mtime, f in hgfiles[: len(hgfiles) - maxbackups]:
331 if mtime == bordermtime:
331 if mtime == bordermtime:
332 # keep it, because timestamp can't decide exact order of backups
332 # keep it, because timestamp can't decide exact order of backups
333 continue
333 continue
334 base = f[: -(1 + len(patchextension))]
334 base = f[: -(1 + len(patchextension))]
335 for ext in shelvefileextensions:
335 for ext in shelvefileextensions:
336 vfs.tryunlink(base + b'.' + ext)
336 vfs.tryunlink(base + b'.' + ext)
337
337
338
338
339 def _backupactivebookmark(repo):
339 def _backupactivebookmark(repo):
340 activebookmark = repo._activebookmark
340 activebookmark = repo._activebookmark
341 if activebookmark:
341 if activebookmark:
342 bookmarks.deactivate(repo)
342 bookmarks.deactivate(repo)
343 return activebookmark
343 return activebookmark
344
344
345
345
346 def _restoreactivebookmark(repo, mark):
346 def _restoreactivebookmark(repo, mark):
347 if mark:
347 if mark:
348 bookmarks.activate(repo, mark)
348 bookmarks.activate(repo, mark)
349
349
350
350
351 def _aborttransaction(repo, tr):
351 def _aborttransaction(repo, tr):
352 '''Abort current transaction for shelve/unshelve, but keep dirstate
352 '''Abort current transaction for shelve/unshelve, but keep dirstate
353 '''
353 '''
354 dirstatebackupname = b'dirstate.shelve'
354 dirstatebackupname = b'dirstate.shelve'
355 repo.dirstate.savebackup(tr, dirstatebackupname)
355 repo.dirstate.savebackup(tr, dirstatebackupname)
356 tr.abort()
356 tr.abort()
357 repo.dirstate.restorebackup(None, dirstatebackupname)
357 repo.dirstate.restorebackup(None, dirstatebackupname)
358
358
359
359
360 def getshelvename(repo, parent, opts):
360 def getshelvename(repo, parent, opts):
361 """Decide on the name this shelve is going to have"""
361 """Decide on the name this shelve is going to have"""
362
362
363 def gennames():
363 def gennames():
364 yield label
364 yield label
365 for i in itertools.count(1):
365 for i in itertools.count(1):
366 yield b'%s-%02d' % (label, i)
366 yield b'%s-%02d' % (label, i)
367
367
368 name = opts.get(b'name')
368 name = opts.get(b'name')
369 label = repo._activebookmark or parent.branch() or b'default'
369 label = repo._activebookmark or parent.branch() or b'default'
370 # slashes aren't allowed in filenames, therefore we rename it
370 # slashes aren't allowed in filenames, therefore we rename it
371 label = label.replace(b'/', b'_')
371 label = label.replace(b'/', b'_')
372 label = label.replace(b'\\', b'_')
372 label = label.replace(b'\\', b'_')
373 # filenames must not start with '.' as it should not be hidden
373 # filenames must not start with '.' as it should not be hidden
374 if label.startswith(b'.'):
374 if label.startswith(b'.'):
375 label = label.replace(b'.', b'_', 1)
375 label = label.replace(b'.', b'_', 1)
376
376
377 if name:
377 if name:
378 if shelvedfile(repo, name, patchextension).exists():
378 if shelvedfile(repo, name, patchextension).exists():
379 e = _(b"a shelved change named '%s' already exists") % name
379 e = _(b"a shelved change named '%s' already exists") % name
380 raise error.Abort(e)
380 raise error.Abort(e)
381
381
382 # ensure we are not creating a subdirectory or a hidden file
382 # ensure we are not creating a subdirectory or a hidden file
383 if b'/' in name or b'\\' in name:
383 if b'/' in name or b'\\' in name:
384 raise error.Abort(
384 raise error.Abort(
385 _(b'shelved change names can not contain slashes')
385 _(b'shelved change names can not contain slashes')
386 )
386 )
387 if name.startswith(b'.'):
387 if name.startswith(b'.'):
388 raise error.Abort(_(b"shelved change names can not start with '.'"))
388 raise error.Abort(_(b"shelved change names can not start with '.'"))
389
389
390 else:
390 else:
391 for n in gennames():
391 for n in gennames():
392 if not shelvedfile(repo, n, patchextension).exists():
392 if not shelvedfile(repo, n, patchextension).exists():
393 name = n
393 name = n
394 break
394 break
395
395
396 return name
396 return name
397
397
398
398
399 def mutableancestors(ctx):
399 def mutableancestors(ctx):
400 """return all mutable ancestors for ctx (included)
400 """return all mutable ancestors for ctx (included)
401
401
402 Much faster than the revset ancestors(ctx) & draft()"""
402 Much faster than the revset ancestors(ctx) & draft()"""
403 seen = {nodemod.nullrev}
403 seen = {nodemod.nullrev}
404 visit = collections.deque()
404 visit = collections.deque()
405 visit.append(ctx)
405 visit.append(ctx)
406 while visit:
406 while visit:
407 ctx = visit.popleft()
407 ctx = visit.popleft()
408 yield ctx.node()
408 yield ctx.node()
409 for parent in ctx.parents():
409 for parent in ctx.parents():
410 rev = parent.rev()
410 rev = parent.rev()
411 if rev not in seen:
411 if rev not in seen:
412 seen.add(rev)
412 seen.add(rev)
413 if parent.mutable():
413 if parent.mutable():
414 visit.append(parent)
414 visit.append(parent)
415
415
416
416
417 def getcommitfunc(extra, interactive, editor=False):
417 def getcommitfunc(extra, interactive, editor=False):
418 def commitfunc(ui, repo, message, match, opts):
418 def commitfunc(ui, repo, message, match, opts):
419 hasmq = util.safehasattr(repo, b'mq')
419 hasmq = util.safehasattr(repo, b'mq')
420 if hasmq:
420 if hasmq:
421 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
421 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
422
422
423 targetphase = phases.internal
423 targetphase = phases.internal
424 if not phases.supportinternal(repo):
424 if not phases.supportinternal(repo):
425 targetphase = phases.secret
425 targetphase = phases.secret
426 overrides = {(b'phases', b'new-commit'): targetphase}
426 overrides = {(b'phases', b'new-commit'): targetphase}
427 try:
427 try:
428 editor_ = False
428 editor_ = False
429 if editor:
429 if editor:
430 editor_ = cmdutil.getcommiteditor(
430 editor_ = cmdutil.getcommiteditor(
431 editform=b'shelve.shelve', **pycompat.strkwargs(opts)
431 editform=b'shelve.shelve', **pycompat.strkwargs(opts)
432 )
432 )
433 with repo.ui.configoverride(overrides):
433 with repo.ui.configoverride(overrides):
434 return repo.commit(
434 return repo.commit(
435 message,
435 message,
436 shelveuser,
436 shelveuser,
437 opts.get(b'date'),
437 opts.get(b'date'),
438 match,
438 match,
439 editor=editor_,
439 editor=editor_,
440 extra=extra,
440 extra=extra,
441 )
441 )
442 finally:
442 finally:
443 if hasmq:
443 if hasmq:
444 repo.mq.checkapplied = saved
444 repo.mq.checkapplied = saved
445
445
446 def interactivecommitfunc(ui, repo, *pats, **opts):
446 def interactivecommitfunc(ui, repo, *pats, **opts):
447 opts = pycompat.byteskwargs(opts)
447 opts = pycompat.byteskwargs(opts)
448 match = scmutil.match(repo[b'.'], pats, {})
448 match = scmutil.match(repo[b'.'], pats, {})
449 message = opts[b'message']
449 message = opts[b'message']
450 return commitfunc(ui, repo, message, match, opts)
450 return commitfunc(ui, repo, message, match, opts)
451
451
452 return interactivecommitfunc if interactive else commitfunc
452 return interactivecommitfunc if interactive else commitfunc
453
453
454
454
455 def _nothingtoshelvemessaging(ui, repo, pats, opts):
455 def _nothingtoshelvemessaging(ui, repo, pats, opts):
456 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
456 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
457 if stat.deleted:
457 if stat.deleted:
458 ui.status(
458 ui.status(
459 _(b"nothing changed (%d missing files, see 'hg status')\n")
459 _(b"nothing changed (%d missing files, see 'hg status')\n")
460 % len(stat.deleted)
460 % len(stat.deleted)
461 )
461 )
462 else:
462 else:
463 ui.status(_(b"nothing changed\n"))
463 ui.status(_(b"nothing changed\n"))
464
464
465
465
466 def _shelvecreatedcommit(repo, node, name, match):
466 def _shelvecreatedcommit(repo, node, name, match):
467 info = {b'node': nodemod.hex(node)}
467 info = {b'node': nodemod.hex(node)}
468 shelvedfile(repo, name, b'shelve').writeinfo(info)
468 shelvedfile(repo, name, b'shelve').writeinfo(info)
469 bases = list(mutableancestors(repo[node]))
469 bases = list(mutableancestors(repo[node]))
470 shelvedfile(repo, name, b'hg').writebundle(bases, node)
470 shelvedfile(repo, name, b'hg').writebundle(bases, node)
471 with shelvedfile(repo, name, patchextension).opener(b'wb') as fp:
471 with shelvedfile(repo, name, patchextension).opener(b'wb') as fp:
472 cmdutil.exportfile(
472 cmdutil.exportfile(
473 repo, [node], fp, opts=mdiff.diffopts(git=True), match=match
473 repo, [node], fp, opts=mdiff.diffopts(git=True), match=match
474 )
474 )
475
475
476
476
477 def _includeunknownfiles(repo, pats, opts, extra):
477 def _includeunknownfiles(repo, pats, opts, extra):
478 s = repo.status(match=scmutil.match(repo[None], pats, opts), unknown=True)
478 s = repo.status(match=scmutil.match(repo[None], pats, opts), unknown=True)
479 if s.unknown:
479 if s.unknown:
480 extra[b'shelve_unknown'] = b'\0'.join(s.unknown)
480 extra[b'shelve_unknown'] = b'\0'.join(s.unknown)
481 repo[None].add(s.unknown)
481 repo[None].add(s.unknown)
482
482
483
483
484 def _finishshelve(repo, tr):
484 def _finishshelve(repo, tr):
485 if phases.supportinternal(repo):
485 if phases.supportinternal(repo):
486 tr.close()
486 tr.close()
487 else:
487 else:
488 _aborttransaction(repo, tr)
488 _aborttransaction(repo, tr)
489
489
490
490
491 def createcmd(ui, repo, pats, opts):
491 def createcmd(ui, repo, pats, opts):
492 """subcommand that creates a new shelve"""
492 """subcommand that creates a new shelve"""
493 with repo.wlock():
493 with repo.wlock():
494 cmdutil.checkunfinished(repo)
494 cmdutil.checkunfinished(repo)
495 return _docreatecmd(ui, repo, pats, opts)
495 return _docreatecmd(ui, repo, pats, opts)
496
496
497
497
498 def _docreatecmd(ui, repo, pats, opts):
498 def _docreatecmd(ui, repo, pats, opts):
499 wctx = repo[None]
499 wctx = repo[None]
500 parents = wctx.parents()
500 parents = wctx.parents()
501 parent = parents[0]
501 parent = parents[0]
502 origbranch = wctx.branch()
502 origbranch = wctx.branch()
503
503
504 if parent.node() != nodemod.nullid:
504 if parent.node() != nodemod.nullid:
505 desc = b"changes to: %s" % parent.description().split(b'\n', 1)[0]
505 desc = b"changes to: %s" % parent.description().split(b'\n', 1)[0]
506 else:
506 else:
507 desc = b'(changes in empty repository)'
507 desc = b'(changes in empty repository)'
508
508
509 if not opts.get(b'message'):
509 if not opts.get(b'message'):
510 opts[b'message'] = desc
510 opts[b'message'] = desc
511
511
512 lock = tr = activebookmark = None
512 lock = tr = activebookmark = None
513 try:
513 try:
514 lock = repo.lock()
514 lock = repo.lock()
515
515
516 # use an uncommitted transaction to generate the bundle to avoid
516 # use an uncommitted transaction to generate the bundle to avoid
517 # pull races. ensure we don't print the abort message to stderr.
517 # pull races. ensure we don't print the abort message to stderr.
518 tr = repo.transaction(b'shelve', report=lambda x: None)
518 tr = repo.transaction(b'shelve', report=lambda x: None)
519
519
520 interactive = opts.get(b'interactive', False)
520 interactive = opts.get(b'interactive', False)
521 includeunknown = opts.get(b'unknown', False) and not opts.get(
521 includeunknown = opts.get(b'unknown', False) and not opts.get(
522 b'addremove', False
522 b'addremove', False
523 )
523 )
524
524
525 name = getshelvename(repo, parent, opts)
525 name = getshelvename(repo, parent, opts)
526 activebookmark = _backupactivebookmark(repo)
526 activebookmark = _backupactivebookmark(repo)
527 extra = {b'internal': b'shelve'}
527 extra = {b'internal': b'shelve'}
528 if includeunknown:
528 if includeunknown:
529 _includeunknownfiles(repo, pats, opts, extra)
529 _includeunknownfiles(repo, pats, opts, extra)
530
530
531 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
531 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
532 # In non-bare shelve we don't store newly created branch
532 # In non-bare shelve we don't store newly created branch
533 # at bundled commit
533 # at bundled commit
534 repo.dirstate.setbranch(repo[b'.'].branch())
534 repo.dirstate.setbranch(repo[b'.'].branch())
535
535
536 commitfunc = getcommitfunc(extra, interactive, editor=True)
536 commitfunc = getcommitfunc(extra, interactive, editor=True)
537 if not interactive:
537 if not interactive:
538 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
538 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
539 else:
539 else:
540 node = cmdutil.dorecord(
540 node = cmdutil.dorecord(
541 ui,
541 ui,
542 repo,
542 repo,
543 commitfunc,
543 commitfunc,
544 None,
544 None,
545 False,
545 False,
546 cmdutil.recordfilter,
546 cmdutil.recordfilter,
547 *pats,
547 *pats,
548 **pycompat.strkwargs(opts)
548 **pycompat.strkwargs(opts)
549 )
549 )
550 if not node:
550 if not node:
551 _nothingtoshelvemessaging(ui, repo, pats, opts)
551 _nothingtoshelvemessaging(ui, repo, pats, opts)
552 return 1
552 return 1
553
553
554 # Create a matcher so that prefetch doesn't attempt to fetch
554 # Create a matcher so that prefetch doesn't attempt to fetch
555 # the entire repository pointlessly, and as an optimisation
555 # the entire repository pointlessly, and as an optimisation
556 # for movedirstate, if needed.
556 # for movedirstate, if needed.
557 match = scmutil.matchfiles(repo, repo[node].files())
557 match = scmutil.matchfiles(repo, repo[node].files())
558 _shelvecreatedcommit(repo, node, name, match)
558 _shelvecreatedcommit(repo, node, name, match)
559
559
560 ui.status(_(b'shelved as %s\n') % name)
560 ui.status(_(b'shelved as %s\n') % name)
561 if opts[b'keep']:
561 if opts[b'keep']:
562 with repo.dirstate.parentchange():
562 with repo.dirstate.parentchange():
563 scmutil.movedirstate(repo, parent, match)
563 scmutil.movedirstate(repo, parent, match)
564 else:
564 else:
565 hg.update(repo, parent.node())
565 hg.update(repo, parent.node())
566 if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
566 if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
567 repo.dirstate.setbranch(origbranch)
567 repo.dirstate.setbranch(origbranch)
568
568
569 _finishshelve(repo, tr)
569 _finishshelve(repo, tr)
570 finally:
570 finally:
571 _restoreactivebookmark(repo, activebookmark)
571 _restoreactivebookmark(repo, activebookmark)
572 lockmod.release(tr, lock)
572 lockmod.release(tr, lock)
573
573
574
574
575 def _isbareshelve(pats, opts):
575 def _isbareshelve(pats, opts):
576 return (
576 return (
577 not pats
577 not pats
578 and not opts.get(b'interactive', False)
578 and not opts.get(b'interactive', False)
579 and not opts.get(b'include', False)
579 and not opts.get(b'include', False)
580 and not opts.get(b'exclude', False)
580 and not opts.get(b'exclude', False)
581 )
581 )
582
582
583
583
584 def _iswctxonnewbranch(repo):
584 def _iswctxonnewbranch(repo):
585 return repo[None].branch() != repo[b'.'].branch()
585 return repo[None].branch() != repo[b'.'].branch()
586
586
587
587
588 def cleanupcmd(ui, repo):
588 def cleanupcmd(ui, repo):
589 """subcommand that deletes all shelves"""
589 """subcommand that deletes all shelves"""
590
590
591 with repo.wlock():
591 with repo.wlock():
592 for (name, _type) in repo.vfs.readdir(shelvedir):
592 for (name, _type) in repo.vfs.readdir(shelvedir):
593 suffix = name.rsplit(b'.', 1)[-1]
593 suffix = name.rsplit(b'.', 1)[-1]
594 if suffix in shelvefileextensions:
594 if suffix in shelvefileextensions:
595 shelvedfile(repo, name).movetobackup()
595 shelvedfile(repo, name).movetobackup()
596 cleanupoldbackups(repo)
596 cleanupoldbackups(repo)
597
597
598
598
599 def deletecmd(ui, repo, pats):
599 def deletecmd(ui, repo, pats):
600 """subcommand that deletes a specific shelve"""
600 """subcommand that deletes a specific shelve"""
601 if not pats:
601 if not pats:
602 raise error.Abort(_(b'no shelved changes specified!'))
602 raise error.Abort(_(b'no shelved changes specified!'))
603 with repo.wlock():
603 with repo.wlock():
604 for name in pats:
604 for name in pats:
605 try:
605 try:
606 for suffix in shelvefileextensions:
606 for suffix in shelvefileextensions:
607 shfile = shelvedfile(repo, name, suffix)
607 shfile = shelvedfile(repo, name, suffix)
608 # patch file is necessary, as it should
608 # patch file is necessary, as it should
609 # be present for any kind of shelve,
609 # be present for any kind of shelve,
610 # but the .hg file is optional as in future we
610 # but the .hg file is optional as in future we
611 # will add obsolete shelve with does not create a
611 # will add obsolete shelve with does not create a
612 # bundle
612 # bundle
613 if shfile.exists() or suffix == patchextension:
613 if shfile.exists() or suffix == patchextension:
614 shfile.movetobackup()
614 shfile.movetobackup()
615 except OSError as err:
615 except OSError as err:
616 if err.errno != errno.ENOENT:
616 if err.errno != errno.ENOENT:
617 raise
617 raise
618 raise error.Abort(_(b"shelved change '%s' not found") % name)
618 raise error.Abort(_(b"shelved change '%s' not found") % name)
619 cleanupoldbackups(repo)
619 cleanupoldbackups(repo)
620
620
621
621
622 def listshelves(repo):
622 def listshelves(repo):
623 """return all shelves in repo as list of (time, filename)"""
623 """return all shelves in repo as list of (time, filename)"""
624 try:
624 try:
625 names = repo.vfs.readdir(shelvedir)
625 names = repo.vfs.readdir(shelvedir)
626 except OSError as err:
626 except OSError as err:
627 if err.errno != errno.ENOENT:
627 if err.errno != errno.ENOENT:
628 raise
628 raise
629 return []
629 return []
630 info = []
630 info = []
631 for (name, _type) in names:
631 for (name, _type) in names:
632 pfx, sfx = name.rsplit(b'.', 1)
632 pfx, sfx = name.rsplit(b'.', 1)
633 if not pfx or sfx != patchextension:
633 if not pfx or sfx != patchextension:
634 continue
634 continue
635 st = shelvedfile(repo, name).stat()
635 st = shelvedfile(repo, name).stat()
636 info.append((st[stat.ST_MTIME], shelvedfile(repo, pfx).filename()))
636 info.append((st[stat.ST_MTIME], shelvedfile(repo, pfx).filename()))
637 return sorted(info, reverse=True)
637 return sorted(info, reverse=True)
638
638
639
639
640 def listcmd(ui, repo, pats, opts):
640 def listcmd(ui, repo, pats, opts):
641 """subcommand that displays the list of shelves"""
641 """subcommand that displays the list of shelves"""
642 pats = set(pats)
642 pats = set(pats)
643 width = 80
643 width = 80
644 if not ui.plain():
644 if not ui.plain():
645 width = ui.termwidth()
645 width = ui.termwidth()
646 namelabel = b'shelve.newest'
646 namelabel = b'shelve.newest'
647 ui.pager(b'shelve')
647 ui.pager(b'shelve')
648 for mtime, name in listshelves(repo):
648 for mtime, name in listshelves(repo):
649 sname = util.split(name)[1]
649 sname = util.split(name)[1]
650 if pats and sname not in pats:
650 if pats and sname not in pats:
651 continue
651 continue
652 ui.write(sname, label=namelabel)
652 ui.write(sname, label=namelabel)
653 namelabel = b'shelve.name'
653 namelabel = b'shelve.name'
654 if ui.quiet:
654 if ui.quiet:
655 ui.write(b'\n')
655 ui.write(b'\n')
656 continue
656 continue
657 ui.write(b' ' * (16 - len(sname)))
657 ui.write(b' ' * (16 - len(sname)))
658 used = 16
658 used = 16
659 date = dateutil.makedate(mtime)
659 date = dateutil.makedate(mtime)
660 age = b'(%s)' % templatefilters.age(date, abbrev=True)
660 age = b'(%s)' % templatefilters.age(date, abbrev=True)
661 ui.write(age, label=b'shelve.age')
661 ui.write(age, label=b'shelve.age')
662 ui.write(b' ' * (12 - len(age)))
662 ui.write(b' ' * (12 - len(age)))
663 used += 12
663 used += 12
664 with open(name + b'.' + patchextension, b'rb') as fp:
664 with open(name + b'.' + patchextension, b'rb') as fp:
665 while True:
665 while True:
666 line = fp.readline()
666 line = fp.readline()
667 if not line:
667 if not line:
668 break
668 break
669 if not line.startswith(b'#'):
669 if not line.startswith(b'#'):
670 desc = line.rstrip()
670 desc = line.rstrip()
671 if ui.formatted():
671 if ui.formatted():
672 desc = stringutil.ellipsis(desc, width - used)
672 desc = stringutil.ellipsis(desc, width - used)
673 ui.write(desc)
673 ui.write(desc)
674 break
674 break
675 ui.write(b'\n')
675 ui.write(b'\n')
676 if not (opts[b'patch'] or opts[b'stat']):
676 if not (opts[b'patch'] or opts[b'stat']):
677 continue
677 continue
678 difflines = fp.readlines()
678 difflines = fp.readlines()
679 if opts[b'patch']:
679 if opts[b'patch']:
680 for chunk, label in patch.difflabel(iter, difflines):
680 for chunk, label in patch.difflabel(iter, difflines):
681 ui.write(chunk, label=label)
681 ui.write(chunk, label=label)
682 if opts[b'stat']:
682 if opts[b'stat']:
683 for chunk, label in patch.diffstatui(difflines, width=width):
683 for chunk, label in patch.diffstatui(difflines, width=width):
684 ui.write(chunk, label=label)
684 ui.write(chunk, label=label)
685
685
686
686
687 def patchcmds(ui, repo, pats, opts):
687 def patchcmds(ui, repo, pats, opts):
688 """subcommand that displays shelves"""
688 """subcommand that displays shelves"""
689 if len(pats) == 0:
689 if len(pats) == 0:
690 shelves = listshelves(repo)
690 shelves = listshelves(repo)
691 if not shelves:
691 if not shelves:
692 raise error.Abort(_(b"there are no shelves to show"))
692 raise error.Abort(_(b"there are no shelves to show"))
693 mtime, name = shelves[0]
693 mtime, name = shelves[0]
694 sname = util.split(name)[1]
694 sname = util.split(name)[1]
695 pats = [sname]
695 pats = [sname]
696
696
697 for shelfname in pats:
697 for shelfname in pats:
698 if not shelvedfile(repo, shelfname, patchextension).exists():
698 if not shelvedfile(repo, shelfname, patchextension).exists():
699 raise error.Abort(_(b"cannot find shelf %s") % shelfname)
699 raise error.Abort(_(b"cannot find shelf %s") % shelfname)
700
700
701 listcmd(ui, repo, pats, opts)
701 listcmd(ui, repo, pats, opts)
702
702
703
703
704 def checkparents(repo, state):
704 def checkparents(repo, state):
705 """check parent while resuming an unshelve"""
705 """check parent while resuming an unshelve"""
706 if state.parents != repo.dirstate.parents():
706 if state.parents != repo.dirstate.parents():
707 raise error.Abort(
707 raise error.Abort(
708 _(b'working directory parents do not match unshelve state')
708 _(b'working directory parents do not match unshelve state')
709 )
709 )
710
710
711
711
712 def _loadshelvedstate(ui, repo, opts):
712 def _loadshelvedstate(ui, repo, opts):
713 try:
713 try:
714 state = shelvedstate.load(repo)
714 state = shelvedstate.load(repo)
715 if opts.get(b'keep') is None:
715 if opts.get(b'keep') is None:
716 opts[b'keep'] = state.keep
716 opts[b'keep'] = state.keep
717 except IOError as err:
717 except IOError as err:
718 if err.errno != errno.ENOENT:
718 if err.errno != errno.ENOENT:
719 raise
719 raise
720 cmdutil.wrongtooltocontinue(repo, _(b'unshelve'))
720 cmdutil.wrongtooltocontinue(repo, _(b'unshelve'))
721 except error.CorruptedState as err:
721 except error.CorruptedState as err:
722 ui.debug(pycompat.bytestr(err) + b'\n')
722 ui.debug(pycompat.bytestr(err) + b'\n')
723 if opts.get(b'continue'):
723 if opts.get(b'continue'):
724 msg = _(b'corrupted shelved state file')
724 msg = _(b'corrupted shelved state file')
725 hint = _(
725 hint = _(
726 b'please run hg unshelve --abort to abort unshelve '
726 b'please run hg unshelve --abort to abort unshelve '
727 b'operation'
727 b'operation'
728 )
728 )
729 raise error.Abort(msg, hint=hint)
729 raise error.Abort(msg, hint=hint)
730 elif opts.get(b'abort'):
730 elif opts.get(b'abort'):
731 shelvedstate.clear(repo)
731 shelvedstate.clear(repo)
732 raise error.Abort(
732 raise error.Abort(
733 _(
733 _(
734 b'could not read shelved state file, your '
734 b'could not read shelved state file, your '
735 b'working copy may be in an unexpected state\n'
735 b'working copy may be in an unexpected state\n'
736 b'please update to some commit\n'
736 b'please update to some commit\n'
737 )
737 )
738 )
738 )
739 return state
739 return state
740
740
741
741
742 def unshelveabort(ui, repo, state):
742 def unshelveabort(ui, repo, state):
743 """subcommand that abort an in-progress unshelve"""
743 """subcommand that abort an in-progress unshelve"""
744 with repo.lock():
744 with repo.lock():
745 try:
745 try:
746 checkparents(repo, state)
746 checkparents(repo, state)
747
747
748 merge.clean_update(state.pendingctx)
748 merge.clean_update(state.pendingctx)
749 if state.activebookmark and state.activebookmark in repo._bookmarks:
749 if state.activebookmark and state.activebookmark in repo._bookmarks:
750 bookmarks.activate(repo, state.activebookmark)
750 bookmarks.activate(repo, state.activebookmark)
751 mergefiles(ui, repo, state.wctx, state.pendingctx)
751 mergefiles(ui, repo, state.wctx, state.pendingctx)
752 if not phases.supportinternal(repo):
752 if not phases.supportinternal(repo):
753 repair.strip(
753 repair.strip(
754 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
754 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
755 )
755 )
756 finally:
756 finally:
757 shelvedstate.clear(repo)
757 shelvedstate.clear(repo)
758 ui.warn(_(b"unshelve of '%s' aborted\n") % state.name)
758 ui.warn(_(b"unshelve of '%s' aborted\n") % state.name)
759
759
760
760
761 def hgabortunshelve(ui, repo):
761 def hgabortunshelve(ui, repo):
762 """logic to abort unshelve using 'hg abort"""
762 """logic to abort unshelve using 'hg abort"""
763 with repo.wlock():
763 with repo.wlock():
764 state = _loadshelvedstate(ui, repo, {b'abort': True})
764 state = _loadshelvedstate(ui, repo, {b'abort': True})
765 return unshelveabort(ui, repo, state)
765 return unshelveabort(ui, repo, state)
766
766
767
767
768 def mergefiles(ui, repo, wctx, shelvectx):
768 def mergefiles(ui, repo, wctx, shelvectx):
769 """updates to wctx and merges the changes from shelvectx into the
769 """updates to wctx and merges the changes from shelvectx into the
770 dirstate."""
770 dirstate."""
771 with ui.configoverride({(b'ui', b'quiet'): True}):
771 with ui.configoverride({(b'ui', b'quiet'): True}):
772 hg.update(repo, wctx.node())
772 hg.update(repo, wctx.node())
773 ui.pushbuffer(True)
773 ui.pushbuffer(True)
774 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
774 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
775 ui.popbuffer()
775 ui.popbuffer()
776
776
777
777
778 def restorebranch(ui, repo, branchtorestore):
778 def restorebranch(ui, repo, branchtorestore):
779 if branchtorestore and branchtorestore != repo.dirstate.branch():
779 if branchtorestore and branchtorestore != repo.dirstate.branch():
780 repo.dirstate.setbranch(branchtorestore)
780 repo.dirstate.setbranch(branchtorestore)
781 ui.status(
781 ui.status(
782 _(b'marked working directory as branch %s\n') % branchtorestore
782 _(b'marked working directory as branch %s\n') % branchtorestore
783 )
783 )
784
784
785
785
786 def unshelvecleanup(ui, repo, name, opts):
786 def unshelvecleanup(ui, repo, name, opts):
787 """remove related files after an unshelve"""
787 """remove related files after an unshelve"""
788 if not opts.get(b'keep'):
788 if not opts.get(b'keep'):
789 for filetype in shelvefileextensions:
789 for filetype in shelvefileextensions:
790 shfile = shelvedfile(repo, name, filetype)
790 shfile = shelvedfile(repo, name, filetype)
791 if shfile.exists():
791 if shfile.exists():
792 shfile.movetobackup()
792 shfile.movetobackup()
793 cleanupoldbackups(repo)
793 cleanupoldbackups(repo)
794
794
795
795
796 def unshelvecontinue(ui, repo, state, opts):
796 def unshelvecontinue(ui, repo, state, opts):
797 """subcommand to continue an in-progress unshelve"""
797 """subcommand to continue an in-progress unshelve"""
798 # We're finishing off a merge. First parent is our original
798 # We're finishing off a merge. First parent is our original
799 # parent, second is the temporary "fake" commit we're unshelving.
799 # parent, second is the temporary "fake" commit we're unshelving.
800 interactive = state.interactive
800 interactive = state.interactive
801 basename = state.name
801 basename = state.name
802 with repo.lock():
802 with repo.lock():
803 checkparents(repo, state)
803 checkparents(repo, state)
804 ms = merge.mergestate.read(repo)
804 ms = merge.mergestate.read(repo)
805 if list(ms.unresolved()):
805 if list(ms.unresolved()):
806 raise error.Abort(
806 raise error.Abort(
807 _(b"unresolved conflicts, can't continue"),
807 _(b"unresolved conflicts, can't continue"),
808 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),
808 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),
809 )
809 )
810
810
811 shelvectx = repo[state.parents[1]]
811 shelvectx = repo[state.parents[1]]
812 pendingctx = state.pendingctx
812 pendingctx = state.pendingctx
813
813
814 with repo.dirstate.parentchange():
814 with repo.dirstate.parentchange():
815 repo.setparents(state.pendingctx.node(), nodemod.nullid)
815 repo.setparents(state.pendingctx.node(), nodemod.nullid)
816 repo.dirstate.write(repo.currenttransaction())
816 repo.dirstate.write(repo.currenttransaction())
817
817
818 targetphase = phases.internal
818 targetphase = phases.internal
819 if not phases.supportinternal(repo):
819 if not phases.supportinternal(repo):
820 targetphase = phases.secret
820 targetphase = phases.secret
821 overrides = {(b'phases', b'new-commit'): targetphase}
821 overrides = {(b'phases', b'new-commit'): targetphase}
822 with repo.ui.configoverride(overrides, b'unshelve'):
822 with repo.ui.configoverride(overrides, b'unshelve'):
823 with repo.dirstate.parentchange():
823 with repo.dirstate.parentchange():
824 repo.setparents(state.parents[0], nodemod.nullid)
824 repo.setparents(state.parents[0], nodemod.nullid)
825 newnode, ispartialunshelve = _createunshelvectx(
825 newnode, ispartialunshelve = _createunshelvectx(
826 ui, repo, shelvectx, basename, interactive, opts
826 ui, repo, shelvectx, basename, interactive, opts
827 )
827 )
828
828
829 if newnode is None:
829 if newnode is None:
830 shelvectx = state.pendingctx
830 shelvectx = state.pendingctx
831 msg = _(
831 msg = _(
832 b'note: unshelved changes already existed '
832 b'note: unshelved changes already existed '
833 b'in the working copy\n'
833 b'in the working copy\n'
834 )
834 )
835 ui.status(msg)
835 ui.status(msg)
836 else:
836 else:
837 # only strip the shelvectx if we produced one
837 # only strip the shelvectx if we produced one
838 state.nodestoremove.append(newnode)
838 state.nodestoremove.append(newnode)
839 shelvectx = repo[newnode]
839 shelvectx = repo[newnode]
840
840
841 hg.updaterepo(repo, pendingctx.node(), overwrite=False)
841 hg.updaterepo(repo, pendingctx.node(), overwrite=False)
842 mergefiles(ui, repo, state.wctx, shelvectx)
842 mergefiles(ui, repo, state.wctx, shelvectx)
843 restorebranch(ui, repo, state.branchtorestore)
843 restorebranch(ui, repo, state.branchtorestore)
844
844
845 if not phases.supportinternal(repo):
845 if not phases.supportinternal(repo):
846 repair.strip(
846 repair.strip(
847 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
847 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
848 )
848 )
849 shelvedstate.clear(repo)
849 shelvedstate.clear(repo)
850 if not ispartialunshelve:
850 if not ispartialunshelve:
851 unshelvecleanup(ui, repo, state.name, opts)
851 unshelvecleanup(ui, repo, state.name, opts)
852 _restoreactivebookmark(repo, state.activebookmark)
852 _restoreactivebookmark(repo, state.activebookmark)
853 ui.status(_(b"unshelve of '%s' complete\n") % state.name)
853 ui.status(_(b"unshelve of '%s' complete\n") % state.name)
854
854
855
855
856 def hgcontinueunshelve(ui, repo):
856 def hgcontinueunshelve(ui, repo):
857 """logic to resume unshelve using 'hg continue'"""
857 """logic to resume unshelve using 'hg continue'"""
858 with repo.wlock():
858 with repo.wlock():
859 state = _loadshelvedstate(ui, repo, {b'continue': True})
859 state = _loadshelvedstate(ui, repo, {b'continue': True})
860 return unshelvecontinue(ui, repo, state, {b'keep': state.keep})
860 return unshelvecontinue(ui, repo, state, {b'keep': state.keep})
861
861
862
862
863 def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
863 def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
864 """Temporarily commit working copy changes before moving unshelve commit"""
864 """Temporarily commit working copy changes before moving unshelve commit"""
865 # Store pending changes in a commit and remember added in case a shelve
865 # Store pending changes in a commit and remember added in case a shelve
866 # contains unknown files that are part of the pending change
866 # contains unknown files that are part of the pending change
867 s = repo.status()
867 s = repo.status()
868 addedbefore = frozenset(s.added)
868 addedbefore = frozenset(s.added)
869 if not (s.modified or s.added or s.removed):
869 if not (s.modified or s.added or s.removed):
870 return tmpwctx, addedbefore
870 return tmpwctx, addedbefore
871 ui.status(
871 ui.status(
872 _(
872 _(
873 b"temporarily committing pending changes "
873 b"temporarily committing pending changes "
874 b"(restore with 'hg unshelve --abort')\n"
874 b"(restore with 'hg unshelve --abort')\n"
875 )
875 )
876 )
876 )
877 extra = {b'internal': b'shelve'}
877 extra = {b'internal': b'shelve'}
878 commitfunc = getcommitfunc(extra=extra, interactive=False, editor=False)
878 commitfunc = getcommitfunc(extra=extra, interactive=False, editor=False)
879 tempopts = {}
879 tempopts = {}
880 tempopts[b'message'] = b"pending changes temporary commit"
880 tempopts[b'message'] = b"pending changes temporary commit"
881 tempopts[b'date'] = opts.get(b'date')
881 tempopts[b'date'] = opts.get(b'date')
882 with ui.configoverride({(b'ui', b'quiet'): True}):
882 with ui.configoverride({(b'ui', b'quiet'): True}):
883 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
883 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
884 tmpwctx = repo[node]
884 tmpwctx = repo[node]
885 return tmpwctx, addedbefore
885 return tmpwctx, addedbefore
886
886
887
887
888 def _unshelverestorecommit(ui, repo, tr, basename):
888 def _unshelverestorecommit(ui, repo, tr, basename):
889 """Recreate commit in the repository during the unshelve"""
889 """Recreate commit in the repository during the unshelve"""
890 repo = repo.unfiltered()
890 repo = repo.unfiltered()
891 node = None
891 node = None
892 if shelvedfile(repo, basename, b'shelve').exists():
892 if shelvedfile(repo, basename, b'shelve').exists():
893 node = shelvedfile(repo, basename, b'shelve').readinfo()[b'node']
893 node = shelvedfile(repo, basename, b'shelve').readinfo()[b'node']
894 if node is None or node not in repo:
894 if node is None or node not in repo:
895 with ui.configoverride({(b'ui', b'quiet'): True}):
895 with ui.configoverride({(b'ui', b'quiet'): True}):
896 shelvectx = shelvedfile(repo, basename, b'hg').applybundle(tr)
896 shelvectx = shelvedfile(repo, basename, b'hg').applybundle(tr)
897 # We might not strip the unbundled changeset, so we should keep track of
897 # We might not strip the unbundled changeset, so we should keep track of
898 # the unshelve node in case we need to reuse it (eg: unshelve --keep)
898 # the unshelve node in case we need to reuse it (eg: unshelve --keep)
899 if node is None:
899 if node is None:
900 info = {b'node': nodemod.hex(shelvectx.node())}
900 info = {b'node': nodemod.hex(shelvectx.node())}
901 shelvedfile(repo, basename, b'shelve').writeinfo(info)
901 shelvedfile(repo, basename, b'shelve').writeinfo(info)
902 else:
902 else:
903 shelvectx = repo[node]
903 shelvectx = repo[node]
904
904
905 return repo, shelvectx
905 return repo, shelvectx
906
906
907
907
908 def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
908 def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
909 """Handles the creation of unshelve commit and updates the shelve if it
909 """Handles the creation of unshelve commit and updates the shelve if it
910 was partially unshelved.
910 was partially unshelved.
911
911
912 If interactive is:
912 If interactive is:
913
913
914 * False: Commits all the changes in the working directory.
914 * False: Commits all the changes in the working directory.
915 * True: Prompts the user to select changes to unshelve and commit them.
915 * True: Prompts the user to select changes to unshelve and commit them.
916 Update the shelve with remaining changes.
916 Update the shelve with remaining changes.
917
917
918 Returns the node of the new commit formed and a bool indicating whether
918 Returns the node of the new commit formed and a bool indicating whether
919 the shelve was partially unshelved.Creates a commit ctx to unshelve
919 the shelve was partially unshelved.Creates a commit ctx to unshelve
920 interactively or non-interactively.
920 interactively or non-interactively.
921
921
922 The user might want to unshelve certain changes only from the stored
922 The user might want to unshelve certain changes only from the stored
923 shelve in interactive. So, we would create two commits. One with requested
923 shelve in interactive. So, we would create two commits. One with requested
924 changes to unshelve at that time and the latter is shelved for future.
924 changes to unshelve at that time and the latter is shelved for future.
925
925
926 Here, we return both the newnode which is created interactively and a
926 Here, we return both the newnode which is created interactively and a
927 bool to know whether the shelve is partly done or completely done.
927 bool to know whether the shelve is partly done or completely done.
928 """
928 """
929 opts[b'message'] = shelvectx.description()
929 opts[b'message'] = shelvectx.description()
930 opts[b'interactive-unshelve'] = True
930 opts[b'interactive-unshelve'] = True
931 pats = []
931 pats = []
932 if not interactive:
932 if not interactive:
933 newnode = repo.commit(
933 newnode = repo.commit(
934 text=shelvectx.description(),
934 text=shelvectx.description(),
935 extra=shelvectx.extra(),
935 extra=shelvectx.extra(),
936 user=shelvectx.user(),
936 user=shelvectx.user(),
937 date=shelvectx.date(),
937 date=shelvectx.date(),
938 )
938 )
939 return newnode, False
939 return newnode, False
940
940
941 commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, editor=True)
941 commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, editor=True)
942 newnode = cmdutil.dorecord(
942 newnode = cmdutil.dorecord(
943 ui,
943 ui,
944 repo,
944 repo,
945 commitfunc,
945 commitfunc,
946 None,
946 None,
947 False,
947 False,
948 cmdutil.recordfilter,
948 cmdutil.recordfilter,
949 *pats,
949 *pats,
950 **pycompat.strkwargs(opts)
950 **pycompat.strkwargs(opts)
951 )
951 )
952 snode = repo.commit(
952 snode = repo.commit(
953 text=shelvectx.description(),
953 text=shelvectx.description(),
954 extra=shelvectx.extra(),
954 extra=shelvectx.extra(),
955 user=shelvectx.user(),
955 user=shelvectx.user(),
956 )
956 )
957 if snode:
957 if snode:
958 m = scmutil.matchfiles(repo, repo[snode].files())
958 m = scmutil.matchfiles(repo, repo[snode].files())
959 _shelvecreatedcommit(repo, snode, basename, m)
959 _shelvecreatedcommit(repo, snode, basename, m)
960
960
961 return newnode, bool(snode)
961 return newnode, bool(snode)
962
962
963
963
964 def _rebaserestoredcommit(
964 def _rebaserestoredcommit(
965 ui,
965 ui,
966 repo,
966 repo,
967 opts,
967 opts,
968 tr,
968 tr,
969 oldtiprev,
969 oldtiprev,
970 basename,
970 basename,
971 pctx,
971 pctx,
972 tmpwctx,
972 tmpwctx,
973 shelvectx,
973 shelvectx,
974 branchtorestore,
974 branchtorestore,
975 activebookmark,
975 activebookmark,
976 ):
976 ):
977 """Rebase restored commit from its original location to a destination"""
977 """Rebase restored commit from its original location to a destination"""
978 # If the shelve is not immediately on top of the commit
978 # If the shelve is not immediately on top of the commit
979 # we'll be merging with, rebase it to be on top.
979 # we'll be merging with, rebase it to be on top.
980 interactive = opts.get(b'interactive')
980 interactive = opts.get(b'interactive')
981 if tmpwctx.node() == shelvectx.p1().node() and not interactive:
981 if tmpwctx.node() == shelvectx.p1().node() and not interactive:
982 # We won't skip on interactive mode because, the user might want to
982 # We won't skip on interactive mode because, the user might want to
983 # unshelve certain changes only.
983 # unshelve certain changes only.
984 return shelvectx, False
984 return shelvectx, False
985
985
986 overrides = {
986 overrides = {
987 (b'ui', b'forcemerge'): opts.get(b'tool', b''),
987 (b'ui', b'forcemerge'): opts.get(b'tool', b''),
988 (b'phases', b'new-commit'): phases.secret,
988 (b'phases', b'new-commit'): phases.secret,
989 }
989 }
990 with repo.ui.configoverride(overrides, b'unshelve'):
990 with repo.ui.configoverride(overrides, b'unshelve'):
991 ui.status(_(b'rebasing shelved changes\n'))
991 ui.status(_(b'rebasing shelved changes\n'))
992 stats = merge.graft(
992 stats = merge.graft(
993 repo,
993 repo,
994 shelvectx,
994 shelvectx,
995 labels=[b'working-copy', b'shelve'],
995 labels=[b'working-copy', b'shelve'],
996 keepconflictparent=True,
996 keepconflictparent=True,
997 )
997 )
998 if stats.unresolvedcount:
998 if stats.unresolvedcount:
999 tr.close()
999 tr.close()
1000
1000
1001 nodestoremove = [
1001 nodestoremove = [
1002 repo.changelog.node(rev)
1002 repo.changelog.node(rev)
1003 for rev in pycompat.xrange(oldtiprev, len(repo))
1003 for rev in pycompat.xrange(oldtiprev, len(repo))
1004 ]
1004 ]
1005 shelvedstate.save(
1005 shelvedstate.save(
1006 repo,
1006 repo,
1007 basename,
1007 basename,
1008 pctx,
1008 pctx,
1009 tmpwctx,
1009 tmpwctx,
1010 nodestoremove,
1010 nodestoremove,
1011 branchtorestore,
1011 branchtorestore,
1012 opts.get(b'keep'),
1012 opts.get(b'keep'),
1013 activebookmark,
1013 activebookmark,
1014 interactive,
1014 interactive,
1015 )
1015 )
1016 raise error.InterventionRequired(
1016 raise error.InterventionRequired(
1017 _(
1017 _(
1018 b"unresolved conflicts (see 'hg resolve', then "
1018 b"unresolved conflicts (see 'hg resolve', then "
1019 b"'hg unshelve --continue')"
1019 b"'hg unshelve --continue')"
1020 )
1020 )
1021 )
1021 )
1022
1022
1023 with repo.dirstate.parentchange():
1023 with repo.dirstate.parentchange():
1024 repo.setparents(tmpwctx.node(), nodemod.nullid)
1024 repo.setparents(tmpwctx.node(), nodemod.nullid)
1025 newnode, ispartialunshelve = _createunshelvectx(
1025 newnode, ispartialunshelve = _createunshelvectx(
1026 ui, repo, shelvectx, basename, interactive, opts
1026 ui, repo, shelvectx, basename, interactive, opts
1027 )
1027 )
1028
1028
1029 if newnode is None:
1029 if newnode is None:
1030 shelvectx = tmpwctx
1030 shelvectx = tmpwctx
1031 msg = _(
1031 msg = _(
1032 b'note: unshelved changes already existed '
1032 b'note: unshelved changes already existed '
1033 b'in the working copy\n'
1033 b'in the working copy\n'
1034 )
1034 )
1035 ui.status(msg)
1035 ui.status(msg)
1036 else:
1036 else:
1037 shelvectx = repo[newnode]
1037 shelvectx = repo[newnode]
1038 hg.updaterepo(repo, tmpwctx.node(), False)
1038 hg.updaterepo(repo, tmpwctx.node(), False)
1039
1039
1040 return shelvectx, ispartialunshelve
1040 return shelvectx, ispartialunshelve
1041
1041
1042
1042
1043 def _forgetunknownfiles(repo, shelvectx, addedbefore):
1043 def _forgetunknownfiles(repo, shelvectx, addedbefore):
1044 # Forget any files that were unknown before the shelve, unknown before
1044 # Forget any files that were unknown before the shelve, unknown before
1045 # unshelve started, but are now added.
1045 # unshelve started, but are now added.
1046 shelveunknown = shelvectx.extra().get(b'shelve_unknown')
1046 shelveunknown = shelvectx.extra().get(b'shelve_unknown')
1047 if not shelveunknown:
1047 if not shelveunknown:
1048 return
1048 return
1049 shelveunknown = frozenset(shelveunknown.split(b'\0'))
1049 shelveunknown = frozenset(shelveunknown.split(b'\0'))
1050 addedafter = frozenset(repo.status().added)
1050 addedafter = frozenset(repo.status().added)
1051 toforget = (addedafter & shelveunknown) - addedbefore
1051 toforget = (addedafter & shelveunknown) - addedbefore
1052 repo[None].forget(toforget)
1052 repo[None].forget(toforget)
1053
1053
1054
1054
1055 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
1055 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
1056 _restoreactivebookmark(repo, activebookmark)
1056 _restoreactivebookmark(repo, activebookmark)
1057 # The transaction aborting will strip all the commits for us,
1057 # The transaction aborting will strip all the commits for us,
1058 # but it doesn't update the inmemory structures, so addchangegroup
1058 # but it doesn't update the inmemory structures, so addchangegroup
1059 # hooks still fire and try to operate on the missing commits.
1059 # hooks still fire and try to operate on the missing commits.
1060 # Clean up manually to prevent this.
1060 # Clean up manually to prevent this.
1061 repo.unfiltered().changelog.strip(oldtiprev, tr)
1061 repo.unfiltered().changelog.strip(oldtiprev, tr)
1062 _aborttransaction(repo, tr)
1062 _aborttransaction(repo, tr)
1063
1063
1064
1064
1065 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
1065 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
1066 """Check potential problems which may result from working
1066 """Check potential problems which may result from working
1067 copy having untracked changes."""
1067 copy having untracked changes."""
1068 wcdeleted = set(repo.status().deleted)
1068 wcdeleted = set(repo.status().deleted)
1069 shelvetouched = set(shelvectx.files())
1069 shelvetouched = set(shelvectx.files())
1070 intersection = wcdeleted.intersection(shelvetouched)
1070 intersection = wcdeleted.intersection(shelvetouched)
1071 if intersection:
1071 if intersection:
1072 m = _(b"shelved change touches missing files")
1072 m = _(b"shelved change touches missing files")
1073 hint = _(b"run hg status to see which files are missing")
1073 hint = _(b"run hg status to see which files are missing")
1074 raise error.Abort(m, hint=hint)
1074 raise error.Abort(m, hint=hint)
1075
1075
1076
1076
1077 def dounshelve(ui, repo, *shelved, **opts):
1077 def unshelvecmd(ui, repo, *shelved, **opts):
1078 opts = pycompat.byteskwargs(opts)
1078 opts = pycompat.byteskwargs(opts)
1079 abortf = opts.get(b'abort')
1079 abortf = opts.get(b'abort')
1080 continuef = opts.get(b'continue')
1080 continuef = opts.get(b'continue')
1081 interactive = opts.get(b'interactive')
1081 interactive = opts.get(b'interactive')
1082 if not abortf and not continuef:
1082 if not abortf and not continuef:
1083 cmdutil.checkunfinished(repo)
1083 cmdutil.checkunfinished(repo)
1084 shelved = list(shelved)
1084 shelved = list(shelved)
1085 if opts.get(b"name"):
1085 if opts.get(b"name"):
1086 shelved.append(opts[b"name"])
1086 shelved.append(opts[b"name"])
1087
1087
1088 if interactive and opts.get(b'keep'):
1088 if interactive and opts.get(b'keep'):
1089 raise error.Abort(_(b'--keep on --interactive is not yet supported'))
1089 raise error.Abort(_(b'--keep on --interactive is not yet supported'))
1090 if abortf or continuef:
1090 if abortf or continuef:
1091 if abortf and continuef:
1091 if abortf and continuef:
1092 raise error.Abort(_(b'cannot use both abort and continue'))
1092 raise error.Abort(_(b'cannot use both abort and continue'))
1093 if shelved:
1093 if shelved:
1094 raise error.Abort(
1094 raise error.Abort(
1095 _(
1095 _(
1096 b'cannot combine abort/continue with '
1096 b'cannot combine abort/continue with '
1097 b'naming a shelved change'
1097 b'naming a shelved change'
1098 )
1098 )
1099 )
1099 )
1100 if abortf and opts.get(b'tool', False):
1100 if abortf and opts.get(b'tool', False):
1101 ui.warn(_(b'tool option will be ignored\n'))
1101 ui.warn(_(b'tool option will be ignored\n'))
1102
1102
1103 state = _loadshelvedstate(ui, repo, opts)
1103 state = _loadshelvedstate(ui, repo, opts)
1104 if abortf:
1104 if abortf:
1105 return unshelveabort(ui, repo, state)
1105 return unshelveabort(ui, repo, state)
1106 elif continuef and interactive:
1106 elif continuef and interactive:
1107 raise error.Abort(_(b'cannot use both continue and interactive'))
1107 raise error.Abort(_(b'cannot use both continue and interactive'))
1108 elif continuef:
1108 elif continuef:
1109 return unshelvecontinue(ui, repo, state, opts)
1109 return unshelvecontinue(ui, repo, state, opts)
1110 elif len(shelved) > 1:
1110 elif len(shelved) > 1:
1111 raise error.Abort(_(b'can only unshelve one change at a time'))
1111 raise error.Abort(_(b'can only unshelve one change at a time'))
1112 elif not shelved:
1112 elif not shelved:
1113 shelved = listshelves(repo)
1113 shelved = listshelves(repo)
1114 if not shelved:
1114 if not shelved:
1115 raise error.Abort(_(b'no shelved changes to apply!'))
1115 raise error.Abort(_(b'no shelved changes to apply!'))
1116 basename = util.split(shelved[0][1])[1]
1116 basename = util.split(shelved[0][1])[1]
1117 ui.status(_(b"unshelving change '%s'\n") % basename)
1117 ui.status(_(b"unshelving change '%s'\n") % basename)
1118 else:
1118 else:
1119 basename = shelved[0]
1119 basename = shelved[0]
1120
1120
1121 if not shelvedfile(repo, basename, patchextension).exists():
1121 if not shelvedfile(repo, basename, patchextension).exists():
1122 raise error.Abort(_(b"shelved change '%s' not found") % basename)
1122 raise error.Abort(_(b"shelved change '%s' not found") % basename)
1123
1123
1124 return _dounshelve(ui, repo, basename, opts)
1125
1126
1127 def _dounshelve(ui, repo, basename, opts):
1124 repo = repo.unfiltered()
1128 repo = repo.unfiltered()
1125 lock = tr = None
1129 lock = tr = None
1126 try:
1130 try:
1127 lock = repo.lock()
1131 lock = repo.lock()
1128 tr = repo.transaction(b'unshelve', report=lambda x: None)
1132 tr = repo.transaction(b'unshelve', report=lambda x: None)
1129 oldtiprev = len(repo)
1133 oldtiprev = len(repo)
1130
1134
1131 pctx = repo[b'.']
1135 pctx = repo[b'.']
1132 tmpwctx = pctx
1136 tmpwctx = pctx
1133 # The goal is to have a commit structure like so:
1137 # The goal is to have a commit structure like so:
1134 # ...-> pctx -> tmpwctx -> shelvectx
1138 # ...-> pctx -> tmpwctx -> shelvectx
1135 # where tmpwctx is an optional commit with the user's pending changes
1139 # where tmpwctx is an optional commit with the user's pending changes
1136 # and shelvectx is the unshelved changes. Then we merge it all down
1140 # and shelvectx is the unshelved changes. Then we merge it all down
1137 # to the original pctx.
1141 # to the original pctx.
1138
1142
1139 activebookmark = _backupactivebookmark(repo)
1143 activebookmark = _backupactivebookmark(repo)
1140 tmpwctx, addedbefore = _commitworkingcopychanges(
1144 tmpwctx, addedbefore = _commitworkingcopychanges(
1141 ui, repo, opts, tmpwctx
1145 ui, repo, opts, tmpwctx
1142 )
1146 )
1143 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
1147 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
1144 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
1148 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
1145 branchtorestore = b''
1149 branchtorestore = b''
1146 if shelvectx.branch() != shelvectx.p1().branch():
1150 if shelvectx.branch() != shelvectx.p1().branch():
1147 branchtorestore = shelvectx.branch()
1151 branchtorestore = shelvectx.branch()
1148
1152
1149 shelvectx, ispartialunshelve = _rebaserestoredcommit(
1153 shelvectx, ispartialunshelve = _rebaserestoredcommit(
1150 ui,
1154 ui,
1151 repo,
1155 repo,
1152 opts,
1156 opts,
1153 tr,
1157 tr,
1154 oldtiprev,
1158 oldtiprev,
1155 basename,
1159 basename,
1156 pctx,
1160 pctx,
1157 tmpwctx,
1161 tmpwctx,
1158 shelvectx,
1162 shelvectx,
1159 branchtorestore,
1163 branchtorestore,
1160 activebookmark,
1164 activebookmark,
1161 )
1165 )
1162 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
1166 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
1163 with ui.configoverride(overrides, b'unshelve'):
1167 with ui.configoverride(overrides, b'unshelve'):
1164 mergefiles(ui, repo, pctx, shelvectx)
1168 mergefiles(ui, repo, pctx, shelvectx)
1165 restorebranch(ui, repo, branchtorestore)
1169 restorebranch(ui, repo, branchtorestore)
1166 shelvedstate.clear(repo)
1170 shelvedstate.clear(repo)
1167 _finishunshelve(repo, oldtiprev, tr, activebookmark)
1171 _finishunshelve(repo, oldtiprev, tr, activebookmark)
1168 _forgetunknownfiles(repo, shelvectx, addedbefore)
1172 _forgetunknownfiles(repo, shelvectx, addedbefore)
1169 if not ispartialunshelve:
1173 if not ispartialunshelve:
1170 unshelvecleanup(ui, repo, basename, opts)
1174 unshelvecleanup(ui, repo, basename, opts)
1171 finally:
1175 finally:
1172 if tr:
1176 if tr:
1173 tr.release()
1177 tr.release()
1174 lockmod.release(lock)
1178 lockmod.release(lock)
General Comments 0
You need to be logged in to leave comments. Login now