##// END OF EJS Templates
bookmarks: use check_incompatible_arguments() for inactive+action...
Martin von Zweigbergk -
r44354:e623ad1b default
parent child Browse files
Show More
@@ -1,7830 +1,7829 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from .pycompat import open
25 from .pycompat import open
26 from . import (
26 from . import (
27 archival,
27 archival,
28 bookmarks,
28 bookmarks,
29 bundle2,
29 bundle2,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 hbisect,
44 hbisect,
45 help,
45 help,
46 hg,
46 hg,
47 logcmdutil,
47 logcmdutil,
48 merge as mergemod,
48 merge as mergemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 (
84 (
85 b'R',
85 b'R',
86 b'repository',
86 b'repository',
87 b'',
87 b'',
88 _(b'repository root directory or name of overlay bundle file'),
88 _(b'repository root directory or name of overlay bundle file'),
89 _(b'REPO'),
89 _(b'REPO'),
90 ),
90 ),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (
92 (
93 b'y',
93 b'y',
94 b'noninteractive',
94 b'noninteractive',
95 None,
95 None,
96 _(
96 _(
97 b'do not prompt, automatically pick the first choice for all prompts'
97 b'do not prompt, automatically pick the first choice for all prompts'
98 ),
98 ),
99 ),
99 ),
100 (b'q', b'quiet', None, _(b'suppress output')),
100 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
101 (b'v', b'verbose', None, _(b'enable additional output')),
102 (
102 (
103 b'',
103 b'',
104 b'color',
104 b'color',
105 b'',
105 b'',
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # and should not be translated
107 # and should not be translated
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b'TYPE'),
109 _(b'TYPE'),
110 ),
110 ),
111 (
111 (
112 b'',
112 b'',
113 b'config',
113 b'config',
114 [],
114 [],
115 _(b'set/override config option (use \'section.name=value\')'),
115 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'CONFIG'),
116 _(b'CONFIG'),
117 ),
117 ),
118 (b'', b'debug', None, _(b'enable debugging output')),
118 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debugger', None, _(b'start debugger')),
119 (b'', b'debugger', None, _(b'start debugger')),
120 (
120 (
121 b'',
121 b'',
122 b'encoding',
122 b'encoding',
123 encoding.encoding,
123 encoding.encoding,
124 _(b'set the charset encoding'),
124 _(b'set the charset encoding'),
125 _(b'ENCODE'),
125 _(b'ENCODE'),
126 ),
126 ),
127 (
127 (
128 b'',
128 b'',
129 b'encodingmode',
129 b'encodingmode',
130 encoding.encodingmode,
130 encoding.encodingmode,
131 _(b'set the charset encoding mode'),
131 _(b'set the charset encoding mode'),
132 _(b'MODE'),
132 _(b'MODE'),
133 ),
133 ),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'time', None, _(b'time how long the command takes')),
135 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'profile', None, _(b'print command execution profile')),
136 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'version', None, _(b'output version information and exit')),
137 (b'', b'version', None, _(b'output version information and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
138 (b'h', b'help', None, _(b'display help and exit')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (
140 (
141 b'',
141 b'',
142 b'pager',
142 b'pager',
143 b'auto',
143 b'auto',
144 _(b"when to paginate (boolean, always, auto, or never)"),
144 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b'TYPE'),
145 _(b'TYPE'),
146 ),
146 ),
147 ]
147 ]
148
148
149 dryrunopts = cmdutil.dryrunopts
149 dryrunopts = cmdutil.dryrunopts
150 remoteopts = cmdutil.remoteopts
150 remoteopts = cmdutil.remoteopts
151 walkopts = cmdutil.walkopts
151 walkopts = cmdutil.walkopts
152 commitopts = cmdutil.commitopts
152 commitopts = cmdutil.commitopts
153 commitopts2 = cmdutil.commitopts2
153 commitopts2 = cmdutil.commitopts2
154 commitopts3 = cmdutil.commitopts3
154 commitopts3 = cmdutil.commitopts3
155 formatteropts = cmdutil.formatteropts
155 formatteropts = cmdutil.formatteropts
156 templateopts = cmdutil.templateopts
156 templateopts = cmdutil.templateopts
157 logopts = cmdutil.logopts
157 logopts = cmdutil.logopts
158 diffopts = cmdutil.diffopts
158 diffopts = cmdutil.diffopts
159 diffwsopts = cmdutil.diffwsopts
159 diffwsopts = cmdutil.diffwsopts
160 diffopts2 = cmdutil.diffopts2
160 diffopts2 = cmdutil.diffopts2
161 mergetoolopts = cmdutil.mergetoolopts
161 mergetoolopts = cmdutil.mergetoolopts
162 similarityopts = cmdutil.similarityopts
162 similarityopts = cmdutil.similarityopts
163 subrepoopts = cmdutil.subrepoopts
163 subrepoopts = cmdutil.subrepoopts
164 debugrevlogopts = cmdutil.debugrevlogopts
164 debugrevlogopts = cmdutil.debugrevlogopts
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168
168
169 @command(
169 @command(
170 b'abort',
170 b'abort',
171 dryrunopts,
171 dryrunopts,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpbasic=True,
173 helpbasic=True,
174 )
174 )
175 def abort(ui, repo, **opts):
175 def abort(ui, repo, **opts):
176 """abort an unfinished operation (EXPERIMENTAL)
176 """abort an unfinished operation (EXPERIMENTAL)
177
177
178 Aborts a multistep operation like graft, histedit, rebase, merge,
178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 and unshelve if they are in an unfinished state.
179 and unshelve if they are in an unfinished state.
180
180
181 use --dry-run/-n to dry run the command.
181 use --dry-run/-n to dry run the command.
182 """
182 """
183 dryrun = opts.get('dry_run')
183 dryrun = opts.get('dry_run')
184 abortstate = cmdutil.getunfinishedstate(repo)
184 abortstate = cmdutil.getunfinishedstate(repo)
185 if not abortstate:
185 if not abortstate:
186 raise error.Abort(_(b'no operation in progress'))
186 raise error.Abort(_(b'no operation in progress'))
187 if not abortstate.abortfunc:
187 if not abortstate.abortfunc:
188 raise error.Abort(
188 raise error.Abort(
189 (
189 (
190 _(b"%s in progress but does not support 'hg abort'")
190 _(b"%s in progress but does not support 'hg abort'")
191 % (abortstate._opname)
191 % (abortstate._opname)
192 ),
192 ),
193 hint=abortstate.hint(),
193 hint=abortstate.hint(),
194 )
194 )
195 if dryrun:
195 if dryrun:
196 ui.status(
196 ui.status(
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 )
198 )
199 return
199 return
200 return abortstate.abortfunc(ui, repo)
200 return abortstate.abortfunc(ui, repo)
201
201
202
202
203 @command(
203 @command(
204 b'add',
204 b'add',
205 walkopts + subrepoopts + dryrunopts,
205 walkopts + subrepoopts + dryrunopts,
206 _(b'[OPTION]... [FILE]...'),
206 _(b'[OPTION]... [FILE]...'),
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpbasic=True,
208 helpbasic=True,
209 inferrepo=True,
209 inferrepo=True,
210 )
210 )
211 def add(ui, repo, *pats, **opts):
211 def add(ui, repo, *pats, **opts):
212 """add the specified files on the next commit
212 """add the specified files on the next commit
213
213
214 Schedule files to be version controlled and added to the
214 Schedule files to be version controlled and added to the
215 repository.
215 repository.
216
216
217 The files will be added to the repository at the next commit. To
217 The files will be added to the repository at the next commit. To
218 undo an add before that, see :hg:`forget`.
218 undo an add before that, see :hg:`forget`.
219
219
220 If no names are given, add all files to the repository (except
220 If no names are given, add all files to the repository (except
221 files matching ``.hgignore``).
221 files matching ``.hgignore``).
222
222
223 .. container:: verbose
223 .. container:: verbose
224
224
225 Examples:
225 Examples:
226
226
227 - New (unknown) files are added
227 - New (unknown) files are added
228 automatically by :hg:`add`::
228 automatically by :hg:`add`::
229
229
230 $ ls
230 $ ls
231 foo.c
231 foo.c
232 $ hg status
232 $ hg status
233 ? foo.c
233 ? foo.c
234 $ hg add
234 $ hg add
235 adding foo.c
235 adding foo.c
236 $ hg status
236 $ hg status
237 A foo.c
237 A foo.c
238
238
239 - Specific files to be added can be specified::
239 - Specific files to be added can be specified::
240
240
241 $ ls
241 $ ls
242 bar.c foo.c
242 bar.c foo.c
243 $ hg status
243 $ hg status
244 ? bar.c
244 ? bar.c
245 ? foo.c
245 ? foo.c
246 $ hg add bar.c
246 $ hg add bar.c
247 $ hg status
247 $ hg status
248 A bar.c
248 A bar.c
249 ? foo.c
249 ? foo.c
250
250
251 Returns 0 if all files are successfully added.
251 Returns 0 if all files are successfully added.
252 """
252 """
253
253
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 return rejected and 1 or 0
257 return rejected and 1 or 0
258
258
259
259
260 @command(
260 @command(
261 b'addremove',
261 b'addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _(b'[OPTION]... [FILE]...'),
263 _(b'[OPTION]... [FILE]...'),
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 inferrepo=True,
265 inferrepo=True,
266 )
266 )
267 def addremove(ui, repo, *pats, **opts):
267 def addremove(ui, repo, *pats, **opts):
268 """add all new files, delete all missing files
268 """add all new files, delete all missing files
269
269
270 Add all new files and remove all missing files from the
270 Add all new files and remove all missing files from the
271 repository.
271 repository.
272
272
273 Unless names are given, new files are ignored if they match any of
273 Unless names are given, new files are ignored if they match any of
274 the patterns in ``.hgignore``. As with add, these changes take
274 the patterns in ``.hgignore``. As with add, these changes take
275 effect at the next commit.
275 effect at the next commit.
276
276
277 Use the -s/--similarity option to detect renamed files. This
277 Use the -s/--similarity option to detect renamed files. This
278 option takes a percentage between 0 (disabled) and 100 (files must
278 option takes a percentage between 0 (disabled) and 100 (files must
279 be identical) as its parameter. With a parameter greater than 0,
279 be identical) as its parameter. With a parameter greater than 0,
280 this compares every removed file with every added file and records
280 this compares every removed file with every added file and records
281 those similar enough as renames. Detecting renamed files this way
281 those similar enough as renames. Detecting renamed files this way
282 can be expensive. After using this option, :hg:`status -C` can be
282 can be expensive. After using this option, :hg:`status -C` can be
283 used to check which files were identified as moved or renamed. If
283 used to check which files were identified as moved or renamed. If
284 not specified, -s/--similarity defaults to 100 and only renames of
284 not specified, -s/--similarity defaults to 100 and only renames of
285 identical files are detected.
285 identical files are detected.
286
286
287 .. container:: verbose
287 .. container:: verbose
288
288
289 Examples:
289 Examples:
290
290
291 - A number of files (bar.c and foo.c) are new,
291 - A number of files (bar.c and foo.c) are new,
292 while foobar.c has been removed (without using :hg:`remove`)
292 while foobar.c has been removed (without using :hg:`remove`)
293 from the repository::
293 from the repository::
294
294
295 $ ls
295 $ ls
296 bar.c foo.c
296 bar.c foo.c
297 $ hg status
297 $ hg status
298 ! foobar.c
298 ! foobar.c
299 ? bar.c
299 ? bar.c
300 ? foo.c
300 ? foo.c
301 $ hg addremove
301 $ hg addremove
302 adding bar.c
302 adding bar.c
303 adding foo.c
303 adding foo.c
304 removing foobar.c
304 removing foobar.c
305 $ hg status
305 $ hg status
306 A bar.c
306 A bar.c
307 A foo.c
307 A foo.c
308 R foobar.c
308 R foobar.c
309
309
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 Afterwards, it was edited slightly::
311 Afterwards, it was edited slightly::
312
312
313 $ ls
313 $ ls
314 foo.c
314 foo.c
315 $ hg status
315 $ hg status
316 ! foobar.c
316 ! foobar.c
317 ? foo.c
317 ? foo.c
318 $ hg addremove --similarity 90
318 $ hg addremove --similarity 90
319 removing foobar.c
319 removing foobar.c
320 adding foo.c
320 adding foo.c
321 recording removal of foobar.c as rename to foo.c (94% similar)
321 recording removal of foobar.c as rename to foo.c (94% similar)
322 $ hg status -C
322 $ hg status -C
323 A foo.c
323 A foo.c
324 foobar.c
324 foobar.c
325 R foobar.c
325 R foobar.c
326
326
327 Returns 0 if all files are successfully added.
327 Returns 0 if all files are successfully added.
328 """
328 """
329 opts = pycompat.byteskwargs(opts)
329 opts = pycompat.byteskwargs(opts)
330 if not opts.get(b'similarity'):
330 if not opts.get(b'similarity'):
331 opts[b'similarity'] = b'100'
331 opts[b'similarity'] = b'100'
332 matcher = scmutil.match(repo[None], pats, opts)
332 matcher = scmutil.match(repo[None], pats, opts)
333 relative = scmutil.anypats(pats, opts)
333 relative = scmutil.anypats(pats, opts)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336
336
337
337
338 @command(
338 @command(
339 b'annotate|blame',
339 b'annotate|blame',
340 [
340 [
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (
342 (
343 b'',
343 b'',
344 b'follow',
344 b'follow',
345 None,
345 None,
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 ),
347 ),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'a', b'text', None, _(b'treat all files as text')),
349 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'f', b'file', None, _(b'list the filename')),
351 (b'f', b'file', None, _(b'list the filename')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
354 (b'c', b'changeset', None, _(b'list the changeset')),
355 (
355 (
356 b'l',
356 b'l',
357 b'line-number',
357 b'line-number',
358 None,
358 None,
359 _(b'show line number at the first appearance'),
359 _(b'show line number at the first appearance'),
360 ),
360 ),
361 (
361 (
362 b'',
362 b'',
363 b'skip',
363 b'skip',
364 [],
364 [],
365 _(b'revset to not display (EXPERIMENTAL)'),
365 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'REV'),
366 _(b'REV'),
367 ),
367 ),
368 ]
368 ]
369 + diffwsopts
369 + diffwsopts
370 + walkopts
370 + walkopts
371 + formatteropts,
371 + formatteropts,
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpbasic=True,
374 helpbasic=True,
375 inferrepo=True,
375 inferrepo=True,
376 )
376 )
377 def annotate(ui, repo, *pats, **opts):
377 def annotate(ui, repo, *pats, **opts):
378 """show changeset information by line for each file
378 """show changeset information by line for each file
379
379
380 List changes in files, showing the revision id responsible for
380 List changes in files, showing the revision id responsible for
381 each line.
381 each line.
382
382
383 This command is useful for discovering when a change was made and
383 This command is useful for discovering when a change was made and
384 by whom.
384 by whom.
385
385
386 If you include --file, --user, or --date, the revision number is
386 If you include --file, --user, or --date, the revision number is
387 suppressed unless you also include --number.
387 suppressed unless you also include --number.
388
388
389 Without the -a/--text option, annotate will avoid processing files
389 Without the -a/--text option, annotate will avoid processing files
390 it detects as binary. With -a, annotate will annotate the file
390 it detects as binary. With -a, annotate will annotate the file
391 anyway, although the results will probably be neither useful
391 anyway, although the results will probably be neither useful
392 nor desirable.
392 nor desirable.
393
393
394 .. container:: verbose
394 .. container:: verbose
395
395
396 Template:
396 Template:
397
397
398 The following keywords are supported in addition to the common template
398 The following keywords are supported in addition to the common template
399 keywords and functions. See also :hg:`help templates`.
399 keywords and functions. See also :hg:`help templates`.
400
400
401 :lines: List of lines with annotation data.
401 :lines: List of lines with annotation data.
402 :path: String. Repository-absolute path of the specified file.
402 :path: String. Repository-absolute path of the specified file.
403
403
404 And each entry of ``{lines}`` provides the following sub-keywords in
404 And each entry of ``{lines}`` provides the following sub-keywords in
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406
406
407 :line: String. Line content.
407 :line: String. Line content.
408 :lineno: Integer. Line number at that revision.
408 :lineno: Integer. Line number at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
409 :path: String. Repository-absolute path of the file at that revision.
410
410
411 See :hg:`help templates.operators` for the list expansion syntax.
411 See :hg:`help templates.operators` for the list expansion syntax.
412
412
413 Returns 0 on success.
413 Returns 0 on success.
414 """
414 """
415 opts = pycompat.byteskwargs(opts)
415 opts = pycompat.byteskwargs(opts)
416 if not pats:
416 if not pats:
417 raise error.Abort(_(b'at least one filename or pattern is required'))
417 raise error.Abort(_(b'at least one filename or pattern is required'))
418
418
419 if opts.get(b'follow'):
419 if opts.get(b'follow'):
420 # --follow is deprecated and now just an alias for -f/--file
420 # --follow is deprecated and now just an alias for -f/--file
421 # to mimic the behavior of Mercurial before version 1.5
421 # to mimic the behavior of Mercurial before version 1.5
422 opts[b'file'] = True
422 opts[b'file'] = True
423
423
424 if (
424 if (
425 not opts.get(b'user')
425 not opts.get(b'user')
426 and not opts.get(b'changeset')
426 and not opts.get(b'changeset')
427 and not opts.get(b'date')
427 and not opts.get(b'date')
428 and not opts.get(b'file')
428 and not opts.get(b'file')
429 ):
429 ):
430 opts[b'number'] = True
430 opts[b'number'] = True
431
431
432 linenumber = opts.get(b'line_number') is not None
432 linenumber = opts.get(b'line_number') is not None
433 if (
433 if (
434 linenumber
434 linenumber
435 and (not opts.get(b'changeset'))
435 and (not opts.get(b'changeset'))
436 and (not opts.get(b'number'))
436 and (not opts.get(b'number'))
437 ):
437 ):
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439
439
440 rev = opts.get(b'rev')
440 rev = opts.get(b'rev')
441 if rev:
441 if rev:
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 ctx = scmutil.revsingle(repo, rev)
443 ctx = scmutil.revsingle(repo, rev)
444
444
445 ui.pager(b'annotate')
445 ui.pager(b'annotate')
446 rootfm = ui.formatter(b'annotate', opts)
446 rootfm = ui.formatter(b'annotate', opts)
447 if ui.debugflag:
447 if ui.debugflag:
448 shorthex = pycompat.identity
448 shorthex = pycompat.identity
449 else:
449 else:
450
450
451 def shorthex(h):
451 def shorthex(h):
452 return h[:12]
452 return h[:12]
453
453
454 if ui.quiet:
454 if ui.quiet:
455 datefunc = dateutil.shortdate
455 datefunc = dateutil.shortdate
456 else:
456 else:
457 datefunc = dateutil.datestr
457 datefunc = dateutil.datestr
458 if ctx.rev() is None:
458 if ctx.rev() is None:
459 if opts.get(b'changeset'):
459 if opts.get(b'changeset'):
460 # omit "+" suffix which is appended to node hex
460 # omit "+" suffix which is appended to node hex
461 def formatrev(rev):
461 def formatrev(rev):
462 if rev == wdirrev:
462 if rev == wdirrev:
463 return b'%d' % ctx.p1().rev()
463 return b'%d' % ctx.p1().rev()
464 else:
464 else:
465 return b'%d' % rev
465 return b'%d' % rev
466
466
467 else:
467 else:
468
468
469 def formatrev(rev):
469 def formatrev(rev):
470 if rev == wdirrev:
470 if rev == wdirrev:
471 return b'%d+' % ctx.p1().rev()
471 return b'%d+' % ctx.p1().rev()
472 else:
472 else:
473 return b'%d ' % rev
473 return b'%d ' % rev
474
474
475 def formathex(h):
475 def formathex(h):
476 if h == wdirhex:
476 if h == wdirhex:
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 else:
478 else:
479 return b'%s ' % shorthex(h)
479 return b'%s ' % shorthex(h)
480
480
481 else:
481 else:
482 formatrev = b'%d'.__mod__
482 formatrev = b'%d'.__mod__
483 formathex = shorthex
483 formathex = shorthex
484
484
485 opmap = [
485 opmap = [
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 ]
492 ]
493 opnamemap = {
493 opnamemap = {
494 b'rev': b'number',
494 b'rev': b'number',
495 b'node': b'changeset',
495 b'node': b'changeset',
496 b'path': b'file',
496 b'path': b'file',
497 b'lineno': b'line_number',
497 b'lineno': b'line_number',
498 }
498 }
499
499
500 if rootfm.isplain():
500 if rootfm.isplain():
501
501
502 def makefunc(get, fmt):
502 def makefunc(get, fmt):
503 return lambda x: fmt(get(x))
503 return lambda x: fmt(get(x))
504
504
505 else:
505 else:
506
506
507 def makefunc(get, fmt):
507 def makefunc(get, fmt):
508 return get
508 return get
509
509
510 datahint = rootfm.datahint()
510 datahint = rootfm.datahint()
511 funcmap = [
511 funcmap = [
512 (makefunc(get, fmt), sep)
512 (makefunc(get, fmt), sep)
513 for fn, sep, get, fmt in opmap
513 for fn, sep, get, fmt in opmap
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 ]
515 ]
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 fields = b' '.join(
517 fields = b' '.join(
518 fn
518 fn
519 for fn, sep, get, fmt in opmap
519 for fn, sep, get, fmt in opmap
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 )
521 )
522
522
523 def bad(x, y):
523 def bad(x, y):
524 raise error.Abort(b"%s: %s" % (x, y))
524 raise error.Abort(b"%s: %s" % (x, y))
525
525
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527
527
528 follow = not opts.get(b'no_follow')
528 follow = not opts.get(b'no_follow')
529 diffopts = patch.difffeatureopts(
529 diffopts = patch.difffeatureopts(
530 ui, opts, section=b'annotate', whitespace=True
530 ui, opts, section=b'annotate', whitespace=True
531 )
531 )
532 skiprevs = opts.get(b'skip')
532 skiprevs = opts.get(b'skip')
533 if skiprevs:
533 if skiprevs:
534 skiprevs = scmutil.revrange(repo, skiprevs)
534 skiprevs = scmutil.revrange(repo, skiprevs)
535
535
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 for abs in ctx.walk(m):
537 for abs in ctx.walk(m):
538 fctx = ctx[abs]
538 fctx = ctx[abs]
539 rootfm.startitem()
539 rootfm.startitem()
540 rootfm.data(path=abs)
540 rootfm.data(path=abs)
541 if not opts.get(b'text') and fctx.isbinary():
541 if not opts.get(b'text') and fctx.isbinary():
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 continue
543 continue
544
544
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 lines = fctx.annotate(
546 lines = fctx.annotate(
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 )
548 )
549 if not lines:
549 if not lines:
550 fm.end()
550 fm.end()
551 continue
551 continue
552 formats = []
552 formats = []
553 pieces = []
553 pieces = []
554
554
555 for f, sep in funcmap:
555 for f, sep in funcmap:
556 l = [f(n) for n in lines]
556 l = [f(n) for n in lines]
557 if fm.isplain():
557 if fm.isplain():
558 sizes = [encoding.colwidth(x) for x in l]
558 sizes = [encoding.colwidth(x) for x in l]
559 ml = max(sizes)
559 ml = max(sizes)
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 else:
561 else:
562 formats.append([b'%s' for x in l])
562 formats.append([b'%s' for x in l])
563 pieces.append(l)
563 pieces.append(l)
564
564
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 fm.startitem()
566 fm.startitem()
567 fm.context(fctx=n.fctx)
567 fm.context(fctx=n.fctx)
568 fm.write(fields, b"".join(f), *p)
568 fm.write(fields, b"".join(f), *p)
569 if n.skip:
569 if n.skip:
570 fmt = b"* %s"
570 fmt = b"* %s"
571 else:
571 else:
572 fmt = b": %s"
572 fmt = b": %s"
573 fm.write(b'line', fmt, n.text)
573 fm.write(b'line', fmt, n.text)
574
574
575 if not lines[-1].text.endswith(b'\n'):
575 if not lines[-1].text.endswith(b'\n'):
576 fm.plain(b'\n')
576 fm.plain(b'\n')
577 fm.end()
577 fm.end()
578
578
579 rootfm.end()
579 rootfm.end()
580
580
581
581
582 @command(
582 @command(
583 b'archive',
583 b'archive',
584 [
584 [
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (
586 (
587 b'p',
587 b'p',
588 b'prefix',
588 b'prefix',
589 b'',
589 b'',
590 _(b'directory prefix for files in archive'),
590 _(b'directory prefix for files in archive'),
591 _(b'PREFIX'),
591 _(b'PREFIX'),
592 ),
592 ),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 ]
595 ]
596 + subrepoopts
596 + subrepoopts
597 + walkopts,
597 + walkopts,
598 _(b'[OPTION]... DEST'),
598 _(b'[OPTION]... DEST'),
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 )
600 )
601 def archive(ui, repo, dest, **opts):
601 def archive(ui, repo, dest, **opts):
602 '''create an unversioned archive of a repository revision
602 '''create an unversioned archive of a repository revision
603
603
604 By default, the revision used is the parent of the working
604 By default, the revision used is the parent of the working
605 directory; use -r/--rev to specify a different revision.
605 directory; use -r/--rev to specify a different revision.
606
606
607 The archive type is automatically detected based on file
607 The archive type is automatically detected based on file
608 extension (to override, use -t/--type).
608 extension (to override, use -t/--type).
609
609
610 .. container:: verbose
610 .. container:: verbose
611
611
612 Examples:
612 Examples:
613
613
614 - create a zip file containing the 1.0 release::
614 - create a zip file containing the 1.0 release::
615
615
616 hg archive -r 1.0 project-1.0.zip
616 hg archive -r 1.0 project-1.0.zip
617
617
618 - create a tarball excluding .hg files::
618 - create a tarball excluding .hg files::
619
619
620 hg archive project.tar.gz -X ".hg*"
620 hg archive project.tar.gz -X ".hg*"
621
621
622 Valid types are:
622 Valid types are:
623
623
624 :``files``: a directory full of files (default)
624 :``files``: a directory full of files (default)
625 :``tar``: tar archive, uncompressed
625 :``tar``: tar archive, uncompressed
626 :``tbz2``: tar archive, compressed using bzip2
626 :``tbz2``: tar archive, compressed using bzip2
627 :``tgz``: tar archive, compressed using gzip
627 :``tgz``: tar archive, compressed using gzip
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``uzip``: zip archive, uncompressed
629 :``uzip``: zip archive, uncompressed
630 :``zip``: zip archive, compressed using deflate
630 :``zip``: zip archive, compressed using deflate
631
631
632 The exact name of the destination archive or directory is given
632 The exact name of the destination archive or directory is given
633 using a format string; see :hg:`help export` for details.
633 using a format string; see :hg:`help export` for details.
634
634
635 Each member added to an archive file has a directory prefix
635 Each member added to an archive file has a directory prefix
636 prepended. Use -p/--prefix to specify a format string for the
636 prepended. Use -p/--prefix to specify a format string for the
637 prefix. The default is the basename of the archive, with suffixes
637 prefix. The default is the basename of the archive, with suffixes
638 removed.
638 removed.
639
639
640 Returns 0 on success.
640 Returns 0 on success.
641 '''
641 '''
642
642
643 opts = pycompat.byteskwargs(opts)
643 opts = pycompat.byteskwargs(opts)
644 rev = opts.get(b'rev')
644 rev = opts.get(b'rev')
645 if rev:
645 if rev:
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 if not ctx:
648 if not ctx:
649 raise error.Abort(_(b'no working directory: please specify a revision'))
649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 node = ctx.node()
650 node = ctx.node()
651 dest = cmdutil.makefilename(ctx, dest)
651 dest = cmdutil.makefilename(ctx, dest)
652 if os.path.realpath(dest) == repo.root:
652 if os.path.realpath(dest) == repo.root:
653 raise error.Abort(_(b'repository root cannot be destination'))
653 raise error.Abort(_(b'repository root cannot be destination'))
654
654
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 prefix = opts.get(b'prefix')
656 prefix = opts.get(b'prefix')
657
657
658 if dest == b'-':
658 if dest == b'-':
659 if kind == b'files':
659 if kind == b'files':
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 dest = cmdutil.makefileobj(ctx, dest)
661 dest = cmdutil.makefileobj(ctx, dest)
662 if not prefix:
662 if not prefix:
663 prefix = os.path.basename(repo.root) + b'-%h'
663 prefix = os.path.basename(repo.root) + b'-%h'
664
664
665 prefix = cmdutil.makefilename(ctx, prefix)
665 prefix = cmdutil.makefilename(ctx, prefix)
666 match = scmutil.match(ctx, [], opts)
666 match = scmutil.match(ctx, [], opts)
667 archival.archive(
667 archival.archive(
668 repo,
668 repo,
669 dest,
669 dest,
670 node,
670 node,
671 kind,
671 kind,
672 not opts.get(b'no_decode'),
672 not opts.get(b'no_decode'),
673 match,
673 match,
674 prefix,
674 prefix,
675 subrepos=opts.get(b'subrepos'),
675 subrepos=opts.get(b'subrepos'),
676 )
676 )
677
677
678
678
679 @command(
679 @command(
680 b'backout',
680 b'backout',
681 [
681 [
682 (
682 (
683 b'',
683 b'',
684 b'merge',
684 b'merge',
685 None,
685 None,
686 _(b'merge with old dirstate parent after backout'),
686 _(b'merge with old dirstate parent after backout'),
687 ),
687 ),
688 (
688 (
689 b'',
689 b'',
690 b'commit',
690 b'commit',
691 None,
691 None,
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 ),
693 ),
694 (b'', b'no-commit', None, _(b'do not commit')),
694 (b'', b'no-commit', None, _(b'do not commit')),
695 (
695 (
696 b'',
696 b'',
697 b'parent',
697 b'parent',
698 b'',
698 b'',
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'REV'),
700 _(b'REV'),
701 ),
701 ),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 ]
704 ]
705 + mergetoolopts
705 + mergetoolopts
706 + walkopts
706 + walkopts
707 + commitopts
707 + commitopts
708 + commitopts2,
708 + commitopts2,
709 _(b'[OPTION]... [-r] REV'),
709 _(b'[OPTION]... [-r] REV'),
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 )
711 )
712 def backout(ui, repo, node=None, rev=None, **opts):
712 def backout(ui, repo, node=None, rev=None, **opts):
713 '''reverse effect of earlier changeset
713 '''reverse effect of earlier changeset
714
714
715 Prepare a new changeset with the effect of REV undone in the
715 Prepare a new changeset with the effect of REV undone in the
716 current working directory. If no conflicts were encountered,
716 current working directory. If no conflicts were encountered,
717 it will be committed immediately.
717 it will be committed immediately.
718
718
719 If REV is the parent of the working directory, then this new changeset
719 If REV is the parent of the working directory, then this new changeset
720 is committed automatically (unless --no-commit is specified).
720 is committed automatically (unless --no-commit is specified).
721
721
722 .. note::
722 .. note::
723
723
724 :hg:`backout` cannot be used to fix either an unwanted or
724 :hg:`backout` cannot be used to fix either an unwanted or
725 incorrect merge.
725 incorrect merge.
726
726
727 .. container:: verbose
727 .. container:: verbose
728
728
729 Examples:
729 Examples:
730
730
731 - Reverse the effect of the parent of the working directory.
731 - Reverse the effect of the parent of the working directory.
732 This backout will be committed immediately::
732 This backout will be committed immediately::
733
733
734 hg backout -r .
734 hg backout -r .
735
735
736 - Reverse the effect of previous bad revision 23::
736 - Reverse the effect of previous bad revision 23::
737
737
738 hg backout -r 23
738 hg backout -r 23
739
739
740 - Reverse the effect of previous bad revision 23 and
740 - Reverse the effect of previous bad revision 23 and
741 leave changes uncommitted::
741 leave changes uncommitted::
742
742
743 hg backout -r 23 --no-commit
743 hg backout -r 23 --no-commit
744 hg commit -m "Backout revision 23"
744 hg commit -m "Backout revision 23"
745
745
746 By default, the pending changeset will have one parent,
746 By default, the pending changeset will have one parent,
747 maintaining a linear history. With --merge, the pending
747 maintaining a linear history. With --merge, the pending
748 changeset will instead have two parents: the old parent of the
748 changeset will instead have two parents: the old parent of the
749 working directory and a new child of REV that simply undoes REV.
749 working directory and a new child of REV that simply undoes REV.
750
750
751 Before version 1.7, the behavior without --merge was equivalent
751 Before version 1.7, the behavior without --merge was equivalent
752 to specifying --merge followed by :hg:`update --clean .` to
752 to specifying --merge followed by :hg:`update --clean .` to
753 cancel the merge and leave the child of REV as a head to be
753 cancel the merge and leave the child of REV as a head to be
754 merged separately.
754 merged separately.
755
755
756 See :hg:`help dates` for a list of formats valid for -d/--date.
756 See :hg:`help dates` for a list of formats valid for -d/--date.
757
757
758 See :hg:`help revert` for a way to restore files to the state
758 See :hg:`help revert` for a way to restore files to the state
759 of another revision.
759 of another revision.
760
760
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 files.
762 files.
763 '''
763 '''
764 with repo.wlock(), repo.lock():
764 with repo.wlock(), repo.lock():
765 return _dobackout(ui, repo, node, rev, **opts)
765 return _dobackout(ui, repo, node, rev, **opts)
766
766
767
767
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 opts = pycompat.byteskwargs(opts)
769 opts = pycompat.byteskwargs(opts)
770 if opts.get(b'commit') and opts.get(b'no_commit'):
770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 if opts.get(b'merge') and opts.get(b'no_commit'):
772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774
774
775 if rev and node:
775 if rev and node:
776 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
777
777
778 if not rev:
778 if not rev:
779 rev = node
779 rev = node
780
780
781 if not rev:
781 if not rev:
782 raise error.Abort(_(b"please specify a revision to backout"))
782 raise error.Abort(_(b"please specify a revision to backout"))
783
783
784 date = opts.get(b'date')
784 date = opts.get(b'date')
785 if date:
785 if date:
786 opts[b'date'] = dateutil.parsedate(date)
786 opts[b'date'] = dateutil.parsedate(date)
787
787
788 cmdutil.checkunfinished(repo)
788 cmdutil.checkunfinished(repo)
789 cmdutil.bailifchanged(repo)
789 cmdutil.bailifchanged(repo)
790 node = scmutil.revsingle(repo, rev).node()
790 node = scmutil.revsingle(repo, rev).node()
791
791
792 op1, op2 = repo.dirstate.parents()
792 op1, op2 = repo.dirstate.parents()
793 if not repo.changelog.isancestor(node, op1):
793 if not repo.changelog.isancestor(node, op1):
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795
795
796 p1, p2 = repo.changelog.parents(node)
796 p1, p2 = repo.changelog.parents(node)
797 if p1 == nullid:
797 if p1 == nullid:
798 raise error.Abort(_(b'cannot backout a change with no parents'))
798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 if p2 != nullid:
799 if p2 != nullid:
800 if not opts.get(b'parent'):
800 if not opts.get(b'parent'):
801 raise error.Abort(_(b'cannot backout a merge changeset'))
801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 p = repo.lookup(opts[b'parent'])
802 p = repo.lookup(opts[b'parent'])
803 if p not in (p1, p2):
803 if p not in (p1, p2):
804 raise error.Abort(
804 raise error.Abort(
805 _(b'%s is not a parent of %s') % (short(p), short(node))
805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 )
806 )
807 parent = p
807 parent = p
808 else:
808 else:
809 if opts.get(b'parent'):
809 if opts.get(b'parent'):
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 parent = p1
811 parent = p1
812
812
813 # the backout should appear on the same branch
813 # the backout should appear on the same branch
814 branch = repo.dirstate.branch()
814 branch = repo.dirstate.branch()
815 bheads = repo.branchheads(branch)
815 bheads = repo.branchheads(branch)
816 rctx = scmutil.revsingle(repo, hex(parent))
816 rctx = scmutil.revsingle(repo, hex(parent))
817 if not opts.get(b'merge') and op1 != node:
817 if not opts.get(b'merge') and op1 != node:
818 with dirstateguard.dirstateguard(repo, b'backout'):
818 with dirstateguard.dirstateguard(repo, b'backout'):
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 with ui.configoverride(overrides, b'backout'):
820 with ui.configoverride(overrides, b'backout'):
821 stats = mergemod.update(
821 stats = mergemod.update(
822 repo,
822 repo,
823 parent,
823 parent,
824 branchmerge=True,
824 branchmerge=True,
825 force=True,
825 force=True,
826 ancestor=node,
826 ancestor=node,
827 mergeancestor=False,
827 mergeancestor=False,
828 )
828 )
829 repo.setparents(op1, op2)
829 repo.setparents(op1, op2)
830 hg._showstats(repo, stats)
830 hg._showstats(repo, stats)
831 if stats.unresolvedcount:
831 if stats.unresolvedcount:
832 repo.ui.status(
832 repo.ui.status(
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 )
834 )
835 return 1
835 return 1
836 else:
836 else:
837 hg.clean(repo, node, show_stats=False)
837 hg.clean(repo, node, show_stats=False)
838 repo.dirstate.setbranch(branch)
838 repo.dirstate.setbranch(branch)
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840
840
841 if opts.get(b'no_commit'):
841 if opts.get(b'no_commit'):
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 ui.status(msg % short(node))
843 ui.status(msg % short(node))
844 return 0
844 return 0
845
845
846 def commitfunc(ui, repo, message, match, opts):
846 def commitfunc(ui, repo, message, match, opts):
847 editform = b'backout'
847 editform = b'backout'
848 e = cmdutil.getcommiteditor(
848 e = cmdutil.getcommiteditor(
849 editform=editform, **pycompat.strkwargs(opts)
849 editform=editform, **pycompat.strkwargs(opts)
850 )
850 )
851 if not message:
851 if not message:
852 # we don't translate commit messages
852 # we don't translate commit messages
853 message = b"Backed out changeset %s" % short(node)
853 message = b"Backed out changeset %s" % short(node)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 return repo.commit(
855 return repo.commit(
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 )
857 )
858
858
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 if not newnode:
860 if not newnode:
861 ui.status(_(b"nothing changed\n"))
861 ui.status(_(b"nothing changed\n"))
862 return 1
862 return 1
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864
864
865 def nice(node):
865 def nice(node):
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867
867
868 ui.status(
868 ui.status(
869 _(b'changeset %s backs out changeset %s\n')
869 _(b'changeset %s backs out changeset %s\n')
870 % (nice(repo.changelog.tip()), nice(node))
870 % (nice(repo.changelog.tip()), nice(node))
871 )
871 )
872 if opts.get(b'merge') and op1 != node:
872 if opts.get(b'merge') and op1 != node:
873 hg.clean(repo, op1, show_stats=False)
873 hg.clean(repo, op1, show_stats=False)
874 ui.status(
874 ui.status(
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 )
876 )
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 with ui.configoverride(overrides, b'backout'):
878 with ui.configoverride(overrides, b'backout'):
879 return hg.merge(repo, hex(repo.changelog.tip()))
879 return hg.merge(repo, hex(repo.changelog.tip()))
880 return 0
880 return 0
881
881
882
882
883 @command(
883 @command(
884 b'bisect',
884 b'bisect',
885 [
885 [
886 (b'r', b'reset', False, _(b'reset bisect state')),
886 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'g', b'good', False, _(b'mark changeset good')),
887 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
889 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (
891 (
892 b'c',
892 b'c',
893 b'command',
893 b'command',
894 b'',
894 b'',
895 _(b'use command to check changeset state'),
895 _(b'use command to check changeset state'),
896 _(b'CMD'),
896 _(b'CMD'),
897 ),
897 ),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 ],
899 ],
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 )
902 )
903 def bisect(
903 def bisect(
904 ui,
904 ui,
905 repo,
905 repo,
906 rev=None,
906 rev=None,
907 extra=None,
907 extra=None,
908 command=None,
908 command=None,
909 reset=None,
909 reset=None,
910 good=None,
910 good=None,
911 bad=None,
911 bad=None,
912 skip=None,
912 skip=None,
913 extend=None,
913 extend=None,
914 noupdate=None,
914 noupdate=None,
915 ):
915 ):
916 """subdivision search of changesets
916 """subdivision search of changesets
917
917
918 This command helps to find changesets which introduce problems. To
918 This command helps to find changesets which introduce problems. To
919 use, mark the earliest changeset you know exhibits the problem as
919 use, mark the earliest changeset you know exhibits the problem as
920 bad, then mark the latest changeset which is free from the problem
920 bad, then mark the latest changeset which is free from the problem
921 as good. Bisect will update your working directory to a revision
921 as good. Bisect will update your working directory to a revision
922 for testing (unless the -U/--noupdate option is specified). Once
922 for testing (unless the -U/--noupdate option is specified). Once
923 you have performed tests, mark the working directory as good or
923 you have performed tests, mark the working directory as good or
924 bad, and bisect will either update to another candidate changeset
924 bad, and bisect will either update to another candidate changeset
925 or announce that it has found the bad revision.
925 or announce that it has found the bad revision.
926
926
927 As a shortcut, you can also use the revision argument to mark a
927 As a shortcut, you can also use the revision argument to mark a
928 revision as good or bad without checking it out first.
928 revision as good or bad without checking it out first.
929
929
930 If you supply a command, it will be used for automatic bisection.
930 If you supply a command, it will be used for automatic bisection.
931 The environment variable HG_NODE will contain the ID of the
931 The environment variable HG_NODE will contain the ID of the
932 changeset being tested. The exit status of the command will be
932 changeset being tested. The exit status of the command will be
933 used to mark revisions as good or bad: status 0 means good, 125
933 used to mark revisions as good or bad: status 0 means good, 125
934 means to skip the revision, 127 (command not found) will abort the
934 means to skip the revision, 127 (command not found) will abort the
935 bisection, and any other non-zero exit status means the revision
935 bisection, and any other non-zero exit status means the revision
936 is bad.
936 is bad.
937
937
938 .. container:: verbose
938 .. container:: verbose
939
939
940 Some examples:
940 Some examples:
941
941
942 - start a bisection with known bad revision 34, and good revision 12::
942 - start a bisection with known bad revision 34, and good revision 12::
943
943
944 hg bisect --bad 34
944 hg bisect --bad 34
945 hg bisect --good 12
945 hg bisect --good 12
946
946
947 - advance the current bisection by marking current revision as good or
947 - advance the current bisection by marking current revision as good or
948 bad::
948 bad::
949
949
950 hg bisect --good
950 hg bisect --good
951 hg bisect --bad
951 hg bisect --bad
952
952
953 - mark the current revision, or a known revision, to be skipped (e.g. if
953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 that revision is not usable because of another issue)::
954 that revision is not usable because of another issue)::
955
955
956 hg bisect --skip
956 hg bisect --skip
957 hg bisect --skip 23
957 hg bisect --skip 23
958
958
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960
960
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962
962
963 - forget the current bisection::
963 - forget the current bisection::
964
964
965 hg bisect --reset
965 hg bisect --reset
966
966
967 - use 'make && make tests' to automatically find the first broken
967 - use 'make && make tests' to automatically find the first broken
968 revision::
968 revision::
969
969
970 hg bisect --reset
970 hg bisect --reset
971 hg bisect --bad 34
971 hg bisect --bad 34
972 hg bisect --good 12
972 hg bisect --good 12
973 hg bisect --command "make && make tests"
973 hg bisect --command "make && make tests"
974
974
975 - see all changesets whose states are already known in the current
975 - see all changesets whose states are already known in the current
976 bisection::
976 bisection::
977
977
978 hg log -r "bisect(pruned)"
978 hg log -r "bisect(pruned)"
979
979
980 - see the changeset currently being bisected (especially useful
980 - see the changeset currently being bisected (especially useful
981 if running with -U/--noupdate)::
981 if running with -U/--noupdate)::
982
982
983 hg log -r "bisect(current)"
983 hg log -r "bisect(current)"
984
984
985 - see all changesets that took part in the current bisection::
985 - see all changesets that took part in the current bisection::
986
986
987 hg log -r "bisect(range)"
987 hg log -r "bisect(range)"
988
988
989 - you can even get a nice graph::
989 - you can even get a nice graph::
990
990
991 hg log --graph -r "bisect(range)"
991 hg log --graph -r "bisect(range)"
992
992
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994
994
995 Returns 0 on success.
995 Returns 0 on success.
996 """
996 """
997 # backward compatibility
997 # backward compatibility
998 if rev in b"good bad reset init".split():
998 if rev in b"good bad reset init".split():
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 cmd, rev, extra = rev, extra, None
1000 cmd, rev, extra = rev, extra, None
1001 if cmd == b"good":
1001 if cmd == b"good":
1002 good = True
1002 good = True
1003 elif cmd == b"bad":
1003 elif cmd == b"bad":
1004 bad = True
1004 bad = True
1005 else:
1005 else:
1006 reset = True
1006 reset = True
1007 elif extra:
1007 elif extra:
1008 raise error.Abort(_(b'incompatible arguments'))
1008 raise error.Abort(_(b'incompatible arguments'))
1009
1009
1010 incompatibles = {
1010 incompatibles = {
1011 b'--bad': bad,
1011 b'--bad': bad,
1012 b'--command': bool(command),
1012 b'--command': bool(command),
1013 b'--extend': extend,
1013 b'--extend': extend,
1014 b'--good': good,
1014 b'--good': good,
1015 b'--reset': reset,
1015 b'--reset': reset,
1016 b'--skip': skip,
1016 b'--skip': skip,
1017 }
1017 }
1018
1018
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020
1020
1021 if len(enabled) > 1:
1021 if len(enabled) > 1:
1022 raise error.Abort(
1022 raise error.Abort(
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 )
1024 )
1025
1025
1026 if reset:
1026 if reset:
1027 hbisect.resetstate(repo)
1027 hbisect.resetstate(repo)
1028 return
1028 return
1029
1029
1030 state = hbisect.load_state(repo)
1030 state = hbisect.load_state(repo)
1031
1031
1032 # update state
1032 # update state
1033 if good or bad or skip:
1033 if good or bad or skip:
1034 if rev:
1034 if rev:
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 else:
1036 else:
1037 nodes = [repo.lookup(b'.')]
1037 nodes = [repo.lookup(b'.')]
1038 if good:
1038 if good:
1039 state[b'good'] += nodes
1039 state[b'good'] += nodes
1040 elif bad:
1040 elif bad:
1041 state[b'bad'] += nodes
1041 state[b'bad'] += nodes
1042 elif skip:
1042 elif skip:
1043 state[b'skip'] += nodes
1043 state[b'skip'] += nodes
1044 hbisect.save_state(repo, state)
1044 hbisect.save_state(repo, state)
1045 if not (state[b'good'] and state[b'bad']):
1045 if not (state[b'good'] and state[b'bad']):
1046 return
1046 return
1047
1047
1048 def mayupdate(repo, node, show_stats=True):
1048 def mayupdate(repo, node, show_stats=True):
1049 """common used update sequence"""
1049 """common used update sequence"""
1050 if noupdate:
1050 if noupdate:
1051 return
1051 return
1052 cmdutil.checkunfinished(repo)
1052 cmdutil.checkunfinished(repo)
1053 cmdutil.bailifchanged(repo)
1053 cmdutil.bailifchanged(repo)
1054 return hg.clean(repo, node, show_stats=show_stats)
1054 return hg.clean(repo, node, show_stats=show_stats)
1055
1055
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057
1057
1058 if command:
1058 if command:
1059 changesets = 1
1059 changesets = 1
1060 if noupdate:
1060 if noupdate:
1061 try:
1061 try:
1062 node = state[b'current'][0]
1062 node = state[b'current'][0]
1063 except LookupError:
1063 except LookupError:
1064 raise error.Abort(
1064 raise error.Abort(
1065 _(
1065 _(
1066 b'current bisect revision is unknown - '
1066 b'current bisect revision is unknown - '
1067 b'start a new bisect to fix'
1067 b'start a new bisect to fix'
1068 )
1068 )
1069 )
1069 )
1070 else:
1070 else:
1071 node, p2 = repo.dirstate.parents()
1071 node, p2 = repo.dirstate.parents()
1072 if p2 != nullid:
1072 if p2 != nullid:
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 if rev:
1074 if rev:
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 with hbisect.restore_state(repo, state, node):
1076 with hbisect.restore_state(repo, state, node):
1077 while changesets:
1077 while changesets:
1078 # update state
1078 # update state
1079 state[b'current'] = [node]
1079 state[b'current'] = [node]
1080 hbisect.save_state(repo, state)
1080 hbisect.save_state(repo, state)
1081 status = ui.system(
1081 status = ui.system(
1082 command,
1082 command,
1083 environ={b'HG_NODE': hex(node)},
1083 environ={b'HG_NODE': hex(node)},
1084 blockedtag=b'bisect_check',
1084 blockedtag=b'bisect_check',
1085 )
1085 )
1086 if status == 125:
1086 if status == 125:
1087 transition = b"skip"
1087 transition = b"skip"
1088 elif status == 0:
1088 elif status == 0:
1089 transition = b"good"
1089 transition = b"good"
1090 # status < 0 means process was killed
1090 # status < 0 means process was killed
1091 elif status == 127:
1091 elif status == 127:
1092 raise error.Abort(_(b"failed to execute %s") % command)
1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 elif status < 0:
1093 elif status < 0:
1094 raise error.Abort(_(b"%s killed") % command)
1094 raise error.Abort(_(b"%s killed") % command)
1095 else:
1095 else:
1096 transition = b"bad"
1096 transition = b"bad"
1097 state[transition].append(node)
1097 state[transition].append(node)
1098 ctx = repo[node]
1098 ctx = repo[node]
1099 ui.status(
1099 ui.status(
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 )
1101 )
1102 hbisect.checkstate(state)
1102 hbisect.checkstate(state)
1103 # bisect
1103 # bisect
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 # update to next check
1105 # update to next check
1106 node = nodes[0]
1106 node = nodes[0]
1107 mayupdate(repo, node, show_stats=False)
1107 mayupdate(repo, node, show_stats=False)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 return
1109 return
1110
1110
1111 hbisect.checkstate(state)
1111 hbisect.checkstate(state)
1112
1112
1113 # actually bisect
1113 # actually bisect
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 if extend:
1115 if extend:
1116 if not changesets:
1116 if not changesets:
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 if extendnode is not None:
1118 if extendnode is not None:
1119 ui.write(
1119 ui.write(
1120 _(b"Extending search to changeset %d:%s\n")
1120 _(b"Extending search to changeset %d:%s\n")
1121 % (extendnode.rev(), extendnode)
1121 % (extendnode.rev(), extendnode)
1122 )
1122 )
1123 state[b'current'] = [extendnode.node()]
1123 state[b'current'] = [extendnode.node()]
1124 hbisect.save_state(repo, state)
1124 hbisect.save_state(repo, state)
1125 return mayupdate(repo, extendnode.node())
1125 return mayupdate(repo, extendnode.node())
1126 raise error.Abort(_(b"nothing to extend"))
1126 raise error.Abort(_(b"nothing to extend"))
1127
1127
1128 if changesets == 0:
1128 if changesets == 0:
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 else:
1130 else:
1131 assert len(nodes) == 1 # only a single node can be tested next
1131 assert len(nodes) == 1 # only a single node can be tested next
1132 node = nodes[0]
1132 node = nodes[0]
1133 # compute the approximate number of remaining tests
1133 # compute the approximate number of remaining tests
1134 tests, size = 0, 2
1134 tests, size = 0, 2
1135 while size <= changesets:
1135 while size <= changesets:
1136 tests, size = tests + 1, size * 2
1136 tests, size = tests + 1, size * 2
1137 rev = repo.changelog.rev(node)
1137 rev = repo.changelog.rev(node)
1138 ui.write(
1138 ui.write(
1139 _(
1139 _(
1140 b"Testing changeset %d:%s "
1140 b"Testing changeset %d:%s "
1141 b"(%d changesets remaining, ~%d tests)\n"
1141 b"(%d changesets remaining, ~%d tests)\n"
1142 )
1142 )
1143 % (rev, short(node), changesets, tests)
1143 % (rev, short(node), changesets, tests)
1144 )
1144 )
1145 state[b'current'] = [node]
1145 state[b'current'] = [node]
1146 hbisect.save_state(repo, state)
1146 hbisect.save_state(repo, state)
1147 return mayupdate(repo, node)
1147 return mayupdate(repo, node)
1148
1148
1149
1149
1150 @command(
1150 @command(
1151 b'bookmarks|bookmark',
1151 b'bookmarks|bookmark',
1152 [
1152 [
1153 (b'f', b'force', False, _(b'force')),
1153 (b'f', b'force', False, _(b'force')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 ]
1159 ]
1160 + formatteropts,
1160 + formatteropts,
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 )
1163 )
1164 def bookmark(ui, repo, *names, **opts):
1164 def bookmark(ui, repo, *names, **opts):
1165 '''create a new bookmark or list existing bookmarks
1165 '''create a new bookmark or list existing bookmarks
1166
1166
1167 Bookmarks are labels on changesets to help track lines of development.
1167 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170
1170
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 The active bookmark is indicated with a '*'.
1172 The active bookmark is indicated with a '*'.
1173 When a commit is made, the active bookmark will advance to the new commit.
1173 When a commit is made, the active bookmark will advance to the new commit.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 Updating away from a bookmark will cause it to be deactivated.
1175 Updating away from a bookmark will cause it to be deactivated.
1176
1176
1177 Bookmarks can be pushed and pulled between repositories (see
1177 Bookmarks can be pushed and pulled between repositories (see
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 be created. Using :hg:`merge` will resolve the divergence.
1180 be created. Using :hg:`merge` will resolve the divergence.
1181
1181
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 the active bookmark's name.
1183 the active bookmark's name.
1184
1184
1185 A bookmark named '@' has the special property that :hg:`clone` will
1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 check it out by default if it exists.
1186 check it out by default if it exists.
1187
1187
1188 .. container:: verbose
1188 .. container:: verbose
1189
1189
1190 Template:
1190 Template:
1191
1191
1192 The following keywords are supported in addition to the common template
1192 The following keywords are supported in addition to the common template
1193 keywords and functions such as ``{bookmark}``. See also
1193 keywords and functions such as ``{bookmark}``. See also
1194 :hg:`help templates`.
1194 :hg:`help templates`.
1195
1195
1196 :active: Boolean. True if the bookmark is active.
1196 :active: Boolean. True if the bookmark is active.
1197
1197
1198 Examples:
1198 Examples:
1199
1199
1200 - create an active bookmark for a new line of development::
1200 - create an active bookmark for a new line of development::
1201
1201
1202 hg book new-feature
1202 hg book new-feature
1203
1203
1204 - create an inactive bookmark as a place marker::
1204 - create an inactive bookmark as a place marker::
1205
1205
1206 hg book -i reviewed
1206 hg book -i reviewed
1207
1207
1208 - create an inactive bookmark on another changeset::
1208 - create an inactive bookmark on another changeset::
1209
1209
1210 hg book -r .^ tested
1210 hg book -r .^ tested
1211
1211
1212 - rename bookmark turkey to dinner::
1212 - rename bookmark turkey to dinner::
1213
1213
1214 hg book -m turkey dinner
1214 hg book -m turkey dinner
1215
1215
1216 - move the '@' bookmark from another branch::
1216 - move the '@' bookmark from another branch::
1217
1217
1218 hg book -f @
1218 hg book -f @
1219
1219
1220 - print only the active bookmark name::
1220 - print only the active bookmark name::
1221
1221
1222 hg book -ql .
1222 hg book -ql .
1223 '''
1223 '''
1224 opts = pycompat.byteskwargs(opts)
1224 opts = pycompat.byteskwargs(opts)
1225 force = opts.get(b'force')
1225 force = opts.get(b'force')
1226 rev = opts.get(b'rev')
1226 rev = opts.get(b'rev')
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228
1228
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1229 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 if action:
1230 if action:
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1231 cmdutil.check_incompatible_arguments(opts, action, b'rev')
1232 elif names or rev:
1232 elif names or rev:
1233 action = b'add'
1233 action = b'add'
1234 elif inactive:
1234 elif inactive:
1235 action = b'inactive' # meaning deactivate
1235 action = b'inactive' # meaning deactivate
1236 else:
1236 else:
1237 action = b'list'
1237 action = b'list'
1238
1238
1239 if inactive and action in {b'delete', b'list'}:
1239 cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
1240 raise error.Abort(_(b"--inactive is incompatible with --%s") % action)
1241 if not names and action in {b'add', b'delete'}:
1240 if not names and action in {b'add', b'delete'}:
1242 raise error.Abort(_(b"bookmark name required"))
1241 raise error.Abort(_(b"bookmark name required"))
1243
1242
1244 if action in {b'add', b'delete', b'rename', b'inactive'}:
1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1245 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1246 if action == b'delete':
1245 if action == b'delete':
1247 names = pycompat.maplist(repo._bookmarks.expandname, names)
1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1248 bookmarks.delete(repo, tr, names)
1247 bookmarks.delete(repo, tr, names)
1249 elif action == b'rename':
1248 elif action == b'rename':
1250 if not names:
1249 if not names:
1251 raise error.Abort(_(b"new bookmark name required"))
1250 raise error.Abort(_(b"new bookmark name required"))
1252 elif len(names) > 1:
1251 elif len(names) > 1:
1253 raise error.Abort(_(b"only one new bookmark name allowed"))
1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1254 oldname = repo._bookmarks.expandname(opts[b'rename'])
1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1255 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1256 elif action == b'add':
1255 elif action == b'add':
1257 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1258 elif action == b'inactive':
1257 elif action == b'inactive':
1259 if len(repo._bookmarks) == 0:
1258 if len(repo._bookmarks) == 0:
1260 ui.status(_(b"no bookmarks set\n"))
1259 ui.status(_(b"no bookmarks set\n"))
1261 elif not repo._activebookmark:
1260 elif not repo._activebookmark:
1262 ui.status(_(b"no active bookmark\n"))
1261 ui.status(_(b"no active bookmark\n"))
1263 else:
1262 else:
1264 bookmarks.deactivate(repo)
1263 bookmarks.deactivate(repo)
1265 elif action == b'list':
1264 elif action == b'list':
1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 with ui.formatter(b'bookmarks', opts) as fm:
1266 with ui.formatter(b'bookmarks', opts) as fm:
1268 bookmarks.printbookmarks(ui, repo, fm, names)
1267 bookmarks.printbookmarks(ui, repo, fm, names)
1269 else:
1268 else:
1270 raise error.ProgrammingError(b'invalid action: %s' % action)
1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1271
1270
1272
1271
1273 @command(
1272 @command(
1274 b'branch',
1273 b'branch',
1275 [
1274 [
1276 (
1275 (
1277 b'f',
1276 b'f',
1278 b'force',
1277 b'force',
1279 None,
1278 None,
1280 _(b'set branch name even if it shadows an existing branch'),
1279 _(b'set branch name even if it shadows an existing branch'),
1281 ),
1280 ),
1282 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1283 (
1282 (
1284 b'r',
1283 b'r',
1285 b'rev',
1284 b'rev',
1286 [],
1285 [],
1287 _(b'change branches of the given revs (EXPERIMENTAL)'),
1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1288 ),
1287 ),
1289 ],
1288 ],
1290 _(b'[-fC] [NAME]'),
1289 _(b'[-fC] [NAME]'),
1291 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1292 )
1291 )
1293 def branch(ui, repo, label=None, **opts):
1292 def branch(ui, repo, label=None, **opts):
1294 """set or show the current branch name
1293 """set or show the current branch name
1295
1294
1296 .. note::
1295 .. note::
1297
1296
1298 Branch names are permanent and global. Use :hg:`bookmark` to create a
1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1299 light-weight bookmark instead. See :hg:`help glossary` for more
1298 light-weight bookmark instead. See :hg:`help glossary` for more
1300 information about named branches and bookmarks.
1299 information about named branches and bookmarks.
1301
1300
1302 With no argument, show the current branch name. With one argument,
1301 With no argument, show the current branch name. With one argument,
1303 set the working directory branch name (the branch will not exist
1302 set the working directory branch name (the branch will not exist
1304 in the repository until the next commit). Standard practice
1303 in the repository until the next commit). Standard practice
1305 recommends that primary development take place on the 'default'
1304 recommends that primary development take place on the 'default'
1306 branch.
1305 branch.
1307
1306
1308 Unless -f/--force is specified, branch will not let you set a
1307 Unless -f/--force is specified, branch will not let you set a
1309 branch name that already exists.
1308 branch name that already exists.
1310
1309
1311 Use -C/--clean to reset the working directory branch to that of
1310 Use -C/--clean to reset the working directory branch to that of
1312 the parent of the working directory, negating a previous branch
1311 the parent of the working directory, negating a previous branch
1313 change.
1312 change.
1314
1313
1315 Use the command :hg:`update` to switch to an existing branch. Use
1314 Use the command :hg:`update` to switch to an existing branch. Use
1316 :hg:`commit --close-branch` to mark this branch head as closed.
1315 :hg:`commit --close-branch` to mark this branch head as closed.
1317 When all heads of a branch are closed, the branch will be
1316 When all heads of a branch are closed, the branch will be
1318 considered closed.
1317 considered closed.
1319
1318
1320 Returns 0 on success.
1319 Returns 0 on success.
1321 """
1320 """
1322 opts = pycompat.byteskwargs(opts)
1321 opts = pycompat.byteskwargs(opts)
1323 revs = opts.get(b'rev')
1322 revs = opts.get(b'rev')
1324 if label:
1323 if label:
1325 label = label.strip()
1324 label = label.strip()
1326
1325
1327 if not opts.get(b'clean') and not label:
1326 if not opts.get(b'clean') and not label:
1328 if revs:
1327 if revs:
1329 raise error.Abort(_(b"no branch name specified for the revisions"))
1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1330 ui.write(b"%s\n" % repo.dirstate.branch())
1329 ui.write(b"%s\n" % repo.dirstate.branch())
1331 return
1330 return
1332
1331
1333 with repo.wlock():
1332 with repo.wlock():
1334 if opts.get(b'clean'):
1333 if opts.get(b'clean'):
1335 label = repo[b'.'].branch()
1334 label = repo[b'.'].branch()
1336 repo.dirstate.setbranch(label)
1335 repo.dirstate.setbranch(label)
1337 ui.status(_(b'reset working directory to branch %s\n') % label)
1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1338 elif label:
1337 elif label:
1339
1338
1340 scmutil.checknewlabel(repo, label, b'branch')
1339 scmutil.checknewlabel(repo, label, b'branch')
1341 if revs:
1340 if revs:
1342 return cmdutil.changebranch(ui, repo, revs, label)
1341 return cmdutil.changebranch(ui, repo, revs, label)
1343
1342
1344 if not opts.get(b'force') and label in repo.branchmap():
1343 if not opts.get(b'force') and label in repo.branchmap():
1345 if label not in [p.branch() for p in repo[None].parents()]:
1344 if label not in [p.branch() for p in repo[None].parents()]:
1346 raise error.Abort(
1345 raise error.Abort(
1347 _(b'a branch of the same name already exists'),
1346 _(b'a branch of the same name already exists'),
1348 # i18n: "it" refers to an existing branch
1347 # i18n: "it" refers to an existing branch
1349 hint=_(b"use 'hg update' to switch to it"),
1348 hint=_(b"use 'hg update' to switch to it"),
1350 )
1349 )
1351
1350
1352 repo.dirstate.setbranch(label)
1351 repo.dirstate.setbranch(label)
1353 ui.status(_(b'marked working directory as branch %s\n') % label)
1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1354
1353
1355 # find any open named branches aside from default
1354 # find any open named branches aside from default
1356 for n, h, t, c in repo.branchmap().iterbranches():
1355 for n, h, t, c in repo.branchmap().iterbranches():
1357 if n != b"default" and not c:
1356 if n != b"default" and not c:
1358 return 0
1357 return 0
1359 ui.status(
1358 ui.status(
1360 _(
1359 _(
1361 b'(branches are permanent and global, '
1360 b'(branches are permanent and global, '
1362 b'did you want a bookmark?)\n'
1361 b'did you want a bookmark?)\n'
1363 )
1362 )
1364 )
1363 )
1365
1364
1366
1365
1367 @command(
1366 @command(
1368 b'branches',
1367 b'branches',
1369 [
1368 [
1370 (
1369 (
1371 b'a',
1370 b'a',
1372 b'active',
1371 b'active',
1373 False,
1372 False,
1374 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1375 ),
1374 ),
1376 (b'c', b'closed', False, _(b'show normal and closed branches')),
1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1377 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1378 ]
1377 ]
1379 + formatteropts,
1378 + formatteropts,
1380 _(b'[-c]'),
1379 _(b'[-c]'),
1381 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1382 intents={INTENT_READONLY},
1381 intents={INTENT_READONLY},
1383 )
1382 )
1384 def branches(ui, repo, active=False, closed=False, **opts):
1383 def branches(ui, repo, active=False, closed=False, **opts):
1385 """list repository named branches
1384 """list repository named branches
1386
1385
1387 List the repository's named branches, indicating which ones are
1386 List the repository's named branches, indicating which ones are
1388 inactive. If -c/--closed is specified, also list branches which have
1387 inactive. If -c/--closed is specified, also list branches which have
1389 been marked closed (see :hg:`commit --close-branch`).
1388 been marked closed (see :hg:`commit --close-branch`).
1390
1389
1391 Use the command :hg:`update` to switch to an existing branch.
1390 Use the command :hg:`update` to switch to an existing branch.
1392
1391
1393 .. container:: verbose
1392 .. container:: verbose
1394
1393
1395 Template:
1394 Template:
1396
1395
1397 The following keywords are supported in addition to the common template
1396 The following keywords are supported in addition to the common template
1398 keywords and functions such as ``{branch}``. See also
1397 keywords and functions such as ``{branch}``. See also
1399 :hg:`help templates`.
1398 :hg:`help templates`.
1400
1399
1401 :active: Boolean. True if the branch is active.
1400 :active: Boolean. True if the branch is active.
1402 :closed: Boolean. True if the branch is closed.
1401 :closed: Boolean. True if the branch is closed.
1403 :current: Boolean. True if it is the current branch.
1402 :current: Boolean. True if it is the current branch.
1404
1403
1405 Returns 0.
1404 Returns 0.
1406 """
1405 """
1407
1406
1408 opts = pycompat.byteskwargs(opts)
1407 opts = pycompat.byteskwargs(opts)
1409 revs = opts.get(b'rev')
1408 revs = opts.get(b'rev')
1410 selectedbranches = None
1409 selectedbranches = None
1411 if revs:
1410 if revs:
1412 revs = scmutil.revrange(repo, revs)
1411 revs = scmutil.revrange(repo, revs)
1413 getbi = repo.revbranchcache().branchinfo
1412 getbi = repo.revbranchcache().branchinfo
1414 selectedbranches = {getbi(r)[0] for r in revs}
1413 selectedbranches = {getbi(r)[0] for r in revs}
1415
1414
1416 ui.pager(b'branches')
1415 ui.pager(b'branches')
1417 fm = ui.formatter(b'branches', opts)
1416 fm = ui.formatter(b'branches', opts)
1418 hexfunc = fm.hexfunc
1417 hexfunc = fm.hexfunc
1419
1418
1420 allheads = set(repo.heads())
1419 allheads = set(repo.heads())
1421 branches = []
1420 branches = []
1422 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1423 if selectedbranches is not None and tag not in selectedbranches:
1422 if selectedbranches is not None and tag not in selectedbranches:
1424 continue
1423 continue
1425 isactive = False
1424 isactive = False
1426 if not isclosed:
1425 if not isclosed:
1427 openheads = set(repo.branchmap().iteropen(heads))
1426 openheads = set(repo.branchmap().iteropen(heads))
1428 isactive = bool(openheads & allheads)
1427 isactive = bool(openheads & allheads)
1429 branches.append((tag, repo[tip], isactive, not isclosed))
1428 branches.append((tag, repo[tip], isactive, not isclosed))
1430 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1431
1430
1432 for tag, ctx, isactive, isopen in branches:
1431 for tag, ctx, isactive, isopen in branches:
1433 if active and not isactive:
1432 if active and not isactive:
1434 continue
1433 continue
1435 if isactive:
1434 if isactive:
1436 label = b'branches.active'
1435 label = b'branches.active'
1437 notice = b''
1436 notice = b''
1438 elif not isopen:
1437 elif not isopen:
1439 if not closed:
1438 if not closed:
1440 continue
1439 continue
1441 label = b'branches.closed'
1440 label = b'branches.closed'
1442 notice = _(b' (closed)')
1441 notice = _(b' (closed)')
1443 else:
1442 else:
1444 label = b'branches.inactive'
1443 label = b'branches.inactive'
1445 notice = _(b' (inactive)')
1444 notice = _(b' (inactive)')
1446 current = tag == repo.dirstate.branch()
1445 current = tag == repo.dirstate.branch()
1447 if current:
1446 if current:
1448 label = b'branches.current'
1447 label = b'branches.current'
1449
1448
1450 fm.startitem()
1449 fm.startitem()
1451 fm.write(b'branch', b'%s', tag, label=label)
1450 fm.write(b'branch', b'%s', tag, label=label)
1452 rev = ctx.rev()
1451 rev = ctx.rev()
1453 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1454 fmt = b' ' * padsize + b' %d:%s'
1453 fmt = b' ' * padsize + b' %d:%s'
1455 fm.condwrite(
1454 fm.condwrite(
1456 not ui.quiet,
1455 not ui.quiet,
1457 b'rev node',
1456 b'rev node',
1458 fmt,
1457 fmt,
1459 rev,
1458 rev,
1460 hexfunc(ctx.node()),
1459 hexfunc(ctx.node()),
1461 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1462 )
1461 )
1463 fm.context(ctx=ctx)
1462 fm.context(ctx=ctx)
1464 fm.data(active=isactive, closed=not isopen, current=current)
1463 fm.data(active=isactive, closed=not isopen, current=current)
1465 if not ui.quiet:
1464 if not ui.quiet:
1466 fm.plain(notice)
1465 fm.plain(notice)
1467 fm.plain(b'\n')
1466 fm.plain(b'\n')
1468 fm.end()
1467 fm.end()
1469
1468
1470
1469
1471 @command(
1470 @command(
1472 b'bundle',
1471 b'bundle',
1473 [
1472 [
1474 (
1473 (
1475 b'f',
1474 b'f',
1476 b'force',
1475 b'force',
1477 None,
1476 None,
1478 _(b'run even when the destination is unrelated'),
1477 _(b'run even when the destination is unrelated'),
1479 ),
1478 ),
1480 (
1479 (
1481 b'r',
1480 b'r',
1482 b'rev',
1481 b'rev',
1483 [],
1482 [],
1484 _(b'a changeset intended to be added to the destination'),
1483 _(b'a changeset intended to be added to the destination'),
1485 _(b'REV'),
1484 _(b'REV'),
1486 ),
1485 ),
1487 (
1486 (
1488 b'b',
1487 b'b',
1489 b'branch',
1488 b'branch',
1490 [],
1489 [],
1491 _(b'a specific branch you would like to bundle'),
1490 _(b'a specific branch you would like to bundle'),
1492 _(b'BRANCH'),
1491 _(b'BRANCH'),
1493 ),
1492 ),
1494 (
1493 (
1495 b'',
1494 b'',
1496 b'base',
1495 b'base',
1497 [],
1496 [],
1498 _(b'a base changeset assumed to be available at the destination'),
1497 _(b'a base changeset assumed to be available at the destination'),
1499 _(b'REV'),
1498 _(b'REV'),
1500 ),
1499 ),
1501 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1502 (
1501 (
1503 b't',
1502 b't',
1504 b'type',
1503 b'type',
1505 b'bzip2',
1504 b'bzip2',
1506 _(b'bundle compression type to use'),
1505 _(b'bundle compression type to use'),
1507 _(b'TYPE'),
1506 _(b'TYPE'),
1508 ),
1507 ),
1509 ]
1508 ]
1510 + remoteopts,
1509 + remoteopts,
1511 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1512 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1513 )
1512 )
1514 def bundle(ui, repo, fname, dest=None, **opts):
1513 def bundle(ui, repo, fname, dest=None, **opts):
1515 """create a bundle file
1514 """create a bundle file
1516
1515
1517 Generate a bundle file containing data to be transferred to another
1516 Generate a bundle file containing data to be transferred to another
1518 repository.
1517 repository.
1519
1518
1520 To create a bundle containing all changesets, use -a/--all
1519 To create a bundle containing all changesets, use -a/--all
1521 (or --base null). Otherwise, hg assumes the destination will have
1520 (or --base null). Otherwise, hg assumes the destination will have
1522 all the nodes you specify with --base parameters. Otherwise, hg
1521 all the nodes you specify with --base parameters. Otherwise, hg
1523 will assume the repository has all the nodes in destination, or
1522 will assume the repository has all the nodes in destination, or
1524 default-push/default if no destination is specified, where destination
1523 default-push/default if no destination is specified, where destination
1525 is the repository you provide through DEST option.
1524 is the repository you provide through DEST option.
1526
1525
1527 You can change bundle format with the -t/--type option. See
1526 You can change bundle format with the -t/--type option. See
1528 :hg:`help bundlespec` for documentation on this format. By default,
1527 :hg:`help bundlespec` for documentation on this format. By default,
1529 the most appropriate format is used and compression defaults to
1528 the most appropriate format is used and compression defaults to
1530 bzip2.
1529 bzip2.
1531
1530
1532 The bundle file can then be transferred using conventional means
1531 The bundle file can then be transferred using conventional means
1533 and applied to another repository with the unbundle or pull
1532 and applied to another repository with the unbundle or pull
1534 command. This is useful when direct push and pull are not
1533 command. This is useful when direct push and pull are not
1535 available or when exporting an entire repository is undesirable.
1534 available or when exporting an entire repository is undesirable.
1536
1535
1537 Applying bundles preserves all changeset contents including
1536 Applying bundles preserves all changeset contents including
1538 permissions, copy/rename information, and revision history.
1537 permissions, copy/rename information, and revision history.
1539
1538
1540 Returns 0 on success, 1 if no changes found.
1539 Returns 0 on success, 1 if no changes found.
1541 """
1540 """
1542 opts = pycompat.byteskwargs(opts)
1541 opts = pycompat.byteskwargs(opts)
1543 revs = None
1542 revs = None
1544 if b'rev' in opts:
1543 if b'rev' in opts:
1545 revstrings = opts[b'rev']
1544 revstrings = opts[b'rev']
1546 revs = scmutil.revrange(repo, revstrings)
1545 revs = scmutil.revrange(repo, revstrings)
1547 if revstrings and not revs:
1546 if revstrings and not revs:
1548 raise error.Abort(_(b'no commits to bundle'))
1547 raise error.Abort(_(b'no commits to bundle'))
1549
1548
1550 bundletype = opts.get(b'type', b'bzip2').lower()
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1551 try:
1550 try:
1552 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1553 except error.UnsupportedBundleSpecification as e:
1552 except error.UnsupportedBundleSpecification as e:
1554 raise error.Abort(
1553 raise error.Abort(
1555 pycompat.bytestr(e),
1554 pycompat.bytestr(e),
1556 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1557 )
1556 )
1558 cgversion = bundlespec.contentopts[b"cg.version"]
1557 cgversion = bundlespec.contentopts[b"cg.version"]
1559
1558
1560 # Packed bundles are a pseudo bundle format for now.
1559 # Packed bundles are a pseudo bundle format for now.
1561 if cgversion == b's1':
1560 if cgversion == b's1':
1562 raise error.Abort(
1561 raise error.Abort(
1563 _(b'packed bundles cannot be produced by "hg bundle"'),
1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1564 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1565 )
1564 )
1566
1565
1567 if opts.get(b'all'):
1566 if opts.get(b'all'):
1568 if dest:
1567 if dest:
1569 raise error.Abort(
1568 raise error.Abort(
1570 _(b"--all is incompatible with specifying a destination")
1569 _(b"--all is incompatible with specifying a destination")
1571 )
1570 )
1572 if opts.get(b'base'):
1571 if opts.get(b'base'):
1573 ui.warn(_(b"ignoring --base because --all was specified\n"))
1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1574 base = [nullrev]
1573 base = [nullrev]
1575 else:
1574 else:
1576 base = scmutil.revrange(repo, opts.get(b'base'))
1575 base = scmutil.revrange(repo, opts.get(b'base'))
1577 if cgversion not in changegroup.supportedoutgoingversions(repo):
1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1578 raise error.Abort(
1577 raise error.Abort(
1579 _(b"repository does not support bundle version %s") % cgversion
1578 _(b"repository does not support bundle version %s") % cgversion
1580 )
1579 )
1581
1580
1582 if base:
1581 if base:
1583 if dest:
1582 if dest:
1584 raise error.Abort(
1583 raise error.Abort(
1585 _(b"--base is incompatible with specifying a destination")
1584 _(b"--base is incompatible with specifying a destination")
1586 )
1585 )
1587 common = [repo[rev].node() for rev in base]
1586 common = [repo[rev].node() for rev in base]
1588 heads = [repo[r].node() for r in revs] if revs else None
1587 heads = [repo[r].node() for r in revs] if revs else None
1589 outgoing = discovery.outgoing(repo, common, heads)
1588 outgoing = discovery.outgoing(repo, common, heads)
1590 else:
1589 else:
1591 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1592 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1593 other = hg.peer(repo, opts, dest)
1592 other = hg.peer(repo, opts, dest)
1594 revs = [repo[r].hex() for r in revs]
1593 revs = [repo[r].hex() for r in revs]
1595 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1596 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1597 outgoing = discovery.findcommonoutgoing(
1596 outgoing = discovery.findcommonoutgoing(
1598 repo,
1597 repo,
1599 other,
1598 other,
1600 onlyheads=heads,
1599 onlyheads=heads,
1601 force=opts.get(b'force'),
1600 force=opts.get(b'force'),
1602 portable=True,
1601 portable=True,
1603 )
1602 )
1604
1603
1605 if not outgoing.missing:
1604 if not outgoing.missing:
1606 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1607 return 1
1606 return 1
1608
1607
1609 if cgversion == b'01': # bundle1
1608 if cgversion == b'01': # bundle1
1610 bversion = b'HG10' + bundlespec.wirecompression
1609 bversion = b'HG10' + bundlespec.wirecompression
1611 bcompression = None
1610 bcompression = None
1612 elif cgversion in (b'02', b'03'):
1611 elif cgversion in (b'02', b'03'):
1613 bversion = b'HG20'
1612 bversion = b'HG20'
1614 bcompression = bundlespec.wirecompression
1613 bcompression = bundlespec.wirecompression
1615 else:
1614 else:
1616 raise error.ProgrammingError(
1615 raise error.ProgrammingError(
1617 b'bundle: unexpected changegroup version %s' % cgversion
1616 b'bundle: unexpected changegroup version %s' % cgversion
1618 )
1617 )
1619
1618
1620 # TODO compression options should be derived from bundlespec parsing.
1619 # TODO compression options should be derived from bundlespec parsing.
1621 # This is a temporary hack to allow adjusting bundle compression
1620 # This is a temporary hack to allow adjusting bundle compression
1622 # level without a) formalizing the bundlespec changes to declare it
1621 # level without a) formalizing the bundlespec changes to declare it
1623 # b) introducing a command flag.
1622 # b) introducing a command flag.
1624 compopts = {}
1623 compopts = {}
1625 complevel = ui.configint(
1624 complevel = ui.configint(
1626 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1627 )
1626 )
1628 if complevel is None:
1627 if complevel is None:
1629 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1630 if complevel is not None:
1629 if complevel is not None:
1631 compopts[b'level'] = complevel
1630 compopts[b'level'] = complevel
1632
1631
1633 # Allow overriding the bundling of obsmarker in phases through
1632 # Allow overriding the bundling of obsmarker in phases through
1634 # configuration while we don't have a bundle version that include them
1633 # configuration while we don't have a bundle version that include them
1635 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1636 bundlespec.contentopts[b'obsolescence'] = True
1635 bundlespec.contentopts[b'obsolescence'] = True
1637 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1638 bundlespec.contentopts[b'phases'] = True
1637 bundlespec.contentopts[b'phases'] = True
1639
1638
1640 bundle2.writenewbundle(
1639 bundle2.writenewbundle(
1641 ui,
1640 ui,
1642 repo,
1641 repo,
1643 b'bundle',
1642 b'bundle',
1644 fname,
1643 fname,
1645 bversion,
1644 bversion,
1646 outgoing,
1645 outgoing,
1647 bundlespec.contentopts,
1646 bundlespec.contentopts,
1648 compression=bcompression,
1647 compression=bcompression,
1649 compopts=compopts,
1648 compopts=compopts,
1650 )
1649 )
1651
1650
1652
1651
1653 @command(
1652 @command(
1654 b'cat',
1653 b'cat',
1655 [
1654 [
1656 (
1655 (
1657 b'o',
1656 b'o',
1658 b'output',
1657 b'output',
1659 b'',
1658 b'',
1660 _(b'print output to file with formatted name'),
1659 _(b'print output to file with formatted name'),
1661 _(b'FORMAT'),
1660 _(b'FORMAT'),
1662 ),
1661 ),
1663 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1664 (b'', b'decode', None, _(b'apply any matching decode filter')),
1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1665 ]
1664 ]
1666 + walkopts
1665 + walkopts
1667 + formatteropts,
1666 + formatteropts,
1668 _(b'[OPTION]... FILE...'),
1667 _(b'[OPTION]... FILE...'),
1669 helpcategory=command.CATEGORY_FILE_CONTENTS,
1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1670 inferrepo=True,
1669 inferrepo=True,
1671 intents={INTENT_READONLY},
1670 intents={INTENT_READONLY},
1672 )
1671 )
1673 def cat(ui, repo, file1, *pats, **opts):
1672 def cat(ui, repo, file1, *pats, **opts):
1674 """output the current or given revision of files
1673 """output the current or given revision of files
1675
1674
1676 Print the specified files as they were at the given revision. If
1675 Print the specified files as they were at the given revision. If
1677 no revision is given, the parent of the working directory is used.
1676 no revision is given, the parent of the working directory is used.
1678
1677
1679 Output may be to a file, in which case the name of the file is
1678 Output may be to a file, in which case the name of the file is
1680 given using a template string. See :hg:`help templates`. In addition
1679 given using a template string. See :hg:`help templates`. In addition
1681 to the common template keywords, the following formatting rules are
1680 to the common template keywords, the following formatting rules are
1682 supported:
1681 supported:
1683
1682
1684 :``%%``: literal "%" character
1683 :``%%``: literal "%" character
1685 :``%s``: basename of file being printed
1684 :``%s``: basename of file being printed
1686 :``%d``: dirname of file being printed, or '.' if in repository root
1685 :``%d``: dirname of file being printed, or '.' if in repository root
1687 :``%p``: root-relative path name of file being printed
1686 :``%p``: root-relative path name of file being printed
1688 :``%H``: changeset hash (40 hexadecimal digits)
1687 :``%H``: changeset hash (40 hexadecimal digits)
1689 :``%R``: changeset revision number
1688 :``%R``: changeset revision number
1690 :``%h``: short-form changeset hash (12 hexadecimal digits)
1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1691 :``%r``: zero-padded changeset revision number
1690 :``%r``: zero-padded changeset revision number
1692 :``%b``: basename of the exporting repository
1691 :``%b``: basename of the exporting repository
1693 :``\\``: literal "\\" character
1692 :``\\``: literal "\\" character
1694
1693
1695 .. container:: verbose
1694 .. container:: verbose
1696
1695
1697 Template:
1696 Template:
1698
1697
1699 The following keywords are supported in addition to the common template
1698 The following keywords are supported in addition to the common template
1700 keywords and functions. See also :hg:`help templates`.
1699 keywords and functions. See also :hg:`help templates`.
1701
1700
1702 :data: String. File content.
1701 :data: String. File content.
1703 :path: String. Repository-absolute path of the file.
1702 :path: String. Repository-absolute path of the file.
1704
1703
1705 Returns 0 on success.
1704 Returns 0 on success.
1706 """
1705 """
1707 opts = pycompat.byteskwargs(opts)
1706 opts = pycompat.byteskwargs(opts)
1708 rev = opts.get(b'rev')
1707 rev = opts.get(b'rev')
1709 if rev:
1708 if rev:
1710 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1711 ctx = scmutil.revsingle(repo, rev)
1710 ctx = scmutil.revsingle(repo, rev)
1712 m = scmutil.match(ctx, (file1,) + pats, opts)
1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1713 fntemplate = opts.pop(b'output', b'')
1712 fntemplate = opts.pop(b'output', b'')
1714 if cmdutil.isstdiofilename(fntemplate):
1713 if cmdutil.isstdiofilename(fntemplate):
1715 fntemplate = b''
1714 fntemplate = b''
1716
1715
1717 if fntemplate:
1716 if fntemplate:
1718 fm = formatter.nullformatter(ui, b'cat', opts)
1717 fm = formatter.nullformatter(ui, b'cat', opts)
1719 else:
1718 else:
1720 ui.pager(b'cat')
1719 ui.pager(b'cat')
1721 fm = ui.formatter(b'cat', opts)
1720 fm = ui.formatter(b'cat', opts)
1722 with fm:
1721 with fm:
1723 return cmdutil.cat(
1722 return cmdutil.cat(
1724 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1725 )
1724 )
1726
1725
1727
1726
1728 @command(
1727 @command(
1729 b'clone',
1728 b'clone',
1730 [
1729 [
1731 (
1730 (
1732 b'U',
1731 b'U',
1733 b'noupdate',
1732 b'noupdate',
1734 None,
1733 None,
1735 _(
1734 _(
1736 b'the clone will include an empty working '
1735 b'the clone will include an empty working '
1737 b'directory (only a repository)'
1736 b'directory (only a repository)'
1738 ),
1737 ),
1739 ),
1738 ),
1740 (
1739 (
1741 b'u',
1740 b'u',
1742 b'updaterev',
1741 b'updaterev',
1743 b'',
1742 b'',
1744 _(b'revision, tag, or branch to check out'),
1743 _(b'revision, tag, or branch to check out'),
1745 _(b'REV'),
1744 _(b'REV'),
1746 ),
1745 ),
1747 (
1746 (
1748 b'r',
1747 b'r',
1749 b'rev',
1748 b'rev',
1750 [],
1749 [],
1751 _(
1750 _(
1752 b'do not clone everything, but include this changeset'
1751 b'do not clone everything, but include this changeset'
1753 b' and its ancestors'
1752 b' and its ancestors'
1754 ),
1753 ),
1755 _(b'REV'),
1754 _(b'REV'),
1756 ),
1755 ),
1757 (
1756 (
1758 b'b',
1757 b'b',
1759 b'branch',
1758 b'branch',
1760 [],
1759 [],
1761 _(
1760 _(
1762 b'do not clone everything, but include this branch\'s'
1761 b'do not clone everything, but include this branch\'s'
1763 b' changesets and their ancestors'
1762 b' changesets and their ancestors'
1764 ),
1763 ),
1765 _(b'BRANCH'),
1764 _(b'BRANCH'),
1766 ),
1765 ),
1767 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1768 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1769 (b'', b'stream', None, _(b'clone with minimal data processing')),
1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1770 ]
1769 ]
1771 + remoteopts,
1770 + remoteopts,
1772 _(b'[OPTION]... SOURCE [DEST]'),
1771 _(b'[OPTION]... SOURCE [DEST]'),
1773 helpcategory=command.CATEGORY_REPO_CREATION,
1772 helpcategory=command.CATEGORY_REPO_CREATION,
1774 helpbasic=True,
1773 helpbasic=True,
1775 norepo=True,
1774 norepo=True,
1776 )
1775 )
1777 def clone(ui, source, dest=None, **opts):
1776 def clone(ui, source, dest=None, **opts):
1778 """make a copy of an existing repository
1777 """make a copy of an existing repository
1779
1778
1780 Create a copy of an existing repository in a new directory.
1779 Create a copy of an existing repository in a new directory.
1781
1780
1782 If no destination directory name is specified, it defaults to the
1781 If no destination directory name is specified, it defaults to the
1783 basename of the source.
1782 basename of the source.
1784
1783
1785 The location of the source is added to the new repository's
1784 The location of the source is added to the new repository's
1786 ``.hg/hgrc`` file, as the default to be used for future pulls.
1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1787
1786
1788 Only local paths and ``ssh://`` URLs are supported as
1787 Only local paths and ``ssh://`` URLs are supported as
1789 destinations. For ``ssh://`` destinations, no working directory or
1788 destinations. For ``ssh://`` destinations, no working directory or
1790 ``.hg/hgrc`` will be created on the remote side.
1789 ``.hg/hgrc`` will be created on the remote side.
1791
1790
1792 If the source repository has a bookmark called '@' set, that
1791 If the source repository has a bookmark called '@' set, that
1793 revision will be checked out in the new repository by default.
1792 revision will be checked out in the new repository by default.
1794
1793
1795 To check out a particular version, use -u/--update, or
1794 To check out a particular version, use -u/--update, or
1796 -U/--noupdate to create a clone with no working directory.
1795 -U/--noupdate to create a clone with no working directory.
1797
1796
1798 To pull only a subset of changesets, specify one or more revisions
1797 To pull only a subset of changesets, specify one or more revisions
1799 identifiers with -r/--rev or branches with -b/--branch. The
1798 identifiers with -r/--rev or branches with -b/--branch. The
1800 resulting clone will contain only the specified changesets and
1799 resulting clone will contain only the specified changesets and
1801 their ancestors. These options (or 'clone src#rev dest') imply
1800 their ancestors. These options (or 'clone src#rev dest') imply
1802 --pull, even for local source repositories.
1801 --pull, even for local source repositories.
1803
1802
1804 In normal clone mode, the remote normalizes repository data into a common
1803 In normal clone mode, the remote normalizes repository data into a common
1805 exchange format and the receiving end translates this data into its local
1804 exchange format and the receiving end translates this data into its local
1806 storage format. --stream activates a different clone mode that essentially
1805 storage format. --stream activates a different clone mode that essentially
1807 copies repository files from the remote with minimal data processing. This
1806 copies repository files from the remote with minimal data processing. This
1808 significantly reduces the CPU cost of a clone both remotely and locally.
1807 significantly reduces the CPU cost of a clone both remotely and locally.
1809 However, it often increases the transferred data size by 30-40%. This can
1808 However, it often increases the transferred data size by 30-40%. This can
1810 result in substantially faster clones where I/O throughput is plentiful,
1809 result in substantially faster clones where I/O throughput is plentiful,
1811 especially for larger repositories. A side-effect of --stream clones is
1810 especially for larger repositories. A side-effect of --stream clones is
1812 that storage settings and requirements on the remote are applied locally:
1811 that storage settings and requirements on the remote are applied locally:
1813 a modern client may inherit legacy or inefficient storage used by the
1812 a modern client may inherit legacy or inefficient storage used by the
1814 remote or a legacy Mercurial client may not be able to clone from a
1813 remote or a legacy Mercurial client may not be able to clone from a
1815 modern Mercurial remote.
1814 modern Mercurial remote.
1816
1815
1817 .. note::
1816 .. note::
1818
1817
1819 Specifying a tag will include the tagged changeset but not the
1818 Specifying a tag will include the tagged changeset but not the
1820 changeset containing the tag.
1819 changeset containing the tag.
1821
1820
1822 .. container:: verbose
1821 .. container:: verbose
1823
1822
1824 For efficiency, hardlinks are used for cloning whenever the
1823 For efficiency, hardlinks are used for cloning whenever the
1825 source and destination are on the same filesystem (note this
1824 source and destination are on the same filesystem (note this
1826 applies only to the repository data, not to the working
1825 applies only to the repository data, not to the working
1827 directory). Some filesystems, such as AFS, implement hardlinking
1826 directory). Some filesystems, such as AFS, implement hardlinking
1828 incorrectly, but do not report errors. In these cases, use the
1827 incorrectly, but do not report errors. In these cases, use the
1829 --pull option to avoid hardlinking.
1828 --pull option to avoid hardlinking.
1830
1829
1831 Mercurial will update the working directory to the first applicable
1830 Mercurial will update the working directory to the first applicable
1832 revision from this list:
1831 revision from this list:
1833
1832
1834 a) null if -U or the source repository has no changesets
1833 a) null if -U or the source repository has no changesets
1835 b) if -u . and the source repository is local, the first parent of
1834 b) if -u . and the source repository is local, the first parent of
1836 the source repository's working directory
1835 the source repository's working directory
1837 c) the changeset specified with -u (if a branch name, this means the
1836 c) the changeset specified with -u (if a branch name, this means the
1838 latest head of that branch)
1837 latest head of that branch)
1839 d) the changeset specified with -r
1838 d) the changeset specified with -r
1840 e) the tipmost head specified with -b
1839 e) the tipmost head specified with -b
1841 f) the tipmost head specified with the url#branch source syntax
1840 f) the tipmost head specified with the url#branch source syntax
1842 g) the revision marked with the '@' bookmark, if present
1841 g) the revision marked with the '@' bookmark, if present
1843 h) the tipmost head of the default branch
1842 h) the tipmost head of the default branch
1844 i) tip
1843 i) tip
1845
1844
1846 When cloning from servers that support it, Mercurial may fetch
1845 When cloning from servers that support it, Mercurial may fetch
1847 pre-generated data from a server-advertised URL or inline from the
1846 pre-generated data from a server-advertised URL or inline from the
1848 same stream. When this is done, hooks operating on incoming changesets
1847 same stream. When this is done, hooks operating on incoming changesets
1849 and changegroups may fire more than once, once for each pre-generated
1848 and changegroups may fire more than once, once for each pre-generated
1850 bundle and as well as for any additional remaining data. In addition,
1849 bundle and as well as for any additional remaining data. In addition,
1851 if an error occurs, the repository may be rolled back to a partial
1850 if an error occurs, the repository may be rolled back to a partial
1852 clone. This behavior may change in future releases.
1851 clone. This behavior may change in future releases.
1853 See :hg:`help -e clonebundles` for more.
1852 See :hg:`help -e clonebundles` for more.
1854
1853
1855 Examples:
1854 Examples:
1856
1855
1857 - clone a remote repository to a new directory named hg/::
1856 - clone a remote repository to a new directory named hg/::
1858
1857
1859 hg clone https://www.mercurial-scm.org/repo/hg/
1858 hg clone https://www.mercurial-scm.org/repo/hg/
1860
1859
1861 - create a lightweight local clone::
1860 - create a lightweight local clone::
1862
1861
1863 hg clone project/ project-feature/
1862 hg clone project/ project-feature/
1864
1863
1865 - clone from an absolute path on an ssh server (note double-slash)::
1864 - clone from an absolute path on an ssh server (note double-slash)::
1866
1865
1867 hg clone ssh://user@server//home/projects/alpha/
1866 hg clone ssh://user@server//home/projects/alpha/
1868
1867
1869 - do a streaming clone while checking out a specified version::
1868 - do a streaming clone while checking out a specified version::
1870
1869
1871 hg clone --stream http://server/repo -u 1.5
1870 hg clone --stream http://server/repo -u 1.5
1872
1871
1873 - create a repository without changesets after a particular revision::
1872 - create a repository without changesets after a particular revision::
1874
1873
1875 hg clone -r 04e544 experimental/ good/
1874 hg clone -r 04e544 experimental/ good/
1876
1875
1877 - clone (and track) a particular named branch::
1876 - clone (and track) a particular named branch::
1878
1877
1879 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1880
1879
1881 See :hg:`help urls` for details on specifying URLs.
1880 See :hg:`help urls` for details on specifying URLs.
1882
1881
1883 Returns 0 on success.
1882 Returns 0 on success.
1884 """
1883 """
1885 opts = pycompat.byteskwargs(opts)
1884 opts = pycompat.byteskwargs(opts)
1886 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1887
1886
1888 # --include/--exclude can come from narrow or sparse.
1887 # --include/--exclude can come from narrow or sparse.
1889 includepats, excludepats = None, None
1888 includepats, excludepats = None, None
1890
1889
1891 # hg.clone() differentiates between None and an empty set. So make sure
1890 # hg.clone() differentiates between None and an empty set. So make sure
1892 # patterns are sets if narrow is requested without patterns.
1891 # patterns are sets if narrow is requested without patterns.
1893 if opts.get(b'narrow'):
1892 if opts.get(b'narrow'):
1894 includepats = set()
1893 includepats = set()
1895 excludepats = set()
1894 excludepats = set()
1896
1895
1897 if opts.get(b'include'):
1896 if opts.get(b'include'):
1898 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1899 if opts.get(b'exclude'):
1898 if opts.get(b'exclude'):
1900 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1901
1900
1902 r = hg.clone(
1901 r = hg.clone(
1903 ui,
1902 ui,
1904 opts,
1903 opts,
1905 source,
1904 source,
1906 dest,
1905 dest,
1907 pull=opts.get(b'pull'),
1906 pull=opts.get(b'pull'),
1908 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1909 revs=opts.get(b'rev'),
1908 revs=opts.get(b'rev'),
1910 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1911 branch=opts.get(b'branch'),
1910 branch=opts.get(b'branch'),
1912 shareopts=opts.get(b'shareopts'),
1911 shareopts=opts.get(b'shareopts'),
1913 storeincludepats=includepats,
1912 storeincludepats=includepats,
1914 storeexcludepats=excludepats,
1913 storeexcludepats=excludepats,
1915 depth=opts.get(b'depth') or None,
1914 depth=opts.get(b'depth') or None,
1916 )
1915 )
1917
1916
1918 return r is None
1917 return r is None
1919
1918
1920
1919
1921 @command(
1920 @command(
1922 b'commit|ci',
1921 b'commit|ci',
1923 [
1922 [
1924 (
1923 (
1925 b'A',
1924 b'A',
1926 b'addremove',
1925 b'addremove',
1927 None,
1926 None,
1928 _(b'mark new/missing files as added/removed before committing'),
1927 _(b'mark new/missing files as added/removed before committing'),
1929 ),
1928 ),
1930 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1931 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1932 (b's', b'secret', None, _(b'use the secret phase for committing')),
1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1933 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1934 (
1933 (
1935 b'',
1934 b'',
1936 b'force-close-branch',
1935 b'force-close-branch',
1937 None,
1936 None,
1938 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1939 ),
1938 ),
1940 (b'i', b'interactive', None, _(b'use interactive mode')),
1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1941 ]
1940 ]
1942 + walkopts
1941 + walkopts
1943 + commitopts
1942 + commitopts
1944 + commitopts2
1943 + commitopts2
1945 + subrepoopts,
1944 + subrepoopts,
1946 _(b'[OPTION]... [FILE]...'),
1945 _(b'[OPTION]... [FILE]...'),
1947 helpcategory=command.CATEGORY_COMMITTING,
1946 helpcategory=command.CATEGORY_COMMITTING,
1948 helpbasic=True,
1947 helpbasic=True,
1949 inferrepo=True,
1948 inferrepo=True,
1950 )
1949 )
1951 def commit(ui, repo, *pats, **opts):
1950 def commit(ui, repo, *pats, **opts):
1952 """commit the specified files or all outstanding changes
1951 """commit the specified files or all outstanding changes
1953
1952
1954 Commit changes to the given files into the repository. Unlike a
1953 Commit changes to the given files into the repository. Unlike a
1955 centralized SCM, this operation is a local operation. See
1954 centralized SCM, this operation is a local operation. See
1956 :hg:`push` for a way to actively distribute your changes.
1955 :hg:`push` for a way to actively distribute your changes.
1957
1956
1958 If a list of files is omitted, all changes reported by :hg:`status`
1957 If a list of files is omitted, all changes reported by :hg:`status`
1959 will be committed.
1958 will be committed.
1960
1959
1961 If you are committing the result of a merge, do not provide any
1960 If you are committing the result of a merge, do not provide any
1962 filenames or -I/-X filters.
1961 filenames or -I/-X filters.
1963
1962
1964 If no commit message is specified, Mercurial starts your
1963 If no commit message is specified, Mercurial starts your
1965 configured editor where you can enter a message. In case your
1964 configured editor where you can enter a message. In case your
1966 commit fails, you will find a backup of your message in
1965 commit fails, you will find a backup of your message in
1967 ``.hg/last-message.txt``.
1966 ``.hg/last-message.txt``.
1968
1967
1969 The --close-branch flag can be used to mark the current branch
1968 The --close-branch flag can be used to mark the current branch
1970 head closed. When all heads of a branch are closed, the branch
1969 head closed. When all heads of a branch are closed, the branch
1971 will be considered closed and no longer listed.
1970 will be considered closed and no longer listed.
1972
1971
1973 The --amend flag can be used to amend the parent of the
1972 The --amend flag can be used to amend the parent of the
1974 working directory with a new commit that contains the changes
1973 working directory with a new commit that contains the changes
1975 in the parent in addition to those currently reported by :hg:`status`,
1974 in the parent in addition to those currently reported by :hg:`status`,
1976 if there are any. The old commit is stored in a backup bundle in
1975 if there are any. The old commit is stored in a backup bundle in
1977 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1978 on how to restore it).
1977 on how to restore it).
1979
1978
1980 Message, user and date are taken from the amended commit unless
1979 Message, user and date are taken from the amended commit unless
1981 specified. When a message isn't specified on the command line,
1980 specified. When a message isn't specified on the command line,
1982 the editor will open with the message of the amended commit.
1981 the editor will open with the message of the amended commit.
1983
1982
1984 It is not possible to amend public changesets (see :hg:`help phases`)
1983 It is not possible to amend public changesets (see :hg:`help phases`)
1985 or changesets that have children.
1984 or changesets that have children.
1986
1985
1987 See :hg:`help dates` for a list of formats valid for -d/--date.
1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1988
1987
1989 Returns 0 on success, 1 if nothing changed.
1988 Returns 0 on success, 1 if nothing changed.
1990
1989
1991 .. container:: verbose
1990 .. container:: verbose
1992
1991
1993 Examples:
1992 Examples:
1994
1993
1995 - commit all files ending in .py::
1994 - commit all files ending in .py::
1996
1995
1997 hg commit --include "set:**.py"
1996 hg commit --include "set:**.py"
1998
1997
1999 - commit all non-binary files::
1998 - commit all non-binary files::
2000
1999
2001 hg commit --exclude "set:binary()"
2000 hg commit --exclude "set:binary()"
2002
2001
2003 - amend the current commit and set the date to now::
2002 - amend the current commit and set the date to now::
2004
2003
2005 hg commit --amend --date now
2004 hg commit --amend --date now
2006 """
2005 """
2007 with repo.wlock(), repo.lock():
2006 with repo.wlock(), repo.lock():
2008 return _docommit(ui, repo, *pats, **opts)
2007 return _docommit(ui, repo, *pats, **opts)
2009
2008
2010
2009
2011 def _docommit(ui, repo, *pats, **opts):
2010 def _docommit(ui, repo, *pats, **opts):
2012 if opts.get('interactive'):
2011 if opts.get('interactive'):
2013 opts.pop('interactive')
2012 opts.pop('interactive')
2014 ret = cmdutil.dorecord(
2013 ret = cmdutil.dorecord(
2015 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2016 )
2015 )
2017 # ret can be 0 (no changes to record) or the value returned by
2016 # ret can be 0 (no changes to record) or the value returned by
2018 # commit(), 1 if nothing changed or None on success.
2017 # commit(), 1 if nothing changed or None on success.
2019 return 1 if ret == 0 else ret
2018 return 1 if ret == 0 else ret
2020
2019
2021 opts = pycompat.byteskwargs(opts)
2020 opts = pycompat.byteskwargs(opts)
2022 if opts.get(b'subrepos'):
2021 if opts.get(b'subrepos'):
2023 if opts.get(b'amend'):
2022 if opts.get(b'amend'):
2024 raise error.Abort(_(b'cannot amend with --subrepos'))
2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2025 # Let --subrepos on the command line override config setting.
2024 # Let --subrepos on the command line override config setting.
2026 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2027
2026
2028 cmdutil.checkunfinished(repo, commit=True)
2027 cmdutil.checkunfinished(repo, commit=True)
2029
2028
2030 branch = repo[None].branch()
2029 branch = repo[None].branch()
2031 bheads = repo.branchheads(branch)
2030 bheads = repo.branchheads(branch)
2032
2031
2033 extra = {}
2032 extra = {}
2034 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2035 extra[b'close'] = b'1'
2034 extra[b'close'] = b'1'
2036
2035
2037 if repo[b'.'].closesbranch():
2036 if repo[b'.'].closesbranch():
2038 raise error.Abort(
2037 raise error.Abort(
2039 _(b'current revision is already a branch closing head')
2038 _(b'current revision is already a branch closing head')
2040 )
2039 )
2041 elif not bheads:
2040 elif not bheads:
2042 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2043 elif (
2042 elif (
2044 branch == repo[b'.'].branch()
2043 branch == repo[b'.'].branch()
2045 and repo[b'.'].node() not in bheads
2044 and repo[b'.'].node() not in bheads
2046 and not opts.get(b'force_close_branch')
2045 and not opts.get(b'force_close_branch')
2047 ):
2046 ):
2048 hint = _(
2047 hint = _(
2049 b'use --force-close-branch to close branch from a non-head'
2048 b'use --force-close-branch to close branch from a non-head'
2050 b' changeset'
2049 b' changeset'
2051 )
2050 )
2052 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2053 elif opts.get(b'amend'):
2052 elif opts.get(b'amend'):
2054 if (
2053 if (
2055 repo[b'.'].p1().branch() != branch
2054 repo[b'.'].p1().branch() != branch
2056 and repo[b'.'].p2().branch() != branch
2055 and repo[b'.'].p2().branch() != branch
2057 ):
2056 ):
2058 raise error.Abort(_(b'can only close branch heads'))
2057 raise error.Abort(_(b'can only close branch heads'))
2059
2058
2060 if opts.get(b'amend'):
2059 if opts.get(b'amend'):
2061 if ui.configbool(b'ui', b'commitsubrepos'):
2060 if ui.configbool(b'ui', b'commitsubrepos'):
2062 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2063
2062
2064 old = repo[b'.']
2063 old = repo[b'.']
2065 rewriteutil.precheck(repo, [old.rev()], b'amend')
2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2066
2065
2067 # Currently histedit gets confused if an amend happens while histedit
2066 # Currently histedit gets confused if an amend happens while histedit
2068 # is in progress. Since we have a checkunfinished command, we are
2067 # is in progress. Since we have a checkunfinished command, we are
2069 # temporarily honoring it.
2068 # temporarily honoring it.
2070 #
2069 #
2071 # Note: eventually this guard will be removed. Please do not expect
2070 # Note: eventually this guard will be removed. Please do not expect
2072 # this behavior to remain.
2071 # this behavior to remain.
2073 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2074 cmdutil.checkunfinished(repo)
2073 cmdutil.checkunfinished(repo)
2075
2074
2076 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2077 if node == old.node():
2076 if node == old.node():
2078 ui.status(_(b"nothing changed\n"))
2077 ui.status(_(b"nothing changed\n"))
2079 return 1
2078 return 1
2080 else:
2079 else:
2081
2080
2082 def commitfunc(ui, repo, message, match, opts):
2081 def commitfunc(ui, repo, message, match, opts):
2083 overrides = {}
2082 overrides = {}
2084 if opts.get(b'secret'):
2083 if opts.get(b'secret'):
2085 overrides[(b'phases', b'new-commit')] = b'secret'
2084 overrides[(b'phases', b'new-commit')] = b'secret'
2086
2085
2087 baseui = repo.baseui
2086 baseui = repo.baseui
2088 with baseui.configoverride(overrides, b'commit'):
2087 with baseui.configoverride(overrides, b'commit'):
2089 with ui.configoverride(overrides, b'commit'):
2088 with ui.configoverride(overrides, b'commit'):
2090 editform = cmdutil.mergeeditform(
2089 editform = cmdutil.mergeeditform(
2091 repo[None], b'commit.normal'
2090 repo[None], b'commit.normal'
2092 )
2091 )
2093 editor = cmdutil.getcommiteditor(
2092 editor = cmdutil.getcommiteditor(
2094 editform=editform, **pycompat.strkwargs(opts)
2093 editform=editform, **pycompat.strkwargs(opts)
2095 )
2094 )
2096 return repo.commit(
2095 return repo.commit(
2097 message,
2096 message,
2098 opts.get(b'user'),
2097 opts.get(b'user'),
2099 opts.get(b'date'),
2098 opts.get(b'date'),
2100 match,
2099 match,
2101 editor=editor,
2100 editor=editor,
2102 extra=extra,
2101 extra=extra,
2103 )
2102 )
2104
2103
2105 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2106
2105
2107 if not node:
2106 if not node:
2108 stat = cmdutil.postcommitstatus(repo, pats, opts)
2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2109 if stat.deleted:
2108 if stat.deleted:
2110 ui.status(
2109 ui.status(
2111 _(
2110 _(
2112 b"nothing changed (%d missing files, see "
2111 b"nothing changed (%d missing files, see "
2113 b"'hg status')\n"
2112 b"'hg status')\n"
2114 )
2113 )
2115 % len(stat.deleted)
2114 % len(stat.deleted)
2116 )
2115 )
2117 else:
2116 else:
2118 ui.status(_(b"nothing changed\n"))
2117 ui.status(_(b"nothing changed\n"))
2119 return 1
2118 return 1
2120
2119
2121 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2122
2121
2123 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2124 status(
2123 status(
2125 ui,
2124 ui,
2126 repo,
2125 repo,
2127 modified=True,
2126 modified=True,
2128 added=True,
2127 added=True,
2129 removed=True,
2128 removed=True,
2130 deleted=True,
2129 deleted=True,
2131 unknown=True,
2130 unknown=True,
2132 subrepos=opts.get(b'subrepos'),
2131 subrepos=opts.get(b'subrepos'),
2133 )
2132 )
2134
2133
2135
2134
2136 @command(
2135 @command(
2137 b'config|showconfig|debugconfig',
2136 b'config|showconfig|debugconfig',
2138 [
2137 [
2139 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2140 (b'e', b'edit', None, _(b'edit user config')),
2139 (b'e', b'edit', None, _(b'edit user config')),
2141 (b'l', b'local', None, _(b'edit repository config')),
2140 (b'l', b'local', None, _(b'edit repository config')),
2142 (b'g', b'global', None, _(b'edit global config')),
2141 (b'g', b'global', None, _(b'edit global config')),
2143 ]
2142 ]
2144 + formatteropts,
2143 + formatteropts,
2145 _(b'[-u] [NAME]...'),
2144 _(b'[-u] [NAME]...'),
2146 helpcategory=command.CATEGORY_HELP,
2145 helpcategory=command.CATEGORY_HELP,
2147 optionalrepo=True,
2146 optionalrepo=True,
2148 intents={INTENT_READONLY},
2147 intents={INTENT_READONLY},
2149 )
2148 )
2150 def config(ui, repo, *values, **opts):
2149 def config(ui, repo, *values, **opts):
2151 """show combined config settings from all hgrc files
2150 """show combined config settings from all hgrc files
2152
2151
2153 With no arguments, print names and values of all config items.
2152 With no arguments, print names and values of all config items.
2154
2153
2155 With one argument of the form section.name, print just the value
2154 With one argument of the form section.name, print just the value
2156 of that config item.
2155 of that config item.
2157
2156
2158 With multiple arguments, print names and values of all config
2157 With multiple arguments, print names and values of all config
2159 items with matching section names or section.names.
2158 items with matching section names or section.names.
2160
2159
2161 With --edit, start an editor on the user-level config file. With
2160 With --edit, start an editor on the user-level config file. With
2162 --global, edit the system-wide config file. With --local, edit the
2161 --global, edit the system-wide config file. With --local, edit the
2163 repository-level config file.
2162 repository-level config file.
2164
2163
2165 With --debug, the source (filename and line number) is printed
2164 With --debug, the source (filename and line number) is printed
2166 for each config item.
2165 for each config item.
2167
2166
2168 See :hg:`help config` for more information about config files.
2167 See :hg:`help config` for more information about config files.
2169
2168
2170 .. container:: verbose
2169 .. container:: verbose
2171
2170
2172 Template:
2171 Template:
2173
2172
2174 The following keywords are supported. See also :hg:`help templates`.
2173 The following keywords are supported. See also :hg:`help templates`.
2175
2174
2176 :name: String. Config name.
2175 :name: String. Config name.
2177 :source: String. Filename and line number where the item is defined.
2176 :source: String. Filename and line number where the item is defined.
2178 :value: String. Config value.
2177 :value: String. Config value.
2179
2178
2180 Returns 0 on success, 1 if NAME does not exist.
2179 Returns 0 on success, 1 if NAME does not exist.
2181
2180
2182 """
2181 """
2183
2182
2184 opts = pycompat.byteskwargs(opts)
2183 opts = pycompat.byteskwargs(opts)
2185 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2184 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2186 if opts.get(b'local') and opts.get(b'global'):
2185 if opts.get(b'local') and opts.get(b'global'):
2187 raise error.Abort(_(b"can't use --local and --global together"))
2186 raise error.Abort(_(b"can't use --local and --global together"))
2188
2187
2189 if opts.get(b'local'):
2188 if opts.get(b'local'):
2190 if not repo:
2189 if not repo:
2191 raise error.Abort(_(b"can't use --local outside a repository"))
2190 raise error.Abort(_(b"can't use --local outside a repository"))
2192 paths = [repo.vfs.join(b'hgrc')]
2191 paths = [repo.vfs.join(b'hgrc')]
2193 elif opts.get(b'global'):
2192 elif opts.get(b'global'):
2194 paths = rcutil.systemrcpath()
2193 paths = rcutil.systemrcpath()
2195 else:
2194 else:
2196 paths = rcutil.userrcpath()
2195 paths = rcutil.userrcpath()
2197
2196
2198 for f in paths:
2197 for f in paths:
2199 if os.path.exists(f):
2198 if os.path.exists(f):
2200 break
2199 break
2201 else:
2200 else:
2202 if opts.get(b'global'):
2201 if opts.get(b'global'):
2203 samplehgrc = uimod.samplehgrcs[b'global']
2202 samplehgrc = uimod.samplehgrcs[b'global']
2204 elif opts.get(b'local'):
2203 elif opts.get(b'local'):
2205 samplehgrc = uimod.samplehgrcs[b'local']
2204 samplehgrc = uimod.samplehgrcs[b'local']
2206 else:
2205 else:
2207 samplehgrc = uimod.samplehgrcs[b'user']
2206 samplehgrc = uimod.samplehgrcs[b'user']
2208
2207
2209 f = paths[0]
2208 f = paths[0]
2210 fp = open(f, b"wb")
2209 fp = open(f, b"wb")
2211 fp.write(util.tonativeeol(samplehgrc))
2210 fp.write(util.tonativeeol(samplehgrc))
2212 fp.close()
2211 fp.close()
2213
2212
2214 editor = ui.geteditor()
2213 editor = ui.geteditor()
2215 ui.system(
2214 ui.system(
2216 b"%s \"%s\"" % (editor, f),
2215 b"%s \"%s\"" % (editor, f),
2217 onerr=error.Abort,
2216 onerr=error.Abort,
2218 errprefix=_(b"edit failed"),
2217 errprefix=_(b"edit failed"),
2219 blockedtag=b'config_edit',
2218 blockedtag=b'config_edit',
2220 )
2219 )
2221 return
2220 return
2222 ui.pager(b'config')
2221 ui.pager(b'config')
2223 fm = ui.formatter(b'config', opts)
2222 fm = ui.formatter(b'config', opts)
2224 for t, f in rcutil.rccomponents():
2223 for t, f in rcutil.rccomponents():
2225 if t == b'path':
2224 if t == b'path':
2226 ui.debug(b'read config from: %s\n' % f)
2225 ui.debug(b'read config from: %s\n' % f)
2227 elif t == b'items':
2226 elif t == b'items':
2228 for section, name, value, source in f:
2227 for section, name, value, source in f:
2229 ui.debug(b'set config by: %s\n' % source)
2228 ui.debug(b'set config by: %s\n' % source)
2230 else:
2229 else:
2231 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2230 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2232 untrusted = bool(opts.get(b'untrusted'))
2231 untrusted = bool(opts.get(b'untrusted'))
2233
2232
2234 selsections = selentries = []
2233 selsections = selentries = []
2235 if values:
2234 if values:
2236 selsections = [v for v in values if b'.' not in v]
2235 selsections = [v for v in values if b'.' not in v]
2237 selentries = [v for v in values if b'.' in v]
2236 selentries = [v for v in values if b'.' in v]
2238 uniquesel = len(selentries) == 1 and not selsections
2237 uniquesel = len(selentries) == 1 and not selsections
2239 selsections = set(selsections)
2238 selsections = set(selsections)
2240 selentries = set(selentries)
2239 selentries = set(selentries)
2241
2240
2242 matched = False
2241 matched = False
2243 for section, name, value in ui.walkconfig(untrusted=untrusted):
2242 for section, name, value in ui.walkconfig(untrusted=untrusted):
2244 source = ui.configsource(section, name, untrusted)
2243 source = ui.configsource(section, name, untrusted)
2245 value = pycompat.bytestr(value)
2244 value = pycompat.bytestr(value)
2246 defaultvalue = ui.configdefault(section, name)
2245 defaultvalue = ui.configdefault(section, name)
2247 if fm.isplain():
2246 if fm.isplain():
2248 source = source or b'none'
2247 source = source or b'none'
2249 value = value.replace(b'\n', b'\\n')
2248 value = value.replace(b'\n', b'\\n')
2250 entryname = section + b'.' + name
2249 entryname = section + b'.' + name
2251 if values and not (section in selsections or entryname in selentries):
2250 if values and not (section in selsections or entryname in selentries):
2252 continue
2251 continue
2253 fm.startitem()
2252 fm.startitem()
2254 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2253 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2255 if uniquesel:
2254 if uniquesel:
2256 fm.data(name=entryname)
2255 fm.data(name=entryname)
2257 fm.write(b'value', b'%s\n', value)
2256 fm.write(b'value', b'%s\n', value)
2258 else:
2257 else:
2259 fm.write(b'name value', b'%s=%s\n', entryname, value)
2258 fm.write(b'name value', b'%s=%s\n', entryname, value)
2260 if formatter.isprintable(defaultvalue):
2259 if formatter.isprintable(defaultvalue):
2261 fm.data(defaultvalue=defaultvalue)
2260 fm.data(defaultvalue=defaultvalue)
2262 elif isinstance(defaultvalue, list) and all(
2261 elif isinstance(defaultvalue, list) and all(
2263 formatter.isprintable(e) for e in defaultvalue
2262 formatter.isprintable(e) for e in defaultvalue
2264 ):
2263 ):
2265 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2264 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2266 # TODO: no idea how to process unsupported defaultvalue types
2265 # TODO: no idea how to process unsupported defaultvalue types
2267 matched = True
2266 matched = True
2268 fm.end()
2267 fm.end()
2269 if matched:
2268 if matched:
2270 return 0
2269 return 0
2271 return 1
2270 return 1
2272
2271
2273
2272
2274 @command(
2273 @command(
2275 b'continue',
2274 b'continue',
2276 dryrunopts,
2275 dryrunopts,
2277 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2276 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2278 helpbasic=True,
2277 helpbasic=True,
2279 )
2278 )
2280 def continuecmd(ui, repo, **opts):
2279 def continuecmd(ui, repo, **opts):
2281 """resumes an interrupted operation (EXPERIMENTAL)
2280 """resumes an interrupted operation (EXPERIMENTAL)
2282
2281
2283 Finishes a multistep operation like graft, histedit, rebase, merge,
2282 Finishes a multistep operation like graft, histedit, rebase, merge,
2284 and unshelve if they are in an interrupted state.
2283 and unshelve if they are in an interrupted state.
2285
2284
2286 use --dry-run/-n to dry run the command.
2285 use --dry-run/-n to dry run the command.
2287 """
2286 """
2288 dryrun = opts.get('dry_run')
2287 dryrun = opts.get('dry_run')
2289 contstate = cmdutil.getunfinishedstate(repo)
2288 contstate = cmdutil.getunfinishedstate(repo)
2290 if not contstate:
2289 if not contstate:
2291 raise error.Abort(_(b'no operation in progress'))
2290 raise error.Abort(_(b'no operation in progress'))
2292 if not contstate.continuefunc:
2291 if not contstate.continuefunc:
2293 raise error.Abort(
2292 raise error.Abort(
2294 (
2293 (
2295 _(b"%s in progress but does not support 'hg continue'")
2294 _(b"%s in progress but does not support 'hg continue'")
2296 % (contstate._opname)
2295 % (contstate._opname)
2297 ),
2296 ),
2298 hint=contstate.continuemsg(),
2297 hint=contstate.continuemsg(),
2299 )
2298 )
2300 if dryrun:
2299 if dryrun:
2301 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2300 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2302 return
2301 return
2303 return contstate.continuefunc(ui, repo)
2302 return contstate.continuefunc(ui, repo)
2304
2303
2305
2304
2306 @command(
2305 @command(
2307 b'copy|cp',
2306 b'copy|cp',
2308 [
2307 [
2309 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2308 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2310 (
2309 (
2311 b'f',
2310 b'f',
2312 b'force',
2311 b'force',
2313 None,
2312 None,
2314 _(b'forcibly copy over an existing managed file'),
2313 _(b'forcibly copy over an existing managed file'),
2315 ),
2314 ),
2316 ]
2315 ]
2317 + walkopts
2316 + walkopts
2318 + dryrunopts,
2317 + dryrunopts,
2319 _(b'[OPTION]... SOURCE... DEST'),
2318 _(b'[OPTION]... SOURCE... DEST'),
2320 helpcategory=command.CATEGORY_FILE_CONTENTS,
2319 helpcategory=command.CATEGORY_FILE_CONTENTS,
2321 )
2320 )
2322 def copy(ui, repo, *pats, **opts):
2321 def copy(ui, repo, *pats, **opts):
2323 """mark files as copied for the next commit
2322 """mark files as copied for the next commit
2324
2323
2325 Mark dest as having copies of source files. If dest is a
2324 Mark dest as having copies of source files. If dest is a
2326 directory, copies are put in that directory. If dest is a file,
2325 directory, copies are put in that directory. If dest is a file,
2327 the source must be a single file.
2326 the source must be a single file.
2328
2327
2329 By default, this command copies the contents of files as they
2328 By default, this command copies the contents of files as they
2330 exist in the working directory. If invoked with -A/--after, the
2329 exist in the working directory. If invoked with -A/--after, the
2331 operation is recorded, but no copying is performed.
2330 operation is recorded, but no copying is performed.
2332
2331
2333 This command takes effect with the next commit. To undo a copy
2332 This command takes effect with the next commit. To undo a copy
2334 before that, see :hg:`revert`.
2333 before that, see :hg:`revert`.
2335
2334
2336 Returns 0 on success, 1 if errors are encountered.
2335 Returns 0 on success, 1 if errors are encountered.
2337 """
2336 """
2338 opts = pycompat.byteskwargs(opts)
2337 opts = pycompat.byteskwargs(opts)
2339 with repo.wlock(False):
2338 with repo.wlock(False):
2340 return cmdutil.copy(ui, repo, pats, opts)
2339 return cmdutil.copy(ui, repo, pats, opts)
2341
2340
2342
2341
2343 @command(
2342 @command(
2344 b'debugcommands',
2343 b'debugcommands',
2345 [],
2344 [],
2346 _(b'[COMMAND]'),
2345 _(b'[COMMAND]'),
2347 helpcategory=command.CATEGORY_HELP,
2346 helpcategory=command.CATEGORY_HELP,
2348 norepo=True,
2347 norepo=True,
2349 )
2348 )
2350 def debugcommands(ui, cmd=b'', *args):
2349 def debugcommands(ui, cmd=b'', *args):
2351 """list all available commands and options"""
2350 """list all available commands and options"""
2352 for cmd, vals in sorted(pycompat.iteritems(table)):
2351 for cmd, vals in sorted(pycompat.iteritems(table)):
2353 cmd = cmd.split(b'|')[0]
2352 cmd = cmd.split(b'|')[0]
2354 opts = b', '.join([i[1] for i in vals[1]])
2353 opts = b', '.join([i[1] for i in vals[1]])
2355 ui.write(b'%s: %s\n' % (cmd, opts))
2354 ui.write(b'%s: %s\n' % (cmd, opts))
2356
2355
2357
2356
2358 @command(
2357 @command(
2359 b'debugcomplete',
2358 b'debugcomplete',
2360 [(b'o', b'options', None, _(b'show the command options'))],
2359 [(b'o', b'options', None, _(b'show the command options'))],
2361 _(b'[-o] CMD'),
2360 _(b'[-o] CMD'),
2362 helpcategory=command.CATEGORY_HELP,
2361 helpcategory=command.CATEGORY_HELP,
2363 norepo=True,
2362 norepo=True,
2364 )
2363 )
2365 def debugcomplete(ui, cmd=b'', **opts):
2364 def debugcomplete(ui, cmd=b'', **opts):
2366 """returns the completion list associated with the given command"""
2365 """returns the completion list associated with the given command"""
2367
2366
2368 if opts.get('options'):
2367 if opts.get('options'):
2369 options = []
2368 options = []
2370 otables = [globalopts]
2369 otables = [globalopts]
2371 if cmd:
2370 if cmd:
2372 aliases, entry = cmdutil.findcmd(cmd, table, False)
2371 aliases, entry = cmdutil.findcmd(cmd, table, False)
2373 otables.append(entry[1])
2372 otables.append(entry[1])
2374 for t in otables:
2373 for t in otables:
2375 for o in t:
2374 for o in t:
2376 if b"(DEPRECATED)" in o[3]:
2375 if b"(DEPRECATED)" in o[3]:
2377 continue
2376 continue
2378 if o[0]:
2377 if o[0]:
2379 options.append(b'-%s' % o[0])
2378 options.append(b'-%s' % o[0])
2380 options.append(b'--%s' % o[1])
2379 options.append(b'--%s' % o[1])
2381 ui.write(b"%s\n" % b"\n".join(options))
2380 ui.write(b"%s\n" % b"\n".join(options))
2382 return
2381 return
2383
2382
2384 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2383 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2385 if ui.verbose:
2384 if ui.verbose:
2386 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2385 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2387 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2386 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2388
2387
2389
2388
2390 @command(
2389 @command(
2391 b'diff',
2390 b'diff',
2392 [
2391 [
2393 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2392 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2394 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2393 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2395 ]
2394 ]
2396 + diffopts
2395 + diffopts
2397 + diffopts2
2396 + diffopts2
2398 + walkopts
2397 + walkopts
2399 + subrepoopts,
2398 + subrepoopts,
2400 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2399 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2401 helpcategory=command.CATEGORY_FILE_CONTENTS,
2400 helpcategory=command.CATEGORY_FILE_CONTENTS,
2402 helpbasic=True,
2401 helpbasic=True,
2403 inferrepo=True,
2402 inferrepo=True,
2404 intents={INTENT_READONLY},
2403 intents={INTENT_READONLY},
2405 )
2404 )
2406 def diff(ui, repo, *pats, **opts):
2405 def diff(ui, repo, *pats, **opts):
2407 """diff repository (or selected files)
2406 """diff repository (or selected files)
2408
2407
2409 Show differences between revisions for the specified files.
2408 Show differences between revisions for the specified files.
2410
2409
2411 Differences between files are shown using the unified diff format.
2410 Differences between files are shown using the unified diff format.
2412
2411
2413 .. note::
2412 .. note::
2414
2413
2415 :hg:`diff` may generate unexpected results for merges, as it will
2414 :hg:`diff` may generate unexpected results for merges, as it will
2416 default to comparing against the working directory's first
2415 default to comparing against the working directory's first
2417 parent changeset if no revisions are specified.
2416 parent changeset if no revisions are specified.
2418
2417
2419 When two revision arguments are given, then changes are shown
2418 When two revision arguments are given, then changes are shown
2420 between those revisions. If only one revision is specified then
2419 between those revisions. If only one revision is specified then
2421 that revision is compared to the working directory, and, when no
2420 that revision is compared to the working directory, and, when no
2422 revisions are specified, the working directory files are compared
2421 revisions are specified, the working directory files are compared
2423 to its first parent.
2422 to its first parent.
2424
2423
2425 Alternatively you can specify -c/--change with a revision to see
2424 Alternatively you can specify -c/--change with a revision to see
2426 the changes in that changeset relative to its first parent.
2425 the changes in that changeset relative to its first parent.
2427
2426
2428 Without the -a/--text option, diff will avoid generating diffs of
2427 Without the -a/--text option, diff will avoid generating diffs of
2429 files it detects as binary. With -a, diff will generate a diff
2428 files it detects as binary. With -a, diff will generate a diff
2430 anyway, probably with undesirable results.
2429 anyway, probably with undesirable results.
2431
2430
2432 Use the -g/--git option to generate diffs in the git extended diff
2431 Use the -g/--git option to generate diffs in the git extended diff
2433 format. For more information, read :hg:`help diffs`.
2432 format. For more information, read :hg:`help diffs`.
2434
2433
2435 .. container:: verbose
2434 .. container:: verbose
2436
2435
2437 Examples:
2436 Examples:
2438
2437
2439 - compare a file in the current working directory to its parent::
2438 - compare a file in the current working directory to its parent::
2440
2439
2441 hg diff foo.c
2440 hg diff foo.c
2442
2441
2443 - compare two historical versions of a directory, with rename info::
2442 - compare two historical versions of a directory, with rename info::
2444
2443
2445 hg diff --git -r 1.0:1.2 lib/
2444 hg diff --git -r 1.0:1.2 lib/
2446
2445
2447 - get change stats relative to the last change on some date::
2446 - get change stats relative to the last change on some date::
2448
2447
2449 hg diff --stat -r "date('may 2')"
2448 hg diff --stat -r "date('may 2')"
2450
2449
2451 - diff all newly-added files that contain a keyword::
2450 - diff all newly-added files that contain a keyword::
2452
2451
2453 hg diff "set:added() and grep(GNU)"
2452 hg diff "set:added() and grep(GNU)"
2454
2453
2455 - compare a revision and its parents::
2454 - compare a revision and its parents::
2456
2455
2457 hg diff -c 9353 # compare against first parent
2456 hg diff -c 9353 # compare against first parent
2458 hg diff -r 9353^:9353 # same using revset syntax
2457 hg diff -r 9353^:9353 # same using revset syntax
2459 hg diff -r 9353^2:9353 # compare against the second parent
2458 hg diff -r 9353^2:9353 # compare against the second parent
2460
2459
2461 Returns 0 on success.
2460 Returns 0 on success.
2462 """
2461 """
2463
2462
2464 opts = pycompat.byteskwargs(opts)
2463 opts = pycompat.byteskwargs(opts)
2465 revs = opts.get(b'rev')
2464 revs = opts.get(b'rev')
2466 change = opts.get(b'change')
2465 change = opts.get(b'change')
2467 stat = opts.get(b'stat')
2466 stat = opts.get(b'stat')
2468 reverse = opts.get(b'reverse')
2467 reverse = opts.get(b'reverse')
2469
2468
2470 if revs and change:
2469 if revs and change:
2471 msg = _(b'cannot specify --rev and --change at the same time')
2470 msg = _(b'cannot specify --rev and --change at the same time')
2472 raise error.Abort(msg)
2471 raise error.Abort(msg)
2473 elif change:
2472 elif change:
2474 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2473 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2475 ctx2 = scmutil.revsingle(repo, change, None)
2474 ctx2 = scmutil.revsingle(repo, change, None)
2476 ctx1 = ctx2.p1()
2475 ctx1 = ctx2.p1()
2477 else:
2476 else:
2478 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2477 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2479 ctx1, ctx2 = scmutil.revpair(repo, revs)
2478 ctx1, ctx2 = scmutil.revpair(repo, revs)
2480 node1, node2 = ctx1.node(), ctx2.node()
2479 node1, node2 = ctx1.node(), ctx2.node()
2481
2480
2482 if reverse:
2481 if reverse:
2483 node1, node2 = node2, node1
2482 node1, node2 = node2, node1
2484
2483
2485 diffopts = patch.diffallopts(ui, opts)
2484 diffopts = patch.diffallopts(ui, opts)
2486 m = scmutil.match(ctx2, pats, opts)
2485 m = scmutil.match(ctx2, pats, opts)
2487 m = repo.narrowmatch(m)
2486 m = repo.narrowmatch(m)
2488 ui.pager(b'diff')
2487 ui.pager(b'diff')
2489 logcmdutil.diffordiffstat(
2488 logcmdutil.diffordiffstat(
2490 ui,
2489 ui,
2491 repo,
2490 repo,
2492 diffopts,
2491 diffopts,
2493 node1,
2492 node1,
2494 node2,
2493 node2,
2495 m,
2494 m,
2496 stat=stat,
2495 stat=stat,
2497 listsubrepos=opts.get(b'subrepos'),
2496 listsubrepos=opts.get(b'subrepos'),
2498 root=opts.get(b'root'),
2497 root=opts.get(b'root'),
2499 )
2498 )
2500
2499
2501
2500
2502 @command(
2501 @command(
2503 b'export',
2502 b'export',
2504 [
2503 [
2505 (
2504 (
2506 b'B',
2505 b'B',
2507 b'bookmark',
2506 b'bookmark',
2508 b'',
2507 b'',
2509 _(b'export changes only reachable by given bookmark'),
2508 _(b'export changes only reachable by given bookmark'),
2510 _(b'BOOKMARK'),
2509 _(b'BOOKMARK'),
2511 ),
2510 ),
2512 (
2511 (
2513 b'o',
2512 b'o',
2514 b'output',
2513 b'output',
2515 b'',
2514 b'',
2516 _(b'print output to file with formatted name'),
2515 _(b'print output to file with formatted name'),
2517 _(b'FORMAT'),
2516 _(b'FORMAT'),
2518 ),
2517 ),
2519 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2518 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2520 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2519 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2521 ]
2520 ]
2522 + diffopts
2521 + diffopts
2523 + formatteropts,
2522 + formatteropts,
2524 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2523 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2525 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2524 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2526 helpbasic=True,
2525 helpbasic=True,
2527 intents={INTENT_READONLY},
2526 intents={INTENT_READONLY},
2528 )
2527 )
2529 def export(ui, repo, *changesets, **opts):
2528 def export(ui, repo, *changesets, **opts):
2530 """dump the header and diffs for one or more changesets
2529 """dump the header and diffs for one or more changesets
2531
2530
2532 Print the changeset header and diffs for one or more revisions.
2531 Print the changeset header and diffs for one or more revisions.
2533 If no revision is given, the parent of the working directory is used.
2532 If no revision is given, the parent of the working directory is used.
2534
2533
2535 The information shown in the changeset header is: author, date,
2534 The information shown in the changeset header is: author, date,
2536 branch name (if non-default), changeset hash, parent(s) and commit
2535 branch name (if non-default), changeset hash, parent(s) and commit
2537 comment.
2536 comment.
2538
2537
2539 .. note::
2538 .. note::
2540
2539
2541 :hg:`export` may generate unexpected diff output for merge
2540 :hg:`export` may generate unexpected diff output for merge
2542 changesets, as it will compare the merge changeset against its
2541 changesets, as it will compare the merge changeset against its
2543 first parent only.
2542 first parent only.
2544
2543
2545 Output may be to a file, in which case the name of the file is
2544 Output may be to a file, in which case the name of the file is
2546 given using a template string. See :hg:`help templates`. In addition
2545 given using a template string. See :hg:`help templates`. In addition
2547 to the common template keywords, the following formatting rules are
2546 to the common template keywords, the following formatting rules are
2548 supported:
2547 supported:
2549
2548
2550 :``%%``: literal "%" character
2549 :``%%``: literal "%" character
2551 :``%H``: changeset hash (40 hexadecimal digits)
2550 :``%H``: changeset hash (40 hexadecimal digits)
2552 :``%N``: number of patches being generated
2551 :``%N``: number of patches being generated
2553 :``%R``: changeset revision number
2552 :``%R``: changeset revision number
2554 :``%b``: basename of the exporting repository
2553 :``%b``: basename of the exporting repository
2555 :``%h``: short-form changeset hash (12 hexadecimal digits)
2554 :``%h``: short-form changeset hash (12 hexadecimal digits)
2556 :``%m``: first line of the commit message (only alphanumeric characters)
2555 :``%m``: first line of the commit message (only alphanumeric characters)
2557 :``%n``: zero-padded sequence number, starting at 1
2556 :``%n``: zero-padded sequence number, starting at 1
2558 :``%r``: zero-padded changeset revision number
2557 :``%r``: zero-padded changeset revision number
2559 :``\\``: literal "\\" character
2558 :``\\``: literal "\\" character
2560
2559
2561 Without the -a/--text option, export will avoid generating diffs
2560 Without the -a/--text option, export will avoid generating diffs
2562 of files it detects as binary. With -a, export will generate a
2561 of files it detects as binary. With -a, export will generate a
2563 diff anyway, probably with undesirable results.
2562 diff anyway, probably with undesirable results.
2564
2563
2565 With -B/--bookmark changesets reachable by the given bookmark are
2564 With -B/--bookmark changesets reachable by the given bookmark are
2566 selected.
2565 selected.
2567
2566
2568 Use the -g/--git option to generate diffs in the git extended diff
2567 Use the -g/--git option to generate diffs in the git extended diff
2569 format. See :hg:`help diffs` for more information.
2568 format. See :hg:`help diffs` for more information.
2570
2569
2571 With the --switch-parent option, the diff will be against the
2570 With the --switch-parent option, the diff will be against the
2572 second parent. It can be useful to review a merge.
2571 second parent. It can be useful to review a merge.
2573
2572
2574 .. container:: verbose
2573 .. container:: verbose
2575
2574
2576 Template:
2575 Template:
2577
2576
2578 The following keywords are supported in addition to the common template
2577 The following keywords are supported in addition to the common template
2579 keywords and functions. See also :hg:`help templates`.
2578 keywords and functions. See also :hg:`help templates`.
2580
2579
2581 :diff: String. Diff content.
2580 :diff: String. Diff content.
2582 :parents: List of strings. Parent nodes of the changeset.
2581 :parents: List of strings. Parent nodes of the changeset.
2583
2582
2584 Examples:
2583 Examples:
2585
2584
2586 - use export and import to transplant a bugfix to the current
2585 - use export and import to transplant a bugfix to the current
2587 branch::
2586 branch::
2588
2587
2589 hg export -r 9353 | hg import -
2588 hg export -r 9353 | hg import -
2590
2589
2591 - export all the changesets between two revisions to a file with
2590 - export all the changesets between two revisions to a file with
2592 rename information::
2591 rename information::
2593
2592
2594 hg export --git -r 123:150 > changes.txt
2593 hg export --git -r 123:150 > changes.txt
2595
2594
2596 - split outgoing changes into a series of patches with
2595 - split outgoing changes into a series of patches with
2597 descriptive names::
2596 descriptive names::
2598
2597
2599 hg export -r "outgoing()" -o "%n-%m.patch"
2598 hg export -r "outgoing()" -o "%n-%m.patch"
2600
2599
2601 Returns 0 on success.
2600 Returns 0 on success.
2602 """
2601 """
2603 opts = pycompat.byteskwargs(opts)
2602 opts = pycompat.byteskwargs(opts)
2604 bookmark = opts.get(b'bookmark')
2603 bookmark = opts.get(b'bookmark')
2605 changesets += tuple(opts.get(b'rev', []))
2604 changesets += tuple(opts.get(b'rev', []))
2606
2605
2607 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2606 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2608
2607
2609 if bookmark:
2608 if bookmark:
2610 if bookmark not in repo._bookmarks:
2609 if bookmark not in repo._bookmarks:
2611 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2610 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2612
2611
2613 revs = scmutil.bookmarkrevs(repo, bookmark)
2612 revs = scmutil.bookmarkrevs(repo, bookmark)
2614 else:
2613 else:
2615 if not changesets:
2614 if not changesets:
2616 changesets = [b'.']
2615 changesets = [b'.']
2617
2616
2618 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2617 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2619 revs = scmutil.revrange(repo, changesets)
2618 revs = scmutil.revrange(repo, changesets)
2620
2619
2621 if not revs:
2620 if not revs:
2622 raise error.Abort(_(b"export requires at least one changeset"))
2621 raise error.Abort(_(b"export requires at least one changeset"))
2623 if len(revs) > 1:
2622 if len(revs) > 1:
2624 ui.note(_(b'exporting patches:\n'))
2623 ui.note(_(b'exporting patches:\n'))
2625 else:
2624 else:
2626 ui.note(_(b'exporting patch:\n'))
2625 ui.note(_(b'exporting patch:\n'))
2627
2626
2628 fntemplate = opts.get(b'output')
2627 fntemplate = opts.get(b'output')
2629 if cmdutil.isstdiofilename(fntemplate):
2628 if cmdutil.isstdiofilename(fntemplate):
2630 fntemplate = b''
2629 fntemplate = b''
2631
2630
2632 if fntemplate:
2631 if fntemplate:
2633 fm = formatter.nullformatter(ui, b'export', opts)
2632 fm = formatter.nullformatter(ui, b'export', opts)
2634 else:
2633 else:
2635 ui.pager(b'export')
2634 ui.pager(b'export')
2636 fm = ui.formatter(b'export', opts)
2635 fm = ui.formatter(b'export', opts)
2637 with fm:
2636 with fm:
2638 cmdutil.export(
2637 cmdutil.export(
2639 repo,
2638 repo,
2640 revs,
2639 revs,
2641 fm,
2640 fm,
2642 fntemplate=fntemplate,
2641 fntemplate=fntemplate,
2643 switch_parent=opts.get(b'switch_parent'),
2642 switch_parent=opts.get(b'switch_parent'),
2644 opts=patch.diffallopts(ui, opts),
2643 opts=patch.diffallopts(ui, opts),
2645 )
2644 )
2646
2645
2647
2646
2648 @command(
2647 @command(
2649 b'files',
2648 b'files',
2650 [
2649 [
2651 (
2650 (
2652 b'r',
2651 b'r',
2653 b'rev',
2652 b'rev',
2654 b'',
2653 b'',
2655 _(b'search the repository as it is in REV'),
2654 _(b'search the repository as it is in REV'),
2656 _(b'REV'),
2655 _(b'REV'),
2657 ),
2656 ),
2658 (
2657 (
2659 b'0',
2658 b'0',
2660 b'print0',
2659 b'print0',
2661 None,
2660 None,
2662 _(b'end filenames with NUL, for use with xargs'),
2661 _(b'end filenames with NUL, for use with xargs'),
2663 ),
2662 ),
2664 ]
2663 ]
2665 + walkopts
2664 + walkopts
2666 + formatteropts
2665 + formatteropts
2667 + subrepoopts,
2666 + subrepoopts,
2668 _(b'[OPTION]... [FILE]...'),
2667 _(b'[OPTION]... [FILE]...'),
2669 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2668 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2670 intents={INTENT_READONLY},
2669 intents={INTENT_READONLY},
2671 )
2670 )
2672 def files(ui, repo, *pats, **opts):
2671 def files(ui, repo, *pats, **opts):
2673 """list tracked files
2672 """list tracked files
2674
2673
2675 Print files under Mercurial control in the working directory or
2674 Print files under Mercurial control in the working directory or
2676 specified revision for given files (excluding removed files).
2675 specified revision for given files (excluding removed files).
2677 Files can be specified as filenames or filesets.
2676 Files can be specified as filenames or filesets.
2678
2677
2679 If no files are given to match, this command prints the names
2678 If no files are given to match, this command prints the names
2680 of all files under Mercurial control.
2679 of all files under Mercurial control.
2681
2680
2682 .. container:: verbose
2681 .. container:: verbose
2683
2682
2684 Template:
2683 Template:
2685
2684
2686 The following keywords are supported in addition to the common template
2685 The following keywords are supported in addition to the common template
2687 keywords and functions. See also :hg:`help templates`.
2686 keywords and functions. See also :hg:`help templates`.
2688
2687
2689 :flags: String. Character denoting file's symlink and executable bits.
2688 :flags: String. Character denoting file's symlink and executable bits.
2690 :path: String. Repository-absolute path of the file.
2689 :path: String. Repository-absolute path of the file.
2691 :size: Integer. Size of the file in bytes.
2690 :size: Integer. Size of the file in bytes.
2692
2691
2693 Examples:
2692 Examples:
2694
2693
2695 - list all files under the current directory::
2694 - list all files under the current directory::
2696
2695
2697 hg files .
2696 hg files .
2698
2697
2699 - shows sizes and flags for current revision::
2698 - shows sizes and flags for current revision::
2700
2699
2701 hg files -vr .
2700 hg files -vr .
2702
2701
2703 - list all files named README::
2702 - list all files named README::
2704
2703
2705 hg files -I "**/README"
2704 hg files -I "**/README"
2706
2705
2707 - list all binary files::
2706 - list all binary files::
2708
2707
2709 hg files "set:binary()"
2708 hg files "set:binary()"
2710
2709
2711 - find files containing a regular expression::
2710 - find files containing a regular expression::
2712
2711
2713 hg files "set:grep('bob')"
2712 hg files "set:grep('bob')"
2714
2713
2715 - search tracked file contents with xargs and grep::
2714 - search tracked file contents with xargs and grep::
2716
2715
2717 hg files -0 | xargs -0 grep foo
2716 hg files -0 | xargs -0 grep foo
2718
2717
2719 See :hg:`help patterns` and :hg:`help filesets` for more information
2718 See :hg:`help patterns` and :hg:`help filesets` for more information
2720 on specifying file patterns.
2719 on specifying file patterns.
2721
2720
2722 Returns 0 if a match is found, 1 otherwise.
2721 Returns 0 if a match is found, 1 otherwise.
2723
2722
2724 """
2723 """
2725
2724
2726 opts = pycompat.byteskwargs(opts)
2725 opts = pycompat.byteskwargs(opts)
2727 rev = opts.get(b'rev')
2726 rev = opts.get(b'rev')
2728 if rev:
2727 if rev:
2729 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2728 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2730 ctx = scmutil.revsingle(repo, rev, None)
2729 ctx = scmutil.revsingle(repo, rev, None)
2731
2730
2732 end = b'\n'
2731 end = b'\n'
2733 if opts.get(b'print0'):
2732 if opts.get(b'print0'):
2734 end = b'\0'
2733 end = b'\0'
2735 fmt = b'%s' + end
2734 fmt = b'%s' + end
2736
2735
2737 m = scmutil.match(ctx, pats, opts)
2736 m = scmutil.match(ctx, pats, opts)
2738 ui.pager(b'files')
2737 ui.pager(b'files')
2739 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2738 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2740 with ui.formatter(b'files', opts) as fm:
2739 with ui.formatter(b'files', opts) as fm:
2741 return cmdutil.files(
2740 return cmdutil.files(
2742 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2741 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2743 )
2742 )
2744
2743
2745
2744
2746 @command(
2745 @command(
2747 b'forget',
2746 b'forget',
2748 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2747 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2749 + walkopts
2748 + walkopts
2750 + dryrunopts,
2749 + dryrunopts,
2751 _(b'[OPTION]... FILE...'),
2750 _(b'[OPTION]... FILE...'),
2752 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2751 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2753 helpbasic=True,
2752 helpbasic=True,
2754 inferrepo=True,
2753 inferrepo=True,
2755 )
2754 )
2756 def forget(ui, repo, *pats, **opts):
2755 def forget(ui, repo, *pats, **opts):
2757 """forget the specified files on the next commit
2756 """forget the specified files on the next commit
2758
2757
2759 Mark the specified files so they will no longer be tracked
2758 Mark the specified files so they will no longer be tracked
2760 after the next commit.
2759 after the next commit.
2761
2760
2762 This only removes files from the current branch, not from the
2761 This only removes files from the current branch, not from the
2763 entire project history, and it does not delete them from the
2762 entire project history, and it does not delete them from the
2764 working directory.
2763 working directory.
2765
2764
2766 To delete the file from the working directory, see :hg:`remove`.
2765 To delete the file from the working directory, see :hg:`remove`.
2767
2766
2768 To undo a forget before the next commit, see :hg:`add`.
2767 To undo a forget before the next commit, see :hg:`add`.
2769
2768
2770 .. container:: verbose
2769 .. container:: verbose
2771
2770
2772 Examples:
2771 Examples:
2773
2772
2774 - forget newly-added binary files::
2773 - forget newly-added binary files::
2775
2774
2776 hg forget "set:added() and binary()"
2775 hg forget "set:added() and binary()"
2777
2776
2778 - forget files that would be excluded by .hgignore::
2777 - forget files that would be excluded by .hgignore::
2779
2778
2780 hg forget "set:hgignore()"
2779 hg forget "set:hgignore()"
2781
2780
2782 Returns 0 on success.
2781 Returns 0 on success.
2783 """
2782 """
2784
2783
2785 opts = pycompat.byteskwargs(opts)
2784 opts = pycompat.byteskwargs(opts)
2786 if not pats:
2785 if not pats:
2787 raise error.Abort(_(b'no files specified'))
2786 raise error.Abort(_(b'no files specified'))
2788
2787
2789 m = scmutil.match(repo[None], pats, opts)
2788 m = scmutil.match(repo[None], pats, opts)
2790 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2789 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2791 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2790 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2792 rejected = cmdutil.forget(
2791 rejected = cmdutil.forget(
2793 ui,
2792 ui,
2794 repo,
2793 repo,
2795 m,
2794 m,
2796 prefix=b"",
2795 prefix=b"",
2797 uipathfn=uipathfn,
2796 uipathfn=uipathfn,
2798 explicitonly=False,
2797 explicitonly=False,
2799 dryrun=dryrun,
2798 dryrun=dryrun,
2800 interactive=interactive,
2799 interactive=interactive,
2801 )[0]
2800 )[0]
2802 return rejected and 1 or 0
2801 return rejected and 1 or 0
2803
2802
2804
2803
2805 @command(
2804 @command(
2806 b'graft',
2805 b'graft',
2807 [
2806 [
2808 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2807 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2809 (
2808 (
2810 b'',
2809 b'',
2811 b'base',
2810 b'base',
2812 b'',
2811 b'',
2813 _(b'base revision when doing the graft merge (ADVANCED)'),
2812 _(b'base revision when doing the graft merge (ADVANCED)'),
2814 _(b'REV'),
2813 _(b'REV'),
2815 ),
2814 ),
2816 (b'c', b'continue', False, _(b'resume interrupted graft')),
2815 (b'c', b'continue', False, _(b'resume interrupted graft')),
2817 (b'', b'stop', False, _(b'stop interrupted graft')),
2816 (b'', b'stop', False, _(b'stop interrupted graft')),
2818 (b'', b'abort', False, _(b'abort interrupted graft')),
2817 (b'', b'abort', False, _(b'abort interrupted graft')),
2819 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2818 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2820 (b'', b'log', None, _(b'append graft info to log message')),
2819 (b'', b'log', None, _(b'append graft info to log message')),
2821 (
2820 (
2822 b'',
2821 b'',
2823 b'no-commit',
2822 b'no-commit',
2824 None,
2823 None,
2825 _(b"don't commit, just apply the changes in working directory"),
2824 _(b"don't commit, just apply the changes in working directory"),
2826 ),
2825 ),
2827 (b'f', b'force', False, _(b'force graft')),
2826 (b'f', b'force', False, _(b'force graft')),
2828 (
2827 (
2829 b'D',
2828 b'D',
2830 b'currentdate',
2829 b'currentdate',
2831 False,
2830 False,
2832 _(b'record the current date as commit date'),
2831 _(b'record the current date as commit date'),
2833 ),
2832 ),
2834 (
2833 (
2835 b'U',
2834 b'U',
2836 b'currentuser',
2835 b'currentuser',
2837 False,
2836 False,
2838 _(b'record the current user as committer'),
2837 _(b'record the current user as committer'),
2839 ),
2838 ),
2840 ]
2839 ]
2841 + commitopts2
2840 + commitopts2
2842 + mergetoolopts
2841 + mergetoolopts
2843 + dryrunopts,
2842 + dryrunopts,
2844 _(b'[OPTION]... [-r REV]... REV...'),
2843 _(b'[OPTION]... [-r REV]... REV...'),
2845 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2844 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2846 )
2845 )
2847 def graft(ui, repo, *revs, **opts):
2846 def graft(ui, repo, *revs, **opts):
2848 '''copy changes from other branches onto the current branch
2847 '''copy changes from other branches onto the current branch
2849
2848
2850 This command uses Mercurial's merge logic to copy individual
2849 This command uses Mercurial's merge logic to copy individual
2851 changes from other branches without merging branches in the
2850 changes from other branches without merging branches in the
2852 history graph. This is sometimes known as 'backporting' or
2851 history graph. This is sometimes known as 'backporting' or
2853 'cherry-picking'. By default, graft will copy user, date, and
2852 'cherry-picking'. By default, graft will copy user, date, and
2854 description from the source changesets.
2853 description from the source changesets.
2855
2854
2856 Changesets that are ancestors of the current revision, that have
2855 Changesets that are ancestors of the current revision, that have
2857 already been grafted, or that are merges will be skipped.
2856 already been grafted, or that are merges will be skipped.
2858
2857
2859 If --log is specified, log messages will have a comment appended
2858 If --log is specified, log messages will have a comment appended
2860 of the form::
2859 of the form::
2861
2860
2862 (grafted from CHANGESETHASH)
2861 (grafted from CHANGESETHASH)
2863
2862
2864 If --force is specified, revisions will be grafted even if they
2863 If --force is specified, revisions will be grafted even if they
2865 are already ancestors of, or have been grafted to, the destination.
2864 are already ancestors of, or have been grafted to, the destination.
2866 This is useful when the revisions have since been backed out.
2865 This is useful when the revisions have since been backed out.
2867
2866
2868 If a graft merge results in conflicts, the graft process is
2867 If a graft merge results in conflicts, the graft process is
2869 interrupted so that the current merge can be manually resolved.
2868 interrupted so that the current merge can be manually resolved.
2870 Once all conflicts are addressed, the graft process can be
2869 Once all conflicts are addressed, the graft process can be
2871 continued with the -c/--continue option.
2870 continued with the -c/--continue option.
2872
2871
2873 The -c/--continue option reapplies all the earlier options.
2872 The -c/--continue option reapplies all the earlier options.
2874
2873
2875 .. container:: verbose
2874 .. container:: verbose
2876
2875
2877 The --base option exposes more of how graft internally uses merge with a
2876 The --base option exposes more of how graft internally uses merge with a
2878 custom base revision. --base can be used to specify another ancestor than
2877 custom base revision. --base can be used to specify another ancestor than
2879 the first and only parent.
2878 the first and only parent.
2880
2879
2881 The command::
2880 The command::
2882
2881
2883 hg graft -r 345 --base 234
2882 hg graft -r 345 --base 234
2884
2883
2885 is thus pretty much the same as::
2884 is thus pretty much the same as::
2886
2885
2887 hg diff -r 234 -r 345 | hg import
2886 hg diff -r 234 -r 345 | hg import
2888
2887
2889 but using merge to resolve conflicts and track moved files.
2888 but using merge to resolve conflicts and track moved files.
2890
2889
2891 The result of a merge can thus be backported as a single commit by
2890 The result of a merge can thus be backported as a single commit by
2892 specifying one of the merge parents as base, and thus effectively
2891 specifying one of the merge parents as base, and thus effectively
2893 grafting the changes from the other side.
2892 grafting the changes from the other side.
2894
2893
2895 It is also possible to collapse multiple changesets and clean up history
2894 It is also possible to collapse multiple changesets and clean up history
2896 by specifying another ancestor as base, much like rebase --collapse
2895 by specifying another ancestor as base, much like rebase --collapse
2897 --keep.
2896 --keep.
2898
2897
2899 The commit message can be tweaked after the fact using commit --amend .
2898 The commit message can be tweaked after the fact using commit --amend .
2900
2899
2901 For using non-ancestors as the base to backout changes, see the backout
2900 For using non-ancestors as the base to backout changes, see the backout
2902 command and the hidden --parent option.
2901 command and the hidden --parent option.
2903
2902
2904 .. container:: verbose
2903 .. container:: verbose
2905
2904
2906 Examples:
2905 Examples:
2907
2906
2908 - copy a single change to the stable branch and edit its description::
2907 - copy a single change to the stable branch and edit its description::
2909
2908
2910 hg update stable
2909 hg update stable
2911 hg graft --edit 9393
2910 hg graft --edit 9393
2912
2911
2913 - graft a range of changesets with one exception, updating dates::
2912 - graft a range of changesets with one exception, updating dates::
2914
2913
2915 hg graft -D "2085::2093 and not 2091"
2914 hg graft -D "2085::2093 and not 2091"
2916
2915
2917 - continue a graft after resolving conflicts::
2916 - continue a graft after resolving conflicts::
2918
2917
2919 hg graft -c
2918 hg graft -c
2920
2919
2921 - show the source of a grafted changeset::
2920 - show the source of a grafted changeset::
2922
2921
2923 hg log --debug -r .
2922 hg log --debug -r .
2924
2923
2925 - show revisions sorted by date::
2924 - show revisions sorted by date::
2926
2925
2927 hg log -r "sort(all(), date)"
2926 hg log -r "sort(all(), date)"
2928
2927
2929 - backport the result of a merge as a single commit::
2928 - backport the result of a merge as a single commit::
2930
2929
2931 hg graft -r 123 --base 123^
2930 hg graft -r 123 --base 123^
2932
2931
2933 - land a feature branch as one changeset::
2932 - land a feature branch as one changeset::
2934
2933
2935 hg up -cr default
2934 hg up -cr default
2936 hg graft -r featureX --base "ancestor('featureX', 'default')"
2935 hg graft -r featureX --base "ancestor('featureX', 'default')"
2937
2936
2938 See :hg:`help revisions` for more about specifying revisions.
2937 See :hg:`help revisions` for more about specifying revisions.
2939
2938
2940 Returns 0 on successful completion.
2939 Returns 0 on successful completion.
2941 '''
2940 '''
2942 with repo.wlock():
2941 with repo.wlock():
2943 return _dograft(ui, repo, *revs, **opts)
2942 return _dograft(ui, repo, *revs, **opts)
2944
2943
2945
2944
2946 def _dograft(ui, repo, *revs, **opts):
2945 def _dograft(ui, repo, *revs, **opts):
2947 opts = pycompat.byteskwargs(opts)
2946 opts = pycompat.byteskwargs(opts)
2948 if revs and opts.get(b'rev'):
2947 if revs and opts.get(b'rev'):
2949 ui.warn(
2948 ui.warn(
2950 _(
2949 _(
2951 b'warning: inconsistent use of --rev might give unexpected '
2950 b'warning: inconsistent use of --rev might give unexpected '
2952 b'revision ordering!\n'
2951 b'revision ordering!\n'
2953 )
2952 )
2954 )
2953 )
2955
2954
2956 revs = list(revs)
2955 revs = list(revs)
2957 revs.extend(opts.get(b'rev'))
2956 revs.extend(opts.get(b'rev'))
2958 basectx = None
2957 basectx = None
2959 if opts.get(b'base'):
2958 if opts.get(b'base'):
2960 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2959 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2961 # a dict of data to be stored in state file
2960 # a dict of data to be stored in state file
2962 statedata = {}
2961 statedata = {}
2963 # list of new nodes created by ongoing graft
2962 # list of new nodes created by ongoing graft
2964 statedata[b'newnodes'] = []
2963 statedata[b'newnodes'] = []
2965
2964
2966 cmdutil.resolvecommitoptions(ui, opts)
2965 cmdutil.resolvecommitoptions(ui, opts)
2967
2966
2968 editor = cmdutil.getcommiteditor(
2967 editor = cmdutil.getcommiteditor(
2969 editform=b'graft', **pycompat.strkwargs(opts)
2968 editform=b'graft', **pycompat.strkwargs(opts)
2970 )
2969 )
2971
2970
2972 cont = False
2971 cont = False
2973 if opts.get(b'no_commit'):
2972 if opts.get(b'no_commit'):
2974 if opts.get(b'edit'):
2973 if opts.get(b'edit'):
2975 raise error.Abort(
2974 raise error.Abort(
2976 _(b"cannot specify --no-commit and --edit together")
2975 _(b"cannot specify --no-commit and --edit together")
2977 )
2976 )
2978 if opts.get(b'currentuser'):
2977 if opts.get(b'currentuser'):
2979 raise error.Abort(
2978 raise error.Abort(
2980 _(b"cannot specify --no-commit and --currentuser together")
2979 _(b"cannot specify --no-commit and --currentuser together")
2981 )
2980 )
2982 if opts.get(b'currentdate'):
2981 if opts.get(b'currentdate'):
2983 raise error.Abort(
2982 raise error.Abort(
2984 _(b"cannot specify --no-commit and --currentdate together")
2983 _(b"cannot specify --no-commit and --currentdate together")
2985 )
2984 )
2986 if opts.get(b'log'):
2985 if opts.get(b'log'):
2987 raise error.Abort(
2986 raise error.Abort(
2988 _(b"cannot specify --no-commit and --log together")
2987 _(b"cannot specify --no-commit and --log together")
2989 )
2988 )
2990
2989
2991 graftstate = statemod.cmdstate(repo, b'graftstate')
2990 graftstate = statemod.cmdstate(repo, b'graftstate')
2992
2991
2993 if opts.get(b'stop'):
2992 if opts.get(b'stop'):
2994 if opts.get(b'continue'):
2993 if opts.get(b'continue'):
2995 raise error.Abort(
2994 raise error.Abort(
2996 _(b"cannot use '--continue' and '--stop' together")
2995 _(b"cannot use '--continue' and '--stop' together")
2997 )
2996 )
2998 if opts.get(b'abort'):
2997 if opts.get(b'abort'):
2999 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
2998 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3000
2999
3001 if any(
3000 if any(
3002 (
3001 (
3003 opts.get(b'edit'),
3002 opts.get(b'edit'),
3004 opts.get(b'log'),
3003 opts.get(b'log'),
3005 opts.get(b'user'),
3004 opts.get(b'user'),
3006 opts.get(b'date'),
3005 opts.get(b'date'),
3007 opts.get(b'currentdate'),
3006 opts.get(b'currentdate'),
3008 opts.get(b'currentuser'),
3007 opts.get(b'currentuser'),
3009 opts.get(b'rev'),
3008 opts.get(b'rev'),
3010 )
3009 )
3011 ):
3010 ):
3012 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3011 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3013 return _stopgraft(ui, repo, graftstate)
3012 return _stopgraft(ui, repo, graftstate)
3014 elif opts.get(b'abort'):
3013 elif opts.get(b'abort'):
3015 if opts.get(b'continue'):
3014 if opts.get(b'continue'):
3016 raise error.Abort(
3015 raise error.Abort(
3017 _(b"cannot use '--continue' and '--abort' together")
3016 _(b"cannot use '--continue' and '--abort' together")
3018 )
3017 )
3019 if any(
3018 if any(
3020 (
3019 (
3021 opts.get(b'edit'),
3020 opts.get(b'edit'),
3022 opts.get(b'log'),
3021 opts.get(b'log'),
3023 opts.get(b'user'),
3022 opts.get(b'user'),
3024 opts.get(b'date'),
3023 opts.get(b'date'),
3025 opts.get(b'currentdate'),
3024 opts.get(b'currentdate'),
3026 opts.get(b'currentuser'),
3025 opts.get(b'currentuser'),
3027 opts.get(b'rev'),
3026 opts.get(b'rev'),
3028 )
3027 )
3029 ):
3028 ):
3030 raise error.Abort(
3029 raise error.Abort(
3031 _(b"cannot specify any other flag with '--abort'")
3030 _(b"cannot specify any other flag with '--abort'")
3032 )
3031 )
3033
3032
3034 return cmdutil.abortgraft(ui, repo, graftstate)
3033 return cmdutil.abortgraft(ui, repo, graftstate)
3035 elif opts.get(b'continue'):
3034 elif opts.get(b'continue'):
3036 cont = True
3035 cont = True
3037 if revs:
3036 if revs:
3038 raise error.Abort(_(b"can't specify --continue and revisions"))
3037 raise error.Abort(_(b"can't specify --continue and revisions"))
3039 # read in unfinished revisions
3038 # read in unfinished revisions
3040 if graftstate.exists():
3039 if graftstate.exists():
3041 statedata = cmdutil.readgraftstate(repo, graftstate)
3040 statedata = cmdutil.readgraftstate(repo, graftstate)
3042 if statedata.get(b'date'):
3041 if statedata.get(b'date'):
3043 opts[b'date'] = statedata[b'date']
3042 opts[b'date'] = statedata[b'date']
3044 if statedata.get(b'user'):
3043 if statedata.get(b'user'):
3045 opts[b'user'] = statedata[b'user']
3044 opts[b'user'] = statedata[b'user']
3046 if statedata.get(b'log'):
3045 if statedata.get(b'log'):
3047 opts[b'log'] = True
3046 opts[b'log'] = True
3048 if statedata.get(b'no_commit'):
3047 if statedata.get(b'no_commit'):
3049 opts[b'no_commit'] = statedata.get(b'no_commit')
3048 opts[b'no_commit'] = statedata.get(b'no_commit')
3050 nodes = statedata[b'nodes']
3049 nodes = statedata[b'nodes']
3051 revs = [repo[node].rev() for node in nodes]
3050 revs = [repo[node].rev() for node in nodes]
3052 else:
3051 else:
3053 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3052 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3054 else:
3053 else:
3055 if not revs:
3054 if not revs:
3056 raise error.Abort(_(b'no revisions specified'))
3055 raise error.Abort(_(b'no revisions specified'))
3057 cmdutil.checkunfinished(repo)
3056 cmdutil.checkunfinished(repo)
3058 cmdutil.bailifchanged(repo)
3057 cmdutil.bailifchanged(repo)
3059 revs = scmutil.revrange(repo, revs)
3058 revs = scmutil.revrange(repo, revs)
3060
3059
3061 skipped = set()
3060 skipped = set()
3062 if basectx is None:
3061 if basectx is None:
3063 # check for merges
3062 # check for merges
3064 for rev in repo.revs(b'%ld and merge()', revs):
3063 for rev in repo.revs(b'%ld and merge()', revs):
3065 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3064 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3066 skipped.add(rev)
3065 skipped.add(rev)
3067 revs = [r for r in revs if r not in skipped]
3066 revs = [r for r in revs if r not in skipped]
3068 if not revs:
3067 if not revs:
3069 return -1
3068 return -1
3070 if basectx is not None and len(revs) != 1:
3069 if basectx is not None and len(revs) != 1:
3071 raise error.Abort(_(b'only one revision allowed with --base '))
3070 raise error.Abort(_(b'only one revision allowed with --base '))
3072
3071
3073 # Don't check in the --continue case, in effect retaining --force across
3072 # Don't check in the --continue case, in effect retaining --force across
3074 # --continues. That's because without --force, any revisions we decided to
3073 # --continues. That's because without --force, any revisions we decided to
3075 # skip would have been filtered out here, so they wouldn't have made their
3074 # skip would have been filtered out here, so they wouldn't have made their
3076 # way to the graftstate. With --force, any revisions we would have otherwise
3075 # way to the graftstate. With --force, any revisions we would have otherwise
3077 # skipped would not have been filtered out, and if they hadn't been applied
3076 # skipped would not have been filtered out, and if they hadn't been applied
3078 # already, they'd have been in the graftstate.
3077 # already, they'd have been in the graftstate.
3079 if not (cont or opts.get(b'force')) and basectx is None:
3078 if not (cont or opts.get(b'force')) and basectx is None:
3080 # check for ancestors of dest branch
3079 # check for ancestors of dest branch
3081 crev = repo[b'.'].rev()
3080 crev = repo[b'.'].rev()
3082 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3081 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3083 # XXX make this lazy in the future
3082 # XXX make this lazy in the future
3084 # don't mutate while iterating, create a copy
3083 # don't mutate while iterating, create a copy
3085 for rev in list(revs):
3084 for rev in list(revs):
3086 if rev in ancestors:
3085 if rev in ancestors:
3087 ui.warn(
3086 ui.warn(
3088 _(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
3087 _(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
3089 )
3088 )
3090 # XXX remove on list is slow
3089 # XXX remove on list is slow
3091 revs.remove(rev)
3090 revs.remove(rev)
3092 if not revs:
3091 if not revs:
3093 return -1
3092 return -1
3094
3093
3095 # analyze revs for earlier grafts
3094 # analyze revs for earlier grafts
3096 ids = {}
3095 ids = {}
3097 for ctx in repo.set(b"%ld", revs):
3096 for ctx in repo.set(b"%ld", revs):
3098 ids[ctx.hex()] = ctx.rev()
3097 ids[ctx.hex()] = ctx.rev()
3099 n = ctx.extra().get(b'source')
3098 n = ctx.extra().get(b'source')
3100 if n:
3099 if n:
3101 ids[n] = ctx.rev()
3100 ids[n] = ctx.rev()
3102
3101
3103 # check ancestors for earlier grafts
3102 # check ancestors for earlier grafts
3104 ui.debug(b'scanning for duplicate grafts\n')
3103 ui.debug(b'scanning for duplicate grafts\n')
3105
3104
3106 # The only changesets we can be sure doesn't contain grafts of any
3105 # The only changesets we can be sure doesn't contain grafts of any
3107 # revs, are the ones that are common ancestors of *all* revs:
3106 # revs, are the ones that are common ancestors of *all* revs:
3108 for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs):
3107 for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs):
3109 ctx = repo[rev]
3108 ctx = repo[rev]
3110 n = ctx.extra().get(b'source')
3109 n = ctx.extra().get(b'source')
3111 if n in ids:
3110 if n in ids:
3112 try:
3111 try:
3113 r = repo[n].rev()
3112 r = repo[n].rev()
3114 except error.RepoLookupError:
3113 except error.RepoLookupError:
3115 r = None
3114 r = None
3116 if r in revs:
3115 if r in revs:
3117 ui.warn(
3116 ui.warn(
3118 _(
3117 _(
3119 b'skipping revision %d:%s '
3118 b'skipping revision %d:%s '
3120 b'(already grafted to %d:%s)\n'
3119 b'(already grafted to %d:%s)\n'
3121 )
3120 )
3122 % (r, repo[r], rev, ctx)
3121 % (r, repo[r], rev, ctx)
3123 )
3122 )
3124 revs.remove(r)
3123 revs.remove(r)
3125 elif ids[n] in revs:
3124 elif ids[n] in revs:
3126 if r is None:
3125 if r is None:
3127 ui.warn(
3126 ui.warn(
3128 _(
3127 _(
3129 b'skipping already grafted revision %d:%s '
3128 b'skipping already grafted revision %d:%s '
3130 b'(%d:%s also has unknown origin %s)\n'
3129 b'(%d:%s also has unknown origin %s)\n'
3131 )
3130 )
3132 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3131 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3133 )
3132 )
3134 else:
3133 else:
3135 ui.warn(
3134 ui.warn(
3136 _(
3135 _(
3137 b'skipping already grafted revision %d:%s '
3136 b'skipping already grafted revision %d:%s '
3138 b'(%d:%s also has origin %d:%s)\n'
3137 b'(%d:%s also has origin %d:%s)\n'
3139 )
3138 )
3140 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3139 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3141 )
3140 )
3142 revs.remove(ids[n])
3141 revs.remove(ids[n])
3143 elif ctx.hex() in ids:
3142 elif ctx.hex() in ids:
3144 r = ids[ctx.hex()]
3143 r = ids[ctx.hex()]
3145 if r in revs:
3144 if r in revs:
3146 ui.warn(
3145 ui.warn(
3147 _(
3146 _(
3148 b'skipping already grafted revision %d:%s '
3147 b'skipping already grafted revision %d:%s '
3149 b'(was grafted from %d:%s)\n'
3148 b'(was grafted from %d:%s)\n'
3150 )
3149 )
3151 % (r, repo[r], rev, ctx)
3150 % (r, repo[r], rev, ctx)
3152 )
3151 )
3153 revs.remove(r)
3152 revs.remove(r)
3154 if not revs:
3153 if not revs:
3155 return -1
3154 return -1
3156
3155
3157 if opts.get(b'no_commit'):
3156 if opts.get(b'no_commit'):
3158 statedata[b'no_commit'] = True
3157 statedata[b'no_commit'] = True
3159 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3158 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3160 desc = b'%d:%s "%s"' % (
3159 desc = b'%d:%s "%s"' % (
3161 ctx.rev(),
3160 ctx.rev(),
3162 ctx,
3161 ctx,
3163 ctx.description().split(b'\n', 1)[0],
3162 ctx.description().split(b'\n', 1)[0],
3164 )
3163 )
3165 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3164 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3166 if names:
3165 if names:
3167 desc += b' (%s)' % b' '.join(names)
3166 desc += b' (%s)' % b' '.join(names)
3168 ui.status(_(b'grafting %s\n') % desc)
3167 ui.status(_(b'grafting %s\n') % desc)
3169 if opts.get(b'dry_run'):
3168 if opts.get(b'dry_run'):
3170 continue
3169 continue
3171
3170
3172 source = ctx.extra().get(b'source')
3171 source = ctx.extra().get(b'source')
3173 extra = {}
3172 extra = {}
3174 if source:
3173 if source:
3175 extra[b'source'] = source
3174 extra[b'source'] = source
3176 extra[b'intermediate-source'] = ctx.hex()
3175 extra[b'intermediate-source'] = ctx.hex()
3177 else:
3176 else:
3178 extra[b'source'] = ctx.hex()
3177 extra[b'source'] = ctx.hex()
3179 user = ctx.user()
3178 user = ctx.user()
3180 if opts.get(b'user'):
3179 if opts.get(b'user'):
3181 user = opts[b'user']
3180 user = opts[b'user']
3182 statedata[b'user'] = user
3181 statedata[b'user'] = user
3183 date = ctx.date()
3182 date = ctx.date()
3184 if opts.get(b'date'):
3183 if opts.get(b'date'):
3185 date = opts[b'date']
3184 date = opts[b'date']
3186 statedata[b'date'] = date
3185 statedata[b'date'] = date
3187 message = ctx.description()
3186 message = ctx.description()
3188 if opts.get(b'log'):
3187 if opts.get(b'log'):
3189 message += b'\n(grafted from %s)' % ctx.hex()
3188 message += b'\n(grafted from %s)' % ctx.hex()
3190 statedata[b'log'] = True
3189 statedata[b'log'] = True
3191
3190
3192 # we don't merge the first commit when continuing
3191 # we don't merge the first commit when continuing
3193 if not cont:
3192 if not cont:
3194 # perform the graft merge with p1(rev) as 'ancestor'
3193 # perform the graft merge with p1(rev) as 'ancestor'
3195 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3194 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3196 base = ctx.p1() if basectx is None else basectx
3195 base = ctx.p1() if basectx is None else basectx
3197 with ui.configoverride(overrides, b'graft'):
3196 with ui.configoverride(overrides, b'graft'):
3198 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3197 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3199 # report any conflicts
3198 # report any conflicts
3200 if stats.unresolvedcount > 0:
3199 if stats.unresolvedcount > 0:
3201 # write out state for --continue
3200 # write out state for --continue
3202 nodes = [repo[rev].hex() for rev in revs[pos:]]
3201 nodes = [repo[rev].hex() for rev in revs[pos:]]
3203 statedata[b'nodes'] = nodes
3202 statedata[b'nodes'] = nodes
3204 stateversion = 1
3203 stateversion = 1
3205 graftstate.save(stateversion, statedata)
3204 graftstate.save(stateversion, statedata)
3206 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3205 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3207 raise error.Abort(
3206 raise error.Abort(
3208 _(b"unresolved conflicts, can't continue"), hint=hint
3207 _(b"unresolved conflicts, can't continue"), hint=hint
3209 )
3208 )
3210 else:
3209 else:
3211 cont = False
3210 cont = False
3212
3211
3213 # commit if --no-commit is false
3212 # commit if --no-commit is false
3214 if not opts.get(b'no_commit'):
3213 if not opts.get(b'no_commit'):
3215 node = repo.commit(
3214 node = repo.commit(
3216 text=message, user=user, date=date, extra=extra, editor=editor
3215 text=message, user=user, date=date, extra=extra, editor=editor
3217 )
3216 )
3218 if node is None:
3217 if node is None:
3219 ui.warn(
3218 ui.warn(
3220 _(b'note: graft of %d:%s created no changes to commit\n')
3219 _(b'note: graft of %d:%s created no changes to commit\n')
3221 % (ctx.rev(), ctx)
3220 % (ctx.rev(), ctx)
3222 )
3221 )
3223 # checking that newnodes exist because old state files won't have it
3222 # checking that newnodes exist because old state files won't have it
3224 elif statedata.get(b'newnodes') is not None:
3223 elif statedata.get(b'newnodes') is not None:
3225 statedata[b'newnodes'].append(node)
3224 statedata[b'newnodes'].append(node)
3226
3225
3227 # remove state when we complete successfully
3226 # remove state when we complete successfully
3228 if not opts.get(b'dry_run'):
3227 if not opts.get(b'dry_run'):
3229 graftstate.delete()
3228 graftstate.delete()
3230
3229
3231 return 0
3230 return 0
3232
3231
3233
3232
3234 def _stopgraft(ui, repo, graftstate):
3233 def _stopgraft(ui, repo, graftstate):
3235 """stop the interrupted graft"""
3234 """stop the interrupted graft"""
3236 if not graftstate.exists():
3235 if not graftstate.exists():
3237 raise error.Abort(_(b"no interrupted graft found"))
3236 raise error.Abort(_(b"no interrupted graft found"))
3238 pctx = repo[b'.']
3237 pctx = repo[b'.']
3239 hg.updaterepo(repo, pctx.node(), overwrite=True)
3238 hg.updaterepo(repo, pctx.node(), overwrite=True)
3240 graftstate.delete()
3239 graftstate.delete()
3241 ui.status(_(b"stopped the interrupted graft\n"))
3240 ui.status(_(b"stopped the interrupted graft\n"))
3242 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3241 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3243 return 0
3242 return 0
3244
3243
3245
3244
3246 statemod.addunfinished(
3245 statemod.addunfinished(
3247 b'graft',
3246 b'graft',
3248 fname=b'graftstate',
3247 fname=b'graftstate',
3249 clearable=True,
3248 clearable=True,
3250 stopflag=True,
3249 stopflag=True,
3251 continueflag=True,
3250 continueflag=True,
3252 abortfunc=cmdutil.hgabortgraft,
3251 abortfunc=cmdutil.hgabortgraft,
3253 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3252 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3254 )
3253 )
3255
3254
3256
3255
3257 @command(
3256 @command(
3258 b'grep',
3257 b'grep',
3259 [
3258 [
3260 (b'0', b'print0', None, _(b'end fields with NUL')),
3259 (b'0', b'print0', None, _(b'end fields with NUL')),
3261 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3260 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3262 (
3261 (
3263 b'',
3262 b'',
3264 b'diff',
3263 b'diff',
3265 None,
3264 None,
3266 _(
3265 _(
3267 b'search revision differences for when the pattern was added '
3266 b'search revision differences for when the pattern was added '
3268 b'or removed'
3267 b'or removed'
3269 ),
3268 ),
3270 ),
3269 ),
3271 (b'a', b'text', None, _(b'treat all files as text')),
3270 (b'a', b'text', None, _(b'treat all files as text')),
3272 (
3271 (
3273 b'f',
3272 b'f',
3274 b'follow',
3273 b'follow',
3275 None,
3274 None,
3276 _(
3275 _(
3277 b'follow changeset history,'
3276 b'follow changeset history,'
3278 b' or file history across copies and renames'
3277 b' or file history across copies and renames'
3279 ),
3278 ),
3280 ),
3279 ),
3281 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3280 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3282 (
3281 (
3283 b'l',
3282 b'l',
3284 b'files-with-matches',
3283 b'files-with-matches',
3285 None,
3284 None,
3286 _(b'print only filenames and revisions that match'),
3285 _(b'print only filenames and revisions that match'),
3287 ),
3286 ),
3288 (b'n', b'line-number', None, _(b'print matching line numbers')),
3287 (b'n', b'line-number', None, _(b'print matching line numbers')),
3289 (
3288 (
3290 b'r',
3289 b'r',
3291 b'rev',
3290 b'rev',
3292 [],
3291 [],
3293 _(b'search files changed within revision range'),
3292 _(b'search files changed within revision range'),
3294 _(b'REV'),
3293 _(b'REV'),
3295 ),
3294 ),
3296 (
3295 (
3297 b'',
3296 b'',
3298 b'all-files',
3297 b'all-files',
3299 None,
3298 None,
3300 _(
3299 _(
3301 b'include all files in the changeset while grepping (DEPRECATED)'
3300 b'include all files in the changeset while grepping (DEPRECATED)'
3302 ),
3301 ),
3303 ),
3302 ),
3304 (b'u', b'user', None, _(b'list the author (long with -v)')),
3303 (b'u', b'user', None, _(b'list the author (long with -v)')),
3305 (b'd', b'date', None, _(b'list the date (short with -q)')),
3304 (b'd', b'date', None, _(b'list the date (short with -q)')),
3306 ]
3305 ]
3307 + formatteropts
3306 + formatteropts
3308 + walkopts,
3307 + walkopts,
3309 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3308 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3310 helpcategory=command.CATEGORY_FILE_CONTENTS,
3309 helpcategory=command.CATEGORY_FILE_CONTENTS,
3311 inferrepo=True,
3310 inferrepo=True,
3312 intents={INTENT_READONLY},
3311 intents={INTENT_READONLY},
3313 )
3312 )
3314 def grep(ui, repo, pattern, *pats, **opts):
3313 def grep(ui, repo, pattern, *pats, **opts):
3315 """search for a pattern in specified files
3314 """search for a pattern in specified files
3316
3315
3317 Search the working directory or revision history for a regular
3316 Search the working directory or revision history for a regular
3318 expression in the specified files for the entire repository.
3317 expression in the specified files for the entire repository.
3319
3318
3320 By default, grep searches the repository files in the working
3319 By default, grep searches the repository files in the working
3321 directory and prints the files where it finds a match. To specify
3320 directory and prints the files where it finds a match. To specify
3322 historical revisions instead of the working directory, use the
3321 historical revisions instead of the working directory, use the
3323 --rev flag.
3322 --rev flag.
3324
3323
3325 To search instead historical revision differences that contains a
3324 To search instead historical revision differences that contains a
3326 change in match status ("-" for a match that becomes a non-match,
3325 change in match status ("-" for a match that becomes a non-match,
3327 or "+" for a non-match that becomes a match), use the --diff flag.
3326 or "+" for a non-match that becomes a match), use the --diff flag.
3328
3327
3329 PATTERN can be any Python (roughly Perl-compatible) regular
3328 PATTERN can be any Python (roughly Perl-compatible) regular
3330 expression.
3329 expression.
3331
3330
3332 If no FILEs are specified and the --rev flag isn't supplied, all
3331 If no FILEs are specified and the --rev flag isn't supplied, all
3333 files in the working directory are searched. When using the --rev
3332 files in the working directory are searched. When using the --rev
3334 flag and specifying FILEs, use the --follow argument to also
3333 flag and specifying FILEs, use the --follow argument to also
3335 follow the specified FILEs across renames and copies.
3334 follow the specified FILEs across renames and copies.
3336
3335
3337 .. container:: verbose
3336 .. container:: verbose
3338
3337
3339 Template:
3338 Template:
3340
3339
3341 The following keywords are supported in addition to the common template
3340 The following keywords are supported in addition to the common template
3342 keywords and functions. See also :hg:`help templates`.
3341 keywords and functions. See also :hg:`help templates`.
3343
3342
3344 :change: String. Character denoting insertion ``+`` or removal ``-``.
3343 :change: String. Character denoting insertion ``+`` or removal ``-``.
3345 Available if ``--diff`` is specified.
3344 Available if ``--diff`` is specified.
3346 :lineno: Integer. Line number of the match.
3345 :lineno: Integer. Line number of the match.
3347 :path: String. Repository-absolute path of the file.
3346 :path: String. Repository-absolute path of the file.
3348 :texts: List of text chunks.
3347 :texts: List of text chunks.
3349
3348
3350 And each entry of ``{texts}`` provides the following sub-keywords.
3349 And each entry of ``{texts}`` provides the following sub-keywords.
3351
3350
3352 :matched: Boolean. True if the chunk matches the specified pattern.
3351 :matched: Boolean. True if the chunk matches the specified pattern.
3353 :text: String. Chunk content.
3352 :text: String. Chunk content.
3354
3353
3355 See :hg:`help templates.operators` for the list expansion syntax.
3354 See :hg:`help templates.operators` for the list expansion syntax.
3356
3355
3357 Returns 0 if a match is found, 1 otherwise.
3356 Returns 0 if a match is found, 1 otherwise.
3358
3357
3359 """
3358 """
3360 opts = pycompat.byteskwargs(opts)
3359 opts = pycompat.byteskwargs(opts)
3361 diff = opts.get(b'all') or opts.get(b'diff')
3360 diff = opts.get(b'all') or opts.get(b'diff')
3362 if diff and opts.get(b'all_files'):
3361 if diff and opts.get(b'all_files'):
3363 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3362 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3364 if opts.get(b'all_files') is None and not diff:
3363 if opts.get(b'all_files') is None and not diff:
3365 opts[b'all_files'] = True
3364 opts[b'all_files'] = True
3366 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3365 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3367 all_files = opts.get(b'all_files')
3366 all_files = opts.get(b'all_files')
3368 if plaingrep:
3367 if plaingrep:
3369 opts[b'rev'] = [b'wdir()']
3368 opts[b'rev'] = [b'wdir()']
3370
3369
3371 reflags = re.M
3370 reflags = re.M
3372 if opts.get(b'ignore_case'):
3371 if opts.get(b'ignore_case'):
3373 reflags |= re.I
3372 reflags |= re.I
3374 try:
3373 try:
3375 regexp = util.re.compile(pattern, reflags)
3374 regexp = util.re.compile(pattern, reflags)
3376 except re.error as inst:
3375 except re.error as inst:
3377 ui.warn(
3376 ui.warn(
3378 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3377 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3379 )
3378 )
3380 return 1
3379 return 1
3381 sep, eol = b':', b'\n'
3380 sep, eol = b':', b'\n'
3382 if opts.get(b'print0'):
3381 if opts.get(b'print0'):
3383 sep = eol = b'\0'
3382 sep = eol = b'\0'
3384
3383
3385 getfile = util.lrucachefunc(repo.file)
3384 getfile = util.lrucachefunc(repo.file)
3386
3385
3387 def matchlines(body):
3386 def matchlines(body):
3388 begin = 0
3387 begin = 0
3389 linenum = 0
3388 linenum = 0
3390 while begin < len(body):
3389 while begin < len(body):
3391 match = regexp.search(body, begin)
3390 match = regexp.search(body, begin)
3392 if not match:
3391 if not match:
3393 break
3392 break
3394 mstart, mend = match.span()
3393 mstart, mend = match.span()
3395 linenum += body.count(b'\n', begin, mstart) + 1
3394 linenum += body.count(b'\n', begin, mstart) + 1
3396 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3395 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3397 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3396 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3398 lend = begin - 1
3397 lend = begin - 1
3399 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3398 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3400
3399
3401 class linestate(object):
3400 class linestate(object):
3402 def __init__(self, line, linenum, colstart, colend):
3401 def __init__(self, line, linenum, colstart, colend):
3403 self.line = line
3402 self.line = line
3404 self.linenum = linenum
3403 self.linenum = linenum
3405 self.colstart = colstart
3404 self.colstart = colstart
3406 self.colend = colend
3405 self.colend = colend
3407
3406
3408 def __hash__(self):
3407 def __hash__(self):
3409 return hash((self.linenum, self.line))
3408 return hash((self.linenum, self.line))
3410
3409
3411 def __eq__(self, other):
3410 def __eq__(self, other):
3412 return self.line == other.line
3411 return self.line == other.line
3413
3412
3414 def findpos(self):
3413 def findpos(self):
3415 """Iterate all (start, end) indices of matches"""
3414 """Iterate all (start, end) indices of matches"""
3416 yield self.colstart, self.colend
3415 yield self.colstart, self.colend
3417 p = self.colend
3416 p = self.colend
3418 while p < len(self.line):
3417 while p < len(self.line):
3419 m = regexp.search(self.line, p)
3418 m = regexp.search(self.line, p)
3420 if not m:
3419 if not m:
3421 break
3420 break
3422 yield m.span()
3421 yield m.span()
3423 p = m.end()
3422 p = m.end()
3424
3423
3425 matches = {}
3424 matches = {}
3426 copies = {}
3425 copies = {}
3427
3426
3428 def grepbody(fn, rev, body):
3427 def grepbody(fn, rev, body):
3429 matches[rev].setdefault(fn, [])
3428 matches[rev].setdefault(fn, [])
3430 m = matches[rev][fn]
3429 m = matches[rev][fn]
3431 if body is None:
3430 if body is None:
3432 return
3431 return
3433
3432
3434 for lnum, cstart, cend, line in matchlines(body):
3433 for lnum, cstart, cend, line in matchlines(body):
3435 s = linestate(line, lnum, cstart, cend)
3434 s = linestate(line, lnum, cstart, cend)
3436 m.append(s)
3435 m.append(s)
3437
3436
3438 def difflinestates(a, b):
3437 def difflinestates(a, b):
3439 sm = difflib.SequenceMatcher(None, a, b)
3438 sm = difflib.SequenceMatcher(None, a, b)
3440 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3439 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3441 if tag == 'insert':
3440 if tag == 'insert':
3442 for i in pycompat.xrange(blo, bhi):
3441 for i in pycompat.xrange(blo, bhi):
3443 yield (b'+', b[i])
3442 yield (b'+', b[i])
3444 elif tag == 'delete':
3443 elif tag == 'delete':
3445 for i in pycompat.xrange(alo, ahi):
3444 for i in pycompat.xrange(alo, ahi):
3446 yield (b'-', a[i])
3445 yield (b'-', a[i])
3447 elif tag == 'replace':
3446 elif tag == 'replace':
3448 for i in pycompat.xrange(alo, ahi):
3447 for i in pycompat.xrange(alo, ahi):
3449 yield (b'-', a[i])
3448 yield (b'-', a[i])
3450 for i in pycompat.xrange(blo, bhi):
3449 for i in pycompat.xrange(blo, bhi):
3451 yield (b'+', b[i])
3450 yield (b'+', b[i])
3452
3451
3453 uipathfn = scmutil.getuipathfn(repo)
3452 uipathfn = scmutil.getuipathfn(repo)
3454
3453
3455 def display(fm, fn, ctx, pstates, states):
3454 def display(fm, fn, ctx, pstates, states):
3456 rev = scmutil.intrev(ctx)
3455 rev = scmutil.intrev(ctx)
3457 if fm.isplain():
3456 if fm.isplain():
3458 formatuser = ui.shortuser
3457 formatuser = ui.shortuser
3459 else:
3458 else:
3460 formatuser = pycompat.bytestr
3459 formatuser = pycompat.bytestr
3461 if ui.quiet:
3460 if ui.quiet:
3462 datefmt = b'%Y-%m-%d'
3461 datefmt = b'%Y-%m-%d'
3463 else:
3462 else:
3464 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3463 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3465 found = False
3464 found = False
3466
3465
3467 @util.cachefunc
3466 @util.cachefunc
3468 def binary():
3467 def binary():
3469 flog = getfile(fn)
3468 flog = getfile(fn)
3470 try:
3469 try:
3471 return stringutil.binary(flog.read(ctx.filenode(fn)))
3470 return stringutil.binary(flog.read(ctx.filenode(fn)))
3472 except error.WdirUnsupported:
3471 except error.WdirUnsupported:
3473 return ctx[fn].isbinary()
3472 return ctx[fn].isbinary()
3474
3473
3475 fieldnamemap = {b'linenumber': b'lineno'}
3474 fieldnamemap = {b'linenumber': b'lineno'}
3476 if diff:
3475 if diff:
3477 iter = difflinestates(pstates, states)
3476 iter = difflinestates(pstates, states)
3478 else:
3477 else:
3479 iter = [(b'', l) for l in states]
3478 iter = [(b'', l) for l in states]
3480 for change, l in iter:
3479 for change, l in iter:
3481 fm.startitem()
3480 fm.startitem()
3482 fm.context(ctx=ctx)
3481 fm.context(ctx=ctx)
3483 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3482 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3484 fm.plain(uipathfn(fn), label=b'grep.filename')
3483 fm.plain(uipathfn(fn), label=b'grep.filename')
3485
3484
3486 cols = [
3485 cols = [
3487 (b'rev', b'%d', rev, not plaingrep, b''),
3486 (b'rev', b'%d', rev, not plaingrep, b''),
3488 (
3487 (
3489 b'linenumber',
3488 b'linenumber',
3490 b'%d',
3489 b'%d',
3491 l.linenum,
3490 l.linenum,
3492 opts.get(b'line_number'),
3491 opts.get(b'line_number'),
3493 b'',
3492 b'',
3494 ),
3493 ),
3495 ]
3494 ]
3496 if diff:
3495 if diff:
3497 cols.append(
3496 cols.append(
3498 (
3497 (
3499 b'change',
3498 b'change',
3500 b'%s',
3499 b'%s',
3501 change,
3500 change,
3502 True,
3501 True,
3503 b'grep.inserted '
3502 b'grep.inserted '
3504 if change == b'+'
3503 if change == b'+'
3505 else b'grep.deleted ',
3504 else b'grep.deleted ',
3506 )
3505 )
3507 )
3506 )
3508 cols.extend(
3507 cols.extend(
3509 [
3508 [
3510 (
3509 (
3511 b'user',
3510 b'user',
3512 b'%s',
3511 b'%s',
3513 formatuser(ctx.user()),
3512 formatuser(ctx.user()),
3514 opts.get(b'user'),
3513 opts.get(b'user'),
3515 b'',
3514 b'',
3516 ),
3515 ),
3517 (
3516 (
3518 b'date',
3517 b'date',
3519 b'%s',
3518 b'%s',
3520 fm.formatdate(ctx.date(), datefmt),
3519 fm.formatdate(ctx.date(), datefmt),
3521 opts.get(b'date'),
3520 opts.get(b'date'),
3522 b'',
3521 b'',
3523 ),
3522 ),
3524 ]
3523 ]
3525 )
3524 )
3526 for name, fmt, data, cond, extra_label in cols:
3525 for name, fmt, data, cond, extra_label in cols:
3527 if cond:
3526 if cond:
3528 fm.plain(sep, label=b'grep.sep')
3527 fm.plain(sep, label=b'grep.sep')
3529 field = fieldnamemap.get(name, name)
3528 field = fieldnamemap.get(name, name)
3530 label = extra_label + (b'grep.%s' % name)
3529 label = extra_label + (b'grep.%s' % name)
3531 fm.condwrite(cond, field, fmt, data, label=label)
3530 fm.condwrite(cond, field, fmt, data, label=label)
3532 if not opts.get(b'files_with_matches'):
3531 if not opts.get(b'files_with_matches'):
3533 fm.plain(sep, label=b'grep.sep')
3532 fm.plain(sep, label=b'grep.sep')
3534 if not opts.get(b'text') and binary():
3533 if not opts.get(b'text') and binary():
3535 fm.plain(_(b" Binary file matches"))
3534 fm.plain(_(b" Binary file matches"))
3536 else:
3535 else:
3537 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3536 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3538 fm.plain(eol)
3537 fm.plain(eol)
3539 found = True
3538 found = True
3540 if opts.get(b'files_with_matches'):
3539 if opts.get(b'files_with_matches'):
3541 break
3540 break
3542 return found
3541 return found
3543
3542
3544 def displaymatches(fm, l):
3543 def displaymatches(fm, l):
3545 p = 0
3544 p = 0
3546 for s, e in l.findpos():
3545 for s, e in l.findpos():
3547 if p < s:
3546 if p < s:
3548 fm.startitem()
3547 fm.startitem()
3549 fm.write(b'text', b'%s', l.line[p:s])
3548 fm.write(b'text', b'%s', l.line[p:s])
3550 fm.data(matched=False)
3549 fm.data(matched=False)
3551 fm.startitem()
3550 fm.startitem()
3552 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3551 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3553 fm.data(matched=True)
3552 fm.data(matched=True)
3554 p = e
3553 p = e
3555 if p < len(l.line):
3554 if p < len(l.line):
3556 fm.startitem()
3555 fm.startitem()
3557 fm.write(b'text', b'%s', l.line[p:])
3556 fm.write(b'text', b'%s', l.line[p:])
3558 fm.data(matched=False)
3557 fm.data(matched=False)
3559 fm.end()
3558 fm.end()
3560
3559
3561 skip = set()
3560 skip = set()
3562 revfiles = {}
3561 revfiles = {}
3563 match = scmutil.match(repo[None], pats, opts)
3562 match = scmutil.match(repo[None], pats, opts)
3564 found = False
3563 found = False
3565 follow = opts.get(b'follow')
3564 follow = opts.get(b'follow')
3566
3565
3567 getrenamed = scmutil.getrenamedfn(repo)
3566 getrenamed = scmutil.getrenamedfn(repo)
3568
3567
3569 def get_file_content(filename, filelog, filenode, context, revision):
3568 def get_file_content(filename, filelog, filenode, context, revision):
3570 try:
3569 try:
3571 content = filelog.read(filenode)
3570 content = filelog.read(filenode)
3572 except error.WdirUnsupported:
3571 except error.WdirUnsupported:
3573 content = context[filename].data()
3572 content = context[filename].data()
3574 except error.CensoredNodeError:
3573 except error.CensoredNodeError:
3575 content = None
3574 content = None
3576 ui.warn(
3575 ui.warn(
3577 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3576 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3578 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3577 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3579 )
3578 )
3580 return content
3579 return content
3581
3580
3582 def prep(ctx, fns):
3581 def prep(ctx, fns):
3583 rev = ctx.rev()
3582 rev = ctx.rev()
3584 pctx = ctx.p1()
3583 pctx = ctx.p1()
3585 parent = pctx.rev()
3584 parent = pctx.rev()
3586 matches.setdefault(rev, {})
3585 matches.setdefault(rev, {})
3587 matches.setdefault(parent, {})
3586 matches.setdefault(parent, {})
3588 files = revfiles.setdefault(rev, [])
3587 files = revfiles.setdefault(rev, [])
3589 for fn in fns:
3588 for fn in fns:
3590 flog = getfile(fn)
3589 flog = getfile(fn)
3591 try:
3590 try:
3592 fnode = ctx.filenode(fn)
3591 fnode = ctx.filenode(fn)
3593 except error.LookupError:
3592 except error.LookupError:
3594 continue
3593 continue
3595
3594
3596 copy = None
3595 copy = None
3597 if follow:
3596 if follow:
3598 copy = getrenamed(fn, rev)
3597 copy = getrenamed(fn, rev)
3599 if copy:
3598 if copy:
3600 copies.setdefault(rev, {})[fn] = copy
3599 copies.setdefault(rev, {})[fn] = copy
3601 if fn in skip:
3600 if fn in skip:
3602 skip.add(copy)
3601 skip.add(copy)
3603 if fn in skip:
3602 if fn in skip:
3604 continue
3603 continue
3605 files.append(fn)
3604 files.append(fn)
3606
3605
3607 if fn not in matches[rev]:
3606 if fn not in matches[rev]:
3608 content = get_file_content(fn, flog, fnode, ctx, rev)
3607 content = get_file_content(fn, flog, fnode, ctx, rev)
3609 grepbody(fn, rev, content)
3608 grepbody(fn, rev, content)
3610
3609
3611 pfn = copy or fn
3610 pfn = copy or fn
3612 if pfn not in matches[parent]:
3611 if pfn not in matches[parent]:
3613 try:
3612 try:
3614 pfnode = pctx.filenode(pfn)
3613 pfnode = pctx.filenode(pfn)
3615 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3614 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3616 grepbody(pfn, parent, pcontent)
3615 grepbody(pfn, parent, pcontent)
3617 except error.LookupError:
3616 except error.LookupError:
3618 pass
3617 pass
3619
3618
3620 ui.pager(b'grep')
3619 ui.pager(b'grep')
3621 fm = ui.formatter(b'grep', opts)
3620 fm = ui.formatter(b'grep', opts)
3622 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3621 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3623 rev = ctx.rev()
3622 rev = ctx.rev()
3624 parent = ctx.p1().rev()
3623 parent = ctx.p1().rev()
3625 for fn in sorted(revfiles.get(rev, [])):
3624 for fn in sorted(revfiles.get(rev, [])):
3626 states = matches[rev][fn]
3625 states = matches[rev][fn]
3627 copy = copies.get(rev, {}).get(fn)
3626 copy = copies.get(rev, {}).get(fn)
3628 if fn in skip:
3627 if fn in skip:
3629 if copy:
3628 if copy:
3630 skip.add(copy)
3629 skip.add(copy)
3631 continue
3630 continue
3632 pstates = matches.get(parent, {}).get(copy or fn, [])
3631 pstates = matches.get(parent, {}).get(copy or fn, [])
3633 if pstates or states:
3632 if pstates or states:
3634 r = display(fm, fn, ctx, pstates, states)
3633 r = display(fm, fn, ctx, pstates, states)
3635 found = found or r
3634 found = found or r
3636 if r and not diff and not all_files:
3635 if r and not diff and not all_files:
3637 skip.add(fn)
3636 skip.add(fn)
3638 if copy:
3637 if copy:
3639 skip.add(copy)
3638 skip.add(copy)
3640 del revfiles[rev]
3639 del revfiles[rev]
3641 # We will keep the matches dict for the duration of the window
3640 # We will keep the matches dict for the duration of the window
3642 # clear the matches dict once the window is over
3641 # clear the matches dict once the window is over
3643 if not revfiles:
3642 if not revfiles:
3644 matches.clear()
3643 matches.clear()
3645 fm.end()
3644 fm.end()
3646
3645
3647 return not found
3646 return not found
3648
3647
3649
3648
3650 @command(
3649 @command(
3651 b'heads',
3650 b'heads',
3652 [
3651 [
3653 (
3652 (
3654 b'r',
3653 b'r',
3655 b'rev',
3654 b'rev',
3656 b'',
3655 b'',
3657 _(b'show only heads which are descendants of STARTREV'),
3656 _(b'show only heads which are descendants of STARTREV'),
3658 _(b'STARTREV'),
3657 _(b'STARTREV'),
3659 ),
3658 ),
3660 (b't', b'topo', False, _(b'show topological heads only')),
3659 (b't', b'topo', False, _(b'show topological heads only')),
3661 (
3660 (
3662 b'a',
3661 b'a',
3663 b'active',
3662 b'active',
3664 False,
3663 False,
3665 _(b'show active branchheads only (DEPRECATED)'),
3664 _(b'show active branchheads only (DEPRECATED)'),
3666 ),
3665 ),
3667 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3666 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3668 ]
3667 ]
3669 + templateopts,
3668 + templateopts,
3670 _(b'[-ct] [-r STARTREV] [REV]...'),
3669 _(b'[-ct] [-r STARTREV] [REV]...'),
3671 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3670 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3672 intents={INTENT_READONLY},
3671 intents={INTENT_READONLY},
3673 )
3672 )
3674 def heads(ui, repo, *branchrevs, **opts):
3673 def heads(ui, repo, *branchrevs, **opts):
3675 """show branch heads
3674 """show branch heads
3676
3675
3677 With no arguments, show all open branch heads in the repository.
3676 With no arguments, show all open branch heads in the repository.
3678 Branch heads are changesets that have no descendants on the
3677 Branch heads are changesets that have no descendants on the
3679 same branch. They are where development generally takes place and
3678 same branch. They are where development generally takes place and
3680 are the usual targets for update and merge operations.
3679 are the usual targets for update and merge operations.
3681
3680
3682 If one or more REVs are given, only open branch heads on the
3681 If one or more REVs are given, only open branch heads on the
3683 branches associated with the specified changesets are shown. This
3682 branches associated with the specified changesets are shown. This
3684 means that you can use :hg:`heads .` to see the heads on the
3683 means that you can use :hg:`heads .` to see the heads on the
3685 currently checked-out branch.
3684 currently checked-out branch.
3686
3685
3687 If -c/--closed is specified, also show branch heads marked closed
3686 If -c/--closed is specified, also show branch heads marked closed
3688 (see :hg:`commit --close-branch`).
3687 (see :hg:`commit --close-branch`).
3689
3688
3690 If STARTREV is specified, only those heads that are descendants of
3689 If STARTREV is specified, only those heads that are descendants of
3691 STARTREV will be displayed.
3690 STARTREV will be displayed.
3692
3691
3693 If -t/--topo is specified, named branch mechanics will be ignored and only
3692 If -t/--topo is specified, named branch mechanics will be ignored and only
3694 topological heads (changesets with no children) will be shown.
3693 topological heads (changesets with no children) will be shown.
3695
3694
3696 Returns 0 if matching heads are found, 1 if not.
3695 Returns 0 if matching heads are found, 1 if not.
3697 """
3696 """
3698
3697
3699 opts = pycompat.byteskwargs(opts)
3698 opts = pycompat.byteskwargs(opts)
3700 start = None
3699 start = None
3701 rev = opts.get(b'rev')
3700 rev = opts.get(b'rev')
3702 if rev:
3701 if rev:
3703 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3704 start = scmutil.revsingle(repo, rev, None).node()
3703 start = scmutil.revsingle(repo, rev, None).node()
3705
3704
3706 if opts.get(b'topo'):
3705 if opts.get(b'topo'):
3707 heads = [repo[h] for h in repo.heads(start)]
3706 heads = [repo[h] for h in repo.heads(start)]
3708 else:
3707 else:
3709 heads = []
3708 heads = []
3710 for branch in repo.branchmap():
3709 for branch in repo.branchmap():
3711 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3710 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3712 heads = [repo[h] for h in heads]
3711 heads = [repo[h] for h in heads]
3713
3712
3714 if branchrevs:
3713 if branchrevs:
3715 branches = set(
3714 branches = set(
3716 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3715 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3717 )
3716 )
3718 heads = [h for h in heads if h.branch() in branches]
3717 heads = [h for h in heads if h.branch() in branches]
3719
3718
3720 if opts.get(b'active') and branchrevs:
3719 if opts.get(b'active') and branchrevs:
3721 dagheads = repo.heads(start)
3720 dagheads = repo.heads(start)
3722 heads = [h for h in heads if h.node() in dagheads]
3721 heads = [h for h in heads if h.node() in dagheads]
3723
3722
3724 if branchrevs:
3723 if branchrevs:
3725 haveheads = set(h.branch() for h in heads)
3724 haveheads = set(h.branch() for h in heads)
3726 if branches - haveheads:
3725 if branches - haveheads:
3727 headless = b', '.join(b for b in branches - haveheads)
3726 headless = b', '.join(b for b in branches - haveheads)
3728 msg = _(b'no open branch heads found on branches %s')
3727 msg = _(b'no open branch heads found on branches %s')
3729 if opts.get(b'rev'):
3728 if opts.get(b'rev'):
3730 msg += _(b' (started at %s)') % opts[b'rev']
3729 msg += _(b' (started at %s)') % opts[b'rev']
3731 ui.warn((msg + b'\n') % headless)
3730 ui.warn((msg + b'\n') % headless)
3732
3731
3733 if not heads:
3732 if not heads:
3734 return 1
3733 return 1
3735
3734
3736 ui.pager(b'heads')
3735 ui.pager(b'heads')
3737 heads = sorted(heads, key=lambda x: -(x.rev()))
3736 heads = sorted(heads, key=lambda x: -(x.rev()))
3738 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3737 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3739 for ctx in heads:
3738 for ctx in heads:
3740 displayer.show(ctx)
3739 displayer.show(ctx)
3741 displayer.close()
3740 displayer.close()
3742
3741
3743
3742
3744 @command(
3743 @command(
3745 b'help',
3744 b'help',
3746 [
3745 [
3747 (b'e', b'extension', None, _(b'show only help for extensions')),
3746 (b'e', b'extension', None, _(b'show only help for extensions')),
3748 (b'c', b'command', None, _(b'show only help for commands')),
3747 (b'c', b'command', None, _(b'show only help for commands')),
3749 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3748 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3750 (
3749 (
3751 b's',
3750 b's',
3752 b'system',
3751 b'system',
3753 [],
3752 [],
3754 _(b'show help for specific platform(s)'),
3753 _(b'show help for specific platform(s)'),
3755 _(b'PLATFORM'),
3754 _(b'PLATFORM'),
3756 ),
3755 ),
3757 ],
3756 ],
3758 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3757 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3759 helpcategory=command.CATEGORY_HELP,
3758 helpcategory=command.CATEGORY_HELP,
3760 norepo=True,
3759 norepo=True,
3761 intents={INTENT_READONLY},
3760 intents={INTENT_READONLY},
3762 )
3761 )
3763 def help_(ui, name=None, **opts):
3762 def help_(ui, name=None, **opts):
3764 """show help for a given topic or a help overview
3763 """show help for a given topic or a help overview
3765
3764
3766 With no arguments, print a list of commands with short help messages.
3765 With no arguments, print a list of commands with short help messages.
3767
3766
3768 Given a topic, extension, or command name, print help for that
3767 Given a topic, extension, or command name, print help for that
3769 topic.
3768 topic.
3770
3769
3771 Returns 0 if successful.
3770 Returns 0 if successful.
3772 """
3771 """
3773
3772
3774 keep = opts.get('system') or []
3773 keep = opts.get('system') or []
3775 if len(keep) == 0:
3774 if len(keep) == 0:
3776 if pycompat.sysplatform.startswith(b'win'):
3775 if pycompat.sysplatform.startswith(b'win'):
3777 keep.append(b'windows')
3776 keep.append(b'windows')
3778 elif pycompat.sysplatform == b'OpenVMS':
3777 elif pycompat.sysplatform == b'OpenVMS':
3779 keep.append(b'vms')
3778 keep.append(b'vms')
3780 elif pycompat.sysplatform == b'plan9':
3779 elif pycompat.sysplatform == b'plan9':
3781 keep.append(b'plan9')
3780 keep.append(b'plan9')
3782 else:
3781 else:
3783 keep.append(b'unix')
3782 keep.append(b'unix')
3784 keep.append(pycompat.sysplatform.lower())
3783 keep.append(pycompat.sysplatform.lower())
3785 if ui.verbose:
3784 if ui.verbose:
3786 keep.append(b'verbose')
3785 keep.append(b'verbose')
3787
3786
3788 commands = sys.modules[__name__]
3787 commands = sys.modules[__name__]
3789 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3788 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3790 ui.pager(b'help')
3789 ui.pager(b'help')
3791 ui.write(formatted)
3790 ui.write(formatted)
3792
3791
3793
3792
3794 @command(
3793 @command(
3795 b'identify|id',
3794 b'identify|id',
3796 [
3795 [
3797 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3796 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3798 (b'n', b'num', None, _(b'show local revision number')),
3797 (b'n', b'num', None, _(b'show local revision number')),
3799 (b'i', b'id', None, _(b'show global revision id')),
3798 (b'i', b'id', None, _(b'show global revision id')),
3800 (b'b', b'branch', None, _(b'show branch')),
3799 (b'b', b'branch', None, _(b'show branch')),
3801 (b't', b'tags', None, _(b'show tags')),
3800 (b't', b'tags', None, _(b'show tags')),
3802 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3801 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3803 ]
3802 ]
3804 + remoteopts
3803 + remoteopts
3805 + formatteropts,
3804 + formatteropts,
3806 _(b'[-nibtB] [-r REV] [SOURCE]'),
3805 _(b'[-nibtB] [-r REV] [SOURCE]'),
3807 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3806 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3808 optionalrepo=True,
3807 optionalrepo=True,
3809 intents={INTENT_READONLY},
3808 intents={INTENT_READONLY},
3810 )
3809 )
3811 def identify(
3810 def identify(
3812 ui,
3811 ui,
3813 repo,
3812 repo,
3814 source=None,
3813 source=None,
3815 rev=None,
3814 rev=None,
3816 num=None,
3815 num=None,
3817 id=None,
3816 id=None,
3818 branch=None,
3817 branch=None,
3819 tags=None,
3818 tags=None,
3820 bookmarks=None,
3819 bookmarks=None,
3821 **opts
3820 **opts
3822 ):
3821 ):
3823 """identify the working directory or specified revision
3822 """identify the working directory or specified revision
3824
3823
3825 Print a summary identifying the repository state at REV using one or
3824 Print a summary identifying the repository state at REV using one or
3826 two parent hash identifiers, followed by a "+" if the working
3825 two parent hash identifiers, followed by a "+" if the working
3827 directory has uncommitted changes, the branch name (if not default),
3826 directory has uncommitted changes, the branch name (if not default),
3828 a list of tags, and a list of bookmarks.
3827 a list of tags, and a list of bookmarks.
3829
3828
3830 When REV is not given, print a summary of the current state of the
3829 When REV is not given, print a summary of the current state of the
3831 repository including the working directory. Specify -r. to get information
3830 repository including the working directory. Specify -r. to get information
3832 of the working directory parent without scanning uncommitted changes.
3831 of the working directory parent without scanning uncommitted changes.
3833
3832
3834 Specifying a path to a repository root or Mercurial bundle will
3833 Specifying a path to a repository root or Mercurial bundle will
3835 cause lookup to operate on that repository/bundle.
3834 cause lookup to operate on that repository/bundle.
3836
3835
3837 .. container:: verbose
3836 .. container:: verbose
3838
3837
3839 Template:
3838 Template:
3840
3839
3841 The following keywords are supported in addition to the common template
3840 The following keywords are supported in addition to the common template
3842 keywords and functions. See also :hg:`help templates`.
3841 keywords and functions. See also :hg:`help templates`.
3843
3842
3844 :dirty: String. Character ``+`` denoting if the working directory has
3843 :dirty: String. Character ``+`` denoting if the working directory has
3845 uncommitted changes.
3844 uncommitted changes.
3846 :id: String. One or two nodes, optionally followed by ``+``.
3845 :id: String. One or two nodes, optionally followed by ``+``.
3847 :parents: List of strings. Parent nodes of the changeset.
3846 :parents: List of strings. Parent nodes of the changeset.
3848
3847
3849 Examples:
3848 Examples:
3850
3849
3851 - generate a build identifier for the working directory::
3850 - generate a build identifier for the working directory::
3852
3851
3853 hg id --id > build-id.dat
3852 hg id --id > build-id.dat
3854
3853
3855 - find the revision corresponding to a tag::
3854 - find the revision corresponding to a tag::
3856
3855
3857 hg id -n -r 1.3
3856 hg id -n -r 1.3
3858
3857
3859 - check the most recent revision of a remote repository::
3858 - check the most recent revision of a remote repository::
3860
3859
3861 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3860 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3862
3861
3863 See :hg:`log` for generating more information about specific revisions,
3862 See :hg:`log` for generating more information about specific revisions,
3864 including full hash identifiers.
3863 including full hash identifiers.
3865
3864
3866 Returns 0 if successful.
3865 Returns 0 if successful.
3867 """
3866 """
3868
3867
3869 opts = pycompat.byteskwargs(opts)
3868 opts = pycompat.byteskwargs(opts)
3870 if not repo and not source:
3869 if not repo and not source:
3871 raise error.Abort(
3870 raise error.Abort(
3872 _(b"there is no Mercurial repository here (.hg not found)")
3871 _(b"there is no Mercurial repository here (.hg not found)")
3873 )
3872 )
3874
3873
3875 default = not (num or id or branch or tags or bookmarks)
3874 default = not (num or id or branch or tags or bookmarks)
3876 output = []
3875 output = []
3877 revs = []
3876 revs = []
3878
3877
3879 if source:
3878 if source:
3880 source, branches = hg.parseurl(ui.expandpath(source))
3879 source, branches = hg.parseurl(ui.expandpath(source))
3881 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3880 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3882 repo = peer.local()
3881 repo = peer.local()
3883 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3882 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3884
3883
3885 fm = ui.formatter(b'identify', opts)
3884 fm = ui.formatter(b'identify', opts)
3886 fm.startitem()
3885 fm.startitem()
3887
3886
3888 if not repo:
3887 if not repo:
3889 if num or branch or tags:
3888 if num or branch or tags:
3890 raise error.Abort(
3889 raise error.Abort(
3891 _(b"can't query remote revision number, branch, or tags")
3890 _(b"can't query remote revision number, branch, or tags")
3892 )
3891 )
3893 if not rev and revs:
3892 if not rev and revs:
3894 rev = revs[0]
3893 rev = revs[0]
3895 if not rev:
3894 if not rev:
3896 rev = b"tip"
3895 rev = b"tip"
3897
3896
3898 remoterev = peer.lookup(rev)
3897 remoterev = peer.lookup(rev)
3899 hexrev = fm.hexfunc(remoterev)
3898 hexrev = fm.hexfunc(remoterev)
3900 if default or id:
3899 if default or id:
3901 output = [hexrev]
3900 output = [hexrev]
3902 fm.data(id=hexrev)
3901 fm.data(id=hexrev)
3903
3902
3904 @util.cachefunc
3903 @util.cachefunc
3905 def getbms():
3904 def getbms():
3906 bms = []
3905 bms = []
3907
3906
3908 if b'bookmarks' in peer.listkeys(b'namespaces'):
3907 if b'bookmarks' in peer.listkeys(b'namespaces'):
3909 hexremoterev = hex(remoterev)
3908 hexremoterev = hex(remoterev)
3910 bms = [
3909 bms = [
3911 bm
3910 bm
3912 for bm, bmr in pycompat.iteritems(
3911 for bm, bmr in pycompat.iteritems(
3913 peer.listkeys(b'bookmarks')
3912 peer.listkeys(b'bookmarks')
3914 )
3913 )
3915 if bmr == hexremoterev
3914 if bmr == hexremoterev
3916 ]
3915 ]
3917
3916
3918 return sorted(bms)
3917 return sorted(bms)
3919
3918
3920 if fm.isplain():
3919 if fm.isplain():
3921 if bookmarks:
3920 if bookmarks:
3922 output.extend(getbms())
3921 output.extend(getbms())
3923 elif default and not ui.quiet:
3922 elif default and not ui.quiet:
3924 # multiple bookmarks for a single parent separated by '/'
3923 # multiple bookmarks for a single parent separated by '/'
3925 bm = b'/'.join(getbms())
3924 bm = b'/'.join(getbms())
3926 if bm:
3925 if bm:
3927 output.append(bm)
3926 output.append(bm)
3928 else:
3927 else:
3929 fm.data(node=hex(remoterev))
3928 fm.data(node=hex(remoterev))
3930 if bookmarks or b'bookmarks' in fm.datahint():
3929 if bookmarks or b'bookmarks' in fm.datahint():
3931 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3930 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3932 else:
3931 else:
3933 if rev:
3932 if rev:
3934 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3933 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3935 ctx = scmutil.revsingle(repo, rev, None)
3934 ctx = scmutil.revsingle(repo, rev, None)
3936
3935
3937 if ctx.rev() is None:
3936 if ctx.rev() is None:
3938 ctx = repo[None]
3937 ctx = repo[None]
3939 parents = ctx.parents()
3938 parents = ctx.parents()
3940 taglist = []
3939 taglist = []
3941 for p in parents:
3940 for p in parents:
3942 taglist.extend(p.tags())
3941 taglist.extend(p.tags())
3943
3942
3944 dirty = b""
3943 dirty = b""
3945 if ctx.dirty(missing=True, merge=False, branch=False):
3944 if ctx.dirty(missing=True, merge=False, branch=False):
3946 dirty = b'+'
3945 dirty = b'+'
3947 fm.data(dirty=dirty)
3946 fm.data(dirty=dirty)
3948
3947
3949 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3948 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3950 if default or id:
3949 if default or id:
3951 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3950 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3952 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3951 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3953
3952
3954 if num:
3953 if num:
3955 numoutput = [b"%d" % p.rev() for p in parents]
3954 numoutput = [b"%d" % p.rev() for p in parents]
3956 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3955 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3957
3956
3958 fm.data(
3957 fm.data(
3959 parents=fm.formatlist(
3958 parents=fm.formatlist(
3960 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3959 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3961 )
3960 )
3962 )
3961 )
3963 else:
3962 else:
3964 hexoutput = fm.hexfunc(ctx.node())
3963 hexoutput = fm.hexfunc(ctx.node())
3965 if default or id:
3964 if default or id:
3966 output = [hexoutput]
3965 output = [hexoutput]
3967 fm.data(id=hexoutput)
3966 fm.data(id=hexoutput)
3968
3967
3969 if num:
3968 if num:
3970 output.append(pycompat.bytestr(ctx.rev()))
3969 output.append(pycompat.bytestr(ctx.rev()))
3971 taglist = ctx.tags()
3970 taglist = ctx.tags()
3972
3971
3973 if default and not ui.quiet:
3972 if default and not ui.quiet:
3974 b = ctx.branch()
3973 b = ctx.branch()
3975 if b != b'default':
3974 if b != b'default':
3976 output.append(b"(%s)" % b)
3975 output.append(b"(%s)" % b)
3977
3976
3978 # multiple tags for a single parent separated by '/'
3977 # multiple tags for a single parent separated by '/'
3979 t = b'/'.join(taglist)
3978 t = b'/'.join(taglist)
3980 if t:
3979 if t:
3981 output.append(t)
3980 output.append(t)
3982
3981
3983 # multiple bookmarks for a single parent separated by '/'
3982 # multiple bookmarks for a single parent separated by '/'
3984 bm = b'/'.join(ctx.bookmarks())
3983 bm = b'/'.join(ctx.bookmarks())
3985 if bm:
3984 if bm:
3986 output.append(bm)
3985 output.append(bm)
3987 else:
3986 else:
3988 if branch:
3987 if branch:
3989 output.append(ctx.branch())
3988 output.append(ctx.branch())
3990
3989
3991 if tags:
3990 if tags:
3992 output.extend(taglist)
3991 output.extend(taglist)
3993
3992
3994 if bookmarks:
3993 if bookmarks:
3995 output.extend(ctx.bookmarks())
3994 output.extend(ctx.bookmarks())
3996
3995
3997 fm.data(node=ctx.hex())
3996 fm.data(node=ctx.hex())
3998 fm.data(branch=ctx.branch())
3997 fm.data(branch=ctx.branch())
3999 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3998 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4000 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3999 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4001 fm.context(ctx=ctx)
4000 fm.context(ctx=ctx)
4002
4001
4003 fm.plain(b"%s\n" % b' '.join(output))
4002 fm.plain(b"%s\n" % b' '.join(output))
4004 fm.end()
4003 fm.end()
4005
4004
4006
4005
4007 @command(
4006 @command(
4008 b'import|patch',
4007 b'import|patch',
4009 [
4008 [
4010 (
4009 (
4011 b'p',
4010 b'p',
4012 b'strip',
4011 b'strip',
4013 1,
4012 1,
4014 _(
4013 _(
4015 b'directory strip option for patch. This has the same '
4014 b'directory strip option for patch. This has the same '
4016 b'meaning as the corresponding patch option'
4015 b'meaning as the corresponding patch option'
4017 ),
4016 ),
4018 _(b'NUM'),
4017 _(b'NUM'),
4019 ),
4018 ),
4020 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4019 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4021 (b'', b'secret', None, _(b'use the secret phase for committing')),
4020 (b'', b'secret', None, _(b'use the secret phase for committing')),
4022 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4021 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4023 (
4022 (
4024 b'f',
4023 b'f',
4025 b'force',
4024 b'force',
4026 None,
4025 None,
4027 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4026 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4028 ),
4027 ),
4029 (
4028 (
4030 b'',
4029 b'',
4031 b'no-commit',
4030 b'no-commit',
4032 None,
4031 None,
4033 _(b"don't commit, just update the working directory"),
4032 _(b"don't commit, just update the working directory"),
4034 ),
4033 ),
4035 (
4034 (
4036 b'',
4035 b'',
4037 b'bypass',
4036 b'bypass',
4038 None,
4037 None,
4039 _(b"apply patch without touching the working directory"),
4038 _(b"apply patch without touching the working directory"),
4040 ),
4039 ),
4041 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4040 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4042 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4041 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4043 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4042 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4044 (
4043 (
4045 b'',
4044 b'',
4046 b'import-branch',
4045 b'import-branch',
4047 None,
4046 None,
4048 _(b'use any branch information in patch (implied by --exact)'),
4047 _(b'use any branch information in patch (implied by --exact)'),
4049 ),
4048 ),
4050 ]
4049 ]
4051 + commitopts
4050 + commitopts
4052 + commitopts2
4051 + commitopts2
4053 + similarityopts,
4052 + similarityopts,
4054 _(b'[OPTION]... PATCH...'),
4053 _(b'[OPTION]... PATCH...'),
4055 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4054 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4056 )
4055 )
4057 def import_(ui, repo, patch1=None, *patches, **opts):
4056 def import_(ui, repo, patch1=None, *patches, **opts):
4058 """import an ordered set of patches
4057 """import an ordered set of patches
4059
4058
4060 Import a list of patches and commit them individually (unless
4059 Import a list of patches and commit them individually (unless
4061 --no-commit is specified).
4060 --no-commit is specified).
4062
4061
4063 To read a patch from standard input (stdin), use "-" as the patch
4062 To read a patch from standard input (stdin), use "-" as the patch
4064 name. If a URL is specified, the patch will be downloaded from
4063 name. If a URL is specified, the patch will be downloaded from
4065 there.
4064 there.
4066
4065
4067 Import first applies changes to the working directory (unless
4066 Import first applies changes to the working directory (unless
4068 --bypass is specified), import will abort if there are outstanding
4067 --bypass is specified), import will abort if there are outstanding
4069 changes.
4068 changes.
4070
4069
4071 Use --bypass to apply and commit patches directly to the
4070 Use --bypass to apply and commit patches directly to the
4072 repository, without affecting the working directory. Without
4071 repository, without affecting the working directory. Without
4073 --exact, patches will be applied on top of the working directory
4072 --exact, patches will be applied on top of the working directory
4074 parent revision.
4073 parent revision.
4075
4074
4076 You can import a patch straight from a mail message. Even patches
4075 You can import a patch straight from a mail message. Even patches
4077 as attachments work (to use the body part, it must have type
4076 as attachments work (to use the body part, it must have type
4078 text/plain or text/x-patch). From and Subject headers of email
4077 text/plain or text/x-patch). From and Subject headers of email
4079 message are used as default committer and commit message. All
4078 message are used as default committer and commit message. All
4080 text/plain body parts before first diff are added to the commit
4079 text/plain body parts before first diff are added to the commit
4081 message.
4080 message.
4082
4081
4083 If the imported patch was generated by :hg:`export`, user and
4082 If the imported patch was generated by :hg:`export`, user and
4084 description from patch override values from message headers and
4083 description from patch override values from message headers and
4085 body. Values given on command line with -m/--message and -u/--user
4084 body. Values given on command line with -m/--message and -u/--user
4086 override these.
4085 override these.
4087
4086
4088 If --exact is specified, import will set the working directory to
4087 If --exact is specified, import will set the working directory to
4089 the parent of each patch before applying it, and will abort if the
4088 the parent of each patch before applying it, and will abort if the
4090 resulting changeset has a different ID than the one recorded in
4089 resulting changeset has a different ID than the one recorded in
4091 the patch. This will guard against various ways that portable
4090 the patch. This will guard against various ways that portable
4092 patch formats and mail systems might fail to transfer Mercurial
4091 patch formats and mail systems might fail to transfer Mercurial
4093 data or metadata. See :hg:`bundle` for lossless transmission.
4092 data or metadata. See :hg:`bundle` for lossless transmission.
4094
4093
4095 Use --partial to ensure a changeset will be created from the patch
4094 Use --partial to ensure a changeset will be created from the patch
4096 even if some hunks fail to apply. Hunks that fail to apply will be
4095 even if some hunks fail to apply. Hunks that fail to apply will be
4097 written to a <target-file>.rej file. Conflicts can then be resolved
4096 written to a <target-file>.rej file. Conflicts can then be resolved
4098 by hand before :hg:`commit --amend` is run to update the created
4097 by hand before :hg:`commit --amend` is run to update the created
4099 changeset. This flag exists to let people import patches that
4098 changeset. This flag exists to let people import patches that
4100 partially apply without losing the associated metadata (author,
4099 partially apply without losing the associated metadata (author,
4101 date, description, ...).
4100 date, description, ...).
4102
4101
4103 .. note::
4102 .. note::
4104
4103
4105 When no hunks apply cleanly, :hg:`import --partial` will create
4104 When no hunks apply cleanly, :hg:`import --partial` will create
4106 an empty changeset, importing only the patch metadata.
4105 an empty changeset, importing only the patch metadata.
4107
4106
4108 With -s/--similarity, hg will attempt to discover renames and
4107 With -s/--similarity, hg will attempt to discover renames and
4109 copies in the patch in the same way as :hg:`addremove`.
4108 copies in the patch in the same way as :hg:`addremove`.
4110
4109
4111 It is possible to use external patch programs to perform the patch
4110 It is possible to use external patch programs to perform the patch
4112 by setting the ``ui.patch`` configuration option. For the default
4111 by setting the ``ui.patch`` configuration option. For the default
4113 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4112 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4114 See :hg:`help config` for more information about configuration
4113 See :hg:`help config` for more information about configuration
4115 files and how to use these options.
4114 files and how to use these options.
4116
4115
4117 See :hg:`help dates` for a list of formats valid for -d/--date.
4116 See :hg:`help dates` for a list of formats valid for -d/--date.
4118
4117
4119 .. container:: verbose
4118 .. container:: verbose
4120
4119
4121 Examples:
4120 Examples:
4122
4121
4123 - import a traditional patch from a website and detect renames::
4122 - import a traditional patch from a website and detect renames::
4124
4123
4125 hg import -s 80 http://example.com/bugfix.patch
4124 hg import -s 80 http://example.com/bugfix.patch
4126
4125
4127 - import a changeset from an hgweb server::
4126 - import a changeset from an hgweb server::
4128
4127
4129 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4128 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4130
4129
4131 - import all the patches in an Unix-style mbox::
4130 - import all the patches in an Unix-style mbox::
4132
4131
4133 hg import incoming-patches.mbox
4132 hg import incoming-patches.mbox
4134
4133
4135 - import patches from stdin::
4134 - import patches from stdin::
4136
4135
4137 hg import -
4136 hg import -
4138
4137
4139 - attempt to exactly restore an exported changeset (not always
4138 - attempt to exactly restore an exported changeset (not always
4140 possible)::
4139 possible)::
4141
4140
4142 hg import --exact proposed-fix.patch
4141 hg import --exact proposed-fix.patch
4143
4142
4144 - use an external tool to apply a patch which is too fuzzy for
4143 - use an external tool to apply a patch which is too fuzzy for
4145 the default internal tool.
4144 the default internal tool.
4146
4145
4147 hg import --config ui.patch="patch --merge" fuzzy.patch
4146 hg import --config ui.patch="patch --merge" fuzzy.patch
4148
4147
4149 - change the default fuzzing from 2 to a less strict 7
4148 - change the default fuzzing from 2 to a less strict 7
4150
4149
4151 hg import --config ui.fuzz=7 fuzz.patch
4150 hg import --config ui.fuzz=7 fuzz.patch
4152
4151
4153 Returns 0 on success, 1 on partial success (see --partial).
4152 Returns 0 on success, 1 on partial success (see --partial).
4154 """
4153 """
4155
4154
4156 opts = pycompat.byteskwargs(opts)
4155 opts = pycompat.byteskwargs(opts)
4157 if not patch1:
4156 if not patch1:
4158 raise error.Abort(_(b'need at least one patch to import'))
4157 raise error.Abort(_(b'need at least one patch to import'))
4159
4158
4160 patches = (patch1,) + patches
4159 patches = (patch1,) + patches
4161
4160
4162 date = opts.get(b'date')
4161 date = opts.get(b'date')
4163 if date:
4162 if date:
4164 opts[b'date'] = dateutil.parsedate(date)
4163 opts[b'date'] = dateutil.parsedate(date)
4165
4164
4166 exact = opts.get(b'exact')
4165 exact = opts.get(b'exact')
4167 update = not opts.get(b'bypass')
4166 update = not opts.get(b'bypass')
4168 if not update and opts.get(b'no_commit'):
4167 if not update and opts.get(b'no_commit'):
4169 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4168 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4170 if opts.get(b'secret') and opts.get(b'no_commit'):
4169 if opts.get(b'secret') and opts.get(b'no_commit'):
4171 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4170 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4172 try:
4171 try:
4173 sim = float(opts.get(b'similarity') or 0)
4172 sim = float(opts.get(b'similarity') or 0)
4174 except ValueError:
4173 except ValueError:
4175 raise error.Abort(_(b'similarity must be a number'))
4174 raise error.Abort(_(b'similarity must be a number'))
4176 if sim < 0 or sim > 100:
4175 if sim < 0 or sim > 100:
4177 raise error.Abort(_(b'similarity must be between 0 and 100'))
4176 raise error.Abort(_(b'similarity must be between 0 and 100'))
4178 if sim and not update:
4177 if sim and not update:
4179 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4178 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4180 if exact:
4179 if exact:
4181 if opts.get(b'edit'):
4180 if opts.get(b'edit'):
4182 raise error.Abort(_(b'cannot use --exact with --edit'))
4181 raise error.Abort(_(b'cannot use --exact with --edit'))
4183 if opts.get(b'prefix'):
4182 if opts.get(b'prefix'):
4184 raise error.Abort(_(b'cannot use --exact with --prefix'))
4183 raise error.Abort(_(b'cannot use --exact with --prefix'))
4185
4184
4186 base = opts[b"base"]
4185 base = opts[b"base"]
4187 msgs = []
4186 msgs = []
4188 ret = 0
4187 ret = 0
4189
4188
4190 with repo.wlock():
4189 with repo.wlock():
4191 if update:
4190 if update:
4192 cmdutil.checkunfinished(repo)
4191 cmdutil.checkunfinished(repo)
4193 if exact or not opts.get(b'force'):
4192 if exact or not opts.get(b'force'):
4194 cmdutil.bailifchanged(repo)
4193 cmdutil.bailifchanged(repo)
4195
4194
4196 if not opts.get(b'no_commit'):
4195 if not opts.get(b'no_commit'):
4197 lock = repo.lock
4196 lock = repo.lock
4198 tr = lambda: repo.transaction(b'import')
4197 tr = lambda: repo.transaction(b'import')
4199 dsguard = util.nullcontextmanager
4198 dsguard = util.nullcontextmanager
4200 else:
4199 else:
4201 lock = util.nullcontextmanager
4200 lock = util.nullcontextmanager
4202 tr = util.nullcontextmanager
4201 tr = util.nullcontextmanager
4203 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4202 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4204 with lock(), tr(), dsguard():
4203 with lock(), tr(), dsguard():
4205 parents = repo[None].parents()
4204 parents = repo[None].parents()
4206 for patchurl in patches:
4205 for patchurl in patches:
4207 if patchurl == b'-':
4206 if patchurl == b'-':
4208 ui.status(_(b'applying patch from stdin\n'))
4207 ui.status(_(b'applying patch from stdin\n'))
4209 patchfile = ui.fin
4208 patchfile = ui.fin
4210 patchurl = b'stdin' # for error message
4209 patchurl = b'stdin' # for error message
4211 else:
4210 else:
4212 patchurl = os.path.join(base, patchurl)
4211 patchurl = os.path.join(base, patchurl)
4213 ui.status(_(b'applying %s\n') % patchurl)
4212 ui.status(_(b'applying %s\n') % patchurl)
4214 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4213 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4215
4214
4216 haspatch = False
4215 haspatch = False
4217 for hunk in patch.split(patchfile):
4216 for hunk in patch.split(patchfile):
4218 with patch.extract(ui, hunk) as patchdata:
4217 with patch.extract(ui, hunk) as patchdata:
4219 msg, node, rej = cmdutil.tryimportone(
4218 msg, node, rej = cmdutil.tryimportone(
4220 ui, repo, patchdata, parents, opts, msgs, hg.clean
4219 ui, repo, patchdata, parents, opts, msgs, hg.clean
4221 )
4220 )
4222 if msg:
4221 if msg:
4223 haspatch = True
4222 haspatch = True
4224 ui.note(msg + b'\n')
4223 ui.note(msg + b'\n')
4225 if update or exact:
4224 if update or exact:
4226 parents = repo[None].parents()
4225 parents = repo[None].parents()
4227 else:
4226 else:
4228 parents = [repo[node]]
4227 parents = [repo[node]]
4229 if rej:
4228 if rej:
4230 ui.write_err(_(b"patch applied partially\n"))
4229 ui.write_err(_(b"patch applied partially\n"))
4231 ui.write_err(
4230 ui.write_err(
4232 _(
4231 _(
4233 b"(fix the .rej files and run "
4232 b"(fix the .rej files and run "
4234 b"`hg commit --amend`)\n"
4233 b"`hg commit --amend`)\n"
4235 )
4234 )
4236 )
4235 )
4237 ret = 1
4236 ret = 1
4238 break
4237 break
4239
4238
4240 if not haspatch:
4239 if not haspatch:
4241 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4240 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4242
4241
4243 if msgs:
4242 if msgs:
4244 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4243 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4245 return ret
4244 return ret
4246
4245
4247
4246
4248 @command(
4247 @command(
4249 b'incoming|in',
4248 b'incoming|in',
4250 [
4249 [
4251 (
4250 (
4252 b'f',
4251 b'f',
4253 b'force',
4252 b'force',
4254 None,
4253 None,
4255 _(b'run even if remote repository is unrelated'),
4254 _(b'run even if remote repository is unrelated'),
4256 ),
4255 ),
4257 (b'n', b'newest-first', None, _(b'show newest record first')),
4256 (b'n', b'newest-first', None, _(b'show newest record first')),
4258 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4257 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4259 (
4258 (
4260 b'r',
4259 b'r',
4261 b'rev',
4260 b'rev',
4262 [],
4261 [],
4263 _(b'a remote changeset intended to be added'),
4262 _(b'a remote changeset intended to be added'),
4264 _(b'REV'),
4263 _(b'REV'),
4265 ),
4264 ),
4266 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4265 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4267 (
4266 (
4268 b'b',
4267 b'b',
4269 b'branch',
4268 b'branch',
4270 [],
4269 [],
4271 _(b'a specific branch you would like to pull'),
4270 _(b'a specific branch you would like to pull'),
4272 _(b'BRANCH'),
4271 _(b'BRANCH'),
4273 ),
4272 ),
4274 ]
4273 ]
4275 + logopts
4274 + logopts
4276 + remoteopts
4275 + remoteopts
4277 + subrepoopts,
4276 + subrepoopts,
4278 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4277 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4279 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4278 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4280 )
4279 )
4281 def incoming(ui, repo, source=b"default", **opts):
4280 def incoming(ui, repo, source=b"default", **opts):
4282 """show new changesets found in source
4281 """show new changesets found in source
4283
4282
4284 Show new changesets found in the specified path/URL or the default
4283 Show new changesets found in the specified path/URL or the default
4285 pull location. These are the changesets that would have been pulled
4284 pull location. These are the changesets that would have been pulled
4286 by :hg:`pull` at the time you issued this command.
4285 by :hg:`pull` at the time you issued this command.
4287
4286
4288 See pull for valid source format details.
4287 See pull for valid source format details.
4289
4288
4290 .. container:: verbose
4289 .. container:: verbose
4291
4290
4292 With -B/--bookmarks, the result of bookmark comparison between
4291 With -B/--bookmarks, the result of bookmark comparison between
4293 local and remote repositories is displayed. With -v/--verbose,
4292 local and remote repositories is displayed. With -v/--verbose,
4294 status is also displayed for each bookmark like below::
4293 status is also displayed for each bookmark like below::
4295
4294
4296 BM1 01234567890a added
4295 BM1 01234567890a added
4297 BM2 1234567890ab advanced
4296 BM2 1234567890ab advanced
4298 BM3 234567890abc diverged
4297 BM3 234567890abc diverged
4299 BM4 34567890abcd changed
4298 BM4 34567890abcd changed
4300
4299
4301 The action taken locally when pulling depends on the
4300 The action taken locally when pulling depends on the
4302 status of each bookmark:
4301 status of each bookmark:
4303
4302
4304 :``added``: pull will create it
4303 :``added``: pull will create it
4305 :``advanced``: pull will update it
4304 :``advanced``: pull will update it
4306 :``diverged``: pull will create a divergent bookmark
4305 :``diverged``: pull will create a divergent bookmark
4307 :``changed``: result depends on remote changesets
4306 :``changed``: result depends on remote changesets
4308
4307
4309 From the point of view of pulling behavior, bookmark
4308 From the point of view of pulling behavior, bookmark
4310 existing only in the remote repository are treated as ``added``,
4309 existing only in the remote repository are treated as ``added``,
4311 even if it is in fact locally deleted.
4310 even if it is in fact locally deleted.
4312
4311
4313 .. container:: verbose
4312 .. container:: verbose
4314
4313
4315 For remote repository, using --bundle avoids downloading the
4314 For remote repository, using --bundle avoids downloading the
4316 changesets twice if the incoming is followed by a pull.
4315 changesets twice if the incoming is followed by a pull.
4317
4316
4318 Examples:
4317 Examples:
4319
4318
4320 - show incoming changes with patches and full description::
4319 - show incoming changes with patches and full description::
4321
4320
4322 hg incoming -vp
4321 hg incoming -vp
4323
4322
4324 - show incoming changes excluding merges, store a bundle::
4323 - show incoming changes excluding merges, store a bundle::
4325
4324
4326 hg in -vpM --bundle incoming.hg
4325 hg in -vpM --bundle incoming.hg
4327 hg pull incoming.hg
4326 hg pull incoming.hg
4328
4327
4329 - briefly list changes inside a bundle::
4328 - briefly list changes inside a bundle::
4330
4329
4331 hg in changes.hg -T "{desc|firstline}\\n"
4330 hg in changes.hg -T "{desc|firstline}\\n"
4332
4331
4333 Returns 0 if there are incoming changes, 1 otherwise.
4332 Returns 0 if there are incoming changes, 1 otherwise.
4334 """
4333 """
4335 opts = pycompat.byteskwargs(opts)
4334 opts = pycompat.byteskwargs(opts)
4336 if opts.get(b'graph'):
4335 if opts.get(b'graph'):
4337 logcmdutil.checkunsupportedgraphflags([], opts)
4336 logcmdutil.checkunsupportedgraphflags([], opts)
4338
4337
4339 def display(other, chlist, displayer):
4338 def display(other, chlist, displayer):
4340 revdag = logcmdutil.graphrevs(other, chlist, opts)
4339 revdag = logcmdutil.graphrevs(other, chlist, opts)
4341 logcmdutil.displaygraph(
4340 logcmdutil.displaygraph(
4342 ui, repo, revdag, displayer, graphmod.asciiedges
4341 ui, repo, revdag, displayer, graphmod.asciiedges
4343 )
4342 )
4344
4343
4345 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4344 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4346 return 0
4345 return 0
4347
4346
4348 if opts.get(b'bundle') and opts.get(b'subrepos'):
4347 if opts.get(b'bundle') and opts.get(b'subrepos'):
4349 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4348 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4350
4349
4351 if opts.get(b'bookmarks'):
4350 if opts.get(b'bookmarks'):
4352 source, branches = hg.parseurl(
4351 source, branches = hg.parseurl(
4353 ui.expandpath(source), opts.get(b'branch')
4352 ui.expandpath(source), opts.get(b'branch')
4354 )
4353 )
4355 other = hg.peer(repo, opts, source)
4354 other = hg.peer(repo, opts, source)
4356 if b'bookmarks' not in other.listkeys(b'namespaces'):
4355 if b'bookmarks' not in other.listkeys(b'namespaces'):
4357 ui.warn(_(b"remote doesn't support bookmarks\n"))
4356 ui.warn(_(b"remote doesn't support bookmarks\n"))
4358 return 0
4357 return 0
4359 ui.pager(b'incoming')
4358 ui.pager(b'incoming')
4360 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4359 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4361 return bookmarks.incoming(ui, repo, other)
4360 return bookmarks.incoming(ui, repo, other)
4362
4361
4363 repo._subtoppath = ui.expandpath(source)
4362 repo._subtoppath = ui.expandpath(source)
4364 try:
4363 try:
4365 return hg.incoming(ui, repo, source, opts)
4364 return hg.incoming(ui, repo, source, opts)
4366 finally:
4365 finally:
4367 del repo._subtoppath
4366 del repo._subtoppath
4368
4367
4369
4368
4370 @command(
4369 @command(
4371 b'init',
4370 b'init',
4372 remoteopts,
4371 remoteopts,
4373 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4372 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4374 helpcategory=command.CATEGORY_REPO_CREATION,
4373 helpcategory=command.CATEGORY_REPO_CREATION,
4375 helpbasic=True,
4374 helpbasic=True,
4376 norepo=True,
4375 norepo=True,
4377 )
4376 )
4378 def init(ui, dest=b".", **opts):
4377 def init(ui, dest=b".", **opts):
4379 """create a new repository in the given directory
4378 """create a new repository in the given directory
4380
4379
4381 Initialize a new repository in the given directory. If the given
4380 Initialize a new repository in the given directory. If the given
4382 directory does not exist, it will be created.
4381 directory does not exist, it will be created.
4383
4382
4384 If no directory is given, the current directory is used.
4383 If no directory is given, the current directory is used.
4385
4384
4386 It is possible to specify an ``ssh://`` URL as the destination.
4385 It is possible to specify an ``ssh://`` URL as the destination.
4387 See :hg:`help urls` for more information.
4386 See :hg:`help urls` for more information.
4388
4387
4389 Returns 0 on success.
4388 Returns 0 on success.
4390 """
4389 """
4391 opts = pycompat.byteskwargs(opts)
4390 opts = pycompat.byteskwargs(opts)
4392 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4391 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4393
4392
4394
4393
4395 @command(
4394 @command(
4396 b'locate',
4395 b'locate',
4397 [
4396 [
4398 (
4397 (
4399 b'r',
4398 b'r',
4400 b'rev',
4399 b'rev',
4401 b'',
4400 b'',
4402 _(b'search the repository as it is in REV'),
4401 _(b'search the repository as it is in REV'),
4403 _(b'REV'),
4402 _(b'REV'),
4404 ),
4403 ),
4405 (
4404 (
4406 b'0',
4405 b'0',
4407 b'print0',
4406 b'print0',
4408 None,
4407 None,
4409 _(b'end filenames with NUL, for use with xargs'),
4408 _(b'end filenames with NUL, for use with xargs'),
4410 ),
4409 ),
4411 (
4410 (
4412 b'f',
4411 b'f',
4413 b'fullpath',
4412 b'fullpath',
4414 None,
4413 None,
4415 _(b'print complete paths from the filesystem root'),
4414 _(b'print complete paths from the filesystem root'),
4416 ),
4415 ),
4417 ]
4416 ]
4418 + walkopts,
4417 + walkopts,
4419 _(b'[OPTION]... [PATTERN]...'),
4418 _(b'[OPTION]... [PATTERN]...'),
4420 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4419 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4421 )
4420 )
4422 def locate(ui, repo, *pats, **opts):
4421 def locate(ui, repo, *pats, **opts):
4423 """locate files matching specific patterns (DEPRECATED)
4422 """locate files matching specific patterns (DEPRECATED)
4424
4423
4425 Print files under Mercurial control in the working directory whose
4424 Print files under Mercurial control in the working directory whose
4426 names match the given patterns.
4425 names match the given patterns.
4427
4426
4428 By default, this command searches all directories in the working
4427 By default, this command searches all directories in the working
4429 directory. To search just the current directory and its
4428 directory. To search just the current directory and its
4430 subdirectories, use "--include .".
4429 subdirectories, use "--include .".
4431
4430
4432 If no patterns are given to match, this command prints the names
4431 If no patterns are given to match, this command prints the names
4433 of all files under Mercurial control in the working directory.
4432 of all files under Mercurial control in the working directory.
4434
4433
4435 If you want to feed the output of this command into the "xargs"
4434 If you want to feed the output of this command into the "xargs"
4436 command, use the -0 option to both this command and "xargs". This
4435 command, use the -0 option to both this command and "xargs". This
4437 will avoid the problem of "xargs" treating single filenames that
4436 will avoid the problem of "xargs" treating single filenames that
4438 contain whitespace as multiple filenames.
4437 contain whitespace as multiple filenames.
4439
4438
4440 See :hg:`help files` for a more versatile command.
4439 See :hg:`help files` for a more versatile command.
4441
4440
4442 Returns 0 if a match is found, 1 otherwise.
4441 Returns 0 if a match is found, 1 otherwise.
4443 """
4442 """
4444 opts = pycompat.byteskwargs(opts)
4443 opts = pycompat.byteskwargs(opts)
4445 if opts.get(b'print0'):
4444 if opts.get(b'print0'):
4446 end = b'\0'
4445 end = b'\0'
4447 else:
4446 else:
4448 end = b'\n'
4447 end = b'\n'
4449 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4448 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4450
4449
4451 ret = 1
4450 ret = 1
4452 m = scmutil.match(
4451 m = scmutil.match(
4453 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4452 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4454 )
4453 )
4455
4454
4456 ui.pager(b'locate')
4455 ui.pager(b'locate')
4457 if ctx.rev() is None:
4456 if ctx.rev() is None:
4458 # When run on the working copy, "locate" includes removed files, so
4457 # When run on the working copy, "locate" includes removed files, so
4459 # we get the list of files from the dirstate.
4458 # we get the list of files from the dirstate.
4460 filesgen = sorted(repo.dirstate.matches(m))
4459 filesgen = sorted(repo.dirstate.matches(m))
4461 else:
4460 else:
4462 filesgen = ctx.matches(m)
4461 filesgen = ctx.matches(m)
4463 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4462 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4464 for abs in filesgen:
4463 for abs in filesgen:
4465 if opts.get(b'fullpath'):
4464 if opts.get(b'fullpath'):
4466 ui.write(repo.wjoin(abs), end)
4465 ui.write(repo.wjoin(abs), end)
4467 else:
4466 else:
4468 ui.write(uipathfn(abs), end)
4467 ui.write(uipathfn(abs), end)
4469 ret = 0
4468 ret = 0
4470
4469
4471 return ret
4470 return ret
4472
4471
4473
4472
4474 @command(
4473 @command(
4475 b'log|history',
4474 b'log|history',
4476 [
4475 [
4477 (
4476 (
4478 b'f',
4477 b'f',
4479 b'follow',
4478 b'follow',
4480 None,
4479 None,
4481 _(
4480 _(
4482 b'follow changeset history, or file history across copies and renames'
4481 b'follow changeset history, or file history across copies and renames'
4483 ),
4482 ),
4484 ),
4483 ),
4485 (
4484 (
4486 b'',
4485 b'',
4487 b'follow-first',
4486 b'follow-first',
4488 None,
4487 None,
4489 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4488 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4490 ),
4489 ),
4491 (
4490 (
4492 b'd',
4491 b'd',
4493 b'date',
4492 b'date',
4494 b'',
4493 b'',
4495 _(b'show revisions matching date spec'),
4494 _(b'show revisions matching date spec'),
4496 _(b'DATE'),
4495 _(b'DATE'),
4497 ),
4496 ),
4498 (b'C', b'copies', None, _(b'show copied files')),
4497 (b'C', b'copies', None, _(b'show copied files')),
4499 (
4498 (
4500 b'k',
4499 b'k',
4501 b'keyword',
4500 b'keyword',
4502 [],
4501 [],
4503 _(b'do case-insensitive search for a given text'),
4502 _(b'do case-insensitive search for a given text'),
4504 _(b'TEXT'),
4503 _(b'TEXT'),
4505 ),
4504 ),
4506 (
4505 (
4507 b'r',
4506 b'r',
4508 b'rev',
4507 b'rev',
4509 [],
4508 [],
4510 _(b'show the specified revision or revset'),
4509 _(b'show the specified revision or revset'),
4511 _(b'REV'),
4510 _(b'REV'),
4512 ),
4511 ),
4513 (
4512 (
4514 b'L',
4513 b'L',
4515 b'line-range',
4514 b'line-range',
4516 [],
4515 [],
4517 _(b'follow line range of specified file (EXPERIMENTAL)'),
4516 _(b'follow line range of specified file (EXPERIMENTAL)'),
4518 _(b'FILE,RANGE'),
4517 _(b'FILE,RANGE'),
4519 ),
4518 ),
4520 (
4519 (
4521 b'',
4520 b'',
4522 b'removed',
4521 b'removed',
4523 None,
4522 None,
4524 _(b'include revisions where files were removed'),
4523 _(b'include revisions where files were removed'),
4525 ),
4524 ),
4526 (
4525 (
4527 b'm',
4526 b'm',
4528 b'only-merges',
4527 b'only-merges',
4529 None,
4528 None,
4530 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4529 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4531 ),
4530 ),
4532 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4531 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4533 (
4532 (
4534 b'',
4533 b'',
4535 b'only-branch',
4534 b'only-branch',
4536 [],
4535 [],
4537 _(
4536 _(
4538 b'show only changesets within the given named branch (DEPRECATED)'
4537 b'show only changesets within the given named branch (DEPRECATED)'
4539 ),
4538 ),
4540 _(b'BRANCH'),
4539 _(b'BRANCH'),
4541 ),
4540 ),
4542 (
4541 (
4543 b'b',
4542 b'b',
4544 b'branch',
4543 b'branch',
4545 [],
4544 [],
4546 _(b'show changesets within the given named branch'),
4545 _(b'show changesets within the given named branch'),
4547 _(b'BRANCH'),
4546 _(b'BRANCH'),
4548 ),
4547 ),
4549 (
4548 (
4550 b'P',
4549 b'P',
4551 b'prune',
4550 b'prune',
4552 [],
4551 [],
4553 _(b'do not display revision or any of its ancestors'),
4552 _(b'do not display revision or any of its ancestors'),
4554 _(b'REV'),
4553 _(b'REV'),
4555 ),
4554 ),
4556 ]
4555 ]
4557 + logopts
4556 + logopts
4558 + walkopts,
4557 + walkopts,
4559 _(b'[OPTION]... [FILE]'),
4558 _(b'[OPTION]... [FILE]'),
4560 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4559 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4561 helpbasic=True,
4560 helpbasic=True,
4562 inferrepo=True,
4561 inferrepo=True,
4563 intents={INTENT_READONLY},
4562 intents={INTENT_READONLY},
4564 )
4563 )
4565 def log(ui, repo, *pats, **opts):
4564 def log(ui, repo, *pats, **opts):
4566 """show revision history of entire repository or files
4565 """show revision history of entire repository or files
4567
4566
4568 Print the revision history of the specified files or the entire
4567 Print the revision history of the specified files or the entire
4569 project.
4568 project.
4570
4569
4571 If no revision range is specified, the default is ``tip:0`` unless
4570 If no revision range is specified, the default is ``tip:0`` unless
4572 --follow is set, in which case the working directory parent is
4571 --follow is set, in which case the working directory parent is
4573 used as the starting revision.
4572 used as the starting revision.
4574
4573
4575 File history is shown without following rename or copy history of
4574 File history is shown without following rename or copy history of
4576 files. Use -f/--follow with a filename to follow history across
4575 files. Use -f/--follow with a filename to follow history across
4577 renames and copies. --follow without a filename will only show
4576 renames and copies. --follow without a filename will only show
4578 ancestors of the starting revision.
4577 ancestors of the starting revision.
4579
4578
4580 By default this command prints revision number and changeset id,
4579 By default this command prints revision number and changeset id,
4581 tags, non-trivial parents, user, date and time, and a summary for
4580 tags, non-trivial parents, user, date and time, and a summary for
4582 each commit. When the -v/--verbose switch is used, the list of
4581 each commit. When the -v/--verbose switch is used, the list of
4583 changed files and full commit message are shown.
4582 changed files and full commit message are shown.
4584
4583
4585 With --graph the revisions are shown as an ASCII art DAG with the most
4584 With --graph the revisions are shown as an ASCII art DAG with the most
4586 recent changeset at the top.
4585 recent changeset at the top.
4587 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4586 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4588 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4587 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4589 changeset from the lines below is a parent of the 'o' merge on the same
4588 changeset from the lines below is a parent of the 'o' merge on the same
4590 line.
4589 line.
4591 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4590 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4592 of a '|' indicates one or more revisions in a path are omitted.
4591 of a '|' indicates one or more revisions in a path are omitted.
4593
4592
4594 .. container:: verbose
4593 .. container:: verbose
4595
4594
4596 Use -L/--line-range FILE,M:N options to follow the history of lines
4595 Use -L/--line-range FILE,M:N options to follow the history of lines
4597 from M to N in FILE. With -p/--patch only diff hunks affecting
4596 from M to N in FILE. With -p/--patch only diff hunks affecting
4598 specified line range will be shown. This option requires --follow;
4597 specified line range will be shown. This option requires --follow;
4599 it can be specified multiple times. Currently, this option is not
4598 it can be specified multiple times. Currently, this option is not
4600 compatible with --graph. This option is experimental.
4599 compatible with --graph. This option is experimental.
4601
4600
4602 .. note::
4601 .. note::
4603
4602
4604 :hg:`log --patch` may generate unexpected diff output for merge
4603 :hg:`log --patch` may generate unexpected diff output for merge
4605 changesets, as it will only compare the merge changeset against
4604 changesets, as it will only compare the merge changeset against
4606 its first parent. Also, only files different from BOTH parents
4605 its first parent. Also, only files different from BOTH parents
4607 will appear in files:.
4606 will appear in files:.
4608
4607
4609 .. note::
4608 .. note::
4610
4609
4611 For performance reasons, :hg:`log FILE` may omit duplicate changes
4610 For performance reasons, :hg:`log FILE` may omit duplicate changes
4612 made on branches and will not show removals or mode changes. To
4611 made on branches and will not show removals or mode changes. To
4613 see all such changes, use the --removed switch.
4612 see all such changes, use the --removed switch.
4614
4613
4615 .. container:: verbose
4614 .. container:: verbose
4616
4615
4617 .. note::
4616 .. note::
4618
4617
4619 The history resulting from -L/--line-range options depends on diff
4618 The history resulting from -L/--line-range options depends on diff
4620 options; for instance if white-spaces are ignored, respective changes
4619 options; for instance if white-spaces are ignored, respective changes
4621 with only white-spaces in specified line range will not be listed.
4620 with only white-spaces in specified line range will not be listed.
4622
4621
4623 .. container:: verbose
4622 .. container:: verbose
4624
4623
4625 Some examples:
4624 Some examples:
4626
4625
4627 - changesets with full descriptions and file lists::
4626 - changesets with full descriptions and file lists::
4628
4627
4629 hg log -v
4628 hg log -v
4630
4629
4631 - changesets ancestral to the working directory::
4630 - changesets ancestral to the working directory::
4632
4631
4633 hg log -f
4632 hg log -f
4634
4633
4635 - last 10 commits on the current branch::
4634 - last 10 commits on the current branch::
4636
4635
4637 hg log -l 10 -b .
4636 hg log -l 10 -b .
4638
4637
4639 - changesets showing all modifications of a file, including removals::
4638 - changesets showing all modifications of a file, including removals::
4640
4639
4641 hg log --removed file.c
4640 hg log --removed file.c
4642
4641
4643 - all changesets that touch a directory, with diffs, excluding merges::
4642 - all changesets that touch a directory, with diffs, excluding merges::
4644
4643
4645 hg log -Mp lib/
4644 hg log -Mp lib/
4646
4645
4647 - all revision numbers that match a keyword::
4646 - all revision numbers that match a keyword::
4648
4647
4649 hg log -k bug --template "{rev}\\n"
4648 hg log -k bug --template "{rev}\\n"
4650
4649
4651 - the full hash identifier of the working directory parent::
4650 - the full hash identifier of the working directory parent::
4652
4651
4653 hg log -r . --template "{node}\\n"
4652 hg log -r . --template "{node}\\n"
4654
4653
4655 - list available log templates::
4654 - list available log templates::
4656
4655
4657 hg log -T list
4656 hg log -T list
4658
4657
4659 - check if a given changeset is included in a tagged release::
4658 - check if a given changeset is included in a tagged release::
4660
4659
4661 hg log -r "a21ccf and ancestor(1.9)"
4660 hg log -r "a21ccf and ancestor(1.9)"
4662
4661
4663 - find all changesets by some user in a date range::
4662 - find all changesets by some user in a date range::
4664
4663
4665 hg log -k alice -d "may 2008 to jul 2008"
4664 hg log -k alice -d "may 2008 to jul 2008"
4666
4665
4667 - summary of all changesets after the last tag::
4666 - summary of all changesets after the last tag::
4668
4667
4669 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4668 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4670
4669
4671 - changesets touching lines 13 to 23 for file.c::
4670 - changesets touching lines 13 to 23 for file.c::
4672
4671
4673 hg log -L file.c,13:23
4672 hg log -L file.c,13:23
4674
4673
4675 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4674 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4676 main.c with patch::
4675 main.c with patch::
4677
4676
4678 hg log -L file.c,13:23 -L main.c,2:6 -p
4677 hg log -L file.c,13:23 -L main.c,2:6 -p
4679
4678
4680 See :hg:`help dates` for a list of formats valid for -d/--date.
4679 See :hg:`help dates` for a list of formats valid for -d/--date.
4681
4680
4682 See :hg:`help revisions` for more about specifying and ordering
4681 See :hg:`help revisions` for more about specifying and ordering
4683 revisions.
4682 revisions.
4684
4683
4685 See :hg:`help templates` for more about pre-packaged styles and
4684 See :hg:`help templates` for more about pre-packaged styles and
4686 specifying custom templates. The default template used by the log
4685 specifying custom templates. The default template used by the log
4687 command can be customized via the ``ui.logtemplate`` configuration
4686 command can be customized via the ``ui.logtemplate`` configuration
4688 setting.
4687 setting.
4689
4688
4690 Returns 0 on success.
4689 Returns 0 on success.
4691
4690
4692 """
4691 """
4693 opts = pycompat.byteskwargs(opts)
4692 opts = pycompat.byteskwargs(opts)
4694 linerange = opts.get(b'line_range')
4693 linerange = opts.get(b'line_range')
4695
4694
4696 if linerange and not opts.get(b'follow'):
4695 if linerange and not opts.get(b'follow'):
4697 raise error.Abort(_(b'--line-range requires --follow'))
4696 raise error.Abort(_(b'--line-range requires --follow'))
4698
4697
4699 if linerange and pats:
4698 if linerange and pats:
4700 # TODO: take pats as patterns with no line-range filter
4699 # TODO: take pats as patterns with no line-range filter
4701 raise error.Abort(
4700 raise error.Abort(
4702 _(b'FILE arguments are not compatible with --line-range option')
4701 _(b'FILE arguments are not compatible with --line-range option')
4703 )
4702 )
4704
4703
4705 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4704 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4706 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4705 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4707 if linerange:
4706 if linerange:
4708 # TODO: should follow file history from logcmdutil._initialrevs(),
4707 # TODO: should follow file history from logcmdutil._initialrevs(),
4709 # then filter the result by logcmdutil._makerevset() and --limit
4708 # then filter the result by logcmdutil._makerevset() and --limit
4710 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4709 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4711
4710
4712 getcopies = None
4711 getcopies = None
4713 if opts.get(b'copies'):
4712 if opts.get(b'copies'):
4714 endrev = None
4713 endrev = None
4715 if revs:
4714 if revs:
4716 endrev = revs.max() + 1
4715 endrev = revs.max() + 1
4717 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4716 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4718
4717
4719 ui.pager(b'log')
4718 ui.pager(b'log')
4720 displayer = logcmdutil.changesetdisplayer(
4719 displayer = logcmdutil.changesetdisplayer(
4721 ui, repo, opts, differ, buffered=True
4720 ui, repo, opts, differ, buffered=True
4722 )
4721 )
4723 if opts.get(b'graph'):
4722 if opts.get(b'graph'):
4724 displayfn = logcmdutil.displaygraphrevs
4723 displayfn = logcmdutil.displaygraphrevs
4725 else:
4724 else:
4726 displayfn = logcmdutil.displayrevs
4725 displayfn = logcmdutil.displayrevs
4727 displayfn(ui, repo, revs, displayer, getcopies)
4726 displayfn(ui, repo, revs, displayer, getcopies)
4728
4727
4729
4728
4730 @command(
4729 @command(
4731 b'manifest',
4730 b'manifest',
4732 [
4731 [
4733 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4732 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4734 (b'', b'all', False, _(b"list files from all revisions")),
4733 (b'', b'all', False, _(b"list files from all revisions")),
4735 ]
4734 ]
4736 + formatteropts,
4735 + formatteropts,
4737 _(b'[-r REV]'),
4736 _(b'[-r REV]'),
4738 helpcategory=command.CATEGORY_MAINTENANCE,
4737 helpcategory=command.CATEGORY_MAINTENANCE,
4739 intents={INTENT_READONLY},
4738 intents={INTENT_READONLY},
4740 )
4739 )
4741 def manifest(ui, repo, node=None, rev=None, **opts):
4740 def manifest(ui, repo, node=None, rev=None, **opts):
4742 """output the current or given revision of the project manifest
4741 """output the current or given revision of the project manifest
4743
4742
4744 Print a list of version controlled files for the given revision.
4743 Print a list of version controlled files for the given revision.
4745 If no revision is given, the first parent of the working directory
4744 If no revision is given, the first parent of the working directory
4746 is used, or the null revision if no revision is checked out.
4745 is used, or the null revision if no revision is checked out.
4747
4746
4748 With -v, print file permissions, symlink and executable bits.
4747 With -v, print file permissions, symlink and executable bits.
4749 With --debug, print file revision hashes.
4748 With --debug, print file revision hashes.
4750
4749
4751 If option --all is specified, the list of all files from all revisions
4750 If option --all is specified, the list of all files from all revisions
4752 is printed. This includes deleted and renamed files.
4751 is printed. This includes deleted and renamed files.
4753
4752
4754 Returns 0 on success.
4753 Returns 0 on success.
4755 """
4754 """
4756 opts = pycompat.byteskwargs(opts)
4755 opts = pycompat.byteskwargs(opts)
4757 fm = ui.formatter(b'manifest', opts)
4756 fm = ui.formatter(b'manifest', opts)
4758
4757
4759 if opts.get(b'all'):
4758 if opts.get(b'all'):
4760 if rev or node:
4759 if rev or node:
4761 raise error.Abort(_(b"can't specify a revision with --all"))
4760 raise error.Abort(_(b"can't specify a revision with --all"))
4762
4761
4763 res = set()
4762 res = set()
4764 for rev in repo:
4763 for rev in repo:
4765 ctx = repo[rev]
4764 ctx = repo[rev]
4766 res |= set(ctx.files())
4765 res |= set(ctx.files())
4767
4766
4768 ui.pager(b'manifest')
4767 ui.pager(b'manifest')
4769 for f in sorted(res):
4768 for f in sorted(res):
4770 fm.startitem()
4769 fm.startitem()
4771 fm.write(b"path", b'%s\n', f)
4770 fm.write(b"path", b'%s\n', f)
4772 fm.end()
4771 fm.end()
4773 return
4772 return
4774
4773
4775 if rev and node:
4774 if rev and node:
4776 raise error.Abort(_(b"please specify just one revision"))
4775 raise error.Abort(_(b"please specify just one revision"))
4777
4776
4778 if not node:
4777 if not node:
4779 node = rev
4778 node = rev
4780
4779
4781 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4780 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4782 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4781 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4783 if node:
4782 if node:
4784 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4783 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4785 ctx = scmutil.revsingle(repo, node)
4784 ctx = scmutil.revsingle(repo, node)
4786 mf = ctx.manifest()
4785 mf = ctx.manifest()
4787 ui.pager(b'manifest')
4786 ui.pager(b'manifest')
4788 for f in ctx:
4787 for f in ctx:
4789 fm.startitem()
4788 fm.startitem()
4790 fm.context(ctx=ctx)
4789 fm.context(ctx=ctx)
4791 fl = ctx[f].flags()
4790 fl = ctx[f].flags()
4792 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4791 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4793 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4792 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4794 fm.write(b'path', b'%s\n', f)
4793 fm.write(b'path', b'%s\n', f)
4795 fm.end()
4794 fm.end()
4796
4795
4797
4796
4798 @command(
4797 @command(
4799 b'merge',
4798 b'merge',
4800 [
4799 [
4801 (
4800 (
4802 b'f',
4801 b'f',
4803 b'force',
4802 b'force',
4804 None,
4803 None,
4805 _(b'force a merge including outstanding changes (DEPRECATED)'),
4804 _(b'force a merge including outstanding changes (DEPRECATED)'),
4806 ),
4805 ),
4807 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4806 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4808 (
4807 (
4809 b'P',
4808 b'P',
4810 b'preview',
4809 b'preview',
4811 None,
4810 None,
4812 _(b'review revisions to merge (no merge is performed)'),
4811 _(b'review revisions to merge (no merge is performed)'),
4813 ),
4812 ),
4814 (b'', b'abort', None, _(b'abort the ongoing merge')),
4813 (b'', b'abort', None, _(b'abort the ongoing merge')),
4815 ]
4814 ]
4816 + mergetoolopts,
4815 + mergetoolopts,
4817 _(b'[-P] [[-r] REV]'),
4816 _(b'[-P] [[-r] REV]'),
4818 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4817 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4819 helpbasic=True,
4818 helpbasic=True,
4820 )
4819 )
4821 def merge(ui, repo, node=None, **opts):
4820 def merge(ui, repo, node=None, **opts):
4822 """merge another revision into working directory
4821 """merge another revision into working directory
4823
4822
4824 The current working directory is updated with all changes made in
4823 The current working directory is updated with all changes made in
4825 the requested revision since the last common predecessor revision.
4824 the requested revision since the last common predecessor revision.
4826
4825
4827 Files that changed between either parent are marked as changed for
4826 Files that changed between either parent are marked as changed for
4828 the next commit and a commit must be performed before any further
4827 the next commit and a commit must be performed before any further
4829 updates to the repository are allowed. The next commit will have
4828 updates to the repository are allowed. The next commit will have
4830 two parents.
4829 two parents.
4831
4830
4832 ``--tool`` can be used to specify the merge tool used for file
4831 ``--tool`` can be used to specify the merge tool used for file
4833 merges. It overrides the HGMERGE environment variable and your
4832 merges. It overrides the HGMERGE environment variable and your
4834 configuration files. See :hg:`help merge-tools` for options.
4833 configuration files. See :hg:`help merge-tools` for options.
4835
4834
4836 If no revision is specified, the working directory's parent is a
4835 If no revision is specified, the working directory's parent is a
4837 head revision, and the current branch contains exactly one other
4836 head revision, and the current branch contains exactly one other
4838 head, the other head is merged with by default. Otherwise, an
4837 head, the other head is merged with by default. Otherwise, an
4839 explicit revision with which to merge must be provided.
4838 explicit revision with which to merge must be provided.
4840
4839
4841 See :hg:`help resolve` for information on handling file conflicts.
4840 See :hg:`help resolve` for information on handling file conflicts.
4842
4841
4843 To undo an uncommitted merge, use :hg:`merge --abort` which
4842 To undo an uncommitted merge, use :hg:`merge --abort` which
4844 will check out a clean copy of the original merge parent, losing
4843 will check out a clean copy of the original merge parent, losing
4845 all changes.
4844 all changes.
4846
4845
4847 Returns 0 on success, 1 if there are unresolved files.
4846 Returns 0 on success, 1 if there are unresolved files.
4848 """
4847 """
4849
4848
4850 opts = pycompat.byteskwargs(opts)
4849 opts = pycompat.byteskwargs(opts)
4851 abort = opts.get(b'abort')
4850 abort = opts.get(b'abort')
4852 if abort and repo.dirstate.p2() == nullid:
4851 if abort and repo.dirstate.p2() == nullid:
4853 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4852 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4854 if abort:
4853 if abort:
4855 state = cmdutil.getunfinishedstate(repo)
4854 state = cmdutil.getunfinishedstate(repo)
4856 if state and state._opname != b'merge':
4855 if state and state._opname != b'merge':
4857 raise error.Abort(
4856 raise error.Abort(
4858 _(b'cannot abort merge with %s in progress') % (state._opname),
4857 _(b'cannot abort merge with %s in progress') % (state._opname),
4859 hint=state.hint(),
4858 hint=state.hint(),
4860 )
4859 )
4861 if node:
4860 if node:
4862 raise error.Abort(_(b"cannot specify a node with --abort"))
4861 raise error.Abort(_(b"cannot specify a node with --abort"))
4863 if opts.get(b'rev'):
4862 if opts.get(b'rev'):
4864 raise error.Abort(_(b"cannot specify both --rev and --abort"))
4863 raise error.Abort(_(b"cannot specify both --rev and --abort"))
4865 if opts.get(b'preview'):
4864 if opts.get(b'preview'):
4866 raise error.Abort(_(b"cannot specify --preview with --abort"))
4865 raise error.Abort(_(b"cannot specify --preview with --abort"))
4867 if opts.get(b'rev') and node:
4866 if opts.get(b'rev') and node:
4868 raise error.Abort(_(b"please specify just one revision"))
4867 raise error.Abort(_(b"please specify just one revision"))
4869 if not node:
4868 if not node:
4870 node = opts.get(b'rev')
4869 node = opts.get(b'rev')
4871
4870
4872 if node:
4871 if node:
4873 node = scmutil.revsingle(repo, node).node()
4872 node = scmutil.revsingle(repo, node).node()
4874
4873
4875 if not node and not abort:
4874 if not node and not abort:
4876 if ui.configbool(b'commands', b'merge.require-rev'):
4875 if ui.configbool(b'commands', b'merge.require-rev'):
4877 raise error.Abort(
4876 raise error.Abort(
4878 _(
4877 _(
4879 b'configuration requires specifying revision to merge '
4878 b'configuration requires specifying revision to merge '
4880 b'with'
4879 b'with'
4881 )
4880 )
4882 )
4881 )
4883 node = repo[destutil.destmerge(repo)].node()
4882 node = repo[destutil.destmerge(repo)].node()
4884
4883
4885 if opts.get(b'preview'):
4884 if opts.get(b'preview'):
4886 # find nodes that are ancestors of p2 but not of p1
4885 # find nodes that are ancestors of p2 but not of p1
4887 p1 = repo.lookup(b'.')
4886 p1 = repo.lookup(b'.')
4888 p2 = node
4887 p2 = node
4889 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4888 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4890
4889
4891 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4890 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4892 for node in nodes:
4891 for node in nodes:
4893 displayer.show(repo[node])
4892 displayer.show(repo[node])
4894 displayer.close()
4893 displayer.close()
4895 return 0
4894 return 0
4896
4895
4897 # ui.forcemerge is an internal variable, do not document
4896 # ui.forcemerge is an internal variable, do not document
4898 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4897 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4899 with ui.configoverride(overrides, b'merge'):
4898 with ui.configoverride(overrides, b'merge'):
4900 force = opts.get(b'force')
4899 force = opts.get(b'force')
4901 labels = [b'working copy', b'merge rev']
4900 labels = [b'working copy', b'merge rev']
4902 return hg.merge(
4901 return hg.merge(
4903 repo,
4902 repo,
4904 node,
4903 node,
4905 force=force,
4904 force=force,
4906 mergeforce=force,
4905 mergeforce=force,
4907 labels=labels,
4906 labels=labels,
4908 abort=abort,
4907 abort=abort,
4909 )
4908 )
4910
4909
4911
4910
4912 statemod.addunfinished(
4911 statemod.addunfinished(
4913 b'merge',
4912 b'merge',
4914 fname=None,
4913 fname=None,
4915 clearable=True,
4914 clearable=True,
4916 allowcommit=True,
4915 allowcommit=True,
4917 cmdmsg=_(b'outstanding uncommitted merge'),
4916 cmdmsg=_(b'outstanding uncommitted merge'),
4918 abortfunc=hg.abortmerge,
4917 abortfunc=hg.abortmerge,
4919 statushint=_(
4918 statushint=_(
4920 b'To continue: hg commit\nTo abort: hg merge --abort'
4919 b'To continue: hg commit\nTo abort: hg merge --abort'
4921 ),
4920 ),
4922 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4921 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4923 )
4922 )
4924
4923
4925
4924
4926 @command(
4925 @command(
4927 b'outgoing|out',
4926 b'outgoing|out',
4928 [
4927 [
4929 (
4928 (
4930 b'f',
4929 b'f',
4931 b'force',
4930 b'force',
4932 None,
4931 None,
4933 _(b'run even when the destination is unrelated'),
4932 _(b'run even when the destination is unrelated'),
4934 ),
4933 ),
4935 (
4934 (
4936 b'r',
4935 b'r',
4937 b'rev',
4936 b'rev',
4938 [],
4937 [],
4939 _(b'a changeset intended to be included in the destination'),
4938 _(b'a changeset intended to be included in the destination'),
4940 _(b'REV'),
4939 _(b'REV'),
4941 ),
4940 ),
4942 (b'n', b'newest-first', None, _(b'show newest record first')),
4941 (b'n', b'newest-first', None, _(b'show newest record first')),
4943 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4942 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4944 (
4943 (
4945 b'b',
4944 b'b',
4946 b'branch',
4945 b'branch',
4947 [],
4946 [],
4948 _(b'a specific branch you would like to push'),
4947 _(b'a specific branch you would like to push'),
4949 _(b'BRANCH'),
4948 _(b'BRANCH'),
4950 ),
4949 ),
4951 ]
4950 ]
4952 + logopts
4951 + logopts
4953 + remoteopts
4952 + remoteopts
4954 + subrepoopts,
4953 + subrepoopts,
4955 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4954 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4956 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4955 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4957 )
4956 )
4958 def outgoing(ui, repo, dest=None, **opts):
4957 def outgoing(ui, repo, dest=None, **opts):
4959 """show changesets not found in the destination
4958 """show changesets not found in the destination
4960
4959
4961 Show changesets not found in the specified destination repository
4960 Show changesets not found in the specified destination repository
4962 or the default push location. These are the changesets that would
4961 or the default push location. These are the changesets that would
4963 be pushed if a push was requested.
4962 be pushed if a push was requested.
4964
4963
4965 See pull for details of valid destination formats.
4964 See pull for details of valid destination formats.
4966
4965
4967 .. container:: verbose
4966 .. container:: verbose
4968
4967
4969 With -B/--bookmarks, the result of bookmark comparison between
4968 With -B/--bookmarks, the result of bookmark comparison between
4970 local and remote repositories is displayed. With -v/--verbose,
4969 local and remote repositories is displayed. With -v/--verbose,
4971 status is also displayed for each bookmark like below::
4970 status is also displayed for each bookmark like below::
4972
4971
4973 BM1 01234567890a added
4972 BM1 01234567890a added
4974 BM2 deleted
4973 BM2 deleted
4975 BM3 234567890abc advanced
4974 BM3 234567890abc advanced
4976 BM4 34567890abcd diverged
4975 BM4 34567890abcd diverged
4977 BM5 4567890abcde changed
4976 BM5 4567890abcde changed
4978
4977
4979 The action taken when pushing depends on the
4978 The action taken when pushing depends on the
4980 status of each bookmark:
4979 status of each bookmark:
4981
4980
4982 :``added``: push with ``-B`` will create it
4981 :``added``: push with ``-B`` will create it
4983 :``deleted``: push with ``-B`` will delete it
4982 :``deleted``: push with ``-B`` will delete it
4984 :``advanced``: push will update it
4983 :``advanced``: push will update it
4985 :``diverged``: push with ``-B`` will update it
4984 :``diverged``: push with ``-B`` will update it
4986 :``changed``: push with ``-B`` will update it
4985 :``changed``: push with ``-B`` will update it
4987
4986
4988 From the point of view of pushing behavior, bookmarks
4987 From the point of view of pushing behavior, bookmarks
4989 existing only in the remote repository are treated as
4988 existing only in the remote repository are treated as
4990 ``deleted``, even if it is in fact added remotely.
4989 ``deleted``, even if it is in fact added remotely.
4991
4990
4992 Returns 0 if there are outgoing changes, 1 otherwise.
4991 Returns 0 if there are outgoing changes, 1 otherwise.
4993 """
4992 """
4994 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4993 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4995 # style URLs, so don't overwrite dest.
4994 # style URLs, so don't overwrite dest.
4996 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4995 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4997 if not path:
4996 if not path:
4998 raise error.Abort(
4997 raise error.Abort(
4999 _(b'default repository not configured!'),
4998 _(b'default repository not configured!'),
5000 hint=_(b"see 'hg help config.paths'"),
4999 hint=_(b"see 'hg help config.paths'"),
5001 )
5000 )
5002
5001
5003 opts = pycompat.byteskwargs(opts)
5002 opts = pycompat.byteskwargs(opts)
5004 if opts.get(b'graph'):
5003 if opts.get(b'graph'):
5005 logcmdutil.checkunsupportedgraphflags([], opts)
5004 logcmdutil.checkunsupportedgraphflags([], opts)
5006 o, other = hg._outgoing(ui, repo, dest, opts)
5005 o, other = hg._outgoing(ui, repo, dest, opts)
5007 if not o:
5006 if not o:
5008 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5007 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5009 return
5008 return
5010
5009
5011 revdag = logcmdutil.graphrevs(repo, o, opts)
5010 revdag = logcmdutil.graphrevs(repo, o, opts)
5012 ui.pager(b'outgoing')
5011 ui.pager(b'outgoing')
5013 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5012 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5014 logcmdutil.displaygraph(
5013 logcmdutil.displaygraph(
5015 ui, repo, revdag, displayer, graphmod.asciiedges
5014 ui, repo, revdag, displayer, graphmod.asciiedges
5016 )
5015 )
5017 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5016 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5018 return 0
5017 return 0
5019
5018
5020 if opts.get(b'bookmarks'):
5019 if opts.get(b'bookmarks'):
5021 dest = path.pushloc or path.loc
5020 dest = path.pushloc or path.loc
5022 other = hg.peer(repo, opts, dest)
5021 other = hg.peer(repo, opts, dest)
5023 if b'bookmarks' not in other.listkeys(b'namespaces'):
5022 if b'bookmarks' not in other.listkeys(b'namespaces'):
5024 ui.warn(_(b"remote doesn't support bookmarks\n"))
5023 ui.warn(_(b"remote doesn't support bookmarks\n"))
5025 return 0
5024 return 0
5026 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5025 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5027 ui.pager(b'outgoing')
5026 ui.pager(b'outgoing')
5028 return bookmarks.outgoing(ui, repo, other)
5027 return bookmarks.outgoing(ui, repo, other)
5029
5028
5030 repo._subtoppath = path.pushloc or path.loc
5029 repo._subtoppath = path.pushloc or path.loc
5031 try:
5030 try:
5032 return hg.outgoing(ui, repo, dest, opts)
5031 return hg.outgoing(ui, repo, dest, opts)
5033 finally:
5032 finally:
5034 del repo._subtoppath
5033 del repo._subtoppath
5035
5034
5036
5035
5037 @command(
5036 @command(
5038 b'parents',
5037 b'parents',
5039 [
5038 [
5040 (
5039 (
5041 b'r',
5040 b'r',
5042 b'rev',
5041 b'rev',
5043 b'',
5042 b'',
5044 _(b'show parents of the specified revision'),
5043 _(b'show parents of the specified revision'),
5045 _(b'REV'),
5044 _(b'REV'),
5046 ),
5045 ),
5047 ]
5046 ]
5048 + templateopts,
5047 + templateopts,
5049 _(b'[-r REV] [FILE]'),
5048 _(b'[-r REV] [FILE]'),
5050 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5049 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5051 inferrepo=True,
5050 inferrepo=True,
5052 )
5051 )
5053 def parents(ui, repo, file_=None, **opts):
5052 def parents(ui, repo, file_=None, **opts):
5054 """show the parents of the working directory or revision (DEPRECATED)
5053 """show the parents of the working directory or revision (DEPRECATED)
5055
5054
5056 Print the working directory's parent revisions. If a revision is
5055 Print the working directory's parent revisions. If a revision is
5057 given via -r/--rev, the parent of that revision will be printed.
5056 given via -r/--rev, the parent of that revision will be printed.
5058 If a file argument is given, the revision in which the file was
5057 If a file argument is given, the revision in which the file was
5059 last changed (before the working directory revision or the
5058 last changed (before the working directory revision or the
5060 argument to --rev if given) is printed.
5059 argument to --rev if given) is printed.
5061
5060
5062 This command is equivalent to::
5061 This command is equivalent to::
5063
5062
5064 hg log -r "p1()+p2()" or
5063 hg log -r "p1()+p2()" or
5065 hg log -r "p1(REV)+p2(REV)" or
5064 hg log -r "p1(REV)+p2(REV)" or
5066 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5065 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5067 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5066 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5068
5067
5069 See :hg:`summary` and :hg:`help revsets` for related information.
5068 See :hg:`summary` and :hg:`help revsets` for related information.
5070
5069
5071 Returns 0 on success.
5070 Returns 0 on success.
5072 """
5071 """
5073
5072
5074 opts = pycompat.byteskwargs(opts)
5073 opts = pycompat.byteskwargs(opts)
5075 rev = opts.get(b'rev')
5074 rev = opts.get(b'rev')
5076 if rev:
5075 if rev:
5077 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5076 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5078 ctx = scmutil.revsingle(repo, rev, None)
5077 ctx = scmutil.revsingle(repo, rev, None)
5079
5078
5080 if file_:
5079 if file_:
5081 m = scmutil.match(ctx, (file_,), opts)
5080 m = scmutil.match(ctx, (file_,), opts)
5082 if m.anypats() or len(m.files()) != 1:
5081 if m.anypats() or len(m.files()) != 1:
5083 raise error.Abort(_(b'can only specify an explicit filename'))
5082 raise error.Abort(_(b'can only specify an explicit filename'))
5084 file_ = m.files()[0]
5083 file_ = m.files()[0]
5085 filenodes = []
5084 filenodes = []
5086 for cp in ctx.parents():
5085 for cp in ctx.parents():
5087 if not cp:
5086 if not cp:
5088 continue
5087 continue
5089 try:
5088 try:
5090 filenodes.append(cp.filenode(file_))
5089 filenodes.append(cp.filenode(file_))
5091 except error.LookupError:
5090 except error.LookupError:
5092 pass
5091 pass
5093 if not filenodes:
5092 if not filenodes:
5094 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5093 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5095 p = []
5094 p = []
5096 for fn in filenodes:
5095 for fn in filenodes:
5097 fctx = repo.filectx(file_, fileid=fn)
5096 fctx = repo.filectx(file_, fileid=fn)
5098 p.append(fctx.node())
5097 p.append(fctx.node())
5099 else:
5098 else:
5100 p = [cp.node() for cp in ctx.parents()]
5099 p = [cp.node() for cp in ctx.parents()]
5101
5100
5102 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5101 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5103 for n in p:
5102 for n in p:
5104 if n != nullid:
5103 if n != nullid:
5105 displayer.show(repo[n])
5104 displayer.show(repo[n])
5106 displayer.close()
5105 displayer.close()
5107
5106
5108
5107
5109 @command(
5108 @command(
5110 b'paths',
5109 b'paths',
5111 formatteropts,
5110 formatteropts,
5112 _(b'[NAME]'),
5111 _(b'[NAME]'),
5113 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5112 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5114 optionalrepo=True,
5113 optionalrepo=True,
5115 intents={INTENT_READONLY},
5114 intents={INTENT_READONLY},
5116 )
5115 )
5117 def paths(ui, repo, search=None, **opts):
5116 def paths(ui, repo, search=None, **opts):
5118 """show aliases for remote repositories
5117 """show aliases for remote repositories
5119
5118
5120 Show definition of symbolic path name NAME. If no name is given,
5119 Show definition of symbolic path name NAME. If no name is given,
5121 show definition of all available names.
5120 show definition of all available names.
5122
5121
5123 Option -q/--quiet suppresses all output when searching for NAME
5122 Option -q/--quiet suppresses all output when searching for NAME
5124 and shows only the path names when listing all definitions.
5123 and shows only the path names when listing all definitions.
5125
5124
5126 Path names are defined in the [paths] section of your
5125 Path names are defined in the [paths] section of your
5127 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5126 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5128 repository, ``.hg/hgrc`` is used, too.
5127 repository, ``.hg/hgrc`` is used, too.
5129
5128
5130 The path names ``default`` and ``default-push`` have a special
5129 The path names ``default`` and ``default-push`` have a special
5131 meaning. When performing a push or pull operation, they are used
5130 meaning. When performing a push or pull operation, they are used
5132 as fallbacks if no location is specified on the command-line.
5131 as fallbacks if no location is specified on the command-line.
5133 When ``default-push`` is set, it will be used for push and
5132 When ``default-push`` is set, it will be used for push and
5134 ``default`` will be used for pull; otherwise ``default`` is used
5133 ``default`` will be used for pull; otherwise ``default`` is used
5135 as the fallback for both. When cloning a repository, the clone
5134 as the fallback for both. When cloning a repository, the clone
5136 source is written as ``default`` in ``.hg/hgrc``.
5135 source is written as ``default`` in ``.hg/hgrc``.
5137
5136
5138 .. note::
5137 .. note::
5139
5138
5140 ``default`` and ``default-push`` apply to all inbound (e.g.
5139 ``default`` and ``default-push`` apply to all inbound (e.g.
5141 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5140 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5142 and :hg:`bundle`) operations.
5141 and :hg:`bundle`) operations.
5143
5142
5144 See :hg:`help urls` for more information.
5143 See :hg:`help urls` for more information.
5145
5144
5146 .. container:: verbose
5145 .. container:: verbose
5147
5146
5148 Template:
5147 Template:
5149
5148
5150 The following keywords are supported. See also :hg:`help templates`.
5149 The following keywords are supported. See also :hg:`help templates`.
5151
5150
5152 :name: String. Symbolic name of the path alias.
5151 :name: String. Symbolic name of the path alias.
5153 :pushurl: String. URL for push operations.
5152 :pushurl: String. URL for push operations.
5154 :url: String. URL or directory path for the other operations.
5153 :url: String. URL or directory path for the other operations.
5155
5154
5156 Returns 0 on success.
5155 Returns 0 on success.
5157 """
5156 """
5158
5157
5159 opts = pycompat.byteskwargs(opts)
5158 opts = pycompat.byteskwargs(opts)
5160 ui.pager(b'paths')
5159 ui.pager(b'paths')
5161 if search:
5160 if search:
5162 pathitems = [
5161 pathitems = [
5163 (name, path)
5162 (name, path)
5164 for name, path in pycompat.iteritems(ui.paths)
5163 for name, path in pycompat.iteritems(ui.paths)
5165 if name == search
5164 if name == search
5166 ]
5165 ]
5167 else:
5166 else:
5168 pathitems = sorted(pycompat.iteritems(ui.paths))
5167 pathitems = sorted(pycompat.iteritems(ui.paths))
5169
5168
5170 fm = ui.formatter(b'paths', opts)
5169 fm = ui.formatter(b'paths', opts)
5171 if fm.isplain():
5170 if fm.isplain():
5172 hidepassword = util.hidepassword
5171 hidepassword = util.hidepassword
5173 else:
5172 else:
5174 hidepassword = bytes
5173 hidepassword = bytes
5175 if ui.quiet:
5174 if ui.quiet:
5176 namefmt = b'%s\n'
5175 namefmt = b'%s\n'
5177 else:
5176 else:
5178 namefmt = b'%s = '
5177 namefmt = b'%s = '
5179 showsubopts = not search and not ui.quiet
5178 showsubopts = not search and not ui.quiet
5180
5179
5181 for name, path in pathitems:
5180 for name, path in pathitems:
5182 fm.startitem()
5181 fm.startitem()
5183 fm.condwrite(not search, b'name', namefmt, name)
5182 fm.condwrite(not search, b'name', namefmt, name)
5184 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5183 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5185 for subopt, value in sorted(path.suboptions.items()):
5184 for subopt, value in sorted(path.suboptions.items()):
5186 assert subopt not in (b'name', b'url')
5185 assert subopt not in (b'name', b'url')
5187 if showsubopts:
5186 if showsubopts:
5188 fm.plain(b'%s:%s = ' % (name, subopt))
5187 fm.plain(b'%s:%s = ' % (name, subopt))
5189 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5188 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5190
5189
5191 fm.end()
5190 fm.end()
5192
5191
5193 if search and not pathitems:
5192 if search and not pathitems:
5194 if not ui.quiet:
5193 if not ui.quiet:
5195 ui.warn(_(b"not found!\n"))
5194 ui.warn(_(b"not found!\n"))
5196 return 1
5195 return 1
5197 else:
5196 else:
5198 return 0
5197 return 0
5199
5198
5200
5199
5201 @command(
5200 @command(
5202 b'phase',
5201 b'phase',
5203 [
5202 [
5204 (b'p', b'public', False, _(b'set changeset phase to public')),
5203 (b'p', b'public', False, _(b'set changeset phase to public')),
5205 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5204 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5206 (b's', b'secret', False, _(b'set changeset phase to secret')),
5205 (b's', b'secret', False, _(b'set changeset phase to secret')),
5207 (b'f', b'force', False, _(b'allow to move boundary backward')),
5206 (b'f', b'force', False, _(b'allow to move boundary backward')),
5208 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5207 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5209 ],
5208 ],
5210 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5209 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5211 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5210 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5212 )
5211 )
5213 def phase(ui, repo, *revs, **opts):
5212 def phase(ui, repo, *revs, **opts):
5214 """set or show the current phase name
5213 """set or show the current phase name
5215
5214
5216 With no argument, show the phase name of the current revision(s).
5215 With no argument, show the phase name of the current revision(s).
5217
5216
5218 With one of -p/--public, -d/--draft or -s/--secret, change the
5217 With one of -p/--public, -d/--draft or -s/--secret, change the
5219 phase value of the specified revisions.
5218 phase value of the specified revisions.
5220
5219
5221 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5220 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5222 lower phase to a higher phase. Phases are ordered as follows::
5221 lower phase to a higher phase. Phases are ordered as follows::
5223
5222
5224 public < draft < secret
5223 public < draft < secret
5225
5224
5226 Returns 0 on success, 1 if some phases could not be changed.
5225 Returns 0 on success, 1 if some phases could not be changed.
5227
5226
5228 (For more information about the phases concept, see :hg:`help phases`.)
5227 (For more information about the phases concept, see :hg:`help phases`.)
5229 """
5228 """
5230 opts = pycompat.byteskwargs(opts)
5229 opts = pycompat.byteskwargs(opts)
5231 # search for a unique phase argument
5230 # search for a unique phase argument
5232 targetphase = None
5231 targetphase = None
5233 for idx, name in enumerate(phases.cmdphasenames):
5232 for idx, name in enumerate(phases.cmdphasenames):
5234 if opts[name]:
5233 if opts[name]:
5235 if targetphase is not None:
5234 if targetphase is not None:
5236 raise error.Abort(_(b'only one phase can be specified'))
5235 raise error.Abort(_(b'only one phase can be specified'))
5237 targetphase = idx
5236 targetphase = idx
5238
5237
5239 # look for specified revision
5238 # look for specified revision
5240 revs = list(revs)
5239 revs = list(revs)
5241 revs.extend(opts[b'rev'])
5240 revs.extend(opts[b'rev'])
5242 if not revs:
5241 if not revs:
5243 # display both parents as the second parent phase can influence
5242 # display both parents as the second parent phase can influence
5244 # the phase of a merge commit
5243 # the phase of a merge commit
5245 revs = [c.rev() for c in repo[None].parents()]
5244 revs = [c.rev() for c in repo[None].parents()]
5246
5245
5247 revs = scmutil.revrange(repo, revs)
5246 revs = scmutil.revrange(repo, revs)
5248
5247
5249 ret = 0
5248 ret = 0
5250 if targetphase is None:
5249 if targetphase is None:
5251 # display
5250 # display
5252 for r in revs:
5251 for r in revs:
5253 ctx = repo[r]
5252 ctx = repo[r]
5254 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5253 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5255 else:
5254 else:
5256 with repo.lock(), repo.transaction(b"phase") as tr:
5255 with repo.lock(), repo.transaction(b"phase") as tr:
5257 # set phase
5256 # set phase
5258 if not revs:
5257 if not revs:
5259 raise error.Abort(_(b'empty revision set'))
5258 raise error.Abort(_(b'empty revision set'))
5260 nodes = [repo[r].node() for r in revs]
5259 nodes = [repo[r].node() for r in revs]
5261 # moving revision from public to draft may hide them
5260 # moving revision from public to draft may hide them
5262 # We have to check result on an unfiltered repository
5261 # We have to check result on an unfiltered repository
5263 unfi = repo.unfiltered()
5262 unfi = repo.unfiltered()
5264 getphase = unfi._phasecache.phase
5263 getphase = unfi._phasecache.phase
5265 olddata = [getphase(unfi, r) for r in unfi]
5264 olddata = [getphase(unfi, r) for r in unfi]
5266 phases.advanceboundary(repo, tr, targetphase, nodes)
5265 phases.advanceboundary(repo, tr, targetphase, nodes)
5267 if opts[b'force']:
5266 if opts[b'force']:
5268 phases.retractboundary(repo, tr, targetphase, nodes)
5267 phases.retractboundary(repo, tr, targetphase, nodes)
5269 getphase = unfi._phasecache.phase
5268 getphase = unfi._phasecache.phase
5270 newdata = [getphase(unfi, r) for r in unfi]
5269 newdata = [getphase(unfi, r) for r in unfi]
5271 changes = sum(newdata[r] != olddata[r] for r in unfi)
5270 changes = sum(newdata[r] != olddata[r] for r in unfi)
5272 cl = unfi.changelog
5271 cl = unfi.changelog
5273 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5272 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5274 if rejected:
5273 if rejected:
5275 ui.warn(
5274 ui.warn(
5276 _(
5275 _(
5277 b'cannot move %i changesets to a higher '
5276 b'cannot move %i changesets to a higher '
5278 b'phase, use --force\n'
5277 b'phase, use --force\n'
5279 )
5278 )
5280 % len(rejected)
5279 % len(rejected)
5281 )
5280 )
5282 ret = 1
5281 ret = 1
5283 if changes:
5282 if changes:
5284 msg = _(b'phase changed for %i changesets\n') % changes
5283 msg = _(b'phase changed for %i changesets\n') % changes
5285 if ret:
5284 if ret:
5286 ui.status(msg)
5285 ui.status(msg)
5287 else:
5286 else:
5288 ui.note(msg)
5287 ui.note(msg)
5289 else:
5288 else:
5290 ui.warn(_(b'no phases changed\n'))
5289 ui.warn(_(b'no phases changed\n'))
5291 return ret
5290 return ret
5292
5291
5293
5292
5294 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5293 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5295 """Run after a changegroup has been added via pull/unbundle
5294 """Run after a changegroup has been added via pull/unbundle
5296
5295
5297 This takes arguments below:
5296 This takes arguments below:
5298
5297
5299 :modheads: change of heads by pull/unbundle
5298 :modheads: change of heads by pull/unbundle
5300 :optupdate: updating working directory is needed or not
5299 :optupdate: updating working directory is needed or not
5301 :checkout: update destination revision (or None to default destination)
5300 :checkout: update destination revision (or None to default destination)
5302 :brev: a name, which might be a bookmark to be activated after updating
5301 :brev: a name, which might be a bookmark to be activated after updating
5303 """
5302 """
5304 if modheads == 0:
5303 if modheads == 0:
5305 return
5304 return
5306 if optupdate:
5305 if optupdate:
5307 try:
5306 try:
5308 return hg.updatetotally(ui, repo, checkout, brev)
5307 return hg.updatetotally(ui, repo, checkout, brev)
5309 except error.UpdateAbort as inst:
5308 except error.UpdateAbort as inst:
5310 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5309 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5311 hint = inst.hint
5310 hint = inst.hint
5312 raise error.UpdateAbort(msg, hint=hint)
5311 raise error.UpdateAbort(msg, hint=hint)
5313 if modheads is not None and modheads > 1:
5312 if modheads is not None and modheads > 1:
5314 currentbranchheads = len(repo.branchheads())
5313 currentbranchheads = len(repo.branchheads())
5315 if currentbranchheads == modheads:
5314 if currentbranchheads == modheads:
5316 ui.status(
5315 ui.status(
5317 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5316 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5318 )
5317 )
5319 elif currentbranchheads > 1:
5318 elif currentbranchheads > 1:
5320 ui.status(
5319 ui.status(
5321 _(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")
5322 )
5321 )
5323 else:
5322 else:
5324 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5323 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5325 elif not ui.configbool(b'commands', b'update.requiredest'):
5324 elif not ui.configbool(b'commands', b'update.requiredest'):
5326 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5325 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5327
5326
5328
5327
5329 @command(
5328 @command(
5330 b'pull',
5329 b'pull',
5331 [
5330 [
5332 (
5331 (
5333 b'u',
5332 b'u',
5334 b'update',
5333 b'update',
5335 None,
5334 None,
5336 _(b'update to new branch head if new descendants were pulled'),
5335 _(b'update to new branch head if new descendants were pulled'),
5337 ),
5336 ),
5338 (
5337 (
5339 b'f',
5338 b'f',
5340 b'force',
5339 b'force',
5341 None,
5340 None,
5342 _(b'run even when remote repository is unrelated'),
5341 _(b'run even when remote repository is unrelated'),
5343 ),
5342 ),
5344 (
5343 (
5345 b'r',
5344 b'r',
5346 b'rev',
5345 b'rev',
5347 [],
5346 [],
5348 _(b'a remote changeset intended to be added'),
5347 _(b'a remote changeset intended to be added'),
5349 _(b'REV'),
5348 _(b'REV'),
5350 ),
5349 ),
5351 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5350 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5352 (
5351 (
5353 b'b',
5352 b'b',
5354 b'branch',
5353 b'branch',
5355 [],
5354 [],
5356 _(b'a specific branch you would like to pull'),
5355 _(b'a specific branch you would like to pull'),
5357 _(b'BRANCH'),
5356 _(b'BRANCH'),
5358 ),
5357 ),
5359 ]
5358 ]
5360 + remoteopts,
5359 + remoteopts,
5361 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5360 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5362 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5361 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5363 helpbasic=True,
5362 helpbasic=True,
5364 )
5363 )
5365 def pull(ui, repo, source=b"default", **opts):
5364 def pull(ui, repo, source=b"default", **opts):
5366 """pull changes from the specified source
5365 """pull changes from the specified source
5367
5366
5368 Pull changes from a remote repository to a local one.
5367 Pull changes from a remote repository to a local one.
5369
5368
5370 This finds all changes from the repository at the specified path
5369 This finds all changes from the repository at the specified path
5371 or URL and adds them to a local repository (the current one unless
5370 or URL and adds them to a local repository (the current one unless
5372 -R is specified). By default, this does not update the copy of the
5371 -R is specified). By default, this does not update the copy of the
5373 project in the working directory.
5372 project in the working directory.
5374
5373
5375 When cloning from servers that support it, Mercurial may fetch
5374 When cloning from servers that support it, Mercurial may fetch
5376 pre-generated data. When this is done, hooks operating on incoming
5375 pre-generated data. When this is done, hooks operating on incoming
5377 changesets and changegroups may fire more than once, once for each
5376 changesets and changegroups may fire more than once, once for each
5378 pre-generated bundle and as well as for any additional remaining
5377 pre-generated bundle and as well as for any additional remaining
5379 data. See :hg:`help -e clonebundles` for more.
5378 data. See :hg:`help -e clonebundles` for more.
5380
5379
5381 Use :hg:`incoming` if you want to see what would have been added
5380 Use :hg:`incoming` if you want to see what would have been added
5382 by a pull at the time you issued this command. If you then decide
5381 by a pull at the time you issued this command. If you then decide
5383 to add those changes to the repository, you should use :hg:`pull
5382 to add those changes to the repository, you should use :hg:`pull
5384 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5383 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5385
5384
5386 If SOURCE is omitted, the 'default' path will be used.
5385 If SOURCE is omitted, the 'default' path will be used.
5387 See :hg:`help urls` for more information.
5386 See :hg:`help urls` for more information.
5388
5387
5389 Specifying bookmark as ``.`` is equivalent to specifying the active
5388 Specifying bookmark as ``.`` is equivalent to specifying the active
5390 bookmark's name.
5389 bookmark's name.
5391
5390
5392 Returns 0 on success, 1 if an update had unresolved files.
5391 Returns 0 on success, 1 if an update had unresolved files.
5393 """
5392 """
5394
5393
5395 opts = pycompat.byteskwargs(opts)
5394 opts = pycompat.byteskwargs(opts)
5396 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5395 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5397 b'update'
5396 b'update'
5398 ):
5397 ):
5399 msg = _(b'update destination required by configuration')
5398 msg = _(b'update destination required by configuration')
5400 hint = _(b'use hg pull followed by hg update DEST')
5399 hint = _(b'use hg pull followed by hg update DEST')
5401 raise error.Abort(msg, hint=hint)
5400 raise error.Abort(msg, hint=hint)
5402
5401
5403 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5402 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5404 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5403 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5405 other = hg.peer(repo, opts, source)
5404 other = hg.peer(repo, opts, source)
5406 try:
5405 try:
5407 revs, checkout = hg.addbranchrevs(
5406 revs, checkout = hg.addbranchrevs(
5408 repo, other, branches, opts.get(b'rev')
5407 repo, other, branches, opts.get(b'rev')
5409 )
5408 )
5410
5409
5411 pullopargs = {}
5410 pullopargs = {}
5412
5411
5413 nodes = None
5412 nodes = None
5414 if opts.get(b'bookmark') or revs:
5413 if opts.get(b'bookmark') or revs:
5415 # The list of bookmark used here is the same used to actually update
5414 # The list of bookmark used here is the same used to actually update
5416 # the bookmark names, to avoid the race from issue 4689 and we do
5415 # the bookmark names, to avoid the race from issue 4689 and we do
5417 # all lookup and bookmark queries in one go so they see the same
5416 # all lookup and bookmark queries in one go so they see the same
5418 # version of the server state (issue 4700).
5417 # version of the server state (issue 4700).
5419 nodes = []
5418 nodes = []
5420 fnodes = []
5419 fnodes = []
5421 revs = revs or []
5420 revs = revs or []
5422 if revs and not other.capable(b'lookup'):
5421 if revs and not other.capable(b'lookup'):
5423 err = _(
5422 err = _(
5424 b"other repository doesn't support revision lookup, "
5423 b"other repository doesn't support revision lookup, "
5425 b"so a rev cannot be specified."
5424 b"so a rev cannot be specified."
5426 )
5425 )
5427 raise error.Abort(err)
5426 raise error.Abort(err)
5428 with other.commandexecutor() as e:
5427 with other.commandexecutor() as e:
5429 fremotebookmarks = e.callcommand(
5428 fremotebookmarks = e.callcommand(
5430 b'listkeys', {b'namespace': b'bookmarks'}
5429 b'listkeys', {b'namespace': b'bookmarks'}
5431 )
5430 )
5432 for r in revs:
5431 for r in revs:
5433 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5432 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5434 remotebookmarks = fremotebookmarks.result()
5433 remotebookmarks = fremotebookmarks.result()
5435 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5434 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5436 pullopargs[b'remotebookmarks'] = remotebookmarks
5435 pullopargs[b'remotebookmarks'] = remotebookmarks
5437 for b in opts.get(b'bookmark', []):
5436 for b in opts.get(b'bookmark', []):
5438 b = repo._bookmarks.expandname(b)
5437 b = repo._bookmarks.expandname(b)
5439 if b not in remotebookmarks:
5438 if b not in remotebookmarks:
5440 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5439 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5441 nodes.append(remotebookmarks[b])
5440 nodes.append(remotebookmarks[b])
5442 for i, rev in enumerate(revs):
5441 for i, rev in enumerate(revs):
5443 node = fnodes[i].result()
5442 node = fnodes[i].result()
5444 nodes.append(node)
5443 nodes.append(node)
5445 if rev == checkout:
5444 if rev == checkout:
5446 checkout = node
5445 checkout = node
5447
5446
5448 wlock = util.nullcontextmanager()
5447 wlock = util.nullcontextmanager()
5449 if opts.get(b'update'):
5448 if opts.get(b'update'):
5450 wlock = repo.wlock()
5449 wlock = repo.wlock()
5451 with wlock:
5450 with wlock:
5452 pullopargs.update(opts.get(b'opargs', {}))
5451 pullopargs.update(opts.get(b'opargs', {}))
5453 modheads = exchange.pull(
5452 modheads = exchange.pull(
5454 repo,
5453 repo,
5455 other,
5454 other,
5456 heads=nodes,
5455 heads=nodes,
5457 force=opts.get(b'force'),
5456 force=opts.get(b'force'),
5458 bookmarks=opts.get(b'bookmark', ()),
5457 bookmarks=opts.get(b'bookmark', ()),
5459 opargs=pullopargs,
5458 opargs=pullopargs,
5460 ).cgresult
5459 ).cgresult
5461
5460
5462 # brev is a name, which might be a bookmark to be activated at
5461 # brev is a name, which might be a bookmark to be activated at
5463 # the end of the update. In other words, it is an explicit
5462 # the end of the update. In other words, it is an explicit
5464 # destination of the update
5463 # destination of the update
5465 brev = None
5464 brev = None
5466
5465
5467 if checkout:
5466 if checkout:
5468 checkout = repo.unfiltered().changelog.rev(checkout)
5467 checkout = repo.unfiltered().changelog.rev(checkout)
5469
5468
5470 # order below depends on implementation of
5469 # order below depends on implementation of
5471 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5470 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5472 # because 'checkout' is determined without it.
5471 # because 'checkout' is determined without it.
5473 if opts.get(b'rev'):
5472 if opts.get(b'rev'):
5474 brev = opts[b'rev'][0]
5473 brev = opts[b'rev'][0]
5475 elif opts.get(b'branch'):
5474 elif opts.get(b'branch'):
5476 brev = opts[b'branch'][0]
5475 brev = opts[b'branch'][0]
5477 else:
5476 else:
5478 brev = branches[0]
5477 brev = branches[0]
5479 repo._subtoppath = source
5478 repo._subtoppath = source
5480 try:
5479 try:
5481 ret = postincoming(
5480 ret = postincoming(
5482 ui, repo, modheads, opts.get(b'update'), checkout, brev
5481 ui, repo, modheads, opts.get(b'update'), checkout, brev
5483 )
5482 )
5484 except error.FilteredRepoLookupError as exc:
5483 except error.FilteredRepoLookupError as exc:
5485 msg = _(b'cannot update to target: %s') % exc.args[0]
5484 msg = _(b'cannot update to target: %s') % exc.args[0]
5486 exc.args = (msg,) + exc.args[1:]
5485 exc.args = (msg,) + exc.args[1:]
5487 raise
5486 raise
5488 finally:
5487 finally:
5489 del repo._subtoppath
5488 del repo._subtoppath
5490
5489
5491 finally:
5490 finally:
5492 other.close()
5491 other.close()
5493 return ret
5492 return ret
5494
5493
5495
5494
5496 @command(
5495 @command(
5497 b'push',
5496 b'push',
5498 [
5497 [
5499 (b'f', b'force', None, _(b'force push')),
5498 (b'f', b'force', None, _(b'force push')),
5500 (
5499 (
5501 b'r',
5500 b'r',
5502 b'rev',
5501 b'rev',
5503 [],
5502 [],
5504 _(b'a changeset intended to be included in the destination'),
5503 _(b'a changeset intended to be included in the destination'),
5505 _(b'REV'),
5504 _(b'REV'),
5506 ),
5505 ),
5507 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5506 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5508 (
5507 (
5509 b'b',
5508 b'b',
5510 b'branch',
5509 b'branch',
5511 [],
5510 [],
5512 _(b'a specific branch you would like to push'),
5511 _(b'a specific branch you would like to push'),
5513 _(b'BRANCH'),
5512 _(b'BRANCH'),
5514 ),
5513 ),
5515 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5514 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5516 (
5515 (
5517 b'',
5516 b'',
5518 b'pushvars',
5517 b'pushvars',
5519 [],
5518 [],
5520 _(b'variables that can be sent to server (ADVANCED)'),
5519 _(b'variables that can be sent to server (ADVANCED)'),
5521 ),
5520 ),
5522 (
5521 (
5523 b'',
5522 b'',
5524 b'publish',
5523 b'publish',
5525 False,
5524 False,
5526 _(b'push the changeset as public (EXPERIMENTAL)'),
5525 _(b'push the changeset as public (EXPERIMENTAL)'),
5527 ),
5526 ),
5528 ]
5527 ]
5529 + remoteopts,
5528 + remoteopts,
5530 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5529 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5531 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5530 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5532 helpbasic=True,
5531 helpbasic=True,
5533 )
5532 )
5534 def push(ui, repo, dest=None, **opts):
5533 def push(ui, repo, dest=None, **opts):
5535 """push changes to the specified destination
5534 """push changes to the specified destination
5536
5535
5537 Push changesets from the local repository to the specified
5536 Push changesets from the local repository to the specified
5538 destination.
5537 destination.
5539
5538
5540 This operation is symmetrical to pull: it is identical to a pull
5539 This operation is symmetrical to pull: it is identical to a pull
5541 in the destination repository from the current one.
5540 in the destination repository from the current one.
5542
5541
5543 By default, push will not allow creation of new heads at the
5542 By default, push will not allow creation of new heads at the
5544 destination, since multiple heads would make it unclear which head
5543 destination, since multiple heads would make it unclear which head
5545 to use. In this situation, it is recommended to pull and merge
5544 to use. In this situation, it is recommended to pull and merge
5546 before pushing.
5545 before pushing.
5547
5546
5548 Use --new-branch if you want to allow push to create a new named
5547 Use --new-branch if you want to allow push to create a new named
5549 branch that is not present at the destination. This allows you to
5548 branch that is not present at the destination. This allows you to
5550 only create a new branch without forcing other changes.
5549 only create a new branch without forcing other changes.
5551
5550
5552 .. note::
5551 .. note::
5553
5552
5554 Extra care should be taken with the -f/--force option,
5553 Extra care should be taken with the -f/--force option,
5555 which will push all new heads on all branches, an action which will
5554 which will push all new heads on all branches, an action which will
5556 almost always cause confusion for collaborators.
5555 almost always cause confusion for collaborators.
5557
5556
5558 If -r/--rev is used, the specified revision and all its ancestors
5557 If -r/--rev is used, the specified revision and all its ancestors
5559 will be pushed to the remote repository.
5558 will be pushed to the remote repository.
5560
5559
5561 If -B/--bookmark is used, the specified bookmarked revision, its
5560 If -B/--bookmark is used, the specified bookmarked revision, its
5562 ancestors, and the bookmark will be pushed to the remote
5561 ancestors, and the bookmark will be pushed to the remote
5563 repository. Specifying ``.`` is equivalent to specifying the active
5562 repository. Specifying ``.`` is equivalent to specifying the active
5564 bookmark's name.
5563 bookmark's name.
5565
5564
5566 Please see :hg:`help urls` for important details about ``ssh://``
5565 Please see :hg:`help urls` for important details about ``ssh://``
5567 URLs. If DESTINATION is omitted, a default path will be used.
5566 URLs. If DESTINATION is omitted, a default path will be used.
5568
5567
5569 .. container:: verbose
5568 .. container:: verbose
5570
5569
5571 The --pushvars option sends strings to the server that become
5570 The --pushvars option sends strings to the server that become
5572 environment variables prepended with ``HG_USERVAR_``. For example,
5571 environment variables prepended with ``HG_USERVAR_``. For example,
5573 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5572 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5574 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5573 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5575
5574
5576 pushvars can provide for user-overridable hooks as well as set debug
5575 pushvars can provide for user-overridable hooks as well as set debug
5577 levels. One example is having a hook that blocks commits containing
5576 levels. One example is having a hook that blocks commits containing
5578 conflict markers, but enables the user to override the hook if the file
5577 conflict markers, but enables the user to override the hook if the file
5579 is using conflict markers for testing purposes or the file format has
5578 is using conflict markers for testing purposes or the file format has
5580 strings that look like conflict markers.
5579 strings that look like conflict markers.
5581
5580
5582 By default, servers will ignore `--pushvars`. To enable it add the
5581 By default, servers will ignore `--pushvars`. To enable it add the
5583 following to your configuration file::
5582 following to your configuration file::
5584
5583
5585 [push]
5584 [push]
5586 pushvars.server = true
5585 pushvars.server = true
5587
5586
5588 Returns 0 if push was successful, 1 if nothing to push.
5587 Returns 0 if push was successful, 1 if nothing to push.
5589 """
5588 """
5590
5589
5591 opts = pycompat.byteskwargs(opts)
5590 opts = pycompat.byteskwargs(opts)
5592 if opts.get(b'bookmark'):
5591 if opts.get(b'bookmark'):
5593 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5592 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5594 for b in opts[b'bookmark']:
5593 for b in opts[b'bookmark']:
5595 # translate -B options to -r so changesets get pushed
5594 # translate -B options to -r so changesets get pushed
5596 b = repo._bookmarks.expandname(b)
5595 b = repo._bookmarks.expandname(b)
5597 if b in repo._bookmarks:
5596 if b in repo._bookmarks:
5598 opts.setdefault(b'rev', []).append(b)
5597 opts.setdefault(b'rev', []).append(b)
5599 else:
5598 else:
5600 # if we try to push a deleted bookmark, translate it to null
5599 # if we try to push a deleted bookmark, translate it to null
5601 # this lets simultaneous -r, -b options continue working
5600 # this lets simultaneous -r, -b options continue working
5602 opts.setdefault(b'rev', []).append(b"null")
5601 opts.setdefault(b'rev', []).append(b"null")
5603
5602
5604 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5603 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5605 if not path:
5604 if not path:
5606 raise error.Abort(
5605 raise error.Abort(
5607 _(b'default repository not configured!'),
5606 _(b'default repository not configured!'),
5608 hint=_(b"see 'hg help config.paths'"),
5607 hint=_(b"see 'hg help config.paths'"),
5609 )
5608 )
5610 dest = path.pushloc or path.loc
5609 dest = path.pushloc or path.loc
5611 branches = (path.branch, opts.get(b'branch') or [])
5610 branches = (path.branch, opts.get(b'branch') or [])
5612 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5611 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5613 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5612 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5614 other = hg.peer(repo, opts, dest)
5613 other = hg.peer(repo, opts, dest)
5615
5614
5616 if revs:
5615 if revs:
5617 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5616 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5618 if not revs:
5617 if not revs:
5619 raise error.Abort(
5618 raise error.Abort(
5620 _(b"specified revisions evaluate to an empty set"),
5619 _(b"specified revisions evaluate to an empty set"),
5621 hint=_(b"use different revision arguments"),
5620 hint=_(b"use different revision arguments"),
5622 )
5621 )
5623 elif path.pushrev:
5622 elif path.pushrev:
5624 # It doesn't make any sense to specify ancestor revisions. So limit
5623 # It doesn't make any sense to specify ancestor revisions. So limit
5625 # to DAG heads to make discovery simpler.
5624 # to DAG heads to make discovery simpler.
5626 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5625 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5627 revs = scmutil.revrange(repo, [expr])
5626 revs = scmutil.revrange(repo, [expr])
5628 revs = [repo[rev].node() for rev in revs]
5627 revs = [repo[rev].node() for rev in revs]
5629 if not revs:
5628 if not revs:
5630 raise error.Abort(
5629 raise error.Abort(
5631 _(b'default push revset for path evaluates to an empty set')
5630 _(b'default push revset for path evaluates to an empty set')
5632 )
5631 )
5633 elif ui.configbool(b'commands', b'push.require-revs'):
5632 elif ui.configbool(b'commands', b'push.require-revs'):
5634 raise error.Abort(
5633 raise error.Abort(
5635 _(b'no revisions specified to push'),
5634 _(b'no revisions specified to push'),
5636 hint=_(b'did you mean "hg push -r ."?'),
5635 hint=_(b'did you mean "hg push -r ."?'),
5637 )
5636 )
5638
5637
5639 repo._subtoppath = dest
5638 repo._subtoppath = dest
5640 try:
5639 try:
5641 # push subrepos depth-first for coherent ordering
5640 # push subrepos depth-first for coherent ordering
5642 c = repo[b'.']
5641 c = repo[b'.']
5643 subs = c.substate # only repos that are committed
5642 subs = c.substate # only repos that are committed
5644 for s in sorted(subs):
5643 for s in sorted(subs):
5645 result = c.sub(s).push(opts)
5644 result = c.sub(s).push(opts)
5646 if result == 0:
5645 if result == 0:
5647 return not result
5646 return not result
5648 finally:
5647 finally:
5649 del repo._subtoppath
5648 del repo._subtoppath
5650
5649
5651 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5650 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5652 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5651 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5653
5652
5654 pushop = exchange.push(
5653 pushop = exchange.push(
5655 repo,
5654 repo,
5656 other,
5655 other,
5657 opts.get(b'force'),
5656 opts.get(b'force'),
5658 revs=revs,
5657 revs=revs,
5659 newbranch=opts.get(b'new_branch'),
5658 newbranch=opts.get(b'new_branch'),
5660 bookmarks=opts.get(b'bookmark', ()),
5659 bookmarks=opts.get(b'bookmark', ()),
5661 publish=opts.get(b'publish'),
5660 publish=opts.get(b'publish'),
5662 opargs=opargs,
5661 opargs=opargs,
5663 )
5662 )
5664
5663
5665 result = not pushop.cgresult
5664 result = not pushop.cgresult
5666
5665
5667 if pushop.bkresult is not None:
5666 if pushop.bkresult is not None:
5668 if pushop.bkresult == 2:
5667 if pushop.bkresult == 2:
5669 result = 2
5668 result = 2
5670 elif not result and pushop.bkresult:
5669 elif not result and pushop.bkresult:
5671 result = 2
5670 result = 2
5672
5671
5673 return result
5672 return result
5674
5673
5675
5674
5676 @command(
5675 @command(
5677 b'recover',
5676 b'recover',
5678 [(b'', b'verify', True, b"run `hg verify` after succesful recover"),],
5677 [(b'', b'verify', True, b"run `hg verify` after succesful recover"),],
5679 helpcategory=command.CATEGORY_MAINTENANCE,
5678 helpcategory=command.CATEGORY_MAINTENANCE,
5680 )
5679 )
5681 def recover(ui, repo, **opts):
5680 def recover(ui, repo, **opts):
5682 """roll back an interrupted transaction
5681 """roll back an interrupted transaction
5683
5682
5684 Recover from an interrupted commit or pull.
5683 Recover from an interrupted commit or pull.
5685
5684
5686 This command tries to fix the repository status after an
5685 This command tries to fix the repository status after an
5687 interrupted operation. It should only be necessary when Mercurial
5686 interrupted operation. It should only be necessary when Mercurial
5688 suggests it.
5687 suggests it.
5689
5688
5690 Returns 0 if successful, 1 if nothing to recover or verify fails.
5689 Returns 0 if successful, 1 if nothing to recover or verify fails.
5691 """
5690 """
5692 ret = repo.recover()
5691 ret = repo.recover()
5693 if ret:
5692 if ret:
5694 if opts['verify']:
5693 if opts['verify']:
5695 return hg.verify(repo)
5694 return hg.verify(repo)
5696 else:
5695 else:
5697 msg = _(
5696 msg = _(
5698 b"(verify step skipped, run `hg verify` to check your "
5697 b"(verify step skipped, run `hg verify` to check your "
5699 b"repository content)\n"
5698 b"repository content)\n"
5700 )
5699 )
5701 ui.warn(msg)
5700 ui.warn(msg)
5702 return 0
5701 return 0
5703 return 1
5702 return 1
5704
5703
5705
5704
5706 @command(
5705 @command(
5707 b'remove|rm',
5706 b'remove|rm',
5708 [
5707 [
5709 (b'A', b'after', None, _(b'record delete for missing files')),
5708 (b'A', b'after', None, _(b'record delete for missing files')),
5710 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5709 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5711 ]
5710 ]
5712 + subrepoopts
5711 + subrepoopts
5713 + walkopts
5712 + walkopts
5714 + dryrunopts,
5713 + dryrunopts,
5715 _(b'[OPTION]... FILE...'),
5714 _(b'[OPTION]... FILE...'),
5716 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5715 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5717 helpbasic=True,
5716 helpbasic=True,
5718 inferrepo=True,
5717 inferrepo=True,
5719 )
5718 )
5720 def remove(ui, repo, *pats, **opts):
5719 def remove(ui, repo, *pats, **opts):
5721 """remove the specified files on the next commit
5720 """remove the specified files on the next commit
5722
5721
5723 Schedule the indicated files for removal from the current branch.
5722 Schedule the indicated files for removal from the current branch.
5724
5723
5725 This command schedules the files to be removed at the next commit.
5724 This command schedules the files to be removed at the next commit.
5726 To undo a remove before that, see :hg:`revert`. To undo added
5725 To undo a remove before that, see :hg:`revert`. To undo added
5727 files, see :hg:`forget`.
5726 files, see :hg:`forget`.
5728
5727
5729 .. container:: verbose
5728 .. container:: verbose
5730
5729
5731 -A/--after can be used to remove only files that have already
5730 -A/--after can be used to remove only files that have already
5732 been deleted, -f/--force can be used to force deletion, and -Af
5731 been deleted, -f/--force can be used to force deletion, and -Af
5733 can be used to remove files from the next revision without
5732 can be used to remove files from the next revision without
5734 deleting them from the working directory.
5733 deleting them from the working directory.
5735
5734
5736 The following table details the behavior of remove for different
5735 The following table details the behavior of remove for different
5737 file states (columns) and option combinations (rows). The file
5736 file states (columns) and option combinations (rows). The file
5738 states are Added [A], Clean [C], Modified [M] and Missing [!]
5737 states are Added [A], Clean [C], Modified [M] and Missing [!]
5739 (as reported by :hg:`status`). The actions are Warn, Remove
5738 (as reported by :hg:`status`). The actions are Warn, Remove
5740 (from branch) and Delete (from disk):
5739 (from branch) and Delete (from disk):
5741
5740
5742 ========= == == == ==
5741 ========= == == == ==
5743 opt/state A C M !
5742 opt/state A C M !
5744 ========= == == == ==
5743 ========= == == == ==
5745 none W RD W R
5744 none W RD W R
5746 -f R RD RD R
5745 -f R RD RD R
5747 -A W W W R
5746 -A W W W R
5748 -Af R R R R
5747 -Af R R R R
5749 ========= == == == ==
5748 ========= == == == ==
5750
5749
5751 .. note::
5750 .. note::
5752
5751
5753 :hg:`remove` never deletes files in Added [A] state from the
5752 :hg:`remove` never deletes files in Added [A] state from the
5754 working directory, not even if ``--force`` is specified.
5753 working directory, not even if ``--force`` is specified.
5755
5754
5756 Returns 0 on success, 1 if any warnings encountered.
5755 Returns 0 on success, 1 if any warnings encountered.
5757 """
5756 """
5758
5757
5759 opts = pycompat.byteskwargs(opts)
5758 opts = pycompat.byteskwargs(opts)
5760 after, force = opts.get(b'after'), opts.get(b'force')
5759 after, force = opts.get(b'after'), opts.get(b'force')
5761 dryrun = opts.get(b'dry_run')
5760 dryrun = opts.get(b'dry_run')
5762 if not pats and not after:
5761 if not pats and not after:
5763 raise error.Abort(_(b'no files specified'))
5762 raise error.Abort(_(b'no files specified'))
5764
5763
5765 m = scmutil.match(repo[None], pats, opts)
5764 m = scmutil.match(repo[None], pats, opts)
5766 subrepos = opts.get(b'subrepos')
5765 subrepos = opts.get(b'subrepos')
5767 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5766 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5768 return cmdutil.remove(
5767 return cmdutil.remove(
5769 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5768 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5770 )
5769 )
5771
5770
5772
5771
5773 @command(
5772 @command(
5774 b'rename|move|mv',
5773 b'rename|move|mv',
5775 [
5774 [
5776 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5775 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5777 (
5776 (
5778 b'f',
5777 b'f',
5779 b'force',
5778 b'force',
5780 None,
5779 None,
5781 _(b'forcibly move over an existing managed file'),
5780 _(b'forcibly move over an existing managed file'),
5782 ),
5781 ),
5783 ]
5782 ]
5784 + walkopts
5783 + walkopts
5785 + dryrunopts,
5784 + dryrunopts,
5786 _(b'[OPTION]... SOURCE... DEST'),
5785 _(b'[OPTION]... SOURCE... DEST'),
5787 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5786 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5788 )
5787 )
5789 def rename(ui, repo, *pats, **opts):
5788 def rename(ui, repo, *pats, **opts):
5790 """rename files; equivalent of copy + remove
5789 """rename files; equivalent of copy + remove
5791
5790
5792 Mark dest as copies of sources; mark sources for deletion. If dest
5791 Mark dest as copies of sources; mark sources for deletion. If dest
5793 is a directory, copies are put in that directory. If dest is a
5792 is a directory, copies are put in that directory. If dest is a
5794 file, there can only be one source.
5793 file, there can only be one source.
5795
5794
5796 By default, this command copies the contents of files as they
5795 By default, this command copies the contents of files as they
5797 exist in the working directory. If invoked with -A/--after, the
5796 exist in the working directory. If invoked with -A/--after, the
5798 operation is recorded, but no copying is performed.
5797 operation is recorded, but no copying is performed.
5799
5798
5800 This command takes effect at the next commit. To undo a rename
5799 This command takes effect at the next commit. To undo a rename
5801 before that, see :hg:`revert`.
5800 before that, see :hg:`revert`.
5802
5801
5803 Returns 0 on success, 1 if errors are encountered.
5802 Returns 0 on success, 1 if errors are encountered.
5804 """
5803 """
5805 opts = pycompat.byteskwargs(opts)
5804 opts = pycompat.byteskwargs(opts)
5806 with repo.wlock(False):
5805 with repo.wlock(False):
5807 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5806 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5808
5807
5809
5808
5810 @command(
5809 @command(
5811 b'resolve',
5810 b'resolve',
5812 [
5811 [
5813 (b'a', b'all', None, _(b'select all unresolved files')),
5812 (b'a', b'all', None, _(b'select all unresolved files')),
5814 (b'l', b'list', None, _(b'list state of files needing merge')),
5813 (b'l', b'list', None, _(b'list state of files needing merge')),
5815 (b'm', b'mark', None, _(b'mark files as resolved')),
5814 (b'm', b'mark', None, _(b'mark files as resolved')),
5816 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5815 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5817 (b'n', b'no-status', None, _(b'hide status prefix')),
5816 (b'n', b'no-status', None, _(b'hide status prefix')),
5818 (b'', b're-merge', None, _(b're-merge files')),
5817 (b'', b're-merge', None, _(b're-merge files')),
5819 ]
5818 ]
5820 + mergetoolopts
5819 + mergetoolopts
5821 + walkopts
5820 + walkopts
5822 + formatteropts,
5821 + formatteropts,
5823 _(b'[OPTION]... [FILE]...'),
5822 _(b'[OPTION]... [FILE]...'),
5824 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5823 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5825 inferrepo=True,
5824 inferrepo=True,
5826 )
5825 )
5827 def resolve(ui, repo, *pats, **opts):
5826 def resolve(ui, repo, *pats, **opts):
5828 """redo merges or set/view the merge status of files
5827 """redo merges or set/view the merge status of files
5829
5828
5830 Merges with unresolved conflicts are often the result of
5829 Merges with unresolved conflicts are often the result of
5831 non-interactive merging using the ``internal:merge`` configuration
5830 non-interactive merging using the ``internal:merge`` configuration
5832 setting, or a command-line merge tool like ``diff3``. The resolve
5831 setting, or a command-line merge tool like ``diff3``. The resolve
5833 command is used to manage the files involved in a merge, after
5832 command is used to manage the files involved in a merge, after
5834 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5833 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5835 working directory must have two parents). See :hg:`help
5834 working directory must have two parents). See :hg:`help
5836 merge-tools` for information on configuring merge tools.
5835 merge-tools` for information on configuring merge tools.
5837
5836
5838 The resolve command can be used in the following ways:
5837 The resolve command can be used in the following ways:
5839
5838
5840 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5839 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5841 the specified files, discarding any previous merge attempts. Re-merging
5840 the specified files, discarding any previous merge attempts. Re-merging
5842 is not performed for files already marked as resolved. Use ``--all/-a``
5841 is not performed for files already marked as resolved. Use ``--all/-a``
5843 to select all unresolved files. ``--tool`` can be used to specify
5842 to select all unresolved files. ``--tool`` can be used to specify
5844 the merge tool used for the given files. It overrides the HGMERGE
5843 the merge tool used for the given files. It overrides the HGMERGE
5845 environment variable and your configuration files. Previous file
5844 environment variable and your configuration files. Previous file
5846 contents are saved with a ``.orig`` suffix.
5845 contents are saved with a ``.orig`` suffix.
5847
5846
5848 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5847 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5849 (e.g. after having manually fixed-up the files). The default is
5848 (e.g. after having manually fixed-up the files). The default is
5850 to mark all unresolved files.
5849 to mark all unresolved files.
5851
5850
5852 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5851 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5853 default is to mark all resolved files.
5852 default is to mark all resolved files.
5854
5853
5855 - :hg:`resolve -l`: list files which had or still have conflicts.
5854 - :hg:`resolve -l`: list files which had or still have conflicts.
5856 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5855 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5857 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5856 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5858 the list. See :hg:`help filesets` for details.
5857 the list. See :hg:`help filesets` for details.
5859
5858
5860 .. note::
5859 .. note::
5861
5860
5862 Mercurial will not let you commit files with unresolved merge
5861 Mercurial will not let you commit files with unresolved merge
5863 conflicts. You must use :hg:`resolve -m ...` before you can
5862 conflicts. You must use :hg:`resolve -m ...` before you can
5864 commit after a conflicting merge.
5863 commit after a conflicting merge.
5865
5864
5866 .. container:: verbose
5865 .. container:: verbose
5867
5866
5868 Template:
5867 Template:
5869
5868
5870 The following keywords are supported in addition to the common template
5869 The following keywords are supported in addition to the common template
5871 keywords and functions. See also :hg:`help templates`.
5870 keywords and functions. See also :hg:`help templates`.
5872
5871
5873 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5872 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5874 :path: String. Repository-absolute path of the file.
5873 :path: String. Repository-absolute path of the file.
5875
5874
5876 Returns 0 on success, 1 if any files fail a resolve attempt.
5875 Returns 0 on success, 1 if any files fail a resolve attempt.
5877 """
5876 """
5878
5877
5879 opts = pycompat.byteskwargs(opts)
5878 opts = pycompat.byteskwargs(opts)
5880 confirm = ui.configbool(b'commands', b'resolve.confirm')
5879 confirm = ui.configbool(b'commands', b'resolve.confirm')
5881 flaglist = b'all mark unmark list no_status re_merge'.split()
5880 flaglist = b'all mark unmark list no_status re_merge'.split()
5882 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5881 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5883
5882
5884 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5883 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5885 if actioncount > 1:
5884 if actioncount > 1:
5886 raise error.Abort(_(b"too many actions specified"))
5885 raise error.Abort(_(b"too many actions specified"))
5887 elif actioncount == 0 and ui.configbool(
5886 elif actioncount == 0 and ui.configbool(
5888 b'commands', b'resolve.explicit-re-merge'
5887 b'commands', b'resolve.explicit-re-merge'
5889 ):
5888 ):
5890 hint = _(b'use --mark, --unmark, --list or --re-merge')
5889 hint = _(b'use --mark, --unmark, --list or --re-merge')
5891 raise error.Abort(_(b'no action specified'), hint=hint)
5890 raise error.Abort(_(b'no action specified'), hint=hint)
5892 if pats and all:
5891 if pats and all:
5893 raise error.Abort(_(b"can't specify --all and patterns"))
5892 raise error.Abort(_(b"can't specify --all and patterns"))
5894 if not (all or pats or show or mark or unmark):
5893 if not (all or pats or show or mark or unmark):
5895 raise error.Abort(
5894 raise error.Abort(
5896 _(b'no files or directories specified'),
5895 _(b'no files or directories specified'),
5897 hint=b'use --all to re-merge all unresolved files',
5896 hint=b'use --all to re-merge all unresolved files',
5898 )
5897 )
5899
5898
5900 if confirm:
5899 if confirm:
5901 if all:
5900 if all:
5902 if ui.promptchoice(
5901 if ui.promptchoice(
5903 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5902 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5904 ):
5903 ):
5905 raise error.Abort(_(b'user quit'))
5904 raise error.Abort(_(b'user quit'))
5906 if mark and not pats:
5905 if mark and not pats:
5907 if ui.promptchoice(
5906 if ui.promptchoice(
5908 _(
5907 _(
5909 b'mark all unresolved files as resolved (yn)?'
5908 b'mark all unresolved files as resolved (yn)?'
5910 b'$$ &Yes $$ &No'
5909 b'$$ &Yes $$ &No'
5911 )
5910 )
5912 ):
5911 ):
5913 raise error.Abort(_(b'user quit'))
5912 raise error.Abort(_(b'user quit'))
5914 if unmark and not pats:
5913 if unmark and not pats:
5915 if ui.promptchoice(
5914 if ui.promptchoice(
5916 _(
5915 _(
5917 b'mark all resolved files as unresolved (yn)?'
5916 b'mark all resolved files as unresolved (yn)?'
5918 b'$$ &Yes $$ &No'
5917 b'$$ &Yes $$ &No'
5919 )
5918 )
5920 ):
5919 ):
5921 raise error.Abort(_(b'user quit'))
5920 raise error.Abort(_(b'user quit'))
5922
5921
5923 uipathfn = scmutil.getuipathfn(repo)
5922 uipathfn = scmutil.getuipathfn(repo)
5924
5923
5925 if show:
5924 if show:
5926 ui.pager(b'resolve')
5925 ui.pager(b'resolve')
5927 fm = ui.formatter(b'resolve', opts)
5926 fm = ui.formatter(b'resolve', opts)
5928 ms = mergemod.mergestate.read(repo)
5927 ms = mergemod.mergestate.read(repo)
5929 wctx = repo[None]
5928 wctx = repo[None]
5930 m = scmutil.match(wctx, pats, opts)
5929 m = scmutil.match(wctx, pats, opts)
5931
5930
5932 # Labels and keys based on merge state. Unresolved path conflicts show
5931 # Labels and keys based on merge state. Unresolved path conflicts show
5933 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5932 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5934 # resolved conflicts.
5933 # resolved conflicts.
5935 mergestateinfo = {
5934 mergestateinfo = {
5936 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5935 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5937 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5936 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5938 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5937 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5939 b'resolve.unresolved',
5938 b'resolve.unresolved',
5940 b'P',
5939 b'P',
5941 ),
5940 ),
5942 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5941 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5943 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5942 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5944 b'resolve.driverresolved',
5943 b'resolve.driverresolved',
5945 b'D',
5944 b'D',
5946 ),
5945 ),
5947 }
5946 }
5948
5947
5949 for f in ms:
5948 for f in ms:
5950 if not m(f):
5949 if not m(f):
5951 continue
5950 continue
5952
5951
5953 label, key = mergestateinfo[ms[f]]
5952 label, key = mergestateinfo[ms[f]]
5954 fm.startitem()
5953 fm.startitem()
5955 fm.context(ctx=wctx)
5954 fm.context(ctx=wctx)
5956 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5955 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5957 fm.data(path=f)
5956 fm.data(path=f)
5958 fm.plain(b'%s\n' % uipathfn(f), label=label)
5957 fm.plain(b'%s\n' % uipathfn(f), label=label)
5959 fm.end()
5958 fm.end()
5960 return 0
5959 return 0
5961
5960
5962 with repo.wlock():
5961 with repo.wlock():
5963 ms = mergemod.mergestate.read(repo)
5962 ms = mergemod.mergestate.read(repo)
5964
5963
5965 if not (ms.active() or repo.dirstate.p2() != nullid):
5964 if not (ms.active() or repo.dirstate.p2() != nullid):
5966 raise error.Abort(
5965 raise error.Abort(
5967 _(b'resolve command not applicable when not merging')
5966 _(b'resolve command not applicable when not merging')
5968 )
5967 )
5969
5968
5970 wctx = repo[None]
5969 wctx = repo[None]
5971
5970
5972 if (
5971 if (
5973 ms.mergedriver
5972 ms.mergedriver
5974 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5973 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5975 ):
5974 ):
5976 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5975 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5977 ms.commit()
5976 ms.commit()
5978 # allow mark and unmark to go through
5977 # allow mark and unmark to go through
5979 if not mark and not unmark and not proceed:
5978 if not mark and not unmark and not proceed:
5980 return 1
5979 return 1
5981
5980
5982 m = scmutil.match(wctx, pats, opts)
5981 m = scmutil.match(wctx, pats, opts)
5983 ret = 0
5982 ret = 0
5984 didwork = False
5983 didwork = False
5985 runconclude = False
5984 runconclude = False
5986
5985
5987 tocomplete = []
5986 tocomplete = []
5988 hasconflictmarkers = []
5987 hasconflictmarkers = []
5989 if mark:
5988 if mark:
5990 markcheck = ui.config(b'commands', b'resolve.mark-check')
5989 markcheck = ui.config(b'commands', b'resolve.mark-check')
5991 if markcheck not in [b'warn', b'abort']:
5990 if markcheck not in [b'warn', b'abort']:
5992 # Treat all invalid / unrecognized values as 'none'.
5991 # Treat all invalid / unrecognized values as 'none'.
5993 markcheck = False
5992 markcheck = False
5994 for f in ms:
5993 for f in ms:
5995 if not m(f):
5994 if not m(f):
5996 continue
5995 continue
5997
5996
5998 didwork = True
5997 didwork = True
5999
5998
6000 # don't let driver-resolved files be marked, and run the conclude
5999 # don't let driver-resolved files be marked, and run the conclude
6001 # step if asked to resolve
6000 # step if asked to resolve
6002 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6001 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6003 exact = m.exact(f)
6002 exact = m.exact(f)
6004 if mark:
6003 if mark:
6005 if exact:
6004 if exact:
6006 ui.warn(
6005 ui.warn(
6007 _(b'not marking %s as it is driver-resolved\n')
6006 _(b'not marking %s as it is driver-resolved\n')
6008 % uipathfn(f)
6007 % uipathfn(f)
6009 )
6008 )
6010 elif unmark:
6009 elif unmark:
6011 if exact:
6010 if exact:
6012 ui.warn(
6011 ui.warn(
6013 _(b'not unmarking %s as it is driver-resolved\n')
6012 _(b'not unmarking %s as it is driver-resolved\n')
6014 % uipathfn(f)
6013 % uipathfn(f)
6015 )
6014 )
6016 else:
6015 else:
6017 runconclude = True
6016 runconclude = True
6018 continue
6017 continue
6019
6018
6020 # path conflicts must be resolved manually
6019 # path conflicts must be resolved manually
6021 if ms[f] in (
6020 if ms[f] in (
6022 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6021 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6023 mergemod.MERGE_RECORD_RESOLVED_PATH,
6022 mergemod.MERGE_RECORD_RESOLVED_PATH,
6024 ):
6023 ):
6025 if mark:
6024 if mark:
6026 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6025 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6027 elif unmark:
6026 elif unmark:
6028 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6027 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6029 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6028 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6030 ui.warn(
6029 ui.warn(
6031 _(b'%s: path conflict must be resolved manually\n')
6030 _(b'%s: path conflict must be resolved manually\n')
6032 % uipathfn(f)
6031 % uipathfn(f)
6033 )
6032 )
6034 continue
6033 continue
6035
6034
6036 if mark:
6035 if mark:
6037 if markcheck:
6036 if markcheck:
6038 fdata = repo.wvfs.tryread(f)
6037 fdata = repo.wvfs.tryread(f)
6039 if (
6038 if (
6040 filemerge.hasconflictmarkers(fdata)
6039 filemerge.hasconflictmarkers(fdata)
6041 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6040 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6042 ):
6041 ):
6043 hasconflictmarkers.append(f)
6042 hasconflictmarkers.append(f)
6044 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6043 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6045 elif unmark:
6044 elif unmark:
6046 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6045 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6047 else:
6046 else:
6048 # backup pre-resolve (merge uses .orig for its own purposes)
6047 # backup pre-resolve (merge uses .orig for its own purposes)
6049 a = repo.wjoin(f)
6048 a = repo.wjoin(f)
6050 try:
6049 try:
6051 util.copyfile(a, a + b".resolve")
6050 util.copyfile(a, a + b".resolve")
6052 except (IOError, OSError) as inst:
6051 except (IOError, OSError) as inst:
6053 if inst.errno != errno.ENOENT:
6052 if inst.errno != errno.ENOENT:
6054 raise
6053 raise
6055
6054
6056 try:
6055 try:
6057 # preresolve file
6056 # preresolve file
6058 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6057 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6059 with ui.configoverride(overrides, b'resolve'):
6058 with ui.configoverride(overrides, b'resolve'):
6060 complete, r = ms.preresolve(f, wctx)
6059 complete, r = ms.preresolve(f, wctx)
6061 if not complete:
6060 if not complete:
6062 tocomplete.append(f)
6061 tocomplete.append(f)
6063 elif r:
6062 elif r:
6064 ret = 1
6063 ret = 1
6065 finally:
6064 finally:
6066 ms.commit()
6065 ms.commit()
6067
6066
6068 # replace filemerge's .orig file with our resolve file, but only
6067 # replace filemerge's .orig file with our resolve file, but only
6069 # for merges that are complete
6068 # for merges that are complete
6070 if complete:
6069 if complete:
6071 try:
6070 try:
6072 util.rename(
6071 util.rename(
6073 a + b".resolve", scmutil.backuppath(ui, repo, f)
6072 a + b".resolve", scmutil.backuppath(ui, repo, f)
6074 )
6073 )
6075 except OSError as inst:
6074 except OSError as inst:
6076 if inst.errno != errno.ENOENT:
6075 if inst.errno != errno.ENOENT:
6077 raise
6076 raise
6078
6077
6079 if hasconflictmarkers:
6078 if hasconflictmarkers:
6080 ui.warn(
6079 ui.warn(
6081 _(
6080 _(
6082 b'warning: the following files still have conflict '
6081 b'warning: the following files still have conflict '
6083 b'markers:\n'
6082 b'markers:\n'
6084 )
6083 )
6085 + b''.join(
6084 + b''.join(
6086 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6085 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6087 )
6086 )
6088 )
6087 )
6089 if markcheck == b'abort' and not all and not pats:
6088 if markcheck == b'abort' and not all and not pats:
6090 raise error.Abort(
6089 raise error.Abort(
6091 _(b'conflict markers detected'),
6090 _(b'conflict markers detected'),
6092 hint=_(b'use --all to mark anyway'),
6091 hint=_(b'use --all to mark anyway'),
6093 )
6092 )
6094
6093
6095 for f in tocomplete:
6094 for f in tocomplete:
6096 try:
6095 try:
6097 # resolve file
6096 # resolve file
6098 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6097 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6099 with ui.configoverride(overrides, b'resolve'):
6098 with ui.configoverride(overrides, b'resolve'):
6100 r = ms.resolve(f, wctx)
6099 r = ms.resolve(f, wctx)
6101 if r:
6100 if r:
6102 ret = 1
6101 ret = 1
6103 finally:
6102 finally:
6104 ms.commit()
6103 ms.commit()
6105
6104
6106 # replace filemerge's .orig file with our resolve file
6105 # replace filemerge's .orig file with our resolve file
6107 a = repo.wjoin(f)
6106 a = repo.wjoin(f)
6108 try:
6107 try:
6109 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6108 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6110 except OSError as inst:
6109 except OSError as inst:
6111 if inst.errno != errno.ENOENT:
6110 if inst.errno != errno.ENOENT:
6112 raise
6111 raise
6113
6112
6114 ms.commit()
6113 ms.commit()
6115 ms.recordactions()
6114 ms.recordactions()
6116
6115
6117 if not didwork and pats:
6116 if not didwork and pats:
6118 hint = None
6117 hint = None
6119 if not any([p for p in pats if p.find(b':') >= 0]):
6118 if not any([p for p in pats if p.find(b':') >= 0]):
6120 pats = [b'path:%s' % p for p in pats]
6119 pats = [b'path:%s' % p for p in pats]
6121 m = scmutil.match(wctx, pats, opts)
6120 m = scmutil.match(wctx, pats, opts)
6122 for f in ms:
6121 for f in ms:
6123 if not m(f):
6122 if not m(f):
6124 continue
6123 continue
6125
6124
6126 def flag(o):
6125 def flag(o):
6127 if o == b're_merge':
6126 if o == b're_merge':
6128 return b'--re-merge '
6127 return b'--re-merge '
6129 return b'-%s ' % o[0:1]
6128 return b'-%s ' % o[0:1]
6130
6129
6131 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6130 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6132 hint = _(b"(try: hg resolve %s%s)\n") % (
6131 hint = _(b"(try: hg resolve %s%s)\n") % (
6133 flags,
6132 flags,
6134 b' '.join(pats),
6133 b' '.join(pats),
6135 )
6134 )
6136 break
6135 break
6137 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6136 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6138 if hint:
6137 if hint:
6139 ui.warn(hint)
6138 ui.warn(hint)
6140 elif ms.mergedriver and ms.mdstate() != b's':
6139 elif ms.mergedriver and ms.mdstate() != b's':
6141 # run conclude step when either a driver-resolved file is requested
6140 # run conclude step when either a driver-resolved file is requested
6142 # or there are no driver-resolved files
6141 # or there are no driver-resolved files
6143 # we can't use 'ret' to determine whether any files are unresolved
6142 # we can't use 'ret' to determine whether any files are unresolved
6144 # because we might not have tried to resolve some
6143 # because we might not have tried to resolve some
6145 if (runconclude or not list(ms.driverresolved())) and not list(
6144 if (runconclude or not list(ms.driverresolved())) and not list(
6146 ms.unresolved()
6145 ms.unresolved()
6147 ):
6146 ):
6148 proceed = mergemod.driverconclude(repo, ms, wctx)
6147 proceed = mergemod.driverconclude(repo, ms, wctx)
6149 ms.commit()
6148 ms.commit()
6150 if not proceed:
6149 if not proceed:
6151 return 1
6150 return 1
6152
6151
6153 # Nudge users into finishing an unfinished operation
6152 # Nudge users into finishing an unfinished operation
6154 unresolvedf = list(ms.unresolved())
6153 unresolvedf = list(ms.unresolved())
6155 driverresolvedf = list(ms.driverresolved())
6154 driverresolvedf = list(ms.driverresolved())
6156 if not unresolvedf and not driverresolvedf:
6155 if not unresolvedf and not driverresolvedf:
6157 ui.status(_(b'(no more unresolved files)\n'))
6156 ui.status(_(b'(no more unresolved files)\n'))
6158 cmdutil.checkafterresolved(repo)
6157 cmdutil.checkafterresolved(repo)
6159 elif not unresolvedf:
6158 elif not unresolvedf:
6160 ui.status(
6159 ui.status(
6161 _(
6160 _(
6162 b'(no more unresolved files -- '
6161 b'(no more unresolved files -- '
6163 b'run "hg resolve --all" to conclude)\n'
6162 b'run "hg resolve --all" to conclude)\n'
6164 )
6163 )
6165 )
6164 )
6166
6165
6167 return ret
6166 return ret
6168
6167
6169
6168
6170 @command(
6169 @command(
6171 b'revert',
6170 b'revert',
6172 [
6171 [
6173 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6172 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6174 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6173 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6175 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6174 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6176 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6175 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6177 (b'i', b'interactive', None, _(b'interactively select the changes')),
6176 (b'i', b'interactive', None, _(b'interactively select the changes')),
6178 ]
6177 ]
6179 + walkopts
6178 + walkopts
6180 + dryrunopts,
6179 + dryrunopts,
6181 _(b'[OPTION]... [-r REV] [NAME]...'),
6180 _(b'[OPTION]... [-r REV] [NAME]...'),
6182 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6181 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6183 )
6182 )
6184 def revert(ui, repo, *pats, **opts):
6183 def revert(ui, repo, *pats, **opts):
6185 """restore files to their checkout state
6184 """restore files to their checkout state
6186
6185
6187 .. note::
6186 .. note::
6188
6187
6189 To check out earlier revisions, you should use :hg:`update REV`.
6188 To check out earlier revisions, you should use :hg:`update REV`.
6190 To cancel an uncommitted merge (and lose your changes),
6189 To cancel an uncommitted merge (and lose your changes),
6191 use :hg:`merge --abort`.
6190 use :hg:`merge --abort`.
6192
6191
6193 With no revision specified, revert the specified files or directories
6192 With no revision specified, revert the specified files or directories
6194 to the contents they had in the parent of the working directory.
6193 to the contents they had in the parent of the working directory.
6195 This restores the contents of files to an unmodified
6194 This restores the contents of files to an unmodified
6196 state and unschedules adds, removes, copies, and renames. If the
6195 state and unschedules adds, removes, copies, and renames. If the
6197 working directory has two parents, you must explicitly specify a
6196 working directory has two parents, you must explicitly specify a
6198 revision.
6197 revision.
6199
6198
6200 Using the -r/--rev or -d/--date options, revert the given files or
6199 Using the -r/--rev or -d/--date options, revert the given files or
6201 directories to their states as of a specific revision. Because
6200 directories to their states as of a specific revision. Because
6202 revert does not change the working directory parents, this will
6201 revert does not change the working directory parents, this will
6203 cause these files to appear modified. This can be helpful to "back
6202 cause these files to appear modified. This can be helpful to "back
6204 out" some or all of an earlier change. See :hg:`backout` for a
6203 out" some or all of an earlier change. See :hg:`backout` for a
6205 related method.
6204 related method.
6206
6205
6207 Modified files are saved with a .orig suffix before reverting.
6206 Modified files are saved with a .orig suffix before reverting.
6208 To disable these backups, use --no-backup. It is possible to store
6207 To disable these backups, use --no-backup. It is possible to store
6209 the backup files in a custom directory relative to the root of the
6208 the backup files in a custom directory relative to the root of the
6210 repository by setting the ``ui.origbackuppath`` configuration
6209 repository by setting the ``ui.origbackuppath`` configuration
6211 option.
6210 option.
6212
6211
6213 See :hg:`help dates` for a list of formats valid for -d/--date.
6212 See :hg:`help dates` for a list of formats valid for -d/--date.
6214
6213
6215 See :hg:`help backout` for a way to reverse the effect of an
6214 See :hg:`help backout` for a way to reverse the effect of an
6216 earlier changeset.
6215 earlier changeset.
6217
6216
6218 Returns 0 on success.
6217 Returns 0 on success.
6219 """
6218 """
6220
6219
6221 opts = pycompat.byteskwargs(opts)
6220 opts = pycompat.byteskwargs(opts)
6222 if opts.get(b"date"):
6221 if opts.get(b"date"):
6223 if opts.get(b"rev"):
6222 if opts.get(b"rev"):
6224 raise error.Abort(_(b"you can't specify a revision and a date"))
6223 raise error.Abort(_(b"you can't specify a revision and a date"))
6225 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6224 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6226
6225
6227 parent, p2 = repo.dirstate.parents()
6226 parent, p2 = repo.dirstate.parents()
6228 if not opts.get(b'rev') and p2 != nullid:
6227 if not opts.get(b'rev') and p2 != nullid:
6229 # revert after merge is a trap for new users (issue2915)
6228 # revert after merge is a trap for new users (issue2915)
6230 raise error.Abort(
6229 raise error.Abort(
6231 _(b'uncommitted merge with no revision specified'),
6230 _(b'uncommitted merge with no revision specified'),
6232 hint=_(b"use 'hg update' or see 'hg help revert'"),
6231 hint=_(b"use 'hg update' or see 'hg help revert'"),
6233 )
6232 )
6234
6233
6235 rev = opts.get(b'rev')
6234 rev = opts.get(b'rev')
6236 if rev:
6235 if rev:
6237 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6236 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6238 ctx = scmutil.revsingle(repo, rev)
6237 ctx = scmutil.revsingle(repo, rev)
6239
6238
6240 if not (
6239 if not (
6241 pats
6240 pats
6242 or opts.get(b'include')
6241 or opts.get(b'include')
6243 or opts.get(b'exclude')
6242 or opts.get(b'exclude')
6244 or opts.get(b'all')
6243 or opts.get(b'all')
6245 or opts.get(b'interactive')
6244 or opts.get(b'interactive')
6246 ):
6245 ):
6247 msg = _(b"no files or directories specified")
6246 msg = _(b"no files or directories specified")
6248 if p2 != nullid:
6247 if p2 != nullid:
6249 hint = _(
6248 hint = _(
6250 b"uncommitted merge, use --all to discard all changes,"
6249 b"uncommitted merge, use --all to discard all changes,"
6251 b" or 'hg update -C .' to abort the merge"
6250 b" or 'hg update -C .' to abort the merge"
6252 )
6251 )
6253 raise error.Abort(msg, hint=hint)
6252 raise error.Abort(msg, hint=hint)
6254 dirty = any(repo.status())
6253 dirty = any(repo.status())
6255 node = ctx.node()
6254 node = ctx.node()
6256 if node != parent:
6255 if node != parent:
6257 if dirty:
6256 if dirty:
6258 hint = (
6257 hint = (
6259 _(
6258 _(
6260 b"uncommitted changes, use --all to discard all"
6259 b"uncommitted changes, use --all to discard all"
6261 b" changes, or 'hg update %d' to update"
6260 b" changes, or 'hg update %d' to update"
6262 )
6261 )
6263 % ctx.rev()
6262 % ctx.rev()
6264 )
6263 )
6265 else:
6264 else:
6266 hint = (
6265 hint = (
6267 _(
6266 _(
6268 b"use --all to revert all files,"
6267 b"use --all to revert all files,"
6269 b" or 'hg update %d' to update"
6268 b" or 'hg update %d' to update"
6270 )
6269 )
6271 % ctx.rev()
6270 % ctx.rev()
6272 )
6271 )
6273 elif dirty:
6272 elif dirty:
6274 hint = _(b"uncommitted changes, use --all to discard all changes")
6273 hint = _(b"uncommitted changes, use --all to discard all changes")
6275 else:
6274 else:
6276 hint = _(b"use --all to revert all files")
6275 hint = _(b"use --all to revert all files")
6277 raise error.Abort(msg, hint=hint)
6276 raise error.Abort(msg, hint=hint)
6278
6277
6279 return cmdutil.revert(
6278 return cmdutil.revert(
6280 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6279 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6281 )
6280 )
6282
6281
6283
6282
6284 @command(
6283 @command(
6285 b'rollback',
6284 b'rollback',
6286 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6285 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6287 helpcategory=command.CATEGORY_MAINTENANCE,
6286 helpcategory=command.CATEGORY_MAINTENANCE,
6288 )
6287 )
6289 def rollback(ui, repo, **opts):
6288 def rollback(ui, repo, **opts):
6290 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6289 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6291
6290
6292 Please use :hg:`commit --amend` instead of rollback to correct
6291 Please use :hg:`commit --amend` instead of rollback to correct
6293 mistakes in the last commit.
6292 mistakes in the last commit.
6294
6293
6295 This command should be used with care. There is only one level of
6294 This command should be used with care. There is only one level of
6296 rollback, and there is no way to undo a rollback. It will also
6295 rollback, and there is no way to undo a rollback. It will also
6297 restore the dirstate at the time of the last transaction, losing
6296 restore the dirstate at the time of the last transaction, losing
6298 any dirstate changes since that time. This command does not alter
6297 any dirstate changes since that time. This command does not alter
6299 the working directory.
6298 the working directory.
6300
6299
6301 Transactions are used to encapsulate the effects of all commands
6300 Transactions are used to encapsulate the effects of all commands
6302 that create new changesets or propagate existing changesets into a
6301 that create new changesets or propagate existing changesets into a
6303 repository.
6302 repository.
6304
6303
6305 .. container:: verbose
6304 .. container:: verbose
6306
6305
6307 For example, the following commands are transactional, and their
6306 For example, the following commands are transactional, and their
6308 effects can be rolled back:
6307 effects can be rolled back:
6309
6308
6310 - commit
6309 - commit
6311 - import
6310 - import
6312 - pull
6311 - pull
6313 - push (with this repository as the destination)
6312 - push (with this repository as the destination)
6314 - unbundle
6313 - unbundle
6315
6314
6316 To avoid permanent data loss, rollback will refuse to rollback a
6315 To avoid permanent data loss, rollback will refuse to rollback a
6317 commit transaction if it isn't checked out. Use --force to
6316 commit transaction if it isn't checked out. Use --force to
6318 override this protection.
6317 override this protection.
6319
6318
6320 The rollback command can be entirely disabled by setting the
6319 The rollback command can be entirely disabled by setting the
6321 ``ui.rollback`` configuration setting to false. If you're here
6320 ``ui.rollback`` configuration setting to false. If you're here
6322 because you want to use rollback and it's disabled, you can
6321 because you want to use rollback and it's disabled, you can
6323 re-enable the command by setting ``ui.rollback`` to true.
6322 re-enable the command by setting ``ui.rollback`` to true.
6324
6323
6325 This command is not intended for use on public repositories. Once
6324 This command is not intended for use on public repositories. Once
6326 changes are visible for pull by other users, rolling a transaction
6325 changes are visible for pull by other users, rolling a transaction
6327 back locally is ineffective (someone else may already have pulled
6326 back locally is ineffective (someone else may already have pulled
6328 the changes). Furthermore, a race is possible with readers of the
6327 the changes). Furthermore, a race is possible with readers of the
6329 repository; for example an in-progress pull from the repository
6328 repository; for example an in-progress pull from the repository
6330 may fail if a rollback is performed.
6329 may fail if a rollback is performed.
6331
6330
6332 Returns 0 on success, 1 if no rollback data is available.
6331 Returns 0 on success, 1 if no rollback data is available.
6333 """
6332 """
6334 if not ui.configbool(b'ui', b'rollback'):
6333 if not ui.configbool(b'ui', b'rollback'):
6335 raise error.Abort(
6334 raise error.Abort(
6336 _(b'rollback is disabled because it is unsafe'),
6335 _(b'rollback is disabled because it is unsafe'),
6337 hint=b'see `hg help -v rollback` for information',
6336 hint=b'see `hg help -v rollback` for information',
6338 )
6337 )
6339 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6338 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6340
6339
6341
6340
6342 @command(
6341 @command(
6343 b'root',
6342 b'root',
6344 [] + formatteropts,
6343 [] + formatteropts,
6345 intents={INTENT_READONLY},
6344 intents={INTENT_READONLY},
6346 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6345 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6347 )
6346 )
6348 def root(ui, repo, **opts):
6347 def root(ui, repo, **opts):
6349 """print the root (top) of the current working directory
6348 """print the root (top) of the current working directory
6350
6349
6351 Print the root directory of the current repository.
6350 Print the root directory of the current repository.
6352
6351
6353 .. container:: verbose
6352 .. container:: verbose
6354
6353
6355 Template:
6354 Template:
6356
6355
6357 The following keywords are supported in addition to the common template
6356 The following keywords are supported in addition to the common template
6358 keywords and functions. See also :hg:`help templates`.
6357 keywords and functions. See also :hg:`help templates`.
6359
6358
6360 :hgpath: String. Path to the .hg directory.
6359 :hgpath: String. Path to the .hg directory.
6361 :storepath: String. Path to the directory holding versioned data.
6360 :storepath: String. Path to the directory holding versioned data.
6362
6361
6363 Returns 0 on success.
6362 Returns 0 on success.
6364 """
6363 """
6365 opts = pycompat.byteskwargs(opts)
6364 opts = pycompat.byteskwargs(opts)
6366 with ui.formatter(b'root', opts) as fm:
6365 with ui.formatter(b'root', opts) as fm:
6367 fm.startitem()
6366 fm.startitem()
6368 fm.write(b'reporoot', b'%s\n', repo.root)
6367 fm.write(b'reporoot', b'%s\n', repo.root)
6369 fm.data(hgpath=repo.path, storepath=repo.spath)
6368 fm.data(hgpath=repo.path, storepath=repo.spath)
6370
6369
6371
6370
6372 @command(
6371 @command(
6373 b'serve',
6372 b'serve',
6374 [
6373 [
6375 (
6374 (
6376 b'A',
6375 b'A',
6377 b'accesslog',
6376 b'accesslog',
6378 b'',
6377 b'',
6379 _(b'name of access log file to write to'),
6378 _(b'name of access log file to write to'),
6380 _(b'FILE'),
6379 _(b'FILE'),
6381 ),
6380 ),
6382 (b'd', b'daemon', None, _(b'run server in background')),
6381 (b'd', b'daemon', None, _(b'run server in background')),
6383 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6382 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6384 (
6383 (
6385 b'E',
6384 b'E',
6386 b'errorlog',
6385 b'errorlog',
6387 b'',
6386 b'',
6388 _(b'name of error log file to write to'),
6387 _(b'name of error log file to write to'),
6389 _(b'FILE'),
6388 _(b'FILE'),
6390 ),
6389 ),
6391 # use string type, then we can check if something was passed
6390 # use string type, then we can check if something was passed
6392 (
6391 (
6393 b'p',
6392 b'p',
6394 b'port',
6393 b'port',
6395 b'',
6394 b'',
6396 _(b'port to listen on (default: 8000)'),
6395 _(b'port to listen on (default: 8000)'),
6397 _(b'PORT'),
6396 _(b'PORT'),
6398 ),
6397 ),
6399 (
6398 (
6400 b'a',
6399 b'a',
6401 b'address',
6400 b'address',
6402 b'',
6401 b'',
6403 _(b'address to listen on (default: all interfaces)'),
6402 _(b'address to listen on (default: all interfaces)'),
6404 _(b'ADDR'),
6403 _(b'ADDR'),
6405 ),
6404 ),
6406 (
6405 (
6407 b'',
6406 b'',
6408 b'prefix',
6407 b'prefix',
6409 b'',
6408 b'',
6410 _(b'prefix path to serve from (default: server root)'),
6409 _(b'prefix path to serve from (default: server root)'),
6411 _(b'PREFIX'),
6410 _(b'PREFIX'),
6412 ),
6411 ),
6413 (
6412 (
6414 b'n',
6413 b'n',
6415 b'name',
6414 b'name',
6416 b'',
6415 b'',
6417 _(b'name to show in web pages (default: working directory)'),
6416 _(b'name to show in web pages (default: working directory)'),
6418 _(b'NAME'),
6417 _(b'NAME'),
6419 ),
6418 ),
6420 (
6419 (
6421 b'',
6420 b'',
6422 b'web-conf',
6421 b'web-conf',
6423 b'',
6422 b'',
6424 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6423 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6425 _(b'FILE'),
6424 _(b'FILE'),
6426 ),
6425 ),
6427 (
6426 (
6428 b'',
6427 b'',
6429 b'webdir-conf',
6428 b'webdir-conf',
6430 b'',
6429 b'',
6431 _(b'name of the hgweb config file (DEPRECATED)'),
6430 _(b'name of the hgweb config file (DEPRECATED)'),
6432 _(b'FILE'),
6431 _(b'FILE'),
6433 ),
6432 ),
6434 (
6433 (
6435 b'',
6434 b'',
6436 b'pid-file',
6435 b'pid-file',
6437 b'',
6436 b'',
6438 _(b'name of file to write process ID to'),
6437 _(b'name of file to write process ID to'),
6439 _(b'FILE'),
6438 _(b'FILE'),
6440 ),
6439 ),
6441 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6440 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6442 (
6441 (
6443 b'',
6442 b'',
6444 b'cmdserver',
6443 b'cmdserver',
6445 b'',
6444 b'',
6446 _(b'for remote clients (ADVANCED)'),
6445 _(b'for remote clients (ADVANCED)'),
6447 _(b'MODE'),
6446 _(b'MODE'),
6448 ),
6447 ),
6449 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6448 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6450 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6449 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6451 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6450 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6452 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6451 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6453 (b'', b'print-url', None, _(b'start and print only the URL')),
6452 (b'', b'print-url', None, _(b'start and print only the URL')),
6454 ]
6453 ]
6455 + subrepoopts,
6454 + subrepoopts,
6456 _(b'[OPTION]...'),
6455 _(b'[OPTION]...'),
6457 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6456 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6458 helpbasic=True,
6457 helpbasic=True,
6459 optionalrepo=True,
6458 optionalrepo=True,
6460 )
6459 )
6461 def serve(ui, repo, **opts):
6460 def serve(ui, repo, **opts):
6462 """start stand-alone webserver
6461 """start stand-alone webserver
6463
6462
6464 Start a local HTTP repository browser and pull server. You can use
6463 Start a local HTTP repository browser and pull server. You can use
6465 this for ad-hoc sharing and browsing of repositories. It is
6464 this for ad-hoc sharing and browsing of repositories. It is
6466 recommended to use a real web server to serve a repository for
6465 recommended to use a real web server to serve a repository for
6467 longer periods of time.
6466 longer periods of time.
6468
6467
6469 Please note that the server does not implement access control.
6468 Please note that the server does not implement access control.
6470 This means that, by default, anybody can read from the server and
6469 This means that, by default, anybody can read from the server and
6471 nobody can write to it by default. Set the ``web.allow-push``
6470 nobody can write to it by default. Set the ``web.allow-push``
6472 option to ``*`` to allow everybody to push to the server. You
6471 option to ``*`` to allow everybody to push to the server. You
6473 should use a real web server if you need to authenticate users.
6472 should use a real web server if you need to authenticate users.
6474
6473
6475 By default, the server logs accesses to stdout and errors to
6474 By default, the server logs accesses to stdout and errors to
6476 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6475 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6477 files.
6476 files.
6478
6477
6479 To have the server choose a free port number to listen on, specify
6478 To have the server choose a free port number to listen on, specify
6480 a port number of 0; in this case, the server will print the port
6479 a port number of 0; in this case, the server will print the port
6481 number it uses.
6480 number it uses.
6482
6481
6483 Returns 0 on success.
6482 Returns 0 on success.
6484 """
6483 """
6485
6484
6486 opts = pycompat.byteskwargs(opts)
6485 opts = pycompat.byteskwargs(opts)
6487 if opts[b"stdio"] and opts[b"cmdserver"]:
6486 if opts[b"stdio"] and opts[b"cmdserver"]:
6488 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6487 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6489 if opts[b"print_url"] and ui.verbose:
6488 if opts[b"print_url"] and ui.verbose:
6490 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6489 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6491
6490
6492 if opts[b"stdio"]:
6491 if opts[b"stdio"]:
6493 if repo is None:
6492 if repo is None:
6494 raise error.RepoError(
6493 raise error.RepoError(
6495 _(b"there is no Mercurial repository here (.hg not found)")
6494 _(b"there is no Mercurial repository here (.hg not found)")
6496 )
6495 )
6497 s = wireprotoserver.sshserver(ui, repo)
6496 s = wireprotoserver.sshserver(ui, repo)
6498 s.serve_forever()
6497 s.serve_forever()
6499
6498
6500 service = server.createservice(ui, repo, opts)
6499 service = server.createservice(ui, repo, opts)
6501 return server.runservice(opts, initfn=service.init, runfn=service.run)
6500 return server.runservice(opts, initfn=service.init, runfn=service.run)
6502
6501
6503
6502
6504 @command(
6503 @command(
6505 b'shelve',
6504 b'shelve',
6506 [
6505 [
6507 (
6506 (
6508 b'A',
6507 b'A',
6509 b'addremove',
6508 b'addremove',
6510 None,
6509 None,
6511 _(b'mark new/missing files as added/removed before shelving'),
6510 _(b'mark new/missing files as added/removed before shelving'),
6512 ),
6511 ),
6513 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6512 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6514 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6513 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6515 (
6514 (
6516 b'',
6515 b'',
6517 b'date',
6516 b'date',
6518 b'',
6517 b'',
6519 _(b'shelve with the specified commit date'),
6518 _(b'shelve with the specified commit date'),
6520 _(b'DATE'),
6519 _(b'DATE'),
6521 ),
6520 ),
6522 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6521 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6523 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6522 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6524 (
6523 (
6525 b'k',
6524 b'k',
6526 b'keep',
6525 b'keep',
6527 False,
6526 False,
6528 _(b'shelve, but keep changes in the working directory'),
6527 _(b'shelve, but keep changes in the working directory'),
6529 ),
6528 ),
6530 (b'l', b'list', None, _(b'list current shelves')),
6529 (b'l', b'list', None, _(b'list current shelves')),
6531 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6530 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6532 (
6531 (
6533 b'n',
6532 b'n',
6534 b'name',
6533 b'name',
6535 b'',
6534 b'',
6536 _(b'use the given name for the shelved commit'),
6535 _(b'use the given name for the shelved commit'),
6537 _(b'NAME'),
6536 _(b'NAME'),
6538 ),
6537 ),
6539 (
6538 (
6540 b'p',
6539 b'p',
6541 b'patch',
6540 b'patch',
6542 None,
6541 None,
6543 _(
6542 _(
6544 b'output patches for changes (provide the names of the shelved '
6543 b'output patches for changes (provide the names of the shelved '
6545 b'changes as positional arguments)'
6544 b'changes as positional arguments)'
6546 ),
6545 ),
6547 ),
6546 ),
6548 (b'i', b'interactive', None, _(b'interactive mode')),
6547 (b'i', b'interactive', None, _(b'interactive mode')),
6549 (
6548 (
6550 b'',
6549 b'',
6551 b'stat',
6550 b'stat',
6552 None,
6551 None,
6553 _(
6552 _(
6554 b'output diffstat-style summary of changes (provide the names of '
6553 b'output diffstat-style summary of changes (provide the names of '
6555 b'the shelved changes as positional arguments)'
6554 b'the shelved changes as positional arguments)'
6556 ),
6555 ),
6557 ),
6556 ),
6558 ]
6557 ]
6559 + cmdutil.walkopts,
6558 + cmdutil.walkopts,
6560 _(b'hg shelve [OPTION]... [FILE]...'),
6559 _(b'hg shelve [OPTION]... [FILE]...'),
6561 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6560 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6562 )
6561 )
6563 def shelve(ui, repo, *pats, **opts):
6562 def shelve(ui, repo, *pats, **opts):
6564 '''save and set aside changes from the working directory
6563 '''save and set aside changes from the working directory
6565
6564
6566 Shelving takes files that "hg status" reports as not clean, saves
6565 Shelving takes files that "hg status" reports as not clean, saves
6567 the modifications to a bundle (a shelved change), and reverts the
6566 the modifications to a bundle (a shelved change), and reverts the
6568 files so that their state in the working directory becomes clean.
6567 files so that their state in the working directory becomes clean.
6569
6568
6570 To restore these changes to the working directory, using "hg
6569 To restore these changes to the working directory, using "hg
6571 unshelve"; this will work even if you switch to a different
6570 unshelve"; this will work even if you switch to a different
6572 commit.
6571 commit.
6573
6572
6574 When no files are specified, "hg shelve" saves all not-clean
6573 When no files are specified, "hg shelve" saves all not-clean
6575 files. If specific files or directories are named, only changes to
6574 files. If specific files or directories are named, only changes to
6576 those files are shelved.
6575 those files are shelved.
6577
6576
6578 In bare shelve (when no files are specified, without interactive,
6577 In bare shelve (when no files are specified, without interactive,
6579 include and exclude option), shelving remembers information if the
6578 include and exclude option), shelving remembers information if the
6580 working directory was on newly created branch, in other words working
6579 working directory was on newly created branch, in other words working
6581 directory was on different branch than its first parent. In this
6580 directory was on different branch than its first parent. In this
6582 situation unshelving restores branch information to the working directory.
6581 situation unshelving restores branch information to the working directory.
6583
6582
6584 Each shelved change has a name that makes it easier to find later.
6583 Each shelved change has a name that makes it easier to find later.
6585 The name of a shelved change defaults to being based on the active
6584 The name of a shelved change defaults to being based on the active
6586 bookmark, or if there is no active bookmark, the current named
6585 bookmark, or if there is no active bookmark, the current named
6587 branch. To specify a different name, use ``--name``.
6586 branch. To specify a different name, use ``--name``.
6588
6587
6589 To see a list of existing shelved changes, use the ``--list``
6588 To see a list of existing shelved changes, use the ``--list``
6590 option. For each shelved change, this will print its name, age,
6589 option. For each shelved change, this will print its name, age,
6591 and description; use ``--patch`` or ``--stat`` for more details.
6590 and description; use ``--patch`` or ``--stat`` for more details.
6592
6591
6593 To delete specific shelved changes, use ``--delete``. To delete
6592 To delete specific shelved changes, use ``--delete``. To delete
6594 all shelved changes, use ``--cleanup``.
6593 all shelved changes, use ``--cleanup``.
6595 '''
6594 '''
6596 opts = pycompat.byteskwargs(opts)
6595 opts = pycompat.byteskwargs(opts)
6597 allowables = [
6596 allowables = [
6598 (b'addremove', {b'create'}), # 'create' is pseudo action
6597 (b'addremove', {b'create'}), # 'create' is pseudo action
6599 (b'unknown', {b'create'}),
6598 (b'unknown', {b'create'}),
6600 (b'cleanup', {b'cleanup'}),
6599 (b'cleanup', {b'cleanup'}),
6601 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6600 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6602 (b'delete', {b'delete'}),
6601 (b'delete', {b'delete'}),
6603 (b'edit', {b'create'}),
6602 (b'edit', {b'create'}),
6604 (b'keep', {b'create'}),
6603 (b'keep', {b'create'}),
6605 (b'list', {b'list'}),
6604 (b'list', {b'list'}),
6606 (b'message', {b'create'}),
6605 (b'message', {b'create'}),
6607 (b'name', {b'create'}),
6606 (b'name', {b'create'}),
6608 (b'patch', {b'patch', b'list'}),
6607 (b'patch', {b'patch', b'list'}),
6609 (b'stat', {b'stat', b'list'}),
6608 (b'stat', {b'stat', b'list'}),
6610 ]
6609 ]
6611
6610
6612 def checkopt(opt):
6611 def checkopt(opt):
6613 if opts.get(opt):
6612 if opts.get(opt):
6614 for i, allowable in allowables:
6613 for i, allowable in allowables:
6615 if opts[i] and opt not in allowable:
6614 if opts[i] and opt not in allowable:
6616 raise error.Abort(
6615 raise error.Abort(
6617 _(
6616 _(
6618 b"options '--%s' and '--%s' may not be "
6617 b"options '--%s' and '--%s' may not be "
6619 b"used together"
6618 b"used together"
6620 )
6619 )
6621 % (opt, i)
6620 % (opt, i)
6622 )
6621 )
6623 return True
6622 return True
6624
6623
6625 if checkopt(b'cleanup'):
6624 if checkopt(b'cleanup'):
6626 if pats:
6625 if pats:
6627 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6626 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6628 return shelvemod.cleanupcmd(ui, repo)
6627 return shelvemod.cleanupcmd(ui, repo)
6629 elif checkopt(b'delete'):
6628 elif checkopt(b'delete'):
6630 return shelvemod.deletecmd(ui, repo, pats)
6629 return shelvemod.deletecmd(ui, repo, pats)
6631 elif checkopt(b'list'):
6630 elif checkopt(b'list'):
6632 return shelvemod.listcmd(ui, repo, pats, opts)
6631 return shelvemod.listcmd(ui, repo, pats, opts)
6633 elif checkopt(b'patch') or checkopt(b'stat'):
6632 elif checkopt(b'patch') or checkopt(b'stat'):
6634 return shelvemod.patchcmds(ui, repo, pats, opts)
6633 return shelvemod.patchcmds(ui, repo, pats, opts)
6635 else:
6634 else:
6636 return shelvemod.createcmd(ui, repo, pats, opts)
6635 return shelvemod.createcmd(ui, repo, pats, opts)
6637
6636
6638
6637
6639 _NOTTERSE = b'nothing'
6638 _NOTTERSE = b'nothing'
6640
6639
6641
6640
6642 @command(
6641 @command(
6643 b'status|st',
6642 b'status|st',
6644 [
6643 [
6645 (b'A', b'all', None, _(b'show status of all files')),
6644 (b'A', b'all', None, _(b'show status of all files')),
6646 (b'm', b'modified', None, _(b'show only modified files')),
6645 (b'm', b'modified', None, _(b'show only modified files')),
6647 (b'a', b'added', None, _(b'show only added files')),
6646 (b'a', b'added', None, _(b'show only added files')),
6648 (b'r', b'removed', None, _(b'show only removed files')),
6647 (b'r', b'removed', None, _(b'show only removed files')),
6649 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6648 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6650 (b'c', b'clean', None, _(b'show only files without changes')),
6649 (b'c', b'clean', None, _(b'show only files without changes')),
6651 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6650 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6652 (b'i', b'ignored', None, _(b'show only ignored files')),
6651 (b'i', b'ignored', None, _(b'show only ignored files')),
6653 (b'n', b'no-status', None, _(b'hide status prefix')),
6652 (b'n', b'no-status', None, _(b'hide status prefix')),
6654 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6653 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6655 (b'C', b'copies', None, _(b'show source of copied files')),
6654 (b'C', b'copies', None, _(b'show source of copied files')),
6656 (
6655 (
6657 b'0',
6656 b'0',
6658 b'print0',
6657 b'print0',
6659 None,
6658 None,
6660 _(b'end filenames with NUL, for use with xargs'),
6659 _(b'end filenames with NUL, for use with xargs'),
6661 ),
6660 ),
6662 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6661 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6663 (
6662 (
6664 b'',
6663 b'',
6665 b'change',
6664 b'change',
6666 b'',
6665 b'',
6667 _(b'list the changed files of a revision'),
6666 _(b'list the changed files of a revision'),
6668 _(b'REV'),
6667 _(b'REV'),
6669 ),
6668 ),
6670 ]
6669 ]
6671 + walkopts
6670 + walkopts
6672 + subrepoopts
6671 + subrepoopts
6673 + formatteropts,
6672 + formatteropts,
6674 _(b'[OPTION]... [FILE]...'),
6673 _(b'[OPTION]... [FILE]...'),
6675 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6676 helpbasic=True,
6675 helpbasic=True,
6677 inferrepo=True,
6676 inferrepo=True,
6678 intents={INTENT_READONLY},
6677 intents={INTENT_READONLY},
6679 )
6678 )
6680 def status(ui, repo, *pats, **opts):
6679 def status(ui, repo, *pats, **opts):
6681 """show changed files in the working directory
6680 """show changed files in the working directory
6682
6681
6683 Show status of files in the repository. If names are given, only
6682 Show status of files in the repository. If names are given, only
6684 files that match are shown. Files that are clean or ignored or
6683 files that match are shown. Files that are clean or ignored or
6685 the source of a copy/move operation, are not listed unless
6684 the source of a copy/move operation, are not listed unless
6686 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6685 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6687 Unless options described with "show only ..." are given, the
6686 Unless options described with "show only ..." are given, the
6688 options -mardu are used.
6687 options -mardu are used.
6689
6688
6690 Option -q/--quiet hides untracked (unknown and ignored) files
6689 Option -q/--quiet hides untracked (unknown and ignored) files
6691 unless explicitly requested with -u/--unknown or -i/--ignored.
6690 unless explicitly requested with -u/--unknown or -i/--ignored.
6692
6691
6693 .. note::
6692 .. note::
6694
6693
6695 :hg:`status` may appear to disagree with diff if permissions have
6694 :hg:`status` may appear to disagree with diff if permissions have
6696 changed or a merge has occurred. The standard diff format does
6695 changed or a merge has occurred. The standard diff format does
6697 not report permission changes and diff only reports changes
6696 not report permission changes and diff only reports changes
6698 relative to one merge parent.
6697 relative to one merge parent.
6699
6698
6700 If one revision is given, it is used as the base revision.
6699 If one revision is given, it is used as the base revision.
6701 If two revisions are given, the differences between them are
6700 If two revisions are given, the differences between them are
6702 shown. The --change option can also be used as a shortcut to list
6701 shown. The --change option can also be used as a shortcut to list
6703 the changed files of a revision from its first parent.
6702 the changed files of a revision from its first parent.
6704
6703
6705 The codes used to show the status of files are::
6704 The codes used to show the status of files are::
6706
6705
6707 M = modified
6706 M = modified
6708 A = added
6707 A = added
6709 R = removed
6708 R = removed
6710 C = clean
6709 C = clean
6711 ! = missing (deleted by non-hg command, but still tracked)
6710 ! = missing (deleted by non-hg command, but still tracked)
6712 ? = not tracked
6711 ? = not tracked
6713 I = ignored
6712 I = ignored
6714 = origin of the previous file (with --copies)
6713 = origin of the previous file (with --copies)
6715
6714
6716 .. container:: verbose
6715 .. container:: verbose
6717
6716
6718 The -t/--terse option abbreviates the output by showing only the directory
6717 The -t/--terse option abbreviates the output by showing only the directory
6719 name if all the files in it share the same status. The option takes an
6718 name if all the files in it share the same status. The option takes an
6720 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6719 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6721 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6720 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6722 for 'ignored' and 'c' for clean.
6721 for 'ignored' and 'c' for clean.
6723
6722
6724 It abbreviates only those statuses which are passed. Note that clean and
6723 It abbreviates only those statuses which are passed. Note that clean and
6725 ignored files are not displayed with '--terse ic' unless the -c/--clean
6724 ignored files are not displayed with '--terse ic' unless the -c/--clean
6726 and -i/--ignored options are also used.
6725 and -i/--ignored options are also used.
6727
6726
6728 The -v/--verbose option shows information when the repository is in an
6727 The -v/--verbose option shows information when the repository is in an
6729 unfinished merge, shelve, rebase state etc. You can have this behavior
6728 unfinished merge, shelve, rebase state etc. You can have this behavior
6730 turned on by default by enabling the ``commands.status.verbose`` option.
6729 turned on by default by enabling the ``commands.status.verbose`` option.
6731
6730
6732 You can skip displaying some of these states by setting
6731 You can skip displaying some of these states by setting
6733 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6732 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6734 'histedit', 'merge', 'rebase', or 'unshelve'.
6733 'histedit', 'merge', 'rebase', or 'unshelve'.
6735
6734
6736 Template:
6735 Template:
6737
6736
6738 The following keywords are supported in addition to the common template
6737 The following keywords are supported in addition to the common template
6739 keywords and functions. See also :hg:`help templates`.
6738 keywords and functions. See also :hg:`help templates`.
6740
6739
6741 :path: String. Repository-absolute path of the file.
6740 :path: String. Repository-absolute path of the file.
6742 :source: String. Repository-absolute path of the file originated from.
6741 :source: String. Repository-absolute path of the file originated from.
6743 Available if ``--copies`` is specified.
6742 Available if ``--copies`` is specified.
6744 :status: String. Character denoting file's status.
6743 :status: String. Character denoting file's status.
6745
6744
6746 Examples:
6745 Examples:
6747
6746
6748 - show changes in the working directory relative to a
6747 - show changes in the working directory relative to a
6749 changeset::
6748 changeset::
6750
6749
6751 hg status --rev 9353
6750 hg status --rev 9353
6752
6751
6753 - show changes in the working directory relative to the
6752 - show changes in the working directory relative to the
6754 current directory (see :hg:`help patterns` for more information)::
6753 current directory (see :hg:`help patterns` for more information)::
6755
6754
6756 hg status re:
6755 hg status re:
6757
6756
6758 - show all changes including copies in an existing changeset::
6757 - show all changes including copies in an existing changeset::
6759
6758
6760 hg status --copies --change 9353
6759 hg status --copies --change 9353
6761
6760
6762 - get a NUL separated list of added files, suitable for xargs::
6761 - get a NUL separated list of added files, suitable for xargs::
6763
6762
6764 hg status -an0
6763 hg status -an0
6765
6764
6766 - show more information about the repository status, abbreviating
6765 - show more information about the repository status, abbreviating
6767 added, removed, modified, deleted, and untracked paths::
6766 added, removed, modified, deleted, and untracked paths::
6768
6767
6769 hg status -v -t mardu
6768 hg status -v -t mardu
6770
6769
6771 Returns 0 on success.
6770 Returns 0 on success.
6772
6771
6773 """
6772 """
6774
6773
6775 opts = pycompat.byteskwargs(opts)
6774 opts = pycompat.byteskwargs(opts)
6776 revs = opts.get(b'rev')
6775 revs = opts.get(b'rev')
6777 change = opts.get(b'change')
6776 change = opts.get(b'change')
6778 terse = opts.get(b'terse')
6777 terse = opts.get(b'terse')
6779 if terse is _NOTTERSE:
6778 if terse is _NOTTERSE:
6780 if revs:
6779 if revs:
6781 terse = b''
6780 terse = b''
6782 else:
6781 else:
6783 terse = ui.config(b'commands', b'status.terse')
6782 terse = ui.config(b'commands', b'status.terse')
6784
6783
6785 if revs and change:
6784 if revs and change:
6786 msg = _(b'cannot specify --rev and --change at the same time')
6785 msg = _(b'cannot specify --rev and --change at the same time')
6787 raise error.Abort(msg)
6786 raise error.Abort(msg)
6788 elif revs and terse:
6787 elif revs and terse:
6789 msg = _(b'cannot use --terse with --rev')
6788 msg = _(b'cannot use --terse with --rev')
6790 raise error.Abort(msg)
6789 raise error.Abort(msg)
6791 elif change:
6790 elif change:
6792 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6791 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6793 ctx2 = scmutil.revsingle(repo, change, None)
6792 ctx2 = scmutil.revsingle(repo, change, None)
6794 ctx1 = ctx2.p1()
6793 ctx1 = ctx2.p1()
6795 else:
6794 else:
6796 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6795 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6797 ctx1, ctx2 = scmutil.revpair(repo, revs)
6796 ctx1, ctx2 = scmutil.revpair(repo, revs)
6798
6797
6799 forcerelativevalue = None
6798 forcerelativevalue = None
6800 if ui.hasconfig(b'commands', b'status.relative'):
6799 if ui.hasconfig(b'commands', b'status.relative'):
6801 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6800 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6802 uipathfn = scmutil.getuipathfn(
6801 uipathfn = scmutil.getuipathfn(
6803 repo,
6802 repo,
6804 legacyrelativevalue=bool(pats),
6803 legacyrelativevalue=bool(pats),
6805 forcerelativevalue=forcerelativevalue,
6804 forcerelativevalue=forcerelativevalue,
6806 )
6805 )
6807
6806
6808 if opts.get(b'print0'):
6807 if opts.get(b'print0'):
6809 end = b'\0'
6808 end = b'\0'
6810 else:
6809 else:
6811 end = b'\n'
6810 end = b'\n'
6812 states = b'modified added removed deleted unknown ignored clean'.split()
6811 states = b'modified added removed deleted unknown ignored clean'.split()
6813 show = [k for k in states if opts.get(k)]
6812 show = [k for k in states if opts.get(k)]
6814 if opts.get(b'all'):
6813 if opts.get(b'all'):
6815 show += ui.quiet and (states[:4] + [b'clean']) or states
6814 show += ui.quiet and (states[:4] + [b'clean']) or states
6816
6815
6817 if not show:
6816 if not show:
6818 if ui.quiet:
6817 if ui.quiet:
6819 show = states[:4]
6818 show = states[:4]
6820 else:
6819 else:
6821 show = states[:5]
6820 show = states[:5]
6822
6821
6823 m = scmutil.match(ctx2, pats, opts)
6822 m = scmutil.match(ctx2, pats, opts)
6824 if terse:
6823 if terse:
6825 # we need to compute clean and unknown to terse
6824 # we need to compute clean and unknown to terse
6826 stat = repo.status(
6825 stat = repo.status(
6827 ctx1.node(),
6826 ctx1.node(),
6828 ctx2.node(),
6827 ctx2.node(),
6829 m,
6828 m,
6830 b'ignored' in show or b'i' in terse,
6829 b'ignored' in show or b'i' in terse,
6831 clean=True,
6830 clean=True,
6832 unknown=True,
6831 unknown=True,
6833 listsubrepos=opts.get(b'subrepos'),
6832 listsubrepos=opts.get(b'subrepos'),
6834 )
6833 )
6835
6834
6836 stat = cmdutil.tersedir(stat, terse)
6835 stat = cmdutil.tersedir(stat, terse)
6837 else:
6836 else:
6838 stat = repo.status(
6837 stat = repo.status(
6839 ctx1.node(),
6838 ctx1.node(),
6840 ctx2.node(),
6839 ctx2.node(),
6841 m,
6840 m,
6842 b'ignored' in show,
6841 b'ignored' in show,
6843 b'clean' in show,
6842 b'clean' in show,
6844 b'unknown' in show,
6843 b'unknown' in show,
6845 opts.get(b'subrepos'),
6844 opts.get(b'subrepos'),
6846 )
6845 )
6847
6846
6848 changestates = zip(
6847 changestates = zip(
6849 states,
6848 states,
6850 pycompat.iterbytestr(b'MAR!?IC'),
6849 pycompat.iterbytestr(b'MAR!?IC'),
6851 [getattr(stat, s.decode('utf8')) for s in states],
6850 [getattr(stat, s.decode('utf8')) for s in states],
6852 )
6851 )
6853
6852
6854 copy = {}
6853 copy = {}
6855 if (
6854 if (
6856 opts.get(b'all')
6855 opts.get(b'all')
6857 or opts.get(b'copies')
6856 or opts.get(b'copies')
6858 or ui.configbool(b'ui', b'statuscopies')
6857 or ui.configbool(b'ui', b'statuscopies')
6859 ) and not opts.get(b'no_status'):
6858 ) and not opts.get(b'no_status'):
6860 copy = copies.pathcopies(ctx1, ctx2, m)
6859 copy = copies.pathcopies(ctx1, ctx2, m)
6861
6860
6862 morestatus = None
6861 morestatus = None
6863 if (
6862 if (
6864 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6863 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6865 ) and not ui.plain():
6864 ) and not ui.plain():
6866 morestatus = cmdutil.readmorestatus(repo)
6865 morestatus = cmdutil.readmorestatus(repo)
6867
6866
6868 ui.pager(b'status')
6867 ui.pager(b'status')
6869 fm = ui.formatter(b'status', opts)
6868 fm = ui.formatter(b'status', opts)
6870 fmt = b'%s' + end
6869 fmt = b'%s' + end
6871 showchar = not opts.get(b'no_status')
6870 showchar = not opts.get(b'no_status')
6872
6871
6873 for state, char, files in changestates:
6872 for state, char, files in changestates:
6874 if state in show:
6873 if state in show:
6875 label = b'status.' + state
6874 label = b'status.' + state
6876 for f in files:
6875 for f in files:
6877 fm.startitem()
6876 fm.startitem()
6878 fm.context(ctx=ctx2)
6877 fm.context(ctx=ctx2)
6879 fm.data(itemtype=b'file', path=f)
6878 fm.data(itemtype=b'file', path=f)
6880 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6879 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6881 fm.plain(fmt % uipathfn(f), label=label)
6880 fm.plain(fmt % uipathfn(f), label=label)
6882 if f in copy:
6881 if f in copy:
6883 fm.data(source=copy[f])
6882 fm.data(source=copy[f])
6884 fm.plain(
6883 fm.plain(
6885 (b' %s' + end) % uipathfn(copy[f]),
6884 (b' %s' + end) % uipathfn(copy[f]),
6886 label=b'status.copied',
6885 label=b'status.copied',
6887 )
6886 )
6888 if morestatus:
6887 if morestatus:
6889 morestatus.formatfile(f, fm)
6888 morestatus.formatfile(f, fm)
6890
6889
6891 if morestatus:
6890 if morestatus:
6892 morestatus.formatfooter(fm)
6891 morestatus.formatfooter(fm)
6893 fm.end()
6892 fm.end()
6894
6893
6895
6894
6896 @command(
6895 @command(
6897 b'summary|sum',
6896 b'summary|sum',
6898 [(b'', b'remote', None, _(b'check for push and pull'))],
6897 [(b'', b'remote', None, _(b'check for push and pull'))],
6899 b'[--remote]',
6898 b'[--remote]',
6900 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6899 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6901 helpbasic=True,
6900 helpbasic=True,
6902 intents={INTENT_READONLY},
6901 intents={INTENT_READONLY},
6903 )
6902 )
6904 def summary(ui, repo, **opts):
6903 def summary(ui, repo, **opts):
6905 """summarize working directory state
6904 """summarize working directory state
6906
6905
6907 This generates a brief summary of the working directory state,
6906 This generates a brief summary of the working directory state,
6908 including parents, branch, commit status, phase and available updates.
6907 including parents, branch, commit status, phase and available updates.
6909
6908
6910 With the --remote option, this will check the default paths for
6909 With the --remote option, this will check the default paths for
6911 incoming and outgoing changes. This can be time-consuming.
6910 incoming and outgoing changes. This can be time-consuming.
6912
6911
6913 Returns 0 on success.
6912 Returns 0 on success.
6914 """
6913 """
6915
6914
6916 opts = pycompat.byteskwargs(opts)
6915 opts = pycompat.byteskwargs(opts)
6917 ui.pager(b'summary')
6916 ui.pager(b'summary')
6918 ctx = repo[None]
6917 ctx = repo[None]
6919 parents = ctx.parents()
6918 parents = ctx.parents()
6920 pnode = parents[0].node()
6919 pnode = parents[0].node()
6921 marks = []
6920 marks = []
6922
6921
6923 try:
6922 try:
6924 ms = mergemod.mergestate.read(repo)
6923 ms = mergemod.mergestate.read(repo)
6925 except error.UnsupportedMergeRecords as e:
6924 except error.UnsupportedMergeRecords as e:
6926 s = b' '.join(e.recordtypes)
6925 s = b' '.join(e.recordtypes)
6927 ui.warn(
6926 ui.warn(
6928 _(b'warning: merge state has unsupported record types: %s\n') % s
6927 _(b'warning: merge state has unsupported record types: %s\n') % s
6929 )
6928 )
6930 unresolved = []
6929 unresolved = []
6931 else:
6930 else:
6932 unresolved = list(ms.unresolved())
6931 unresolved = list(ms.unresolved())
6933
6932
6934 for p in parents:
6933 for p in parents:
6935 # label with log.changeset (instead of log.parent) since this
6934 # label with log.changeset (instead of log.parent) since this
6936 # shows a working directory parent *changeset*:
6935 # shows a working directory parent *changeset*:
6937 # i18n: column positioning for "hg summary"
6936 # i18n: column positioning for "hg summary"
6938 ui.write(
6937 ui.write(
6939 _(b'parent: %d:%s ') % (p.rev(), p),
6938 _(b'parent: %d:%s ') % (p.rev(), p),
6940 label=logcmdutil.changesetlabels(p),
6939 label=logcmdutil.changesetlabels(p),
6941 )
6940 )
6942 ui.write(b' '.join(p.tags()), label=b'log.tag')
6941 ui.write(b' '.join(p.tags()), label=b'log.tag')
6943 if p.bookmarks():
6942 if p.bookmarks():
6944 marks.extend(p.bookmarks())
6943 marks.extend(p.bookmarks())
6945 if p.rev() == -1:
6944 if p.rev() == -1:
6946 if not len(repo):
6945 if not len(repo):
6947 ui.write(_(b' (empty repository)'))
6946 ui.write(_(b' (empty repository)'))
6948 else:
6947 else:
6949 ui.write(_(b' (no revision checked out)'))
6948 ui.write(_(b' (no revision checked out)'))
6950 if p.obsolete():
6949 if p.obsolete():
6951 ui.write(_(b' (obsolete)'))
6950 ui.write(_(b' (obsolete)'))
6952 if p.isunstable():
6951 if p.isunstable():
6953 instabilities = (
6952 instabilities = (
6954 ui.label(instability, b'trouble.%s' % instability)
6953 ui.label(instability, b'trouble.%s' % instability)
6955 for instability in p.instabilities()
6954 for instability in p.instabilities()
6956 )
6955 )
6957 ui.write(b' (' + b', '.join(instabilities) + b')')
6956 ui.write(b' (' + b', '.join(instabilities) + b')')
6958 ui.write(b'\n')
6957 ui.write(b'\n')
6959 if p.description():
6958 if p.description():
6960 ui.status(
6959 ui.status(
6961 b' ' + p.description().splitlines()[0].strip() + b'\n',
6960 b' ' + p.description().splitlines()[0].strip() + b'\n',
6962 label=b'log.summary',
6961 label=b'log.summary',
6963 )
6962 )
6964
6963
6965 branch = ctx.branch()
6964 branch = ctx.branch()
6966 bheads = repo.branchheads(branch)
6965 bheads = repo.branchheads(branch)
6967 # i18n: column positioning for "hg summary"
6966 # i18n: column positioning for "hg summary"
6968 m = _(b'branch: %s\n') % branch
6967 m = _(b'branch: %s\n') % branch
6969 if branch != b'default':
6968 if branch != b'default':
6970 ui.write(m, label=b'log.branch')
6969 ui.write(m, label=b'log.branch')
6971 else:
6970 else:
6972 ui.status(m, label=b'log.branch')
6971 ui.status(m, label=b'log.branch')
6973
6972
6974 if marks:
6973 if marks:
6975 active = repo._activebookmark
6974 active = repo._activebookmark
6976 # i18n: column positioning for "hg summary"
6975 # i18n: column positioning for "hg summary"
6977 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6976 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6978 if active is not None:
6977 if active is not None:
6979 if active in marks:
6978 if active in marks:
6980 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6979 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6981 marks.remove(active)
6980 marks.remove(active)
6982 else:
6981 else:
6983 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6982 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6984 for m in marks:
6983 for m in marks:
6985 ui.write(b' ' + m, label=b'log.bookmark')
6984 ui.write(b' ' + m, label=b'log.bookmark')
6986 ui.write(b'\n', label=b'log.bookmark')
6985 ui.write(b'\n', label=b'log.bookmark')
6987
6986
6988 status = repo.status(unknown=True)
6987 status = repo.status(unknown=True)
6989
6988
6990 c = repo.dirstate.copies()
6989 c = repo.dirstate.copies()
6991 copied, renamed = [], []
6990 copied, renamed = [], []
6992 for d, s in pycompat.iteritems(c):
6991 for d, s in pycompat.iteritems(c):
6993 if s in status.removed:
6992 if s in status.removed:
6994 status.removed.remove(s)
6993 status.removed.remove(s)
6995 renamed.append(d)
6994 renamed.append(d)
6996 else:
6995 else:
6997 copied.append(d)
6996 copied.append(d)
6998 if d in status.added:
6997 if d in status.added:
6999 status.added.remove(d)
6998 status.added.remove(d)
7000
6999
7001 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7000 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7002
7001
7003 labels = [
7002 labels = [
7004 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7003 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7005 (ui.label(_(b'%d added'), b'status.added'), status.added),
7004 (ui.label(_(b'%d added'), b'status.added'), status.added),
7006 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7005 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7007 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7006 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7008 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7007 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7009 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7008 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7010 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7009 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7011 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7010 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7012 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7011 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7013 ]
7012 ]
7014 t = []
7013 t = []
7015 for l, s in labels:
7014 for l, s in labels:
7016 if s:
7015 if s:
7017 t.append(l % len(s))
7016 t.append(l % len(s))
7018
7017
7019 t = b', '.join(t)
7018 t = b', '.join(t)
7020 cleanworkdir = False
7019 cleanworkdir = False
7021
7020
7022 if repo.vfs.exists(b'graftstate'):
7021 if repo.vfs.exists(b'graftstate'):
7023 t += _(b' (graft in progress)')
7022 t += _(b' (graft in progress)')
7024 if repo.vfs.exists(b'updatestate'):
7023 if repo.vfs.exists(b'updatestate'):
7025 t += _(b' (interrupted update)')
7024 t += _(b' (interrupted update)')
7026 elif len(parents) > 1:
7025 elif len(parents) > 1:
7027 t += _(b' (merge)')
7026 t += _(b' (merge)')
7028 elif branch != parents[0].branch():
7027 elif branch != parents[0].branch():
7029 t += _(b' (new branch)')
7028 t += _(b' (new branch)')
7030 elif parents[0].closesbranch() and pnode in repo.branchheads(
7029 elif parents[0].closesbranch() and pnode in repo.branchheads(
7031 branch, closed=True
7030 branch, closed=True
7032 ):
7031 ):
7033 t += _(b' (head closed)')
7032 t += _(b' (head closed)')
7034 elif not (
7033 elif not (
7035 status.modified
7034 status.modified
7036 or status.added
7035 or status.added
7037 or status.removed
7036 or status.removed
7038 or renamed
7037 or renamed
7039 or copied
7038 or copied
7040 or subs
7039 or subs
7041 ):
7040 ):
7042 t += _(b' (clean)')
7041 t += _(b' (clean)')
7043 cleanworkdir = True
7042 cleanworkdir = True
7044 elif pnode not in bheads:
7043 elif pnode not in bheads:
7045 t += _(b' (new branch head)')
7044 t += _(b' (new branch head)')
7046
7045
7047 if parents:
7046 if parents:
7048 pendingphase = max(p.phase() for p in parents)
7047 pendingphase = max(p.phase() for p in parents)
7049 else:
7048 else:
7050 pendingphase = phases.public
7049 pendingphase = phases.public
7051
7050
7052 if pendingphase > phases.newcommitphase(ui):
7051 if pendingphase > phases.newcommitphase(ui):
7053 t += b' (%s)' % phases.phasenames[pendingphase]
7052 t += b' (%s)' % phases.phasenames[pendingphase]
7054
7053
7055 if cleanworkdir:
7054 if cleanworkdir:
7056 # i18n: column positioning for "hg summary"
7055 # i18n: column positioning for "hg summary"
7057 ui.status(_(b'commit: %s\n') % t.strip())
7056 ui.status(_(b'commit: %s\n') % t.strip())
7058 else:
7057 else:
7059 # i18n: column positioning for "hg summary"
7058 # i18n: column positioning for "hg summary"
7060 ui.write(_(b'commit: %s\n') % t.strip())
7059 ui.write(_(b'commit: %s\n') % t.strip())
7061
7060
7062 # all ancestors of branch heads - all ancestors of parent = new csets
7061 # all ancestors of branch heads - all ancestors of parent = new csets
7063 new = len(
7062 new = len(
7064 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7063 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7065 )
7064 )
7066
7065
7067 if new == 0:
7066 if new == 0:
7068 # i18n: column positioning for "hg summary"
7067 # i18n: column positioning for "hg summary"
7069 ui.status(_(b'update: (current)\n'))
7068 ui.status(_(b'update: (current)\n'))
7070 elif pnode not in bheads:
7069 elif pnode not in bheads:
7071 # i18n: column positioning for "hg summary"
7070 # i18n: column positioning for "hg summary"
7072 ui.write(_(b'update: %d new changesets (update)\n') % new)
7071 ui.write(_(b'update: %d new changesets (update)\n') % new)
7073 else:
7072 else:
7074 # i18n: column positioning for "hg summary"
7073 # i18n: column positioning for "hg summary"
7075 ui.write(
7074 ui.write(
7076 _(b'update: %d new changesets, %d branch heads (merge)\n')
7075 _(b'update: %d new changesets, %d branch heads (merge)\n')
7077 % (new, len(bheads))
7076 % (new, len(bheads))
7078 )
7077 )
7079
7078
7080 t = []
7079 t = []
7081 draft = len(repo.revs(b'draft()'))
7080 draft = len(repo.revs(b'draft()'))
7082 if draft:
7081 if draft:
7083 t.append(_(b'%d draft') % draft)
7082 t.append(_(b'%d draft') % draft)
7084 secret = len(repo.revs(b'secret()'))
7083 secret = len(repo.revs(b'secret()'))
7085 if secret:
7084 if secret:
7086 t.append(_(b'%d secret') % secret)
7085 t.append(_(b'%d secret') % secret)
7087
7086
7088 if draft or secret:
7087 if draft or secret:
7089 ui.status(_(b'phases: %s\n') % b', '.join(t))
7088 ui.status(_(b'phases: %s\n') % b', '.join(t))
7090
7089
7091 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7090 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7092 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7091 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7093 numtrouble = len(repo.revs(trouble + b"()"))
7092 numtrouble = len(repo.revs(trouble + b"()"))
7094 # We write all the possibilities to ease translation
7093 # We write all the possibilities to ease translation
7095 troublemsg = {
7094 troublemsg = {
7096 b"orphan": _(b"orphan: %d changesets"),
7095 b"orphan": _(b"orphan: %d changesets"),
7097 b"contentdivergent": _(b"content-divergent: %d changesets"),
7096 b"contentdivergent": _(b"content-divergent: %d changesets"),
7098 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7097 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7099 }
7098 }
7100 if numtrouble > 0:
7099 if numtrouble > 0:
7101 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7100 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7102
7101
7103 cmdutil.summaryhooks(ui, repo)
7102 cmdutil.summaryhooks(ui, repo)
7104
7103
7105 if opts.get(b'remote'):
7104 if opts.get(b'remote'):
7106 needsincoming, needsoutgoing = True, True
7105 needsincoming, needsoutgoing = True, True
7107 else:
7106 else:
7108 needsincoming, needsoutgoing = False, False
7107 needsincoming, needsoutgoing = False, False
7109 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7108 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7110 if i:
7109 if i:
7111 needsincoming = True
7110 needsincoming = True
7112 if o:
7111 if o:
7113 needsoutgoing = True
7112 needsoutgoing = True
7114 if not needsincoming and not needsoutgoing:
7113 if not needsincoming and not needsoutgoing:
7115 return
7114 return
7116
7115
7117 def getincoming():
7116 def getincoming():
7118 source, branches = hg.parseurl(ui.expandpath(b'default'))
7117 source, branches = hg.parseurl(ui.expandpath(b'default'))
7119 sbranch = branches[0]
7118 sbranch = branches[0]
7120 try:
7119 try:
7121 other = hg.peer(repo, {}, source)
7120 other = hg.peer(repo, {}, source)
7122 except error.RepoError:
7121 except error.RepoError:
7123 if opts.get(b'remote'):
7122 if opts.get(b'remote'):
7124 raise
7123 raise
7125 return source, sbranch, None, None, None
7124 return source, sbranch, None, None, None
7126 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7125 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7127 if revs:
7126 if revs:
7128 revs = [other.lookup(rev) for rev in revs]
7127 revs = [other.lookup(rev) for rev in revs]
7129 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7128 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7130 repo.ui.pushbuffer()
7129 repo.ui.pushbuffer()
7131 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7130 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7132 repo.ui.popbuffer()
7131 repo.ui.popbuffer()
7133 return source, sbranch, other, commoninc, commoninc[1]
7132 return source, sbranch, other, commoninc, commoninc[1]
7134
7133
7135 if needsincoming:
7134 if needsincoming:
7136 source, sbranch, sother, commoninc, incoming = getincoming()
7135 source, sbranch, sother, commoninc, incoming = getincoming()
7137 else:
7136 else:
7138 source = sbranch = sother = commoninc = incoming = None
7137 source = sbranch = sother = commoninc = incoming = None
7139
7138
7140 def getoutgoing():
7139 def getoutgoing():
7141 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7140 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7142 dbranch = branches[0]
7141 dbranch = branches[0]
7143 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7142 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7144 if source != dest:
7143 if source != dest:
7145 try:
7144 try:
7146 dother = hg.peer(repo, {}, dest)
7145 dother = hg.peer(repo, {}, dest)
7147 except error.RepoError:
7146 except error.RepoError:
7148 if opts.get(b'remote'):
7147 if opts.get(b'remote'):
7149 raise
7148 raise
7150 return dest, dbranch, None, None
7149 return dest, dbranch, None, None
7151 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7150 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7152 elif sother is None:
7151 elif sother is None:
7153 # there is no explicit destination peer, but source one is invalid
7152 # there is no explicit destination peer, but source one is invalid
7154 return dest, dbranch, None, None
7153 return dest, dbranch, None, None
7155 else:
7154 else:
7156 dother = sother
7155 dother = sother
7157 if source != dest or (sbranch is not None and sbranch != dbranch):
7156 if source != dest or (sbranch is not None and sbranch != dbranch):
7158 common = None
7157 common = None
7159 else:
7158 else:
7160 common = commoninc
7159 common = commoninc
7161 if revs:
7160 if revs:
7162 revs = [repo.lookup(rev) for rev in revs]
7161 revs = [repo.lookup(rev) for rev in revs]
7163 repo.ui.pushbuffer()
7162 repo.ui.pushbuffer()
7164 outgoing = discovery.findcommonoutgoing(
7163 outgoing = discovery.findcommonoutgoing(
7165 repo, dother, onlyheads=revs, commoninc=common
7164 repo, dother, onlyheads=revs, commoninc=common
7166 )
7165 )
7167 repo.ui.popbuffer()
7166 repo.ui.popbuffer()
7168 return dest, dbranch, dother, outgoing
7167 return dest, dbranch, dother, outgoing
7169
7168
7170 if needsoutgoing:
7169 if needsoutgoing:
7171 dest, dbranch, dother, outgoing = getoutgoing()
7170 dest, dbranch, dother, outgoing = getoutgoing()
7172 else:
7171 else:
7173 dest = dbranch = dother = outgoing = None
7172 dest = dbranch = dother = outgoing = None
7174
7173
7175 if opts.get(b'remote'):
7174 if opts.get(b'remote'):
7176 t = []
7175 t = []
7177 if incoming:
7176 if incoming:
7178 t.append(_(b'1 or more incoming'))
7177 t.append(_(b'1 or more incoming'))
7179 o = outgoing.missing
7178 o = outgoing.missing
7180 if o:
7179 if o:
7181 t.append(_(b'%d outgoing') % len(o))
7180 t.append(_(b'%d outgoing') % len(o))
7182 other = dother or sother
7181 other = dother or sother
7183 if b'bookmarks' in other.listkeys(b'namespaces'):
7182 if b'bookmarks' in other.listkeys(b'namespaces'):
7184 counts = bookmarks.summary(repo, other)
7183 counts = bookmarks.summary(repo, other)
7185 if counts[0] > 0:
7184 if counts[0] > 0:
7186 t.append(_(b'%d incoming bookmarks') % counts[0])
7185 t.append(_(b'%d incoming bookmarks') % counts[0])
7187 if counts[1] > 0:
7186 if counts[1] > 0:
7188 t.append(_(b'%d outgoing bookmarks') % counts[1])
7187 t.append(_(b'%d outgoing bookmarks') % counts[1])
7189
7188
7190 if t:
7189 if t:
7191 # i18n: column positioning for "hg summary"
7190 # i18n: column positioning for "hg summary"
7192 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7191 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7193 else:
7192 else:
7194 # i18n: column positioning for "hg summary"
7193 # i18n: column positioning for "hg summary"
7195 ui.status(_(b'remote: (synced)\n'))
7194 ui.status(_(b'remote: (synced)\n'))
7196
7195
7197 cmdutil.summaryremotehooks(
7196 cmdutil.summaryremotehooks(
7198 ui,
7197 ui,
7199 repo,
7198 repo,
7200 opts,
7199 opts,
7201 (
7200 (
7202 (source, sbranch, sother, commoninc),
7201 (source, sbranch, sother, commoninc),
7203 (dest, dbranch, dother, outgoing),
7202 (dest, dbranch, dother, outgoing),
7204 ),
7203 ),
7205 )
7204 )
7206
7205
7207
7206
7208 @command(
7207 @command(
7209 b'tag',
7208 b'tag',
7210 [
7209 [
7211 (b'f', b'force', None, _(b'force tag')),
7210 (b'f', b'force', None, _(b'force tag')),
7212 (b'l', b'local', None, _(b'make the tag local')),
7211 (b'l', b'local', None, _(b'make the tag local')),
7213 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7212 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7214 (b'', b'remove', None, _(b'remove a tag')),
7213 (b'', b'remove', None, _(b'remove a tag')),
7215 # -l/--local is already there, commitopts cannot be used
7214 # -l/--local is already there, commitopts cannot be used
7216 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7215 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7217 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7216 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7218 ]
7217 ]
7219 + commitopts2,
7218 + commitopts2,
7220 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7219 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7221 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7220 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7222 )
7221 )
7223 def tag(ui, repo, name1, *names, **opts):
7222 def tag(ui, repo, name1, *names, **opts):
7224 """add one or more tags for the current or given revision
7223 """add one or more tags for the current or given revision
7225
7224
7226 Name a particular revision using <name>.
7225 Name a particular revision using <name>.
7227
7226
7228 Tags are used to name particular revisions of the repository and are
7227 Tags are used to name particular revisions of the repository and are
7229 very useful to compare different revisions, to go back to significant
7228 very useful to compare different revisions, to go back to significant
7230 earlier versions or to mark branch points as releases, etc. Changing
7229 earlier versions or to mark branch points as releases, etc. Changing
7231 an existing tag is normally disallowed; use -f/--force to override.
7230 an existing tag is normally disallowed; use -f/--force to override.
7232
7231
7233 If no revision is given, the parent of the working directory is
7232 If no revision is given, the parent of the working directory is
7234 used.
7233 used.
7235
7234
7236 To facilitate version control, distribution, and merging of tags,
7235 To facilitate version control, distribution, and merging of tags,
7237 they are stored as a file named ".hgtags" which is managed similarly
7236 they are stored as a file named ".hgtags" which is managed similarly
7238 to other project files and can be hand-edited if necessary. This
7237 to other project files and can be hand-edited if necessary. This
7239 also means that tagging creates a new commit. The file
7238 also means that tagging creates a new commit. The file
7240 ".hg/localtags" is used for local tags (not shared among
7239 ".hg/localtags" is used for local tags (not shared among
7241 repositories).
7240 repositories).
7242
7241
7243 Tag commits are usually made at the head of a branch. If the parent
7242 Tag commits are usually made at the head of a branch. If the parent
7244 of the working directory is not a branch head, :hg:`tag` aborts; use
7243 of the working directory is not a branch head, :hg:`tag` aborts; use
7245 -f/--force to force the tag commit to be based on a non-head
7244 -f/--force to force the tag commit to be based on a non-head
7246 changeset.
7245 changeset.
7247
7246
7248 See :hg:`help dates` for a list of formats valid for -d/--date.
7247 See :hg:`help dates` for a list of formats valid for -d/--date.
7249
7248
7250 Since tag names have priority over branch names during revision
7249 Since tag names have priority over branch names during revision
7251 lookup, using an existing branch name as a tag name is discouraged.
7250 lookup, using an existing branch name as a tag name is discouraged.
7252
7251
7253 Returns 0 on success.
7252 Returns 0 on success.
7254 """
7253 """
7255 opts = pycompat.byteskwargs(opts)
7254 opts = pycompat.byteskwargs(opts)
7256 with repo.wlock(), repo.lock():
7255 with repo.wlock(), repo.lock():
7257 rev_ = b"."
7256 rev_ = b"."
7258 names = [t.strip() for t in (name1,) + names]
7257 names = [t.strip() for t in (name1,) + names]
7259 if len(names) != len(set(names)):
7258 if len(names) != len(set(names)):
7260 raise error.Abort(_(b'tag names must be unique'))
7259 raise error.Abort(_(b'tag names must be unique'))
7261 for n in names:
7260 for n in names:
7262 scmutil.checknewlabel(repo, n, b'tag')
7261 scmutil.checknewlabel(repo, n, b'tag')
7263 if not n:
7262 if not n:
7264 raise error.Abort(
7263 raise error.Abort(
7265 _(b'tag names cannot consist entirely of whitespace')
7264 _(b'tag names cannot consist entirely of whitespace')
7266 )
7265 )
7267 if opts.get(b'rev') and opts.get(b'remove'):
7266 if opts.get(b'rev') and opts.get(b'remove'):
7268 raise error.Abort(_(b"--rev and --remove are incompatible"))
7267 raise error.Abort(_(b"--rev and --remove are incompatible"))
7269 if opts.get(b'rev'):
7268 if opts.get(b'rev'):
7270 rev_ = opts[b'rev']
7269 rev_ = opts[b'rev']
7271 message = opts.get(b'message')
7270 message = opts.get(b'message')
7272 if opts.get(b'remove'):
7271 if opts.get(b'remove'):
7273 if opts.get(b'local'):
7272 if opts.get(b'local'):
7274 expectedtype = b'local'
7273 expectedtype = b'local'
7275 else:
7274 else:
7276 expectedtype = b'global'
7275 expectedtype = b'global'
7277
7276
7278 for n in names:
7277 for n in names:
7279 if repo.tagtype(n) == b'global':
7278 if repo.tagtype(n) == b'global':
7280 alltags = tagsmod.findglobaltags(ui, repo)
7279 alltags = tagsmod.findglobaltags(ui, repo)
7281 if alltags[n][0] == nullid:
7280 if alltags[n][0] == nullid:
7282 raise error.Abort(_(b"tag '%s' is already removed") % n)
7281 raise error.Abort(_(b"tag '%s' is already removed") % n)
7283 if not repo.tagtype(n):
7282 if not repo.tagtype(n):
7284 raise error.Abort(_(b"tag '%s' does not exist") % n)
7283 raise error.Abort(_(b"tag '%s' does not exist") % n)
7285 if repo.tagtype(n) != expectedtype:
7284 if repo.tagtype(n) != expectedtype:
7286 if expectedtype == b'global':
7285 if expectedtype == b'global':
7287 raise error.Abort(
7286 raise error.Abort(
7288 _(b"tag '%s' is not a global tag") % n
7287 _(b"tag '%s' is not a global tag") % n
7289 )
7288 )
7290 else:
7289 else:
7291 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7290 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7292 rev_ = b'null'
7291 rev_ = b'null'
7293 if not message:
7292 if not message:
7294 # we don't translate commit messages
7293 # we don't translate commit messages
7295 message = b'Removed tag %s' % b', '.join(names)
7294 message = b'Removed tag %s' % b', '.join(names)
7296 elif not opts.get(b'force'):
7295 elif not opts.get(b'force'):
7297 for n in names:
7296 for n in names:
7298 if n in repo.tags():
7297 if n in repo.tags():
7299 raise error.Abort(
7298 raise error.Abort(
7300 _(b"tag '%s' already exists (use -f to force)") % n
7299 _(b"tag '%s' already exists (use -f to force)") % n
7301 )
7300 )
7302 if not opts.get(b'local'):
7301 if not opts.get(b'local'):
7303 p1, p2 = repo.dirstate.parents()
7302 p1, p2 = repo.dirstate.parents()
7304 if p2 != nullid:
7303 if p2 != nullid:
7305 raise error.Abort(_(b'uncommitted merge'))
7304 raise error.Abort(_(b'uncommitted merge'))
7306 bheads = repo.branchheads()
7305 bheads = repo.branchheads()
7307 if not opts.get(b'force') and bheads and p1 not in bheads:
7306 if not opts.get(b'force') and bheads and p1 not in bheads:
7308 raise error.Abort(
7307 raise error.Abort(
7309 _(
7308 _(
7310 b'working directory is not at a branch head '
7309 b'working directory is not at a branch head '
7311 b'(use -f to force)'
7310 b'(use -f to force)'
7312 )
7311 )
7313 )
7312 )
7314 node = scmutil.revsingle(repo, rev_).node()
7313 node = scmutil.revsingle(repo, rev_).node()
7315
7314
7316 if not message:
7315 if not message:
7317 # we don't translate commit messages
7316 # we don't translate commit messages
7318 message = b'Added tag %s for changeset %s' % (
7317 message = b'Added tag %s for changeset %s' % (
7319 b', '.join(names),
7318 b', '.join(names),
7320 short(node),
7319 short(node),
7321 )
7320 )
7322
7321
7323 date = opts.get(b'date')
7322 date = opts.get(b'date')
7324 if date:
7323 if date:
7325 date = dateutil.parsedate(date)
7324 date = dateutil.parsedate(date)
7326
7325
7327 if opts.get(b'remove'):
7326 if opts.get(b'remove'):
7328 editform = b'tag.remove'
7327 editform = b'tag.remove'
7329 else:
7328 else:
7330 editform = b'tag.add'
7329 editform = b'tag.add'
7331 editor = cmdutil.getcommiteditor(
7330 editor = cmdutil.getcommiteditor(
7332 editform=editform, **pycompat.strkwargs(opts)
7331 editform=editform, **pycompat.strkwargs(opts)
7333 )
7332 )
7334
7333
7335 # don't allow tagging the null rev
7334 # don't allow tagging the null rev
7336 if (
7335 if (
7337 not opts.get(b'remove')
7336 not opts.get(b'remove')
7338 and scmutil.revsingle(repo, rev_).rev() == nullrev
7337 and scmutil.revsingle(repo, rev_).rev() == nullrev
7339 ):
7338 ):
7340 raise error.Abort(_(b"cannot tag null revision"))
7339 raise error.Abort(_(b"cannot tag null revision"))
7341
7340
7342 tagsmod.tag(
7341 tagsmod.tag(
7343 repo,
7342 repo,
7344 names,
7343 names,
7345 node,
7344 node,
7346 message,
7345 message,
7347 opts.get(b'local'),
7346 opts.get(b'local'),
7348 opts.get(b'user'),
7347 opts.get(b'user'),
7349 date,
7348 date,
7350 editor=editor,
7349 editor=editor,
7351 )
7350 )
7352
7351
7353
7352
7354 @command(
7353 @command(
7355 b'tags',
7354 b'tags',
7356 formatteropts,
7355 formatteropts,
7357 b'',
7356 b'',
7358 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7359 intents={INTENT_READONLY},
7358 intents={INTENT_READONLY},
7360 )
7359 )
7361 def tags(ui, repo, **opts):
7360 def tags(ui, repo, **opts):
7362 """list repository tags
7361 """list repository tags
7363
7362
7364 This lists both regular and local tags. When the -v/--verbose
7363 This lists both regular and local tags. When the -v/--verbose
7365 switch is used, a third column "local" is printed for local tags.
7364 switch is used, a third column "local" is printed for local tags.
7366 When the -q/--quiet switch is used, only the tag name is printed.
7365 When the -q/--quiet switch is used, only the tag name is printed.
7367
7366
7368 .. container:: verbose
7367 .. container:: verbose
7369
7368
7370 Template:
7369 Template:
7371
7370
7372 The following keywords are supported in addition to the common template
7371 The following keywords are supported in addition to the common template
7373 keywords and functions such as ``{tag}``. See also
7372 keywords and functions such as ``{tag}``. See also
7374 :hg:`help templates`.
7373 :hg:`help templates`.
7375
7374
7376 :type: String. ``local`` for local tags.
7375 :type: String. ``local`` for local tags.
7377
7376
7378 Returns 0 on success.
7377 Returns 0 on success.
7379 """
7378 """
7380
7379
7381 opts = pycompat.byteskwargs(opts)
7380 opts = pycompat.byteskwargs(opts)
7382 ui.pager(b'tags')
7381 ui.pager(b'tags')
7383 fm = ui.formatter(b'tags', opts)
7382 fm = ui.formatter(b'tags', opts)
7384 hexfunc = fm.hexfunc
7383 hexfunc = fm.hexfunc
7385
7384
7386 for t, n in reversed(repo.tagslist()):
7385 for t, n in reversed(repo.tagslist()):
7387 hn = hexfunc(n)
7386 hn = hexfunc(n)
7388 label = b'tags.normal'
7387 label = b'tags.normal'
7389 tagtype = b''
7388 tagtype = b''
7390 if repo.tagtype(t) == b'local':
7389 if repo.tagtype(t) == b'local':
7391 label = b'tags.local'
7390 label = b'tags.local'
7392 tagtype = b'local'
7391 tagtype = b'local'
7393
7392
7394 fm.startitem()
7393 fm.startitem()
7395 fm.context(repo=repo)
7394 fm.context(repo=repo)
7396 fm.write(b'tag', b'%s', t, label=label)
7395 fm.write(b'tag', b'%s', t, label=label)
7397 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7396 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7398 fm.condwrite(
7397 fm.condwrite(
7399 not ui.quiet,
7398 not ui.quiet,
7400 b'rev node',
7399 b'rev node',
7401 fmt,
7400 fmt,
7402 repo.changelog.rev(n),
7401 repo.changelog.rev(n),
7403 hn,
7402 hn,
7404 label=label,
7403 label=label,
7405 )
7404 )
7406 fm.condwrite(
7405 fm.condwrite(
7407 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7406 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7408 )
7407 )
7409 fm.plain(b'\n')
7408 fm.plain(b'\n')
7410 fm.end()
7409 fm.end()
7411
7410
7412
7411
7413 @command(
7412 @command(
7414 b'tip',
7413 b'tip',
7415 [
7414 [
7416 (b'p', b'patch', None, _(b'show patch')),
7415 (b'p', b'patch', None, _(b'show patch')),
7417 (b'g', b'git', None, _(b'use git extended diff format')),
7416 (b'g', b'git', None, _(b'use git extended diff format')),
7418 ]
7417 ]
7419 + templateopts,
7418 + templateopts,
7420 _(b'[-p] [-g]'),
7419 _(b'[-p] [-g]'),
7421 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7420 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7422 )
7421 )
7423 def tip(ui, repo, **opts):
7422 def tip(ui, repo, **opts):
7424 """show the tip revision (DEPRECATED)
7423 """show the tip revision (DEPRECATED)
7425
7424
7426 The tip revision (usually just called the tip) is the changeset
7425 The tip revision (usually just called the tip) is the changeset
7427 most recently added to the repository (and therefore the most
7426 most recently added to the repository (and therefore the most
7428 recently changed head).
7427 recently changed head).
7429
7428
7430 If you have just made a commit, that commit will be the tip. If
7429 If you have just made a commit, that commit will be the tip. If
7431 you have just pulled changes from another repository, the tip of
7430 you have just pulled changes from another repository, the tip of
7432 that repository becomes the current tip. The "tip" tag is special
7431 that repository becomes the current tip. The "tip" tag is special
7433 and cannot be renamed or assigned to a different changeset.
7432 and cannot be renamed or assigned to a different changeset.
7434
7433
7435 This command is deprecated, please use :hg:`heads` instead.
7434 This command is deprecated, please use :hg:`heads` instead.
7436
7435
7437 Returns 0 on success.
7436 Returns 0 on success.
7438 """
7437 """
7439 opts = pycompat.byteskwargs(opts)
7438 opts = pycompat.byteskwargs(opts)
7440 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7439 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7441 displayer.show(repo[b'tip'])
7440 displayer.show(repo[b'tip'])
7442 displayer.close()
7441 displayer.close()
7443
7442
7444
7443
7445 @command(
7444 @command(
7446 b'unbundle',
7445 b'unbundle',
7447 [
7446 [
7448 (
7447 (
7449 b'u',
7448 b'u',
7450 b'update',
7449 b'update',
7451 None,
7450 None,
7452 _(b'update to new branch head if changesets were unbundled'),
7451 _(b'update to new branch head if changesets were unbundled'),
7453 )
7452 )
7454 ],
7453 ],
7455 _(b'[-u] FILE...'),
7454 _(b'[-u] FILE...'),
7456 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7455 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7457 )
7456 )
7458 def unbundle(ui, repo, fname1, *fnames, **opts):
7457 def unbundle(ui, repo, fname1, *fnames, **opts):
7459 """apply one or more bundle files
7458 """apply one or more bundle files
7460
7459
7461 Apply one or more bundle files generated by :hg:`bundle`.
7460 Apply one or more bundle files generated by :hg:`bundle`.
7462
7461
7463 Returns 0 on success, 1 if an update has unresolved files.
7462 Returns 0 on success, 1 if an update has unresolved files.
7464 """
7463 """
7465 fnames = (fname1,) + fnames
7464 fnames = (fname1,) + fnames
7466
7465
7467 with repo.lock():
7466 with repo.lock():
7468 for fname in fnames:
7467 for fname in fnames:
7469 f = hg.openpath(ui, fname)
7468 f = hg.openpath(ui, fname)
7470 gen = exchange.readbundle(ui, f, fname)
7469 gen = exchange.readbundle(ui, f, fname)
7471 if isinstance(gen, streamclone.streamcloneapplier):
7470 if isinstance(gen, streamclone.streamcloneapplier):
7472 raise error.Abort(
7471 raise error.Abort(
7473 _(
7472 _(
7474 b'packed bundles cannot be applied with '
7473 b'packed bundles cannot be applied with '
7475 b'"hg unbundle"'
7474 b'"hg unbundle"'
7476 ),
7475 ),
7477 hint=_(b'use "hg debugapplystreamclonebundle"'),
7476 hint=_(b'use "hg debugapplystreamclonebundle"'),
7478 )
7477 )
7479 url = b'bundle:' + fname
7478 url = b'bundle:' + fname
7480 try:
7479 try:
7481 txnname = b'unbundle'
7480 txnname = b'unbundle'
7482 if not isinstance(gen, bundle2.unbundle20):
7481 if not isinstance(gen, bundle2.unbundle20):
7483 txnname = b'unbundle\n%s' % util.hidepassword(url)
7482 txnname = b'unbundle\n%s' % util.hidepassword(url)
7484 with repo.transaction(txnname) as tr:
7483 with repo.transaction(txnname) as tr:
7485 op = bundle2.applybundle(
7484 op = bundle2.applybundle(
7486 repo, gen, tr, source=b'unbundle', url=url
7485 repo, gen, tr, source=b'unbundle', url=url
7487 )
7486 )
7488 except error.BundleUnknownFeatureError as exc:
7487 except error.BundleUnknownFeatureError as exc:
7489 raise error.Abort(
7488 raise error.Abort(
7490 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7489 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7491 hint=_(
7490 hint=_(
7492 b"see https://mercurial-scm.org/"
7491 b"see https://mercurial-scm.org/"
7493 b"wiki/BundleFeature for more "
7492 b"wiki/BundleFeature for more "
7494 b"information"
7493 b"information"
7495 ),
7494 ),
7496 )
7495 )
7497 modheads = bundle2.combinechangegroupresults(op)
7496 modheads = bundle2.combinechangegroupresults(op)
7498
7497
7499 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7498 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7500
7499
7501
7500
7502 @command(
7501 @command(
7503 b'unshelve',
7502 b'unshelve',
7504 [
7503 [
7505 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7504 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7506 (
7505 (
7507 b'c',
7506 b'c',
7508 b'continue',
7507 b'continue',
7509 None,
7508 None,
7510 _(b'continue an incomplete unshelve operation'),
7509 _(b'continue an incomplete unshelve operation'),
7511 ),
7510 ),
7512 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7511 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7513 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7512 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7514 (
7513 (
7515 b'n',
7514 b'n',
7516 b'name',
7515 b'name',
7517 b'',
7516 b'',
7518 _(b'restore shelved change with given name'),
7517 _(b'restore shelved change with given name'),
7519 _(b'NAME'),
7518 _(b'NAME'),
7520 ),
7519 ),
7521 (b't', b'tool', b'', _(b'specify merge tool')),
7520 (b't', b'tool', b'', _(b'specify merge tool')),
7522 (
7521 (
7523 b'',
7522 b'',
7524 b'date',
7523 b'date',
7525 b'',
7524 b'',
7526 _(b'set date for temporary commits (DEPRECATED)'),
7525 _(b'set date for temporary commits (DEPRECATED)'),
7527 _(b'DATE'),
7526 _(b'DATE'),
7528 ),
7527 ),
7529 ],
7528 ],
7530 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7529 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7531 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7530 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7532 )
7531 )
7533 def unshelve(ui, repo, *shelved, **opts):
7532 def unshelve(ui, repo, *shelved, **opts):
7534 """restore a shelved change to the working directory
7533 """restore a shelved change to the working directory
7535
7534
7536 This command accepts an optional name of a shelved change to
7535 This command accepts an optional name of a shelved change to
7537 restore. If none is given, the most recent shelved change is used.
7536 restore. If none is given, the most recent shelved change is used.
7538
7537
7539 If a shelved change is applied successfully, the bundle that
7538 If a shelved change is applied successfully, the bundle that
7540 contains the shelved changes is moved to a backup location
7539 contains the shelved changes is moved to a backup location
7541 (.hg/shelve-backup).
7540 (.hg/shelve-backup).
7542
7541
7543 Since you can restore a shelved change on top of an arbitrary
7542 Since you can restore a shelved change on top of an arbitrary
7544 commit, it is possible that unshelving will result in a conflict
7543 commit, it is possible that unshelving will result in a conflict
7545 between your changes and the commits you are unshelving onto. If
7544 between your changes and the commits you are unshelving onto. If
7546 this occurs, you must resolve the conflict, then use
7545 this occurs, you must resolve the conflict, then use
7547 ``--continue`` to complete the unshelve operation. (The bundle
7546 ``--continue`` to complete the unshelve operation. (The bundle
7548 will not be moved until you successfully complete the unshelve.)
7547 will not be moved until you successfully complete the unshelve.)
7549
7548
7550 (Alternatively, you can use ``--abort`` to abandon an unshelve
7549 (Alternatively, you can use ``--abort`` to abandon an unshelve
7551 that causes a conflict. This reverts the unshelved changes, and
7550 that causes a conflict. This reverts the unshelved changes, and
7552 leaves the bundle in place.)
7551 leaves the bundle in place.)
7553
7552
7554 If bare shelved change (without interactive, include and exclude
7553 If bare shelved change (without interactive, include and exclude
7555 option) was done on newly created branch it would restore branch
7554 option) was done on newly created branch it would restore branch
7556 information to the working directory.
7555 information to the working directory.
7557
7556
7558 After a successful unshelve, the shelved changes are stored in a
7557 After a successful unshelve, the shelved changes are stored in a
7559 backup directory. Only the N most recent backups are kept. N
7558 backup directory. Only the N most recent backups are kept. N
7560 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7559 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7561 configuration option.
7560 configuration option.
7562
7561
7563 .. container:: verbose
7562 .. container:: verbose
7564
7563
7565 Timestamp in seconds is used to decide order of backups. More
7564 Timestamp in seconds is used to decide order of backups. More
7566 than ``maxbackups`` backups are kept, if same timestamp
7565 than ``maxbackups`` backups are kept, if same timestamp
7567 prevents from deciding exact order of them, for safety.
7566 prevents from deciding exact order of them, for safety.
7568
7567
7569 Selected changes can be unshelved with ``--interactive`` flag.
7568 Selected changes can be unshelved with ``--interactive`` flag.
7570 The working directory is updated with the selected changes, and
7569 The working directory is updated with the selected changes, and
7571 only the unselected changes remain shelved.
7570 only the unselected changes remain shelved.
7572 Note: The whole shelve is applied to working directory first before
7571 Note: The whole shelve is applied to working directory first before
7573 running interactively. So, this will bring up all the conflicts between
7572 running interactively. So, this will bring up all the conflicts between
7574 working directory and the shelve, irrespective of which changes will be
7573 working directory and the shelve, irrespective of which changes will be
7575 unshelved.
7574 unshelved.
7576 """
7575 """
7577 with repo.wlock():
7576 with repo.wlock():
7578 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7577 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7579
7578
7580
7579
7581 statemod.addunfinished(
7580 statemod.addunfinished(
7582 b'unshelve',
7581 b'unshelve',
7583 fname=b'shelvedstate',
7582 fname=b'shelvedstate',
7584 continueflag=True,
7583 continueflag=True,
7585 abortfunc=shelvemod.hgabortunshelve,
7584 abortfunc=shelvemod.hgabortunshelve,
7586 continuefunc=shelvemod.hgcontinueunshelve,
7585 continuefunc=shelvemod.hgcontinueunshelve,
7587 cmdmsg=_(b'unshelve already in progress'),
7586 cmdmsg=_(b'unshelve already in progress'),
7588 )
7587 )
7589
7588
7590
7589
7591 @command(
7590 @command(
7592 b'update|up|checkout|co',
7591 b'update|up|checkout|co',
7593 [
7592 [
7594 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7593 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7595 (b'c', b'check', None, _(b'require clean working directory')),
7594 (b'c', b'check', None, _(b'require clean working directory')),
7596 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7595 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7597 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7596 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7598 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7597 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7599 ]
7598 ]
7600 + mergetoolopts,
7599 + mergetoolopts,
7601 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7600 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7602 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7601 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7603 helpbasic=True,
7602 helpbasic=True,
7604 )
7603 )
7605 def update(ui, repo, node=None, **opts):
7604 def update(ui, repo, node=None, **opts):
7606 """update working directory (or switch revisions)
7605 """update working directory (or switch revisions)
7607
7606
7608 Update the repository's working directory to the specified
7607 Update the repository's working directory to the specified
7609 changeset. If no changeset is specified, update to the tip of the
7608 changeset. If no changeset is specified, update to the tip of the
7610 current named branch and move the active bookmark (see :hg:`help
7609 current named branch and move the active bookmark (see :hg:`help
7611 bookmarks`).
7610 bookmarks`).
7612
7611
7613 Update sets the working directory's parent revision to the specified
7612 Update sets the working directory's parent revision to the specified
7614 changeset (see :hg:`help parents`).
7613 changeset (see :hg:`help parents`).
7615
7614
7616 If the changeset is not a descendant or ancestor of the working
7615 If the changeset is not a descendant or ancestor of the working
7617 directory's parent and there are uncommitted changes, the update is
7616 directory's parent and there are uncommitted changes, the update is
7618 aborted. With the -c/--check option, the working directory is checked
7617 aborted. With the -c/--check option, the working directory is checked
7619 for uncommitted changes; if none are found, the working directory is
7618 for uncommitted changes; if none are found, the working directory is
7620 updated to the specified changeset.
7619 updated to the specified changeset.
7621
7620
7622 .. container:: verbose
7621 .. container:: verbose
7623
7622
7624 The -C/--clean, -c/--check, and -m/--merge options control what
7623 The -C/--clean, -c/--check, and -m/--merge options control what
7625 happens if the working directory contains uncommitted changes.
7624 happens if the working directory contains uncommitted changes.
7626 At most of one of them can be specified.
7625 At most of one of them can be specified.
7627
7626
7628 1. If no option is specified, and if
7627 1. If no option is specified, and if
7629 the requested changeset is an ancestor or descendant of
7628 the requested changeset is an ancestor or descendant of
7630 the working directory's parent, the uncommitted changes
7629 the working directory's parent, the uncommitted changes
7631 are merged into the requested changeset and the merged
7630 are merged into the requested changeset and the merged
7632 result is left uncommitted. If the requested changeset is
7631 result is left uncommitted. If the requested changeset is
7633 not an ancestor or descendant (that is, it is on another
7632 not an ancestor or descendant (that is, it is on another
7634 branch), the update is aborted and the uncommitted changes
7633 branch), the update is aborted and the uncommitted changes
7635 are preserved.
7634 are preserved.
7636
7635
7637 2. With the -m/--merge option, the update is allowed even if the
7636 2. With the -m/--merge option, the update is allowed even if the
7638 requested changeset is not an ancestor or descendant of
7637 requested changeset is not an ancestor or descendant of
7639 the working directory's parent.
7638 the working directory's parent.
7640
7639
7641 3. With the -c/--check option, the update is aborted and the
7640 3. With the -c/--check option, the update is aborted and the
7642 uncommitted changes are preserved.
7641 uncommitted changes are preserved.
7643
7642
7644 4. With the -C/--clean option, uncommitted changes are discarded and
7643 4. With the -C/--clean option, uncommitted changes are discarded and
7645 the working directory is updated to the requested changeset.
7644 the working directory is updated to the requested changeset.
7646
7645
7647 To cancel an uncommitted merge (and lose your changes), use
7646 To cancel an uncommitted merge (and lose your changes), use
7648 :hg:`merge --abort`.
7647 :hg:`merge --abort`.
7649
7648
7650 Use null as the changeset to remove the working directory (like
7649 Use null as the changeset to remove the working directory (like
7651 :hg:`clone -U`).
7650 :hg:`clone -U`).
7652
7651
7653 If you want to revert just one file to an older revision, use
7652 If you want to revert just one file to an older revision, use
7654 :hg:`revert [-r REV] NAME`.
7653 :hg:`revert [-r REV] NAME`.
7655
7654
7656 See :hg:`help dates` for a list of formats valid for -d/--date.
7655 See :hg:`help dates` for a list of formats valid for -d/--date.
7657
7656
7658 Returns 0 on success, 1 if there are unresolved files.
7657 Returns 0 on success, 1 if there are unresolved files.
7659 """
7658 """
7660 rev = opts.get('rev')
7659 rev = opts.get('rev')
7661 date = opts.get('date')
7660 date = opts.get('date')
7662 clean = opts.get('clean')
7661 clean = opts.get('clean')
7663 check = opts.get('check')
7662 check = opts.get('check')
7664 merge = opts.get('merge')
7663 merge = opts.get('merge')
7665 if rev and node:
7664 if rev and node:
7666 raise error.Abort(_(b"please specify just one revision"))
7665 raise error.Abort(_(b"please specify just one revision"))
7667
7666
7668 if ui.configbool(b'commands', b'update.requiredest'):
7667 if ui.configbool(b'commands', b'update.requiredest'):
7669 if not node and not rev and not date:
7668 if not node and not rev and not date:
7670 raise error.Abort(
7669 raise error.Abort(
7671 _(b'you must specify a destination'),
7670 _(b'you must specify a destination'),
7672 hint=_(b'for example: hg update ".::"'),
7671 hint=_(b'for example: hg update ".::"'),
7673 )
7672 )
7674
7673
7675 if rev is None or rev == b'':
7674 if rev is None or rev == b'':
7676 rev = node
7675 rev = node
7677
7676
7678 if date and rev is not None:
7677 if date and rev is not None:
7679 raise error.Abort(_(b"you can't specify a revision and a date"))
7678 raise error.Abort(_(b"you can't specify a revision and a date"))
7680
7679
7681 if len([x for x in (clean, check, merge) if x]) > 1:
7680 if len([x for x in (clean, check, merge) if x]) > 1:
7682 raise error.Abort(
7681 raise error.Abort(
7683 _(
7682 _(
7684 b"can only specify one of -C/--clean, -c/--check, "
7683 b"can only specify one of -C/--clean, -c/--check, "
7685 b"or -m/--merge"
7684 b"or -m/--merge"
7686 )
7685 )
7687 )
7686 )
7688
7687
7689 updatecheck = None
7688 updatecheck = None
7690 if check:
7689 if check:
7691 updatecheck = b'abort'
7690 updatecheck = b'abort'
7692 elif merge:
7691 elif merge:
7693 updatecheck = b'none'
7692 updatecheck = b'none'
7694
7693
7695 with repo.wlock():
7694 with repo.wlock():
7696 cmdutil.clearunfinished(repo)
7695 cmdutil.clearunfinished(repo)
7697 if date:
7696 if date:
7698 rev = cmdutil.finddate(ui, repo, date)
7697 rev = cmdutil.finddate(ui, repo, date)
7699
7698
7700 # if we defined a bookmark, we have to remember the original name
7699 # if we defined a bookmark, we have to remember the original name
7701 brev = rev
7700 brev = rev
7702 if rev:
7701 if rev:
7703 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7702 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7704 ctx = scmutil.revsingle(repo, rev, default=None)
7703 ctx = scmutil.revsingle(repo, rev, default=None)
7705 rev = ctx.rev()
7704 rev = ctx.rev()
7706 hidden = ctx.hidden()
7705 hidden = ctx.hidden()
7707 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7706 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7708 with ui.configoverride(overrides, b'update'):
7707 with ui.configoverride(overrides, b'update'):
7709 ret = hg.updatetotally(
7708 ret = hg.updatetotally(
7710 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7709 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7711 )
7710 )
7712 if hidden:
7711 if hidden:
7713 ctxstr = ctx.hex()[:12]
7712 ctxstr = ctx.hex()[:12]
7714 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7713 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7715
7714
7716 if ctx.obsolete():
7715 if ctx.obsolete():
7717 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7716 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7718 ui.warn(b"(%s)\n" % obsfatemsg)
7717 ui.warn(b"(%s)\n" % obsfatemsg)
7719 return ret
7718 return ret
7720
7719
7721
7720
7722 @command(
7721 @command(
7723 b'verify',
7722 b'verify',
7724 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7723 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7725 helpcategory=command.CATEGORY_MAINTENANCE,
7724 helpcategory=command.CATEGORY_MAINTENANCE,
7726 )
7725 )
7727 def verify(ui, repo, **opts):
7726 def verify(ui, repo, **opts):
7728 """verify the integrity of the repository
7727 """verify the integrity of the repository
7729
7728
7730 Verify the integrity of the current repository.
7729 Verify the integrity of the current repository.
7731
7730
7732 This will perform an extensive check of the repository's
7731 This will perform an extensive check of the repository's
7733 integrity, validating the hashes and checksums of each entry in
7732 integrity, validating the hashes and checksums of each entry in
7734 the changelog, manifest, and tracked files, as well as the
7733 the changelog, manifest, and tracked files, as well as the
7735 integrity of their crosslinks and indices.
7734 integrity of their crosslinks and indices.
7736
7735
7737 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7736 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7738 for more information about recovery from corruption of the
7737 for more information about recovery from corruption of the
7739 repository.
7738 repository.
7740
7739
7741 Returns 0 on success, 1 if errors are encountered.
7740 Returns 0 on success, 1 if errors are encountered.
7742 """
7741 """
7743 opts = pycompat.byteskwargs(opts)
7742 opts = pycompat.byteskwargs(opts)
7744
7743
7745 level = None
7744 level = None
7746 if opts[b'full']:
7745 if opts[b'full']:
7747 level = verifymod.VERIFY_FULL
7746 level = verifymod.VERIFY_FULL
7748 return hg.verify(repo, level)
7747 return hg.verify(repo, level)
7749
7748
7750
7749
7751 @command(
7750 @command(
7752 b'version',
7751 b'version',
7753 [] + formatteropts,
7752 [] + formatteropts,
7754 helpcategory=command.CATEGORY_HELP,
7753 helpcategory=command.CATEGORY_HELP,
7755 norepo=True,
7754 norepo=True,
7756 intents={INTENT_READONLY},
7755 intents={INTENT_READONLY},
7757 )
7756 )
7758 def version_(ui, **opts):
7757 def version_(ui, **opts):
7759 """output version and copyright information
7758 """output version and copyright information
7760
7759
7761 .. container:: verbose
7760 .. container:: verbose
7762
7761
7763 Template:
7762 Template:
7764
7763
7765 The following keywords are supported. See also :hg:`help templates`.
7764 The following keywords are supported. See also :hg:`help templates`.
7766
7765
7767 :extensions: List of extensions.
7766 :extensions: List of extensions.
7768 :ver: String. Version number.
7767 :ver: String. Version number.
7769
7768
7770 And each entry of ``{extensions}`` provides the following sub-keywords
7769 And each entry of ``{extensions}`` provides the following sub-keywords
7771 in addition to ``{ver}``.
7770 in addition to ``{ver}``.
7772
7771
7773 :bundled: Boolean. True if included in the release.
7772 :bundled: Boolean. True if included in the release.
7774 :name: String. Extension name.
7773 :name: String. Extension name.
7775 """
7774 """
7776 opts = pycompat.byteskwargs(opts)
7775 opts = pycompat.byteskwargs(opts)
7777 if ui.verbose:
7776 if ui.verbose:
7778 ui.pager(b'version')
7777 ui.pager(b'version')
7779 fm = ui.formatter(b"version", opts)
7778 fm = ui.formatter(b"version", opts)
7780 fm.startitem()
7779 fm.startitem()
7781 fm.write(
7780 fm.write(
7782 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7781 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7783 )
7782 )
7784 license = _(
7783 license = _(
7785 b"(see https://mercurial-scm.org for more information)\n"
7784 b"(see https://mercurial-scm.org for more information)\n"
7786 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7785 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7787 b"This is free software; see the source for copying conditions. "
7786 b"This is free software; see the source for copying conditions. "
7788 b"There is NO\nwarranty; "
7787 b"There is NO\nwarranty; "
7789 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7788 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7790 )
7789 )
7791 if not ui.quiet:
7790 if not ui.quiet:
7792 fm.plain(license)
7791 fm.plain(license)
7793
7792
7794 if ui.verbose:
7793 if ui.verbose:
7795 fm.plain(_(b"\nEnabled extensions:\n\n"))
7794 fm.plain(_(b"\nEnabled extensions:\n\n"))
7796 # format names and versions into columns
7795 # format names and versions into columns
7797 names = []
7796 names = []
7798 vers = []
7797 vers = []
7799 isinternals = []
7798 isinternals = []
7800 for name, module in extensions.extensions():
7799 for name, module in extensions.extensions():
7801 names.append(name)
7800 names.append(name)
7802 vers.append(extensions.moduleversion(module) or None)
7801 vers.append(extensions.moduleversion(module) or None)
7803 isinternals.append(extensions.ismoduleinternal(module))
7802 isinternals.append(extensions.ismoduleinternal(module))
7804 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7803 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7805 if names:
7804 if names:
7806 namefmt = b" %%-%ds " % max(len(n) for n in names)
7805 namefmt = b" %%-%ds " % max(len(n) for n in names)
7807 places = [_(b"external"), _(b"internal")]
7806 places = [_(b"external"), _(b"internal")]
7808 for n, v, p in zip(names, vers, isinternals):
7807 for n, v, p in zip(names, vers, isinternals):
7809 fn.startitem()
7808 fn.startitem()
7810 fn.condwrite(ui.verbose, b"name", namefmt, n)
7809 fn.condwrite(ui.verbose, b"name", namefmt, n)
7811 if ui.verbose:
7810 if ui.verbose:
7812 fn.plain(b"%s " % places[p])
7811 fn.plain(b"%s " % places[p])
7813 fn.data(bundled=p)
7812 fn.data(bundled=p)
7814 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7813 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7815 if ui.verbose:
7814 if ui.verbose:
7816 fn.plain(b"\n")
7815 fn.plain(b"\n")
7817 fn.end()
7816 fn.end()
7818 fm.end()
7817 fm.end()
7819
7818
7820
7819
7821 def loadcmdtable(ui, name, cmdtable):
7820 def loadcmdtable(ui, name, cmdtable):
7822 """Load command functions from specified cmdtable
7821 """Load command functions from specified cmdtable
7823 """
7822 """
7824 overrides = [cmd for cmd in cmdtable if cmd in table]
7823 overrides = [cmd for cmd in cmdtable if cmd in table]
7825 if overrides:
7824 if overrides:
7826 ui.warn(
7825 ui.warn(
7827 _(b"extension '%s' overrides commands: %s\n")
7826 _(b"extension '%s' overrides commands: %s\n")
7828 % (name, b" ".join(overrides))
7827 % (name, b" ".join(overrides))
7829 )
7828 )
7830 table.update(cmdtable)
7829 table.update(cmdtable)
@@ -1,1257 +1,1257 b''
1
1
2 $ hg init repo
2 $ hg init repo
3 $ cd repo
3 $ cd repo
4
4
5 $ cat > $TESTTMP/hook.sh <<'EOF'
5 $ cat > $TESTTMP/hook.sh <<'EOF'
6 > echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"
6 > echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"
7 > EOF
7 > EOF
8 $ TESTHOOK="hooks.txnclose-bookmark.test=sh $TESTTMP/hook.sh"
8 $ TESTHOOK="hooks.txnclose-bookmark.test=sh $TESTTMP/hook.sh"
9
9
10 no bookmarks
10 no bookmarks
11
11
12 $ hg bookmarks
12 $ hg bookmarks
13 no bookmarks set
13 no bookmarks set
14
14
15 $ hg bookmarks -Tjson
15 $ hg bookmarks -Tjson
16 [
16 [
17 ]
17 ]
18
18
19 bookmark rev -1
19 bookmark rev -1
20
20
21 $ hg bookmark X --config "$TESTHOOK"
21 $ hg bookmark X --config "$TESTHOOK"
22 test-hook-bookmark: X: -> 0000000000000000000000000000000000000000
22 test-hook-bookmark: X: -> 0000000000000000000000000000000000000000
23
23
24 list bookmarks
24 list bookmarks
25
25
26 $ hg bookmarks
26 $ hg bookmarks
27 * X -1:000000000000
27 * X -1:000000000000
28
28
29 list bookmarks with color
29 list bookmarks with color
30
30
31 $ hg --config extensions.color= --config color.mode=ansi \
31 $ hg --config extensions.color= --config color.mode=ansi \
32 > bookmarks --color=always
32 > bookmarks --color=always
33 \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
33 \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
34
34
35 $ echo a > a
35 $ echo a > a
36 $ hg add a
36 $ hg add a
37 $ hg commit -m 0 --config "$TESTHOOK"
37 $ hg commit -m 0 --config "$TESTHOOK"
38 test-hook-bookmark: X: 0000000000000000000000000000000000000000 -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
38 test-hook-bookmark: X: 0000000000000000000000000000000000000000 -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
39
39
40 bookmark X moved to rev 0
40 bookmark X moved to rev 0
41
41
42 $ hg bookmarks
42 $ hg bookmarks
43 * X 0:f7b1eb17ad24
43 * X 0:f7b1eb17ad24
44
44
45 look up bookmark
45 look up bookmark
46
46
47 $ hg log -r X
47 $ hg log -r X
48 changeset: 0:f7b1eb17ad24
48 changeset: 0:f7b1eb17ad24
49 bookmark: X
49 bookmark: X
50 tag: tip
50 tag: tip
51 user: test
51 user: test
52 date: Thu Jan 01 00:00:00 1970 +0000
52 date: Thu Jan 01 00:00:00 1970 +0000
53 summary: 0
53 summary: 0
54
54
55
55
56 second bookmark for rev 0, command should work even with ui.strict on
56 second bookmark for rev 0, command should work even with ui.strict on
57
57
58 $ hg --config ui.strict=1 bookmark X2 --config "$TESTHOOK"
58 $ hg --config ui.strict=1 bookmark X2 --config "$TESTHOOK"
59 test-hook-bookmark: X2: -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
59 test-hook-bookmark: X2: -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
60
60
61 bookmark rev -1 again
61 bookmark rev -1 again
62
62
63 $ hg bookmark -r null Y
63 $ hg bookmark -r null Y
64
64
65 list bookmarks
65 list bookmarks
66
66
67 $ hg bookmarks
67 $ hg bookmarks
68 X 0:f7b1eb17ad24
68 X 0:f7b1eb17ad24
69 * X2 0:f7b1eb17ad24
69 * X2 0:f7b1eb17ad24
70 Y -1:000000000000
70 Y -1:000000000000
71 $ hg bookmarks -l
71 $ hg bookmarks -l
72 X 0:f7b1eb17ad24
72 X 0:f7b1eb17ad24
73 * X2 0:f7b1eb17ad24
73 * X2 0:f7b1eb17ad24
74 Y -1:000000000000
74 Y -1:000000000000
75 $ hg bookmarks -l X Y
75 $ hg bookmarks -l X Y
76 X 0:f7b1eb17ad24
76 X 0:f7b1eb17ad24
77 Y -1:000000000000
77 Y -1:000000000000
78 $ hg bookmarks -l .
78 $ hg bookmarks -l .
79 * X2 0:f7b1eb17ad24
79 * X2 0:f7b1eb17ad24
80 $ hg bookmarks -l X A Y
80 $ hg bookmarks -l X A Y
81 abort: bookmark 'A' does not exist
81 abort: bookmark 'A' does not exist
82 [255]
82 [255]
83 $ hg bookmarks -l -r0
83 $ hg bookmarks -l -r0
84 abort: cannot specify both --list and --rev
84 abort: cannot specify both --list and --rev
85 [255]
85 [255]
86 $ hg bookmarks -l --inactive
86 $ hg bookmarks -l --inactive
87 abort: --inactive is incompatible with --list
87 abort: cannot specify both --inactive and --list
88 [255]
88 [255]
89
89
90 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
90 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
91 0 X
91 0 X
92 0 X2
92 0 X2
93
93
94 $ echo b > b
94 $ echo b > b
95 $ hg add b
95 $ hg add b
96 $ hg commit -m 1 --config "$TESTHOOK"
96 $ hg commit -m 1 --config "$TESTHOOK"
97 test-hook-bookmark: X2: f7b1eb17ad24730a1651fccd46c43826d1bbc2ac -> 925d80f479bb026b0fb3deb27503780b13f74123
97 test-hook-bookmark: X2: f7b1eb17ad24730a1651fccd46c43826d1bbc2ac -> 925d80f479bb026b0fb3deb27503780b13f74123
98
98
99 $ hg bookmarks -T '{rev}:{node|shortest} {bookmark} {desc|firstline}\n'
99 $ hg bookmarks -T '{rev}:{node|shortest} {bookmark} {desc|firstline}\n'
100 0:f7b1 X 0
100 0:f7b1 X 0
101 1:925d X2 1
101 1:925d X2 1
102 -1:0000 Y
102 -1:0000 Y
103
103
104 $ hg bookmarks -Tjson
104 $ hg bookmarks -Tjson
105 [
105 [
106 {
106 {
107 "active": false,
107 "active": false,
108 "bookmark": "X",
108 "bookmark": "X",
109 "node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
109 "node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
110 "rev": 0
110 "rev": 0
111 },
111 },
112 {
112 {
113 "active": true,
113 "active": true,
114 "bookmark": "X2",
114 "bookmark": "X2",
115 "node": "925d80f479bb026b0fb3deb27503780b13f74123",
115 "node": "925d80f479bb026b0fb3deb27503780b13f74123",
116 "rev": 1
116 "rev": 1
117 },
117 },
118 {
118 {
119 "active": false,
119 "active": false,
120 "bookmark": "Y",
120 "bookmark": "Y",
121 "node": "0000000000000000000000000000000000000000",
121 "node": "0000000000000000000000000000000000000000",
122 "rev": -1
122 "rev": -1
123 }
123 }
124 ]
124 ]
125
125
126 bookmarks revset
126 bookmarks revset
127
127
128 $ hg log -r 'bookmark()'
128 $ hg log -r 'bookmark()'
129 changeset: 0:f7b1eb17ad24
129 changeset: 0:f7b1eb17ad24
130 bookmark: X
130 bookmark: X
131 user: test
131 user: test
132 date: Thu Jan 01 00:00:00 1970 +0000
132 date: Thu Jan 01 00:00:00 1970 +0000
133 summary: 0
133 summary: 0
134
134
135 changeset: 1:925d80f479bb
135 changeset: 1:925d80f479bb
136 bookmark: X2
136 bookmark: X2
137 tag: tip
137 tag: tip
138 user: test
138 user: test
139 date: Thu Jan 01 00:00:00 1970 +0000
139 date: Thu Jan 01 00:00:00 1970 +0000
140 summary: 1
140 summary: 1
141
141
142 $ hg log -r 'bookmark(Y)'
142 $ hg log -r 'bookmark(Y)'
143 $ hg log -r 'bookmark(X2)'
143 $ hg log -r 'bookmark(X2)'
144 changeset: 1:925d80f479bb
144 changeset: 1:925d80f479bb
145 bookmark: X2
145 bookmark: X2
146 tag: tip
146 tag: tip
147 user: test
147 user: test
148 date: Thu Jan 01 00:00:00 1970 +0000
148 date: Thu Jan 01 00:00:00 1970 +0000
149 summary: 1
149 summary: 1
150
150
151 $ hg log -r 'bookmark("re:X")'
151 $ hg log -r 'bookmark("re:X")'
152 changeset: 0:f7b1eb17ad24
152 changeset: 0:f7b1eb17ad24
153 bookmark: X
153 bookmark: X
154 user: test
154 user: test
155 date: Thu Jan 01 00:00:00 1970 +0000
155 date: Thu Jan 01 00:00:00 1970 +0000
156 summary: 0
156 summary: 0
157
157
158 changeset: 1:925d80f479bb
158 changeset: 1:925d80f479bb
159 bookmark: X2
159 bookmark: X2
160 tag: tip
160 tag: tip
161 user: test
161 user: test
162 date: Thu Jan 01 00:00:00 1970 +0000
162 date: Thu Jan 01 00:00:00 1970 +0000
163 summary: 1
163 summary: 1
164
164
165 $ hg log -r 'bookmark("literal:X")'
165 $ hg log -r 'bookmark("literal:X")'
166 changeset: 0:f7b1eb17ad24
166 changeset: 0:f7b1eb17ad24
167 bookmark: X
167 bookmark: X
168 user: test
168 user: test
169 date: Thu Jan 01 00:00:00 1970 +0000
169 date: Thu Jan 01 00:00:00 1970 +0000
170 summary: 0
170 summary: 0
171
171
172
172
173 "." is expanded to the active bookmark:
173 "." is expanded to the active bookmark:
174
174
175 $ hg log -r 'bookmark(.)'
175 $ hg log -r 'bookmark(.)'
176 changeset: 1:925d80f479bb
176 changeset: 1:925d80f479bb
177 bookmark: X2
177 bookmark: X2
178 tag: tip
178 tag: tip
179 user: test
179 user: test
180 date: Thu Jan 01 00:00:00 1970 +0000
180 date: Thu Jan 01 00:00:00 1970 +0000
181 summary: 1
181 summary: 1
182
182
183
183
184 but "literal:." is not since "." seems not a literal bookmark:
184 but "literal:." is not since "." seems not a literal bookmark:
185
185
186 $ hg log -r 'bookmark("literal:.")'
186 $ hg log -r 'bookmark("literal:.")'
187 abort: bookmark '.' does not exist!
187 abort: bookmark '.' does not exist!
188 [255]
188 [255]
189
189
190 "." should fail if there's no active bookmark:
190 "." should fail if there's no active bookmark:
191
191
192 $ hg bookmark --inactive
192 $ hg bookmark --inactive
193 $ hg log -r 'bookmark(.)'
193 $ hg log -r 'bookmark(.)'
194 abort: no active bookmark!
194 abort: no active bookmark!
195 [255]
195 [255]
196 $ hg log -r 'present(bookmark(.))'
196 $ hg log -r 'present(bookmark(.))'
197
197
198 $ hg log -r 'bookmark(unknown)'
198 $ hg log -r 'bookmark(unknown)'
199 abort: bookmark 'unknown' does not exist!
199 abort: bookmark 'unknown' does not exist!
200 [255]
200 [255]
201 $ hg log -r 'bookmark("literal:unknown")'
201 $ hg log -r 'bookmark("literal:unknown")'
202 abort: bookmark 'unknown' does not exist!
202 abort: bookmark 'unknown' does not exist!
203 [255]
203 [255]
204 $ hg log -r 'bookmark("re:unknown")'
204 $ hg log -r 'bookmark("re:unknown")'
205 $ hg log -r 'present(bookmark("literal:unknown"))'
205 $ hg log -r 'present(bookmark("literal:unknown"))'
206 $ hg log -r 'present(bookmark("re:unknown"))'
206 $ hg log -r 'present(bookmark("re:unknown"))'
207
207
208 $ hg help revsets | grep 'bookmark('
208 $ hg help revsets | grep 'bookmark('
209 "bookmark([name])"
209 "bookmark([name])"
210
210
211 reactivate "X2"
211 reactivate "X2"
212
212
213 $ hg update X2
213 $ hg update X2
214 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
214 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
215 (activating bookmark X2)
215 (activating bookmark X2)
216
216
217 bookmarks X and X2 moved to rev 1, Y at rev -1
217 bookmarks X and X2 moved to rev 1, Y at rev -1
218
218
219 $ hg bookmarks
219 $ hg bookmarks
220 X 0:f7b1eb17ad24
220 X 0:f7b1eb17ad24
221 * X2 1:925d80f479bb
221 * X2 1:925d80f479bb
222 Y -1:000000000000
222 Y -1:000000000000
223
223
224 bookmark rev 0 again
224 bookmark rev 0 again
225
225
226 $ hg bookmark -r 0 Z
226 $ hg bookmark -r 0 Z
227
227
228 $ hg update X
228 $ hg update X
229 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
229 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
230 (activating bookmark X)
230 (activating bookmark X)
231 $ echo c > c
231 $ echo c > c
232 $ hg add c
232 $ hg add c
233 $ hg commit -m 2
233 $ hg commit -m 2
234 created new head
234 created new head
235
235
236 bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
236 bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
237
237
238 $ hg bookmarks
238 $ hg bookmarks
239 * X 2:db815d6d32e6
239 * X 2:db815d6d32e6
240 X2 1:925d80f479bb
240 X2 1:925d80f479bb
241 Y -1:000000000000
241 Y -1:000000000000
242 Z 0:f7b1eb17ad24
242 Z 0:f7b1eb17ad24
243
243
244 rename nonexistent bookmark
244 rename nonexistent bookmark
245
245
246 $ hg bookmark -m A B
246 $ hg bookmark -m A B
247 abort: bookmark 'A' does not exist
247 abort: bookmark 'A' does not exist
248 [255]
248 [255]
249
249
250 rename to existent bookmark
250 rename to existent bookmark
251
251
252 $ hg bookmark -m X Y
252 $ hg bookmark -m X Y
253 abort: bookmark 'Y' already exists (use -f to force)
253 abort: bookmark 'Y' already exists (use -f to force)
254 [255]
254 [255]
255
255
256 force rename to existent bookmark
256 force rename to existent bookmark
257
257
258 $ hg bookmark -f -m X Y
258 $ hg bookmark -f -m X Y
259
259
260 rename bookmark using .
260 rename bookmark using .
261
261
262 $ hg book rename-me
262 $ hg book rename-me
263 $ hg book -m . renamed --config "$TESTHOOK"
263 $ hg book -m . renamed --config "$TESTHOOK"
264 test-hook-bookmark: rename-me: db815d6d32e69058eadefc8cffbad37675707975 ->
264 test-hook-bookmark: rename-me: db815d6d32e69058eadefc8cffbad37675707975 ->
265 test-hook-bookmark: renamed: -> db815d6d32e69058eadefc8cffbad37675707975
265 test-hook-bookmark: renamed: -> db815d6d32e69058eadefc8cffbad37675707975
266 $ hg bookmark
266 $ hg bookmark
267 X2 1:925d80f479bb
267 X2 1:925d80f479bb
268 Y 2:db815d6d32e6
268 Y 2:db815d6d32e6
269 Z 0:f7b1eb17ad24
269 Z 0:f7b1eb17ad24
270 * renamed 2:db815d6d32e6
270 * renamed 2:db815d6d32e6
271 $ hg up -q Y
271 $ hg up -q Y
272 $ hg book -d renamed --config "$TESTHOOK"
272 $ hg book -d renamed --config "$TESTHOOK"
273 test-hook-bookmark: renamed: db815d6d32e69058eadefc8cffbad37675707975 ->
273 test-hook-bookmark: renamed: db815d6d32e69058eadefc8cffbad37675707975 ->
274
274
275 rename bookmark using . with no active bookmark
275 rename bookmark using . with no active bookmark
276
276
277 $ hg book rename-me
277 $ hg book rename-me
278 $ hg book -i rename-me
278 $ hg book -i rename-me
279 $ hg book -m . renamed
279 $ hg book -m . renamed
280 abort: no active bookmark!
280 abort: no active bookmark!
281 [255]
281 [255]
282 $ hg up -q Y
282 $ hg up -q Y
283 $ hg book -d rename-me
283 $ hg book -d rename-me
284
284
285 delete bookmark using .
285 delete bookmark using .
286
286
287 $ hg book delete-me
287 $ hg book delete-me
288 $ hg book -d .
288 $ hg book -d .
289 $ hg bookmark
289 $ hg bookmark
290 X2 1:925d80f479bb
290 X2 1:925d80f479bb
291 Y 2:db815d6d32e6
291 Y 2:db815d6d32e6
292 Z 0:f7b1eb17ad24
292 Z 0:f7b1eb17ad24
293 $ hg up -q Y
293 $ hg up -q Y
294
294
295 delete bookmark using . with no active bookmark
295 delete bookmark using . with no active bookmark
296
296
297 $ hg book delete-me
297 $ hg book delete-me
298 $ hg book -i delete-me
298 $ hg book -i delete-me
299 $ hg book -d .
299 $ hg book -d .
300 abort: no active bookmark!
300 abort: no active bookmark!
301 [255]
301 [255]
302 $ hg up -q Y
302 $ hg up -q Y
303 $ hg book -d delete-me
303 $ hg book -d delete-me
304
304
305 list bookmarks
305 list bookmarks
306
306
307 $ hg bookmark
307 $ hg bookmark
308 X2 1:925d80f479bb
308 X2 1:925d80f479bb
309 * Y 2:db815d6d32e6
309 * Y 2:db815d6d32e6
310 Z 0:f7b1eb17ad24
310 Z 0:f7b1eb17ad24
311
311
312 bookmarks from a revset
312 bookmarks from a revset
313 $ hg bookmark -r '.^1' REVSET
313 $ hg bookmark -r '.^1' REVSET
314 $ hg bookmark -r ':tip' TIP
314 $ hg bookmark -r ':tip' TIP
315 $ hg up -q TIP
315 $ hg up -q TIP
316 $ hg bookmarks
316 $ hg bookmarks
317 REVSET 0:f7b1eb17ad24
317 REVSET 0:f7b1eb17ad24
318 * TIP 2:db815d6d32e6
318 * TIP 2:db815d6d32e6
319 X2 1:925d80f479bb
319 X2 1:925d80f479bb
320 Y 2:db815d6d32e6
320 Y 2:db815d6d32e6
321 Z 0:f7b1eb17ad24
321 Z 0:f7b1eb17ad24
322
322
323 $ hg bookmark -d REVSET
323 $ hg bookmark -d REVSET
324 $ hg bookmark -d TIP
324 $ hg bookmark -d TIP
325
325
326 rename without new name or multiple names
326 rename without new name or multiple names
327
327
328 $ hg bookmark -m Y
328 $ hg bookmark -m Y
329 abort: new bookmark name required
329 abort: new bookmark name required
330 [255]
330 [255]
331 $ hg bookmark -m Y Y2 Y3
331 $ hg bookmark -m Y Y2 Y3
332 abort: only one new bookmark name allowed
332 abort: only one new bookmark name allowed
333 [255]
333 [255]
334
334
335 delete without name
335 delete without name
336
336
337 $ hg bookmark -d
337 $ hg bookmark -d
338 abort: bookmark name required
338 abort: bookmark name required
339 [255]
339 [255]
340
340
341 delete nonexistent bookmark
341 delete nonexistent bookmark
342
342
343 $ hg bookmark -d A
343 $ hg bookmark -d A
344 abort: bookmark 'A' does not exist
344 abort: bookmark 'A' does not exist
345 [255]
345 [255]
346
346
347 delete with --inactive
347 delete with --inactive
348
348
349 $ hg bookmark -d --inactive Y
349 $ hg bookmark -d --inactive Y
350 abort: --inactive is incompatible with --delete
350 abort: cannot specify both --inactive and --delete
351 [255]
351 [255]
352
352
353 bookmark name with spaces should be stripped
353 bookmark name with spaces should be stripped
354
354
355 $ hg bookmark ' x y '
355 $ hg bookmark ' x y '
356
356
357 list bookmarks
357 list bookmarks
358
358
359 $ hg bookmarks
359 $ hg bookmarks
360 X2 1:925d80f479bb
360 X2 1:925d80f479bb
361 Y 2:db815d6d32e6
361 Y 2:db815d6d32e6
362 Z 0:f7b1eb17ad24
362 Z 0:f7b1eb17ad24
363 * x y 2:db815d6d32e6
363 * x y 2:db815d6d32e6
364 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
364 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
365 2 Y
365 2 Y
366 2 x y
366 2 x y
367 1 X2
367 1 X2
368 0 Z
368 0 Z
369
369
370 look up stripped bookmark name
370 look up stripped bookmark name
371
371
372 $ hg log -r '"x y"'
372 $ hg log -r '"x y"'
373 changeset: 2:db815d6d32e6
373 changeset: 2:db815d6d32e6
374 bookmark: Y
374 bookmark: Y
375 bookmark: x y
375 bookmark: x y
376 tag: tip
376 tag: tip
377 parent: 0:f7b1eb17ad24
377 parent: 0:f7b1eb17ad24
378 user: test
378 user: test
379 date: Thu Jan 01 00:00:00 1970 +0000
379 date: Thu Jan 01 00:00:00 1970 +0000
380 summary: 2
380 summary: 2
381
381
382
382
383 reject bookmark name with newline
383 reject bookmark name with newline
384
384
385 $ hg bookmark '
385 $ hg bookmark '
386 > '
386 > '
387 abort: bookmark names cannot consist entirely of whitespace
387 abort: bookmark names cannot consist entirely of whitespace
388 [255]
388 [255]
389
389
390 $ hg bookmark -m Z '
390 $ hg bookmark -m Z '
391 > '
391 > '
392 abort: bookmark names cannot consist entirely of whitespace
392 abort: bookmark names cannot consist entirely of whitespace
393 [255]
393 [255]
394
394
395 bookmark with reserved name
395 bookmark with reserved name
396
396
397 $ hg bookmark tip
397 $ hg bookmark tip
398 abort: the name 'tip' is reserved
398 abort: the name 'tip' is reserved
399 [255]
399 [255]
400
400
401 $ hg bookmark .
401 $ hg bookmark .
402 abort: the name '.' is reserved
402 abort: the name '.' is reserved
403 [255]
403 [255]
404
404
405 $ hg bookmark null
405 $ hg bookmark null
406 abort: the name 'null' is reserved
406 abort: the name 'null' is reserved
407 [255]
407 [255]
408
408
409
409
410 bookmark with existing name
410 bookmark with existing name
411
411
412 $ hg bookmark X2
412 $ hg bookmark X2
413 abort: bookmark 'X2' already exists (use -f to force)
413 abort: bookmark 'X2' already exists (use -f to force)
414 [255]
414 [255]
415
415
416 $ hg bookmark -m Y Z
416 $ hg bookmark -m Y Z
417 abort: bookmark 'Z' already exists (use -f to force)
417 abort: bookmark 'Z' already exists (use -f to force)
418 [255]
418 [255]
419
419
420 bookmark with name of branch
420 bookmark with name of branch
421
421
422 $ hg bookmark default
422 $ hg bookmark default
423 abort: a bookmark cannot have the name of an existing branch
423 abort: a bookmark cannot have the name of an existing branch
424 [255]
424 [255]
425
425
426 $ hg bookmark -m Y default
426 $ hg bookmark -m Y default
427 abort: a bookmark cannot have the name of an existing branch
427 abort: a bookmark cannot have the name of an existing branch
428 [255]
428 [255]
429
429
430 bookmark with integer name
430 bookmark with integer name
431
431
432 $ hg bookmark 10
432 $ hg bookmark 10
433 abort: cannot use an integer as a name
433 abort: cannot use an integer as a name
434 [255]
434 [255]
435
435
436 bookmark with a name that matches a node id
436 bookmark with a name that matches a node id
437 $ hg bookmark 925d80f479bb db815d6d32e6 --config "$TESTHOOK"
437 $ hg bookmark 925d80f479bb db815d6d32e6 --config "$TESTHOOK"
438 bookmark 925d80f479bb matches a changeset hash
438 bookmark 925d80f479bb matches a changeset hash
439 (did you leave a -r out of an 'hg bookmark' command?)
439 (did you leave a -r out of an 'hg bookmark' command?)
440 bookmark db815d6d32e6 matches a changeset hash
440 bookmark db815d6d32e6 matches a changeset hash
441 (did you leave a -r out of an 'hg bookmark' command?)
441 (did you leave a -r out of an 'hg bookmark' command?)
442 test-hook-bookmark: 925d80f479bb: -> db815d6d32e69058eadefc8cffbad37675707975
442 test-hook-bookmark: 925d80f479bb: -> db815d6d32e69058eadefc8cffbad37675707975
443 test-hook-bookmark: db815d6d32e6: -> db815d6d32e69058eadefc8cffbad37675707975
443 test-hook-bookmark: db815d6d32e6: -> db815d6d32e69058eadefc8cffbad37675707975
444 $ hg bookmark -d 925d80f479bb
444 $ hg bookmark -d 925d80f479bb
445 $ hg bookmark -d db815d6d32e6
445 $ hg bookmark -d db815d6d32e6
446
446
447 $ cd ..
447 $ cd ..
448
448
449 bookmark with a name that matches an ambiguous node id
449 bookmark with a name that matches an ambiguous node id
450
450
451 $ hg init ambiguous
451 $ hg init ambiguous
452 $ cd ambiguous
452 $ cd ambiguous
453 $ echo 0 > a
453 $ echo 0 > a
454 $ hg ci -qAm 0
454 $ hg ci -qAm 0
455 $ for i in 1057 2857 4025; do
455 $ for i in 1057 2857 4025; do
456 > hg up -q 0
456 > hg up -q 0
457 > echo $i > a
457 > echo $i > a
458 > hg ci -qm $i
458 > hg ci -qm $i
459 > done
459 > done
460 $ hg up -q null
460 $ hg up -q null
461 $ hg log -r0: -T '{rev}:{node}\n'
461 $ hg log -r0: -T '{rev}:{node}\n'
462 0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
462 0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
463 1:c56256a09cd28e5764f32e8e2810d0f01e2e357a
463 1:c56256a09cd28e5764f32e8e2810d0f01e2e357a
464 2:c5623987d205cd6d9d8389bfc40fff9dbb670b48
464 2:c5623987d205cd6d9d8389bfc40fff9dbb670b48
465 3:c562ddd9c94164376c20b86b0b4991636a3bf84f
465 3:c562ddd9c94164376c20b86b0b4991636a3bf84f
466
466
467 $ hg bookmark -r0 c562
467 $ hg bookmark -r0 c562
468 $ hg bookmarks
468 $ hg bookmarks
469 c562 0:b4e73ffab476
469 c562 0:b4e73ffab476
470
470
471 $ cd ..
471 $ cd ..
472
472
473 incompatible options
473 incompatible options
474
474
475 $ cd repo
475 $ cd repo
476
476
477 $ hg bookmark -m Y -d Z
477 $ hg bookmark -m Y -d Z
478 abort: cannot specify both --delete and --rename
478 abort: cannot specify both --delete and --rename
479 [255]
479 [255]
480
480
481 $ hg bookmark -r 1 -d Z
481 $ hg bookmark -r 1 -d Z
482 abort: cannot specify both --delete and --rev
482 abort: cannot specify both --delete and --rev
483 [255]
483 [255]
484
484
485 $ hg bookmark -r 1 -m Z Y
485 $ hg bookmark -r 1 -m Z Y
486 abort: cannot specify both --rename and --rev
486 abort: cannot specify both --rename and --rev
487 [255]
487 [255]
488
488
489 force bookmark with existing name
489 force bookmark with existing name
490
490
491 $ hg bookmark -f X2 --config "$TESTHOOK"
491 $ hg bookmark -f X2 --config "$TESTHOOK"
492 test-hook-bookmark: X2: 925d80f479bb026b0fb3deb27503780b13f74123 -> db815d6d32e69058eadefc8cffbad37675707975
492 test-hook-bookmark: X2: 925d80f479bb026b0fb3deb27503780b13f74123 -> db815d6d32e69058eadefc8cffbad37675707975
493
493
494 force bookmark back to where it was, should deactivate it
494 force bookmark back to where it was, should deactivate it
495
495
496 $ hg bookmark -fr1 X2
496 $ hg bookmark -fr1 X2
497 $ hg bookmarks
497 $ hg bookmarks
498 X2 1:925d80f479bb
498 X2 1:925d80f479bb
499 Y 2:db815d6d32e6
499 Y 2:db815d6d32e6
500 Z 0:f7b1eb17ad24
500 Z 0:f7b1eb17ad24
501 x y 2:db815d6d32e6
501 x y 2:db815d6d32e6
502
502
503 forward bookmark to descendant without --force
503 forward bookmark to descendant without --force
504
504
505 $ hg bookmark Z
505 $ hg bookmark Z
506 moving bookmark 'Z' forward from f7b1eb17ad24
506 moving bookmark 'Z' forward from f7b1eb17ad24
507
507
508 list bookmarks
508 list bookmarks
509
509
510 $ hg bookmark
510 $ hg bookmark
511 X2 1:925d80f479bb
511 X2 1:925d80f479bb
512 Y 2:db815d6d32e6
512 Y 2:db815d6d32e6
513 * Z 2:db815d6d32e6
513 * Z 2:db815d6d32e6
514 x y 2:db815d6d32e6
514 x y 2:db815d6d32e6
515 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
515 $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
516 2 Y
516 2 Y
517 2 Z
517 2 Z
518 2 x y
518 2 x y
519 1 X2
519 1 X2
520
520
521 revision but no bookmark name
521 revision but no bookmark name
522
522
523 $ hg bookmark -r .
523 $ hg bookmark -r .
524 abort: bookmark name required
524 abort: bookmark name required
525 [255]
525 [255]
526
526
527 bookmark name with whitespace only
527 bookmark name with whitespace only
528
528
529 $ hg bookmark ' '
529 $ hg bookmark ' '
530 abort: bookmark names cannot consist entirely of whitespace
530 abort: bookmark names cannot consist entirely of whitespace
531 [255]
531 [255]
532
532
533 $ hg bookmark -m Y ' '
533 $ hg bookmark -m Y ' '
534 abort: bookmark names cannot consist entirely of whitespace
534 abort: bookmark names cannot consist entirely of whitespace
535 [255]
535 [255]
536
536
537 invalid bookmark
537 invalid bookmark
538
538
539 $ hg bookmark 'foo:bar'
539 $ hg bookmark 'foo:bar'
540 abort: ':' cannot be used in a name
540 abort: ':' cannot be used in a name
541 [255]
541 [255]
542
542
543 $ hg bookmark 'foo
543 $ hg bookmark 'foo
544 > bar'
544 > bar'
545 abort: '\n' cannot be used in a name
545 abort: '\n' cannot be used in a name
546 [255]
546 [255]
547
547
548 the bookmark extension should be ignored now that it is part of core
548 the bookmark extension should be ignored now that it is part of core
549
549
550 $ echo "[extensions]" >> $HGRCPATH
550 $ echo "[extensions]" >> $HGRCPATH
551 $ echo "bookmarks=" >> $HGRCPATH
551 $ echo "bookmarks=" >> $HGRCPATH
552 $ hg bookmarks
552 $ hg bookmarks
553 X2 1:925d80f479bb
553 X2 1:925d80f479bb
554 Y 2:db815d6d32e6
554 Y 2:db815d6d32e6
555 * Z 2:db815d6d32e6
555 * Z 2:db815d6d32e6
556 x y 2:db815d6d32e6
556 x y 2:db815d6d32e6
557
557
558 test summary
558 test summary
559
559
560 $ hg summary
560 $ hg summary
561 parent: 2:db815d6d32e6 tip
561 parent: 2:db815d6d32e6 tip
562 2
562 2
563 branch: default
563 branch: default
564 bookmarks: *Z Y x y
564 bookmarks: *Z Y x y
565 commit: (clean)
565 commit: (clean)
566 update: 1 new changesets, 2 branch heads (merge)
566 update: 1 new changesets, 2 branch heads (merge)
567 phases: 3 draft
567 phases: 3 draft
568
568
569 test id
569 test id
570
570
571 $ hg id
571 $ hg id
572 db815d6d32e6 tip Y/Z/x y
572 db815d6d32e6 tip Y/Z/x y
573
573
574 test rollback
574 test rollback
575
575
576 $ echo foo > f1
576 $ echo foo > f1
577 $ hg bookmark tmp-rollback
577 $ hg bookmark tmp-rollback
578 $ hg ci -Amr
578 $ hg ci -Amr
579 adding f1
579 adding f1
580 $ hg bookmarks
580 $ hg bookmarks
581 X2 1:925d80f479bb
581 X2 1:925d80f479bb
582 Y 2:db815d6d32e6
582 Y 2:db815d6d32e6
583 Z 2:db815d6d32e6
583 Z 2:db815d6d32e6
584 * tmp-rollback 3:2bf5cfec5864
584 * tmp-rollback 3:2bf5cfec5864
585 x y 2:db815d6d32e6
585 x y 2:db815d6d32e6
586 $ hg rollback
586 $ hg rollback
587 repository tip rolled back to revision 2 (undo commit)
587 repository tip rolled back to revision 2 (undo commit)
588 working directory now based on revision 2
588 working directory now based on revision 2
589 $ hg bookmarks
589 $ hg bookmarks
590 X2 1:925d80f479bb
590 X2 1:925d80f479bb
591 Y 2:db815d6d32e6
591 Y 2:db815d6d32e6
592 Z 2:db815d6d32e6
592 Z 2:db815d6d32e6
593 * tmp-rollback 2:db815d6d32e6
593 * tmp-rollback 2:db815d6d32e6
594 x y 2:db815d6d32e6
594 x y 2:db815d6d32e6
595 $ hg bookmark -f Z -r 1
595 $ hg bookmark -f Z -r 1
596 $ hg rollback
596 $ hg rollback
597 repository tip rolled back to revision 2 (undo bookmark)
597 repository tip rolled back to revision 2 (undo bookmark)
598 $ hg bookmarks
598 $ hg bookmarks
599 X2 1:925d80f479bb
599 X2 1:925d80f479bb
600 Y 2:db815d6d32e6
600 Y 2:db815d6d32e6
601 Z 2:db815d6d32e6
601 Z 2:db815d6d32e6
602 * tmp-rollback 2:db815d6d32e6
602 * tmp-rollback 2:db815d6d32e6
603 x y 2:db815d6d32e6
603 x y 2:db815d6d32e6
604 $ hg bookmark -d tmp-rollback
604 $ hg bookmark -d tmp-rollback
605
605
606 activate bookmark on working dir parent without --force
606 activate bookmark on working dir parent without --force
607
607
608 $ hg bookmark --inactive Z
608 $ hg bookmark --inactive Z
609 $ hg bookmark Z
609 $ hg bookmark Z
610
610
611 deactivate current 'Z', but also add 'Y'
611 deactivate current 'Z', but also add 'Y'
612
612
613 $ hg bookmark -d Y
613 $ hg bookmark -d Y
614 $ hg bookmark --inactive Z Y
614 $ hg bookmark --inactive Z Y
615 $ hg bookmark -l
615 $ hg bookmark -l
616 X2 1:925d80f479bb
616 X2 1:925d80f479bb
617 Y 2:db815d6d32e6
617 Y 2:db815d6d32e6
618 Z 2:db815d6d32e6
618 Z 2:db815d6d32e6
619 x y 2:db815d6d32e6
619 x y 2:db815d6d32e6
620 $ hg bookmark Z
620 $ hg bookmark Z
621
621
622 bookmark wdir to activate it (issue6218)
622 bookmark wdir to activate it (issue6218)
623
623
624 $ hg bookmark -d Z
624 $ hg bookmark -d Z
625 $ hg bookmark -r 'wdir()' Z
625 $ hg bookmark -r 'wdir()' Z
626 $ hg bookmark -l
626 $ hg bookmark -l
627 X2 1:925d80f479bb
627 X2 1:925d80f479bb
628 Y 2:db815d6d32e6
628 Y 2:db815d6d32e6
629 * Z 2:db815d6d32e6
629 * Z 2:db815d6d32e6
630 x y 2:db815d6d32e6
630 x y 2:db815d6d32e6
631
631
632 test clone
632 test clone
633
633
634 $ hg bookmark -r 2 -i @
634 $ hg bookmark -r 2 -i @
635 $ hg bookmark -r 2 -i a@
635 $ hg bookmark -r 2 -i a@
636 $ hg bookmarks
636 $ hg bookmarks
637 @ 2:db815d6d32e6
637 @ 2:db815d6d32e6
638 X2 1:925d80f479bb
638 X2 1:925d80f479bb
639 Y 2:db815d6d32e6
639 Y 2:db815d6d32e6
640 * Z 2:db815d6d32e6
640 * Z 2:db815d6d32e6
641 a@ 2:db815d6d32e6
641 a@ 2:db815d6d32e6
642 x y 2:db815d6d32e6
642 x y 2:db815d6d32e6
643 $ hg clone . cloned-bookmarks
643 $ hg clone . cloned-bookmarks
644 updating to bookmark @
644 updating to bookmark @
645 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
645 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
646 $ hg -R cloned-bookmarks bookmarks
646 $ hg -R cloned-bookmarks bookmarks
647 * @ 2:db815d6d32e6
647 * @ 2:db815d6d32e6
648 X2 1:925d80f479bb
648 X2 1:925d80f479bb
649 Y 2:db815d6d32e6
649 Y 2:db815d6d32e6
650 Z 2:db815d6d32e6
650 Z 2:db815d6d32e6
651 a@ 2:db815d6d32e6
651 a@ 2:db815d6d32e6
652 x y 2:db815d6d32e6
652 x y 2:db815d6d32e6
653
653
654 test clone with pull protocol
654 test clone with pull protocol
655
655
656 $ hg clone --pull . cloned-bookmarks-pull
656 $ hg clone --pull . cloned-bookmarks-pull
657 requesting all changes
657 requesting all changes
658 adding changesets
658 adding changesets
659 adding manifests
659 adding manifests
660 adding file changes
660 adding file changes
661 added 3 changesets with 3 changes to 3 files (+1 heads)
661 added 3 changesets with 3 changes to 3 files (+1 heads)
662 new changesets f7b1eb17ad24:db815d6d32e6
662 new changesets f7b1eb17ad24:db815d6d32e6
663 updating to bookmark @
663 updating to bookmark @
664 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
664 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
665 $ hg -R cloned-bookmarks-pull bookmarks
665 $ hg -R cloned-bookmarks-pull bookmarks
666 * @ 2:db815d6d32e6
666 * @ 2:db815d6d32e6
667 X2 1:925d80f479bb
667 X2 1:925d80f479bb
668 Y 2:db815d6d32e6
668 Y 2:db815d6d32e6
669 Z 2:db815d6d32e6
669 Z 2:db815d6d32e6
670 a@ 2:db815d6d32e6
670 a@ 2:db815d6d32e6
671 x y 2:db815d6d32e6
671 x y 2:db815d6d32e6
672
672
673 delete multiple bookmarks at once
673 delete multiple bookmarks at once
674
674
675 $ hg bookmark -d @ a@
675 $ hg bookmark -d @ a@
676
676
677 test clone with a bookmark named "default" (issue3677)
677 test clone with a bookmark named "default" (issue3677)
678
678
679 $ hg bookmark -r 1 -f -i default
679 $ hg bookmark -r 1 -f -i default
680 $ hg clone . cloned-bookmark-default
680 $ hg clone . cloned-bookmark-default
681 updating to branch default
681 updating to branch default
682 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
682 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
683 $ hg -R cloned-bookmark-default bookmarks
683 $ hg -R cloned-bookmark-default bookmarks
684 X2 1:925d80f479bb
684 X2 1:925d80f479bb
685 Y 2:db815d6d32e6
685 Y 2:db815d6d32e6
686 Z 2:db815d6d32e6
686 Z 2:db815d6d32e6
687 default 1:925d80f479bb
687 default 1:925d80f479bb
688 x y 2:db815d6d32e6
688 x y 2:db815d6d32e6
689 $ hg -R cloned-bookmark-default parents -q
689 $ hg -R cloned-bookmark-default parents -q
690 2:db815d6d32e6
690 2:db815d6d32e6
691 $ hg bookmark -d default
691 $ hg bookmark -d default
692
692
693 test clone with a specific revision
693 test clone with a specific revision
694
694
695 $ hg clone -r 925d80 . cloned-bookmarks-rev
695 $ hg clone -r 925d80 . cloned-bookmarks-rev
696 adding changesets
696 adding changesets
697 adding manifests
697 adding manifests
698 adding file changes
698 adding file changes
699 added 2 changesets with 2 changes to 2 files
699 added 2 changesets with 2 changes to 2 files
700 new changesets f7b1eb17ad24:925d80f479bb
700 new changesets f7b1eb17ad24:925d80f479bb
701 updating to branch default
701 updating to branch default
702 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
702 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
703 $ hg -R cloned-bookmarks-rev bookmarks
703 $ hg -R cloned-bookmarks-rev bookmarks
704 X2 1:925d80f479bb
704 X2 1:925d80f479bb
705
705
706 test clone with update to a bookmark
706 test clone with update to a bookmark
707
707
708 $ hg clone -u Z . ../cloned-bookmarks-update
708 $ hg clone -u Z . ../cloned-bookmarks-update
709 updating to branch default
709 updating to branch default
710 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
710 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
711 $ hg -R ../cloned-bookmarks-update bookmarks
711 $ hg -R ../cloned-bookmarks-update bookmarks
712 X2 1:925d80f479bb
712 X2 1:925d80f479bb
713 Y 2:db815d6d32e6
713 Y 2:db815d6d32e6
714 * Z 2:db815d6d32e6
714 * Z 2:db815d6d32e6
715 x y 2:db815d6d32e6
715 x y 2:db815d6d32e6
716
716
717 create bundle with two heads
717 create bundle with two heads
718
718
719 $ hg clone . tobundle
719 $ hg clone . tobundle
720 updating to branch default
720 updating to branch default
721 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
721 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
722 $ echo x > tobundle/x
722 $ echo x > tobundle/x
723 $ hg -R tobundle add tobundle/x
723 $ hg -R tobundle add tobundle/x
724 $ hg -R tobundle commit -m'x'
724 $ hg -R tobundle commit -m'x'
725 $ hg -R tobundle update -r -2
725 $ hg -R tobundle update -r -2
726 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
726 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
727 $ echo y > tobundle/y
727 $ echo y > tobundle/y
728 $ hg -R tobundle branch test
728 $ hg -R tobundle branch test
729 marked working directory as branch test
729 marked working directory as branch test
730 (branches are permanent and global, did you want a bookmark?)
730 (branches are permanent and global, did you want a bookmark?)
731 $ hg -R tobundle add tobundle/y
731 $ hg -R tobundle add tobundle/y
732 $ hg -R tobundle commit -m'y'
732 $ hg -R tobundle commit -m'y'
733 $ hg -R tobundle bundle tobundle.hg
733 $ hg -R tobundle bundle tobundle.hg
734 searching for changes
734 searching for changes
735 2 changesets found
735 2 changesets found
736 $ hg unbundle tobundle.hg
736 $ hg unbundle tobundle.hg
737 adding changesets
737 adding changesets
738 adding manifests
738 adding manifests
739 adding file changes
739 adding file changes
740 added 2 changesets with 2 changes to 2 files (+1 heads)
740 added 2 changesets with 2 changes to 2 files (+1 heads)
741 new changesets 125c9a1d6df6:9ba5f110a0b3 (2 drafts)
741 new changesets 125c9a1d6df6:9ba5f110a0b3 (2 drafts)
742 (run 'hg heads' to see heads, 'hg merge' to merge)
742 (run 'hg heads' to see heads, 'hg merge' to merge)
743
743
744 update to active bookmark if it's not the parent
744 update to active bookmark if it's not the parent
745
745
746 (it is known issue that fsmonitor can't handle nested repositories. In
746 (it is known issue that fsmonitor can't handle nested repositories. In
747 this test scenario, cloned-bookmark-default and tobundle exist in the
747 this test scenario, cloned-bookmark-default and tobundle exist in the
748 working directory of current repository)
748 working directory of current repository)
749
749
750 $ hg summary
750 $ hg summary
751 parent: 2:db815d6d32e6
751 parent: 2:db815d6d32e6
752 2
752 2
753 branch: default
753 branch: default
754 bookmarks: *Z Y x y
754 bookmarks: *Z Y x y
755 commit: 1 added, 1 unknown (new branch head) (no-fsmonitor !)
755 commit: 1 added, 1 unknown (new branch head) (no-fsmonitor !)
756 commit: 1 added, * unknown (new branch head) (glob) (fsmonitor !)
756 commit: 1 added, * unknown (new branch head) (glob) (fsmonitor !)
757 update: 2 new changesets (update)
757 update: 2 new changesets (update)
758 phases: 5 draft
758 phases: 5 draft
759 $ hg update
759 $ hg update
760 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
760 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
761 updating bookmark Z
761 updating bookmark Z
762 $ hg bookmarks
762 $ hg bookmarks
763 X2 1:925d80f479bb
763 X2 1:925d80f479bb
764 Y 2:db815d6d32e6
764 Y 2:db815d6d32e6
765 * Z 3:125c9a1d6df6
765 * Z 3:125c9a1d6df6
766 x y 2:db815d6d32e6
766 x y 2:db815d6d32e6
767
767
768 pull --update works the same as pull && update
768 pull --update works the same as pull && update
769
769
770 $ hg bookmark -r3 Y
770 $ hg bookmark -r3 Y
771 moving bookmark 'Y' forward from db815d6d32e6
771 moving bookmark 'Y' forward from db815d6d32e6
772 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
772 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
773 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
773 $ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
774
774
775 (manual version)
775 (manual version)
776
776
777 $ hg -R ../cloned-bookmarks-manual-update update Y
777 $ hg -R ../cloned-bookmarks-manual-update update Y
778 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
778 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
779 (activating bookmark Y)
779 (activating bookmark Y)
780 $ hg -R ../cloned-bookmarks-manual-update pull .
780 $ hg -R ../cloned-bookmarks-manual-update pull .
781 pulling from .
781 pulling from .
782 searching for changes
782 searching for changes
783 adding changesets
783 adding changesets
784 adding manifests
784 adding manifests
785 adding file changes
785 adding file changes
786 updating bookmark Y
786 updating bookmark Y
787 updating bookmark Z
787 updating bookmark Z
788 added 2 changesets with 2 changes to 2 files (+1 heads)
788 added 2 changesets with 2 changes to 2 files (+1 heads)
789 new changesets 125c9a1d6df6:9ba5f110a0b3
789 new changesets 125c9a1d6df6:9ba5f110a0b3
790 (run 'hg heads' to see heads, 'hg merge' to merge)
790 (run 'hg heads' to see heads, 'hg merge' to merge)
791
791
792 (# tests strange but with --date crashing when bookmark have to move)
792 (# tests strange but with --date crashing when bookmark have to move)
793
793
794 $ hg -R ../cloned-bookmarks-manual-update update -d 1986
794 $ hg -R ../cloned-bookmarks-manual-update update -d 1986
795 abort: revision matching date not found
795 abort: revision matching date not found
796 [255]
796 [255]
797 $ hg -R ../cloned-bookmarks-manual-update update
797 $ hg -R ../cloned-bookmarks-manual-update update
798 updating to active bookmark Y
798 updating to active bookmark Y
799 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
799 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
800
800
801 (all in one version)
801 (all in one version)
802
802
803 $ hg -R ../cloned-bookmarks-update update Y
803 $ hg -R ../cloned-bookmarks-update update Y
804 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
804 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
805 (activating bookmark Y)
805 (activating bookmark Y)
806 $ hg -R ../cloned-bookmarks-update pull --update .
806 $ hg -R ../cloned-bookmarks-update pull --update .
807 pulling from .
807 pulling from .
808 searching for changes
808 searching for changes
809 adding changesets
809 adding changesets
810 adding manifests
810 adding manifests
811 adding file changes
811 adding file changes
812 updating bookmark Y
812 updating bookmark Y
813 updating bookmark Z
813 updating bookmark Z
814 added 2 changesets with 2 changes to 2 files (+1 heads)
814 added 2 changesets with 2 changes to 2 files (+1 heads)
815 new changesets 125c9a1d6df6:9ba5f110a0b3
815 new changesets 125c9a1d6df6:9ba5f110a0b3
816 updating to active bookmark Y
816 updating to active bookmark Y
817 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
817 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
818
818
819 We warn about divergent during bare update to the active bookmark
819 We warn about divergent during bare update to the active bookmark
820
820
821 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
821 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
822 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
822 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
823 (activating bookmark Y)
823 (activating bookmark Y)
824 $ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
824 $ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
825 $ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
825 $ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
826 X2 1:925d80f479bb
826 X2 1:925d80f479bb
827 * Y 2:db815d6d32e6
827 * Y 2:db815d6d32e6
828 Y@1 1:925d80f479bb
828 Y@1 1:925d80f479bb
829 Z 2:db815d6d32e6
829 Z 2:db815d6d32e6
830 x y 2:db815d6d32e6
830 x y 2:db815d6d32e6
831 $ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
831 $ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
832 pulling from $TESTTMP/repo
832 pulling from $TESTTMP/repo
833 searching for changes
833 searching for changes
834 adding changesets
834 adding changesets
835 adding manifests
835 adding manifests
836 adding file changes
836 adding file changes
837 updating bookmark Y
837 updating bookmark Y
838 updating bookmark Z
838 updating bookmark Z
839 added 2 changesets with 2 changes to 2 files (+1 heads)
839 added 2 changesets with 2 changes to 2 files (+1 heads)
840 new changesets 125c9a1d6df6:9ba5f110a0b3
840 new changesets 125c9a1d6df6:9ba5f110a0b3
841 (run 'hg heads' to see heads, 'hg merge' to merge)
841 (run 'hg heads' to see heads, 'hg merge' to merge)
842 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update
842 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update
843 updating to active bookmark Y
843 updating to active bookmark Y
844 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
844 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
845 1 other divergent bookmarks for "Y"
845 1 other divergent bookmarks for "Y"
846
846
847 test wrongly formated bookmark
847 test wrongly formated bookmark
848
848
849 $ echo '' >> .hg/bookmarks
849 $ echo '' >> .hg/bookmarks
850 $ hg bookmarks
850 $ hg bookmarks
851 X2 1:925d80f479bb
851 X2 1:925d80f479bb
852 Y 3:125c9a1d6df6
852 Y 3:125c9a1d6df6
853 * Z 3:125c9a1d6df6
853 * Z 3:125c9a1d6df6
854 x y 2:db815d6d32e6
854 x y 2:db815d6d32e6
855 $ echo "Ican'thasformatedlines" >> .hg/bookmarks
855 $ echo "Ican'thasformatedlines" >> .hg/bookmarks
856 $ hg bookmarks
856 $ hg bookmarks
857 malformed line in .hg/bookmarks: "Ican'thasformatedlines"
857 malformed line in .hg/bookmarks: "Ican'thasformatedlines"
858 X2 1:925d80f479bb
858 X2 1:925d80f479bb
859 Y 3:125c9a1d6df6
859 Y 3:125c9a1d6df6
860 * Z 3:125c9a1d6df6
860 * Z 3:125c9a1d6df6
861 x y 2:db815d6d32e6
861 x y 2:db815d6d32e6
862
862
863 test missing revisions
863 test missing revisions
864
864
865 $ echo "925d80f479b925d80f479bc925d80f479bccabab z" > .hg/bookmarks
865 $ echo "925d80f479b925d80f479bc925d80f479bccabab z" > .hg/bookmarks
866 $ hg book
866 $ hg book
867 no bookmarks set
867 no bookmarks set
868
868
869 test stripping a non-checked-out but bookmarked revision
869 test stripping a non-checked-out but bookmarked revision
870
870
871 $ hg log --graph
871 $ hg log --graph
872 o changeset: 4:9ba5f110a0b3
872 o changeset: 4:9ba5f110a0b3
873 | branch: test
873 | branch: test
874 | tag: tip
874 | tag: tip
875 | parent: 2:db815d6d32e6
875 | parent: 2:db815d6d32e6
876 | user: test
876 | user: test
877 | date: Thu Jan 01 00:00:00 1970 +0000
877 | date: Thu Jan 01 00:00:00 1970 +0000
878 | summary: y
878 | summary: y
879 |
879 |
880 | @ changeset: 3:125c9a1d6df6
880 | @ changeset: 3:125c9a1d6df6
881 |/ user: test
881 |/ user: test
882 | date: Thu Jan 01 00:00:00 1970 +0000
882 | date: Thu Jan 01 00:00:00 1970 +0000
883 | summary: x
883 | summary: x
884 |
884 |
885 o changeset: 2:db815d6d32e6
885 o changeset: 2:db815d6d32e6
886 | parent: 0:f7b1eb17ad24
886 | parent: 0:f7b1eb17ad24
887 | user: test
887 | user: test
888 | date: Thu Jan 01 00:00:00 1970 +0000
888 | date: Thu Jan 01 00:00:00 1970 +0000
889 | summary: 2
889 | summary: 2
890 |
890 |
891 | o changeset: 1:925d80f479bb
891 | o changeset: 1:925d80f479bb
892 |/ user: test
892 |/ user: test
893 | date: Thu Jan 01 00:00:00 1970 +0000
893 | date: Thu Jan 01 00:00:00 1970 +0000
894 | summary: 1
894 | summary: 1
895 |
895 |
896 o changeset: 0:f7b1eb17ad24
896 o changeset: 0:f7b1eb17ad24
897 user: test
897 user: test
898 date: Thu Jan 01 00:00:00 1970 +0000
898 date: Thu Jan 01 00:00:00 1970 +0000
899 summary: 0
899 summary: 0
900
900
901 $ hg book should-end-on-two
901 $ hg book should-end-on-two
902 $ hg co --clean 4
902 $ hg co --clean 4
903 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
903 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
904 (leaving bookmark should-end-on-two)
904 (leaving bookmark should-end-on-two)
905 $ hg book four
905 $ hg book four
906 $ hg --config extensions.mq= strip 3
906 $ hg --config extensions.mq= strip 3
907 saved backup bundle to * (glob)
907 saved backup bundle to * (glob)
908 should-end-on-two should end up pointing to revision 2, as that's the
908 should-end-on-two should end up pointing to revision 2, as that's the
909 tipmost surviving ancestor of the stripped revision.
909 tipmost surviving ancestor of the stripped revision.
910 $ hg log --graph
910 $ hg log --graph
911 @ changeset: 3:9ba5f110a0b3
911 @ changeset: 3:9ba5f110a0b3
912 | branch: test
912 | branch: test
913 | bookmark: four
913 | bookmark: four
914 | tag: tip
914 | tag: tip
915 | user: test
915 | user: test
916 | date: Thu Jan 01 00:00:00 1970 +0000
916 | date: Thu Jan 01 00:00:00 1970 +0000
917 | summary: y
917 | summary: y
918 |
918 |
919 o changeset: 2:db815d6d32e6
919 o changeset: 2:db815d6d32e6
920 | bookmark: should-end-on-two
920 | bookmark: should-end-on-two
921 | parent: 0:f7b1eb17ad24
921 | parent: 0:f7b1eb17ad24
922 | user: test
922 | user: test
923 | date: Thu Jan 01 00:00:00 1970 +0000
923 | date: Thu Jan 01 00:00:00 1970 +0000
924 | summary: 2
924 | summary: 2
925 |
925 |
926 | o changeset: 1:925d80f479bb
926 | o changeset: 1:925d80f479bb
927 |/ user: test
927 |/ user: test
928 | date: Thu Jan 01 00:00:00 1970 +0000
928 | date: Thu Jan 01 00:00:00 1970 +0000
929 | summary: 1
929 | summary: 1
930 |
930 |
931 o changeset: 0:f7b1eb17ad24
931 o changeset: 0:f7b1eb17ad24
932 user: test
932 user: test
933 date: Thu Jan 01 00:00:00 1970 +0000
933 date: Thu Jan 01 00:00:00 1970 +0000
934 summary: 0
934 summary: 0
935
935
936
936
937 no-op update doesn't deactivate bookmarks
937 no-op update doesn't deactivate bookmarks
938
938
939 (it is known issue that fsmonitor can't handle nested repositories. In
939 (it is known issue that fsmonitor can't handle nested repositories. In
940 this test scenario, cloned-bookmark-default and tobundle exist in the
940 this test scenario, cloned-bookmark-default and tobundle exist in the
941 working directory of current repository)
941 working directory of current repository)
942
942
943 $ hg bookmarks
943 $ hg bookmarks
944 * four 3:9ba5f110a0b3
944 * four 3:9ba5f110a0b3
945 should-end-on-two 2:db815d6d32e6
945 should-end-on-two 2:db815d6d32e6
946 $ hg up four
946 $ hg up four
947 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
947 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
948 $ hg up
948 $ hg up
949 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
949 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
950 $ hg sum
950 $ hg sum
951 parent: 3:9ba5f110a0b3 tip
951 parent: 3:9ba5f110a0b3 tip
952 y
952 y
953 branch: test
953 branch: test
954 bookmarks: *four
954 bookmarks: *four
955 commit: 2 unknown (clean) (no-fsmonitor !)
955 commit: 2 unknown (clean) (no-fsmonitor !)
956 commit: * unknown (clean) (glob) (fsmonitor !)
956 commit: * unknown (clean) (glob) (fsmonitor !)
957 update: (current)
957 update: (current)
958 phases: 4 draft
958 phases: 4 draft
959
959
960 test clearing divergent bookmarks of linear ancestors
960 test clearing divergent bookmarks of linear ancestors
961
961
962 $ hg bookmark Z -r 0
962 $ hg bookmark Z -r 0
963 $ hg bookmark Z@1 -r 1
963 $ hg bookmark Z@1 -r 1
964 $ hg bookmark Z@2 -r 2
964 $ hg bookmark Z@2 -r 2
965 $ hg bookmark Z@3 -r 3
965 $ hg bookmark Z@3 -r 3
966 $ hg book
966 $ hg book
967 Z 0:f7b1eb17ad24
967 Z 0:f7b1eb17ad24
968 Z@1 1:925d80f479bb
968 Z@1 1:925d80f479bb
969 Z@2 2:db815d6d32e6
969 Z@2 2:db815d6d32e6
970 Z@3 3:9ba5f110a0b3
970 Z@3 3:9ba5f110a0b3
971 * four 3:9ba5f110a0b3
971 * four 3:9ba5f110a0b3
972 should-end-on-two 2:db815d6d32e6
972 should-end-on-two 2:db815d6d32e6
973 $ hg bookmark Z
973 $ hg bookmark Z
974 moving bookmark 'Z' forward from f7b1eb17ad24
974 moving bookmark 'Z' forward from f7b1eb17ad24
975 $ hg book
975 $ hg book
976 * Z 3:9ba5f110a0b3
976 * Z 3:9ba5f110a0b3
977 Z@1 1:925d80f479bb
977 Z@1 1:925d80f479bb
978 four 3:9ba5f110a0b3
978 four 3:9ba5f110a0b3
979 should-end-on-two 2:db815d6d32e6
979 should-end-on-two 2:db815d6d32e6
980
980
981 test clearing only a single divergent bookmark across branches
981 test clearing only a single divergent bookmark across branches
982
982
983 $ hg book foo -r 1
983 $ hg book foo -r 1
984 $ hg book foo@1 -r 0
984 $ hg book foo@1 -r 0
985 $ hg book foo@2 -r 2
985 $ hg book foo@2 -r 2
986 $ hg book foo@3 -r 3
986 $ hg book foo@3 -r 3
987 $ hg book foo -r foo@3
987 $ hg book foo -r foo@3
988 $ hg book
988 $ hg book
989 * Z 3:9ba5f110a0b3
989 * Z 3:9ba5f110a0b3
990 Z@1 1:925d80f479bb
990 Z@1 1:925d80f479bb
991 foo 3:9ba5f110a0b3
991 foo 3:9ba5f110a0b3
992 foo@1 0:f7b1eb17ad24
992 foo@1 0:f7b1eb17ad24
993 foo@2 2:db815d6d32e6
993 foo@2 2:db815d6d32e6
994 four 3:9ba5f110a0b3
994 four 3:9ba5f110a0b3
995 should-end-on-two 2:db815d6d32e6
995 should-end-on-two 2:db815d6d32e6
996
996
997 pull --update works the same as pull && update (case #2)
997 pull --update works the same as pull && update (case #2)
998
998
999 It is assumed that "hg pull" itself doesn't update current active
999 It is assumed that "hg pull" itself doesn't update current active
1000 bookmark ('Y' in tests below).
1000 bookmark ('Y' in tests below).
1001
1001
1002 $ hg pull -q ../cloned-bookmarks-update
1002 $ hg pull -q ../cloned-bookmarks-update
1003 divergent bookmark Z stored as Z@2
1003 divergent bookmark Z stored as Z@2
1004
1004
1005 (pulling revision on another named branch with --update updates
1005 (pulling revision on another named branch with --update updates
1006 neither the working directory nor current active bookmark: "no-op"
1006 neither the working directory nor current active bookmark: "no-op"
1007 case)
1007 case)
1008
1008
1009 $ echo yy >> y
1009 $ echo yy >> y
1010 $ hg commit -m yy
1010 $ hg commit -m yy
1011
1011
1012 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1012 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1013 * Y 3:125c9a1d6df6
1013 * Y 3:125c9a1d6df6
1014 $ hg -R ../cloned-bookmarks-update pull . --update
1014 $ hg -R ../cloned-bookmarks-update pull . --update
1015 pulling from .
1015 pulling from .
1016 searching for changes
1016 searching for changes
1017 adding changesets
1017 adding changesets
1018 adding manifests
1018 adding manifests
1019 adding file changes
1019 adding file changes
1020 divergent bookmark Z stored as Z@default
1020 divergent bookmark Z stored as Z@default
1021 adding remote bookmark foo
1021 adding remote bookmark foo
1022 adding remote bookmark four
1022 adding remote bookmark four
1023 adding remote bookmark should-end-on-two
1023 adding remote bookmark should-end-on-two
1024 added 1 changesets with 1 changes to 1 files
1024 added 1 changesets with 1 changes to 1 files
1025 new changesets 5fb12f0f2d51
1025 new changesets 5fb12f0f2d51
1026 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1026 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1027 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
1027 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
1028 3:125c9a1d6df6
1028 3:125c9a1d6df6
1029 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1029 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1030 * Y 3:125c9a1d6df6
1030 * Y 3:125c9a1d6df6
1031
1031
1032 (pulling revision on current named/topological branch with --update
1032 (pulling revision on current named/topological branch with --update
1033 updates the working directory and current active bookmark)
1033 updates the working directory and current active bookmark)
1034
1034
1035 $ hg update -C -q 125c9a1d6df6
1035 $ hg update -C -q 125c9a1d6df6
1036 $ echo xx >> x
1036 $ echo xx >> x
1037 $ hg commit -m xx
1037 $ hg commit -m xx
1038
1038
1039 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1039 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1040 * Y 3:125c9a1d6df6
1040 * Y 3:125c9a1d6df6
1041 $ hg -R ../cloned-bookmarks-update pull . --update
1041 $ hg -R ../cloned-bookmarks-update pull . --update
1042 pulling from .
1042 pulling from .
1043 searching for changes
1043 searching for changes
1044 adding changesets
1044 adding changesets
1045 adding manifests
1045 adding manifests
1046 adding file changes
1046 adding file changes
1047 divergent bookmark Z stored as Z@default
1047 divergent bookmark Z stored as Z@default
1048 added 1 changesets with 1 changes to 1 files
1048 added 1 changesets with 1 changes to 1 files
1049 new changesets 81dcce76aa0b
1049 new changesets 81dcce76aa0b
1050 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1050 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1051 updating bookmark Y
1051 updating bookmark Y
1052 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
1052 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
1053 6:81dcce76aa0b
1053 6:81dcce76aa0b
1054 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1054 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
1055 * Y 6:81dcce76aa0b
1055 * Y 6:81dcce76aa0b
1056
1056
1057 $ cd ..
1057 $ cd ..
1058
1058
1059 ensure changelog is written before bookmarks
1059 ensure changelog is written before bookmarks
1060 $ hg init orderrepo
1060 $ hg init orderrepo
1061 $ cd orderrepo
1061 $ cd orderrepo
1062 $ touch a
1062 $ touch a
1063 $ hg commit -Aqm one
1063 $ hg commit -Aqm one
1064 $ hg book mybook
1064 $ hg book mybook
1065 $ echo a > a
1065 $ echo a > a
1066
1066
1067 $ cat > $TESTTMP/pausefinalize.py <<EOF
1067 $ cat > $TESTTMP/pausefinalize.py <<EOF
1068 > from __future__ import absolute_import
1068 > from __future__ import absolute_import
1069 > import os
1069 > import os
1070 > import time
1070 > import time
1071 > from mercurial import extensions, localrepo
1071 > from mercurial import extensions, localrepo
1072 > def transaction(orig, self, desc, report=None):
1072 > def transaction(orig, self, desc, report=None):
1073 > tr = orig(self, desc, report)
1073 > tr = orig(self, desc, report)
1074 > def sleep(*args, **kwargs):
1074 > def sleep(*args, **kwargs):
1075 > retry = 20
1075 > retry = 20
1076 > while retry > 0 and not os.path.exists(b"$TESTTMP/unpause"):
1076 > while retry > 0 and not os.path.exists(b"$TESTTMP/unpause"):
1077 > retry -= 1
1077 > retry -= 1
1078 > time.sleep(0.5)
1078 > time.sleep(0.5)
1079 > if os.path.exists(b"$TESTTMP/unpause"):
1079 > if os.path.exists(b"$TESTTMP/unpause"):
1080 > os.remove(b"$TESTTMP/unpause")
1080 > os.remove(b"$TESTTMP/unpause")
1081 > # It is important that this finalizer start with 'a', so it runs before
1081 > # It is important that this finalizer start with 'a', so it runs before
1082 > # the changelog finalizer appends to the changelog.
1082 > # the changelog finalizer appends to the changelog.
1083 > tr.addfinalize(b'a-sleep', sleep)
1083 > tr.addfinalize(b'a-sleep', sleep)
1084 > return tr
1084 > return tr
1085 >
1085 >
1086 > def extsetup(ui):
1086 > def extsetup(ui):
1087 > # This extension inserts an artifical pause during the transaction
1087 > # This extension inserts an artifical pause during the transaction
1088 > # finalizer, so we can run commands mid-transaction-close.
1088 > # finalizer, so we can run commands mid-transaction-close.
1089 > extensions.wrapfunction(localrepo.localrepository, 'transaction',
1089 > extensions.wrapfunction(localrepo.localrepository, 'transaction',
1090 > transaction)
1090 > transaction)
1091 > EOF
1091 > EOF
1092 $ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
1092 $ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
1093 $ sleep 2
1093 $ sleep 2
1094 $ hg log -r .
1094 $ hg log -r .
1095 changeset: 0:867bc5792c8c
1095 changeset: 0:867bc5792c8c
1096 bookmark: mybook
1096 bookmark: mybook
1097 tag: tip
1097 tag: tip
1098 user: test
1098 user: test
1099 date: Thu Jan 01 00:00:00 1970 +0000
1099 date: Thu Jan 01 00:00:00 1970 +0000
1100 summary: one
1100 summary: one
1101
1101
1102 $ hg bookmarks
1102 $ hg bookmarks
1103 * mybook 0:867bc5792c8c
1103 * mybook 0:867bc5792c8c
1104 $ touch $TESTTMP/unpause
1104 $ touch $TESTTMP/unpause
1105
1105
1106 $ cd ..
1106 $ cd ..
1107
1107
1108 check whether HG_PENDING makes pending changes only in related
1108 check whether HG_PENDING makes pending changes only in related
1109 repositories visible to an external hook.
1109 repositories visible to an external hook.
1110
1110
1111 (emulate a transaction running concurrently by copied
1111 (emulate a transaction running concurrently by copied
1112 .hg/bookmarks.pending in subsequent test)
1112 .hg/bookmarks.pending in subsequent test)
1113
1113
1114 $ cat > $TESTTMP/savepending.sh <<EOF
1114 $ cat > $TESTTMP/savepending.sh <<EOF
1115 > cp .hg/bookmarks.pending .hg/bookmarks.pending.saved
1115 > cp .hg/bookmarks.pending .hg/bookmarks.pending.saved
1116 > exit 1 # to avoid adding new bookmark for subsequent tests
1116 > exit 1 # to avoid adding new bookmark for subsequent tests
1117 > EOF
1117 > EOF
1118
1118
1119 $ hg init unrelated
1119 $ hg init unrelated
1120 $ cd unrelated
1120 $ cd unrelated
1121 $ echo a > a
1121 $ echo a > a
1122 $ hg add a
1122 $ hg add a
1123 $ hg commit -m '#0'
1123 $ hg commit -m '#0'
1124 $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" bookmarks INVISIBLE
1124 $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" bookmarks INVISIBLE
1125 transaction abort!
1125 transaction abort!
1126 rollback completed
1126 rollback completed
1127 abort: pretxnclose hook exited with status 1
1127 abort: pretxnclose hook exited with status 1
1128 [255]
1128 [255]
1129 $ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending
1129 $ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending
1130
1130
1131 (check visible bookmarks while transaction running in repo)
1131 (check visible bookmarks while transaction running in repo)
1132
1132
1133 $ cat > $TESTTMP/checkpending.sh <<EOF
1133 $ cat > $TESTTMP/checkpending.sh <<EOF
1134 > echo "@repo"
1134 > echo "@repo"
1135 > hg -R "$TESTTMP/repo" bookmarks
1135 > hg -R "$TESTTMP/repo" bookmarks
1136 > echo "@unrelated"
1136 > echo "@unrelated"
1137 > hg -R "$TESTTMP/unrelated" bookmarks
1137 > hg -R "$TESTTMP/unrelated" bookmarks
1138 > exit 1 # to avoid adding new bookmark for subsequent tests
1138 > exit 1 # to avoid adding new bookmark for subsequent tests
1139 > EOF
1139 > EOF
1140
1140
1141 $ cd ../repo
1141 $ cd ../repo
1142 $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" bookmarks NEW
1142 $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" bookmarks NEW
1143 @repo
1143 @repo
1144 * NEW 6:81dcce76aa0b
1144 * NEW 6:81dcce76aa0b
1145 X2 1:925d80f479bb
1145 X2 1:925d80f479bb
1146 Y 4:125c9a1d6df6
1146 Y 4:125c9a1d6df6
1147 Z 5:5fb12f0f2d51
1147 Z 5:5fb12f0f2d51
1148 Z@1 1:925d80f479bb
1148 Z@1 1:925d80f479bb
1149 Z@2 4:125c9a1d6df6
1149 Z@2 4:125c9a1d6df6
1150 foo 3:9ba5f110a0b3
1150 foo 3:9ba5f110a0b3
1151 foo@1 0:f7b1eb17ad24
1151 foo@1 0:f7b1eb17ad24
1152 foo@2 2:db815d6d32e6
1152 foo@2 2:db815d6d32e6
1153 four 3:9ba5f110a0b3
1153 four 3:9ba5f110a0b3
1154 should-end-on-two 2:db815d6d32e6
1154 should-end-on-two 2:db815d6d32e6
1155 x y 2:db815d6d32e6
1155 x y 2:db815d6d32e6
1156 @unrelated
1156 @unrelated
1157 no bookmarks set
1157 no bookmarks set
1158 transaction abort!
1158 transaction abort!
1159 rollback completed
1159 rollback completed
1160 abort: pretxnclose hook exited with status 1
1160 abort: pretxnclose hook exited with status 1
1161 [255]
1161 [255]
1162
1162
1163 Check pretxnclose-bookmark can abort a transaction
1163 Check pretxnclose-bookmark can abort a transaction
1164 --------------------------------------------------
1164 --------------------------------------------------
1165
1165
1166 add hooks:
1166 add hooks:
1167
1167
1168 * to prevent NEW bookmark on a non-public changeset
1168 * to prevent NEW bookmark on a non-public changeset
1169 * to prevent non-forward move of NEW bookmark
1169 * to prevent non-forward move of NEW bookmark
1170
1170
1171 $ cat << EOF >> .hg/hgrc
1171 $ cat << EOF >> .hg/hgrc
1172 > [hooks]
1172 > [hooks]
1173 > pretxnclose-bookmark.force-public = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"\$HG_NODE\" -T '{phase}' | grep public > /dev/null)"
1173 > pretxnclose-bookmark.force-public = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"\$HG_NODE\" -T '{phase}' | grep public > /dev/null)"
1174 > pretxnclose-bookmark.force-forward = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"max(\$HG_OLDNODE::\$HG_NODE)\" -T 'MATCH' | grep MATCH > /dev/null)"
1174 > pretxnclose-bookmark.force-forward = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"max(\$HG_OLDNODE::\$HG_NODE)\" -T 'MATCH' | grep MATCH > /dev/null)"
1175 > EOF
1175 > EOF
1176
1176
1177 $ hg log -G -T phases
1177 $ hg log -G -T phases
1178 @ changeset: 6:81dcce76aa0b
1178 @ changeset: 6:81dcce76aa0b
1179 | tag: tip
1179 | tag: tip
1180 | phase: draft
1180 | phase: draft
1181 | parent: 4:125c9a1d6df6
1181 | parent: 4:125c9a1d6df6
1182 | user: test
1182 | user: test
1183 | date: Thu Jan 01 00:00:00 1970 +0000
1183 | date: Thu Jan 01 00:00:00 1970 +0000
1184 | summary: xx
1184 | summary: xx
1185 |
1185 |
1186 | o changeset: 5:5fb12f0f2d51
1186 | o changeset: 5:5fb12f0f2d51
1187 | | branch: test
1187 | | branch: test
1188 | | bookmark: Z
1188 | | bookmark: Z
1189 | | phase: draft
1189 | | phase: draft
1190 | | parent: 3:9ba5f110a0b3
1190 | | parent: 3:9ba5f110a0b3
1191 | | user: test
1191 | | user: test
1192 | | date: Thu Jan 01 00:00:00 1970 +0000
1192 | | date: Thu Jan 01 00:00:00 1970 +0000
1193 | | summary: yy
1193 | | summary: yy
1194 | |
1194 | |
1195 o | changeset: 4:125c9a1d6df6
1195 o | changeset: 4:125c9a1d6df6
1196 | | bookmark: Y
1196 | | bookmark: Y
1197 | | bookmark: Z@2
1197 | | bookmark: Z@2
1198 | | phase: public
1198 | | phase: public
1199 | | parent: 2:db815d6d32e6
1199 | | parent: 2:db815d6d32e6
1200 | | user: test
1200 | | user: test
1201 | | date: Thu Jan 01 00:00:00 1970 +0000
1201 | | date: Thu Jan 01 00:00:00 1970 +0000
1202 | | summary: x
1202 | | summary: x
1203 | |
1203 | |
1204 | o changeset: 3:9ba5f110a0b3
1204 | o changeset: 3:9ba5f110a0b3
1205 |/ branch: test
1205 |/ branch: test
1206 | bookmark: foo
1206 | bookmark: foo
1207 | bookmark: four
1207 | bookmark: four
1208 | phase: public
1208 | phase: public
1209 | user: test
1209 | user: test
1210 | date: Thu Jan 01 00:00:00 1970 +0000
1210 | date: Thu Jan 01 00:00:00 1970 +0000
1211 | summary: y
1211 | summary: y
1212 |
1212 |
1213 o changeset: 2:db815d6d32e6
1213 o changeset: 2:db815d6d32e6
1214 | bookmark: foo@2
1214 | bookmark: foo@2
1215 | bookmark: should-end-on-two
1215 | bookmark: should-end-on-two
1216 | bookmark: x y
1216 | bookmark: x y
1217 | phase: public
1217 | phase: public
1218 | parent: 0:f7b1eb17ad24
1218 | parent: 0:f7b1eb17ad24
1219 | user: test
1219 | user: test
1220 | date: Thu Jan 01 00:00:00 1970 +0000
1220 | date: Thu Jan 01 00:00:00 1970 +0000
1221 | summary: 2
1221 | summary: 2
1222 |
1222 |
1223 | o changeset: 1:925d80f479bb
1223 | o changeset: 1:925d80f479bb
1224 |/ bookmark: X2
1224 |/ bookmark: X2
1225 | bookmark: Z@1
1225 | bookmark: Z@1
1226 | phase: public
1226 | phase: public
1227 | user: test
1227 | user: test
1228 | date: Thu Jan 01 00:00:00 1970 +0000
1228 | date: Thu Jan 01 00:00:00 1970 +0000
1229 | summary: 1
1229 | summary: 1
1230 |
1230 |
1231 o changeset: 0:f7b1eb17ad24
1231 o changeset: 0:f7b1eb17ad24
1232 bookmark: foo@1
1232 bookmark: foo@1
1233 phase: public
1233 phase: public
1234 user: test
1234 user: test
1235 date: Thu Jan 01 00:00:00 1970 +0000
1235 date: Thu Jan 01 00:00:00 1970 +0000
1236 summary: 0
1236 summary: 0
1237
1237
1238
1238
1239 attempt to create on a default changeset
1239 attempt to create on a default changeset
1240
1240
1241 $ hg bookmark -r 81dcce76aa0b NEW
1241 $ hg bookmark -r 81dcce76aa0b NEW
1242 transaction abort!
1242 transaction abort!
1243 rollback completed
1243 rollback completed
1244 abort: pretxnclose-bookmark.force-public hook exited with status 1
1244 abort: pretxnclose-bookmark.force-public hook exited with status 1
1245 [255]
1245 [255]
1246
1246
1247 create on a public changeset
1247 create on a public changeset
1248
1248
1249 $ hg bookmark -r 9ba5f110a0b3 NEW
1249 $ hg bookmark -r 9ba5f110a0b3 NEW
1250
1250
1251 move to the other branch
1251 move to the other branch
1252
1252
1253 $ hg bookmark -f -r 125c9a1d6df6 NEW
1253 $ hg bookmark -f -r 125c9a1d6df6 NEW
1254 transaction abort!
1254 transaction abort!
1255 rollback completed
1255 rollback completed
1256 abort: pretxnclose-bookmark.force-forward hook exited with status 1
1256 abort: pretxnclose-bookmark.force-forward hook exited with status 1
1257 [255]
1257 [255]
General Comments 0
You need to be logged in to leave comments. Login now