##// END OF EJS Templates
graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop...
Martin von Zweigbergk -
r45553:6118ad07 default
parent child Browse files
Show More
@@ -1,7843 +1,7842 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 mergestate as mergestatemod,
49 mergestate as mergestatemod,
50 narrowspec,
50 narrowspec,
51 obsolete,
51 obsolete,
52 obsutil,
52 obsutil,
53 patch,
53 patch,
54 phases,
54 phases,
55 pycompat,
55 pycompat,
56 rcutil,
56 rcutil,
57 registrar,
57 registrar,
58 revsetlang,
58 revsetlang,
59 rewriteutil,
59 rewriteutil,
60 scmutil,
60 scmutil,
61 server,
61 server,
62 shelve as shelvemod,
62 shelve as shelvemod,
63 state as statemod,
63 state as statemod,
64 streamclone,
64 streamclone,
65 tags as tagsmod,
65 tags as tagsmod,
66 ui as uimod,
66 ui as uimod,
67 util,
67 util,
68 verify as verifymod,
68 verify as verifymod,
69 wireprotoserver,
69 wireprotoserver,
70 )
70 )
71 from .utils import (
71 from .utils import (
72 dateutil,
72 dateutil,
73 stringutil,
73 stringutil,
74 )
74 )
75
75
76 table = {}
76 table = {}
77 table.update(debugcommandsmod.command._table)
77 table.update(debugcommandsmod.command._table)
78
78
79 command = registrar.command(table)
79 command = registrar.command(table)
80 INTENT_READONLY = registrar.INTENT_READONLY
80 INTENT_READONLY = registrar.INTENT_READONLY
81
81
82 # common command options
82 # common command options
83
83
84 globalopts = [
84 globalopts = [
85 (
85 (
86 b'R',
86 b'R',
87 b'repository',
87 b'repository',
88 b'',
88 b'',
89 _(b'repository root directory or name of overlay bundle file'),
89 _(b'repository root directory or name of overlay bundle file'),
90 _(b'REPO'),
90 _(b'REPO'),
91 ),
91 ),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
93 (
93 (
94 b'y',
94 b'y',
95 b'noninteractive',
95 b'noninteractive',
96 None,
96 None,
97 _(
97 _(
98 b'do not prompt, automatically pick the first choice for all prompts'
98 b'do not prompt, automatically pick the first choice for all prompts'
99 ),
99 ),
100 ),
100 ),
101 (b'q', b'quiet', None, _(b'suppress output')),
101 (b'q', b'quiet', None, _(b'suppress output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
102 (b'v', b'verbose', None, _(b'enable additional output')),
103 (
103 (
104 b'',
104 b'',
105 b'color',
105 b'color',
106 b'',
106 b'',
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
108 # and should not be translated
108 # and should not be translated
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 _(b"when to colorize (boolean, always, auto, never, or debug)"),
110 _(b'TYPE'),
110 _(b'TYPE'),
111 ),
111 ),
112 (
112 (
113 b'',
113 b'',
114 b'config',
114 b'config',
115 [],
115 [],
116 _(b'set/override config option (use \'section.name=value\')'),
116 _(b'set/override config option (use \'section.name=value\')'),
117 _(b'CONFIG'),
117 _(b'CONFIG'),
118 ),
118 ),
119 (b'', b'debug', None, _(b'enable debugging output')),
119 (b'', b'debug', None, _(b'enable debugging output')),
120 (b'', b'debugger', None, _(b'start debugger')),
120 (b'', b'debugger', None, _(b'start debugger')),
121 (
121 (
122 b'',
122 b'',
123 b'encoding',
123 b'encoding',
124 encoding.encoding,
124 encoding.encoding,
125 _(b'set the charset encoding'),
125 _(b'set the charset encoding'),
126 _(b'ENCODE'),
126 _(b'ENCODE'),
127 ),
127 ),
128 (
128 (
129 b'',
129 b'',
130 b'encodingmode',
130 b'encodingmode',
131 encoding.encodingmode,
131 encoding.encodingmode,
132 _(b'set the charset encoding mode'),
132 _(b'set the charset encoding mode'),
133 _(b'MODE'),
133 _(b'MODE'),
134 ),
134 ),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 (b'', b'traceback', None, _(b'always print a traceback on exception')),
136 (b'', b'time', None, _(b'time how long the command takes')),
136 (b'', b'time', None, _(b'time how long the command takes')),
137 (b'', b'profile', None, _(b'print command execution profile')),
137 (b'', b'profile', None, _(b'print command execution profile')),
138 (b'', b'version', None, _(b'output version information and exit')),
138 (b'', b'version', None, _(b'output version information and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
139 (b'h', b'help', None, _(b'display help and exit')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 (b'', b'hidden', False, _(b'consider hidden changesets')),
141 (
141 (
142 b'',
142 b'',
143 b'pager',
143 b'pager',
144 b'auto',
144 b'auto',
145 _(b"when to paginate (boolean, always, auto, or never)"),
145 _(b"when to paginate (boolean, always, auto, or never)"),
146 _(b'TYPE'),
146 _(b'TYPE'),
147 ),
147 ),
148 ]
148 ]
149
149
150 dryrunopts = cmdutil.dryrunopts
150 dryrunopts = cmdutil.dryrunopts
151 remoteopts = cmdutil.remoteopts
151 remoteopts = cmdutil.remoteopts
152 walkopts = cmdutil.walkopts
152 walkopts = cmdutil.walkopts
153 commitopts = cmdutil.commitopts
153 commitopts = cmdutil.commitopts
154 commitopts2 = cmdutil.commitopts2
154 commitopts2 = cmdutil.commitopts2
155 commitopts3 = cmdutil.commitopts3
155 commitopts3 = cmdutil.commitopts3
156 formatteropts = cmdutil.formatteropts
156 formatteropts = cmdutil.formatteropts
157 templateopts = cmdutil.templateopts
157 templateopts = cmdutil.templateopts
158 logopts = cmdutil.logopts
158 logopts = cmdutil.logopts
159 diffopts = cmdutil.diffopts
159 diffopts = cmdutil.diffopts
160 diffwsopts = cmdutil.diffwsopts
160 diffwsopts = cmdutil.diffwsopts
161 diffopts2 = cmdutil.diffopts2
161 diffopts2 = cmdutil.diffopts2
162 mergetoolopts = cmdutil.mergetoolopts
162 mergetoolopts = cmdutil.mergetoolopts
163 similarityopts = cmdutil.similarityopts
163 similarityopts = cmdutil.similarityopts
164 subrepoopts = cmdutil.subrepoopts
164 subrepoopts = cmdutil.subrepoopts
165 debugrevlogopts = cmdutil.debugrevlogopts
165 debugrevlogopts = cmdutil.debugrevlogopts
166
166
167 # Commands start here, listed alphabetically
167 # Commands start here, listed alphabetically
168
168
169
169
170 @command(
170 @command(
171 b'abort',
171 b'abort',
172 dryrunopts,
172 dryrunopts,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
174 helpbasic=True,
174 helpbasic=True,
175 )
175 )
176 def abort(ui, repo, **opts):
176 def abort(ui, repo, **opts):
177 """abort an unfinished operation (EXPERIMENTAL)
177 """abort an unfinished operation (EXPERIMENTAL)
178
178
179 Aborts a multistep operation like graft, histedit, rebase, merge,
179 Aborts a multistep operation like graft, histedit, rebase, merge,
180 and unshelve if they are in an unfinished state.
180 and unshelve if they are in an unfinished state.
181
181
182 use --dry-run/-n to dry run the command.
182 use --dry-run/-n to dry run the command.
183 """
183 """
184 dryrun = opts.get('dry_run')
184 dryrun = opts.get('dry_run')
185 abortstate = cmdutil.getunfinishedstate(repo)
185 abortstate = cmdutil.getunfinishedstate(repo)
186 if not abortstate:
186 if not abortstate:
187 raise error.Abort(_(b'no operation in progress'))
187 raise error.Abort(_(b'no operation in progress'))
188 if not abortstate.abortfunc:
188 if not abortstate.abortfunc:
189 raise error.Abort(
189 raise error.Abort(
190 (
190 (
191 _(b"%s in progress but does not support 'hg abort'")
191 _(b"%s in progress but does not support 'hg abort'")
192 % (abortstate._opname)
192 % (abortstate._opname)
193 ),
193 ),
194 hint=abortstate.hint(),
194 hint=abortstate.hint(),
195 )
195 )
196 if dryrun:
196 if dryrun:
197 ui.status(
197 ui.status(
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
199 )
199 )
200 return
200 return
201 return abortstate.abortfunc(ui, repo)
201 return abortstate.abortfunc(ui, repo)
202
202
203
203
204 @command(
204 @command(
205 b'add',
205 b'add',
206 walkopts + subrepoopts + dryrunopts,
206 walkopts + subrepoopts + dryrunopts,
207 _(b'[OPTION]... [FILE]...'),
207 _(b'[OPTION]... [FILE]...'),
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
209 helpbasic=True,
209 helpbasic=True,
210 inferrepo=True,
210 inferrepo=True,
211 )
211 )
212 def add(ui, repo, *pats, **opts):
212 def add(ui, repo, *pats, **opts):
213 """add the specified files on the next commit
213 """add the specified files on the next commit
214
214
215 Schedule files to be version controlled and added to the
215 Schedule files to be version controlled and added to the
216 repository.
216 repository.
217
217
218 The files will be added to the repository at the next commit. To
218 The files will be added to the repository at the next commit. To
219 undo an add before that, see :hg:`forget`.
219 undo an add before that, see :hg:`forget`.
220
220
221 If no names are given, add all files to the repository (except
221 If no names are given, add all files to the repository (except
222 files matching ``.hgignore``).
222 files matching ``.hgignore``).
223
223
224 .. container:: verbose
224 .. container:: verbose
225
225
226 Examples:
226 Examples:
227
227
228 - New (unknown) files are added
228 - New (unknown) files are added
229 automatically by :hg:`add`::
229 automatically by :hg:`add`::
230
230
231 $ ls
231 $ ls
232 foo.c
232 foo.c
233 $ hg status
233 $ hg status
234 ? foo.c
234 ? foo.c
235 $ hg add
235 $ hg add
236 adding foo.c
236 adding foo.c
237 $ hg status
237 $ hg status
238 A foo.c
238 A foo.c
239
239
240 - Specific files to be added can be specified::
240 - Specific files to be added can be specified::
241
241
242 $ ls
242 $ ls
243 bar.c foo.c
243 bar.c foo.c
244 $ hg status
244 $ hg status
245 ? bar.c
245 ? bar.c
246 ? foo.c
246 ? foo.c
247 $ hg add bar.c
247 $ hg add bar.c
248 $ hg status
248 $ hg status
249 A bar.c
249 A bar.c
250 ? foo.c
250 ? foo.c
251
251
252 Returns 0 if all files are successfully added.
252 Returns 0 if all files are successfully added.
253 """
253 """
254
254
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
258 return rejected and 1 or 0
258 return rejected and 1 or 0
259
259
260
260
261 @command(
261 @command(
262 b'addremove',
262 b'addremove',
263 similarityopts + subrepoopts + walkopts + dryrunopts,
263 similarityopts + subrepoopts + walkopts + dryrunopts,
264 _(b'[OPTION]... [FILE]...'),
264 _(b'[OPTION]... [FILE]...'),
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
266 inferrepo=True,
266 inferrepo=True,
267 )
267 )
268 def addremove(ui, repo, *pats, **opts):
268 def addremove(ui, repo, *pats, **opts):
269 """add all new files, delete all missing files
269 """add all new files, delete all missing files
270
270
271 Add all new files and remove all missing files from the
271 Add all new files and remove all missing files from the
272 repository.
272 repository.
273
273
274 Unless names are given, new files are ignored if they match any of
274 Unless names are given, new files are ignored if they match any of
275 the patterns in ``.hgignore``. As with add, these changes take
275 the patterns in ``.hgignore``. As with add, these changes take
276 effect at the next commit.
276 effect at the next commit.
277
277
278 Use the -s/--similarity option to detect renamed files. This
278 Use the -s/--similarity option to detect renamed files. This
279 option takes a percentage between 0 (disabled) and 100 (files must
279 option takes a percentage between 0 (disabled) and 100 (files must
280 be identical) as its parameter. With a parameter greater than 0,
280 be identical) as its parameter. With a parameter greater than 0,
281 this compares every removed file with every added file and records
281 this compares every removed file with every added file and records
282 those similar enough as renames. Detecting renamed files this way
282 those similar enough as renames. Detecting renamed files this way
283 can be expensive. After using this option, :hg:`status -C` can be
283 can be expensive. After using this option, :hg:`status -C` can be
284 used to check which files were identified as moved or renamed. If
284 used to check which files were identified as moved or renamed. If
285 not specified, -s/--similarity defaults to 100 and only renames of
285 not specified, -s/--similarity defaults to 100 and only renames of
286 identical files are detected.
286 identical files are detected.
287
287
288 .. container:: verbose
288 .. container:: verbose
289
289
290 Examples:
290 Examples:
291
291
292 - A number of files (bar.c and foo.c) are new,
292 - A number of files (bar.c and foo.c) are new,
293 while foobar.c has been removed (without using :hg:`remove`)
293 while foobar.c has been removed (without using :hg:`remove`)
294 from the repository::
294 from the repository::
295
295
296 $ ls
296 $ ls
297 bar.c foo.c
297 bar.c foo.c
298 $ hg status
298 $ hg status
299 ! foobar.c
299 ! foobar.c
300 ? bar.c
300 ? bar.c
301 ? foo.c
301 ? foo.c
302 $ hg addremove
302 $ hg addremove
303 adding bar.c
303 adding bar.c
304 adding foo.c
304 adding foo.c
305 removing foobar.c
305 removing foobar.c
306 $ hg status
306 $ hg status
307 A bar.c
307 A bar.c
308 A foo.c
308 A foo.c
309 R foobar.c
309 R foobar.c
310
310
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 - A file foobar.c was moved to foo.c without using :hg:`rename`.
312 Afterwards, it was edited slightly::
312 Afterwards, it was edited slightly::
313
313
314 $ ls
314 $ ls
315 foo.c
315 foo.c
316 $ hg status
316 $ hg status
317 ! foobar.c
317 ! foobar.c
318 ? foo.c
318 ? foo.c
319 $ hg addremove --similarity 90
319 $ hg addremove --similarity 90
320 removing foobar.c
320 removing foobar.c
321 adding foo.c
321 adding foo.c
322 recording removal of foobar.c as rename to foo.c (94% similar)
322 recording removal of foobar.c as rename to foo.c (94% similar)
323 $ hg status -C
323 $ hg status -C
324 A foo.c
324 A foo.c
325 foobar.c
325 foobar.c
326 R foobar.c
326 R foobar.c
327
327
328 Returns 0 if all files are successfully added.
328 Returns 0 if all files are successfully added.
329 """
329 """
330 opts = pycompat.byteskwargs(opts)
330 opts = pycompat.byteskwargs(opts)
331 if not opts.get(b'similarity'):
331 if not opts.get(b'similarity'):
332 opts[b'similarity'] = b'100'
332 opts[b'similarity'] = b'100'
333 matcher = scmutil.match(repo[None], pats, opts)
333 matcher = scmutil.match(repo[None], pats, opts)
334 relative = scmutil.anypats(pats, opts)
334 relative = scmutil.anypats(pats, opts)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
337
337
338
338
339 @command(
339 @command(
340 b'annotate|blame',
340 b'annotate|blame',
341 [
341 [
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
343 (
343 (
344 b'',
344 b'',
345 b'follow',
345 b'follow',
346 None,
346 None,
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 _(b'follow copies/renames and list the filename (DEPRECATED)'),
348 ),
348 ),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
350 (b'a', b'text', None, _(b'treat all files as text')),
350 (b'a', b'text', None, _(b'treat all files as text')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 (b'u', b'user', None, _(b'list the author (long with -v)')),
352 (b'f', b'file', None, _(b'list the filename')),
352 (b'f', b'file', None, _(b'list the filename')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 (b'd', b'date', None, _(b'list the date (short with -q)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
354 (b'n', b'number', None, _(b'list the revision number (default)')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
355 (b'c', b'changeset', None, _(b'list the changeset')),
356 (
356 (
357 b'l',
357 b'l',
358 b'line-number',
358 b'line-number',
359 None,
359 None,
360 _(b'show line number at the first appearance'),
360 _(b'show line number at the first appearance'),
361 ),
361 ),
362 (
362 (
363 b'',
363 b'',
364 b'skip',
364 b'skip',
365 [],
365 [],
366 _(b'revset to not display (EXPERIMENTAL)'),
366 _(b'revset to not display (EXPERIMENTAL)'),
367 _(b'REV'),
367 _(b'REV'),
368 ),
368 ),
369 ]
369 ]
370 + diffwsopts
370 + diffwsopts
371 + walkopts
371 + walkopts
372 + formatteropts,
372 + formatteropts,
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 helpcategory=command.CATEGORY_FILE_CONTENTS,
375 helpbasic=True,
375 helpbasic=True,
376 inferrepo=True,
376 inferrepo=True,
377 )
377 )
378 def annotate(ui, repo, *pats, **opts):
378 def annotate(ui, repo, *pats, **opts):
379 """show changeset information by line for each file
379 """show changeset information by line for each file
380
380
381 List changes in files, showing the revision id responsible for
381 List changes in files, showing the revision id responsible for
382 each line.
382 each line.
383
383
384 This command is useful for discovering when a change was made and
384 This command is useful for discovering when a change was made and
385 by whom.
385 by whom.
386
386
387 If you include --file, --user, or --date, the revision number is
387 If you include --file, --user, or --date, the revision number is
388 suppressed unless you also include --number.
388 suppressed unless you also include --number.
389
389
390 Without the -a/--text option, annotate will avoid processing files
390 Without the -a/--text option, annotate will avoid processing files
391 it detects as binary. With -a, annotate will annotate the file
391 it detects as binary. With -a, annotate will annotate the file
392 anyway, although the results will probably be neither useful
392 anyway, although the results will probably be neither useful
393 nor desirable.
393 nor desirable.
394
394
395 .. container:: verbose
395 .. container:: verbose
396
396
397 Template:
397 Template:
398
398
399 The following keywords are supported in addition to the common template
399 The following keywords are supported in addition to the common template
400 keywords and functions. See also :hg:`help templates`.
400 keywords and functions. See also :hg:`help templates`.
401
401
402 :lines: List of lines with annotation data.
402 :lines: List of lines with annotation data.
403 :path: String. Repository-absolute path of the specified file.
403 :path: String. Repository-absolute path of the specified file.
404
404
405 And each entry of ``{lines}`` provides the following sub-keywords in
405 And each entry of ``{lines}`` provides the following sub-keywords in
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
407
407
408 :line: String. Line content.
408 :line: String. Line content.
409 :lineno: Integer. Line number at that revision.
409 :lineno: Integer. Line number at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
410 :path: String. Repository-absolute path of the file at that revision.
411
411
412 See :hg:`help templates.operators` for the list expansion syntax.
412 See :hg:`help templates.operators` for the list expansion syntax.
413
413
414 Returns 0 on success.
414 Returns 0 on success.
415 """
415 """
416 opts = pycompat.byteskwargs(opts)
416 opts = pycompat.byteskwargs(opts)
417 if not pats:
417 if not pats:
418 raise error.Abort(_(b'at least one filename or pattern is required'))
418 raise error.Abort(_(b'at least one filename or pattern is required'))
419
419
420 if opts.get(b'follow'):
420 if opts.get(b'follow'):
421 # --follow is deprecated and now just an alias for -f/--file
421 # --follow is deprecated and now just an alias for -f/--file
422 # to mimic the behavior of Mercurial before version 1.5
422 # to mimic the behavior of Mercurial before version 1.5
423 opts[b'file'] = True
423 opts[b'file'] = True
424
424
425 if (
425 if (
426 not opts.get(b'user')
426 not opts.get(b'user')
427 and not opts.get(b'changeset')
427 and not opts.get(b'changeset')
428 and not opts.get(b'date')
428 and not opts.get(b'date')
429 and not opts.get(b'file')
429 and not opts.get(b'file')
430 ):
430 ):
431 opts[b'number'] = True
431 opts[b'number'] = True
432
432
433 linenumber = opts.get(b'line_number') is not None
433 linenumber = opts.get(b'line_number') is not None
434 if (
434 if (
435 linenumber
435 linenumber
436 and (not opts.get(b'changeset'))
436 and (not opts.get(b'changeset'))
437 and (not opts.get(b'number'))
437 and (not opts.get(b'number'))
438 ):
438 ):
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
440
440
441 rev = opts.get(b'rev')
441 rev = opts.get(b'rev')
442 if rev:
442 if rev:
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
444 ctx = scmutil.revsingle(repo, rev)
444 ctx = scmutil.revsingle(repo, rev)
445
445
446 ui.pager(b'annotate')
446 ui.pager(b'annotate')
447 rootfm = ui.formatter(b'annotate', opts)
447 rootfm = ui.formatter(b'annotate', opts)
448 if ui.debugflag:
448 if ui.debugflag:
449 shorthex = pycompat.identity
449 shorthex = pycompat.identity
450 else:
450 else:
451
451
452 def shorthex(h):
452 def shorthex(h):
453 return h[:12]
453 return h[:12]
454
454
455 if ui.quiet:
455 if ui.quiet:
456 datefunc = dateutil.shortdate
456 datefunc = dateutil.shortdate
457 else:
457 else:
458 datefunc = dateutil.datestr
458 datefunc = dateutil.datestr
459 if ctx.rev() is None:
459 if ctx.rev() is None:
460 if opts.get(b'changeset'):
460 if opts.get(b'changeset'):
461 # omit "+" suffix which is appended to node hex
461 # omit "+" suffix which is appended to node hex
462 def formatrev(rev):
462 def formatrev(rev):
463 if rev == wdirrev:
463 if rev == wdirrev:
464 return b'%d' % ctx.p1().rev()
464 return b'%d' % ctx.p1().rev()
465 else:
465 else:
466 return b'%d' % rev
466 return b'%d' % rev
467
467
468 else:
468 else:
469
469
470 def formatrev(rev):
470 def formatrev(rev):
471 if rev == wdirrev:
471 if rev == wdirrev:
472 return b'%d+' % ctx.p1().rev()
472 return b'%d+' % ctx.p1().rev()
473 else:
473 else:
474 return b'%d ' % rev
474 return b'%d ' % rev
475
475
476 def formathex(h):
476 def formathex(h):
477 if h == wdirhex:
477 if h == wdirhex:
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 return b'%s+' % shorthex(hex(ctx.p1().node()))
479 else:
479 else:
480 return b'%s ' % shorthex(h)
480 return b'%s ' % shorthex(h)
481
481
482 else:
482 else:
483 formatrev = b'%d'.__mod__
483 formatrev = b'%d'.__mod__
484 formathex = shorthex
484 formathex = shorthex
485
485
486 opmap = [
486 opmap = [
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
493 ]
493 ]
494 opnamemap = {
494 opnamemap = {
495 b'rev': b'number',
495 b'rev': b'number',
496 b'node': b'changeset',
496 b'node': b'changeset',
497 b'path': b'file',
497 b'path': b'file',
498 b'lineno': b'line_number',
498 b'lineno': b'line_number',
499 }
499 }
500
500
501 if rootfm.isplain():
501 if rootfm.isplain():
502
502
503 def makefunc(get, fmt):
503 def makefunc(get, fmt):
504 return lambda x: fmt(get(x))
504 return lambda x: fmt(get(x))
505
505
506 else:
506 else:
507
507
508 def makefunc(get, fmt):
508 def makefunc(get, fmt):
509 return get
509 return get
510
510
511 datahint = rootfm.datahint()
511 datahint = rootfm.datahint()
512 funcmap = [
512 funcmap = [
513 (makefunc(get, fmt), sep)
513 (makefunc(get, fmt), sep)
514 for fn, sep, get, fmt in opmap
514 for fn, sep, get, fmt in opmap
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
516 ]
516 ]
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
518 fields = b' '.join(
518 fields = b' '.join(
519 fn
519 fn
520 for fn, sep, get, fmt in opmap
520 for fn, sep, get, fmt in opmap
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
522 )
522 )
523
523
524 def bad(x, y):
524 def bad(x, y):
525 raise error.Abort(b"%s: %s" % (x, y))
525 raise error.Abort(b"%s: %s" % (x, y))
526
526
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
527 m = scmutil.match(ctx, pats, opts, badfn=bad)
528
528
529 follow = not opts.get(b'no_follow')
529 follow = not opts.get(b'no_follow')
530 diffopts = patch.difffeatureopts(
530 diffopts = patch.difffeatureopts(
531 ui, opts, section=b'annotate', whitespace=True
531 ui, opts, section=b'annotate', whitespace=True
532 )
532 )
533 skiprevs = opts.get(b'skip')
533 skiprevs = opts.get(b'skip')
534 if skiprevs:
534 if skiprevs:
535 skiprevs = scmutil.revrange(repo, skiprevs)
535 skiprevs = scmutil.revrange(repo, skiprevs)
536
536
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
538 for abs in ctx.walk(m):
538 for abs in ctx.walk(m):
539 fctx = ctx[abs]
539 fctx = ctx[abs]
540 rootfm.startitem()
540 rootfm.startitem()
541 rootfm.data(path=abs)
541 rootfm.data(path=abs)
542 if not opts.get(b'text') and fctx.isbinary():
542 if not opts.get(b'text') and fctx.isbinary():
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
544 continue
544 continue
545
545
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
547 lines = fctx.annotate(
547 lines = fctx.annotate(
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 follow=follow, skiprevs=skiprevs, diffopts=diffopts
549 )
549 )
550 if not lines:
550 if not lines:
551 fm.end()
551 fm.end()
552 continue
552 continue
553 formats = []
553 formats = []
554 pieces = []
554 pieces = []
555
555
556 for f, sep in funcmap:
556 for f, sep in funcmap:
557 l = [f(n) for n in lines]
557 l = [f(n) for n in lines]
558 if fm.isplain():
558 if fm.isplain():
559 sizes = [encoding.colwidth(x) for x in l]
559 sizes = [encoding.colwidth(x) for x in l]
560 ml = max(sizes)
560 ml = max(sizes)
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
562 else:
562 else:
563 formats.append([b'%s'] * len(l))
563 formats.append([b'%s'] * len(l))
564 pieces.append(l)
564 pieces.append(l)
565
565
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
567 fm.startitem()
567 fm.startitem()
568 fm.context(fctx=n.fctx)
568 fm.context(fctx=n.fctx)
569 fm.write(fields, b"".join(f), *p)
569 fm.write(fields, b"".join(f), *p)
570 if n.skip:
570 if n.skip:
571 fmt = b"* %s"
571 fmt = b"* %s"
572 else:
572 else:
573 fmt = b": %s"
573 fmt = b": %s"
574 fm.write(b'line', fmt, n.text)
574 fm.write(b'line', fmt, n.text)
575
575
576 if not lines[-1].text.endswith(b'\n'):
576 if not lines[-1].text.endswith(b'\n'):
577 fm.plain(b'\n')
577 fm.plain(b'\n')
578 fm.end()
578 fm.end()
579
579
580 rootfm.end()
580 rootfm.end()
581
581
582
582
583 @command(
583 @command(
584 b'archive',
584 b'archive',
585 [
585 [
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
587 (
587 (
588 b'p',
588 b'p',
589 b'prefix',
589 b'prefix',
590 b'',
590 b'',
591 _(b'directory prefix for files in archive'),
591 _(b'directory prefix for files in archive'),
592 _(b'PREFIX'),
592 _(b'PREFIX'),
593 ),
593 ),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
596 ]
596 ]
597 + subrepoopts
597 + subrepoopts
598 + walkopts,
598 + walkopts,
599 _(b'[OPTION]... DEST'),
599 _(b'[OPTION]... DEST'),
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 helpcategory=command.CATEGORY_IMPORT_EXPORT,
601 )
601 )
602 def archive(ui, repo, dest, **opts):
602 def archive(ui, repo, dest, **opts):
603 '''create an unversioned archive of a repository revision
603 '''create an unversioned archive of a repository revision
604
604
605 By default, the revision used is the parent of the working
605 By default, the revision used is the parent of the working
606 directory; use -r/--rev to specify a different revision.
606 directory; use -r/--rev to specify a different revision.
607
607
608 The archive type is automatically detected based on file
608 The archive type is automatically detected based on file
609 extension (to override, use -t/--type).
609 extension (to override, use -t/--type).
610
610
611 .. container:: verbose
611 .. container:: verbose
612
612
613 Examples:
613 Examples:
614
614
615 - create a zip file containing the 1.0 release::
615 - create a zip file containing the 1.0 release::
616
616
617 hg archive -r 1.0 project-1.0.zip
617 hg archive -r 1.0 project-1.0.zip
618
618
619 - create a tarball excluding .hg files::
619 - create a tarball excluding .hg files::
620
620
621 hg archive project.tar.gz -X ".hg*"
621 hg archive project.tar.gz -X ".hg*"
622
622
623 Valid types are:
623 Valid types are:
624
624
625 :``files``: a directory full of files (default)
625 :``files``: a directory full of files (default)
626 :``tar``: tar archive, uncompressed
626 :``tar``: tar archive, uncompressed
627 :``tbz2``: tar archive, compressed using bzip2
627 :``tbz2``: tar archive, compressed using bzip2
628 :``tgz``: tar archive, compressed using gzip
628 :``tgz``: tar archive, compressed using gzip
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 :``txz``: tar archive, compressed using lzma (only in Python 3)
630 :``uzip``: zip archive, uncompressed
630 :``uzip``: zip archive, uncompressed
631 :``zip``: zip archive, compressed using deflate
631 :``zip``: zip archive, compressed using deflate
632
632
633 The exact name of the destination archive or directory is given
633 The exact name of the destination archive or directory is given
634 using a format string; see :hg:`help export` for details.
634 using a format string; see :hg:`help export` for details.
635
635
636 Each member added to an archive file has a directory prefix
636 Each member added to an archive file has a directory prefix
637 prepended. Use -p/--prefix to specify a format string for the
637 prepended. Use -p/--prefix to specify a format string for the
638 prefix. The default is the basename of the archive, with suffixes
638 prefix. The default is the basename of the archive, with suffixes
639 removed.
639 removed.
640
640
641 Returns 0 on success.
641 Returns 0 on success.
642 '''
642 '''
643
643
644 opts = pycompat.byteskwargs(opts)
644 opts = pycompat.byteskwargs(opts)
645 rev = opts.get(b'rev')
645 rev = opts.get(b'rev')
646 if rev:
646 if rev:
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
648 ctx = scmutil.revsingle(repo, rev)
648 ctx = scmutil.revsingle(repo, rev)
649 if not ctx:
649 if not ctx:
650 raise error.Abort(_(b'no working directory: please specify a revision'))
650 raise error.Abort(_(b'no working directory: please specify a revision'))
651 node = ctx.node()
651 node = ctx.node()
652 dest = cmdutil.makefilename(ctx, dest)
652 dest = cmdutil.makefilename(ctx, dest)
653 if os.path.realpath(dest) == repo.root:
653 if os.path.realpath(dest) == repo.root:
654 raise error.Abort(_(b'repository root cannot be destination'))
654 raise error.Abort(_(b'repository root cannot be destination'))
655
655
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
657 prefix = opts.get(b'prefix')
657 prefix = opts.get(b'prefix')
658
658
659 if dest == b'-':
659 if dest == b'-':
660 if kind == b'files':
660 if kind == b'files':
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 raise error.Abort(_(b'cannot archive plain files to stdout'))
662 dest = cmdutil.makefileobj(ctx, dest)
662 dest = cmdutil.makefileobj(ctx, dest)
663 if not prefix:
663 if not prefix:
664 prefix = os.path.basename(repo.root) + b'-%h'
664 prefix = os.path.basename(repo.root) + b'-%h'
665
665
666 prefix = cmdutil.makefilename(ctx, prefix)
666 prefix = cmdutil.makefilename(ctx, prefix)
667 match = scmutil.match(ctx, [], opts)
667 match = scmutil.match(ctx, [], opts)
668 archival.archive(
668 archival.archive(
669 repo,
669 repo,
670 dest,
670 dest,
671 node,
671 node,
672 kind,
672 kind,
673 not opts.get(b'no_decode'),
673 not opts.get(b'no_decode'),
674 match,
674 match,
675 prefix,
675 prefix,
676 subrepos=opts.get(b'subrepos'),
676 subrepos=opts.get(b'subrepos'),
677 )
677 )
678
678
679
679
680 @command(
680 @command(
681 b'backout',
681 b'backout',
682 [
682 [
683 (
683 (
684 b'',
684 b'',
685 b'merge',
685 b'merge',
686 None,
686 None,
687 _(b'merge with old dirstate parent after backout'),
687 _(b'merge with old dirstate parent after backout'),
688 ),
688 ),
689 (
689 (
690 b'',
690 b'',
691 b'commit',
691 b'commit',
692 None,
692 None,
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 _(b'commit if no conflicts were encountered (DEPRECATED)'),
694 ),
694 ),
695 (b'', b'no-commit', None, _(b'do not commit')),
695 (b'', b'no-commit', None, _(b'do not commit')),
696 (
696 (
697 b'',
697 b'',
698 b'parent',
698 b'parent',
699 b'',
699 b'',
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 _(b'parent to choose when backing out merge (DEPRECATED)'),
701 _(b'REV'),
701 _(b'REV'),
702 ),
702 ),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
705 ]
705 ]
706 + mergetoolopts
706 + mergetoolopts
707 + walkopts
707 + walkopts
708 + commitopts
708 + commitopts
709 + commitopts2,
709 + commitopts2,
710 _(b'[OPTION]... [-r] REV'),
710 _(b'[OPTION]... [-r] REV'),
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
712 )
712 )
713 def backout(ui, repo, node=None, rev=None, **opts):
713 def backout(ui, repo, node=None, rev=None, **opts):
714 '''reverse effect of earlier changeset
714 '''reverse effect of earlier changeset
715
715
716 Prepare a new changeset with the effect of REV undone in the
716 Prepare a new changeset with the effect of REV undone in the
717 current working directory. If no conflicts were encountered,
717 current working directory. If no conflicts were encountered,
718 it will be committed immediately.
718 it will be committed immediately.
719
719
720 If REV is the parent of the working directory, then this new changeset
720 If REV is the parent of the working directory, then this new changeset
721 is committed automatically (unless --no-commit is specified).
721 is committed automatically (unless --no-commit is specified).
722
722
723 .. note::
723 .. note::
724
724
725 :hg:`backout` cannot be used to fix either an unwanted or
725 :hg:`backout` cannot be used to fix either an unwanted or
726 incorrect merge.
726 incorrect merge.
727
727
728 .. container:: verbose
728 .. container:: verbose
729
729
730 Examples:
730 Examples:
731
731
732 - Reverse the effect of the parent of the working directory.
732 - Reverse the effect of the parent of the working directory.
733 This backout will be committed immediately::
733 This backout will be committed immediately::
734
734
735 hg backout -r .
735 hg backout -r .
736
736
737 - Reverse the effect of previous bad revision 23::
737 - Reverse the effect of previous bad revision 23::
738
738
739 hg backout -r 23
739 hg backout -r 23
740
740
741 - Reverse the effect of previous bad revision 23 and
741 - Reverse the effect of previous bad revision 23 and
742 leave changes uncommitted::
742 leave changes uncommitted::
743
743
744 hg backout -r 23 --no-commit
744 hg backout -r 23 --no-commit
745 hg commit -m "Backout revision 23"
745 hg commit -m "Backout revision 23"
746
746
747 By default, the pending changeset will have one parent,
747 By default, the pending changeset will have one parent,
748 maintaining a linear history. With --merge, the pending
748 maintaining a linear history. With --merge, the pending
749 changeset will instead have two parents: the old parent of the
749 changeset will instead have two parents: the old parent of the
750 working directory and a new child of REV that simply undoes REV.
750 working directory and a new child of REV that simply undoes REV.
751
751
752 Before version 1.7, the behavior without --merge was equivalent
752 Before version 1.7, the behavior without --merge was equivalent
753 to specifying --merge followed by :hg:`update --clean .` to
753 to specifying --merge followed by :hg:`update --clean .` to
754 cancel the merge and leave the child of REV as a head to be
754 cancel the merge and leave the child of REV as a head to be
755 merged separately.
755 merged separately.
756
756
757 See :hg:`help dates` for a list of formats valid for -d/--date.
757 See :hg:`help dates` for a list of formats valid for -d/--date.
758
758
759 See :hg:`help revert` for a way to restore files to the state
759 See :hg:`help revert` for a way to restore files to the state
760 of another revision.
760 of another revision.
761
761
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 Returns 0 on success, 1 if nothing to backout or there are unresolved
763 files.
763 files.
764 '''
764 '''
765 with repo.wlock(), repo.lock():
765 with repo.wlock(), repo.lock():
766 return _dobackout(ui, repo, node, rev, **opts)
766 return _dobackout(ui, repo, node, rev, **opts)
767
767
768
768
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 def _dobackout(ui, repo, node=None, rev=None, **opts):
770 opts = pycompat.byteskwargs(opts)
770 opts = pycompat.byteskwargs(opts)
771 if opts.get(b'commit') and opts.get(b'no_commit'):
771 if opts.get(b'commit') and opts.get(b'no_commit'):
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 raise error.Abort(_(b"cannot use --commit with --no-commit"))
773 if opts.get(b'merge') and opts.get(b'no_commit'):
773 if opts.get(b'merge') and opts.get(b'no_commit'):
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774 raise error.Abort(_(b"cannot use --merge with --no-commit"))
775
775
776 if rev and node:
776 if rev and node:
777 raise error.Abort(_(b"please specify just one revision"))
777 raise error.Abort(_(b"please specify just one revision"))
778
778
779 if not rev:
779 if not rev:
780 rev = node
780 rev = node
781
781
782 if not rev:
782 if not rev:
783 raise error.Abort(_(b"please specify a revision to backout"))
783 raise error.Abort(_(b"please specify a revision to backout"))
784
784
785 date = opts.get(b'date')
785 date = opts.get(b'date')
786 if date:
786 if date:
787 opts[b'date'] = dateutil.parsedate(date)
787 opts[b'date'] = dateutil.parsedate(date)
788
788
789 cmdutil.checkunfinished(repo)
789 cmdutil.checkunfinished(repo)
790 cmdutil.bailifchanged(repo)
790 cmdutil.bailifchanged(repo)
791 node = scmutil.revsingle(repo, rev).node()
791 node = scmutil.revsingle(repo, rev).node()
792
792
793 op1, op2 = repo.dirstate.parents()
793 op1, op2 = repo.dirstate.parents()
794 if not repo.changelog.isancestor(node, op1):
794 if not repo.changelog.isancestor(node, op1):
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
796
796
797 p1, p2 = repo.changelog.parents(node)
797 p1, p2 = repo.changelog.parents(node)
798 if p1 == nullid:
798 if p1 == nullid:
799 raise error.Abort(_(b'cannot backout a change with no parents'))
799 raise error.Abort(_(b'cannot backout a change with no parents'))
800 if p2 != nullid:
800 if p2 != nullid:
801 if not opts.get(b'parent'):
801 if not opts.get(b'parent'):
802 raise error.Abort(_(b'cannot backout a merge changeset'))
802 raise error.Abort(_(b'cannot backout a merge changeset'))
803 p = repo.lookup(opts[b'parent'])
803 p = repo.lookup(opts[b'parent'])
804 if p not in (p1, p2):
804 if p not in (p1, p2):
805 raise error.Abort(
805 raise error.Abort(
806 _(b'%s is not a parent of %s') % (short(p), short(node))
806 _(b'%s is not a parent of %s') % (short(p), short(node))
807 )
807 )
808 parent = p
808 parent = p
809 else:
809 else:
810 if opts.get(b'parent'):
810 if opts.get(b'parent'):
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
812 parent = p1
812 parent = p1
813
813
814 # the backout should appear on the same branch
814 # the backout should appear on the same branch
815 branch = repo.dirstate.branch()
815 branch = repo.dirstate.branch()
816 bheads = repo.branchheads(branch)
816 bheads = repo.branchheads(branch)
817 rctx = scmutil.revsingle(repo, hex(parent))
817 rctx = scmutil.revsingle(repo, hex(parent))
818 if not opts.get(b'merge') and op1 != node:
818 if not opts.get(b'merge') and op1 != node:
819 with dirstateguard.dirstateguard(repo, b'backout'):
819 with dirstateguard.dirstateguard(repo, b'backout'):
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
821 with ui.configoverride(overrides, b'backout'):
821 with ui.configoverride(overrides, b'backout'):
822 stats = mergemod.update(
822 stats = mergemod.update(
823 repo,
823 repo,
824 parent,
824 parent,
825 branchmerge=True,
825 branchmerge=True,
826 force=True,
826 force=True,
827 ancestor=node,
827 ancestor=node,
828 mergeancestor=False,
828 mergeancestor=False,
829 )
829 )
830 repo.setparents(op1, op2)
830 repo.setparents(op1, op2)
831 hg._showstats(repo, stats)
831 hg._showstats(repo, stats)
832 if stats.unresolvedcount:
832 if stats.unresolvedcount:
833 repo.ui.status(
833 repo.ui.status(
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 _(b"use 'hg resolve' to retry unresolved file merges\n")
835 )
835 )
836 return 1
836 return 1
837 else:
837 else:
838 hg.clean(repo, node, show_stats=False)
838 hg.clean(repo, node, show_stats=False)
839 repo.dirstate.setbranch(branch)
839 repo.dirstate.setbranch(branch)
840 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
841
841
842 if opts.get(b'no_commit'):
842 if opts.get(b'no_commit'):
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 msg = _(b"changeset %s backed out, don't forget to commit.\n")
844 ui.status(msg % short(node))
844 ui.status(msg % short(node))
845 return 0
845 return 0
846
846
847 def commitfunc(ui, repo, message, match, opts):
847 def commitfunc(ui, repo, message, match, opts):
848 editform = b'backout'
848 editform = b'backout'
849 e = cmdutil.getcommiteditor(
849 e = cmdutil.getcommiteditor(
850 editform=editform, **pycompat.strkwargs(opts)
850 editform=editform, **pycompat.strkwargs(opts)
851 )
851 )
852 if not message:
852 if not message:
853 # we don't translate commit messages
853 # we don't translate commit messages
854 message = b"Backed out changeset %s" % short(node)
854 message = b"Backed out changeset %s" % short(node)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 e = cmdutil.getcommiteditor(edit=True, editform=editform)
856 return repo.commit(
856 return repo.commit(
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
858 )
858 )
859
859
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
861 if not newnode:
861 if not newnode:
862 ui.status(_(b"nothing changed\n"))
862 ui.status(_(b"nothing changed\n"))
863 return 1
863 return 1
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
864 cmdutil.commitstatus(repo, newnode, branch, bheads)
865
865
866 def nice(node):
866 def nice(node):
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867 return b'%d:%s' % (repo.changelog.rev(node), short(node))
868
868
869 ui.status(
869 ui.status(
870 _(b'changeset %s backs out changeset %s\n')
870 _(b'changeset %s backs out changeset %s\n')
871 % (nice(repo.changelog.tip()), nice(node))
871 % (nice(repo.changelog.tip()), nice(node))
872 )
872 )
873 if opts.get(b'merge') and op1 != node:
873 if opts.get(b'merge') and op1 != node:
874 hg.clean(repo, op1, show_stats=False)
874 hg.clean(repo, op1, show_stats=False)
875 ui.status(
875 ui.status(
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
877 )
877 )
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
879 with ui.configoverride(overrides, b'backout'):
879 with ui.configoverride(overrides, b'backout'):
880 return hg.merge(repo[b'tip'])
880 return hg.merge(repo[b'tip'])
881 return 0
881 return 0
882
882
883
883
884 @command(
884 @command(
885 b'bisect',
885 b'bisect',
886 [
886 [
887 (b'r', b'reset', False, _(b'reset bisect state')),
887 (b'r', b'reset', False, _(b'reset bisect state')),
888 (b'g', b'good', False, _(b'mark changeset good')),
888 (b'g', b'good', False, _(b'mark changeset good')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
889 (b'b', b'bad', False, _(b'mark changeset bad')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
890 (b's', b'skip', False, _(b'skip testing changeset')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
891 (b'e', b'extend', False, _(b'extend the bisect range')),
892 (
892 (
893 b'c',
893 b'c',
894 b'command',
894 b'command',
895 b'',
895 b'',
896 _(b'use command to check changeset state'),
896 _(b'use command to check changeset state'),
897 _(b'CMD'),
897 _(b'CMD'),
898 ),
898 ),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
899 (b'U', b'noupdate', False, _(b'do not update to target')),
900 ],
900 ],
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
903 )
903 )
904 def bisect(
904 def bisect(
905 ui,
905 ui,
906 repo,
906 repo,
907 rev=None,
907 rev=None,
908 extra=None,
908 extra=None,
909 command=None,
909 command=None,
910 reset=None,
910 reset=None,
911 good=None,
911 good=None,
912 bad=None,
912 bad=None,
913 skip=None,
913 skip=None,
914 extend=None,
914 extend=None,
915 noupdate=None,
915 noupdate=None,
916 ):
916 ):
917 """subdivision search of changesets
917 """subdivision search of changesets
918
918
919 This command helps to find changesets which introduce problems. To
919 This command helps to find changesets which introduce problems. To
920 use, mark the earliest changeset you know exhibits the problem as
920 use, mark the earliest changeset you know exhibits the problem as
921 bad, then mark the latest changeset which is free from the problem
921 bad, then mark the latest changeset which is free from the problem
922 as good. Bisect will update your working directory to a revision
922 as good. Bisect will update your working directory to a revision
923 for testing (unless the -U/--noupdate option is specified). Once
923 for testing (unless the -U/--noupdate option is specified). Once
924 you have performed tests, mark the working directory as good or
924 you have performed tests, mark the working directory as good or
925 bad, and bisect will either update to another candidate changeset
925 bad, and bisect will either update to another candidate changeset
926 or announce that it has found the bad revision.
926 or announce that it has found the bad revision.
927
927
928 As a shortcut, you can also use the revision argument to mark a
928 As a shortcut, you can also use the revision argument to mark a
929 revision as good or bad without checking it out first.
929 revision as good or bad without checking it out first.
930
930
931 If you supply a command, it will be used for automatic bisection.
931 If you supply a command, it will be used for automatic bisection.
932 The environment variable HG_NODE will contain the ID of the
932 The environment variable HG_NODE will contain the ID of the
933 changeset being tested. The exit status of the command will be
933 changeset being tested. The exit status of the command will be
934 used to mark revisions as good or bad: status 0 means good, 125
934 used to mark revisions as good or bad: status 0 means good, 125
935 means to skip the revision, 127 (command not found) will abort the
935 means to skip the revision, 127 (command not found) will abort the
936 bisection, and any other non-zero exit status means the revision
936 bisection, and any other non-zero exit status means the revision
937 is bad.
937 is bad.
938
938
939 .. container:: verbose
939 .. container:: verbose
940
940
941 Some examples:
941 Some examples:
942
942
943 - start a bisection with known bad revision 34, and good revision 12::
943 - start a bisection with known bad revision 34, and good revision 12::
944
944
945 hg bisect --bad 34
945 hg bisect --bad 34
946 hg bisect --good 12
946 hg bisect --good 12
947
947
948 - advance the current bisection by marking current revision as good or
948 - advance the current bisection by marking current revision as good or
949 bad::
949 bad::
950
950
951 hg bisect --good
951 hg bisect --good
952 hg bisect --bad
952 hg bisect --bad
953
953
954 - mark the current revision, or a known revision, to be skipped (e.g. if
954 - mark the current revision, or a known revision, to be skipped (e.g. if
955 that revision is not usable because of another issue)::
955 that revision is not usable because of another issue)::
956
956
957 hg bisect --skip
957 hg bisect --skip
958 hg bisect --skip 23
958 hg bisect --skip 23
959
959
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960 - skip all revisions that do not touch directories ``foo`` or ``bar``::
961
961
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
963
963
964 - forget the current bisection::
964 - forget the current bisection::
965
965
966 hg bisect --reset
966 hg bisect --reset
967
967
968 - use 'make && make tests' to automatically find the first broken
968 - use 'make && make tests' to automatically find the first broken
969 revision::
969 revision::
970
970
971 hg bisect --reset
971 hg bisect --reset
972 hg bisect --bad 34
972 hg bisect --bad 34
973 hg bisect --good 12
973 hg bisect --good 12
974 hg bisect --command "make && make tests"
974 hg bisect --command "make && make tests"
975
975
976 - see all changesets whose states are already known in the current
976 - see all changesets whose states are already known in the current
977 bisection::
977 bisection::
978
978
979 hg log -r "bisect(pruned)"
979 hg log -r "bisect(pruned)"
980
980
981 - see the changeset currently being bisected (especially useful
981 - see the changeset currently being bisected (especially useful
982 if running with -U/--noupdate)::
982 if running with -U/--noupdate)::
983
983
984 hg log -r "bisect(current)"
984 hg log -r "bisect(current)"
985
985
986 - see all changesets that took part in the current bisection::
986 - see all changesets that took part in the current bisection::
987
987
988 hg log -r "bisect(range)"
988 hg log -r "bisect(range)"
989
989
990 - you can even get a nice graph::
990 - you can even get a nice graph::
991
991
992 hg log --graph -r "bisect(range)"
992 hg log --graph -r "bisect(range)"
993
993
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
995
995
996 Returns 0 on success.
996 Returns 0 on success.
997 """
997 """
998 # backward compatibility
998 # backward compatibility
999 if rev in b"good bad reset init".split():
999 if rev in b"good bad reset init".split():
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1001 cmd, rev, extra = rev, extra, None
1001 cmd, rev, extra = rev, extra, None
1002 if cmd == b"good":
1002 if cmd == b"good":
1003 good = True
1003 good = True
1004 elif cmd == b"bad":
1004 elif cmd == b"bad":
1005 bad = True
1005 bad = True
1006 else:
1006 else:
1007 reset = True
1007 reset = True
1008 elif extra:
1008 elif extra:
1009 raise error.Abort(_(b'incompatible arguments'))
1009 raise error.Abort(_(b'incompatible arguments'))
1010
1010
1011 incompatibles = {
1011 incompatibles = {
1012 b'--bad': bad,
1012 b'--bad': bad,
1013 b'--command': bool(command),
1013 b'--command': bool(command),
1014 b'--extend': extend,
1014 b'--extend': extend,
1015 b'--good': good,
1015 b'--good': good,
1016 b'--reset': reset,
1016 b'--reset': reset,
1017 b'--skip': skip,
1017 b'--skip': skip,
1018 }
1018 }
1019
1019
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1020 enabled = [x for x in incompatibles if incompatibles[x]]
1021
1021
1022 if len(enabled) > 1:
1022 if len(enabled) > 1:
1023 raise error.Abort(
1023 raise error.Abort(
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1025 )
1025 )
1026
1026
1027 if reset:
1027 if reset:
1028 hbisect.resetstate(repo)
1028 hbisect.resetstate(repo)
1029 return
1029 return
1030
1030
1031 state = hbisect.load_state(repo)
1031 state = hbisect.load_state(repo)
1032
1032
1033 # update state
1033 # update state
1034 if good or bad or skip:
1034 if good or bad or skip:
1035 if rev:
1035 if rev:
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1037 else:
1037 else:
1038 nodes = [repo.lookup(b'.')]
1038 nodes = [repo.lookup(b'.')]
1039 if good:
1039 if good:
1040 state[b'good'] += nodes
1040 state[b'good'] += nodes
1041 elif bad:
1041 elif bad:
1042 state[b'bad'] += nodes
1042 state[b'bad'] += nodes
1043 elif skip:
1043 elif skip:
1044 state[b'skip'] += nodes
1044 state[b'skip'] += nodes
1045 hbisect.save_state(repo, state)
1045 hbisect.save_state(repo, state)
1046 if not (state[b'good'] and state[b'bad']):
1046 if not (state[b'good'] and state[b'bad']):
1047 return
1047 return
1048
1048
1049 def mayupdate(repo, node, show_stats=True):
1049 def mayupdate(repo, node, show_stats=True):
1050 """common used update sequence"""
1050 """common used update sequence"""
1051 if noupdate:
1051 if noupdate:
1052 return
1052 return
1053 cmdutil.checkunfinished(repo)
1053 cmdutil.checkunfinished(repo)
1054 cmdutil.bailifchanged(repo)
1054 cmdutil.bailifchanged(repo)
1055 return hg.clean(repo, node, show_stats=show_stats)
1055 return hg.clean(repo, node, show_stats=show_stats)
1056
1056
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1058
1058
1059 if command:
1059 if command:
1060 changesets = 1
1060 changesets = 1
1061 if noupdate:
1061 if noupdate:
1062 try:
1062 try:
1063 node = state[b'current'][0]
1063 node = state[b'current'][0]
1064 except LookupError:
1064 except LookupError:
1065 raise error.Abort(
1065 raise error.Abort(
1066 _(
1066 _(
1067 b'current bisect revision is unknown - '
1067 b'current bisect revision is unknown - '
1068 b'start a new bisect to fix'
1068 b'start a new bisect to fix'
1069 )
1069 )
1070 )
1070 )
1071 else:
1071 else:
1072 node, p2 = repo.dirstate.parents()
1072 node, p2 = repo.dirstate.parents()
1073 if p2 != nullid:
1073 if p2 != nullid:
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1074 raise error.Abort(_(b'current bisect revision is a merge'))
1075 if rev:
1075 if rev:
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 node = repo[scmutil.revsingle(repo, rev, node)].node()
1077 with hbisect.restore_state(repo, state, node):
1077 with hbisect.restore_state(repo, state, node):
1078 while changesets:
1078 while changesets:
1079 # update state
1079 # update state
1080 state[b'current'] = [node]
1080 state[b'current'] = [node]
1081 hbisect.save_state(repo, state)
1081 hbisect.save_state(repo, state)
1082 status = ui.system(
1082 status = ui.system(
1083 command,
1083 command,
1084 environ={b'HG_NODE': hex(node)},
1084 environ={b'HG_NODE': hex(node)},
1085 blockedtag=b'bisect_check',
1085 blockedtag=b'bisect_check',
1086 )
1086 )
1087 if status == 125:
1087 if status == 125:
1088 transition = b"skip"
1088 transition = b"skip"
1089 elif status == 0:
1089 elif status == 0:
1090 transition = b"good"
1090 transition = b"good"
1091 # status < 0 means process was killed
1091 # status < 0 means process was killed
1092 elif status == 127:
1092 elif status == 127:
1093 raise error.Abort(_(b"failed to execute %s") % command)
1093 raise error.Abort(_(b"failed to execute %s") % command)
1094 elif status < 0:
1094 elif status < 0:
1095 raise error.Abort(_(b"%s killed") % command)
1095 raise error.Abort(_(b"%s killed") % command)
1096 else:
1096 else:
1097 transition = b"bad"
1097 transition = b"bad"
1098 state[transition].append(node)
1098 state[transition].append(node)
1099 ctx = repo[node]
1099 ctx = repo[node]
1100 ui.status(
1100 ui.status(
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1102 )
1102 )
1103 hbisect.checkstate(state)
1103 hbisect.checkstate(state)
1104 # bisect
1104 # bisect
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 nodes, changesets, bgood = hbisect.bisect(repo, state)
1106 # update to next check
1106 # update to next check
1107 node = nodes[0]
1107 node = nodes[0]
1108 mayupdate(repo, node, show_stats=False)
1108 mayupdate(repo, node, show_stats=False)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1110 return
1110 return
1111
1111
1112 hbisect.checkstate(state)
1112 hbisect.checkstate(state)
1113
1113
1114 # actually bisect
1114 # actually bisect
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1115 nodes, changesets, good = hbisect.bisect(repo, state)
1116 if extend:
1116 if extend:
1117 if not changesets:
1117 if not changesets:
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 extendnode = hbisect.extendrange(repo, state, nodes, good)
1119 if extendnode is not None:
1119 if extendnode is not None:
1120 ui.write(
1120 ui.write(
1121 _(b"Extending search to changeset %d:%s\n")
1121 _(b"Extending search to changeset %d:%s\n")
1122 % (extendnode.rev(), extendnode)
1122 % (extendnode.rev(), extendnode)
1123 )
1123 )
1124 state[b'current'] = [extendnode.node()]
1124 state[b'current'] = [extendnode.node()]
1125 hbisect.save_state(repo, state)
1125 hbisect.save_state(repo, state)
1126 return mayupdate(repo, extendnode.node())
1126 return mayupdate(repo, extendnode.node())
1127 raise error.Abort(_(b"nothing to extend"))
1127 raise error.Abort(_(b"nothing to extend"))
1128
1128
1129 if changesets == 0:
1129 if changesets == 0:
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1131 else:
1131 else:
1132 assert len(nodes) == 1 # only a single node can be tested next
1132 assert len(nodes) == 1 # only a single node can be tested next
1133 node = nodes[0]
1133 node = nodes[0]
1134 # compute the approximate number of remaining tests
1134 # compute the approximate number of remaining tests
1135 tests, size = 0, 2
1135 tests, size = 0, 2
1136 while size <= changesets:
1136 while size <= changesets:
1137 tests, size = tests + 1, size * 2
1137 tests, size = tests + 1, size * 2
1138 rev = repo.changelog.rev(node)
1138 rev = repo.changelog.rev(node)
1139 ui.write(
1139 ui.write(
1140 _(
1140 _(
1141 b"Testing changeset %d:%s "
1141 b"Testing changeset %d:%s "
1142 b"(%d changesets remaining, ~%d tests)\n"
1142 b"(%d changesets remaining, ~%d tests)\n"
1143 )
1143 )
1144 % (rev, short(node), changesets, tests)
1144 % (rev, short(node), changesets, tests)
1145 )
1145 )
1146 state[b'current'] = [node]
1146 state[b'current'] = [node]
1147 hbisect.save_state(repo, state)
1147 hbisect.save_state(repo, state)
1148 return mayupdate(repo, node)
1148 return mayupdate(repo, node)
1149
1149
1150
1150
1151 @command(
1151 @command(
1152 b'bookmarks|bookmark',
1152 b'bookmarks|bookmark',
1153 [
1153 [
1154 (b'f', b'force', False, _(b'force')),
1154 (b'f', b'force', False, _(b'force')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 (b'd', b'delete', False, _(b'delete a given bookmark')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 (b'l', b'list', False, _(b'list existing bookmarks')),
1160 ]
1160 ]
1161 + formatteropts,
1161 + formatteropts,
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1164 )
1164 )
1165 def bookmark(ui, repo, *names, **opts):
1165 def bookmark(ui, repo, *names, **opts):
1166 '''create a new bookmark or list existing bookmarks
1166 '''create a new bookmark or list existing bookmarks
1167
1167
1168 Bookmarks are labels on changesets to help track lines of development.
1168 Bookmarks are labels on changesets to help track lines of development.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 Bookmarks are unversioned and can be moved, renamed and deleted.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1170 Deleting or moving a bookmark has no effect on the associated changesets.
1171
1171
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 Creating or updating to a bookmark causes it to be marked as 'active'.
1173 The active bookmark is indicated with a '*'.
1173 The active bookmark is indicated with a '*'.
1174 When a commit is made, the active bookmark will advance to the new commit.
1174 When a commit is made, the active bookmark will advance to the new commit.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 A plain :hg:`update` will also advance an active bookmark, if possible.
1176 Updating away from a bookmark will cause it to be deactivated.
1176 Updating away from a bookmark will cause it to be deactivated.
1177
1177
1178 Bookmarks can be pushed and pulled between repositories (see
1178 Bookmarks can be pushed and pulled between repositories (see
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 diverged, a new 'divergent bookmark' of the form 'name@path' will
1181 be created. Using :hg:`merge` will resolve the divergence.
1181 be created. Using :hg:`merge` will resolve the divergence.
1182
1182
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1184 the active bookmark's name.
1184 the active bookmark's name.
1185
1185
1186 A bookmark named '@' has the special property that :hg:`clone` will
1186 A bookmark named '@' has the special property that :hg:`clone` will
1187 check it out by default if it exists.
1187 check it out by default if it exists.
1188
1188
1189 .. container:: verbose
1189 .. container:: verbose
1190
1190
1191 Template:
1191 Template:
1192
1192
1193 The following keywords are supported in addition to the common template
1193 The following keywords are supported in addition to the common template
1194 keywords and functions such as ``{bookmark}``. See also
1194 keywords and functions such as ``{bookmark}``. See also
1195 :hg:`help templates`.
1195 :hg:`help templates`.
1196
1196
1197 :active: Boolean. True if the bookmark is active.
1197 :active: Boolean. True if the bookmark is active.
1198
1198
1199 Examples:
1199 Examples:
1200
1200
1201 - create an active bookmark for a new line of development::
1201 - create an active bookmark for a new line of development::
1202
1202
1203 hg book new-feature
1203 hg book new-feature
1204
1204
1205 - create an inactive bookmark as a place marker::
1205 - create an inactive bookmark as a place marker::
1206
1206
1207 hg book -i reviewed
1207 hg book -i reviewed
1208
1208
1209 - create an inactive bookmark on another changeset::
1209 - create an inactive bookmark on another changeset::
1210
1210
1211 hg book -r .^ tested
1211 hg book -r .^ tested
1212
1212
1213 - rename bookmark turkey to dinner::
1213 - rename bookmark turkey to dinner::
1214
1214
1215 hg book -m turkey dinner
1215 hg book -m turkey dinner
1216
1216
1217 - move the '@' bookmark from another branch::
1217 - move the '@' bookmark from another branch::
1218
1218
1219 hg book -f @
1219 hg book -f @
1220
1220
1221 - print only the active bookmark name::
1221 - print only the active bookmark name::
1222
1222
1223 hg book -ql .
1223 hg book -ql .
1224 '''
1224 '''
1225 opts = pycompat.byteskwargs(opts)
1225 opts = pycompat.byteskwargs(opts)
1226 force = opts.get(b'force')
1226 force = opts.get(b'force')
1227 rev = opts.get(b'rev')
1227 rev = opts.get(b'rev')
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1229
1229
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1230 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1231 if action:
1231 if action:
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1232 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1233 elif names or rev:
1233 elif names or rev:
1234 action = b'add'
1234 action = b'add'
1235 elif inactive:
1235 elif inactive:
1236 action = b'inactive' # meaning deactivate
1236 action = b'inactive' # meaning deactivate
1237 else:
1237 else:
1238 action = b'list'
1238 action = b'list'
1239
1239
1240 cmdutil.check_incompatible_arguments(
1240 cmdutil.check_incompatible_arguments(
1241 opts, b'inactive', [b'delete', b'list']
1241 opts, b'inactive', [b'delete', b'list']
1242 )
1242 )
1243 if not names and action in {b'add', b'delete'}:
1243 if not names and action in {b'add', b'delete'}:
1244 raise error.Abort(_(b"bookmark name required"))
1244 raise error.Abort(_(b"bookmark name required"))
1245
1245
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1246 if action in {b'add', b'delete', b'rename', b'inactive'}:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1247 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1248 if action == b'delete':
1248 if action == b'delete':
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1249 names = pycompat.maplist(repo._bookmarks.expandname, names)
1250 bookmarks.delete(repo, tr, names)
1250 bookmarks.delete(repo, tr, names)
1251 elif action == b'rename':
1251 elif action == b'rename':
1252 if not names:
1252 if not names:
1253 raise error.Abort(_(b"new bookmark name required"))
1253 raise error.Abort(_(b"new bookmark name required"))
1254 elif len(names) > 1:
1254 elif len(names) > 1:
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1255 raise error.Abort(_(b"only one new bookmark name allowed"))
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1256 oldname = repo._bookmarks.expandname(opts[b'rename'])
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1257 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1258 elif action == b'add':
1258 elif action == b'add':
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1259 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1260 elif action == b'inactive':
1260 elif action == b'inactive':
1261 if len(repo._bookmarks) == 0:
1261 if len(repo._bookmarks) == 0:
1262 ui.status(_(b"no bookmarks set\n"))
1262 ui.status(_(b"no bookmarks set\n"))
1263 elif not repo._activebookmark:
1263 elif not repo._activebookmark:
1264 ui.status(_(b"no active bookmark\n"))
1264 ui.status(_(b"no active bookmark\n"))
1265 else:
1265 else:
1266 bookmarks.deactivate(repo)
1266 bookmarks.deactivate(repo)
1267 elif action == b'list':
1267 elif action == b'list':
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1268 names = pycompat.maplist(repo._bookmarks.expandname, names)
1269 with ui.formatter(b'bookmarks', opts) as fm:
1269 with ui.formatter(b'bookmarks', opts) as fm:
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1270 bookmarks.printbookmarks(ui, repo, fm, names)
1271 else:
1271 else:
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1272 raise error.ProgrammingError(b'invalid action: %s' % action)
1273
1273
1274
1274
1275 @command(
1275 @command(
1276 b'branch',
1276 b'branch',
1277 [
1277 [
1278 (
1278 (
1279 b'f',
1279 b'f',
1280 b'force',
1280 b'force',
1281 None,
1281 None,
1282 _(b'set branch name even if it shadows an existing branch'),
1282 _(b'set branch name even if it shadows an existing branch'),
1283 ),
1283 ),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1284 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1285 (
1285 (
1286 b'r',
1286 b'r',
1287 b'rev',
1287 b'rev',
1288 [],
1288 [],
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1289 _(b'change branches of the given revs (EXPERIMENTAL)'),
1290 ),
1290 ),
1291 ],
1291 ],
1292 _(b'[-fC] [NAME]'),
1292 _(b'[-fC] [NAME]'),
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1293 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1294 )
1294 )
1295 def branch(ui, repo, label=None, **opts):
1295 def branch(ui, repo, label=None, **opts):
1296 """set or show the current branch name
1296 """set or show the current branch name
1297
1297
1298 .. note::
1298 .. note::
1299
1299
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1300 Branch names are permanent and global. Use :hg:`bookmark` to create a
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1301 light-weight bookmark instead. See :hg:`help glossary` for more
1302 information about named branches and bookmarks.
1302 information about named branches and bookmarks.
1303
1303
1304 With no argument, show the current branch name. With one argument,
1304 With no argument, show the current branch name. With one argument,
1305 set the working directory branch name (the branch will not exist
1305 set the working directory branch name (the branch will not exist
1306 in the repository until the next commit). Standard practice
1306 in the repository until the next commit). Standard practice
1307 recommends that primary development take place on the 'default'
1307 recommends that primary development take place on the 'default'
1308 branch.
1308 branch.
1309
1309
1310 Unless -f/--force is specified, branch will not let you set a
1310 Unless -f/--force is specified, branch will not let you set a
1311 branch name that already exists.
1311 branch name that already exists.
1312
1312
1313 Use -C/--clean to reset the working directory branch to that of
1313 Use -C/--clean to reset the working directory branch to that of
1314 the parent of the working directory, negating a previous branch
1314 the parent of the working directory, negating a previous branch
1315 change.
1315 change.
1316
1316
1317 Use the command :hg:`update` to switch to an existing branch. Use
1317 Use the command :hg:`update` to switch to an existing branch. Use
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1318 :hg:`commit --close-branch` to mark this branch head as closed.
1319 When all heads of a branch are closed, the branch will be
1319 When all heads of a branch are closed, the branch will be
1320 considered closed.
1320 considered closed.
1321
1321
1322 Returns 0 on success.
1322 Returns 0 on success.
1323 """
1323 """
1324 opts = pycompat.byteskwargs(opts)
1324 opts = pycompat.byteskwargs(opts)
1325 revs = opts.get(b'rev')
1325 revs = opts.get(b'rev')
1326 if label:
1326 if label:
1327 label = label.strip()
1327 label = label.strip()
1328
1328
1329 if not opts.get(b'clean') and not label:
1329 if not opts.get(b'clean') and not label:
1330 if revs:
1330 if revs:
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1331 raise error.Abort(_(b"no branch name specified for the revisions"))
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1332 ui.write(b"%s\n" % repo.dirstate.branch())
1333 return
1333 return
1334
1334
1335 with repo.wlock():
1335 with repo.wlock():
1336 if opts.get(b'clean'):
1336 if opts.get(b'clean'):
1337 label = repo[b'.'].branch()
1337 label = repo[b'.'].branch()
1338 repo.dirstate.setbranch(label)
1338 repo.dirstate.setbranch(label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1339 ui.status(_(b'reset working directory to branch %s\n') % label)
1340 elif label:
1340 elif label:
1341
1341
1342 scmutil.checknewlabel(repo, label, b'branch')
1342 scmutil.checknewlabel(repo, label, b'branch')
1343 if revs:
1343 if revs:
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1344 return cmdutil.changebranch(ui, repo, revs, label, opts)
1345
1345
1346 if not opts.get(b'force') and label in repo.branchmap():
1346 if not opts.get(b'force') and label in repo.branchmap():
1347 if label not in [p.branch() for p in repo[None].parents()]:
1347 if label not in [p.branch() for p in repo[None].parents()]:
1348 raise error.Abort(
1348 raise error.Abort(
1349 _(b'a branch of the same name already exists'),
1349 _(b'a branch of the same name already exists'),
1350 # i18n: "it" refers to an existing branch
1350 # i18n: "it" refers to an existing branch
1351 hint=_(b"use 'hg update' to switch to it"),
1351 hint=_(b"use 'hg update' to switch to it"),
1352 )
1352 )
1353
1353
1354 repo.dirstate.setbranch(label)
1354 repo.dirstate.setbranch(label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1355 ui.status(_(b'marked working directory as branch %s\n') % label)
1356
1356
1357 # find any open named branches aside from default
1357 # find any open named branches aside from default
1358 for n, h, t, c in repo.branchmap().iterbranches():
1358 for n, h, t, c in repo.branchmap().iterbranches():
1359 if n != b"default" and not c:
1359 if n != b"default" and not c:
1360 return 0
1360 return 0
1361 ui.status(
1361 ui.status(
1362 _(
1362 _(
1363 b'(branches are permanent and global, '
1363 b'(branches are permanent and global, '
1364 b'did you want a bookmark?)\n'
1364 b'did you want a bookmark?)\n'
1365 )
1365 )
1366 )
1366 )
1367
1367
1368
1368
1369 @command(
1369 @command(
1370 b'branches',
1370 b'branches',
1371 [
1371 [
1372 (
1372 (
1373 b'a',
1373 b'a',
1374 b'active',
1374 b'active',
1375 False,
1375 False,
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1376 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1377 ),
1377 ),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1378 (b'c', b'closed', False, _(b'show normal and closed branches')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1379 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1380 ]
1380 ]
1381 + formatteropts,
1381 + formatteropts,
1382 _(b'[-c]'),
1382 _(b'[-c]'),
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1383 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1384 intents={INTENT_READONLY},
1384 intents={INTENT_READONLY},
1385 )
1385 )
1386 def branches(ui, repo, active=False, closed=False, **opts):
1386 def branches(ui, repo, active=False, closed=False, **opts):
1387 """list repository named branches
1387 """list repository named branches
1388
1388
1389 List the repository's named branches, indicating which ones are
1389 List the repository's named branches, indicating which ones are
1390 inactive. If -c/--closed is specified, also list branches which have
1390 inactive. If -c/--closed is specified, also list branches which have
1391 been marked closed (see :hg:`commit --close-branch`).
1391 been marked closed (see :hg:`commit --close-branch`).
1392
1392
1393 Use the command :hg:`update` to switch to an existing branch.
1393 Use the command :hg:`update` to switch to an existing branch.
1394
1394
1395 .. container:: verbose
1395 .. container:: verbose
1396
1396
1397 Template:
1397 Template:
1398
1398
1399 The following keywords are supported in addition to the common template
1399 The following keywords are supported in addition to the common template
1400 keywords and functions such as ``{branch}``. See also
1400 keywords and functions such as ``{branch}``. See also
1401 :hg:`help templates`.
1401 :hg:`help templates`.
1402
1402
1403 :active: Boolean. True if the branch is active.
1403 :active: Boolean. True if the branch is active.
1404 :closed: Boolean. True if the branch is closed.
1404 :closed: Boolean. True if the branch is closed.
1405 :current: Boolean. True if it is the current branch.
1405 :current: Boolean. True if it is the current branch.
1406
1406
1407 Returns 0.
1407 Returns 0.
1408 """
1408 """
1409
1409
1410 opts = pycompat.byteskwargs(opts)
1410 opts = pycompat.byteskwargs(opts)
1411 revs = opts.get(b'rev')
1411 revs = opts.get(b'rev')
1412 selectedbranches = None
1412 selectedbranches = None
1413 if revs:
1413 if revs:
1414 revs = scmutil.revrange(repo, revs)
1414 revs = scmutil.revrange(repo, revs)
1415 getbi = repo.revbranchcache().branchinfo
1415 getbi = repo.revbranchcache().branchinfo
1416 selectedbranches = {getbi(r)[0] for r in revs}
1416 selectedbranches = {getbi(r)[0] for r in revs}
1417
1417
1418 ui.pager(b'branches')
1418 ui.pager(b'branches')
1419 fm = ui.formatter(b'branches', opts)
1419 fm = ui.formatter(b'branches', opts)
1420 hexfunc = fm.hexfunc
1420 hexfunc = fm.hexfunc
1421
1421
1422 allheads = set(repo.heads())
1422 allheads = set(repo.heads())
1423 branches = []
1423 branches = []
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1424 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1425 if selectedbranches is not None and tag not in selectedbranches:
1425 if selectedbranches is not None and tag not in selectedbranches:
1426 continue
1426 continue
1427 isactive = False
1427 isactive = False
1428 if not isclosed:
1428 if not isclosed:
1429 openheads = set(repo.branchmap().iteropen(heads))
1429 openheads = set(repo.branchmap().iteropen(heads))
1430 isactive = bool(openheads & allheads)
1430 isactive = bool(openheads & allheads)
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1431 branches.append((tag, repo[tip], isactive, not isclosed))
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1432 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1433
1433
1434 for tag, ctx, isactive, isopen in branches:
1434 for tag, ctx, isactive, isopen in branches:
1435 if active and not isactive:
1435 if active and not isactive:
1436 continue
1436 continue
1437 if isactive:
1437 if isactive:
1438 label = b'branches.active'
1438 label = b'branches.active'
1439 notice = b''
1439 notice = b''
1440 elif not isopen:
1440 elif not isopen:
1441 if not closed:
1441 if not closed:
1442 continue
1442 continue
1443 label = b'branches.closed'
1443 label = b'branches.closed'
1444 notice = _(b' (closed)')
1444 notice = _(b' (closed)')
1445 else:
1445 else:
1446 label = b'branches.inactive'
1446 label = b'branches.inactive'
1447 notice = _(b' (inactive)')
1447 notice = _(b' (inactive)')
1448 current = tag == repo.dirstate.branch()
1448 current = tag == repo.dirstate.branch()
1449 if current:
1449 if current:
1450 label = b'branches.current'
1450 label = b'branches.current'
1451
1451
1452 fm.startitem()
1452 fm.startitem()
1453 fm.write(b'branch', b'%s', tag, label=label)
1453 fm.write(b'branch', b'%s', tag, label=label)
1454 rev = ctx.rev()
1454 rev = ctx.rev()
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1455 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1456 fmt = b' ' * padsize + b' %d:%s'
1456 fmt = b' ' * padsize + b' %d:%s'
1457 fm.condwrite(
1457 fm.condwrite(
1458 not ui.quiet,
1458 not ui.quiet,
1459 b'rev node',
1459 b'rev node',
1460 fmt,
1460 fmt,
1461 rev,
1461 rev,
1462 hexfunc(ctx.node()),
1462 hexfunc(ctx.node()),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1463 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1464 )
1464 )
1465 fm.context(ctx=ctx)
1465 fm.context(ctx=ctx)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1466 fm.data(active=isactive, closed=not isopen, current=current)
1467 if not ui.quiet:
1467 if not ui.quiet:
1468 fm.plain(notice)
1468 fm.plain(notice)
1469 fm.plain(b'\n')
1469 fm.plain(b'\n')
1470 fm.end()
1470 fm.end()
1471
1471
1472
1472
1473 @command(
1473 @command(
1474 b'bundle',
1474 b'bundle',
1475 [
1475 [
1476 (
1476 (
1477 b'f',
1477 b'f',
1478 b'force',
1478 b'force',
1479 None,
1479 None,
1480 _(b'run even when the destination is unrelated'),
1480 _(b'run even when the destination is unrelated'),
1481 ),
1481 ),
1482 (
1482 (
1483 b'r',
1483 b'r',
1484 b'rev',
1484 b'rev',
1485 [],
1485 [],
1486 _(b'a changeset intended to be added to the destination'),
1486 _(b'a changeset intended to be added to the destination'),
1487 _(b'REV'),
1487 _(b'REV'),
1488 ),
1488 ),
1489 (
1489 (
1490 b'b',
1490 b'b',
1491 b'branch',
1491 b'branch',
1492 [],
1492 [],
1493 _(b'a specific branch you would like to bundle'),
1493 _(b'a specific branch you would like to bundle'),
1494 _(b'BRANCH'),
1494 _(b'BRANCH'),
1495 ),
1495 ),
1496 (
1496 (
1497 b'',
1497 b'',
1498 b'base',
1498 b'base',
1499 [],
1499 [],
1500 _(b'a base changeset assumed to be available at the destination'),
1500 _(b'a base changeset assumed to be available at the destination'),
1501 _(b'REV'),
1501 _(b'REV'),
1502 ),
1502 ),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1503 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1504 (
1504 (
1505 b't',
1505 b't',
1506 b'type',
1506 b'type',
1507 b'bzip2',
1507 b'bzip2',
1508 _(b'bundle compression type to use'),
1508 _(b'bundle compression type to use'),
1509 _(b'TYPE'),
1509 _(b'TYPE'),
1510 ),
1510 ),
1511 ]
1511 ]
1512 + remoteopts,
1512 + remoteopts,
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1513 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1514 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1515 )
1515 )
1516 def bundle(ui, repo, fname, dest=None, **opts):
1516 def bundle(ui, repo, fname, dest=None, **opts):
1517 """create a bundle file
1517 """create a bundle file
1518
1518
1519 Generate a bundle file containing data to be transferred to another
1519 Generate a bundle file containing data to be transferred to another
1520 repository.
1520 repository.
1521
1521
1522 To create a bundle containing all changesets, use -a/--all
1522 To create a bundle containing all changesets, use -a/--all
1523 (or --base null). Otherwise, hg assumes the destination will have
1523 (or --base null). Otherwise, hg assumes the destination will have
1524 all the nodes you specify with --base parameters. Otherwise, hg
1524 all the nodes you specify with --base parameters. Otherwise, hg
1525 will assume the repository has all the nodes in destination, or
1525 will assume the repository has all the nodes in destination, or
1526 default-push/default if no destination is specified, where destination
1526 default-push/default if no destination is specified, where destination
1527 is the repository you provide through DEST option.
1527 is the repository you provide through DEST option.
1528
1528
1529 You can change bundle format with the -t/--type option. See
1529 You can change bundle format with the -t/--type option. See
1530 :hg:`help bundlespec` for documentation on this format. By default,
1530 :hg:`help bundlespec` for documentation on this format. By default,
1531 the most appropriate format is used and compression defaults to
1531 the most appropriate format is used and compression defaults to
1532 bzip2.
1532 bzip2.
1533
1533
1534 The bundle file can then be transferred using conventional means
1534 The bundle file can then be transferred using conventional means
1535 and applied to another repository with the unbundle or pull
1535 and applied to another repository with the unbundle or pull
1536 command. This is useful when direct push and pull are not
1536 command. This is useful when direct push and pull are not
1537 available or when exporting an entire repository is undesirable.
1537 available or when exporting an entire repository is undesirable.
1538
1538
1539 Applying bundles preserves all changeset contents including
1539 Applying bundles preserves all changeset contents including
1540 permissions, copy/rename information, and revision history.
1540 permissions, copy/rename information, and revision history.
1541
1541
1542 Returns 0 on success, 1 if no changes found.
1542 Returns 0 on success, 1 if no changes found.
1543 """
1543 """
1544 opts = pycompat.byteskwargs(opts)
1544 opts = pycompat.byteskwargs(opts)
1545 revs = None
1545 revs = None
1546 if b'rev' in opts:
1546 if b'rev' in opts:
1547 revstrings = opts[b'rev']
1547 revstrings = opts[b'rev']
1548 revs = scmutil.revrange(repo, revstrings)
1548 revs = scmutil.revrange(repo, revstrings)
1549 if revstrings and not revs:
1549 if revstrings and not revs:
1550 raise error.Abort(_(b'no commits to bundle'))
1550 raise error.Abort(_(b'no commits to bundle'))
1551
1551
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1552 bundletype = opts.get(b'type', b'bzip2').lower()
1553 try:
1553 try:
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1554 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1555 except error.UnsupportedBundleSpecification as e:
1555 except error.UnsupportedBundleSpecification as e:
1556 raise error.Abort(
1556 raise error.Abort(
1557 pycompat.bytestr(e),
1557 pycompat.bytestr(e),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1558 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1559 )
1559 )
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1560 cgversion = bundlespec.contentopts[b"cg.version"]
1561
1561
1562 # Packed bundles are a pseudo bundle format for now.
1562 # Packed bundles are a pseudo bundle format for now.
1563 if cgversion == b's1':
1563 if cgversion == b's1':
1564 raise error.Abort(
1564 raise error.Abort(
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1565 _(b'packed bundles cannot be produced by "hg bundle"'),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1566 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1567 )
1567 )
1568
1568
1569 if opts.get(b'all'):
1569 if opts.get(b'all'):
1570 if dest:
1570 if dest:
1571 raise error.Abort(
1571 raise error.Abort(
1572 _(b"--all is incompatible with specifying a destination")
1572 _(b"--all is incompatible with specifying a destination")
1573 )
1573 )
1574 if opts.get(b'base'):
1574 if opts.get(b'base'):
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1575 ui.warn(_(b"ignoring --base because --all was specified\n"))
1576 base = [nullrev]
1576 base = [nullrev]
1577 else:
1577 else:
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1578 base = scmutil.revrange(repo, opts.get(b'base'))
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1579 if cgversion not in changegroup.supportedoutgoingversions(repo):
1580 raise error.Abort(
1580 raise error.Abort(
1581 _(b"repository does not support bundle version %s") % cgversion
1581 _(b"repository does not support bundle version %s") % cgversion
1582 )
1582 )
1583
1583
1584 if base:
1584 if base:
1585 if dest:
1585 if dest:
1586 raise error.Abort(
1586 raise error.Abort(
1587 _(b"--base is incompatible with specifying a destination")
1587 _(b"--base is incompatible with specifying a destination")
1588 )
1588 )
1589 common = [repo[rev].node() for rev in base]
1589 common = [repo[rev].node() for rev in base]
1590 heads = [repo[r].node() for r in revs] if revs else None
1590 heads = [repo[r].node() for r in revs] if revs else None
1591 outgoing = discovery.outgoing(repo, common, heads)
1591 outgoing = discovery.outgoing(repo, common, heads)
1592 else:
1592 else:
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1593 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1594 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1595 other = hg.peer(repo, opts, dest)
1595 other = hg.peer(repo, opts, dest)
1596 revs = [repo[r].hex() for r in revs]
1596 revs = [repo[r].hex() for r in revs]
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1597 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1598 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1599 outgoing = discovery.findcommonoutgoing(
1599 outgoing = discovery.findcommonoutgoing(
1600 repo,
1600 repo,
1601 other,
1601 other,
1602 onlyheads=heads,
1602 onlyheads=heads,
1603 force=opts.get(b'force'),
1603 force=opts.get(b'force'),
1604 portable=True,
1604 portable=True,
1605 )
1605 )
1606
1606
1607 if not outgoing.missing:
1607 if not outgoing.missing:
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1608 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1609 return 1
1609 return 1
1610
1610
1611 if cgversion == b'01': # bundle1
1611 if cgversion == b'01': # bundle1
1612 bversion = b'HG10' + bundlespec.wirecompression
1612 bversion = b'HG10' + bundlespec.wirecompression
1613 bcompression = None
1613 bcompression = None
1614 elif cgversion in (b'02', b'03'):
1614 elif cgversion in (b'02', b'03'):
1615 bversion = b'HG20'
1615 bversion = b'HG20'
1616 bcompression = bundlespec.wirecompression
1616 bcompression = bundlespec.wirecompression
1617 else:
1617 else:
1618 raise error.ProgrammingError(
1618 raise error.ProgrammingError(
1619 b'bundle: unexpected changegroup version %s' % cgversion
1619 b'bundle: unexpected changegroup version %s' % cgversion
1620 )
1620 )
1621
1621
1622 # TODO compression options should be derived from bundlespec parsing.
1622 # TODO compression options should be derived from bundlespec parsing.
1623 # This is a temporary hack to allow adjusting bundle compression
1623 # This is a temporary hack to allow adjusting bundle compression
1624 # level without a) formalizing the bundlespec changes to declare it
1624 # level without a) formalizing the bundlespec changes to declare it
1625 # b) introducing a command flag.
1625 # b) introducing a command flag.
1626 compopts = {}
1626 compopts = {}
1627 complevel = ui.configint(
1627 complevel = ui.configint(
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1628 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1629 )
1629 )
1630 if complevel is None:
1630 if complevel is None:
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1631 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1632 if complevel is not None:
1632 if complevel is not None:
1633 compopts[b'level'] = complevel
1633 compopts[b'level'] = complevel
1634
1634
1635 # Allow overriding the bundling of obsmarker in phases through
1635 # Allow overriding the bundling of obsmarker in phases through
1636 # configuration while we don't have a bundle version that include them
1636 # configuration while we don't have a bundle version that include them
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1637 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1638 bundlespec.contentopts[b'obsolescence'] = True
1638 bundlespec.contentopts[b'obsolescence'] = True
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1639 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1640 bundlespec.contentopts[b'phases'] = True
1640 bundlespec.contentopts[b'phases'] = True
1641
1641
1642 bundle2.writenewbundle(
1642 bundle2.writenewbundle(
1643 ui,
1643 ui,
1644 repo,
1644 repo,
1645 b'bundle',
1645 b'bundle',
1646 fname,
1646 fname,
1647 bversion,
1647 bversion,
1648 outgoing,
1648 outgoing,
1649 bundlespec.contentopts,
1649 bundlespec.contentopts,
1650 compression=bcompression,
1650 compression=bcompression,
1651 compopts=compopts,
1651 compopts=compopts,
1652 )
1652 )
1653
1653
1654
1654
1655 @command(
1655 @command(
1656 b'cat',
1656 b'cat',
1657 [
1657 [
1658 (
1658 (
1659 b'o',
1659 b'o',
1660 b'output',
1660 b'output',
1661 b'',
1661 b'',
1662 _(b'print output to file with formatted name'),
1662 _(b'print output to file with formatted name'),
1663 _(b'FORMAT'),
1663 _(b'FORMAT'),
1664 ),
1664 ),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1665 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1666 (b'', b'decode', None, _(b'apply any matching decode filter')),
1667 ]
1667 ]
1668 + walkopts
1668 + walkopts
1669 + formatteropts,
1669 + formatteropts,
1670 _(b'[OPTION]... FILE...'),
1670 _(b'[OPTION]... FILE...'),
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1671 helpcategory=command.CATEGORY_FILE_CONTENTS,
1672 inferrepo=True,
1672 inferrepo=True,
1673 intents={INTENT_READONLY},
1673 intents={INTENT_READONLY},
1674 )
1674 )
1675 def cat(ui, repo, file1, *pats, **opts):
1675 def cat(ui, repo, file1, *pats, **opts):
1676 """output the current or given revision of files
1676 """output the current or given revision of files
1677
1677
1678 Print the specified files as they were at the given revision. If
1678 Print the specified files as they were at the given revision. If
1679 no revision is given, the parent of the working directory is used.
1679 no revision is given, the parent of the working directory is used.
1680
1680
1681 Output may be to a file, in which case the name of the file is
1681 Output may be to a file, in which case the name of the file is
1682 given using a template string. See :hg:`help templates`. In addition
1682 given using a template string. See :hg:`help templates`. In addition
1683 to the common template keywords, the following formatting rules are
1683 to the common template keywords, the following formatting rules are
1684 supported:
1684 supported:
1685
1685
1686 :``%%``: literal "%" character
1686 :``%%``: literal "%" character
1687 :``%s``: basename of file being printed
1687 :``%s``: basename of file being printed
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1688 :``%d``: dirname of file being printed, or '.' if in repository root
1689 :``%p``: root-relative path name of file being printed
1689 :``%p``: root-relative path name of file being printed
1690 :``%H``: changeset hash (40 hexadecimal digits)
1690 :``%H``: changeset hash (40 hexadecimal digits)
1691 :``%R``: changeset revision number
1691 :``%R``: changeset revision number
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1692 :``%h``: short-form changeset hash (12 hexadecimal digits)
1693 :``%r``: zero-padded changeset revision number
1693 :``%r``: zero-padded changeset revision number
1694 :``%b``: basename of the exporting repository
1694 :``%b``: basename of the exporting repository
1695 :``\\``: literal "\\" character
1695 :``\\``: literal "\\" character
1696
1696
1697 .. container:: verbose
1697 .. container:: verbose
1698
1698
1699 Template:
1699 Template:
1700
1700
1701 The following keywords are supported in addition to the common template
1701 The following keywords are supported in addition to the common template
1702 keywords and functions. See also :hg:`help templates`.
1702 keywords and functions. See also :hg:`help templates`.
1703
1703
1704 :data: String. File content.
1704 :data: String. File content.
1705 :path: String. Repository-absolute path of the file.
1705 :path: String. Repository-absolute path of the file.
1706
1706
1707 Returns 0 on success.
1707 Returns 0 on success.
1708 """
1708 """
1709 opts = pycompat.byteskwargs(opts)
1709 opts = pycompat.byteskwargs(opts)
1710 rev = opts.get(b'rev')
1710 rev = opts.get(b'rev')
1711 if rev:
1711 if rev:
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1713 ctx = scmutil.revsingle(repo, rev)
1713 ctx = scmutil.revsingle(repo, rev)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1714 m = scmutil.match(ctx, (file1,) + pats, opts)
1715 fntemplate = opts.pop(b'output', b'')
1715 fntemplate = opts.pop(b'output', b'')
1716 if cmdutil.isstdiofilename(fntemplate):
1716 if cmdutil.isstdiofilename(fntemplate):
1717 fntemplate = b''
1717 fntemplate = b''
1718
1718
1719 if fntemplate:
1719 if fntemplate:
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1720 fm = formatter.nullformatter(ui, b'cat', opts)
1721 else:
1721 else:
1722 ui.pager(b'cat')
1722 ui.pager(b'cat')
1723 fm = ui.formatter(b'cat', opts)
1723 fm = ui.formatter(b'cat', opts)
1724 with fm:
1724 with fm:
1725 return cmdutil.cat(
1725 return cmdutil.cat(
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1726 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1727 )
1727 )
1728
1728
1729
1729
1730 @command(
1730 @command(
1731 b'clone',
1731 b'clone',
1732 [
1732 [
1733 (
1733 (
1734 b'U',
1734 b'U',
1735 b'noupdate',
1735 b'noupdate',
1736 None,
1736 None,
1737 _(
1737 _(
1738 b'the clone will include an empty working '
1738 b'the clone will include an empty working '
1739 b'directory (only a repository)'
1739 b'directory (only a repository)'
1740 ),
1740 ),
1741 ),
1741 ),
1742 (
1742 (
1743 b'u',
1743 b'u',
1744 b'updaterev',
1744 b'updaterev',
1745 b'',
1745 b'',
1746 _(b'revision, tag, or branch to check out'),
1746 _(b'revision, tag, or branch to check out'),
1747 _(b'REV'),
1747 _(b'REV'),
1748 ),
1748 ),
1749 (
1749 (
1750 b'r',
1750 b'r',
1751 b'rev',
1751 b'rev',
1752 [],
1752 [],
1753 _(
1753 _(
1754 b'do not clone everything, but include this changeset'
1754 b'do not clone everything, but include this changeset'
1755 b' and its ancestors'
1755 b' and its ancestors'
1756 ),
1756 ),
1757 _(b'REV'),
1757 _(b'REV'),
1758 ),
1758 ),
1759 (
1759 (
1760 b'b',
1760 b'b',
1761 b'branch',
1761 b'branch',
1762 [],
1762 [],
1763 _(
1763 _(
1764 b'do not clone everything, but include this branch\'s'
1764 b'do not clone everything, but include this branch\'s'
1765 b' changesets and their ancestors'
1765 b' changesets and their ancestors'
1766 ),
1766 ),
1767 _(b'BRANCH'),
1767 _(b'BRANCH'),
1768 ),
1768 ),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1769 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1770 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1771 (b'', b'stream', None, _(b'clone with minimal data processing')),
1772 ]
1772 ]
1773 + remoteopts,
1773 + remoteopts,
1774 _(b'[OPTION]... SOURCE [DEST]'),
1774 _(b'[OPTION]... SOURCE [DEST]'),
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1775 helpcategory=command.CATEGORY_REPO_CREATION,
1776 helpbasic=True,
1776 helpbasic=True,
1777 norepo=True,
1777 norepo=True,
1778 )
1778 )
1779 def clone(ui, source, dest=None, **opts):
1779 def clone(ui, source, dest=None, **opts):
1780 """make a copy of an existing repository
1780 """make a copy of an existing repository
1781
1781
1782 Create a copy of an existing repository in a new directory.
1782 Create a copy of an existing repository in a new directory.
1783
1783
1784 If no destination directory name is specified, it defaults to the
1784 If no destination directory name is specified, it defaults to the
1785 basename of the source.
1785 basename of the source.
1786
1786
1787 The location of the source is added to the new repository's
1787 The location of the source is added to the new repository's
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1788 ``.hg/hgrc`` file, as the default to be used for future pulls.
1789
1789
1790 Only local paths and ``ssh://`` URLs are supported as
1790 Only local paths and ``ssh://`` URLs are supported as
1791 destinations. For ``ssh://`` destinations, no working directory or
1791 destinations. For ``ssh://`` destinations, no working directory or
1792 ``.hg/hgrc`` will be created on the remote side.
1792 ``.hg/hgrc`` will be created on the remote side.
1793
1793
1794 If the source repository has a bookmark called '@' set, that
1794 If the source repository has a bookmark called '@' set, that
1795 revision will be checked out in the new repository by default.
1795 revision will be checked out in the new repository by default.
1796
1796
1797 To check out a particular version, use -u/--update, or
1797 To check out a particular version, use -u/--update, or
1798 -U/--noupdate to create a clone with no working directory.
1798 -U/--noupdate to create a clone with no working directory.
1799
1799
1800 To pull only a subset of changesets, specify one or more revisions
1800 To pull only a subset of changesets, specify one or more revisions
1801 identifiers with -r/--rev or branches with -b/--branch. The
1801 identifiers with -r/--rev or branches with -b/--branch. The
1802 resulting clone will contain only the specified changesets and
1802 resulting clone will contain only the specified changesets and
1803 their ancestors. These options (or 'clone src#rev dest') imply
1803 their ancestors. These options (or 'clone src#rev dest') imply
1804 --pull, even for local source repositories.
1804 --pull, even for local source repositories.
1805
1805
1806 In normal clone mode, the remote normalizes repository data into a common
1806 In normal clone mode, the remote normalizes repository data into a common
1807 exchange format and the receiving end translates this data into its local
1807 exchange format and the receiving end translates this data into its local
1808 storage format. --stream activates a different clone mode that essentially
1808 storage format. --stream activates a different clone mode that essentially
1809 copies repository files from the remote with minimal data processing. This
1809 copies repository files from the remote with minimal data processing. This
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1810 significantly reduces the CPU cost of a clone both remotely and locally.
1811 However, it often increases the transferred data size by 30-40%. This can
1811 However, it often increases the transferred data size by 30-40%. This can
1812 result in substantially faster clones where I/O throughput is plentiful,
1812 result in substantially faster clones where I/O throughput is plentiful,
1813 especially for larger repositories. A side-effect of --stream clones is
1813 especially for larger repositories. A side-effect of --stream clones is
1814 that storage settings and requirements on the remote are applied locally:
1814 that storage settings and requirements on the remote are applied locally:
1815 a modern client may inherit legacy or inefficient storage used by the
1815 a modern client may inherit legacy or inefficient storage used by the
1816 remote or a legacy Mercurial client may not be able to clone from a
1816 remote or a legacy Mercurial client may not be able to clone from a
1817 modern Mercurial remote.
1817 modern Mercurial remote.
1818
1818
1819 .. note::
1819 .. note::
1820
1820
1821 Specifying a tag will include the tagged changeset but not the
1821 Specifying a tag will include the tagged changeset but not the
1822 changeset containing the tag.
1822 changeset containing the tag.
1823
1823
1824 .. container:: verbose
1824 .. container:: verbose
1825
1825
1826 For efficiency, hardlinks are used for cloning whenever the
1826 For efficiency, hardlinks are used for cloning whenever the
1827 source and destination are on the same filesystem (note this
1827 source and destination are on the same filesystem (note this
1828 applies only to the repository data, not to the working
1828 applies only to the repository data, not to the working
1829 directory). Some filesystems, such as AFS, implement hardlinking
1829 directory). Some filesystems, such as AFS, implement hardlinking
1830 incorrectly, but do not report errors. In these cases, use the
1830 incorrectly, but do not report errors. In these cases, use the
1831 --pull option to avoid hardlinking.
1831 --pull option to avoid hardlinking.
1832
1832
1833 Mercurial will update the working directory to the first applicable
1833 Mercurial will update the working directory to the first applicable
1834 revision from this list:
1834 revision from this list:
1835
1835
1836 a) null if -U or the source repository has no changesets
1836 a) null if -U or the source repository has no changesets
1837 b) if -u . and the source repository is local, the first parent of
1837 b) if -u . and the source repository is local, the first parent of
1838 the source repository's working directory
1838 the source repository's working directory
1839 c) the changeset specified with -u (if a branch name, this means the
1839 c) the changeset specified with -u (if a branch name, this means the
1840 latest head of that branch)
1840 latest head of that branch)
1841 d) the changeset specified with -r
1841 d) the changeset specified with -r
1842 e) the tipmost head specified with -b
1842 e) the tipmost head specified with -b
1843 f) the tipmost head specified with the url#branch source syntax
1843 f) the tipmost head specified with the url#branch source syntax
1844 g) the revision marked with the '@' bookmark, if present
1844 g) the revision marked with the '@' bookmark, if present
1845 h) the tipmost head of the default branch
1845 h) the tipmost head of the default branch
1846 i) tip
1846 i) tip
1847
1847
1848 When cloning from servers that support it, Mercurial may fetch
1848 When cloning from servers that support it, Mercurial may fetch
1849 pre-generated data from a server-advertised URL or inline from the
1849 pre-generated data from a server-advertised URL or inline from the
1850 same stream. When this is done, hooks operating on incoming changesets
1850 same stream. When this is done, hooks operating on incoming changesets
1851 and changegroups may fire more than once, once for each pre-generated
1851 and changegroups may fire more than once, once for each pre-generated
1852 bundle and as well as for any additional remaining data. In addition,
1852 bundle and as well as for any additional remaining data. In addition,
1853 if an error occurs, the repository may be rolled back to a partial
1853 if an error occurs, the repository may be rolled back to a partial
1854 clone. This behavior may change in future releases.
1854 clone. This behavior may change in future releases.
1855 See :hg:`help -e clonebundles` for more.
1855 See :hg:`help -e clonebundles` for more.
1856
1856
1857 Examples:
1857 Examples:
1858
1858
1859 - clone a remote repository to a new directory named hg/::
1859 - clone a remote repository to a new directory named hg/::
1860
1860
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1861 hg clone https://www.mercurial-scm.org/repo/hg/
1862
1862
1863 - create a lightweight local clone::
1863 - create a lightweight local clone::
1864
1864
1865 hg clone project/ project-feature/
1865 hg clone project/ project-feature/
1866
1866
1867 - clone from an absolute path on an ssh server (note double-slash)::
1867 - clone from an absolute path on an ssh server (note double-slash)::
1868
1868
1869 hg clone ssh://user@server//home/projects/alpha/
1869 hg clone ssh://user@server//home/projects/alpha/
1870
1870
1871 - do a streaming clone while checking out a specified version::
1871 - do a streaming clone while checking out a specified version::
1872
1872
1873 hg clone --stream http://server/repo -u 1.5
1873 hg clone --stream http://server/repo -u 1.5
1874
1874
1875 - create a repository without changesets after a particular revision::
1875 - create a repository without changesets after a particular revision::
1876
1876
1877 hg clone -r 04e544 experimental/ good/
1877 hg clone -r 04e544 experimental/ good/
1878
1878
1879 - clone (and track) a particular named branch::
1879 - clone (and track) a particular named branch::
1880
1880
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1881 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1882
1882
1883 See :hg:`help urls` for details on specifying URLs.
1883 See :hg:`help urls` for details on specifying URLs.
1884
1884
1885 Returns 0 on success.
1885 Returns 0 on success.
1886 """
1886 """
1887 opts = pycompat.byteskwargs(opts)
1887 opts = pycompat.byteskwargs(opts)
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1888 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1889
1889
1890 # --include/--exclude can come from narrow or sparse.
1890 # --include/--exclude can come from narrow or sparse.
1891 includepats, excludepats = None, None
1891 includepats, excludepats = None, None
1892
1892
1893 # hg.clone() differentiates between None and an empty set. So make sure
1893 # hg.clone() differentiates between None and an empty set. So make sure
1894 # patterns are sets if narrow is requested without patterns.
1894 # patterns are sets if narrow is requested without patterns.
1895 if opts.get(b'narrow'):
1895 if opts.get(b'narrow'):
1896 includepats = set()
1896 includepats = set()
1897 excludepats = set()
1897 excludepats = set()
1898
1898
1899 if opts.get(b'include'):
1899 if opts.get(b'include'):
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1900 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1901 if opts.get(b'exclude'):
1901 if opts.get(b'exclude'):
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1902 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1903
1903
1904 r = hg.clone(
1904 r = hg.clone(
1905 ui,
1905 ui,
1906 opts,
1906 opts,
1907 source,
1907 source,
1908 dest,
1908 dest,
1909 pull=opts.get(b'pull'),
1909 pull=opts.get(b'pull'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1910 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1911 revs=opts.get(b'rev'),
1911 revs=opts.get(b'rev'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1912 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1913 branch=opts.get(b'branch'),
1913 branch=opts.get(b'branch'),
1914 shareopts=opts.get(b'shareopts'),
1914 shareopts=opts.get(b'shareopts'),
1915 storeincludepats=includepats,
1915 storeincludepats=includepats,
1916 storeexcludepats=excludepats,
1916 storeexcludepats=excludepats,
1917 depth=opts.get(b'depth') or None,
1917 depth=opts.get(b'depth') or None,
1918 )
1918 )
1919
1919
1920 return r is None
1920 return r is None
1921
1921
1922
1922
1923 @command(
1923 @command(
1924 b'commit|ci',
1924 b'commit|ci',
1925 [
1925 [
1926 (
1926 (
1927 b'A',
1927 b'A',
1928 b'addremove',
1928 b'addremove',
1929 None,
1929 None,
1930 _(b'mark new/missing files as added/removed before committing'),
1930 _(b'mark new/missing files as added/removed before committing'),
1931 ),
1931 ),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1932 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1933 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1934 (b's', b'secret', None, _(b'use the secret phase for committing')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1935 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1936 (
1936 (
1937 b'',
1937 b'',
1938 b'force-close-branch',
1938 b'force-close-branch',
1939 None,
1939 None,
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1940 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1941 ),
1941 ),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1942 (b'i', b'interactive', None, _(b'use interactive mode')),
1943 ]
1943 ]
1944 + walkopts
1944 + walkopts
1945 + commitopts
1945 + commitopts
1946 + commitopts2
1946 + commitopts2
1947 + subrepoopts,
1947 + subrepoopts,
1948 _(b'[OPTION]... [FILE]...'),
1948 _(b'[OPTION]... [FILE]...'),
1949 helpcategory=command.CATEGORY_COMMITTING,
1949 helpcategory=command.CATEGORY_COMMITTING,
1950 helpbasic=True,
1950 helpbasic=True,
1951 inferrepo=True,
1951 inferrepo=True,
1952 )
1952 )
1953 def commit(ui, repo, *pats, **opts):
1953 def commit(ui, repo, *pats, **opts):
1954 """commit the specified files or all outstanding changes
1954 """commit the specified files or all outstanding changes
1955
1955
1956 Commit changes to the given files into the repository. Unlike a
1956 Commit changes to the given files into the repository. Unlike a
1957 centralized SCM, this operation is a local operation. See
1957 centralized SCM, this operation is a local operation. See
1958 :hg:`push` for a way to actively distribute your changes.
1958 :hg:`push` for a way to actively distribute your changes.
1959
1959
1960 If a list of files is omitted, all changes reported by :hg:`status`
1960 If a list of files is omitted, all changes reported by :hg:`status`
1961 will be committed.
1961 will be committed.
1962
1962
1963 If you are committing the result of a merge, do not provide any
1963 If you are committing the result of a merge, do not provide any
1964 filenames or -I/-X filters.
1964 filenames or -I/-X filters.
1965
1965
1966 If no commit message is specified, Mercurial starts your
1966 If no commit message is specified, Mercurial starts your
1967 configured editor where you can enter a message. In case your
1967 configured editor where you can enter a message. In case your
1968 commit fails, you will find a backup of your message in
1968 commit fails, you will find a backup of your message in
1969 ``.hg/last-message.txt``.
1969 ``.hg/last-message.txt``.
1970
1970
1971 The --close-branch flag can be used to mark the current branch
1971 The --close-branch flag can be used to mark the current branch
1972 head closed. When all heads of a branch are closed, the branch
1972 head closed. When all heads of a branch are closed, the branch
1973 will be considered closed and no longer listed.
1973 will be considered closed and no longer listed.
1974
1974
1975 The --amend flag can be used to amend the parent of the
1975 The --amend flag can be used to amend the parent of the
1976 working directory with a new commit that contains the changes
1976 working directory with a new commit that contains the changes
1977 in the parent in addition to those currently reported by :hg:`status`,
1977 in the parent in addition to those currently reported by :hg:`status`,
1978 if there are any. The old commit is stored in a backup bundle in
1978 if there are any. The old commit is stored in a backup bundle in
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1979 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1980 on how to restore it).
1980 on how to restore it).
1981
1981
1982 Message, user and date are taken from the amended commit unless
1982 Message, user and date are taken from the amended commit unless
1983 specified. When a message isn't specified on the command line,
1983 specified. When a message isn't specified on the command line,
1984 the editor will open with the message of the amended commit.
1984 the editor will open with the message of the amended commit.
1985
1985
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1986 It is not possible to amend public changesets (see :hg:`help phases`)
1987 or changesets that have children.
1987 or changesets that have children.
1988
1988
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1989 See :hg:`help dates` for a list of formats valid for -d/--date.
1990
1990
1991 Returns 0 on success, 1 if nothing changed.
1991 Returns 0 on success, 1 if nothing changed.
1992
1992
1993 .. container:: verbose
1993 .. container:: verbose
1994
1994
1995 Examples:
1995 Examples:
1996
1996
1997 - commit all files ending in .py::
1997 - commit all files ending in .py::
1998
1998
1999 hg commit --include "set:**.py"
1999 hg commit --include "set:**.py"
2000
2000
2001 - commit all non-binary files::
2001 - commit all non-binary files::
2002
2002
2003 hg commit --exclude "set:binary()"
2003 hg commit --exclude "set:binary()"
2004
2004
2005 - amend the current commit and set the date to now::
2005 - amend the current commit and set the date to now::
2006
2006
2007 hg commit --amend --date now
2007 hg commit --amend --date now
2008 """
2008 """
2009 with repo.wlock(), repo.lock():
2009 with repo.wlock(), repo.lock():
2010 return _docommit(ui, repo, *pats, **opts)
2010 return _docommit(ui, repo, *pats, **opts)
2011
2011
2012
2012
2013 def _docommit(ui, repo, *pats, **opts):
2013 def _docommit(ui, repo, *pats, **opts):
2014 if opts.get('interactive'):
2014 if opts.get('interactive'):
2015 opts.pop('interactive')
2015 opts.pop('interactive')
2016 ret = cmdutil.dorecord(
2016 ret = cmdutil.dorecord(
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2017 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2018 )
2018 )
2019 # ret can be 0 (no changes to record) or the value returned by
2019 # ret can be 0 (no changes to record) or the value returned by
2020 # commit(), 1 if nothing changed or None on success.
2020 # commit(), 1 if nothing changed or None on success.
2021 return 1 if ret == 0 else ret
2021 return 1 if ret == 0 else ret
2022
2022
2023 opts = pycompat.byteskwargs(opts)
2023 opts = pycompat.byteskwargs(opts)
2024 if opts.get(b'subrepos'):
2024 if opts.get(b'subrepos'):
2025 if opts.get(b'amend'):
2025 if opts.get(b'amend'):
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2026 raise error.Abort(_(b'cannot amend with --subrepos'))
2027 # Let --subrepos on the command line override config setting.
2027 # Let --subrepos on the command line override config setting.
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2028 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2029
2029
2030 cmdutil.checkunfinished(repo, commit=True)
2030 cmdutil.checkunfinished(repo, commit=True)
2031
2031
2032 branch = repo[None].branch()
2032 branch = repo[None].branch()
2033 bheads = repo.branchheads(branch)
2033 bheads = repo.branchheads(branch)
2034
2034
2035 extra = {}
2035 extra = {}
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2036 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2037 extra[b'close'] = b'1'
2037 extra[b'close'] = b'1'
2038
2038
2039 if repo[b'.'].closesbranch():
2039 if repo[b'.'].closesbranch():
2040 raise error.Abort(
2040 raise error.Abort(
2041 _(b'current revision is already a branch closing head')
2041 _(b'current revision is already a branch closing head')
2042 )
2042 )
2043 elif not bheads:
2043 elif not bheads:
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2044 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2045 elif (
2045 elif (
2046 branch == repo[b'.'].branch()
2046 branch == repo[b'.'].branch()
2047 and repo[b'.'].node() not in bheads
2047 and repo[b'.'].node() not in bheads
2048 and not opts.get(b'force_close_branch')
2048 and not opts.get(b'force_close_branch')
2049 ):
2049 ):
2050 hint = _(
2050 hint = _(
2051 b'use --force-close-branch to close branch from a non-head'
2051 b'use --force-close-branch to close branch from a non-head'
2052 b' changeset'
2052 b' changeset'
2053 )
2053 )
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2054 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2055 elif opts.get(b'amend'):
2055 elif opts.get(b'amend'):
2056 if (
2056 if (
2057 repo[b'.'].p1().branch() != branch
2057 repo[b'.'].p1().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2058 and repo[b'.'].p2().branch() != branch
2059 ):
2059 ):
2060 raise error.Abort(_(b'can only close branch heads'))
2060 raise error.Abort(_(b'can only close branch heads'))
2061
2061
2062 if opts.get(b'amend'):
2062 if opts.get(b'amend'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2063 if ui.configbool(b'ui', b'commitsubrepos'):
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2064 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2065
2065
2066 old = repo[b'.']
2066 old = repo[b'.']
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2067 rewriteutil.precheck(repo, [old.rev()], b'amend')
2068
2068
2069 # Currently histedit gets confused if an amend happens while histedit
2069 # Currently histedit gets confused if an amend happens while histedit
2070 # is in progress. Since we have a checkunfinished command, we are
2070 # is in progress. Since we have a checkunfinished command, we are
2071 # temporarily honoring it.
2071 # temporarily honoring it.
2072 #
2072 #
2073 # Note: eventually this guard will be removed. Please do not expect
2073 # Note: eventually this guard will be removed. Please do not expect
2074 # this behavior to remain.
2074 # this behavior to remain.
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2075 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2076 cmdutil.checkunfinished(repo)
2076 cmdutil.checkunfinished(repo)
2077
2077
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2078 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2079 if node == old.node():
2079 if node == old.node():
2080 ui.status(_(b"nothing changed\n"))
2080 ui.status(_(b"nothing changed\n"))
2081 return 1
2081 return 1
2082 else:
2082 else:
2083
2083
2084 def commitfunc(ui, repo, message, match, opts):
2084 def commitfunc(ui, repo, message, match, opts):
2085 overrides = {}
2085 overrides = {}
2086 if opts.get(b'secret'):
2086 if opts.get(b'secret'):
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2087 overrides[(b'phases', b'new-commit')] = b'secret'
2088
2088
2089 baseui = repo.baseui
2089 baseui = repo.baseui
2090 with baseui.configoverride(overrides, b'commit'):
2090 with baseui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2091 with ui.configoverride(overrides, b'commit'):
2092 editform = cmdutil.mergeeditform(
2092 editform = cmdutil.mergeeditform(
2093 repo[None], b'commit.normal'
2093 repo[None], b'commit.normal'
2094 )
2094 )
2095 editor = cmdutil.getcommiteditor(
2095 editor = cmdutil.getcommiteditor(
2096 editform=editform, **pycompat.strkwargs(opts)
2096 editform=editform, **pycompat.strkwargs(opts)
2097 )
2097 )
2098 return repo.commit(
2098 return repo.commit(
2099 message,
2099 message,
2100 opts.get(b'user'),
2100 opts.get(b'user'),
2101 opts.get(b'date'),
2101 opts.get(b'date'),
2102 match,
2102 match,
2103 editor=editor,
2103 editor=editor,
2104 extra=extra,
2104 extra=extra,
2105 )
2105 )
2106
2106
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2107 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2108
2108
2109 if not node:
2109 if not node:
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2110 stat = cmdutil.postcommitstatus(repo, pats, opts)
2111 if stat.deleted:
2111 if stat.deleted:
2112 ui.status(
2112 ui.status(
2113 _(
2113 _(
2114 b"nothing changed (%d missing files, see "
2114 b"nothing changed (%d missing files, see "
2115 b"'hg status')\n"
2115 b"'hg status')\n"
2116 )
2116 )
2117 % len(stat.deleted)
2117 % len(stat.deleted)
2118 )
2118 )
2119 else:
2119 else:
2120 ui.status(_(b"nothing changed\n"))
2120 ui.status(_(b"nothing changed\n"))
2121 return 1
2121 return 1
2122
2122
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2123 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2124
2124
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2125 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2126 status(
2126 status(
2127 ui,
2127 ui,
2128 repo,
2128 repo,
2129 modified=True,
2129 modified=True,
2130 added=True,
2130 added=True,
2131 removed=True,
2131 removed=True,
2132 deleted=True,
2132 deleted=True,
2133 unknown=True,
2133 unknown=True,
2134 subrepos=opts.get(b'subrepos'),
2134 subrepos=opts.get(b'subrepos'),
2135 )
2135 )
2136
2136
2137
2137
2138 @command(
2138 @command(
2139 b'config|showconfig|debugconfig',
2139 b'config|showconfig|debugconfig',
2140 [
2140 [
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2141 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2142 (b'e', b'edit', None, _(b'edit user config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2143 (b'l', b'local', None, _(b'edit repository config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2144 (b'g', b'global', None, _(b'edit global config')),
2145 ]
2145 ]
2146 + formatteropts,
2146 + formatteropts,
2147 _(b'[-u] [NAME]...'),
2147 _(b'[-u] [NAME]...'),
2148 helpcategory=command.CATEGORY_HELP,
2148 helpcategory=command.CATEGORY_HELP,
2149 optionalrepo=True,
2149 optionalrepo=True,
2150 intents={INTENT_READONLY},
2150 intents={INTENT_READONLY},
2151 )
2151 )
2152 def config(ui, repo, *values, **opts):
2152 def config(ui, repo, *values, **opts):
2153 """show combined config settings from all hgrc files
2153 """show combined config settings from all hgrc files
2154
2154
2155 With no arguments, print names and values of all config items.
2155 With no arguments, print names and values of all config items.
2156
2156
2157 With one argument of the form section.name, print just the value
2157 With one argument of the form section.name, print just the value
2158 of that config item.
2158 of that config item.
2159
2159
2160 With multiple arguments, print names and values of all config
2160 With multiple arguments, print names and values of all config
2161 items with matching section names or section.names.
2161 items with matching section names or section.names.
2162
2162
2163 With --edit, start an editor on the user-level config file. With
2163 With --edit, start an editor on the user-level config file. With
2164 --global, edit the system-wide config file. With --local, edit the
2164 --global, edit the system-wide config file. With --local, edit the
2165 repository-level config file.
2165 repository-level config file.
2166
2166
2167 With --debug, the source (filename and line number) is printed
2167 With --debug, the source (filename and line number) is printed
2168 for each config item.
2168 for each config item.
2169
2169
2170 See :hg:`help config` for more information about config files.
2170 See :hg:`help config` for more information about config files.
2171
2171
2172 .. container:: verbose
2172 .. container:: verbose
2173
2173
2174 Template:
2174 Template:
2175
2175
2176 The following keywords are supported. See also :hg:`help templates`.
2176 The following keywords are supported. See also :hg:`help templates`.
2177
2177
2178 :name: String. Config name.
2178 :name: String. Config name.
2179 :source: String. Filename and line number where the item is defined.
2179 :source: String. Filename and line number where the item is defined.
2180 :value: String. Config value.
2180 :value: String. Config value.
2181
2181
2182 Returns 0 on success, 1 if NAME does not exist.
2182 Returns 0 on success, 1 if NAME does not exist.
2183
2183
2184 """
2184 """
2185
2185
2186 opts = pycompat.byteskwargs(opts)
2186 opts = pycompat.byteskwargs(opts)
2187 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2187 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2188 if opts.get(b'local') and opts.get(b'global'):
2188 if opts.get(b'local') and opts.get(b'global'):
2189 raise error.Abort(_(b"can't use --local and --global together"))
2189 raise error.Abort(_(b"can't use --local and --global together"))
2190
2190
2191 if opts.get(b'local'):
2191 if opts.get(b'local'):
2192 if not repo:
2192 if not repo:
2193 raise error.Abort(_(b"can't use --local outside a repository"))
2193 raise error.Abort(_(b"can't use --local outside a repository"))
2194 paths = [repo.vfs.join(b'hgrc')]
2194 paths = [repo.vfs.join(b'hgrc')]
2195 elif opts.get(b'global'):
2195 elif opts.get(b'global'):
2196 paths = rcutil.systemrcpath()
2196 paths = rcutil.systemrcpath()
2197 else:
2197 else:
2198 paths = rcutil.userrcpath()
2198 paths = rcutil.userrcpath()
2199
2199
2200 for f in paths:
2200 for f in paths:
2201 if os.path.exists(f):
2201 if os.path.exists(f):
2202 break
2202 break
2203 else:
2203 else:
2204 if opts.get(b'global'):
2204 if opts.get(b'global'):
2205 samplehgrc = uimod.samplehgrcs[b'global']
2205 samplehgrc = uimod.samplehgrcs[b'global']
2206 elif opts.get(b'local'):
2206 elif opts.get(b'local'):
2207 samplehgrc = uimod.samplehgrcs[b'local']
2207 samplehgrc = uimod.samplehgrcs[b'local']
2208 else:
2208 else:
2209 samplehgrc = uimod.samplehgrcs[b'user']
2209 samplehgrc = uimod.samplehgrcs[b'user']
2210
2210
2211 f = paths[0]
2211 f = paths[0]
2212 fp = open(f, b"wb")
2212 fp = open(f, b"wb")
2213 fp.write(util.tonativeeol(samplehgrc))
2213 fp.write(util.tonativeeol(samplehgrc))
2214 fp.close()
2214 fp.close()
2215
2215
2216 editor = ui.geteditor()
2216 editor = ui.geteditor()
2217 ui.system(
2217 ui.system(
2218 b"%s \"%s\"" % (editor, f),
2218 b"%s \"%s\"" % (editor, f),
2219 onerr=error.Abort,
2219 onerr=error.Abort,
2220 errprefix=_(b"edit failed"),
2220 errprefix=_(b"edit failed"),
2221 blockedtag=b'config_edit',
2221 blockedtag=b'config_edit',
2222 )
2222 )
2223 return
2223 return
2224 ui.pager(b'config')
2224 ui.pager(b'config')
2225 fm = ui.formatter(b'config', opts)
2225 fm = ui.formatter(b'config', opts)
2226 for t, f in rcutil.rccomponents():
2226 for t, f in rcutil.rccomponents():
2227 if t == b'path':
2227 if t == b'path':
2228 ui.debug(b'read config from: %s\n' % f)
2228 ui.debug(b'read config from: %s\n' % f)
2229 elif t == b'resource':
2229 elif t == b'resource':
2230 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2230 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2231 elif t == b'items':
2231 elif t == b'items':
2232 # Don't print anything for 'items'.
2232 # Don't print anything for 'items'.
2233 pass
2233 pass
2234 else:
2234 else:
2235 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2235 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2236 untrusted = bool(opts.get(b'untrusted'))
2236 untrusted = bool(opts.get(b'untrusted'))
2237
2237
2238 selsections = selentries = []
2238 selsections = selentries = []
2239 if values:
2239 if values:
2240 selsections = [v for v in values if b'.' not in v]
2240 selsections = [v for v in values if b'.' not in v]
2241 selentries = [v for v in values if b'.' in v]
2241 selentries = [v for v in values if b'.' in v]
2242 uniquesel = len(selentries) == 1 and not selsections
2242 uniquesel = len(selentries) == 1 and not selsections
2243 selsections = set(selsections)
2243 selsections = set(selsections)
2244 selentries = set(selentries)
2244 selentries = set(selentries)
2245
2245
2246 matched = False
2246 matched = False
2247 for section, name, value in ui.walkconfig(untrusted=untrusted):
2247 for section, name, value in ui.walkconfig(untrusted=untrusted):
2248 source = ui.configsource(section, name, untrusted)
2248 source = ui.configsource(section, name, untrusted)
2249 value = pycompat.bytestr(value)
2249 value = pycompat.bytestr(value)
2250 defaultvalue = ui.configdefault(section, name)
2250 defaultvalue = ui.configdefault(section, name)
2251 if fm.isplain():
2251 if fm.isplain():
2252 source = source or b'none'
2252 source = source or b'none'
2253 value = value.replace(b'\n', b'\\n')
2253 value = value.replace(b'\n', b'\\n')
2254 entryname = section + b'.' + name
2254 entryname = section + b'.' + name
2255 if values and not (section in selsections or entryname in selentries):
2255 if values and not (section in selsections or entryname in selentries):
2256 continue
2256 continue
2257 fm.startitem()
2257 fm.startitem()
2258 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2258 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2259 if uniquesel:
2259 if uniquesel:
2260 fm.data(name=entryname)
2260 fm.data(name=entryname)
2261 fm.write(b'value', b'%s\n', value)
2261 fm.write(b'value', b'%s\n', value)
2262 else:
2262 else:
2263 fm.write(b'name value', b'%s=%s\n', entryname, value)
2263 fm.write(b'name value', b'%s=%s\n', entryname, value)
2264 if formatter.isprintable(defaultvalue):
2264 if formatter.isprintable(defaultvalue):
2265 fm.data(defaultvalue=defaultvalue)
2265 fm.data(defaultvalue=defaultvalue)
2266 elif isinstance(defaultvalue, list) and all(
2266 elif isinstance(defaultvalue, list) and all(
2267 formatter.isprintable(e) for e in defaultvalue
2267 formatter.isprintable(e) for e in defaultvalue
2268 ):
2268 ):
2269 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2269 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2270 # TODO: no idea how to process unsupported defaultvalue types
2270 # TODO: no idea how to process unsupported defaultvalue types
2271 matched = True
2271 matched = True
2272 fm.end()
2272 fm.end()
2273 if matched:
2273 if matched:
2274 return 0
2274 return 0
2275 return 1
2275 return 1
2276
2276
2277
2277
2278 @command(
2278 @command(
2279 b'continue',
2279 b'continue',
2280 dryrunopts,
2280 dryrunopts,
2281 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2281 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2282 helpbasic=True,
2282 helpbasic=True,
2283 )
2283 )
2284 def continuecmd(ui, repo, **opts):
2284 def continuecmd(ui, repo, **opts):
2285 """resumes an interrupted operation (EXPERIMENTAL)
2285 """resumes an interrupted operation (EXPERIMENTAL)
2286
2286
2287 Finishes a multistep operation like graft, histedit, rebase, merge,
2287 Finishes a multistep operation like graft, histedit, rebase, merge,
2288 and unshelve if they are in an interrupted state.
2288 and unshelve if they are in an interrupted state.
2289
2289
2290 use --dry-run/-n to dry run the command.
2290 use --dry-run/-n to dry run the command.
2291 """
2291 """
2292 dryrun = opts.get('dry_run')
2292 dryrun = opts.get('dry_run')
2293 contstate = cmdutil.getunfinishedstate(repo)
2293 contstate = cmdutil.getunfinishedstate(repo)
2294 if not contstate:
2294 if not contstate:
2295 raise error.Abort(_(b'no operation in progress'))
2295 raise error.Abort(_(b'no operation in progress'))
2296 if not contstate.continuefunc:
2296 if not contstate.continuefunc:
2297 raise error.Abort(
2297 raise error.Abort(
2298 (
2298 (
2299 _(b"%s in progress but does not support 'hg continue'")
2299 _(b"%s in progress but does not support 'hg continue'")
2300 % (contstate._opname)
2300 % (contstate._opname)
2301 ),
2301 ),
2302 hint=contstate.continuemsg(),
2302 hint=contstate.continuemsg(),
2303 )
2303 )
2304 if dryrun:
2304 if dryrun:
2305 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2305 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2306 return
2306 return
2307 return contstate.continuefunc(ui, repo)
2307 return contstate.continuefunc(ui, repo)
2308
2308
2309
2309
2310 @command(
2310 @command(
2311 b'copy|cp',
2311 b'copy|cp',
2312 [
2312 [
2313 (b'', b'forget', None, _(b'unmark a file as copied')),
2313 (b'', b'forget', None, _(b'unmark a file as copied')),
2314 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2314 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2315 (
2315 (
2316 b'',
2316 b'',
2317 b'at-rev',
2317 b'at-rev',
2318 b'',
2318 b'',
2319 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2319 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2320 _(b'REV'),
2320 _(b'REV'),
2321 ),
2321 ),
2322 (
2322 (
2323 b'f',
2323 b'f',
2324 b'force',
2324 b'force',
2325 None,
2325 None,
2326 _(b'forcibly copy over an existing managed file'),
2326 _(b'forcibly copy over an existing managed file'),
2327 ),
2327 ),
2328 ]
2328 ]
2329 + walkopts
2329 + walkopts
2330 + dryrunopts,
2330 + dryrunopts,
2331 _(b'[OPTION]... SOURCE... DEST'),
2331 _(b'[OPTION]... SOURCE... DEST'),
2332 helpcategory=command.CATEGORY_FILE_CONTENTS,
2332 helpcategory=command.CATEGORY_FILE_CONTENTS,
2333 )
2333 )
2334 def copy(ui, repo, *pats, **opts):
2334 def copy(ui, repo, *pats, **opts):
2335 """mark files as copied for the next commit
2335 """mark files as copied for the next commit
2336
2336
2337 Mark dest as having copies of source files. If dest is a
2337 Mark dest as having copies of source files. If dest is a
2338 directory, copies are put in that directory. If dest is a file,
2338 directory, copies are put in that directory. If dest is a file,
2339 the source must be a single file.
2339 the source must be a single file.
2340
2340
2341 By default, this command copies the contents of files as they
2341 By default, this command copies the contents of files as they
2342 exist in the working directory. If invoked with -A/--after, the
2342 exist in the working directory. If invoked with -A/--after, the
2343 operation is recorded, but no copying is performed.
2343 operation is recorded, but no copying is performed.
2344
2344
2345 To undo marking a file as copied, use --forget. With that option,
2345 To undo marking a file as copied, use --forget. With that option,
2346 all given (positional) arguments are unmarked as copies. The destination
2346 all given (positional) arguments are unmarked as copies. The destination
2347 file(s) will be left in place (still tracked).
2347 file(s) will be left in place (still tracked).
2348
2348
2349 This command takes effect with the next commit by default.
2349 This command takes effect with the next commit by default.
2350
2350
2351 Returns 0 on success, 1 if errors are encountered.
2351 Returns 0 on success, 1 if errors are encountered.
2352 """
2352 """
2353 opts = pycompat.byteskwargs(opts)
2353 opts = pycompat.byteskwargs(opts)
2354 with repo.wlock():
2354 with repo.wlock():
2355 return cmdutil.copy(ui, repo, pats, opts)
2355 return cmdutil.copy(ui, repo, pats, opts)
2356
2356
2357
2357
2358 @command(
2358 @command(
2359 b'debugcommands',
2359 b'debugcommands',
2360 [],
2360 [],
2361 _(b'[COMMAND]'),
2361 _(b'[COMMAND]'),
2362 helpcategory=command.CATEGORY_HELP,
2362 helpcategory=command.CATEGORY_HELP,
2363 norepo=True,
2363 norepo=True,
2364 )
2364 )
2365 def debugcommands(ui, cmd=b'', *args):
2365 def debugcommands(ui, cmd=b'', *args):
2366 """list all available commands and options"""
2366 """list all available commands and options"""
2367 for cmd, vals in sorted(pycompat.iteritems(table)):
2367 for cmd, vals in sorted(pycompat.iteritems(table)):
2368 cmd = cmd.split(b'|')[0]
2368 cmd = cmd.split(b'|')[0]
2369 opts = b', '.join([i[1] for i in vals[1]])
2369 opts = b', '.join([i[1] for i in vals[1]])
2370 ui.write(b'%s: %s\n' % (cmd, opts))
2370 ui.write(b'%s: %s\n' % (cmd, opts))
2371
2371
2372
2372
2373 @command(
2373 @command(
2374 b'debugcomplete',
2374 b'debugcomplete',
2375 [(b'o', b'options', None, _(b'show the command options'))],
2375 [(b'o', b'options', None, _(b'show the command options'))],
2376 _(b'[-o] CMD'),
2376 _(b'[-o] CMD'),
2377 helpcategory=command.CATEGORY_HELP,
2377 helpcategory=command.CATEGORY_HELP,
2378 norepo=True,
2378 norepo=True,
2379 )
2379 )
2380 def debugcomplete(ui, cmd=b'', **opts):
2380 def debugcomplete(ui, cmd=b'', **opts):
2381 """returns the completion list associated with the given command"""
2381 """returns the completion list associated with the given command"""
2382
2382
2383 if opts.get('options'):
2383 if opts.get('options'):
2384 options = []
2384 options = []
2385 otables = [globalopts]
2385 otables = [globalopts]
2386 if cmd:
2386 if cmd:
2387 aliases, entry = cmdutil.findcmd(cmd, table, False)
2387 aliases, entry = cmdutil.findcmd(cmd, table, False)
2388 otables.append(entry[1])
2388 otables.append(entry[1])
2389 for t in otables:
2389 for t in otables:
2390 for o in t:
2390 for o in t:
2391 if b"(DEPRECATED)" in o[3]:
2391 if b"(DEPRECATED)" in o[3]:
2392 continue
2392 continue
2393 if o[0]:
2393 if o[0]:
2394 options.append(b'-%s' % o[0])
2394 options.append(b'-%s' % o[0])
2395 options.append(b'--%s' % o[1])
2395 options.append(b'--%s' % o[1])
2396 ui.write(b"%s\n" % b"\n".join(options))
2396 ui.write(b"%s\n" % b"\n".join(options))
2397 return
2397 return
2398
2398
2399 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2399 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2400 if ui.verbose:
2400 if ui.verbose:
2401 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2401 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2402 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2402 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2403
2403
2404
2404
2405 @command(
2405 @command(
2406 b'diff',
2406 b'diff',
2407 [
2407 [
2408 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2408 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2409 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2409 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2410 ]
2410 ]
2411 + diffopts
2411 + diffopts
2412 + diffopts2
2412 + diffopts2
2413 + walkopts
2413 + walkopts
2414 + subrepoopts,
2414 + subrepoopts,
2415 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2415 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2416 helpcategory=command.CATEGORY_FILE_CONTENTS,
2416 helpcategory=command.CATEGORY_FILE_CONTENTS,
2417 helpbasic=True,
2417 helpbasic=True,
2418 inferrepo=True,
2418 inferrepo=True,
2419 intents={INTENT_READONLY},
2419 intents={INTENT_READONLY},
2420 )
2420 )
2421 def diff(ui, repo, *pats, **opts):
2421 def diff(ui, repo, *pats, **opts):
2422 """diff repository (or selected files)
2422 """diff repository (or selected files)
2423
2423
2424 Show differences between revisions for the specified files.
2424 Show differences between revisions for the specified files.
2425
2425
2426 Differences between files are shown using the unified diff format.
2426 Differences between files are shown using the unified diff format.
2427
2427
2428 .. note::
2428 .. note::
2429
2429
2430 :hg:`diff` may generate unexpected results for merges, as it will
2430 :hg:`diff` may generate unexpected results for merges, as it will
2431 default to comparing against the working directory's first
2431 default to comparing against the working directory's first
2432 parent changeset if no revisions are specified.
2432 parent changeset if no revisions are specified.
2433
2433
2434 When two revision arguments are given, then changes are shown
2434 When two revision arguments are given, then changes are shown
2435 between those revisions. If only one revision is specified then
2435 between those revisions. If only one revision is specified then
2436 that revision is compared to the working directory, and, when no
2436 that revision is compared to the working directory, and, when no
2437 revisions are specified, the working directory files are compared
2437 revisions are specified, the working directory files are compared
2438 to its first parent.
2438 to its first parent.
2439
2439
2440 Alternatively you can specify -c/--change with a revision to see
2440 Alternatively you can specify -c/--change with a revision to see
2441 the changes in that changeset relative to its first parent.
2441 the changes in that changeset relative to its first parent.
2442
2442
2443 Without the -a/--text option, diff will avoid generating diffs of
2443 Without the -a/--text option, diff will avoid generating diffs of
2444 files it detects as binary. With -a, diff will generate a diff
2444 files it detects as binary. With -a, diff will generate a diff
2445 anyway, probably with undesirable results.
2445 anyway, probably with undesirable results.
2446
2446
2447 Use the -g/--git option to generate diffs in the git extended diff
2447 Use the -g/--git option to generate diffs in the git extended diff
2448 format. For more information, read :hg:`help diffs`.
2448 format. For more information, read :hg:`help diffs`.
2449
2449
2450 .. container:: verbose
2450 .. container:: verbose
2451
2451
2452 Examples:
2452 Examples:
2453
2453
2454 - compare a file in the current working directory to its parent::
2454 - compare a file in the current working directory to its parent::
2455
2455
2456 hg diff foo.c
2456 hg diff foo.c
2457
2457
2458 - compare two historical versions of a directory, with rename info::
2458 - compare two historical versions of a directory, with rename info::
2459
2459
2460 hg diff --git -r 1.0:1.2 lib/
2460 hg diff --git -r 1.0:1.2 lib/
2461
2461
2462 - get change stats relative to the last change on some date::
2462 - get change stats relative to the last change on some date::
2463
2463
2464 hg diff --stat -r "date('may 2')"
2464 hg diff --stat -r "date('may 2')"
2465
2465
2466 - diff all newly-added files that contain a keyword::
2466 - diff all newly-added files that contain a keyword::
2467
2467
2468 hg diff "set:added() and grep(GNU)"
2468 hg diff "set:added() and grep(GNU)"
2469
2469
2470 - compare a revision and its parents::
2470 - compare a revision and its parents::
2471
2471
2472 hg diff -c 9353 # compare against first parent
2472 hg diff -c 9353 # compare against first parent
2473 hg diff -r 9353^:9353 # same using revset syntax
2473 hg diff -r 9353^:9353 # same using revset syntax
2474 hg diff -r 9353^2:9353 # compare against the second parent
2474 hg diff -r 9353^2:9353 # compare against the second parent
2475
2475
2476 Returns 0 on success.
2476 Returns 0 on success.
2477 """
2477 """
2478
2478
2479 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2479 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2480 opts = pycompat.byteskwargs(opts)
2480 opts = pycompat.byteskwargs(opts)
2481 revs = opts.get(b'rev')
2481 revs = opts.get(b'rev')
2482 change = opts.get(b'change')
2482 change = opts.get(b'change')
2483 stat = opts.get(b'stat')
2483 stat = opts.get(b'stat')
2484 reverse = opts.get(b'reverse')
2484 reverse = opts.get(b'reverse')
2485
2485
2486 if change:
2486 if change:
2487 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2487 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2488 ctx2 = scmutil.revsingle(repo, change, None)
2488 ctx2 = scmutil.revsingle(repo, change, None)
2489 ctx1 = ctx2.p1()
2489 ctx1 = ctx2.p1()
2490 else:
2490 else:
2491 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2491 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2492 ctx1, ctx2 = scmutil.revpair(repo, revs)
2492 ctx1, ctx2 = scmutil.revpair(repo, revs)
2493
2493
2494 if reverse:
2494 if reverse:
2495 ctxleft = ctx2
2495 ctxleft = ctx2
2496 ctxright = ctx1
2496 ctxright = ctx1
2497 else:
2497 else:
2498 ctxleft = ctx1
2498 ctxleft = ctx1
2499 ctxright = ctx2
2499 ctxright = ctx2
2500
2500
2501 diffopts = patch.diffallopts(ui, opts)
2501 diffopts = patch.diffallopts(ui, opts)
2502 m = scmutil.match(ctx2, pats, opts)
2502 m = scmutil.match(ctx2, pats, opts)
2503 m = repo.narrowmatch(m)
2503 m = repo.narrowmatch(m)
2504 ui.pager(b'diff')
2504 ui.pager(b'diff')
2505 logcmdutil.diffordiffstat(
2505 logcmdutil.diffordiffstat(
2506 ui,
2506 ui,
2507 repo,
2507 repo,
2508 diffopts,
2508 diffopts,
2509 ctxleft,
2509 ctxleft,
2510 ctxright,
2510 ctxright,
2511 m,
2511 m,
2512 stat=stat,
2512 stat=stat,
2513 listsubrepos=opts.get(b'subrepos'),
2513 listsubrepos=opts.get(b'subrepos'),
2514 root=opts.get(b'root'),
2514 root=opts.get(b'root'),
2515 )
2515 )
2516
2516
2517
2517
2518 @command(
2518 @command(
2519 b'export',
2519 b'export',
2520 [
2520 [
2521 (
2521 (
2522 b'B',
2522 b'B',
2523 b'bookmark',
2523 b'bookmark',
2524 b'',
2524 b'',
2525 _(b'export changes only reachable by given bookmark'),
2525 _(b'export changes only reachable by given bookmark'),
2526 _(b'BOOKMARK'),
2526 _(b'BOOKMARK'),
2527 ),
2527 ),
2528 (
2528 (
2529 b'o',
2529 b'o',
2530 b'output',
2530 b'output',
2531 b'',
2531 b'',
2532 _(b'print output to file with formatted name'),
2532 _(b'print output to file with formatted name'),
2533 _(b'FORMAT'),
2533 _(b'FORMAT'),
2534 ),
2534 ),
2535 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2535 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2536 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2536 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2537 ]
2537 ]
2538 + diffopts
2538 + diffopts
2539 + formatteropts,
2539 + formatteropts,
2540 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2540 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2541 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2541 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2542 helpbasic=True,
2542 helpbasic=True,
2543 intents={INTENT_READONLY},
2543 intents={INTENT_READONLY},
2544 )
2544 )
2545 def export(ui, repo, *changesets, **opts):
2545 def export(ui, repo, *changesets, **opts):
2546 """dump the header and diffs for one or more changesets
2546 """dump the header and diffs for one or more changesets
2547
2547
2548 Print the changeset header and diffs for one or more revisions.
2548 Print the changeset header and diffs for one or more revisions.
2549 If no revision is given, the parent of the working directory is used.
2549 If no revision is given, the parent of the working directory is used.
2550
2550
2551 The information shown in the changeset header is: author, date,
2551 The information shown in the changeset header is: author, date,
2552 branch name (if non-default), changeset hash, parent(s) and commit
2552 branch name (if non-default), changeset hash, parent(s) and commit
2553 comment.
2553 comment.
2554
2554
2555 .. note::
2555 .. note::
2556
2556
2557 :hg:`export` may generate unexpected diff output for merge
2557 :hg:`export` may generate unexpected diff output for merge
2558 changesets, as it will compare the merge changeset against its
2558 changesets, as it will compare the merge changeset against its
2559 first parent only.
2559 first parent only.
2560
2560
2561 Output may be to a file, in which case the name of the file is
2561 Output may be to a file, in which case the name of the file is
2562 given using a template string. See :hg:`help templates`. In addition
2562 given using a template string. See :hg:`help templates`. In addition
2563 to the common template keywords, the following formatting rules are
2563 to the common template keywords, the following formatting rules are
2564 supported:
2564 supported:
2565
2565
2566 :``%%``: literal "%" character
2566 :``%%``: literal "%" character
2567 :``%H``: changeset hash (40 hexadecimal digits)
2567 :``%H``: changeset hash (40 hexadecimal digits)
2568 :``%N``: number of patches being generated
2568 :``%N``: number of patches being generated
2569 :``%R``: changeset revision number
2569 :``%R``: changeset revision number
2570 :``%b``: basename of the exporting repository
2570 :``%b``: basename of the exporting repository
2571 :``%h``: short-form changeset hash (12 hexadecimal digits)
2571 :``%h``: short-form changeset hash (12 hexadecimal digits)
2572 :``%m``: first line of the commit message (only alphanumeric characters)
2572 :``%m``: first line of the commit message (only alphanumeric characters)
2573 :``%n``: zero-padded sequence number, starting at 1
2573 :``%n``: zero-padded sequence number, starting at 1
2574 :``%r``: zero-padded changeset revision number
2574 :``%r``: zero-padded changeset revision number
2575 :``\\``: literal "\\" character
2575 :``\\``: literal "\\" character
2576
2576
2577 Without the -a/--text option, export will avoid generating diffs
2577 Without the -a/--text option, export will avoid generating diffs
2578 of files it detects as binary. With -a, export will generate a
2578 of files it detects as binary. With -a, export will generate a
2579 diff anyway, probably with undesirable results.
2579 diff anyway, probably with undesirable results.
2580
2580
2581 With -B/--bookmark changesets reachable by the given bookmark are
2581 With -B/--bookmark changesets reachable by the given bookmark are
2582 selected.
2582 selected.
2583
2583
2584 Use the -g/--git option to generate diffs in the git extended diff
2584 Use the -g/--git option to generate diffs in the git extended diff
2585 format. See :hg:`help diffs` for more information.
2585 format. See :hg:`help diffs` for more information.
2586
2586
2587 With the --switch-parent option, the diff will be against the
2587 With the --switch-parent option, the diff will be against the
2588 second parent. It can be useful to review a merge.
2588 second parent. It can be useful to review a merge.
2589
2589
2590 .. container:: verbose
2590 .. container:: verbose
2591
2591
2592 Template:
2592 Template:
2593
2593
2594 The following keywords are supported in addition to the common template
2594 The following keywords are supported in addition to the common template
2595 keywords and functions. See also :hg:`help templates`.
2595 keywords and functions. See also :hg:`help templates`.
2596
2596
2597 :diff: String. Diff content.
2597 :diff: String. Diff content.
2598 :parents: List of strings. Parent nodes of the changeset.
2598 :parents: List of strings. Parent nodes of the changeset.
2599
2599
2600 Examples:
2600 Examples:
2601
2601
2602 - use export and import to transplant a bugfix to the current
2602 - use export and import to transplant a bugfix to the current
2603 branch::
2603 branch::
2604
2604
2605 hg export -r 9353 | hg import -
2605 hg export -r 9353 | hg import -
2606
2606
2607 - export all the changesets between two revisions to a file with
2607 - export all the changesets between two revisions to a file with
2608 rename information::
2608 rename information::
2609
2609
2610 hg export --git -r 123:150 > changes.txt
2610 hg export --git -r 123:150 > changes.txt
2611
2611
2612 - split outgoing changes into a series of patches with
2612 - split outgoing changes into a series of patches with
2613 descriptive names::
2613 descriptive names::
2614
2614
2615 hg export -r "outgoing()" -o "%n-%m.patch"
2615 hg export -r "outgoing()" -o "%n-%m.patch"
2616
2616
2617 Returns 0 on success.
2617 Returns 0 on success.
2618 """
2618 """
2619 opts = pycompat.byteskwargs(opts)
2619 opts = pycompat.byteskwargs(opts)
2620 bookmark = opts.get(b'bookmark')
2620 bookmark = opts.get(b'bookmark')
2621 changesets += tuple(opts.get(b'rev', []))
2621 changesets += tuple(opts.get(b'rev', []))
2622
2622
2623 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2623 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2624
2624
2625 if bookmark:
2625 if bookmark:
2626 if bookmark not in repo._bookmarks:
2626 if bookmark not in repo._bookmarks:
2627 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2627 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2628
2628
2629 revs = scmutil.bookmarkrevs(repo, bookmark)
2629 revs = scmutil.bookmarkrevs(repo, bookmark)
2630 else:
2630 else:
2631 if not changesets:
2631 if not changesets:
2632 changesets = [b'.']
2632 changesets = [b'.']
2633
2633
2634 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2634 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2635 revs = scmutil.revrange(repo, changesets)
2635 revs = scmutil.revrange(repo, changesets)
2636
2636
2637 if not revs:
2637 if not revs:
2638 raise error.Abort(_(b"export requires at least one changeset"))
2638 raise error.Abort(_(b"export requires at least one changeset"))
2639 if len(revs) > 1:
2639 if len(revs) > 1:
2640 ui.note(_(b'exporting patches:\n'))
2640 ui.note(_(b'exporting patches:\n'))
2641 else:
2641 else:
2642 ui.note(_(b'exporting patch:\n'))
2642 ui.note(_(b'exporting patch:\n'))
2643
2643
2644 fntemplate = opts.get(b'output')
2644 fntemplate = opts.get(b'output')
2645 if cmdutil.isstdiofilename(fntemplate):
2645 if cmdutil.isstdiofilename(fntemplate):
2646 fntemplate = b''
2646 fntemplate = b''
2647
2647
2648 if fntemplate:
2648 if fntemplate:
2649 fm = formatter.nullformatter(ui, b'export', opts)
2649 fm = formatter.nullformatter(ui, b'export', opts)
2650 else:
2650 else:
2651 ui.pager(b'export')
2651 ui.pager(b'export')
2652 fm = ui.formatter(b'export', opts)
2652 fm = ui.formatter(b'export', opts)
2653 with fm:
2653 with fm:
2654 cmdutil.export(
2654 cmdutil.export(
2655 repo,
2655 repo,
2656 revs,
2656 revs,
2657 fm,
2657 fm,
2658 fntemplate=fntemplate,
2658 fntemplate=fntemplate,
2659 switch_parent=opts.get(b'switch_parent'),
2659 switch_parent=opts.get(b'switch_parent'),
2660 opts=patch.diffallopts(ui, opts),
2660 opts=patch.diffallopts(ui, opts),
2661 )
2661 )
2662
2662
2663
2663
2664 @command(
2664 @command(
2665 b'files',
2665 b'files',
2666 [
2666 [
2667 (
2667 (
2668 b'r',
2668 b'r',
2669 b'rev',
2669 b'rev',
2670 b'',
2670 b'',
2671 _(b'search the repository as it is in REV'),
2671 _(b'search the repository as it is in REV'),
2672 _(b'REV'),
2672 _(b'REV'),
2673 ),
2673 ),
2674 (
2674 (
2675 b'0',
2675 b'0',
2676 b'print0',
2676 b'print0',
2677 None,
2677 None,
2678 _(b'end filenames with NUL, for use with xargs'),
2678 _(b'end filenames with NUL, for use with xargs'),
2679 ),
2679 ),
2680 ]
2680 ]
2681 + walkopts
2681 + walkopts
2682 + formatteropts
2682 + formatteropts
2683 + subrepoopts,
2683 + subrepoopts,
2684 _(b'[OPTION]... [FILE]...'),
2684 _(b'[OPTION]... [FILE]...'),
2685 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2685 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2686 intents={INTENT_READONLY},
2686 intents={INTENT_READONLY},
2687 )
2687 )
2688 def files(ui, repo, *pats, **opts):
2688 def files(ui, repo, *pats, **opts):
2689 """list tracked files
2689 """list tracked files
2690
2690
2691 Print files under Mercurial control in the working directory or
2691 Print files under Mercurial control in the working directory or
2692 specified revision for given files (excluding removed files).
2692 specified revision for given files (excluding removed files).
2693 Files can be specified as filenames or filesets.
2693 Files can be specified as filenames or filesets.
2694
2694
2695 If no files are given to match, this command prints the names
2695 If no files are given to match, this command prints the names
2696 of all files under Mercurial control.
2696 of all files under Mercurial control.
2697
2697
2698 .. container:: verbose
2698 .. container:: verbose
2699
2699
2700 Template:
2700 Template:
2701
2701
2702 The following keywords are supported in addition to the common template
2702 The following keywords are supported in addition to the common template
2703 keywords and functions. See also :hg:`help templates`.
2703 keywords and functions. See also :hg:`help templates`.
2704
2704
2705 :flags: String. Character denoting file's symlink and executable bits.
2705 :flags: String. Character denoting file's symlink and executable bits.
2706 :path: String. Repository-absolute path of the file.
2706 :path: String. Repository-absolute path of the file.
2707 :size: Integer. Size of the file in bytes.
2707 :size: Integer. Size of the file in bytes.
2708
2708
2709 Examples:
2709 Examples:
2710
2710
2711 - list all files under the current directory::
2711 - list all files under the current directory::
2712
2712
2713 hg files .
2713 hg files .
2714
2714
2715 - shows sizes and flags for current revision::
2715 - shows sizes and flags for current revision::
2716
2716
2717 hg files -vr .
2717 hg files -vr .
2718
2718
2719 - list all files named README::
2719 - list all files named README::
2720
2720
2721 hg files -I "**/README"
2721 hg files -I "**/README"
2722
2722
2723 - list all binary files::
2723 - list all binary files::
2724
2724
2725 hg files "set:binary()"
2725 hg files "set:binary()"
2726
2726
2727 - find files containing a regular expression::
2727 - find files containing a regular expression::
2728
2728
2729 hg files "set:grep('bob')"
2729 hg files "set:grep('bob')"
2730
2730
2731 - search tracked file contents with xargs and grep::
2731 - search tracked file contents with xargs and grep::
2732
2732
2733 hg files -0 | xargs -0 grep foo
2733 hg files -0 | xargs -0 grep foo
2734
2734
2735 See :hg:`help patterns` and :hg:`help filesets` for more information
2735 See :hg:`help patterns` and :hg:`help filesets` for more information
2736 on specifying file patterns.
2736 on specifying file patterns.
2737
2737
2738 Returns 0 if a match is found, 1 otherwise.
2738 Returns 0 if a match is found, 1 otherwise.
2739
2739
2740 """
2740 """
2741
2741
2742 opts = pycompat.byteskwargs(opts)
2742 opts = pycompat.byteskwargs(opts)
2743 rev = opts.get(b'rev')
2743 rev = opts.get(b'rev')
2744 if rev:
2744 if rev:
2745 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2745 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2746 ctx = scmutil.revsingle(repo, rev, None)
2746 ctx = scmutil.revsingle(repo, rev, None)
2747
2747
2748 end = b'\n'
2748 end = b'\n'
2749 if opts.get(b'print0'):
2749 if opts.get(b'print0'):
2750 end = b'\0'
2750 end = b'\0'
2751 fmt = b'%s' + end
2751 fmt = b'%s' + end
2752
2752
2753 m = scmutil.match(ctx, pats, opts)
2753 m = scmutil.match(ctx, pats, opts)
2754 ui.pager(b'files')
2754 ui.pager(b'files')
2755 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2755 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2756 with ui.formatter(b'files', opts) as fm:
2756 with ui.formatter(b'files', opts) as fm:
2757 return cmdutil.files(
2757 return cmdutil.files(
2758 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2758 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2759 )
2759 )
2760
2760
2761
2761
2762 @command(
2762 @command(
2763 b'forget',
2763 b'forget',
2764 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2764 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2765 + walkopts
2765 + walkopts
2766 + dryrunopts,
2766 + dryrunopts,
2767 _(b'[OPTION]... FILE...'),
2767 _(b'[OPTION]... FILE...'),
2768 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2768 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2769 helpbasic=True,
2769 helpbasic=True,
2770 inferrepo=True,
2770 inferrepo=True,
2771 )
2771 )
2772 def forget(ui, repo, *pats, **opts):
2772 def forget(ui, repo, *pats, **opts):
2773 """forget the specified files on the next commit
2773 """forget the specified files on the next commit
2774
2774
2775 Mark the specified files so they will no longer be tracked
2775 Mark the specified files so they will no longer be tracked
2776 after the next commit.
2776 after the next commit.
2777
2777
2778 This only removes files from the current branch, not from the
2778 This only removes files from the current branch, not from the
2779 entire project history, and it does not delete them from the
2779 entire project history, and it does not delete them from the
2780 working directory.
2780 working directory.
2781
2781
2782 To delete the file from the working directory, see :hg:`remove`.
2782 To delete the file from the working directory, see :hg:`remove`.
2783
2783
2784 To undo a forget before the next commit, see :hg:`add`.
2784 To undo a forget before the next commit, see :hg:`add`.
2785
2785
2786 .. container:: verbose
2786 .. container:: verbose
2787
2787
2788 Examples:
2788 Examples:
2789
2789
2790 - forget newly-added binary files::
2790 - forget newly-added binary files::
2791
2791
2792 hg forget "set:added() and binary()"
2792 hg forget "set:added() and binary()"
2793
2793
2794 - forget files that would be excluded by .hgignore::
2794 - forget files that would be excluded by .hgignore::
2795
2795
2796 hg forget "set:hgignore()"
2796 hg forget "set:hgignore()"
2797
2797
2798 Returns 0 on success.
2798 Returns 0 on success.
2799 """
2799 """
2800
2800
2801 opts = pycompat.byteskwargs(opts)
2801 opts = pycompat.byteskwargs(opts)
2802 if not pats:
2802 if not pats:
2803 raise error.Abort(_(b'no files specified'))
2803 raise error.Abort(_(b'no files specified'))
2804
2804
2805 m = scmutil.match(repo[None], pats, opts)
2805 m = scmutil.match(repo[None], pats, opts)
2806 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2806 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2807 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2807 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2808 rejected = cmdutil.forget(
2808 rejected = cmdutil.forget(
2809 ui,
2809 ui,
2810 repo,
2810 repo,
2811 m,
2811 m,
2812 prefix=b"",
2812 prefix=b"",
2813 uipathfn=uipathfn,
2813 uipathfn=uipathfn,
2814 explicitonly=False,
2814 explicitonly=False,
2815 dryrun=dryrun,
2815 dryrun=dryrun,
2816 interactive=interactive,
2816 interactive=interactive,
2817 )[0]
2817 )[0]
2818 return rejected and 1 or 0
2818 return rejected and 1 or 0
2819
2819
2820
2820
2821 @command(
2821 @command(
2822 b'graft',
2822 b'graft',
2823 [
2823 [
2824 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2824 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2825 (
2825 (
2826 b'',
2826 b'',
2827 b'base',
2827 b'base',
2828 b'',
2828 b'',
2829 _(b'base revision when doing the graft merge (ADVANCED)'),
2829 _(b'base revision when doing the graft merge (ADVANCED)'),
2830 _(b'REV'),
2830 _(b'REV'),
2831 ),
2831 ),
2832 (b'c', b'continue', False, _(b'resume interrupted graft')),
2832 (b'c', b'continue', False, _(b'resume interrupted graft')),
2833 (b'', b'stop', False, _(b'stop interrupted graft')),
2833 (b'', b'stop', False, _(b'stop interrupted graft')),
2834 (b'', b'abort', False, _(b'abort interrupted graft')),
2834 (b'', b'abort', False, _(b'abort interrupted graft')),
2835 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2835 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2836 (b'', b'log', None, _(b'append graft info to log message')),
2836 (b'', b'log', None, _(b'append graft info to log message')),
2837 (
2837 (
2838 b'',
2838 b'',
2839 b'no-commit',
2839 b'no-commit',
2840 None,
2840 None,
2841 _(b"don't commit, just apply the changes in working directory"),
2841 _(b"don't commit, just apply the changes in working directory"),
2842 ),
2842 ),
2843 (b'f', b'force', False, _(b'force graft')),
2843 (b'f', b'force', False, _(b'force graft')),
2844 (
2844 (
2845 b'D',
2845 b'D',
2846 b'currentdate',
2846 b'currentdate',
2847 False,
2847 False,
2848 _(b'record the current date as commit date'),
2848 _(b'record the current date as commit date'),
2849 ),
2849 ),
2850 (
2850 (
2851 b'U',
2851 b'U',
2852 b'currentuser',
2852 b'currentuser',
2853 False,
2853 False,
2854 _(b'record the current user as committer'),
2854 _(b'record the current user as committer'),
2855 ),
2855 ),
2856 ]
2856 ]
2857 + commitopts2
2857 + commitopts2
2858 + mergetoolopts
2858 + mergetoolopts
2859 + dryrunopts,
2859 + dryrunopts,
2860 _(b'[OPTION]... [-r REV]... REV...'),
2860 _(b'[OPTION]... [-r REV]... REV...'),
2861 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2861 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2862 )
2862 )
2863 def graft(ui, repo, *revs, **opts):
2863 def graft(ui, repo, *revs, **opts):
2864 '''copy changes from other branches onto the current branch
2864 '''copy changes from other branches onto the current branch
2865
2865
2866 This command uses Mercurial's merge logic to copy individual
2866 This command uses Mercurial's merge logic to copy individual
2867 changes from other branches without merging branches in the
2867 changes from other branches without merging branches in the
2868 history graph. This is sometimes known as 'backporting' or
2868 history graph. This is sometimes known as 'backporting' or
2869 'cherry-picking'. By default, graft will copy user, date, and
2869 'cherry-picking'. By default, graft will copy user, date, and
2870 description from the source changesets.
2870 description from the source changesets.
2871
2871
2872 Changesets that are ancestors of the current revision, that have
2872 Changesets that are ancestors of the current revision, that have
2873 already been grafted, or that are merges will be skipped.
2873 already been grafted, or that are merges will be skipped.
2874
2874
2875 If --log is specified, log messages will have a comment appended
2875 If --log is specified, log messages will have a comment appended
2876 of the form::
2876 of the form::
2877
2877
2878 (grafted from CHANGESETHASH)
2878 (grafted from CHANGESETHASH)
2879
2879
2880 If --force is specified, revisions will be grafted even if they
2880 If --force is specified, revisions will be grafted even if they
2881 are already ancestors of, or have been grafted to, the destination.
2881 are already ancestors of, or have been grafted to, the destination.
2882 This is useful when the revisions have since been backed out.
2882 This is useful when the revisions have since been backed out.
2883
2883
2884 If a graft merge results in conflicts, the graft process is
2884 If a graft merge results in conflicts, the graft process is
2885 interrupted so that the current merge can be manually resolved.
2885 interrupted so that the current merge can be manually resolved.
2886 Once all conflicts are addressed, the graft process can be
2886 Once all conflicts are addressed, the graft process can be
2887 continued with the -c/--continue option.
2887 continued with the -c/--continue option.
2888
2888
2889 The -c/--continue option reapplies all the earlier options.
2889 The -c/--continue option reapplies all the earlier options.
2890
2890
2891 .. container:: verbose
2891 .. container:: verbose
2892
2892
2893 The --base option exposes more of how graft internally uses merge with a
2893 The --base option exposes more of how graft internally uses merge with a
2894 custom base revision. --base can be used to specify another ancestor than
2894 custom base revision. --base can be used to specify another ancestor than
2895 the first and only parent.
2895 the first and only parent.
2896
2896
2897 The command::
2897 The command::
2898
2898
2899 hg graft -r 345 --base 234
2899 hg graft -r 345 --base 234
2900
2900
2901 is thus pretty much the same as::
2901 is thus pretty much the same as::
2902
2902
2903 hg diff -r 234 -r 345 | hg import
2903 hg diff -r 234 -r 345 | hg import
2904
2904
2905 but using merge to resolve conflicts and track moved files.
2905 but using merge to resolve conflicts and track moved files.
2906
2906
2907 The result of a merge can thus be backported as a single commit by
2907 The result of a merge can thus be backported as a single commit by
2908 specifying one of the merge parents as base, and thus effectively
2908 specifying one of the merge parents as base, and thus effectively
2909 grafting the changes from the other side.
2909 grafting the changes from the other side.
2910
2910
2911 It is also possible to collapse multiple changesets and clean up history
2911 It is also possible to collapse multiple changesets and clean up history
2912 by specifying another ancestor as base, much like rebase --collapse
2912 by specifying another ancestor as base, much like rebase --collapse
2913 --keep.
2913 --keep.
2914
2914
2915 The commit message can be tweaked after the fact using commit --amend .
2915 The commit message can be tweaked after the fact using commit --amend .
2916
2916
2917 For using non-ancestors as the base to backout changes, see the backout
2917 For using non-ancestors as the base to backout changes, see the backout
2918 command and the hidden --parent option.
2918 command and the hidden --parent option.
2919
2919
2920 .. container:: verbose
2920 .. container:: verbose
2921
2921
2922 Examples:
2922 Examples:
2923
2923
2924 - copy a single change to the stable branch and edit its description::
2924 - copy a single change to the stable branch and edit its description::
2925
2925
2926 hg update stable
2926 hg update stable
2927 hg graft --edit 9393
2927 hg graft --edit 9393
2928
2928
2929 - graft a range of changesets with one exception, updating dates::
2929 - graft a range of changesets with one exception, updating dates::
2930
2930
2931 hg graft -D "2085::2093 and not 2091"
2931 hg graft -D "2085::2093 and not 2091"
2932
2932
2933 - continue a graft after resolving conflicts::
2933 - continue a graft after resolving conflicts::
2934
2934
2935 hg graft -c
2935 hg graft -c
2936
2936
2937 - show the source of a grafted changeset::
2937 - show the source of a grafted changeset::
2938
2938
2939 hg log --debug -r .
2939 hg log --debug -r .
2940
2940
2941 - show revisions sorted by date::
2941 - show revisions sorted by date::
2942
2942
2943 hg log -r "sort(all(), date)"
2943 hg log -r "sort(all(), date)"
2944
2944
2945 - backport the result of a merge as a single commit::
2945 - backport the result of a merge as a single commit::
2946
2946
2947 hg graft -r 123 --base 123^
2947 hg graft -r 123 --base 123^
2948
2948
2949 - land a feature branch as one changeset::
2949 - land a feature branch as one changeset::
2950
2950
2951 hg up -cr default
2951 hg up -cr default
2952 hg graft -r featureX --base "ancestor('featureX', 'default')"
2952 hg graft -r featureX --base "ancestor('featureX', 'default')"
2953
2953
2954 See :hg:`help revisions` for more about specifying revisions.
2954 See :hg:`help revisions` for more about specifying revisions.
2955
2955
2956 Returns 0 on successful completion, 1 if there are unresolved files.
2956 Returns 0 on successful completion, 1 if there are unresolved files.
2957 '''
2957 '''
2958 with repo.wlock():
2958 with repo.wlock():
2959 return _dograft(ui, repo, *revs, **opts)
2959 return _dograft(ui, repo, *revs, **opts)
2960
2960
2961
2961
2962 def _dograft(ui, repo, *revs, **opts):
2962 def _dograft(ui, repo, *revs, **opts):
2963 opts = pycompat.byteskwargs(opts)
2963 opts = pycompat.byteskwargs(opts)
2964 if revs and opts.get(b'rev'):
2964 if revs and opts.get(b'rev'):
2965 ui.warn(
2965 ui.warn(
2966 _(
2966 _(
2967 b'warning: inconsistent use of --rev might give unexpected '
2967 b'warning: inconsistent use of --rev might give unexpected '
2968 b'revision ordering!\n'
2968 b'revision ordering!\n'
2969 )
2969 )
2970 )
2970 )
2971
2971
2972 revs = list(revs)
2972 revs = list(revs)
2973 revs.extend(opts.get(b'rev'))
2973 revs.extend(opts.get(b'rev'))
2974 # a dict of data to be stored in state file
2974 # a dict of data to be stored in state file
2975 statedata = {}
2975 statedata = {}
2976 # list of new nodes created by ongoing graft
2976 # list of new nodes created by ongoing graft
2977 statedata[b'newnodes'] = []
2977 statedata[b'newnodes'] = []
2978
2978
2979 cmdutil.resolvecommitoptions(ui, opts)
2979 cmdutil.resolvecommitoptions(ui, opts)
2980
2980
2981 editor = cmdutil.getcommiteditor(
2981 editor = cmdutil.getcommiteditor(
2982 editform=b'graft', **pycompat.strkwargs(opts)
2982 editform=b'graft', **pycompat.strkwargs(opts)
2983 )
2983 )
2984
2984
2985 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2985 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
2986
2986
2987 cont = False
2987 cont = False
2988 if opts.get(b'no_commit'):
2988 if opts.get(b'no_commit'):
2989 cmdutil.check_incompatible_arguments(
2989 cmdutil.check_incompatible_arguments(
2990 opts,
2990 opts,
2991 b'no_commit',
2991 b'no_commit',
2992 [b'edit', b'currentuser', b'currentdate', b'log'],
2992 [b'edit', b'currentuser', b'currentdate', b'log'],
2993 )
2993 )
2994
2994
2995 graftstate = statemod.cmdstate(repo, b'graftstate')
2995 graftstate = statemod.cmdstate(repo, b'graftstate')
2996
2996
2997 if opts.get(b'stop'):
2997 if opts.get(b'stop'):
2998 if any(
2998 cmdutil.check_incompatible_arguments(
2999 (
2999 opts,
3000 opts.get(b'edit'),
3000 b'stop',
3001 opts.get(b'log'),
3001 [
3002 opts.get(b'user'),
3002 b'edit',
3003 opts.get(b'date'),
3003 b'log',
3004 opts.get(b'currentdate'),
3004 b'user',
3005 opts.get(b'currentuser'),
3005 b'date',
3006 opts.get(b'rev'),
3006 b'currentdate',
3007 )
3007 b'currentuser',
3008 ):
3008 b'rev',
3009 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3009 ],
3010 )
3010 return _stopgraft(ui, repo, graftstate)
3011 return _stopgraft(ui, repo, graftstate)
3011 elif opts.get(b'abort'):
3012 elif opts.get(b'abort'):
3012 if any(
3013 cmdutil.check_incompatible_arguments(
3013 (
3014 opts,
3014 opts.get(b'edit'),
3015 b'abort',
3015 opts.get(b'log'),
3016 [
3016 opts.get(b'user'),
3017 b'edit',
3017 opts.get(b'date'),
3018 b'log',
3018 opts.get(b'currentdate'),
3019 b'user',
3019 opts.get(b'currentuser'),
3020 b'date',
3020 opts.get(b'rev'),
3021 b'currentdate',
3021 )
3022 b'currentuser',
3022 ):
3023 b'rev',
3023 raise error.Abort(
3024 ],
3024 _(b"cannot specify any other flag with '--abort'")
3025 )
3025 )
3026
3027 return cmdutil.abortgraft(ui, repo, graftstate)
3026 return cmdutil.abortgraft(ui, repo, graftstate)
3028 elif opts.get(b'continue'):
3027 elif opts.get(b'continue'):
3029 cont = True
3028 cont = True
3030 if revs:
3029 if revs:
3031 raise error.Abort(_(b"can't specify --continue and revisions"))
3030 raise error.Abort(_(b"can't specify --continue and revisions"))
3032 # read in unfinished revisions
3031 # read in unfinished revisions
3033 if graftstate.exists():
3032 if graftstate.exists():
3034 statedata = cmdutil.readgraftstate(repo, graftstate)
3033 statedata = cmdutil.readgraftstate(repo, graftstate)
3035 if statedata.get(b'date'):
3034 if statedata.get(b'date'):
3036 opts[b'date'] = statedata[b'date']
3035 opts[b'date'] = statedata[b'date']
3037 if statedata.get(b'user'):
3036 if statedata.get(b'user'):
3038 opts[b'user'] = statedata[b'user']
3037 opts[b'user'] = statedata[b'user']
3039 if statedata.get(b'log'):
3038 if statedata.get(b'log'):
3040 opts[b'log'] = True
3039 opts[b'log'] = True
3041 if statedata.get(b'no_commit'):
3040 if statedata.get(b'no_commit'):
3042 opts[b'no_commit'] = statedata.get(b'no_commit')
3041 opts[b'no_commit'] = statedata.get(b'no_commit')
3043 if statedata.get(b'base'):
3042 if statedata.get(b'base'):
3044 opts[b'base'] = statedata.get(b'base')
3043 opts[b'base'] = statedata.get(b'base')
3045 nodes = statedata[b'nodes']
3044 nodes = statedata[b'nodes']
3046 revs = [repo[node].rev() for node in nodes]
3045 revs = [repo[node].rev() for node in nodes]
3047 else:
3046 else:
3048 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3047 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3049 else:
3048 else:
3050 if not revs:
3049 if not revs:
3051 raise error.Abort(_(b'no revisions specified'))
3050 raise error.Abort(_(b'no revisions specified'))
3052 cmdutil.checkunfinished(repo)
3051 cmdutil.checkunfinished(repo)
3053 cmdutil.bailifchanged(repo)
3052 cmdutil.bailifchanged(repo)
3054 revs = scmutil.revrange(repo, revs)
3053 revs = scmutil.revrange(repo, revs)
3055
3054
3056 skipped = set()
3055 skipped = set()
3057 basectx = None
3056 basectx = None
3058 if opts.get(b'base'):
3057 if opts.get(b'base'):
3059 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3058 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3060 if basectx is None:
3059 if basectx is None:
3061 # check for merges
3060 # check for merges
3062 for rev in repo.revs(b'%ld and merge()', revs):
3061 for rev in repo.revs(b'%ld and merge()', revs):
3063 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3062 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3064 skipped.add(rev)
3063 skipped.add(rev)
3065 revs = [r for r in revs if r not in skipped]
3064 revs = [r for r in revs if r not in skipped]
3066 if not revs:
3065 if not revs:
3067 return -1
3066 return -1
3068 if basectx is not None and len(revs) != 1:
3067 if basectx is not None and len(revs) != 1:
3069 raise error.Abort(_(b'only one revision allowed with --base '))
3068 raise error.Abort(_(b'only one revision allowed with --base '))
3070
3069
3071 # Don't check in the --continue case, in effect retaining --force across
3070 # Don't check in the --continue case, in effect retaining --force across
3072 # --continues. That's because without --force, any revisions we decided to
3071 # --continues. That's because without --force, any revisions we decided to
3073 # skip would have been filtered out here, so they wouldn't have made their
3072 # skip would have been filtered out here, so they wouldn't have made their
3074 # way to the graftstate. With --force, any revisions we would have otherwise
3073 # way to the graftstate. With --force, any revisions we would have otherwise
3075 # skipped would not have been filtered out, and if they hadn't been applied
3074 # skipped would not have been filtered out, and if they hadn't been applied
3076 # already, they'd have been in the graftstate.
3075 # already, they'd have been in the graftstate.
3077 if not (cont or opts.get(b'force')) and basectx is None:
3076 if not (cont or opts.get(b'force')) and basectx is None:
3078 # check for ancestors of dest branch
3077 # check for ancestors of dest branch
3079 ancestors = repo.revs(b'%ld & (::.)', revs)
3078 ancestors = repo.revs(b'%ld & (::.)', revs)
3080 for rev in ancestors:
3079 for rev in ancestors:
3081 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3080 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3082
3081
3083 revs = [r for r in revs if r not in ancestors]
3082 revs = [r for r in revs if r not in ancestors]
3084
3083
3085 if not revs:
3084 if not revs:
3086 return -1
3085 return -1
3087
3086
3088 # analyze revs for earlier grafts
3087 # analyze revs for earlier grafts
3089 ids = {}
3088 ids = {}
3090 for ctx in repo.set(b"%ld", revs):
3089 for ctx in repo.set(b"%ld", revs):
3091 ids[ctx.hex()] = ctx.rev()
3090 ids[ctx.hex()] = ctx.rev()
3092 n = ctx.extra().get(b'source')
3091 n = ctx.extra().get(b'source')
3093 if n:
3092 if n:
3094 ids[n] = ctx.rev()
3093 ids[n] = ctx.rev()
3095
3094
3096 # check ancestors for earlier grafts
3095 # check ancestors for earlier grafts
3097 ui.debug(b'scanning for duplicate grafts\n')
3096 ui.debug(b'scanning for duplicate grafts\n')
3098
3097
3099 # The only changesets we can be sure doesn't contain grafts of any
3098 # The only changesets we can be sure doesn't contain grafts of any
3100 # revs, are the ones that are common ancestors of *all* revs:
3099 # revs, are the ones that are common ancestors of *all* revs:
3101 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3100 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3102 ctx = repo[rev]
3101 ctx = repo[rev]
3103 n = ctx.extra().get(b'source')
3102 n = ctx.extra().get(b'source')
3104 if n in ids:
3103 if n in ids:
3105 try:
3104 try:
3106 r = repo[n].rev()
3105 r = repo[n].rev()
3107 except error.RepoLookupError:
3106 except error.RepoLookupError:
3108 r = None
3107 r = None
3109 if r in revs:
3108 if r in revs:
3110 ui.warn(
3109 ui.warn(
3111 _(
3110 _(
3112 b'skipping revision %d:%s '
3111 b'skipping revision %d:%s '
3113 b'(already grafted to %d:%s)\n'
3112 b'(already grafted to %d:%s)\n'
3114 )
3113 )
3115 % (r, repo[r], rev, ctx)
3114 % (r, repo[r], rev, ctx)
3116 )
3115 )
3117 revs.remove(r)
3116 revs.remove(r)
3118 elif ids[n] in revs:
3117 elif ids[n] in revs:
3119 if r is None:
3118 if r is None:
3120 ui.warn(
3119 ui.warn(
3121 _(
3120 _(
3122 b'skipping already grafted revision %d:%s '
3121 b'skipping already grafted revision %d:%s '
3123 b'(%d:%s also has unknown origin %s)\n'
3122 b'(%d:%s also has unknown origin %s)\n'
3124 )
3123 )
3125 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3124 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3126 )
3125 )
3127 else:
3126 else:
3128 ui.warn(
3127 ui.warn(
3129 _(
3128 _(
3130 b'skipping already grafted revision %d:%s '
3129 b'skipping already grafted revision %d:%s '
3131 b'(%d:%s also has origin %d:%s)\n'
3130 b'(%d:%s also has origin %d:%s)\n'
3132 )
3131 )
3133 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3132 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3134 )
3133 )
3135 revs.remove(ids[n])
3134 revs.remove(ids[n])
3136 elif ctx.hex() in ids:
3135 elif ctx.hex() in ids:
3137 r = ids[ctx.hex()]
3136 r = ids[ctx.hex()]
3138 if r in revs:
3137 if r in revs:
3139 ui.warn(
3138 ui.warn(
3140 _(
3139 _(
3141 b'skipping already grafted revision %d:%s '
3140 b'skipping already grafted revision %d:%s '
3142 b'(was grafted from %d:%s)\n'
3141 b'(was grafted from %d:%s)\n'
3143 )
3142 )
3144 % (r, repo[r], rev, ctx)
3143 % (r, repo[r], rev, ctx)
3145 )
3144 )
3146 revs.remove(r)
3145 revs.remove(r)
3147 if not revs:
3146 if not revs:
3148 return -1
3147 return -1
3149
3148
3150 if opts.get(b'no_commit'):
3149 if opts.get(b'no_commit'):
3151 statedata[b'no_commit'] = True
3150 statedata[b'no_commit'] = True
3152 if opts.get(b'base'):
3151 if opts.get(b'base'):
3153 statedata[b'base'] = opts[b'base']
3152 statedata[b'base'] = opts[b'base']
3154 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3153 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3155 desc = b'%d:%s "%s"' % (
3154 desc = b'%d:%s "%s"' % (
3156 ctx.rev(),
3155 ctx.rev(),
3157 ctx,
3156 ctx,
3158 ctx.description().split(b'\n', 1)[0],
3157 ctx.description().split(b'\n', 1)[0],
3159 )
3158 )
3160 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3159 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3161 if names:
3160 if names:
3162 desc += b' (%s)' % b' '.join(names)
3161 desc += b' (%s)' % b' '.join(names)
3163 ui.status(_(b'grafting %s\n') % desc)
3162 ui.status(_(b'grafting %s\n') % desc)
3164 if opts.get(b'dry_run'):
3163 if opts.get(b'dry_run'):
3165 continue
3164 continue
3166
3165
3167 source = ctx.extra().get(b'source')
3166 source = ctx.extra().get(b'source')
3168 extra = {}
3167 extra = {}
3169 if source:
3168 if source:
3170 extra[b'source'] = source
3169 extra[b'source'] = source
3171 extra[b'intermediate-source'] = ctx.hex()
3170 extra[b'intermediate-source'] = ctx.hex()
3172 else:
3171 else:
3173 extra[b'source'] = ctx.hex()
3172 extra[b'source'] = ctx.hex()
3174 user = ctx.user()
3173 user = ctx.user()
3175 if opts.get(b'user'):
3174 if opts.get(b'user'):
3176 user = opts[b'user']
3175 user = opts[b'user']
3177 statedata[b'user'] = user
3176 statedata[b'user'] = user
3178 date = ctx.date()
3177 date = ctx.date()
3179 if opts.get(b'date'):
3178 if opts.get(b'date'):
3180 date = opts[b'date']
3179 date = opts[b'date']
3181 statedata[b'date'] = date
3180 statedata[b'date'] = date
3182 message = ctx.description()
3181 message = ctx.description()
3183 if opts.get(b'log'):
3182 if opts.get(b'log'):
3184 message += b'\n(grafted from %s)' % ctx.hex()
3183 message += b'\n(grafted from %s)' % ctx.hex()
3185 statedata[b'log'] = True
3184 statedata[b'log'] = True
3186
3185
3187 # we don't merge the first commit when continuing
3186 # we don't merge the first commit when continuing
3188 if not cont:
3187 if not cont:
3189 # perform the graft merge with p1(rev) as 'ancestor'
3188 # perform the graft merge with p1(rev) as 'ancestor'
3190 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3189 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3191 base = ctx.p1() if basectx is None else basectx
3190 base = ctx.p1() if basectx is None else basectx
3192 with ui.configoverride(overrides, b'graft'):
3191 with ui.configoverride(overrides, b'graft'):
3193 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3192 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3194 # report any conflicts
3193 # report any conflicts
3195 if stats.unresolvedcount > 0:
3194 if stats.unresolvedcount > 0:
3196 # write out state for --continue
3195 # write out state for --continue
3197 nodes = [repo[rev].hex() for rev in revs[pos:]]
3196 nodes = [repo[rev].hex() for rev in revs[pos:]]
3198 statedata[b'nodes'] = nodes
3197 statedata[b'nodes'] = nodes
3199 stateversion = 1
3198 stateversion = 1
3200 graftstate.save(stateversion, statedata)
3199 graftstate.save(stateversion, statedata)
3201 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3200 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3202 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3201 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3203 return 1
3202 return 1
3204 else:
3203 else:
3205 cont = False
3204 cont = False
3206
3205
3207 # commit if --no-commit is false
3206 # commit if --no-commit is false
3208 if not opts.get(b'no_commit'):
3207 if not opts.get(b'no_commit'):
3209 node = repo.commit(
3208 node = repo.commit(
3210 text=message, user=user, date=date, extra=extra, editor=editor
3209 text=message, user=user, date=date, extra=extra, editor=editor
3211 )
3210 )
3212 if node is None:
3211 if node is None:
3213 ui.warn(
3212 ui.warn(
3214 _(b'note: graft of %d:%s created no changes to commit\n')
3213 _(b'note: graft of %d:%s created no changes to commit\n')
3215 % (ctx.rev(), ctx)
3214 % (ctx.rev(), ctx)
3216 )
3215 )
3217 # checking that newnodes exist because old state files won't have it
3216 # checking that newnodes exist because old state files won't have it
3218 elif statedata.get(b'newnodes') is not None:
3217 elif statedata.get(b'newnodes') is not None:
3219 statedata[b'newnodes'].append(node)
3218 statedata[b'newnodes'].append(node)
3220
3219
3221 # remove state when we complete successfully
3220 # remove state when we complete successfully
3222 if not opts.get(b'dry_run'):
3221 if not opts.get(b'dry_run'):
3223 graftstate.delete()
3222 graftstate.delete()
3224
3223
3225 return 0
3224 return 0
3226
3225
3227
3226
3228 def _stopgraft(ui, repo, graftstate):
3227 def _stopgraft(ui, repo, graftstate):
3229 """stop the interrupted graft"""
3228 """stop the interrupted graft"""
3230 if not graftstate.exists():
3229 if not graftstate.exists():
3231 raise error.Abort(_(b"no interrupted graft found"))
3230 raise error.Abort(_(b"no interrupted graft found"))
3232 pctx = repo[b'.']
3231 pctx = repo[b'.']
3233 hg.updaterepo(repo, pctx.node(), overwrite=True)
3232 hg.updaterepo(repo, pctx.node(), overwrite=True)
3234 graftstate.delete()
3233 graftstate.delete()
3235 ui.status(_(b"stopped the interrupted graft\n"))
3234 ui.status(_(b"stopped the interrupted graft\n"))
3236 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3235 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3237 return 0
3236 return 0
3238
3237
3239
3238
3240 statemod.addunfinished(
3239 statemod.addunfinished(
3241 b'graft',
3240 b'graft',
3242 fname=b'graftstate',
3241 fname=b'graftstate',
3243 clearable=True,
3242 clearable=True,
3244 stopflag=True,
3243 stopflag=True,
3245 continueflag=True,
3244 continueflag=True,
3246 abortfunc=cmdutil.hgabortgraft,
3245 abortfunc=cmdutil.hgabortgraft,
3247 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3246 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3248 )
3247 )
3249
3248
3250
3249
3251 @command(
3250 @command(
3252 b'grep',
3251 b'grep',
3253 [
3252 [
3254 (b'0', b'print0', None, _(b'end fields with NUL')),
3253 (b'0', b'print0', None, _(b'end fields with NUL')),
3255 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3254 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3256 (
3255 (
3257 b'',
3256 b'',
3258 b'diff',
3257 b'diff',
3259 None,
3258 None,
3260 _(
3259 _(
3261 b'search revision differences for when the pattern was added '
3260 b'search revision differences for when the pattern was added '
3262 b'or removed'
3261 b'or removed'
3263 ),
3262 ),
3264 ),
3263 ),
3265 (b'a', b'text', None, _(b'treat all files as text')),
3264 (b'a', b'text', None, _(b'treat all files as text')),
3266 (
3265 (
3267 b'f',
3266 b'f',
3268 b'follow',
3267 b'follow',
3269 None,
3268 None,
3270 _(
3269 _(
3271 b'follow changeset history,'
3270 b'follow changeset history,'
3272 b' or file history across copies and renames'
3271 b' or file history across copies and renames'
3273 ),
3272 ),
3274 ),
3273 ),
3275 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3274 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3276 (
3275 (
3277 b'l',
3276 b'l',
3278 b'files-with-matches',
3277 b'files-with-matches',
3279 None,
3278 None,
3280 _(b'print only filenames and revisions that match'),
3279 _(b'print only filenames and revisions that match'),
3281 ),
3280 ),
3282 (b'n', b'line-number', None, _(b'print matching line numbers')),
3281 (b'n', b'line-number', None, _(b'print matching line numbers')),
3283 (
3282 (
3284 b'r',
3283 b'r',
3285 b'rev',
3284 b'rev',
3286 [],
3285 [],
3287 _(b'search files changed within revision range'),
3286 _(b'search files changed within revision range'),
3288 _(b'REV'),
3287 _(b'REV'),
3289 ),
3288 ),
3290 (
3289 (
3291 b'',
3290 b'',
3292 b'all-files',
3291 b'all-files',
3293 None,
3292 None,
3294 _(
3293 _(
3295 b'include all files in the changeset while grepping (DEPRECATED)'
3294 b'include all files in the changeset while grepping (DEPRECATED)'
3296 ),
3295 ),
3297 ),
3296 ),
3298 (b'u', b'user', None, _(b'list the author (long with -v)')),
3297 (b'u', b'user', None, _(b'list the author (long with -v)')),
3299 (b'd', b'date', None, _(b'list the date (short with -q)')),
3298 (b'd', b'date', None, _(b'list the date (short with -q)')),
3300 ]
3299 ]
3301 + formatteropts
3300 + formatteropts
3302 + walkopts,
3301 + walkopts,
3303 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3302 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3304 helpcategory=command.CATEGORY_FILE_CONTENTS,
3303 helpcategory=command.CATEGORY_FILE_CONTENTS,
3305 inferrepo=True,
3304 inferrepo=True,
3306 intents={INTENT_READONLY},
3305 intents={INTENT_READONLY},
3307 )
3306 )
3308 def grep(ui, repo, pattern, *pats, **opts):
3307 def grep(ui, repo, pattern, *pats, **opts):
3309 """search for a pattern in specified files
3308 """search for a pattern in specified files
3310
3309
3311 Search the working directory or revision history for a regular
3310 Search the working directory or revision history for a regular
3312 expression in the specified files for the entire repository.
3311 expression in the specified files for the entire repository.
3313
3312
3314 By default, grep searches the repository files in the working
3313 By default, grep searches the repository files in the working
3315 directory and prints the files where it finds a match. To specify
3314 directory and prints the files where it finds a match. To specify
3316 historical revisions instead of the working directory, use the
3315 historical revisions instead of the working directory, use the
3317 --rev flag.
3316 --rev flag.
3318
3317
3319 To search instead historical revision differences that contains a
3318 To search instead historical revision differences that contains a
3320 change in match status ("-" for a match that becomes a non-match,
3319 change in match status ("-" for a match that becomes a non-match,
3321 or "+" for a non-match that becomes a match), use the --diff flag.
3320 or "+" for a non-match that becomes a match), use the --diff flag.
3322
3321
3323 PATTERN can be any Python (roughly Perl-compatible) regular
3322 PATTERN can be any Python (roughly Perl-compatible) regular
3324 expression.
3323 expression.
3325
3324
3326 If no FILEs are specified and the --rev flag isn't supplied, all
3325 If no FILEs are specified and the --rev flag isn't supplied, all
3327 files in the working directory are searched. When using the --rev
3326 files in the working directory are searched. When using the --rev
3328 flag and specifying FILEs, use the --follow argument to also
3327 flag and specifying FILEs, use the --follow argument to also
3329 follow the specified FILEs across renames and copies.
3328 follow the specified FILEs across renames and copies.
3330
3329
3331 .. container:: verbose
3330 .. container:: verbose
3332
3331
3333 Template:
3332 Template:
3334
3333
3335 The following keywords are supported in addition to the common template
3334 The following keywords are supported in addition to the common template
3336 keywords and functions. See also :hg:`help templates`.
3335 keywords and functions. See also :hg:`help templates`.
3337
3336
3338 :change: String. Character denoting insertion ``+`` or removal ``-``.
3337 :change: String. Character denoting insertion ``+`` or removal ``-``.
3339 Available if ``--diff`` is specified.
3338 Available if ``--diff`` is specified.
3340 :lineno: Integer. Line number of the match.
3339 :lineno: Integer. Line number of the match.
3341 :path: String. Repository-absolute path of the file.
3340 :path: String. Repository-absolute path of the file.
3342 :texts: List of text chunks.
3341 :texts: List of text chunks.
3343
3342
3344 And each entry of ``{texts}`` provides the following sub-keywords.
3343 And each entry of ``{texts}`` provides the following sub-keywords.
3345
3344
3346 :matched: Boolean. True if the chunk matches the specified pattern.
3345 :matched: Boolean. True if the chunk matches the specified pattern.
3347 :text: String. Chunk content.
3346 :text: String. Chunk content.
3348
3347
3349 See :hg:`help templates.operators` for the list expansion syntax.
3348 See :hg:`help templates.operators` for the list expansion syntax.
3350
3349
3351 Returns 0 if a match is found, 1 otherwise.
3350 Returns 0 if a match is found, 1 otherwise.
3352
3351
3353 """
3352 """
3354 opts = pycompat.byteskwargs(opts)
3353 opts = pycompat.byteskwargs(opts)
3355 diff = opts.get(b'all') or opts.get(b'diff')
3354 diff = opts.get(b'all') or opts.get(b'diff')
3356 if diff and opts.get(b'all_files'):
3355 if diff and opts.get(b'all_files'):
3357 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3356 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3358 if opts.get(b'all_files') is None and not diff:
3357 if opts.get(b'all_files') is None and not diff:
3359 opts[b'all_files'] = True
3358 opts[b'all_files'] = True
3360 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3359 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3361 all_files = opts.get(b'all_files')
3360 all_files = opts.get(b'all_files')
3362 if plaingrep:
3361 if plaingrep:
3363 opts[b'rev'] = [b'wdir()']
3362 opts[b'rev'] = [b'wdir()']
3364
3363
3365 reflags = re.M
3364 reflags = re.M
3366 if opts.get(b'ignore_case'):
3365 if opts.get(b'ignore_case'):
3367 reflags |= re.I
3366 reflags |= re.I
3368 try:
3367 try:
3369 regexp = util.re.compile(pattern, reflags)
3368 regexp = util.re.compile(pattern, reflags)
3370 except re.error as inst:
3369 except re.error as inst:
3371 ui.warn(
3370 ui.warn(
3372 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3371 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3373 )
3372 )
3374 return 1
3373 return 1
3375 sep, eol = b':', b'\n'
3374 sep, eol = b':', b'\n'
3376 if opts.get(b'print0'):
3375 if opts.get(b'print0'):
3377 sep = eol = b'\0'
3376 sep = eol = b'\0'
3378
3377
3379 getfile = util.lrucachefunc(repo.file)
3378 getfile = util.lrucachefunc(repo.file)
3380
3379
3381 def matchlines(body):
3380 def matchlines(body):
3382 begin = 0
3381 begin = 0
3383 linenum = 0
3382 linenum = 0
3384 while begin < len(body):
3383 while begin < len(body):
3385 match = regexp.search(body, begin)
3384 match = regexp.search(body, begin)
3386 if not match:
3385 if not match:
3387 break
3386 break
3388 mstart, mend = match.span()
3387 mstart, mend = match.span()
3389 linenum += body.count(b'\n', begin, mstart) + 1
3388 linenum += body.count(b'\n', begin, mstart) + 1
3390 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3389 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3391 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3390 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3392 lend = begin - 1
3391 lend = begin - 1
3393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3392 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3394
3393
3395 class linestate(object):
3394 class linestate(object):
3396 def __init__(self, line, linenum, colstart, colend):
3395 def __init__(self, line, linenum, colstart, colend):
3397 self.line = line
3396 self.line = line
3398 self.linenum = linenum
3397 self.linenum = linenum
3399 self.colstart = colstart
3398 self.colstart = colstart
3400 self.colend = colend
3399 self.colend = colend
3401
3400
3402 def __hash__(self):
3401 def __hash__(self):
3403 return hash((self.linenum, self.line))
3402 return hash((self.linenum, self.line))
3404
3403
3405 def __eq__(self, other):
3404 def __eq__(self, other):
3406 return self.line == other.line
3405 return self.line == other.line
3407
3406
3408 def findpos(self):
3407 def findpos(self):
3409 """Iterate all (start, end) indices of matches"""
3408 """Iterate all (start, end) indices of matches"""
3410 yield self.colstart, self.colend
3409 yield self.colstart, self.colend
3411 p = self.colend
3410 p = self.colend
3412 while p < len(self.line):
3411 while p < len(self.line):
3413 m = regexp.search(self.line, p)
3412 m = regexp.search(self.line, p)
3414 if not m:
3413 if not m:
3415 break
3414 break
3416 if m.end() == p:
3415 if m.end() == p:
3417 p += 1
3416 p += 1
3418 else:
3417 else:
3419 yield m.span()
3418 yield m.span()
3420 p = m.end()
3419 p = m.end()
3421
3420
3422 matches = {}
3421 matches = {}
3423 copies = {}
3422 copies = {}
3424
3423
3425 def grepbody(fn, rev, body):
3424 def grepbody(fn, rev, body):
3426 matches[rev].setdefault(fn, [])
3425 matches[rev].setdefault(fn, [])
3427 m = matches[rev][fn]
3426 m = matches[rev][fn]
3428 if body is None:
3427 if body is None:
3429 return
3428 return
3430
3429
3431 for lnum, cstart, cend, line in matchlines(body):
3430 for lnum, cstart, cend, line in matchlines(body):
3432 s = linestate(line, lnum, cstart, cend)
3431 s = linestate(line, lnum, cstart, cend)
3433 m.append(s)
3432 m.append(s)
3434
3433
3435 def difflinestates(a, b):
3434 def difflinestates(a, b):
3436 sm = difflib.SequenceMatcher(None, a, b)
3435 sm = difflib.SequenceMatcher(None, a, b)
3437 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3436 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3438 if tag == 'insert':
3437 if tag == 'insert':
3439 for i in pycompat.xrange(blo, bhi):
3438 for i in pycompat.xrange(blo, bhi):
3440 yield (b'+', b[i])
3439 yield (b'+', b[i])
3441 elif tag == 'delete':
3440 elif tag == 'delete':
3442 for i in pycompat.xrange(alo, ahi):
3441 for i in pycompat.xrange(alo, ahi):
3443 yield (b'-', a[i])
3442 yield (b'-', a[i])
3444 elif tag == 'replace':
3443 elif tag == 'replace':
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 for i in pycompat.xrange(blo, bhi):
3446 for i in pycompat.xrange(blo, bhi):
3448 yield (b'+', b[i])
3447 yield (b'+', b[i])
3449
3448
3450 uipathfn = scmutil.getuipathfn(repo)
3449 uipathfn = scmutil.getuipathfn(repo)
3451
3450
3452 def display(fm, fn, ctx, pstates, states):
3451 def display(fm, fn, ctx, pstates, states):
3453 rev = scmutil.intrev(ctx)
3452 rev = scmutil.intrev(ctx)
3454 if fm.isplain():
3453 if fm.isplain():
3455 formatuser = ui.shortuser
3454 formatuser = ui.shortuser
3456 else:
3455 else:
3457 formatuser = pycompat.bytestr
3456 formatuser = pycompat.bytestr
3458 if ui.quiet:
3457 if ui.quiet:
3459 datefmt = b'%Y-%m-%d'
3458 datefmt = b'%Y-%m-%d'
3460 else:
3459 else:
3461 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3460 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3462 found = False
3461 found = False
3463
3462
3464 @util.cachefunc
3463 @util.cachefunc
3465 def binary():
3464 def binary():
3466 flog = getfile(fn)
3465 flog = getfile(fn)
3467 try:
3466 try:
3468 return stringutil.binary(flog.read(ctx.filenode(fn)))
3467 return stringutil.binary(flog.read(ctx.filenode(fn)))
3469 except error.WdirUnsupported:
3468 except error.WdirUnsupported:
3470 return ctx[fn].isbinary()
3469 return ctx[fn].isbinary()
3471
3470
3472 fieldnamemap = {b'linenumber': b'lineno'}
3471 fieldnamemap = {b'linenumber': b'lineno'}
3473 if diff:
3472 if diff:
3474 iter = difflinestates(pstates, states)
3473 iter = difflinestates(pstates, states)
3475 else:
3474 else:
3476 iter = [(b'', l) for l in states]
3475 iter = [(b'', l) for l in states]
3477 for change, l in iter:
3476 for change, l in iter:
3478 fm.startitem()
3477 fm.startitem()
3479 fm.context(ctx=ctx)
3478 fm.context(ctx=ctx)
3480 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3479 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3481 fm.plain(uipathfn(fn), label=b'grep.filename')
3480 fm.plain(uipathfn(fn), label=b'grep.filename')
3482
3481
3483 cols = [
3482 cols = [
3484 (b'rev', b'%d', rev, not plaingrep, b''),
3483 (b'rev', b'%d', rev, not plaingrep, b''),
3485 (
3484 (
3486 b'linenumber',
3485 b'linenumber',
3487 b'%d',
3486 b'%d',
3488 l.linenum,
3487 l.linenum,
3489 opts.get(b'line_number'),
3488 opts.get(b'line_number'),
3490 b'',
3489 b'',
3491 ),
3490 ),
3492 ]
3491 ]
3493 if diff:
3492 if diff:
3494 cols.append(
3493 cols.append(
3495 (
3494 (
3496 b'change',
3495 b'change',
3497 b'%s',
3496 b'%s',
3498 change,
3497 change,
3499 True,
3498 True,
3500 b'grep.inserted '
3499 b'grep.inserted '
3501 if change == b'+'
3500 if change == b'+'
3502 else b'grep.deleted ',
3501 else b'grep.deleted ',
3503 )
3502 )
3504 )
3503 )
3505 cols.extend(
3504 cols.extend(
3506 [
3505 [
3507 (
3506 (
3508 b'user',
3507 b'user',
3509 b'%s',
3508 b'%s',
3510 formatuser(ctx.user()),
3509 formatuser(ctx.user()),
3511 opts.get(b'user'),
3510 opts.get(b'user'),
3512 b'',
3511 b'',
3513 ),
3512 ),
3514 (
3513 (
3515 b'date',
3514 b'date',
3516 b'%s',
3515 b'%s',
3517 fm.formatdate(ctx.date(), datefmt),
3516 fm.formatdate(ctx.date(), datefmt),
3518 opts.get(b'date'),
3517 opts.get(b'date'),
3519 b'',
3518 b'',
3520 ),
3519 ),
3521 ]
3520 ]
3522 )
3521 )
3523 for name, fmt, data, cond, extra_label in cols:
3522 for name, fmt, data, cond, extra_label in cols:
3524 if cond:
3523 if cond:
3525 fm.plain(sep, label=b'grep.sep')
3524 fm.plain(sep, label=b'grep.sep')
3526 field = fieldnamemap.get(name, name)
3525 field = fieldnamemap.get(name, name)
3527 label = extra_label + (b'grep.%s' % name)
3526 label = extra_label + (b'grep.%s' % name)
3528 fm.condwrite(cond, field, fmt, data, label=label)
3527 fm.condwrite(cond, field, fmt, data, label=label)
3529 if not opts.get(b'files_with_matches'):
3528 if not opts.get(b'files_with_matches'):
3530 fm.plain(sep, label=b'grep.sep')
3529 fm.plain(sep, label=b'grep.sep')
3531 if not opts.get(b'text') and binary():
3530 if not opts.get(b'text') and binary():
3532 fm.plain(_(b" Binary file matches"))
3531 fm.plain(_(b" Binary file matches"))
3533 else:
3532 else:
3534 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3533 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3535 fm.plain(eol)
3534 fm.plain(eol)
3536 found = True
3535 found = True
3537 if opts.get(b'files_with_matches'):
3536 if opts.get(b'files_with_matches'):
3538 break
3537 break
3539 return found
3538 return found
3540
3539
3541 def displaymatches(fm, l):
3540 def displaymatches(fm, l):
3542 p = 0
3541 p = 0
3543 for s, e in l.findpos():
3542 for s, e in l.findpos():
3544 if p < s:
3543 if p < s:
3545 fm.startitem()
3544 fm.startitem()
3546 fm.write(b'text', b'%s', l.line[p:s])
3545 fm.write(b'text', b'%s', l.line[p:s])
3547 fm.data(matched=False)
3546 fm.data(matched=False)
3548 fm.startitem()
3547 fm.startitem()
3549 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3548 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3550 fm.data(matched=True)
3549 fm.data(matched=True)
3551 p = e
3550 p = e
3552 if p < len(l.line):
3551 if p < len(l.line):
3553 fm.startitem()
3552 fm.startitem()
3554 fm.write(b'text', b'%s', l.line[p:])
3553 fm.write(b'text', b'%s', l.line[p:])
3555 fm.data(matched=False)
3554 fm.data(matched=False)
3556 fm.end()
3555 fm.end()
3557
3556
3558 skip = set()
3557 skip = set()
3559 revfiles = {}
3558 revfiles = {}
3560 match = scmutil.match(repo[None], pats, opts)
3559 match = scmutil.match(repo[None], pats, opts)
3561 found = False
3560 found = False
3562 follow = opts.get(b'follow')
3561 follow = opts.get(b'follow')
3563
3562
3564 getrenamed = scmutil.getrenamedfn(repo)
3563 getrenamed = scmutil.getrenamedfn(repo)
3565
3564
3566 def readfile(ctx, fn):
3565 def readfile(ctx, fn):
3567 rev = ctx.rev()
3566 rev = ctx.rev()
3568 if rev is None:
3567 if rev is None:
3569 fctx = ctx[fn]
3568 fctx = ctx[fn]
3570 try:
3569 try:
3571 return fctx.data()
3570 return fctx.data()
3572 except IOError as e:
3571 except IOError as e:
3573 if e.errno != errno.ENOENT:
3572 if e.errno != errno.ENOENT:
3574 raise
3573 raise
3575 else:
3574 else:
3576 flog = getfile(fn)
3575 flog = getfile(fn)
3577 fnode = ctx.filenode(fn)
3576 fnode = ctx.filenode(fn)
3578 try:
3577 try:
3579 return flog.read(fnode)
3578 return flog.read(fnode)
3580 except error.CensoredNodeError:
3579 except error.CensoredNodeError:
3581 ui.warn(
3580 ui.warn(
3582 _(
3581 _(
3583 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3582 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3584 )
3583 )
3585 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3584 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3586 )
3585 )
3587
3586
3588 def prep(ctx, fns):
3587 def prep(ctx, fns):
3589 rev = ctx.rev()
3588 rev = ctx.rev()
3590 pctx = ctx.p1()
3589 pctx = ctx.p1()
3591 matches.setdefault(rev, {})
3590 matches.setdefault(rev, {})
3592 if diff:
3591 if diff:
3593 parent = pctx.rev()
3592 parent = pctx.rev()
3594 matches.setdefault(parent, {})
3593 matches.setdefault(parent, {})
3595 files = revfiles.setdefault(rev, [])
3594 files = revfiles.setdefault(rev, [])
3596 if rev is None:
3595 if rev is None:
3597 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3596 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3598 # pathauditor checks without this in mozilla-central
3597 # pathauditor checks without this in mozilla-central
3599 contextmanager = repo.wvfs.audit.cached
3598 contextmanager = repo.wvfs.audit.cached
3600 else:
3599 else:
3601 contextmanager = util.nullcontextmanager
3600 contextmanager = util.nullcontextmanager
3602 with contextmanager():
3601 with contextmanager():
3603 for fn in fns:
3602 for fn in fns:
3604 # fn might not exist in the revision (could be a file removed by
3603 # fn might not exist in the revision (could be a file removed by
3605 # the revision). We could check `fn not in ctx` even when rev is
3604 # the revision). We could check `fn not in ctx` even when rev is
3606 # None, but it's less racy to protect againt that in readfile.
3605 # None, but it's less racy to protect againt that in readfile.
3607 if rev is not None and fn not in ctx:
3606 if rev is not None and fn not in ctx:
3608 continue
3607 continue
3609
3608
3610 copy = None
3609 copy = None
3611 if follow:
3610 if follow:
3612 copy = getrenamed(fn, rev)
3611 copy = getrenamed(fn, rev)
3613 if copy:
3612 if copy:
3614 copies.setdefault(rev, {})[fn] = copy
3613 copies.setdefault(rev, {})[fn] = copy
3615 if fn in skip:
3614 if fn in skip:
3616 skip.add(copy)
3615 skip.add(copy)
3617 if fn in skip:
3616 if fn in skip:
3618 continue
3617 continue
3619 files.append(fn)
3618 files.append(fn)
3620
3619
3621 if fn not in matches[rev]:
3620 if fn not in matches[rev]:
3622 grepbody(fn, rev, readfile(ctx, fn))
3621 grepbody(fn, rev, readfile(ctx, fn))
3623
3622
3624 if diff:
3623 if diff:
3625 pfn = copy or fn
3624 pfn = copy or fn
3626 if pfn not in matches[parent] and pfn in pctx:
3625 if pfn not in matches[parent] and pfn in pctx:
3627 grepbody(pfn, parent, readfile(pctx, pfn))
3626 grepbody(pfn, parent, readfile(pctx, pfn))
3628
3627
3629 ui.pager(b'grep')
3628 ui.pager(b'grep')
3630 fm = ui.formatter(b'grep', opts)
3629 fm = ui.formatter(b'grep', opts)
3631 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3630 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3632 rev = ctx.rev()
3631 rev = ctx.rev()
3633 parent = ctx.p1().rev()
3632 parent = ctx.p1().rev()
3634 for fn in sorted(revfiles.get(rev, [])):
3633 for fn in sorted(revfiles.get(rev, [])):
3635 states = matches[rev][fn]
3634 states = matches[rev][fn]
3636 copy = copies.get(rev, {}).get(fn)
3635 copy = copies.get(rev, {}).get(fn)
3637 if fn in skip:
3636 if fn in skip:
3638 if copy:
3637 if copy:
3639 skip.add(copy)
3638 skip.add(copy)
3640 continue
3639 continue
3641 pstates = matches.get(parent, {}).get(copy or fn, [])
3640 pstates = matches.get(parent, {}).get(copy or fn, [])
3642 if pstates or states:
3641 if pstates or states:
3643 r = display(fm, fn, ctx, pstates, states)
3642 r = display(fm, fn, ctx, pstates, states)
3644 found = found or r
3643 found = found or r
3645 if r and not diff and not all_files:
3644 if r and not diff and not all_files:
3646 skip.add(fn)
3645 skip.add(fn)
3647 if copy:
3646 if copy:
3648 skip.add(copy)
3647 skip.add(copy)
3649 del revfiles[rev]
3648 del revfiles[rev]
3650 # We will keep the matches dict for the duration of the window
3649 # We will keep the matches dict for the duration of the window
3651 # clear the matches dict once the window is over
3650 # clear the matches dict once the window is over
3652 if not revfiles:
3651 if not revfiles:
3653 matches.clear()
3652 matches.clear()
3654 fm.end()
3653 fm.end()
3655
3654
3656 return not found
3655 return not found
3657
3656
3658
3657
3659 @command(
3658 @command(
3660 b'heads',
3659 b'heads',
3661 [
3660 [
3662 (
3661 (
3663 b'r',
3662 b'r',
3664 b'rev',
3663 b'rev',
3665 b'',
3664 b'',
3666 _(b'show only heads which are descendants of STARTREV'),
3665 _(b'show only heads which are descendants of STARTREV'),
3667 _(b'STARTREV'),
3666 _(b'STARTREV'),
3668 ),
3667 ),
3669 (b't', b'topo', False, _(b'show topological heads only')),
3668 (b't', b'topo', False, _(b'show topological heads only')),
3670 (
3669 (
3671 b'a',
3670 b'a',
3672 b'active',
3671 b'active',
3673 False,
3672 False,
3674 _(b'show active branchheads only (DEPRECATED)'),
3673 _(b'show active branchheads only (DEPRECATED)'),
3675 ),
3674 ),
3676 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3675 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3677 ]
3676 ]
3678 + templateopts,
3677 + templateopts,
3679 _(b'[-ct] [-r STARTREV] [REV]...'),
3678 _(b'[-ct] [-r STARTREV] [REV]...'),
3680 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3679 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3681 intents={INTENT_READONLY},
3680 intents={INTENT_READONLY},
3682 )
3681 )
3683 def heads(ui, repo, *branchrevs, **opts):
3682 def heads(ui, repo, *branchrevs, **opts):
3684 """show branch heads
3683 """show branch heads
3685
3684
3686 With no arguments, show all open branch heads in the repository.
3685 With no arguments, show all open branch heads in the repository.
3687 Branch heads are changesets that have no descendants on the
3686 Branch heads are changesets that have no descendants on the
3688 same branch. They are where development generally takes place and
3687 same branch. They are where development generally takes place and
3689 are the usual targets for update and merge operations.
3688 are the usual targets for update and merge operations.
3690
3689
3691 If one or more REVs are given, only open branch heads on the
3690 If one or more REVs are given, only open branch heads on the
3692 branches associated with the specified changesets are shown. This
3691 branches associated with the specified changesets are shown. This
3693 means that you can use :hg:`heads .` to see the heads on the
3692 means that you can use :hg:`heads .` to see the heads on the
3694 currently checked-out branch.
3693 currently checked-out branch.
3695
3694
3696 If -c/--closed is specified, also show branch heads marked closed
3695 If -c/--closed is specified, also show branch heads marked closed
3697 (see :hg:`commit --close-branch`).
3696 (see :hg:`commit --close-branch`).
3698
3697
3699 If STARTREV is specified, only those heads that are descendants of
3698 If STARTREV is specified, only those heads that are descendants of
3700 STARTREV will be displayed.
3699 STARTREV will be displayed.
3701
3700
3702 If -t/--topo is specified, named branch mechanics will be ignored and only
3701 If -t/--topo is specified, named branch mechanics will be ignored and only
3703 topological heads (changesets with no children) will be shown.
3702 topological heads (changesets with no children) will be shown.
3704
3703
3705 Returns 0 if matching heads are found, 1 if not.
3704 Returns 0 if matching heads are found, 1 if not.
3706 """
3705 """
3707
3706
3708 opts = pycompat.byteskwargs(opts)
3707 opts = pycompat.byteskwargs(opts)
3709 start = None
3708 start = None
3710 rev = opts.get(b'rev')
3709 rev = opts.get(b'rev')
3711 if rev:
3710 if rev:
3712 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3713 start = scmutil.revsingle(repo, rev, None).node()
3712 start = scmutil.revsingle(repo, rev, None).node()
3714
3713
3715 if opts.get(b'topo'):
3714 if opts.get(b'topo'):
3716 heads = [repo[h] for h in repo.heads(start)]
3715 heads = [repo[h] for h in repo.heads(start)]
3717 else:
3716 else:
3718 heads = []
3717 heads = []
3719 for branch in repo.branchmap():
3718 for branch in repo.branchmap():
3720 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3719 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3721 heads = [repo[h] for h in heads]
3720 heads = [repo[h] for h in heads]
3722
3721
3723 if branchrevs:
3722 if branchrevs:
3724 branches = {
3723 branches = {
3725 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3724 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3726 }
3725 }
3727 heads = [h for h in heads if h.branch() in branches]
3726 heads = [h for h in heads if h.branch() in branches]
3728
3727
3729 if opts.get(b'active') and branchrevs:
3728 if opts.get(b'active') and branchrevs:
3730 dagheads = repo.heads(start)
3729 dagheads = repo.heads(start)
3731 heads = [h for h in heads if h.node() in dagheads]
3730 heads = [h for h in heads if h.node() in dagheads]
3732
3731
3733 if branchrevs:
3732 if branchrevs:
3734 haveheads = {h.branch() for h in heads}
3733 haveheads = {h.branch() for h in heads}
3735 if branches - haveheads:
3734 if branches - haveheads:
3736 headless = b', '.join(b for b in branches - haveheads)
3735 headless = b', '.join(b for b in branches - haveheads)
3737 msg = _(b'no open branch heads found on branches %s')
3736 msg = _(b'no open branch heads found on branches %s')
3738 if opts.get(b'rev'):
3737 if opts.get(b'rev'):
3739 msg += _(b' (started at %s)') % opts[b'rev']
3738 msg += _(b' (started at %s)') % opts[b'rev']
3740 ui.warn((msg + b'\n') % headless)
3739 ui.warn((msg + b'\n') % headless)
3741
3740
3742 if not heads:
3741 if not heads:
3743 return 1
3742 return 1
3744
3743
3745 ui.pager(b'heads')
3744 ui.pager(b'heads')
3746 heads = sorted(heads, key=lambda x: -(x.rev()))
3745 heads = sorted(heads, key=lambda x: -(x.rev()))
3747 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3746 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3748 for ctx in heads:
3747 for ctx in heads:
3749 displayer.show(ctx)
3748 displayer.show(ctx)
3750 displayer.close()
3749 displayer.close()
3751
3750
3752
3751
3753 @command(
3752 @command(
3754 b'help',
3753 b'help',
3755 [
3754 [
3756 (b'e', b'extension', None, _(b'show only help for extensions')),
3755 (b'e', b'extension', None, _(b'show only help for extensions')),
3757 (b'c', b'command', None, _(b'show only help for commands')),
3756 (b'c', b'command', None, _(b'show only help for commands')),
3758 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3757 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3759 (
3758 (
3760 b's',
3759 b's',
3761 b'system',
3760 b'system',
3762 [],
3761 [],
3763 _(b'show help for specific platform(s)'),
3762 _(b'show help for specific platform(s)'),
3764 _(b'PLATFORM'),
3763 _(b'PLATFORM'),
3765 ),
3764 ),
3766 ],
3765 ],
3767 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3766 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3768 helpcategory=command.CATEGORY_HELP,
3767 helpcategory=command.CATEGORY_HELP,
3769 norepo=True,
3768 norepo=True,
3770 intents={INTENT_READONLY},
3769 intents={INTENT_READONLY},
3771 )
3770 )
3772 def help_(ui, name=None, **opts):
3771 def help_(ui, name=None, **opts):
3773 """show help for a given topic or a help overview
3772 """show help for a given topic or a help overview
3774
3773
3775 With no arguments, print a list of commands with short help messages.
3774 With no arguments, print a list of commands with short help messages.
3776
3775
3777 Given a topic, extension, or command name, print help for that
3776 Given a topic, extension, or command name, print help for that
3778 topic.
3777 topic.
3779
3778
3780 Returns 0 if successful.
3779 Returns 0 if successful.
3781 """
3780 """
3782
3781
3783 keep = opts.get('system') or []
3782 keep = opts.get('system') or []
3784 if len(keep) == 0:
3783 if len(keep) == 0:
3785 if pycompat.sysplatform.startswith(b'win'):
3784 if pycompat.sysplatform.startswith(b'win'):
3786 keep.append(b'windows')
3785 keep.append(b'windows')
3787 elif pycompat.sysplatform == b'OpenVMS':
3786 elif pycompat.sysplatform == b'OpenVMS':
3788 keep.append(b'vms')
3787 keep.append(b'vms')
3789 elif pycompat.sysplatform == b'plan9':
3788 elif pycompat.sysplatform == b'plan9':
3790 keep.append(b'plan9')
3789 keep.append(b'plan9')
3791 else:
3790 else:
3792 keep.append(b'unix')
3791 keep.append(b'unix')
3793 keep.append(pycompat.sysplatform.lower())
3792 keep.append(pycompat.sysplatform.lower())
3794 if ui.verbose:
3793 if ui.verbose:
3795 keep.append(b'verbose')
3794 keep.append(b'verbose')
3796
3795
3797 commands = sys.modules[__name__]
3796 commands = sys.modules[__name__]
3798 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3797 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3799 ui.pager(b'help')
3798 ui.pager(b'help')
3800 ui.write(formatted)
3799 ui.write(formatted)
3801
3800
3802
3801
3803 @command(
3802 @command(
3804 b'identify|id',
3803 b'identify|id',
3805 [
3804 [
3806 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3805 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3807 (b'n', b'num', None, _(b'show local revision number')),
3806 (b'n', b'num', None, _(b'show local revision number')),
3808 (b'i', b'id', None, _(b'show global revision id')),
3807 (b'i', b'id', None, _(b'show global revision id')),
3809 (b'b', b'branch', None, _(b'show branch')),
3808 (b'b', b'branch', None, _(b'show branch')),
3810 (b't', b'tags', None, _(b'show tags')),
3809 (b't', b'tags', None, _(b'show tags')),
3811 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3810 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3812 ]
3811 ]
3813 + remoteopts
3812 + remoteopts
3814 + formatteropts,
3813 + formatteropts,
3815 _(b'[-nibtB] [-r REV] [SOURCE]'),
3814 _(b'[-nibtB] [-r REV] [SOURCE]'),
3816 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3815 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3817 optionalrepo=True,
3816 optionalrepo=True,
3818 intents={INTENT_READONLY},
3817 intents={INTENT_READONLY},
3819 )
3818 )
3820 def identify(
3819 def identify(
3821 ui,
3820 ui,
3822 repo,
3821 repo,
3823 source=None,
3822 source=None,
3824 rev=None,
3823 rev=None,
3825 num=None,
3824 num=None,
3826 id=None,
3825 id=None,
3827 branch=None,
3826 branch=None,
3828 tags=None,
3827 tags=None,
3829 bookmarks=None,
3828 bookmarks=None,
3830 **opts
3829 **opts
3831 ):
3830 ):
3832 """identify the working directory or specified revision
3831 """identify the working directory or specified revision
3833
3832
3834 Print a summary identifying the repository state at REV using one or
3833 Print a summary identifying the repository state at REV using one or
3835 two parent hash identifiers, followed by a "+" if the working
3834 two parent hash identifiers, followed by a "+" if the working
3836 directory has uncommitted changes, the branch name (if not default),
3835 directory has uncommitted changes, the branch name (if not default),
3837 a list of tags, and a list of bookmarks.
3836 a list of tags, and a list of bookmarks.
3838
3837
3839 When REV is not given, print a summary of the current state of the
3838 When REV is not given, print a summary of the current state of the
3840 repository including the working directory. Specify -r. to get information
3839 repository including the working directory. Specify -r. to get information
3841 of the working directory parent without scanning uncommitted changes.
3840 of the working directory parent without scanning uncommitted changes.
3842
3841
3843 Specifying a path to a repository root or Mercurial bundle will
3842 Specifying a path to a repository root or Mercurial bundle will
3844 cause lookup to operate on that repository/bundle.
3843 cause lookup to operate on that repository/bundle.
3845
3844
3846 .. container:: verbose
3845 .. container:: verbose
3847
3846
3848 Template:
3847 Template:
3849
3848
3850 The following keywords are supported in addition to the common template
3849 The following keywords are supported in addition to the common template
3851 keywords and functions. See also :hg:`help templates`.
3850 keywords and functions. See also :hg:`help templates`.
3852
3851
3853 :dirty: String. Character ``+`` denoting if the working directory has
3852 :dirty: String. Character ``+`` denoting if the working directory has
3854 uncommitted changes.
3853 uncommitted changes.
3855 :id: String. One or two nodes, optionally followed by ``+``.
3854 :id: String. One or two nodes, optionally followed by ``+``.
3856 :parents: List of strings. Parent nodes of the changeset.
3855 :parents: List of strings. Parent nodes of the changeset.
3857
3856
3858 Examples:
3857 Examples:
3859
3858
3860 - generate a build identifier for the working directory::
3859 - generate a build identifier for the working directory::
3861
3860
3862 hg id --id > build-id.dat
3861 hg id --id > build-id.dat
3863
3862
3864 - find the revision corresponding to a tag::
3863 - find the revision corresponding to a tag::
3865
3864
3866 hg id -n -r 1.3
3865 hg id -n -r 1.3
3867
3866
3868 - check the most recent revision of a remote repository::
3867 - check the most recent revision of a remote repository::
3869
3868
3870 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3869 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3871
3870
3872 See :hg:`log` for generating more information about specific revisions,
3871 See :hg:`log` for generating more information about specific revisions,
3873 including full hash identifiers.
3872 including full hash identifiers.
3874
3873
3875 Returns 0 if successful.
3874 Returns 0 if successful.
3876 """
3875 """
3877
3876
3878 opts = pycompat.byteskwargs(opts)
3877 opts = pycompat.byteskwargs(opts)
3879 if not repo and not source:
3878 if not repo and not source:
3880 raise error.Abort(
3879 raise error.Abort(
3881 _(b"there is no Mercurial repository here (.hg not found)")
3880 _(b"there is no Mercurial repository here (.hg not found)")
3882 )
3881 )
3883
3882
3884 default = not (num or id or branch or tags or bookmarks)
3883 default = not (num or id or branch or tags or bookmarks)
3885 output = []
3884 output = []
3886 revs = []
3885 revs = []
3887
3886
3888 if source:
3887 if source:
3889 source, branches = hg.parseurl(ui.expandpath(source))
3888 source, branches = hg.parseurl(ui.expandpath(source))
3890 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3889 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3891 repo = peer.local()
3890 repo = peer.local()
3892 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3891 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3893
3892
3894 fm = ui.formatter(b'identify', opts)
3893 fm = ui.formatter(b'identify', opts)
3895 fm.startitem()
3894 fm.startitem()
3896
3895
3897 if not repo:
3896 if not repo:
3898 if num or branch or tags:
3897 if num or branch or tags:
3899 raise error.Abort(
3898 raise error.Abort(
3900 _(b"can't query remote revision number, branch, or tags")
3899 _(b"can't query remote revision number, branch, or tags")
3901 )
3900 )
3902 if not rev and revs:
3901 if not rev and revs:
3903 rev = revs[0]
3902 rev = revs[0]
3904 if not rev:
3903 if not rev:
3905 rev = b"tip"
3904 rev = b"tip"
3906
3905
3907 remoterev = peer.lookup(rev)
3906 remoterev = peer.lookup(rev)
3908 hexrev = fm.hexfunc(remoterev)
3907 hexrev = fm.hexfunc(remoterev)
3909 if default or id:
3908 if default or id:
3910 output = [hexrev]
3909 output = [hexrev]
3911 fm.data(id=hexrev)
3910 fm.data(id=hexrev)
3912
3911
3913 @util.cachefunc
3912 @util.cachefunc
3914 def getbms():
3913 def getbms():
3915 bms = []
3914 bms = []
3916
3915
3917 if b'bookmarks' in peer.listkeys(b'namespaces'):
3916 if b'bookmarks' in peer.listkeys(b'namespaces'):
3918 hexremoterev = hex(remoterev)
3917 hexremoterev = hex(remoterev)
3919 bms = [
3918 bms = [
3920 bm
3919 bm
3921 for bm, bmr in pycompat.iteritems(
3920 for bm, bmr in pycompat.iteritems(
3922 peer.listkeys(b'bookmarks')
3921 peer.listkeys(b'bookmarks')
3923 )
3922 )
3924 if bmr == hexremoterev
3923 if bmr == hexremoterev
3925 ]
3924 ]
3926
3925
3927 return sorted(bms)
3926 return sorted(bms)
3928
3927
3929 if fm.isplain():
3928 if fm.isplain():
3930 if bookmarks:
3929 if bookmarks:
3931 output.extend(getbms())
3930 output.extend(getbms())
3932 elif default and not ui.quiet:
3931 elif default and not ui.quiet:
3933 # multiple bookmarks for a single parent separated by '/'
3932 # multiple bookmarks for a single parent separated by '/'
3934 bm = b'/'.join(getbms())
3933 bm = b'/'.join(getbms())
3935 if bm:
3934 if bm:
3936 output.append(bm)
3935 output.append(bm)
3937 else:
3936 else:
3938 fm.data(node=hex(remoterev))
3937 fm.data(node=hex(remoterev))
3939 if bookmarks or b'bookmarks' in fm.datahint():
3938 if bookmarks or b'bookmarks' in fm.datahint():
3940 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3939 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3941 else:
3940 else:
3942 if rev:
3941 if rev:
3943 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3942 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3944 ctx = scmutil.revsingle(repo, rev, None)
3943 ctx = scmutil.revsingle(repo, rev, None)
3945
3944
3946 if ctx.rev() is None:
3945 if ctx.rev() is None:
3947 ctx = repo[None]
3946 ctx = repo[None]
3948 parents = ctx.parents()
3947 parents = ctx.parents()
3949 taglist = []
3948 taglist = []
3950 for p in parents:
3949 for p in parents:
3951 taglist.extend(p.tags())
3950 taglist.extend(p.tags())
3952
3951
3953 dirty = b""
3952 dirty = b""
3954 if ctx.dirty(missing=True, merge=False, branch=False):
3953 if ctx.dirty(missing=True, merge=False, branch=False):
3955 dirty = b'+'
3954 dirty = b'+'
3956 fm.data(dirty=dirty)
3955 fm.data(dirty=dirty)
3957
3956
3958 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3957 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3959 if default or id:
3958 if default or id:
3960 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3959 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3961 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3960 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3962
3961
3963 if num:
3962 if num:
3964 numoutput = [b"%d" % p.rev() for p in parents]
3963 numoutput = [b"%d" % p.rev() for p in parents]
3965 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3964 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3966
3965
3967 fm.data(
3966 fm.data(
3968 parents=fm.formatlist(
3967 parents=fm.formatlist(
3969 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3968 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3970 )
3969 )
3971 )
3970 )
3972 else:
3971 else:
3973 hexoutput = fm.hexfunc(ctx.node())
3972 hexoutput = fm.hexfunc(ctx.node())
3974 if default or id:
3973 if default or id:
3975 output = [hexoutput]
3974 output = [hexoutput]
3976 fm.data(id=hexoutput)
3975 fm.data(id=hexoutput)
3977
3976
3978 if num:
3977 if num:
3979 output.append(pycompat.bytestr(ctx.rev()))
3978 output.append(pycompat.bytestr(ctx.rev()))
3980 taglist = ctx.tags()
3979 taglist = ctx.tags()
3981
3980
3982 if default and not ui.quiet:
3981 if default and not ui.quiet:
3983 b = ctx.branch()
3982 b = ctx.branch()
3984 if b != b'default':
3983 if b != b'default':
3985 output.append(b"(%s)" % b)
3984 output.append(b"(%s)" % b)
3986
3985
3987 # multiple tags for a single parent separated by '/'
3986 # multiple tags for a single parent separated by '/'
3988 t = b'/'.join(taglist)
3987 t = b'/'.join(taglist)
3989 if t:
3988 if t:
3990 output.append(t)
3989 output.append(t)
3991
3990
3992 # multiple bookmarks for a single parent separated by '/'
3991 # multiple bookmarks for a single parent separated by '/'
3993 bm = b'/'.join(ctx.bookmarks())
3992 bm = b'/'.join(ctx.bookmarks())
3994 if bm:
3993 if bm:
3995 output.append(bm)
3994 output.append(bm)
3996 else:
3995 else:
3997 if branch:
3996 if branch:
3998 output.append(ctx.branch())
3997 output.append(ctx.branch())
3999
3998
4000 if tags:
3999 if tags:
4001 output.extend(taglist)
4000 output.extend(taglist)
4002
4001
4003 if bookmarks:
4002 if bookmarks:
4004 output.extend(ctx.bookmarks())
4003 output.extend(ctx.bookmarks())
4005
4004
4006 fm.data(node=ctx.hex())
4005 fm.data(node=ctx.hex())
4007 fm.data(branch=ctx.branch())
4006 fm.data(branch=ctx.branch())
4008 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4007 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4009 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4008 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4010 fm.context(ctx=ctx)
4009 fm.context(ctx=ctx)
4011
4010
4012 fm.plain(b"%s\n" % b' '.join(output))
4011 fm.plain(b"%s\n" % b' '.join(output))
4013 fm.end()
4012 fm.end()
4014
4013
4015
4014
4016 @command(
4015 @command(
4017 b'import|patch',
4016 b'import|patch',
4018 [
4017 [
4019 (
4018 (
4020 b'p',
4019 b'p',
4021 b'strip',
4020 b'strip',
4022 1,
4021 1,
4023 _(
4022 _(
4024 b'directory strip option for patch. This has the same '
4023 b'directory strip option for patch. This has the same '
4025 b'meaning as the corresponding patch option'
4024 b'meaning as the corresponding patch option'
4026 ),
4025 ),
4027 _(b'NUM'),
4026 _(b'NUM'),
4028 ),
4027 ),
4029 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4028 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4030 (b'', b'secret', None, _(b'use the secret phase for committing')),
4029 (b'', b'secret', None, _(b'use the secret phase for committing')),
4031 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4030 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4032 (
4031 (
4033 b'f',
4032 b'f',
4034 b'force',
4033 b'force',
4035 None,
4034 None,
4036 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4035 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4037 ),
4036 ),
4038 (
4037 (
4039 b'',
4038 b'',
4040 b'no-commit',
4039 b'no-commit',
4041 None,
4040 None,
4042 _(b"don't commit, just update the working directory"),
4041 _(b"don't commit, just update the working directory"),
4043 ),
4042 ),
4044 (
4043 (
4045 b'',
4044 b'',
4046 b'bypass',
4045 b'bypass',
4047 None,
4046 None,
4048 _(b"apply patch without touching the working directory"),
4047 _(b"apply patch without touching the working directory"),
4049 ),
4048 ),
4050 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4049 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4051 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4050 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4052 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4051 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4053 (
4052 (
4054 b'',
4053 b'',
4055 b'import-branch',
4054 b'import-branch',
4056 None,
4055 None,
4057 _(b'use any branch information in patch (implied by --exact)'),
4056 _(b'use any branch information in patch (implied by --exact)'),
4058 ),
4057 ),
4059 ]
4058 ]
4060 + commitopts
4059 + commitopts
4061 + commitopts2
4060 + commitopts2
4062 + similarityopts,
4061 + similarityopts,
4063 _(b'[OPTION]... PATCH...'),
4062 _(b'[OPTION]... PATCH...'),
4064 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4063 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4065 )
4064 )
4066 def import_(ui, repo, patch1=None, *patches, **opts):
4065 def import_(ui, repo, patch1=None, *patches, **opts):
4067 """import an ordered set of patches
4066 """import an ordered set of patches
4068
4067
4069 Import a list of patches and commit them individually (unless
4068 Import a list of patches and commit them individually (unless
4070 --no-commit is specified).
4069 --no-commit is specified).
4071
4070
4072 To read a patch from standard input (stdin), use "-" as the patch
4071 To read a patch from standard input (stdin), use "-" as the patch
4073 name. If a URL is specified, the patch will be downloaded from
4072 name. If a URL is specified, the patch will be downloaded from
4074 there.
4073 there.
4075
4074
4076 Import first applies changes to the working directory (unless
4075 Import first applies changes to the working directory (unless
4077 --bypass is specified), import will abort if there are outstanding
4076 --bypass is specified), import will abort if there are outstanding
4078 changes.
4077 changes.
4079
4078
4080 Use --bypass to apply and commit patches directly to the
4079 Use --bypass to apply and commit patches directly to the
4081 repository, without affecting the working directory. Without
4080 repository, without affecting the working directory. Without
4082 --exact, patches will be applied on top of the working directory
4081 --exact, patches will be applied on top of the working directory
4083 parent revision.
4082 parent revision.
4084
4083
4085 You can import a patch straight from a mail message. Even patches
4084 You can import a patch straight from a mail message. Even patches
4086 as attachments work (to use the body part, it must have type
4085 as attachments work (to use the body part, it must have type
4087 text/plain or text/x-patch). From and Subject headers of email
4086 text/plain or text/x-patch). From and Subject headers of email
4088 message are used as default committer and commit message. All
4087 message are used as default committer and commit message. All
4089 text/plain body parts before first diff are added to the commit
4088 text/plain body parts before first diff are added to the commit
4090 message.
4089 message.
4091
4090
4092 If the imported patch was generated by :hg:`export`, user and
4091 If the imported patch was generated by :hg:`export`, user and
4093 description from patch override values from message headers and
4092 description from patch override values from message headers and
4094 body. Values given on command line with -m/--message and -u/--user
4093 body. Values given on command line with -m/--message and -u/--user
4095 override these.
4094 override these.
4096
4095
4097 If --exact is specified, import will set the working directory to
4096 If --exact is specified, import will set the working directory to
4098 the parent of each patch before applying it, and will abort if the
4097 the parent of each patch before applying it, and will abort if the
4099 resulting changeset has a different ID than the one recorded in
4098 resulting changeset has a different ID than the one recorded in
4100 the patch. This will guard against various ways that portable
4099 the patch. This will guard against various ways that portable
4101 patch formats and mail systems might fail to transfer Mercurial
4100 patch formats and mail systems might fail to transfer Mercurial
4102 data or metadata. See :hg:`bundle` for lossless transmission.
4101 data or metadata. See :hg:`bundle` for lossless transmission.
4103
4102
4104 Use --partial to ensure a changeset will be created from the patch
4103 Use --partial to ensure a changeset will be created from the patch
4105 even if some hunks fail to apply. Hunks that fail to apply will be
4104 even if some hunks fail to apply. Hunks that fail to apply will be
4106 written to a <target-file>.rej file. Conflicts can then be resolved
4105 written to a <target-file>.rej file. Conflicts can then be resolved
4107 by hand before :hg:`commit --amend` is run to update the created
4106 by hand before :hg:`commit --amend` is run to update the created
4108 changeset. This flag exists to let people import patches that
4107 changeset. This flag exists to let people import patches that
4109 partially apply without losing the associated metadata (author,
4108 partially apply without losing the associated metadata (author,
4110 date, description, ...).
4109 date, description, ...).
4111
4110
4112 .. note::
4111 .. note::
4113
4112
4114 When no hunks apply cleanly, :hg:`import --partial` will create
4113 When no hunks apply cleanly, :hg:`import --partial` will create
4115 an empty changeset, importing only the patch metadata.
4114 an empty changeset, importing only the patch metadata.
4116
4115
4117 With -s/--similarity, hg will attempt to discover renames and
4116 With -s/--similarity, hg will attempt to discover renames and
4118 copies in the patch in the same way as :hg:`addremove`.
4117 copies in the patch in the same way as :hg:`addremove`.
4119
4118
4120 It is possible to use external patch programs to perform the patch
4119 It is possible to use external patch programs to perform the patch
4121 by setting the ``ui.patch`` configuration option. For the default
4120 by setting the ``ui.patch`` configuration option. For the default
4122 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4121 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4123 See :hg:`help config` for more information about configuration
4122 See :hg:`help config` for more information about configuration
4124 files and how to use these options.
4123 files and how to use these options.
4125
4124
4126 See :hg:`help dates` for a list of formats valid for -d/--date.
4125 See :hg:`help dates` for a list of formats valid for -d/--date.
4127
4126
4128 .. container:: verbose
4127 .. container:: verbose
4129
4128
4130 Examples:
4129 Examples:
4131
4130
4132 - import a traditional patch from a website and detect renames::
4131 - import a traditional patch from a website and detect renames::
4133
4132
4134 hg import -s 80 http://example.com/bugfix.patch
4133 hg import -s 80 http://example.com/bugfix.patch
4135
4134
4136 - import a changeset from an hgweb server::
4135 - import a changeset from an hgweb server::
4137
4136
4138 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4137 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4139
4138
4140 - import all the patches in an Unix-style mbox::
4139 - import all the patches in an Unix-style mbox::
4141
4140
4142 hg import incoming-patches.mbox
4141 hg import incoming-patches.mbox
4143
4142
4144 - import patches from stdin::
4143 - import patches from stdin::
4145
4144
4146 hg import -
4145 hg import -
4147
4146
4148 - attempt to exactly restore an exported changeset (not always
4147 - attempt to exactly restore an exported changeset (not always
4149 possible)::
4148 possible)::
4150
4149
4151 hg import --exact proposed-fix.patch
4150 hg import --exact proposed-fix.patch
4152
4151
4153 - use an external tool to apply a patch which is too fuzzy for
4152 - use an external tool to apply a patch which is too fuzzy for
4154 the default internal tool.
4153 the default internal tool.
4155
4154
4156 hg import --config ui.patch="patch --merge" fuzzy.patch
4155 hg import --config ui.patch="patch --merge" fuzzy.patch
4157
4156
4158 - change the default fuzzing from 2 to a less strict 7
4157 - change the default fuzzing from 2 to a less strict 7
4159
4158
4160 hg import --config ui.fuzz=7 fuzz.patch
4159 hg import --config ui.fuzz=7 fuzz.patch
4161
4160
4162 Returns 0 on success, 1 on partial success (see --partial).
4161 Returns 0 on success, 1 on partial success (see --partial).
4163 """
4162 """
4164
4163
4165 opts = pycompat.byteskwargs(opts)
4164 opts = pycompat.byteskwargs(opts)
4166 if not patch1:
4165 if not patch1:
4167 raise error.Abort(_(b'need at least one patch to import'))
4166 raise error.Abort(_(b'need at least one patch to import'))
4168
4167
4169 patches = (patch1,) + patches
4168 patches = (patch1,) + patches
4170
4169
4171 date = opts.get(b'date')
4170 date = opts.get(b'date')
4172 if date:
4171 if date:
4173 opts[b'date'] = dateutil.parsedate(date)
4172 opts[b'date'] = dateutil.parsedate(date)
4174
4173
4175 exact = opts.get(b'exact')
4174 exact = opts.get(b'exact')
4176 update = not opts.get(b'bypass')
4175 update = not opts.get(b'bypass')
4177 if not update and opts.get(b'no_commit'):
4176 if not update and opts.get(b'no_commit'):
4178 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4177 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4179 if opts.get(b'secret') and opts.get(b'no_commit'):
4178 if opts.get(b'secret') and opts.get(b'no_commit'):
4180 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4179 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4181 try:
4180 try:
4182 sim = float(opts.get(b'similarity') or 0)
4181 sim = float(opts.get(b'similarity') or 0)
4183 except ValueError:
4182 except ValueError:
4184 raise error.Abort(_(b'similarity must be a number'))
4183 raise error.Abort(_(b'similarity must be a number'))
4185 if sim < 0 or sim > 100:
4184 if sim < 0 or sim > 100:
4186 raise error.Abort(_(b'similarity must be between 0 and 100'))
4185 raise error.Abort(_(b'similarity must be between 0 and 100'))
4187 if sim and not update:
4186 if sim and not update:
4188 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4187 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4189 if exact:
4188 if exact:
4190 if opts.get(b'edit'):
4189 if opts.get(b'edit'):
4191 raise error.Abort(_(b'cannot use --exact with --edit'))
4190 raise error.Abort(_(b'cannot use --exact with --edit'))
4192 if opts.get(b'prefix'):
4191 if opts.get(b'prefix'):
4193 raise error.Abort(_(b'cannot use --exact with --prefix'))
4192 raise error.Abort(_(b'cannot use --exact with --prefix'))
4194
4193
4195 base = opts[b"base"]
4194 base = opts[b"base"]
4196 msgs = []
4195 msgs = []
4197 ret = 0
4196 ret = 0
4198
4197
4199 with repo.wlock():
4198 with repo.wlock():
4200 if update:
4199 if update:
4201 cmdutil.checkunfinished(repo)
4200 cmdutil.checkunfinished(repo)
4202 if exact or not opts.get(b'force'):
4201 if exact or not opts.get(b'force'):
4203 cmdutil.bailifchanged(repo)
4202 cmdutil.bailifchanged(repo)
4204
4203
4205 if not opts.get(b'no_commit'):
4204 if not opts.get(b'no_commit'):
4206 lock = repo.lock
4205 lock = repo.lock
4207 tr = lambda: repo.transaction(b'import')
4206 tr = lambda: repo.transaction(b'import')
4208 dsguard = util.nullcontextmanager
4207 dsguard = util.nullcontextmanager
4209 else:
4208 else:
4210 lock = util.nullcontextmanager
4209 lock = util.nullcontextmanager
4211 tr = util.nullcontextmanager
4210 tr = util.nullcontextmanager
4212 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4211 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4213 with lock(), tr(), dsguard():
4212 with lock(), tr(), dsguard():
4214 parents = repo[None].parents()
4213 parents = repo[None].parents()
4215 for patchurl in patches:
4214 for patchurl in patches:
4216 if patchurl == b'-':
4215 if patchurl == b'-':
4217 ui.status(_(b'applying patch from stdin\n'))
4216 ui.status(_(b'applying patch from stdin\n'))
4218 patchfile = ui.fin
4217 patchfile = ui.fin
4219 patchurl = b'stdin' # for error message
4218 patchurl = b'stdin' # for error message
4220 else:
4219 else:
4221 patchurl = os.path.join(base, patchurl)
4220 patchurl = os.path.join(base, patchurl)
4222 ui.status(_(b'applying %s\n') % patchurl)
4221 ui.status(_(b'applying %s\n') % patchurl)
4223 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4222 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4224
4223
4225 haspatch = False
4224 haspatch = False
4226 for hunk in patch.split(patchfile):
4225 for hunk in patch.split(patchfile):
4227 with patch.extract(ui, hunk) as patchdata:
4226 with patch.extract(ui, hunk) as patchdata:
4228 msg, node, rej = cmdutil.tryimportone(
4227 msg, node, rej = cmdutil.tryimportone(
4229 ui, repo, patchdata, parents, opts, msgs, hg.clean
4228 ui, repo, patchdata, parents, opts, msgs, hg.clean
4230 )
4229 )
4231 if msg:
4230 if msg:
4232 haspatch = True
4231 haspatch = True
4233 ui.note(msg + b'\n')
4232 ui.note(msg + b'\n')
4234 if update or exact:
4233 if update or exact:
4235 parents = repo[None].parents()
4234 parents = repo[None].parents()
4236 else:
4235 else:
4237 parents = [repo[node]]
4236 parents = [repo[node]]
4238 if rej:
4237 if rej:
4239 ui.write_err(_(b"patch applied partially\n"))
4238 ui.write_err(_(b"patch applied partially\n"))
4240 ui.write_err(
4239 ui.write_err(
4241 _(
4240 _(
4242 b"(fix the .rej files and run "
4241 b"(fix the .rej files and run "
4243 b"`hg commit --amend`)\n"
4242 b"`hg commit --amend`)\n"
4244 )
4243 )
4245 )
4244 )
4246 ret = 1
4245 ret = 1
4247 break
4246 break
4248
4247
4249 if not haspatch:
4248 if not haspatch:
4250 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4249 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4251
4250
4252 if msgs:
4251 if msgs:
4253 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4252 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4254 return ret
4253 return ret
4255
4254
4256
4255
4257 @command(
4256 @command(
4258 b'incoming|in',
4257 b'incoming|in',
4259 [
4258 [
4260 (
4259 (
4261 b'f',
4260 b'f',
4262 b'force',
4261 b'force',
4263 None,
4262 None,
4264 _(b'run even if remote repository is unrelated'),
4263 _(b'run even if remote repository is unrelated'),
4265 ),
4264 ),
4266 (b'n', b'newest-first', None, _(b'show newest record first')),
4265 (b'n', b'newest-first', None, _(b'show newest record first')),
4267 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4266 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4268 (
4267 (
4269 b'r',
4268 b'r',
4270 b'rev',
4269 b'rev',
4271 [],
4270 [],
4272 _(b'a remote changeset intended to be added'),
4271 _(b'a remote changeset intended to be added'),
4273 _(b'REV'),
4272 _(b'REV'),
4274 ),
4273 ),
4275 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4274 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4276 (
4275 (
4277 b'b',
4276 b'b',
4278 b'branch',
4277 b'branch',
4279 [],
4278 [],
4280 _(b'a specific branch you would like to pull'),
4279 _(b'a specific branch you would like to pull'),
4281 _(b'BRANCH'),
4280 _(b'BRANCH'),
4282 ),
4281 ),
4283 ]
4282 ]
4284 + logopts
4283 + logopts
4285 + remoteopts
4284 + remoteopts
4286 + subrepoopts,
4285 + subrepoopts,
4287 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4286 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4288 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4287 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4289 )
4288 )
4290 def incoming(ui, repo, source=b"default", **opts):
4289 def incoming(ui, repo, source=b"default", **opts):
4291 """show new changesets found in source
4290 """show new changesets found in source
4292
4291
4293 Show new changesets found in the specified path/URL or the default
4292 Show new changesets found in the specified path/URL or the default
4294 pull location. These are the changesets that would have been pulled
4293 pull location. These are the changesets that would have been pulled
4295 by :hg:`pull` at the time you issued this command.
4294 by :hg:`pull` at the time you issued this command.
4296
4295
4297 See pull for valid source format details.
4296 See pull for valid source format details.
4298
4297
4299 .. container:: verbose
4298 .. container:: verbose
4300
4299
4301 With -B/--bookmarks, the result of bookmark comparison between
4300 With -B/--bookmarks, the result of bookmark comparison between
4302 local and remote repositories is displayed. With -v/--verbose,
4301 local and remote repositories is displayed. With -v/--verbose,
4303 status is also displayed for each bookmark like below::
4302 status is also displayed for each bookmark like below::
4304
4303
4305 BM1 01234567890a added
4304 BM1 01234567890a added
4306 BM2 1234567890ab advanced
4305 BM2 1234567890ab advanced
4307 BM3 234567890abc diverged
4306 BM3 234567890abc diverged
4308 BM4 34567890abcd changed
4307 BM4 34567890abcd changed
4309
4308
4310 The action taken locally when pulling depends on the
4309 The action taken locally when pulling depends on the
4311 status of each bookmark:
4310 status of each bookmark:
4312
4311
4313 :``added``: pull will create it
4312 :``added``: pull will create it
4314 :``advanced``: pull will update it
4313 :``advanced``: pull will update it
4315 :``diverged``: pull will create a divergent bookmark
4314 :``diverged``: pull will create a divergent bookmark
4316 :``changed``: result depends on remote changesets
4315 :``changed``: result depends on remote changesets
4317
4316
4318 From the point of view of pulling behavior, bookmark
4317 From the point of view of pulling behavior, bookmark
4319 existing only in the remote repository are treated as ``added``,
4318 existing only in the remote repository are treated as ``added``,
4320 even if it is in fact locally deleted.
4319 even if it is in fact locally deleted.
4321
4320
4322 .. container:: verbose
4321 .. container:: verbose
4323
4322
4324 For remote repository, using --bundle avoids downloading the
4323 For remote repository, using --bundle avoids downloading the
4325 changesets twice if the incoming is followed by a pull.
4324 changesets twice if the incoming is followed by a pull.
4326
4325
4327 Examples:
4326 Examples:
4328
4327
4329 - show incoming changes with patches and full description::
4328 - show incoming changes with patches and full description::
4330
4329
4331 hg incoming -vp
4330 hg incoming -vp
4332
4331
4333 - show incoming changes excluding merges, store a bundle::
4332 - show incoming changes excluding merges, store a bundle::
4334
4333
4335 hg in -vpM --bundle incoming.hg
4334 hg in -vpM --bundle incoming.hg
4336 hg pull incoming.hg
4335 hg pull incoming.hg
4337
4336
4338 - briefly list changes inside a bundle::
4337 - briefly list changes inside a bundle::
4339
4338
4340 hg in changes.hg -T "{desc|firstline}\\n"
4339 hg in changes.hg -T "{desc|firstline}\\n"
4341
4340
4342 Returns 0 if there are incoming changes, 1 otherwise.
4341 Returns 0 if there are incoming changes, 1 otherwise.
4343 """
4342 """
4344 opts = pycompat.byteskwargs(opts)
4343 opts = pycompat.byteskwargs(opts)
4345 if opts.get(b'graph'):
4344 if opts.get(b'graph'):
4346 logcmdutil.checkunsupportedgraphflags([], opts)
4345 logcmdutil.checkunsupportedgraphflags([], opts)
4347
4346
4348 def display(other, chlist, displayer):
4347 def display(other, chlist, displayer):
4349 revdag = logcmdutil.graphrevs(other, chlist, opts)
4348 revdag = logcmdutil.graphrevs(other, chlist, opts)
4350 logcmdutil.displaygraph(
4349 logcmdutil.displaygraph(
4351 ui, repo, revdag, displayer, graphmod.asciiedges
4350 ui, repo, revdag, displayer, graphmod.asciiedges
4352 )
4351 )
4353
4352
4354 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4353 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4355 return 0
4354 return 0
4356
4355
4357 if opts.get(b'bundle') and opts.get(b'subrepos'):
4356 if opts.get(b'bundle') and opts.get(b'subrepos'):
4358 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4357 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4359
4358
4360 if opts.get(b'bookmarks'):
4359 if opts.get(b'bookmarks'):
4361 source, branches = hg.parseurl(
4360 source, branches = hg.parseurl(
4362 ui.expandpath(source), opts.get(b'branch')
4361 ui.expandpath(source), opts.get(b'branch')
4363 )
4362 )
4364 other = hg.peer(repo, opts, source)
4363 other = hg.peer(repo, opts, source)
4365 if b'bookmarks' not in other.listkeys(b'namespaces'):
4364 if b'bookmarks' not in other.listkeys(b'namespaces'):
4366 ui.warn(_(b"remote doesn't support bookmarks\n"))
4365 ui.warn(_(b"remote doesn't support bookmarks\n"))
4367 return 0
4366 return 0
4368 ui.pager(b'incoming')
4367 ui.pager(b'incoming')
4369 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4368 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4370 return bookmarks.incoming(ui, repo, other)
4369 return bookmarks.incoming(ui, repo, other)
4371
4370
4372 repo._subtoppath = ui.expandpath(source)
4371 repo._subtoppath = ui.expandpath(source)
4373 try:
4372 try:
4374 return hg.incoming(ui, repo, source, opts)
4373 return hg.incoming(ui, repo, source, opts)
4375 finally:
4374 finally:
4376 del repo._subtoppath
4375 del repo._subtoppath
4377
4376
4378
4377
4379 @command(
4378 @command(
4380 b'init',
4379 b'init',
4381 remoteopts,
4380 remoteopts,
4382 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4381 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4383 helpcategory=command.CATEGORY_REPO_CREATION,
4382 helpcategory=command.CATEGORY_REPO_CREATION,
4384 helpbasic=True,
4383 helpbasic=True,
4385 norepo=True,
4384 norepo=True,
4386 )
4385 )
4387 def init(ui, dest=b".", **opts):
4386 def init(ui, dest=b".", **opts):
4388 """create a new repository in the given directory
4387 """create a new repository in the given directory
4389
4388
4390 Initialize a new repository in the given directory. If the given
4389 Initialize a new repository in the given directory. If the given
4391 directory does not exist, it will be created.
4390 directory does not exist, it will be created.
4392
4391
4393 If no directory is given, the current directory is used.
4392 If no directory is given, the current directory is used.
4394
4393
4395 It is possible to specify an ``ssh://`` URL as the destination.
4394 It is possible to specify an ``ssh://`` URL as the destination.
4396 See :hg:`help urls` for more information.
4395 See :hg:`help urls` for more information.
4397
4396
4398 Returns 0 on success.
4397 Returns 0 on success.
4399 """
4398 """
4400 opts = pycompat.byteskwargs(opts)
4399 opts = pycompat.byteskwargs(opts)
4401 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4400 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4402
4401
4403
4402
4404 @command(
4403 @command(
4405 b'locate',
4404 b'locate',
4406 [
4405 [
4407 (
4406 (
4408 b'r',
4407 b'r',
4409 b'rev',
4408 b'rev',
4410 b'',
4409 b'',
4411 _(b'search the repository as it is in REV'),
4410 _(b'search the repository as it is in REV'),
4412 _(b'REV'),
4411 _(b'REV'),
4413 ),
4412 ),
4414 (
4413 (
4415 b'0',
4414 b'0',
4416 b'print0',
4415 b'print0',
4417 None,
4416 None,
4418 _(b'end filenames with NUL, for use with xargs'),
4417 _(b'end filenames with NUL, for use with xargs'),
4419 ),
4418 ),
4420 (
4419 (
4421 b'f',
4420 b'f',
4422 b'fullpath',
4421 b'fullpath',
4423 None,
4422 None,
4424 _(b'print complete paths from the filesystem root'),
4423 _(b'print complete paths from the filesystem root'),
4425 ),
4424 ),
4426 ]
4425 ]
4427 + walkopts,
4426 + walkopts,
4428 _(b'[OPTION]... [PATTERN]...'),
4427 _(b'[OPTION]... [PATTERN]...'),
4429 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4428 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4430 )
4429 )
4431 def locate(ui, repo, *pats, **opts):
4430 def locate(ui, repo, *pats, **opts):
4432 """locate files matching specific patterns (DEPRECATED)
4431 """locate files matching specific patterns (DEPRECATED)
4433
4432
4434 Print files under Mercurial control in the working directory whose
4433 Print files under Mercurial control in the working directory whose
4435 names match the given patterns.
4434 names match the given patterns.
4436
4435
4437 By default, this command searches all directories in the working
4436 By default, this command searches all directories in the working
4438 directory. To search just the current directory and its
4437 directory. To search just the current directory and its
4439 subdirectories, use "--include .".
4438 subdirectories, use "--include .".
4440
4439
4441 If no patterns are given to match, this command prints the names
4440 If no patterns are given to match, this command prints the names
4442 of all files under Mercurial control in the working directory.
4441 of all files under Mercurial control in the working directory.
4443
4442
4444 If you want to feed the output of this command into the "xargs"
4443 If you want to feed the output of this command into the "xargs"
4445 command, use the -0 option to both this command and "xargs". This
4444 command, use the -0 option to both this command and "xargs". This
4446 will avoid the problem of "xargs" treating single filenames that
4445 will avoid the problem of "xargs" treating single filenames that
4447 contain whitespace as multiple filenames.
4446 contain whitespace as multiple filenames.
4448
4447
4449 See :hg:`help files` for a more versatile command.
4448 See :hg:`help files` for a more versatile command.
4450
4449
4451 Returns 0 if a match is found, 1 otherwise.
4450 Returns 0 if a match is found, 1 otherwise.
4452 """
4451 """
4453 opts = pycompat.byteskwargs(opts)
4452 opts = pycompat.byteskwargs(opts)
4454 if opts.get(b'print0'):
4453 if opts.get(b'print0'):
4455 end = b'\0'
4454 end = b'\0'
4456 else:
4455 else:
4457 end = b'\n'
4456 end = b'\n'
4458 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4457 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4459
4458
4460 ret = 1
4459 ret = 1
4461 m = scmutil.match(
4460 m = scmutil.match(
4462 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4461 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4463 )
4462 )
4464
4463
4465 ui.pager(b'locate')
4464 ui.pager(b'locate')
4466 if ctx.rev() is None:
4465 if ctx.rev() is None:
4467 # When run on the working copy, "locate" includes removed files, so
4466 # When run on the working copy, "locate" includes removed files, so
4468 # we get the list of files from the dirstate.
4467 # we get the list of files from the dirstate.
4469 filesgen = sorted(repo.dirstate.matches(m))
4468 filesgen = sorted(repo.dirstate.matches(m))
4470 else:
4469 else:
4471 filesgen = ctx.matches(m)
4470 filesgen = ctx.matches(m)
4472 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4471 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4473 for abs in filesgen:
4472 for abs in filesgen:
4474 if opts.get(b'fullpath'):
4473 if opts.get(b'fullpath'):
4475 ui.write(repo.wjoin(abs), end)
4474 ui.write(repo.wjoin(abs), end)
4476 else:
4475 else:
4477 ui.write(uipathfn(abs), end)
4476 ui.write(uipathfn(abs), end)
4478 ret = 0
4477 ret = 0
4479
4478
4480 return ret
4479 return ret
4481
4480
4482
4481
4483 @command(
4482 @command(
4484 b'log|history',
4483 b'log|history',
4485 [
4484 [
4486 (
4485 (
4487 b'f',
4486 b'f',
4488 b'follow',
4487 b'follow',
4489 None,
4488 None,
4490 _(
4489 _(
4491 b'follow changeset history, or file history across copies and renames'
4490 b'follow changeset history, or file history across copies and renames'
4492 ),
4491 ),
4493 ),
4492 ),
4494 (
4493 (
4495 b'',
4494 b'',
4496 b'follow-first',
4495 b'follow-first',
4497 None,
4496 None,
4498 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4497 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4499 ),
4498 ),
4500 (
4499 (
4501 b'd',
4500 b'd',
4502 b'date',
4501 b'date',
4503 b'',
4502 b'',
4504 _(b'show revisions matching date spec'),
4503 _(b'show revisions matching date spec'),
4505 _(b'DATE'),
4504 _(b'DATE'),
4506 ),
4505 ),
4507 (b'C', b'copies', None, _(b'show copied files')),
4506 (b'C', b'copies', None, _(b'show copied files')),
4508 (
4507 (
4509 b'k',
4508 b'k',
4510 b'keyword',
4509 b'keyword',
4511 [],
4510 [],
4512 _(b'do case-insensitive search for a given text'),
4511 _(b'do case-insensitive search for a given text'),
4513 _(b'TEXT'),
4512 _(b'TEXT'),
4514 ),
4513 ),
4515 (
4514 (
4516 b'r',
4515 b'r',
4517 b'rev',
4516 b'rev',
4518 [],
4517 [],
4519 _(b'show the specified revision or revset'),
4518 _(b'show the specified revision or revset'),
4520 _(b'REV'),
4519 _(b'REV'),
4521 ),
4520 ),
4522 (
4521 (
4523 b'L',
4522 b'L',
4524 b'line-range',
4523 b'line-range',
4525 [],
4524 [],
4526 _(b'follow line range of specified file (EXPERIMENTAL)'),
4525 _(b'follow line range of specified file (EXPERIMENTAL)'),
4527 _(b'FILE,RANGE'),
4526 _(b'FILE,RANGE'),
4528 ),
4527 ),
4529 (
4528 (
4530 b'',
4529 b'',
4531 b'removed',
4530 b'removed',
4532 None,
4531 None,
4533 _(b'include revisions where files were removed'),
4532 _(b'include revisions where files were removed'),
4534 ),
4533 ),
4535 (
4534 (
4536 b'm',
4535 b'm',
4537 b'only-merges',
4536 b'only-merges',
4538 None,
4537 None,
4539 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4538 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4540 ),
4539 ),
4541 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4540 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4542 (
4541 (
4543 b'',
4542 b'',
4544 b'only-branch',
4543 b'only-branch',
4545 [],
4544 [],
4546 _(
4545 _(
4547 b'show only changesets within the given named branch (DEPRECATED)'
4546 b'show only changesets within the given named branch (DEPRECATED)'
4548 ),
4547 ),
4549 _(b'BRANCH'),
4548 _(b'BRANCH'),
4550 ),
4549 ),
4551 (
4550 (
4552 b'b',
4551 b'b',
4553 b'branch',
4552 b'branch',
4554 [],
4553 [],
4555 _(b'show changesets within the given named branch'),
4554 _(b'show changesets within the given named branch'),
4556 _(b'BRANCH'),
4555 _(b'BRANCH'),
4557 ),
4556 ),
4558 (
4557 (
4559 b'P',
4558 b'P',
4560 b'prune',
4559 b'prune',
4561 [],
4560 [],
4562 _(b'do not display revision or any of its ancestors'),
4561 _(b'do not display revision or any of its ancestors'),
4563 _(b'REV'),
4562 _(b'REV'),
4564 ),
4563 ),
4565 ]
4564 ]
4566 + logopts
4565 + logopts
4567 + walkopts,
4566 + walkopts,
4568 _(b'[OPTION]... [FILE]'),
4567 _(b'[OPTION]... [FILE]'),
4569 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4568 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4570 helpbasic=True,
4569 helpbasic=True,
4571 inferrepo=True,
4570 inferrepo=True,
4572 intents={INTENT_READONLY},
4571 intents={INTENT_READONLY},
4573 )
4572 )
4574 def log(ui, repo, *pats, **opts):
4573 def log(ui, repo, *pats, **opts):
4575 """show revision history of entire repository or files
4574 """show revision history of entire repository or files
4576
4575
4577 Print the revision history of the specified files or the entire
4576 Print the revision history of the specified files or the entire
4578 project.
4577 project.
4579
4578
4580 If no revision range is specified, the default is ``tip:0`` unless
4579 If no revision range is specified, the default is ``tip:0`` unless
4581 --follow is set, in which case the working directory parent is
4580 --follow is set, in which case the working directory parent is
4582 used as the starting revision.
4581 used as the starting revision.
4583
4582
4584 File history is shown without following rename or copy history of
4583 File history is shown without following rename or copy history of
4585 files. Use -f/--follow with a filename to follow history across
4584 files. Use -f/--follow with a filename to follow history across
4586 renames and copies. --follow without a filename will only show
4585 renames and copies. --follow without a filename will only show
4587 ancestors of the starting revision.
4586 ancestors of the starting revision.
4588
4587
4589 By default this command prints revision number and changeset id,
4588 By default this command prints revision number and changeset id,
4590 tags, non-trivial parents, user, date and time, and a summary for
4589 tags, non-trivial parents, user, date and time, and a summary for
4591 each commit. When the -v/--verbose switch is used, the list of
4590 each commit. When the -v/--verbose switch is used, the list of
4592 changed files and full commit message are shown.
4591 changed files and full commit message are shown.
4593
4592
4594 With --graph the revisions are shown as an ASCII art DAG with the most
4593 With --graph the revisions are shown as an ASCII art DAG with the most
4595 recent changeset at the top.
4594 recent changeset at the top.
4596 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4595 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4597 involved in an unresolved merge conflict, '_' closes a branch,
4596 involved in an unresolved merge conflict, '_' closes a branch,
4598 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4597 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4599 changeset from the lines below is a parent of the 'o' merge on the same
4598 changeset from the lines below is a parent of the 'o' merge on the same
4600 line.
4599 line.
4601 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4600 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4602 of a '|' indicates one or more revisions in a path are omitted.
4601 of a '|' indicates one or more revisions in a path are omitted.
4603
4602
4604 .. container:: verbose
4603 .. container:: verbose
4605
4604
4606 Use -L/--line-range FILE,M:N options to follow the history of lines
4605 Use -L/--line-range FILE,M:N options to follow the history of lines
4607 from M to N in FILE. With -p/--patch only diff hunks affecting
4606 from M to N in FILE. With -p/--patch only diff hunks affecting
4608 specified line range will be shown. This option requires --follow;
4607 specified line range will be shown. This option requires --follow;
4609 it can be specified multiple times. Currently, this option is not
4608 it can be specified multiple times. Currently, this option is not
4610 compatible with --graph. This option is experimental.
4609 compatible with --graph. This option is experimental.
4611
4610
4612 .. note::
4611 .. note::
4613
4612
4614 :hg:`log --patch` may generate unexpected diff output for merge
4613 :hg:`log --patch` may generate unexpected diff output for merge
4615 changesets, as it will only compare the merge changeset against
4614 changesets, as it will only compare the merge changeset against
4616 its first parent. Also, only files different from BOTH parents
4615 its first parent. Also, only files different from BOTH parents
4617 will appear in files:.
4616 will appear in files:.
4618
4617
4619 .. note::
4618 .. note::
4620
4619
4621 For performance reasons, :hg:`log FILE` may omit duplicate changes
4620 For performance reasons, :hg:`log FILE` may omit duplicate changes
4622 made on branches and will not show removals or mode changes. To
4621 made on branches and will not show removals or mode changes. To
4623 see all such changes, use the --removed switch.
4622 see all such changes, use the --removed switch.
4624
4623
4625 .. container:: verbose
4624 .. container:: verbose
4626
4625
4627 .. note::
4626 .. note::
4628
4627
4629 The history resulting from -L/--line-range options depends on diff
4628 The history resulting from -L/--line-range options depends on diff
4630 options; for instance if white-spaces are ignored, respective changes
4629 options; for instance if white-spaces are ignored, respective changes
4631 with only white-spaces in specified line range will not be listed.
4630 with only white-spaces in specified line range will not be listed.
4632
4631
4633 .. container:: verbose
4632 .. container:: verbose
4634
4633
4635 Some examples:
4634 Some examples:
4636
4635
4637 - changesets with full descriptions and file lists::
4636 - changesets with full descriptions and file lists::
4638
4637
4639 hg log -v
4638 hg log -v
4640
4639
4641 - changesets ancestral to the working directory::
4640 - changesets ancestral to the working directory::
4642
4641
4643 hg log -f
4642 hg log -f
4644
4643
4645 - last 10 commits on the current branch::
4644 - last 10 commits on the current branch::
4646
4645
4647 hg log -l 10 -b .
4646 hg log -l 10 -b .
4648
4647
4649 - changesets showing all modifications of a file, including removals::
4648 - changesets showing all modifications of a file, including removals::
4650
4649
4651 hg log --removed file.c
4650 hg log --removed file.c
4652
4651
4653 - all changesets that touch a directory, with diffs, excluding merges::
4652 - all changesets that touch a directory, with diffs, excluding merges::
4654
4653
4655 hg log -Mp lib/
4654 hg log -Mp lib/
4656
4655
4657 - all revision numbers that match a keyword::
4656 - all revision numbers that match a keyword::
4658
4657
4659 hg log -k bug --template "{rev}\\n"
4658 hg log -k bug --template "{rev}\\n"
4660
4659
4661 - the full hash identifier of the working directory parent::
4660 - the full hash identifier of the working directory parent::
4662
4661
4663 hg log -r . --template "{node}\\n"
4662 hg log -r . --template "{node}\\n"
4664
4663
4665 - list available log templates::
4664 - list available log templates::
4666
4665
4667 hg log -T list
4666 hg log -T list
4668
4667
4669 - check if a given changeset is included in a tagged release::
4668 - check if a given changeset is included in a tagged release::
4670
4669
4671 hg log -r "a21ccf and ancestor(1.9)"
4670 hg log -r "a21ccf and ancestor(1.9)"
4672
4671
4673 - find all changesets by some user in a date range::
4672 - find all changesets by some user in a date range::
4674
4673
4675 hg log -k alice -d "may 2008 to jul 2008"
4674 hg log -k alice -d "may 2008 to jul 2008"
4676
4675
4677 - summary of all changesets after the last tag::
4676 - summary of all changesets after the last tag::
4678
4677
4679 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4678 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4680
4679
4681 - changesets touching lines 13 to 23 for file.c::
4680 - changesets touching lines 13 to 23 for file.c::
4682
4681
4683 hg log -L file.c,13:23
4682 hg log -L file.c,13:23
4684
4683
4685 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4684 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4686 main.c with patch::
4685 main.c with patch::
4687
4686
4688 hg log -L file.c,13:23 -L main.c,2:6 -p
4687 hg log -L file.c,13:23 -L main.c,2:6 -p
4689
4688
4690 See :hg:`help dates` for a list of formats valid for -d/--date.
4689 See :hg:`help dates` for a list of formats valid for -d/--date.
4691
4690
4692 See :hg:`help revisions` for more about specifying and ordering
4691 See :hg:`help revisions` for more about specifying and ordering
4693 revisions.
4692 revisions.
4694
4693
4695 See :hg:`help templates` for more about pre-packaged styles and
4694 See :hg:`help templates` for more about pre-packaged styles and
4696 specifying custom templates. The default template used by the log
4695 specifying custom templates. The default template used by the log
4697 command can be customized via the ``ui.logtemplate`` configuration
4696 command can be customized via the ``ui.logtemplate`` configuration
4698 setting.
4697 setting.
4699
4698
4700 Returns 0 on success.
4699 Returns 0 on success.
4701
4700
4702 """
4701 """
4703 opts = pycompat.byteskwargs(opts)
4702 opts = pycompat.byteskwargs(opts)
4704 linerange = opts.get(b'line_range')
4703 linerange = opts.get(b'line_range')
4705
4704
4706 if linerange and not opts.get(b'follow'):
4705 if linerange and not opts.get(b'follow'):
4707 raise error.Abort(_(b'--line-range requires --follow'))
4706 raise error.Abort(_(b'--line-range requires --follow'))
4708
4707
4709 if linerange and pats:
4708 if linerange and pats:
4710 # TODO: take pats as patterns with no line-range filter
4709 # TODO: take pats as patterns with no line-range filter
4711 raise error.Abort(
4710 raise error.Abort(
4712 _(b'FILE arguments are not compatible with --line-range option')
4711 _(b'FILE arguments are not compatible with --line-range option')
4713 )
4712 )
4714
4713
4715 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4714 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4716 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4715 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4717 if linerange:
4716 if linerange:
4718 # TODO: should follow file history from logcmdutil._initialrevs(),
4717 # TODO: should follow file history from logcmdutil._initialrevs(),
4719 # then filter the result by logcmdutil._makerevset() and --limit
4718 # then filter the result by logcmdutil._makerevset() and --limit
4720 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4719 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4721
4720
4722 getcopies = None
4721 getcopies = None
4723 if opts.get(b'copies'):
4722 if opts.get(b'copies'):
4724 endrev = None
4723 endrev = None
4725 if revs:
4724 if revs:
4726 endrev = revs.max() + 1
4725 endrev = revs.max() + 1
4727 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4726 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4728
4727
4729 ui.pager(b'log')
4728 ui.pager(b'log')
4730 displayer = logcmdutil.changesetdisplayer(
4729 displayer = logcmdutil.changesetdisplayer(
4731 ui, repo, opts, differ, buffered=True
4730 ui, repo, opts, differ, buffered=True
4732 )
4731 )
4733 if opts.get(b'graph'):
4732 if opts.get(b'graph'):
4734 displayfn = logcmdutil.displaygraphrevs
4733 displayfn = logcmdutil.displaygraphrevs
4735 else:
4734 else:
4736 displayfn = logcmdutil.displayrevs
4735 displayfn = logcmdutil.displayrevs
4737 displayfn(ui, repo, revs, displayer, getcopies)
4736 displayfn(ui, repo, revs, displayer, getcopies)
4738
4737
4739
4738
4740 @command(
4739 @command(
4741 b'manifest',
4740 b'manifest',
4742 [
4741 [
4743 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4742 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4744 (b'', b'all', False, _(b"list files from all revisions")),
4743 (b'', b'all', False, _(b"list files from all revisions")),
4745 ]
4744 ]
4746 + formatteropts,
4745 + formatteropts,
4747 _(b'[-r REV]'),
4746 _(b'[-r REV]'),
4748 helpcategory=command.CATEGORY_MAINTENANCE,
4747 helpcategory=command.CATEGORY_MAINTENANCE,
4749 intents={INTENT_READONLY},
4748 intents={INTENT_READONLY},
4750 )
4749 )
4751 def manifest(ui, repo, node=None, rev=None, **opts):
4750 def manifest(ui, repo, node=None, rev=None, **opts):
4752 """output the current or given revision of the project manifest
4751 """output the current or given revision of the project manifest
4753
4752
4754 Print a list of version controlled files for the given revision.
4753 Print a list of version controlled files for the given revision.
4755 If no revision is given, the first parent of the working directory
4754 If no revision is given, the first parent of the working directory
4756 is used, or the null revision if no revision is checked out.
4755 is used, or the null revision if no revision is checked out.
4757
4756
4758 With -v, print file permissions, symlink and executable bits.
4757 With -v, print file permissions, symlink and executable bits.
4759 With --debug, print file revision hashes.
4758 With --debug, print file revision hashes.
4760
4759
4761 If option --all is specified, the list of all files from all revisions
4760 If option --all is specified, the list of all files from all revisions
4762 is printed. This includes deleted and renamed files.
4761 is printed. This includes deleted and renamed files.
4763
4762
4764 Returns 0 on success.
4763 Returns 0 on success.
4765 """
4764 """
4766 opts = pycompat.byteskwargs(opts)
4765 opts = pycompat.byteskwargs(opts)
4767 fm = ui.formatter(b'manifest', opts)
4766 fm = ui.formatter(b'manifest', opts)
4768
4767
4769 if opts.get(b'all'):
4768 if opts.get(b'all'):
4770 if rev or node:
4769 if rev or node:
4771 raise error.Abort(_(b"can't specify a revision with --all"))
4770 raise error.Abort(_(b"can't specify a revision with --all"))
4772
4771
4773 res = set()
4772 res = set()
4774 for rev in repo:
4773 for rev in repo:
4775 ctx = repo[rev]
4774 ctx = repo[rev]
4776 res |= set(ctx.files())
4775 res |= set(ctx.files())
4777
4776
4778 ui.pager(b'manifest')
4777 ui.pager(b'manifest')
4779 for f in sorted(res):
4778 for f in sorted(res):
4780 fm.startitem()
4779 fm.startitem()
4781 fm.write(b"path", b'%s\n', f)
4780 fm.write(b"path", b'%s\n', f)
4782 fm.end()
4781 fm.end()
4783 return
4782 return
4784
4783
4785 if rev and node:
4784 if rev and node:
4786 raise error.Abort(_(b"please specify just one revision"))
4785 raise error.Abort(_(b"please specify just one revision"))
4787
4786
4788 if not node:
4787 if not node:
4789 node = rev
4788 node = rev
4790
4789
4791 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4790 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4792 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4791 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4793 if node:
4792 if node:
4794 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4793 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4795 ctx = scmutil.revsingle(repo, node)
4794 ctx = scmutil.revsingle(repo, node)
4796 mf = ctx.manifest()
4795 mf = ctx.manifest()
4797 ui.pager(b'manifest')
4796 ui.pager(b'manifest')
4798 for f in ctx:
4797 for f in ctx:
4799 fm.startitem()
4798 fm.startitem()
4800 fm.context(ctx=ctx)
4799 fm.context(ctx=ctx)
4801 fl = ctx[f].flags()
4800 fl = ctx[f].flags()
4802 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4801 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4803 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4802 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4804 fm.write(b'path', b'%s\n', f)
4803 fm.write(b'path', b'%s\n', f)
4805 fm.end()
4804 fm.end()
4806
4805
4807
4806
4808 @command(
4807 @command(
4809 b'merge',
4808 b'merge',
4810 [
4809 [
4811 (
4810 (
4812 b'f',
4811 b'f',
4813 b'force',
4812 b'force',
4814 None,
4813 None,
4815 _(b'force a merge including outstanding changes (DEPRECATED)'),
4814 _(b'force a merge including outstanding changes (DEPRECATED)'),
4816 ),
4815 ),
4817 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4816 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4818 (
4817 (
4819 b'P',
4818 b'P',
4820 b'preview',
4819 b'preview',
4821 None,
4820 None,
4822 _(b'review revisions to merge (no merge is performed)'),
4821 _(b'review revisions to merge (no merge is performed)'),
4823 ),
4822 ),
4824 (b'', b'abort', None, _(b'abort the ongoing merge')),
4823 (b'', b'abort', None, _(b'abort the ongoing merge')),
4825 ]
4824 ]
4826 + mergetoolopts,
4825 + mergetoolopts,
4827 _(b'[-P] [[-r] REV]'),
4826 _(b'[-P] [[-r] REV]'),
4828 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4827 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4829 helpbasic=True,
4828 helpbasic=True,
4830 )
4829 )
4831 def merge(ui, repo, node=None, **opts):
4830 def merge(ui, repo, node=None, **opts):
4832 """merge another revision into working directory
4831 """merge another revision into working directory
4833
4832
4834 The current working directory is updated with all changes made in
4833 The current working directory is updated with all changes made in
4835 the requested revision since the last common predecessor revision.
4834 the requested revision since the last common predecessor revision.
4836
4835
4837 Files that changed between either parent are marked as changed for
4836 Files that changed between either parent are marked as changed for
4838 the next commit and a commit must be performed before any further
4837 the next commit and a commit must be performed before any further
4839 updates to the repository are allowed. The next commit will have
4838 updates to the repository are allowed. The next commit will have
4840 two parents.
4839 two parents.
4841
4840
4842 ``--tool`` can be used to specify the merge tool used for file
4841 ``--tool`` can be used to specify the merge tool used for file
4843 merges. It overrides the HGMERGE environment variable and your
4842 merges. It overrides the HGMERGE environment variable and your
4844 configuration files. See :hg:`help merge-tools` for options.
4843 configuration files. See :hg:`help merge-tools` for options.
4845
4844
4846 If no revision is specified, the working directory's parent is a
4845 If no revision is specified, the working directory's parent is a
4847 head revision, and the current branch contains exactly one other
4846 head revision, and the current branch contains exactly one other
4848 head, the other head is merged with by default. Otherwise, an
4847 head, the other head is merged with by default. Otherwise, an
4849 explicit revision with which to merge must be provided.
4848 explicit revision with which to merge must be provided.
4850
4849
4851 See :hg:`help resolve` for information on handling file conflicts.
4850 See :hg:`help resolve` for information on handling file conflicts.
4852
4851
4853 To undo an uncommitted merge, use :hg:`merge --abort` which
4852 To undo an uncommitted merge, use :hg:`merge --abort` which
4854 will check out a clean copy of the original merge parent, losing
4853 will check out a clean copy of the original merge parent, losing
4855 all changes.
4854 all changes.
4856
4855
4857 Returns 0 on success, 1 if there are unresolved files.
4856 Returns 0 on success, 1 if there are unresolved files.
4858 """
4857 """
4859
4858
4860 opts = pycompat.byteskwargs(opts)
4859 opts = pycompat.byteskwargs(opts)
4861 abort = opts.get(b'abort')
4860 abort = opts.get(b'abort')
4862 if abort and repo.dirstate.p2() == nullid:
4861 if abort and repo.dirstate.p2() == nullid:
4863 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4862 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4864 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4863 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4865 if abort:
4864 if abort:
4866 state = cmdutil.getunfinishedstate(repo)
4865 state = cmdutil.getunfinishedstate(repo)
4867 if state and state._opname != b'merge':
4866 if state and state._opname != b'merge':
4868 raise error.Abort(
4867 raise error.Abort(
4869 _(b'cannot abort merge with %s in progress') % (state._opname),
4868 _(b'cannot abort merge with %s in progress') % (state._opname),
4870 hint=state.hint(),
4869 hint=state.hint(),
4871 )
4870 )
4872 if node:
4871 if node:
4873 raise error.Abort(_(b"cannot specify a node with --abort"))
4872 raise error.Abort(_(b"cannot specify a node with --abort"))
4874 return hg.abortmerge(repo.ui, repo)
4873 return hg.abortmerge(repo.ui, repo)
4875
4874
4876 if opts.get(b'rev') and node:
4875 if opts.get(b'rev') and node:
4877 raise error.Abort(_(b"please specify just one revision"))
4876 raise error.Abort(_(b"please specify just one revision"))
4878 if not node:
4877 if not node:
4879 node = opts.get(b'rev')
4878 node = opts.get(b'rev')
4880
4879
4881 if node:
4880 if node:
4882 ctx = scmutil.revsingle(repo, node)
4881 ctx = scmutil.revsingle(repo, node)
4883 else:
4882 else:
4884 if ui.configbool(b'commands', b'merge.require-rev'):
4883 if ui.configbool(b'commands', b'merge.require-rev'):
4885 raise error.Abort(
4884 raise error.Abort(
4886 _(
4885 _(
4887 b'configuration requires specifying revision to merge '
4886 b'configuration requires specifying revision to merge '
4888 b'with'
4887 b'with'
4889 )
4888 )
4890 )
4889 )
4891 ctx = repo[destutil.destmerge(repo)]
4890 ctx = repo[destutil.destmerge(repo)]
4892
4891
4893 if ctx.node() is None:
4892 if ctx.node() is None:
4894 raise error.Abort(_(b'merging with the working copy has no effect'))
4893 raise error.Abort(_(b'merging with the working copy has no effect'))
4895
4894
4896 if opts.get(b'preview'):
4895 if opts.get(b'preview'):
4897 # find nodes that are ancestors of p2 but not of p1
4896 # find nodes that are ancestors of p2 but not of p1
4898 p1 = repo[b'.'].node()
4897 p1 = repo[b'.'].node()
4899 p2 = ctx.node()
4898 p2 = ctx.node()
4900 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4899 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4901
4900
4902 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4901 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4903 for node in nodes:
4902 for node in nodes:
4904 displayer.show(repo[node])
4903 displayer.show(repo[node])
4905 displayer.close()
4904 displayer.close()
4906 return 0
4905 return 0
4907
4906
4908 # ui.forcemerge is an internal variable, do not document
4907 # ui.forcemerge is an internal variable, do not document
4909 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4908 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4910 with ui.configoverride(overrides, b'merge'):
4909 with ui.configoverride(overrides, b'merge'):
4911 force = opts.get(b'force')
4910 force = opts.get(b'force')
4912 labels = [b'working copy', b'merge rev']
4911 labels = [b'working copy', b'merge rev']
4913 return hg.merge(ctx, force=force, labels=labels)
4912 return hg.merge(ctx, force=force, labels=labels)
4914
4913
4915
4914
4916 statemod.addunfinished(
4915 statemod.addunfinished(
4917 b'merge',
4916 b'merge',
4918 fname=None,
4917 fname=None,
4919 clearable=True,
4918 clearable=True,
4920 allowcommit=True,
4919 allowcommit=True,
4921 cmdmsg=_(b'outstanding uncommitted merge'),
4920 cmdmsg=_(b'outstanding uncommitted merge'),
4922 abortfunc=hg.abortmerge,
4921 abortfunc=hg.abortmerge,
4923 statushint=_(
4922 statushint=_(
4924 b'To continue: hg commit\nTo abort: hg merge --abort'
4923 b'To continue: hg commit\nTo abort: hg merge --abort'
4925 ),
4924 ),
4926 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4925 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4927 )
4926 )
4928
4927
4929
4928
4930 @command(
4929 @command(
4931 b'outgoing|out',
4930 b'outgoing|out',
4932 [
4931 [
4933 (
4932 (
4934 b'f',
4933 b'f',
4935 b'force',
4934 b'force',
4936 None,
4935 None,
4937 _(b'run even when the destination is unrelated'),
4936 _(b'run even when the destination is unrelated'),
4938 ),
4937 ),
4939 (
4938 (
4940 b'r',
4939 b'r',
4941 b'rev',
4940 b'rev',
4942 [],
4941 [],
4943 _(b'a changeset intended to be included in the destination'),
4942 _(b'a changeset intended to be included in the destination'),
4944 _(b'REV'),
4943 _(b'REV'),
4945 ),
4944 ),
4946 (b'n', b'newest-first', None, _(b'show newest record first')),
4945 (b'n', b'newest-first', None, _(b'show newest record first')),
4947 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4946 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4948 (
4947 (
4949 b'b',
4948 b'b',
4950 b'branch',
4949 b'branch',
4951 [],
4950 [],
4952 _(b'a specific branch you would like to push'),
4951 _(b'a specific branch you would like to push'),
4953 _(b'BRANCH'),
4952 _(b'BRANCH'),
4954 ),
4953 ),
4955 ]
4954 ]
4956 + logopts
4955 + logopts
4957 + remoteopts
4956 + remoteopts
4958 + subrepoopts,
4957 + subrepoopts,
4959 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4958 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4960 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4959 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4961 )
4960 )
4962 def outgoing(ui, repo, dest=None, **opts):
4961 def outgoing(ui, repo, dest=None, **opts):
4963 """show changesets not found in the destination
4962 """show changesets not found in the destination
4964
4963
4965 Show changesets not found in the specified destination repository
4964 Show changesets not found in the specified destination repository
4966 or the default push location. These are the changesets that would
4965 or the default push location. These are the changesets that would
4967 be pushed if a push was requested.
4966 be pushed if a push was requested.
4968
4967
4969 See pull for details of valid destination formats.
4968 See pull for details of valid destination formats.
4970
4969
4971 .. container:: verbose
4970 .. container:: verbose
4972
4971
4973 With -B/--bookmarks, the result of bookmark comparison between
4972 With -B/--bookmarks, the result of bookmark comparison between
4974 local and remote repositories is displayed. With -v/--verbose,
4973 local and remote repositories is displayed. With -v/--verbose,
4975 status is also displayed for each bookmark like below::
4974 status is also displayed for each bookmark like below::
4976
4975
4977 BM1 01234567890a added
4976 BM1 01234567890a added
4978 BM2 deleted
4977 BM2 deleted
4979 BM3 234567890abc advanced
4978 BM3 234567890abc advanced
4980 BM4 34567890abcd diverged
4979 BM4 34567890abcd diverged
4981 BM5 4567890abcde changed
4980 BM5 4567890abcde changed
4982
4981
4983 The action taken when pushing depends on the
4982 The action taken when pushing depends on the
4984 status of each bookmark:
4983 status of each bookmark:
4985
4984
4986 :``added``: push with ``-B`` will create it
4985 :``added``: push with ``-B`` will create it
4987 :``deleted``: push with ``-B`` will delete it
4986 :``deleted``: push with ``-B`` will delete it
4988 :``advanced``: push will update it
4987 :``advanced``: push will update it
4989 :``diverged``: push with ``-B`` will update it
4988 :``diverged``: push with ``-B`` will update it
4990 :``changed``: push with ``-B`` will update it
4989 :``changed``: push with ``-B`` will update it
4991
4990
4992 From the point of view of pushing behavior, bookmarks
4991 From the point of view of pushing behavior, bookmarks
4993 existing only in the remote repository are treated as
4992 existing only in the remote repository are treated as
4994 ``deleted``, even if it is in fact added remotely.
4993 ``deleted``, even if it is in fact added remotely.
4995
4994
4996 Returns 0 if there are outgoing changes, 1 otherwise.
4995 Returns 0 if there are outgoing changes, 1 otherwise.
4997 """
4996 """
4998 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4997 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4999 # style URLs, so don't overwrite dest.
4998 # style URLs, so don't overwrite dest.
5000 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
4999 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5001 if not path:
5000 if not path:
5002 raise error.Abort(
5001 raise error.Abort(
5003 _(b'default repository not configured!'),
5002 _(b'default repository not configured!'),
5004 hint=_(b"see 'hg help config.paths'"),
5003 hint=_(b"see 'hg help config.paths'"),
5005 )
5004 )
5006
5005
5007 opts = pycompat.byteskwargs(opts)
5006 opts = pycompat.byteskwargs(opts)
5008 if opts.get(b'graph'):
5007 if opts.get(b'graph'):
5009 logcmdutil.checkunsupportedgraphflags([], opts)
5008 logcmdutil.checkunsupportedgraphflags([], opts)
5010 o, other = hg._outgoing(ui, repo, dest, opts)
5009 o, other = hg._outgoing(ui, repo, dest, opts)
5011 if not o:
5010 if not o:
5012 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5011 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5013 return
5012 return
5014
5013
5015 revdag = logcmdutil.graphrevs(repo, o, opts)
5014 revdag = logcmdutil.graphrevs(repo, o, opts)
5016 ui.pager(b'outgoing')
5015 ui.pager(b'outgoing')
5017 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5016 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5018 logcmdutil.displaygraph(
5017 logcmdutil.displaygraph(
5019 ui, repo, revdag, displayer, graphmod.asciiedges
5018 ui, repo, revdag, displayer, graphmod.asciiedges
5020 )
5019 )
5021 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5020 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5022 return 0
5021 return 0
5023
5022
5024 if opts.get(b'bookmarks'):
5023 if opts.get(b'bookmarks'):
5025 dest = path.pushloc or path.loc
5024 dest = path.pushloc or path.loc
5026 other = hg.peer(repo, opts, dest)
5025 other = hg.peer(repo, opts, dest)
5027 if b'bookmarks' not in other.listkeys(b'namespaces'):
5026 if b'bookmarks' not in other.listkeys(b'namespaces'):
5028 ui.warn(_(b"remote doesn't support bookmarks\n"))
5027 ui.warn(_(b"remote doesn't support bookmarks\n"))
5029 return 0
5028 return 0
5030 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5029 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5031 ui.pager(b'outgoing')
5030 ui.pager(b'outgoing')
5032 return bookmarks.outgoing(ui, repo, other)
5031 return bookmarks.outgoing(ui, repo, other)
5033
5032
5034 repo._subtoppath = path.pushloc or path.loc
5033 repo._subtoppath = path.pushloc or path.loc
5035 try:
5034 try:
5036 return hg.outgoing(ui, repo, dest, opts)
5035 return hg.outgoing(ui, repo, dest, opts)
5037 finally:
5036 finally:
5038 del repo._subtoppath
5037 del repo._subtoppath
5039
5038
5040
5039
5041 @command(
5040 @command(
5042 b'parents',
5041 b'parents',
5043 [
5042 [
5044 (
5043 (
5045 b'r',
5044 b'r',
5046 b'rev',
5045 b'rev',
5047 b'',
5046 b'',
5048 _(b'show parents of the specified revision'),
5047 _(b'show parents of the specified revision'),
5049 _(b'REV'),
5048 _(b'REV'),
5050 ),
5049 ),
5051 ]
5050 ]
5052 + templateopts,
5051 + templateopts,
5053 _(b'[-r REV] [FILE]'),
5052 _(b'[-r REV] [FILE]'),
5054 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5053 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5055 inferrepo=True,
5054 inferrepo=True,
5056 )
5055 )
5057 def parents(ui, repo, file_=None, **opts):
5056 def parents(ui, repo, file_=None, **opts):
5058 """show the parents of the working directory or revision (DEPRECATED)
5057 """show the parents of the working directory or revision (DEPRECATED)
5059
5058
5060 Print the working directory's parent revisions. If a revision is
5059 Print the working directory's parent revisions. If a revision is
5061 given via -r/--rev, the parent of that revision will be printed.
5060 given via -r/--rev, the parent of that revision will be printed.
5062 If a file argument is given, the revision in which the file was
5061 If a file argument is given, the revision in which the file was
5063 last changed (before the working directory revision or the
5062 last changed (before the working directory revision or the
5064 argument to --rev if given) is printed.
5063 argument to --rev if given) is printed.
5065
5064
5066 This command is equivalent to::
5065 This command is equivalent to::
5067
5066
5068 hg log -r "p1()+p2()" or
5067 hg log -r "p1()+p2()" or
5069 hg log -r "p1(REV)+p2(REV)" or
5068 hg log -r "p1(REV)+p2(REV)" or
5070 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5069 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5071 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5070 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5072
5071
5073 See :hg:`summary` and :hg:`help revsets` for related information.
5072 See :hg:`summary` and :hg:`help revsets` for related information.
5074
5073
5075 Returns 0 on success.
5074 Returns 0 on success.
5076 """
5075 """
5077
5076
5078 opts = pycompat.byteskwargs(opts)
5077 opts = pycompat.byteskwargs(opts)
5079 rev = opts.get(b'rev')
5078 rev = opts.get(b'rev')
5080 if rev:
5079 if rev:
5081 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5080 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5082 ctx = scmutil.revsingle(repo, rev, None)
5081 ctx = scmutil.revsingle(repo, rev, None)
5083
5082
5084 if file_:
5083 if file_:
5085 m = scmutil.match(ctx, (file_,), opts)
5084 m = scmutil.match(ctx, (file_,), opts)
5086 if m.anypats() or len(m.files()) != 1:
5085 if m.anypats() or len(m.files()) != 1:
5087 raise error.Abort(_(b'can only specify an explicit filename'))
5086 raise error.Abort(_(b'can only specify an explicit filename'))
5088 file_ = m.files()[0]
5087 file_ = m.files()[0]
5089 filenodes = []
5088 filenodes = []
5090 for cp in ctx.parents():
5089 for cp in ctx.parents():
5091 if not cp:
5090 if not cp:
5092 continue
5091 continue
5093 try:
5092 try:
5094 filenodes.append(cp.filenode(file_))
5093 filenodes.append(cp.filenode(file_))
5095 except error.LookupError:
5094 except error.LookupError:
5096 pass
5095 pass
5097 if not filenodes:
5096 if not filenodes:
5098 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5097 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5099 p = []
5098 p = []
5100 for fn in filenodes:
5099 for fn in filenodes:
5101 fctx = repo.filectx(file_, fileid=fn)
5100 fctx = repo.filectx(file_, fileid=fn)
5102 p.append(fctx.node())
5101 p.append(fctx.node())
5103 else:
5102 else:
5104 p = [cp.node() for cp in ctx.parents()]
5103 p = [cp.node() for cp in ctx.parents()]
5105
5104
5106 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5105 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5107 for n in p:
5106 for n in p:
5108 if n != nullid:
5107 if n != nullid:
5109 displayer.show(repo[n])
5108 displayer.show(repo[n])
5110 displayer.close()
5109 displayer.close()
5111
5110
5112
5111
5113 @command(
5112 @command(
5114 b'paths',
5113 b'paths',
5115 formatteropts,
5114 formatteropts,
5116 _(b'[NAME]'),
5115 _(b'[NAME]'),
5117 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5116 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5118 optionalrepo=True,
5117 optionalrepo=True,
5119 intents={INTENT_READONLY},
5118 intents={INTENT_READONLY},
5120 )
5119 )
5121 def paths(ui, repo, search=None, **opts):
5120 def paths(ui, repo, search=None, **opts):
5122 """show aliases for remote repositories
5121 """show aliases for remote repositories
5123
5122
5124 Show definition of symbolic path name NAME. If no name is given,
5123 Show definition of symbolic path name NAME. If no name is given,
5125 show definition of all available names.
5124 show definition of all available names.
5126
5125
5127 Option -q/--quiet suppresses all output when searching for NAME
5126 Option -q/--quiet suppresses all output when searching for NAME
5128 and shows only the path names when listing all definitions.
5127 and shows only the path names when listing all definitions.
5129
5128
5130 Path names are defined in the [paths] section of your
5129 Path names are defined in the [paths] section of your
5131 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5130 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5132 repository, ``.hg/hgrc`` is used, too.
5131 repository, ``.hg/hgrc`` is used, too.
5133
5132
5134 The path names ``default`` and ``default-push`` have a special
5133 The path names ``default`` and ``default-push`` have a special
5135 meaning. When performing a push or pull operation, they are used
5134 meaning. When performing a push or pull operation, they are used
5136 as fallbacks if no location is specified on the command-line.
5135 as fallbacks if no location is specified on the command-line.
5137 When ``default-push`` is set, it will be used for push and
5136 When ``default-push`` is set, it will be used for push and
5138 ``default`` will be used for pull; otherwise ``default`` is used
5137 ``default`` will be used for pull; otherwise ``default`` is used
5139 as the fallback for both. When cloning a repository, the clone
5138 as the fallback for both. When cloning a repository, the clone
5140 source is written as ``default`` in ``.hg/hgrc``.
5139 source is written as ``default`` in ``.hg/hgrc``.
5141
5140
5142 .. note::
5141 .. note::
5143
5142
5144 ``default`` and ``default-push`` apply to all inbound (e.g.
5143 ``default`` and ``default-push`` apply to all inbound (e.g.
5145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5144 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5146 and :hg:`bundle`) operations.
5145 and :hg:`bundle`) operations.
5147
5146
5148 See :hg:`help urls` for more information.
5147 See :hg:`help urls` for more information.
5149
5148
5150 .. container:: verbose
5149 .. container:: verbose
5151
5150
5152 Template:
5151 Template:
5153
5152
5154 The following keywords are supported. See also :hg:`help templates`.
5153 The following keywords are supported. See also :hg:`help templates`.
5155
5154
5156 :name: String. Symbolic name of the path alias.
5155 :name: String. Symbolic name of the path alias.
5157 :pushurl: String. URL for push operations.
5156 :pushurl: String. URL for push operations.
5158 :url: String. URL or directory path for the other operations.
5157 :url: String. URL or directory path for the other operations.
5159
5158
5160 Returns 0 on success.
5159 Returns 0 on success.
5161 """
5160 """
5162
5161
5163 opts = pycompat.byteskwargs(opts)
5162 opts = pycompat.byteskwargs(opts)
5164 ui.pager(b'paths')
5163 ui.pager(b'paths')
5165 if search:
5164 if search:
5166 pathitems = [
5165 pathitems = [
5167 (name, path)
5166 (name, path)
5168 for name, path in pycompat.iteritems(ui.paths)
5167 for name, path in pycompat.iteritems(ui.paths)
5169 if name == search
5168 if name == search
5170 ]
5169 ]
5171 else:
5170 else:
5172 pathitems = sorted(pycompat.iteritems(ui.paths))
5171 pathitems = sorted(pycompat.iteritems(ui.paths))
5173
5172
5174 fm = ui.formatter(b'paths', opts)
5173 fm = ui.formatter(b'paths', opts)
5175 if fm.isplain():
5174 if fm.isplain():
5176 hidepassword = util.hidepassword
5175 hidepassword = util.hidepassword
5177 else:
5176 else:
5178 hidepassword = bytes
5177 hidepassword = bytes
5179 if ui.quiet:
5178 if ui.quiet:
5180 namefmt = b'%s\n'
5179 namefmt = b'%s\n'
5181 else:
5180 else:
5182 namefmt = b'%s = '
5181 namefmt = b'%s = '
5183 showsubopts = not search and not ui.quiet
5182 showsubopts = not search and not ui.quiet
5184
5183
5185 for name, path in pathitems:
5184 for name, path in pathitems:
5186 fm.startitem()
5185 fm.startitem()
5187 fm.condwrite(not search, b'name', namefmt, name)
5186 fm.condwrite(not search, b'name', namefmt, name)
5188 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5187 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5189 for subopt, value in sorted(path.suboptions.items()):
5188 for subopt, value in sorted(path.suboptions.items()):
5190 assert subopt not in (b'name', b'url')
5189 assert subopt not in (b'name', b'url')
5191 if showsubopts:
5190 if showsubopts:
5192 fm.plain(b'%s:%s = ' % (name, subopt))
5191 fm.plain(b'%s:%s = ' % (name, subopt))
5193 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5192 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5194
5193
5195 fm.end()
5194 fm.end()
5196
5195
5197 if search and not pathitems:
5196 if search and not pathitems:
5198 if not ui.quiet:
5197 if not ui.quiet:
5199 ui.warn(_(b"not found!\n"))
5198 ui.warn(_(b"not found!\n"))
5200 return 1
5199 return 1
5201 else:
5200 else:
5202 return 0
5201 return 0
5203
5202
5204
5203
5205 @command(
5204 @command(
5206 b'phase',
5205 b'phase',
5207 [
5206 [
5208 (b'p', b'public', False, _(b'set changeset phase to public')),
5207 (b'p', b'public', False, _(b'set changeset phase to public')),
5209 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5208 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5210 (b's', b'secret', False, _(b'set changeset phase to secret')),
5209 (b's', b'secret', False, _(b'set changeset phase to secret')),
5211 (b'f', b'force', False, _(b'allow to move boundary backward')),
5210 (b'f', b'force', False, _(b'allow to move boundary backward')),
5212 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5211 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5213 ],
5212 ],
5214 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5213 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5215 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5214 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5216 )
5215 )
5217 def phase(ui, repo, *revs, **opts):
5216 def phase(ui, repo, *revs, **opts):
5218 """set or show the current phase name
5217 """set or show the current phase name
5219
5218
5220 With no argument, show the phase name of the current revision(s).
5219 With no argument, show the phase name of the current revision(s).
5221
5220
5222 With one of -p/--public, -d/--draft or -s/--secret, change the
5221 With one of -p/--public, -d/--draft or -s/--secret, change the
5223 phase value of the specified revisions.
5222 phase value of the specified revisions.
5224
5223
5225 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5224 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5226 lower phase to a higher phase. Phases are ordered as follows::
5225 lower phase to a higher phase. Phases are ordered as follows::
5227
5226
5228 public < draft < secret
5227 public < draft < secret
5229
5228
5230 Returns 0 on success, 1 if some phases could not be changed.
5229 Returns 0 on success, 1 if some phases could not be changed.
5231
5230
5232 (For more information about the phases concept, see :hg:`help phases`.)
5231 (For more information about the phases concept, see :hg:`help phases`.)
5233 """
5232 """
5234 opts = pycompat.byteskwargs(opts)
5233 opts = pycompat.byteskwargs(opts)
5235 # search for a unique phase argument
5234 # search for a unique phase argument
5236 targetphase = None
5235 targetphase = None
5237 for idx, name in enumerate(phases.cmdphasenames):
5236 for idx, name in enumerate(phases.cmdphasenames):
5238 if opts[name]:
5237 if opts[name]:
5239 if targetphase is not None:
5238 if targetphase is not None:
5240 raise error.Abort(_(b'only one phase can be specified'))
5239 raise error.Abort(_(b'only one phase can be specified'))
5241 targetphase = idx
5240 targetphase = idx
5242
5241
5243 # look for specified revision
5242 # look for specified revision
5244 revs = list(revs)
5243 revs = list(revs)
5245 revs.extend(opts[b'rev'])
5244 revs.extend(opts[b'rev'])
5246 if not revs:
5245 if not revs:
5247 # display both parents as the second parent phase can influence
5246 # display both parents as the second parent phase can influence
5248 # the phase of a merge commit
5247 # the phase of a merge commit
5249 revs = [c.rev() for c in repo[None].parents()]
5248 revs = [c.rev() for c in repo[None].parents()]
5250
5249
5251 revs = scmutil.revrange(repo, revs)
5250 revs = scmutil.revrange(repo, revs)
5252
5251
5253 ret = 0
5252 ret = 0
5254 if targetphase is None:
5253 if targetphase is None:
5255 # display
5254 # display
5256 for r in revs:
5255 for r in revs:
5257 ctx = repo[r]
5256 ctx = repo[r]
5258 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5257 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5259 else:
5258 else:
5260 with repo.lock(), repo.transaction(b"phase") as tr:
5259 with repo.lock(), repo.transaction(b"phase") as tr:
5261 # set phase
5260 # set phase
5262 if not revs:
5261 if not revs:
5263 raise error.Abort(_(b'empty revision set'))
5262 raise error.Abort(_(b'empty revision set'))
5264 nodes = [repo[r].node() for r in revs]
5263 nodes = [repo[r].node() for r in revs]
5265 # moving revision from public to draft may hide them
5264 # moving revision from public to draft may hide them
5266 # We have to check result on an unfiltered repository
5265 # We have to check result on an unfiltered repository
5267 unfi = repo.unfiltered()
5266 unfi = repo.unfiltered()
5268 getphase = unfi._phasecache.phase
5267 getphase = unfi._phasecache.phase
5269 olddata = [getphase(unfi, r) for r in unfi]
5268 olddata = [getphase(unfi, r) for r in unfi]
5270 phases.advanceboundary(repo, tr, targetphase, nodes)
5269 phases.advanceboundary(repo, tr, targetphase, nodes)
5271 if opts[b'force']:
5270 if opts[b'force']:
5272 phases.retractboundary(repo, tr, targetphase, nodes)
5271 phases.retractboundary(repo, tr, targetphase, nodes)
5273 getphase = unfi._phasecache.phase
5272 getphase = unfi._phasecache.phase
5274 newdata = [getphase(unfi, r) for r in unfi]
5273 newdata = [getphase(unfi, r) for r in unfi]
5275 changes = sum(newdata[r] != olddata[r] for r in unfi)
5274 changes = sum(newdata[r] != olddata[r] for r in unfi)
5276 cl = unfi.changelog
5275 cl = unfi.changelog
5277 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5276 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5278 if rejected:
5277 if rejected:
5279 ui.warn(
5278 ui.warn(
5280 _(
5279 _(
5281 b'cannot move %i changesets to a higher '
5280 b'cannot move %i changesets to a higher '
5282 b'phase, use --force\n'
5281 b'phase, use --force\n'
5283 )
5282 )
5284 % len(rejected)
5283 % len(rejected)
5285 )
5284 )
5286 ret = 1
5285 ret = 1
5287 if changes:
5286 if changes:
5288 msg = _(b'phase changed for %i changesets\n') % changes
5287 msg = _(b'phase changed for %i changesets\n') % changes
5289 if ret:
5288 if ret:
5290 ui.status(msg)
5289 ui.status(msg)
5291 else:
5290 else:
5292 ui.note(msg)
5291 ui.note(msg)
5293 else:
5292 else:
5294 ui.warn(_(b'no phases changed\n'))
5293 ui.warn(_(b'no phases changed\n'))
5295 return ret
5294 return ret
5296
5295
5297
5296
5298 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5297 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5299 """Run after a changegroup has been added via pull/unbundle
5298 """Run after a changegroup has been added via pull/unbundle
5300
5299
5301 This takes arguments below:
5300 This takes arguments below:
5302
5301
5303 :modheads: change of heads by pull/unbundle
5302 :modheads: change of heads by pull/unbundle
5304 :optupdate: updating working directory is needed or not
5303 :optupdate: updating working directory is needed or not
5305 :checkout: update destination revision (or None to default destination)
5304 :checkout: update destination revision (or None to default destination)
5306 :brev: a name, which might be a bookmark to be activated after updating
5305 :brev: a name, which might be a bookmark to be activated after updating
5307 """
5306 """
5308 if modheads == 0:
5307 if modheads == 0:
5309 return
5308 return
5310 if optupdate:
5309 if optupdate:
5311 try:
5310 try:
5312 return hg.updatetotally(ui, repo, checkout, brev)
5311 return hg.updatetotally(ui, repo, checkout, brev)
5313 except error.UpdateAbort as inst:
5312 except error.UpdateAbort as inst:
5314 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5313 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5315 hint = inst.hint
5314 hint = inst.hint
5316 raise error.UpdateAbort(msg, hint=hint)
5315 raise error.UpdateAbort(msg, hint=hint)
5317 if modheads is not None and modheads > 1:
5316 if modheads is not None and modheads > 1:
5318 currentbranchheads = len(repo.branchheads())
5317 currentbranchheads = len(repo.branchheads())
5319 if currentbranchheads == modheads:
5318 if currentbranchheads == modheads:
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 elif currentbranchheads > 1:
5322 elif currentbranchheads > 1:
5324 ui.status(
5323 ui.status(
5325 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5324 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5326 )
5325 )
5327 else:
5326 else:
5328 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5327 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5329 elif not ui.configbool(b'commands', b'update.requiredest'):
5328 elif not ui.configbool(b'commands', b'update.requiredest'):
5330 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5329 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5331
5330
5332
5331
5333 @command(
5332 @command(
5334 b'pull',
5333 b'pull',
5335 [
5334 [
5336 (
5335 (
5337 b'u',
5336 b'u',
5338 b'update',
5337 b'update',
5339 None,
5338 None,
5340 _(b'update to new branch head if new descendants were pulled'),
5339 _(b'update to new branch head if new descendants were pulled'),
5341 ),
5340 ),
5342 (
5341 (
5343 b'f',
5342 b'f',
5344 b'force',
5343 b'force',
5345 None,
5344 None,
5346 _(b'run even when remote repository is unrelated'),
5345 _(b'run even when remote repository is unrelated'),
5347 ),
5346 ),
5348 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5347 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5349 (
5348 (
5350 b'r',
5349 b'r',
5351 b'rev',
5350 b'rev',
5352 [],
5351 [],
5353 _(b'a remote changeset intended to be added'),
5352 _(b'a remote changeset intended to be added'),
5354 _(b'REV'),
5353 _(b'REV'),
5355 ),
5354 ),
5356 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5355 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5357 (
5356 (
5358 b'b',
5357 b'b',
5359 b'branch',
5358 b'branch',
5360 [],
5359 [],
5361 _(b'a specific branch you would like to pull'),
5360 _(b'a specific branch you would like to pull'),
5362 _(b'BRANCH'),
5361 _(b'BRANCH'),
5363 ),
5362 ),
5364 ]
5363 ]
5365 + remoteopts,
5364 + remoteopts,
5366 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5365 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5367 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5366 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5368 helpbasic=True,
5367 helpbasic=True,
5369 )
5368 )
5370 def pull(ui, repo, source=b"default", **opts):
5369 def pull(ui, repo, source=b"default", **opts):
5371 """pull changes from the specified source
5370 """pull changes from the specified source
5372
5371
5373 Pull changes from a remote repository to a local one.
5372 Pull changes from a remote repository to a local one.
5374
5373
5375 This finds all changes from the repository at the specified path
5374 This finds all changes from the repository at the specified path
5376 or URL and adds them to a local repository (the current one unless
5375 or URL and adds them to a local repository (the current one unless
5377 -R is specified). By default, this does not update the copy of the
5376 -R is specified). By default, this does not update the copy of the
5378 project in the working directory.
5377 project in the working directory.
5379
5378
5380 When cloning from servers that support it, Mercurial may fetch
5379 When cloning from servers that support it, Mercurial may fetch
5381 pre-generated data. When this is done, hooks operating on incoming
5380 pre-generated data. When this is done, hooks operating on incoming
5382 changesets and changegroups may fire more than once, once for each
5381 changesets and changegroups may fire more than once, once for each
5383 pre-generated bundle and as well as for any additional remaining
5382 pre-generated bundle and as well as for any additional remaining
5384 data. See :hg:`help -e clonebundles` for more.
5383 data. See :hg:`help -e clonebundles` for more.
5385
5384
5386 Use :hg:`incoming` if you want to see what would have been added
5385 Use :hg:`incoming` if you want to see what would have been added
5387 by a pull at the time you issued this command. If you then decide
5386 by a pull at the time you issued this command. If you then decide
5388 to add those changes to the repository, you should use :hg:`pull
5387 to add those changes to the repository, you should use :hg:`pull
5389 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5388 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5390
5389
5391 If SOURCE is omitted, the 'default' path will be used.
5390 If SOURCE is omitted, the 'default' path will be used.
5392 See :hg:`help urls` for more information.
5391 See :hg:`help urls` for more information.
5393
5392
5394 Specifying bookmark as ``.`` is equivalent to specifying the active
5393 Specifying bookmark as ``.`` is equivalent to specifying the active
5395 bookmark's name.
5394 bookmark's name.
5396
5395
5397 Returns 0 on success, 1 if an update had unresolved files.
5396 Returns 0 on success, 1 if an update had unresolved files.
5398 """
5397 """
5399
5398
5400 opts = pycompat.byteskwargs(opts)
5399 opts = pycompat.byteskwargs(opts)
5401 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5400 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5402 b'update'
5401 b'update'
5403 ):
5402 ):
5404 msg = _(b'update destination required by configuration')
5403 msg = _(b'update destination required by configuration')
5405 hint = _(b'use hg pull followed by hg update DEST')
5404 hint = _(b'use hg pull followed by hg update DEST')
5406 raise error.Abort(msg, hint=hint)
5405 raise error.Abort(msg, hint=hint)
5407
5406
5408 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5407 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5409 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5408 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5410 other = hg.peer(repo, opts, source)
5409 other = hg.peer(repo, opts, source)
5411 try:
5410 try:
5412 revs, checkout = hg.addbranchrevs(
5411 revs, checkout = hg.addbranchrevs(
5413 repo, other, branches, opts.get(b'rev')
5412 repo, other, branches, opts.get(b'rev')
5414 )
5413 )
5415
5414
5416 pullopargs = {}
5415 pullopargs = {}
5417
5416
5418 nodes = None
5417 nodes = None
5419 if opts.get(b'bookmark') or revs:
5418 if opts.get(b'bookmark') or revs:
5420 # The list of bookmark used here is the same used to actually update
5419 # The list of bookmark used here is the same used to actually update
5421 # the bookmark names, to avoid the race from issue 4689 and we do
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5422 # all lookup and bookmark queries in one go so they see the same
5421 # all lookup and bookmark queries in one go so they see the same
5423 # version of the server state (issue 4700).
5422 # version of the server state (issue 4700).
5424 nodes = []
5423 nodes = []
5425 fnodes = []
5424 fnodes = []
5426 revs = revs or []
5425 revs = revs or []
5427 if revs and not other.capable(b'lookup'):
5426 if revs and not other.capable(b'lookup'):
5428 err = _(
5427 err = _(
5429 b"other repository doesn't support revision lookup, "
5428 b"other repository doesn't support revision lookup, "
5430 b"so a rev cannot be specified."
5429 b"so a rev cannot be specified."
5431 )
5430 )
5432 raise error.Abort(err)
5431 raise error.Abort(err)
5433 with other.commandexecutor() as e:
5432 with other.commandexecutor() as e:
5434 fremotebookmarks = e.callcommand(
5433 fremotebookmarks = e.callcommand(
5435 b'listkeys', {b'namespace': b'bookmarks'}
5434 b'listkeys', {b'namespace': b'bookmarks'}
5436 )
5435 )
5437 for r in revs:
5436 for r in revs:
5438 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5439 remotebookmarks = fremotebookmarks.result()
5438 remotebookmarks = fremotebookmarks.result()
5440 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5441 pullopargs[b'remotebookmarks'] = remotebookmarks
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5442 for b in opts.get(b'bookmark', []):
5441 for b in opts.get(b'bookmark', []):
5443 b = repo._bookmarks.expandname(b)
5442 b = repo._bookmarks.expandname(b)
5444 if b not in remotebookmarks:
5443 if b not in remotebookmarks:
5445 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5444 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5446 nodes.append(remotebookmarks[b])
5445 nodes.append(remotebookmarks[b])
5447 for i, rev in enumerate(revs):
5446 for i, rev in enumerate(revs):
5448 node = fnodes[i].result()
5447 node = fnodes[i].result()
5449 nodes.append(node)
5448 nodes.append(node)
5450 if rev == checkout:
5449 if rev == checkout:
5451 checkout = node
5450 checkout = node
5452
5451
5453 wlock = util.nullcontextmanager()
5452 wlock = util.nullcontextmanager()
5454 if opts.get(b'update'):
5453 if opts.get(b'update'):
5455 wlock = repo.wlock()
5454 wlock = repo.wlock()
5456 with wlock:
5455 with wlock:
5457 pullopargs.update(opts.get(b'opargs', {}))
5456 pullopargs.update(opts.get(b'opargs', {}))
5458 modheads = exchange.pull(
5457 modheads = exchange.pull(
5459 repo,
5458 repo,
5460 other,
5459 other,
5461 heads=nodes,
5460 heads=nodes,
5462 force=opts.get(b'force'),
5461 force=opts.get(b'force'),
5463 bookmarks=opts.get(b'bookmark', ()),
5462 bookmarks=opts.get(b'bookmark', ()),
5464 opargs=pullopargs,
5463 opargs=pullopargs,
5465 confirm=opts.get(b'confirm'),
5464 confirm=opts.get(b'confirm'),
5466 ).cgresult
5465 ).cgresult
5467
5466
5468 # brev is a name, which might be a bookmark to be activated at
5467 # brev is a name, which might be a bookmark to be activated at
5469 # the end of the update. In other words, it is an explicit
5468 # the end of the update. In other words, it is an explicit
5470 # destination of the update
5469 # destination of the update
5471 brev = None
5470 brev = None
5472
5471
5473 if checkout:
5472 if checkout:
5474 checkout = repo.unfiltered().changelog.rev(checkout)
5473 checkout = repo.unfiltered().changelog.rev(checkout)
5475
5474
5476 # order below depends on implementation of
5475 # order below depends on implementation of
5477 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5476 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5478 # because 'checkout' is determined without it.
5477 # because 'checkout' is determined without it.
5479 if opts.get(b'rev'):
5478 if opts.get(b'rev'):
5480 brev = opts[b'rev'][0]
5479 brev = opts[b'rev'][0]
5481 elif opts.get(b'branch'):
5480 elif opts.get(b'branch'):
5482 brev = opts[b'branch'][0]
5481 brev = opts[b'branch'][0]
5483 else:
5482 else:
5484 brev = branches[0]
5483 brev = branches[0]
5485 repo._subtoppath = source
5484 repo._subtoppath = source
5486 try:
5485 try:
5487 ret = postincoming(
5486 ret = postincoming(
5488 ui, repo, modheads, opts.get(b'update'), checkout, brev
5487 ui, repo, modheads, opts.get(b'update'), checkout, brev
5489 )
5488 )
5490 except error.FilteredRepoLookupError as exc:
5489 except error.FilteredRepoLookupError as exc:
5491 msg = _(b'cannot update to target: %s') % exc.args[0]
5490 msg = _(b'cannot update to target: %s') % exc.args[0]
5492 exc.args = (msg,) + exc.args[1:]
5491 exc.args = (msg,) + exc.args[1:]
5493 raise
5492 raise
5494 finally:
5493 finally:
5495 del repo._subtoppath
5494 del repo._subtoppath
5496
5495
5497 finally:
5496 finally:
5498 other.close()
5497 other.close()
5499 return ret
5498 return ret
5500
5499
5501
5500
5502 @command(
5501 @command(
5503 b'push',
5502 b'push',
5504 [
5503 [
5505 (b'f', b'force', None, _(b'force push')),
5504 (b'f', b'force', None, _(b'force push')),
5506 (
5505 (
5507 b'r',
5506 b'r',
5508 b'rev',
5507 b'rev',
5509 [],
5508 [],
5510 _(b'a changeset intended to be included in the destination'),
5509 _(b'a changeset intended to be included in the destination'),
5511 _(b'REV'),
5510 _(b'REV'),
5512 ),
5511 ),
5513 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5512 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5514 (
5513 (
5515 b'b',
5514 b'b',
5516 b'branch',
5515 b'branch',
5517 [],
5516 [],
5518 _(b'a specific branch you would like to push'),
5517 _(b'a specific branch you would like to push'),
5519 _(b'BRANCH'),
5518 _(b'BRANCH'),
5520 ),
5519 ),
5521 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5520 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5522 (
5521 (
5523 b'',
5522 b'',
5524 b'pushvars',
5523 b'pushvars',
5525 [],
5524 [],
5526 _(b'variables that can be sent to server (ADVANCED)'),
5525 _(b'variables that can be sent to server (ADVANCED)'),
5527 ),
5526 ),
5528 (
5527 (
5529 b'',
5528 b'',
5530 b'publish',
5529 b'publish',
5531 False,
5530 False,
5532 _(b'push the changeset as public (EXPERIMENTAL)'),
5531 _(b'push the changeset as public (EXPERIMENTAL)'),
5533 ),
5532 ),
5534 ]
5533 ]
5535 + remoteopts,
5534 + remoteopts,
5536 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5535 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5537 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5536 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5538 helpbasic=True,
5537 helpbasic=True,
5539 )
5538 )
5540 def push(ui, repo, dest=None, **opts):
5539 def push(ui, repo, dest=None, **opts):
5541 """push changes to the specified destination
5540 """push changes to the specified destination
5542
5541
5543 Push changesets from the local repository to the specified
5542 Push changesets from the local repository to the specified
5544 destination.
5543 destination.
5545
5544
5546 This operation is symmetrical to pull: it is identical to a pull
5545 This operation is symmetrical to pull: it is identical to a pull
5547 in the destination repository from the current one.
5546 in the destination repository from the current one.
5548
5547
5549 By default, push will not allow creation of new heads at the
5548 By default, push will not allow creation of new heads at the
5550 destination, since multiple heads would make it unclear which head
5549 destination, since multiple heads would make it unclear which head
5551 to use. In this situation, it is recommended to pull and merge
5550 to use. In this situation, it is recommended to pull and merge
5552 before pushing.
5551 before pushing.
5553
5552
5554 Use --new-branch if you want to allow push to create a new named
5553 Use --new-branch if you want to allow push to create a new named
5555 branch that is not present at the destination. This allows you to
5554 branch that is not present at the destination. This allows you to
5556 only create a new branch without forcing other changes.
5555 only create a new branch without forcing other changes.
5557
5556
5558 .. note::
5557 .. note::
5559
5558
5560 Extra care should be taken with the -f/--force option,
5559 Extra care should be taken with the -f/--force option,
5561 which will push all new heads on all branches, an action which will
5560 which will push all new heads on all branches, an action which will
5562 almost always cause confusion for collaborators.
5561 almost always cause confusion for collaborators.
5563
5562
5564 If -r/--rev is used, the specified revision and all its ancestors
5563 If -r/--rev is used, the specified revision and all its ancestors
5565 will be pushed to the remote repository.
5564 will be pushed to the remote repository.
5566
5565
5567 If -B/--bookmark is used, the specified bookmarked revision, its
5566 If -B/--bookmark is used, the specified bookmarked revision, its
5568 ancestors, and the bookmark will be pushed to the remote
5567 ancestors, and the bookmark will be pushed to the remote
5569 repository. Specifying ``.`` is equivalent to specifying the active
5568 repository. Specifying ``.`` is equivalent to specifying the active
5570 bookmark's name.
5569 bookmark's name.
5571
5570
5572 Please see :hg:`help urls` for important details about ``ssh://``
5571 Please see :hg:`help urls` for important details about ``ssh://``
5573 URLs. If DESTINATION is omitted, a default path will be used.
5572 URLs. If DESTINATION is omitted, a default path will be used.
5574
5573
5575 .. container:: verbose
5574 .. container:: verbose
5576
5575
5577 The --pushvars option sends strings to the server that become
5576 The --pushvars option sends strings to the server that become
5578 environment variables prepended with ``HG_USERVAR_``. For example,
5577 environment variables prepended with ``HG_USERVAR_``. For example,
5579 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5578 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5580 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5579 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5581
5580
5582 pushvars can provide for user-overridable hooks as well as set debug
5581 pushvars can provide for user-overridable hooks as well as set debug
5583 levels. One example is having a hook that blocks commits containing
5582 levels. One example is having a hook that blocks commits containing
5584 conflict markers, but enables the user to override the hook if the file
5583 conflict markers, but enables the user to override the hook if the file
5585 is using conflict markers for testing purposes or the file format has
5584 is using conflict markers for testing purposes or the file format has
5586 strings that look like conflict markers.
5585 strings that look like conflict markers.
5587
5586
5588 By default, servers will ignore `--pushvars`. To enable it add the
5587 By default, servers will ignore `--pushvars`. To enable it add the
5589 following to your configuration file::
5588 following to your configuration file::
5590
5589
5591 [push]
5590 [push]
5592 pushvars.server = true
5591 pushvars.server = true
5593
5592
5594 Returns 0 if push was successful, 1 if nothing to push.
5593 Returns 0 if push was successful, 1 if nothing to push.
5595 """
5594 """
5596
5595
5597 opts = pycompat.byteskwargs(opts)
5596 opts = pycompat.byteskwargs(opts)
5598 if opts.get(b'bookmark'):
5597 if opts.get(b'bookmark'):
5599 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5598 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5600 for b in opts[b'bookmark']:
5599 for b in opts[b'bookmark']:
5601 # translate -B options to -r so changesets get pushed
5600 # translate -B options to -r so changesets get pushed
5602 b = repo._bookmarks.expandname(b)
5601 b = repo._bookmarks.expandname(b)
5603 if b in repo._bookmarks:
5602 if b in repo._bookmarks:
5604 opts.setdefault(b'rev', []).append(b)
5603 opts.setdefault(b'rev', []).append(b)
5605 else:
5604 else:
5606 # if we try to push a deleted bookmark, translate it to null
5605 # if we try to push a deleted bookmark, translate it to null
5607 # this lets simultaneous -r, -b options continue working
5606 # this lets simultaneous -r, -b options continue working
5608 opts.setdefault(b'rev', []).append(b"null")
5607 opts.setdefault(b'rev', []).append(b"null")
5609
5608
5610 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5609 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5611 if not path:
5610 if not path:
5612 raise error.Abort(
5611 raise error.Abort(
5613 _(b'default repository not configured!'),
5612 _(b'default repository not configured!'),
5614 hint=_(b"see 'hg help config.paths'"),
5613 hint=_(b"see 'hg help config.paths'"),
5615 )
5614 )
5616 dest = path.pushloc or path.loc
5615 dest = path.pushloc or path.loc
5617 branches = (path.branch, opts.get(b'branch') or [])
5616 branches = (path.branch, opts.get(b'branch') or [])
5618 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5617 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5619 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5618 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5620 other = hg.peer(repo, opts, dest)
5619 other = hg.peer(repo, opts, dest)
5621
5620
5622 if revs:
5621 if revs:
5623 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5622 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5624 if not revs:
5623 if not revs:
5625 raise error.Abort(
5624 raise error.Abort(
5626 _(b"specified revisions evaluate to an empty set"),
5625 _(b"specified revisions evaluate to an empty set"),
5627 hint=_(b"use different revision arguments"),
5626 hint=_(b"use different revision arguments"),
5628 )
5627 )
5629 elif path.pushrev:
5628 elif path.pushrev:
5630 # It doesn't make any sense to specify ancestor revisions. So limit
5629 # It doesn't make any sense to specify ancestor revisions. So limit
5631 # to DAG heads to make discovery simpler.
5630 # to DAG heads to make discovery simpler.
5632 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5631 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5633 revs = scmutil.revrange(repo, [expr])
5632 revs = scmutil.revrange(repo, [expr])
5634 revs = [repo[rev].node() for rev in revs]
5633 revs = [repo[rev].node() for rev in revs]
5635 if not revs:
5634 if not revs:
5636 raise error.Abort(
5635 raise error.Abort(
5637 _(b'default push revset for path evaluates to an empty set')
5636 _(b'default push revset for path evaluates to an empty set')
5638 )
5637 )
5639 elif ui.configbool(b'commands', b'push.require-revs'):
5638 elif ui.configbool(b'commands', b'push.require-revs'):
5640 raise error.Abort(
5639 raise error.Abort(
5641 _(b'no revisions specified to push'),
5640 _(b'no revisions specified to push'),
5642 hint=_(b'did you mean "hg push -r ."?'),
5641 hint=_(b'did you mean "hg push -r ."?'),
5643 )
5642 )
5644
5643
5645 repo._subtoppath = dest
5644 repo._subtoppath = dest
5646 try:
5645 try:
5647 # push subrepos depth-first for coherent ordering
5646 # push subrepos depth-first for coherent ordering
5648 c = repo[b'.']
5647 c = repo[b'.']
5649 subs = c.substate # only repos that are committed
5648 subs = c.substate # only repos that are committed
5650 for s in sorted(subs):
5649 for s in sorted(subs):
5651 result = c.sub(s).push(opts)
5650 result = c.sub(s).push(opts)
5652 if result == 0:
5651 if result == 0:
5653 return not result
5652 return not result
5654 finally:
5653 finally:
5655 del repo._subtoppath
5654 del repo._subtoppath
5656
5655
5657 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5656 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5658 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5657 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5659
5658
5660 pushop = exchange.push(
5659 pushop = exchange.push(
5661 repo,
5660 repo,
5662 other,
5661 other,
5663 opts.get(b'force'),
5662 opts.get(b'force'),
5664 revs=revs,
5663 revs=revs,
5665 newbranch=opts.get(b'new_branch'),
5664 newbranch=opts.get(b'new_branch'),
5666 bookmarks=opts.get(b'bookmark', ()),
5665 bookmarks=opts.get(b'bookmark', ()),
5667 publish=opts.get(b'publish'),
5666 publish=opts.get(b'publish'),
5668 opargs=opargs,
5667 opargs=opargs,
5669 )
5668 )
5670
5669
5671 result = not pushop.cgresult
5670 result = not pushop.cgresult
5672
5671
5673 if pushop.bkresult is not None:
5672 if pushop.bkresult is not None:
5674 if pushop.bkresult == 2:
5673 if pushop.bkresult == 2:
5675 result = 2
5674 result = 2
5676 elif not result and pushop.bkresult:
5675 elif not result and pushop.bkresult:
5677 result = 2
5676 result = 2
5678
5677
5679 return result
5678 return result
5680
5679
5681
5680
5682 @command(
5681 @command(
5683 b'recover',
5682 b'recover',
5684 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5683 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5685 helpcategory=command.CATEGORY_MAINTENANCE,
5684 helpcategory=command.CATEGORY_MAINTENANCE,
5686 )
5685 )
5687 def recover(ui, repo, **opts):
5686 def recover(ui, repo, **opts):
5688 """roll back an interrupted transaction
5687 """roll back an interrupted transaction
5689
5688
5690 Recover from an interrupted commit or pull.
5689 Recover from an interrupted commit or pull.
5691
5690
5692 This command tries to fix the repository status after an
5691 This command tries to fix the repository status after an
5693 interrupted operation. It should only be necessary when Mercurial
5692 interrupted operation. It should only be necessary when Mercurial
5694 suggests it.
5693 suggests it.
5695
5694
5696 Returns 0 if successful, 1 if nothing to recover or verify fails.
5695 Returns 0 if successful, 1 if nothing to recover or verify fails.
5697 """
5696 """
5698 ret = repo.recover()
5697 ret = repo.recover()
5699 if ret:
5698 if ret:
5700 if opts['verify']:
5699 if opts['verify']:
5701 return hg.verify(repo)
5700 return hg.verify(repo)
5702 else:
5701 else:
5703 msg = _(
5702 msg = _(
5704 b"(verify step skipped, run `hg verify` to check your "
5703 b"(verify step skipped, run `hg verify` to check your "
5705 b"repository content)\n"
5704 b"repository content)\n"
5706 )
5705 )
5707 ui.warn(msg)
5706 ui.warn(msg)
5708 return 0
5707 return 0
5709 return 1
5708 return 1
5710
5709
5711
5710
5712 @command(
5711 @command(
5713 b'remove|rm',
5712 b'remove|rm',
5714 [
5713 [
5715 (b'A', b'after', None, _(b'record delete for missing files')),
5714 (b'A', b'after', None, _(b'record delete for missing files')),
5716 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5715 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5717 ]
5716 ]
5718 + subrepoopts
5717 + subrepoopts
5719 + walkopts
5718 + walkopts
5720 + dryrunopts,
5719 + dryrunopts,
5721 _(b'[OPTION]... FILE...'),
5720 _(b'[OPTION]... FILE...'),
5722 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5721 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5723 helpbasic=True,
5722 helpbasic=True,
5724 inferrepo=True,
5723 inferrepo=True,
5725 )
5724 )
5726 def remove(ui, repo, *pats, **opts):
5725 def remove(ui, repo, *pats, **opts):
5727 """remove the specified files on the next commit
5726 """remove the specified files on the next commit
5728
5727
5729 Schedule the indicated files for removal from the current branch.
5728 Schedule the indicated files for removal from the current branch.
5730
5729
5731 This command schedules the files to be removed at the next commit.
5730 This command schedules the files to be removed at the next commit.
5732 To undo a remove before that, see :hg:`revert`. To undo added
5731 To undo a remove before that, see :hg:`revert`. To undo added
5733 files, see :hg:`forget`.
5732 files, see :hg:`forget`.
5734
5733
5735 .. container:: verbose
5734 .. container:: verbose
5736
5735
5737 -A/--after can be used to remove only files that have already
5736 -A/--after can be used to remove only files that have already
5738 been deleted, -f/--force can be used to force deletion, and -Af
5737 been deleted, -f/--force can be used to force deletion, and -Af
5739 can be used to remove files from the next revision without
5738 can be used to remove files from the next revision without
5740 deleting them from the working directory.
5739 deleting them from the working directory.
5741
5740
5742 The following table details the behavior of remove for different
5741 The following table details the behavior of remove for different
5743 file states (columns) and option combinations (rows). The file
5742 file states (columns) and option combinations (rows). The file
5744 states are Added [A], Clean [C], Modified [M] and Missing [!]
5743 states are Added [A], Clean [C], Modified [M] and Missing [!]
5745 (as reported by :hg:`status`). The actions are Warn, Remove
5744 (as reported by :hg:`status`). The actions are Warn, Remove
5746 (from branch) and Delete (from disk):
5745 (from branch) and Delete (from disk):
5747
5746
5748 ========= == == == ==
5747 ========= == == == ==
5749 opt/state A C M !
5748 opt/state A C M !
5750 ========= == == == ==
5749 ========= == == == ==
5751 none W RD W R
5750 none W RD W R
5752 -f R RD RD R
5751 -f R RD RD R
5753 -A W W W R
5752 -A W W W R
5754 -Af R R R R
5753 -Af R R R R
5755 ========= == == == ==
5754 ========= == == == ==
5756
5755
5757 .. note::
5756 .. note::
5758
5757
5759 :hg:`remove` never deletes files in Added [A] state from the
5758 :hg:`remove` never deletes files in Added [A] state from the
5760 working directory, not even if ``--force`` is specified.
5759 working directory, not even if ``--force`` is specified.
5761
5760
5762 Returns 0 on success, 1 if any warnings encountered.
5761 Returns 0 on success, 1 if any warnings encountered.
5763 """
5762 """
5764
5763
5765 opts = pycompat.byteskwargs(opts)
5764 opts = pycompat.byteskwargs(opts)
5766 after, force = opts.get(b'after'), opts.get(b'force')
5765 after, force = opts.get(b'after'), opts.get(b'force')
5767 dryrun = opts.get(b'dry_run')
5766 dryrun = opts.get(b'dry_run')
5768 if not pats and not after:
5767 if not pats and not after:
5769 raise error.Abort(_(b'no files specified'))
5768 raise error.Abort(_(b'no files specified'))
5770
5769
5771 m = scmutil.match(repo[None], pats, opts)
5770 m = scmutil.match(repo[None], pats, opts)
5772 subrepos = opts.get(b'subrepos')
5771 subrepos = opts.get(b'subrepos')
5773 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5772 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5774 return cmdutil.remove(
5773 return cmdutil.remove(
5775 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5774 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5776 )
5775 )
5777
5776
5778
5777
5779 @command(
5778 @command(
5780 b'rename|move|mv',
5779 b'rename|move|mv',
5781 [
5780 [
5782 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5781 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5783 (
5782 (
5784 b'f',
5783 b'f',
5785 b'force',
5784 b'force',
5786 None,
5785 None,
5787 _(b'forcibly move over an existing managed file'),
5786 _(b'forcibly move over an existing managed file'),
5788 ),
5787 ),
5789 ]
5788 ]
5790 + walkopts
5789 + walkopts
5791 + dryrunopts,
5790 + dryrunopts,
5792 _(b'[OPTION]... SOURCE... DEST'),
5791 _(b'[OPTION]... SOURCE... DEST'),
5793 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5792 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5794 )
5793 )
5795 def rename(ui, repo, *pats, **opts):
5794 def rename(ui, repo, *pats, **opts):
5796 """rename files; equivalent of copy + remove
5795 """rename files; equivalent of copy + remove
5797
5796
5798 Mark dest as copies of sources; mark sources for deletion. If dest
5797 Mark dest as copies of sources; mark sources for deletion. If dest
5799 is a directory, copies are put in that directory. If dest is a
5798 is a directory, copies are put in that directory. If dest is a
5800 file, there can only be one source.
5799 file, there can only be one source.
5801
5800
5802 By default, this command copies the contents of files as they
5801 By default, this command copies the contents of files as they
5803 exist in the working directory. If invoked with -A/--after, the
5802 exist in the working directory. If invoked with -A/--after, the
5804 operation is recorded, but no copying is performed.
5803 operation is recorded, but no copying is performed.
5805
5804
5806 This command takes effect at the next commit. To undo a rename
5805 This command takes effect at the next commit. To undo a rename
5807 before that, see :hg:`revert`.
5806 before that, see :hg:`revert`.
5808
5807
5809 Returns 0 on success, 1 if errors are encountered.
5808 Returns 0 on success, 1 if errors are encountered.
5810 """
5809 """
5811 opts = pycompat.byteskwargs(opts)
5810 opts = pycompat.byteskwargs(opts)
5812 with repo.wlock():
5811 with repo.wlock():
5813 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5812 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5814
5813
5815
5814
5816 @command(
5815 @command(
5817 b'resolve',
5816 b'resolve',
5818 [
5817 [
5819 (b'a', b'all', None, _(b'select all unresolved files')),
5818 (b'a', b'all', None, _(b'select all unresolved files')),
5820 (b'l', b'list', None, _(b'list state of files needing merge')),
5819 (b'l', b'list', None, _(b'list state of files needing merge')),
5821 (b'm', b'mark', None, _(b'mark files as resolved')),
5820 (b'm', b'mark', None, _(b'mark files as resolved')),
5822 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5821 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5823 (b'n', b'no-status', None, _(b'hide status prefix')),
5822 (b'n', b'no-status', None, _(b'hide status prefix')),
5824 (b'', b're-merge', None, _(b're-merge files')),
5823 (b'', b're-merge', None, _(b're-merge files')),
5825 ]
5824 ]
5826 + mergetoolopts
5825 + mergetoolopts
5827 + walkopts
5826 + walkopts
5828 + formatteropts,
5827 + formatteropts,
5829 _(b'[OPTION]... [FILE]...'),
5828 _(b'[OPTION]... [FILE]...'),
5830 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5829 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5831 inferrepo=True,
5830 inferrepo=True,
5832 )
5831 )
5833 def resolve(ui, repo, *pats, **opts):
5832 def resolve(ui, repo, *pats, **opts):
5834 """redo merges or set/view the merge status of files
5833 """redo merges or set/view the merge status of files
5835
5834
5836 Merges with unresolved conflicts are often the result of
5835 Merges with unresolved conflicts are often the result of
5837 non-interactive merging using the ``internal:merge`` configuration
5836 non-interactive merging using the ``internal:merge`` configuration
5838 setting, or a command-line merge tool like ``diff3``. The resolve
5837 setting, or a command-line merge tool like ``diff3``. The resolve
5839 command is used to manage the files involved in a merge, after
5838 command is used to manage the files involved in a merge, after
5840 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5839 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5841 working directory must have two parents). See :hg:`help
5840 working directory must have two parents). See :hg:`help
5842 merge-tools` for information on configuring merge tools.
5841 merge-tools` for information on configuring merge tools.
5843
5842
5844 The resolve command can be used in the following ways:
5843 The resolve command can be used in the following ways:
5845
5844
5846 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5845 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5847 the specified files, discarding any previous merge attempts. Re-merging
5846 the specified files, discarding any previous merge attempts. Re-merging
5848 is not performed for files already marked as resolved. Use ``--all/-a``
5847 is not performed for files already marked as resolved. Use ``--all/-a``
5849 to select all unresolved files. ``--tool`` can be used to specify
5848 to select all unresolved files. ``--tool`` can be used to specify
5850 the merge tool used for the given files. It overrides the HGMERGE
5849 the merge tool used for the given files. It overrides the HGMERGE
5851 environment variable and your configuration files. Previous file
5850 environment variable and your configuration files. Previous file
5852 contents are saved with a ``.orig`` suffix.
5851 contents are saved with a ``.orig`` suffix.
5853
5852
5854 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5853 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5855 (e.g. after having manually fixed-up the files). The default is
5854 (e.g. after having manually fixed-up the files). The default is
5856 to mark all unresolved files.
5855 to mark all unresolved files.
5857
5856
5858 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5857 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5859 default is to mark all resolved files.
5858 default is to mark all resolved files.
5860
5859
5861 - :hg:`resolve -l`: list files which had or still have conflicts.
5860 - :hg:`resolve -l`: list files which had or still have conflicts.
5862 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5861 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5863 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5862 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5864 the list. See :hg:`help filesets` for details.
5863 the list. See :hg:`help filesets` for details.
5865
5864
5866 .. note::
5865 .. note::
5867
5866
5868 Mercurial will not let you commit files with unresolved merge
5867 Mercurial will not let you commit files with unresolved merge
5869 conflicts. You must use :hg:`resolve -m ...` before you can
5868 conflicts. You must use :hg:`resolve -m ...` before you can
5870 commit after a conflicting merge.
5869 commit after a conflicting merge.
5871
5870
5872 .. container:: verbose
5871 .. container:: verbose
5873
5872
5874 Template:
5873 Template:
5875
5874
5876 The following keywords are supported in addition to the common template
5875 The following keywords are supported in addition to the common template
5877 keywords and functions. See also :hg:`help templates`.
5876 keywords and functions. See also :hg:`help templates`.
5878
5877
5879 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5878 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5880 :path: String. Repository-absolute path of the file.
5879 :path: String. Repository-absolute path of the file.
5881
5880
5882 Returns 0 on success, 1 if any files fail a resolve attempt.
5881 Returns 0 on success, 1 if any files fail a resolve attempt.
5883 """
5882 """
5884
5883
5885 opts = pycompat.byteskwargs(opts)
5884 opts = pycompat.byteskwargs(opts)
5886 confirm = ui.configbool(b'commands', b'resolve.confirm')
5885 confirm = ui.configbool(b'commands', b'resolve.confirm')
5887 flaglist = b'all mark unmark list no_status re_merge'.split()
5886 flaglist = b'all mark unmark list no_status re_merge'.split()
5888 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5887 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5889
5888
5890 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5889 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5891 if actioncount > 1:
5890 if actioncount > 1:
5892 raise error.Abort(_(b"too many actions specified"))
5891 raise error.Abort(_(b"too many actions specified"))
5893 elif actioncount == 0 and ui.configbool(
5892 elif actioncount == 0 and ui.configbool(
5894 b'commands', b'resolve.explicit-re-merge'
5893 b'commands', b'resolve.explicit-re-merge'
5895 ):
5894 ):
5896 hint = _(b'use --mark, --unmark, --list or --re-merge')
5895 hint = _(b'use --mark, --unmark, --list or --re-merge')
5897 raise error.Abort(_(b'no action specified'), hint=hint)
5896 raise error.Abort(_(b'no action specified'), hint=hint)
5898 if pats and all:
5897 if pats and all:
5899 raise error.Abort(_(b"can't specify --all and patterns"))
5898 raise error.Abort(_(b"can't specify --all and patterns"))
5900 if not (all or pats or show or mark or unmark):
5899 if not (all or pats or show or mark or unmark):
5901 raise error.Abort(
5900 raise error.Abort(
5902 _(b'no files or directories specified'),
5901 _(b'no files or directories specified'),
5903 hint=b'use --all to re-merge all unresolved files',
5902 hint=b'use --all to re-merge all unresolved files',
5904 )
5903 )
5905
5904
5906 if confirm:
5905 if confirm:
5907 if all:
5906 if all:
5908 if ui.promptchoice(
5907 if ui.promptchoice(
5909 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5908 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5910 ):
5909 ):
5911 raise error.Abort(_(b'user quit'))
5910 raise error.Abort(_(b'user quit'))
5912 if mark and not pats:
5911 if mark and not pats:
5913 if ui.promptchoice(
5912 if ui.promptchoice(
5914 _(
5913 _(
5915 b'mark all unresolved files as resolved (yn)?'
5914 b'mark all unresolved files as resolved (yn)?'
5916 b'$$ &Yes $$ &No'
5915 b'$$ &Yes $$ &No'
5917 )
5916 )
5918 ):
5917 ):
5919 raise error.Abort(_(b'user quit'))
5918 raise error.Abort(_(b'user quit'))
5920 if unmark and not pats:
5919 if unmark and not pats:
5921 if ui.promptchoice(
5920 if ui.promptchoice(
5922 _(
5921 _(
5923 b'mark all resolved files as unresolved (yn)?'
5922 b'mark all resolved files as unresolved (yn)?'
5924 b'$$ &Yes $$ &No'
5923 b'$$ &Yes $$ &No'
5925 )
5924 )
5926 ):
5925 ):
5927 raise error.Abort(_(b'user quit'))
5926 raise error.Abort(_(b'user quit'))
5928
5927
5929 uipathfn = scmutil.getuipathfn(repo)
5928 uipathfn = scmutil.getuipathfn(repo)
5930
5929
5931 if show:
5930 if show:
5932 ui.pager(b'resolve')
5931 ui.pager(b'resolve')
5933 fm = ui.formatter(b'resolve', opts)
5932 fm = ui.formatter(b'resolve', opts)
5934 ms = mergestatemod.mergestate.read(repo)
5933 ms = mergestatemod.mergestate.read(repo)
5935 wctx = repo[None]
5934 wctx = repo[None]
5936 m = scmutil.match(wctx, pats, opts)
5935 m = scmutil.match(wctx, pats, opts)
5937
5936
5938 # Labels and keys based on merge state. Unresolved path conflicts show
5937 # Labels and keys based on merge state. Unresolved path conflicts show
5939 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5938 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5940 # resolved conflicts.
5939 # resolved conflicts.
5941 mergestateinfo = {
5940 mergestateinfo = {
5942 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5941 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5943 b'resolve.unresolved',
5942 b'resolve.unresolved',
5944 b'U',
5943 b'U',
5945 ),
5944 ),
5946 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5945 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5947 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5946 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5948 b'resolve.unresolved',
5947 b'resolve.unresolved',
5949 b'P',
5948 b'P',
5950 ),
5949 ),
5951 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5950 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
5952 b'resolve.resolved',
5951 b'resolve.resolved',
5953 b'R',
5952 b'R',
5954 ),
5953 ),
5955 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5954 mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: (
5956 b'resolve.driverresolved',
5955 b'resolve.driverresolved',
5957 b'D',
5956 b'D',
5958 ),
5957 ),
5959 }
5958 }
5960
5959
5961 for f in ms:
5960 for f in ms:
5962 if not m(f):
5961 if not m(f):
5963 continue
5962 continue
5964
5963
5965 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
5964 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
5966 continue
5965 continue
5967 label, key = mergestateinfo[ms[f]]
5966 label, key = mergestateinfo[ms[f]]
5968 fm.startitem()
5967 fm.startitem()
5969 fm.context(ctx=wctx)
5968 fm.context(ctx=wctx)
5970 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5969 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5971 fm.data(path=f)
5970 fm.data(path=f)
5972 fm.plain(b'%s\n' % uipathfn(f), label=label)
5971 fm.plain(b'%s\n' % uipathfn(f), label=label)
5973 fm.end()
5972 fm.end()
5974 return 0
5973 return 0
5975
5974
5976 with repo.wlock():
5975 with repo.wlock():
5977 ms = mergestatemod.mergestate.read(repo)
5976 ms = mergestatemod.mergestate.read(repo)
5978
5977
5979 if not (ms.active() or repo.dirstate.p2() != nullid):
5978 if not (ms.active() or repo.dirstate.p2() != nullid):
5980 raise error.Abort(
5979 raise error.Abort(
5981 _(b'resolve command not applicable when not merging')
5980 _(b'resolve command not applicable when not merging')
5982 )
5981 )
5983
5982
5984 wctx = repo[None]
5983 wctx = repo[None]
5985
5984
5986 if (
5985 if (
5987 ms.mergedriver
5986 ms.mergedriver
5988 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5987 and ms.mdstate() == mergestatemod.MERGE_DRIVER_STATE_UNMARKED
5989 ):
5988 ):
5990 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5989 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5991 ms.commit()
5990 ms.commit()
5992 # allow mark and unmark to go through
5991 # allow mark and unmark to go through
5993 if not mark and not unmark and not proceed:
5992 if not mark and not unmark and not proceed:
5994 return 1
5993 return 1
5995
5994
5996 m = scmutil.match(wctx, pats, opts)
5995 m = scmutil.match(wctx, pats, opts)
5997 ret = 0
5996 ret = 0
5998 didwork = False
5997 didwork = False
5999 runconclude = False
5998 runconclude = False
6000
5999
6001 tocomplete = []
6000 tocomplete = []
6002 hasconflictmarkers = []
6001 hasconflictmarkers = []
6003 if mark:
6002 if mark:
6004 markcheck = ui.config(b'commands', b'resolve.mark-check')
6003 markcheck = ui.config(b'commands', b'resolve.mark-check')
6005 if markcheck not in [b'warn', b'abort']:
6004 if markcheck not in [b'warn', b'abort']:
6006 # Treat all invalid / unrecognized values as 'none'.
6005 # Treat all invalid / unrecognized values as 'none'.
6007 markcheck = False
6006 markcheck = False
6008 for f in ms:
6007 for f in ms:
6009 if not m(f):
6008 if not m(f):
6010 continue
6009 continue
6011
6010
6012 didwork = True
6011 didwork = True
6013
6012
6014 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
6013 if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
6015 continue
6014 continue
6016
6015
6017 # don't let driver-resolved files be marked, and run the conclude
6016 # don't let driver-resolved files be marked, and run the conclude
6018 # step if asked to resolve
6017 # step if asked to resolve
6019 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6018 if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:
6020 exact = m.exact(f)
6019 exact = m.exact(f)
6021 if mark:
6020 if mark:
6022 if exact:
6021 if exact:
6023 ui.warn(
6022 ui.warn(
6024 _(b'not marking %s as it is driver-resolved\n')
6023 _(b'not marking %s as it is driver-resolved\n')
6025 % uipathfn(f)
6024 % uipathfn(f)
6026 )
6025 )
6027 elif unmark:
6026 elif unmark:
6028 if exact:
6027 if exact:
6029 ui.warn(
6028 ui.warn(
6030 _(b'not unmarking %s as it is driver-resolved\n')
6029 _(b'not unmarking %s as it is driver-resolved\n')
6031 % uipathfn(f)
6030 % uipathfn(f)
6032 )
6031 )
6033 else:
6032 else:
6034 runconclude = True
6033 runconclude = True
6035 continue
6034 continue
6036
6035
6037 # path conflicts must be resolved manually
6036 # path conflicts must be resolved manually
6038 if ms[f] in (
6037 if ms[f] in (
6039 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6038 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6040 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6039 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6041 ):
6040 ):
6042 if mark:
6041 if mark:
6043 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6042 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6044 elif unmark:
6043 elif unmark:
6045 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6044 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6046 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6045 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6047 ui.warn(
6046 ui.warn(
6048 _(b'%s: path conflict must be resolved manually\n')
6047 _(b'%s: path conflict must be resolved manually\n')
6049 % uipathfn(f)
6048 % uipathfn(f)
6050 )
6049 )
6051 continue
6050 continue
6052
6051
6053 if mark:
6052 if mark:
6054 if markcheck:
6053 if markcheck:
6055 fdata = repo.wvfs.tryread(f)
6054 fdata = repo.wvfs.tryread(f)
6056 if (
6055 if (
6057 filemerge.hasconflictmarkers(fdata)
6056 filemerge.hasconflictmarkers(fdata)
6058 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6057 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6059 ):
6058 ):
6060 hasconflictmarkers.append(f)
6059 hasconflictmarkers.append(f)
6061 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6060 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6062 elif unmark:
6061 elif unmark:
6063 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6062 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6064 else:
6063 else:
6065 # backup pre-resolve (merge uses .orig for its own purposes)
6064 # backup pre-resolve (merge uses .orig for its own purposes)
6066 a = repo.wjoin(f)
6065 a = repo.wjoin(f)
6067 try:
6066 try:
6068 util.copyfile(a, a + b".resolve")
6067 util.copyfile(a, a + b".resolve")
6069 except (IOError, OSError) as inst:
6068 except (IOError, OSError) as inst:
6070 if inst.errno != errno.ENOENT:
6069 if inst.errno != errno.ENOENT:
6071 raise
6070 raise
6072
6071
6073 try:
6072 try:
6074 # preresolve file
6073 # preresolve file
6075 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6074 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6076 with ui.configoverride(overrides, b'resolve'):
6075 with ui.configoverride(overrides, b'resolve'):
6077 complete, r = ms.preresolve(f, wctx)
6076 complete, r = ms.preresolve(f, wctx)
6078 if not complete:
6077 if not complete:
6079 tocomplete.append(f)
6078 tocomplete.append(f)
6080 elif r:
6079 elif r:
6081 ret = 1
6080 ret = 1
6082 finally:
6081 finally:
6083 ms.commit()
6082 ms.commit()
6084
6083
6085 # replace filemerge's .orig file with our resolve file, but only
6084 # replace filemerge's .orig file with our resolve file, but only
6086 # for merges that are complete
6085 # for merges that are complete
6087 if complete:
6086 if complete:
6088 try:
6087 try:
6089 util.rename(
6088 util.rename(
6090 a + b".resolve", scmutil.backuppath(ui, repo, f)
6089 a + b".resolve", scmutil.backuppath(ui, repo, f)
6091 )
6090 )
6092 except OSError as inst:
6091 except OSError as inst:
6093 if inst.errno != errno.ENOENT:
6092 if inst.errno != errno.ENOENT:
6094 raise
6093 raise
6095
6094
6096 if hasconflictmarkers:
6095 if hasconflictmarkers:
6097 ui.warn(
6096 ui.warn(
6098 _(
6097 _(
6099 b'warning: the following files still have conflict '
6098 b'warning: the following files still have conflict '
6100 b'markers:\n'
6099 b'markers:\n'
6101 )
6100 )
6102 + b''.join(
6101 + b''.join(
6103 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6102 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6104 )
6103 )
6105 )
6104 )
6106 if markcheck == b'abort' and not all and not pats:
6105 if markcheck == b'abort' and not all and not pats:
6107 raise error.Abort(
6106 raise error.Abort(
6108 _(b'conflict markers detected'),
6107 _(b'conflict markers detected'),
6109 hint=_(b'use --all to mark anyway'),
6108 hint=_(b'use --all to mark anyway'),
6110 )
6109 )
6111
6110
6112 for f in tocomplete:
6111 for f in tocomplete:
6113 try:
6112 try:
6114 # resolve file
6113 # resolve file
6115 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6114 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6116 with ui.configoverride(overrides, b'resolve'):
6115 with ui.configoverride(overrides, b'resolve'):
6117 r = ms.resolve(f, wctx)
6116 r = ms.resolve(f, wctx)
6118 if r:
6117 if r:
6119 ret = 1
6118 ret = 1
6120 finally:
6119 finally:
6121 ms.commit()
6120 ms.commit()
6122
6121
6123 # replace filemerge's .orig file with our resolve file
6122 # replace filemerge's .orig file with our resolve file
6124 a = repo.wjoin(f)
6123 a = repo.wjoin(f)
6125 try:
6124 try:
6126 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6125 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6127 except OSError as inst:
6126 except OSError as inst:
6128 if inst.errno != errno.ENOENT:
6127 if inst.errno != errno.ENOENT:
6129 raise
6128 raise
6130
6129
6131 ms.commit()
6130 ms.commit()
6132 ms.recordactions()
6131 ms.recordactions()
6133
6132
6134 if not didwork and pats:
6133 if not didwork and pats:
6135 hint = None
6134 hint = None
6136 if not any([p for p in pats if p.find(b':') >= 0]):
6135 if not any([p for p in pats if p.find(b':') >= 0]):
6137 pats = [b'path:%s' % p for p in pats]
6136 pats = [b'path:%s' % p for p in pats]
6138 m = scmutil.match(wctx, pats, opts)
6137 m = scmutil.match(wctx, pats, opts)
6139 for f in ms:
6138 for f in ms:
6140 if not m(f):
6139 if not m(f):
6141 continue
6140 continue
6142
6141
6143 def flag(o):
6142 def flag(o):
6144 if o == b're_merge':
6143 if o == b're_merge':
6145 return b'--re-merge '
6144 return b'--re-merge '
6146 return b'-%s ' % o[0:1]
6145 return b'-%s ' % o[0:1]
6147
6146
6148 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6147 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6149 hint = _(b"(try: hg resolve %s%s)\n") % (
6148 hint = _(b"(try: hg resolve %s%s)\n") % (
6150 flags,
6149 flags,
6151 b' '.join(pats),
6150 b' '.join(pats),
6152 )
6151 )
6153 break
6152 break
6154 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6153 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6155 if hint:
6154 if hint:
6156 ui.warn(hint)
6155 ui.warn(hint)
6157 elif ms.mergedriver and ms.mdstate() != b's':
6156 elif ms.mergedriver and ms.mdstate() != b's':
6158 # run conclude step when either a driver-resolved file is requested
6157 # run conclude step when either a driver-resolved file is requested
6159 # or there are no driver-resolved files
6158 # or there are no driver-resolved files
6160 # we can't use 'ret' to determine whether any files are unresolved
6159 # we can't use 'ret' to determine whether any files are unresolved
6161 # because we might not have tried to resolve some
6160 # because we might not have tried to resolve some
6162 if (runconclude or not list(ms.driverresolved())) and not list(
6161 if (runconclude or not list(ms.driverresolved())) and not list(
6163 ms.unresolved()
6162 ms.unresolved()
6164 ):
6163 ):
6165 proceed = mergemod.driverconclude(repo, ms, wctx)
6164 proceed = mergemod.driverconclude(repo, ms, wctx)
6166 ms.commit()
6165 ms.commit()
6167 if not proceed:
6166 if not proceed:
6168 return 1
6167 return 1
6169
6168
6170 # Nudge users into finishing an unfinished operation
6169 # Nudge users into finishing an unfinished operation
6171 unresolvedf = list(ms.unresolved())
6170 unresolvedf = list(ms.unresolved())
6172 driverresolvedf = list(ms.driverresolved())
6171 driverresolvedf = list(ms.driverresolved())
6173 if not unresolvedf and not driverresolvedf:
6172 if not unresolvedf and not driverresolvedf:
6174 ui.status(_(b'(no more unresolved files)\n'))
6173 ui.status(_(b'(no more unresolved files)\n'))
6175 cmdutil.checkafterresolved(repo)
6174 cmdutil.checkafterresolved(repo)
6176 elif not unresolvedf:
6175 elif not unresolvedf:
6177 ui.status(
6176 ui.status(
6178 _(
6177 _(
6179 b'(no more unresolved files -- '
6178 b'(no more unresolved files -- '
6180 b'run "hg resolve --all" to conclude)\n'
6179 b'run "hg resolve --all" to conclude)\n'
6181 )
6180 )
6182 )
6181 )
6183
6182
6184 return ret
6183 return ret
6185
6184
6186
6185
6187 @command(
6186 @command(
6188 b'revert',
6187 b'revert',
6189 [
6188 [
6190 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6189 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6191 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6190 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6192 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6191 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6193 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6192 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6194 (b'i', b'interactive', None, _(b'interactively select the changes')),
6193 (b'i', b'interactive', None, _(b'interactively select the changes')),
6195 ]
6194 ]
6196 + walkopts
6195 + walkopts
6197 + dryrunopts,
6196 + dryrunopts,
6198 _(b'[OPTION]... [-r REV] [NAME]...'),
6197 _(b'[OPTION]... [-r REV] [NAME]...'),
6199 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6198 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6200 )
6199 )
6201 def revert(ui, repo, *pats, **opts):
6200 def revert(ui, repo, *pats, **opts):
6202 """restore files to their checkout state
6201 """restore files to their checkout state
6203
6202
6204 .. note::
6203 .. note::
6205
6204
6206 To check out earlier revisions, you should use :hg:`update REV`.
6205 To check out earlier revisions, you should use :hg:`update REV`.
6207 To cancel an uncommitted merge (and lose your changes),
6206 To cancel an uncommitted merge (and lose your changes),
6208 use :hg:`merge --abort`.
6207 use :hg:`merge --abort`.
6209
6208
6210 With no revision specified, revert the specified files or directories
6209 With no revision specified, revert the specified files or directories
6211 to the contents they had in the parent of the working directory.
6210 to the contents they had in the parent of the working directory.
6212 This restores the contents of files to an unmodified
6211 This restores the contents of files to an unmodified
6213 state and unschedules adds, removes, copies, and renames. If the
6212 state and unschedules adds, removes, copies, and renames. If the
6214 working directory has two parents, you must explicitly specify a
6213 working directory has two parents, you must explicitly specify a
6215 revision.
6214 revision.
6216
6215
6217 Using the -r/--rev or -d/--date options, revert the given files or
6216 Using the -r/--rev or -d/--date options, revert the given files or
6218 directories to their states as of a specific revision. Because
6217 directories to their states as of a specific revision. Because
6219 revert does not change the working directory parents, this will
6218 revert does not change the working directory parents, this will
6220 cause these files to appear modified. This can be helpful to "back
6219 cause these files to appear modified. This can be helpful to "back
6221 out" some or all of an earlier change. See :hg:`backout` for a
6220 out" some or all of an earlier change. See :hg:`backout` for a
6222 related method.
6221 related method.
6223
6222
6224 Modified files are saved with a .orig suffix before reverting.
6223 Modified files are saved with a .orig suffix before reverting.
6225 To disable these backups, use --no-backup. It is possible to store
6224 To disable these backups, use --no-backup. It is possible to store
6226 the backup files in a custom directory relative to the root of the
6225 the backup files in a custom directory relative to the root of the
6227 repository by setting the ``ui.origbackuppath`` configuration
6226 repository by setting the ``ui.origbackuppath`` configuration
6228 option.
6227 option.
6229
6228
6230 See :hg:`help dates` for a list of formats valid for -d/--date.
6229 See :hg:`help dates` for a list of formats valid for -d/--date.
6231
6230
6232 See :hg:`help backout` for a way to reverse the effect of an
6231 See :hg:`help backout` for a way to reverse the effect of an
6233 earlier changeset.
6232 earlier changeset.
6234
6233
6235 Returns 0 on success.
6234 Returns 0 on success.
6236 """
6235 """
6237
6236
6238 opts = pycompat.byteskwargs(opts)
6237 opts = pycompat.byteskwargs(opts)
6239 if opts.get(b"date"):
6238 if opts.get(b"date"):
6240 if opts.get(b"rev"):
6239 if opts.get(b"rev"):
6241 raise error.Abort(_(b"you can't specify a revision and a date"))
6240 raise error.Abort(_(b"you can't specify a revision and a date"))
6242 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6241 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6243
6242
6244 parent, p2 = repo.dirstate.parents()
6243 parent, p2 = repo.dirstate.parents()
6245 if not opts.get(b'rev') and p2 != nullid:
6244 if not opts.get(b'rev') and p2 != nullid:
6246 # revert after merge is a trap for new users (issue2915)
6245 # revert after merge is a trap for new users (issue2915)
6247 raise error.Abort(
6246 raise error.Abort(
6248 _(b'uncommitted merge with no revision specified'),
6247 _(b'uncommitted merge with no revision specified'),
6249 hint=_(b"use 'hg update' or see 'hg help revert'"),
6248 hint=_(b"use 'hg update' or see 'hg help revert'"),
6250 )
6249 )
6251
6250
6252 rev = opts.get(b'rev')
6251 rev = opts.get(b'rev')
6253 if rev:
6252 if rev:
6254 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6253 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6255 ctx = scmutil.revsingle(repo, rev)
6254 ctx = scmutil.revsingle(repo, rev)
6256
6255
6257 if not (
6256 if not (
6258 pats
6257 pats
6259 or opts.get(b'include')
6258 or opts.get(b'include')
6260 or opts.get(b'exclude')
6259 or opts.get(b'exclude')
6261 or opts.get(b'all')
6260 or opts.get(b'all')
6262 or opts.get(b'interactive')
6261 or opts.get(b'interactive')
6263 ):
6262 ):
6264 msg = _(b"no files or directories specified")
6263 msg = _(b"no files or directories specified")
6265 if p2 != nullid:
6264 if p2 != nullid:
6266 hint = _(
6265 hint = _(
6267 b"uncommitted merge, use --all to discard all changes,"
6266 b"uncommitted merge, use --all to discard all changes,"
6268 b" or 'hg update -C .' to abort the merge"
6267 b" or 'hg update -C .' to abort the merge"
6269 )
6268 )
6270 raise error.Abort(msg, hint=hint)
6269 raise error.Abort(msg, hint=hint)
6271 dirty = any(repo.status())
6270 dirty = any(repo.status())
6272 node = ctx.node()
6271 node = ctx.node()
6273 if node != parent:
6272 if node != parent:
6274 if dirty:
6273 if dirty:
6275 hint = (
6274 hint = (
6276 _(
6275 _(
6277 b"uncommitted changes, use --all to discard all"
6276 b"uncommitted changes, use --all to discard all"
6278 b" changes, or 'hg update %d' to update"
6277 b" changes, or 'hg update %d' to update"
6279 )
6278 )
6280 % ctx.rev()
6279 % ctx.rev()
6281 )
6280 )
6282 else:
6281 else:
6283 hint = (
6282 hint = (
6284 _(
6283 _(
6285 b"use --all to revert all files,"
6284 b"use --all to revert all files,"
6286 b" or 'hg update %d' to update"
6285 b" or 'hg update %d' to update"
6287 )
6286 )
6288 % ctx.rev()
6287 % ctx.rev()
6289 )
6288 )
6290 elif dirty:
6289 elif dirty:
6291 hint = _(b"uncommitted changes, use --all to discard all changes")
6290 hint = _(b"uncommitted changes, use --all to discard all changes")
6292 else:
6291 else:
6293 hint = _(b"use --all to revert all files")
6292 hint = _(b"use --all to revert all files")
6294 raise error.Abort(msg, hint=hint)
6293 raise error.Abort(msg, hint=hint)
6295
6294
6296 return cmdutil.revert(
6295 return cmdutil.revert(
6297 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6296 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6298 )
6297 )
6299
6298
6300
6299
6301 @command(
6300 @command(
6302 b'rollback',
6301 b'rollback',
6303 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6302 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6304 helpcategory=command.CATEGORY_MAINTENANCE,
6303 helpcategory=command.CATEGORY_MAINTENANCE,
6305 )
6304 )
6306 def rollback(ui, repo, **opts):
6305 def rollback(ui, repo, **opts):
6307 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6306 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6308
6307
6309 Please use :hg:`commit --amend` instead of rollback to correct
6308 Please use :hg:`commit --amend` instead of rollback to correct
6310 mistakes in the last commit.
6309 mistakes in the last commit.
6311
6310
6312 This command should be used with care. There is only one level of
6311 This command should be used with care. There is only one level of
6313 rollback, and there is no way to undo a rollback. It will also
6312 rollback, and there is no way to undo a rollback. It will also
6314 restore the dirstate at the time of the last transaction, losing
6313 restore the dirstate at the time of the last transaction, losing
6315 any dirstate changes since that time. This command does not alter
6314 any dirstate changes since that time. This command does not alter
6316 the working directory.
6315 the working directory.
6317
6316
6318 Transactions are used to encapsulate the effects of all commands
6317 Transactions are used to encapsulate the effects of all commands
6319 that create new changesets or propagate existing changesets into a
6318 that create new changesets or propagate existing changesets into a
6320 repository.
6319 repository.
6321
6320
6322 .. container:: verbose
6321 .. container:: verbose
6323
6322
6324 For example, the following commands are transactional, and their
6323 For example, the following commands are transactional, and their
6325 effects can be rolled back:
6324 effects can be rolled back:
6326
6325
6327 - commit
6326 - commit
6328 - import
6327 - import
6329 - pull
6328 - pull
6330 - push (with this repository as the destination)
6329 - push (with this repository as the destination)
6331 - unbundle
6330 - unbundle
6332
6331
6333 To avoid permanent data loss, rollback will refuse to rollback a
6332 To avoid permanent data loss, rollback will refuse to rollback a
6334 commit transaction if it isn't checked out. Use --force to
6333 commit transaction if it isn't checked out. Use --force to
6335 override this protection.
6334 override this protection.
6336
6335
6337 The rollback command can be entirely disabled by setting the
6336 The rollback command can be entirely disabled by setting the
6338 ``ui.rollback`` configuration setting to false. If you're here
6337 ``ui.rollback`` configuration setting to false. If you're here
6339 because you want to use rollback and it's disabled, you can
6338 because you want to use rollback and it's disabled, you can
6340 re-enable the command by setting ``ui.rollback`` to true.
6339 re-enable the command by setting ``ui.rollback`` to true.
6341
6340
6342 This command is not intended for use on public repositories. Once
6341 This command is not intended for use on public repositories. Once
6343 changes are visible for pull by other users, rolling a transaction
6342 changes are visible for pull by other users, rolling a transaction
6344 back locally is ineffective (someone else may already have pulled
6343 back locally is ineffective (someone else may already have pulled
6345 the changes). Furthermore, a race is possible with readers of the
6344 the changes). Furthermore, a race is possible with readers of the
6346 repository; for example an in-progress pull from the repository
6345 repository; for example an in-progress pull from the repository
6347 may fail if a rollback is performed.
6346 may fail if a rollback is performed.
6348
6347
6349 Returns 0 on success, 1 if no rollback data is available.
6348 Returns 0 on success, 1 if no rollback data is available.
6350 """
6349 """
6351 if not ui.configbool(b'ui', b'rollback'):
6350 if not ui.configbool(b'ui', b'rollback'):
6352 raise error.Abort(
6351 raise error.Abort(
6353 _(b'rollback is disabled because it is unsafe'),
6352 _(b'rollback is disabled because it is unsafe'),
6354 hint=b'see `hg help -v rollback` for information',
6353 hint=b'see `hg help -v rollback` for information',
6355 )
6354 )
6356 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6355 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6357
6356
6358
6357
6359 @command(
6358 @command(
6360 b'root',
6359 b'root',
6361 [] + formatteropts,
6360 [] + formatteropts,
6362 intents={INTENT_READONLY},
6361 intents={INTENT_READONLY},
6363 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6362 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6364 )
6363 )
6365 def root(ui, repo, **opts):
6364 def root(ui, repo, **opts):
6366 """print the root (top) of the current working directory
6365 """print the root (top) of the current working directory
6367
6366
6368 Print the root directory of the current repository.
6367 Print the root directory of the current repository.
6369
6368
6370 .. container:: verbose
6369 .. container:: verbose
6371
6370
6372 Template:
6371 Template:
6373
6372
6374 The following keywords are supported in addition to the common template
6373 The following keywords are supported in addition to the common template
6375 keywords and functions. See also :hg:`help templates`.
6374 keywords and functions. See also :hg:`help templates`.
6376
6375
6377 :hgpath: String. Path to the .hg directory.
6376 :hgpath: String. Path to the .hg directory.
6378 :storepath: String. Path to the directory holding versioned data.
6377 :storepath: String. Path to the directory holding versioned data.
6379
6378
6380 Returns 0 on success.
6379 Returns 0 on success.
6381 """
6380 """
6382 opts = pycompat.byteskwargs(opts)
6381 opts = pycompat.byteskwargs(opts)
6383 with ui.formatter(b'root', opts) as fm:
6382 with ui.formatter(b'root', opts) as fm:
6384 fm.startitem()
6383 fm.startitem()
6385 fm.write(b'reporoot', b'%s\n', repo.root)
6384 fm.write(b'reporoot', b'%s\n', repo.root)
6386 fm.data(hgpath=repo.path, storepath=repo.spath)
6385 fm.data(hgpath=repo.path, storepath=repo.spath)
6387
6386
6388
6387
6389 @command(
6388 @command(
6390 b'serve',
6389 b'serve',
6391 [
6390 [
6392 (
6391 (
6393 b'A',
6392 b'A',
6394 b'accesslog',
6393 b'accesslog',
6395 b'',
6394 b'',
6396 _(b'name of access log file to write to'),
6395 _(b'name of access log file to write to'),
6397 _(b'FILE'),
6396 _(b'FILE'),
6398 ),
6397 ),
6399 (b'd', b'daemon', None, _(b'run server in background')),
6398 (b'd', b'daemon', None, _(b'run server in background')),
6400 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6399 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6401 (
6400 (
6402 b'E',
6401 b'E',
6403 b'errorlog',
6402 b'errorlog',
6404 b'',
6403 b'',
6405 _(b'name of error log file to write to'),
6404 _(b'name of error log file to write to'),
6406 _(b'FILE'),
6405 _(b'FILE'),
6407 ),
6406 ),
6408 # use string type, then we can check if something was passed
6407 # use string type, then we can check if something was passed
6409 (
6408 (
6410 b'p',
6409 b'p',
6411 b'port',
6410 b'port',
6412 b'',
6411 b'',
6413 _(b'port to listen on (default: 8000)'),
6412 _(b'port to listen on (default: 8000)'),
6414 _(b'PORT'),
6413 _(b'PORT'),
6415 ),
6414 ),
6416 (
6415 (
6417 b'a',
6416 b'a',
6418 b'address',
6417 b'address',
6419 b'',
6418 b'',
6420 _(b'address to listen on (default: all interfaces)'),
6419 _(b'address to listen on (default: all interfaces)'),
6421 _(b'ADDR'),
6420 _(b'ADDR'),
6422 ),
6421 ),
6423 (
6422 (
6424 b'',
6423 b'',
6425 b'prefix',
6424 b'prefix',
6426 b'',
6425 b'',
6427 _(b'prefix path to serve from (default: server root)'),
6426 _(b'prefix path to serve from (default: server root)'),
6428 _(b'PREFIX'),
6427 _(b'PREFIX'),
6429 ),
6428 ),
6430 (
6429 (
6431 b'n',
6430 b'n',
6432 b'name',
6431 b'name',
6433 b'',
6432 b'',
6434 _(b'name to show in web pages (default: working directory)'),
6433 _(b'name to show in web pages (default: working directory)'),
6435 _(b'NAME'),
6434 _(b'NAME'),
6436 ),
6435 ),
6437 (
6436 (
6438 b'',
6437 b'',
6439 b'web-conf',
6438 b'web-conf',
6440 b'',
6439 b'',
6441 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6440 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6442 _(b'FILE'),
6441 _(b'FILE'),
6443 ),
6442 ),
6444 (
6443 (
6445 b'',
6444 b'',
6446 b'webdir-conf',
6445 b'webdir-conf',
6447 b'',
6446 b'',
6448 _(b'name of the hgweb config file (DEPRECATED)'),
6447 _(b'name of the hgweb config file (DEPRECATED)'),
6449 _(b'FILE'),
6448 _(b'FILE'),
6450 ),
6449 ),
6451 (
6450 (
6452 b'',
6451 b'',
6453 b'pid-file',
6452 b'pid-file',
6454 b'',
6453 b'',
6455 _(b'name of file to write process ID to'),
6454 _(b'name of file to write process ID to'),
6456 _(b'FILE'),
6455 _(b'FILE'),
6457 ),
6456 ),
6458 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6457 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6459 (
6458 (
6460 b'',
6459 b'',
6461 b'cmdserver',
6460 b'cmdserver',
6462 b'',
6461 b'',
6463 _(b'for remote clients (ADVANCED)'),
6462 _(b'for remote clients (ADVANCED)'),
6464 _(b'MODE'),
6463 _(b'MODE'),
6465 ),
6464 ),
6466 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6465 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6467 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6466 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6468 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6467 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6469 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6468 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6470 (b'', b'print-url', None, _(b'start and print only the URL')),
6469 (b'', b'print-url', None, _(b'start and print only the URL')),
6471 ]
6470 ]
6472 + subrepoopts,
6471 + subrepoopts,
6473 _(b'[OPTION]...'),
6472 _(b'[OPTION]...'),
6474 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6473 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6475 helpbasic=True,
6474 helpbasic=True,
6476 optionalrepo=True,
6475 optionalrepo=True,
6477 )
6476 )
6478 def serve(ui, repo, **opts):
6477 def serve(ui, repo, **opts):
6479 """start stand-alone webserver
6478 """start stand-alone webserver
6480
6479
6481 Start a local HTTP repository browser and pull server. You can use
6480 Start a local HTTP repository browser and pull server. You can use
6482 this for ad-hoc sharing and browsing of repositories. It is
6481 this for ad-hoc sharing and browsing of repositories. It is
6483 recommended to use a real web server to serve a repository for
6482 recommended to use a real web server to serve a repository for
6484 longer periods of time.
6483 longer periods of time.
6485
6484
6486 Please note that the server does not implement access control.
6485 Please note that the server does not implement access control.
6487 This means that, by default, anybody can read from the server and
6486 This means that, by default, anybody can read from the server and
6488 nobody can write to it by default. Set the ``web.allow-push``
6487 nobody can write to it by default. Set the ``web.allow-push``
6489 option to ``*`` to allow everybody to push to the server. You
6488 option to ``*`` to allow everybody to push to the server. You
6490 should use a real web server if you need to authenticate users.
6489 should use a real web server if you need to authenticate users.
6491
6490
6492 By default, the server logs accesses to stdout and errors to
6491 By default, the server logs accesses to stdout and errors to
6493 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6492 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6494 files.
6493 files.
6495
6494
6496 To have the server choose a free port number to listen on, specify
6495 To have the server choose a free port number to listen on, specify
6497 a port number of 0; in this case, the server will print the port
6496 a port number of 0; in this case, the server will print the port
6498 number it uses.
6497 number it uses.
6499
6498
6500 Returns 0 on success.
6499 Returns 0 on success.
6501 """
6500 """
6502
6501
6503 opts = pycompat.byteskwargs(opts)
6502 opts = pycompat.byteskwargs(opts)
6504 if opts[b"stdio"] and opts[b"cmdserver"]:
6503 if opts[b"stdio"] and opts[b"cmdserver"]:
6505 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6504 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6506 if opts[b"print_url"] and ui.verbose:
6505 if opts[b"print_url"] and ui.verbose:
6507 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6506 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6508
6507
6509 if opts[b"stdio"]:
6508 if opts[b"stdio"]:
6510 if repo is None:
6509 if repo is None:
6511 raise error.RepoError(
6510 raise error.RepoError(
6512 _(b"there is no Mercurial repository here (.hg not found)")
6511 _(b"there is no Mercurial repository here (.hg not found)")
6513 )
6512 )
6514 s = wireprotoserver.sshserver(ui, repo)
6513 s = wireprotoserver.sshserver(ui, repo)
6515 s.serve_forever()
6514 s.serve_forever()
6516
6515
6517 service = server.createservice(ui, repo, opts)
6516 service = server.createservice(ui, repo, opts)
6518 return server.runservice(opts, initfn=service.init, runfn=service.run)
6517 return server.runservice(opts, initfn=service.init, runfn=service.run)
6519
6518
6520
6519
6521 @command(
6520 @command(
6522 b'shelve',
6521 b'shelve',
6523 [
6522 [
6524 (
6523 (
6525 b'A',
6524 b'A',
6526 b'addremove',
6525 b'addremove',
6527 None,
6526 None,
6528 _(b'mark new/missing files as added/removed before shelving'),
6527 _(b'mark new/missing files as added/removed before shelving'),
6529 ),
6528 ),
6530 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6529 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6531 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6530 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6532 (
6531 (
6533 b'',
6532 b'',
6534 b'date',
6533 b'date',
6535 b'',
6534 b'',
6536 _(b'shelve with the specified commit date'),
6535 _(b'shelve with the specified commit date'),
6537 _(b'DATE'),
6536 _(b'DATE'),
6538 ),
6537 ),
6539 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6538 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6540 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6539 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6541 (
6540 (
6542 b'k',
6541 b'k',
6543 b'keep',
6542 b'keep',
6544 False,
6543 False,
6545 _(b'shelve, but keep changes in the working directory'),
6544 _(b'shelve, but keep changes in the working directory'),
6546 ),
6545 ),
6547 (b'l', b'list', None, _(b'list current shelves')),
6546 (b'l', b'list', None, _(b'list current shelves')),
6548 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6547 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6549 (
6548 (
6550 b'n',
6549 b'n',
6551 b'name',
6550 b'name',
6552 b'',
6551 b'',
6553 _(b'use the given name for the shelved commit'),
6552 _(b'use the given name for the shelved commit'),
6554 _(b'NAME'),
6553 _(b'NAME'),
6555 ),
6554 ),
6556 (
6555 (
6557 b'p',
6556 b'p',
6558 b'patch',
6557 b'patch',
6559 None,
6558 None,
6560 _(
6559 _(
6561 b'output patches for changes (provide the names of the shelved '
6560 b'output patches for changes (provide the names of the shelved '
6562 b'changes as positional arguments)'
6561 b'changes as positional arguments)'
6563 ),
6562 ),
6564 ),
6563 ),
6565 (b'i', b'interactive', None, _(b'interactive mode')),
6564 (b'i', b'interactive', None, _(b'interactive mode')),
6566 (
6565 (
6567 b'',
6566 b'',
6568 b'stat',
6567 b'stat',
6569 None,
6568 None,
6570 _(
6569 _(
6571 b'output diffstat-style summary of changes (provide the names of '
6570 b'output diffstat-style summary of changes (provide the names of '
6572 b'the shelved changes as positional arguments)'
6571 b'the shelved changes as positional arguments)'
6573 ),
6572 ),
6574 ),
6573 ),
6575 ]
6574 ]
6576 + cmdutil.walkopts,
6575 + cmdutil.walkopts,
6577 _(b'hg shelve [OPTION]... [FILE]...'),
6576 _(b'hg shelve [OPTION]... [FILE]...'),
6578 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6577 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6579 )
6578 )
6580 def shelve(ui, repo, *pats, **opts):
6579 def shelve(ui, repo, *pats, **opts):
6581 '''save and set aside changes from the working directory
6580 '''save and set aside changes from the working directory
6582
6581
6583 Shelving takes files that "hg status" reports as not clean, saves
6582 Shelving takes files that "hg status" reports as not clean, saves
6584 the modifications to a bundle (a shelved change), and reverts the
6583 the modifications to a bundle (a shelved change), and reverts the
6585 files so that their state in the working directory becomes clean.
6584 files so that their state in the working directory becomes clean.
6586
6585
6587 To restore these changes to the working directory, using "hg
6586 To restore these changes to the working directory, using "hg
6588 unshelve"; this will work even if you switch to a different
6587 unshelve"; this will work even if you switch to a different
6589 commit.
6588 commit.
6590
6589
6591 When no files are specified, "hg shelve" saves all not-clean
6590 When no files are specified, "hg shelve" saves all not-clean
6592 files. If specific files or directories are named, only changes to
6591 files. If specific files or directories are named, only changes to
6593 those files are shelved.
6592 those files are shelved.
6594
6593
6595 In bare shelve (when no files are specified, without interactive,
6594 In bare shelve (when no files are specified, without interactive,
6596 include and exclude option), shelving remembers information if the
6595 include and exclude option), shelving remembers information if the
6597 working directory was on newly created branch, in other words working
6596 working directory was on newly created branch, in other words working
6598 directory was on different branch than its first parent. In this
6597 directory was on different branch than its first parent. In this
6599 situation unshelving restores branch information to the working directory.
6598 situation unshelving restores branch information to the working directory.
6600
6599
6601 Each shelved change has a name that makes it easier to find later.
6600 Each shelved change has a name that makes it easier to find later.
6602 The name of a shelved change defaults to being based on the active
6601 The name of a shelved change defaults to being based on the active
6603 bookmark, or if there is no active bookmark, the current named
6602 bookmark, or if there is no active bookmark, the current named
6604 branch. To specify a different name, use ``--name``.
6603 branch. To specify a different name, use ``--name``.
6605
6604
6606 To see a list of existing shelved changes, use the ``--list``
6605 To see a list of existing shelved changes, use the ``--list``
6607 option. For each shelved change, this will print its name, age,
6606 option. For each shelved change, this will print its name, age,
6608 and description; use ``--patch`` or ``--stat`` for more details.
6607 and description; use ``--patch`` or ``--stat`` for more details.
6609
6608
6610 To delete specific shelved changes, use ``--delete``. To delete
6609 To delete specific shelved changes, use ``--delete``. To delete
6611 all shelved changes, use ``--cleanup``.
6610 all shelved changes, use ``--cleanup``.
6612 '''
6611 '''
6613 opts = pycompat.byteskwargs(opts)
6612 opts = pycompat.byteskwargs(opts)
6614 allowables = [
6613 allowables = [
6615 (b'addremove', {b'create'}), # 'create' is pseudo action
6614 (b'addremove', {b'create'}), # 'create' is pseudo action
6616 (b'unknown', {b'create'}),
6615 (b'unknown', {b'create'}),
6617 (b'cleanup', {b'cleanup'}),
6616 (b'cleanup', {b'cleanup'}),
6618 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6617 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6619 (b'delete', {b'delete'}),
6618 (b'delete', {b'delete'}),
6620 (b'edit', {b'create'}),
6619 (b'edit', {b'create'}),
6621 (b'keep', {b'create'}),
6620 (b'keep', {b'create'}),
6622 (b'list', {b'list'}),
6621 (b'list', {b'list'}),
6623 (b'message', {b'create'}),
6622 (b'message', {b'create'}),
6624 (b'name', {b'create'}),
6623 (b'name', {b'create'}),
6625 (b'patch', {b'patch', b'list'}),
6624 (b'patch', {b'patch', b'list'}),
6626 (b'stat', {b'stat', b'list'}),
6625 (b'stat', {b'stat', b'list'}),
6627 ]
6626 ]
6628
6627
6629 def checkopt(opt):
6628 def checkopt(opt):
6630 if opts.get(opt):
6629 if opts.get(opt):
6631 for i, allowable in allowables:
6630 for i, allowable in allowables:
6632 if opts[i] and opt not in allowable:
6631 if opts[i] and opt not in allowable:
6633 raise error.Abort(
6632 raise error.Abort(
6634 _(
6633 _(
6635 b"options '--%s' and '--%s' may not be "
6634 b"options '--%s' and '--%s' may not be "
6636 b"used together"
6635 b"used together"
6637 )
6636 )
6638 % (opt, i)
6637 % (opt, i)
6639 )
6638 )
6640 return True
6639 return True
6641
6640
6642 if checkopt(b'cleanup'):
6641 if checkopt(b'cleanup'):
6643 if pats:
6642 if pats:
6644 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6643 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6645 return shelvemod.cleanupcmd(ui, repo)
6644 return shelvemod.cleanupcmd(ui, repo)
6646 elif checkopt(b'delete'):
6645 elif checkopt(b'delete'):
6647 return shelvemod.deletecmd(ui, repo, pats)
6646 return shelvemod.deletecmd(ui, repo, pats)
6648 elif checkopt(b'list'):
6647 elif checkopt(b'list'):
6649 return shelvemod.listcmd(ui, repo, pats, opts)
6648 return shelvemod.listcmd(ui, repo, pats, opts)
6650 elif checkopt(b'patch') or checkopt(b'stat'):
6649 elif checkopt(b'patch') or checkopt(b'stat'):
6651 return shelvemod.patchcmds(ui, repo, pats, opts)
6650 return shelvemod.patchcmds(ui, repo, pats, opts)
6652 else:
6651 else:
6653 return shelvemod.createcmd(ui, repo, pats, opts)
6652 return shelvemod.createcmd(ui, repo, pats, opts)
6654
6653
6655
6654
6656 _NOTTERSE = b'nothing'
6655 _NOTTERSE = b'nothing'
6657
6656
6658
6657
6659 @command(
6658 @command(
6660 b'status|st',
6659 b'status|st',
6661 [
6660 [
6662 (b'A', b'all', None, _(b'show status of all files')),
6661 (b'A', b'all', None, _(b'show status of all files')),
6663 (b'm', b'modified', None, _(b'show only modified files')),
6662 (b'm', b'modified', None, _(b'show only modified files')),
6664 (b'a', b'added', None, _(b'show only added files')),
6663 (b'a', b'added', None, _(b'show only added files')),
6665 (b'r', b'removed', None, _(b'show only removed files')),
6664 (b'r', b'removed', None, _(b'show only removed files')),
6666 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6665 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6667 (b'c', b'clean', None, _(b'show only files without changes')),
6666 (b'c', b'clean', None, _(b'show only files without changes')),
6668 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6667 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6669 (b'i', b'ignored', None, _(b'show only ignored files')),
6668 (b'i', b'ignored', None, _(b'show only ignored files')),
6670 (b'n', b'no-status', None, _(b'hide status prefix')),
6669 (b'n', b'no-status', None, _(b'hide status prefix')),
6671 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6670 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6672 (
6671 (
6673 b'C',
6672 b'C',
6674 b'copies',
6673 b'copies',
6675 None,
6674 None,
6676 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6675 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6677 ),
6676 ),
6678 (
6677 (
6679 b'0',
6678 b'0',
6680 b'print0',
6679 b'print0',
6681 None,
6680 None,
6682 _(b'end filenames with NUL, for use with xargs'),
6681 _(b'end filenames with NUL, for use with xargs'),
6683 ),
6682 ),
6684 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6683 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6685 (
6684 (
6686 b'',
6685 b'',
6687 b'change',
6686 b'change',
6688 b'',
6687 b'',
6689 _(b'list the changed files of a revision'),
6688 _(b'list the changed files of a revision'),
6690 _(b'REV'),
6689 _(b'REV'),
6691 ),
6690 ),
6692 ]
6691 ]
6693 + walkopts
6692 + walkopts
6694 + subrepoopts
6693 + subrepoopts
6695 + formatteropts,
6694 + formatteropts,
6696 _(b'[OPTION]... [FILE]...'),
6695 _(b'[OPTION]... [FILE]...'),
6697 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6696 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6698 helpbasic=True,
6697 helpbasic=True,
6699 inferrepo=True,
6698 inferrepo=True,
6700 intents={INTENT_READONLY},
6699 intents={INTENT_READONLY},
6701 )
6700 )
6702 def status(ui, repo, *pats, **opts):
6701 def status(ui, repo, *pats, **opts):
6703 """show changed files in the working directory
6702 """show changed files in the working directory
6704
6703
6705 Show status of files in the repository. If names are given, only
6704 Show status of files in the repository. If names are given, only
6706 files that match are shown. Files that are clean or ignored or
6705 files that match are shown. Files that are clean or ignored or
6707 the source of a copy/move operation, are not listed unless
6706 the source of a copy/move operation, are not listed unless
6708 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6707 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6709 Unless options described with "show only ..." are given, the
6708 Unless options described with "show only ..." are given, the
6710 options -mardu are used.
6709 options -mardu are used.
6711
6710
6712 Option -q/--quiet hides untracked (unknown and ignored) files
6711 Option -q/--quiet hides untracked (unknown and ignored) files
6713 unless explicitly requested with -u/--unknown or -i/--ignored.
6712 unless explicitly requested with -u/--unknown or -i/--ignored.
6714
6713
6715 .. note::
6714 .. note::
6716
6715
6717 :hg:`status` may appear to disagree with diff if permissions have
6716 :hg:`status` may appear to disagree with diff if permissions have
6718 changed or a merge has occurred. The standard diff format does
6717 changed or a merge has occurred. The standard diff format does
6719 not report permission changes and diff only reports changes
6718 not report permission changes and diff only reports changes
6720 relative to one merge parent.
6719 relative to one merge parent.
6721
6720
6722 If one revision is given, it is used as the base revision.
6721 If one revision is given, it is used as the base revision.
6723 If two revisions are given, the differences between them are
6722 If two revisions are given, the differences between them are
6724 shown. The --change option can also be used as a shortcut to list
6723 shown. The --change option can also be used as a shortcut to list
6725 the changed files of a revision from its first parent.
6724 the changed files of a revision from its first parent.
6726
6725
6727 The codes used to show the status of files are::
6726 The codes used to show the status of files are::
6728
6727
6729 M = modified
6728 M = modified
6730 A = added
6729 A = added
6731 R = removed
6730 R = removed
6732 C = clean
6731 C = clean
6733 ! = missing (deleted by non-hg command, but still tracked)
6732 ! = missing (deleted by non-hg command, but still tracked)
6734 ? = not tracked
6733 ? = not tracked
6735 I = ignored
6734 I = ignored
6736 = origin of the previous file (with --copies)
6735 = origin of the previous file (with --copies)
6737
6736
6738 .. container:: verbose
6737 .. container:: verbose
6739
6738
6740 The -t/--terse option abbreviates the output by showing only the directory
6739 The -t/--terse option abbreviates the output by showing only the directory
6741 name if all the files in it share the same status. The option takes an
6740 name if all the files in it share the same status. The option takes an
6742 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6741 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6743 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6742 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6744 for 'ignored' and 'c' for clean.
6743 for 'ignored' and 'c' for clean.
6745
6744
6746 It abbreviates only those statuses which are passed. Note that clean and
6745 It abbreviates only those statuses which are passed. Note that clean and
6747 ignored files are not displayed with '--terse ic' unless the -c/--clean
6746 ignored files are not displayed with '--terse ic' unless the -c/--clean
6748 and -i/--ignored options are also used.
6747 and -i/--ignored options are also used.
6749
6748
6750 The -v/--verbose option shows information when the repository is in an
6749 The -v/--verbose option shows information when the repository is in an
6751 unfinished merge, shelve, rebase state etc. You can have this behavior
6750 unfinished merge, shelve, rebase state etc. You can have this behavior
6752 turned on by default by enabling the ``commands.status.verbose`` option.
6751 turned on by default by enabling the ``commands.status.verbose`` option.
6753
6752
6754 You can skip displaying some of these states by setting
6753 You can skip displaying some of these states by setting
6755 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6754 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6756 'histedit', 'merge', 'rebase', or 'unshelve'.
6755 'histedit', 'merge', 'rebase', or 'unshelve'.
6757
6756
6758 Template:
6757 Template:
6759
6758
6760 The following keywords are supported in addition to the common template
6759 The following keywords are supported in addition to the common template
6761 keywords and functions. See also :hg:`help templates`.
6760 keywords and functions. See also :hg:`help templates`.
6762
6761
6763 :path: String. Repository-absolute path of the file.
6762 :path: String. Repository-absolute path of the file.
6764 :source: String. Repository-absolute path of the file originated from.
6763 :source: String. Repository-absolute path of the file originated from.
6765 Available if ``--copies`` is specified.
6764 Available if ``--copies`` is specified.
6766 :status: String. Character denoting file's status.
6765 :status: String. Character denoting file's status.
6767
6766
6768 Examples:
6767 Examples:
6769
6768
6770 - show changes in the working directory relative to a
6769 - show changes in the working directory relative to a
6771 changeset::
6770 changeset::
6772
6771
6773 hg status --rev 9353
6772 hg status --rev 9353
6774
6773
6775 - show changes in the working directory relative to the
6774 - show changes in the working directory relative to the
6776 current directory (see :hg:`help patterns` for more information)::
6775 current directory (see :hg:`help patterns` for more information)::
6777
6776
6778 hg status re:
6777 hg status re:
6779
6778
6780 - show all changes including copies in an existing changeset::
6779 - show all changes including copies in an existing changeset::
6781
6780
6782 hg status --copies --change 9353
6781 hg status --copies --change 9353
6783
6782
6784 - get a NUL separated list of added files, suitable for xargs::
6783 - get a NUL separated list of added files, suitable for xargs::
6785
6784
6786 hg status -an0
6785 hg status -an0
6787
6786
6788 - show more information about the repository status, abbreviating
6787 - show more information about the repository status, abbreviating
6789 added, removed, modified, deleted, and untracked paths::
6788 added, removed, modified, deleted, and untracked paths::
6790
6789
6791 hg status -v -t mardu
6790 hg status -v -t mardu
6792
6791
6793 Returns 0 on success.
6792 Returns 0 on success.
6794
6793
6795 """
6794 """
6796
6795
6797 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6796 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6798 opts = pycompat.byteskwargs(opts)
6797 opts = pycompat.byteskwargs(opts)
6799 revs = opts.get(b'rev')
6798 revs = opts.get(b'rev')
6800 change = opts.get(b'change')
6799 change = opts.get(b'change')
6801 terse = opts.get(b'terse')
6800 terse = opts.get(b'terse')
6802 if terse is _NOTTERSE:
6801 if terse is _NOTTERSE:
6803 if revs:
6802 if revs:
6804 terse = b''
6803 terse = b''
6805 else:
6804 else:
6806 terse = ui.config(b'commands', b'status.terse')
6805 terse = ui.config(b'commands', b'status.terse')
6807
6806
6808 if revs and terse:
6807 if revs and terse:
6809 msg = _(b'cannot use --terse with --rev')
6808 msg = _(b'cannot use --terse with --rev')
6810 raise error.Abort(msg)
6809 raise error.Abort(msg)
6811 elif change:
6810 elif change:
6812 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6811 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6813 ctx2 = scmutil.revsingle(repo, change, None)
6812 ctx2 = scmutil.revsingle(repo, change, None)
6814 ctx1 = ctx2.p1()
6813 ctx1 = ctx2.p1()
6815 else:
6814 else:
6816 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6815 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6817 ctx1, ctx2 = scmutil.revpair(repo, revs)
6816 ctx1, ctx2 = scmutil.revpair(repo, revs)
6818
6817
6819 forcerelativevalue = None
6818 forcerelativevalue = None
6820 if ui.hasconfig(b'commands', b'status.relative'):
6819 if ui.hasconfig(b'commands', b'status.relative'):
6821 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6820 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6822 uipathfn = scmutil.getuipathfn(
6821 uipathfn = scmutil.getuipathfn(
6823 repo,
6822 repo,
6824 legacyrelativevalue=bool(pats),
6823 legacyrelativevalue=bool(pats),
6825 forcerelativevalue=forcerelativevalue,
6824 forcerelativevalue=forcerelativevalue,
6826 )
6825 )
6827
6826
6828 if opts.get(b'print0'):
6827 if opts.get(b'print0'):
6829 end = b'\0'
6828 end = b'\0'
6830 else:
6829 else:
6831 end = b'\n'
6830 end = b'\n'
6832 states = b'modified added removed deleted unknown ignored clean'.split()
6831 states = b'modified added removed deleted unknown ignored clean'.split()
6833 show = [k for k in states if opts.get(k)]
6832 show = [k for k in states if opts.get(k)]
6834 if opts.get(b'all'):
6833 if opts.get(b'all'):
6835 show += ui.quiet and (states[:4] + [b'clean']) or states
6834 show += ui.quiet and (states[:4] + [b'clean']) or states
6836
6835
6837 if not show:
6836 if not show:
6838 if ui.quiet:
6837 if ui.quiet:
6839 show = states[:4]
6838 show = states[:4]
6840 else:
6839 else:
6841 show = states[:5]
6840 show = states[:5]
6842
6841
6843 m = scmutil.match(ctx2, pats, opts)
6842 m = scmutil.match(ctx2, pats, opts)
6844 if terse:
6843 if terse:
6845 # we need to compute clean and unknown to terse
6844 # we need to compute clean and unknown to terse
6846 stat = repo.status(
6845 stat = repo.status(
6847 ctx1.node(),
6846 ctx1.node(),
6848 ctx2.node(),
6847 ctx2.node(),
6849 m,
6848 m,
6850 b'ignored' in show or b'i' in terse,
6849 b'ignored' in show or b'i' in terse,
6851 clean=True,
6850 clean=True,
6852 unknown=True,
6851 unknown=True,
6853 listsubrepos=opts.get(b'subrepos'),
6852 listsubrepos=opts.get(b'subrepos'),
6854 )
6853 )
6855
6854
6856 stat = cmdutil.tersedir(stat, terse)
6855 stat = cmdutil.tersedir(stat, terse)
6857 else:
6856 else:
6858 stat = repo.status(
6857 stat = repo.status(
6859 ctx1.node(),
6858 ctx1.node(),
6860 ctx2.node(),
6859 ctx2.node(),
6861 m,
6860 m,
6862 b'ignored' in show,
6861 b'ignored' in show,
6863 b'clean' in show,
6862 b'clean' in show,
6864 b'unknown' in show,
6863 b'unknown' in show,
6865 opts.get(b'subrepos'),
6864 opts.get(b'subrepos'),
6866 )
6865 )
6867
6866
6868 changestates = zip(
6867 changestates = zip(
6869 states,
6868 states,
6870 pycompat.iterbytestr(b'MAR!?IC'),
6869 pycompat.iterbytestr(b'MAR!?IC'),
6871 [getattr(stat, s.decode('utf8')) for s in states],
6870 [getattr(stat, s.decode('utf8')) for s in states],
6872 )
6871 )
6873
6872
6874 copy = {}
6873 copy = {}
6875 if (
6874 if (
6876 opts.get(b'all')
6875 opts.get(b'all')
6877 or opts.get(b'copies')
6876 or opts.get(b'copies')
6878 or ui.configbool(b'ui', b'statuscopies')
6877 or ui.configbool(b'ui', b'statuscopies')
6879 ) and not opts.get(b'no_status'):
6878 ) and not opts.get(b'no_status'):
6880 copy = copies.pathcopies(ctx1, ctx2, m)
6879 copy = copies.pathcopies(ctx1, ctx2, m)
6881
6880
6882 morestatus = None
6881 morestatus = None
6883 if (
6882 if (
6884 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6883 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6885 ) and not ui.plain():
6884 ) and not ui.plain():
6886 morestatus = cmdutil.readmorestatus(repo)
6885 morestatus = cmdutil.readmorestatus(repo)
6887
6886
6888 ui.pager(b'status')
6887 ui.pager(b'status')
6889 fm = ui.formatter(b'status', opts)
6888 fm = ui.formatter(b'status', opts)
6890 fmt = b'%s' + end
6889 fmt = b'%s' + end
6891 showchar = not opts.get(b'no_status')
6890 showchar = not opts.get(b'no_status')
6892
6891
6893 for state, char, files in changestates:
6892 for state, char, files in changestates:
6894 if state in show:
6893 if state in show:
6895 label = b'status.' + state
6894 label = b'status.' + state
6896 for f in files:
6895 for f in files:
6897 fm.startitem()
6896 fm.startitem()
6898 fm.context(ctx=ctx2)
6897 fm.context(ctx=ctx2)
6899 fm.data(itemtype=b'file', path=f)
6898 fm.data(itemtype=b'file', path=f)
6900 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6899 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6901 fm.plain(fmt % uipathfn(f), label=label)
6900 fm.plain(fmt % uipathfn(f), label=label)
6902 if f in copy:
6901 if f in copy:
6903 fm.data(source=copy[f])
6902 fm.data(source=copy[f])
6904 fm.plain(
6903 fm.plain(
6905 (b' %s' + end) % uipathfn(copy[f]),
6904 (b' %s' + end) % uipathfn(copy[f]),
6906 label=b'status.copied',
6905 label=b'status.copied',
6907 )
6906 )
6908 if morestatus:
6907 if morestatus:
6909 morestatus.formatfile(f, fm)
6908 morestatus.formatfile(f, fm)
6910
6909
6911 if morestatus:
6910 if morestatus:
6912 morestatus.formatfooter(fm)
6911 morestatus.formatfooter(fm)
6913 fm.end()
6912 fm.end()
6914
6913
6915
6914
6916 @command(
6915 @command(
6917 b'summary|sum',
6916 b'summary|sum',
6918 [(b'', b'remote', None, _(b'check for push and pull'))],
6917 [(b'', b'remote', None, _(b'check for push and pull'))],
6919 b'[--remote]',
6918 b'[--remote]',
6920 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6919 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6921 helpbasic=True,
6920 helpbasic=True,
6922 intents={INTENT_READONLY},
6921 intents={INTENT_READONLY},
6923 )
6922 )
6924 def summary(ui, repo, **opts):
6923 def summary(ui, repo, **opts):
6925 """summarize working directory state
6924 """summarize working directory state
6926
6925
6927 This generates a brief summary of the working directory state,
6926 This generates a brief summary of the working directory state,
6928 including parents, branch, commit status, phase and available updates.
6927 including parents, branch, commit status, phase and available updates.
6929
6928
6930 With the --remote option, this will check the default paths for
6929 With the --remote option, this will check the default paths for
6931 incoming and outgoing changes. This can be time-consuming.
6930 incoming and outgoing changes. This can be time-consuming.
6932
6931
6933 Returns 0 on success.
6932 Returns 0 on success.
6934 """
6933 """
6935
6934
6936 opts = pycompat.byteskwargs(opts)
6935 opts = pycompat.byteskwargs(opts)
6937 ui.pager(b'summary')
6936 ui.pager(b'summary')
6938 ctx = repo[None]
6937 ctx = repo[None]
6939 parents = ctx.parents()
6938 parents = ctx.parents()
6940 pnode = parents[0].node()
6939 pnode = parents[0].node()
6941 marks = []
6940 marks = []
6942
6941
6943 try:
6942 try:
6944 ms = mergestatemod.mergestate.read(repo)
6943 ms = mergestatemod.mergestate.read(repo)
6945 except error.UnsupportedMergeRecords as e:
6944 except error.UnsupportedMergeRecords as e:
6946 s = b' '.join(e.recordtypes)
6945 s = b' '.join(e.recordtypes)
6947 ui.warn(
6946 ui.warn(
6948 _(b'warning: merge state has unsupported record types: %s\n') % s
6947 _(b'warning: merge state has unsupported record types: %s\n') % s
6949 )
6948 )
6950 unresolved = []
6949 unresolved = []
6951 else:
6950 else:
6952 unresolved = list(ms.unresolved())
6951 unresolved = list(ms.unresolved())
6953
6952
6954 for p in parents:
6953 for p in parents:
6955 # label with log.changeset (instead of log.parent) since this
6954 # label with log.changeset (instead of log.parent) since this
6956 # shows a working directory parent *changeset*:
6955 # shows a working directory parent *changeset*:
6957 # i18n: column positioning for "hg summary"
6956 # i18n: column positioning for "hg summary"
6958 ui.write(
6957 ui.write(
6959 _(b'parent: %d:%s ') % (p.rev(), p),
6958 _(b'parent: %d:%s ') % (p.rev(), p),
6960 label=logcmdutil.changesetlabels(p),
6959 label=logcmdutil.changesetlabels(p),
6961 )
6960 )
6962 ui.write(b' '.join(p.tags()), label=b'log.tag')
6961 ui.write(b' '.join(p.tags()), label=b'log.tag')
6963 if p.bookmarks():
6962 if p.bookmarks():
6964 marks.extend(p.bookmarks())
6963 marks.extend(p.bookmarks())
6965 if p.rev() == -1:
6964 if p.rev() == -1:
6966 if not len(repo):
6965 if not len(repo):
6967 ui.write(_(b' (empty repository)'))
6966 ui.write(_(b' (empty repository)'))
6968 else:
6967 else:
6969 ui.write(_(b' (no revision checked out)'))
6968 ui.write(_(b' (no revision checked out)'))
6970 if p.obsolete():
6969 if p.obsolete():
6971 ui.write(_(b' (obsolete)'))
6970 ui.write(_(b' (obsolete)'))
6972 if p.isunstable():
6971 if p.isunstable():
6973 instabilities = (
6972 instabilities = (
6974 ui.label(instability, b'trouble.%s' % instability)
6973 ui.label(instability, b'trouble.%s' % instability)
6975 for instability in p.instabilities()
6974 for instability in p.instabilities()
6976 )
6975 )
6977 ui.write(b' (' + b', '.join(instabilities) + b')')
6976 ui.write(b' (' + b', '.join(instabilities) + b')')
6978 ui.write(b'\n')
6977 ui.write(b'\n')
6979 if p.description():
6978 if p.description():
6980 ui.status(
6979 ui.status(
6981 b' ' + p.description().splitlines()[0].strip() + b'\n',
6980 b' ' + p.description().splitlines()[0].strip() + b'\n',
6982 label=b'log.summary',
6981 label=b'log.summary',
6983 )
6982 )
6984
6983
6985 branch = ctx.branch()
6984 branch = ctx.branch()
6986 bheads = repo.branchheads(branch)
6985 bheads = repo.branchheads(branch)
6987 # i18n: column positioning for "hg summary"
6986 # i18n: column positioning for "hg summary"
6988 m = _(b'branch: %s\n') % branch
6987 m = _(b'branch: %s\n') % branch
6989 if branch != b'default':
6988 if branch != b'default':
6990 ui.write(m, label=b'log.branch')
6989 ui.write(m, label=b'log.branch')
6991 else:
6990 else:
6992 ui.status(m, label=b'log.branch')
6991 ui.status(m, label=b'log.branch')
6993
6992
6994 if marks:
6993 if marks:
6995 active = repo._activebookmark
6994 active = repo._activebookmark
6996 # i18n: column positioning for "hg summary"
6995 # i18n: column positioning for "hg summary"
6997 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6996 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6998 if active is not None:
6997 if active is not None:
6999 if active in marks:
6998 if active in marks:
7000 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6999 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7001 marks.remove(active)
7000 marks.remove(active)
7002 else:
7001 else:
7003 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7002 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7004 for m in marks:
7003 for m in marks:
7005 ui.write(b' ' + m, label=b'log.bookmark')
7004 ui.write(b' ' + m, label=b'log.bookmark')
7006 ui.write(b'\n', label=b'log.bookmark')
7005 ui.write(b'\n', label=b'log.bookmark')
7007
7006
7008 status = repo.status(unknown=True)
7007 status = repo.status(unknown=True)
7009
7008
7010 c = repo.dirstate.copies()
7009 c = repo.dirstate.copies()
7011 copied, renamed = [], []
7010 copied, renamed = [], []
7012 for d, s in pycompat.iteritems(c):
7011 for d, s in pycompat.iteritems(c):
7013 if s in status.removed:
7012 if s in status.removed:
7014 status.removed.remove(s)
7013 status.removed.remove(s)
7015 renamed.append(d)
7014 renamed.append(d)
7016 else:
7015 else:
7017 copied.append(d)
7016 copied.append(d)
7018 if d in status.added:
7017 if d in status.added:
7019 status.added.remove(d)
7018 status.added.remove(d)
7020
7019
7021 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7020 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7022
7021
7023 labels = [
7022 labels = [
7024 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7023 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7025 (ui.label(_(b'%d added'), b'status.added'), status.added),
7024 (ui.label(_(b'%d added'), b'status.added'), status.added),
7026 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7025 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7027 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7026 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7028 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7027 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7029 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7028 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7030 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7029 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7031 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7030 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7032 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7031 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7033 ]
7032 ]
7034 t = []
7033 t = []
7035 for l, s in labels:
7034 for l, s in labels:
7036 if s:
7035 if s:
7037 t.append(l % len(s))
7036 t.append(l % len(s))
7038
7037
7039 t = b', '.join(t)
7038 t = b', '.join(t)
7040 cleanworkdir = False
7039 cleanworkdir = False
7041
7040
7042 if repo.vfs.exists(b'graftstate'):
7041 if repo.vfs.exists(b'graftstate'):
7043 t += _(b' (graft in progress)')
7042 t += _(b' (graft in progress)')
7044 if repo.vfs.exists(b'updatestate'):
7043 if repo.vfs.exists(b'updatestate'):
7045 t += _(b' (interrupted update)')
7044 t += _(b' (interrupted update)')
7046 elif len(parents) > 1:
7045 elif len(parents) > 1:
7047 t += _(b' (merge)')
7046 t += _(b' (merge)')
7048 elif branch != parents[0].branch():
7047 elif branch != parents[0].branch():
7049 t += _(b' (new branch)')
7048 t += _(b' (new branch)')
7050 elif parents[0].closesbranch() and pnode in repo.branchheads(
7049 elif parents[0].closesbranch() and pnode in repo.branchheads(
7051 branch, closed=True
7050 branch, closed=True
7052 ):
7051 ):
7053 t += _(b' (head closed)')
7052 t += _(b' (head closed)')
7054 elif not (
7053 elif not (
7055 status.modified
7054 status.modified
7056 or status.added
7055 or status.added
7057 or status.removed
7056 or status.removed
7058 or renamed
7057 or renamed
7059 or copied
7058 or copied
7060 or subs
7059 or subs
7061 ):
7060 ):
7062 t += _(b' (clean)')
7061 t += _(b' (clean)')
7063 cleanworkdir = True
7062 cleanworkdir = True
7064 elif pnode not in bheads:
7063 elif pnode not in bheads:
7065 t += _(b' (new branch head)')
7064 t += _(b' (new branch head)')
7066
7065
7067 if parents:
7066 if parents:
7068 pendingphase = max(p.phase() for p in parents)
7067 pendingphase = max(p.phase() for p in parents)
7069 else:
7068 else:
7070 pendingphase = phases.public
7069 pendingphase = phases.public
7071
7070
7072 if pendingphase > phases.newcommitphase(ui):
7071 if pendingphase > phases.newcommitphase(ui):
7073 t += b' (%s)' % phases.phasenames[pendingphase]
7072 t += b' (%s)' % phases.phasenames[pendingphase]
7074
7073
7075 if cleanworkdir:
7074 if cleanworkdir:
7076 # i18n: column positioning for "hg summary"
7075 # i18n: column positioning for "hg summary"
7077 ui.status(_(b'commit: %s\n') % t.strip())
7076 ui.status(_(b'commit: %s\n') % t.strip())
7078 else:
7077 else:
7079 # i18n: column positioning for "hg summary"
7078 # i18n: column positioning for "hg summary"
7080 ui.write(_(b'commit: %s\n') % t.strip())
7079 ui.write(_(b'commit: %s\n') % t.strip())
7081
7080
7082 # all ancestors of branch heads - all ancestors of parent = new csets
7081 # all ancestors of branch heads - all ancestors of parent = new csets
7083 new = len(
7082 new = len(
7084 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7083 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7085 )
7084 )
7086
7085
7087 if new == 0:
7086 if new == 0:
7088 # i18n: column positioning for "hg summary"
7087 # i18n: column positioning for "hg summary"
7089 ui.status(_(b'update: (current)\n'))
7088 ui.status(_(b'update: (current)\n'))
7090 elif pnode not in bheads:
7089 elif pnode not in bheads:
7091 # i18n: column positioning for "hg summary"
7090 # i18n: column positioning for "hg summary"
7092 ui.write(_(b'update: %d new changesets (update)\n') % new)
7091 ui.write(_(b'update: %d new changesets (update)\n') % new)
7093 else:
7092 else:
7094 # i18n: column positioning for "hg summary"
7093 # i18n: column positioning for "hg summary"
7095 ui.write(
7094 ui.write(
7096 _(b'update: %d new changesets, %d branch heads (merge)\n')
7095 _(b'update: %d new changesets, %d branch heads (merge)\n')
7097 % (new, len(bheads))
7096 % (new, len(bheads))
7098 )
7097 )
7099
7098
7100 t = []
7099 t = []
7101 draft = len(repo.revs(b'draft()'))
7100 draft = len(repo.revs(b'draft()'))
7102 if draft:
7101 if draft:
7103 t.append(_(b'%d draft') % draft)
7102 t.append(_(b'%d draft') % draft)
7104 secret = len(repo.revs(b'secret()'))
7103 secret = len(repo.revs(b'secret()'))
7105 if secret:
7104 if secret:
7106 t.append(_(b'%d secret') % secret)
7105 t.append(_(b'%d secret') % secret)
7107
7106
7108 if draft or secret:
7107 if draft or secret:
7109 ui.status(_(b'phases: %s\n') % b', '.join(t))
7108 ui.status(_(b'phases: %s\n') % b', '.join(t))
7110
7109
7111 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7110 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7112 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7111 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7113 numtrouble = len(repo.revs(trouble + b"()"))
7112 numtrouble = len(repo.revs(trouble + b"()"))
7114 # We write all the possibilities to ease translation
7113 # We write all the possibilities to ease translation
7115 troublemsg = {
7114 troublemsg = {
7116 b"orphan": _(b"orphan: %d changesets"),
7115 b"orphan": _(b"orphan: %d changesets"),
7117 b"contentdivergent": _(b"content-divergent: %d changesets"),
7116 b"contentdivergent": _(b"content-divergent: %d changesets"),
7118 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7117 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7119 }
7118 }
7120 if numtrouble > 0:
7119 if numtrouble > 0:
7121 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7120 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7122
7121
7123 cmdutil.summaryhooks(ui, repo)
7122 cmdutil.summaryhooks(ui, repo)
7124
7123
7125 if opts.get(b'remote'):
7124 if opts.get(b'remote'):
7126 needsincoming, needsoutgoing = True, True
7125 needsincoming, needsoutgoing = True, True
7127 else:
7126 else:
7128 needsincoming, needsoutgoing = False, False
7127 needsincoming, needsoutgoing = False, False
7129 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7128 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7130 if i:
7129 if i:
7131 needsincoming = True
7130 needsincoming = True
7132 if o:
7131 if o:
7133 needsoutgoing = True
7132 needsoutgoing = True
7134 if not needsincoming and not needsoutgoing:
7133 if not needsincoming and not needsoutgoing:
7135 return
7134 return
7136
7135
7137 def getincoming():
7136 def getincoming():
7138 source, branches = hg.parseurl(ui.expandpath(b'default'))
7137 source, branches = hg.parseurl(ui.expandpath(b'default'))
7139 sbranch = branches[0]
7138 sbranch = branches[0]
7140 try:
7139 try:
7141 other = hg.peer(repo, {}, source)
7140 other = hg.peer(repo, {}, source)
7142 except error.RepoError:
7141 except error.RepoError:
7143 if opts.get(b'remote'):
7142 if opts.get(b'remote'):
7144 raise
7143 raise
7145 return source, sbranch, None, None, None
7144 return source, sbranch, None, None, None
7146 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7145 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7147 if revs:
7146 if revs:
7148 revs = [other.lookup(rev) for rev in revs]
7147 revs = [other.lookup(rev) for rev in revs]
7149 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7148 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7150 repo.ui.pushbuffer()
7149 repo.ui.pushbuffer()
7151 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7150 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7152 repo.ui.popbuffer()
7151 repo.ui.popbuffer()
7153 return source, sbranch, other, commoninc, commoninc[1]
7152 return source, sbranch, other, commoninc, commoninc[1]
7154
7153
7155 if needsincoming:
7154 if needsincoming:
7156 source, sbranch, sother, commoninc, incoming = getincoming()
7155 source, sbranch, sother, commoninc, incoming = getincoming()
7157 else:
7156 else:
7158 source = sbranch = sother = commoninc = incoming = None
7157 source = sbranch = sother = commoninc = incoming = None
7159
7158
7160 def getoutgoing():
7159 def getoutgoing():
7161 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7160 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7162 dbranch = branches[0]
7161 dbranch = branches[0]
7163 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7162 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7164 if source != dest:
7163 if source != dest:
7165 try:
7164 try:
7166 dother = hg.peer(repo, {}, dest)
7165 dother = hg.peer(repo, {}, dest)
7167 except error.RepoError:
7166 except error.RepoError:
7168 if opts.get(b'remote'):
7167 if opts.get(b'remote'):
7169 raise
7168 raise
7170 return dest, dbranch, None, None
7169 return dest, dbranch, None, None
7171 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7170 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7172 elif sother is None:
7171 elif sother is None:
7173 # there is no explicit destination peer, but source one is invalid
7172 # there is no explicit destination peer, but source one is invalid
7174 return dest, dbranch, None, None
7173 return dest, dbranch, None, None
7175 else:
7174 else:
7176 dother = sother
7175 dother = sother
7177 if source != dest or (sbranch is not None and sbranch != dbranch):
7176 if source != dest or (sbranch is not None and sbranch != dbranch):
7178 common = None
7177 common = None
7179 else:
7178 else:
7180 common = commoninc
7179 common = commoninc
7181 if revs:
7180 if revs:
7182 revs = [repo.lookup(rev) for rev in revs]
7181 revs = [repo.lookup(rev) for rev in revs]
7183 repo.ui.pushbuffer()
7182 repo.ui.pushbuffer()
7184 outgoing = discovery.findcommonoutgoing(
7183 outgoing = discovery.findcommonoutgoing(
7185 repo, dother, onlyheads=revs, commoninc=common
7184 repo, dother, onlyheads=revs, commoninc=common
7186 )
7185 )
7187 repo.ui.popbuffer()
7186 repo.ui.popbuffer()
7188 return dest, dbranch, dother, outgoing
7187 return dest, dbranch, dother, outgoing
7189
7188
7190 if needsoutgoing:
7189 if needsoutgoing:
7191 dest, dbranch, dother, outgoing = getoutgoing()
7190 dest, dbranch, dother, outgoing = getoutgoing()
7192 else:
7191 else:
7193 dest = dbranch = dother = outgoing = None
7192 dest = dbranch = dother = outgoing = None
7194
7193
7195 if opts.get(b'remote'):
7194 if opts.get(b'remote'):
7196 t = []
7195 t = []
7197 if incoming:
7196 if incoming:
7198 t.append(_(b'1 or more incoming'))
7197 t.append(_(b'1 or more incoming'))
7199 o = outgoing.missing
7198 o = outgoing.missing
7200 if o:
7199 if o:
7201 t.append(_(b'%d outgoing') % len(o))
7200 t.append(_(b'%d outgoing') % len(o))
7202 other = dother or sother
7201 other = dother or sother
7203 if b'bookmarks' in other.listkeys(b'namespaces'):
7202 if b'bookmarks' in other.listkeys(b'namespaces'):
7204 counts = bookmarks.summary(repo, other)
7203 counts = bookmarks.summary(repo, other)
7205 if counts[0] > 0:
7204 if counts[0] > 0:
7206 t.append(_(b'%d incoming bookmarks') % counts[0])
7205 t.append(_(b'%d incoming bookmarks') % counts[0])
7207 if counts[1] > 0:
7206 if counts[1] > 0:
7208 t.append(_(b'%d outgoing bookmarks') % counts[1])
7207 t.append(_(b'%d outgoing bookmarks') % counts[1])
7209
7208
7210 if t:
7209 if t:
7211 # i18n: column positioning for "hg summary"
7210 # i18n: column positioning for "hg summary"
7212 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7211 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7213 else:
7212 else:
7214 # i18n: column positioning for "hg summary"
7213 # i18n: column positioning for "hg summary"
7215 ui.status(_(b'remote: (synced)\n'))
7214 ui.status(_(b'remote: (synced)\n'))
7216
7215
7217 cmdutil.summaryremotehooks(
7216 cmdutil.summaryremotehooks(
7218 ui,
7217 ui,
7219 repo,
7218 repo,
7220 opts,
7219 opts,
7221 (
7220 (
7222 (source, sbranch, sother, commoninc),
7221 (source, sbranch, sother, commoninc),
7223 (dest, dbranch, dother, outgoing),
7222 (dest, dbranch, dother, outgoing),
7224 ),
7223 ),
7225 )
7224 )
7226
7225
7227
7226
7228 @command(
7227 @command(
7229 b'tag',
7228 b'tag',
7230 [
7229 [
7231 (b'f', b'force', None, _(b'force tag')),
7230 (b'f', b'force', None, _(b'force tag')),
7232 (b'l', b'local', None, _(b'make the tag local')),
7231 (b'l', b'local', None, _(b'make the tag local')),
7233 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7232 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7234 (b'', b'remove', None, _(b'remove a tag')),
7233 (b'', b'remove', None, _(b'remove a tag')),
7235 # -l/--local is already there, commitopts cannot be used
7234 # -l/--local is already there, commitopts cannot be used
7236 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7235 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7237 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7236 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7238 ]
7237 ]
7239 + commitopts2,
7238 + commitopts2,
7240 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7239 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7241 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7240 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7242 )
7241 )
7243 def tag(ui, repo, name1, *names, **opts):
7242 def tag(ui, repo, name1, *names, **opts):
7244 """add one or more tags for the current or given revision
7243 """add one or more tags for the current or given revision
7245
7244
7246 Name a particular revision using <name>.
7245 Name a particular revision using <name>.
7247
7246
7248 Tags are used to name particular revisions of the repository and are
7247 Tags are used to name particular revisions of the repository and are
7249 very useful to compare different revisions, to go back to significant
7248 very useful to compare different revisions, to go back to significant
7250 earlier versions or to mark branch points as releases, etc. Changing
7249 earlier versions or to mark branch points as releases, etc. Changing
7251 an existing tag is normally disallowed; use -f/--force to override.
7250 an existing tag is normally disallowed; use -f/--force to override.
7252
7251
7253 If no revision is given, the parent of the working directory is
7252 If no revision is given, the parent of the working directory is
7254 used.
7253 used.
7255
7254
7256 To facilitate version control, distribution, and merging of tags,
7255 To facilitate version control, distribution, and merging of tags,
7257 they are stored as a file named ".hgtags" which is managed similarly
7256 they are stored as a file named ".hgtags" which is managed similarly
7258 to other project files and can be hand-edited if necessary. This
7257 to other project files and can be hand-edited if necessary. This
7259 also means that tagging creates a new commit. The file
7258 also means that tagging creates a new commit. The file
7260 ".hg/localtags" is used for local tags (not shared among
7259 ".hg/localtags" is used for local tags (not shared among
7261 repositories).
7260 repositories).
7262
7261
7263 Tag commits are usually made at the head of a branch. If the parent
7262 Tag commits are usually made at the head of a branch. If the parent
7264 of the working directory is not a branch head, :hg:`tag` aborts; use
7263 of the working directory is not a branch head, :hg:`tag` aborts; use
7265 -f/--force to force the tag commit to be based on a non-head
7264 -f/--force to force the tag commit to be based on a non-head
7266 changeset.
7265 changeset.
7267
7266
7268 See :hg:`help dates` for a list of formats valid for -d/--date.
7267 See :hg:`help dates` for a list of formats valid for -d/--date.
7269
7268
7270 Since tag names have priority over branch names during revision
7269 Since tag names have priority over branch names during revision
7271 lookup, using an existing branch name as a tag name is discouraged.
7270 lookup, using an existing branch name as a tag name is discouraged.
7272
7271
7273 Returns 0 on success.
7272 Returns 0 on success.
7274 """
7273 """
7275 opts = pycompat.byteskwargs(opts)
7274 opts = pycompat.byteskwargs(opts)
7276 with repo.wlock(), repo.lock():
7275 with repo.wlock(), repo.lock():
7277 rev_ = b"."
7276 rev_ = b"."
7278 names = [t.strip() for t in (name1,) + names]
7277 names = [t.strip() for t in (name1,) + names]
7279 if len(names) != len(set(names)):
7278 if len(names) != len(set(names)):
7280 raise error.Abort(_(b'tag names must be unique'))
7279 raise error.Abort(_(b'tag names must be unique'))
7281 for n in names:
7280 for n in names:
7282 scmutil.checknewlabel(repo, n, b'tag')
7281 scmutil.checknewlabel(repo, n, b'tag')
7283 if not n:
7282 if not n:
7284 raise error.Abort(
7283 raise error.Abort(
7285 _(b'tag names cannot consist entirely of whitespace')
7284 _(b'tag names cannot consist entirely of whitespace')
7286 )
7285 )
7287 if opts.get(b'rev') and opts.get(b'remove'):
7286 if opts.get(b'rev') and opts.get(b'remove'):
7288 raise error.Abort(_(b"--rev and --remove are incompatible"))
7287 raise error.Abort(_(b"--rev and --remove are incompatible"))
7289 if opts.get(b'rev'):
7288 if opts.get(b'rev'):
7290 rev_ = opts[b'rev']
7289 rev_ = opts[b'rev']
7291 message = opts.get(b'message')
7290 message = opts.get(b'message')
7292 if opts.get(b'remove'):
7291 if opts.get(b'remove'):
7293 if opts.get(b'local'):
7292 if opts.get(b'local'):
7294 expectedtype = b'local'
7293 expectedtype = b'local'
7295 else:
7294 else:
7296 expectedtype = b'global'
7295 expectedtype = b'global'
7297
7296
7298 for n in names:
7297 for n in names:
7299 if repo.tagtype(n) == b'global':
7298 if repo.tagtype(n) == b'global':
7300 alltags = tagsmod.findglobaltags(ui, repo)
7299 alltags = tagsmod.findglobaltags(ui, repo)
7301 if alltags[n][0] == nullid:
7300 if alltags[n][0] == nullid:
7302 raise error.Abort(_(b"tag '%s' is already removed") % n)
7301 raise error.Abort(_(b"tag '%s' is already removed") % n)
7303 if not repo.tagtype(n):
7302 if not repo.tagtype(n):
7304 raise error.Abort(_(b"tag '%s' does not exist") % n)
7303 raise error.Abort(_(b"tag '%s' does not exist") % n)
7305 if repo.tagtype(n) != expectedtype:
7304 if repo.tagtype(n) != expectedtype:
7306 if expectedtype == b'global':
7305 if expectedtype == b'global':
7307 raise error.Abort(
7306 raise error.Abort(
7308 _(b"tag '%s' is not a global tag") % n
7307 _(b"tag '%s' is not a global tag") % n
7309 )
7308 )
7310 else:
7309 else:
7311 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7310 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7312 rev_ = b'null'
7311 rev_ = b'null'
7313 if not message:
7312 if not message:
7314 # we don't translate commit messages
7313 # we don't translate commit messages
7315 message = b'Removed tag %s' % b', '.join(names)
7314 message = b'Removed tag %s' % b', '.join(names)
7316 elif not opts.get(b'force'):
7315 elif not opts.get(b'force'):
7317 for n in names:
7316 for n in names:
7318 if n in repo.tags():
7317 if n in repo.tags():
7319 raise error.Abort(
7318 raise error.Abort(
7320 _(b"tag '%s' already exists (use -f to force)") % n
7319 _(b"tag '%s' already exists (use -f to force)") % n
7321 )
7320 )
7322 if not opts.get(b'local'):
7321 if not opts.get(b'local'):
7323 p1, p2 = repo.dirstate.parents()
7322 p1, p2 = repo.dirstate.parents()
7324 if p2 != nullid:
7323 if p2 != nullid:
7325 raise error.Abort(_(b'uncommitted merge'))
7324 raise error.Abort(_(b'uncommitted merge'))
7326 bheads = repo.branchheads()
7325 bheads = repo.branchheads()
7327 if not opts.get(b'force') and bheads and p1 not in bheads:
7326 if not opts.get(b'force') and bheads and p1 not in bheads:
7328 raise error.Abort(
7327 raise error.Abort(
7329 _(
7328 _(
7330 b'working directory is not at a branch head '
7329 b'working directory is not at a branch head '
7331 b'(use -f to force)'
7330 b'(use -f to force)'
7332 )
7331 )
7333 )
7332 )
7334 node = scmutil.revsingle(repo, rev_).node()
7333 node = scmutil.revsingle(repo, rev_).node()
7335
7334
7336 if not message:
7335 if not message:
7337 # we don't translate commit messages
7336 # we don't translate commit messages
7338 message = b'Added tag %s for changeset %s' % (
7337 message = b'Added tag %s for changeset %s' % (
7339 b', '.join(names),
7338 b', '.join(names),
7340 short(node),
7339 short(node),
7341 )
7340 )
7342
7341
7343 date = opts.get(b'date')
7342 date = opts.get(b'date')
7344 if date:
7343 if date:
7345 date = dateutil.parsedate(date)
7344 date = dateutil.parsedate(date)
7346
7345
7347 if opts.get(b'remove'):
7346 if opts.get(b'remove'):
7348 editform = b'tag.remove'
7347 editform = b'tag.remove'
7349 else:
7348 else:
7350 editform = b'tag.add'
7349 editform = b'tag.add'
7351 editor = cmdutil.getcommiteditor(
7350 editor = cmdutil.getcommiteditor(
7352 editform=editform, **pycompat.strkwargs(opts)
7351 editform=editform, **pycompat.strkwargs(opts)
7353 )
7352 )
7354
7353
7355 # don't allow tagging the null rev
7354 # don't allow tagging the null rev
7356 if (
7355 if (
7357 not opts.get(b'remove')
7356 not opts.get(b'remove')
7358 and scmutil.revsingle(repo, rev_).rev() == nullrev
7357 and scmutil.revsingle(repo, rev_).rev() == nullrev
7359 ):
7358 ):
7360 raise error.Abort(_(b"cannot tag null revision"))
7359 raise error.Abort(_(b"cannot tag null revision"))
7361
7360
7362 tagsmod.tag(
7361 tagsmod.tag(
7363 repo,
7362 repo,
7364 names,
7363 names,
7365 node,
7364 node,
7366 message,
7365 message,
7367 opts.get(b'local'),
7366 opts.get(b'local'),
7368 opts.get(b'user'),
7367 opts.get(b'user'),
7369 date,
7368 date,
7370 editor=editor,
7369 editor=editor,
7371 )
7370 )
7372
7371
7373
7372
7374 @command(
7373 @command(
7375 b'tags',
7374 b'tags',
7376 formatteropts,
7375 formatteropts,
7377 b'',
7376 b'',
7378 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7377 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7379 intents={INTENT_READONLY},
7378 intents={INTENT_READONLY},
7380 )
7379 )
7381 def tags(ui, repo, **opts):
7380 def tags(ui, repo, **opts):
7382 """list repository tags
7381 """list repository tags
7383
7382
7384 This lists both regular and local tags. When the -v/--verbose
7383 This lists both regular and local tags. When the -v/--verbose
7385 switch is used, a third column "local" is printed for local tags.
7384 switch is used, a third column "local" is printed for local tags.
7386 When the -q/--quiet switch is used, only the tag name is printed.
7385 When the -q/--quiet switch is used, only the tag name is printed.
7387
7386
7388 .. container:: verbose
7387 .. container:: verbose
7389
7388
7390 Template:
7389 Template:
7391
7390
7392 The following keywords are supported in addition to the common template
7391 The following keywords are supported in addition to the common template
7393 keywords and functions such as ``{tag}``. See also
7392 keywords and functions such as ``{tag}``. See also
7394 :hg:`help templates`.
7393 :hg:`help templates`.
7395
7394
7396 :type: String. ``local`` for local tags.
7395 :type: String. ``local`` for local tags.
7397
7396
7398 Returns 0 on success.
7397 Returns 0 on success.
7399 """
7398 """
7400
7399
7401 opts = pycompat.byteskwargs(opts)
7400 opts = pycompat.byteskwargs(opts)
7402 ui.pager(b'tags')
7401 ui.pager(b'tags')
7403 fm = ui.formatter(b'tags', opts)
7402 fm = ui.formatter(b'tags', opts)
7404 hexfunc = fm.hexfunc
7403 hexfunc = fm.hexfunc
7405
7404
7406 for t, n in reversed(repo.tagslist()):
7405 for t, n in reversed(repo.tagslist()):
7407 hn = hexfunc(n)
7406 hn = hexfunc(n)
7408 label = b'tags.normal'
7407 label = b'tags.normal'
7409 tagtype = b''
7408 tagtype = b''
7410 if repo.tagtype(t) == b'local':
7409 if repo.tagtype(t) == b'local':
7411 label = b'tags.local'
7410 label = b'tags.local'
7412 tagtype = b'local'
7411 tagtype = b'local'
7413
7412
7414 fm.startitem()
7413 fm.startitem()
7415 fm.context(repo=repo)
7414 fm.context(repo=repo)
7416 fm.write(b'tag', b'%s', t, label=label)
7415 fm.write(b'tag', b'%s', t, label=label)
7417 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7416 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7418 fm.condwrite(
7417 fm.condwrite(
7419 not ui.quiet,
7418 not ui.quiet,
7420 b'rev node',
7419 b'rev node',
7421 fmt,
7420 fmt,
7422 repo.changelog.rev(n),
7421 repo.changelog.rev(n),
7423 hn,
7422 hn,
7424 label=label,
7423 label=label,
7425 )
7424 )
7426 fm.condwrite(
7425 fm.condwrite(
7427 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7426 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7428 )
7427 )
7429 fm.plain(b'\n')
7428 fm.plain(b'\n')
7430 fm.end()
7429 fm.end()
7431
7430
7432
7431
7433 @command(
7432 @command(
7434 b'tip',
7433 b'tip',
7435 [
7434 [
7436 (b'p', b'patch', None, _(b'show patch')),
7435 (b'p', b'patch', None, _(b'show patch')),
7437 (b'g', b'git', None, _(b'use git extended diff format')),
7436 (b'g', b'git', None, _(b'use git extended diff format')),
7438 ]
7437 ]
7439 + templateopts,
7438 + templateopts,
7440 _(b'[-p] [-g]'),
7439 _(b'[-p] [-g]'),
7441 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7440 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7442 )
7441 )
7443 def tip(ui, repo, **opts):
7442 def tip(ui, repo, **opts):
7444 """show the tip revision (DEPRECATED)
7443 """show the tip revision (DEPRECATED)
7445
7444
7446 The tip revision (usually just called the tip) is the changeset
7445 The tip revision (usually just called the tip) is the changeset
7447 most recently added to the repository (and therefore the most
7446 most recently added to the repository (and therefore the most
7448 recently changed head).
7447 recently changed head).
7449
7448
7450 If you have just made a commit, that commit will be the tip. If
7449 If you have just made a commit, that commit will be the tip. If
7451 you have just pulled changes from another repository, the tip of
7450 you have just pulled changes from another repository, the tip of
7452 that repository becomes the current tip. The "tip" tag is special
7451 that repository becomes the current tip. The "tip" tag is special
7453 and cannot be renamed or assigned to a different changeset.
7452 and cannot be renamed or assigned to a different changeset.
7454
7453
7455 This command is deprecated, please use :hg:`heads` instead.
7454 This command is deprecated, please use :hg:`heads` instead.
7456
7455
7457 Returns 0 on success.
7456 Returns 0 on success.
7458 """
7457 """
7459 opts = pycompat.byteskwargs(opts)
7458 opts = pycompat.byteskwargs(opts)
7460 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7459 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7461 displayer.show(repo[b'tip'])
7460 displayer.show(repo[b'tip'])
7462 displayer.close()
7461 displayer.close()
7463
7462
7464
7463
7465 @command(
7464 @command(
7466 b'unbundle',
7465 b'unbundle',
7467 [
7466 [
7468 (
7467 (
7469 b'u',
7468 b'u',
7470 b'update',
7469 b'update',
7471 None,
7470 None,
7472 _(b'update to new branch head if changesets were unbundled'),
7471 _(b'update to new branch head if changesets were unbundled'),
7473 )
7472 )
7474 ],
7473 ],
7475 _(b'[-u] FILE...'),
7474 _(b'[-u] FILE...'),
7476 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7475 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7477 )
7476 )
7478 def unbundle(ui, repo, fname1, *fnames, **opts):
7477 def unbundle(ui, repo, fname1, *fnames, **opts):
7479 """apply one or more bundle files
7478 """apply one or more bundle files
7480
7479
7481 Apply one or more bundle files generated by :hg:`bundle`.
7480 Apply one or more bundle files generated by :hg:`bundle`.
7482
7481
7483 Returns 0 on success, 1 if an update has unresolved files.
7482 Returns 0 on success, 1 if an update has unresolved files.
7484 """
7483 """
7485 fnames = (fname1,) + fnames
7484 fnames = (fname1,) + fnames
7486
7485
7487 with repo.lock():
7486 with repo.lock():
7488 for fname in fnames:
7487 for fname in fnames:
7489 f = hg.openpath(ui, fname)
7488 f = hg.openpath(ui, fname)
7490 gen = exchange.readbundle(ui, f, fname)
7489 gen = exchange.readbundle(ui, f, fname)
7491 if isinstance(gen, streamclone.streamcloneapplier):
7490 if isinstance(gen, streamclone.streamcloneapplier):
7492 raise error.Abort(
7491 raise error.Abort(
7493 _(
7492 _(
7494 b'packed bundles cannot be applied with '
7493 b'packed bundles cannot be applied with '
7495 b'"hg unbundle"'
7494 b'"hg unbundle"'
7496 ),
7495 ),
7497 hint=_(b'use "hg debugapplystreamclonebundle"'),
7496 hint=_(b'use "hg debugapplystreamclonebundle"'),
7498 )
7497 )
7499 url = b'bundle:' + fname
7498 url = b'bundle:' + fname
7500 try:
7499 try:
7501 txnname = b'unbundle'
7500 txnname = b'unbundle'
7502 if not isinstance(gen, bundle2.unbundle20):
7501 if not isinstance(gen, bundle2.unbundle20):
7503 txnname = b'unbundle\n%s' % util.hidepassword(url)
7502 txnname = b'unbundle\n%s' % util.hidepassword(url)
7504 with repo.transaction(txnname) as tr:
7503 with repo.transaction(txnname) as tr:
7505 op = bundle2.applybundle(
7504 op = bundle2.applybundle(
7506 repo, gen, tr, source=b'unbundle', url=url
7505 repo, gen, tr, source=b'unbundle', url=url
7507 )
7506 )
7508 except error.BundleUnknownFeatureError as exc:
7507 except error.BundleUnknownFeatureError as exc:
7509 raise error.Abort(
7508 raise error.Abort(
7510 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7509 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7511 hint=_(
7510 hint=_(
7512 b"see https://mercurial-scm.org/"
7511 b"see https://mercurial-scm.org/"
7513 b"wiki/BundleFeature for more "
7512 b"wiki/BundleFeature for more "
7514 b"information"
7513 b"information"
7515 ),
7514 ),
7516 )
7515 )
7517 modheads = bundle2.combinechangegroupresults(op)
7516 modheads = bundle2.combinechangegroupresults(op)
7518
7517
7519 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7518 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7520
7519
7521
7520
7522 @command(
7521 @command(
7523 b'unshelve',
7522 b'unshelve',
7524 [
7523 [
7525 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7524 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7526 (
7525 (
7527 b'c',
7526 b'c',
7528 b'continue',
7527 b'continue',
7529 None,
7528 None,
7530 _(b'continue an incomplete unshelve operation'),
7529 _(b'continue an incomplete unshelve operation'),
7531 ),
7530 ),
7532 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7531 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7533 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7532 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7534 (
7533 (
7535 b'n',
7534 b'n',
7536 b'name',
7535 b'name',
7537 b'',
7536 b'',
7538 _(b'restore shelved change with given name'),
7537 _(b'restore shelved change with given name'),
7539 _(b'NAME'),
7538 _(b'NAME'),
7540 ),
7539 ),
7541 (b't', b'tool', b'', _(b'specify merge tool')),
7540 (b't', b'tool', b'', _(b'specify merge tool')),
7542 (
7541 (
7543 b'',
7542 b'',
7544 b'date',
7543 b'date',
7545 b'',
7544 b'',
7546 _(b'set date for temporary commits (DEPRECATED)'),
7545 _(b'set date for temporary commits (DEPRECATED)'),
7547 _(b'DATE'),
7546 _(b'DATE'),
7548 ),
7547 ),
7549 ],
7548 ],
7550 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7549 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7551 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7550 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7552 )
7551 )
7553 def unshelve(ui, repo, *shelved, **opts):
7552 def unshelve(ui, repo, *shelved, **opts):
7554 """restore a shelved change to the working directory
7553 """restore a shelved change to the working directory
7555
7554
7556 This command accepts an optional name of a shelved change to
7555 This command accepts an optional name of a shelved change to
7557 restore. If none is given, the most recent shelved change is used.
7556 restore. If none is given, the most recent shelved change is used.
7558
7557
7559 If a shelved change is applied successfully, the bundle that
7558 If a shelved change is applied successfully, the bundle that
7560 contains the shelved changes is moved to a backup location
7559 contains the shelved changes is moved to a backup location
7561 (.hg/shelve-backup).
7560 (.hg/shelve-backup).
7562
7561
7563 Since you can restore a shelved change on top of an arbitrary
7562 Since you can restore a shelved change on top of an arbitrary
7564 commit, it is possible that unshelving will result in a conflict
7563 commit, it is possible that unshelving will result in a conflict
7565 between your changes and the commits you are unshelving onto. If
7564 between your changes and the commits you are unshelving onto. If
7566 this occurs, you must resolve the conflict, then use
7565 this occurs, you must resolve the conflict, then use
7567 ``--continue`` to complete the unshelve operation. (The bundle
7566 ``--continue`` to complete the unshelve operation. (The bundle
7568 will not be moved until you successfully complete the unshelve.)
7567 will not be moved until you successfully complete the unshelve.)
7569
7568
7570 (Alternatively, you can use ``--abort`` to abandon an unshelve
7569 (Alternatively, you can use ``--abort`` to abandon an unshelve
7571 that causes a conflict. This reverts the unshelved changes, and
7570 that causes a conflict. This reverts the unshelved changes, and
7572 leaves the bundle in place.)
7571 leaves the bundle in place.)
7573
7572
7574 If bare shelved change (without interactive, include and exclude
7573 If bare shelved change (without interactive, include and exclude
7575 option) was done on newly created branch it would restore branch
7574 option) was done on newly created branch it would restore branch
7576 information to the working directory.
7575 information to the working directory.
7577
7576
7578 After a successful unshelve, the shelved changes are stored in a
7577 After a successful unshelve, the shelved changes are stored in a
7579 backup directory. Only the N most recent backups are kept. N
7578 backup directory. Only the N most recent backups are kept. N
7580 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7579 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7581 configuration option.
7580 configuration option.
7582
7581
7583 .. container:: verbose
7582 .. container:: verbose
7584
7583
7585 Timestamp in seconds is used to decide order of backups. More
7584 Timestamp in seconds is used to decide order of backups. More
7586 than ``maxbackups`` backups are kept, if same timestamp
7585 than ``maxbackups`` backups are kept, if same timestamp
7587 prevents from deciding exact order of them, for safety.
7586 prevents from deciding exact order of them, for safety.
7588
7587
7589 Selected changes can be unshelved with ``--interactive`` flag.
7588 Selected changes can be unshelved with ``--interactive`` flag.
7590 The working directory is updated with the selected changes, and
7589 The working directory is updated with the selected changes, and
7591 only the unselected changes remain shelved.
7590 only the unselected changes remain shelved.
7592 Note: The whole shelve is applied to working directory first before
7591 Note: The whole shelve is applied to working directory first before
7593 running interactively. So, this will bring up all the conflicts between
7592 running interactively. So, this will bring up all the conflicts between
7594 working directory and the shelve, irrespective of which changes will be
7593 working directory and the shelve, irrespective of which changes will be
7595 unshelved.
7594 unshelved.
7596 """
7595 """
7597 with repo.wlock():
7596 with repo.wlock():
7598 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7597 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7599
7598
7600
7599
7601 statemod.addunfinished(
7600 statemod.addunfinished(
7602 b'unshelve',
7601 b'unshelve',
7603 fname=b'shelvedstate',
7602 fname=b'shelvedstate',
7604 continueflag=True,
7603 continueflag=True,
7605 abortfunc=shelvemod.hgabortunshelve,
7604 abortfunc=shelvemod.hgabortunshelve,
7606 continuefunc=shelvemod.hgcontinueunshelve,
7605 continuefunc=shelvemod.hgcontinueunshelve,
7607 cmdmsg=_(b'unshelve already in progress'),
7606 cmdmsg=_(b'unshelve already in progress'),
7608 )
7607 )
7609
7608
7610
7609
7611 @command(
7610 @command(
7612 b'update|up|checkout|co',
7611 b'update|up|checkout|co',
7613 [
7612 [
7614 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7613 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7615 (b'c', b'check', None, _(b'require clean working directory')),
7614 (b'c', b'check', None, _(b'require clean working directory')),
7616 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7615 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7617 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7616 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7618 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7617 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7619 ]
7618 ]
7620 + mergetoolopts,
7619 + mergetoolopts,
7621 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7620 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7622 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7621 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7623 helpbasic=True,
7622 helpbasic=True,
7624 )
7623 )
7625 def update(ui, repo, node=None, **opts):
7624 def update(ui, repo, node=None, **opts):
7626 """update working directory (or switch revisions)
7625 """update working directory (or switch revisions)
7627
7626
7628 Update the repository's working directory to the specified
7627 Update the repository's working directory to the specified
7629 changeset. If no changeset is specified, update to the tip of the
7628 changeset. If no changeset is specified, update to the tip of the
7630 current named branch and move the active bookmark (see :hg:`help
7629 current named branch and move the active bookmark (see :hg:`help
7631 bookmarks`).
7630 bookmarks`).
7632
7631
7633 Update sets the working directory's parent revision to the specified
7632 Update sets the working directory's parent revision to the specified
7634 changeset (see :hg:`help parents`).
7633 changeset (see :hg:`help parents`).
7635
7634
7636 If the changeset is not a descendant or ancestor of the working
7635 If the changeset is not a descendant or ancestor of the working
7637 directory's parent and there are uncommitted changes, the update is
7636 directory's parent and there are uncommitted changes, the update is
7638 aborted. With the -c/--check option, the working directory is checked
7637 aborted. With the -c/--check option, the working directory is checked
7639 for uncommitted changes; if none are found, the working directory is
7638 for uncommitted changes; if none are found, the working directory is
7640 updated to the specified changeset.
7639 updated to the specified changeset.
7641
7640
7642 .. container:: verbose
7641 .. container:: verbose
7643
7642
7644 The -C/--clean, -c/--check, and -m/--merge options control what
7643 The -C/--clean, -c/--check, and -m/--merge options control what
7645 happens if the working directory contains uncommitted changes.
7644 happens if the working directory contains uncommitted changes.
7646 At most of one of them can be specified.
7645 At most of one of them can be specified.
7647
7646
7648 1. If no option is specified, and if
7647 1. If no option is specified, and if
7649 the requested changeset is an ancestor or descendant of
7648 the requested changeset is an ancestor or descendant of
7650 the working directory's parent, the uncommitted changes
7649 the working directory's parent, the uncommitted changes
7651 are merged into the requested changeset and the merged
7650 are merged into the requested changeset and the merged
7652 result is left uncommitted. If the requested changeset is
7651 result is left uncommitted. If the requested changeset is
7653 not an ancestor or descendant (that is, it is on another
7652 not an ancestor or descendant (that is, it is on another
7654 branch), the update is aborted and the uncommitted changes
7653 branch), the update is aborted and the uncommitted changes
7655 are preserved.
7654 are preserved.
7656
7655
7657 2. With the -m/--merge option, the update is allowed even if the
7656 2. With the -m/--merge option, the update is allowed even if the
7658 requested changeset is not an ancestor or descendant of
7657 requested changeset is not an ancestor or descendant of
7659 the working directory's parent.
7658 the working directory's parent.
7660
7659
7661 3. With the -c/--check option, the update is aborted and the
7660 3. With the -c/--check option, the update is aborted and the
7662 uncommitted changes are preserved.
7661 uncommitted changes are preserved.
7663
7662
7664 4. With the -C/--clean option, uncommitted changes are discarded and
7663 4. With the -C/--clean option, uncommitted changes are discarded and
7665 the working directory is updated to the requested changeset.
7664 the working directory is updated to the requested changeset.
7666
7665
7667 To cancel an uncommitted merge (and lose your changes), use
7666 To cancel an uncommitted merge (and lose your changes), use
7668 :hg:`merge --abort`.
7667 :hg:`merge --abort`.
7669
7668
7670 Use null as the changeset to remove the working directory (like
7669 Use null as the changeset to remove the working directory (like
7671 :hg:`clone -U`).
7670 :hg:`clone -U`).
7672
7671
7673 If you want to revert just one file to an older revision, use
7672 If you want to revert just one file to an older revision, use
7674 :hg:`revert [-r REV] NAME`.
7673 :hg:`revert [-r REV] NAME`.
7675
7674
7676 See :hg:`help dates` for a list of formats valid for -d/--date.
7675 See :hg:`help dates` for a list of formats valid for -d/--date.
7677
7676
7678 Returns 0 on success, 1 if there are unresolved files.
7677 Returns 0 on success, 1 if there are unresolved files.
7679 """
7678 """
7680 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7679 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7681 rev = opts.get('rev')
7680 rev = opts.get('rev')
7682 date = opts.get('date')
7681 date = opts.get('date')
7683 clean = opts.get('clean')
7682 clean = opts.get('clean')
7684 check = opts.get('check')
7683 check = opts.get('check')
7685 merge = opts.get('merge')
7684 merge = opts.get('merge')
7686 if rev and node:
7685 if rev and node:
7687 raise error.Abort(_(b"please specify just one revision"))
7686 raise error.Abort(_(b"please specify just one revision"))
7688
7687
7689 if ui.configbool(b'commands', b'update.requiredest'):
7688 if ui.configbool(b'commands', b'update.requiredest'):
7690 if not node and not rev and not date:
7689 if not node and not rev and not date:
7691 raise error.Abort(
7690 raise error.Abort(
7692 _(b'you must specify a destination'),
7691 _(b'you must specify a destination'),
7693 hint=_(b'for example: hg update ".::"'),
7692 hint=_(b'for example: hg update ".::"'),
7694 )
7693 )
7695
7694
7696 if rev is None or rev == b'':
7695 if rev is None or rev == b'':
7697 rev = node
7696 rev = node
7698
7697
7699 if date and rev is not None:
7698 if date and rev is not None:
7700 raise error.Abort(_(b"you can't specify a revision and a date"))
7699 raise error.Abort(_(b"you can't specify a revision and a date"))
7701
7700
7702 updatecheck = None
7701 updatecheck = None
7703 if check:
7702 if check:
7704 updatecheck = b'abort'
7703 updatecheck = b'abort'
7705 elif merge:
7704 elif merge:
7706 updatecheck = b'none'
7705 updatecheck = b'none'
7707
7706
7708 with repo.wlock():
7707 with repo.wlock():
7709 cmdutil.clearunfinished(repo)
7708 cmdutil.clearunfinished(repo)
7710 if date:
7709 if date:
7711 rev = cmdutil.finddate(ui, repo, date)
7710 rev = cmdutil.finddate(ui, repo, date)
7712
7711
7713 # if we defined a bookmark, we have to remember the original name
7712 # if we defined a bookmark, we have to remember the original name
7714 brev = rev
7713 brev = rev
7715 if rev:
7714 if rev:
7716 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7715 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7717 ctx = scmutil.revsingle(repo, rev, default=None)
7716 ctx = scmutil.revsingle(repo, rev, default=None)
7718 rev = ctx.rev()
7717 rev = ctx.rev()
7719 hidden = ctx.hidden()
7718 hidden = ctx.hidden()
7720 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7719 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7721 with ui.configoverride(overrides, b'update'):
7720 with ui.configoverride(overrides, b'update'):
7722 ret = hg.updatetotally(
7721 ret = hg.updatetotally(
7723 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7722 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7724 )
7723 )
7725 if hidden:
7724 if hidden:
7726 ctxstr = ctx.hex()[:12]
7725 ctxstr = ctx.hex()[:12]
7727 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7726 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7728
7727
7729 if ctx.obsolete():
7728 if ctx.obsolete():
7730 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7729 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7731 ui.warn(b"(%s)\n" % obsfatemsg)
7730 ui.warn(b"(%s)\n" % obsfatemsg)
7732 return ret
7731 return ret
7733
7732
7734
7733
7735 @command(
7734 @command(
7736 b'verify',
7735 b'verify',
7737 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7736 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7738 helpcategory=command.CATEGORY_MAINTENANCE,
7737 helpcategory=command.CATEGORY_MAINTENANCE,
7739 )
7738 )
7740 def verify(ui, repo, **opts):
7739 def verify(ui, repo, **opts):
7741 """verify the integrity of the repository
7740 """verify the integrity of the repository
7742
7741
7743 Verify the integrity of the current repository.
7742 Verify the integrity of the current repository.
7744
7743
7745 This will perform an extensive check of the repository's
7744 This will perform an extensive check of the repository's
7746 integrity, validating the hashes and checksums of each entry in
7745 integrity, validating the hashes and checksums of each entry in
7747 the changelog, manifest, and tracked files, as well as the
7746 the changelog, manifest, and tracked files, as well as the
7748 integrity of their crosslinks and indices.
7747 integrity of their crosslinks and indices.
7749
7748
7750 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7749 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7751 for more information about recovery from corruption of the
7750 for more information about recovery from corruption of the
7752 repository.
7751 repository.
7753
7752
7754 Returns 0 on success, 1 if errors are encountered.
7753 Returns 0 on success, 1 if errors are encountered.
7755 """
7754 """
7756 opts = pycompat.byteskwargs(opts)
7755 opts = pycompat.byteskwargs(opts)
7757
7756
7758 level = None
7757 level = None
7759 if opts[b'full']:
7758 if opts[b'full']:
7760 level = verifymod.VERIFY_FULL
7759 level = verifymod.VERIFY_FULL
7761 return hg.verify(repo, level)
7760 return hg.verify(repo, level)
7762
7761
7763
7762
7764 @command(
7763 @command(
7765 b'version',
7764 b'version',
7766 [] + formatteropts,
7765 [] + formatteropts,
7767 helpcategory=command.CATEGORY_HELP,
7766 helpcategory=command.CATEGORY_HELP,
7768 norepo=True,
7767 norepo=True,
7769 intents={INTENT_READONLY},
7768 intents={INTENT_READONLY},
7770 )
7769 )
7771 def version_(ui, **opts):
7770 def version_(ui, **opts):
7772 """output version and copyright information
7771 """output version and copyright information
7773
7772
7774 .. container:: verbose
7773 .. container:: verbose
7775
7774
7776 Template:
7775 Template:
7777
7776
7778 The following keywords are supported. See also :hg:`help templates`.
7777 The following keywords are supported. See also :hg:`help templates`.
7779
7778
7780 :extensions: List of extensions.
7779 :extensions: List of extensions.
7781 :ver: String. Version number.
7780 :ver: String. Version number.
7782
7781
7783 And each entry of ``{extensions}`` provides the following sub-keywords
7782 And each entry of ``{extensions}`` provides the following sub-keywords
7784 in addition to ``{ver}``.
7783 in addition to ``{ver}``.
7785
7784
7786 :bundled: Boolean. True if included in the release.
7785 :bundled: Boolean. True if included in the release.
7787 :name: String. Extension name.
7786 :name: String. Extension name.
7788 """
7787 """
7789 opts = pycompat.byteskwargs(opts)
7788 opts = pycompat.byteskwargs(opts)
7790 if ui.verbose:
7789 if ui.verbose:
7791 ui.pager(b'version')
7790 ui.pager(b'version')
7792 fm = ui.formatter(b"version", opts)
7791 fm = ui.formatter(b"version", opts)
7793 fm.startitem()
7792 fm.startitem()
7794 fm.write(
7793 fm.write(
7795 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7794 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7796 )
7795 )
7797 license = _(
7796 license = _(
7798 b"(see https://mercurial-scm.org for more information)\n"
7797 b"(see https://mercurial-scm.org for more information)\n"
7799 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7798 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7800 b"This is free software; see the source for copying conditions. "
7799 b"This is free software; see the source for copying conditions. "
7801 b"There is NO\nwarranty; "
7800 b"There is NO\nwarranty; "
7802 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7801 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7803 )
7802 )
7804 if not ui.quiet:
7803 if not ui.quiet:
7805 fm.plain(license)
7804 fm.plain(license)
7806
7805
7807 if ui.verbose:
7806 if ui.verbose:
7808 fm.plain(_(b"\nEnabled extensions:\n\n"))
7807 fm.plain(_(b"\nEnabled extensions:\n\n"))
7809 # format names and versions into columns
7808 # format names and versions into columns
7810 names = []
7809 names = []
7811 vers = []
7810 vers = []
7812 isinternals = []
7811 isinternals = []
7813 for name, module in sorted(extensions.extensions()):
7812 for name, module in sorted(extensions.extensions()):
7814 names.append(name)
7813 names.append(name)
7815 vers.append(extensions.moduleversion(module) or None)
7814 vers.append(extensions.moduleversion(module) or None)
7816 isinternals.append(extensions.ismoduleinternal(module))
7815 isinternals.append(extensions.ismoduleinternal(module))
7817 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7816 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7818 if names:
7817 if names:
7819 namefmt = b" %%-%ds " % max(len(n) for n in names)
7818 namefmt = b" %%-%ds " % max(len(n) for n in names)
7820 places = [_(b"external"), _(b"internal")]
7819 places = [_(b"external"), _(b"internal")]
7821 for n, v, p in zip(names, vers, isinternals):
7820 for n, v, p in zip(names, vers, isinternals):
7822 fn.startitem()
7821 fn.startitem()
7823 fn.condwrite(ui.verbose, b"name", namefmt, n)
7822 fn.condwrite(ui.verbose, b"name", namefmt, n)
7824 if ui.verbose:
7823 if ui.verbose:
7825 fn.plain(b"%s " % places[p])
7824 fn.plain(b"%s " % places[p])
7826 fn.data(bundled=p)
7825 fn.data(bundled=p)
7827 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7826 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7828 if ui.verbose:
7827 if ui.verbose:
7829 fn.plain(b"\n")
7828 fn.plain(b"\n")
7830 fn.end()
7829 fn.end()
7831 fm.end()
7830 fm.end()
7832
7831
7833
7832
7834 def loadcmdtable(ui, name, cmdtable):
7833 def loadcmdtable(ui, name, cmdtable):
7835 """Load command functions from specified cmdtable
7834 """Load command functions from specified cmdtable
7836 """
7835 """
7837 overrides = [cmd for cmd in cmdtable if cmd in table]
7836 overrides = [cmd for cmd in cmdtable if cmd in table]
7838 if overrides:
7837 if overrides:
7839 ui.warn(
7838 ui.warn(
7840 _(b"extension '%s' overrides commands: %s\n")
7839 _(b"extension '%s' overrides commands: %s\n")
7841 % (name, b" ".join(overrides))
7840 % (name, b" ".join(overrides))
7842 )
7841 )
7843 table.update(cmdtable)
7842 table.update(cmdtable)
@@ -1,771 +1,771 b''
1 #testcases abortcommand abortflag
1 #testcases abortcommand abortflag
2
2
3 #if abortflag
3 #if abortflag
4 $ cat >> $HGRCPATH <<EOF
4 $ cat >> $HGRCPATH <<EOF
5 > [alias]
5 > [alias]
6 > abort = graft --abort
6 > abort = graft --abort
7 > EOF
7 > EOF
8 #endif
8 #endif
9
9
10
10
11 Testing the reading of old format graftstate file with newer mercurial
11 Testing the reading of old format graftstate file with newer mercurial
12
12
13 $ hg init oldgraft
13 $ hg init oldgraft
14 $ cd oldgraft
14 $ cd oldgraft
15 $ for ch in a b c; do echo foo > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
15 $ for ch in a b c; do echo foo > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
16 $ hg log -GT "{rev}:{node|short} {desc}\n"
16 $ hg log -GT "{rev}:{node|short} {desc}\n"
17 @ 2:8be98ac1a569 added c
17 @ 2:8be98ac1a569 added c
18 |
18 |
19 o 1:80e6d2c47cfe added b
19 o 1:80e6d2c47cfe added b
20 |
20 |
21 o 0:f7ad41964313 added a
21 o 0:f7ad41964313 added a
22
22
23 $ hg up 0
23 $ hg up 0
24 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
24 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
25 $ echo bar > b
25 $ echo bar > b
26 $ hg add b
26 $ hg add b
27 $ hg ci -m "bar to b"
27 $ hg ci -m "bar to b"
28 created new head
28 created new head
29 $ hg graft -r 1 -r 2
29 $ hg graft -r 1 -r 2
30 grafting 1:80e6d2c47cfe "added b"
30 grafting 1:80e6d2c47cfe "added b"
31 merging b
31 merging b
32 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
32 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
33 abort: unresolved conflicts, can't continue
33 abort: unresolved conflicts, can't continue
34 (use 'hg resolve' and 'hg graft --continue')
34 (use 'hg resolve' and 'hg graft --continue')
35 [1]
35 [1]
36
36
37 Writing the nodes in old format to graftstate
37 Writing the nodes in old format to graftstate
38
38
39 $ hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate
39 $ hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate
40 $ echo foo > b
40 $ echo foo > b
41 $ hg resolve -m
41 $ hg resolve -m
42 (no more unresolved files)
42 (no more unresolved files)
43 continue: hg graft --continue
43 continue: hg graft --continue
44 $ hg graft --continue
44 $ hg graft --continue
45 grafting 1:80e6d2c47cfe "added b"
45 grafting 1:80e6d2c47cfe "added b"
46 grafting 2:8be98ac1a569 "added c"
46 grafting 2:8be98ac1a569 "added c"
47
47
48 Testing that --user is preserved during conflicts and value is reused while
48 Testing that --user is preserved during conflicts and value is reused while
49 running `hg graft --continue`
49 running `hg graft --continue`
50
50
51 $ hg log -G
51 $ hg log -G
52 @ changeset: 5:711e9fa999f1
52 @ changeset: 5:711e9fa999f1
53 | tag: tip
53 | tag: tip
54 | user: test
54 | user: test
55 | date: Thu Jan 01 00:00:00 1970 +0000
55 | date: Thu Jan 01 00:00:00 1970 +0000
56 | summary: added c
56 | summary: added c
57 |
57 |
58 o changeset: 4:e5ad7353b408
58 o changeset: 4:e5ad7353b408
59 | user: test
59 | user: test
60 | date: Thu Jan 01 00:00:00 1970 +0000
60 | date: Thu Jan 01 00:00:00 1970 +0000
61 | summary: added b
61 | summary: added b
62 |
62 |
63 o changeset: 3:9e887f7a939c
63 o changeset: 3:9e887f7a939c
64 | parent: 0:f7ad41964313
64 | parent: 0:f7ad41964313
65 | user: test
65 | user: test
66 | date: Thu Jan 01 00:00:00 1970 +0000
66 | date: Thu Jan 01 00:00:00 1970 +0000
67 | summary: bar to b
67 | summary: bar to b
68 |
68 |
69 | o changeset: 2:8be98ac1a569
69 | o changeset: 2:8be98ac1a569
70 | | user: test
70 | | user: test
71 | | date: Thu Jan 01 00:00:00 1970 +0000
71 | | date: Thu Jan 01 00:00:00 1970 +0000
72 | | summary: added c
72 | | summary: added c
73 | |
73 | |
74 | o changeset: 1:80e6d2c47cfe
74 | o changeset: 1:80e6d2c47cfe
75 |/ user: test
75 |/ user: test
76 | date: Thu Jan 01 00:00:00 1970 +0000
76 | date: Thu Jan 01 00:00:00 1970 +0000
77 | summary: added b
77 | summary: added b
78 |
78 |
79 o changeset: 0:f7ad41964313
79 o changeset: 0:f7ad41964313
80 user: test
80 user: test
81 date: Thu Jan 01 00:00:00 1970 +0000
81 date: Thu Jan 01 00:00:00 1970 +0000
82 summary: added a
82 summary: added a
83
83
84
84
85 $ hg up '.^^'
85 $ hg up '.^^'
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
87
87
88 $ hg graft -r 1 -r 2 --user batman
88 $ hg graft -r 1 -r 2 --user batman
89 grafting 1:80e6d2c47cfe "added b"
89 grafting 1:80e6d2c47cfe "added b"
90 merging b
90 merging b
91 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
91 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
92 abort: unresolved conflicts, can't continue
92 abort: unresolved conflicts, can't continue
93 (use 'hg resolve' and 'hg graft --continue')
93 (use 'hg resolve' and 'hg graft --continue')
94 [1]
94 [1]
95
95
96 $ echo wat > b
96 $ echo wat > b
97 $ hg resolve -m
97 $ hg resolve -m
98 (no more unresolved files)
98 (no more unresolved files)
99 continue: hg graft --continue
99 continue: hg graft --continue
100
100
101 $ hg graft --continue
101 $ hg graft --continue
102 grafting 1:80e6d2c47cfe "added b"
102 grafting 1:80e6d2c47cfe "added b"
103 grafting 2:8be98ac1a569 "added c"
103 grafting 2:8be98ac1a569 "added c"
104
104
105 $ hg log -Gr 3::
105 $ hg log -Gr 3::
106 @ changeset: 7:11a36ffaacf2
106 @ changeset: 7:11a36ffaacf2
107 | tag: tip
107 | tag: tip
108 | user: batman
108 | user: batman
109 | date: Thu Jan 01 00:00:00 1970 +0000
109 | date: Thu Jan 01 00:00:00 1970 +0000
110 | summary: added c
110 | summary: added c
111 |
111 |
112 o changeset: 6:76803afc6511
112 o changeset: 6:76803afc6511
113 | parent: 3:9e887f7a939c
113 | parent: 3:9e887f7a939c
114 | user: batman
114 | user: batman
115 | date: Thu Jan 01 00:00:00 1970 +0000
115 | date: Thu Jan 01 00:00:00 1970 +0000
116 | summary: added b
116 | summary: added b
117 |
117 |
118 | o changeset: 5:711e9fa999f1
118 | o changeset: 5:711e9fa999f1
119 | | user: test
119 | | user: test
120 | | date: Thu Jan 01 00:00:00 1970 +0000
120 | | date: Thu Jan 01 00:00:00 1970 +0000
121 | | summary: added c
121 | | summary: added c
122 | |
122 | |
123 | o changeset: 4:e5ad7353b408
123 | o changeset: 4:e5ad7353b408
124 |/ user: test
124 |/ user: test
125 | date: Thu Jan 01 00:00:00 1970 +0000
125 | date: Thu Jan 01 00:00:00 1970 +0000
126 | summary: added b
126 | summary: added b
127 |
127 |
128 o changeset: 3:9e887f7a939c
128 o changeset: 3:9e887f7a939c
129 | parent: 0:f7ad41964313
129 | parent: 0:f7ad41964313
130 ~ user: test
130 ~ user: test
131 date: Thu Jan 01 00:00:00 1970 +0000
131 date: Thu Jan 01 00:00:00 1970 +0000
132 summary: bar to b
132 summary: bar to b
133
133
134 Test that --date is preserved and reused in `hg graft --continue`
134 Test that --date is preserved and reused in `hg graft --continue`
135
135
136 $ hg up '.^^'
136 $ hg up '.^^'
137 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
137 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
138 $ hg graft -r 1 -r 2 --date '1234560000 120'
138 $ hg graft -r 1 -r 2 --date '1234560000 120'
139 grafting 1:80e6d2c47cfe "added b"
139 grafting 1:80e6d2c47cfe "added b"
140 merging b
140 merging b
141 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
141 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
142 abort: unresolved conflicts, can't continue
142 abort: unresolved conflicts, can't continue
143 (use 'hg resolve' and 'hg graft --continue')
143 (use 'hg resolve' and 'hg graft --continue')
144 [1]
144 [1]
145
145
146 $ echo foobar > b
146 $ echo foobar > b
147 $ hg resolve -m
147 $ hg resolve -m
148 (no more unresolved files)
148 (no more unresolved files)
149 continue: hg graft --continue
149 continue: hg graft --continue
150 $ hg graft --continue
150 $ hg graft --continue
151 grafting 1:80e6d2c47cfe "added b"
151 grafting 1:80e6d2c47cfe "added b"
152 grafting 2:8be98ac1a569 "added c"
152 grafting 2:8be98ac1a569 "added c"
153
153
154 $ hg log -Gr '.^^::.'
154 $ hg log -Gr '.^^::.'
155 @ changeset: 9:1896b76e007a
155 @ changeset: 9:1896b76e007a
156 | tag: tip
156 | tag: tip
157 | user: test
157 | user: test
158 | date: Fri Feb 13 21:18:00 2009 -0002
158 | date: Fri Feb 13 21:18:00 2009 -0002
159 | summary: added c
159 | summary: added c
160 |
160 |
161 o changeset: 8:ce2b4f1632af
161 o changeset: 8:ce2b4f1632af
162 | parent: 3:9e887f7a939c
162 | parent: 3:9e887f7a939c
163 | user: test
163 | user: test
164 | date: Fri Feb 13 21:18:00 2009 -0002
164 | date: Fri Feb 13 21:18:00 2009 -0002
165 | summary: added b
165 | summary: added b
166 |
166 |
167 o changeset: 3:9e887f7a939c
167 o changeset: 3:9e887f7a939c
168 | parent: 0:f7ad41964313
168 | parent: 0:f7ad41964313
169 ~ user: test
169 ~ user: test
170 date: Thu Jan 01 00:00:00 1970 +0000
170 date: Thu Jan 01 00:00:00 1970 +0000
171 summary: bar to b
171 summary: bar to b
172
172
173 Test that --log is preserved and reused in `hg graft --continue`
173 Test that --log is preserved and reused in `hg graft --continue`
174
174
175 $ hg up '.^^'
175 $ hg up '.^^'
176 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
176 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
177 $ hg graft -r 1 -r 2 --log
177 $ hg graft -r 1 -r 2 --log
178 grafting 1:80e6d2c47cfe "added b"
178 grafting 1:80e6d2c47cfe "added b"
179 merging b
179 merging b
180 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
180 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
181 abort: unresolved conflicts, can't continue
181 abort: unresolved conflicts, can't continue
182 (use 'hg resolve' and 'hg graft --continue')
182 (use 'hg resolve' and 'hg graft --continue')
183 [1]
183 [1]
184
184
185 $ echo foobar > b
185 $ echo foobar > b
186 $ hg resolve -m
186 $ hg resolve -m
187 (no more unresolved files)
187 (no more unresolved files)
188 continue: hg graft --continue
188 continue: hg graft --continue
189
189
190 $ hg graft --continue
190 $ hg graft --continue
191 grafting 1:80e6d2c47cfe "added b"
191 grafting 1:80e6d2c47cfe "added b"
192 grafting 2:8be98ac1a569 "added c"
192 grafting 2:8be98ac1a569 "added c"
193
193
194 $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
194 $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
195 @ 11:30c1050a58b2 added c
195 @ 11:30c1050a58b2 added c
196 | (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
196 | (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
197 o 10:ec7eda2313e2 added b
197 o 10:ec7eda2313e2 added b
198 | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
198 | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
199 o 3:9e887f7a939c bar to b
199 o 3:9e887f7a939c bar to b
200 |
200 |
201 ~
201 ~
202
202
203 $ cd ..
203 $ cd ..
204
204
205 Testing the --stop flag of `hg graft` which stops the interrupted graft
205 Testing the --stop flag of `hg graft` which stops the interrupted graft
206
206
207 $ hg init stopgraft
207 $ hg init stopgraft
208 $ cd stopgraft
208 $ cd stopgraft
209 $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
209 $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
210
210
211 $ hg log -G
211 $ hg log -G
212 @ changeset: 3:9150fe93bec6
212 @ changeset: 3:9150fe93bec6
213 | tag: tip
213 | tag: tip
214 | user: test
214 | user: test
215 | date: Thu Jan 01 00:00:00 1970 +0000
215 | date: Thu Jan 01 00:00:00 1970 +0000
216 | summary: added d
216 | summary: added d
217 |
217 |
218 o changeset: 2:155349b645be
218 o changeset: 2:155349b645be
219 | user: test
219 | user: test
220 | date: Thu Jan 01 00:00:00 1970 +0000
220 | date: Thu Jan 01 00:00:00 1970 +0000
221 | summary: added c
221 | summary: added c
222 |
222 |
223 o changeset: 1:5f6d8a4bf34a
223 o changeset: 1:5f6d8a4bf34a
224 | user: test
224 | user: test
225 | date: Thu Jan 01 00:00:00 1970 +0000
225 | date: Thu Jan 01 00:00:00 1970 +0000
226 | summary: added b
226 | summary: added b
227 |
227 |
228 o changeset: 0:9092f1db7931
228 o changeset: 0:9092f1db7931
229 user: test
229 user: test
230 date: Thu Jan 01 00:00:00 1970 +0000
230 date: Thu Jan 01 00:00:00 1970 +0000
231 summary: added a
231 summary: added a
232
232
233 $ hg up '.^^'
233 $ hg up '.^^'
234 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
234 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
235
235
236 $ echo foo > d
236 $ echo foo > d
237 $ hg ci -Aqm "added foo to d"
237 $ hg ci -Aqm "added foo to d"
238
238
239 $ hg graft --stop
239 $ hg graft --stop
240 abort: no interrupted graft found
240 abort: no interrupted graft found
241 [255]
241 [255]
242
242
243 $ hg graft -r 3
243 $ hg graft -r 3
244 grafting 3:9150fe93bec6 "added d"
244 grafting 3:9150fe93bec6 "added d"
245 merging d
245 merging d
246 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
246 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
247 abort: unresolved conflicts, can't continue
247 abort: unresolved conflicts, can't continue
248 (use 'hg resolve' and 'hg graft --continue')
248 (use 'hg resolve' and 'hg graft --continue')
249 [1]
249 [1]
250
250
251 $ hg graft --stop --continue
251 $ hg graft --stop --continue
252 abort: cannot specify both --stop and --continue
252 abort: cannot specify both --stop and --continue
253 [255]
253 [255]
254
254
255 $ hg graft --stop -U
255 $ hg graft --stop -U
256 abort: cannot specify any other flag with '--stop'
256 abort: cannot specify both --stop and --user
257 [255]
257 [255]
258 $ hg graft --stop --rev 4
258 $ hg graft --stop --rev 4
259 abort: cannot specify any other flag with '--stop'
259 abort: cannot specify both --stop and --rev
260 [255]
260 [255]
261 $ hg graft --stop --log
261 $ hg graft --stop --log
262 abort: cannot specify any other flag with '--stop'
262 abort: cannot specify both --stop and --log
263 [255]
263 [255]
264
264
265 $ hg graft --stop
265 $ hg graft --stop
266 stopped the interrupted graft
266 stopped the interrupted graft
267 working directory is now at a0deacecd59d
267 working directory is now at a0deacecd59d
268
268
269 $ hg diff
269 $ hg diff
270
270
271 $ hg log -Gr '.'
271 $ hg log -Gr '.'
272 @ changeset: 4:a0deacecd59d
272 @ changeset: 4:a0deacecd59d
273 | tag: tip
273 | tag: tip
274 ~ parent: 1:5f6d8a4bf34a
274 ~ parent: 1:5f6d8a4bf34a
275 user: test
275 user: test
276 date: Thu Jan 01 00:00:00 1970 +0000
276 date: Thu Jan 01 00:00:00 1970 +0000
277 summary: added foo to d
277 summary: added foo to d
278
278
279 $ hg graft -r 2 -r 3
279 $ hg graft -r 2 -r 3
280 grafting 2:155349b645be "added c"
280 grafting 2:155349b645be "added c"
281 grafting 3:9150fe93bec6 "added d"
281 grafting 3:9150fe93bec6 "added d"
282 merging d
282 merging d
283 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
283 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
284 abort: unresolved conflicts, can't continue
284 abort: unresolved conflicts, can't continue
285 (use 'hg resolve' and 'hg graft --continue')
285 (use 'hg resolve' and 'hg graft --continue')
286 [1]
286 [1]
287
287
288 $ hg graft --stop
288 $ hg graft --stop
289 stopped the interrupted graft
289 stopped the interrupted graft
290 working directory is now at 75b447541a9e
290 working directory is now at 75b447541a9e
291
291
292 $ hg diff
292 $ hg diff
293
293
294 $ hg log -G -T "{rev}:{node|short} {desc}"
294 $ hg log -G -T "{rev}:{node|short} {desc}"
295 @ 5:75b447541a9e added c
295 @ 5:75b447541a9e added c
296 |
296 |
297 o 4:a0deacecd59d added foo to d
297 o 4:a0deacecd59d added foo to d
298 |
298 |
299 | o 3:9150fe93bec6 added d
299 | o 3:9150fe93bec6 added d
300 | |
300 | |
301 | o 2:155349b645be added c
301 | o 2:155349b645be added c
302 |/
302 |/
303 o 1:5f6d8a4bf34a added b
303 o 1:5f6d8a4bf34a added b
304 |
304 |
305 o 0:9092f1db7931 added a
305 o 0:9092f1db7931 added a
306
306
307 $ cd ..
307 $ cd ..
308
308
309 Testing the --abort flag for `hg graft` which aborts and rollback to state
309 Testing the --abort flag for `hg graft` which aborts and rollback to state
310 before the graft
310 before the graft
311
311
312 $ hg init abortgraft
312 $ hg init abortgraft
313 $ cd abortgraft
313 $ cd abortgraft
314 $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
314 $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
315
315
316 $ hg up '.^^'
316 $ hg up '.^^'
317 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
317 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
318
318
319 $ echo x > x
319 $ echo x > x
320 $ hg ci -Aqm "added x"
320 $ hg ci -Aqm "added x"
321 $ hg up '.^'
321 $ hg up '.^'
322 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
322 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
323 $ echo foo > c
323 $ echo foo > c
324 $ hg ci -Aqm "added foo to c"
324 $ hg ci -Aqm "added foo to c"
325
325
326 $ hg log -GT "{rev}:{node|short} {desc}"
326 $ hg log -GT "{rev}:{node|short} {desc}"
327 @ 5:36b793615f78 added foo to c
327 @ 5:36b793615f78 added foo to c
328 |
328 |
329 | o 4:863a25e1a9ea added x
329 | o 4:863a25e1a9ea added x
330 |/
330 |/
331 | o 3:9150fe93bec6 added d
331 | o 3:9150fe93bec6 added d
332 | |
332 | |
333 | o 2:155349b645be added c
333 | o 2:155349b645be added c
334 |/
334 |/
335 o 1:5f6d8a4bf34a added b
335 o 1:5f6d8a4bf34a added b
336 |
336 |
337 o 0:9092f1db7931 added a
337 o 0:9092f1db7931 added a
338
338
339 $ hg up 9150fe93bec6
339 $ hg up 9150fe93bec6
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
341
341
342 $ hg abort
342 $ hg abort
343 abort: no interrupted graft to abort (abortflag !)
343 abort: no interrupted graft to abort (abortflag !)
344 abort: no operation in progress (abortcommand !)
344 abort: no operation in progress (abortcommand !)
345 [255]
345 [255]
346
346
347 when stripping is required
347 when stripping is required
348 $ hg graft -r 4 -r 5
348 $ hg graft -r 4 -r 5
349 grafting 4:863a25e1a9ea "added x"
349 grafting 4:863a25e1a9ea "added x"
350 grafting 5:36b793615f78 "added foo to c" (tip)
350 grafting 5:36b793615f78 "added foo to c" (tip)
351 merging c
351 merging c
352 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
352 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
353 abort: unresolved conflicts, can't continue
353 abort: unresolved conflicts, can't continue
354 (use 'hg resolve' and 'hg graft --continue')
354 (use 'hg resolve' and 'hg graft --continue')
355 [1]
355 [1]
356
356
357 $ hg graft --continue --abort
357 $ hg graft --continue --abort
358 abort: cannot specify both --abort and --continue
358 abort: cannot specify both --abort and --continue
359 [255]
359 [255]
360
360
361 $ hg graft --abort --stop
361 $ hg graft --abort --stop
362 abort: cannot specify both --abort and --stop
362 abort: cannot specify both --abort and --stop
363 [255]
363 [255]
364
364
365 $ hg graft --abort --currentuser
365 $ hg graft --abort --currentuser
366 abort: cannot specify any other flag with '--abort'
366 abort: cannot specify both --abort and --user
367 [255]
367 [255]
368
368
369 $ hg graft --abort --edit
369 $ hg graft --abort --edit
370 abort: cannot specify any other flag with '--abort'
370 abort: cannot specify both --abort and --edit
371 [255]
371 [255]
372
372
373 #if abortcommand
373 #if abortcommand
374 when in dry-run mode
374 when in dry-run mode
375 $ hg abort --dry-run
375 $ hg abort --dry-run
376 graft in progress, will be aborted
376 graft in progress, will be aborted
377 #endif
377 #endif
378
378
379 $ hg abort
379 $ hg abort
380 graft aborted
380 graft aborted
381 working directory is now at 9150fe93bec6
381 working directory is now at 9150fe93bec6
382 $ hg log -GT "{rev}:{node|short} {desc}"
382 $ hg log -GT "{rev}:{node|short} {desc}"
383 o 5:36b793615f78 added foo to c
383 o 5:36b793615f78 added foo to c
384 |
384 |
385 | o 4:863a25e1a9ea added x
385 | o 4:863a25e1a9ea added x
386 |/
386 |/
387 | @ 3:9150fe93bec6 added d
387 | @ 3:9150fe93bec6 added d
388 | |
388 | |
389 | o 2:155349b645be added c
389 | o 2:155349b645be added c
390 |/
390 |/
391 o 1:5f6d8a4bf34a added b
391 o 1:5f6d8a4bf34a added b
392 |
392 |
393 o 0:9092f1db7931 added a
393 o 0:9092f1db7931 added a
394
394
395 when stripping is not required
395 when stripping is not required
396 $ hg graft -r 5
396 $ hg graft -r 5
397 grafting 5:36b793615f78 "added foo to c" (tip)
397 grafting 5:36b793615f78 "added foo to c" (tip)
398 merging c
398 merging c
399 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
399 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
400 abort: unresolved conflicts, can't continue
400 abort: unresolved conflicts, can't continue
401 (use 'hg resolve' and 'hg graft --continue')
401 (use 'hg resolve' and 'hg graft --continue')
402 [1]
402 [1]
403
403
404 $ hg abort
404 $ hg abort
405 graft aborted
405 graft aborted
406 working directory is now at 9150fe93bec6
406 working directory is now at 9150fe93bec6
407 $ hg log -GT "{rev}:{node|short} {desc}"
407 $ hg log -GT "{rev}:{node|short} {desc}"
408 o 5:36b793615f78 added foo to c
408 o 5:36b793615f78 added foo to c
409 |
409 |
410 | o 4:863a25e1a9ea added x
410 | o 4:863a25e1a9ea added x
411 |/
411 |/
412 | @ 3:9150fe93bec6 added d
412 | @ 3:9150fe93bec6 added d
413 | |
413 | |
414 | o 2:155349b645be added c
414 | o 2:155349b645be added c
415 |/
415 |/
416 o 1:5f6d8a4bf34a added b
416 o 1:5f6d8a4bf34a added b
417 |
417 |
418 o 0:9092f1db7931 added a
418 o 0:9092f1db7931 added a
419
419
420 when some of the changesets became public
420 when some of the changesets became public
421
421
422 $ hg graft -r 4 -r 5
422 $ hg graft -r 4 -r 5
423 grafting 4:863a25e1a9ea "added x"
423 grafting 4:863a25e1a9ea "added x"
424 grafting 5:36b793615f78 "added foo to c" (tip)
424 grafting 5:36b793615f78 "added foo to c" (tip)
425 merging c
425 merging c
426 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
426 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
427 abort: unresolved conflicts, can't continue
427 abort: unresolved conflicts, can't continue
428 (use 'hg resolve' and 'hg graft --continue')
428 (use 'hg resolve' and 'hg graft --continue')
429 [1]
429 [1]
430
430
431 $ hg log -GT "{rev}:{node|short} {desc}"
431 $ hg log -GT "{rev}:{node|short} {desc}"
432 @ 6:6ec71c037d94 added x
432 @ 6:6ec71c037d94 added x
433 |
433 |
434 | % 5:36b793615f78 added foo to c
434 | % 5:36b793615f78 added foo to c
435 | |
435 | |
436 | | o 4:863a25e1a9ea added x
436 | | o 4:863a25e1a9ea added x
437 | |/
437 | |/
438 o | 3:9150fe93bec6 added d
438 o | 3:9150fe93bec6 added d
439 | |
439 | |
440 o | 2:155349b645be added c
440 o | 2:155349b645be added c
441 |/
441 |/
442 o 1:5f6d8a4bf34a added b
442 o 1:5f6d8a4bf34a added b
443 |
443 |
444 o 0:9092f1db7931 added a
444 o 0:9092f1db7931 added a
445
445
446 $ hg phase -r 6 --public
446 $ hg phase -r 6 --public
447
447
448 $ hg abort
448 $ hg abort
449 cannot clean up public changesets 6ec71c037d94
449 cannot clean up public changesets 6ec71c037d94
450 graft aborted
450 graft aborted
451 working directory is now at 6ec71c037d94
451 working directory is now at 6ec71c037d94
452
452
453 when we created new changesets on top of existing one
453 when we created new changesets on top of existing one
454
454
455 $ hg up '.^^'
455 $ hg up '.^^'
456 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
456 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
457 $ echo y > y
457 $ echo y > y
458 $ hg ci -Aqm "added y"
458 $ hg ci -Aqm "added y"
459 $ echo z > z
459 $ echo z > z
460 $ hg ci -Aqm "added z"
460 $ hg ci -Aqm "added z"
461
461
462 $ hg up 3
462 $ hg up 3
463 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
463 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
464 $ hg log -GT "{rev}:{node|short} {desc}"
464 $ hg log -GT "{rev}:{node|short} {desc}"
465 o 8:637f9e9bbfd4 added z
465 o 8:637f9e9bbfd4 added z
466 |
466 |
467 o 7:123221671fd4 added y
467 o 7:123221671fd4 added y
468 |
468 |
469 | o 6:6ec71c037d94 added x
469 | o 6:6ec71c037d94 added x
470 | |
470 | |
471 | | o 5:36b793615f78 added foo to c
471 | | o 5:36b793615f78 added foo to c
472 | | |
472 | | |
473 | | | o 4:863a25e1a9ea added x
473 | | | o 4:863a25e1a9ea added x
474 | | |/
474 | | |/
475 | @ | 3:9150fe93bec6 added d
475 | @ | 3:9150fe93bec6 added d
476 |/ /
476 |/ /
477 o / 2:155349b645be added c
477 o / 2:155349b645be added c
478 |/
478 |/
479 o 1:5f6d8a4bf34a added b
479 o 1:5f6d8a4bf34a added b
480 |
480 |
481 o 0:9092f1db7931 added a
481 o 0:9092f1db7931 added a
482
482
483 $ hg graft -r 8 -r 7 -r 5
483 $ hg graft -r 8 -r 7 -r 5
484 grafting 8:637f9e9bbfd4 "added z" (tip)
484 grafting 8:637f9e9bbfd4 "added z" (tip)
485 grafting 7:123221671fd4 "added y"
485 grafting 7:123221671fd4 "added y"
486 grafting 5:36b793615f78 "added foo to c"
486 grafting 5:36b793615f78 "added foo to c"
487 merging c
487 merging c
488 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
488 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
489 abort: unresolved conflicts, can't continue
489 abort: unresolved conflicts, can't continue
490 (use 'hg resolve' and 'hg graft --continue')
490 (use 'hg resolve' and 'hg graft --continue')
491 [1]
491 [1]
492
492
493 $ cd ..
493 $ cd ..
494 $ hg init pullrepo
494 $ hg init pullrepo
495 $ cd pullrepo
495 $ cd pullrepo
496 $ cat >> .hg/hgrc <<EOF
496 $ cat >> .hg/hgrc <<EOF
497 > [phases]
497 > [phases]
498 > publish=False
498 > publish=False
499 > EOF
499 > EOF
500 $ hg pull ../abortgraft --config phases.publish=False
500 $ hg pull ../abortgraft --config phases.publish=False
501 pulling from ../abortgraft
501 pulling from ../abortgraft
502 requesting all changes
502 requesting all changes
503 adding changesets
503 adding changesets
504 adding manifests
504 adding manifests
505 adding file changes
505 adding file changes
506 added 11 changesets with 9 changes to 8 files (+4 heads)
506 added 11 changesets with 9 changes to 8 files (+4 heads)
507 new changesets 9092f1db7931:6b98ff0062dd (6 drafts)
507 new changesets 9092f1db7931:6b98ff0062dd (6 drafts)
508 (run 'hg heads' to see heads, 'hg merge' to merge)
508 (run 'hg heads' to see heads, 'hg merge' to merge)
509 $ hg up 9
509 $ hg up 9
510 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
510 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
511 $ echo w > w
511 $ echo w > w
512 $ hg ci -Aqm "added w" --config phases.publish=False
512 $ hg ci -Aqm "added w" --config phases.publish=False
513
513
514 $ cd ../abortgraft
514 $ cd ../abortgraft
515 $ hg pull ../pullrepo
515 $ hg pull ../pullrepo
516 pulling from ../pullrepo
516 pulling from ../pullrepo
517 searching for changes
517 searching for changes
518 adding changesets
518 adding changesets
519 adding manifests
519 adding manifests
520 adding file changes
520 adding file changes
521 added 1 changesets with 1 changes to 1 files (+1 heads)
521 added 1 changesets with 1 changes to 1 files (+1 heads)
522 new changesets 311dfc6cf3bf (1 drafts)
522 new changesets 311dfc6cf3bf (1 drafts)
523 (run 'hg heads .' to see heads, 'hg merge' to merge)
523 (run 'hg heads .' to see heads, 'hg merge' to merge)
524
524
525 $ hg abort
525 $ hg abort
526 new changesets detected on destination branch, can't strip
526 new changesets detected on destination branch, can't strip
527 graft aborted
527 graft aborted
528 working directory is now at 6b98ff0062dd
528 working directory is now at 6b98ff0062dd
529
529
530 $ cd ..
530 $ cd ..
531
531
532 ============================
532 ============================
533 Testing --no-commit option:|
533 Testing --no-commit option:|
534 ============================
534 ============================
535
535
536 $ hg init nocommit
536 $ hg init nocommit
537 $ cd nocommit
537 $ cd nocommit
538 $ echo a > a
538 $ echo a > a
539 $ hg ci -qAma
539 $ hg ci -qAma
540 $ echo b > b
540 $ echo b > b
541 $ hg ci -qAmb
541 $ hg ci -qAmb
542 $ hg up -q 0
542 $ hg up -q 0
543 $ echo c > c
543 $ echo c > c
544 $ hg ci -qAmc
544 $ hg ci -qAmc
545 $ hg log -GT "{rev}:{node|short} {desc}\n"
545 $ hg log -GT "{rev}:{node|short} {desc}\n"
546 @ 2:d36c0562f908 c
546 @ 2:d36c0562f908 c
547 |
547 |
548 | o 1:d2ae7f538514 b
548 | o 1:d2ae7f538514 b
549 |/
549 |/
550 o 0:cb9a9f314b8b a
550 o 0:cb9a9f314b8b a
551
551
552
552
553 Check reporting when --no-commit used with non-applicable options:
553 Check reporting when --no-commit used with non-applicable options:
554
554
555 $ hg graft 1 --no-commit -e
555 $ hg graft 1 --no-commit -e
556 abort: cannot specify both --no-commit and --edit
556 abort: cannot specify both --no-commit and --edit
557 [255]
557 [255]
558
558
559 $ hg graft 1 --no-commit --log
559 $ hg graft 1 --no-commit --log
560 abort: cannot specify both --no-commit and --log
560 abort: cannot specify both --no-commit and --log
561 [255]
561 [255]
562
562
563 $ hg graft 1 --no-commit -D
563 $ hg graft 1 --no-commit -D
564 abort: cannot specify both --no-commit and --currentdate
564 abort: cannot specify both --no-commit and --currentdate
565 [255]
565 [255]
566
566
567 Test --no-commit is working:
567 Test --no-commit is working:
568 $ hg graft 1 --no-commit
568 $ hg graft 1 --no-commit
569 grafting 1:d2ae7f538514 "b"
569 grafting 1:d2ae7f538514 "b"
570
570
571 $ hg log -GT "{rev}:{node|short} {desc}\n"
571 $ hg log -GT "{rev}:{node|short} {desc}\n"
572 @ 2:d36c0562f908 c
572 @ 2:d36c0562f908 c
573 |
573 |
574 | o 1:d2ae7f538514 b
574 | o 1:d2ae7f538514 b
575 |/
575 |/
576 o 0:cb9a9f314b8b a
576 o 0:cb9a9f314b8b a
577
577
578
578
579 $ hg diff
579 $ hg diff
580 diff -r d36c0562f908 b
580 diff -r d36c0562f908 b
581 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
581 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
582 +++ b/b Thu Jan 01 00:00:00 1970 +0000
582 +++ b/b Thu Jan 01 00:00:00 1970 +0000
583 @@ -0,0 +1,1 @@
583 @@ -0,0 +1,1 @@
584 +b
584 +b
585
585
586 Prepare wrdir to check --no-commit is resepected after --continue:
586 Prepare wrdir to check --no-commit is resepected after --continue:
587
587
588 $ hg up -qC
588 $ hg up -qC
589 $ echo A>a
589 $ echo A>a
590 $ hg ci -qm "A in file a"
590 $ hg ci -qm "A in file a"
591 $ hg up -q 1
591 $ hg up -q 1
592 $ echo B>a
592 $ echo B>a
593 $ hg ci -qm "B in file a"
593 $ hg ci -qm "B in file a"
594 $ hg log -GT "{rev}:{node|short} {desc}\n"
594 $ hg log -GT "{rev}:{node|short} {desc}\n"
595 @ 4:2aa9ad1006ff B in file a
595 @ 4:2aa9ad1006ff B in file a
596 |
596 |
597 | o 3:09e253b87e17 A in file a
597 | o 3:09e253b87e17 A in file a
598 | |
598 | |
599 | o 2:d36c0562f908 c
599 | o 2:d36c0562f908 c
600 | |
600 | |
601 o | 1:d2ae7f538514 b
601 o | 1:d2ae7f538514 b
602 |/
602 |/
603 o 0:cb9a9f314b8b a
603 o 0:cb9a9f314b8b a
604
604
605
605
606 $ hg graft 3 --no-commit
606 $ hg graft 3 --no-commit
607 grafting 3:09e253b87e17 "A in file a"
607 grafting 3:09e253b87e17 "A in file a"
608 merging a
608 merging a
609 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
609 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
610 abort: unresolved conflicts, can't continue
610 abort: unresolved conflicts, can't continue
611 (use 'hg resolve' and 'hg graft --continue')
611 (use 'hg resolve' and 'hg graft --continue')
612 [1]
612 [1]
613
613
614 Resolve conflict:
614 Resolve conflict:
615 $ echo A>a
615 $ echo A>a
616 $ hg resolve --mark
616 $ hg resolve --mark
617 (no more unresolved files)
617 (no more unresolved files)
618 continue: hg graft --continue
618 continue: hg graft --continue
619
619
620 $ hg graft --continue
620 $ hg graft --continue
621 grafting 3:09e253b87e17 "A in file a"
621 grafting 3:09e253b87e17 "A in file a"
622 $ hg log -GT "{rev}:{node|short} {desc}\n"
622 $ hg log -GT "{rev}:{node|short} {desc}\n"
623 @ 4:2aa9ad1006ff B in file a
623 @ 4:2aa9ad1006ff B in file a
624 |
624 |
625 | % 3:09e253b87e17 A in file a
625 | % 3:09e253b87e17 A in file a
626 | |
626 | |
627 | o 2:d36c0562f908 c
627 | o 2:d36c0562f908 c
628 | |
628 | |
629 o | 1:d2ae7f538514 b
629 o | 1:d2ae7f538514 b
630 |/
630 |/
631 o 0:cb9a9f314b8b a
631 o 0:cb9a9f314b8b a
632
632
633 $ hg diff
633 $ hg diff
634 diff -r 2aa9ad1006ff a
634 diff -r 2aa9ad1006ff a
635 --- a/a Thu Jan 01 00:00:00 1970 +0000
635 --- a/a Thu Jan 01 00:00:00 1970 +0000
636 +++ b/a Thu Jan 01 00:00:00 1970 +0000
636 +++ b/a Thu Jan 01 00:00:00 1970 +0000
637 @@ -1,1 +1,1 @@
637 @@ -1,1 +1,1 @@
638 -B
638 -B
639 +A
639 +A
640
640
641 $ hg up -qC
641 $ hg up -qC
642
642
643 Check --no-commit is resepected when passed with --continue:
643 Check --no-commit is resepected when passed with --continue:
644
644
645 $ hg graft 3
645 $ hg graft 3
646 grafting 3:09e253b87e17 "A in file a"
646 grafting 3:09e253b87e17 "A in file a"
647 merging a
647 merging a
648 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
648 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
649 abort: unresolved conflicts, can't continue
649 abort: unresolved conflicts, can't continue
650 (use 'hg resolve' and 'hg graft --continue')
650 (use 'hg resolve' and 'hg graft --continue')
651 [1]
651 [1]
652
652
653 Resolve conflict:
653 Resolve conflict:
654 $ echo A>a
654 $ echo A>a
655 $ hg resolve --mark
655 $ hg resolve --mark
656 (no more unresolved files)
656 (no more unresolved files)
657 continue: hg graft --continue
657 continue: hg graft --continue
658
658
659 $ hg graft --continue --no-commit
659 $ hg graft --continue --no-commit
660 grafting 3:09e253b87e17 "A in file a"
660 grafting 3:09e253b87e17 "A in file a"
661 $ hg diff
661 $ hg diff
662 diff -r 2aa9ad1006ff a
662 diff -r 2aa9ad1006ff a
663 --- a/a Thu Jan 01 00:00:00 1970 +0000
663 --- a/a Thu Jan 01 00:00:00 1970 +0000
664 +++ b/a Thu Jan 01 00:00:00 1970 +0000
664 +++ b/a Thu Jan 01 00:00:00 1970 +0000
665 @@ -1,1 +1,1 @@
665 @@ -1,1 +1,1 @@
666 -B
666 -B
667 +A
667 +A
668
668
669 $ hg log -GT "{rev}:{node|short} {desc}\n"
669 $ hg log -GT "{rev}:{node|short} {desc}\n"
670 @ 4:2aa9ad1006ff B in file a
670 @ 4:2aa9ad1006ff B in file a
671 |
671 |
672 | % 3:09e253b87e17 A in file a
672 | % 3:09e253b87e17 A in file a
673 | |
673 | |
674 | o 2:d36c0562f908 c
674 | o 2:d36c0562f908 c
675 | |
675 | |
676 o | 1:d2ae7f538514 b
676 o | 1:d2ae7f538514 b
677 |/
677 |/
678 o 0:cb9a9f314b8b a
678 o 0:cb9a9f314b8b a
679
679
680 $ hg up -qC
680 $ hg up -qC
681
681
682 Test --no-commit when graft multiple revisions:
682 Test --no-commit when graft multiple revisions:
683 When there is conflict:
683 When there is conflict:
684 $ hg graft -r "2::3" --no-commit
684 $ hg graft -r "2::3" --no-commit
685 grafting 2:d36c0562f908 "c"
685 grafting 2:d36c0562f908 "c"
686 grafting 3:09e253b87e17 "A in file a"
686 grafting 3:09e253b87e17 "A in file a"
687 merging a
687 merging a
688 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
688 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
689 abort: unresolved conflicts, can't continue
689 abort: unresolved conflicts, can't continue
690 (use 'hg resolve' and 'hg graft --continue')
690 (use 'hg resolve' and 'hg graft --continue')
691 [1]
691 [1]
692
692
693 $ echo A>a
693 $ echo A>a
694 $ hg resolve --mark
694 $ hg resolve --mark
695 (no more unresolved files)
695 (no more unresolved files)
696 continue: hg graft --continue
696 continue: hg graft --continue
697 $ hg graft --continue
697 $ hg graft --continue
698 grafting 3:09e253b87e17 "A in file a"
698 grafting 3:09e253b87e17 "A in file a"
699 $ hg diff
699 $ hg diff
700 diff -r 2aa9ad1006ff a
700 diff -r 2aa9ad1006ff a
701 --- a/a Thu Jan 01 00:00:00 1970 +0000
701 --- a/a Thu Jan 01 00:00:00 1970 +0000
702 +++ b/a Thu Jan 01 00:00:00 1970 +0000
702 +++ b/a Thu Jan 01 00:00:00 1970 +0000
703 @@ -1,1 +1,1 @@
703 @@ -1,1 +1,1 @@
704 -B
704 -B
705 +A
705 +A
706 diff -r 2aa9ad1006ff c
706 diff -r 2aa9ad1006ff c
707 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
707 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
708 +++ b/c Thu Jan 01 00:00:00 1970 +0000
708 +++ b/c Thu Jan 01 00:00:00 1970 +0000
709 @@ -0,0 +1,1 @@
709 @@ -0,0 +1,1 @@
710 +c
710 +c
711
711
712 $ hg log -GT "{rev}:{node|short} {desc}\n"
712 $ hg log -GT "{rev}:{node|short} {desc}\n"
713 @ 4:2aa9ad1006ff B in file a
713 @ 4:2aa9ad1006ff B in file a
714 |
714 |
715 | % 3:09e253b87e17 A in file a
715 | % 3:09e253b87e17 A in file a
716 | |
716 | |
717 | o 2:d36c0562f908 c
717 | o 2:d36c0562f908 c
718 | |
718 | |
719 o | 1:d2ae7f538514 b
719 o | 1:d2ae7f538514 b
720 |/
720 |/
721 o 0:cb9a9f314b8b a
721 o 0:cb9a9f314b8b a
722
722
723 $ hg up -qC
723 $ hg up -qC
724
724
725 When there is no conflict:
725 When there is no conflict:
726 $ echo d>d
726 $ echo d>d
727 $ hg add d -q
727 $ hg add d -q
728 $ hg ci -qmd
728 $ hg ci -qmd
729 $ hg up 3 -q
729 $ hg up 3 -q
730 $ hg log -GT "{rev}:{node|short} {desc}\n"
730 $ hg log -GT "{rev}:{node|short} {desc}\n"
731 o 5:baefa8927fc0 d
731 o 5:baefa8927fc0 d
732 |
732 |
733 o 4:2aa9ad1006ff B in file a
733 o 4:2aa9ad1006ff B in file a
734 |
734 |
735 | @ 3:09e253b87e17 A in file a
735 | @ 3:09e253b87e17 A in file a
736 | |
736 | |
737 | o 2:d36c0562f908 c
737 | o 2:d36c0562f908 c
738 | |
738 | |
739 o | 1:d2ae7f538514 b
739 o | 1:d2ae7f538514 b
740 |/
740 |/
741 o 0:cb9a9f314b8b a
741 o 0:cb9a9f314b8b a
742
742
743
743
744 $ hg graft -r 1 -r 5 --no-commit
744 $ hg graft -r 1 -r 5 --no-commit
745 grafting 1:d2ae7f538514 "b"
745 grafting 1:d2ae7f538514 "b"
746 grafting 5:baefa8927fc0 "d" (tip)
746 grafting 5:baefa8927fc0 "d" (tip)
747 $ hg diff
747 $ hg diff
748 diff -r 09e253b87e17 b
748 diff -r 09e253b87e17 b
749 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
749 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
750 +++ b/b Thu Jan 01 00:00:00 1970 +0000
750 +++ b/b Thu Jan 01 00:00:00 1970 +0000
751 @@ -0,0 +1,1 @@
751 @@ -0,0 +1,1 @@
752 +b
752 +b
753 diff -r 09e253b87e17 d
753 diff -r 09e253b87e17 d
754 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
754 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
755 +++ b/d Thu Jan 01 00:00:00 1970 +0000
755 +++ b/d Thu Jan 01 00:00:00 1970 +0000
756 @@ -0,0 +1,1 @@
756 @@ -0,0 +1,1 @@
757 +d
757 +d
758 $ hg log -GT "{rev}:{node|short} {desc}\n"
758 $ hg log -GT "{rev}:{node|short} {desc}\n"
759 o 5:baefa8927fc0 d
759 o 5:baefa8927fc0 d
760 |
760 |
761 o 4:2aa9ad1006ff B in file a
761 o 4:2aa9ad1006ff B in file a
762 |
762 |
763 | @ 3:09e253b87e17 A in file a
763 | @ 3:09e253b87e17 A in file a
764 | |
764 | |
765 | o 2:d36c0562f908 c
765 | o 2:d36c0562f908 c
766 | |
766 | |
767 o | 1:d2ae7f538514 b
767 o | 1:d2ae7f538514 b
768 |/
768 |/
769 o 0:cb9a9f314b8b a
769 o 0:cb9a9f314b8b a
770
770
771 $ cd ..
771 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now