##// END OF EJS Templates
outgoing: accept multiple destinations...
marmoute -
r47693:d4e4ccb7 default
parent child Browse files
Show More
@@ -1,7915 +1,7909 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import sys
13 import sys
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 wdirhex,
21 wdirhex,
22 wdirrev,
22 wdirrev,
23 )
23 )
24 from .pycompat import open
24 from .pycompat import open
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 bundlecaches,
29 bundlecaches,
30 changegroup,
30 changegroup,
31 cmdutil,
31 cmdutil,
32 copies,
32 copies,
33 debugcommands as debugcommandsmod,
33 debugcommands as debugcommandsmod,
34 destutil,
34 destutil,
35 dirstateguard,
35 dirstateguard,
36 discovery,
36 discovery,
37 encoding,
37 encoding,
38 error,
38 error,
39 exchange,
39 exchange,
40 extensions,
40 extensions,
41 filemerge,
41 filemerge,
42 formatter,
42 formatter,
43 graphmod,
43 graphmod,
44 grep as grepmod,
44 grep as grepmod,
45 hbisect,
45 hbisect,
46 help,
46 help,
47 hg,
47 hg,
48 logcmdutil,
48 logcmdutil,
49 merge as mergemod,
49 merge as mergemod,
50 mergestate as mergestatemod,
50 mergestate as mergestatemod,
51 narrowspec,
51 narrowspec,
52 obsolete,
52 obsolete,
53 obsutil,
53 obsutil,
54 patch,
54 patch,
55 phases,
55 phases,
56 pycompat,
56 pycompat,
57 rcutil,
57 rcutil,
58 registrar,
58 registrar,
59 requirements,
59 requirements,
60 revsetlang,
60 revsetlang,
61 rewriteutil,
61 rewriteutil,
62 scmutil,
62 scmutil,
63 server,
63 server,
64 shelve as shelvemod,
64 shelve as shelvemod,
65 state as statemod,
65 state as statemod,
66 streamclone,
66 streamclone,
67 tags as tagsmod,
67 tags as tagsmod,
68 ui as uimod,
68 ui as uimod,
69 util,
69 util,
70 verify as verifymod,
70 verify as verifymod,
71 vfs as vfsmod,
71 vfs as vfsmod,
72 wireprotoserver,
72 wireprotoserver,
73 )
73 )
74 from .utils import (
74 from .utils import (
75 dateutil,
75 dateutil,
76 stringutil,
76 stringutil,
77 urlutil,
77 urlutil,
78 )
78 )
79
79
80 if pycompat.TYPE_CHECKING:
80 if pycompat.TYPE_CHECKING:
81 from typing import (
81 from typing import (
82 List,
82 List,
83 )
83 )
84
84
85
85
86 table = {}
86 table = {}
87 table.update(debugcommandsmod.command._table)
87 table.update(debugcommandsmod.command._table)
88
88
89 command = registrar.command(table)
89 command = registrar.command(table)
90 INTENT_READONLY = registrar.INTENT_READONLY
90 INTENT_READONLY = registrar.INTENT_READONLY
91
91
92 # common command options
92 # common command options
93
93
94 globalopts = [
94 globalopts = [
95 (
95 (
96 b'R',
96 b'R',
97 b'repository',
97 b'repository',
98 b'',
98 b'',
99 _(b'repository root directory or name of overlay bundle file'),
99 _(b'repository root directory or name of overlay bundle file'),
100 _(b'REPO'),
100 _(b'REPO'),
101 ),
101 ),
102 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
102 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
103 (
103 (
104 b'y',
104 b'y',
105 b'noninteractive',
105 b'noninteractive',
106 None,
106 None,
107 _(
107 _(
108 b'do not prompt, automatically pick the first choice for all prompts'
108 b'do not prompt, automatically pick the first choice for all prompts'
109 ),
109 ),
110 ),
110 ),
111 (b'q', b'quiet', None, _(b'suppress output')),
111 (b'q', b'quiet', None, _(b'suppress output')),
112 (b'v', b'verbose', None, _(b'enable additional output')),
112 (b'v', b'verbose', None, _(b'enable additional output')),
113 (
113 (
114 b'',
114 b'',
115 b'color',
115 b'color',
116 b'',
116 b'',
117 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
117 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
118 # and should not be translated
118 # and should not be translated
119 _(b"when to colorize (boolean, always, auto, never, or debug)"),
119 _(b"when to colorize (boolean, always, auto, never, or debug)"),
120 _(b'TYPE'),
120 _(b'TYPE'),
121 ),
121 ),
122 (
122 (
123 b'',
123 b'',
124 b'config',
124 b'config',
125 [],
125 [],
126 _(b'set/override config option (use \'section.name=value\')'),
126 _(b'set/override config option (use \'section.name=value\')'),
127 _(b'CONFIG'),
127 _(b'CONFIG'),
128 ),
128 ),
129 (b'', b'debug', None, _(b'enable debugging output')),
129 (b'', b'debug', None, _(b'enable debugging output')),
130 (b'', b'debugger', None, _(b'start debugger')),
130 (b'', b'debugger', None, _(b'start debugger')),
131 (
131 (
132 b'',
132 b'',
133 b'encoding',
133 b'encoding',
134 encoding.encoding,
134 encoding.encoding,
135 _(b'set the charset encoding'),
135 _(b'set the charset encoding'),
136 _(b'ENCODE'),
136 _(b'ENCODE'),
137 ),
137 ),
138 (
138 (
139 b'',
139 b'',
140 b'encodingmode',
140 b'encodingmode',
141 encoding.encodingmode,
141 encoding.encodingmode,
142 _(b'set the charset encoding mode'),
142 _(b'set the charset encoding mode'),
143 _(b'MODE'),
143 _(b'MODE'),
144 ),
144 ),
145 (b'', b'traceback', None, _(b'always print a traceback on exception')),
145 (b'', b'traceback', None, _(b'always print a traceback on exception')),
146 (b'', b'time', None, _(b'time how long the command takes')),
146 (b'', b'time', None, _(b'time how long the command takes')),
147 (b'', b'profile', None, _(b'print command execution profile')),
147 (b'', b'profile', None, _(b'print command execution profile')),
148 (b'', b'version', None, _(b'output version information and exit')),
148 (b'', b'version', None, _(b'output version information and exit')),
149 (b'h', b'help', None, _(b'display help and exit')),
149 (b'h', b'help', None, _(b'display help and exit')),
150 (b'', b'hidden', False, _(b'consider hidden changesets')),
150 (b'', b'hidden', False, _(b'consider hidden changesets')),
151 (
151 (
152 b'',
152 b'',
153 b'pager',
153 b'pager',
154 b'auto',
154 b'auto',
155 _(b"when to paginate (boolean, always, auto, or never)"),
155 _(b"when to paginate (boolean, always, auto, or never)"),
156 _(b'TYPE'),
156 _(b'TYPE'),
157 ),
157 ),
158 ]
158 ]
159
159
160 dryrunopts = cmdutil.dryrunopts
160 dryrunopts = cmdutil.dryrunopts
161 remoteopts = cmdutil.remoteopts
161 remoteopts = cmdutil.remoteopts
162 walkopts = cmdutil.walkopts
162 walkopts = cmdutil.walkopts
163 commitopts = cmdutil.commitopts
163 commitopts = cmdutil.commitopts
164 commitopts2 = cmdutil.commitopts2
164 commitopts2 = cmdutil.commitopts2
165 commitopts3 = cmdutil.commitopts3
165 commitopts3 = cmdutil.commitopts3
166 formatteropts = cmdutil.formatteropts
166 formatteropts = cmdutil.formatteropts
167 templateopts = cmdutil.templateopts
167 templateopts = cmdutil.templateopts
168 logopts = cmdutil.logopts
168 logopts = cmdutil.logopts
169 diffopts = cmdutil.diffopts
169 diffopts = cmdutil.diffopts
170 diffwsopts = cmdutil.diffwsopts
170 diffwsopts = cmdutil.diffwsopts
171 diffopts2 = cmdutil.diffopts2
171 diffopts2 = cmdutil.diffopts2
172 mergetoolopts = cmdutil.mergetoolopts
172 mergetoolopts = cmdutil.mergetoolopts
173 similarityopts = cmdutil.similarityopts
173 similarityopts = cmdutil.similarityopts
174 subrepoopts = cmdutil.subrepoopts
174 subrepoopts = cmdutil.subrepoopts
175 debugrevlogopts = cmdutil.debugrevlogopts
175 debugrevlogopts = cmdutil.debugrevlogopts
176
176
177 # Commands start here, listed alphabetically
177 # Commands start here, listed alphabetically
178
178
179
179
180 @command(
180 @command(
181 b'abort',
181 b'abort',
182 dryrunopts,
182 dryrunopts,
183 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
183 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
184 helpbasic=True,
184 helpbasic=True,
185 )
185 )
186 def abort(ui, repo, **opts):
186 def abort(ui, repo, **opts):
187 """abort an unfinished operation (EXPERIMENTAL)
187 """abort an unfinished operation (EXPERIMENTAL)
188
188
189 Aborts a multistep operation like graft, histedit, rebase, merge,
189 Aborts a multistep operation like graft, histedit, rebase, merge,
190 and unshelve if they are in an unfinished state.
190 and unshelve if they are in an unfinished state.
191
191
192 use --dry-run/-n to dry run the command.
192 use --dry-run/-n to dry run the command.
193 """
193 """
194 dryrun = opts.get('dry_run')
194 dryrun = opts.get('dry_run')
195 abortstate = cmdutil.getunfinishedstate(repo)
195 abortstate = cmdutil.getunfinishedstate(repo)
196 if not abortstate:
196 if not abortstate:
197 raise error.StateError(_(b'no operation in progress'))
197 raise error.StateError(_(b'no operation in progress'))
198 if not abortstate.abortfunc:
198 if not abortstate.abortfunc:
199 raise error.InputError(
199 raise error.InputError(
200 (
200 (
201 _(b"%s in progress but does not support 'hg abort'")
201 _(b"%s in progress but does not support 'hg abort'")
202 % (abortstate._opname)
202 % (abortstate._opname)
203 ),
203 ),
204 hint=abortstate.hint(),
204 hint=abortstate.hint(),
205 )
205 )
206 if dryrun:
206 if dryrun:
207 ui.status(
207 ui.status(
208 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
208 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
209 )
209 )
210 return
210 return
211 return abortstate.abortfunc(ui, repo)
211 return abortstate.abortfunc(ui, repo)
212
212
213
213
214 @command(
214 @command(
215 b'add',
215 b'add',
216 walkopts + subrepoopts + dryrunopts,
216 walkopts + subrepoopts + dryrunopts,
217 _(b'[OPTION]... [FILE]...'),
217 _(b'[OPTION]... [FILE]...'),
218 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
218 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
219 helpbasic=True,
219 helpbasic=True,
220 inferrepo=True,
220 inferrepo=True,
221 )
221 )
222 def add(ui, repo, *pats, **opts):
222 def add(ui, repo, *pats, **opts):
223 """add the specified files on the next commit
223 """add the specified files on the next commit
224
224
225 Schedule files to be version controlled and added to the
225 Schedule files to be version controlled and added to the
226 repository.
226 repository.
227
227
228 The files will be added to the repository at the next commit. To
228 The files will be added to the repository at the next commit. To
229 undo an add before that, see :hg:`forget`.
229 undo an add before that, see :hg:`forget`.
230
230
231 If no names are given, add all files to the repository (except
231 If no names are given, add all files to the repository (except
232 files matching ``.hgignore``).
232 files matching ``.hgignore``).
233
233
234 .. container:: verbose
234 .. container:: verbose
235
235
236 Examples:
236 Examples:
237
237
238 - New (unknown) files are added
238 - New (unknown) files are added
239 automatically by :hg:`add`::
239 automatically by :hg:`add`::
240
240
241 $ ls
241 $ ls
242 foo.c
242 foo.c
243 $ hg status
243 $ hg status
244 ? foo.c
244 ? foo.c
245 $ hg add
245 $ hg add
246 adding foo.c
246 adding foo.c
247 $ hg status
247 $ hg status
248 A foo.c
248 A foo.c
249
249
250 - Specific files to be added can be specified::
250 - Specific files to be added can be specified::
251
251
252 $ ls
252 $ ls
253 bar.c foo.c
253 bar.c foo.c
254 $ hg status
254 $ hg status
255 ? bar.c
255 ? bar.c
256 ? foo.c
256 ? foo.c
257 $ hg add bar.c
257 $ hg add bar.c
258 $ hg status
258 $ hg status
259 A bar.c
259 A bar.c
260 ? foo.c
260 ? foo.c
261
261
262 Returns 0 if all files are successfully added.
262 Returns 0 if all files are successfully added.
263 """
263 """
264
264
265 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
265 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
266 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
266 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
267 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
267 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
268 return rejected and 1 or 0
268 return rejected and 1 or 0
269
269
270
270
271 @command(
271 @command(
272 b'addremove',
272 b'addremove',
273 similarityopts + subrepoopts + walkopts + dryrunopts,
273 similarityopts + subrepoopts + walkopts + dryrunopts,
274 _(b'[OPTION]... [FILE]...'),
274 _(b'[OPTION]... [FILE]...'),
275 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
275 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
276 inferrepo=True,
276 inferrepo=True,
277 )
277 )
278 def addremove(ui, repo, *pats, **opts):
278 def addremove(ui, repo, *pats, **opts):
279 """add all new files, delete all missing files
279 """add all new files, delete all missing files
280
280
281 Add all new files and remove all missing files from the
281 Add all new files and remove all missing files from the
282 repository.
282 repository.
283
283
284 Unless names are given, new files are ignored if they match any of
284 Unless names are given, new files are ignored if they match any of
285 the patterns in ``.hgignore``. As with add, these changes take
285 the patterns in ``.hgignore``. As with add, these changes take
286 effect at the next commit.
286 effect at the next commit.
287
287
288 Use the -s/--similarity option to detect renamed files. This
288 Use the -s/--similarity option to detect renamed files. This
289 option takes a percentage between 0 (disabled) and 100 (files must
289 option takes a percentage between 0 (disabled) and 100 (files must
290 be identical) as its parameter. With a parameter greater than 0,
290 be identical) as its parameter. With a parameter greater than 0,
291 this compares every removed file with every added file and records
291 this compares every removed file with every added file and records
292 those similar enough as renames. Detecting renamed files this way
292 those similar enough as renames. Detecting renamed files this way
293 can be expensive. After using this option, :hg:`status -C` can be
293 can be expensive. After using this option, :hg:`status -C` can be
294 used to check which files were identified as moved or renamed. If
294 used to check which files were identified as moved or renamed. If
295 not specified, -s/--similarity defaults to 100 and only renames of
295 not specified, -s/--similarity defaults to 100 and only renames of
296 identical files are detected.
296 identical files are detected.
297
297
298 .. container:: verbose
298 .. container:: verbose
299
299
300 Examples:
300 Examples:
301
301
302 - A number of files (bar.c and foo.c) are new,
302 - A number of files (bar.c and foo.c) are new,
303 while foobar.c has been removed (without using :hg:`remove`)
303 while foobar.c has been removed (without using :hg:`remove`)
304 from the repository::
304 from the repository::
305
305
306 $ ls
306 $ ls
307 bar.c foo.c
307 bar.c foo.c
308 $ hg status
308 $ hg status
309 ! foobar.c
309 ! foobar.c
310 ? bar.c
310 ? bar.c
311 ? foo.c
311 ? foo.c
312 $ hg addremove
312 $ hg addremove
313 adding bar.c
313 adding bar.c
314 adding foo.c
314 adding foo.c
315 removing foobar.c
315 removing foobar.c
316 $ hg status
316 $ hg status
317 A bar.c
317 A bar.c
318 A foo.c
318 A foo.c
319 R foobar.c
319 R foobar.c
320
320
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
321 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 Afterwards, it was edited slightly::
322 Afterwards, it was edited slightly::
323
323
324 $ ls
324 $ ls
325 foo.c
325 foo.c
326 $ hg status
326 $ hg status
327 ! foobar.c
327 ! foobar.c
328 ? foo.c
328 ? foo.c
329 $ hg addremove --similarity 90
329 $ hg addremove --similarity 90
330 removing foobar.c
330 removing foobar.c
331 adding foo.c
331 adding foo.c
332 recording removal of foobar.c as rename to foo.c (94% similar)
332 recording removal of foobar.c as rename to foo.c (94% similar)
333 $ hg status -C
333 $ hg status -C
334 A foo.c
334 A foo.c
335 foobar.c
335 foobar.c
336 R foobar.c
336 R foobar.c
337
337
338 Returns 0 if all files are successfully added.
338 Returns 0 if all files are successfully added.
339 """
339 """
340 opts = pycompat.byteskwargs(opts)
340 opts = pycompat.byteskwargs(opts)
341 if not opts.get(b'similarity'):
341 if not opts.get(b'similarity'):
342 opts[b'similarity'] = b'100'
342 opts[b'similarity'] = b'100'
343 matcher = scmutil.match(repo[None], pats, opts)
343 matcher = scmutil.match(repo[None], pats, opts)
344 relative = scmutil.anypats(pats, opts)
344 relative = scmutil.anypats(pats, opts)
345 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
345 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
346 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
346 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
347
347
348
348
349 @command(
349 @command(
350 b'annotate|blame',
350 b'annotate|blame',
351 [
351 [
352 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
352 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
353 (
353 (
354 b'',
354 b'',
355 b'follow',
355 b'follow',
356 None,
356 None,
357 _(b'follow copies/renames and list the filename (DEPRECATED)'),
357 _(b'follow copies/renames and list the filename (DEPRECATED)'),
358 ),
358 ),
359 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
359 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
360 (b'a', b'text', None, _(b'treat all files as text')),
360 (b'a', b'text', None, _(b'treat all files as text')),
361 (b'u', b'user', None, _(b'list the author (long with -v)')),
361 (b'u', b'user', None, _(b'list the author (long with -v)')),
362 (b'f', b'file', None, _(b'list the filename')),
362 (b'f', b'file', None, _(b'list the filename')),
363 (b'd', b'date', None, _(b'list the date (short with -q)')),
363 (b'd', b'date', None, _(b'list the date (short with -q)')),
364 (b'n', b'number', None, _(b'list the revision number (default)')),
364 (b'n', b'number', None, _(b'list the revision number (default)')),
365 (b'c', b'changeset', None, _(b'list the changeset')),
365 (b'c', b'changeset', None, _(b'list the changeset')),
366 (
366 (
367 b'l',
367 b'l',
368 b'line-number',
368 b'line-number',
369 None,
369 None,
370 _(b'show line number at the first appearance'),
370 _(b'show line number at the first appearance'),
371 ),
371 ),
372 (
372 (
373 b'',
373 b'',
374 b'skip',
374 b'skip',
375 [],
375 [],
376 _(b'revset to not display (EXPERIMENTAL)'),
376 _(b'revset to not display (EXPERIMENTAL)'),
377 _(b'REV'),
377 _(b'REV'),
378 ),
378 ),
379 ]
379 ]
380 + diffwsopts
380 + diffwsopts
381 + walkopts
381 + walkopts
382 + formatteropts,
382 + formatteropts,
383 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
383 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
384 helpcategory=command.CATEGORY_FILE_CONTENTS,
384 helpcategory=command.CATEGORY_FILE_CONTENTS,
385 helpbasic=True,
385 helpbasic=True,
386 inferrepo=True,
386 inferrepo=True,
387 )
387 )
388 def annotate(ui, repo, *pats, **opts):
388 def annotate(ui, repo, *pats, **opts):
389 """show changeset information by line for each file
389 """show changeset information by line for each file
390
390
391 List changes in files, showing the revision id responsible for
391 List changes in files, showing the revision id responsible for
392 each line.
392 each line.
393
393
394 This command is useful for discovering when a change was made and
394 This command is useful for discovering when a change was made and
395 by whom.
395 by whom.
396
396
397 If you include --file, --user, or --date, the revision number is
397 If you include --file, --user, or --date, the revision number is
398 suppressed unless you also include --number.
398 suppressed unless you also include --number.
399
399
400 Without the -a/--text option, annotate will avoid processing files
400 Without the -a/--text option, annotate will avoid processing files
401 it detects as binary. With -a, annotate will annotate the file
401 it detects as binary. With -a, annotate will annotate the file
402 anyway, although the results will probably be neither useful
402 anyway, although the results will probably be neither useful
403 nor desirable.
403 nor desirable.
404
404
405 .. container:: verbose
405 .. container:: verbose
406
406
407 Template:
407 Template:
408
408
409 The following keywords are supported in addition to the common template
409 The following keywords are supported in addition to the common template
410 keywords and functions. See also :hg:`help templates`.
410 keywords and functions. See also :hg:`help templates`.
411
411
412 :lines: List of lines with annotation data.
412 :lines: List of lines with annotation data.
413 :path: String. Repository-absolute path of the specified file.
413 :path: String. Repository-absolute path of the specified file.
414
414
415 And each entry of ``{lines}`` provides the following sub-keywords in
415 And each entry of ``{lines}`` provides the following sub-keywords in
416 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
416 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
417
417
418 :line: String. Line content.
418 :line: String. Line content.
419 :lineno: Integer. Line number at that revision.
419 :lineno: Integer. Line number at that revision.
420 :path: String. Repository-absolute path of the file at that revision.
420 :path: String. Repository-absolute path of the file at that revision.
421
421
422 See :hg:`help templates.operators` for the list expansion syntax.
422 See :hg:`help templates.operators` for the list expansion syntax.
423
423
424 Returns 0 on success.
424 Returns 0 on success.
425 """
425 """
426 opts = pycompat.byteskwargs(opts)
426 opts = pycompat.byteskwargs(opts)
427 if not pats:
427 if not pats:
428 raise error.InputError(
428 raise error.InputError(
429 _(b'at least one filename or pattern is required')
429 _(b'at least one filename or pattern is required')
430 )
430 )
431
431
432 if opts.get(b'follow'):
432 if opts.get(b'follow'):
433 # --follow is deprecated and now just an alias for -f/--file
433 # --follow is deprecated and now just an alias for -f/--file
434 # to mimic the behavior of Mercurial before version 1.5
434 # to mimic the behavior of Mercurial before version 1.5
435 opts[b'file'] = True
435 opts[b'file'] = True
436
436
437 if (
437 if (
438 not opts.get(b'user')
438 not opts.get(b'user')
439 and not opts.get(b'changeset')
439 and not opts.get(b'changeset')
440 and not opts.get(b'date')
440 and not opts.get(b'date')
441 and not opts.get(b'file')
441 and not opts.get(b'file')
442 ):
442 ):
443 opts[b'number'] = True
443 opts[b'number'] = True
444
444
445 linenumber = opts.get(b'line_number') is not None
445 linenumber = opts.get(b'line_number') is not None
446 if (
446 if (
447 linenumber
447 linenumber
448 and (not opts.get(b'changeset'))
448 and (not opts.get(b'changeset'))
449 and (not opts.get(b'number'))
449 and (not opts.get(b'number'))
450 ):
450 ):
451 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
451 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
452
452
453 rev = opts.get(b'rev')
453 rev = opts.get(b'rev')
454 if rev:
454 if rev:
455 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
455 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
456 ctx = scmutil.revsingle(repo, rev)
456 ctx = scmutil.revsingle(repo, rev)
457
457
458 ui.pager(b'annotate')
458 ui.pager(b'annotate')
459 rootfm = ui.formatter(b'annotate', opts)
459 rootfm = ui.formatter(b'annotate', opts)
460 if ui.debugflag:
460 if ui.debugflag:
461 shorthex = pycompat.identity
461 shorthex = pycompat.identity
462 else:
462 else:
463
463
464 def shorthex(h):
464 def shorthex(h):
465 return h[:12]
465 return h[:12]
466
466
467 if ui.quiet:
467 if ui.quiet:
468 datefunc = dateutil.shortdate
468 datefunc = dateutil.shortdate
469 else:
469 else:
470 datefunc = dateutil.datestr
470 datefunc = dateutil.datestr
471 if ctx.rev() is None:
471 if ctx.rev() is None:
472 if opts.get(b'changeset'):
472 if opts.get(b'changeset'):
473 # omit "+" suffix which is appended to node hex
473 # omit "+" suffix which is appended to node hex
474 def formatrev(rev):
474 def formatrev(rev):
475 if rev == wdirrev:
475 if rev == wdirrev:
476 return b'%d' % ctx.p1().rev()
476 return b'%d' % ctx.p1().rev()
477 else:
477 else:
478 return b'%d' % rev
478 return b'%d' % rev
479
479
480 else:
480 else:
481
481
482 def formatrev(rev):
482 def formatrev(rev):
483 if rev == wdirrev:
483 if rev == wdirrev:
484 return b'%d+' % ctx.p1().rev()
484 return b'%d+' % ctx.p1().rev()
485 else:
485 else:
486 return b'%d ' % rev
486 return b'%d ' % rev
487
487
488 def formathex(h):
488 def formathex(h):
489 if h == wdirhex:
489 if h == wdirhex:
490 return b'%s+' % shorthex(hex(ctx.p1().node()))
490 return b'%s+' % shorthex(hex(ctx.p1().node()))
491 else:
491 else:
492 return b'%s ' % shorthex(h)
492 return b'%s ' % shorthex(h)
493
493
494 else:
494 else:
495 formatrev = b'%d'.__mod__
495 formatrev = b'%d'.__mod__
496 formathex = shorthex
496 formathex = shorthex
497
497
498 opmap = [
498 opmap = [
499 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
499 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
500 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
500 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
501 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
501 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
502 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
502 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
503 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
503 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
504 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
504 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
505 ]
505 ]
506 opnamemap = {
506 opnamemap = {
507 b'rev': b'number',
507 b'rev': b'number',
508 b'node': b'changeset',
508 b'node': b'changeset',
509 b'path': b'file',
509 b'path': b'file',
510 b'lineno': b'line_number',
510 b'lineno': b'line_number',
511 }
511 }
512
512
513 if rootfm.isplain():
513 if rootfm.isplain():
514
514
515 def makefunc(get, fmt):
515 def makefunc(get, fmt):
516 return lambda x: fmt(get(x))
516 return lambda x: fmt(get(x))
517
517
518 else:
518 else:
519
519
520 def makefunc(get, fmt):
520 def makefunc(get, fmt):
521 return get
521 return get
522
522
523 datahint = rootfm.datahint()
523 datahint = rootfm.datahint()
524 funcmap = [
524 funcmap = [
525 (makefunc(get, fmt), sep)
525 (makefunc(get, fmt), sep)
526 for fn, sep, get, fmt in opmap
526 for fn, sep, get, fmt in opmap
527 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
528 ]
528 ]
529 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
529 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
530 fields = b' '.join(
530 fields = b' '.join(
531 fn
531 fn
532 for fn, sep, get, fmt in opmap
532 for fn, sep, get, fmt in opmap
533 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
533 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
534 )
534 )
535
535
536 def bad(x, y):
536 def bad(x, y):
537 raise error.Abort(b"%s: %s" % (x, y))
537 raise error.Abort(b"%s: %s" % (x, y))
538
538
539 m = scmutil.match(ctx, pats, opts, badfn=bad)
539 m = scmutil.match(ctx, pats, opts, badfn=bad)
540
540
541 follow = not opts.get(b'no_follow')
541 follow = not opts.get(b'no_follow')
542 diffopts = patch.difffeatureopts(
542 diffopts = patch.difffeatureopts(
543 ui, opts, section=b'annotate', whitespace=True
543 ui, opts, section=b'annotate', whitespace=True
544 )
544 )
545 skiprevs = opts.get(b'skip')
545 skiprevs = opts.get(b'skip')
546 if skiprevs:
546 if skiprevs:
547 skiprevs = scmutil.revrange(repo, skiprevs)
547 skiprevs = scmutil.revrange(repo, skiprevs)
548
548
549 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
549 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
550 for abs in ctx.walk(m):
550 for abs in ctx.walk(m):
551 fctx = ctx[abs]
551 fctx = ctx[abs]
552 rootfm.startitem()
552 rootfm.startitem()
553 rootfm.data(path=abs)
553 rootfm.data(path=abs)
554 if not opts.get(b'text') and fctx.isbinary():
554 if not opts.get(b'text') and fctx.isbinary():
555 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
555 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
556 continue
556 continue
557
557
558 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
558 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
559 lines = fctx.annotate(
559 lines = fctx.annotate(
560 follow=follow, skiprevs=skiprevs, diffopts=diffopts
560 follow=follow, skiprevs=skiprevs, diffopts=diffopts
561 )
561 )
562 if not lines:
562 if not lines:
563 fm.end()
563 fm.end()
564 continue
564 continue
565 formats = []
565 formats = []
566 pieces = []
566 pieces = []
567
567
568 for f, sep in funcmap:
568 for f, sep in funcmap:
569 l = [f(n) for n in lines]
569 l = [f(n) for n in lines]
570 if fm.isplain():
570 if fm.isplain():
571 sizes = [encoding.colwidth(x) for x in l]
571 sizes = [encoding.colwidth(x) for x in l]
572 ml = max(sizes)
572 ml = max(sizes)
573 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
573 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
574 else:
574 else:
575 formats.append([b'%s'] * len(l))
575 formats.append([b'%s'] * len(l))
576 pieces.append(l)
576 pieces.append(l)
577
577
578 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
578 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
579 fm.startitem()
579 fm.startitem()
580 fm.context(fctx=n.fctx)
580 fm.context(fctx=n.fctx)
581 fm.write(fields, b"".join(f), *p)
581 fm.write(fields, b"".join(f), *p)
582 if n.skip:
582 if n.skip:
583 fmt = b"* %s"
583 fmt = b"* %s"
584 else:
584 else:
585 fmt = b": %s"
585 fmt = b": %s"
586 fm.write(b'line', fmt, n.text)
586 fm.write(b'line', fmt, n.text)
587
587
588 if not lines[-1].text.endswith(b'\n'):
588 if not lines[-1].text.endswith(b'\n'):
589 fm.plain(b'\n')
589 fm.plain(b'\n')
590 fm.end()
590 fm.end()
591
591
592 rootfm.end()
592 rootfm.end()
593
593
594
594
595 @command(
595 @command(
596 b'archive',
596 b'archive',
597 [
597 [
598 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
598 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
599 (
599 (
600 b'p',
600 b'p',
601 b'prefix',
601 b'prefix',
602 b'',
602 b'',
603 _(b'directory prefix for files in archive'),
603 _(b'directory prefix for files in archive'),
604 _(b'PREFIX'),
604 _(b'PREFIX'),
605 ),
605 ),
606 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
606 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
607 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
607 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
608 ]
608 ]
609 + subrepoopts
609 + subrepoopts
610 + walkopts,
610 + walkopts,
611 _(b'[OPTION]... DEST'),
611 _(b'[OPTION]... DEST'),
612 helpcategory=command.CATEGORY_IMPORT_EXPORT,
612 helpcategory=command.CATEGORY_IMPORT_EXPORT,
613 )
613 )
614 def archive(ui, repo, dest, **opts):
614 def archive(ui, repo, dest, **opts):
615 """create an unversioned archive of a repository revision
615 """create an unversioned archive of a repository revision
616
616
617 By default, the revision used is the parent of the working
617 By default, the revision used is the parent of the working
618 directory; use -r/--rev to specify a different revision.
618 directory; use -r/--rev to specify a different revision.
619
619
620 The archive type is automatically detected based on file
620 The archive type is automatically detected based on file
621 extension (to override, use -t/--type).
621 extension (to override, use -t/--type).
622
622
623 .. container:: verbose
623 .. container:: verbose
624
624
625 Examples:
625 Examples:
626
626
627 - create a zip file containing the 1.0 release::
627 - create a zip file containing the 1.0 release::
628
628
629 hg archive -r 1.0 project-1.0.zip
629 hg archive -r 1.0 project-1.0.zip
630
630
631 - create a tarball excluding .hg files::
631 - create a tarball excluding .hg files::
632
632
633 hg archive project.tar.gz -X ".hg*"
633 hg archive project.tar.gz -X ".hg*"
634
634
635 Valid types are:
635 Valid types are:
636
636
637 :``files``: a directory full of files (default)
637 :``files``: a directory full of files (default)
638 :``tar``: tar archive, uncompressed
638 :``tar``: tar archive, uncompressed
639 :``tbz2``: tar archive, compressed using bzip2
639 :``tbz2``: tar archive, compressed using bzip2
640 :``tgz``: tar archive, compressed using gzip
640 :``tgz``: tar archive, compressed using gzip
641 :``txz``: tar archive, compressed using lzma (only in Python 3)
641 :``txz``: tar archive, compressed using lzma (only in Python 3)
642 :``uzip``: zip archive, uncompressed
642 :``uzip``: zip archive, uncompressed
643 :``zip``: zip archive, compressed using deflate
643 :``zip``: zip archive, compressed using deflate
644
644
645 The exact name of the destination archive or directory is given
645 The exact name of the destination archive or directory is given
646 using a format string; see :hg:`help export` for details.
646 using a format string; see :hg:`help export` for details.
647
647
648 Each member added to an archive file has a directory prefix
648 Each member added to an archive file has a directory prefix
649 prepended. Use -p/--prefix to specify a format string for the
649 prepended. Use -p/--prefix to specify a format string for the
650 prefix. The default is the basename of the archive, with suffixes
650 prefix. The default is the basename of the archive, with suffixes
651 removed.
651 removed.
652
652
653 Returns 0 on success.
653 Returns 0 on success.
654 """
654 """
655
655
656 opts = pycompat.byteskwargs(opts)
656 opts = pycompat.byteskwargs(opts)
657 rev = opts.get(b'rev')
657 rev = opts.get(b'rev')
658 if rev:
658 if rev:
659 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
659 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
660 ctx = scmutil.revsingle(repo, rev)
660 ctx = scmutil.revsingle(repo, rev)
661 if not ctx:
661 if not ctx:
662 raise error.InputError(
662 raise error.InputError(
663 _(b'no working directory: please specify a revision')
663 _(b'no working directory: please specify a revision')
664 )
664 )
665 node = ctx.node()
665 node = ctx.node()
666 dest = cmdutil.makefilename(ctx, dest)
666 dest = cmdutil.makefilename(ctx, dest)
667 if os.path.realpath(dest) == repo.root:
667 if os.path.realpath(dest) == repo.root:
668 raise error.InputError(_(b'repository root cannot be destination'))
668 raise error.InputError(_(b'repository root cannot be destination'))
669
669
670 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
670 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
671 prefix = opts.get(b'prefix')
671 prefix = opts.get(b'prefix')
672
672
673 if dest == b'-':
673 if dest == b'-':
674 if kind == b'files':
674 if kind == b'files':
675 raise error.InputError(_(b'cannot archive plain files to stdout'))
675 raise error.InputError(_(b'cannot archive plain files to stdout'))
676 dest = cmdutil.makefileobj(ctx, dest)
676 dest = cmdutil.makefileobj(ctx, dest)
677 if not prefix:
677 if not prefix:
678 prefix = os.path.basename(repo.root) + b'-%h'
678 prefix = os.path.basename(repo.root) + b'-%h'
679
679
680 prefix = cmdutil.makefilename(ctx, prefix)
680 prefix = cmdutil.makefilename(ctx, prefix)
681 match = scmutil.match(ctx, [], opts)
681 match = scmutil.match(ctx, [], opts)
682 archival.archive(
682 archival.archive(
683 repo,
683 repo,
684 dest,
684 dest,
685 node,
685 node,
686 kind,
686 kind,
687 not opts.get(b'no_decode'),
687 not opts.get(b'no_decode'),
688 match,
688 match,
689 prefix,
689 prefix,
690 subrepos=opts.get(b'subrepos'),
690 subrepos=opts.get(b'subrepos'),
691 )
691 )
692
692
693
693
694 @command(
694 @command(
695 b'backout',
695 b'backout',
696 [
696 [
697 (
697 (
698 b'',
698 b'',
699 b'merge',
699 b'merge',
700 None,
700 None,
701 _(b'merge with old dirstate parent after backout'),
701 _(b'merge with old dirstate parent after backout'),
702 ),
702 ),
703 (
703 (
704 b'',
704 b'',
705 b'commit',
705 b'commit',
706 None,
706 None,
707 _(b'commit if no conflicts were encountered (DEPRECATED)'),
707 _(b'commit if no conflicts were encountered (DEPRECATED)'),
708 ),
708 ),
709 (b'', b'no-commit', None, _(b'do not commit')),
709 (b'', b'no-commit', None, _(b'do not commit')),
710 (
710 (
711 b'',
711 b'',
712 b'parent',
712 b'parent',
713 b'',
713 b'',
714 _(b'parent to choose when backing out merge (DEPRECATED)'),
714 _(b'parent to choose when backing out merge (DEPRECATED)'),
715 _(b'REV'),
715 _(b'REV'),
716 ),
716 ),
717 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
717 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
719 ]
719 ]
720 + mergetoolopts
720 + mergetoolopts
721 + walkopts
721 + walkopts
722 + commitopts
722 + commitopts
723 + commitopts2,
723 + commitopts2,
724 _(b'[OPTION]... [-r] REV'),
724 _(b'[OPTION]... [-r] REV'),
725 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
725 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
726 )
726 )
727 def backout(ui, repo, node=None, rev=None, **opts):
727 def backout(ui, repo, node=None, rev=None, **opts):
728 """reverse effect of earlier changeset
728 """reverse effect of earlier changeset
729
729
730 Prepare a new changeset with the effect of REV undone in the
730 Prepare a new changeset with the effect of REV undone in the
731 current working directory. If no conflicts were encountered,
731 current working directory. If no conflicts were encountered,
732 it will be committed immediately.
732 it will be committed immediately.
733
733
734 If REV is the parent of the working directory, then this new changeset
734 If REV is the parent of the working directory, then this new changeset
735 is committed automatically (unless --no-commit is specified).
735 is committed automatically (unless --no-commit is specified).
736
736
737 .. note::
737 .. note::
738
738
739 :hg:`backout` cannot be used to fix either an unwanted or
739 :hg:`backout` cannot be used to fix either an unwanted or
740 incorrect merge.
740 incorrect merge.
741
741
742 .. container:: verbose
742 .. container:: verbose
743
743
744 Examples:
744 Examples:
745
745
746 - Reverse the effect of the parent of the working directory.
746 - Reverse the effect of the parent of the working directory.
747 This backout will be committed immediately::
747 This backout will be committed immediately::
748
748
749 hg backout -r .
749 hg backout -r .
750
750
751 - Reverse the effect of previous bad revision 23::
751 - Reverse the effect of previous bad revision 23::
752
752
753 hg backout -r 23
753 hg backout -r 23
754
754
755 - Reverse the effect of previous bad revision 23 and
755 - Reverse the effect of previous bad revision 23 and
756 leave changes uncommitted::
756 leave changes uncommitted::
757
757
758 hg backout -r 23 --no-commit
758 hg backout -r 23 --no-commit
759 hg commit -m "Backout revision 23"
759 hg commit -m "Backout revision 23"
760
760
761 By default, the pending changeset will have one parent,
761 By default, the pending changeset will have one parent,
762 maintaining a linear history. With --merge, the pending
762 maintaining a linear history. With --merge, the pending
763 changeset will instead have two parents: the old parent of the
763 changeset will instead have two parents: the old parent of the
764 working directory and a new child of REV that simply undoes REV.
764 working directory and a new child of REV that simply undoes REV.
765
765
766 Before version 1.7, the behavior without --merge was equivalent
766 Before version 1.7, the behavior without --merge was equivalent
767 to specifying --merge followed by :hg:`update --clean .` to
767 to specifying --merge followed by :hg:`update --clean .` to
768 cancel the merge and leave the child of REV as a head to be
768 cancel the merge and leave the child of REV as a head to be
769 merged separately.
769 merged separately.
770
770
771 See :hg:`help dates` for a list of formats valid for -d/--date.
771 See :hg:`help dates` for a list of formats valid for -d/--date.
772
772
773 See :hg:`help revert` for a way to restore files to the state
773 See :hg:`help revert` for a way to restore files to the state
774 of another revision.
774 of another revision.
775
775
776 Returns 0 on success, 1 if nothing to backout or there are unresolved
776 Returns 0 on success, 1 if nothing to backout or there are unresolved
777 files.
777 files.
778 """
778 """
779 with repo.wlock(), repo.lock():
779 with repo.wlock(), repo.lock():
780 return _dobackout(ui, repo, node, rev, **opts)
780 return _dobackout(ui, repo, node, rev, **opts)
781
781
782
782
783 def _dobackout(ui, repo, node=None, rev=None, **opts):
783 def _dobackout(ui, repo, node=None, rev=None, **opts):
784 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
784 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
785 opts = pycompat.byteskwargs(opts)
785 opts = pycompat.byteskwargs(opts)
786
786
787 if rev and node:
787 if rev and node:
788 raise error.InputError(_(b"please specify just one revision"))
788 raise error.InputError(_(b"please specify just one revision"))
789
789
790 if not rev:
790 if not rev:
791 rev = node
791 rev = node
792
792
793 if not rev:
793 if not rev:
794 raise error.InputError(_(b"please specify a revision to backout"))
794 raise error.InputError(_(b"please specify a revision to backout"))
795
795
796 date = opts.get(b'date')
796 date = opts.get(b'date')
797 if date:
797 if date:
798 opts[b'date'] = dateutil.parsedate(date)
798 opts[b'date'] = dateutil.parsedate(date)
799
799
800 cmdutil.checkunfinished(repo)
800 cmdutil.checkunfinished(repo)
801 cmdutil.bailifchanged(repo)
801 cmdutil.bailifchanged(repo)
802 ctx = scmutil.revsingle(repo, rev)
802 ctx = scmutil.revsingle(repo, rev)
803 node = ctx.node()
803 node = ctx.node()
804
804
805 op1, op2 = repo.dirstate.parents()
805 op1, op2 = repo.dirstate.parents()
806 if not repo.changelog.isancestor(node, op1):
806 if not repo.changelog.isancestor(node, op1):
807 raise error.InputError(
807 raise error.InputError(
808 _(b'cannot backout change that is not an ancestor')
808 _(b'cannot backout change that is not an ancestor')
809 )
809 )
810
810
811 p1, p2 = repo.changelog.parents(node)
811 p1, p2 = repo.changelog.parents(node)
812 if p1 == nullid:
812 if p1 == nullid:
813 raise error.InputError(_(b'cannot backout a change with no parents'))
813 raise error.InputError(_(b'cannot backout a change with no parents'))
814 if p2 != nullid:
814 if p2 != nullid:
815 if not opts.get(b'parent'):
815 if not opts.get(b'parent'):
816 raise error.InputError(_(b'cannot backout a merge changeset'))
816 raise error.InputError(_(b'cannot backout a merge changeset'))
817 p = repo.lookup(opts[b'parent'])
817 p = repo.lookup(opts[b'parent'])
818 if p not in (p1, p2):
818 if p not in (p1, p2):
819 raise error.InputError(
819 raise error.InputError(
820 _(b'%s is not a parent of %s') % (short(p), short(node))
820 _(b'%s is not a parent of %s') % (short(p), short(node))
821 )
821 )
822 parent = p
822 parent = p
823 else:
823 else:
824 if opts.get(b'parent'):
824 if opts.get(b'parent'):
825 raise error.InputError(
825 raise error.InputError(
826 _(b'cannot use --parent on non-merge changeset')
826 _(b'cannot use --parent on non-merge changeset')
827 )
827 )
828 parent = p1
828 parent = p1
829
829
830 # the backout should appear on the same branch
830 # the backout should appear on the same branch
831 branch = repo.dirstate.branch()
831 branch = repo.dirstate.branch()
832 bheads = repo.branchheads(branch)
832 bheads = repo.branchheads(branch)
833 rctx = scmutil.revsingle(repo, hex(parent))
833 rctx = scmutil.revsingle(repo, hex(parent))
834 if not opts.get(b'merge') and op1 != node:
834 if not opts.get(b'merge') and op1 != node:
835 with dirstateguard.dirstateguard(repo, b'backout'):
835 with dirstateguard.dirstateguard(repo, b'backout'):
836 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
836 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
837 with ui.configoverride(overrides, b'backout'):
837 with ui.configoverride(overrides, b'backout'):
838 stats = mergemod.back_out(ctx, parent=repo[parent])
838 stats = mergemod.back_out(ctx, parent=repo[parent])
839 repo.setparents(op1, op2)
839 repo.setparents(op1, op2)
840 hg._showstats(repo, stats)
840 hg._showstats(repo, stats)
841 if stats.unresolvedcount:
841 if stats.unresolvedcount:
842 repo.ui.status(
842 repo.ui.status(
843 _(b"use 'hg resolve' to retry unresolved file merges\n")
843 _(b"use 'hg resolve' to retry unresolved file merges\n")
844 )
844 )
845 return 1
845 return 1
846 else:
846 else:
847 hg.clean(repo, node, show_stats=False)
847 hg.clean(repo, node, show_stats=False)
848 repo.dirstate.setbranch(branch)
848 repo.dirstate.setbranch(branch)
849 cmdutil.revert(ui, repo, rctx)
849 cmdutil.revert(ui, repo, rctx)
850
850
851 if opts.get(b'no_commit'):
851 if opts.get(b'no_commit'):
852 msg = _(b"changeset %s backed out, don't forget to commit.\n")
852 msg = _(b"changeset %s backed out, don't forget to commit.\n")
853 ui.status(msg % short(node))
853 ui.status(msg % short(node))
854 return 0
854 return 0
855
855
856 def commitfunc(ui, repo, message, match, opts):
856 def commitfunc(ui, repo, message, match, opts):
857 editform = b'backout'
857 editform = b'backout'
858 e = cmdutil.getcommiteditor(
858 e = cmdutil.getcommiteditor(
859 editform=editform, **pycompat.strkwargs(opts)
859 editform=editform, **pycompat.strkwargs(opts)
860 )
860 )
861 if not message:
861 if not message:
862 # we don't translate commit messages
862 # we don't translate commit messages
863 message = b"Backed out changeset %s" % short(node)
863 message = b"Backed out changeset %s" % short(node)
864 e = cmdutil.getcommiteditor(edit=True, editform=editform)
864 e = cmdutil.getcommiteditor(edit=True, editform=editform)
865 return repo.commit(
865 return repo.commit(
866 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
866 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
867 )
867 )
868
868
869 # save to detect changes
869 # save to detect changes
870 tip = repo.changelog.tip()
870 tip = repo.changelog.tip()
871
871
872 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
872 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
873 if not newnode:
873 if not newnode:
874 ui.status(_(b"nothing changed\n"))
874 ui.status(_(b"nothing changed\n"))
875 return 1
875 return 1
876 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
876 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
877
877
878 def nice(node):
878 def nice(node):
879 return b'%d:%s' % (repo.changelog.rev(node), short(node))
879 return b'%d:%s' % (repo.changelog.rev(node), short(node))
880
880
881 ui.status(
881 ui.status(
882 _(b'changeset %s backs out changeset %s\n')
882 _(b'changeset %s backs out changeset %s\n')
883 % (nice(newnode), nice(node))
883 % (nice(newnode), nice(node))
884 )
884 )
885 if opts.get(b'merge') and op1 != node:
885 if opts.get(b'merge') and op1 != node:
886 hg.clean(repo, op1, show_stats=False)
886 hg.clean(repo, op1, show_stats=False)
887 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
887 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
888 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
888 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
889 with ui.configoverride(overrides, b'backout'):
889 with ui.configoverride(overrides, b'backout'):
890 return hg.merge(repo[b'tip'])
890 return hg.merge(repo[b'tip'])
891 return 0
891 return 0
892
892
893
893
894 @command(
894 @command(
895 b'bisect',
895 b'bisect',
896 [
896 [
897 (b'r', b'reset', False, _(b'reset bisect state')),
897 (b'r', b'reset', False, _(b'reset bisect state')),
898 (b'g', b'good', False, _(b'mark changeset good')),
898 (b'g', b'good', False, _(b'mark changeset good')),
899 (b'b', b'bad', False, _(b'mark changeset bad')),
899 (b'b', b'bad', False, _(b'mark changeset bad')),
900 (b's', b'skip', False, _(b'skip testing changeset')),
900 (b's', b'skip', False, _(b'skip testing changeset')),
901 (b'e', b'extend', False, _(b'extend the bisect range')),
901 (b'e', b'extend', False, _(b'extend the bisect range')),
902 (
902 (
903 b'c',
903 b'c',
904 b'command',
904 b'command',
905 b'',
905 b'',
906 _(b'use command to check changeset state'),
906 _(b'use command to check changeset state'),
907 _(b'CMD'),
907 _(b'CMD'),
908 ),
908 ),
909 (b'U', b'noupdate', False, _(b'do not update to target')),
909 (b'U', b'noupdate', False, _(b'do not update to target')),
910 ],
910 ],
911 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
911 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
912 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
912 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
913 )
913 )
914 def bisect(
914 def bisect(
915 ui,
915 ui,
916 repo,
916 repo,
917 positional_1=None,
917 positional_1=None,
918 positional_2=None,
918 positional_2=None,
919 command=None,
919 command=None,
920 reset=None,
920 reset=None,
921 good=None,
921 good=None,
922 bad=None,
922 bad=None,
923 skip=None,
923 skip=None,
924 extend=None,
924 extend=None,
925 noupdate=None,
925 noupdate=None,
926 ):
926 ):
927 """subdivision search of changesets
927 """subdivision search of changesets
928
928
929 This command helps to find changesets which introduce problems. To
929 This command helps to find changesets which introduce problems. To
930 use, mark the earliest changeset you know exhibits the problem as
930 use, mark the earliest changeset you know exhibits the problem as
931 bad, then mark the latest changeset which is free from the problem
931 bad, then mark the latest changeset which is free from the problem
932 as good. Bisect will update your working directory to a revision
932 as good. Bisect will update your working directory to a revision
933 for testing (unless the -U/--noupdate option is specified). Once
933 for testing (unless the -U/--noupdate option is specified). Once
934 you have performed tests, mark the working directory as good or
934 you have performed tests, mark the working directory as good or
935 bad, and bisect will either update to another candidate changeset
935 bad, and bisect will either update to another candidate changeset
936 or announce that it has found the bad revision.
936 or announce that it has found the bad revision.
937
937
938 As a shortcut, you can also use the revision argument to mark a
938 As a shortcut, you can also use the revision argument to mark a
939 revision as good or bad without checking it out first.
939 revision as good or bad without checking it out first.
940
940
941 If you supply a command, it will be used for automatic bisection.
941 If you supply a command, it will be used for automatic bisection.
942 The environment variable HG_NODE will contain the ID of the
942 The environment variable HG_NODE will contain the ID of the
943 changeset being tested. The exit status of the command will be
943 changeset being tested. The exit status of the command will be
944 used to mark revisions as good or bad: status 0 means good, 125
944 used to mark revisions as good or bad: status 0 means good, 125
945 means to skip the revision, 127 (command not found) will abort the
945 means to skip the revision, 127 (command not found) will abort the
946 bisection, and any other non-zero exit status means the revision
946 bisection, and any other non-zero exit status means the revision
947 is bad.
947 is bad.
948
948
949 .. container:: verbose
949 .. container:: verbose
950
950
951 Some examples:
951 Some examples:
952
952
953 - start a bisection with known bad revision 34, and good revision 12::
953 - start a bisection with known bad revision 34, and good revision 12::
954
954
955 hg bisect --bad 34
955 hg bisect --bad 34
956 hg bisect --good 12
956 hg bisect --good 12
957
957
958 - advance the current bisection by marking current revision as good or
958 - advance the current bisection by marking current revision as good or
959 bad::
959 bad::
960
960
961 hg bisect --good
961 hg bisect --good
962 hg bisect --bad
962 hg bisect --bad
963
963
964 - mark the current revision, or a known revision, to be skipped (e.g. if
964 - mark the current revision, or a known revision, to be skipped (e.g. if
965 that revision is not usable because of another issue)::
965 that revision is not usable because of another issue)::
966
966
967 hg bisect --skip
967 hg bisect --skip
968 hg bisect --skip 23
968 hg bisect --skip 23
969
969
970 - skip all revisions that do not touch directories ``foo`` or ``bar``::
970 - skip all revisions that do not touch directories ``foo`` or ``bar``::
971
971
972 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
972 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
973
973
974 - forget the current bisection::
974 - forget the current bisection::
975
975
976 hg bisect --reset
976 hg bisect --reset
977
977
978 - use 'make && make tests' to automatically find the first broken
978 - use 'make && make tests' to automatically find the first broken
979 revision::
979 revision::
980
980
981 hg bisect --reset
981 hg bisect --reset
982 hg bisect --bad 34
982 hg bisect --bad 34
983 hg bisect --good 12
983 hg bisect --good 12
984 hg bisect --command "make && make tests"
984 hg bisect --command "make && make tests"
985
985
986 - see all changesets whose states are already known in the current
986 - see all changesets whose states are already known in the current
987 bisection::
987 bisection::
988
988
989 hg log -r "bisect(pruned)"
989 hg log -r "bisect(pruned)"
990
990
991 - see the changeset currently being bisected (especially useful
991 - see the changeset currently being bisected (especially useful
992 if running with -U/--noupdate)::
992 if running with -U/--noupdate)::
993
993
994 hg log -r "bisect(current)"
994 hg log -r "bisect(current)"
995
995
996 - see all changesets that took part in the current bisection::
996 - see all changesets that took part in the current bisection::
997
997
998 hg log -r "bisect(range)"
998 hg log -r "bisect(range)"
999
999
1000 - you can even get a nice graph::
1000 - you can even get a nice graph::
1001
1001
1002 hg log --graph -r "bisect(range)"
1002 hg log --graph -r "bisect(range)"
1003
1003
1004 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1004 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1005
1005
1006 Returns 0 on success.
1006 Returns 0 on success.
1007 """
1007 """
1008 rev = []
1008 rev = []
1009 # backward compatibility
1009 # backward compatibility
1010 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1010 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1011 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1011 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1012 cmd = positional_1
1012 cmd = positional_1
1013 rev.append(positional_2)
1013 rev.append(positional_2)
1014 if cmd == b"good":
1014 if cmd == b"good":
1015 good = True
1015 good = True
1016 elif cmd == b"bad":
1016 elif cmd == b"bad":
1017 bad = True
1017 bad = True
1018 else:
1018 else:
1019 reset = True
1019 reset = True
1020 elif positional_2:
1020 elif positional_2:
1021 raise error.InputError(_(b'incompatible arguments'))
1021 raise error.InputError(_(b'incompatible arguments'))
1022 elif positional_1 is not None:
1022 elif positional_1 is not None:
1023 rev.append(positional_1)
1023 rev.append(positional_1)
1024
1024
1025 incompatibles = {
1025 incompatibles = {
1026 b'--bad': bad,
1026 b'--bad': bad,
1027 b'--command': bool(command),
1027 b'--command': bool(command),
1028 b'--extend': extend,
1028 b'--extend': extend,
1029 b'--good': good,
1029 b'--good': good,
1030 b'--reset': reset,
1030 b'--reset': reset,
1031 b'--skip': skip,
1031 b'--skip': skip,
1032 }
1032 }
1033
1033
1034 enabled = [x for x in incompatibles if incompatibles[x]]
1034 enabled = [x for x in incompatibles if incompatibles[x]]
1035
1035
1036 if len(enabled) > 1:
1036 if len(enabled) > 1:
1037 raise error.InputError(
1037 raise error.InputError(
1038 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1038 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1039 )
1039 )
1040
1040
1041 if reset:
1041 if reset:
1042 hbisect.resetstate(repo)
1042 hbisect.resetstate(repo)
1043 return
1043 return
1044
1044
1045 state = hbisect.load_state(repo)
1045 state = hbisect.load_state(repo)
1046
1046
1047 if rev:
1047 if rev:
1048 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1048 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1049 else:
1049 else:
1050 nodes = [repo.lookup(b'.')]
1050 nodes = [repo.lookup(b'.')]
1051
1051
1052 # update state
1052 # update state
1053 if good or bad or skip:
1053 if good or bad or skip:
1054 if good:
1054 if good:
1055 state[b'good'] += nodes
1055 state[b'good'] += nodes
1056 elif bad:
1056 elif bad:
1057 state[b'bad'] += nodes
1057 state[b'bad'] += nodes
1058 elif skip:
1058 elif skip:
1059 state[b'skip'] += nodes
1059 state[b'skip'] += nodes
1060 hbisect.save_state(repo, state)
1060 hbisect.save_state(repo, state)
1061 if not (state[b'good'] and state[b'bad']):
1061 if not (state[b'good'] and state[b'bad']):
1062 return
1062 return
1063
1063
1064 def mayupdate(repo, node, show_stats=True):
1064 def mayupdate(repo, node, show_stats=True):
1065 """common used update sequence"""
1065 """common used update sequence"""
1066 if noupdate:
1066 if noupdate:
1067 return
1067 return
1068 cmdutil.checkunfinished(repo)
1068 cmdutil.checkunfinished(repo)
1069 cmdutil.bailifchanged(repo)
1069 cmdutil.bailifchanged(repo)
1070 return hg.clean(repo, node, show_stats=show_stats)
1070 return hg.clean(repo, node, show_stats=show_stats)
1071
1071
1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1073
1073
1074 if command:
1074 if command:
1075 changesets = 1
1075 changesets = 1
1076 if noupdate:
1076 if noupdate:
1077 try:
1077 try:
1078 node = state[b'current'][0]
1078 node = state[b'current'][0]
1079 except LookupError:
1079 except LookupError:
1080 raise error.StateError(
1080 raise error.StateError(
1081 _(
1081 _(
1082 b'current bisect revision is unknown - '
1082 b'current bisect revision is unknown - '
1083 b'start a new bisect to fix'
1083 b'start a new bisect to fix'
1084 )
1084 )
1085 )
1085 )
1086 else:
1086 else:
1087 node, p2 = repo.dirstate.parents()
1087 node, p2 = repo.dirstate.parents()
1088 if p2 != nullid:
1088 if p2 != nullid:
1089 raise error.StateError(_(b'current bisect revision is a merge'))
1089 raise error.StateError(_(b'current bisect revision is a merge'))
1090 if rev:
1090 if rev:
1091 if not nodes:
1091 if not nodes:
1092 raise error.Abort(_(b'empty revision set'))
1092 raise error.Abort(_(b'empty revision set'))
1093 node = repo[nodes[-1]].node()
1093 node = repo[nodes[-1]].node()
1094 with hbisect.restore_state(repo, state, node):
1094 with hbisect.restore_state(repo, state, node):
1095 while changesets:
1095 while changesets:
1096 # update state
1096 # update state
1097 state[b'current'] = [node]
1097 state[b'current'] = [node]
1098 hbisect.save_state(repo, state)
1098 hbisect.save_state(repo, state)
1099 status = ui.system(
1099 status = ui.system(
1100 command,
1100 command,
1101 environ={b'HG_NODE': hex(node)},
1101 environ={b'HG_NODE': hex(node)},
1102 blockedtag=b'bisect_check',
1102 blockedtag=b'bisect_check',
1103 )
1103 )
1104 if status == 125:
1104 if status == 125:
1105 transition = b"skip"
1105 transition = b"skip"
1106 elif status == 0:
1106 elif status == 0:
1107 transition = b"good"
1107 transition = b"good"
1108 # status < 0 means process was killed
1108 # status < 0 means process was killed
1109 elif status == 127:
1109 elif status == 127:
1110 raise error.Abort(_(b"failed to execute %s") % command)
1110 raise error.Abort(_(b"failed to execute %s") % command)
1111 elif status < 0:
1111 elif status < 0:
1112 raise error.Abort(_(b"%s killed") % command)
1112 raise error.Abort(_(b"%s killed") % command)
1113 else:
1113 else:
1114 transition = b"bad"
1114 transition = b"bad"
1115 state[transition].append(node)
1115 state[transition].append(node)
1116 ctx = repo[node]
1116 ctx = repo[node]
1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1119 hbisect.checkstate(state)
1119 hbisect.checkstate(state)
1120 # bisect
1120 # bisect
1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1122 # update to next check
1122 # update to next check
1123 node = nodes[0]
1123 node = nodes[0]
1124 mayupdate(repo, node, show_stats=False)
1124 mayupdate(repo, node, show_stats=False)
1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1126 return
1126 return
1127
1127
1128 hbisect.checkstate(state)
1128 hbisect.checkstate(state)
1129
1129
1130 # actually bisect
1130 # actually bisect
1131 nodes, changesets, good = hbisect.bisect(repo, state)
1131 nodes, changesets, good = hbisect.bisect(repo, state)
1132 if extend:
1132 if extend:
1133 if not changesets:
1133 if not changesets:
1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1135 if extendctx is not None:
1135 if extendctx is not None:
1136 ui.write(
1136 ui.write(
1137 _(b"Extending search to changeset %s\n")
1137 _(b"Extending search to changeset %s\n")
1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1139 )
1139 )
1140 state[b'current'] = [extendctx.node()]
1140 state[b'current'] = [extendctx.node()]
1141 hbisect.save_state(repo, state)
1141 hbisect.save_state(repo, state)
1142 return mayupdate(repo, extendctx.node())
1142 return mayupdate(repo, extendctx.node())
1143 raise error.StateError(_(b"nothing to extend"))
1143 raise error.StateError(_(b"nothing to extend"))
1144
1144
1145 if changesets == 0:
1145 if changesets == 0:
1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1147 else:
1147 else:
1148 assert len(nodes) == 1 # only a single node can be tested next
1148 assert len(nodes) == 1 # only a single node can be tested next
1149 node = nodes[0]
1149 node = nodes[0]
1150 # compute the approximate number of remaining tests
1150 # compute the approximate number of remaining tests
1151 tests, size = 0, 2
1151 tests, size = 0, 2
1152 while size <= changesets:
1152 while size <= changesets:
1153 tests, size = tests + 1, size * 2
1153 tests, size = tests + 1, size * 2
1154 rev = repo.changelog.rev(node)
1154 rev = repo.changelog.rev(node)
1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1156 ui.write(
1156 ui.write(
1157 _(
1157 _(
1158 b"Testing changeset %s "
1158 b"Testing changeset %s "
1159 b"(%d changesets remaining, ~%d tests)\n"
1159 b"(%d changesets remaining, ~%d tests)\n"
1160 )
1160 )
1161 % (summary, changesets, tests)
1161 % (summary, changesets, tests)
1162 )
1162 )
1163 state[b'current'] = [node]
1163 state[b'current'] = [node]
1164 hbisect.save_state(repo, state)
1164 hbisect.save_state(repo, state)
1165 return mayupdate(repo, node)
1165 return mayupdate(repo, node)
1166
1166
1167
1167
1168 @command(
1168 @command(
1169 b'bookmarks|bookmark',
1169 b'bookmarks|bookmark',
1170 [
1170 [
1171 (b'f', b'force', False, _(b'force')),
1171 (b'f', b'force', False, _(b'force')),
1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1177 ]
1177 ]
1178 + formatteropts,
1178 + formatteropts,
1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1181 )
1181 )
1182 def bookmark(ui, repo, *names, **opts):
1182 def bookmark(ui, repo, *names, **opts):
1183 """create a new bookmark or list existing bookmarks
1183 """create a new bookmark or list existing bookmarks
1184
1184
1185 Bookmarks are labels on changesets to help track lines of development.
1185 Bookmarks are labels on changesets to help track lines of development.
1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1187 Deleting or moving a bookmark has no effect on the associated changesets.
1187 Deleting or moving a bookmark has no effect on the associated changesets.
1188
1188
1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1190 The active bookmark is indicated with a '*'.
1190 The active bookmark is indicated with a '*'.
1191 When a commit is made, the active bookmark will advance to the new commit.
1191 When a commit is made, the active bookmark will advance to the new commit.
1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1193 Updating away from a bookmark will cause it to be deactivated.
1193 Updating away from a bookmark will cause it to be deactivated.
1194
1194
1195 Bookmarks can be pushed and pulled between repositories (see
1195 Bookmarks can be pushed and pulled between repositories (see
1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1198 be created. Using :hg:`merge` will resolve the divergence.
1198 be created. Using :hg:`merge` will resolve the divergence.
1199
1199
1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1201 the active bookmark's name.
1201 the active bookmark's name.
1202
1202
1203 A bookmark named '@' has the special property that :hg:`clone` will
1203 A bookmark named '@' has the special property that :hg:`clone` will
1204 check it out by default if it exists.
1204 check it out by default if it exists.
1205
1205
1206 .. container:: verbose
1206 .. container:: verbose
1207
1207
1208 Template:
1208 Template:
1209
1209
1210 The following keywords are supported in addition to the common template
1210 The following keywords are supported in addition to the common template
1211 keywords and functions such as ``{bookmark}``. See also
1211 keywords and functions such as ``{bookmark}``. See also
1212 :hg:`help templates`.
1212 :hg:`help templates`.
1213
1213
1214 :active: Boolean. True if the bookmark is active.
1214 :active: Boolean. True if the bookmark is active.
1215
1215
1216 Examples:
1216 Examples:
1217
1217
1218 - create an active bookmark for a new line of development::
1218 - create an active bookmark for a new line of development::
1219
1219
1220 hg book new-feature
1220 hg book new-feature
1221
1221
1222 - create an inactive bookmark as a place marker::
1222 - create an inactive bookmark as a place marker::
1223
1223
1224 hg book -i reviewed
1224 hg book -i reviewed
1225
1225
1226 - create an inactive bookmark on another changeset::
1226 - create an inactive bookmark on another changeset::
1227
1227
1228 hg book -r .^ tested
1228 hg book -r .^ tested
1229
1229
1230 - rename bookmark turkey to dinner::
1230 - rename bookmark turkey to dinner::
1231
1231
1232 hg book -m turkey dinner
1232 hg book -m turkey dinner
1233
1233
1234 - move the '@' bookmark from another branch::
1234 - move the '@' bookmark from another branch::
1235
1235
1236 hg book -f @
1236 hg book -f @
1237
1237
1238 - print only the active bookmark name::
1238 - print only the active bookmark name::
1239
1239
1240 hg book -ql .
1240 hg book -ql .
1241 """
1241 """
1242 opts = pycompat.byteskwargs(opts)
1242 opts = pycompat.byteskwargs(opts)
1243 force = opts.get(b'force')
1243 force = opts.get(b'force')
1244 rev = opts.get(b'rev')
1244 rev = opts.get(b'rev')
1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1246
1246
1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1248 if action:
1248 if action:
1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1250 elif names or rev:
1250 elif names or rev:
1251 action = b'add'
1251 action = b'add'
1252 elif inactive:
1252 elif inactive:
1253 action = b'inactive' # meaning deactivate
1253 action = b'inactive' # meaning deactivate
1254 else:
1254 else:
1255 action = b'list'
1255 action = b'list'
1256
1256
1257 cmdutil.check_incompatible_arguments(
1257 cmdutil.check_incompatible_arguments(
1258 opts, b'inactive', [b'delete', b'list']
1258 opts, b'inactive', [b'delete', b'list']
1259 )
1259 )
1260 if not names and action in {b'add', b'delete'}:
1260 if not names and action in {b'add', b'delete'}:
1261 raise error.InputError(_(b"bookmark name required"))
1261 raise error.InputError(_(b"bookmark name required"))
1262
1262
1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1265 if action == b'delete':
1265 if action == b'delete':
1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 bookmarks.delete(repo, tr, names)
1267 bookmarks.delete(repo, tr, names)
1268 elif action == b'rename':
1268 elif action == b'rename':
1269 if not names:
1269 if not names:
1270 raise error.InputError(_(b"new bookmark name required"))
1270 raise error.InputError(_(b"new bookmark name required"))
1271 elif len(names) > 1:
1271 elif len(names) > 1:
1272 raise error.InputError(
1272 raise error.InputError(
1273 _(b"only one new bookmark name allowed")
1273 _(b"only one new bookmark name allowed")
1274 )
1274 )
1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1277 elif action == b'add':
1277 elif action == b'add':
1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1279 elif action == b'inactive':
1279 elif action == b'inactive':
1280 if len(repo._bookmarks) == 0:
1280 if len(repo._bookmarks) == 0:
1281 ui.status(_(b"no bookmarks set\n"))
1281 ui.status(_(b"no bookmarks set\n"))
1282 elif not repo._activebookmark:
1282 elif not repo._activebookmark:
1283 ui.status(_(b"no active bookmark\n"))
1283 ui.status(_(b"no active bookmark\n"))
1284 else:
1284 else:
1285 bookmarks.deactivate(repo)
1285 bookmarks.deactivate(repo)
1286 elif action == b'list':
1286 elif action == b'list':
1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1288 with ui.formatter(b'bookmarks', opts) as fm:
1288 with ui.formatter(b'bookmarks', opts) as fm:
1289 bookmarks.printbookmarks(ui, repo, fm, names)
1289 bookmarks.printbookmarks(ui, repo, fm, names)
1290 else:
1290 else:
1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1292
1292
1293
1293
1294 @command(
1294 @command(
1295 b'branch',
1295 b'branch',
1296 [
1296 [
1297 (
1297 (
1298 b'f',
1298 b'f',
1299 b'force',
1299 b'force',
1300 None,
1300 None,
1301 _(b'set branch name even if it shadows an existing branch'),
1301 _(b'set branch name even if it shadows an existing branch'),
1302 ),
1302 ),
1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1304 (
1304 (
1305 b'r',
1305 b'r',
1306 b'rev',
1306 b'rev',
1307 [],
1307 [],
1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1309 ),
1309 ),
1310 ],
1310 ],
1311 _(b'[-fC] [NAME]'),
1311 _(b'[-fC] [NAME]'),
1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1313 )
1313 )
1314 def branch(ui, repo, label=None, **opts):
1314 def branch(ui, repo, label=None, **opts):
1315 """set or show the current branch name
1315 """set or show the current branch name
1316
1316
1317 .. note::
1317 .. note::
1318
1318
1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1320 light-weight bookmark instead. See :hg:`help glossary` for more
1320 light-weight bookmark instead. See :hg:`help glossary` for more
1321 information about named branches and bookmarks.
1321 information about named branches and bookmarks.
1322
1322
1323 With no argument, show the current branch name. With one argument,
1323 With no argument, show the current branch name. With one argument,
1324 set the working directory branch name (the branch will not exist
1324 set the working directory branch name (the branch will not exist
1325 in the repository until the next commit). Standard practice
1325 in the repository until the next commit). Standard practice
1326 recommends that primary development take place on the 'default'
1326 recommends that primary development take place on the 'default'
1327 branch.
1327 branch.
1328
1328
1329 Unless -f/--force is specified, branch will not let you set a
1329 Unless -f/--force is specified, branch will not let you set a
1330 branch name that already exists.
1330 branch name that already exists.
1331
1331
1332 Use -C/--clean to reset the working directory branch to that of
1332 Use -C/--clean to reset the working directory branch to that of
1333 the parent of the working directory, negating a previous branch
1333 the parent of the working directory, negating a previous branch
1334 change.
1334 change.
1335
1335
1336 Use the command :hg:`update` to switch to an existing branch. Use
1336 Use the command :hg:`update` to switch to an existing branch. Use
1337 :hg:`commit --close-branch` to mark this branch head as closed.
1337 :hg:`commit --close-branch` to mark this branch head as closed.
1338 When all heads of a branch are closed, the branch will be
1338 When all heads of a branch are closed, the branch will be
1339 considered closed.
1339 considered closed.
1340
1340
1341 Returns 0 on success.
1341 Returns 0 on success.
1342 """
1342 """
1343 opts = pycompat.byteskwargs(opts)
1343 opts = pycompat.byteskwargs(opts)
1344 revs = opts.get(b'rev')
1344 revs = opts.get(b'rev')
1345 if label:
1345 if label:
1346 label = label.strip()
1346 label = label.strip()
1347
1347
1348 if not opts.get(b'clean') and not label:
1348 if not opts.get(b'clean') and not label:
1349 if revs:
1349 if revs:
1350 raise error.InputError(
1350 raise error.InputError(
1351 _(b"no branch name specified for the revisions")
1351 _(b"no branch name specified for the revisions")
1352 )
1352 )
1353 ui.write(b"%s\n" % repo.dirstate.branch())
1353 ui.write(b"%s\n" % repo.dirstate.branch())
1354 return
1354 return
1355
1355
1356 with repo.wlock():
1356 with repo.wlock():
1357 if opts.get(b'clean'):
1357 if opts.get(b'clean'):
1358 label = repo[b'.'].branch()
1358 label = repo[b'.'].branch()
1359 repo.dirstate.setbranch(label)
1359 repo.dirstate.setbranch(label)
1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1361 elif label:
1361 elif label:
1362
1362
1363 scmutil.checknewlabel(repo, label, b'branch')
1363 scmutil.checknewlabel(repo, label, b'branch')
1364 if revs:
1364 if revs:
1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1366
1366
1367 if not opts.get(b'force') and label in repo.branchmap():
1367 if not opts.get(b'force') and label in repo.branchmap():
1368 if label not in [p.branch() for p in repo[None].parents()]:
1368 if label not in [p.branch() for p in repo[None].parents()]:
1369 raise error.InputError(
1369 raise error.InputError(
1370 _(b'a branch of the same name already exists'),
1370 _(b'a branch of the same name already exists'),
1371 # i18n: "it" refers to an existing branch
1371 # i18n: "it" refers to an existing branch
1372 hint=_(b"use 'hg update' to switch to it"),
1372 hint=_(b"use 'hg update' to switch to it"),
1373 )
1373 )
1374
1374
1375 repo.dirstate.setbranch(label)
1375 repo.dirstate.setbranch(label)
1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1377
1377
1378 # find any open named branches aside from default
1378 # find any open named branches aside from default
1379 for n, h, t, c in repo.branchmap().iterbranches():
1379 for n, h, t, c in repo.branchmap().iterbranches():
1380 if n != b"default" and not c:
1380 if n != b"default" and not c:
1381 return 0
1381 return 0
1382 ui.status(
1382 ui.status(
1383 _(
1383 _(
1384 b'(branches are permanent and global, '
1384 b'(branches are permanent and global, '
1385 b'did you want a bookmark?)\n'
1385 b'did you want a bookmark?)\n'
1386 )
1386 )
1387 )
1387 )
1388
1388
1389
1389
1390 @command(
1390 @command(
1391 b'branches',
1391 b'branches',
1392 [
1392 [
1393 (
1393 (
1394 b'a',
1394 b'a',
1395 b'active',
1395 b'active',
1396 False,
1396 False,
1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1398 ),
1398 ),
1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1401 ]
1401 ]
1402 + formatteropts,
1402 + formatteropts,
1403 _(b'[-c]'),
1403 _(b'[-c]'),
1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1405 intents={INTENT_READONLY},
1405 intents={INTENT_READONLY},
1406 )
1406 )
1407 def branches(ui, repo, active=False, closed=False, **opts):
1407 def branches(ui, repo, active=False, closed=False, **opts):
1408 """list repository named branches
1408 """list repository named branches
1409
1409
1410 List the repository's named branches, indicating which ones are
1410 List the repository's named branches, indicating which ones are
1411 inactive. If -c/--closed is specified, also list branches which have
1411 inactive. If -c/--closed is specified, also list branches which have
1412 been marked closed (see :hg:`commit --close-branch`).
1412 been marked closed (see :hg:`commit --close-branch`).
1413
1413
1414 Use the command :hg:`update` to switch to an existing branch.
1414 Use the command :hg:`update` to switch to an existing branch.
1415
1415
1416 .. container:: verbose
1416 .. container:: verbose
1417
1417
1418 Template:
1418 Template:
1419
1419
1420 The following keywords are supported in addition to the common template
1420 The following keywords are supported in addition to the common template
1421 keywords and functions such as ``{branch}``. See also
1421 keywords and functions such as ``{branch}``. See also
1422 :hg:`help templates`.
1422 :hg:`help templates`.
1423
1423
1424 :active: Boolean. True if the branch is active.
1424 :active: Boolean. True if the branch is active.
1425 :closed: Boolean. True if the branch is closed.
1425 :closed: Boolean. True if the branch is closed.
1426 :current: Boolean. True if it is the current branch.
1426 :current: Boolean. True if it is the current branch.
1427
1427
1428 Returns 0.
1428 Returns 0.
1429 """
1429 """
1430
1430
1431 opts = pycompat.byteskwargs(opts)
1431 opts = pycompat.byteskwargs(opts)
1432 revs = opts.get(b'rev')
1432 revs = opts.get(b'rev')
1433 selectedbranches = None
1433 selectedbranches = None
1434 if revs:
1434 if revs:
1435 revs = scmutil.revrange(repo, revs)
1435 revs = scmutil.revrange(repo, revs)
1436 getbi = repo.revbranchcache().branchinfo
1436 getbi = repo.revbranchcache().branchinfo
1437 selectedbranches = {getbi(r)[0] for r in revs}
1437 selectedbranches = {getbi(r)[0] for r in revs}
1438
1438
1439 ui.pager(b'branches')
1439 ui.pager(b'branches')
1440 fm = ui.formatter(b'branches', opts)
1440 fm = ui.formatter(b'branches', opts)
1441 hexfunc = fm.hexfunc
1441 hexfunc = fm.hexfunc
1442
1442
1443 allheads = set(repo.heads())
1443 allheads = set(repo.heads())
1444 branches = []
1444 branches = []
1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1446 if selectedbranches is not None and tag not in selectedbranches:
1446 if selectedbranches is not None and tag not in selectedbranches:
1447 continue
1447 continue
1448 isactive = False
1448 isactive = False
1449 if not isclosed:
1449 if not isclosed:
1450 openheads = set(repo.branchmap().iteropen(heads))
1450 openheads = set(repo.branchmap().iteropen(heads))
1451 isactive = bool(openheads & allheads)
1451 isactive = bool(openheads & allheads)
1452 branches.append((tag, repo[tip], isactive, not isclosed))
1452 branches.append((tag, repo[tip], isactive, not isclosed))
1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1454
1454
1455 for tag, ctx, isactive, isopen in branches:
1455 for tag, ctx, isactive, isopen in branches:
1456 if active and not isactive:
1456 if active and not isactive:
1457 continue
1457 continue
1458 if isactive:
1458 if isactive:
1459 label = b'branches.active'
1459 label = b'branches.active'
1460 notice = b''
1460 notice = b''
1461 elif not isopen:
1461 elif not isopen:
1462 if not closed:
1462 if not closed:
1463 continue
1463 continue
1464 label = b'branches.closed'
1464 label = b'branches.closed'
1465 notice = _(b' (closed)')
1465 notice = _(b' (closed)')
1466 else:
1466 else:
1467 label = b'branches.inactive'
1467 label = b'branches.inactive'
1468 notice = _(b' (inactive)')
1468 notice = _(b' (inactive)')
1469 current = tag == repo.dirstate.branch()
1469 current = tag == repo.dirstate.branch()
1470 if current:
1470 if current:
1471 label = b'branches.current'
1471 label = b'branches.current'
1472
1472
1473 fm.startitem()
1473 fm.startitem()
1474 fm.write(b'branch', b'%s', tag, label=label)
1474 fm.write(b'branch', b'%s', tag, label=label)
1475 rev = ctx.rev()
1475 rev = ctx.rev()
1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1477 fmt = b' ' * padsize + b' %d:%s'
1477 fmt = b' ' * padsize + b' %d:%s'
1478 fm.condwrite(
1478 fm.condwrite(
1479 not ui.quiet,
1479 not ui.quiet,
1480 b'rev node',
1480 b'rev node',
1481 fmt,
1481 fmt,
1482 rev,
1482 rev,
1483 hexfunc(ctx.node()),
1483 hexfunc(ctx.node()),
1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1485 )
1485 )
1486 fm.context(ctx=ctx)
1486 fm.context(ctx=ctx)
1487 fm.data(active=isactive, closed=not isopen, current=current)
1487 fm.data(active=isactive, closed=not isopen, current=current)
1488 if not ui.quiet:
1488 if not ui.quiet:
1489 fm.plain(notice)
1489 fm.plain(notice)
1490 fm.plain(b'\n')
1490 fm.plain(b'\n')
1491 fm.end()
1491 fm.end()
1492
1492
1493
1493
1494 @command(
1494 @command(
1495 b'bundle',
1495 b'bundle',
1496 [
1496 [
1497 (
1497 (
1498 b'f',
1498 b'f',
1499 b'force',
1499 b'force',
1500 None,
1500 None,
1501 _(b'run even when the destination is unrelated'),
1501 _(b'run even when the destination is unrelated'),
1502 ),
1502 ),
1503 (
1503 (
1504 b'r',
1504 b'r',
1505 b'rev',
1505 b'rev',
1506 [],
1506 [],
1507 _(b'a changeset intended to be added to the destination'),
1507 _(b'a changeset intended to be added to the destination'),
1508 _(b'REV'),
1508 _(b'REV'),
1509 ),
1509 ),
1510 (
1510 (
1511 b'b',
1511 b'b',
1512 b'branch',
1512 b'branch',
1513 [],
1513 [],
1514 _(b'a specific branch you would like to bundle'),
1514 _(b'a specific branch you would like to bundle'),
1515 _(b'BRANCH'),
1515 _(b'BRANCH'),
1516 ),
1516 ),
1517 (
1517 (
1518 b'',
1518 b'',
1519 b'base',
1519 b'base',
1520 [],
1520 [],
1521 _(b'a base changeset assumed to be available at the destination'),
1521 _(b'a base changeset assumed to be available at the destination'),
1522 _(b'REV'),
1522 _(b'REV'),
1523 ),
1523 ),
1524 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1524 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1525 (
1525 (
1526 b't',
1526 b't',
1527 b'type',
1527 b'type',
1528 b'bzip2',
1528 b'bzip2',
1529 _(b'bundle compression type to use'),
1529 _(b'bundle compression type to use'),
1530 _(b'TYPE'),
1530 _(b'TYPE'),
1531 ),
1531 ),
1532 ]
1532 ]
1533 + remoteopts,
1533 + remoteopts,
1534 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1534 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1535 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1535 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1536 )
1536 )
1537 def bundle(ui, repo, fname, dest=None, **opts):
1537 def bundle(ui, repo, fname, dest=None, **opts):
1538 """create a bundle file
1538 """create a bundle file
1539
1539
1540 Generate a bundle file containing data to be transferred to another
1540 Generate a bundle file containing data to be transferred to another
1541 repository.
1541 repository.
1542
1542
1543 To create a bundle containing all changesets, use -a/--all
1543 To create a bundle containing all changesets, use -a/--all
1544 (or --base null). Otherwise, hg assumes the destination will have
1544 (or --base null). Otherwise, hg assumes the destination will have
1545 all the nodes you specify with --base parameters. Otherwise, hg
1545 all the nodes you specify with --base parameters. Otherwise, hg
1546 will assume the repository has all the nodes in destination, or
1546 will assume the repository has all the nodes in destination, or
1547 default-push/default if no destination is specified, where destination
1547 default-push/default if no destination is specified, where destination
1548 is the repository you provide through DEST option.
1548 is the repository you provide through DEST option.
1549
1549
1550 You can change bundle format with the -t/--type option. See
1550 You can change bundle format with the -t/--type option. See
1551 :hg:`help bundlespec` for documentation on this format. By default,
1551 :hg:`help bundlespec` for documentation on this format. By default,
1552 the most appropriate format is used and compression defaults to
1552 the most appropriate format is used and compression defaults to
1553 bzip2.
1553 bzip2.
1554
1554
1555 The bundle file can then be transferred using conventional means
1555 The bundle file can then be transferred using conventional means
1556 and applied to another repository with the unbundle or pull
1556 and applied to another repository with the unbundle or pull
1557 command. This is useful when direct push and pull are not
1557 command. This is useful when direct push and pull are not
1558 available or when exporting an entire repository is undesirable.
1558 available or when exporting an entire repository is undesirable.
1559
1559
1560 Applying bundles preserves all changeset contents including
1560 Applying bundles preserves all changeset contents including
1561 permissions, copy/rename information, and revision history.
1561 permissions, copy/rename information, and revision history.
1562
1562
1563 Returns 0 on success, 1 if no changes found.
1563 Returns 0 on success, 1 if no changes found.
1564 """
1564 """
1565 opts = pycompat.byteskwargs(opts)
1565 opts = pycompat.byteskwargs(opts)
1566 revs = None
1566 revs = None
1567 if b'rev' in opts:
1567 if b'rev' in opts:
1568 revstrings = opts[b'rev']
1568 revstrings = opts[b'rev']
1569 revs = scmutil.revrange(repo, revstrings)
1569 revs = scmutil.revrange(repo, revstrings)
1570 if revstrings and not revs:
1570 if revstrings and not revs:
1571 raise error.InputError(_(b'no commits to bundle'))
1571 raise error.InputError(_(b'no commits to bundle'))
1572
1572
1573 bundletype = opts.get(b'type', b'bzip2').lower()
1573 bundletype = opts.get(b'type', b'bzip2').lower()
1574 try:
1574 try:
1575 bundlespec = bundlecaches.parsebundlespec(
1575 bundlespec = bundlecaches.parsebundlespec(
1576 repo, bundletype, strict=False
1576 repo, bundletype, strict=False
1577 )
1577 )
1578 except error.UnsupportedBundleSpecification as e:
1578 except error.UnsupportedBundleSpecification as e:
1579 raise error.InputError(
1579 raise error.InputError(
1580 pycompat.bytestr(e),
1580 pycompat.bytestr(e),
1581 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1581 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1582 )
1582 )
1583 cgversion = bundlespec.contentopts[b"cg.version"]
1583 cgversion = bundlespec.contentopts[b"cg.version"]
1584
1584
1585 # Packed bundles are a pseudo bundle format for now.
1585 # Packed bundles are a pseudo bundle format for now.
1586 if cgversion == b's1':
1586 if cgversion == b's1':
1587 raise error.InputError(
1587 raise error.InputError(
1588 _(b'packed bundles cannot be produced by "hg bundle"'),
1588 _(b'packed bundles cannot be produced by "hg bundle"'),
1589 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1589 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1590 )
1590 )
1591
1591
1592 if opts.get(b'all'):
1592 if opts.get(b'all'):
1593 if dest:
1593 if dest:
1594 raise error.InputError(
1594 raise error.InputError(
1595 _(b"--all is incompatible with specifying a destination")
1595 _(b"--all is incompatible with specifying a destination")
1596 )
1596 )
1597 if opts.get(b'base'):
1597 if opts.get(b'base'):
1598 ui.warn(_(b"ignoring --base because --all was specified\n"))
1598 ui.warn(_(b"ignoring --base because --all was specified\n"))
1599 base = [nullrev]
1599 base = [nullrev]
1600 else:
1600 else:
1601 base = scmutil.revrange(repo, opts.get(b'base'))
1601 base = scmutil.revrange(repo, opts.get(b'base'))
1602 if cgversion not in changegroup.supportedoutgoingversions(repo):
1602 if cgversion not in changegroup.supportedoutgoingversions(repo):
1603 raise error.Abort(
1603 raise error.Abort(
1604 _(b"repository does not support bundle version %s") % cgversion
1604 _(b"repository does not support bundle version %s") % cgversion
1605 )
1605 )
1606
1606
1607 if base:
1607 if base:
1608 if dest:
1608 if dest:
1609 raise error.InputError(
1609 raise error.InputError(
1610 _(b"--base is incompatible with specifying a destination")
1610 _(b"--base is incompatible with specifying a destination")
1611 )
1611 )
1612 common = [repo[rev].node() for rev in base]
1612 common = [repo[rev].node() for rev in base]
1613 heads = [repo[r].node() for r in revs] if revs else None
1613 heads = [repo[r].node() for r in revs] if revs else None
1614 outgoing = discovery.outgoing(repo, common, heads)
1614 outgoing = discovery.outgoing(repo, common, heads)
1615 else:
1615 else:
1616 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1616 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1617 dest, branches = urlutil.parseurl(dest, opts.get(b'branch'))
1617 dest, branches = urlutil.parseurl(dest, opts.get(b'branch'))
1618 other = hg.peer(repo, opts, dest)
1618 other = hg.peer(repo, opts, dest)
1619 revs = [repo[r].hex() for r in revs]
1619 revs = [repo[r].hex() for r in revs]
1620 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1620 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1621 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1621 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1622 outgoing = discovery.findcommonoutgoing(
1622 outgoing = discovery.findcommonoutgoing(
1623 repo,
1623 repo,
1624 other,
1624 other,
1625 onlyheads=heads,
1625 onlyheads=heads,
1626 force=opts.get(b'force'),
1626 force=opts.get(b'force'),
1627 portable=True,
1627 portable=True,
1628 )
1628 )
1629
1629
1630 if not outgoing.missing:
1630 if not outgoing.missing:
1631 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1631 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1632 return 1
1632 return 1
1633
1633
1634 if cgversion == b'01': # bundle1
1634 if cgversion == b'01': # bundle1
1635 bversion = b'HG10' + bundlespec.wirecompression
1635 bversion = b'HG10' + bundlespec.wirecompression
1636 bcompression = None
1636 bcompression = None
1637 elif cgversion in (b'02', b'03'):
1637 elif cgversion in (b'02', b'03'):
1638 bversion = b'HG20'
1638 bversion = b'HG20'
1639 bcompression = bundlespec.wirecompression
1639 bcompression = bundlespec.wirecompression
1640 else:
1640 else:
1641 raise error.ProgrammingError(
1641 raise error.ProgrammingError(
1642 b'bundle: unexpected changegroup version %s' % cgversion
1642 b'bundle: unexpected changegroup version %s' % cgversion
1643 )
1643 )
1644
1644
1645 # TODO compression options should be derived from bundlespec parsing.
1645 # TODO compression options should be derived from bundlespec parsing.
1646 # This is a temporary hack to allow adjusting bundle compression
1646 # This is a temporary hack to allow adjusting bundle compression
1647 # level without a) formalizing the bundlespec changes to declare it
1647 # level without a) formalizing the bundlespec changes to declare it
1648 # b) introducing a command flag.
1648 # b) introducing a command flag.
1649 compopts = {}
1649 compopts = {}
1650 complevel = ui.configint(
1650 complevel = ui.configint(
1651 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1651 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1652 )
1652 )
1653 if complevel is None:
1653 if complevel is None:
1654 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1654 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1655 if complevel is not None:
1655 if complevel is not None:
1656 compopts[b'level'] = complevel
1656 compopts[b'level'] = complevel
1657
1657
1658 compthreads = ui.configint(
1658 compthreads = ui.configint(
1659 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1659 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1660 )
1660 )
1661 if compthreads is None:
1661 if compthreads is None:
1662 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1662 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1663 if compthreads is not None:
1663 if compthreads is not None:
1664 compopts[b'threads'] = compthreads
1664 compopts[b'threads'] = compthreads
1665
1665
1666 # Bundling of obsmarker and phases is optional as not all clients
1666 # Bundling of obsmarker and phases is optional as not all clients
1667 # support the necessary features.
1667 # support the necessary features.
1668 cfg = ui.configbool
1668 cfg = ui.configbool
1669 contentopts = {
1669 contentopts = {
1670 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1670 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1671 b'obsolescence-mandatory': cfg(
1671 b'obsolescence-mandatory': cfg(
1672 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1672 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1673 ),
1673 ),
1674 b'phases': cfg(b'experimental', b'bundle-phases'),
1674 b'phases': cfg(b'experimental', b'bundle-phases'),
1675 }
1675 }
1676 bundlespec.contentopts.update(contentopts)
1676 bundlespec.contentopts.update(contentopts)
1677
1677
1678 bundle2.writenewbundle(
1678 bundle2.writenewbundle(
1679 ui,
1679 ui,
1680 repo,
1680 repo,
1681 b'bundle',
1681 b'bundle',
1682 fname,
1682 fname,
1683 bversion,
1683 bversion,
1684 outgoing,
1684 outgoing,
1685 bundlespec.contentopts,
1685 bundlespec.contentopts,
1686 compression=bcompression,
1686 compression=bcompression,
1687 compopts=compopts,
1687 compopts=compopts,
1688 )
1688 )
1689
1689
1690
1690
1691 @command(
1691 @command(
1692 b'cat',
1692 b'cat',
1693 [
1693 [
1694 (
1694 (
1695 b'o',
1695 b'o',
1696 b'output',
1696 b'output',
1697 b'',
1697 b'',
1698 _(b'print output to file with formatted name'),
1698 _(b'print output to file with formatted name'),
1699 _(b'FORMAT'),
1699 _(b'FORMAT'),
1700 ),
1700 ),
1701 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1701 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1702 (b'', b'decode', None, _(b'apply any matching decode filter')),
1702 (b'', b'decode', None, _(b'apply any matching decode filter')),
1703 ]
1703 ]
1704 + walkopts
1704 + walkopts
1705 + formatteropts,
1705 + formatteropts,
1706 _(b'[OPTION]... FILE...'),
1706 _(b'[OPTION]... FILE...'),
1707 helpcategory=command.CATEGORY_FILE_CONTENTS,
1707 helpcategory=command.CATEGORY_FILE_CONTENTS,
1708 inferrepo=True,
1708 inferrepo=True,
1709 intents={INTENT_READONLY},
1709 intents={INTENT_READONLY},
1710 )
1710 )
1711 def cat(ui, repo, file1, *pats, **opts):
1711 def cat(ui, repo, file1, *pats, **opts):
1712 """output the current or given revision of files
1712 """output the current or given revision of files
1713
1713
1714 Print the specified files as they were at the given revision. If
1714 Print the specified files as they were at the given revision. If
1715 no revision is given, the parent of the working directory is used.
1715 no revision is given, the parent of the working directory is used.
1716
1716
1717 Output may be to a file, in which case the name of the file is
1717 Output may be to a file, in which case the name of the file is
1718 given using a template string. See :hg:`help templates`. In addition
1718 given using a template string. See :hg:`help templates`. In addition
1719 to the common template keywords, the following formatting rules are
1719 to the common template keywords, the following formatting rules are
1720 supported:
1720 supported:
1721
1721
1722 :``%%``: literal "%" character
1722 :``%%``: literal "%" character
1723 :``%s``: basename of file being printed
1723 :``%s``: basename of file being printed
1724 :``%d``: dirname of file being printed, or '.' if in repository root
1724 :``%d``: dirname of file being printed, or '.' if in repository root
1725 :``%p``: root-relative path name of file being printed
1725 :``%p``: root-relative path name of file being printed
1726 :``%H``: changeset hash (40 hexadecimal digits)
1726 :``%H``: changeset hash (40 hexadecimal digits)
1727 :``%R``: changeset revision number
1727 :``%R``: changeset revision number
1728 :``%h``: short-form changeset hash (12 hexadecimal digits)
1728 :``%h``: short-form changeset hash (12 hexadecimal digits)
1729 :``%r``: zero-padded changeset revision number
1729 :``%r``: zero-padded changeset revision number
1730 :``%b``: basename of the exporting repository
1730 :``%b``: basename of the exporting repository
1731 :``\\``: literal "\\" character
1731 :``\\``: literal "\\" character
1732
1732
1733 .. container:: verbose
1733 .. container:: verbose
1734
1734
1735 Template:
1735 Template:
1736
1736
1737 The following keywords are supported in addition to the common template
1737 The following keywords are supported in addition to the common template
1738 keywords and functions. See also :hg:`help templates`.
1738 keywords and functions. See also :hg:`help templates`.
1739
1739
1740 :data: String. File content.
1740 :data: String. File content.
1741 :path: String. Repository-absolute path of the file.
1741 :path: String. Repository-absolute path of the file.
1742
1742
1743 Returns 0 on success.
1743 Returns 0 on success.
1744 """
1744 """
1745 opts = pycompat.byteskwargs(opts)
1745 opts = pycompat.byteskwargs(opts)
1746 rev = opts.get(b'rev')
1746 rev = opts.get(b'rev')
1747 if rev:
1747 if rev:
1748 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1748 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1749 ctx = scmutil.revsingle(repo, rev)
1749 ctx = scmutil.revsingle(repo, rev)
1750 m = scmutil.match(ctx, (file1,) + pats, opts)
1750 m = scmutil.match(ctx, (file1,) + pats, opts)
1751 fntemplate = opts.pop(b'output', b'')
1751 fntemplate = opts.pop(b'output', b'')
1752 if cmdutil.isstdiofilename(fntemplate):
1752 if cmdutil.isstdiofilename(fntemplate):
1753 fntemplate = b''
1753 fntemplate = b''
1754
1754
1755 if fntemplate:
1755 if fntemplate:
1756 fm = formatter.nullformatter(ui, b'cat', opts)
1756 fm = formatter.nullformatter(ui, b'cat', opts)
1757 else:
1757 else:
1758 ui.pager(b'cat')
1758 ui.pager(b'cat')
1759 fm = ui.formatter(b'cat', opts)
1759 fm = ui.formatter(b'cat', opts)
1760 with fm:
1760 with fm:
1761 return cmdutil.cat(
1761 return cmdutil.cat(
1762 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1762 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1763 )
1763 )
1764
1764
1765
1765
1766 @command(
1766 @command(
1767 b'clone',
1767 b'clone',
1768 [
1768 [
1769 (
1769 (
1770 b'U',
1770 b'U',
1771 b'noupdate',
1771 b'noupdate',
1772 None,
1772 None,
1773 _(
1773 _(
1774 b'the clone will include an empty working '
1774 b'the clone will include an empty working '
1775 b'directory (only a repository)'
1775 b'directory (only a repository)'
1776 ),
1776 ),
1777 ),
1777 ),
1778 (
1778 (
1779 b'u',
1779 b'u',
1780 b'updaterev',
1780 b'updaterev',
1781 b'',
1781 b'',
1782 _(b'revision, tag, or branch to check out'),
1782 _(b'revision, tag, or branch to check out'),
1783 _(b'REV'),
1783 _(b'REV'),
1784 ),
1784 ),
1785 (
1785 (
1786 b'r',
1786 b'r',
1787 b'rev',
1787 b'rev',
1788 [],
1788 [],
1789 _(
1789 _(
1790 b'do not clone everything, but include this changeset'
1790 b'do not clone everything, but include this changeset'
1791 b' and its ancestors'
1791 b' and its ancestors'
1792 ),
1792 ),
1793 _(b'REV'),
1793 _(b'REV'),
1794 ),
1794 ),
1795 (
1795 (
1796 b'b',
1796 b'b',
1797 b'branch',
1797 b'branch',
1798 [],
1798 [],
1799 _(
1799 _(
1800 b'do not clone everything, but include this branch\'s'
1800 b'do not clone everything, but include this branch\'s'
1801 b' changesets and their ancestors'
1801 b' changesets and their ancestors'
1802 ),
1802 ),
1803 _(b'BRANCH'),
1803 _(b'BRANCH'),
1804 ),
1804 ),
1805 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1805 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1806 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1806 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1807 (b'', b'stream', None, _(b'clone with minimal data processing')),
1807 (b'', b'stream', None, _(b'clone with minimal data processing')),
1808 ]
1808 ]
1809 + remoteopts,
1809 + remoteopts,
1810 _(b'[OPTION]... SOURCE [DEST]'),
1810 _(b'[OPTION]... SOURCE [DEST]'),
1811 helpcategory=command.CATEGORY_REPO_CREATION,
1811 helpcategory=command.CATEGORY_REPO_CREATION,
1812 helpbasic=True,
1812 helpbasic=True,
1813 norepo=True,
1813 norepo=True,
1814 )
1814 )
1815 def clone(ui, source, dest=None, **opts):
1815 def clone(ui, source, dest=None, **opts):
1816 """make a copy of an existing repository
1816 """make a copy of an existing repository
1817
1817
1818 Create a copy of an existing repository in a new directory.
1818 Create a copy of an existing repository in a new directory.
1819
1819
1820 If no destination directory name is specified, it defaults to the
1820 If no destination directory name is specified, it defaults to the
1821 basename of the source.
1821 basename of the source.
1822
1822
1823 The location of the source is added to the new repository's
1823 The location of the source is added to the new repository's
1824 ``.hg/hgrc`` file, as the default to be used for future pulls.
1824 ``.hg/hgrc`` file, as the default to be used for future pulls.
1825
1825
1826 Only local paths and ``ssh://`` URLs are supported as
1826 Only local paths and ``ssh://`` URLs are supported as
1827 destinations. For ``ssh://`` destinations, no working directory or
1827 destinations. For ``ssh://`` destinations, no working directory or
1828 ``.hg/hgrc`` will be created on the remote side.
1828 ``.hg/hgrc`` will be created on the remote side.
1829
1829
1830 If the source repository has a bookmark called '@' set, that
1830 If the source repository has a bookmark called '@' set, that
1831 revision will be checked out in the new repository by default.
1831 revision will be checked out in the new repository by default.
1832
1832
1833 To check out a particular version, use -u/--update, or
1833 To check out a particular version, use -u/--update, or
1834 -U/--noupdate to create a clone with no working directory.
1834 -U/--noupdate to create a clone with no working directory.
1835
1835
1836 To pull only a subset of changesets, specify one or more revisions
1836 To pull only a subset of changesets, specify one or more revisions
1837 identifiers with -r/--rev or branches with -b/--branch. The
1837 identifiers with -r/--rev or branches with -b/--branch. The
1838 resulting clone will contain only the specified changesets and
1838 resulting clone will contain only the specified changesets and
1839 their ancestors. These options (or 'clone src#rev dest') imply
1839 their ancestors. These options (or 'clone src#rev dest') imply
1840 --pull, even for local source repositories.
1840 --pull, even for local source repositories.
1841
1841
1842 In normal clone mode, the remote normalizes repository data into a common
1842 In normal clone mode, the remote normalizes repository data into a common
1843 exchange format and the receiving end translates this data into its local
1843 exchange format and the receiving end translates this data into its local
1844 storage format. --stream activates a different clone mode that essentially
1844 storage format. --stream activates a different clone mode that essentially
1845 copies repository files from the remote with minimal data processing. This
1845 copies repository files from the remote with minimal data processing. This
1846 significantly reduces the CPU cost of a clone both remotely and locally.
1846 significantly reduces the CPU cost of a clone both remotely and locally.
1847 However, it often increases the transferred data size by 30-40%. This can
1847 However, it often increases the transferred data size by 30-40%. This can
1848 result in substantially faster clones where I/O throughput is plentiful,
1848 result in substantially faster clones where I/O throughput is plentiful,
1849 especially for larger repositories. A side-effect of --stream clones is
1849 especially for larger repositories. A side-effect of --stream clones is
1850 that storage settings and requirements on the remote are applied locally:
1850 that storage settings and requirements on the remote are applied locally:
1851 a modern client may inherit legacy or inefficient storage used by the
1851 a modern client may inherit legacy or inefficient storage used by the
1852 remote or a legacy Mercurial client may not be able to clone from a
1852 remote or a legacy Mercurial client may not be able to clone from a
1853 modern Mercurial remote.
1853 modern Mercurial remote.
1854
1854
1855 .. note::
1855 .. note::
1856
1856
1857 Specifying a tag will include the tagged changeset but not the
1857 Specifying a tag will include the tagged changeset but not the
1858 changeset containing the tag.
1858 changeset containing the tag.
1859
1859
1860 .. container:: verbose
1860 .. container:: verbose
1861
1861
1862 For efficiency, hardlinks are used for cloning whenever the
1862 For efficiency, hardlinks are used for cloning whenever the
1863 source and destination are on the same filesystem (note this
1863 source and destination are on the same filesystem (note this
1864 applies only to the repository data, not to the working
1864 applies only to the repository data, not to the working
1865 directory). Some filesystems, such as AFS, implement hardlinking
1865 directory). Some filesystems, such as AFS, implement hardlinking
1866 incorrectly, but do not report errors. In these cases, use the
1866 incorrectly, but do not report errors. In these cases, use the
1867 --pull option to avoid hardlinking.
1867 --pull option to avoid hardlinking.
1868
1868
1869 Mercurial will update the working directory to the first applicable
1869 Mercurial will update the working directory to the first applicable
1870 revision from this list:
1870 revision from this list:
1871
1871
1872 a) null if -U or the source repository has no changesets
1872 a) null if -U or the source repository has no changesets
1873 b) if -u . and the source repository is local, the first parent of
1873 b) if -u . and the source repository is local, the first parent of
1874 the source repository's working directory
1874 the source repository's working directory
1875 c) the changeset specified with -u (if a branch name, this means the
1875 c) the changeset specified with -u (if a branch name, this means the
1876 latest head of that branch)
1876 latest head of that branch)
1877 d) the changeset specified with -r
1877 d) the changeset specified with -r
1878 e) the tipmost head specified with -b
1878 e) the tipmost head specified with -b
1879 f) the tipmost head specified with the url#branch source syntax
1879 f) the tipmost head specified with the url#branch source syntax
1880 g) the revision marked with the '@' bookmark, if present
1880 g) the revision marked with the '@' bookmark, if present
1881 h) the tipmost head of the default branch
1881 h) the tipmost head of the default branch
1882 i) tip
1882 i) tip
1883
1883
1884 When cloning from servers that support it, Mercurial may fetch
1884 When cloning from servers that support it, Mercurial may fetch
1885 pre-generated data from a server-advertised URL or inline from the
1885 pre-generated data from a server-advertised URL or inline from the
1886 same stream. When this is done, hooks operating on incoming changesets
1886 same stream. When this is done, hooks operating on incoming changesets
1887 and changegroups may fire more than once, once for each pre-generated
1887 and changegroups may fire more than once, once for each pre-generated
1888 bundle and as well as for any additional remaining data. In addition,
1888 bundle and as well as for any additional remaining data. In addition,
1889 if an error occurs, the repository may be rolled back to a partial
1889 if an error occurs, the repository may be rolled back to a partial
1890 clone. This behavior may change in future releases.
1890 clone. This behavior may change in future releases.
1891 See :hg:`help -e clonebundles` for more.
1891 See :hg:`help -e clonebundles` for more.
1892
1892
1893 Examples:
1893 Examples:
1894
1894
1895 - clone a remote repository to a new directory named hg/::
1895 - clone a remote repository to a new directory named hg/::
1896
1896
1897 hg clone https://www.mercurial-scm.org/repo/hg/
1897 hg clone https://www.mercurial-scm.org/repo/hg/
1898
1898
1899 - create a lightweight local clone::
1899 - create a lightweight local clone::
1900
1900
1901 hg clone project/ project-feature/
1901 hg clone project/ project-feature/
1902
1902
1903 - clone from an absolute path on an ssh server (note double-slash)::
1903 - clone from an absolute path on an ssh server (note double-slash)::
1904
1904
1905 hg clone ssh://user@server//home/projects/alpha/
1905 hg clone ssh://user@server//home/projects/alpha/
1906
1906
1907 - do a streaming clone while checking out a specified version::
1907 - do a streaming clone while checking out a specified version::
1908
1908
1909 hg clone --stream http://server/repo -u 1.5
1909 hg clone --stream http://server/repo -u 1.5
1910
1910
1911 - create a repository without changesets after a particular revision::
1911 - create a repository without changesets after a particular revision::
1912
1912
1913 hg clone -r 04e544 experimental/ good/
1913 hg clone -r 04e544 experimental/ good/
1914
1914
1915 - clone (and track) a particular named branch::
1915 - clone (and track) a particular named branch::
1916
1916
1917 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1917 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1918
1918
1919 See :hg:`help urls` for details on specifying URLs.
1919 See :hg:`help urls` for details on specifying URLs.
1920
1920
1921 Returns 0 on success.
1921 Returns 0 on success.
1922 """
1922 """
1923 opts = pycompat.byteskwargs(opts)
1923 opts = pycompat.byteskwargs(opts)
1924 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1924 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1925
1925
1926 # --include/--exclude can come from narrow or sparse.
1926 # --include/--exclude can come from narrow or sparse.
1927 includepats, excludepats = None, None
1927 includepats, excludepats = None, None
1928
1928
1929 # hg.clone() differentiates between None and an empty set. So make sure
1929 # hg.clone() differentiates between None and an empty set. So make sure
1930 # patterns are sets if narrow is requested without patterns.
1930 # patterns are sets if narrow is requested without patterns.
1931 if opts.get(b'narrow'):
1931 if opts.get(b'narrow'):
1932 includepats = set()
1932 includepats = set()
1933 excludepats = set()
1933 excludepats = set()
1934
1934
1935 if opts.get(b'include'):
1935 if opts.get(b'include'):
1936 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1936 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1937 if opts.get(b'exclude'):
1937 if opts.get(b'exclude'):
1938 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1938 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1939
1939
1940 r = hg.clone(
1940 r = hg.clone(
1941 ui,
1941 ui,
1942 opts,
1942 opts,
1943 source,
1943 source,
1944 dest,
1944 dest,
1945 pull=opts.get(b'pull'),
1945 pull=opts.get(b'pull'),
1946 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1946 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1947 revs=opts.get(b'rev'),
1947 revs=opts.get(b'rev'),
1948 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1948 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1949 branch=opts.get(b'branch'),
1949 branch=opts.get(b'branch'),
1950 shareopts=opts.get(b'shareopts'),
1950 shareopts=opts.get(b'shareopts'),
1951 storeincludepats=includepats,
1951 storeincludepats=includepats,
1952 storeexcludepats=excludepats,
1952 storeexcludepats=excludepats,
1953 depth=opts.get(b'depth') or None,
1953 depth=opts.get(b'depth') or None,
1954 )
1954 )
1955
1955
1956 return r is None
1956 return r is None
1957
1957
1958
1958
1959 @command(
1959 @command(
1960 b'commit|ci',
1960 b'commit|ci',
1961 [
1961 [
1962 (
1962 (
1963 b'A',
1963 b'A',
1964 b'addremove',
1964 b'addremove',
1965 None,
1965 None,
1966 _(b'mark new/missing files as added/removed before committing'),
1966 _(b'mark new/missing files as added/removed before committing'),
1967 ),
1967 ),
1968 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1968 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1969 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1969 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1970 (b's', b'secret', None, _(b'use the secret phase for committing')),
1970 (b's', b'secret', None, _(b'use the secret phase for committing')),
1971 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1971 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1972 (
1972 (
1973 b'',
1973 b'',
1974 b'force-close-branch',
1974 b'force-close-branch',
1975 None,
1975 None,
1976 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1976 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1977 ),
1977 ),
1978 (b'i', b'interactive', None, _(b'use interactive mode')),
1978 (b'i', b'interactive', None, _(b'use interactive mode')),
1979 ]
1979 ]
1980 + walkopts
1980 + walkopts
1981 + commitopts
1981 + commitopts
1982 + commitopts2
1982 + commitopts2
1983 + subrepoopts,
1983 + subrepoopts,
1984 _(b'[OPTION]... [FILE]...'),
1984 _(b'[OPTION]... [FILE]...'),
1985 helpcategory=command.CATEGORY_COMMITTING,
1985 helpcategory=command.CATEGORY_COMMITTING,
1986 helpbasic=True,
1986 helpbasic=True,
1987 inferrepo=True,
1987 inferrepo=True,
1988 )
1988 )
1989 def commit(ui, repo, *pats, **opts):
1989 def commit(ui, repo, *pats, **opts):
1990 """commit the specified files or all outstanding changes
1990 """commit the specified files or all outstanding changes
1991
1991
1992 Commit changes to the given files into the repository. Unlike a
1992 Commit changes to the given files into the repository. Unlike a
1993 centralized SCM, this operation is a local operation. See
1993 centralized SCM, this operation is a local operation. See
1994 :hg:`push` for a way to actively distribute your changes.
1994 :hg:`push` for a way to actively distribute your changes.
1995
1995
1996 If a list of files is omitted, all changes reported by :hg:`status`
1996 If a list of files is omitted, all changes reported by :hg:`status`
1997 will be committed.
1997 will be committed.
1998
1998
1999 If you are committing the result of a merge, do not provide any
1999 If you are committing the result of a merge, do not provide any
2000 filenames or -I/-X filters.
2000 filenames or -I/-X filters.
2001
2001
2002 If no commit message is specified, Mercurial starts your
2002 If no commit message is specified, Mercurial starts your
2003 configured editor where you can enter a message. In case your
2003 configured editor where you can enter a message. In case your
2004 commit fails, you will find a backup of your message in
2004 commit fails, you will find a backup of your message in
2005 ``.hg/last-message.txt``.
2005 ``.hg/last-message.txt``.
2006
2006
2007 The --close-branch flag can be used to mark the current branch
2007 The --close-branch flag can be used to mark the current branch
2008 head closed. When all heads of a branch are closed, the branch
2008 head closed. When all heads of a branch are closed, the branch
2009 will be considered closed and no longer listed.
2009 will be considered closed and no longer listed.
2010
2010
2011 The --amend flag can be used to amend the parent of the
2011 The --amend flag can be used to amend the parent of the
2012 working directory with a new commit that contains the changes
2012 working directory with a new commit that contains the changes
2013 in the parent in addition to those currently reported by :hg:`status`,
2013 in the parent in addition to those currently reported by :hg:`status`,
2014 if there are any. The old commit is stored in a backup bundle in
2014 if there are any. The old commit is stored in a backup bundle in
2015 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2015 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2016 on how to restore it).
2016 on how to restore it).
2017
2017
2018 Message, user and date are taken from the amended commit unless
2018 Message, user and date are taken from the amended commit unless
2019 specified. When a message isn't specified on the command line,
2019 specified. When a message isn't specified on the command line,
2020 the editor will open with the message of the amended commit.
2020 the editor will open with the message of the amended commit.
2021
2021
2022 It is not possible to amend public changesets (see :hg:`help phases`)
2022 It is not possible to amend public changesets (see :hg:`help phases`)
2023 or changesets that have children.
2023 or changesets that have children.
2024
2024
2025 See :hg:`help dates` for a list of formats valid for -d/--date.
2025 See :hg:`help dates` for a list of formats valid for -d/--date.
2026
2026
2027 Returns 0 on success, 1 if nothing changed.
2027 Returns 0 on success, 1 if nothing changed.
2028
2028
2029 .. container:: verbose
2029 .. container:: verbose
2030
2030
2031 Examples:
2031 Examples:
2032
2032
2033 - commit all files ending in .py::
2033 - commit all files ending in .py::
2034
2034
2035 hg commit --include "set:**.py"
2035 hg commit --include "set:**.py"
2036
2036
2037 - commit all non-binary files::
2037 - commit all non-binary files::
2038
2038
2039 hg commit --exclude "set:binary()"
2039 hg commit --exclude "set:binary()"
2040
2040
2041 - amend the current commit and set the date to now::
2041 - amend the current commit and set the date to now::
2042
2042
2043 hg commit --amend --date now
2043 hg commit --amend --date now
2044 """
2044 """
2045 with repo.wlock(), repo.lock():
2045 with repo.wlock(), repo.lock():
2046 return _docommit(ui, repo, *pats, **opts)
2046 return _docommit(ui, repo, *pats, **opts)
2047
2047
2048
2048
2049 def _docommit(ui, repo, *pats, **opts):
2049 def _docommit(ui, repo, *pats, **opts):
2050 if opts.get('interactive'):
2050 if opts.get('interactive'):
2051 opts.pop('interactive')
2051 opts.pop('interactive')
2052 ret = cmdutil.dorecord(
2052 ret = cmdutil.dorecord(
2053 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2053 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2054 )
2054 )
2055 # ret can be 0 (no changes to record) or the value returned by
2055 # ret can be 0 (no changes to record) or the value returned by
2056 # commit(), 1 if nothing changed or None on success.
2056 # commit(), 1 if nothing changed or None on success.
2057 return 1 if ret == 0 else ret
2057 return 1 if ret == 0 else ret
2058
2058
2059 opts = pycompat.byteskwargs(opts)
2059 opts = pycompat.byteskwargs(opts)
2060 if opts.get(b'subrepos'):
2060 if opts.get(b'subrepos'):
2061 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2061 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
2062 # Let --subrepos on the command line override config setting.
2062 # Let --subrepos on the command line override config setting.
2063 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2063 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2064
2064
2065 cmdutil.checkunfinished(repo, commit=True)
2065 cmdutil.checkunfinished(repo, commit=True)
2066
2066
2067 branch = repo[None].branch()
2067 branch = repo[None].branch()
2068 bheads = repo.branchheads(branch)
2068 bheads = repo.branchheads(branch)
2069 tip = repo.changelog.tip()
2069 tip = repo.changelog.tip()
2070
2070
2071 extra = {}
2071 extra = {}
2072 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2072 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2073 extra[b'close'] = b'1'
2073 extra[b'close'] = b'1'
2074
2074
2075 if repo[b'.'].closesbranch():
2075 if repo[b'.'].closesbranch():
2076 raise error.InputError(
2076 raise error.InputError(
2077 _(b'current revision is already a branch closing head')
2077 _(b'current revision is already a branch closing head')
2078 )
2078 )
2079 elif not bheads:
2079 elif not bheads:
2080 raise error.InputError(
2080 raise error.InputError(
2081 _(b'branch "%s" has no heads to close') % branch
2081 _(b'branch "%s" has no heads to close') % branch
2082 )
2082 )
2083 elif (
2083 elif (
2084 branch == repo[b'.'].branch()
2084 branch == repo[b'.'].branch()
2085 and repo[b'.'].node() not in bheads
2085 and repo[b'.'].node() not in bheads
2086 and not opts.get(b'force_close_branch')
2086 and not opts.get(b'force_close_branch')
2087 ):
2087 ):
2088 hint = _(
2088 hint = _(
2089 b'use --force-close-branch to close branch from a non-head'
2089 b'use --force-close-branch to close branch from a non-head'
2090 b' changeset'
2090 b' changeset'
2091 )
2091 )
2092 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2092 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2093 elif opts.get(b'amend'):
2093 elif opts.get(b'amend'):
2094 if (
2094 if (
2095 repo[b'.'].p1().branch() != branch
2095 repo[b'.'].p1().branch() != branch
2096 and repo[b'.'].p2().branch() != branch
2096 and repo[b'.'].p2().branch() != branch
2097 ):
2097 ):
2098 raise error.InputError(_(b'can only close branch heads'))
2098 raise error.InputError(_(b'can only close branch heads'))
2099
2099
2100 if opts.get(b'amend'):
2100 if opts.get(b'amend'):
2101 if ui.configbool(b'ui', b'commitsubrepos'):
2101 if ui.configbool(b'ui', b'commitsubrepos'):
2102 raise error.InputError(
2102 raise error.InputError(
2103 _(b'cannot amend with ui.commitsubrepos enabled')
2103 _(b'cannot amend with ui.commitsubrepos enabled')
2104 )
2104 )
2105
2105
2106 old = repo[b'.']
2106 old = repo[b'.']
2107 rewriteutil.precheck(repo, [old.rev()], b'amend')
2107 rewriteutil.precheck(repo, [old.rev()], b'amend')
2108
2108
2109 # Currently histedit gets confused if an amend happens while histedit
2109 # Currently histedit gets confused if an amend happens while histedit
2110 # is in progress. Since we have a checkunfinished command, we are
2110 # is in progress. Since we have a checkunfinished command, we are
2111 # temporarily honoring it.
2111 # temporarily honoring it.
2112 #
2112 #
2113 # Note: eventually this guard will be removed. Please do not expect
2113 # Note: eventually this guard will be removed. Please do not expect
2114 # this behavior to remain.
2114 # this behavior to remain.
2115 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2115 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2116 cmdutil.checkunfinished(repo)
2116 cmdutil.checkunfinished(repo)
2117
2117
2118 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2118 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2119 if node == old.node():
2119 if node == old.node():
2120 ui.status(_(b"nothing changed\n"))
2120 ui.status(_(b"nothing changed\n"))
2121 return 1
2121 return 1
2122 else:
2122 else:
2123
2123
2124 def commitfunc(ui, repo, message, match, opts):
2124 def commitfunc(ui, repo, message, match, opts):
2125 overrides = {}
2125 overrides = {}
2126 if opts.get(b'secret'):
2126 if opts.get(b'secret'):
2127 overrides[(b'phases', b'new-commit')] = b'secret'
2127 overrides[(b'phases', b'new-commit')] = b'secret'
2128
2128
2129 baseui = repo.baseui
2129 baseui = repo.baseui
2130 with baseui.configoverride(overrides, b'commit'):
2130 with baseui.configoverride(overrides, b'commit'):
2131 with ui.configoverride(overrides, b'commit'):
2131 with ui.configoverride(overrides, b'commit'):
2132 editform = cmdutil.mergeeditform(
2132 editform = cmdutil.mergeeditform(
2133 repo[None], b'commit.normal'
2133 repo[None], b'commit.normal'
2134 )
2134 )
2135 editor = cmdutil.getcommiteditor(
2135 editor = cmdutil.getcommiteditor(
2136 editform=editform, **pycompat.strkwargs(opts)
2136 editform=editform, **pycompat.strkwargs(opts)
2137 )
2137 )
2138 return repo.commit(
2138 return repo.commit(
2139 message,
2139 message,
2140 opts.get(b'user'),
2140 opts.get(b'user'),
2141 opts.get(b'date'),
2141 opts.get(b'date'),
2142 match,
2142 match,
2143 editor=editor,
2143 editor=editor,
2144 extra=extra,
2144 extra=extra,
2145 )
2145 )
2146
2146
2147 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2147 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2148
2148
2149 if not node:
2149 if not node:
2150 stat = cmdutil.postcommitstatus(repo, pats, opts)
2150 stat = cmdutil.postcommitstatus(repo, pats, opts)
2151 if stat.deleted:
2151 if stat.deleted:
2152 ui.status(
2152 ui.status(
2153 _(
2153 _(
2154 b"nothing changed (%d missing files, see "
2154 b"nothing changed (%d missing files, see "
2155 b"'hg status')\n"
2155 b"'hg status')\n"
2156 )
2156 )
2157 % len(stat.deleted)
2157 % len(stat.deleted)
2158 )
2158 )
2159 else:
2159 else:
2160 ui.status(_(b"nothing changed\n"))
2160 ui.status(_(b"nothing changed\n"))
2161 return 1
2161 return 1
2162
2162
2163 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2163 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2164
2164
2165 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2165 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2166 status(
2166 status(
2167 ui,
2167 ui,
2168 repo,
2168 repo,
2169 modified=True,
2169 modified=True,
2170 added=True,
2170 added=True,
2171 removed=True,
2171 removed=True,
2172 deleted=True,
2172 deleted=True,
2173 unknown=True,
2173 unknown=True,
2174 subrepos=opts.get(b'subrepos'),
2174 subrepos=opts.get(b'subrepos'),
2175 )
2175 )
2176
2176
2177
2177
2178 @command(
2178 @command(
2179 b'config|showconfig|debugconfig',
2179 b'config|showconfig|debugconfig',
2180 [
2180 [
2181 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2181 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2182 (b'e', b'edit', None, _(b'edit user config')),
2182 (b'e', b'edit', None, _(b'edit user config')),
2183 (b'l', b'local', None, _(b'edit repository config')),
2183 (b'l', b'local', None, _(b'edit repository config')),
2184 (
2184 (
2185 b'',
2185 b'',
2186 b'shared',
2186 b'shared',
2187 None,
2187 None,
2188 _(b'edit shared source repository config (EXPERIMENTAL)'),
2188 _(b'edit shared source repository config (EXPERIMENTAL)'),
2189 ),
2189 ),
2190 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2190 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2191 (b'g', b'global', None, _(b'edit global config')),
2191 (b'g', b'global', None, _(b'edit global config')),
2192 ]
2192 ]
2193 + formatteropts,
2193 + formatteropts,
2194 _(b'[-u] [NAME]...'),
2194 _(b'[-u] [NAME]...'),
2195 helpcategory=command.CATEGORY_HELP,
2195 helpcategory=command.CATEGORY_HELP,
2196 optionalrepo=True,
2196 optionalrepo=True,
2197 intents={INTENT_READONLY},
2197 intents={INTENT_READONLY},
2198 )
2198 )
2199 def config(ui, repo, *values, **opts):
2199 def config(ui, repo, *values, **opts):
2200 """show combined config settings from all hgrc files
2200 """show combined config settings from all hgrc files
2201
2201
2202 With no arguments, print names and values of all config items.
2202 With no arguments, print names and values of all config items.
2203
2203
2204 With one argument of the form section.name, print just the value
2204 With one argument of the form section.name, print just the value
2205 of that config item.
2205 of that config item.
2206
2206
2207 With multiple arguments, print names and values of all config
2207 With multiple arguments, print names and values of all config
2208 items with matching section names or section.names.
2208 items with matching section names or section.names.
2209
2209
2210 With --edit, start an editor on the user-level config file. With
2210 With --edit, start an editor on the user-level config file. With
2211 --global, edit the system-wide config file. With --local, edit the
2211 --global, edit the system-wide config file. With --local, edit the
2212 repository-level config file.
2212 repository-level config file.
2213
2213
2214 With --debug, the source (filename and line number) is printed
2214 With --debug, the source (filename and line number) is printed
2215 for each config item.
2215 for each config item.
2216
2216
2217 See :hg:`help config` for more information about config files.
2217 See :hg:`help config` for more information about config files.
2218
2218
2219 .. container:: verbose
2219 .. container:: verbose
2220
2220
2221 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2221 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2222 This file is not shared across shares when in share-safe mode.
2222 This file is not shared across shares when in share-safe mode.
2223
2223
2224 Template:
2224 Template:
2225
2225
2226 The following keywords are supported. See also :hg:`help templates`.
2226 The following keywords are supported. See also :hg:`help templates`.
2227
2227
2228 :name: String. Config name.
2228 :name: String. Config name.
2229 :source: String. Filename and line number where the item is defined.
2229 :source: String. Filename and line number where the item is defined.
2230 :value: String. Config value.
2230 :value: String. Config value.
2231
2231
2232 The --shared flag can be used to edit the config file of shared source
2232 The --shared flag can be used to edit the config file of shared source
2233 repository. It only works when you have shared using the experimental
2233 repository. It only works when you have shared using the experimental
2234 share safe feature.
2234 share safe feature.
2235
2235
2236 Returns 0 on success, 1 if NAME does not exist.
2236 Returns 0 on success, 1 if NAME does not exist.
2237
2237
2238 """
2238 """
2239
2239
2240 opts = pycompat.byteskwargs(opts)
2240 opts = pycompat.byteskwargs(opts)
2241 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2241 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2242 if any(opts.get(o) for o in editopts):
2242 if any(opts.get(o) for o in editopts):
2243 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2243 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2244 if opts.get(b'local'):
2244 if opts.get(b'local'):
2245 if not repo:
2245 if not repo:
2246 raise error.InputError(
2246 raise error.InputError(
2247 _(b"can't use --local outside a repository")
2247 _(b"can't use --local outside a repository")
2248 )
2248 )
2249 paths = [repo.vfs.join(b'hgrc')]
2249 paths = [repo.vfs.join(b'hgrc')]
2250 elif opts.get(b'global'):
2250 elif opts.get(b'global'):
2251 paths = rcutil.systemrcpath()
2251 paths = rcutil.systemrcpath()
2252 elif opts.get(b'shared'):
2252 elif opts.get(b'shared'):
2253 if not repo.shared():
2253 if not repo.shared():
2254 raise error.InputError(
2254 raise error.InputError(
2255 _(b"repository is not shared; can't use --shared")
2255 _(b"repository is not shared; can't use --shared")
2256 )
2256 )
2257 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2257 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2258 raise error.InputError(
2258 raise error.InputError(
2259 _(
2259 _(
2260 b"share safe feature not enabled; "
2260 b"share safe feature not enabled; "
2261 b"unable to edit shared source repository config"
2261 b"unable to edit shared source repository config"
2262 )
2262 )
2263 )
2263 )
2264 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2264 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2265 elif opts.get(b'non_shared'):
2265 elif opts.get(b'non_shared'):
2266 paths = [repo.vfs.join(b'hgrc-not-shared')]
2266 paths = [repo.vfs.join(b'hgrc-not-shared')]
2267 else:
2267 else:
2268 paths = rcutil.userrcpath()
2268 paths = rcutil.userrcpath()
2269
2269
2270 for f in paths:
2270 for f in paths:
2271 if os.path.exists(f):
2271 if os.path.exists(f):
2272 break
2272 break
2273 else:
2273 else:
2274 if opts.get(b'global'):
2274 if opts.get(b'global'):
2275 samplehgrc = uimod.samplehgrcs[b'global']
2275 samplehgrc = uimod.samplehgrcs[b'global']
2276 elif opts.get(b'local'):
2276 elif opts.get(b'local'):
2277 samplehgrc = uimod.samplehgrcs[b'local']
2277 samplehgrc = uimod.samplehgrcs[b'local']
2278 else:
2278 else:
2279 samplehgrc = uimod.samplehgrcs[b'user']
2279 samplehgrc = uimod.samplehgrcs[b'user']
2280
2280
2281 f = paths[0]
2281 f = paths[0]
2282 fp = open(f, b"wb")
2282 fp = open(f, b"wb")
2283 fp.write(util.tonativeeol(samplehgrc))
2283 fp.write(util.tonativeeol(samplehgrc))
2284 fp.close()
2284 fp.close()
2285
2285
2286 editor = ui.geteditor()
2286 editor = ui.geteditor()
2287 ui.system(
2287 ui.system(
2288 b"%s \"%s\"" % (editor, f),
2288 b"%s \"%s\"" % (editor, f),
2289 onerr=error.InputError,
2289 onerr=error.InputError,
2290 errprefix=_(b"edit failed"),
2290 errprefix=_(b"edit failed"),
2291 blockedtag=b'config_edit',
2291 blockedtag=b'config_edit',
2292 )
2292 )
2293 return
2293 return
2294 ui.pager(b'config')
2294 ui.pager(b'config')
2295 fm = ui.formatter(b'config', opts)
2295 fm = ui.formatter(b'config', opts)
2296 for t, f in rcutil.rccomponents():
2296 for t, f in rcutil.rccomponents():
2297 if t == b'path':
2297 if t == b'path':
2298 ui.debug(b'read config from: %s\n' % f)
2298 ui.debug(b'read config from: %s\n' % f)
2299 elif t == b'resource':
2299 elif t == b'resource':
2300 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2300 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2301 elif t == b'items':
2301 elif t == b'items':
2302 # Don't print anything for 'items'.
2302 # Don't print anything for 'items'.
2303 pass
2303 pass
2304 else:
2304 else:
2305 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2305 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2306 untrusted = bool(opts.get(b'untrusted'))
2306 untrusted = bool(opts.get(b'untrusted'))
2307
2307
2308 selsections = selentries = []
2308 selsections = selentries = []
2309 if values:
2309 if values:
2310 selsections = [v for v in values if b'.' not in v]
2310 selsections = [v for v in values if b'.' not in v]
2311 selentries = [v for v in values if b'.' in v]
2311 selentries = [v for v in values if b'.' in v]
2312 uniquesel = len(selentries) == 1 and not selsections
2312 uniquesel = len(selentries) == 1 and not selsections
2313 selsections = set(selsections)
2313 selsections = set(selsections)
2314 selentries = set(selentries)
2314 selentries = set(selentries)
2315
2315
2316 matched = False
2316 matched = False
2317 for section, name, value in ui.walkconfig(untrusted=untrusted):
2317 for section, name, value in ui.walkconfig(untrusted=untrusted):
2318 source = ui.configsource(section, name, untrusted)
2318 source = ui.configsource(section, name, untrusted)
2319 value = pycompat.bytestr(value)
2319 value = pycompat.bytestr(value)
2320 defaultvalue = ui.configdefault(section, name)
2320 defaultvalue = ui.configdefault(section, name)
2321 if fm.isplain():
2321 if fm.isplain():
2322 source = source or b'none'
2322 source = source or b'none'
2323 value = value.replace(b'\n', b'\\n')
2323 value = value.replace(b'\n', b'\\n')
2324 entryname = section + b'.' + name
2324 entryname = section + b'.' + name
2325 if values and not (section in selsections or entryname in selentries):
2325 if values and not (section in selsections or entryname in selentries):
2326 continue
2326 continue
2327 fm.startitem()
2327 fm.startitem()
2328 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2328 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2329 if uniquesel:
2329 if uniquesel:
2330 fm.data(name=entryname)
2330 fm.data(name=entryname)
2331 fm.write(b'value', b'%s\n', value)
2331 fm.write(b'value', b'%s\n', value)
2332 else:
2332 else:
2333 fm.write(b'name value', b'%s=%s\n', entryname, value)
2333 fm.write(b'name value', b'%s=%s\n', entryname, value)
2334 if formatter.isprintable(defaultvalue):
2334 if formatter.isprintable(defaultvalue):
2335 fm.data(defaultvalue=defaultvalue)
2335 fm.data(defaultvalue=defaultvalue)
2336 elif isinstance(defaultvalue, list) and all(
2336 elif isinstance(defaultvalue, list) and all(
2337 formatter.isprintable(e) for e in defaultvalue
2337 formatter.isprintable(e) for e in defaultvalue
2338 ):
2338 ):
2339 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2339 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2340 # TODO: no idea how to process unsupported defaultvalue types
2340 # TODO: no idea how to process unsupported defaultvalue types
2341 matched = True
2341 matched = True
2342 fm.end()
2342 fm.end()
2343 if matched:
2343 if matched:
2344 return 0
2344 return 0
2345 return 1
2345 return 1
2346
2346
2347
2347
2348 @command(
2348 @command(
2349 b'continue',
2349 b'continue',
2350 dryrunopts,
2350 dryrunopts,
2351 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2351 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2352 helpbasic=True,
2352 helpbasic=True,
2353 )
2353 )
2354 def continuecmd(ui, repo, **opts):
2354 def continuecmd(ui, repo, **opts):
2355 """resumes an interrupted operation (EXPERIMENTAL)
2355 """resumes an interrupted operation (EXPERIMENTAL)
2356
2356
2357 Finishes a multistep operation like graft, histedit, rebase, merge,
2357 Finishes a multistep operation like graft, histedit, rebase, merge,
2358 and unshelve if they are in an interrupted state.
2358 and unshelve if they are in an interrupted state.
2359
2359
2360 use --dry-run/-n to dry run the command.
2360 use --dry-run/-n to dry run the command.
2361 """
2361 """
2362 dryrun = opts.get('dry_run')
2362 dryrun = opts.get('dry_run')
2363 contstate = cmdutil.getunfinishedstate(repo)
2363 contstate = cmdutil.getunfinishedstate(repo)
2364 if not contstate:
2364 if not contstate:
2365 raise error.StateError(_(b'no operation in progress'))
2365 raise error.StateError(_(b'no operation in progress'))
2366 if not contstate.continuefunc:
2366 if not contstate.continuefunc:
2367 raise error.StateError(
2367 raise error.StateError(
2368 (
2368 (
2369 _(b"%s in progress but does not support 'hg continue'")
2369 _(b"%s in progress but does not support 'hg continue'")
2370 % (contstate._opname)
2370 % (contstate._opname)
2371 ),
2371 ),
2372 hint=contstate.continuemsg(),
2372 hint=contstate.continuemsg(),
2373 )
2373 )
2374 if dryrun:
2374 if dryrun:
2375 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2375 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2376 return
2376 return
2377 return contstate.continuefunc(ui, repo)
2377 return contstate.continuefunc(ui, repo)
2378
2378
2379
2379
2380 @command(
2380 @command(
2381 b'copy|cp',
2381 b'copy|cp',
2382 [
2382 [
2383 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2383 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2384 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2384 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2385 (
2385 (
2386 b'',
2386 b'',
2387 b'at-rev',
2387 b'at-rev',
2388 b'',
2388 b'',
2389 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2389 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2390 _(b'REV'),
2390 _(b'REV'),
2391 ),
2391 ),
2392 (
2392 (
2393 b'f',
2393 b'f',
2394 b'force',
2394 b'force',
2395 None,
2395 None,
2396 _(b'forcibly copy over an existing managed file'),
2396 _(b'forcibly copy over an existing managed file'),
2397 ),
2397 ),
2398 ]
2398 ]
2399 + walkopts
2399 + walkopts
2400 + dryrunopts,
2400 + dryrunopts,
2401 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2401 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2402 helpcategory=command.CATEGORY_FILE_CONTENTS,
2403 )
2403 )
2404 def copy(ui, repo, *pats, **opts):
2404 def copy(ui, repo, *pats, **opts):
2405 """mark files as copied for the next commit
2405 """mark files as copied for the next commit
2406
2406
2407 Mark dest as having copies of source files. If dest is a
2407 Mark dest as having copies of source files. If dest is a
2408 directory, copies are put in that directory. If dest is a file,
2408 directory, copies are put in that directory. If dest is a file,
2409 the source must be a single file.
2409 the source must be a single file.
2410
2410
2411 By default, this command copies the contents of files as they
2411 By default, this command copies the contents of files as they
2412 exist in the working directory. If invoked with -A/--after, the
2412 exist in the working directory. If invoked with -A/--after, the
2413 operation is recorded, but no copying is performed.
2413 operation is recorded, but no copying is performed.
2414
2414
2415 To undo marking a destination file as copied, use --forget. With that
2415 To undo marking a destination file as copied, use --forget. With that
2416 option, all given (positional) arguments are unmarked as copies. The
2416 option, all given (positional) arguments are unmarked as copies. The
2417 destination file(s) will be left in place (still tracked). Note that
2417 destination file(s) will be left in place (still tracked). Note that
2418 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2418 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2419
2419
2420 This command takes effect with the next commit by default.
2420 This command takes effect with the next commit by default.
2421
2421
2422 Returns 0 on success, 1 if errors are encountered.
2422 Returns 0 on success, 1 if errors are encountered.
2423 """
2423 """
2424 opts = pycompat.byteskwargs(opts)
2424 opts = pycompat.byteskwargs(opts)
2425 with repo.wlock():
2425 with repo.wlock():
2426 return cmdutil.copy(ui, repo, pats, opts)
2426 return cmdutil.copy(ui, repo, pats, opts)
2427
2427
2428
2428
2429 @command(
2429 @command(
2430 b'debugcommands',
2430 b'debugcommands',
2431 [],
2431 [],
2432 _(b'[COMMAND]'),
2432 _(b'[COMMAND]'),
2433 helpcategory=command.CATEGORY_HELP,
2433 helpcategory=command.CATEGORY_HELP,
2434 norepo=True,
2434 norepo=True,
2435 )
2435 )
2436 def debugcommands(ui, cmd=b'', *args):
2436 def debugcommands(ui, cmd=b'', *args):
2437 """list all available commands and options"""
2437 """list all available commands and options"""
2438 for cmd, vals in sorted(pycompat.iteritems(table)):
2438 for cmd, vals in sorted(pycompat.iteritems(table)):
2439 cmd = cmd.split(b'|')[0]
2439 cmd = cmd.split(b'|')[0]
2440 opts = b', '.join([i[1] for i in vals[1]])
2440 opts = b', '.join([i[1] for i in vals[1]])
2441 ui.write(b'%s: %s\n' % (cmd, opts))
2441 ui.write(b'%s: %s\n' % (cmd, opts))
2442
2442
2443
2443
2444 @command(
2444 @command(
2445 b'debugcomplete',
2445 b'debugcomplete',
2446 [(b'o', b'options', None, _(b'show the command options'))],
2446 [(b'o', b'options', None, _(b'show the command options'))],
2447 _(b'[-o] CMD'),
2447 _(b'[-o] CMD'),
2448 helpcategory=command.CATEGORY_HELP,
2448 helpcategory=command.CATEGORY_HELP,
2449 norepo=True,
2449 norepo=True,
2450 )
2450 )
2451 def debugcomplete(ui, cmd=b'', **opts):
2451 def debugcomplete(ui, cmd=b'', **opts):
2452 """returns the completion list associated with the given command"""
2452 """returns the completion list associated with the given command"""
2453
2453
2454 if opts.get('options'):
2454 if opts.get('options'):
2455 options = []
2455 options = []
2456 otables = [globalopts]
2456 otables = [globalopts]
2457 if cmd:
2457 if cmd:
2458 aliases, entry = cmdutil.findcmd(cmd, table, False)
2458 aliases, entry = cmdutil.findcmd(cmd, table, False)
2459 otables.append(entry[1])
2459 otables.append(entry[1])
2460 for t in otables:
2460 for t in otables:
2461 for o in t:
2461 for o in t:
2462 if b"(DEPRECATED)" in o[3]:
2462 if b"(DEPRECATED)" in o[3]:
2463 continue
2463 continue
2464 if o[0]:
2464 if o[0]:
2465 options.append(b'-%s' % o[0])
2465 options.append(b'-%s' % o[0])
2466 options.append(b'--%s' % o[1])
2466 options.append(b'--%s' % o[1])
2467 ui.write(b"%s\n" % b"\n".join(options))
2467 ui.write(b"%s\n" % b"\n".join(options))
2468 return
2468 return
2469
2469
2470 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2470 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2471 if ui.verbose:
2471 if ui.verbose:
2472 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2472 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2473 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2473 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2474
2474
2475
2475
2476 @command(
2476 @command(
2477 b'diff',
2477 b'diff',
2478 [
2478 [
2479 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2479 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2480 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2480 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2481 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2481 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2482 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2482 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2483 ]
2483 ]
2484 + diffopts
2484 + diffopts
2485 + diffopts2
2485 + diffopts2
2486 + walkopts
2486 + walkopts
2487 + subrepoopts,
2487 + subrepoopts,
2488 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2488 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2489 helpcategory=command.CATEGORY_FILE_CONTENTS,
2489 helpcategory=command.CATEGORY_FILE_CONTENTS,
2490 helpbasic=True,
2490 helpbasic=True,
2491 inferrepo=True,
2491 inferrepo=True,
2492 intents={INTENT_READONLY},
2492 intents={INTENT_READONLY},
2493 )
2493 )
2494 def diff(ui, repo, *pats, **opts):
2494 def diff(ui, repo, *pats, **opts):
2495 """diff repository (or selected files)
2495 """diff repository (or selected files)
2496
2496
2497 Show differences between revisions for the specified files.
2497 Show differences between revisions for the specified files.
2498
2498
2499 Differences between files are shown using the unified diff format.
2499 Differences between files are shown using the unified diff format.
2500
2500
2501 .. note::
2501 .. note::
2502
2502
2503 :hg:`diff` may generate unexpected results for merges, as it will
2503 :hg:`diff` may generate unexpected results for merges, as it will
2504 default to comparing against the working directory's first
2504 default to comparing against the working directory's first
2505 parent changeset if no revisions are specified.
2505 parent changeset if no revisions are specified.
2506
2506
2507 By default, the working directory files are compared to its first parent. To
2507 By default, the working directory files are compared to its first parent. To
2508 see the differences from another revision, use --from. To see the difference
2508 see the differences from another revision, use --from. To see the difference
2509 to another revision, use --to. For example, :hg:`diff --from .^` will show
2509 to another revision, use --to. For example, :hg:`diff --from .^` will show
2510 the differences from the working copy's grandparent to the working copy,
2510 the differences from the working copy's grandparent to the working copy,
2511 :hg:`diff --to .` will show the diff from the working copy to its parent
2511 :hg:`diff --to .` will show the diff from the working copy to its parent
2512 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2512 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2513 show the diff between those two revisions.
2513 show the diff between those two revisions.
2514
2514
2515 Alternatively you can specify -c/--change with a revision to see the changes
2515 Alternatively you can specify -c/--change with a revision to see the changes
2516 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2516 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2517 equivalent to :hg:`diff --from 42^ --to 42`)
2517 equivalent to :hg:`diff --from 42^ --to 42`)
2518
2518
2519 Without the -a/--text option, diff will avoid generating diffs of
2519 Without the -a/--text option, diff will avoid generating diffs of
2520 files it detects as binary. With -a, diff will generate a diff
2520 files it detects as binary. With -a, diff will generate a diff
2521 anyway, probably with undesirable results.
2521 anyway, probably with undesirable results.
2522
2522
2523 Use the -g/--git option to generate diffs in the git extended diff
2523 Use the -g/--git option to generate diffs in the git extended diff
2524 format. For more information, read :hg:`help diffs`.
2524 format. For more information, read :hg:`help diffs`.
2525
2525
2526 .. container:: verbose
2526 .. container:: verbose
2527
2527
2528 Examples:
2528 Examples:
2529
2529
2530 - compare a file in the current working directory to its parent::
2530 - compare a file in the current working directory to its parent::
2531
2531
2532 hg diff foo.c
2532 hg diff foo.c
2533
2533
2534 - compare two historical versions of a directory, with rename info::
2534 - compare two historical versions of a directory, with rename info::
2535
2535
2536 hg diff --git --from 1.0 --to 1.2 lib/
2536 hg diff --git --from 1.0 --to 1.2 lib/
2537
2537
2538 - get change stats relative to the last change on some date::
2538 - get change stats relative to the last change on some date::
2539
2539
2540 hg diff --stat --from "date('may 2')"
2540 hg diff --stat --from "date('may 2')"
2541
2541
2542 - diff all newly-added files that contain a keyword::
2542 - diff all newly-added files that contain a keyword::
2543
2543
2544 hg diff "set:added() and grep(GNU)"
2544 hg diff "set:added() and grep(GNU)"
2545
2545
2546 - compare a revision and its parents::
2546 - compare a revision and its parents::
2547
2547
2548 hg diff -c 9353 # compare against first parent
2548 hg diff -c 9353 # compare against first parent
2549 hg diff --from 9353^ --to 9353 # same using revset syntax
2549 hg diff --from 9353^ --to 9353 # same using revset syntax
2550 hg diff --from 9353^2 --to 9353 # compare against the second parent
2550 hg diff --from 9353^2 --to 9353 # compare against the second parent
2551
2551
2552 Returns 0 on success.
2552 Returns 0 on success.
2553 """
2553 """
2554
2554
2555 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2555 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2556 opts = pycompat.byteskwargs(opts)
2556 opts = pycompat.byteskwargs(opts)
2557 revs = opts.get(b'rev')
2557 revs = opts.get(b'rev')
2558 change = opts.get(b'change')
2558 change = opts.get(b'change')
2559 from_rev = opts.get(b'from')
2559 from_rev = opts.get(b'from')
2560 to_rev = opts.get(b'to')
2560 to_rev = opts.get(b'to')
2561 stat = opts.get(b'stat')
2561 stat = opts.get(b'stat')
2562 reverse = opts.get(b'reverse')
2562 reverse = opts.get(b'reverse')
2563
2563
2564 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2564 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2565 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2565 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2566 if change:
2566 if change:
2567 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2567 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2568 ctx2 = scmutil.revsingle(repo, change, None)
2568 ctx2 = scmutil.revsingle(repo, change, None)
2569 ctx1 = logcmdutil.diff_parent(ctx2)
2569 ctx1 = logcmdutil.diff_parent(ctx2)
2570 elif from_rev or to_rev:
2570 elif from_rev or to_rev:
2571 repo = scmutil.unhidehashlikerevs(
2571 repo = scmutil.unhidehashlikerevs(
2572 repo, [from_rev] + [to_rev], b'nowarn'
2572 repo, [from_rev] + [to_rev], b'nowarn'
2573 )
2573 )
2574 ctx1 = scmutil.revsingle(repo, from_rev, None)
2574 ctx1 = scmutil.revsingle(repo, from_rev, None)
2575 ctx2 = scmutil.revsingle(repo, to_rev, None)
2575 ctx2 = scmutil.revsingle(repo, to_rev, None)
2576 else:
2576 else:
2577 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2577 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2578 ctx1, ctx2 = scmutil.revpair(repo, revs)
2578 ctx1, ctx2 = scmutil.revpair(repo, revs)
2579
2579
2580 if reverse:
2580 if reverse:
2581 ctxleft = ctx2
2581 ctxleft = ctx2
2582 ctxright = ctx1
2582 ctxright = ctx1
2583 else:
2583 else:
2584 ctxleft = ctx1
2584 ctxleft = ctx1
2585 ctxright = ctx2
2585 ctxright = ctx2
2586
2586
2587 diffopts = patch.diffallopts(ui, opts)
2587 diffopts = patch.diffallopts(ui, opts)
2588 m = scmutil.match(ctx2, pats, opts)
2588 m = scmutil.match(ctx2, pats, opts)
2589 m = repo.narrowmatch(m)
2589 m = repo.narrowmatch(m)
2590 ui.pager(b'diff')
2590 ui.pager(b'diff')
2591 logcmdutil.diffordiffstat(
2591 logcmdutil.diffordiffstat(
2592 ui,
2592 ui,
2593 repo,
2593 repo,
2594 diffopts,
2594 diffopts,
2595 ctxleft,
2595 ctxleft,
2596 ctxright,
2596 ctxright,
2597 m,
2597 m,
2598 stat=stat,
2598 stat=stat,
2599 listsubrepos=opts.get(b'subrepos'),
2599 listsubrepos=opts.get(b'subrepos'),
2600 root=opts.get(b'root'),
2600 root=opts.get(b'root'),
2601 )
2601 )
2602
2602
2603
2603
2604 @command(
2604 @command(
2605 b'export',
2605 b'export',
2606 [
2606 [
2607 (
2607 (
2608 b'B',
2608 b'B',
2609 b'bookmark',
2609 b'bookmark',
2610 b'',
2610 b'',
2611 _(b'export changes only reachable by given bookmark'),
2611 _(b'export changes only reachable by given bookmark'),
2612 _(b'BOOKMARK'),
2612 _(b'BOOKMARK'),
2613 ),
2613 ),
2614 (
2614 (
2615 b'o',
2615 b'o',
2616 b'output',
2616 b'output',
2617 b'',
2617 b'',
2618 _(b'print output to file with formatted name'),
2618 _(b'print output to file with formatted name'),
2619 _(b'FORMAT'),
2619 _(b'FORMAT'),
2620 ),
2620 ),
2621 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2621 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2622 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2622 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2623 ]
2623 ]
2624 + diffopts
2624 + diffopts
2625 + formatteropts,
2625 + formatteropts,
2626 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2626 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2627 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2627 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2628 helpbasic=True,
2628 helpbasic=True,
2629 intents={INTENT_READONLY},
2629 intents={INTENT_READONLY},
2630 )
2630 )
2631 def export(ui, repo, *changesets, **opts):
2631 def export(ui, repo, *changesets, **opts):
2632 """dump the header and diffs for one or more changesets
2632 """dump the header and diffs for one or more changesets
2633
2633
2634 Print the changeset header and diffs for one or more revisions.
2634 Print the changeset header and diffs for one or more revisions.
2635 If no revision is given, the parent of the working directory is used.
2635 If no revision is given, the parent of the working directory is used.
2636
2636
2637 The information shown in the changeset header is: author, date,
2637 The information shown in the changeset header is: author, date,
2638 branch name (if non-default), changeset hash, parent(s) and commit
2638 branch name (if non-default), changeset hash, parent(s) and commit
2639 comment.
2639 comment.
2640
2640
2641 .. note::
2641 .. note::
2642
2642
2643 :hg:`export` may generate unexpected diff output for merge
2643 :hg:`export` may generate unexpected diff output for merge
2644 changesets, as it will compare the merge changeset against its
2644 changesets, as it will compare the merge changeset against its
2645 first parent only.
2645 first parent only.
2646
2646
2647 Output may be to a file, in which case the name of the file is
2647 Output may be to a file, in which case the name of the file is
2648 given using a template string. See :hg:`help templates`. In addition
2648 given using a template string. See :hg:`help templates`. In addition
2649 to the common template keywords, the following formatting rules are
2649 to the common template keywords, the following formatting rules are
2650 supported:
2650 supported:
2651
2651
2652 :``%%``: literal "%" character
2652 :``%%``: literal "%" character
2653 :``%H``: changeset hash (40 hexadecimal digits)
2653 :``%H``: changeset hash (40 hexadecimal digits)
2654 :``%N``: number of patches being generated
2654 :``%N``: number of patches being generated
2655 :``%R``: changeset revision number
2655 :``%R``: changeset revision number
2656 :``%b``: basename of the exporting repository
2656 :``%b``: basename of the exporting repository
2657 :``%h``: short-form changeset hash (12 hexadecimal digits)
2657 :``%h``: short-form changeset hash (12 hexadecimal digits)
2658 :``%m``: first line of the commit message (only alphanumeric characters)
2658 :``%m``: first line of the commit message (only alphanumeric characters)
2659 :``%n``: zero-padded sequence number, starting at 1
2659 :``%n``: zero-padded sequence number, starting at 1
2660 :``%r``: zero-padded changeset revision number
2660 :``%r``: zero-padded changeset revision number
2661 :``\\``: literal "\\" character
2661 :``\\``: literal "\\" character
2662
2662
2663 Without the -a/--text option, export will avoid generating diffs
2663 Without the -a/--text option, export will avoid generating diffs
2664 of files it detects as binary. With -a, export will generate a
2664 of files it detects as binary. With -a, export will generate a
2665 diff anyway, probably with undesirable results.
2665 diff anyway, probably with undesirable results.
2666
2666
2667 With -B/--bookmark changesets reachable by the given bookmark are
2667 With -B/--bookmark changesets reachable by the given bookmark are
2668 selected.
2668 selected.
2669
2669
2670 Use the -g/--git option to generate diffs in the git extended diff
2670 Use the -g/--git option to generate diffs in the git extended diff
2671 format. See :hg:`help diffs` for more information.
2671 format. See :hg:`help diffs` for more information.
2672
2672
2673 With the --switch-parent option, the diff will be against the
2673 With the --switch-parent option, the diff will be against the
2674 second parent. It can be useful to review a merge.
2674 second parent. It can be useful to review a merge.
2675
2675
2676 .. container:: verbose
2676 .. container:: verbose
2677
2677
2678 Template:
2678 Template:
2679
2679
2680 The following keywords are supported in addition to the common template
2680 The following keywords are supported in addition to the common template
2681 keywords and functions. See also :hg:`help templates`.
2681 keywords and functions. See also :hg:`help templates`.
2682
2682
2683 :diff: String. Diff content.
2683 :diff: String. Diff content.
2684 :parents: List of strings. Parent nodes of the changeset.
2684 :parents: List of strings. Parent nodes of the changeset.
2685
2685
2686 Examples:
2686 Examples:
2687
2687
2688 - use export and import to transplant a bugfix to the current
2688 - use export and import to transplant a bugfix to the current
2689 branch::
2689 branch::
2690
2690
2691 hg export -r 9353 | hg import -
2691 hg export -r 9353 | hg import -
2692
2692
2693 - export all the changesets between two revisions to a file with
2693 - export all the changesets between two revisions to a file with
2694 rename information::
2694 rename information::
2695
2695
2696 hg export --git -r 123:150 > changes.txt
2696 hg export --git -r 123:150 > changes.txt
2697
2697
2698 - split outgoing changes into a series of patches with
2698 - split outgoing changes into a series of patches with
2699 descriptive names::
2699 descriptive names::
2700
2700
2701 hg export -r "outgoing()" -o "%n-%m.patch"
2701 hg export -r "outgoing()" -o "%n-%m.patch"
2702
2702
2703 Returns 0 on success.
2703 Returns 0 on success.
2704 """
2704 """
2705 opts = pycompat.byteskwargs(opts)
2705 opts = pycompat.byteskwargs(opts)
2706 bookmark = opts.get(b'bookmark')
2706 bookmark = opts.get(b'bookmark')
2707 changesets += tuple(opts.get(b'rev', []))
2707 changesets += tuple(opts.get(b'rev', []))
2708
2708
2709 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2709 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2710
2710
2711 if bookmark:
2711 if bookmark:
2712 if bookmark not in repo._bookmarks:
2712 if bookmark not in repo._bookmarks:
2713 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2713 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2714
2714
2715 revs = scmutil.bookmarkrevs(repo, bookmark)
2715 revs = scmutil.bookmarkrevs(repo, bookmark)
2716 else:
2716 else:
2717 if not changesets:
2717 if not changesets:
2718 changesets = [b'.']
2718 changesets = [b'.']
2719
2719
2720 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2720 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2721 revs = scmutil.revrange(repo, changesets)
2721 revs = scmutil.revrange(repo, changesets)
2722
2722
2723 if not revs:
2723 if not revs:
2724 raise error.InputError(_(b"export requires at least one changeset"))
2724 raise error.InputError(_(b"export requires at least one changeset"))
2725 if len(revs) > 1:
2725 if len(revs) > 1:
2726 ui.note(_(b'exporting patches:\n'))
2726 ui.note(_(b'exporting patches:\n'))
2727 else:
2727 else:
2728 ui.note(_(b'exporting patch:\n'))
2728 ui.note(_(b'exporting patch:\n'))
2729
2729
2730 fntemplate = opts.get(b'output')
2730 fntemplate = opts.get(b'output')
2731 if cmdutil.isstdiofilename(fntemplate):
2731 if cmdutil.isstdiofilename(fntemplate):
2732 fntemplate = b''
2732 fntemplate = b''
2733
2733
2734 if fntemplate:
2734 if fntemplate:
2735 fm = formatter.nullformatter(ui, b'export', opts)
2735 fm = formatter.nullformatter(ui, b'export', opts)
2736 else:
2736 else:
2737 ui.pager(b'export')
2737 ui.pager(b'export')
2738 fm = ui.formatter(b'export', opts)
2738 fm = ui.formatter(b'export', opts)
2739 with fm:
2739 with fm:
2740 cmdutil.export(
2740 cmdutil.export(
2741 repo,
2741 repo,
2742 revs,
2742 revs,
2743 fm,
2743 fm,
2744 fntemplate=fntemplate,
2744 fntemplate=fntemplate,
2745 switch_parent=opts.get(b'switch_parent'),
2745 switch_parent=opts.get(b'switch_parent'),
2746 opts=patch.diffallopts(ui, opts),
2746 opts=patch.diffallopts(ui, opts),
2747 )
2747 )
2748
2748
2749
2749
2750 @command(
2750 @command(
2751 b'files',
2751 b'files',
2752 [
2752 [
2753 (
2753 (
2754 b'r',
2754 b'r',
2755 b'rev',
2755 b'rev',
2756 b'',
2756 b'',
2757 _(b'search the repository as it is in REV'),
2757 _(b'search the repository as it is in REV'),
2758 _(b'REV'),
2758 _(b'REV'),
2759 ),
2759 ),
2760 (
2760 (
2761 b'0',
2761 b'0',
2762 b'print0',
2762 b'print0',
2763 None,
2763 None,
2764 _(b'end filenames with NUL, for use with xargs'),
2764 _(b'end filenames with NUL, for use with xargs'),
2765 ),
2765 ),
2766 ]
2766 ]
2767 + walkopts
2767 + walkopts
2768 + formatteropts
2768 + formatteropts
2769 + subrepoopts,
2769 + subrepoopts,
2770 _(b'[OPTION]... [FILE]...'),
2770 _(b'[OPTION]... [FILE]...'),
2771 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2771 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2772 intents={INTENT_READONLY},
2772 intents={INTENT_READONLY},
2773 )
2773 )
2774 def files(ui, repo, *pats, **opts):
2774 def files(ui, repo, *pats, **opts):
2775 """list tracked files
2775 """list tracked files
2776
2776
2777 Print files under Mercurial control in the working directory or
2777 Print files under Mercurial control in the working directory or
2778 specified revision for given files (excluding removed files).
2778 specified revision for given files (excluding removed files).
2779 Files can be specified as filenames or filesets.
2779 Files can be specified as filenames or filesets.
2780
2780
2781 If no files are given to match, this command prints the names
2781 If no files are given to match, this command prints the names
2782 of all files under Mercurial control.
2782 of all files under Mercurial control.
2783
2783
2784 .. container:: verbose
2784 .. container:: verbose
2785
2785
2786 Template:
2786 Template:
2787
2787
2788 The following keywords are supported in addition to the common template
2788 The following keywords are supported in addition to the common template
2789 keywords and functions. See also :hg:`help templates`.
2789 keywords and functions. See also :hg:`help templates`.
2790
2790
2791 :flags: String. Character denoting file's symlink and executable bits.
2791 :flags: String. Character denoting file's symlink and executable bits.
2792 :path: String. Repository-absolute path of the file.
2792 :path: String. Repository-absolute path of the file.
2793 :size: Integer. Size of the file in bytes.
2793 :size: Integer. Size of the file in bytes.
2794
2794
2795 Examples:
2795 Examples:
2796
2796
2797 - list all files under the current directory::
2797 - list all files under the current directory::
2798
2798
2799 hg files .
2799 hg files .
2800
2800
2801 - shows sizes and flags for current revision::
2801 - shows sizes and flags for current revision::
2802
2802
2803 hg files -vr .
2803 hg files -vr .
2804
2804
2805 - list all files named README::
2805 - list all files named README::
2806
2806
2807 hg files -I "**/README"
2807 hg files -I "**/README"
2808
2808
2809 - list all binary files::
2809 - list all binary files::
2810
2810
2811 hg files "set:binary()"
2811 hg files "set:binary()"
2812
2812
2813 - find files containing a regular expression::
2813 - find files containing a regular expression::
2814
2814
2815 hg files "set:grep('bob')"
2815 hg files "set:grep('bob')"
2816
2816
2817 - search tracked file contents with xargs and grep::
2817 - search tracked file contents with xargs and grep::
2818
2818
2819 hg files -0 | xargs -0 grep foo
2819 hg files -0 | xargs -0 grep foo
2820
2820
2821 See :hg:`help patterns` and :hg:`help filesets` for more information
2821 See :hg:`help patterns` and :hg:`help filesets` for more information
2822 on specifying file patterns.
2822 on specifying file patterns.
2823
2823
2824 Returns 0 if a match is found, 1 otherwise.
2824 Returns 0 if a match is found, 1 otherwise.
2825
2825
2826 """
2826 """
2827
2827
2828 opts = pycompat.byteskwargs(opts)
2828 opts = pycompat.byteskwargs(opts)
2829 rev = opts.get(b'rev')
2829 rev = opts.get(b'rev')
2830 if rev:
2830 if rev:
2831 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2831 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2832 ctx = scmutil.revsingle(repo, rev, None)
2832 ctx = scmutil.revsingle(repo, rev, None)
2833
2833
2834 end = b'\n'
2834 end = b'\n'
2835 if opts.get(b'print0'):
2835 if opts.get(b'print0'):
2836 end = b'\0'
2836 end = b'\0'
2837 fmt = b'%s' + end
2837 fmt = b'%s' + end
2838
2838
2839 m = scmutil.match(ctx, pats, opts)
2839 m = scmutil.match(ctx, pats, opts)
2840 ui.pager(b'files')
2840 ui.pager(b'files')
2841 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2841 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2842 with ui.formatter(b'files', opts) as fm:
2842 with ui.formatter(b'files', opts) as fm:
2843 return cmdutil.files(
2843 return cmdutil.files(
2844 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2844 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2845 )
2845 )
2846
2846
2847
2847
2848 @command(
2848 @command(
2849 b'forget',
2849 b'forget',
2850 [
2850 [
2851 (b'i', b'interactive', None, _(b'use interactive mode')),
2851 (b'i', b'interactive', None, _(b'use interactive mode')),
2852 ]
2852 ]
2853 + walkopts
2853 + walkopts
2854 + dryrunopts,
2854 + dryrunopts,
2855 _(b'[OPTION]... FILE...'),
2855 _(b'[OPTION]... FILE...'),
2856 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2856 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2857 helpbasic=True,
2857 helpbasic=True,
2858 inferrepo=True,
2858 inferrepo=True,
2859 )
2859 )
2860 def forget(ui, repo, *pats, **opts):
2860 def forget(ui, repo, *pats, **opts):
2861 """forget the specified files on the next commit
2861 """forget the specified files on the next commit
2862
2862
2863 Mark the specified files so they will no longer be tracked
2863 Mark the specified files so they will no longer be tracked
2864 after the next commit.
2864 after the next commit.
2865
2865
2866 This only removes files from the current branch, not from the
2866 This only removes files from the current branch, not from the
2867 entire project history, and it does not delete them from the
2867 entire project history, and it does not delete them from the
2868 working directory.
2868 working directory.
2869
2869
2870 To delete the file from the working directory, see :hg:`remove`.
2870 To delete the file from the working directory, see :hg:`remove`.
2871
2871
2872 To undo a forget before the next commit, see :hg:`add`.
2872 To undo a forget before the next commit, see :hg:`add`.
2873
2873
2874 .. container:: verbose
2874 .. container:: verbose
2875
2875
2876 Examples:
2876 Examples:
2877
2877
2878 - forget newly-added binary files::
2878 - forget newly-added binary files::
2879
2879
2880 hg forget "set:added() and binary()"
2880 hg forget "set:added() and binary()"
2881
2881
2882 - forget files that would be excluded by .hgignore::
2882 - forget files that would be excluded by .hgignore::
2883
2883
2884 hg forget "set:hgignore()"
2884 hg forget "set:hgignore()"
2885
2885
2886 Returns 0 on success.
2886 Returns 0 on success.
2887 """
2887 """
2888
2888
2889 opts = pycompat.byteskwargs(opts)
2889 opts = pycompat.byteskwargs(opts)
2890 if not pats:
2890 if not pats:
2891 raise error.InputError(_(b'no files specified'))
2891 raise error.InputError(_(b'no files specified'))
2892
2892
2893 m = scmutil.match(repo[None], pats, opts)
2893 m = scmutil.match(repo[None], pats, opts)
2894 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2894 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2895 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2895 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2896 rejected = cmdutil.forget(
2896 rejected = cmdutil.forget(
2897 ui,
2897 ui,
2898 repo,
2898 repo,
2899 m,
2899 m,
2900 prefix=b"",
2900 prefix=b"",
2901 uipathfn=uipathfn,
2901 uipathfn=uipathfn,
2902 explicitonly=False,
2902 explicitonly=False,
2903 dryrun=dryrun,
2903 dryrun=dryrun,
2904 interactive=interactive,
2904 interactive=interactive,
2905 )[0]
2905 )[0]
2906 return rejected and 1 or 0
2906 return rejected and 1 or 0
2907
2907
2908
2908
2909 @command(
2909 @command(
2910 b'graft',
2910 b'graft',
2911 [
2911 [
2912 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2912 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2913 (
2913 (
2914 b'',
2914 b'',
2915 b'base',
2915 b'base',
2916 b'',
2916 b'',
2917 _(b'base revision when doing the graft merge (ADVANCED)'),
2917 _(b'base revision when doing the graft merge (ADVANCED)'),
2918 _(b'REV'),
2918 _(b'REV'),
2919 ),
2919 ),
2920 (b'c', b'continue', False, _(b'resume interrupted graft')),
2920 (b'c', b'continue', False, _(b'resume interrupted graft')),
2921 (b'', b'stop', False, _(b'stop interrupted graft')),
2921 (b'', b'stop', False, _(b'stop interrupted graft')),
2922 (b'', b'abort', False, _(b'abort interrupted graft')),
2922 (b'', b'abort', False, _(b'abort interrupted graft')),
2923 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2923 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2924 (b'', b'log', None, _(b'append graft info to log message')),
2924 (b'', b'log', None, _(b'append graft info to log message')),
2925 (
2925 (
2926 b'',
2926 b'',
2927 b'no-commit',
2927 b'no-commit',
2928 None,
2928 None,
2929 _(b"don't commit, just apply the changes in working directory"),
2929 _(b"don't commit, just apply the changes in working directory"),
2930 ),
2930 ),
2931 (b'f', b'force', False, _(b'force graft')),
2931 (b'f', b'force', False, _(b'force graft')),
2932 (
2932 (
2933 b'D',
2933 b'D',
2934 b'currentdate',
2934 b'currentdate',
2935 False,
2935 False,
2936 _(b'record the current date as commit date'),
2936 _(b'record the current date as commit date'),
2937 ),
2937 ),
2938 (
2938 (
2939 b'U',
2939 b'U',
2940 b'currentuser',
2940 b'currentuser',
2941 False,
2941 False,
2942 _(b'record the current user as committer'),
2942 _(b'record the current user as committer'),
2943 ),
2943 ),
2944 ]
2944 ]
2945 + commitopts2
2945 + commitopts2
2946 + mergetoolopts
2946 + mergetoolopts
2947 + dryrunopts,
2947 + dryrunopts,
2948 _(b'[OPTION]... [-r REV]... REV...'),
2948 _(b'[OPTION]... [-r REV]... REV...'),
2949 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2949 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2950 )
2950 )
2951 def graft(ui, repo, *revs, **opts):
2951 def graft(ui, repo, *revs, **opts):
2952 """copy changes from other branches onto the current branch
2952 """copy changes from other branches onto the current branch
2953
2953
2954 This command uses Mercurial's merge logic to copy individual
2954 This command uses Mercurial's merge logic to copy individual
2955 changes from other branches without merging branches in the
2955 changes from other branches without merging branches in the
2956 history graph. This is sometimes known as 'backporting' or
2956 history graph. This is sometimes known as 'backporting' or
2957 'cherry-picking'. By default, graft will copy user, date, and
2957 'cherry-picking'. By default, graft will copy user, date, and
2958 description from the source changesets.
2958 description from the source changesets.
2959
2959
2960 Changesets that are ancestors of the current revision, that have
2960 Changesets that are ancestors of the current revision, that have
2961 already been grafted, or that are merges will be skipped.
2961 already been grafted, or that are merges will be skipped.
2962
2962
2963 If --log is specified, log messages will have a comment appended
2963 If --log is specified, log messages will have a comment appended
2964 of the form::
2964 of the form::
2965
2965
2966 (grafted from CHANGESETHASH)
2966 (grafted from CHANGESETHASH)
2967
2967
2968 If --force is specified, revisions will be grafted even if they
2968 If --force is specified, revisions will be grafted even if they
2969 are already ancestors of, or have been grafted to, the destination.
2969 are already ancestors of, or have been grafted to, the destination.
2970 This is useful when the revisions have since been backed out.
2970 This is useful when the revisions have since been backed out.
2971
2971
2972 If a graft merge results in conflicts, the graft process is
2972 If a graft merge results in conflicts, the graft process is
2973 interrupted so that the current merge can be manually resolved.
2973 interrupted so that the current merge can be manually resolved.
2974 Once all conflicts are addressed, the graft process can be
2974 Once all conflicts are addressed, the graft process can be
2975 continued with the -c/--continue option.
2975 continued with the -c/--continue option.
2976
2976
2977 The -c/--continue option reapplies all the earlier options.
2977 The -c/--continue option reapplies all the earlier options.
2978
2978
2979 .. container:: verbose
2979 .. container:: verbose
2980
2980
2981 The --base option exposes more of how graft internally uses merge with a
2981 The --base option exposes more of how graft internally uses merge with a
2982 custom base revision. --base can be used to specify another ancestor than
2982 custom base revision. --base can be used to specify another ancestor than
2983 the first and only parent.
2983 the first and only parent.
2984
2984
2985 The command::
2985 The command::
2986
2986
2987 hg graft -r 345 --base 234
2987 hg graft -r 345 --base 234
2988
2988
2989 is thus pretty much the same as::
2989 is thus pretty much the same as::
2990
2990
2991 hg diff --from 234 --to 345 | hg import
2991 hg diff --from 234 --to 345 | hg import
2992
2992
2993 but using merge to resolve conflicts and track moved files.
2993 but using merge to resolve conflicts and track moved files.
2994
2994
2995 The result of a merge can thus be backported as a single commit by
2995 The result of a merge can thus be backported as a single commit by
2996 specifying one of the merge parents as base, and thus effectively
2996 specifying one of the merge parents as base, and thus effectively
2997 grafting the changes from the other side.
2997 grafting the changes from the other side.
2998
2998
2999 It is also possible to collapse multiple changesets and clean up history
2999 It is also possible to collapse multiple changesets and clean up history
3000 by specifying another ancestor as base, much like rebase --collapse
3000 by specifying another ancestor as base, much like rebase --collapse
3001 --keep.
3001 --keep.
3002
3002
3003 The commit message can be tweaked after the fact using commit --amend .
3003 The commit message can be tweaked after the fact using commit --amend .
3004
3004
3005 For using non-ancestors as the base to backout changes, see the backout
3005 For using non-ancestors as the base to backout changes, see the backout
3006 command and the hidden --parent option.
3006 command and the hidden --parent option.
3007
3007
3008 .. container:: verbose
3008 .. container:: verbose
3009
3009
3010 Examples:
3010 Examples:
3011
3011
3012 - copy a single change to the stable branch and edit its description::
3012 - copy a single change to the stable branch and edit its description::
3013
3013
3014 hg update stable
3014 hg update stable
3015 hg graft --edit 9393
3015 hg graft --edit 9393
3016
3016
3017 - graft a range of changesets with one exception, updating dates::
3017 - graft a range of changesets with one exception, updating dates::
3018
3018
3019 hg graft -D "2085::2093 and not 2091"
3019 hg graft -D "2085::2093 and not 2091"
3020
3020
3021 - continue a graft after resolving conflicts::
3021 - continue a graft after resolving conflicts::
3022
3022
3023 hg graft -c
3023 hg graft -c
3024
3024
3025 - show the source of a grafted changeset::
3025 - show the source of a grafted changeset::
3026
3026
3027 hg log --debug -r .
3027 hg log --debug -r .
3028
3028
3029 - show revisions sorted by date::
3029 - show revisions sorted by date::
3030
3030
3031 hg log -r "sort(all(), date)"
3031 hg log -r "sort(all(), date)"
3032
3032
3033 - backport the result of a merge as a single commit::
3033 - backport the result of a merge as a single commit::
3034
3034
3035 hg graft -r 123 --base 123^
3035 hg graft -r 123 --base 123^
3036
3036
3037 - land a feature branch as one changeset::
3037 - land a feature branch as one changeset::
3038
3038
3039 hg up -cr default
3039 hg up -cr default
3040 hg graft -r featureX --base "ancestor('featureX', 'default')"
3040 hg graft -r featureX --base "ancestor('featureX', 'default')"
3041
3041
3042 See :hg:`help revisions` for more about specifying revisions.
3042 See :hg:`help revisions` for more about specifying revisions.
3043
3043
3044 Returns 0 on successful completion, 1 if there are unresolved files.
3044 Returns 0 on successful completion, 1 if there are unresolved files.
3045 """
3045 """
3046 with repo.wlock():
3046 with repo.wlock():
3047 return _dograft(ui, repo, *revs, **opts)
3047 return _dograft(ui, repo, *revs, **opts)
3048
3048
3049
3049
3050 def _dograft(ui, repo, *revs, **opts):
3050 def _dograft(ui, repo, *revs, **opts):
3051 opts = pycompat.byteskwargs(opts)
3051 opts = pycompat.byteskwargs(opts)
3052 if revs and opts.get(b'rev'):
3052 if revs and opts.get(b'rev'):
3053 ui.warn(
3053 ui.warn(
3054 _(
3054 _(
3055 b'warning: inconsistent use of --rev might give unexpected '
3055 b'warning: inconsistent use of --rev might give unexpected '
3056 b'revision ordering!\n'
3056 b'revision ordering!\n'
3057 )
3057 )
3058 )
3058 )
3059
3059
3060 revs = list(revs)
3060 revs = list(revs)
3061 revs.extend(opts.get(b'rev'))
3061 revs.extend(opts.get(b'rev'))
3062 # a dict of data to be stored in state file
3062 # a dict of data to be stored in state file
3063 statedata = {}
3063 statedata = {}
3064 # list of new nodes created by ongoing graft
3064 # list of new nodes created by ongoing graft
3065 statedata[b'newnodes'] = []
3065 statedata[b'newnodes'] = []
3066
3066
3067 cmdutil.resolvecommitoptions(ui, opts)
3067 cmdutil.resolvecommitoptions(ui, opts)
3068
3068
3069 editor = cmdutil.getcommiteditor(
3069 editor = cmdutil.getcommiteditor(
3070 editform=b'graft', **pycompat.strkwargs(opts)
3070 editform=b'graft', **pycompat.strkwargs(opts)
3071 )
3071 )
3072
3072
3073 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3073 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3074
3074
3075 cont = False
3075 cont = False
3076 if opts.get(b'no_commit'):
3076 if opts.get(b'no_commit'):
3077 cmdutil.check_incompatible_arguments(
3077 cmdutil.check_incompatible_arguments(
3078 opts,
3078 opts,
3079 b'no_commit',
3079 b'no_commit',
3080 [b'edit', b'currentuser', b'currentdate', b'log'],
3080 [b'edit', b'currentuser', b'currentdate', b'log'],
3081 )
3081 )
3082
3082
3083 graftstate = statemod.cmdstate(repo, b'graftstate')
3083 graftstate = statemod.cmdstate(repo, b'graftstate')
3084
3084
3085 if opts.get(b'stop'):
3085 if opts.get(b'stop'):
3086 cmdutil.check_incompatible_arguments(
3086 cmdutil.check_incompatible_arguments(
3087 opts,
3087 opts,
3088 b'stop',
3088 b'stop',
3089 [
3089 [
3090 b'edit',
3090 b'edit',
3091 b'log',
3091 b'log',
3092 b'user',
3092 b'user',
3093 b'date',
3093 b'date',
3094 b'currentdate',
3094 b'currentdate',
3095 b'currentuser',
3095 b'currentuser',
3096 b'rev',
3096 b'rev',
3097 ],
3097 ],
3098 )
3098 )
3099 return _stopgraft(ui, repo, graftstate)
3099 return _stopgraft(ui, repo, graftstate)
3100 elif opts.get(b'abort'):
3100 elif opts.get(b'abort'):
3101 cmdutil.check_incompatible_arguments(
3101 cmdutil.check_incompatible_arguments(
3102 opts,
3102 opts,
3103 b'abort',
3103 b'abort',
3104 [
3104 [
3105 b'edit',
3105 b'edit',
3106 b'log',
3106 b'log',
3107 b'user',
3107 b'user',
3108 b'date',
3108 b'date',
3109 b'currentdate',
3109 b'currentdate',
3110 b'currentuser',
3110 b'currentuser',
3111 b'rev',
3111 b'rev',
3112 ],
3112 ],
3113 )
3113 )
3114 return cmdutil.abortgraft(ui, repo, graftstate)
3114 return cmdutil.abortgraft(ui, repo, graftstate)
3115 elif opts.get(b'continue'):
3115 elif opts.get(b'continue'):
3116 cont = True
3116 cont = True
3117 if revs:
3117 if revs:
3118 raise error.InputError(_(b"can't specify --continue and revisions"))
3118 raise error.InputError(_(b"can't specify --continue and revisions"))
3119 # read in unfinished revisions
3119 # read in unfinished revisions
3120 if graftstate.exists():
3120 if graftstate.exists():
3121 statedata = cmdutil.readgraftstate(repo, graftstate)
3121 statedata = cmdutil.readgraftstate(repo, graftstate)
3122 if statedata.get(b'date'):
3122 if statedata.get(b'date'):
3123 opts[b'date'] = statedata[b'date']
3123 opts[b'date'] = statedata[b'date']
3124 if statedata.get(b'user'):
3124 if statedata.get(b'user'):
3125 opts[b'user'] = statedata[b'user']
3125 opts[b'user'] = statedata[b'user']
3126 if statedata.get(b'log'):
3126 if statedata.get(b'log'):
3127 opts[b'log'] = True
3127 opts[b'log'] = True
3128 if statedata.get(b'no_commit'):
3128 if statedata.get(b'no_commit'):
3129 opts[b'no_commit'] = statedata.get(b'no_commit')
3129 opts[b'no_commit'] = statedata.get(b'no_commit')
3130 if statedata.get(b'base'):
3130 if statedata.get(b'base'):
3131 opts[b'base'] = statedata.get(b'base')
3131 opts[b'base'] = statedata.get(b'base')
3132 nodes = statedata[b'nodes']
3132 nodes = statedata[b'nodes']
3133 revs = [repo[node].rev() for node in nodes]
3133 revs = [repo[node].rev() for node in nodes]
3134 else:
3134 else:
3135 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3135 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3136 else:
3136 else:
3137 if not revs:
3137 if not revs:
3138 raise error.InputError(_(b'no revisions specified'))
3138 raise error.InputError(_(b'no revisions specified'))
3139 cmdutil.checkunfinished(repo)
3139 cmdutil.checkunfinished(repo)
3140 cmdutil.bailifchanged(repo)
3140 cmdutil.bailifchanged(repo)
3141 revs = scmutil.revrange(repo, revs)
3141 revs = scmutil.revrange(repo, revs)
3142
3142
3143 skipped = set()
3143 skipped = set()
3144 basectx = None
3144 basectx = None
3145 if opts.get(b'base'):
3145 if opts.get(b'base'):
3146 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3146 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3147 if basectx is None:
3147 if basectx is None:
3148 # check for merges
3148 # check for merges
3149 for rev in repo.revs(b'%ld and merge()', revs):
3149 for rev in repo.revs(b'%ld and merge()', revs):
3150 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3150 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3151 skipped.add(rev)
3151 skipped.add(rev)
3152 revs = [r for r in revs if r not in skipped]
3152 revs = [r for r in revs if r not in skipped]
3153 if not revs:
3153 if not revs:
3154 return -1
3154 return -1
3155 if basectx is not None and len(revs) != 1:
3155 if basectx is not None and len(revs) != 1:
3156 raise error.InputError(_(b'only one revision allowed with --base '))
3156 raise error.InputError(_(b'only one revision allowed with --base '))
3157
3157
3158 # Don't check in the --continue case, in effect retaining --force across
3158 # Don't check in the --continue case, in effect retaining --force across
3159 # --continues. That's because without --force, any revisions we decided to
3159 # --continues. That's because without --force, any revisions we decided to
3160 # skip would have been filtered out here, so they wouldn't have made their
3160 # skip would have been filtered out here, so they wouldn't have made their
3161 # way to the graftstate. With --force, any revisions we would have otherwise
3161 # way to the graftstate. With --force, any revisions we would have otherwise
3162 # skipped would not have been filtered out, and if they hadn't been applied
3162 # skipped would not have been filtered out, and if they hadn't been applied
3163 # already, they'd have been in the graftstate.
3163 # already, they'd have been in the graftstate.
3164 if not (cont or opts.get(b'force')) and basectx is None:
3164 if not (cont or opts.get(b'force')) and basectx is None:
3165 # check for ancestors of dest branch
3165 # check for ancestors of dest branch
3166 ancestors = repo.revs(b'%ld & (::.)', revs)
3166 ancestors = repo.revs(b'%ld & (::.)', revs)
3167 for rev in ancestors:
3167 for rev in ancestors:
3168 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3168 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3169
3169
3170 revs = [r for r in revs if r not in ancestors]
3170 revs = [r for r in revs if r not in ancestors]
3171
3171
3172 if not revs:
3172 if not revs:
3173 return -1
3173 return -1
3174
3174
3175 # analyze revs for earlier grafts
3175 # analyze revs for earlier grafts
3176 ids = {}
3176 ids = {}
3177 for ctx in repo.set(b"%ld", revs):
3177 for ctx in repo.set(b"%ld", revs):
3178 ids[ctx.hex()] = ctx.rev()
3178 ids[ctx.hex()] = ctx.rev()
3179 n = ctx.extra().get(b'source')
3179 n = ctx.extra().get(b'source')
3180 if n:
3180 if n:
3181 ids[n] = ctx.rev()
3181 ids[n] = ctx.rev()
3182
3182
3183 # check ancestors for earlier grafts
3183 # check ancestors for earlier grafts
3184 ui.debug(b'scanning for duplicate grafts\n')
3184 ui.debug(b'scanning for duplicate grafts\n')
3185
3185
3186 # The only changesets we can be sure doesn't contain grafts of any
3186 # The only changesets we can be sure doesn't contain grafts of any
3187 # revs, are the ones that are common ancestors of *all* revs:
3187 # revs, are the ones that are common ancestors of *all* revs:
3188 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3188 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3189 ctx = repo[rev]
3189 ctx = repo[rev]
3190 n = ctx.extra().get(b'source')
3190 n = ctx.extra().get(b'source')
3191 if n in ids:
3191 if n in ids:
3192 try:
3192 try:
3193 r = repo[n].rev()
3193 r = repo[n].rev()
3194 except error.RepoLookupError:
3194 except error.RepoLookupError:
3195 r = None
3195 r = None
3196 if r in revs:
3196 if r in revs:
3197 ui.warn(
3197 ui.warn(
3198 _(
3198 _(
3199 b'skipping revision %d:%s '
3199 b'skipping revision %d:%s '
3200 b'(already grafted to %d:%s)\n'
3200 b'(already grafted to %d:%s)\n'
3201 )
3201 )
3202 % (r, repo[r], rev, ctx)
3202 % (r, repo[r], rev, ctx)
3203 )
3203 )
3204 revs.remove(r)
3204 revs.remove(r)
3205 elif ids[n] in revs:
3205 elif ids[n] in revs:
3206 if r is None:
3206 if r is None:
3207 ui.warn(
3207 ui.warn(
3208 _(
3208 _(
3209 b'skipping already grafted revision %d:%s '
3209 b'skipping already grafted revision %d:%s '
3210 b'(%d:%s also has unknown origin %s)\n'
3210 b'(%d:%s also has unknown origin %s)\n'
3211 )
3211 )
3212 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3212 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3213 )
3213 )
3214 else:
3214 else:
3215 ui.warn(
3215 ui.warn(
3216 _(
3216 _(
3217 b'skipping already grafted revision %d:%s '
3217 b'skipping already grafted revision %d:%s '
3218 b'(%d:%s also has origin %d:%s)\n'
3218 b'(%d:%s also has origin %d:%s)\n'
3219 )
3219 )
3220 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3220 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3221 )
3221 )
3222 revs.remove(ids[n])
3222 revs.remove(ids[n])
3223 elif ctx.hex() in ids:
3223 elif ctx.hex() in ids:
3224 r = ids[ctx.hex()]
3224 r = ids[ctx.hex()]
3225 if r in revs:
3225 if r in revs:
3226 ui.warn(
3226 ui.warn(
3227 _(
3227 _(
3228 b'skipping already grafted revision %d:%s '
3228 b'skipping already grafted revision %d:%s '
3229 b'(was grafted from %d:%s)\n'
3229 b'(was grafted from %d:%s)\n'
3230 )
3230 )
3231 % (r, repo[r], rev, ctx)
3231 % (r, repo[r], rev, ctx)
3232 )
3232 )
3233 revs.remove(r)
3233 revs.remove(r)
3234 if not revs:
3234 if not revs:
3235 return -1
3235 return -1
3236
3236
3237 if opts.get(b'no_commit'):
3237 if opts.get(b'no_commit'):
3238 statedata[b'no_commit'] = True
3238 statedata[b'no_commit'] = True
3239 if opts.get(b'base'):
3239 if opts.get(b'base'):
3240 statedata[b'base'] = opts[b'base']
3240 statedata[b'base'] = opts[b'base']
3241 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3241 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3242 desc = b'%d:%s "%s"' % (
3242 desc = b'%d:%s "%s"' % (
3243 ctx.rev(),
3243 ctx.rev(),
3244 ctx,
3244 ctx,
3245 ctx.description().split(b'\n', 1)[0],
3245 ctx.description().split(b'\n', 1)[0],
3246 )
3246 )
3247 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3247 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3248 if names:
3248 if names:
3249 desc += b' (%s)' % b' '.join(names)
3249 desc += b' (%s)' % b' '.join(names)
3250 ui.status(_(b'grafting %s\n') % desc)
3250 ui.status(_(b'grafting %s\n') % desc)
3251 if opts.get(b'dry_run'):
3251 if opts.get(b'dry_run'):
3252 continue
3252 continue
3253
3253
3254 source = ctx.extra().get(b'source')
3254 source = ctx.extra().get(b'source')
3255 extra = {}
3255 extra = {}
3256 if source:
3256 if source:
3257 extra[b'source'] = source
3257 extra[b'source'] = source
3258 extra[b'intermediate-source'] = ctx.hex()
3258 extra[b'intermediate-source'] = ctx.hex()
3259 else:
3259 else:
3260 extra[b'source'] = ctx.hex()
3260 extra[b'source'] = ctx.hex()
3261 user = ctx.user()
3261 user = ctx.user()
3262 if opts.get(b'user'):
3262 if opts.get(b'user'):
3263 user = opts[b'user']
3263 user = opts[b'user']
3264 statedata[b'user'] = user
3264 statedata[b'user'] = user
3265 date = ctx.date()
3265 date = ctx.date()
3266 if opts.get(b'date'):
3266 if opts.get(b'date'):
3267 date = opts[b'date']
3267 date = opts[b'date']
3268 statedata[b'date'] = date
3268 statedata[b'date'] = date
3269 message = ctx.description()
3269 message = ctx.description()
3270 if opts.get(b'log'):
3270 if opts.get(b'log'):
3271 message += b'\n(grafted from %s)' % ctx.hex()
3271 message += b'\n(grafted from %s)' % ctx.hex()
3272 statedata[b'log'] = True
3272 statedata[b'log'] = True
3273
3273
3274 # we don't merge the first commit when continuing
3274 # we don't merge the first commit when continuing
3275 if not cont:
3275 if not cont:
3276 # perform the graft merge with p1(rev) as 'ancestor'
3276 # perform the graft merge with p1(rev) as 'ancestor'
3277 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3277 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3278 base = ctx.p1() if basectx is None else basectx
3278 base = ctx.p1() if basectx is None else basectx
3279 with ui.configoverride(overrides, b'graft'):
3279 with ui.configoverride(overrides, b'graft'):
3280 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3280 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3281 # report any conflicts
3281 # report any conflicts
3282 if stats.unresolvedcount > 0:
3282 if stats.unresolvedcount > 0:
3283 # write out state for --continue
3283 # write out state for --continue
3284 nodes = [repo[rev].hex() for rev in revs[pos:]]
3284 nodes = [repo[rev].hex() for rev in revs[pos:]]
3285 statedata[b'nodes'] = nodes
3285 statedata[b'nodes'] = nodes
3286 stateversion = 1
3286 stateversion = 1
3287 graftstate.save(stateversion, statedata)
3287 graftstate.save(stateversion, statedata)
3288 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3288 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3289 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3289 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3290 return 1
3290 return 1
3291 else:
3291 else:
3292 cont = False
3292 cont = False
3293
3293
3294 # commit if --no-commit is false
3294 # commit if --no-commit is false
3295 if not opts.get(b'no_commit'):
3295 if not opts.get(b'no_commit'):
3296 node = repo.commit(
3296 node = repo.commit(
3297 text=message, user=user, date=date, extra=extra, editor=editor
3297 text=message, user=user, date=date, extra=extra, editor=editor
3298 )
3298 )
3299 if node is None:
3299 if node is None:
3300 ui.warn(
3300 ui.warn(
3301 _(b'note: graft of %d:%s created no changes to commit\n')
3301 _(b'note: graft of %d:%s created no changes to commit\n')
3302 % (ctx.rev(), ctx)
3302 % (ctx.rev(), ctx)
3303 )
3303 )
3304 # checking that newnodes exist because old state files won't have it
3304 # checking that newnodes exist because old state files won't have it
3305 elif statedata.get(b'newnodes') is not None:
3305 elif statedata.get(b'newnodes') is not None:
3306 nn = statedata[b'newnodes'] # type: List[bytes]
3306 nn = statedata[b'newnodes'] # type: List[bytes]
3307 nn.append(node)
3307 nn.append(node)
3308
3308
3309 # remove state when we complete successfully
3309 # remove state when we complete successfully
3310 if not opts.get(b'dry_run'):
3310 if not opts.get(b'dry_run'):
3311 graftstate.delete()
3311 graftstate.delete()
3312
3312
3313 return 0
3313 return 0
3314
3314
3315
3315
3316 def _stopgraft(ui, repo, graftstate):
3316 def _stopgraft(ui, repo, graftstate):
3317 """stop the interrupted graft"""
3317 """stop the interrupted graft"""
3318 if not graftstate.exists():
3318 if not graftstate.exists():
3319 raise error.StateError(_(b"no interrupted graft found"))
3319 raise error.StateError(_(b"no interrupted graft found"))
3320 pctx = repo[b'.']
3320 pctx = repo[b'.']
3321 mergemod.clean_update(pctx)
3321 mergemod.clean_update(pctx)
3322 graftstate.delete()
3322 graftstate.delete()
3323 ui.status(_(b"stopped the interrupted graft\n"))
3323 ui.status(_(b"stopped the interrupted graft\n"))
3324 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3324 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3325 return 0
3325 return 0
3326
3326
3327
3327
3328 statemod.addunfinished(
3328 statemod.addunfinished(
3329 b'graft',
3329 b'graft',
3330 fname=b'graftstate',
3330 fname=b'graftstate',
3331 clearable=True,
3331 clearable=True,
3332 stopflag=True,
3332 stopflag=True,
3333 continueflag=True,
3333 continueflag=True,
3334 abortfunc=cmdutil.hgabortgraft,
3334 abortfunc=cmdutil.hgabortgraft,
3335 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3335 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3336 )
3336 )
3337
3337
3338
3338
3339 @command(
3339 @command(
3340 b'grep',
3340 b'grep',
3341 [
3341 [
3342 (b'0', b'print0', None, _(b'end fields with NUL')),
3342 (b'0', b'print0', None, _(b'end fields with NUL')),
3343 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3343 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3344 (
3344 (
3345 b'',
3345 b'',
3346 b'diff',
3346 b'diff',
3347 None,
3347 None,
3348 _(
3348 _(
3349 b'search revision differences for when the pattern was added '
3349 b'search revision differences for when the pattern was added '
3350 b'or removed'
3350 b'or removed'
3351 ),
3351 ),
3352 ),
3352 ),
3353 (b'a', b'text', None, _(b'treat all files as text')),
3353 (b'a', b'text', None, _(b'treat all files as text')),
3354 (
3354 (
3355 b'f',
3355 b'f',
3356 b'follow',
3356 b'follow',
3357 None,
3357 None,
3358 _(
3358 _(
3359 b'follow changeset history,'
3359 b'follow changeset history,'
3360 b' or file history across copies and renames'
3360 b' or file history across copies and renames'
3361 ),
3361 ),
3362 ),
3362 ),
3363 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3363 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3364 (
3364 (
3365 b'l',
3365 b'l',
3366 b'files-with-matches',
3366 b'files-with-matches',
3367 None,
3367 None,
3368 _(b'print only filenames and revisions that match'),
3368 _(b'print only filenames and revisions that match'),
3369 ),
3369 ),
3370 (b'n', b'line-number', None, _(b'print matching line numbers')),
3370 (b'n', b'line-number', None, _(b'print matching line numbers')),
3371 (
3371 (
3372 b'r',
3372 b'r',
3373 b'rev',
3373 b'rev',
3374 [],
3374 [],
3375 _(b'search files changed within revision range'),
3375 _(b'search files changed within revision range'),
3376 _(b'REV'),
3376 _(b'REV'),
3377 ),
3377 ),
3378 (
3378 (
3379 b'',
3379 b'',
3380 b'all-files',
3380 b'all-files',
3381 None,
3381 None,
3382 _(
3382 _(
3383 b'include all files in the changeset while grepping (DEPRECATED)'
3383 b'include all files in the changeset while grepping (DEPRECATED)'
3384 ),
3384 ),
3385 ),
3385 ),
3386 (b'u', b'user', None, _(b'list the author (long with -v)')),
3386 (b'u', b'user', None, _(b'list the author (long with -v)')),
3387 (b'd', b'date', None, _(b'list the date (short with -q)')),
3387 (b'd', b'date', None, _(b'list the date (short with -q)')),
3388 ]
3388 ]
3389 + formatteropts
3389 + formatteropts
3390 + walkopts,
3390 + walkopts,
3391 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3391 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3392 helpcategory=command.CATEGORY_FILE_CONTENTS,
3392 helpcategory=command.CATEGORY_FILE_CONTENTS,
3393 inferrepo=True,
3393 inferrepo=True,
3394 intents={INTENT_READONLY},
3394 intents={INTENT_READONLY},
3395 )
3395 )
3396 def grep(ui, repo, pattern, *pats, **opts):
3396 def grep(ui, repo, pattern, *pats, **opts):
3397 """search for a pattern in specified files
3397 """search for a pattern in specified files
3398
3398
3399 Search the working directory or revision history for a regular
3399 Search the working directory or revision history for a regular
3400 expression in the specified files for the entire repository.
3400 expression in the specified files for the entire repository.
3401
3401
3402 By default, grep searches the repository files in the working
3402 By default, grep searches the repository files in the working
3403 directory and prints the files where it finds a match. To specify
3403 directory and prints the files where it finds a match. To specify
3404 historical revisions instead of the working directory, use the
3404 historical revisions instead of the working directory, use the
3405 --rev flag.
3405 --rev flag.
3406
3406
3407 To search instead historical revision differences that contains a
3407 To search instead historical revision differences that contains a
3408 change in match status ("-" for a match that becomes a non-match,
3408 change in match status ("-" for a match that becomes a non-match,
3409 or "+" for a non-match that becomes a match), use the --diff flag.
3409 or "+" for a non-match that becomes a match), use the --diff flag.
3410
3410
3411 PATTERN can be any Python (roughly Perl-compatible) regular
3411 PATTERN can be any Python (roughly Perl-compatible) regular
3412 expression.
3412 expression.
3413
3413
3414 If no FILEs are specified and the --rev flag isn't supplied, all
3414 If no FILEs are specified and the --rev flag isn't supplied, all
3415 files in the working directory are searched. When using the --rev
3415 files in the working directory are searched. When using the --rev
3416 flag and specifying FILEs, use the --follow argument to also
3416 flag and specifying FILEs, use the --follow argument to also
3417 follow the specified FILEs across renames and copies.
3417 follow the specified FILEs across renames and copies.
3418
3418
3419 .. container:: verbose
3419 .. container:: verbose
3420
3420
3421 Template:
3421 Template:
3422
3422
3423 The following keywords are supported in addition to the common template
3423 The following keywords are supported in addition to the common template
3424 keywords and functions. See also :hg:`help templates`.
3424 keywords and functions. See also :hg:`help templates`.
3425
3425
3426 :change: String. Character denoting insertion ``+`` or removal ``-``.
3426 :change: String. Character denoting insertion ``+`` or removal ``-``.
3427 Available if ``--diff`` is specified.
3427 Available if ``--diff`` is specified.
3428 :lineno: Integer. Line number of the match.
3428 :lineno: Integer. Line number of the match.
3429 :path: String. Repository-absolute path of the file.
3429 :path: String. Repository-absolute path of the file.
3430 :texts: List of text chunks.
3430 :texts: List of text chunks.
3431
3431
3432 And each entry of ``{texts}`` provides the following sub-keywords.
3432 And each entry of ``{texts}`` provides the following sub-keywords.
3433
3433
3434 :matched: Boolean. True if the chunk matches the specified pattern.
3434 :matched: Boolean. True if the chunk matches the specified pattern.
3435 :text: String. Chunk content.
3435 :text: String. Chunk content.
3436
3436
3437 See :hg:`help templates.operators` for the list expansion syntax.
3437 See :hg:`help templates.operators` for the list expansion syntax.
3438
3438
3439 Returns 0 if a match is found, 1 otherwise.
3439 Returns 0 if a match is found, 1 otherwise.
3440
3440
3441 """
3441 """
3442 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3442 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3443 opts = pycompat.byteskwargs(opts)
3443 opts = pycompat.byteskwargs(opts)
3444 diff = opts.get(b'all') or opts.get(b'diff')
3444 diff = opts.get(b'all') or opts.get(b'diff')
3445 follow = opts.get(b'follow')
3445 follow = opts.get(b'follow')
3446 if opts.get(b'all_files') is None and not diff:
3446 if opts.get(b'all_files') is None and not diff:
3447 opts[b'all_files'] = True
3447 opts[b'all_files'] = True
3448 plaingrep = (
3448 plaingrep = (
3449 opts.get(b'all_files')
3449 opts.get(b'all_files')
3450 and not opts.get(b'rev')
3450 and not opts.get(b'rev')
3451 and not opts.get(b'follow')
3451 and not opts.get(b'follow')
3452 )
3452 )
3453 all_files = opts.get(b'all_files')
3453 all_files = opts.get(b'all_files')
3454 if plaingrep:
3454 if plaingrep:
3455 opts[b'rev'] = [b'wdir()']
3455 opts[b'rev'] = [b'wdir()']
3456
3456
3457 reflags = re.M
3457 reflags = re.M
3458 if opts.get(b'ignore_case'):
3458 if opts.get(b'ignore_case'):
3459 reflags |= re.I
3459 reflags |= re.I
3460 try:
3460 try:
3461 regexp = util.re.compile(pattern, reflags)
3461 regexp = util.re.compile(pattern, reflags)
3462 except re.error as inst:
3462 except re.error as inst:
3463 ui.warn(
3463 ui.warn(
3464 _(b"grep: invalid match pattern: %s\n")
3464 _(b"grep: invalid match pattern: %s\n")
3465 % stringutil.forcebytestr(inst)
3465 % stringutil.forcebytestr(inst)
3466 )
3466 )
3467 return 1
3467 return 1
3468 sep, eol = b':', b'\n'
3468 sep, eol = b':', b'\n'
3469 if opts.get(b'print0'):
3469 if opts.get(b'print0'):
3470 sep = eol = b'\0'
3470 sep = eol = b'\0'
3471
3471
3472 searcher = grepmod.grepsearcher(
3472 searcher = grepmod.grepsearcher(
3473 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3473 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3474 )
3474 )
3475
3475
3476 getfile = searcher._getfile
3476 getfile = searcher._getfile
3477
3477
3478 uipathfn = scmutil.getuipathfn(repo)
3478 uipathfn = scmutil.getuipathfn(repo)
3479
3479
3480 def display(fm, fn, ctx, pstates, states):
3480 def display(fm, fn, ctx, pstates, states):
3481 rev = scmutil.intrev(ctx)
3481 rev = scmutil.intrev(ctx)
3482 if fm.isplain():
3482 if fm.isplain():
3483 formatuser = ui.shortuser
3483 formatuser = ui.shortuser
3484 else:
3484 else:
3485 formatuser = pycompat.bytestr
3485 formatuser = pycompat.bytestr
3486 if ui.quiet:
3486 if ui.quiet:
3487 datefmt = b'%Y-%m-%d'
3487 datefmt = b'%Y-%m-%d'
3488 else:
3488 else:
3489 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3489 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3490 found = False
3490 found = False
3491
3491
3492 @util.cachefunc
3492 @util.cachefunc
3493 def binary():
3493 def binary():
3494 flog = getfile(fn)
3494 flog = getfile(fn)
3495 try:
3495 try:
3496 return stringutil.binary(flog.read(ctx.filenode(fn)))
3496 return stringutil.binary(flog.read(ctx.filenode(fn)))
3497 except error.WdirUnsupported:
3497 except error.WdirUnsupported:
3498 return ctx[fn].isbinary()
3498 return ctx[fn].isbinary()
3499
3499
3500 fieldnamemap = {b'linenumber': b'lineno'}
3500 fieldnamemap = {b'linenumber': b'lineno'}
3501 if diff:
3501 if diff:
3502 iter = grepmod.difflinestates(pstates, states)
3502 iter = grepmod.difflinestates(pstates, states)
3503 else:
3503 else:
3504 iter = [(b'', l) for l in states]
3504 iter = [(b'', l) for l in states]
3505 for change, l in iter:
3505 for change, l in iter:
3506 fm.startitem()
3506 fm.startitem()
3507 fm.context(ctx=ctx)
3507 fm.context(ctx=ctx)
3508 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3508 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3509 fm.plain(uipathfn(fn), label=b'grep.filename')
3509 fm.plain(uipathfn(fn), label=b'grep.filename')
3510
3510
3511 cols = [
3511 cols = [
3512 (b'rev', b'%d', rev, not plaingrep, b''),
3512 (b'rev', b'%d', rev, not plaingrep, b''),
3513 (
3513 (
3514 b'linenumber',
3514 b'linenumber',
3515 b'%d',
3515 b'%d',
3516 l.linenum,
3516 l.linenum,
3517 opts.get(b'line_number'),
3517 opts.get(b'line_number'),
3518 b'',
3518 b'',
3519 ),
3519 ),
3520 ]
3520 ]
3521 if diff:
3521 if diff:
3522 cols.append(
3522 cols.append(
3523 (
3523 (
3524 b'change',
3524 b'change',
3525 b'%s',
3525 b'%s',
3526 change,
3526 change,
3527 True,
3527 True,
3528 b'grep.inserted '
3528 b'grep.inserted '
3529 if change == b'+'
3529 if change == b'+'
3530 else b'grep.deleted ',
3530 else b'grep.deleted ',
3531 )
3531 )
3532 )
3532 )
3533 cols.extend(
3533 cols.extend(
3534 [
3534 [
3535 (
3535 (
3536 b'user',
3536 b'user',
3537 b'%s',
3537 b'%s',
3538 formatuser(ctx.user()),
3538 formatuser(ctx.user()),
3539 opts.get(b'user'),
3539 opts.get(b'user'),
3540 b'',
3540 b'',
3541 ),
3541 ),
3542 (
3542 (
3543 b'date',
3543 b'date',
3544 b'%s',
3544 b'%s',
3545 fm.formatdate(ctx.date(), datefmt),
3545 fm.formatdate(ctx.date(), datefmt),
3546 opts.get(b'date'),
3546 opts.get(b'date'),
3547 b'',
3547 b'',
3548 ),
3548 ),
3549 ]
3549 ]
3550 )
3550 )
3551 for name, fmt, data, cond, extra_label in cols:
3551 for name, fmt, data, cond, extra_label in cols:
3552 if cond:
3552 if cond:
3553 fm.plain(sep, label=b'grep.sep')
3553 fm.plain(sep, label=b'grep.sep')
3554 field = fieldnamemap.get(name, name)
3554 field = fieldnamemap.get(name, name)
3555 label = extra_label + (b'grep.%s' % name)
3555 label = extra_label + (b'grep.%s' % name)
3556 fm.condwrite(cond, field, fmt, data, label=label)
3556 fm.condwrite(cond, field, fmt, data, label=label)
3557 if not opts.get(b'files_with_matches'):
3557 if not opts.get(b'files_with_matches'):
3558 fm.plain(sep, label=b'grep.sep')
3558 fm.plain(sep, label=b'grep.sep')
3559 if not opts.get(b'text') and binary():
3559 if not opts.get(b'text') and binary():
3560 fm.plain(_(b" Binary file matches"))
3560 fm.plain(_(b" Binary file matches"))
3561 else:
3561 else:
3562 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3562 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3563 fm.plain(eol)
3563 fm.plain(eol)
3564 found = True
3564 found = True
3565 if opts.get(b'files_with_matches'):
3565 if opts.get(b'files_with_matches'):
3566 break
3566 break
3567 return found
3567 return found
3568
3568
3569 def displaymatches(fm, l):
3569 def displaymatches(fm, l):
3570 p = 0
3570 p = 0
3571 for s, e in l.findpos(regexp):
3571 for s, e in l.findpos(regexp):
3572 if p < s:
3572 if p < s:
3573 fm.startitem()
3573 fm.startitem()
3574 fm.write(b'text', b'%s', l.line[p:s])
3574 fm.write(b'text', b'%s', l.line[p:s])
3575 fm.data(matched=False)
3575 fm.data(matched=False)
3576 fm.startitem()
3576 fm.startitem()
3577 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3577 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3578 fm.data(matched=True)
3578 fm.data(matched=True)
3579 p = e
3579 p = e
3580 if p < len(l.line):
3580 if p < len(l.line):
3581 fm.startitem()
3581 fm.startitem()
3582 fm.write(b'text', b'%s', l.line[p:])
3582 fm.write(b'text', b'%s', l.line[p:])
3583 fm.data(matched=False)
3583 fm.data(matched=False)
3584 fm.end()
3584 fm.end()
3585
3585
3586 found = False
3586 found = False
3587
3587
3588 wopts = logcmdutil.walkopts(
3588 wopts = logcmdutil.walkopts(
3589 pats=pats,
3589 pats=pats,
3590 opts=opts,
3590 opts=opts,
3591 revspec=opts[b'rev'],
3591 revspec=opts[b'rev'],
3592 include_pats=opts[b'include'],
3592 include_pats=opts[b'include'],
3593 exclude_pats=opts[b'exclude'],
3593 exclude_pats=opts[b'exclude'],
3594 follow=follow,
3594 follow=follow,
3595 force_changelog_traversal=all_files,
3595 force_changelog_traversal=all_files,
3596 filter_revisions_by_pats=not all_files,
3596 filter_revisions_by_pats=not all_files,
3597 )
3597 )
3598 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3598 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3599
3599
3600 ui.pager(b'grep')
3600 ui.pager(b'grep')
3601 fm = ui.formatter(b'grep', opts)
3601 fm = ui.formatter(b'grep', opts)
3602 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3602 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3603 r = display(fm, fn, ctx, pstates, states)
3603 r = display(fm, fn, ctx, pstates, states)
3604 found = found or r
3604 found = found or r
3605 if r and not diff and not all_files:
3605 if r and not diff and not all_files:
3606 searcher.skipfile(fn, ctx.rev())
3606 searcher.skipfile(fn, ctx.rev())
3607 fm.end()
3607 fm.end()
3608
3608
3609 return not found
3609 return not found
3610
3610
3611
3611
3612 @command(
3612 @command(
3613 b'heads',
3613 b'heads',
3614 [
3614 [
3615 (
3615 (
3616 b'r',
3616 b'r',
3617 b'rev',
3617 b'rev',
3618 b'',
3618 b'',
3619 _(b'show only heads which are descendants of STARTREV'),
3619 _(b'show only heads which are descendants of STARTREV'),
3620 _(b'STARTREV'),
3620 _(b'STARTREV'),
3621 ),
3621 ),
3622 (b't', b'topo', False, _(b'show topological heads only')),
3622 (b't', b'topo', False, _(b'show topological heads only')),
3623 (
3623 (
3624 b'a',
3624 b'a',
3625 b'active',
3625 b'active',
3626 False,
3626 False,
3627 _(b'show active branchheads only (DEPRECATED)'),
3627 _(b'show active branchheads only (DEPRECATED)'),
3628 ),
3628 ),
3629 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3629 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3630 ]
3630 ]
3631 + templateopts,
3631 + templateopts,
3632 _(b'[-ct] [-r STARTREV] [REV]...'),
3632 _(b'[-ct] [-r STARTREV] [REV]...'),
3633 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3633 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3634 intents={INTENT_READONLY},
3634 intents={INTENT_READONLY},
3635 )
3635 )
3636 def heads(ui, repo, *branchrevs, **opts):
3636 def heads(ui, repo, *branchrevs, **opts):
3637 """show branch heads
3637 """show branch heads
3638
3638
3639 With no arguments, show all open branch heads in the repository.
3639 With no arguments, show all open branch heads in the repository.
3640 Branch heads are changesets that have no descendants on the
3640 Branch heads are changesets that have no descendants on the
3641 same branch. They are where development generally takes place and
3641 same branch. They are where development generally takes place and
3642 are the usual targets for update and merge operations.
3642 are the usual targets for update and merge operations.
3643
3643
3644 If one or more REVs are given, only open branch heads on the
3644 If one or more REVs are given, only open branch heads on the
3645 branches associated with the specified changesets are shown. This
3645 branches associated with the specified changesets are shown. This
3646 means that you can use :hg:`heads .` to see the heads on the
3646 means that you can use :hg:`heads .` to see the heads on the
3647 currently checked-out branch.
3647 currently checked-out branch.
3648
3648
3649 If -c/--closed is specified, also show branch heads marked closed
3649 If -c/--closed is specified, also show branch heads marked closed
3650 (see :hg:`commit --close-branch`).
3650 (see :hg:`commit --close-branch`).
3651
3651
3652 If STARTREV is specified, only those heads that are descendants of
3652 If STARTREV is specified, only those heads that are descendants of
3653 STARTREV will be displayed.
3653 STARTREV will be displayed.
3654
3654
3655 If -t/--topo is specified, named branch mechanics will be ignored and only
3655 If -t/--topo is specified, named branch mechanics will be ignored and only
3656 topological heads (changesets with no children) will be shown.
3656 topological heads (changesets with no children) will be shown.
3657
3657
3658 Returns 0 if matching heads are found, 1 if not.
3658 Returns 0 if matching heads are found, 1 if not.
3659 """
3659 """
3660
3660
3661 opts = pycompat.byteskwargs(opts)
3661 opts = pycompat.byteskwargs(opts)
3662 start = None
3662 start = None
3663 rev = opts.get(b'rev')
3663 rev = opts.get(b'rev')
3664 if rev:
3664 if rev:
3665 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3665 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3666 start = scmutil.revsingle(repo, rev, None).node()
3666 start = scmutil.revsingle(repo, rev, None).node()
3667
3667
3668 if opts.get(b'topo'):
3668 if opts.get(b'topo'):
3669 heads = [repo[h] for h in repo.heads(start)]
3669 heads = [repo[h] for h in repo.heads(start)]
3670 else:
3670 else:
3671 heads = []
3671 heads = []
3672 for branch in repo.branchmap():
3672 for branch in repo.branchmap():
3673 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3673 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3674 heads = [repo[h] for h in heads]
3674 heads = [repo[h] for h in heads]
3675
3675
3676 if branchrevs:
3676 if branchrevs:
3677 branches = {
3677 branches = {
3678 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3678 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3679 }
3679 }
3680 heads = [h for h in heads if h.branch() in branches]
3680 heads = [h for h in heads if h.branch() in branches]
3681
3681
3682 if opts.get(b'active') and branchrevs:
3682 if opts.get(b'active') and branchrevs:
3683 dagheads = repo.heads(start)
3683 dagheads = repo.heads(start)
3684 heads = [h for h in heads if h.node() in dagheads]
3684 heads = [h for h in heads if h.node() in dagheads]
3685
3685
3686 if branchrevs:
3686 if branchrevs:
3687 haveheads = {h.branch() for h in heads}
3687 haveheads = {h.branch() for h in heads}
3688 if branches - haveheads:
3688 if branches - haveheads:
3689 headless = b', '.join(b for b in branches - haveheads)
3689 headless = b', '.join(b for b in branches - haveheads)
3690 msg = _(b'no open branch heads found on branches %s')
3690 msg = _(b'no open branch heads found on branches %s')
3691 if opts.get(b'rev'):
3691 if opts.get(b'rev'):
3692 msg += _(b' (started at %s)') % opts[b'rev']
3692 msg += _(b' (started at %s)') % opts[b'rev']
3693 ui.warn((msg + b'\n') % headless)
3693 ui.warn((msg + b'\n') % headless)
3694
3694
3695 if not heads:
3695 if not heads:
3696 return 1
3696 return 1
3697
3697
3698 ui.pager(b'heads')
3698 ui.pager(b'heads')
3699 heads = sorted(heads, key=lambda x: -(x.rev()))
3699 heads = sorted(heads, key=lambda x: -(x.rev()))
3700 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3700 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3701 for ctx in heads:
3701 for ctx in heads:
3702 displayer.show(ctx)
3702 displayer.show(ctx)
3703 displayer.close()
3703 displayer.close()
3704
3704
3705
3705
3706 @command(
3706 @command(
3707 b'help',
3707 b'help',
3708 [
3708 [
3709 (b'e', b'extension', None, _(b'show only help for extensions')),
3709 (b'e', b'extension', None, _(b'show only help for extensions')),
3710 (b'c', b'command', None, _(b'show only help for commands')),
3710 (b'c', b'command', None, _(b'show only help for commands')),
3711 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3711 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3712 (
3712 (
3713 b's',
3713 b's',
3714 b'system',
3714 b'system',
3715 [],
3715 [],
3716 _(b'show help for specific platform(s)'),
3716 _(b'show help for specific platform(s)'),
3717 _(b'PLATFORM'),
3717 _(b'PLATFORM'),
3718 ),
3718 ),
3719 ],
3719 ],
3720 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3720 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3721 helpcategory=command.CATEGORY_HELP,
3721 helpcategory=command.CATEGORY_HELP,
3722 norepo=True,
3722 norepo=True,
3723 intents={INTENT_READONLY},
3723 intents={INTENT_READONLY},
3724 )
3724 )
3725 def help_(ui, name=None, **opts):
3725 def help_(ui, name=None, **opts):
3726 """show help for a given topic or a help overview
3726 """show help for a given topic or a help overview
3727
3727
3728 With no arguments, print a list of commands with short help messages.
3728 With no arguments, print a list of commands with short help messages.
3729
3729
3730 Given a topic, extension, or command name, print help for that
3730 Given a topic, extension, or command name, print help for that
3731 topic.
3731 topic.
3732
3732
3733 Returns 0 if successful.
3733 Returns 0 if successful.
3734 """
3734 """
3735
3735
3736 keep = opts.get('system') or []
3736 keep = opts.get('system') or []
3737 if len(keep) == 0:
3737 if len(keep) == 0:
3738 if pycompat.sysplatform.startswith(b'win'):
3738 if pycompat.sysplatform.startswith(b'win'):
3739 keep.append(b'windows')
3739 keep.append(b'windows')
3740 elif pycompat.sysplatform == b'OpenVMS':
3740 elif pycompat.sysplatform == b'OpenVMS':
3741 keep.append(b'vms')
3741 keep.append(b'vms')
3742 elif pycompat.sysplatform == b'plan9':
3742 elif pycompat.sysplatform == b'plan9':
3743 keep.append(b'plan9')
3743 keep.append(b'plan9')
3744 else:
3744 else:
3745 keep.append(b'unix')
3745 keep.append(b'unix')
3746 keep.append(pycompat.sysplatform.lower())
3746 keep.append(pycompat.sysplatform.lower())
3747 if ui.verbose:
3747 if ui.verbose:
3748 keep.append(b'verbose')
3748 keep.append(b'verbose')
3749
3749
3750 commands = sys.modules[__name__]
3750 commands = sys.modules[__name__]
3751 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3751 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3752 ui.pager(b'help')
3752 ui.pager(b'help')
3753 ui.write(formatted)
3753 ui.write(formatted)
3754
3754
3755
3755
3756 @command(
3756 @command(
3757 b'identify|id',
3757 b'identify|id',
3758 [
3758 [
3759 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3759 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3760 (b'n', b'num', None, _(b'show local revision number')),
3760 (b'n', b'num', None, _(b'show local revision number')),
3761 (b'i', b'id', None, _(b'show global revision id')),
3761 (b'i', b'id', None, _(b'show global revision id')),
3762 (b'b', b'branch', None, _(b'show branch')),
3762 (b'b', b'branch', None, _(b'show branch')),
3763 (b't', b'tags', None, _(b'show tags')),
3763 (b't', b'tags', None, _(b'show tags')),
3764 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3764 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3765 ]
3765 ]
3766 + remoteopts
3766 + remoteopts
3767 + formatteropts,
3767 + formatteropts,
3768 _(b'[-nibtB] [-r REV] [SOURCE]'),
3768 _(b'[-nibtB] [-r REV] [SOURCE]'),
3769 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3769 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3770 optionalrepo=True,
3770 optionalrepo=True,
3771 intents={INTENT_READONLY},
3771 intents={INTENT_READONLY},
3772 )
3772 )
3773 def identify(
3773 def identify(
3774 ui,
3774 ui,
3775 repo,
3775 repo,
3776 source=None,
3776 source=None,
3777 rev=None,
3777 rev=None,
3778 num=None,
3778 num=None,
3779 id=None,
3779 id=None,
3780 branch=None,
3780 branch=None,
3781 tags=None,
3781 tags=None,
3782 bookmarks=None,
3782 bookmarks=None,
3783 **opts
3783 **opts
3784 ):
3784 ):
3785 """identify the working directory or specified revision
3785 """identify the working directory or specified revision
3786
3786
3787 Print a summary identifying the repository state at REV using one or
3787 Print a summary identifying the repository state at REV using one or
3788 two parent hash identifiers, followed by a "+" if the working
3788 two parent hash identifiers, followed by a "+" if the working
3789 directory has uncommitted changes, the branch name (if not default),
3789 directory has uncommitted changes, the branch name (if not default),
3790 a list of tags, and a list of bookmarks.
3790 a list of tags, and a list of bookmarks.
3791
3791
3792 When REV is not given, print a summary of the current state of the
3792 When REV is not given, print a summary of the current state of the
3793 repository including the working directory. Specify -r. to get information
3793 repository including the working directory. Specify -r. to get information
3794 of the working directory parent without scanning uncommitted changes.
3794 of the working directory parent without scanning uncommitted changes.
3795
3795
3796 Specifying a path to a repository root or Mercurial bundle will
3796 Specifying a path to a repository root or Mercurial bundle will
3797 cause lookup to operate on that repository/bundle.
3797 cause lookup to operate on that repository/bundle.
3798
3798
3799 .. container:: verbose
3799 .. container:: verbose
3800
3800
3801 Template:
3801 Template:
3802
3802
3803 The following keywords are supported in addition to the common template
3803 The following keywords are supported in addition to the common template
3804 keywords and functions. See also :hg:`help templates`.
3804 keywords and functions. See also :hg:`help templates`.
3805
3805
3806 :dirty: String. Character ``+`` denoting if the working directory has
3806 :dirty: String. Character ``+`` denoting if the working directory has
3807 uncommitted changes.
3807 uncommitted changes.
3808 :id: String. One or two nodes, optionally followed by ``+``.
3808 :id: String. One or two nodes, optionally followed by ``+``.
3809 :parents: List of strings. Parent nodes of the changeset.
3809 :parents: List of strings. Parent nodes of the changeset.
3810
3810
3811 Examples:
3811 Examples:
3812
3812
3813 - generate a build identifier for the working directory::
3813 - generate a build identifier for the working directory::
3814
3814
3815 hg id --id > build-id.dat
3815 hg id --id > build-id.dat
3816
3816
3817 - find the revision corresponding to a tag::
3817 - find the revision corresponding to a tag::
3818
3818
3819 hg id -n -r 1.3
3819 hg id -n -r 1.3
3820
3820
3821 - check the most recent revision of a remote repository::
3821 - check the most recent revision of a remote repository::
3822
3822
3823 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3823 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3824
3824
3825 See :hg:`log` for generating more information about specific revisions,
3825 See :hg:`log` for generating more information about specific revisions,
3826 including full hash identifiers.
3826 including full hash identifiers.
3827
3827
3828 Returns 0 if successful.
3828 Returns 0 if successful.
3829 """
3829 """
3830
3830
3831 opts = pycompat.byteskwargs(opts)
3831 opts = pycompat.byteskwargs(opts)
3832 if not repo and not source:
3832 if not repo and not source:
3833 raise error.InputError(
3833 raise error.InputError(
3834 _(b"there is no Mercurial repository here (.hg not found)")
3834 _(b"there is no Mercurial repository here (.hg not found)")
3835 )
3835 )
3836
3836
3837 default = not (num or id or branch or tags or bookmarks)
3837 default = not (num or id or branch or tags or bookmarks)
3838 output = []
3838 output = []
3839 revs = []
3839 revs = []
3840
3840
3841 peer = None
3841 peer = None
3842 try:
3842 try:
3843 if source:
3843 if source:
3844 source, branches = urlutil.parseurl(ui.expandpath(source))
3844 source, branches = urlutil.parseurl(ui.expandpath(source))
3845 # only pass ui when no repo
3845 # only pass ui when no repo
3846 peer = hg.peer(repo or ui, opts, source)
3846 peer = hg.peer(repo or ui, opts, source)
3847 repo = peer.local()
3847 repo = peer.local()
3848 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3848 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3849
3849
3850 fm = ui.formatter(b'identify', opts)
3850 fm = ui.formatter(b'identify', opts)
3851 fm.startitem()
3851 fm.startitem()
3852
3852
3853 if not repo:
3853 if not repo:
3854 if num or branch or tags:
3854 if num or branch or tags:
3855 raise error.InputError(
3855 raise error.InputError(
3856 _(b"can't query remote revision number, branch, or tags")
3856 _(b"can't query remote revision number, branch, or tags")
3857 )
3857 )
3858 if not rev and revs:
3858 if not rev and revs:
3859 rev = revs[0]
3859 rev = revs[0]
3860 if not rev:
3860 if not rev:
3861 rev = b"tip"
3861 rev = b"tip"
3862
3862
3863 remoterev = peer.lookup(rev)
3863 remoterev = peer.lookup(rev)
3864 hexrev = fm.hexfunc(remoterev)
3864 hexrev = fm.hexfunc(remoterev)
3865 if default or id:
3865 if default or id:
3866 output = [hexrev]
3866 output = [hexrev]
3867 fm.data(id=hexrev)
3867 fm.data(id=hexrev)
3868
3868
3869 @util.cachefunc
3869 @util.cachefunc
3870 def getbms():
3870 def getbms():
3871 bms = []
3871 bms = []
3872
3872
3873 if b'bookmarks' in peer.listkeys(b'namespaces'):
3873 if b'bookmarks' in peer.listkeys(b'namespaces'):
3874 hexremoterev = hex(remoterev)
3874 hexremoterev = hex(remoterev)
3875 bms = [
3875 bms = [
3876 bm
3876 bm
3877 for bm, bmr in pycompat.iteritems(
3877 for bm, bmr in pycompat.iteritems(
3878 peer.listkeys(b'bookmarks')
3878 peer.listkeys(b'bookmarks')
3879 )
3879 )
3880 if bmr == hexremoterev
3880 if bmr == hexremoterev
3881 ]
3881 ]
3882
3882
3883 return sorted(bms)
3883 return sorted(bms)
3884
3884
3885 if fm.isplain():
3885 if fm.isplain():
3886 if bookmarks:
3886 if bookmarks:
3887 output.extend(getbms())
3887 output.extend(getbms())
3888 elif default and not ui.quiet:
3888 elif default and not ui.quiet:
3889 # multiple bookmarks for a single parent separated by '/'
3889 # multiple bookmarks for a single parent separated by '/'
3890 bm = b'/'.join(getbms())
3890 bm = b'/'.join(getbms())
3891 if bm:
3891 if bm:
3892 output.append(bm)
3892 output.append(bm)
3893 else:
3893 else:
3894 fm.data(node=hex(remoterev))
3894 fm.data(node=hex(remoterev))
3895 if bookmarks or b'bookmarks' in fm.datahint():
3895 if bookmarks or b'bookmarks' in fm.datahint():
3896 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3896 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3897 else:
3897 else:
3898 if rev:
3898 if rev:
3899 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3899 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3900 ctx = scmutil.revsingle(repo, rev, None)
3900 ctx = scmutil.revsingle(repo, rev, None)
3901
3901
3902 if ctx.rev() is None:
3902 if ctx.rev() is None:
3903 ctx = repo[None]
3903 ctx = repo[None]
3904 parents = ctx.parents()
3904 parents = ctx.parents()
3905 taglist = []
3905 taglist = []
3906 for p in parents:
3906 for p in parents:
3907 taglist.extend(p.tags())
3907 taglist.extend(p.tags())
3908
3908
3909 dirty = b""
3909 dirty = b""
3910 if ctx.dirty(missing=True, merge=False, branch=False):
3910 if ctx.dirty(missing=True, merge=False, branch=False):
3911 dirty = b'+'
3911 dirty = b'+'
3912 fm.data(dirty=dirty)
3912 fm.data(dirty=dirty)
3913
3913
3914 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3914 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3915 if default or id:
3915 if default or id:
3916 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3916 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3917 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3917 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3918
3918
3919 if num:
3919 if num:
3920 numoutput = [b"%d" % p.rev() for p in parents]
3920 numoutput = [b"%d" % p.rev() for p in parents]
3921 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3921 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3922
3922
3923 fm.data(
3923 fm.data(
3924 parents=fm.formatlist(
3924 parents=fm.formatlist(
3925 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3925 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3926 )
3926 )
3927 )
3927 )
3928 else:
3928 else:
3929 hexoutput = fm.hexfunc(ctx.node())
3929 hexoutput = fm.hexfunc(ctx.node())
3930 if default or id:
3930 if default or id:
3931 output = [hexoutput]
3931 output = [hexoutput]
3932 fm.data(id=hexoutput)
3932 fm.data(id=hexoutput)
3933
3933
3934 if num:
3934 if num:
3935 output.append(pycompat.bytestr(ctx.rev()))
3935 output.append(pycompat.bytestr(ctx.rev()))
3936 taglist = ctx.tags()
3936 taglist = ctx.tags()
3937
3937
3938 if default and not ui.quiet:
3938 if default and not ui.quiet:
3939 b = ctx.branch()
3939 b = ctx.branch()
3940 if b != b'default':
3940 if b != b'default':
3941 output.append(b"(%s)" % b)
3941 output.append(b"(%s)" % b)
3942
3942
3943 # multiple tags for a single parent separated by '/'
3943 # multiple tags for a single parent separated by '/'
3944 t = b'/'.join(taglist)
3944 t = b'/'.join(taglist)
3945 if t:
3945 if t:
3946 output.append(t)
3946 output.append(t)
3947
3947
3948 # multiple bookmarks for a single parent separated by '/'
3948 # multiple bookmarks for a single parent separated by '/'
3949 bm = b'/'.join(ctx.bookmarks())
3949 bm = b'/'.join(ctx.bookmarks())
3950 if bm:
3950 if bm:
3951 output.append(bm)
3951 output.append(bm)
3952 else:
3952 else:
3953 if branch:
3953 if branch:
3954 output.append(ctx.branch())
3954 output.append(ctx.branch())
3955
3955
3956 if tags:
3956 if tags:
3957 output.extend(taglist)
3957 output.extend(taglist)
3958
3958
3959 if bookmarks:
3959 if bookmarks:
3960 output.extend(ctx.bookmarks())
3960 output.extend(ctx.bookmarks())
3961
3961
3962 fm.data(node=ctx.hex())
3962 fm.data(node=ctx.hex())
3963 fm.data(branch=ctx.branch())
3963 fm.data(branch=ctx.branch())
3964 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3964 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
3965 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3965 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
3966 fm.context(ctx=ctx)
3966 fm.context(ctx=ctx)
3967
3967
3968 fm.plain(b"%s\n" % b' '.join(output))
3968 fm.plain(b"%s\n" % b' '.join(output))
3969 fm.end()
3969 fm.end()
3970 finally:
3970 finally:
3971 if peer:
3971 if peer:
3972 peer.close()
3972 peer.close()
3973
3973
3974
3974
3975 @command(
3975 @command(
3976 b'import|patch',
3976 b'import|patch',
3977 [
3977 [
3978 (
3978 (
3979 b'p',
3979 b'p',
3980 b'strip',
3980 b'strip',
3981 1,
3981 1,
3982 _(
3982 _(
3983 b'directory strip option for patch. This has the same '
3983 b'directory strip option for patch. This has the same '
3984 b'meaning as the corresponding patch option'
3984 b'meaning as the corresponding patch option'
3985 ),
3985 ),
3986 _(b'NUM'),
3986 _(b'NUM'),
3987 ),
3987 ),
3988 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3988 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
3989 (b'', b'secret', None, _(b'use the secret phase for committing')),
3989 (b'', b'secret', None, _(b'use the secret phase for committing')),
3990 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3990 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3991 (
3991 (
3992 b'f',
3992 b'f',
3993 b'force',
3993 b'force',
3994 None,
3994 None,
3995 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3995 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
3996 ),
3996 ),
3997 (
3997 (
3998 b'',
3998 b'',
3999 b'no-commit',
3999 b'no-commit',
4000 None,
4000 None,
4001 _(b"don't commit, just update the working directory"),
4001 _(b"don't commit, just update the working directory"),
4002 ),
4002 ),
4003 (
4003 (
4004 b'',
4004 b'',
4005 b'bypass',
4005 b'bypass',
4006 None,
4006 None,
4007 _(b"apply patch without touching the working directory"),
4007 _(b"apply patch without touching the working directory"),
4008 ),
4008 ),
4009 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4009 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4010 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4010 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4011 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4011 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4012 (
4012 (
4013 b'',
4013 b'',
4014 b'import-branch',
4014 b'import-branch',
4015 None,
4015 None,
4016 _(b'use any branch information in patch (implied by --exact)'),
4016 _(b'use any branch information in patch (implied by --exact)'),
4017 ),
4017 ),
4018 ]
4018 ]
4019 + commitopts
4019 + commitopts
4020 + commitopts2
4020 + commitopts2
4021 + similarityopts,
4021 + similarityopts,
4022 _(b'[OPTION]... PATCH...'),
4022 _(b'[OPTION]... PATCH...'),
4023 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4023 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4024 )
4024 )
4025 def import_(ui, repo, patch1=None, *patches, **opts):
4025 def import_(ui, repo, patch1=None, *patches, **opts):
4026 """import an ordered set of patches
4026 """import an ordered set of patches
4027
4027
4028 Import a list of patches and commit them individually (unless
4028 Import a list of patches and commit them individually (unless
4029 --no-commit is specified).
4029 --no-commit is specified).
4030
4030
4031 To read a patch from standard input (stdin), use "-" as the patch
4031 To read a patch from standard input (stdin), use "-" as the patch
4032 name. If a URL is specified, the patch will be downloaded from
4032 name. If a URL is specified, the patch will be downloaded from
4033 there.
4033 there.
4034
4034
4035 Import first applies changes to the working directory (unless
4035 Import first applies changes to the working directory (unless
4036 --bypass is specified), import will abort if there are outstanding
4036 --bypass is specified), import will abort if there are outstanding
4037 changes.
4037 changes.
4038
4038
4039 Use --bypass to apply and commit patches directly to the
4039 Use --bypass to apply and commit patches directly to the
4040 repository, without affecting the working directory. Without
4040 repository, without affecting the working directory. Without
4041 --exact, patches will be applied on top of the working directory
4041 --exact, patches will be applied on top of the working directory
4042 parent revision.
4042 parent revision.
4043
4043
4044 You can import a patch straight from a mail message. Even patches
4044 You can import a patch straight from a mail message. Even patches
4045 as attachments work (to use the body part, it must have type
4045 as attachments work (to use the body part, it must have type
4046 text/plain or text/x-patch). From and Subject headers of email
4046 text/plain or text/x-patch). From and Subject headers of email
4047 message are used as default committer and commit message. All
4047 message are used as default committer and commit message. All
4048 text/plain body parts before first diff are added to the commit
4048 text/plain body parts before first diff are added to the commit
4049 message.
4049 message.
4050
4050
4051 If the imported patch was generated by :hg:`export`, user and
4051 If the imported patch was generated by :hg:`export`, user and
4052 description from patch override values from message headers and
4052 description from patch override values from message headers and
4053 body. Values given on command line with -m/--message and -u/--user
4053 body. Values given on command line with -m/--message and -u/--user
4054 override these.
4054 override these.
4055
4055
4056 If --exact is specified, import will set the working directory to
4056 If --exact is specified, import will set the working directory to
4057 the parent of each patch before applying it, and will abort if the
4057 the parent of each patch before applying it, and will abort if the
4058 resulting changeset has a different ID than the one recorded in
4058 resulting changeset has a different ID than the one recorded in
4059 the patch. This will guard against various ways that portable
4059 the patch. This will guard against various ways that portable
4060 patch formats and mail systems might fail to transfer Mercurial
4060 patch formats and mail systems might fail to transfer Mercurial
4061 data or metadata. See :hg:`bundle` for lossless transmission.
4061 data or metadata. See :hg:`bundle` for lossless transmission.
4062
4062
4063 Use --partial to ensure a changeset will be created from the patch
4063 Use --partial to ensure a changeset will be created from the patch
4064 even if some hunks fail to apply. Hunks that fail to apply will be
4064 even if some hunks fail to apply. Hunks that fail to apply will be
4065 written to a <target-file>.rej file. Conflicts can then be resolved
4065 written to a <target-file>.rej file. Conflicts can then be resolved
4066 by hand before :hg:`commit --amend` is run to update the created
4066 by hand before :hg:`commit --amend` is run to update the created
4067 changeset. This flag exists to let people import patches that
4067 changeset. This flag exists to let people import patches that
4068 partially apply without losing the associated metadata (author,
4068 partially apply without losing the associated metadata (author,
4069 date, description, ...).
4069 date, description, ...).
4070
4070
4071 .. note::
4071 .. note::
4072
4072
4073 When no hunks apply cleanly, :hg:`import --partial` will create
4073 When no hunks apply cleanly, :hg:`import --partial` will create
4074 an empty changeset, importing only the patch metadata.
4074 an empty changeset, importing only the patch metadata.
4075
4075
4076 With -s/--similarity, hg will attempt to discover renames and
4076 With -s/--similarity, hg will attempt to discover renames and
4077 copies in the patch in the same way as :hg:`addremove`.
4077 copies in the patch in the same way as :hg:`addremove`.
4078
4078
4079 It is possible to use external patch programs to perform the patch
4079 It is possible to use external patch programs to perform the patch
4080 by setting the ``ui.patch`` configuration option. For the default
4080 by setting the ``ui.patch`` configuration option. For the default
4081 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4081 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4082 See :hg:`help config` for more information about configuration
4082 See :hg:`help config` for more information about configuration
4083 files and how to use these options.
4083 files and how to use these options.
4084
4084
4085 See :hg:`help dates` for a list of formats valid for -d/--date.
4085 See :hg:`help dates` for a list of formats valid for -d/--date.
4086
4086
4087 .. container:: verbose
4087 .. container:: verbose
4088
4088
4089 Examples:
4089 Examples:
4090
4090
4091 - import a traditional patch from a website and detect renames::
4091 - import a traditional patch from a website and detect renames::
4092
4092
4093 hg import -s 80 http://example.com/bugfix.patch
4093 hg import -s 80 http://example.com/bugfix.patch
4094
4094
4095 - import a changeset from an hgweb server::
4095 - import a changeset from an hgweb server::
4096
4096
4097 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4097 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4098
4098
4099 - import all the patches in an Unix-style mbox::
4099 - import all the patches in an Unix-style mbox::
4100
4100
4101 hg import incoming-patches.mbox
4101 hg import incoming-patches.mbox
4102
4102
4103 - import patches from stdin::
4103 - import patches from stdin::
4104
4104
4105 hg import -
4105 hg import -
4106
4106
4107 - attempt to exactly restore an exported changeset (not always
4107 - attempt to exactly restore an exported changeset (not always
4108 possible)::
4108 possible)::
4109
4109
4110 hg import --exact proposed-fix.patch
4110 hg import --exact proposed-fix.patch
4111
4111
4112 - use an external tool to apply a patch which is too fuzzy for
4112 - use an external tool to apply a patch which is too fuzzy for
4113 the default internal tool.
4113 the default internal tool.
4114
4114
4115 hg import --config ui.patch="patch --merge" fuzzy.patch
4115 hg import --config ui.patch="patch --merge" fuzzy.patch
4116
4116
4117 - change the default fuzzing from 2 to a less strict 7
4117 - change the default fuzzing from 2 to a less strict 7
4118
4118
4119 hg import --config ui.fuzz=7 fuzz.patch
4119 hg import --config ui.fuzz=7 fuzz.patch
4120
4120
4121 Returns 0 on success, 1 on partial success (see --partial).
4121 Returns 0 on success, 1 on partial success (see --partial).
4122 """
4122 """
4123
4123
4124 cmdutil.check_incompatible_arguments(
4124 cmdutil.check_incompatible_arguments(
4125 opts, 'no_commit', ['bypass', 'secret']
4125 opts, 'no_commit', ['bypass', 'secret']
4126 )
4126 )
4127 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4127 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4128 opts = pycompat.byteskwargs(opts)
4128 opts = pycompat.byteskwargs(opts)
4129 if not patch1:
4129 if not patch1:
4130 raise error.InputError(_(b'need at least one patch to import'))
4130 raise error.InputError(_(b'need at least one patch to import'))
4131
4131
4132 patches = (patch1,) + patches
4132 patches = (patch1,) + patches
4133
4133
4134 date = opts.get(b'date')
4134 date = opts.get(b'date')
4135 if date:
4135 if date:
4136 opts[b'date'] = dateutil.parsedate(date)
4136 opts[b'date'] = dateutil.parsedate(date)
4137
4137
4138 exact = opts.get(b'exact')
4138 exact = opts.get(b'exact')
4139 update = not opts.get(b'bypass')
4139 update = not opts.get(b'bypass')
4140 try:
4140 try:
4141 sim = float(opts.get(b'similarity') or 0)
4141 sim = float(opts.get(b'similarity') or 0)
4142 except ValueError:
4142 except ValueError:
4143 raise error.InputError(_(b'similarity must be a number'))
4143 raise error.InputError(_(b'similarity must be a number'))
4144 if sim < 0 or sim > 100:
4144 if sim < 0 or sim > 100:
4145 raise error.InputError(_(b'similarity must be between 0 and 100'))
4145 raise error.InputError(_(b'similarity must be between 0 and 100'))
4146 if sim and not update:
4146 if sim and not update:
4147 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4147 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4148
4148
4149 base = opts[b"base"]
4149 base = opts[b"base"]
4150 msgs = []
4150 msgs = []
4151 ret = 0
4151 ret = 0
4152
4152
4153 with repo.wlock():
4153 with repo.wlock():
4154 if update:
4154 if update:
4155 cmdutil.checkunfinished(repo)
4155 cmdutil.checkunfinished(repo)
4156 if exact or not opts.get(b'force'):
4156 if exact or not opts.get(b'force'):
4157 cmdutil.bailifchanged(repo)
4157 cmdutil.bailifchanged(repo)
4158
4158
4159 if not opts.get(b'no_commit'):
4159 if not opts.get(b'no_commit'):
4160 lock = repo.lock
4160 lock = repo.lock
4161 tr = lambda: repo.transaction(b'import')
4161 tr = lambda: repo.transaction(b'import')
4162 dsguard = util.nullcontextmanager
4162 dsguard = util.nullcontextmanager
4163 else:
4163 else:
4164 lock = util.nullcontextmanager
4164 lock = util.nullcontextmanager
4165 tr = util.nullcontextmanager
4165 tr = util.nullcontextmanager
4166 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4166 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4167 with lock(), tr(), dsguard():
4167 with lock(), tr(), dsguard():
4168 parents = repo[None].parents()
4168 parents = repo[None].parents()
4169 for patchurl in patches:
4169 for patchurl in patches:
4170 if patchurl == b'-':
4170 if patchurl == b'-':
4171 ui.status(_(b'applying patch from stdin\n'))
4171 ui.status(_(b'applying patch from stdin\n'))
4172 patchfile = ui.fin
4172 patchfile = ui.fin
4173 patchurl = b'stdin' # for error message
4173 patchurl = b'stdin' # for error message
4174 else:
4174 else:
4175 patchurl = os.path.join(base, patchurl)
4175 patchurl = os.path.join(base, patchurl)
4176 ui.status(_(b'applying %s\n') % patchurl)
4176 ui.status(_(b'applying %s\n') % patchurl)
4177 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4177 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4178
4178
4179 haspatch = False
4179 haspatch = False
4180 for hunk in patch.split(patchfile):
4180 for hunk in patch.split(patchfile):
4181 with patch.extract(ui, hunk) as patchdata:
4181 with patch.extract(ui, hunk) as patchdata:
4182 msg, node, rej = cmdutil.tryimportone(
4182 msg, node, rej = cmdutil.tryimportone(
4183 ui, repo, patchdata, parents, opts, msgs, hg.clean
4183 ui, repo, patchdata, parents, opts, msgs, hg.clean
4184 )
4184 )
4185 if msg:
4185 if msg:
4186 haspatch = True
4186 haspatch = True
4187 ui.note(msg + b'\n')
4187 ui.note(msg + b'\n')
4188 if update or exact:
4188 if update or exact:
4189 parents = repo[None].parents()
4189 parents = repo[None].parents()
4190 else:
4190 else:
4191 parents = [repo[node]]
4191 parents = [repo[node]]
4192 if rej:
4192 if rej:
4193 ui.write_err(_(b"patch applied partially\n"))
4193 ui.write_err(_(b"patch applied partially\n"))
4194 ui.write_err(
4194 ui.write_err(
4195 _(
4195 _(
4196 b"(fix the .rej files and run "
4196 b"(fix the .rej files and run "
4197 b"`hg commit --amend`)\n"
4197 b"`hg commit --amend`)\n"
4198 )
4198 )
4199 )
4199 )
4200 ret = 1
4200 ret = 1
4201 break
4201 break
4202
4202
4203 if not haspatch:
4203 if not haspatch:
4204 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4204 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4205
4205
4206 if msgs:
4206 if msgs:
4207 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4207 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4208 return ret
4208 return ret
4209
4209
4210
4210
4211 @command(
4211 @command(
4212 b'incoming|in',
4212 b'incoming|in',
4213 [
4213 [
4214 (
4214 (
4215 b'f',
4215 b'f',
4216 b'force',
4216 b'force',
4217 None,
4217 None,
4218 _(b'run even if remote repository is unrelated'),
4218 _(b'run even if remote repository is unrelated'),
4219 ),
4219 ),
4220 (b'n', b'newest-first', None, _(b'show newest record first')),
4220 (b'n', b'newest-first', None, _(b'show newest record first')),
4221 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4221 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4222 (
4222 (
4223 b'r',
4223 b'r',
4224 b'rev',
4224 b'rev',
4225 [],
4225 [],
4226 _(b'a remote changeset intended to be added'),
4226 _(b'a remote changeset intended to be added'),
4227 _(b'REV'),
4227 _(b'REV'),
4228 ),
4228 ),
4229 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4229 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4230 (
4230 (
4231 b'b',
4231 b'b',
4232 b'branch',
4232 b'branch',
4233 [],
4233 [],
4234 _(b'a specific branch you would like to pull'),
4234 _(b'a specific branch you would like to pull'),
4235 _(b'BRANCH'),
4235 _(b'BRANCH'),
4236 ),
4236 ),
4237 ]
4237 ]
4238 + logopts
4238 + logopts
4239 + remoteopts
4239 + remoteopts
4240 + subrepoopts,
4240 + subrepoopts,
4241 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4241 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4242 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4242 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4243 )
4243 )
4244 def incoming(ui, repo, source=b"default", **opts):
4244 def incoming(ui, repo, source=b"default", **opts):
4245 """show new changesets found in source
4245 """show new changesets found in source
4246
4246
4247 Show new changesets found in the specified path/URL or the default
4247 Show new changesets found in the specified path/URL or the default
4248 pull location. These are the changesets that would have been pulled
4248 pull location. These are the changesets that would have been pulled
4249 by :hg:`pull` at the time you issued this command.
4249 by :hg:`pull` at the time you issued this command.
4250
4250
4251 See pull for valid source format details.
4251 See pull for valid source format details.
4252
4252
4253 .. container:: verbose
4253 .. container:: verbose
4254
4254
4255 With -B/--bookmarks, the result of bookmark comparison between
4255 With -B/--bookmarks, the result of bookmark comparison between
4256 local and remote repositories is displayed. With -v/--verbose,
4256 local and remote repositories is displayed. With -v/--verbose,
4257 status is also displayed for each bookmark like below::
4257 status is also displayed for each bookmark like below::
4258
4258
4259 BM1 01234567890a added
4259 BM1 01234567890a added
4260 BM2 1234567890ab advanced
4260 BM2 1234567890ab advanced
4261 BM3 234567890abc diverged
4261 BM3 234567890abc diverged
4262 BM4 34567890abcd changed
4262 BM4 34567890abcd changed
4263
4263
4264 The action taken locally when pulling depends on the
4264 The action taken locally when pulling depends on the
4265 status of each bookmark:
4265 status of each bookmark:
4266
4266
4267 :``added``: pull will create it
4267 :``added``: pull will create it
4268 :``advanced``: pull will update it
4268 :``advanced``: pull will update it
4269 :``diverged``: pull will create a divergent bookmark
4269 :``diverged``: pull will create a divergent bookmark
4270 :``changed``: result depends on remote changesets
4270 :``changed``: result depends on remote changesets
4271
4271
4272 From the point of view of pulling behavior, bookmark
4272 From the point of view of pulling behavior, bookmark
4273 existing only in the remote repository are treated as ``added``,
4273 existing only in the remote repository are treated as ``added``,
4274 even if it is in fact locally deleted.
4274 even if it is in fact locally deleted.
4275
4275
4276 .. container:: verbose
4276 .. container:: verbose
4277
4277
4278 For remote repository, using --bundle avoids downloading the
4278 For remote repository, using --bundle avoids downloading the
4279 changesets twice if the incoming is followed by a pull.
4279 changesets twice if the incoming is followed by a pull.
4280
4280
4281 Examples:
4281 Examples:
4282
4282
4283 - show incoming changes with patches and full description::
4283 - show incoming changes with patches and full description::
4284
4284
4285 hg incoming -vp
4285 hg incoming -vp
4286
4286
4287 - show incoming changes excluding merges, store a bundle::
4287 - show incoming changes excluding merges, store a bundle::
4288
4288
4289 hg in -vpM --bundle incoming.hg
4289 hg in -vpM --bundle incoming.hg
4290 hg pull incoming.hg
4290 hg pull incoming.hg
4291
4291
4292 - briefly list changes inside a bundle::
4292 - briefly list changes inside a bundle::
4293
4293
4294 hg in changes.hg -T "{desc|firstline}\\n"
4294 hg in changes.hg -T "{desc|firstline}\\n"
4295
4295
4296 Returns 0 if there are incoming changes, 1 otherwise.
4296 Returns 0 if there are incoming changes, 1 otherwise.
4297 """
4297 """
4298 opts = pycompat.byteskwargs(opts)
4298 opts = pycompat.byteskwargs(opts)
4299 if opts.get(b'graph'):
4299 if opts.get(b'graph'):
4300 logcmdutil.checkunsupportedgraphflags([], opts)
4300 logcmdutil.checkunsupportedgraphflags([], opts)
4301
4301
4302 def display(other, chlist, displayer):
4302 def display(other, chlist, displayer):
4303 revdag = logcmdutil.graphrevs(other, chlist, opts)
4303 revdag = logcmdutil.graphrevs(other, chlist, opts)
4304 logcmdutil.displaygraph(
4304 logcmdutil.displaygraph(
4305 ui, repo, revdag, displayer, graphmod.asciiedges
4305 ui, repo, revdag, displayer, graphmod.asciiedges
4306 )
4306 )
4307
4307
4308 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4308 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4309 return 0
4309 return 0
4310
4310
4311 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4311 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4312
4312
4313 if opts.get(b'bookmarks'):
4313 if opts.get(b'bookmarks'):
4314 source, branches = urlutil.parseurl(
4314 source, branches = urlutil.parseurl(
4315 ui.expandpath(source), opts.get(b'branch')
4315 ui.expandpath(source), opts.get(b'branch')
4316 )
4316 )
4317 other = hg.peer(repo, opts, source)
4317 other = hg.peer(repo, opts, source)
4318 try:
4318 try:
4319 if b'bookmarks' not in other.listkeys(b'namespaces'):
4319 if b'bookmarks' not in other.listkeys(b'namespaces'):
4320 ui.warn(_(b"remote doesn't support bookmarks\n"))
4320 ui.warn(_(b"remote doesn't support bookmarks\n"))
4321 return 0
4321 return 0
4322 ui.pager(b'incoming')
4322 ui.pager(b'incoming')
4323 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
4323 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
4324 return bookmarks.incoming(ui, repo, other)
4324 return bookmarks.incoming(ui, repo, other)
4325 finally:
4325 finally:
4326 other.close()
4326 other.close()
4327
4327
4328 repo._subtoppath = ui.expandpath(source)
4328 repo._subtoppath = ui.expandpath(source)
4329 try:
4329 try:
4330 return hg.incoming(ui, repo, source, opts)
4330 return hg.incoming(ui, repo, source, opts)
4331 finally:
4331 finally:
4332 del repo._subtoppath
4332 del repo._subtoppath
4333
4333
4334
4334
4335 @command(
4335 @command(
4336 b'init',
4336 b'init',
4337 remoteopts,
4337 remoteopts,
4338 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4338 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4339 helpcategory=command.CATEGORY_REPO_CREATION,
4339 helpcategory=command.CATEGORY_REPO_CREATION,
4340 helpbasic=True,
4340 helpbasic=True,
4341 norepo=True,
4341 norepo=True,
4342 )
4342 )
4343 def init(ui, dest=b".", **opts):
4343 def init(ui, dest=b".", **opts):
4344 """create a new repository in the given directory
4344 """create a new repository in the given directory
4345
4345
4346 Initialize a new repository in the given directory. If the given
4346 Initialize a new repository in the given directory. If the given
4347 directory does not exist, it will be created.
4347 directory does not exist, it will be created.
4348
4348
4349 If no directory is given, the current directory is used.
4349 If no directory is given, the current directory is used.
4350
4350
4351 It is possible to specify an ``ssh://`` URL as the destination.
4351 It is possible to specify an ``ssh://`` URL as the destination.
4352 See :hg:`help urls` for more information.
4352 See :hg:`help urls` for more information.
4353
4353
4354 Returns 0 on success.
4354 Returns 0 on success.
4355 """
4355 """
4356 opts = pycompat.byteskwargs(opts)
4356 opts = pycompat.byteskwargs(opts)
4357 peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
4357 peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
4358 peer.close()
4358 peer.close()
4359
4359
4360
4360
4361 @command(
4361 @command(
4362 b'locate',
4362 b'locate',
4363 [
4363 [
4364 (
4364 (
4365 b'r',
4365 b'r',
4366 b'rev',
4366 b'rev',
4367 b'',
4367 b'',
4368 _(b'search the repository as it is in REV'),
4368 _(b'search the repository as it is in REV'),
4369 _(b'REV'),
4369 _(b'REV'),
4370 ),
4370 ),
4371 (
4371 (
4372 b'0',
4372 b'0',
4373 b'print0',
4373 b'print0',
4374 None,
4374 None,
4375 _(b'end filenames with NUL, for use with xargs'),
4375 _(b'end filenames with NUL, for use with xargs'),
4376 ),
4376 ),
4377 (
4377 (
4378 b'f',
4378 b'f',
4379 b'fullpath',
4379 b'fullpath',
4380 None,
4380 None,
4381 _(b'print complete paths from the filesystem root'),
4381 _(b'print complete paths from the filesystem root'),
4382 ),
4382 ),
4383 ]
4383 ]
4384 + walkopts,
4384 + walkopts,
4385 _(b'[OPTION]... [PATTERN]...'),
4385 _(b'[OPTION]... [PATTERN]...'),
4386 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4386 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4387 )
4387 )
4388 def locate(ui, repo, *pats, **opts):
4388 def locate(ui, repo, *pats, **opts):
4389 """locate files matching specific patterns (DEPRECATED)
4389 """locate files matching specific patterns (DEPRECATED)
4390
4390
4391 Print files under Mercurial control in the working directory whose
4391 Print files under Mercurial control in the working directory whose
4392 names match the given patterns.
4392 names match the given patterns.
4393
4393
4394 By default, this command searches all directories in the working
4394 By default, this command searches all directories in the working
4395 directory. To search just the current directory and its
4395 directory. To search just the current directory and its
4396 subdirectories, use "--include .".
4396 subdirectories, use "--include .".
4397
4397
4398 If no patterns are given to match, this command prints the names
4398 If no patterns are given to match, this command prints the names
4399 of all files under Mercurial control in the working directory.
4399 of all files under Mercurial control in the working directory.
4400
4400
4401 If you want to feed the output of this command into the "xargs"
4401 If you want to feed the output of this command into the "xargs"
4402 command, use the -0 option to both this command and "xargs". This
4402 command, use the -0 option to both this command and "xargs". This
4403 will avoid the problem of "xargs" treating single filenames that
4403 will avoid the problem of "xargs" treating single filenames that
4404 contain whitespace as multiple filenames.
4404 contain whitespace as multiple filenames.
4405
4405
4406 See :hg:`help files` for a more versatile command.
4406 See :hg:`help files` for a more versatile command.
4407
4407
4408 Returns 0 if a match is found, 1 otherwise.
4408 Returns 0 if a match is found, 1 otherwise.
4409 """
4409 """
4410 opts = pycompat.byteskwargs(opts)
4410 opts = pycompat.byteskwargs(opts)
4411 if opts.get(b'print0'):
4411 if opts.get(b'print0'):
4412 end = b'\0'
4412 end = b'\0'
4413 else:
4413 else:
4414 end = b'\n'
4414 end = b'\n'
4415 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4415 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4416
4416
4417 ret = 1
4417 ret = 1
4418 m = scmutil.match(
4418 m = scmutil.match(
4419 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4419 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4420 )
4420 )
4421
4421
4422 ui.pager(b'locate')
4422 ui.pager(b'locate')
4423 if ctx.rev() is None:
4423 if ctx.rev() is None:
4424 # When run on the working copy, "locate" includes removed files, so
4424 # When run on the working copy, "locate" includes removed files, so
4425 # we get the list of files from the dirstate.
4425 # we get the list of files from the dirstate.
4426 filesgen = sorted(repo.dirstate.matches(m))
4426 filesgen = sorted(repo.dirstate.matches(m))
4427 else:
4427 else:
4428 filesgen = ctx.matches(m)
4428 filesgen = ctx.matches(m)
4429 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4429 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4430 for abs in filesgen:
4430 for abs in filesgen:
4431 if opts.get(b'fullpath'):
4431 if opts.get(b'fullpath'):
4432 ui.write(repo.wjoin(abs), end)
4432 ui.write(repo.wjoin(abs), end)
4433 else:
4433 else:
4434 ui.write(uipathfn(abs), end)
4434 ui.write(uipathfn(abs), end)
4435 ret = 0
4435 ret = 0
4436
4436
4437 return ret
4437 return ret
4438
4438
4439
4439
4440 @command(
4440 @command(
4441 b'log|history',
4441 b'log|history',
4442 [
4442 [
4443 (
4443 (
4444 b'f',
4444 b'f',
4445 b'follow',
4445 b'follow',
4446 None,
4446 None,
4447 _(
4447 _(
4448 b'follow changeset history, or file history across copies and renames'
4448 b'follow changeset history, or file history across copies and renames'
4449 ),
4449 ),
4450 ),
4450 ),
4451 (
4451 (
4452 b'',
4452 b'',
4453 b'follow-first',
4453 b'follow-first',
4454 None,
4454 None,
4455 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4455 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4456 ),
4456 ),
4457 (
4457 (
4458 b'd',
4458 b'd',
4459 b'date',
4459 b'date',
4460 b'',
4460 b'',
4461 _(b'show revisions matching date spec'),
4461 _(b'show revisions matching date spec'),
4462 _(b'DATE'),
4462 _(b'DATE'),
4463 ),
4463 ),
4464 (b'C', b'copies', None, _(b'show copied files')),
4464 (b'C', b'copies', None, _(b'show copied files')),
4465 (
4465 (
4466 b'k',
4466 b'k',
4467 b'keyword',
4467 b'keyword',
4468 [],
4468 [],
4469 _(b'do case-insensitive search for a given text'),
4469 _(b'do case-insensitive search for a given text'),
4470 _(b'TEXT'),
4470 _(b'TEXT'),
4471 ),
4471 ),
4472 (
4472 (
4473 b'r',
4473 b'r',
4474 b'rev',
4474 b'rev',
4475 [],
4475 [],
4476 _(b'revisions to select or follow from'),
4476 _(b'revisions to select or follow from'),
4477 _(b'REV'),
4477 _(b'REV'),
4478 ),
4478 ),
4479 (
4479 (
4480 b'L',
4480 b'L',
4481 b'line-range',
4481 b'line-range',
4482 [],
4482 [],
4483 _(b'follow line range of specified file (EXPERIMENTAL)'),
4483 _(b'follow line range of specified file (EXPERIMENTAL)'),
4484 _(b'FILE,RANGE'),
4484 _(b'FILE,RANGE'),
4485 ),
4485 ),
4486 (
4486 (
4487 b'',
4487 b'',
4488 b'removed',
4488 b'removed',
4489 None,
4489 None,
4490 _(b'include revisions where files were removed'),
4490 _(b'include revisions where files were removed'),
4491 ),
4491 ),
4492 (
4492 (
4493 b'm',
4493 b'm',
4494 b'only-merges',
4494 b'only-merges',
4495 None,
4495 None,
4496 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4496 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4497 ),
4497 ),
4498 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4498 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4499 (
4499 (
4500 b'',
4500 b'',
4501 b'only-branch',
4501 b'only-branch',
4502 [],
4502 [],
4503 _(
4503 _(
4504 b'show only changesets within the given named branch (DEPRECATED)'
4504 b'show only changesets within the given named branch (DEPRECATED)'
4505 ),
4505 ),
4506 _(b'BRANCH'),
4506 _(b'BRANCH'),
4507 ),
4507 ),
4508 (
4508 (
4509 b'b',
4509 b'b',
4510 b'branch',
4510 b'branch',
4511 [],
4511 [],
4512 _(b'show changesets within the given named branch'),
4512 _(b'show changesets within the given named branch'),
4513 _(b'BRANCH'),
4513 _(b'BRANCH'),
4514 ),
4514 ),
4515 (
4515 (
4516 b'B',
4516 b'B',
4517 b'bookmark',
4517 b'bookmark',
4518 [],
4518 [],
4519 _(b"show changesets within the given bookmark"),
4519 _(b"show changesets within the given bookmark"),
4520 _(b'BOOKMARK'),
4520 _(b'BOOKMARK'),
4521 ),
4521 ),
4522 (
4522 (
4523 b'P',
4523 b'P',
4524 b'prune',
4524 b'prune',
4525 [],
4525 [],
4526 _(b'do not display revision or any of its ancestors'),
4526 _(b'do not display revision or any of its ancestors'),
4527 _(b'REV'),
4527 _(b'REV'),
4528 ),
4528 ),
4529 ]
4529 ]
4530 + logopts
4530 + logopts
4531 + walkopts,
4531 + walkopts,
4532 _(b'[OPTION]... [FILE]'),
4532 _(b'[OPTION]... [FILE]'),
4533 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4533 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4534 helpbasic=True,
4534 helpbasic=True,
4535 inferrepo=True,
4535 inferrepo=True,
4536 intents={INTENT_READONLY},
4536 intents={INTENT_READONLY},
4537 )
4537 )
4538 def log(ui, repo, *pats, **opts):
4538 def log(ui, repo, *pats, **opts):
4539 """show revision history of entire repository or files
4539 """show revision history of entire repository or files
4540
4540
4541 Print the revision history of the specified files or the entire
4541 Print the revision history of the specified files or the entire
4542 project.
4542 project.
4543
4543
4544 If no revision range is specified, the default is ``tip:0`` unless
4544 If no revision range is specified, the default is ``tip:0`` unless
4545 --follow is set.
4545 --follow is set.
4546
4546
4547 File history is shown without following rename or copy history of
4547 File history is shown without following rename or copy history of
4548 files. Use -f/--follow with a filename to follow history across
4548 files. Use -f/--follow with a filename to follow history across
4549 renames and copies. --follow without a filename will only show
4549 renames and copies. --follow without a filename will only show
4550 ancestors of the starting revisions. The starting revisions can be
4550 ancestors of the starting revisions. The starting revisions can be
4551 specified by -r/--rev, which default to the working directory parent.
4551 specified by -r/--rev, which default to the working directory parent.
4552
4552
4553 By default this command prints revision number and changeset id,
4553 By default this command prints revision number and changeset id,
4554 tags, non-trivial parents, user, date and time, and a summary for
4554 tags, non-trivial parents, user, date and time, and a summary for
4555 each commit. When the -v/--verbose switch is used, the list of
4555 each commit. When the -v/--verbose switch is used, the list of
4556 changed files and full commit message are shown.
4556 changed files and full commit message are shown.
4557
4557
4558 With --graph the revisions are shown as an ASCII art DAG with the most
4558 With --graph the revisions are shown as an ASCII art DAG with the most
4559 recent changeset at the top.
4559 recent changeset at the top.
4560 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4560 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4561 involved in an unresolved merge conflict, '_' closes a branch,
4561 involved in an unresolved merge conflict, '_' closes a branch,
4562 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4562 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4563 changeset from the lines below is a parent of the 'o' merge on the same
4563 changeset from the lines below is a parent of the 'o' merge on the same
4564 line.
4564 line.
4565 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4565 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4566 of a '|' indicates one or more revisions in a path are omitted.
4566 of a '|' indicates one or more revisions in a path are omitted.
4567
4567
4568 .. container:: verbose
4568 .. container:: verbose
4569
4569
4570 Use -L/--line-range FILE,M:N options to follow the history of lines
4570 Use -L/--line-range FILE,M:N options to follow the history of lines
4571 from M to N in FILE. With -p/--patch only diff hunks affecting
4571 from M to N in FILE. With -p/--patch only diff hunks affecting
4572 specified line range will be shown. This option requires --follow;
4572 specified line range will be shown. This option requires --follow;
4573 it can be specified multiple times. Currently, this option is not
4573 it can be specified multiple times. Currently, this option is not
4574 compatible with --graph. This option is experimental.
4574 compatible with --graph. This option is experimental.
4575
4575
4576 .. note::
4576 .. note::
4577
4577
4578 :hg:`log --patch` may generate unexpected diff output for merge
4578 :hg:`log --patch` may generate unexpected diff output for merge
4579 changesets, as it will only compare the merge changeset against
4579 changesets, as it will only compare the merge changeset against
4580 its first parent. Also, only files different from BOTH parents
4580 its first parent. Also, only files different from BOTH parents
4581 will appear in files:.
4581 will appear in files:.
4582
4582
4583 .. note::
4583 .. note::
4584
4584
4585 For performance reasons, :hg:`log FILE` may omit duplicate changes
4585 For performance reasons, :hg:`log FILE` may omit duplicate changes
4586 made on branches and will not show removals or mode changes. To
4586 made on branches and will not show removals or mode changes. To
4587 see all such changes, use the --removed switch.
4587 see all such changes, use the --removed switch.
4588
4588
4589 .. container:: verbose
4589 .. container:: verbose
4590
4590
4591 .. note::
4591 .. note::
4592
4592
4593 The history resulting from -L/--line-range options depends on diff
4593 The history resulting from -L/--line-range options depends on diff
4594 options; for instance if white-spaces are ignored, respective changes
4594 options; for instance if white-spaces are ignored, respective changes
4595 with only white-spaces in specified line range will not be listed.
4595 with only white-spaces in specified line range will not be listed.
4596
4596
4597 .. container:: verbose
4597 .. container:: verbose
4598
4598
4599 Some examples:
4599 Some examples:
4600
4600
4601 - changesets with full descriptions and file lists::
4601 - changesets with full descriptions and file lists::
4602
4602
4603 hg log -v
4603 hg log -v
4604
4604
4605 - changesets ancestral to the working directory::
4605 - changesets ancestral to the working directory::
4606
4606
4607 hg log -f
4607 hg log -f
4608
4608
4609 - last 10 commits on the current branch::
4609 - last 10 commits on the current branch::
4610
4610
4611 hg log -l 10 -b .
4611 hg log -l 10 -b .
4612
4612
4613 - changesets showing all modifications of a file, including removals::
4613 - changesets showing all modifications of a file, including removals::
4614
4614
4615 hg log --removed file.c
4615 hg log --removed file.c
4616
4616
4617 - all changesets that touch a directory, with diffs, excluding merges::
4617 - all changesets that touch a directory, with diffs, excluding merges::
4618
4618
4619 hg log -Mp lib/
4619 hg log -Mp lib/
4620
4620
4621 - all revision numbers that match a keyword::
4621 - all revision numbers that match a keyword::
4622
4622
4623 hg log -k bug --template "{rev}\\n"
4623 hg log -k bug --template "{rev}\\n"
4624
4624
4625 - the full hash identifier of the working directory parent::
4625 - the full hash identifier of the working directory parent::
4626
4626
4627 hg log -r . --template "{node}\\n"
4627 hg log -r . --template "{node}\\n"
4628
4628
4629 - list available log templates::
4629 - list available log templates::
4630
4630
4631 hg log -T list
4631 hg log -T list
4632
4632
4633 - check if a given changeset is included in a tagged release::
4633 - check if a given changeset is included in a tagged release::
4634
4634
4635 hg log -r "a21ccf and ancestor(1.9)"
4635 hg log -r "a21ccf and ancestor(1.9)"
4636
4636
4637 - find all changesets by some user in a date range::
4637 - find all changesets by some user in a date range::
4638
4638
4639 hg log -k alice -d "may 2008 to jul 2008"
4639 hg log -k alice -d "may 2008 to jul 2008"
4640
4640
4641 - summary of all changesets after the last tag::
4641 - summary of all changesets after the last tag::
4642
4642
4643 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4643 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4644
4644
4645 - changesets touching lines 13 to 23 for file.c::
4645 - changesets touching lines 13 to 23 for file.c::
4646
4646
4647 hg log -L file.c,13:23
4647 hg log -L file.c,13:23
4648
4648
4649 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4649 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4650 main.c with patch::
4650 main.c with patch::
4651
4651
4652 hg log -L file.c,13:23 -L main.c,2:6 -p
4652 hg log -L file.c,13:23 -L main.c,2:6 -p
4653
4653
4654 See :hg:`help dates` for a list of formats valid for -d/--date.
4654 See :hg:`help dates` for a list of formats valid for -d/--date.
4655
4655
4656 See :hg:`help revisions` for more about specifying and ordering
4656 See :hg:`help revisions` for more about specifying and ordering
4657 revisions.
4657 revisions.
4658
4658
4659 See :hg:`help templates` for more about pre-packaged styles and
4659 See :hg:`help templates` for more about pre-packaged styles and
4660 specifying custom templates. The default template used by the log
4660 specifying custom templates. The default template used by the log
4661 command can be customized via the ``command-templates.log`` configuration
4661 command can be customized via the ``command-templates.log`` configuration
4662 setting.
4662 setting.
4663
4663
4664 Returns 0 on success.
4664 Returns 0 on success.
4665
4665
4666 """
4666 """
4667 opts = pycompat.byteskwargs(opts)
4667 opts = pycompat.byteskwargs(opts)
4668 linerange = opts.get(b'line_range')
4668 linerange = opts.get(b'line_range')
4669
4669
4670 if linerange and not opts.get(b'follow'):
4670 if linerange and not opts.get(b'follow'):
4671 raise error.InputError(_(b'--line-range requires --follow'))
4671 raise error.InputError(_(b'--line-range requires --follow'))
4672
4672
4673 if linerange and pats:
4673 if linerange and pats:
4674 # TODO: take pats as patterns with no line-range filter
4674 # TODO: take pats as patterns with no line-range filter
4675 raise error.InputError(
4675 raise error.InputError(
4676 _(b'FILE arguments are not compatible with --line-range option')
4676 _(b'FILE arguments are not compatible with --line-range option')
4677 )
4677 )
4678
4678
4679 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4679 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4680 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4680 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4681 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4681 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4682 if linerange:
4682 if linerange:
4683 # TODO: should follow file history from logcmdutil._initialrevs(),
4683 # TODO: should follow file history from logcmdutil._initialrevs(),
4684 # then filter the result by logcmdutil._makerevset() and --limit
4684 # then filter the result by logcmdutil._makerevset() and --limit
4685 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4685 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4686
4686
4687 getcopies = None
4687 getcopies = None
4688 if opts.get(b'copies'):
4688 if opts.get(b'copies'):
4689 endrev = None
4689 endrev = None
4690 if revs:
4690 if revs:
4691 endrev = revs.max() + 1
4691 endrev = revs.max() + 1
4692 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4692 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4693
4693
4694 ui.pager(b'log')
4694 ui.pager(b'log')
4695 displayer = logcmdutil.changesetdisplayer(
4695 displayer = logcmdutil.changesetdisplayer(
4696 ui, repo, opts, differ, buffered=True
4696 ui, repo, opts, differ, buffered=True
4697 )
4697 )
4698 if opts.get(b'graph'):
4698 if opts.get(b'graph'):
4699 displayfn = logcmdutil.displaygraphrevs
4699 displayfn = logcmdutil.displaygraphrevs
4700 else:
4700 else:
4701 displayfn = logcmdutil.displayrevs
4701 displayfn = logcmdutil.displayrevs
4702 displayfn(ui, repo, revs, displayer, getcopies)
4702 displayfn(ui, repo, revs, displayer, getcopies)
4703
4703
4704
4704
4705 @command(
4705 @command(
4706 b'manifest',
4706 b'manifest',
4707 [
4707 [
4708 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4708 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4709 (b'', b'all', False, _(b"list files from all revisions")),
4709 (b'', b'all', False, _(b"list files from all revisions")),
4710 ]
4710 ]
4711 + formatteropts,
4711 + formatteropts,
4712 _(b'[-r REV]'),
4712 _(b'[-r REV]'),
4713 helpcategory=command.CATEGORY_MAINTENANCE,
4713 helpcategory=command.CATEGORY_MAINTENANCE,
4714 intents={INTENT_READONLY},
4714 intents={INTENT_READONLY},
4715 )
4715 )
4716 def manifest(ui, repo, node=None, rev=None, **opts):
4716 def manifest(ui, repo, node=None, rev=None, **opts):
4717 """output the current or given revision of the project manifest
4717 """output the current or given revision of the project manifest
4718
4718
4719 Print a list of version controlled files for the given revision.
4719 Print a list of version controlled files for the given revision.
4720 If no revision is given, the first parent of the working directory
4720 If no revision is given, the first parent of the working directory
4721 is used, or the null revision if no revision is checked out.
4721 is used, or the null revision if no revision is checked out.
4722
4722
4723 With -v, print file permissions, symlink and executable bits.
4723 With -v, print file permissions, symlink and executable bits.
4724 With --debug, print file revision hashes.
4724 With --debug, print file revision hashes.
4725
4725
4726 If option --all is specified, the list of all files from all revisions
4726 If option --all is specified, the list of all files from all revisions
4727 is printed. This includes deleted and renamed files.
4727 is printed. This includes deleted and renamed files.
4728
4728
4729 Returns 0 on success.
4729 Returns 0 on success.
4730 """
4730 """
4731 opts = pycompat.byteskwargs(opts)
4731 opts = pycompat.byteskwargs(opts)
4732 fm = ui.formatter(b'manifest', opts)
4732 fm = ui.formatter(b'manifest', opts)
4733
4733
4734 if opts.get(b'all'):
4734 if opts.get(b'all'):
4735 if rev or node:
4735 if rev or node:
4736 raise error.InputError(_(b"can't specify a revision with --all"))
4736 raise error.InputError(_(b"can't specify a revision with --all"))
4737
4737
4738 res = set()
4738 res = set()
4739 for rev in repo:
4739 for rev in repo:
4740 ctx = repo[rev]
4740 ctx = repo[rev]
4741 res |= set(ctx.files())
4741 res |= set(ctx.files())
4742
4742
4743 ui.pager(b'manifest')
4743 ui.pager(b'manifest')
4744 for f in sorted(res):
4744 for f in sorted(res):
4745 fm.startitem()
4745 fm.startitem()
4746 fm.write(b"path", b'%s\n', f)
4746 fm.write(b"path", b'%s\n', f)
4747 fm.end()
4747 fm.end()
4748 return
4748 return
4749
4749
4750 if rev and node:
4750 if rev and node:
4751 raise error.InputError(_(b"please specify just one revision"))
4751 raise error.InputError(_(b"please specify just one revision"))
4752
4752
4753 if not node:
4753 if not node:
4754 node = rev
4754 node = rev
4755
4755
4756 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4756 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4757 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4757 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4758 if node:
4758 if node:
4759 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4759 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4760 ctx = scmutil.revsingle(repo, node)
4760 ctx = scmutil.revsingle(repo, node)
4761 mf = ctx.manifest()
4761 mf = ctx.manifest()
4762 ui.pager(b'manifest')
4762 ui.pager(b'manifest')
4763 for f in ctx:
4763 for f in ctx:
4764 fm.startitem()
4764 fm.startitem()
4765 fm.context(ctx=ctx)
4765 fm.context(ctx=ctx)
4766 fl = ctx[f].flags()
4766 fl = ctx[f].flags()
4767 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4767 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4768 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4768 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4769 fm.write(b'path', b'%s\n', f)
4769 fm.write(b'path', b'%s\n', f)
4770 fm.end()
4770 fm.end()
4771
4771
4772
4772
4773 @command(
4773 @command(
4774 b'merge',
4774 b'merge',
4775 [
4775 [
4776 (
4776 (
4777 b'f',
4777 b'f',
4778 b'force',
4778 b'force',
4779 None,
4779 None,
4780 _(b'force a merge including outstanding changes (DEPRECATED)'),
4780 _(b'force a merge including outstanding changes (DEPRECATED)'),
4781 ),
4781 ),
4782 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4782 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4783 (
4783 (
4784 b'P',
4784 b'P',
4785 b'preview',
4785 b'preview',
4786 None,
4786 None,
4787 _(b'review revisions to merge (no merge is performed)'),
4787 _(b'review revisions to merge (no merge is performed)'),
4788 ),
4788 ),
4789 (b'', b'abort', None, _(b'abort the ongoing merge')),
4789 (b'', b'abort', None, _(b'abort the ongoing merge')),
4790 ]
4790 ]
4791 + mergetoolopts,
4791 + mergetoolopts,
4792 _(b'[-P] [[-r] REV]'),
4792 _(b'[-P] [[-r] REV]'),
4793 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4793 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4794 helpbasic=True,
4794 helpbasic=True,
4795 )
4795 )
4796 def merge(ui, repo, node=None, **opts):
4796 def merge(ui, repo, node=None, **opts):
4797 """merge another revision into working directory
4797 """merge another revision into working directory
4798
4798
4799 The current working directory is updated with all changes made in
4799 The current working directory is updated with all changes made in
4800 the requested revision since the last common predecessor revision.
4800 the requested revision since the last common predecessor revision.
4801
4801
4802 Files that changed between either parent are marked as changed for
4802 Files that changed between either parent are marked as changed for
4803 the next commit and a commit must be performed before any further
4803 the next commit and a commit must be performed before any further
4804 updates to the repository are allowed. The next commit will have
4804 updates to the repository are allowed. The next commit will have
4805 two parents.
4805 two parents.
4806
4806
4807 ``--tool`` can be used to specify the merge tool used for file
4807 ``--tool`` can be used to specify the merge tool used for file
4808 merges. It overrides the HGMERGE environment variable and your
4808 merges. It overrides the HGMERGE environment variable and your
4809 configuration files. See :hg:`help merge-tools` for options.
4809 configuration files. See :hg:`help merge-tools` for options.
4810
4810
4811 If no revision is specified, the working directory's parent is a
4811 If no revision is specified, the working directory's parent is a
4812 head revision, and the current branch contains exactly one other
4812 head revision, and the current branch contains exactly one other
4813 head, the other head is merged with by default. Otherwise, an
4813 head, the other head is merged with by default. Otherwise, an
4814 explicit revision with which to merge must be provided.
4814 explicit revision with which to merge must be provided.
4815
4815
4816 See :hg:`help resolve` for information on handling file conflicts.
4816 See :hg:`help resolve` for information on handling file conflicts.
4817
4817
4818 To undo an uncommitted merge, use :hg:`merge --abort` which
4818 To undo an uncommitted merge, use :hg:`merge --abort` which
4819 will check out a clean copy of the original merge parent, losing
4819 will check out a clean copy of the original merge parent, losing
4820 all changes.
4820 all changes.
4821
4821
4822 Returns 0 on success, 1 if there are unresolved files.
4822 Returns 0 on success, 1 if there are unresolved files.
4823 """
4823 """
4824
4824
4825 opts = pycompat.byteskwargs(opts)
4825 opts = pycompat.byteskwargs(opts)
4826 abort = opts.get(b'abort')
4826 abort = opts.get(b'abort')
4827 if abort and repo.dirstate.p2() == nullid:
4827 if abort and repo.dirstate.p2() == nullid:
4828 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4828 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4829 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4829 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4830 if abort:
4830 if abort:
4831 state = cmdutil.getunfinishedstate(repo)
4831 state = cmdutil.getunfinishedstate(repo)
4832 if state and state._opname != b'merge':
4832 if state and state._opname != b'merge':
4833 raise error.StateError(
4833 raise error.StateError(
4834 _(b'cannot abort merge with %s in progress') % (state._opname),
4834 _(b'cannot abort merge with %s in progress') % (state._opname),
4835 hint=state.hint(),
4835 hint=state.hint(),
4836 )
4836 )
4837 if node:
4837 if node:
4838 raise error.InputError(_(b"cannot specify a node with --abort"))
4838 raise error.InputError(_(b"cannot specify a node with --abort"))
4839 return hg.abortmerge(repo.ui, repo)
4839 return hg.abortmerge(repo.ui, repo)
4840
4840
4841 if opts.get(b'rev') and node:
4841 if opts.get(b'rev') and node:
4842 raise error.InputError(_(b"please specify just one revision"))
4842 raise error.InputError(_(b"please specify just one revision"))
4843 if not node:
4843 if not node:
4844 node = opts.get(b'rev')
4844 node = opts.get(b'rev')
4845
4845
4846 if node:
4846 if node:
4847 ctx = scmutil.revsingle(repo, node)
4847 ctx = scmutil.revsingle(repo, node)
4848 else:
4848 else:
4849 if ui.configbool(b'commands', b'merge.require-rev'):
4849 if ui.configbool(b'commands', b'merge.require-rev'):
4850 raise error.InputError(
4850 raise error.InputError(
4851 _(
4851 _(
4852 b'configuration requires specifying revision to merge '
4852 b'configuration requires specifying revision to merge '
4853 b'with'
4853 b'with'
4854 )
4854 )
4855 )
4855 )
4856 ctx = repo[destutil.destmerge(repo)]
4856 ctx = repo[destutil.destmerge(repo)]
4857
4857
4858 if ctx.node() is None:
4858 if ctx.node() is None:
4859 raise error.InputError(
4859 raise error.InputError(
4860 _(b'merging with the working copy has no effect')
4860 _(b'merging with the working copy has no effect')
4861 )
4861 )
4862
4862
4863 if opts.get(b'preview'):
4863 if opts.get(b'preview'):
4864 # find nodes that are ancestors of p2 but not of p1
4864 # find nodes that are ancestors of p2 but not of p1
4865 p1 = repo[b'.'].node()
4865 p1 = repo[b'.'].node()
4866 p2 = ctx.node()
4866 p2 = ctx.node()
4867 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4867 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4868
4868
4869 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4869 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4870 for node in nodes:
4870 for node in nodes:
4871 displayer.show(repo[node])
4871 displayer.show(repo[node])
4872 displayer.close()
4872 displayer.close()
4873 return 0
4873 return 0
4874
4874
4875 # ui.forcemerge is an internal variable, do not document
4875 # ui.forcemerge is an internal variable, do not document
4876 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4876 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4877 with ui.configoverride(overrides, b'merge'):
4877 with ui.configoverride(overrides, b'merge'):
4878 force = opts.get(b'force')
4878 force = opts.get(b'force')
4879 labels = [b'working copy', b'merge rev']
4879 labels = [b'working copy', b'merge rev']
4880 return hg.merge(ctx, force=force, labels=labels)
4880 return hg.merge(ctx, force=force, labels=labels)
4881
4881
4882
4882
4883 statemod.addunfinished(
4883 statemod.addunfinished(
4884 b'merge',
4884 b'merge',
4885 fname=None,
4885 fname=None,
4886 clearable=True,
4886 clearable=True,
4887 allowcommit=True,
4887 allowcommit=True,
4888 cmdmsg=_(b'outstanding uncommitted merge'),
4888 cmdmsg=_(b'outstanding uncommitted merge'),
4889 abortfunc=hg.abortmerge,
4889 abortfunc=hg.abortmerge,
4890 statushint=_(
4890 statushint=_(
4891 b'To continue: hg commit\nTo abort: hg merge --abort'
4891 b'To continue: hg commit\nTo abort: hg merge --abort'
4892 ),
4892 ),
4893 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4893 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4894 )
4894 )
4895
4895
4896
4896
4897 @command(
4897 @command(
4898 b'outgoing|out',
4898 b'outgoing|out',
4899 [
4899 [
4900 (
4900 (
4901 b'f',
4901 b'f',
4902 b'force',
4902 b'force',
4903 None,
4903 None,
4904 _(b'run even when the destination is unrelated'),
4904 _(b'run even when the destination is unrelated'),
4905 ),
4905 ),
4906 (
4906 (
4907 b'r',
4907 b'r',
4908 b'rev',
4908 b'rev',
4909 [],
4909 [],
4910 _(b'a changeset intended to be included in the destination'),
4910 _(b'a changeset intended to be included in the destination'),
4911 _(b'REV'),
4911 _(b'REV'),
4912 ),
4912 ),
4913 (b'n', b'newest-first', None, _(b'show newest record first')),
4913 (b'n', b'newest-first', None, _(b'show newest record first')),
4914 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4914 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4915 (
4915 (
4916 b'b',
4916 b'b',
4917 b'branch',
4917 b'branch',
4918 [],
4918 [],
4919 _(b'a specific branch you would like to push'),
4919 _(b'a specific branch you would like to push'),
4920 _(b'BRANCH'),
4920 _(b'BRANCH'),
4921 ),
4921 ),
4922 ]
4922 ]
4923 + logopts
4923 + logopts
4924 + remoteopts
4924 + remoteopts
4925 + subrepoopts,
4925 + subrepoopts,
4926 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4926 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4927 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4927 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4928 )
4928 )
4929 def outgoing(ui, repo, dest=None, **opts):
4929 def outgoing(ui, repo, *dests, **opts):
4930 """show changesets not found in the destination
4930 """show changesets not found in the destination
4931
4931
4932 Show changesets not found in the specified destination repository
4932 Show changesets not found in the specified destination repository
4933 or the default push location. These are the changesets that would
4933 or the default push location. These are the changesets that would
4934 be pushed if a push was requested.
4934 be pushed if a push was requested.
4935
4935
4936 See pull for details of valid destination formats.
4936 See pull for details of valid destination formats.
4937
4937
4938 .. container:: verbose
4938 .. container:: verbose
4939
4939
4940 With -B/--bookmarks, the result of bookmark comparison between
4940 With -B/--bookmarks, the result of bookmark comparison between
4941 local and remote repositories is displayed. With -v/--verbose,
4941 local and remote repositories is displayed. With -v/--verbose,
4942 status is also displayed for each bookmark like below::
4942 status is also displayed for each bookmark like below::
4943
4943
4944 BM1 01234567890a added
4944 BM1 01234567890a added
4945 BM2 deleted
4945 BM2 deleted
4946 BM3 234567890abc advanced
4946 BM3 234567890abc advanced
4947 BM4 34567890abcd diverged
4947 BM4 34567890abcd diverged
4948 BM5 4567890abcde changed
4948 BM5 4567890abcde changed
4949
4949
4950 The action taken when pushing depends on the
4950 The action taken when pushing depends on the
4951 status of each bookmark:
4951 status of each bookmark:
4952
4952
4953 :``added``: push with ``-B`` will create it
4953 :``added``: push with ``-B`` will create it
4954 :``deleted``: push with ``-B`` will delete it
4954 :``deleted``: push with ``-B`` will delete it
4955 :``advanced``: push will update it
4955 :``advanced``: push will update it
4956 :``diverged``: push with ``-B`` will update it
4956 :``diverged``: push with ``-B`` will update it
4957 :``changed``: push with ``-B`` will update it
4957 :``changed``: push with ``-B`` will update it
4958
4958
4959 From the point of view of pushing behavior, bookmarks
4959 From the point of view of pushing behavior, bookmarks
4960 existing only in the remote repository are treated as
4960 existing only in the remote repository are treated as
4961 ``deleted``, even if it is in fact added remotely.
4961 ``deleted``, even if it is in fact added remotely.
4962
4962
4963 Returns 0 if there are outgoing changes, 1 otherwise.
4963 Returns 0 if there are outgoing changes, 1 otherwise.
4964 """
4964 """
4965 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4966 # style URLs, so don't overwrite dest.
4967 path = ui.getpath(dest, default=(b'default-push', b'default'))
4968 if not path:
4969 raise error.ConfigError(
4970 _(b'default repository not configured!'),
4971 hint=_(b"see 'hg help config.paths'"),
4972 )
4973
4974 opts = pycompat.byteskwargs(opts)
4965 opts = pycompat.byteskwargs(opts)
4975 if opts.get(b'bookmarks'):
4966 if opts.get(b'bookmarks'):
4976 dest = path.pushloc or path.loc
4967 for path in urlutil.get_push_paths(repo, ui, dests):
4977 other = hg.peer(repo, opts, dest)
4968 dest = path.pushloc or path.loc
4978 try:
4969 other = hg.peer(repo, opts, dest)
4979 if b'bookmarks' not in other.listkeys(b'namespaces'):
4970 try:
4980 ui.warn(_(b"remote doesn't support bookmarks\n"))
4971 if b'bookmarks' not in other.listkeys(b'namespaces'):
4981 return 0
4972 ui.warn(_(b"remote doesn't support bookmarks\n"))
4982 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
4973 return 0
4983 ui.pager(b'outgoing')
4974 ui.status(
4984 return bookmarks.outgoing(ui, repo, other)
4975 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
4985 finally:
4976 )
4986 other.close()
4977 ui.pager(b'outgoing')
4987
4978 return bookmarks.outgoing(ui, repo, other)
4988 return hg.outgoing(ui, repo, dest, opts)
4979 finally:
4980 other.close()
4981
4982 return hg.outgoing(ui, repo, dests, opts)
4989
4983
4990
4984
4991 @command(
4985 @command(
4992 b'parents',
4986 b'parents',
4993 [
4987 [
4994 (
4988 (
4995 b'r',
4989 b'r',
4996 b'rev',
4990 b'rev',
4997 b'',
4991 b'',
4998 _(b'show parents of the specified revision'),
4992 _(b'show parents of the specified revision'),
4999 _(b'REV'),
4993 _(b'REV'),
5000 ),
4994 ),
5001 ]
4995 ]
5002 + templateopts,
4996 + templateopts,
5003 _(b'[-r REV] [FILE]'),
4997 _(b'[-r REV] [FILE]'),
5004 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4998 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5005 inferrepo=True,
4999 inferrepo=True,
5006 )
5000 )
5007 def parents(ui, repo, file_=None, **opts):
5001 def parents(ui, repo, file_=None, **opts):
5008 """show the parents of the working directory or revision (DEPRECATED)
5002 """show the parents of the working directory or revision (DEPRECATED)
5009
5003
5010 Print the working directory's parent revisions. If a revision is
5004 Print the working directory's parent revisions. If a revision is
5011 given via -r/--rev, the parent of that revision will be printed.
5005 given via -r/--rev, the parent of that revision will be printed.
5012 If a file argument is given, the revision in which the file was
5006 If a file argument is given, the revision in which the file was
5013 last changed (before the working directory revision or the
5007 last changed (before the working directory revision or the
5014 argument to --rev if given) is printed.
5008 argument to --rev if given) is printed.
5015
5009
5016 This command is equivalent to::
5010 This command is equivalent to::
5017
5011
5018 hg log -r "p1()+p2()" or
5012 hg log -r "p1()+p2()" or
5019 hg log -r "p1(REV)+p2(REV)" or
5013 hg log -r "p1(REV)+p2(REV)" or
5020 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5014 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5021 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5015 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5022
5016
5023 See :hg:`summary` and :hg:`help revsets` for related information.
5017 See :hg:`summary` and :hg:`help revsets` for related information.
5024
5018
5025 Returns 0 on success.
5019 Returns 0 on success.
5026 """
5020 """
5027
5021
5028 opts = pycompat.byteskwargs(opts)
5022 opts = pycompat.byteskwargs(opts)
5029 rev = opts.get(b'rev')
5023 rev = opts.get(b'rev')
5030 if rev:
5024 if rev:
5031 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5025 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5032 ctx = scmutil.revsingle(repo, rev, None)
5026 ctx = scmutil.revsingle(repo, rev, None)
5033
5027
5034 if file_:
5028 if file_:
5035 m = scmutil.match(ctx, (file_,), opts)
5029 m = scmutil.match(ctx, (file_,), opts)
5036 if m.anypats() or len(m.files()) != 1:
5030 if m.anypats() or len(m.files()) != 1:
5037 raise error.InputError(_(b'can only specify an explicit filename'))
5031 raise error.InputError(_(b'can only specify an explicit filename'))
5038 file_ = m.files()[0]
5032 file_ = m.files()[0]
5039 filenodes = []
5033 filenodes = []
5040 for cp in ctx.parents():
5034 for cp in ctx.parents():
5041 if not cp:
5035 if not cp:
5042 continue
5036 continue
5043 try:
5037 try:
5044 filenodes.append(cp.filenode(file_))
5038 filenodes.append(cp.filenode(file_))
5045 except error.LookupError:
5039 except error.LookupError:
5046 pass
5040 pass
5047 if not filenodes:
5041 if not filenodes:
5048 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5042 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5049 p = []
5043 p = []
5050 for fn in filenodes:
5044 for fn in filenodes:
5051 fctx = repo.filectx(file_, fileid=fn)
5045 fctx = repo.filectx(file_, fileid=fn)
5052 p.append(fctx.node())
5046 p.append(fctx.node())
5053 else:
5047 else:
5054 p = [cp.node() for cp in ctx.parents()]
5048 p = [cp.node() for cp in ctx.parents()]
5055
5049
5056 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5050 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5057 for n in p:
5051 for n in p:
5058 if n != nullid:
5052 if n != nullid:
5059 displayer.show(repo[n])
5053 displayer.show(repo[n])
5060 displayer.close()
5054 displayer.close()
5061
5055
5062
5056
5063 @command(
5057 @command(
5064 b'paths',
5058 b'paths',
5065 formatteropts,
5059 formatteropts,
5066 _(b'[NAME]'),
5060 _(b'[NAME]'),
5067 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5061 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5068 optionalrepo=True,
5062 optionalrepo=True,
5069 intents={INTENT_READONLY},
5063 intents={INTENT_READONLY},
5070 )
5064 )
5071 def paths(ui, repo, search=None, **opts):
5065 def paths(ui, repo, search=None, **opts):
5072 """show aliases for remote repositories
5066 """show aliases for remote repositories
5073
5067
5074 Show definition of symbolic path name NAME. If no name is given,
5068 Show definition of symbolic path name NAME. If no name is given,
5075 show definition of all available names.
5069 show definition of all available names.
5076
5070
5077 Option -q/--quiet suppresses all output when searching for NAME
5071 Option -q/--quiet suppresses all output when searching for NAME
5078 and shows only the path names when listing all definitions.
5072 and shows only the path names when listing all definitions.
5079
5073
5080 Path names are defined in the [paths] section of your
5074 Path names are defined in the [paths] section of your
5081 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5075 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5082 repository, ``.hg/hgrc`` is used, too.
5076 repository, ``.hg/hgrc`` is used, too.
5083
5077
5084 The path names ``default`` and ``default-push`` have a special
5078 The path names ``default`` and ``default-push`` have a special
5085 meaning. When performing a push or pull operation, they are used
5079 meaning. When performing a push or pull operation, they are used
5086 as fallbacks if no location is specified on the command-line.
5080 as fallbacks if no location is specified on the command-line.
5087 When ``default-push`` is set, it will be used for push and
5081 When ``default-push`` is set, it will be used for push and
5088 ``default`` will be used for pull; otherwise ``default`` is used
5082 ``default`` will be used for pull; otherwise ``default`` is used
5089 as the fallback for both. When cloning a repository, the clone
5083 as the fallback for both. When cloning a repository, the clone
5090 source is written as ``default`` in ``.hg/hgrc``.
5084 source is written as ``default`` in ``.hg/hgrc``.
5091
5085
5092 .. note::
5086 .. note::
5093
5087
5094 ``default`` and ``default-push`` apply to all inbound (e.g.
5088 ``default`` and ``default-push`` apply to all inbound (e.g.
5095 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5089 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5096 and :hg:`bundle`) operations.
5090 and :hg:`bundle`) operations.
5097
5091
5098 See :hg:`help urls` for more information.
5092 See :hg:`help urls` for more information.
5099
5093
5100 .. container:: verbose
5094 .. container:: verbose
5101
5095
5102 Template:
5096 Template:
5103
5097
5104 The following keywords are supported. See also :hg:`help templates`.
5098 The following keywords are supported. See also :hg:`help templates`.
5105
5099
5106 :name: String. Symbolic name of the path alias.
5100 :name: String. Symbolic name of the path alias.
5107 :pushurl: String. URL for push operations.
5101 :pushurl: String. URL for push operations.
5108 :url: String. URL or directory path for the other operations.
5102 :url: String. URL or directory path for the other operations.
5109
5103
5110 Returns 0 on success.
5104 Returns 0 on success.
5111 """
5105 """
5112
5106
5113 opts = pycompat.byteskwargs(opts)
5107 opts = pycompat.byteskwargs(opts)
5114 ui.pager(b'paths')
5108 ui.pager(b'paths')
5115 if search:
5109 if search:
5116 pathitems = [
5110 pathitems = [
5117 (name, path)
5111 (name, path)
5118 for name, path in pycompat.iteritems(ui.paths)
5112 for name, path in pycompat.iteritems(ui.paths)
5119 if name == search
5113 if name == search
5120 ]
5114 ]
5121 else:
5115 else:
5122 pathitems = sorted(pycompat.iteritems(ui.paths))
5116 pathitems = sorted(pycompat.iteritems(ui.paths))
5123
5117
5124 fm = ui.formatter(b'paths', opts)
5118 fm = ui.formatter(b'paths', opts)
5125 if fm.isplain():
5119 if fm.isplain():
5126 hidepassword = urlutil.hidepassword
5120 hidepassword = urlutil.hidepassword
5127 else:
5121 else:
5128 hidepassword = bytes
5122 hidepassword = bytes
5129 if ui.quiet:
5123 if ui.quiet:
5130 namefmt = b'%s\n'
5124 namefmt = b'%s\n'
5131 else:
5125 else:
5132 namefmt = b'%s = '
5126 namefmt = b'%s = '
5133 showsubopts = not search and not ui.quiet
5127 showsubopts = not search and not ui.quiet
5134
5128
5135 for name, path in pathitems:
5129 for name, path in pathitems:
5136 fm.startitem()
5130 fm.startitem()
5137 fm.condwrite(not search, b'name', namefmt, name)
5131 fm.condwrite(not search, b'name', namefmt, name)
5138 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5132 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5139 for subopt, value in sorted(path.suboptions.items()):
5133 for subopt, value in sorted(path.suboptions.items()):
5140 assert subopt not in (b'name', b'url')
5134 assert subopt not in (b'name', b'url')
5141 if showsubopts:
5135 if showsubopts:
5142 fm.plain(b'%s:%s = ' % (name, subopt))
5136 fm.plain(b'%s:%s = ' % (name, subopt))
5143 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5137 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5144
5138
5145 fm.end()
5139 fm.end()
5146
5140
5147 if search and not pathitems:
5141 if search and not pathitems:
5148 if not ui.quiet:
5142 if not ui.quiet:
5149 ui.warn(_(b"not found!\n"))
5143 ui.warn(_(b"not found!\n"))
5150 return 1
5144 return 1
5151 else:
5145 else:
5152 return 0
5146 return 0
5153
5147
5154
5148
5155 @command(
5149 @command(
5156 b'phase',
5150 b'phase',
5157 [
5151 [
5158 (b'p', b'public', False, _(b'set changeset phase to public')),
5152 (b'p', b'public', False, _(b'set changeset phase to public')),
5159 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5153 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5160 (b's', b'secret', False, _(b'set changeset phase to secret')),
5154 (b's', b'secret', False, _(b'set changeset phase to secret')),
5161 (b'f', b'force', False, _(b'allow to move boundary backward')),
5155 (b'f', b'force', False, _(b'allow to move boundary backward')),
5162 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5156 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5163 ],
5157 ],
5164 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5158 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5165 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5159 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5166 )
5160 )
5167 def phase(ui, repo, *revs, **opts):
5161 def phase(ui, repo, *revs, **opts):
5168 """set or show the current phase name
5162 """set or show the current phase name
5169
5163
5170 With no argument, show the phase name of the current revision(s).
5164 With no argument, show the phase name of the current revision(s).
5171
5165
5172 With one of -p/--public, -d/--draft or -s/--secret, change the
5166 With one of -p/--public, -d/--draft or -s/--secret, change the
5173 phase value of the specified revisions.
5167 phase value of the specified revisions.
5174
5168
5175 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5169 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5176 lower phase to a higher phase. Phases are ordered as follows::
5170 lower phase to a higher phase. Phases are ordered as follows::
5177
5171
5178 public < draft < secret
5172 public < draft < secret
5179
5173
5180 Returns 0 on success, 1 if some phases could not be changed.
5174 Returns 0 on success, 1 if some phases could not be changed.
5181
5175
5182 (For more information about the phases concept, see :hg:`help phases`.)
5176 (For more information about the phases concept, see :hg:`help phases`.)
5183 """
5177 """
5184 opts = pycompat.byteskwargs(opts)
5178 opts = pycompat.byteskwargs(opts)
5185 # search for a unique phase argument
5179 # search for a unique phase argument
5186 targetphase = None
5180 targetphase = None
5187 for idx, name in enumerate(phases.cmdphasenames):
5181 for idx, name in enumerate(phases.cmdphasenames):
5188 if opts[name]:
5182 if opts[name]:
5189 if targetphase is not None:
5183 if targetphase is not None:
5190 raise error.InputError(_(b'only one phase can be specified'))
5184 raise error.InputError(_(b'only one phase can be specified'))
5191 targetphase = idx
5185 targetphase = idx
5192
5186
5193 # look for specified revision
5187 # look for specified revision
5194 revs = list(revs)
5188 revs = list(revs)
5195 revs.extend(opts[b'rev'])
5189 revs.extend(opts[b'rev'])
5196 if not revs:
5190 if not revs:
5197 # display both parents as the second parent phase can influence
5191 # display both parents as the second parent phase can influence
5198 # the phase of a merge commit
5192 # the phase of a merge commit
5199 revs = [c.rev() for c in repo[None].parents()]
5193 revs = [c.rev() for c in repo[None].parents()]
5200
5194
5201 revs = scmutil.revrange(repo, revs)
5195 revs = scmutil.revrange(repo, revs)
5202
5196
5203 ret = 0
5197 ret = 0
5204 if targetphase is None:
5198 if targetphase is None:
5205 # display
5199 # display
5206 for r in revs:
5200 for r in revs:
5207 ctx = repo[r]
5201 ctx = repo[r]
5208 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5202 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5209 else:
5203 else:
5210 with repo.lock(), repo.transaction(b"phase") as tr:
5204 with repo.lock(), repo.transaction(b"phase") as tr:
5211 # set phase
5205 # set phase
5212 if not revs:
5206 if not revs:
5213 raise error.InputError(_(b'empty revision set'))
5207 raise error.InputError(_(b'empty revision set'))
5214 nodes = [repo[r].node() for r in revs]
5208 nodes = [repo[r].node() for r in revs]
5215 # moving revision from public to draft may hide them
5209 # moving revision from public to draft may hide them
5216 # We have to check result on an unfiltered repository
5210 # We have to check result on an unfiltered repository
5217 unfi = repo.unfiltered()
5211 unfi = repo.unfiltered()
5218 getphase = unfi._phasecache.phase
5212 getphase = unfi._phasecache.phase
5219 olddata = [getphase(unfi, r) for r in unfi]
5213 olddata = [getphase(unfi, r) for r in unfi]
5220 phases.advanceboundary(repo, tr, targetphase, nodes)
5214 phases.advanceboundary(repo, tr, targetphase, nodes)
5221 if opts[b'force']:
5215 if opts[b'force']:
5222 phases.retractboundary(repo, tr, targetphase, nodes)
5216 phases.retractboundary(repo, tr, targetphase, nodes)
5223 getphase = unfi._phasecache.phase
5217 getphase = unfi._phasecache.phase
5224 newdata = [getphase(unfi, r) for r in unfi]
5218 newdata = [getphase(unfi, r) for r in unfi]
5225 changes = sum(newdata[r] != olddata[r] for r in unfi)
5219 changes = sum(newdata[r] != olddata[r] for r in unfi)
5226 cl = unfi.changelog
5220 cl = unfi.changelog
5227 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5221 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5228 if rejected:
5222 if rejected:
5229 ui.warn(
5223 ui.warn(
5230 _(
5224 _(
5231 b'cannot move %i changesets to a higher '
5225 b'cannot move %i changesets to a higher '
5232 b'phase, use --force\n'
5226 b'phase, use --force\n'
5233 )
5227 )
5234 % len(rejected)
5228 % len(rejected)
5235 )
5229 )
5236 ret = 1
5230 ret = 1
5237 if changes:
5231 if changes:
5238 msg = _(b'phase changed for %i changesets\n') % changes
5232 msg = _(b'phase changed for %i changesets\n') % changes
5239 if ret:
5233 if ret:
5240 ui.status(msg)
5234 ui.status(msg)
5241 else:
5235 else:
5242 ui.note(msg)
5236 ui.note(msg)
5243 else:
5237 else:
5244 ui.warn(_(b'no phases changed\n'))
5238 ui.warn(_(b'no phases changed\n'))
5245 return ret
5239 return ret
5246
5240
5247
5241
5248 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5242 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5249 """Run after a changegroup has been added via pull/unbundle
5243 """Run after a changegroup has been added via pull/unbundle
5250
5244
5251 This takes arguments below:
5245 This takes arguments below:
5252
5246
5253 :modheads: change of heads by pull/unbundle
5247 :modheads: change of heads by pull/unbundle
5254 :optupdate: updating working directory is needed or not
5248 :optupdate: updating working directory is needed or not
5255 :checkout: update destination revision (or None to default destination)
5249 :checkout: update destination revision (or None to default destination)
5256 :brev: a name, which might be a bookmark to be activated after updating
5250 :brev: a name, which might be a bookmark to be activated after updating
5257
5251
5258 return True if update raise any conflict, False otherwise.
5252 return True if update raise any conflict, False otherwise.
5259 """
5253 """
5260 if modheads == 0:
5254 if modheads == 0:
5261 return False
5255 return False
5262 if optupdate:
5256 if optupdate:
5263 try:
5257 try:
5264 return hg.updatetotally(ui, repo, checkout, brev)
5258 return hg.updatetotally(ui, repo, checkout, brev)
5265 except error.UpdateAbort as inst:
5259 except error.UpdateAbort as inst:
5266 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5260 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5267 hint = inst.hint
5261 hint = inst.hint
5268 raise error.UpdateAbort(msg, hint=hint)
5262 raise error.UpdateAbort(msg, hint=hint)
5269 if modheads is not None and modheads > 1:
5263 if modheads is not None and modheads > 1:
5270 currentbranchheads = len(repo.branchheads())
5264 currentbranchheads = len(repo.branchheads())
5271 if currentbranchheads == modheads:
5265 if currentbranchheads == modheads:
5272 ui.status(
5266 ui.status(
5273 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5267 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5274 )
5268 )
5275 elif currentbranchheads > 1:
5269 elif currentbranchheads > 1:
5276 ui.status(
5270 ui.status(
5277 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5271 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5278 )
5272 )
5279 else:
5273 else:
5280 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5274 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5281 elif not ui.configbool(b'commands', b'update.requiredest'):
5275 elif not ui.configbool(b'commands', b'update.requiredest'):
5282 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5276 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5283 return False
5277 return False
5284
5278
5285
5279
5286 @command(
5280 @command(
5287 b'pull',
5281 b'pull',
5288 [
5282 [
5289 (
5283 (
5290 b'u',
5284 b'u',
5291 b'update',
5285 b'update',
5292 None,
5286 None,
5293 _(b'update to new branch head if new descendants were pulled'),
5287 _(b'update to new branch head if new descendants were pulled'),
5294 ),
5288 ),
5295 (
5289 (
5296 b'f',
5290 b'f',
5297 b'force',
5291 b'force',
5298 None,
5292 None,
5299 _(b'run even when remote repository is unrelated'),
5293 _(b'run even when remote repository is unrelated'),
5300 ),
5294 ),
5301 (
5295 (
5302 b'',
5296 b'',
5303 b'confirm',
5297 b'confirm',
5304 None,
5298 None,
5305 _(b'confirm pull before applying changes'),
5299 _(b'confirm pull before applying changes'),
5306 ),
5300 ),
5307 (
5301 (
5308 b'r',
5302 b'r',
5309 b'rev',
5303 b'rev',
5310 [],
5304 [],
5311 _(b'a remote changeset intended to be added'),
5305 _(b'a remote changeset intended to be added'),
5312 _(b'REV'),
5306 _(b'REV'),
5313 ),
5307 ),
5314 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5308 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5315 (
5309 (
5316 b'b',
5310 b'b',
5317 b'branch',
5311 b'branch',
5318 [],
5312 [],
5319 _(b'a specific branch you would like to pull'),
5313 _(b'a specific branch you would like to pull'),
5320 _(b'BRANCH'),
5314 _(b'BRANCH'),
5321 ),
5315 ),
5322 ]
5316 ]
5323 + remoteopts,
5317 + remoteopts,
5324 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5318 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5325 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5319 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5326 helpbasic=True,
5320 helpbasic=True,
5327 )
5321 )
5328 def pull(ui, repo, *sources, **opts):
5322 def pull(ui, repo, *sources, **opts):
5329 """pull changes from the specified source
5323 """pull changes from the specified source
5330
5324
5331 Pull changes from a remote repository to a local one.
5325 Pull changes from a remote repository to a local one.
5332
5326
5333 This finds all changes from the repository at the specified path
5327 This finds all changes from the repository at the specified path
5334 or URL and adds them to a local repository (the current one unless
5328 or URL and adds them to a local repository (the current one unless
5335 -R is specified). By default, this does not update the copy of the
5329 -R is specified). By default, this does not update the copy of the
5336 project in the working directory.
5330 project in the working directory.
5337
5331
5338 When cloning from servers that support it, Mercurial may fetch
5332 When cloning from servers that support it, Mercurial may fetch
5339 pre-generated data. When this is done, hooks operating on incoming
5333 pre-generated data. When this is done, hooks operating on incoming
5340 changesets and changegroups may fire more than once, once for each
5334 changesets and changegroups may fire more than once, once for each
5341 pre-generated bundle and as well as for any additional remaining
5335 pre-generated bundle and as well as for any additional remaining
5342 data. See :hg:`help -e clonebundles` for more.
5336 data. See :hg:`help -e clonebundles` for more.
5343
5337
5344 Use :hg:`incoming` if you want to see what would have been added
5338 Use :hg:`incoming` if you want to see what would have been added
5345 by a pull at the time you issued this command. If you then decide
5339 by a pull at the time you issued this command. If you then decide
5346 to add those changes to the repository, you should use :hg:`pull
5340 to add those changes to the repository, you should use :hg:`pull
5347 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5341 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5348
5342
5349 If SOURCE is omitted, the 'default' path will be used.
5343 If SOURCE is omitted, the 'default' path will be used.
5350 See :hg:`help urls` for more information.
5344 See :hg:`help urls` for more information.
5351
5345
5352 If multiple sources are specified, they will be pulled sequentially as if
5346 If multiple sources are specified, they will be pulled sequentially as if
5353 the command was run multiple time. If --update is specify and the command
5347 the command was run multiple time. If --update is specify and the command
5354 will stop at the first failed --update.
5348 will stop at the first failed --update.
5355
5349
5356 Specifying bookmark as ``.`` is equivalent to specifying the active
5350 Specifying bookmark as ``.`` is equivalent to specifying the active
5357 bookmark's name.
5351 bookmark's name.
5358
5352
5359 Returns 0 on success, 1 if an update had unresolved files.
5353 Returns 0 on success, 1 if an update had unresolved files.
5360 """
5354 """
5361
5355
5362 opts = pycompat.byteskwargs(opts)
5356 opts = pycompat.byteskwargs(opts)
5363 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5357 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5364 b'update'
5358 b'update'
5365 ):
5359 ):
5366 msg = _(b'update destination required by configuration')
5360 msg = _(b'update destination required by configuration')
5367 hint = _(b'use hg pull followed by hg update DEST')
5361 hint = _(b'use hg pull followed by hg update DEST')
5368 raise error.InputError(msg, hint=hint)
5362 raise error.InputError(msg, hint=hint)
5369
5363
5370 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5364 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5371 for source, branches in sources:
5365 for source, branches in sources:
5372 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5366 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5373 ui.flush()
5367 ui.flush()
5374 other = hg.peer(repo, opts, source)
5368 other = hg.peer(repo, opts, source)
5375 update_conflict = None
5369 update_conflict = None
5376 try:
5370 try:
5377 revs, checkout = hg.addbranchrevs(
5371 revs, checkout = hg.addbranchrevs(
5378 repo, other, branches, opts.get(b'rev')
5372 repo, other, branches, opts.get(b'rev')
5379 )
5373 )
5380
5374
5381 pullopargs = {}
5375 pullopargs = {}
5382
5376
5383 nodes = None
5377 nodes = None
5384 if opts.get(b'bookmark') or revs:
5378 if opts.get(b'bookmark') or revs:
5385 # The list of bookmark used here is the same used to actually update
5379 # The list of bookmark used here is the same used to actually update
5386 # the bookmark names, to avoid the race from issue 4689 and we do
5380 # the bookmark names, to avoid the race from issue 4689 and we do
5387 # all lookup and bookmark queries in one go so they see the same
5381 # all lookup and bookmark queries in one go so they see the same
5388 # version of the server state (issue 4700).
5382 # version of the server state (issue 4700).
5389 nodes = []
5383 nodes = []
5390 fnodes = []
5384 fnodes = []
5391 revs = revs or []
5385 revs = revs or []
5392 if revs and not other.capable(b'lookup'):
5386 if revs and not other.capable(b'lookup'):
5393 err = _(
5387 err = _(
5394 b"other repository doesn't support revision lookup, "
5388 b"other repository doesn't support revision lookup, "
5395 b"so a rev cannot be specified."
5389 b"so a rev cannot be specified."
5396 )
5390 )
5397 raise error.Abort(err)
5391 raise error.Abort(err)
5398 with other.commandexecutor() as e:
5392 with other.commandexecutor() as e:
5399 fremotebookmarks = e.callcommand(
5393 fremotebookmarks = e.callcommand(
5400 b'listkeys', {b'namespace': b'bookmarks'}
5394 b'listkeys', {b'namespace': b'bookmarks'}
5401 )
5395 )
5402 for r in revs:
5396 for r in revs:
5403 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5397 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5404 remotebookmarks = fremotebookmarks.result()
5398 remotebookmarks = fremotebookmarks.result()
5405 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5399 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5406 pullopargs[b'remotebookmarks'] = remotebookmarks
5400 pullopargs[b'remotebookmarks'] = remotebookmarks
5407 for b in opts.get(b'bookmark', []):
5401 for b in opts.get(b'bookmark', []):
5408 b = repo._bookmarks.expandname(b)
5402 b = repo._bookmarks.expandname(b)
5409 if b not in remotebookmarks:
5403 if b not in remotebookmarks:
5410 raise error.InputError(
5404 raise error.InputError(
5411 _(b'remote bookmark %s not found!') % b
5405 _(b'remote bookmark %s not found!') % b
5412 )
5406 )
5413 nodes.append(remotebookmarks[b])
5407 nodes.append(remotebookmarks[b])
5414 for i, rev in enumerate(revs):
5408 for i, rev in enumerate(revs):
5415 node = fnodes[i].result()
5409 node = fnodes[i].result()
5416 nodes.append(node)
5410 nodes.append(node)
5417 if rev == checkout:
5411 if rev == checkout:
5418 checkout = node
5412 checkout = node
5419
5413
5420 wlock = util.nullcontextmanager()
5414 wlock = util.nullcontextmanager()
5421 if opts.get(b'update'):
5415 if opts.get(b'update'):
5422 wlock = repo.wlock()
5416 wlock = repo.wlock()
5423 with wlock:
5417 with wlock:
5424 pullopargs.update(opts.get(b'opargs', {}))
5418 pullopargs.update(opts.get(b'opargs', {}))
5425 modheads = exchange.pull(
5419 modheads = exchange.pull(
5426 repo,
5420 repo,
5427 other,
5421 other,
5428 heads=nodes,
5422 heads=nodes,
5429 force=opts.get(b'force'),
5423 force=opts.get(b'force'),
5430 bookmarks=opts.get(b'bookmark', ()),
5424 bookmarks=opts.get(b'bookmark', ()),
5431 opargs=pullopargs,
5425 opargs=pullopargs,
5432 confirm=opts.get(b'confirm'),
5426 confirm=opts.get(b'confirm'),
5433 ).cgresult
5427 ).cgresult
5434
5428
5435 # brev is a name, which might be a bookmark to be activated at
5429 # brev is a name, which might be a bookmark to be activated at
5436 # the end of the update. In other words, it is an explicit
5430 # the end of the update. In other words, it is an explicit
5437 # destination of the update
5431 # destination of the update
5438 brev = None
5432 brev = None
5439
5433
5440 if checkout:
5434 if checkout:
5441 checkout = repo.unfiltered().changelog.rev(checkout)
5435 checkout = repo.unfiltered().changelog.rev(checkout)
5442
5436
5443 # order below depends on implementation of
5437 # order below depends on implementation of
5444 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5438 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5445 # because 'checkout' is determined without it.
5439 # because 'checkout' is determined without it.
5446 if opts.get(b'rev'):
5440 if opts.get(b'rev'):
5447 brev = opts[b'rev'][0]
5441 brev = opts[b'rev'][0]
5448 elif opts.get(b'branch'):
5442 elif opts.get(b'branch'):
5449 brev = opts[b'branch'][0]
5443 brev = opts[b'branch'][0]
5450 else:
5444 else:
5451 brev = branches[0]
5445 brev = branches[0]
5452 repo._subtoppath = source
5446 repo._subtoppath = source
5453 try:
5447 try:
5454 update_conflict = postincoming(
5448 update_conflict = postincoming(
5455 ui, repo, modheads, opts.get(b'update'), checkout, brev
5449 ui, repo, modheads, opts.get(b'update'), checkout, brev
5456 )
5450 )
5457 except error.FilteredRepoLookupError as exc:
5451 except error.FilteredRepoLookupError as exc:
5458 msg = _(b'cannot update to target: %s') % exc.args[0]
5452 msg = _(b'cannot update to target: %s') % exc.args[0]
5459 exc.args = (msg,) + exc.args[1:]
5453 exc.args = (msg,) + exc.args[1:]
5460 raise
5454 raise
5461 finally:
5455 finally:
5462 del repo._subtoppath
5456 del repo._subtoppath
5463
5457
5464 finally:
5458 finally:
5465 other.close()
5459 other.close()
5466 # skip the remaining pull source if they are some conflict.
5460 # skip the remaining pull source if they are some conflict.
5467 if update_conflict:
5461 if update_conflict:
5468 break
5462 break
5469 if update_conflict:
5463 if update_conflict:
5470 return 1
5464 return 1
5471 else:
5465 else:
5472 return 0
5466 return 0
5473
5467
5474
5468
5475 @command(
5469 @command(
5476 b'purge|clean',
5470 b'purge|clean',
5477 [
5471 [
5478 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5472 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5479 (b'', b'all', None, _(b'purge ignored files too')),
5473 (b'', b'all', None, _(b'purge ignored files too')),
5480 (b'i', b'ignored', None, _(b'purge only ignored files')),
5474 (b'i', b'ignored', None, _(b'purge only ignored files')),
5481 (b'', b'dirs', None, _(b'purge empty directories')),
5475 (b'', b'dirs', None, _(b'purge empty directories')),
5482 (b'', b'files', None, _(b'purge files')),
5476 (b'', b'files', None, _(b'purge files')),
5483 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5477 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5484 (
5478 (
5485 b'0',
5479 b'0',
5486 b'print0',
5480 b'print0',
5487 None,
5481 None,
5488 _(
5482 _(
5489 b'end filenames with NUL, for use with xargs'
5483 b'end filenames with NUL, for use with xargs'
5490 b' (implies -p/--print)'
5484 b' (implies -p/--print)'
5491 ),
5485 ),
5492 ),
5486 ),
5493 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5487 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5494 ]
5488 ]
5495 + cmdutil.walkopts,
5489 + cmdutil.walkopts,
5496 _(b'hg purge [OPTION]... [DIR]...'),
5490 _(b'hg purge [OPTION]... [DIR]...'),
5497 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5491 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5498 )
5492 )
5499 def purge(ui, repo, *dirs, **opts):
5493 def purge(ui, repo, *dirs, **opts):
5500 """removes files not tracked by Mercurial
5494 """removes files not tracked by Mercurial
5501
5495
5502 Delete files not known to Mercurial. This is useful to test local
5496 Delete files not known to Mercurial. This is useful to test local
5503 and uncommitted changes in an otherwise-clean source tree.
5497 and uncommitted changes in an otherwise-clean source tree.
5504
5498
5505 This means that purge will delete the following by default:
5499 This means that purge will delete the following by default:
5506
5500
5507 - Unknown files: files marked with "?" by :hg:`status`
5501 - Unknown files: files marked with "?" by :hg:`status`
5508 - Empty directories: in fact Mercurial ignores directories unless
5502 - Empty directories: in fact Mercurial ignores directories unless
5509 they contain files under source control management
5503 they contain files under source control management
5510
5504
5511 But it will leave untouched:
5505 But it will leave untouched:
5512
5506
5513 - Modified and unmodified tracked files
5507 - Modified and unmodified tracked files
5514 - Ignored files (unless -i or --all is specified)
5508 - Ignored files (unless -i or --all is specified)
5515 - New files added to the repository (with :hg:`add`)
5509 - New files added to the repository (with :hg:`add`)
5516
5510
5517 The --files and --dirs options can be used to direct purge to delete
5511 The --files and --dirs options can be used to direct purge to delete
5518 only files, only directories, or both. If neither option is given,
5512 only files, only directories, or both. If neither option is given,
5519 both will be deleted.
5513 both will be deleted.
5520
5514
5521 If directories are given on the command line, only files in these
5515 If directories are given on the command line, only files in these
5522 directories are considered.
5516 directories are considered.
5523
5517
5524 Be careful with purge, as you could irreversibly delete some files
5518 Be careful with purge, as you could irreversibly delete some files
5525 you forgot to add to the repository. If you only want to print the
5519 you forgot to add to the repository. If you only want to print the
5526 list of files that this program would delete, use the --print
5520 list of files that this program would delete, use the --print
5527 option.
5521 option.
5528 """
5522 """
5529 opts = pycompat.byteskwargs(opts)
5523 opts = pycompat.byteskwargs(opts)
5530 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5524 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5531
5525
5532 act = not opts.get(b'print')
5526 act = not opts.get(b'print')
5533 eol = b'\n'
5527 eol = b'\n'
5534 if opts.get(b'print0'):
5528 if opts.get(b'print0'):
5535 eol = b'\0'
5529 eol = b'\0'
5536 act = False # --print0 implies --print
5530 act = False # --print0 implies --print
5537 if opts.get(b'all', False):
5531 if opts.get(b'all', False):
5538 ignored = True
5532 ignored = True
5539 unknown = True
5533 unknown = True
5540 else:
5534 else:
5541 ignored = opts.get(b'ignored', False)
5535 ignored = opts.get(b'ignored', False)
5542 unknown = not ignored
5536 unknown = not ignored
5543
5537
5544 removefiles = opts.get(b'files')
5538 removefiles = opts.get(b'files')
5545 removedirs = opts.get(b'dirs')
5539 removedirs = opts.get(b'dirs')
5546 confirm = opts.get(b'confirm')
5540 confirm = opts.get(b'confirm')
5547 if confirm is None:
5541 if confirm is None:
5548 try:
5542 try:
5549 extensions.find(b'purge')
5543 extensions.find(b'purge')
5550 confirm = False
5544 confirm = False
5551 except KeyError:
5545 except KeyError:
5552 confirm = True
5546 confirm = True
5553
5547
5554 if not removefiles and not removedirs:
5548 if not removefiles and not removedirs:
5555 removefiles = True
5549 removefiles = True
5556 removedirs = True
5550 removedirs = True
5557
5551
5558 match = scmutil.match(repo[None], dirs, opts)
5552 match = scmutil.match(repo[None], dirs, opts)
5559
5553
5560 paths = mergemod.purge(
5554 paths = mergemod.purge(
5561 repo,
5555 repo,
5562 match,
5556 match,
5563 unknown=unknown,
5557 unknown=unknown,
5564 ignored=ignored,
5558 ignored=ignored,
5565 removeemptydirs=removedirs,
5559 removeemptydirs=removedirs,
5566 removefiles=removefiles,
5560 removefiles=removefiles,
5567 abortonerror=opts.get(b'abort_on_err'),
5561 abortonerror=opts.get(b'abort_on_err'),
5568 noop=not act,
5562 noop=not act,
5569 confirm=confirm,
5563 confirm=confirm,
5570 )
5564 )
5571
5565
5572 for path in paths:
5566 for path in paths:
5573 if not act:
5567 if not act:
5574 ui.write(b'%s%s' % (path, eol))
5568 ui.write(b'%s%s' % (path, eol))
5575
5569
5576
5570
5577 @command(
5571 @command(
5578 b'push',
5572 b'push',
5579 [
5573 [
5580 (b'f', b'force', None, _(b'force push')),
5574 (b'f', b'force', None, _(b'force push')),
5581 (
5575 (
5582 b'r',
5576 b'r',
5583 b'rev',
5577 b'rev',
5584 [],
5578 [],
5585 _(b'a changeset intended to be included in the destination'),
5579 _(b'a changeset intended to be included in the destination'),
5586 _(b'REV'),
5580 _(b'REV'),
5587 ),
5581 ),
5588 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5582 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5589 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5583 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5590 (
5584 (
5591 b'b',
5585 b'b',
5592 b'branch',
5586 b'branch',
5593 [],
5587 [],
5594 _(b'a specific branch you would like to push'),
5588 _(b'a specific branch you would like to push'),
5595 _(b'BRANCH'),
5589 _(b'BRANCH'),
5596 ),
5590 ),
5597 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5591 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5598 (
5592 (
5599 b'',
5593 b'',
5600 b'pushvars',
5594 b'pushvars',
5601 [],
5595 [],
5602 _(b'variables that can be sent to server (ADVANCED)'),
5596 _(b'variables that can be sent to server (ADVANCED)'),
5603 ),
5597 ),
5604 (
5598 (
5605 b'',
5599 b'',
5606 b'publish',
5600 b'publish',
5607 False,
5601 False,
5608 _(b'push the changeset as public (EXPERIMENTAL)'),
5602 _(b'push the changeset as public (EXPERIMENTAL)'),
5609 ),
5603 ),
5610 ]
5604 ]
5611 + remoteopts,
5605 + remoteopts,
5612 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5606 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5613 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5607 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5614 helpbasic=True,
5608 helpbasic=True,
5615 )
5609 )
5616 def push(ui, repo, *dests, **opts):
5610 def push(ui, repo, *dests, **opts):
5617 """push changes to the specified destination
5611 """push changes to the specified destination
5618
5612
5619 Push changesets from the local repository to the specified
5613 Push changesets from the local repository to the specified
5620 destination.
5614 destination.
5621
5615
5622 This operation is symmetrical to pull: it is identical to a pull
5616 This operation is symmetrical to pull: it is identical to a pull
5623 in the destination repository from the current one.
5617 in the destination repository from the current one.
5624
5618
5625 By default, push will not allow creation of new heads at the
5619 By default, push will not allow creation of new heads at the
5626 destination, since multiple heads would make it unclear which head
5620 destination, since multiple heads would make it unclear which head
5627 to use. In this situation, it is recommended to pull and merge
5621 to use. In this situation, it is recommended to pull and merge
5628 before pushing.
5622 before pushing.
5629
5623
5630 Use --new-branch if you want to allow push to create a new named
5624 Use --new-branch if you want to allow push to create a new named
5631 branch that is not present at the destination. This allows you to
5625 branch that is not present at the destination. This allows you to
5632 only create a new branch without forcing other changes.
5626 only create a new branch without forcing other changes.
5633
5627
5634 .. note::
5628 .. note::
5635
5629
5636 Extra care should be taken with the -f/--force option,
5630 Extra care should be taken with the -f/--force option,
5637 which will push all new heads on all branches, an action which will
5631 which will push all new heads on all branches, an action which will
5638 almost always cause confusion for collaborators.
5632 almost always cause confusion for collaborators.
5639
5633
5640 If -r/--rev is used, the specified revision and all its ancestors
5634 If -r/--rev is used, the specified revision and all its ancestors
5641 will be pushed to the remote repository.
5635 will be pushed to the remote repository.
5642
5636
5643 If -B/--bookmark is used, the specified bookmarked revision, its
5637 If -B/--bookmark is used, the specified bookmarked revision, its
5644 ancestors, and the bookmark will be pushed to the remote
5638 ancestors, and the bookmark will be pushed to the remote
5645 repository. Specifying ``.`` is equivalent to specifying the active
5639 repository. Specifying ``.`` is equivalent to specifying the active
5646 bookmark's name. Use the --all-bookmarks option for pushing all
5640 bookmark's name. Use the --all-bookmarks option for pushing all
5647 current bookmarks.
5641 current bookmarks.
5648
5642
5649 Please see :hg:`help urls` for important details about ``ssh://``
5643 Please see :hg:`help urls` for important details about ``ssh://``
5650 URLs. If DESTINATION is omitted, a default path will be used.
5644 URLs. If DESTINATION is omitted, a default path will be used.
5651
5645
5652 When passed multiple destinations, push will process them one after the
5646 When passed multiple destinations, push will process them one after the
5653 other, but stop should an error occur.
5647 other, but stop should an error occur.
5654
5648
5655 .. container:: verbose
5649 .. container:: verbose
5656
5650
5657 The --pushvars option sends strings to the server that become
5651 The --pushvars option sends strings to the server that become
5658 environment variables prepended with ``HG_USERVAR_``. For example,
5652 environment variables prepended with ``HG_USERVAR_``. For example,
5659 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5653 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5660 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5654 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5661
5655
5662 pushvars can provide for user-overridable hooks as well as set debug
5656 pushvars can provide for user-overridable hooks as well as set debug
5663 levels. One example is having a hook that blocks commits containing
5657 levels. One example is having a hook that blocks commits containing
5664 conflict markers, but enables the user to override the hook if the file
5658 conflict markers, but enables the user to override the hook if the file
5665 is using conflict markers for testing purposes or the file format has
5659 is using conflict markers for testing purposes or the file format has
5666 strings that look like conflict markers.
5660 strings that look like conflict markers.
5667
5661
5668 By default, servers will ignore `--pushvars`. To enable it add the
5662 By default, servers will ignore `--pushvars`. To enable it add the
5669 following to your configuration file::
5663 following to your configuration file::
5670
5664
5671 [push]
5665 [push]
5672 pushvars.server = true
5666 pushvars.server = true
5673
5667
5674 Returns 0 if push was successful, 1 if nothing to push.
5668 Returns 0 if push was successful, 1 if nothing to push.
5675 """
5669 """
5676
5670
5677 opts = pycompat.byteskwargs(opts)
5671 opts = pycompat.byteskwargs(opts)
5678
5672
5679 if opts.get(b'all_bookmarks'):
5673 if opts.get(b'all_bookmarks'):
5680 cmdutil.check_incompatible_arguments(
5674 cmdutil.check_incompatible_arguments(
5681 opts,
5675 opts,
5682 b'all_bookmarks',
5676 b'all_bookmarks',
5683 [b'bookmark', b'rev'],
5677 [b'bookmark', b'rev'],
5684 )
5678 )
5685 opts[b'bookmark'] = list(repo._bookmarks)
5679 opts[b'bookmark'] = list(repo._bookmarks)
5686
5680
5687 if opts.get(b'bookmark'):
5681 if opts.get(b'bookmark'):
5688 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5682 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5689 for b in opts[b'bookmark']:
5683 for b in opts[b'bookmark']:
5690 # translate -B options to -r so changesets get pushed
5684 # translate -B options to -r so changesets get pushed
5691 b = repo._bookmarks.expandname(b)
5685 b = repo._bookmarks.expandname(b)
5692 if b in repo._bookmarks:
5686 if b in repo._bookmarks:
5693 opts.setdefault(b'rev', []).append(b)
5687 opts.setdefault(b'rev', []).append(b)
5694 else:
5688 else:
5695 # if we try to push a deleted bookmark, translate it to null
5689 # if we try to push a deleted bookmark, translate it to null
5696 # this lets simultaneous -r, -b options continue working
5690 # this lets simultaneous -r, -b options continue working
5697 opts.setdefault(b'rev', []).append(b"null")
5691 opts.setdefault(b'rev', []).append(b"null")
5698
5692
5699 some_pushed = False
5693 some_pushed = False
5700 result = 0
5694 result = 0
5701 for path in urlutil.get_push_paths(repo, ui, dests):
5695 for path in urlutil.get_push_paths(repo, ui, dests):
5702 dest = path.pushloc or path.loc
5696 dest = path.pushloc or path.loc
5703 branches = (path.branch, opts.get(b'branch') or [])
5697 branches = (path.branch, opts.get(b'branch') or [])
5704 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5698 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5705 revs, checkout = hg.addbranchrevs(
5699 revs, checkout = hg.addbranchrevs(
5706 repo, repo, branches, opts.get(b'rev')
5700 repo, repo, branches, opts.get(b'rev')
5707 )
5701 )
5708 other = hg.peer(repo, opts, dest)
5702 other = hg.peer(repo, opts, dest)
5709
5703
5710 try:
5704 try:
5711 if revs:
5705 if revs:
5712 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5706 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5713 if not revs:
5707 if not revs:
5714 raise error.InputError(
5708 raise error.InputError(
5715 _(b"specified revisions evaluate to an empty set"),
5709 _(b"specified revisions evaluate to an empty set"),
5716 hint=_(b"use different revision arguments"),
5710 hint=_(b"use different revision arguments"),
5717 )
5711 )
5718 elif path.pushrev:
5712 elif path.pushrev:
5719 # It doesn't make any sense to specify ancestor revisions. So limit
5713 # It doesn't make any sense to specify ancestor revisions. So limit
5720 # to DAG heads to make discovery simpler.
5714 # to DAG heads to make discovery simpler.
5721 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5715 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5722 revs = scmutil.revrange(repo, [expr])
5716 revs = scmutil.revrange(repo, [expr])
5723 revs = [repo[rev].node() for rev in revs]
5717 revs = [repo[rev].node() for rev in revs]
5724 if not revs:
5718 if not revs:
5725 raise error.InputError(
5719 raise error.InputError(
5726 _(
5720 _(
5727 b'default push revset for path evaluates to an empty set'
5721 b'default push revset for path evaluates to an empty set'
5728 )
5722 )
5729 )
5723 )
5730 elif ui.configbool(b'commands', b'push.require-revs'):
5724 elif ui.configbool(b'commands', b'push.require-revs'):
5731 raise error.InputError(
5725 raise error.InputError(
5732 _(b'no revisions specified to push'),
5726 _(b'no revisions specified to push'),
5733 hint=_(b'did you mean "hg push -r ."?'),
5727 hint=_(b'did you mean "hg push -r ."?'),
5734 )
5728 )
5735
5729
5736 repo._subtoppath = dest
5730 repo._subtoppath = dest
5737 try:
5731 try:
5738 # push subrepos depth-first for coherent ordering
5732 # push subrepos depth-first for coherent ordering
5739 c = repo[b'.']
5733 c = repo[b'.']
5740 subs = c.substate # only repos that are committed
5734 subs = c.substate # only repos that are committed
5741 for s in sorted(subs):
5735 for s in sorted(subs):
5742 sub_result = c.sub(s).push(opts)
5736 sub_result = c.sub(s).push(opts)
5743 if sub_result == 0:
5737 if sub_result == 0:
5744 return 1
5738 return 1
5745 finally:
5739 finally:
5746 del repo._subtoppath
5740 del repo._subtoppath
5747
5741
5748 opargs = dict(
5742 opargs = dict(
5749 opts.get(b'opargs', {})
5743 opts.get(b'opargs', {})
5750 ) # copy opargs since we may mutate it
5744 ) # copy opargs since we may mutate it
5751 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5745 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5752
5746
5753 pushop = exchange.push(
5747 pushop = exchange.push(
5754 repo,
5748 repo,
5755 other,
5749 other,
5756 opts.get(b'force'),
5750 opts.get(b'force'),
5757 revs=revs,
5751 revs=revs,
5758 newbranch=opts.get(b'new_branch'),
5752 newbranch=opts.get(b'new_branch'),
5759 bookmarks=opts.get(b'bookmark', ()),
5753 bookmarks=opts.get(b'bookmark', ()),
5760 publish=opts.get(b'publish'),
5754 publish=opts.get(b'publish'),
5761 opargs=opargs,
5755 opargs=opargs,
5762 )
5756 )
5763
5757
5764 if pushop.cgresult == 0:
5758 if pushop.cgresult == 0:
5765 result = 1
5759 result = 1
5766 elif pushop.cgresult is not None:
5760 elif pushop.cgresult is not None:
5767 some_pushed = True
5761 some_pushed = True
5768
5762
5769 if pushop.bkresult is not None:
5763 if pushop.bkresult is not None:
5770 if pushop.bkresult == 2:
5764 if pushop.bkresult == 2:
5771 result = 2
5765 result = 2
5772 elif not result and pushop.bkresult:
5766 elif not result and pushop.bkresult:
5773 result = 2
5767 result = 2
5774
5768
5775 if result:
5769 if result:
5776 break
5770 break
5777
5771
5778 finally:
5772 finally:
5779 other.close()
5773 other.close()
5780 if result == 0 and not some_pushed:
5774 if result == 0 and not some_pushed:
5781 result = 1
5775 result = 1
5782 return result
5776 return result
5783
5777
5784
5778
5785 @command(
5779 @command(
5786 b'recover',
5780 b'recover',
5787 [
5781 [
5788 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5782 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5789 ],
5783 ],
5790 helpcategory=command.CATEGORY_MAINTENANCE,
5784 helpcategory=command.CATEGORY_MAINTENANCE,
5791 )
5785 )
5792 def recover(ui, repo, **opts):
5786 def recover(ui, repo, **opts):
5793 """roll back an interrupted transaction
5787 """roll back an interrupted transaction
5794
5788
5795 Recover from an interrupted commit or pull.
5789 Recover from an interrupted commit or pull.
5796
5790
5797 This command tries to fix the repository status after an
5791 This command tries to fix the repository status after an
5798 interrupted operation. It should only be necessary when Mercurial
5792 interrupted operation. It should only be necessary when Mercurial
5799 suggests it.
5793 suggests it.
5800
5794
5801 Returns 0 if successful, 1 if nothing to recover or verify fails.
5795 Returns 0 if successful, 1 if nothing to recover or verify fails.
5802 """
5796 """
5803 ret = repo.recover()
5797 ret = repo.recover()
5804 if ret:
5798 if ret:
5805 if opts['verify']:
5799 if opts['verify']:
5806 return hg.verify(repo)
5800 return hg.verify(repo)
5807 else:
5801 else:
5808 msg = _(
5802 msg = _(
5809 b"(verify step skipped, run `hg verify` to check your "
5803 b"(verify step skipped, run `hg verify` to check your "
5810 b"repository content)\n"
5804 b"repository content)\n"
5811 )
5805 )
5812 ui.warn(msg)
5806 ui.warn(msg)
5813 return 0
5807 return 0
5814 return 1
5808 return 1
5815
5809
5816
5810
5817 @command(
5811 @command(
5818 b'remove|rm',
5812 b'remove|rm',
5819 [
5813 [
5820 (b'A', b'after', None, _(b'record delete for missing files')),
5814 (b'A', b'after', None, _(b'record delete for missing files')),
5821 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5815 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5822 ]
5816 ]
5823 + subrepoopts
5817 + subrepoopts
5824 + walkopts
5818 + walkopts
5825 + dryrunopts,
5819 + dryrunopts,
5826 _(b'[OPTION]... FILE...'),
5820 _(b'[OPTION]... FILE...'),
5827 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5821 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5828 helpbasic=True,
5822 helpbasic=True,
5829 inferrepo=True,
5823 inferrepo=True,
5830 )
5824 )
5831 def remove(ui, repo, *pats, **opts):
5825 def remove(ui, repo, *pats, **opts):
5832 """remove the specified files on the next commit
5826 """remove the specified files on the next commit
5833
5827
5834 Schedule the indicated files for removal from the current branch.
5828 Schedule the indicated files for removal from the current branch.
5835
5829
5836 This command schedules the files to be removed at the next commit.
5830 This command schedules the files to be removed at the next commit.
5837 To undo a remove before that, see :hg:`revert`. To undo added
5831 To undo a remove before that, see :hg:`revert`. To undo added
5838 files, see :hg:`forget`.
5832 files, see :hg:`forget`.
5839
5833
5840 .. container:: verbose
5834 .. container:: verbose
5841
5835
5842 -A/--after can be used to remove only files that have already
5836 -A/--after can be used to remove only files that have already
5843 been deleted, -f/--force can be used to force deletion, and -Af
5837 been deleted, -f/--force can be used to force deletion, and -Af
5844 can be used to remove files from the next revision without
5838 can be used to remove files from the next revision without
5845 deleting them from the working directory.
5839 deleting them from the working directory.
5846
5840
5847 The following table details the behavior of remove for different
5841 The following table details the behavior of remove for different
5848 file states (columns) and option combinations (rows). The file
5842 file states (columns) and option combinations (rows). The file
5849 states are Added [A], Clean [C], Modified [M] and Missing [!]
5843 states are Added [A], Clean [C], Modified [M] and Missing [!]
5850 (as reported by :hg:`status`). The actions are Warn, Remove
5844 (as reported by :hg:`status`). The actions are Warn, Remove
5851 (from branch) and Delete (from disk):
5845 (from branch) and Delete (from disk):
5852
5846
5853 ========= == == == ==
5847 ========= == == == ==
5854 opt/state A C M !
5848 opt/state A C M !
5855 ========= == == == ==
5849 ========= == == == ==
5856 none W RD W R
5850 none W RD W R
5857 -f R RD RD R
5851 -f R RD RD R
5858 -A W W W R
5852 -A W W W R
5859 -Af R R R R
5853 -Af R R R R
5860 ========= == == == ==
5854 ========= == == == ==
5861
5855
5862 .. note::
5856 .. note::
5863
5857
5864 :hg:`remove` never deletes files in Added [A] state from the
5858 :hg:`remove` never deletes files in Added [A] state from the
5865 working directory, not even if ``--force`` is specified.
5859 working directory, not even if ``--force`` is specified.
5866
5860
5867 Returns 0 on success, 1 if any warnings encountered.
5861 Returns 0 on success, 1 if any warnings encountered.
5868 """
5862 """
5869
5863
5870 opts = pycompat.byteskwargs(opts)
5864 opts = pycompat.byteskwargs(opts)
5871 after, force = opts.get(b'after'), opts.get(b'force')
5865 after, force = opts.get(b'after'), opts.get(b'force')
5872 dryrun = opts.get(b'dry_run')
5866 dryrun = opts.get(b'dry_run')
5873 if not pats and not after:
5867 if not pats and not after:
5874 raise error.InputError(_(b'no files specified'))
5868 raise error.InputError(_(b'no files specified'))
5875
5869
5876 m = scmutil.match(repo[None], pats, opts)
5870 m = scmutil.match(repo[None], pats, opts)
5877 subrepos = opts.get(b'subrepos')
5871 subrepos = opts.get(b'subrepos')
5878 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5872 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5879 return cmdutil.remove(
5873 return cmdutil.remove(
5880 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5874 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5881 )
5875 )
5882
5876
5883
5877
5884 @command(
5878 @command(
5885 b'rename|move|mv',
5879 b'rename|move|mv',
5886 [
5880 [
5887 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5881 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5888 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5882 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5889 (
5883 (
5890 b'',
5884 b'',
5891 b'at-rev',
5885 b'at-rev',
5892 b'',
5886 b'',
5893 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5887 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5894 _(b'REV'),
5888 _(b'REV'),
5895 ),
5889 ),
5896 (
5890 (
5897 b'f',
5891 b'f',
5898 b'force',
5892 b'force',
5899 None,
5893 None,
5900 _(b'forcibly move over an existing managed file'),
5894 _(b'forcibly move over an existing managed file'),
5901 ),
5895 ),
5902 ]
5896 ]
5903 + walkopts
5897 + walkopts
5904 + dryrunopts,
5898 + dryrunopts,
5905 _(b'[OPTION]... SOURCE... DEST'),
5899 _(b'[OPTION]... SOURCE... DEST'),
5906 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5900 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5907 )
5901 )
5908 def rename(ui, repo, *pats, **opts):
5902 def rename(ui, repo, *pats, **opts):
5909 """rename files; equivalent of copy + remove
5903 """rename files; equivalent of copy + remove
5910
5904
5911 Mark dest as copies of sources; mark sources for deletion. If dest
5905 Mark dest as copies of sources; mark sources for deletion. If dest
5912 is a directory, copies are put in that directory. If dest is a
5906 is a directory, copies are put in that directory. If dest is a
5913 file, there can only be one source.
5907 file, there can only be one source.
5914
5908
5915 By default, this command copies the contents of files as they
5909 By default, this command copies the contents of files as they
5916 exist in the working directory. If invoked with -A/--after, the
5910 exist in the working directory. If invoked with -A/--after, the
5917 operation is recorded, but no copying is performed.
5911 operation is recorded, but no copying is performed.
5918
5912
5919 To undo marking a destination file as renamed, use --forget. With that
5913 To undo marking a destination file as renamed, use --forget. With that
5920 option, all given (positional) arguments are unmarked as renames. The
5914 option, all given (positional) arguments are unmarked as renames. The
5921 destination file(s) will be left in place (still tracked). The source
5915 destination file(s) will be left in place (still tracked). The source
5922 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5916 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5923 the same way as :hg:`copy --forget`.
5917 the same way as :hg:`copy --forget`.
5924
5918
5925 This command takes effect with the next commit by default.
5919 This command takes effect with the next commit by default.
5926
5920
5927 Returns 0 on success, 1 if errors are encountered.
5921 Returns 0 on success, 1 if errors are encountered.
5928 """
5922 """
5929 opts = pycompat.byteskwargs(opts)
5923 opts = pycompat.byteskwargs(opts)
5930 with repo.wlock():
5924 with repo.wlock():
5931 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5925 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5932
5926
5933
5927
5934 @command(
5928 @command(
5935 b'resolve',
5929 b'resolve',
5936 [
5930 [
5937 (b'a', b'all', None, _(b'select all unresolved files')),
5931 (b'a', b'all', None, _(b'select all unresolved files')),
5938 (b'l', b'list', None, _(b'list state of files needing merge')),
5932 (b'l', b'list', None, _(b'list state of files needing merge')),
5939 (b'm', b'mark', None, _(b'mark files as resolved')),
5933 (b'm', b'mark', None, _(b'mark files as resolved')),
5940 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5934 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5941 (b'n', b'no-status', None, _(b'hide status prefix')),
5935 (b'n', b'no-status', None, _(b'hide status prefix')),
5942 (b'', b're-merge', None, _(b're-merge files')),
5936 (b'', b're-merge', None, _(b're-merge files')),
5943 ]
5937 ]
5944 + mergetoolopts
5938 + mergetoolopts
5945 + walkopts
5939 + walkopts
5946 + formatteropts,
5940 + formatteropts,
5947 _(b'[OPTION]... [FILE]...'),
5941 _(b'[OPTION]... [FILE]...'),
5948 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5942 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5949 inferrepo=True,
5943 inferrepo=True,
5950 )
5944 )
5951 def resolve(ui, repo, *pats, **opts):
5945 def resolve(ui, repo, *pats, **opts):
5952 """redo merges or set/view the merge status of files
5946 """redo merges or set/view the merge status of files
5953
5947
5954 Merges with unresolved conflicts are often the result of
5948 Merges with unresolved conflicts are often the result of
5955 non-interactive merging using the ``internal:merge`` configuration
5949 non-interactive merging using the ``internal:merge`` configuration
5956 setting, or a command-line merge tool like ``diff3``. The resolve
5950 setting, or a command-line merge tool like ``diff3``. The resolve
5957 command is used to manage the files involved in a merge, after
5951 command is used to manage the files involved in a merge, after
5958 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5952 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5959 working directory must have two parents). See :hg:`help
5953 working directory must have two parents). See :hg:`help
5960 merge-tools` for information on configuring merge tools.
5954 merge-tools` for information on configuring merge tools.
5961
5955
5962 The resolve command can be used in the following ways:
5956 The resolve command can be used in the following ways:
5963
5957
5964 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5958 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5965 the specified files, discarding any previous merge attempts. Re-merging
5959 the specified files, discarding any previous merge attempts. Re-merging
5966 is not performed for files already marked as resolved. Use ``--all/-a``
5960 is not performed for files already marked as resolved. Use ``--all/-a``
5967 to select all unresolved files. ``--tool`` can be used to specify
5961 to select all unresolved files. ``--tool`` can be used to specify
5968 the merge tool used for the given files. It overrides the HGMERGE
5962 the merge tool used for the given files. It overrides the HGMERGE
5969 environment variable and your configuration files. Previous file
5963 environment variable and your configuration files. Previous file
5970 contents are saved with a ``.orig`` suffix.
5964 contents are saved with a ``.orig`` suffix.
5971
5965
5972 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5966 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5973 (e.g. after having manually fixed-up the files). The default is
5967 (e.g. after having manually fixed-up the files). The default is
5974 to mark all unresolved files.
5968 to mark all unresolved files.
5975
5969
5976 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5970 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5977 default is to mark all resolved files.
5971 default is to mark all resolved files.
5978
5972
5979 - :hg:`resolve -l`: list files which had or still have conflicts.
5973 - :hg:`resolve -l`: list files which had or still have conflicts.
5980 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5974 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5981 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5975 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5982 the list. See :hg:`help filesets` for details.
5976 the list. See :hg:`help filesets` for details.
5983
5977
5984 .. note::
5978 .. note::
5985
5979
5986 Mercurial will not let you commit files with unresolved merge
5980 Mercurial will not let you commit files with unresolved merge
5987 conflicts. You must use :hg:`resolve -m ...` before you can
5981 conflicts. You must use :hg:`resolve -m ...` before you can
5988 commit after a conflicting merge.
5982 commit after a conflicting merge.
5989
5983
5990 .. container:: verbose
5984 .. container:: verbose
5991
5985
5992 Template:
5986 Template:
5993
5987
5994 The following keywords are supported in addition to the common template
5988 The following keywords are supported in addition to the common template
5995 keywords and functions. See also :hg:`help templates`.
5989 keywords and functions. See also :hg:`help templates`.
5996
5990
5997 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5991 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5998 :path: String. Repository-absolute path of the file.
5992 :path: String. Repository-absolute path of the file.
5999
5993
6000 Returns 0 on success, 1 if any files fail a resolve attempt.
5994 Returns 0 on success, 1 if any files fail a resolve attempt.
6001 """
5995 """
6002
5996
6003 opts = pycompat.byteskwargs(opts)
5997 opts = pycompat.byteskwargs(opts)
6004 confirm = ui.configbool(b'commands', b'resolve.confirm')
5998 confirm = ui.configbool(b'commands', b'resolve.confirm')
6005 flaglist = b'all mark unmark list no_status re_merge'.split()
5999 flaglist = b'all mark unmark list no_status re_merge'.split()
6006 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6000 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6007
6001
6008 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6002 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6009 if actioncount > 1:
6003 if actioncount > 1:
6010 raise error.InputError(_(b"too many actions specified"))
6004 raise error.InputError(_(b"too many actions specified"))
6011 elif actioncount == 0 and ui.configbool(
6005 elif actioncount == 0 and ui.configbool(
6012 b'commands', b'resolve.explicit-re-merge'
6006 b'commands', b'resolve.explicit-re-merge'
6013 ):
6007 ):
6014 hint = _(b'use --mark, --unmark, --list or --re-merge')
6008 hint = _(b'use --mark, --unmark, --list or --re-merge')
6015 raise error.InputError(_(b'no action specified'), hint=hint)
6009 raise error.InputError(_(b'no action specified'), hint=hint)
6016 if pats and all:
6010 if pats and all:
6017 raise error.InputError(_(b"can't specify --all and patterns"))
6011 raise error.InputError(_(b"can't specify --all and patterns"))
6018 if not (all or pats or show or mark or unmark):
6012 if not (all or pats or show or mark or unmark):
6019 raise error.InputError(
6013 raise error.InputError(
6020 _(b'no files or directories specified'),
6014 _(b'no files or directories specified'),
6021 hint=b'use --all to re-merge all unresolved files',
6015 hint=b'use --all to re-merge all unresolved files',
6022 )
6016 )
6023
6017
6024 if confirm:
6018 if confirm:
6025 if all:
6019 if all:
6026 if ui.promptchoice(
6020 if ui.promptchoice(
6027 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6021 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6028 ):
6022 ):
6029 raise error.CanceledError(_(b'user quit'))
6023 raise error.CanceledError(_(b'user quit'))
6030 if mark and not pats:
6024 if mark and not pats:
6031 if ui.promptchoice(
6025 if ui.promptchoice(
6032 _(
6026 _(
6033 b'mark all unresolved files as resolved (yn)?'
6027 b'mark all unresolved files as resolved (yn)?'
6034 b'$$ &Yes $$ &No'
6028 b'$$ &Yes $$ &No'
6035 )
6029 )
6036 ):
6030 ):
6037 raise error.CanceledError(_(b'user quit'))
6031 raise error.CanceledError(_(b'user quit'))
6038 if unmark and not pats:
6032 if unmark and not pats:
6039 if ui.promptchoice(
6033 if ui.promptchoice(
6040 _(
6034 _(
6041 b'mark all resolved files as unresolved (yn)?'
6035 b'mark all resolved files as unresolved (yn)?'
6042 b'$$ &Yes $$ &No'
6036 b'$$ &Yes $$ &No'
6043 )
6037 )
6044 ):
6038 ):
6045 raise error.CanceledError(_(b'user quit'))
6039 raise error.CanceledError(_(b'user quit'))
6046
6040
6047 uipathfn = scmutil.getuipathfn(repo)
6041 uipathfn = scmutil.getuipathfn(repo)
6048
6042
6049 if show:
6043 if show:
6050 ui.pager(b'resolve')
6044 ui.pager(b'resolve')
6051 fm = ui.formatter(b'resolve', opts)
6045 fm = ui.formatter(b'resolve', opts)
6052 ms = mergestatemod.mergestate.read(repo)
6046 ms = mergestatemod.mergestate.read(repo)
6053 wctx = repo[None]
6047 wctx = repo[None]
6054 m = scmutil.match(wctx, pats, opts)
6048 m = scmutil.match(wctx, pats, opts)
6055
6049
6056 # Labels and keys based on merge state. Unresolved path conflicts show
6050 # Labels and keys based on merge state. Unresolved path conflicts show
6057 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6051 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6058 # resolved conflicts.
6052 # resolved conflicts.
6059 mergestateinfo = {
6053 mergestateinfo = {
6060 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6054 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6061 b'resolve.unresolved',
6055 b'resolve.unresolved',
6062 b'U',
6056 b'U',
6063 ),
6057 ),
6064 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6058 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6065 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6059 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6066 b'resolve.unresolved',
6060 b'resolve.unresolved',
6067 b'P',
6061 b'P',
6068 ),
6062 ),
6069 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6063 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6070 b'resolve.resolved',
6064 b'resolve.resolved',
6071 b'R',
6065 b'R',
6072 ),
6066 ),
6073 }
6067 }
6074
6068
6075 for f in ms:
6069 for f in ms:
6076 if not m(f):
6070 if not m(f):
6077 continue
6071 continue
6078
6072
6079 label, key = mergestateinfo[ms[f]]
6073 label, key = mergestateinfo[ms[f]]
6080 fm.startitem()
6074 fm.startitem()
6081 fm.context(ctx=wctx)
6075 fm.context(ctx=wctx)
6082 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6076 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6083 fm.data(path=f)
6077 fm.data(path=f)
6084 fm.plain(b'%s\n' % uipathfn(f), label=label)
6078 fm.plain(b'%s\n' % uipathfn(f), label=label)
6085 fm.end()
6079 fm.end()
6086 return 0
6080 return 0
6087
6081
6088 with repo.wlock():
6082 with repo.wlock():
6089 ms = mergestatemod.mergestate.read(repo)
6083 ms = mergestatemod.mergestate.read(repo)
6090
6084
6091 if not (ms.active() or repo.dirstate.p2() != nullid):
6085 if not (ms.active() or repo.dirstate.p2() != nullid):
6092 raise error.StateError(
6086 raise error.StateError(
6093 _(b'resolve command not applicable when not merging')
6087 _(b'resolve command not applicable when not merging')
6094 )
6088 )
6095
6089
6096 wctx = repo[None]
6090 wctx = repo[None]
6097 m = scmutil.match(wctx, pats, opts)
6091 m = scmutil.match(wctx, pats, opts)
6098 ret = 0
6092 ret = 0
6099 didwork = False
6093 didwork = False
6100
6094
6101 tocomplete = []
6095 tocomplete = []
6102 hasconflictmarkers = []
6096 hasconflictmarkers = []
6103 if mark:
6097 if mark:
6104 markcheck = ui.config(b'commands', b'resolve.mark-check')
6098 markcheck = ui.config(b'commands', b'resolve.mark-check')
6105 if markcheck not in [b'warn', b'abort']:
6099 if markcheck not in [b'warn', b'abort']:
6106 # Treat all invalid / unrecognized values as 'none'.
6100 # Treat all invalid / unrecognized values as 'none'.
6107 markcheck = False
6101 markcheck = False
6108 for f in ms:
6102 for f in ms:
6109 if not m(f):
6103 if not m(f):
6110 continue
6104 continue
6111
6105
6112 didwork = True
6106 didwork = True
6113
6107
6114 # path conflicts must be resolved manually
6108 # path conflicts must be resolved manually
6115 if ms[f] in (
6109 if ms[f] in (
6116 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6110 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6117 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6111 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6118 ):
6112 ):
6119 if mark:
6113 if mark:
6120 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6114 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6121 elif unmark:
6115 elif unmark:
6122 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6116 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6123 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6117 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6124 ui.warn(
6118 ui.warn(
6125 _(b'%s: path conflict must be resolved manually\n')
6119 _(b'%s: path conflict must be resolved manually\n')
6126 % uipathfn(f)
6120 % uipathfn(f)
6127 )
6121 )
6128 continue
6122 continue
6129
6123
6130 if mark:
6124 if mark:
6131 if markcheck:
6125 if markcheck:
6132 fdata = repo.wvfs.tryread(f)
6126 fdata = repo.wvfs.tryread(f)
6133 if (
6127 if (
6134 filemerge.hasconflictmarkers(fdata)
6128 filemerge.hasconflictmarkers(fdata)
6135 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6129 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6136 ):
6130 ):
6137 hasconflictmarkers.append(f)
6131 hasconflictmarkers.append(f)
6138 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6132 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6139 elif unmark:
6133 elif unmark:
6140 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6134 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6141 else:
6135 else:
6142 # backup pre-resolve (merge uses .orig for its own purposes)
6136 # backup pre-resolve (merge uses .orig for its own purposes)
6143 a = repo.wjoin(f)
6137 a = repo.wjoin(f)
6144 try:
6138 try:
6145 util.copyfile(a, a + b".resolve")
6139 util.copyfile(a, a + b".resolve")
6146 except (IOError, OSError) as inst:
6140 except (IOError, OSError) as inst:
6147 if inst.errno != errno.ENOENT:
6141 if inst.errno != errno.ENOENT:
6148 raise
6142 raise
6149
6143
6150 try:
6144 try:
6151 # preresolve file
6145 # preresolve file
6152 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6146 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6153 with ui.configoverride(overrides, b'resolve'):
6147 with ui.configoverride(overrides, b'resolve'):
6154 complete, r = ms.preresolve(f, wctx)
6148 complete, r = ms.preresolve(f, wctx)
6155 if not complete:
6149 if not complete:
6156 tocomplete.append(f)
6150 tocomplete.append(f)
6157 elif r:
6151 elif r:
6158 ret = 1
6152 ret = 1
6159 finally:
6153 finally:
6160 ms.commit()
6154 ms.commit()
6161
6155
6162 # replace filemerge's .orig file with our resolve file, but only
6156 # replace filemerge's .orig file with our resolve file, but only
6163 # for merges that are complete
6157 # for merges that are complete
6164 if complete:
6158 if complete:
6165 try:
6159 try:
6166 util.rename(
6160 util.rename(
6167 a + b".resolve", scmutil.backuppath(ui, repo, f)
6161 a + b".resolve", scmutil.backuppath(ui, repo, f)
6168 )
6162 )
6169 except OSError as inst:
6163 except OSError as inst:
6170 if inst.errno != errno.ENOENT:
6164 if inst.errno != errno.ENOENT:
6171 raise
6165 raise
6172
6166
6173 if hasconflictmarkers:
6167 if hasconflictmarkers:
6174 ui.warn(
6168 ui.warn(
6175 _(
6169 _(
6176 b'warning: the following files still have conflict '
6170 b'warning: the following files still have conflict '
6177 b'markers:\n'
6171 b'markers:\n'
6178 )
6172 )
6179 + b''.join(
6173 + b''.join(
6180 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6174 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6181 )
6175 )
6182 )
6176 )
6183 if markcheck == b'abort' and not all and not pats:
6177 if markcheck == b'abort' and not all and not pats:
6184 raise error.StateError(
6178 raise error.StateError(
6185 _(b'conflict markers detected'),
6179 _(b'conflict markers detected'),
6186 hint=_(b'use --all to mark anyway'),
6180 hint=_(b'use --all to mark anyway'),
6187 )
6181 )
6188
6182
6189 for f in tocomplete:
6183 for f in tocomplete:
6190 try:
6184 try:
6191 # resolve file
6185 # resolve file
6192 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6186 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6193 with ui.configoverride(overrides, b'resolve'):
6187 with ui.configoverride(overrides, b'resolve'):
6194 r = ms.resolve(f, wctx)
6188 r = ms.resolve(f, wctx)
6195 if r:
6189 if r:
6196 ret = 1
6190 ret = 1
6197 finally:
6191 finally:
6198 ms.commit()
6192 ms.commit()
6199
6193
6200 # replace filemerge's .orig file with our resolve file
6194 # replace filemerge's .orig file with our resolve file
6201 a = repo.wjoin(f)
6195 a = repo.wjoin(f)
6202 try:
6196 try:
6203 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6197 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6204 except OSError as inst:
6198 except OSError as inst:
6205 if inst.errno != errno.ENOENT:
6199 if inst.errno != errno.ENOENT:
6206 raise
6200 raise
6207
6201
6208 ms.commit()
6202 ms.commit()
6209 branchmerge = repo.dirstate.p2() != nullid
6203 branchmerge = repo.dirstate.p2() != nullid
6210 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6204 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6211
6205
6212 if not didwork and pats:
6206 if not didwork and pats:
6213 hint = None
6207 hint = None
6214 if not any([p for p in pats if p.find(b':') >= 0]):
6208 if not any([p for p in pats if p.find(b':') >= 0]):
6215 pats = [b'path:%s' % p for p in pats]
6209 pats = [b'path:%s' % p for p in pats]
6216 m = scmutil.match(wctx, pats, opts)
6210 m = scmutil.match(wctx, pats, opts)
6217 for f in ms:
6211 for f in ms:
6218 if not m(f):
6212 if not m(f):
6219 continue
6213 continue
6220
6214
6221 def flag(o):
6215 def flag(o):
6222 if o == b're_merge':
6216 if o == b're_merge':
6223 return b'--re-merge '
6217 return b'--re-merge '
6224 return b'-%s ' % o[0:1]
6218 return b'-%s ' % o[0:1]
6225
6219
6226 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6220 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6227 hint = _(b"(try: hg resolve %s%s)\n") % (
6221 hint = _(b"(try: hg resolve %s%s)\n") % (
6228 flags,
6222 flags,
6229 b' '.join(pats),
6223 b' '.join(pats),
6230 )
6224 )
6231 break
6225 break
6232 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6226 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6233 if hint:
6227 if hint:
6234 ui.warn(hint)
6228 ui.warn(hint)
6235
6229
6236 unresolvedf = ms.unresolvedcount()
6230 unresolvedf = ms.unresolvedcount()
6237 if not unresolvedf:
6231 if not unresolvedf:
6238 ui.status(_(b'(no more unresolved files)\n'))
6232 ui.status(_(b'(no more unresolved files)\n'))
6239 cmdutil.checkafterresolved(repo)
6233 cmdutil.checkafterresolved(repo)
6240
6234
6241 return ret
6235 return ret
6242
6236
6243
6237
6244 @command(
6238 @command(
6245 b'revert',
6239 b'revert',
6246 [
6240 [
6247 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6241 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6248 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6242 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6249 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6243 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6250 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6244 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6251 (b'i', b'interactive', None, _(b'interactively select the changes')),
6245 (b'i', b'interactive', None, _(b'interactively select the changes')),
6252 ]
6246 ]
6253 + walkopts
6247 + walkopts
6254 + dryrunopts,
6248 + dryrunopts,
6255 _(b'[OPTION]... [-r REV] [NAME]...'),
6249 _(b'[OPTION]... [-r REV] [NAME]...'),
6256 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6250 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6257 )
6251 )
6258 def revert(ui, repo, *pats, **opts):
6252 def revert(ui, repo, *pats, **opts):
6259 """restore files to their checkout state
6253 """restore files to their checkout state
6260
6254
6261 .. note::
6255 .. note::
6262
6256
6263 To check out earlier revisions, you should use :hg:`update REV`.
6257 To check out earlier revisions, you should use :hg:`update REV`.
6264 To cancel an uncommitted merge (and lose your changes),
6258 To cancel an uncommitted merge (and lose your changes),
6265 use :hg:`merge --abort`.
6259 use :hg:`merge --abort`.
6266
6260
6267 With no revision specified, revert the specified files or directories
6261 With no revision specified, revert the specified files or directories
6268 to the contents they had in the parent of the working directory.
6262 to the contents they had in the parent of the working directory.
6269 This restores the contents of files to an unmodified
6263 This restores the contents of files to an unmodified
6270 state and unschedules adds, removes, copies, and renames. If the
6264 state and unschedules adds, removes, copies, and renames. If the
6271 working directory has two parents, you must explicitly specify a
6265 working directory has two parents, you must explicitly specify a
6272 revision.
6266 revision.
6273
6267
6274 Using the -r/--rev or -d/--date options, revert the given files or
6268 Using the -r/--rev or -d/--date options, revert the given files or
6275 directories to their states as of a specific revision. Because
6269 directories to their states as of a specific revision. Because
6276 revert does not change the working directory parents, this will
6270 revert does not change the working directory parents, this will
6277 cause these files to appear modified. This can be helpful to "back
6271 cause these files to appear modified. This can be helpful to "back
6278 out" some or all of an earlier change. See :hg:`backout` for a
6272 out" some or all of an earlier change. See :hg:`backout` for a
6279 related method.
6273 related method.
6280
6274
6281 Modified files are saved with a .orig suffix before reverting.
6275 Modified files are saved with a .orig suffix before reverting.
6282 To disable these backups, use --no-backup. It is possible to store
6276 To disable these backups, use --no-backup. It is possible to store
6283 the backup files in a custom directory relative to the root of the
6277 the backup files in a custom directory relative to the root of the
6284 repository by setting the ``ui.origbackuppath`` configuration
6278 repository by setting the ``ui.origbackuppath`` configuration
6285 option.
6279 option.
6286
6280
6287 See :hg:`help dates` for a list of formats valid for -d/--date.
6281 See :hg:`help dates` for a list of formats valid for -d/--date.
6288
6282
6289 See :hg:`help backout` for a way to reverse the effect of an
6283 See :hg:`help backout` for a way to reverse the effect of an
6290 earlier changeset.
6284 earlier changeset.
6291
6285
6292 Returns 0 on success.
6286 Returns 0 on success.
6293 """
6287 """
6294
6288
6295 opts = pycompat.byteskwargs(opts)
6289 opts = pycompat.byteskwargs(opts)
6296 if opts.get(b"date"):
6290 if opts.get(b"date"):
6297 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6291 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6298 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6292 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6299
6293
6300 parent, p2 = repo.dirstate.parents()
6294 parent, p2 = repo.dirstate.parents()
6301 if not opts.get(b'rev') and p2 != nullid:
6295 if not opts.get(b'rev') and p2 != nullid:
6302 # revert after merge is a trap for new users (issue2915)
6296 # revert after merge is a trap for new users (issue2915)
6303 raise error.InputError(
6297 raise error.InputError(
6304 _(b'uncommitted merge with no revision specified'),
6298 _(b'uncommitted merge with no revision specified'),
6305 hint=_(b"use 'hg update' or see 'hg help revert'"),
6299 hint=_(b"use 'hg update' or see 'hg help revert'"),
6306 )
6300 )
6307
6301
6308 rev = opts.get(b'rev')
6302 rev = opts.get(b'rev')
6309 if rev:
6303 if rev:
6310 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6304 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6311 ctx = scmutil.revsingle(repo, rev)
6305 ctx = scmutil.revsingle(repo, rev)
6312
6306
6313 if not (
6307 if not (
6314 pats
6308 pats
6315 or opts.get(b'include')
6309 or opts.get(b'include')
6316 or opts.get(b'exclude')
6310 or opts.get(b'exclude')
6317 or opts.get(b'all')
6311 or opts.get(b'all')
6318 or opts.get(b'interactive')
6312 or opts.get(b'interactive')
6319 ):
6313 ):
6320 msg = _(b"no files or directories specified")
6314 msg = _(b"no files or directories specified")
6321 if p2 != nullid:
6315 if p2 != nullid:
6322 hint = _(
6316 hint = _(
6323 b"uncommitted merge, use --all to discard all changes,"
6317 b"uncommitted merge, use --all to discard all changes,"
6324 b" or 'hg update -C .' to abort the merge"
6318 b" or 'hg update -C .' to abort the merge"
6325 )
6319 )
6326 raise error.InputError(msg, hint=hint)
6320 raise error.InputError(msg, hint=hint)
6327 dirty = any(repo.status())
6321 dirty = any(repo.status())
6328 node = ctx.node()
6322 node = ctx.node()
6329 if node != parent:
6323 if node != parent:
6330 if dirty:
6324 if dirty:
6331 hint = (
6325 hint = (
6332 _(
6326 _(
6333 b"uncommitted changes, use --all to discard all"
6327 b"uncommitted changes, use --all to discard all"
6334 b" changes, or 'hg update %d' to update"
6328 b" changes, or 'hg update %d' to update"
6335 )
6329 )
6336 % ctx.rev()
6330 % ctx.rev()
6337 )
6331 )
6338 else:
6332 else:
6339 hint = (
6333 hint = (
6340 _(
6334 _(
6341 b"use --all to revert all files,"
6335 b"use --all to revert all files,"
6342 b" or 'hg update %d' to update"
6336 b" or 'hg update %d' to update"
6343 )
6337 )
6344 % ctx.rev()
6338 % ctx.rev()
6345 )
6339 )
6346 elif dirty:
6340 elif dirty:
6347 hint = _(b"uncommitted changes, use --all to discard all changes")
6341 hint = _(b"uncommitted changes, use --all to discard all changes")
6348 else:
6342 else:
6349 hint = _(b"use --all to revert all files")
6343 hint = _(b"use --all to revert all files")
6350 raise error.InputError(msg, hint=hint)
6344 raise error.InputError(msg, hint=hint)
6351
6345
6352 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6346 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6353
6347
6354
6348
6355 @command(
6349 @command(
6356 b'rollback',
6350 b'rollback',
6357 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6351 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6358 helpcategory=command.CATEGORY_MAINTENANCE,
6352 helpcategory=command.CATEGORY_MAINTENANCE,
6359 )
6353 )
6360 def rollback(ui, repo, **opts):
6354 def rollback(ui, repo, **opts):
6361 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6355 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6362
6356
6363 Please use :hg:`commit --amend` instead of rollback to correct
6357 Please use :hg:`commit --amend` instead of rollback to correct
6364 mistakes in the last commit.
6358 mistakes in the last commit.
6365
6359
6366 This command should be used with care. There is only one level of
6360 This command should be used with care. There is only one level of
6367 rollback, and there is no way to undo a rollback. It will also
6361 rollback, and there is no way to undo a rollback. It will also
6368 restore the dirstate at the time of the last transaction, losing
6362 restore the dirstate at the time of the last transaction, losing
6369 any dirstate changes since that time. This command does not alter
6363 any dirstate changes since that time. This command does not alter
6370 the working directory.
6364 the working directory.
6371
6365
6372 Transactions are used to encapsulate the effects of all commands
6366 Transactions are used to encapsulate the effects of all commands
6373 that create new changesets or propagate existing changesets into a
6367 that create new changesets or propagate existing changesets into a
6374 repository.
6368 repository.
6375
6369
6376 .. container:: verbose
6370 .. container:: verbose
6377
6371
6378 For example, the following commands are transactional, and their
6372 For example, the following commands are transactional, and their
6379 effects can be rolled back:
6373 effects can be rolled back:
6380
6374
6381 - commit
6375 - commit
6382 - import
6376 - import
6383 - pull
6377 - pull
6384 - push (with this repository as the destination)
6378 - push (with this repository as the destination)
6385 - unbundle
6379 - unbundle
6386
6380
6387 To avoid permanent data loss, rollback will refuse to rollback a
6381 To avoid permanent data loss, rollback will refuse to rollback a
6388 commit transaction if it isn't checked out. Use --force to
6382 commit transaction if it isn't checked out. Use --force to
6389 override this protection.
6383 override this protection.
6390
6384
6391 The rollback command can be entirely disabled by setting the
6385 The rollback command can be entirely disabled by setting the
6392 ``ui.rollback`` configuration setting to false. If you're here
6386 ``ui.rollback`` configuration setting to false. If you're here
6393 because you want to use rollback and it's disabled, you can
6387 because you want to use rollback and it's disabled, you can
6394 re-enable the command by setting ``ui.rollback`` to true.
6388 re-enable the command by setting ``ui.rollback`` to true.
6395
6389
6396 This command is not intended for use on public repositories. Once
6390 This command is not intended for use on public repositories. Once
6397 changes are visible for pull by other users, rolling a transaction
6391 changes are visible for pull by other users, rolling a transaction
6398 back locally is ineffective (someone else may already have pulled
6392 back locally is ineffective (someone else may already have pulled
6399 the changes). Furthermore, a race is possible with readers of the
6393 the changes). Furthermore, a race is possible with readers of the
6400 repository; for example an in-progress pull from the repository
6394 repository; for example an in-progress pull from the repository
6401 may fail if a rollback is performed.
6395 may fail if a rollback is performed.
6402
6396
6403 Returns 0 on success, 1 if no rollback data is available.
6397 Returns 0 on success, 1 if no rollback data is available.
6404 """
6398 """
6405 if not ui.configbool(b'ui', b'rollback'):
6399 if not ui.configbool(b'ui', b'rollback'):
6406 raise error.Abort(
6400 raise error.Abort(
6407 _(b'rollback is disabled because it is unsafe'),
6401 _(b'rollback is disabled because it is unsafe'),
6408 hint=b'see `hg help -v rollback` for information',
6402 hint=b'see `hg help -v rollback` for information',
6409 )
6403 )
6410 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6404 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6411
6405
6412
6406
6413 @command(
6407 @command(
6414 b'root',
6408 b'root',
6415 [] + formatteropts,
6409 [] + formatteropts,
6416 intents={INTENT_READONLY},
6410 intents={INTENT_READONLY},
6417 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6411 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6418 )
6412 )
6419 def root(ui, repo, **opts):
6413 def root(ui, repo, **opts):
6420 """print the root (top) of the current working directory
6414 """print the root (top) of the current working directory
6421
6415
6422 Print the root directory of the current repository.
6416 Print the root directory of the current repository.
6423
6417
6424 .. container:: verbose
6418 .. container:: verbose
6425
6419
6426 Template:
6420 Template:
6427
6421
6428 The following keywords are supported in addition to the common template
6422 The following keywords are supported in addition to the common template
6429 keywords and functions. See also :hg:`help templates`.
6423 keywords and functions. See also :hg:`help templates`.
6430
6424
6431 :hgpath: String. Path to the .hg directory.
6425 :hgpath: String. Path to the .hg directory.
6432 :storepath: String. Path to the directory holding versioned data.
6426 :storepath: String. Path to the directory holding versioned data.
6433
6427
6434 Returns 0 on success.
6428 Returns 0 on success.
6435 """
6429 """
6436 opts = pycompat.byteskwargs(opts)
6430 opts = pycompat.byteskwargs(opts)
6437 with ui.formatter(b'root', opts) as fm:
6431 with ui.formatter(b'root', opts) as fm:
6438 fm.startitem()
6432 fm.startitem()
6439 fm.write(b'reporoot', b'%s\n', repo.root)
6433 fm.write(b'reporoot', b'%s\n', repo.root)
6440 fm.data(hgpath=repo.path, storepath=repo.spath)
6434 fm.data(hgpath=repo.path, storepath=repo.spath)
6441
6435
6442
6436
6443 @command(
6437 @command(
6444 b'serve',
6438 b'serve',
6445 [
6439 [
6446 (
6440 (
6447 b'A',
6441 b'A',
6448 b'accesslog',
6442 b'accesslog',
6449 b'',
6443 b'',
6450 _(b'name of access log file to write to'),
6444 _(b'name of access log file to write to'),
6451 _(b'FILE'),
6445 _(b'FILE'),
6452 ),
6446 ),
6453 (b'd', b'daemon', None, _(b'run server in background')),
6447 (b'd', b'daemon', None, _(b'run server in background')),
6454 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6448 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6455 (
6449 (
6456 b'E',
6450 b'E',
6457 b'errorlog',
6451 b'errorlog',
6458 b'',
6452 b'',
6459 _(b'name of error log file to write to'),
6453 _(b'name of error log file to write to'),
6460 _(b'FILE'),
6454 _(b'FILE'),
6461 ),
6455 ),
6462 # use string type, then we can check if something was passed
6456 # use string type, then we can check if something was passed
6463 (
6457 (
6464 b'p',
6458 b'p',
6465 b'port',
6459 b'port',
6466 b'',
6460 b'',
6467 _(b'port to listen on (default: 8000)'),
6461 _(b'port to listen on (default: 8000)'),
6468 _(b'PORT'),
6462 _(b'PORT'),
6469 ),
6463 ),
6470 (
6464 (
6471 b'a',
6465 b'a',
6472 b'address',
6466 b'address',
6473 b'',
6467 b'',
6474 _(b'address to listen on (default: all interfaces)'),
6468 _(b'address to listen on (default: all interfaces)'),
6475 _(b'ADDR'),
6469 _(b'ADDR'),
6476 ),
6470 ),
6477 (
6471 (
6478 b'',
6472 b'',
6479 b'prefix',
6473 b'prefix',
6480 b'',
6474 b'',
6481 _(b'prefix path to serve from (default: server root)'),
6475 _(b'prefix path to serve from (default: server root)'),
6482 _(b'PREFIX'),
6476 _(b'PREFIX'),
6483 ),
6477 ),
6484 (
6478 (
6485 b'n',
6479 b'n',
6486 b'name',
6480 b'name',
6487 b'',
6481 b'',
6488 _(b'name to show in web pages (default: working directory)'),
6482 _(b'name to show in web pages (default: working directory)'),
6489 _(b'NAME'),
6483 _(b'NAME'),
6490 ),
6484 ),
6491 (
6485 (
6492 b'',
6486 b'',
6493 b'web-conf',
6487 b'web-conf',
6494 b'',
6488 b'',
6495 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6489 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6496 _(b'FILE'),
6490 _(b'FILE'),
6497 ),
6491 ),
6498 (
6492 (
6499 b'',
6493 b'',
6500 b'webdir-conf',
6494 b'webdir-conf',
6501 b'',
6495 b'',
6502 _(b'name of the hgweb config file (DEPRECATED)'),
6496 _(b'name of the hgweb config file (DEPRECATED)'),
6503 _(b'FILE'),
6497 _(b'FILE'),
6504 ),
6498 ),
6505 (
6499 (
6506 b'',
6500 b'',
6507 b'pid-file',
6501 b'pid-file',
6508 b'',
6502 b'',
6509 _(b'name of file to write process ID to'),
6503 _(b'name of file to write process ID to'),
6510 _(b'FILE'),
6504 _(b'FILE'),
6511 ),
6505 ),
6512 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6506 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6513 (
6507 (
6514 b'',
6508 b'',
6515 b'cmdserver',
6509 b'cmdserver',
6516 b'',
6510 b'',
6517 _(b'for remote clients (ADVANCED)'),
6511 _(b'for remote clients (ADVANCED)'),
6518 _(b'MODE'),
6512 _(b'MODE'),
6519 ),
6513 ),
6520 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6514 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6521 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6515 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6522 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6516 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6523 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6517 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6524 (b'', b'print-url', None, _(b'start and print only the URL')),
6518 (b'', b'print-url', None, _(b'start and print only the URL')),
6525 ]
6519 ]
6526 + subrepoopts,
6520 + subrepoopts,
6527 _(b'[OPTION]...'),
6521 _(b'[OPTION]...'),
6528 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6522 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6529 helpbasic=True,
6523 helpbasic=True,
6530 optionalrepo=True,
6524 optionalrepo=True,
6531 )
6525 )
6532 def serve(ui, repo, **opts):
6526 def serve(ui, repo, **opts):
6533 """start stand-alone webserver
6527 """start stand-alone webserver
6534
6528
6535 Start a local HTTP repository browser and pull server. You can use
6529 Start a local HTTP repository browser and pull server. You can use
6536 this for ad-hoc sharing and browsing of repositories. It is
6530 this for ad-hoc sharing and browsing of repositories. It is
6537 recommended to use a real web server to serve a repository for
6531 recommended to use a real web server to serve a repository for
6538 longer periods of time.
6532 longer periods of time.
6539
6533
6540 Please note that the server does not implement access control.
6534 Please note that the server does not implement access control.
6541 This means that, by default, anybody can read from the server and
6535 This means that, by default, anybody can read from the server and
6542 nobody can write to it by default. Set the ``web.allow-push``
6536 nobody can write to it by default. Set the ``web.allow-push``
6543 option to ``*`` to allow everybody to push to the server. You
6537 option to ``*`` to allow everybody to push to the server. You
6544 should use a real web server if you need to authenticate users.
6538 should use a real web server if you need to authenticate users.
6545
6539
6546 By default, the server logs accesses to stdout and errors to
6540 By default, the server logs accesses to stdout and errors to
6547 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6541 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6548 files.
6542 files.
6549
6543
6550 To have the server choose a free port number to listen on, specify
6544 To have the server choose a free port number to listen on, specify
6551 a port number of 0; in this case, the server will print the port
6545 a port number of 0; in this case, the server will print the port
6552 number it uses.
6546 number it uses.
6553
6547
6554 Returns 0 on success.
6548 Returns 0 on success.
6555 """
6549 """
6556
6550
6557 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6551 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6558 opts = pycompat.byteskwargs(opts)
6552 opts = pycompat.byteskwargs(opts)
6559 if opts[b"print_url"] and ui.verbose:
6553 if opts[b"print_url"] and ui.verbose:
6560 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6554 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6561
6555
6562 if opts[b"stdio"]:
6556 if opts[b"stdio"]:
6563 if repo is None:
6557 if repo is None:
6564 raise error.RepoError(
6558 raise error.RepoError(
6565 _(b"there is no Mercurial repository here (.hg not found)")
6559 _(b"there is no Mercurial repository here (.hg not found)")
6566 )
6560 )
6567 s = wireprotoserver.sshserver(ui, repo)
6561 s = wireprotoserver.sshserver(ui, repo)
6568 s.serve_forever()
6562 s.serve_forever()
6569 return
6563 return
6570
6564
6571 service = server.createservice(ui, repo, opts)
6565 service = server.createservice(ui, repo, opts)
6572 return server.runservice(opts, initfn=service.init, runfn=service.run)
6566 return server.runservice(opts, initfn=service.init, runfn=service.run)
6573
6567
6574
6568
6575 @command(
6569 @command(
6576 b'shelve',
6570 b'shelve',
6577 [
6571 [
6578 (
6572 (
6579 b'A',
6573 b'A',
6580 b'addremove',
6574 b'addremove',
6581 None,
6575 None,
6582 _(b'mark new/missing files as added/removed before shelving'),
6576 _(b'mark new/missing files as added/removed before shelving'),
6583 ),
6577 ),
6584 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6578 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6585 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6579 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6586 (
6580 (
6587 b'',
6581 b'',
6588 b'date',
6582 b'date',
6589 b'',
6583 b'',
6590 _(b'shelve with the specified commit date'),
6584 _(b'shelve with the specified commit date'),
6591 _(b'DATE'),
6585 _(b'DATE'),
6592 ),
6586 ),
6593 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6587 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6594 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6588 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6595 (
6589 (
6596 b'k',
6590 b'k',
6597 b'keep',
6591 b'keep',
6598 False,
6592 False,
6599 _(b'shelve, but keep changes in the working directory'),
6593 _(b'shelve, but keep changes in the working directory'),
6600 ),
6594 ),
6601 (b'l', b'list', None, _(b'list current shelves')),
6595 (b'l', b'list', None, _(b'list current shelves')),
6602 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6596 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6603 (
6597 (
6604 b'n',
6598 b'n',
6605 b'name',
6599 b'name',
6606 b'',
6600 b'',
6607 _(b'use the given name for the shelved commit'),
6601 _(b'use the given name for the shelved commit'),
6608 _(b'NAME'),
6602 _(b'NAME'),
6609 ),
6603 ),
6610 (
6604 (
6611 b'p',
6605 b'p',
6612 b'patch',
6606 b'patch',
6613 None,
6607 None,
6614 _(
6608 _(
6615 b'output patches for changes (provide the names of the shelved '
6609 b'output patches for changes (provide the names of the shelved '
6616 b'changes as positional arguments)'
6610 b'changes as positional arguments)'
6617 ),
6611 ),
6618 ),
6612 ),
6619 (b'i', b'interactive', None, _(b'interactive mode')),
6613 (b'i', b'interactive', None, _(b'interactive mode')),
6620 (
6614 (
6621 b'',
6615 b'',
6622 b'stat',
6616 b'stat',
6623 None,
6617 None,
6624 _(
6618 _(
6625 b'output diffstat-style summary of changes (provide the names of '
6619 b'output diffstat-style summary of changes (provide the names of '
6626 b'the shelved changes as positional arguments)'
6620 b'the shelved changes as positional arguments)'
6627 ),
6621 ),
6628 ),
6622 ),
6629 ]
6623 ]
6630 + cmdutil.walkopts,
6624 + cmdutil.walkopts,
6631 _(b'hg shelve [OPTION]... [FILE]...'),
6625 _(b'hg shelve [OPTION]... [FILE]...'),
6632 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6626 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6633 )
6627 )
6634 def shelve(ui, repo, *pats, **opts):
6628 def shelve(ui, repo, *pats, **opts):
6635 """save and set aside changes from the working directory
6629 """save and set aside changes from the working directory
6636
6630
6637 Shelving takes files that "hg status" reports as not clean, saves
6631 Shelving takes files that "hg status" reports as not clean, saves
6638 the modifications to a bundle (a shelved change), and reverts the
6632 the modifications to a bundle (a shelved change), and reverts the
6639 files so that their state in the working directory becomes clean.
6633 files so that their state in the working directory becomes clean.
6640
6634
6641 To restore these changes to the working directory, using "hg
6635 To restore these changes to the working directory, using "hg
6642 unshelve"; this will work even if you switch to a different
6636 unshelve"; this will work even if you switch to a different
6643 commit.
6637 commit.
6644
6638
6645 When no files are specified, "hg shelve" saves all not-clean
6639 When no files are specified, "hg shelve" saves all not-clean
6646 files. If specific files or directories are named, only changes to
6640 files. If specific files or directories are named, only changes to
6647 those files are shelved.
6641 those files are shelved.
6648
6642
6649 In bare shelve (when no files are specified, without interactive,
6643 In bare shelve (when no files are specified, without interactive,
6650 include and exclude option), shelving remembers information if the
6644 include and exclude option), shelving remembers information if the
6651 working directory was on newly created branch, in other words working
6645 working directory was on newly created branch, in other words working
6652 directory was on different branch than its first parent. In this
6646 directory was on different branch than its first parent. In this
6653 situation unshelving restores branch information to the working directory.
6647 situation unshelving restores branch information to the working directory.
6654
6648
6655 Each shelved change has a name that makes it easier to find later.
6649 Each shelved change has a name that makes it easier to find later.
6656 The name of a shelved change defaults to being based on the active
6650 The name of a shelved change defaults to being based on the active
6657 bookmark, or if there is no active bookmark, the current named
6651 bookmark, or if there is no active bookmark, the current named
6658 branch. To specify a different name, use ``--name``.
6652 branch. To specify a different name, use ``--name``.
6659
6653
6660 To see a list of existing shelved changes, use the ``--list``
6654 To see a list of existing shelved changes, use the ``--list``
6661 option. For each shelved change, this will print its name, age,
6655 option. For each shelved change, this will print its name, age,
6662 and description; use ``--patch`` or ``--stat`` for more details.
6656 and description; use ``--patch`` or ``--stat`` for more details.
6663
6657
6664 To delete specific shelved changes, use ``--delete``. To delete
6658 To delete specific shelved changes, use ``--delete``. To delete
6665 all shelved changes, use ``--cleanup``.
6659 all shelved changes, use ``--cleanup``.
6666 """
6660 """
6667 opts = pycompat.byteskwargs(opts)
6661 opts = pycompat.byteskwargs(opts)
6668 allowables = [
6662 allowables = [
6669 (b'addremove', {b'create'}), # 'create' is pseudo action
6663 (b'addremove', {b'create'}), # 'create' is pseudo action
6670 (b'unknown', {b'create'}),
6664 (b'unknown', {b'create'}),
6671 (b'cleanup', {b'cleanup'}),
6665 (b'cleanup', {b'cleanup'}),
6672 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6666 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6673 (b'delete', {b'delete'}),
6667 (b'delete', {b'delete'}),
6674 (b'edit', {b'create'}),
6668 (b'edit', {b'create'}),
6675 (b'keep', {b'create'}),
6669 (b'keep', {b'create'}),
6676 (b'list', {b'list'}),
6670 (b'list', {b'list'}),
6677 (b'message', {b'create'}),
6671 (b'message', {b'create'}),
6678 (b'name', {b'create'}),
6672 (b'name', {b'create'}),
6679 (b'patch', {b'patch', b'list'}),
6673 (b'patch', {b'patch', b'list'}),
6680 (b'stat', {b'stat', b'list'}),
6674 (b'stat', {b'stat', b'list'}),
6681 ]
6675 ]
6682
6676
6683 def checkopt(opt):
6677 def checkopt(opt):
6684 if opts.get(opt):
6678 if opts.get(opt):
6685 for i, allowable in allowables:
6679 for i, allowable in allowables:
6686 if opts[i] and opt not in allowable:
6680 if opts[i] and opt not in allowable:
6687 raise error.InputError(
6681 raise error.InputError(
6688 _(
6682 _(
6689 b"options '--%s' and '--%s' may not be "
6683 b"options '--%s' and '--%s' may not be "
6690 b"used together"
6684 b"used together"
6691 )
6685 )
6692 % (opt, i)
6686 % (opt, i)
6693 )
6687 )
6694 return True
6688 return True
6695
6689
6696 if checkopt(b'cleanup'):
6690 if checkopt(b'cleanup'):
6697 if pats:
6691 if pats:
6698 raise error.InputError(
6692 raise error.InputError(
6699 _(b"cannot specify names when using '--cleanup'")
6693 _(b"cannot specify names when using '--cleanup'")
6700 )
6694 )
6701 return shelvemod.cleanupcmd(ui, repo)
6695 return shelvemod.cleanupcmd(ui, repo)
6702 elif checkopt(b'delete'):
6696 elif checkopt(b'delete'):
6703 return shelvemod.deletecmd(ui, repo, pats)
6697 return shelvemod.deletecmd(ui, repo, pats)
6704 elif checkopt(b'list'):
6698 elif checkopt(b'list'):
6705 return shelvemod.listcmd(ui, repo, pats, opts)
6699 return shelvemod.listcmd(ui, repo, pats, opts)
6706 elif checkopt(b'patch') or checkopt(b'stat'):
6700 elif checkopt(b'patch') or checkopt(b'stat'):
6707 return shelvemod.patchcmds(ui, repo, pats, opts)
6701 return shelvemod.patchcmds(ui, repo, pats, opts)
6708 else:
6702 else:
6709 return shelvemod.createcmd(ui, repo, pats, opts)
6703 return shelvemod.createcmd(ui, repo, pats, opts)
6710
6704
6711
6705
6712 _NOTTERSE = b'nothing'
6706 _NOTTERSE = b'nothing'
6713
6707
6714
6708
6715 @command(
6709 @command(
6716 b'status|st',
6710 b'status|st',
6717 [
6711 [
6718 (b'A', b'all', None, _(b'show status of all files')),
6712 (b'A', b'all', None, _(b'show status of all files')),
6719 (b'm', b'modified', None, _(b'show only modified files')),
6713 (b'm', b'modified', None, _(b'show only modified files')),
6720 (b'a', b'added', None, _(b'show only added files')),
6714 (b'a', b'added', None, _(b'show only added files')),
6721 (b'r', b'removed', None, _(b'show only removed files')),
6715 (b'r', b'removed', None, _(b'show only removed files')),
6722 (b'd', b'deleted', None, _(b'show only missing files')),
6716 (b'd', b'deleted', None, _(b'show only missing files')),
6723 (b'c', b'clean', None, _(b'show only files without changes')),
6717 (b'c', b'clean', None, _(b'show only files without changes')),
6724 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6718 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6725 (b'i', b'ignored', None, _(b'show only ignored files')),
6719 (b'i', b'ignored', None, _(b'show only ignored files')),
6726 (b'n', b'no-status', None, _(b'hide status prefix')),
6720 (b'n', b'no-status', None, _(b'hide status prefix')),
6727 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6721 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6728 (
6722 (
6729 b'C',
6723 b'C',
6730 b'copies',
6724 b'copies',
6731 None,
6725 None,
6732 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6726 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6733 ),
6727 ),
6734 (
6728 (
6735 b'0',
6729 b'0',
6736 b'print0',
6730 b'print0',
6737 None,
6731 None,
6738 _(b'end filenames with NUL, for use with xargs'),
6732 _(b'end filenames with NUL, for use with xargs'),
6739 ),
6733 ),
6740 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6734 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6741 (
6735 (
6742 b'',
6736 b'',
6743 b'change',
6737 b'change',
6744 b'',
6738 b'',
6745 _(b'list the changed files of a revision'),
6739 _(b'list the changed files of a revision'),
6746 _(b'REV'),
6740 _(b'REV'),
6747 ),
6741 ),
6748 ]
6742 ]
6749 + walkopts
6743 + walkopts
6750 + subrepoopts
6744 + subrepoopts
6751 + formatteropts,
6745 + formatteropts,
6752 _(b'[OPTION]... [FILE]...'),
6746 _(b'[OPTION]... [FILE]...'),
6753 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6747 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6754 helpbasic=True,
6748 helpbasic=True,
6755 inferrepo=True,
6749 inferrepo=True,
6756 intents={INTENT_READONLY},
6750 intents={INTENT_READONLY},
6757 )
6751 )
6758 def status(ui, repo, *pats, **opts):
6752 def status(ui, repo, *pats, **opts):
6759 """show changed files in the working directory
6753 """show changed files in the working directory
6760
6754
6761 Show status of files in the repository. If names are given, only
6755 Show status of files in the repository. If names are given, only
6762 files that match are shown. Files that are clean or ignored or
6756 files that match are shown. Files that are clean or ignored or
6763 the source of a copy/move operation, are not listed unless
6757 the source of a copy/move operation, are not listed unless
6764 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6758 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6765 Unless options described with "show only ..." are given, the
6759 Unless options described with "show only ..." are given, the
6766 options -mardu are used.
6760 options -mardu are used.
6767
6761
6768 Option -q/--quiet hides untracked (unknown and ignored) files
6762 Option -q/--quiet hides untracked (unknown and ignored) files
6769 unless explicitly requested with -u/--unknown or -i/--ignored.
6763 unless explicitly requested with -u/--unknown or -i/--ignored.
6770
6764
6771 .. note::
6765 .. note::
6772
6766
6773 :hg:`status` may appear to disagree with diff if permissions have
6767 :hg:`status` may appear to disagree with diff if permissions have
6774 changed or a merge has occurred. The standard diff format does
6768 changed or a merge has occurred. The standard diff format does
6775 not report permission changes and diff only reports changes
6769 not report permission changes and diff only reports changes
6776 relative to one merge parent.
6770 relative to one merge parent.
6777
6771
6778 If one revision is given, it is used as the base revision.
6772 If one revision is given, it is used as the base revision.
6779 If two revisions are given, the differences between them are
6773 If two revisions are given, the differences between them are
6780 shown. The --change option can also be used as a shortcut to list
6774 shown. The --change option can also be used as a shortcut to list
6781 the changed files of a revision from its first parent.
6775 the changed files of a revision from its first parent.
6782
6776
6783 The codes used to show the status of files are::
6777 The codes used to show the status of files are::
6784
6778
6785 M = modified
6779 M = modified
6786 A = added
6780 A = added
6787 R = removed
6781 R = removed
6788 C = clean
6782 C = clean
6789 ! = missing (deleted by non-hg command, but still tracked)
6783 ! = missing (deleted by non-hg command, but still tracked)
6790 ? = not tracked
6784 ? = not tracked
6791 I = ignored
6785 I = ignored
6792 = origin of the previous file (with --copies)
6786 = origin of the previous file (with --copies)
6793
6787
6794 .. container:: verbose
6788 .. container:: verbose
6795
6789
6796 The -t/--terse option abbreviates the output by showing only the directory
6790 The -t/--terse option abbreviates the output by showing only the directory
6797 name if all the files in it share the same status. The option takes an
6791 name if all the files in it share the same status. The option takes an
6798 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6792 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6799 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6793 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6800 for 'ignored' and 'c' for clean.
6794 for 'ignored' and 'c' for clean.
6801
6795
6802 It abbreviates only those statuses which are passed. Note that clean and
6796 It abbreviates only those statuses which are passed. Note that clean and
6803 ignored files are not displayed with '--terse ic' unless the -c/--clean
6797 ignored files are not displayed with '--terse ic' unless the -c/--clean
6804 and -i/--ignored options are also used.
6798 and -i/--ignored options are also used.
6805
6799
6806 The -v/--verbose option shows information when the repository is in an
6800 The -v/--verbose option shows information when the repository is in an
6807 unfinished merge, shelve, rebase state etc. You can have this behavior
6801 unfinished merge, shelve, rebase state etc. You can have this behavior
6808 turned on by default by enabling the ``commands.status.verbose`` option.
6802 turned on by default by enabling the ``commands.status.verbose`` option.
6809
6803
6810 You can skip displaying some of these states by setting
6804 You can skip displaying some of these states by setting
6811 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6805 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6812 'histedit', 'merge', 'rebase', or 'unshelve'.
6806 'histedit', 'merge', 'rebase', or 'unshelve'.
6813
6807
6814 Template:
6808 Template:
6815
6809
6816 The following keywords are supported in addition to the common template
6810 The following keywords are supported in addition to the common template
6817 keywords and functions. See also :hg:`help templates`.
6811 keywords and functions. See also :hg:`help templates`.
6818
6812
6819 :path: String. Repository-absolute path of the file.
6813 :path: String. Repository-absolute path of the file.
6820 :source: String. Repository-absolute path of the file originated from.
6814 :source: String. Repository-absolute path of the file originated from.
6821 Available if ``--copies`` is specified.
6815 Available if ``--copies`` is specified.
6822 :status: String. Character denoting file's status.
6816 :status: String. Character denoting file's status.
6823
6817
6824 Examples:
6818 Examples:
6825
6819
6826 - show changes in the working directory relative to a
6820 - show changes in the working directory relative to a
6827 changeset::
6821 changeset::
6828
6822
6829 hg status --rev 9353
6823 hg status --rev 9353
6830
6824
6831 - show changes in the working directory relative to the
6825 - show changes in the working directory relative to the
6832 current directory (see :hg:`help patterns` for more information)::
6826 current directory (see :hg:`help patterns` for more information)::
6833
6827
6834 hg status re:
6828 hg status re:
6835
6829
6836 - show all changes including copies in an existing changeset::
6830 - show all changes including copies in an existing changeset::
6837
6831
6838 hg status --copies --change 9353
6832 hg status --copies --change 9353
6839
6833
6840 - get a NUL separated list of added files, suitable for xargs::
6834 - get a NUL separated list of added files, suitable for xargs::
6841
6835
6842 hg status -an0
6836 hg status -an0
6843
6837
6844 - show more information about the repository status, abbreviating
6838 - show more information about the repository status, abbreviating
6845 added, removed, modified, deleted, and untracked paths::
6839 added, removed, modified, deleted, and untracked paths::
6846
6840
6847 hg status -v -t mardu
6841 hg status -v -t mardu
6848
6842
6849 Returns 0 on success.
6843 Returns 0 on success.
6850
6844
6851 """
6845 """
6852
6846
6853 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6847 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6854 opts = pycompat.byteskwargs(opts)
6848 opts = pycompat.byteskwargs(opts)
6855 revs = opts.get(b'rev')
6849 revs = opts.get(b'rev')
6856 change = opts.get(b'change')
6850 change = opts.get(b'change')
6857 terse = opts.get(b'terse')
6851 terse = opts.get(b'terse')
6858 if terse is _NOTTERSE:
6852 if terse is _NOTTERSE:
6859 if revs:
6853 if revs:
6860 terse = b''
6854 terse = b''
6861 else:
6855 else:
6862 terse = ui.config(b'commands', b'status.terse')
6856 terse = ui.config(b'commands', b'status.terse')
6863
6857
6864 if revs and terse:
6858 if revs and terse:
6865 msg = _(b'cannot use --terse with --rev')
6859 msg = _(b'cannot use --terse with --rev')
6866 raise error.InputError(msg)
6860 raise error.InputError(msg)
6867 elif change:
6861 elif change:
6868 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6862 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6869 ctx2 = scmutil.revsingle(repo, change, None)
6863 ctx2 = scmutil.revsingle(repo, change, None)
6870 ctx1 = ctx2.p1()
6864 ctx1 = ctx2.p1()
6871 else:
6865 else:
6872 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6866 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6873 ctx1, ctx2 = scmutil.revpair(repo, revs)
6867 ctx1, ctx2 = scmutil.revpair(repo, revs)
6874
6868
6875 forcerelativevalue = None
6869 forcerelativevalue = None
6876 if ui.hasconfig(b'commands', b'status.relative'):
6870 if ui.hasconfig(b'commands', b'status.relative'):
6877 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6871 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6878 uipathfn = scmutil.getuipathfn(
6872 uipathfn = scmutil.getuipathfn(
6879 repo,
6873 repo,
6880 legacyrelativevalue=bool(pats),
6874 legacyrelativevalue=bool(pats),
6881 forcerelativevalue=forcerelativevalue,
6875 forcerelativevalue=forcerelativevalue,
6882 )
6876 )
6883
6877
6884 if opts.get(b'print0'):
6878 if opts.get(b'print0'):
6885 end = b'\0'
6879 end = b'\0'
6886 else:
6880 else:
6887 end = b'\n'
6881 end = b'\n'
6888 states = b'modified added removed deleted unknown ignored clean'.split()
6882 states = b'modified added removed deleted unknown ignored clean'.split()
6889 show = [k for k in states if opts.get(k)]
6883 show = [k for k in states if opts.get(k)]
6890 if opts.get(b'all'):
6884 if opts.get(b'all'):
6891 show += ui.quiet and (states[:4] + [b'clean']) or states
6885 show += ui.quiet and (states[:4] + [b'clean']) or states
6892
6886
6893 if not show:
6887 if not show:
6894 if ui.quiet:
6888 if ui.quiet:
6895 show = states[:4]
6889 show = states[:4]
6896 else:
6890 else:
6897 show = states[:5]
6891 show = states[:5]
6898
6892
6899 m = scmutil.match(ctx2, pats, opts)
6893 m = scmutil.match(ctx2, pats, opts)
6900 if terse:
6894 if terse:
6901 # we need to compute clean and unknown to terse
6895 # we need to compute clean and unknown to terse
6902 stat = repo.status(
6896 stat = repo.status(
6903 ctx1.node(),
6897 ctx1.node(),
6904 ctx2.node(),
6898 ctx2.node(),
6905 m,
6899 m,
6906 b'ignored' in show or b'i' in terse,
6900 b'ignored' in show or b'i' in terse,
6907 clean=True,
6901 clean=True,
6908 unknown=True,
6902 unknown=True,
6909 listsubrepos=opts.get(b'subrepos'),
6903 listsubrepos=opts.get(b'subrepos'),
6910 )
6904 )
6911
6905
6912 stat = cmdutil.tersedir(stat, terse)
6906 stat = cmdutil.tersedir(stat, terse)
6913 else:
6907 else:
6914 stat = repo.status(
6908 stat = repo.status(
6915 ctx1.node(),
6909 ctx1.node(),
6916 ctx2.node(),
6910 ctx2.node(),
6917 m,
6911 m,
6918 b'ignored' in show,
6912 b'ignored' in show,
6919 b'clean' in show,
6913 b'clean' in show,
6920 b'unknown' in show,
6914 b'unknown' in show,
6921 opts.get(b'subrepos'),
6915 opts.get(b'subrepos'),
6922 )
6916 )
6923
6917
6924 changestates = zip(
6918 changestates = zip(
6925 states,
6919 states,
6926 pycompat.iterbytestr(b'MAR!?IC'),
6920 pycompat.iterbytestr(b'MAR!?IC'),
6927 [getattr(stat, s.decode('utf8')) for s in states],
6921 [getattr(stat, s.decode('utf8')) for s in states],
6928 )
6922 )
6929
6923
6930 copy = {}
6924 copy = {}
6931 if (
6925 if (
6932 opts.get(b'all')
6926 opts.get(b'all')
6933 or opts.get(b'copies')
6927 or opts.get(b'copies')
6934 or ui.configbool(b'ui', b'statuscopies')
6928 or ui.configbool(b'ui', b'statuscopies')
6935 ) and not opts.get(b'no_status'):
6929 ) and not opts.get(b'no_status'):
6936 copy = copies.pathcopies(ctx1, ctx2, m)
6930 copy = copies.pathcopies(ctx1, ctx2, m)
6937
6931
6938 morestatus = None
6932 morestatus = None
6939 if (
6933 if (
6940 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6934 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6941 and not ui.plain()
6935 and not ui.plain()
6942 and not opts.get(b'print0')
6936 and not opts.get(b'print0')
6943 ):
6937 ):
6944 morestatus = cmdutil.readmorestatus(repo)
6938 morestatus = cmdutil.readmorestatus(repo)
6945
6939
6946 ui.pager(b'status')
6940 ui.pager(b'status')
6947 fm = ui.formatter(b'status', opts)
6941 fm = ui.formatter(b'status', opts)
6948 fmt = b'%s' + end
6942 fmt = b'%s' + end
6949 showchar = not opts.get(b'no_status')
6943 showchar = not opts.get(b'no_status')
6950
6944
6951 for state, char, files in changestates:
6945 for state, char, files in changestates:
6952 if state in show:
6946 if state in show:
6953 label = b'status.' + state
6947 label = b'status.' + state
6954 for f in files:
6948 for f in files:
6955 fm.startitem()
6949 fm.startitem()
6956 fm.context(ctx=ctx2)
6950 fm.context(ctx=ctx2)
6957 fm.data(itemtype=b'file', path=f)
6951 fm.data(itemtype=b'file', path=f)
6958 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6952 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6959 fm.plain(fmt % uipathfn(f), label=label)
6953 fm.plain(fmt % uipathfn(f), label=label)
6960 if f in copy:
6954 if f in copy:
6961 fm.data(source=copy[f])
6955 fm.data(source=copy[f])
6962 fm.plain(
6956 fm.plain(
6963 (b' %s' + end) % uipathfn(copy[f]),
6957 (b' %s' + end) % uipathfn(copy[f]),
6964 label=b'status.copied',
6958 label=b'status.copied',
6965 )
6959 )
6966 if morestatus:
6960 if morestatus:
6967 morestatus.formatfile(f, fm)
6961 morestatus.formatfile(f, fm)
6968
6962
6969 if morestatus:
6963 if morestatus:
6970 morestatus.formatfooter(fm)
6964 morestatus.formatfooter(fm)
6971 fm.end()
6965 fm.end()
6972
6966
6973
6967
6974 @command(
6968 @command(
6975 b'summary|sum',
6969 b'summary|sum',
6976 [(b'', b'remote', None, _(b'check for push and pull'))],
6970 [(b'', b'remote', None, _(b'check for push and pull'))],
6977 b'[--remote]',
6971 b'[--remote]',
6978 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6972 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6979 helpbasic=True,
6973 helpbasic=True,
6980 intents={INTENT_READONLY},
6974 intents={INTENT_READONLY},
6981 )
6975 )
6982 def summary(ui, repo, **opts):
6976 def summary(ui, repo, **opts):
6983 """summarize working directory state
6977 """summarize working directory state
6984
6978
6985 This generates a brief summary of the working directory state,
6979 This generates a brief summary of the working directory state,
6986 including parents, branch, commit status, phase and available updates.
6980 including parents, branch, commit status, phase and available updates.
6987
6981
6988 With the --remote option, this will check the default paths for
6982 With the --remote option, this will check the default paths for
6989 incoming and outgoing changes. This can be time-consuming.
6983 incoming and outgoing changes. This can be time-consuming.
6990
6984
6991 Returns 0 on success.
6985 Returns 0 on success.
6992 """
6986 """
6993
6987
6994 opts = pycompat.byteskwargs(opts)
6988 opts = pycompat.byteskwargs(opts)
6995 ui.pager(b'summary')
6989 ui.pager(b'summary')
6996 ctx = repo[None]
6990 ctx = repo[None]
6997 parents = ctx.parents()
6991 parents = ctx.parents()
6998 pnode = parents[0].node()
6992 pnode = parents[0].node()
6999 marks = []
6993 marks = []
7000
6994
7001 try:
6995 try:
7002 ms = mergestatemod.mergestate.read(repo)
6996 ms = mergestatemod.mergestate.read(repo)
7003 except error.UnsupportedMergeRecords as e:
6997 except error.UnsupportedMergeRecords as e:
7004 s = b' '.join(e.recordtypes)
6998 s = b' '.join(e.recordtypes)
7005 ui.warn(
6999 ui.warn(
7006 _(b'warning: merge state has unsupported record types: %s\n') % s
7000 _(b'warning: merge state has unsupported record types: %s\n') % s
7007 )
7001 )
7008 unresolved = []
7002 unresolved = []
7009 else:
7003 else:
7010 unresolved = list(ms.unresolved())
7004 unresolved = list(ms.unresolved())
7011
7005
7012 for p in parents:
7006 for p in parents:
7013 # label with log.changeset (instead of log.parent) since this
7007 # label with log.changeset (instead of log.parent) since this
7014 # shows a working directory parent *changeset*:
7008 # shows a working directory parent *changeset*:
7015 # i18n: column positioning for "hg summary"
7009 # i18n: column positioning for "hg summary"
7016 ui.write(
7010 ui.write(
7017 _(b'parent: %d:%s ') % (p.rev(), p),
7011 _(b'parent: %d:%s ') % (p.rev(), p),
7018 label=logcmdutil.changesetlabels(p),
7012 label=logcmdutil.changesetlabels(p),
7019 )
7013 )
7020 ui.write(b' '.join(p.tags()), label=b'log.tag')
7014 ui.write(b' '.join(p.tags()), label=b'log.tag')
7021 if p.bookmarks():
7015 if p.bookmarks():
7022 marks.extend(p.bookmarks())
7016 marks.extend(p.bookmarks())
7023 if p.rev() == -1:
7017 if p.rev() == -1:
7024 if not len(repo):
7018 if not len(repo):
7025 ui.write(_(b' (empty repository)'))
7019 ui.write(_(b' (empty repository)'))
7026 else:
7020 else:
7027 ui.write(_(b' (no revision checked out)'))
7021 ui.write(_(b' (no revision checked out)'))
7028 if p.obsolete():
7022 if p.obsolete():
7029 ui.write(_(b' (obsolete)'))
7023 ui.write(_(b' (obsolete)'))
7030 if p.isunstable():
7024 if p.isunstable():
7031 instabilities = (
7025 instabilities = (
7032 ui.label(instability, b'trouble.%s' % instability)
7026 ui.label(instability, b'trouble.%s' % instability)
7033 for instability in p.instabilities()
7027 for instability in p.instabilities()
7034 )
7028 )
7035 ui.write(b' (' + b', '.join(instabilities) + b')')
7029 ui.write(b' (' + b', '.join(instabilities) + b')')
7036 ui.write(b'\n')
7030 ui.write(b'\n')
7037 if p.description():
7031 if p.description():
7038 ui.status(
7032 ui.status(
7039 b' ' + p.description().splitlines()[0].strip() + b'\n',
7033 b' ' + p.description().splitlines()[0].strip() + b'\n',
7040 label=b'log.summary',
7034 label=b'log.summary',
7041 )
7035 )
7042
7036
7043 branch = ctx.branch()
7037 branch = ctx.branch()
7044 bheads = repo.branchheads(branch)
7038 bheads = repo.branchheads(branch)
7045 # i18n: column positioning for "hg summary"
7039 # i18n: column positioning for "hg summary"
7046 m = _(b'branch: %s\n') % branch
7040 m = _(b'branch: %s\n') % branch
7047 if branch != b'default':
7041 if branch != b'default':
7048 ui.write(m, label=b'log.branch')
7042 ui.write(m, label=b'log.branch')
7049 else:
7043 else:
7050 ui.status(m, label=b'log.branch')
7044 ui.status(m, label=b'log.branch')
7051
7045
7052 if marks:
7046 if marks:
7053 active = repo._activebookmark
7047 active = repo._activebookmark
7054 # i18n: column positioning for "hg summary"
7048 # i18n: column positioning for "hg summary"
7055 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7049 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7056 if active is not None:
7050 if active is not None:
7057 if active in marks:
7051 if active in marks:
7058 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7052 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7059 marks.remove(active)
7053 marks.remove(active)
7060 else:
7054 else:
7061 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7055 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7062 for m in marks:
7056 for m in marks:
7063 ui.write(b' ' + m, label=b'log.bookmark')
7057 ui.write(b' ' + m, label=b'log.bookmark')
7064 ui.write(b'\n', label=b'log.bookmark')
7058 ui.write(b'\n', label=b'log.bookmark')
7065
7059
7066 status = repo.status(unknown=True)
7060 status = repo.status(unknown=True)
7067
7061
7068 c = repo.dirstate.copies()
7062 c = repo.dirstate.copies()
7069 copied, renamed = [], []
7063 copied, renamed = [], []
7070 for d, s in pycompat.iteritems(c):
7064 for d, s in pycompat.iteritems(c):
7071 if s in status.removed:
7065 if s in status.removed:
7072 status.removed.remove(s)
7066 status.removed.remove(s)
7073 renamed.append(d)
7067 renamed.append(d)
7074 else:
7068 else:
7075 copied.append(d)
7069 copied.append(d)
7076 if d in status.added:
7070 if d in status.added:
7077 status.added.remove(d)
7071 status.added.remove(d)
7078
7072
7079 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7073 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7080
7074
7081 labels = [
7075 labels = [
7082 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7076 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7083 (ui.label(_(b'%d added'), b'status.added'), status.added),
7077 (ui.label(_(b'%d added'), b'status.added'), status.added),
7084 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7078 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7085 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7079 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7086 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7080 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7087 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7081 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7088 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7082 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7089 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7083 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7090 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7084 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7091 ]
7085 ]
7092 t = []
7086 t = []
7093 for l, s in labels:
7087 for l, s in labels:
7094 if s:
7088 if s:
7095 t.append(l % len(s))
7089 t.append(l % len(s))
7096
7090
7097 t = b', '.join(t)
7091 t = b', '.join(t)
7098 cleanworkdir = False
7092 cleanworkdir = False
7099
7093
7100 if repo.vfs.exists(b'graftstate'):
7094 if repo.vfs.exists(b'graftstate'):
7101 t += _(b' (graft in progress)')
7095 t += _(b' (graft in progress)')
7102 if repo.vfs.exists(b'updatestate'):
7096 if repo.vfs.exists(b'updatestate'):
7103 t += _(b' (interrupted update)')
7097 t += _(b' (interrupted update)')
7104 elif len(parents) > 1:
7098 elif len(parents) > 1:
7105 t += _(b' (merge)')
7099 t += _(b' (merge)')
7106 elif branch != parents[0].branch():
7100 elif branch != parents[0].branch():
7107 t += _(b' (new branch)')
7101 t += _(b' (new branch)')
7108 elif parents[0].closesbranch() and pnode in repo.branchheads(
7102 elif parents[0].closesbranch() and pnode in repo.branchheads(
7109 branch, closed=True
7103 branch, closed=True
7110 ):
7104 ):
7111 t += _(b' (head closed)')
7105 t += _(b' (head closed)')
7112 elif not (
7106 elif not (
7113 status.modified
7107 status.modified
7114 or status.added
7108 or status.added
7115 or status.removed
7109 or status.removed
7116 or renamed
7110 or renamed
7117 or copied
7111 or copied
7118 or subs
7112 or subs
7119 ):
7113 ):
7120 t += _(b' (clean)')
7114 t += _(b' (clean)')
7121 cleanworkdir = True
7115 cleanworkdir = True
7122 elif pnode not in bheads:
7116 elif pnode not in bheads:
7123 t += _(b' (new branch head)')
7117 t += _(b' (new branch head)')
7124
7118
7125 if parents:
7119 if parents:
7126 pendingphase = max(p.phase() for p in parents)
7120 pendingphase = max(p.phase() for p in parents)
7127 else:
7121 else:
7128 pendingphase = phases.public
7122 pendingphase = phases.public
7129
7123
7130 if pendingphase > phases.newcommitphase(ui):
7124 if pendingphase > phases.newcommitphase(ui):
7131 t += b' (%s)' % phases.phasenames[pendingphase]
7125 t += b' (%s)' % phases.phasenames[pendingphase]
7132
7126
7133 if cleanworkdir:
7127 if cleanworkdir:
7134 # i18n: column positioning for "hg summary"
7128 # i18n: column positioning for "hg summary"
7135 ui.status(_(b'commit: %s\n') % t.strip())
7129 ui.status(_(b'commit: %s\n') % t.strip())
7136 else:
7130 else:
7137 # i18n: column positioning for "hg summary"
7131 # i18n: column positioning for "hg summary"
7138 ui.write(_(b'commit: %s\n') % t.strip())
7132 ui.write(_(b'commit: %s\n') % t.strip())
7139
7133
7140 # all ancestors of branch heads - all ancestors of parent = new csets
7134 # all ancestors of branch heads - all ancestors of parent = new csets
7141 new = len(
7135 new = len(
7142 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7136 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7143 )
7137 )
7144
7138
7145 if new == 0:
7139 if new == 0:
7146 # i18n: column positioning for "hg summary"
7140 # i18n: column positioning for "hg summary"
7147 ui.status(_(b'update: (current)\n'))
7141 ui.status(_(b'update: (current)\n'))
7148 elif pnode not in bheads:
7142 elif pnode not in bheads:
7149 # i18n: column positioning for "hg summary"
7143 # i18n: column positioning for "hg summary"
7150 ui.write(_(b'update: %d new changesets (update)\n') % new)
7144 ui.write(_(b'update: %d new changesets (update)\n') % new)
7151 else:
7145 else:
7152 # i18n: column positioning for "hg summary"
7146 # i18n: column positioning for "hg summary"
7153 ui.write(
7147 ui.write(
7154 _(b'update: %d new changesets, %d branch heads (merge)\n')
7148 _(b'update: %d new changesets, %d branch heads (merge)\n')
7155 % (new, len(bheads))
7149 % (new, len(bheads))
7156 )
7150 )
7157
7151
7158 t = []
7152 t = []
7159 draft = len(repo.revs(b'draft()'))
7153 draft = len(repo.revs(b'draft()'))
7160 if draft:
7154 if draft:
7161 t.append(_(b'%d draft') % draft)
7155 t.append(_(b'%d draft') % draft)
7162 secret = len(repo.revs(b'secret()'))
7156 secret = len(repo.revs(b'secret()'))
7163 if secret:
7157 if secret:
7164 t.append(_(b'%d secret') % secret)
7158 t.append(_(b'%d secret') % secret)
7165
7159
7166 if draft or secret:
7160 if draft or secret:
7167 ui.status(_(b'phases: %s\n') % b', '.join(t))
7161 ui.status(_(b'phases: %s\n') % b', '.join(t))
7168
7162
7169 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7163 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7170 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7164 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7171 numtrouble = len(repo.revs(trouble + b"()"))
7165 numtrouble = len(repo.revs(trouble + b"()"))
7172 # We write all the possibilities to ease translation
7166 # We write all the possibilities to ease translation
7173 troublemsg = {
7167 troublemsg = {
7174 b"orphan": _(b"orphan: %d changesets"),
7168 b"orphan": _(b"orphan: %d changesets"),
7175 b"contentdivergent": _(b"content-divergent: %d changesets"),
7169 b"contentdivergent": _(b"content-divergent: %d changesets"),
7176 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7170 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7177 }
7171 }
7178 if numtrouble > 0:
7172 if numtrouble > 0:
7179 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7173 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7180
7174
7181 cmdutil.summaryhooks(ui, repo)
7175 cmdutil.summaryhooks(ui, repo)
7182
7176
7183 if opts.get(b'remote'):
7177 if opts.get(b'remote'):
7184 needsincoming, needsoutgoing = True, True
7178 needsincoming, needsoutgoing = True, True
7185 else:
7179 else:
7186 needsincoming, needsoutgoing = False, False
7180 needsincoming, needsoutgoing = False, False
7187 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7181 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7188 if i:
7182 if i:
7189 needsincoming = True
7183 needsincoming = True
7190 if o:
7184 if o:
7191 needsoutgoing = True
7185 needsoutgoing = True
7192 if not needsincoming and not needsoutgoing:
7186 if not needsincoming and not needsoutgoing:
7193 return
7187 return
7194
7188
7195 def getincoming():
7189 def getincoming():
7196 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7190 source, branches = urlutil.parseurl(ui.expandpath(b'default'))
7197 sbranch = branches[0]
7191 sbranch = branches[0]
7198 try:
7192 try:
7199 other = hg.peer(repo, {}, source)
7193 other = hg.peer(repo, {}, source)
7200 except error.RepoError:
7194 except error.RepoError:
7201 if opts.get(b'remote'):
7195 if opts.get(b'remote'):
7202 raise
7196 raise
7203 return source, sbranch, None, None, None
7197 return source, sbranch, None, None, None
7204 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7198 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7205 if revs:
7199 if revs:
7206 revs = [other.lookup(rev) for rev in revs]
7200 revs = [other.lookup(rev) for rev in revs]
7207 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7201 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7208 repo.ui.pushbuffer()
7202 repo.ui.pushbuffer()
7209 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7203 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7210 repo.ui.popbuffer()
7204 repo.ui.popbuffer()
7211 return source, sbranch, other, commoninc, commoninc[1]
7205 return source, sbranch, other, commoninc, commoninc[1]
7212
7206
7213 if needsincoming:
7207 if needsincoming:
7214 source, sbranch, sother, commoninc, incoming = getincoming()
7208 source, sbranch, sother, commoninc, incoming = getincoming()
7215 else:
7209 else:
7216 source = sbranch = sother = commoninc = incoming = None
7210 source = sbranch = sother = commoninc = incoming = None
7217
7211
7218 def getoutgoing():
7212 def getoutgoing():
7219 dest, branches = urlutil.parseurl(
7213 dest, branches = urlutil.parseurl(
7220 ui.expandpath(b'default-push', b'default')
7214 ui.expandpath(b'default-push', b'default')
7221 )
7215 )
7222 dbranch = branches[0]
7216 dbranch = branches[0]
7223 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7217 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7224 if source != dest:
7218 if source != dest:
7225 try:
7219 try:
7226 dother = hg.peer(repo, {}, dest)
7220 dother = hg.peer(repo, {}, dest)
7227 except error.RepoError:
7221 except error.RepoError:
7228 if opts.get(b'remote'):
7222 if opts.get(b'remote'):
7229 raise
7223 raise
7230 return dest, dbranch, None, None
7224 return dest, dbranch, None, None
7231 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7225 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7232 elif sother is None:
7226 elif sother is None:
7233 # there is no explicit destination peer, but source one is invalid
7227 # there is no explicit destination peer, but source one is invalid
7234 return dest, dbranch, None, None
7228 return dest, dbranch, None, None
7235 else:
7229 else:
7236 dother = sother
7230 dother = sother
7237 if source != dest or (sbranch is not None and sbranch != dbranch):
7231 if source != dest or (sbranch is not None and sbranch != dbranch):
7238 common = None
7232 common = None
7239 else:
7233 else:
7240 common = commoninc
7234 common = commoninc
7241 if revs:
7235 if revs:
7242 revs = [repo.lookup(rev) for rev in revs]
7236 revs = [repo.lookup(rev) for rev in revs]
7243 repo.ui.pushbuffer()
7237 repo.ui.pushbuffer()
7244 outgoing = discovery.findcommonoutgoing(
7238 outgoing = discovery.findcommonoutgoing(
7245 repo, dother, onlyheads=revs, commoninc=common
7239 repo, dother, onlyheads=revs, commoninc=common
7246 )
7240 )
7247 repo.ui.popbuffer()
7241 repo.ui.popbuffer()
7248 return dest, dbranch, dother, outgoing
7242 return dest, dbranch, dother, outgoing
7249
7243
7250 if needsoutgoing:
7244 if needsoutgoing:
7251 dest, dbranch, dother, outgoing = getoutgoing()
7245 dest, dbranch, dother, outgoing = getoutgoing()
7252 else:
7246 else:
7253 dest = dbranch = dother = outgoing = None
7247 dest = dbranch = dother = outgoing = None
7254
7248
7255 if opts.get(b'remote'):
7249 if opts.get(b'remote'):
7256 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7250 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7257 # The former always sets `sother` (or raises an exception if it can't);
7251 # The former always sets `sother` (or raises an exception if it can't);
7258 # the latter always sets `outgoing`.
7252 # the latter always sets `outgoing`.
7259 assert sother is not None
7253 assert sother is not None
7260 assert outgoing is not None
7254 assert outgoing is not None
7261
7255
7262 t = []
7256 t = []
7263 if incoming:
7257 if incoming:
7264 t.append(_(b'1 or more incoming'))
7258 t.append(_(b'1 or more incoming'))
7265 o = outgoing.missing
7259 o = outgoing.missing
7266 if o:
7260 if o:
7267 t.append(_(b'%d outgoing') % len(o))
7261 t.append(_(b'%d outgoing') % len(o))
7268 other = dother or sother
7262 other = dother or sother
7269 if b'bookmarks' in other.listkeys(b'namespaces'):
7263 if b'bookmarks' in other.listkeys(b'namespaces'):
7270 counts = bookmarks.summary(repo, other)
7264 counts = bookmarks.summary(repo, other)
7271 if counts[0] > 0:
7265 if counts[0] > 0:
7272 t.append(_(b'%d incoming bookmarks') % counts[0])
7266 t.append(_(b'%d incoming bookmarks') % counts[0])
7273 if counts[1] > 0:
7267 if counts[1] > 0:
7274 t.append(_(b'%d outgoing bookmarks') % counts[1])
7268 t.append(_(b'%d outgoing bookmarks') % counts[1])
7275
7269
7276 if t:
7270 if t:
7277 # i18n: column positioning for "hg summary"
7271 # i18n: column positioning for "hg summary"
7278 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7272 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7279 else:
7273 else:
7280 # i18n: column positioning for "hg summary"
7274 # i18n: column positioning for "hg summary"
7281 ui.status(_(b'remote: (synced)\n'))
7275 ui.status(_(b'remote: (synced)\n'))
7282
7276
7283 cmdutil.summaryremotehooks(
7277 cmdutil.summaryremotehooks(
7284 ui,
7278 ui,
7285 repo,
7279 repo,
7286 opts,
7280 opts,
7287 (
7281 (
7288 (source, sbranch, sother, commoninc),
7282 (source, sbranch, sother, commoninc),
7289 (dest, dbranch, dother, outgoing),
7283 (dest, dbranch, dother, outgoing),
7290 ),
7284 ),
7291 )
7285 )
7292
7286
7293
7287
7294 @command(
7288 @command(
7295 b'tag',
7289 b'tag',
7296 [
7290 [
7297 (b'f', b'force', None, _(b'force tag')),
7291 (b'f', b'force', None, _(b'force tag')),
7298 (b'l', b'local', None, _(b'make the tag local')),
7292 (b'l', b'local', None, _(b'make the tag local')),
7299 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7293 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7300 (b'', b'remove', None, _(b'remove a tag')),
7294 (b'', b'remove', None, _(b'remove a tag')),
7301 # -l/--local is already there, commitopts cannot be used
7295 # -l/--local is already there, commitopts cannot be used
7302 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7296 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7303 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7297 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7304 ]
7298 ]
7305 + commitopts2,
7299 + commitopts2,
7306 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7300 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7307 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7301 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7308 )
7302 )
7309 def tag(ui, repo, name1, *names, **opts):
7303 def tag(ui, repo, name1, *names, **opts):
7310 """add one or more tags for the current or given revision
7304 """add one or more tags for the current or given revision
7311
7305
7312 Name a particular revision using <name>.
7306 Name a particular revision using <name>.
7313
7307
7314 Tags are used to name particular revisions of the repository and are
7308 Tags are used to name particular revisions of the repository and are
7315 very useful to compare different revisions, to go back to significant
7309 very useful to compare different revisions, to go back to significant
7316 earlier versions or to mark branch points as releases, etc. Changing
7310 earlier versions or to mark branch points as releases, etc. Changing
7317 an existing tag is normally disallowed; use -f/--force to override.
7311 an existing tag is normally disallowed; use -f/--force to override.
7318
7312
7319 If no revision is given, the parent of the working directory is
7313 If no revision is given, the parent of the working directory is
7320 used.
7314 used.
7321
7315
7322 To facilitate version control, distribution, and merging of tags,
7316 To facilitate version control, distribution, and merging of tags,
7323 they are stored as a file named ".hgtags" which is managed similarly
7317 they are stored as a file named ".hgtags" which is managed similarly
7324 to other project files and can be hand-edited if necessary. This
7318 to other project files and can be hand-edited if necessary. This
7325 also means that tagging creates a new commit. The file
7319 also means that tagging creates a new commit. The file
7326 ".hg/localtags" is used for local tags (not shared among
7320 ".hg/localtags" is used for local tags (not shared among
7327 repositories).
7321 repositories).
7328
7322
7329 Tag commits are usually made at the head of a branch. If the parent
7323 Tag commits are usually made at the head of a branch. If the parent
7330 of the working directory is not a branch head, :hg:`tag` aborts; use
7324 of the working directory is not a branch head, :hg:`tag` aborts; use
7331 -f/--force to force the tag commit to be based on a non-head
7325 -f/--force to force the tag commit to be based on a non-head
7332 changeset.
7326 changeset.
7333
7327
7334 See :hg:`help dates` for a list of formats valid for -d/--date.
7328 See :hg:`help dates` for a list of formats valid for -d/--date.
7335
7329
7336 Since tag names have priority over branch names during revision
7330 Since tag names have priority over branch names during revision
7337 lookup, using an existing branch name as a tag name is discouraged.
7331 lookup, using an existing branch name as a tag name is discouraged.
7338
7332
7339 Returns 0 on success.
7333 Returns 0 on success.
7340 """
7334 """
7341 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7335 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7342 opts = pycompat.byteskwargs(opts)
7336 opts = pycompat.byteskwargs(opts)
7343 with repo.wlock(), repo.lock():
7337 with repo.wlock(), repo.lock():
7344 rev_ = b"."
7338 rev_ = b"."
7345 names = [t.strip() for t in (name1,) + names]
7339 names = [t.strip() for t in (name1,) + names]
7346 if len(names) != len(set(names)):
7340 if len(names) != len(set(names)):
7347 raise error.InputError(_(b'tag names must be unique'))
7341 raise error.InputError(_(b'tag names must be unique'))
7348 for n in names:
7342 for n in names:
7349 scmutil.checknewlabel(repo, n, b'tag')
7343 scmutil.checknewlabel(repo, n, b'tag')
7350 if not n:
7344 if not n:
7351 raise error.InputError(
7345 raise error.InputError(
7352 _(b'tag names cannot consist entirely of whitespace')
7346 _(b'tag names cannot consist entirely of whitespace')
7353 )
7347 )
7354 if opts.get(b'rev'):
7348 if opts.get(b'rev'):
7355 rev_ = opts[b'rev']
7349 rev_ = opts[b'rev']
7356 message = opts.get(b'message')
7350 message = opts.get(b'message')
7357 if opts.get(b'remove'):
7351 if opts.get(b'remove'):
7358 if opts.get(b'local'):
7352 if opts.get(b'local'):
7359 expectedtype = b'local'
7353 expectedtype = b'local'
7360 else:
7354 else:
7361 expectedtype = b'global'
7355 expectedtype = b'global'
7362
7356
7363 for n in names:
7357 for n in names:
7364 if repo.tagtype(n) == b'global':
7358 if repo.tagtype(n) == b'global':
7365 alltags = tagsmod.findglobaltags(ui, repo)
7359 alltags = tagsmod.findglobaltags(ui, repo)
7366 if alltags[n][0] == nullid:
7360 if alltags[n][0] == nullid:
7367 raise error.InputError(
7361 raise error.InputError(
7368 _(b"tag '%s' is already removed") % n
7362 _(b"tag '%s' is already removed") % n
7369 )
7363 )
7370 if not repo.tagtype(n):
7364 if not repo.tagtype(n):
7371 raise error.InputError(_(b"tag '%s' does not exist") % n)
7365 raise error.InputError(_(b"tag '%s' does not exist") % n)
7372 if repo.tagtype(n) != expectedtype:
7366 if repo.tagtype(n) != expectedtype:
7373 if expectedtype == b'global':
7367 if expectedtype == b'global':
7374 raise error.InputError(
7368 raise error.InputError(
7375 _(b"tag '%s' is not a global tag") % n
7369 _(b"tag '%s' is not a global tag") % n
7376 )
7370 )
7377 else:
7371 else:
7378 raise error.InputError(
7372 raise error.InputError(
7379 _(b"tag '%s' is not a local tag") % n
7373 _(b"tag '%s' is not a local tag") % n
7380 )
7374 )
7381 rev_ = b'null'
7375 rev_ = b'null'
7382 if not message:
7376 if not message:
7383 # we don't translate commit messages
7377 # we don't translate commit messages
7384 message = b'Removed tag %s' % b', '.join(names)
7378 message = b'Removed tag %s' % b', '.join(names)
7385 elif not opts.get(b'force'):
7379 elif not opts.get(b'force'):
7386 for n in names:
7380 for n in names:
7387 if n in repo.tags():
7381 if n in repo.tags():
7388 raise error.InputError(
7382 raise error.InputError(
7389 _(b"tag '%s' already exists (use -f to force)") % n
7383 _(b"tag '%s' already exists (use -f to force)") % n
7390 )
7384 )
7391 if not opts.get(b'local'):
7385 if not opts.get(b'local'):
7392 p1, p2 = repo.dirstate.parents()
7386 p1, p2 = repo.dirstate.parents()
7393 if p2 != nullid:
7387 if p2 != nullid:
7394 raise error.StateError(_(b'uncommitted merge'))
7388 raise error.StateError(_(b'uncommitted merge'))
7395 bheads = repo.branchheads()
7389 bheads = repo.branchheads()
7396 if not opts.get(b'force') and bheads and p1 not in bheads:
7390 if not opts.get(b'force') and bheads and p1 not in bheads:
7397 raise error.InputError(
7391 raise error.InputError(
7398 _(
7392 _(
7399 b'working directory is not at a branch head '
7393 b'working directory is not at a branch head '
7400 b'(use -f to force)'
7394 b'(use -f to force)'
7401 )
7395 )
7402 )
7396 )
7403 node = scmutil.revsingle(repo, rev_).node()
7397 node = scmutil.revsingle(repo, rev_).node()
7404
7398
7405 if not message:
7399 if not message:
7406 # we don't translate commit messages
7400 # we don't translate commit messages
7407 message = b'Added tag %s for changeset %s' % (
7401 message = b'Added tag %s for changeset %s' % (
7408 b', '.join(names),
7402 b', '.join(names),
7409 short(node),
7403 short(node),
7410 )
7404 )
7411
7405
7412 date = opts.get(b'date')
7406 date = opts.get(b'date')
7413 if date:
7407 if date:
7414 date = dateutil.parsedate(date)
7408 date = dateutil.parsedate(date)
7415
7409
7416 if opts.get(b'remove'):
7410 if opts.get(b'remove'):
7417 editform = b'tag.remove'
7411 editform = b'tag.remove'
7418 else:
7412 else:
7419 editform = b'tag.add'
7413 editform = b'tag.add'
7420 editor = cmdutil.getcommiteditor(
7414 editor = cmdutil.getcommiteditor(
7421 editform=editform, **pycompat.strkwargs(opts)
7415 editform=editform, **pycompat.strkwargs(opts)
7422 )
7416 )
7423
7417
7424 # don't allow tagging the null rev
7418 # don't allow tagging the null rev
7425 if (
7419 if (
7426 not opts.get(b'remove')
7420 not opts.get(b'remove')
7427 and scmutil.revsingle(repo, rev_).rev() == nullrev
7421 and scmutil.revsingle(repo, rev_).rev() == nullrev
7428 ):
7422 ):
7429 raise error.InputError(_(b"cannot tag null revision"))
7423 raise error.InputError(_(b"cannot tag null revision"))
7430
7424
7431 tagsmod.tag(
7425 tagsmod.tag(
7432 repo,
7426 repo,
7433 names,
7427 names,
7434 node,
7428 node,
7435 message,
7429 message,
7436 opts.get(b'local'),
7430 opts.get(b'local'),
7437 opts.get(b'user'),
7431 opts.get(b'user'),
7438 date,
7432 date,
7439 editor=editor,
7433 editor=editor,
7440 )
7434 )
7441
7435
7442
7436
7443 @command(
7437 @command(
7444 b'tags',
7438 b'tags',
7445 formatteropts,
7439 formatteropts,
7446 b'',
7440 b'',
7447 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7441 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7448 intents={INTENT_READONLY},
7442 intents={INTENT_READONLY},
7449 )
7443 )
7450 def tags(ui, repo, **opts):
7444 def tags(ui, repo, **opts):
7451 """list repository tags
7445 """list repository tags
7452
7446
7453 This lists both regular and local tags. When the -v/--verbose
7447 This lists both regular and local tags. When the -v/--verbose
7454 switch is used, a third column "local" is printed for local tags.
7448 switch is used, a third column "local" is printed for local tags.
7455 When the -q/--quiet switch is used, only the tag name is printed.
7449 When the -q/--quiet switch is used, only the tag name is printed.
7456
7450
7457 .. container:: verbose
7451 .. container:: verbose
7458
7452
7459 Template:
7453 Template:
7460
7454
7461 The following keywords are supported in addition to the common template
7455 The following keywords are supported in addition to the common template
7462 keywords and functions such as ``{tag}``. See also
7456 keywords and functions such as ``{tag}``. See also
7463 :hg:`help templates`.
7457 :hg:`help templates`.
7464
7458
7465 :type: String. ``local`` for local tags.
7459 :type: String. ``local`` for local tags.
7466
7460
7467 Returns 0 on success.
7461 Returns 0 on success.
7468 """
7462 """
7469
7463
7470 opts = pycompat.byteskwargs(opts)
7464 opts = pycompat.byteskwargs(opts)
7471 ui.pager(b'tags')
7465 ui.pager(b'tags')
7472 fm = ui.formatter(b'tags', opts)
7466 fm = ui.formatter(b'tags', opts)
7473 hexfunc = fm.hexfunc
7467 hexfunc = fm.hexfunc
7474
7468
7475 for t, n in reversed(repo.tagslist()):
7469 for t, n in reversed(repo.tagslist()):
7476 hn = hexfunc(n)
7470 hn = hexfunc(n)
7477 label = b'tags.normal'
7471 label = b'tags.normal'
7478 tagtype = repo.tagtype(t)
7472 tagtype = repo.tagtype(t)
7479 if not tagtype or tagtype == b'global':
7473 if not tagtype or tagtype == b'global':
7480 tagtype = b''
7474 tagtype = b''
7481 else:
7475 else:
7482 label = b'tags.' + tagtype
7476 label = b'tags.' + tagtype
7483
7477
7484 fm.startitem()
7478 fm.startitem()
7485 fm.context(repo=repo)
7479 fm.context(repo=repo)
7486 fm.write(b'tag', b'%s', t, label=label)
7480 fm.write(b'tag', b'%s', t, label=label)
7487 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7481 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7488 fm.condwrite(
7482 fm.condwrite(
7489 not ui.quiet,
7483 not ui.quiet,
7490 b'rev node',
7484 b'rev node',
7491 fmt,
7485 fmt,
7492 repo.changelog.rev(n),
7486 repo.changelog.rev(n),
7493 hn,
7487 hn,
7494 label=label,
7488 label=label,
7495 )
7489 )
7496 fm.condwrite(
7490 fm.condwrite(
7497 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7491 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7498 )
7492 )
7499 fm.plain(b'\n')
7493 fm.plain(b'\n')
7500 fm.end()
7494 fm.end()
7501
7495
7502
7496
7503 @command(
7497 @command(
7504 b'tip',
7498 b'tip',
7505 [
7499 [
7506 (b'p', b'patch', None, _(b'show patch')),
7500 (b'p', b'patch', None, _(b'show patch')),
7507 (b'g', b'git', None, _(b'use git extended diff format')),
7501 (b'g', b'git', None, _(b'use git extended diff format')),
7508 ]
7502 ]
7509 + templateopts,
7503 + templateopts,
7510 _(b'[-p] [-g]'),
7504 _(b'[-p] [-g]'),
7511 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7505 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7512 )
7506 )
7513 def tip(ui, repo, **opts):
7507 def tip(ui, repo, **opts):
7514 """show the tip revision (DEPRECATED)
7508 """show the tip revision (DEPRECATED)
7515
7509
7516 The tip revision (usually just called the tip) is the changeset
7510 The tip revision (usually just called the tip) is the changeset
7517 most recently added to the repository (and therefore the most
7511 most recently added to the repository (and therefore the most
7518 recently changed head).
7512 recently changed head).
7519
7513
7520 If you have just made a commit, that commit will be the tip. If
7514 If you have just made a commit, that commit will be the tip. If
7521 you have just pulled changes from another repository, the tip of
7515 you have just pulled changes from another repository, the tip of
7522 that repository becomes the current tip. The "tip" tag is special
7516 that repository becomes the current tip. The "tip" tag is special
7523 and cannot be renamed or assigned to a different changeset.
7517 and cannot be renamed or assigned to a different changeset.
7524
7518
7525 This command is deprecated, please use :hg:`heads` instead.
7519 This command is deprecated, please use :hg:`heads` instead.
7526
7520
7527 Returns 0 on success.
7521 Returns 0 on success.
7528 """
7522 """
7529 opts = pycompat.byteskwargs(opts)
7523 opts = pycompat.byteskwargs(opts)
7530 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7524 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7531 displayer.show(repo[b'tip'])
7525 displayer.show(repo[b'tip'])
7532 displayer.close()
7526 displayer.close()
7533
7527
7534
7528
7535 @command(
7529 @command(
7536 b'unbundle',
7530 b'unbundle',
7537 [
7531 [
7538 (
7532 (
7539 b'u',
7533 b'u',
7540 b'update',
7534 b'update',
7541 None,
7535 None,
7542 _(b'update to new branch head if changesets were unbundled'),
7536 _(b'update to new branch head if changesets were unbundled'),
7543 )
7537 )
7544 ],
7538 ],
7545 _(b'[-u] FILE...'),
7539 _(b'[-u] FILE...'),
7546 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7540 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7547 )
7541 )
7548 def unbundle(ui, repo, fname1, *fnames, **opts):
7542 def unbundle(ui, repo, fname1, *fnames, **opts):
7549 """apply one or more bundle files
7543 """apply one or more bundle files
7550
7544
7551 Apply one or more bundle files generated by :hg:`bundle`.
7545 Apply one or more bundle files generated by :hg:`bundle`.
7552
7546
7553 Returns 0 on success, 1 if an update has unresolved files.
7547 Returns 0 on success, 1 if an update has unresolved files.
7554 """
7548 """
7555 fnames = (fname1,) + fnames
7549 fnames = (fname1,) + fnames
7556
7550
7557 with repo.lock():
7551 with repo.lock():
7558 for fname in fnames:
7552 for fname in fnames:
7559 f = hg.openpath(ui, fname)
7553 f = hg.openpath(ui, fname)
7560 gen = exchange.readbundle(ui, f, fname)
7554 gen = exchange.readbundle(ui, f, fname)
7561 if isinstance(gen, streamclone.streamcloneapplier):
7555 if isinstance(gen, streamclone.streamcloneapplier):
7562 raise error.InputError(
7556 raise error.InputError(
7563 _(
7557 _(
7564 b'packed bundles cannot be applied with '
7558 b'packed bundles cannot be applied with '
7565 b'"hg unbundle"'
7559 b'"hg unbundle"'
7566 ),
7560 ),
7567 hint=_(b'use "hg debugapplystreamclonebundle"'),
7561 hint=_(b'use "hg debugapplystreamclonebundle"'),
7568 )
7562 )
7569 url = b'bundle:' + fname
7563 url = b'bundle:' + fname
7570 try:
7564 try:
7571 txnname = b'unbundle'
7565 txnname = b'unbundle'
7572 if not isinstance(gen, bundle2.unbundle20):
7566 if not isinstance(gen, bundle2.unbundle20):
7573 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7567 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7574 with repo.transaction(txnname) as tr:
7568 with repo.transaction(txnname) as tr:
7575 op = bundle2.applybundle(
7569 op = bundle2.applybundle(
7576 repo, gen, tr, source=b'unbundle', url=url
7570 repo, gen, tr, source=b'unbundle', url=url
7577 )
7571 )
7578 except error.BundleUnknownFeatureError as exc:
7572 except error.BundleUnknownFeatureError as exc:
7579 raise error.Abort(
7573 raise error.Abort(
7580 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7574 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7581 hint=_(
7575 hint=_(
7582 b"see https://mercurial-scm.org/"
7576 b"see https://mercurial-scm.org/"
7583 b"wiki/BundleFeature for more "
7577 b"wiki/BundleFeature for more "
7584 b"information"
7578 b"information"
7585 ),
7579 ),
7586 )
7580 )
7587 modheads = bundle2.combinechangegroupresults(op)
7581 modheads = bundle2.combinechangegroupresults(op)
7588
7582
7589 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7583 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7590 return 1
7584 return 1
7591 else:
7585 else:
7592 return 0
7586 return 0
7593
7587
7594
7588
7595 @command(
7589 @command(
7596 b'unshelve',
7590 b'unshelve',
7597 [
7591 [
7598 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7592 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7599 (
7593 (
7600 b'c',
7594 b'c',
7601 b'continue',
7595 b'continue',
7602 None,
7596 None,
7603 _(b'continue an incomplete unshelve operation'),
7597 _(b'continue an incomplete unshelve operation'),
7604 ),
7598 ),
7605 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7599 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7606 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7600 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7607 (
7601 (
7608 b'n',
7602 b'n',
7609 b'name',
7603 b'name',
7610 b'',
7604 b'',
7611 _(b'restore shelved change with given name'),
7605 _(b'restore shelved change with given name'),
7612 _(b'NAME'),
7606 _(b'NAME'),
7613 ),
7607 ),
7614 (b't', b'tool', b'', _(b'specify merge tool')),
7608 (b't', b'tool', b'', _(b'specify merge tool')),
7615 (
7609 (
7616 b'',
7610 b'',
7617 b'date',
7611 b'date',
7618 b'',
7612 b'',
7619 _(b'set date for temporary commits (DEPRECATED)'),
7613 _(b'set date for temporary commits (DEPRECATED)'),
7620 _(b'DATE'),
7614 _(b'DATE'),
7621 ),
7615 ),
7622 ],
7616 ],
7623 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7617 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7624 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7618 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7625 )
7619 )
7626 def unshelve(ui, repo, *shelved, **opts):
7620 def unshelve(ui, repo, *shelved, **opts):
7627 """restore a shelved change to the working directory
7621 """restore a shelved change to the working directory
7628
7622
7629 This command accepts an optional name of a shelved change to
7623 This command accepts an optional name of a shelved change to
7630 restore. If none is given, the most recent shelved change is used.
7624 restore. If none is given, the most recent shelved change is used.
7631
7625
7632 If a shelved change is applied successfully, the bundle that
7626 If a shelved change is applied successfully, the bundle that
7633 contains the shelved changes is moved to a backup location
7627 contains the shelved changes is moved to a backup location
7634 (.hg/shelve-backup).
7628 (.hg/shelve-backup).
7635
7629
7636 Since you can restore a shelved change on top of an arbitrary
7630 Since you can restore a shelved change on top of an arbitrary
7637 commit, it is possible that unshelving will result in a conflict
7631 commit, it is possible that unshelving will result in a conflict
7638 between your changes and the commits you are unshelving onto. If
7632 between your changes and the commits you are unshelving onto. If
7639 this occurs, you must resolve the conflict, then use
7633 this occurs, you must resolve the conflict, then use
7640 ``--continue`` to complete the unshelve operation. (The bundle
7634 ``--continue`` to complete the unshelve operation. (The bundle
7641 will not be moved until you successfully complete the unshelve.)
7635 will not be moved until you successfully complete the unshelve.)
7642
7636
7643 (Alternatively, you can use ``--abort`` to abandon an unshelve
7637 (Alternatively, you can use ``--abort`` to abandon an unshelve
7644 that causes a conflict. This reverts the unshelved changes, and
7638 that causes a conflict. This reverts the unshelved changes, and
7645 leaves the bundle in place.)
7639 leaves the bundle in place.)
7646
7640
7647 If bare shelved change (without interactive, include and exclude
7641 If bare shelved change (without interactive, include and exclude
7648 option) was done on newly created branch it would restore branch
7642 option) was done on newly created branch it would restore branch
7649 information to the working directory.
7643 information to the working directory.
7650
7644
7651 After a successful unshelve, the shelved changes are stored in a
7645 After a successful unshelve, the shelved changes are stored in a
7652 backup directory. Only the N most recent backups are kept. N
7646 backup directory. Only the N most recent backups are kept. N
7653 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7647 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7654 configuration option.
7648 configuration option.
7655
7649
7656 .. container:: verbose
7650 .. container:: verbose
7657
7651
7658 Timestamp in seconds is used to decide order of backups. More
7652 Timestamp in seconds is used to decide order of backups. More
7659 than ``maxbackups`` backups are kept, if same timestamp
7653 than ``maxbackups`` backups are kept, if same timestamp
7660 prevents from deciding exact order of them, for safety.
7654 prevents from deciding exact order of them, for safety.
7661
7655
7662 Selected changes can be unshelved with ``--interactive`` flag.
7656 Selected changes can be unshelved with ``--interactive`` flag.
7663 The working directory is updated with the selected changes, and
7657 The working directory is updated with the selected changes, and
7664 only the unselected changes remain shelved.
7658 only the unselected changes remain shelved.
7665 Note: The whole shelve is applied to working directory first before
7659 Note: The whole shelve is applied to working directory first before
7666 running interactively. So, this will bring up all the conflicts between
7660 running interactively. So, this will bring up all the conflicts between
7667 working directory and the shelve, irrespective of which changes will be
7661 working directory and the shelve, irrespective of which changes will be
7668 unshelved.
7662 unshelved.
7669 """
7663 """
7670 with repo.wlock():
7664 with repo.wlock():
7671 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7665 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7672
7666
7673
7667
7674 statemod.addunfinished(
7668 statemod.addunfinished(
7675 b'unshelve',
7669 b'unshelve',
7676 fname=b'shelvedstate',
7670 fname=b'shelvedstate',
7677 continueflag=True,
7671 continueflag=True,
7678 abortfunc=shelvemod.hgabortunshelve,
7672 abortfunc=shelvemod.hgabortunshelve,
7679 continuefunc=shelvemod.hgcontinueunshelve,
7673 continuefunc=shelvemod.hgcontinueunshelve,
7680 cmdmsg=_(b'unshelve already in progress'),
7674 cmdmsg=_(b'unshelve already in progress'),
7681 )
7675 )
7682
7676
7683
7677
7684 @command(
7678 @command(
7685 b'update|up|checkout|co',
7679 b'update|up|checkout|co',
7686 [
7680 [
7687 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7681 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7688 (b'c', b'check', None, _(b'require clean working directory')),
7682 (b'c', b'check', None, _(b'require clean working directory')),
7689 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7683 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7690 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7684 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7691 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7685 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7692 ]
7686 ]
7693 + mergetoolopts,
7687 + mergetoolopts,
7694 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7688 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7695 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7689 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7696 helpbasic=True,
7690 helpbasic=True,
7697 )
7691 )
7698 def update(ui, repo, node=None, **opts):
7692 def update(ui, repo, node=None, **opts):
7699 """update working directory (or switch revisions)
7693 """update working directory (or switch revisions)
7700
7694
7701 Update the repository's working directory to the specified
7695 Update the repository's working directory to the specified
7702 changeset. If no changeset is specified, update to the tip of the
7696 changeset. If no changeset is specified, update to the tip of the
7703 current named branch and move the active bookmark (see :hg:`help
7697 current named branch and move the active bookmark (see :hg:`help
7704 bookmarks`).
7698 bookmarks`).
7705
7699
7706 Update sets the working directory's parent revision to the specified
7700 Update sets the working directory's parent revision to the specified
7707 changeset (see :hg:`help parents`).
7701 changeset (see :hg:`help parents`).
7708
7702
7709 If the changeset is not a descendant or ancestor of the working
7703 If the changeset is not a descendant or ancestor of the working
7710 directory's parent and there are uncommitted changes, the update is
7704 directory's parent and there are uncommitted changes, the update is
7711 aborted. With the -c/--check option, the working directory is checked
7705 aborted. With the -c/--check option, the working directory is checked
7712 for uncommitted changes; if none are found, the working directory is
7706 for uncommitted changes; if none are found, the working directory is
7713 updated to the specified changeset.
7707 updated to the specified changeset.
7714
7708
7715 .. container:: verbose
7709 .. container:: verbose
7716
7710
7717 The -C/--clean, -c/--check, and -m/--merge options control what
7711 The -C/--clean, -c/--check, and -m/--merge options control what
7718 happens if the working directory contains uncommitted changes.
7712 happens if the working directory contains uncommitted changes.
7719 At most of one of them can be specified.
7713 At most of one of them can be specified.
7720
7714
7721 1. If no option is specified, and if
7715 1. If no option is specified, and if
7722 the requested changeset is an ancestor or descendant of
7716 the requested changeset is an ancestor or descendant of
7723 the working directory's parent, the uncommitted changes
7717 the working directory's parent, the uncommitted changes
7724 are merged into the requested changeset and the merged
7718 are merged into the requested changeset and the merged
7725 result is left uncommitted. If the requested changeset is
7719 result is left uncommitted. If the requested changeset is
7726 not an ancestor or descendant (that is, it is on another
7720 not an ancestor or descendant (that is, it is on another
7727 branch), the update is aborted and the uncommitted changes
7721 branch), the update is aborted and the uncommitted changes
7728 are preserved.
7722 are preserved.
7729
7723
7730 2. With the -m/--merge option, the update is allowed even if the
7724 2. With the -m/--merge option, the update is allowed even if the
7731 requested changeset is not an ancestor or descendant of
7725 requested changeset is not an ancestor or descendant of
7732 the working directory's parent.
7726 the working directory's parent.
7733
7727
7734 3. With the -c/--check option, the update is aborted and the
7728 3. With the -c/--check option, the update is aborted and the
7735 uncommitted changes are preserved.
7729 uncommitted changes are preserved.
7736
7730
7737 4. With the -C/--clean option, uncommitted changes are discarded and
7731 4. With the -C/--clean option, uncommitted changes are discarded and
7738 the working directory is updated to the requested changeset.
7732 the working directory is updated to the requested changeset.
7739
7733
7740 To cancel an uncommitted merge (and lose your changes), use
7734 To cancel an uncommitted merge (and lose your changes), use
7741 :hg:`merge --abort`.
7735 :hg:`merge --abort`.
7742
7736
7743 Use null as the changeset to remove the working directory (like
7737 Use null as the changeset to remove the working directory (like
7744 :hg:`clone -U`).
7738 :hg:`clone -U`).
7745
7739
7746 If you want to revert just one file to an older revision, use
7740 If you want to revert just one file to an older revision, use
7747 :hg:`revert [-r REV] NAME`.
7741 :hg:`revert [-r REV] NAME`.
7748
7742
7749 See :hg:`help dates` for a list of formats valid for -d/--date.
7743 See :hg:`help dates` for a list of formats valid for -d/--date.
7750
7744
7751 Returns 0 on success, 1 if there are unresolved files.
7745 Returns 0 on success, 1 if there are unresolved files.
7752 """
7746 """
7753 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7747 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7754 rev = opts.get('rev')
7748 rev = opts.get('rev')
7755 date = opts.get('date')
7749 date = opts.get('date')
7756 clean = opts.get('clean')
7750 clean = opts.get('clean')
7757 check = opts.get('check')
7751 check = opts.get('check')
7758 merge = opts.get('merge')
7752 merge = opts.get('merge')
7759 if rev and node:
7753 if rev and node:
7760 raise error.InputError(_(b"please specify just one revision"))
7754 raise error.InputError(_(b"please specify just one revision"))
7761
7755
7762 if ui.configbool(b'commands', b'update.requiredest'):
7756 if ui.configbool(b'commands', b'update.requiredest'):
7763 if not node and not rev and not date:
7757 if not node and not rev and not date:
7764 raise error.InputError(
7758 raise error.InputError(
7765 _(b'you must specify a destination'),
7759 _(b'you must specify a destination'),
7766 hint=_(b'for example: hg update ".::"'),
7760 hint=_(b'for example: hg update ".::"'),
7767 )
7761 )
7768
7762
7769 if rev is None or rev == b'':
7763 if rev is None or rev == b'':
7770 rev = node
7764 rev = node
7771
7765
7772 if date and rev is not None:
7766 if date and rev is not None:
7773 raise error.InputError(_(b"you can't specify a revision and a date"))
7767 raise error.InputError(_(b"you can't specify a revision and a date"))
7774
7768
7775 updatecheck = None
7769 updatecheck = None
7776 if check:
7770 if check:
7777 updatecheck = b'abort'
7771 updatecheck = b'abort'
7778 elif merge:
7772 elif merge:
7779 updatecheck = b'none'
7773 updatecheck = b'none'
7780
7774
7781 with repo.wlock():
7775 with repo.wlock():
7782 cmdutil.clearunfinished(repo)
7776 cmdutil.clearunfinished(repo)
7783 if date:
7777 if date:
7784 rev = cmdutil.finddate(ui, repo, date)
7778 rev = cmdutil.finddate(ui, repo, date)
7785
7779
7786 # if we defined a bookmark, we have to remember the original name
7780 # if we defined a bookmark, we have to remember the original name
7787 brev = rev
7781 brev = rev
7788 if rev:
7782 if rev:
7789 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7783 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7790 ctx = scmutil.revsingle(repo, rev, default=None)
7784 ctx = scmutil.revsingle(repo, rev, default=None)
7791 rev = ctx.rev()
7785 rev = ctx.rev()
7792 hidden = ctx.hidden()
7786 hidden = ctx.hidden()
7793 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7787 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7794 with ui.configoverride(overrides, b'update'):
7788 with ui.configoverride(overrides, b'update'):
7795 ret = hg.updatetotally(
7789 ret = hg.updatetotally(
7796 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7790 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7797 )
7791 )
7798 if hidden:
7792 if hidden:
7799 ctxstr = ctx.hex()[:12]
7793 ctxstr = ctx.hex()[:12]
7800 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7794 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7801
7795
7802 if ctx.obsolete():
7796 if ctx.obsolete():
7803 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7797 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7804 ui.warn(b"(%s)\n" % obsfatemsg)
7798 ui.warn(b"(%s)\n" % obsfatemsg)
7805 return ret
7799 return ret
7806
7800
7807
7801
7808 @command(
7802 @command(
7809 b'verify',
7803 b'verify',
7810 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7804 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7811 helpcategory=command.CATEGORY_MAINTENANCE,
7805 helpcategory=command.CATEGORY_MAINTENANCE,
7812 )
7806 )
7813 def verify(ui, repo, **opts):
7807 def verify(ui, repo, **opts):
7814 """verify the integrity of the repository
7808 """verify the integrity of the repository
7815
7809
7816 Verify the integrity of the current repository.
7810 Verify the integrity of the current repository.
7817
7811
7818 This will perform an extensive check of the repository's
7812 This will perform an extensive check of the repository's
7819 integrity, validating the hashes and checksums of each entry in
7813 integrity, validating the hashes and checksums of each entry in
7820 the changelog, manifest, and tracked files, as well as the
7814 the changelog, manifest, and tracked files, as well as the
7821 integrity of their crosslinks and indices.
7815 integrity of their crosslinks and indices.
7822
7816
7823 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7817 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7824 for more information about recovery from corruption of the
7818 for more information about recovery from corruption of the
7825 repository.
7819 repository.
7826
7820
7827 Returns 0 on success, 1 if errors are encountered.
7821 Returns 0 on success, 1 if errors are encountered.
7828 """
7822 """
7829 opts = pycompat.byteskwargs(opts)
7823 opts = pycompat.byteskwargs(opts)
7830
7824
7831 level = None
7825 level = None
7832 if opts[b'full']:
7826 if opts[b'full']:
7833 level = verifymod.VERIFY_FULL
7827 level = verifymod.VERIFY_FULL
7834 return hg.verify(repo, level)
7828 return hg.verify(repo, level)
7835
7829
7836
7830
7837 @command(
7831 @command(
7838 b'version',
7832 b'version',
7839 [] + formatteropts,
7833 [] + formatteropts,
7840 helpcategory=command.CATEGORY_HELP,
7834 helpcategory=command.CATEGORY_HELP,
7841 norepo=True,
7835 norepo=True,
7842 intents={INTENT_READONLY},
7836 intents={INTENT_READONLY},
7843 )
7837 )
7844 def version_(ui, **opts):
7838 def version_(ui, **opts):
7845 """output version and copyright information
7839 """output version and copyright information
7846
7840
7847 .. container:: verbose
7841 .. container:: verbose
7848
7842
7849 Template:
7843 Template:
7850
7844
7851 The following keywords are supported. See also :hg:`help templates`.
7845 The following keywords are supported. See also :hg:`help templates`.
7852
7846
7853 :extensions: List of extensions.
7847 :extensions: List of extensions.
7854 :ver: String. Version number.
7848 :ver: String. Version number.
7855
7849
7856 And each entry of ``{extensions}`` provides the following sub-keywords
7850 And each entry of ``{extensions}`` provides the following sub-keywords
7857 in addition to ``{ver}``.
7851 in addition to ``{ver}``.
7858
7852
7859 :bundled: Boolean. True if included in the release.
7853 :bundled: Boolean. True if included in the release.
7860 :name: String. Extension name.
7854 :name: String. Extension name.
7861 """
7855 """
7862 opts = pycompat.byteskwargs(opts)
7856 opts = pycompat.byteskwargs(opts)
7863 if ui.verbose:
7857 if ui.verbose:
7864 ui.pager(b'version')
7858 ui.pager(b'version')
7865 fm = ui.formatter(b"version", opts)
7859 fm = ui.formatter(b"version", opts)
7866 fm.startitem()
7860 fm.startitem()
7867 fm.write(
7861 fm.write(
7868 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7862 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7869 )
7863 )
7870 license = _(
7864 license = _(
7871 b"(see https://mercurial-scm.org for more information)\n"
7865 b"(see https://mercurial-scm.org for more information)\n"
7872 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7866 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7873 b"This is free software; see the source for copying conditions. "
7867 b"This is free software; see the source for copying conditions. "
7874 b"There is NO\nwarranty; "
7868 b"There is NO\nwarranty; "
7875 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7869 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7876 )
7870 )
7877 if not ui.quiet:
7871 if not ui.quiet:
7878 fm.plain(license)
7872 fm.plain(license)
7879
7873
7880 if ui.verbose:
7874 if ui.verbose:
7881 fm.plain(_(b"\nEnabled extensions:\n\n"))
7875 fm.plain(_(b"\nEnabled extensions:\n\n"))
7882 # format names and versions into columns
7876 # format names and versions into columns
7883 names = []
7877 names = []
7884 vers = []
7878 vers = []
7885 isinternals = []
7879 isinternals = []
7886 for name, module in sorted(extensions.extensions()):
7880 for name, module in sorted(extensions.extensions()):
7887 names.append(name)
7881 names.append(name)
7888 vers.append(extensions.moduleversion(module) or None)
7882 vers.append(extensions.moduleversion(module) or None)
7889 isinternals.append(extensions.ismoduleinternal(module))
7883 isinternals.append(extensions.ismoduleinternal(module))
7890 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7884 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7891 if names:
7885 if names:
7892 namefmt = b" %%-%ds " % max(len(n) for n in names)
7886 namefmt = b" %%-%ds " % max(len(n) for n in names)
7893 places = [_(b"external"), _(b"internal")]
7887 places = [_(b"external"), _(b"internal")]
7894 for n, v, p in zip(names, vers, isinternals):
7888 for n, v, p in zip(names, vers, isinternals):
7895 fn.startitem()
7889 fn.startitem()
7896 fn.condwrite(ui.verbose, b"name", namefmt, n)
7890 fn.condwrite(ui.verbose, b"name", namefmt, n)
7897 if ui.verbose:
7891 if ui.verbose:
7898 fn.plain(b"%s " % places[p])
7892 fn.plain(b"%s " % places[p])
7899 fn.data(bundled=p)
7893 fn.data(bundled=p)
7900 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7894 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7901 if ui.verbose:
7895 if ui.verbose:
7902 fn.plain(b"\n")
7896 fn.plain(b"\n")
7903 fn.end()
7897 fn.end()
7904 fm.end()
7898 fm.end()
7905
7899
7906
7900
7907 def loadcmdtable(ui, name, cmdtable):
7901 def loadcmdtable(ui, name, cmdtable):
7908 """Load command functions from specified cmdtable"""
7902 """Load command functions from specified cmdtable"""
7909 overrides = [cmd for cmd in cmdtable if cmd in table]
7903 overrides = [cmd for cmd in cmdtable if cmd in table]
7910 if overrides:
7904 if overrides:
7911 ui.warn(
7905 ui.warn(
7912 _(b"extension '%s' overrides commands: %s\n")
7906 _(b"extension '%s' overrides commands: %s\n")
7913 % (name, b" ".join(overrides))
7907 % (name, b" ".join(overrides))
7914 )
7908 )
7915 table.update(cmdtable)
7909 table.update(cmdtable)
@@ -1,1572 +1,1576 b''
1 # hg.py - repository classes for mercurial
1 # hg.py - repository classes for mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 #
5 #
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 from __future__ import absolute_import
9 from __future__ import absolute_import
10
10
11 import errno
11 import errno
12 import os
12 import os
13 import shutil
13 import shutil
14 import stat
14 import stat
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullhex,
19 nullhex,
20 nullid,
20 nullid,
21 short,
21 short,
22 )
22 )
23 from .pycompat import getattr
23 from .pycompat import getattr
24
24
25 from . import (
25 from . import (
26 bookmarks,
26 bookmarks,
27 bundlerepo,
27 bundlerepo,
28 cacheutil,
28 cacheutil,
29 cmdutil,
29 cmdutil,
30 destutil,
30 destutil,
31 discovery,
31 discovery,
32 error,
32 error,
33 exchange,
33 exchange,
34 extensions,
34 extensions,
35 graphmod,
35 graphmod,
36 httppeer,
36 httppeer,
37 localrepo,
37 localrepo,
38 lock,
38 lock,
39 logcmdutil,
39 logcmdutil,
40 logexchange,
40 logexchange,
41 merge as mergemod,
41 merge as mergemod,
42 mergestate as mergestatemod,
42 mergestate as mergestatemod,
43 narrowspec,
43 narrowspec,
44 phases,
44 phases,
45 requirements,
45 requirements,
46 scmutil,
46 scmutil,
47 sshpeer,
47 sshpeer,
48 statichttprepo,
48 statichttprepo,
49 ui as uimod,
49 ui as uimod,
50 unionrepo,
50 unionrepo,
51 url,
51 url,
52 util,
52 util,
53 verify as verifymod,
53 verify as verifymod,
54 vfs as vfsmod,
54 vfs as vfsmod,
55 )
55 )
56 from .utils import (
56 from .utils import (
57 hashutil,
57 hashutil,
58 stringutil,
58 stringutil,
59 urlutil,
59 urlutil,
60 )
60 )
61
61
62
62
63 release = lock.release
63 release = lock.release
64
64
65 # shared features
65 # shared features
66 sharedbookmarks = b'bookmarks'
66 sharedbookmarks = b'bookmarks'
67
67
68
68
69 def _local(path):
69 def _local(path):
70 path = util.expandpath(urlutil.urllocalpath(path))
70 path = util.expandpath(urlutil.urllocalpath(path))
71
71
72 try:
72 try:
73 # we use os.stat() directly here instead of os.path.isfile()
73 # we use os.stat() directly here instead of os.path.isfile()
74 # because the latter started returning `False` on invalid path
74 # because the latter started returning `False` on invalid path
75 # exceptions starting in 3.8 and we care about handling
75 # exceptions starting in 3.8 and we care about handling
76 # invalid paths specially here.
76 # invalid paths specially here.
77 st = os.stat(path)
77 st = os.stat(path)
78 isfile = stat.S_ISREG(st.st_mode)
78 isfile = stat.S_ISREG(st.st_mode)
79 # Python 2 raises TypeError, Python 3 ValueError.
79 # Python 2 raises TypeError, Python 3 ValueError.
80 except (TypeError, ValueError) as e:
80 except (TypeError, ValueError) as e:
81 raise error.Abort(
81 raise error.Abort(
82 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
82 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
83 )
83 )
84 except OSError:
84 except OSError:
85 isfile = False
85 isfile = False
86
86
87 return isfile and bundlerepo or localrepo
87 return isfile and bundlerepo or localrepo
88
88
89
89
90 def addbranchrevs(lrepo, other, branches, revs):
90 def addbranchrevs(lrepo, other, branches, revs):
91 peer = other.peer() # a courtesy to callers using a localrepo for other
91 peer = other.peer() # a courtesy to callers using a localrepo for other
92 hashbranch, branches = branches
92 hashbranch, branches = branches
93 if not hashbranch and not branches:
93 if not hashbranch and not branches:
94 x = revs or None
94 x = revs or None
95 if revs:
95 if revs:
96 y = revs[0]
96 y = revs[0]
97 else:
97 else:
98 y = None
98 y = None
99 return x, y
99 return x, y
100 if revs:
100 if revs:
101 revs = list(revs)
101 revs = list(revs)
102 else:
102 else:
103 revs = []
103 revs = []
104
104
105 if not peer.capable(b'branchmap'):
105 if not peer.capable(b'branchmap'):
106 if branches:
106 if branches:
107 raise error.Abort(_(b"remote branch lookup not supported"))
107 raise error.Abort(_(b"remote branch lookup not supported"))
108 revs.append(hashbranch)
108 revs.append(hashbranch)
109 return revs, revs[0]
109 return revs, revs[0]
110
110
111 with peer.commandexecutor() as e:
111 with peer.commandexecutor() as e:
112 branchmap = e.callcommand(b'branchmap', {}).result()
112 branchmap = e.callcommand(b'branchmap', {}).result()
113
113
114 def primary(branch):
114 def primary(branch):
115 if branch == b'.':
115 if branch == b'.':
116 if not lrepo:
116 if not lrepo:
117 raise error.Abort(_(b"dirstate branch not accessible"))
117 raise error.Abort(_(b"dirstate branch not accessible"))
118 branch = lrepo.dirstate.branch()
118 branch = lrepo.dirstate.branch()
119 if branch in branchmap:
119 if branch in branchmap:
120 revs.extend(hex(r) for r in reversed(branchmap[branch]))
120 revs.extend(hex(r) for r in reversed(branchmap[branch]))
121 return True
121 return True
122 else:
122 else:
123 return False
123 return False
124
124
125 for branch in branches:
125 for branch in branches:
126 if not primary(branch):
126 if not primary(branch):
127 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
127 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
128 if hashbranch:
128 if hashbranch:
129 if not primary(hashbranch):
129 if not primary(hashbranch):
130 revs.append(hashbranch)
130 revs.append(hashbranch)
131 return revs, revs[0]
131 return revs, revs[0]
132
132
133
133
134 def parseurl(path, branches=None):
134 def parseurl(path, branches=None):
135 '''parse url#branch, returning (url, (branch, branches))'''
135 '''parse url#branch, returning (url, (branch, branches))'''
136 msg = b'parseurl(...) moved to mercurial.utils.urlutil'
136 msg = b'parseurl(...) moved to mercurial.utils.urlutil'
137 util.nouideprecwarn(msg, b'6.0', stacklevel=2)
137 util.nouideprecwarn(msg, b'6.0', stacklevel=2)
138 return urlutil.parseurl(path, branches=branches)
138 return urlutil.parseurl(path, branches=branches)
139
139
140
140
141 schemes = {
141 schemes = {
142 b'bundle': bundlerepo,
142 b'bundle': bundlerepo,
143 b'union': unionrepo,
143 b'union': unionrepo,
144 b'file': _local,
144 b'file': _local,
145 b'http': httppeer,
145 b'http': httppeer,
146 b'https': httppeer,
146 b'https': httppeer,
147 b'ssh': sshpeer,
147 b'ssh': sshpeer,
148 b'static-http': statichttprepo,
148 b'static-http': statichttprepo,
149 }
149 }
150
150
151
151
152 def _peerlookup(path):
152 def _peerlookup(path):
153 u = urlutil.url(path)
153 u = urlutil.url(path)
154 scheme = u.scheme or b'file'
154 scheme = u.scheme or b'file'
155 thing = schemes.get(scheme) or schemes[b'file']
155 thing = schemes.get(scheme) or schemes[b'file']
156 try:
156 try:
157 return thing(path)
157 return thing(path)
158 except TypeError:
158 except TypeError:
159 # we can't test callable(thing) because 'thing' can be an unloaded
159 # we can't test callable(thing) because 'thing' can be an unloaded
160 # module that implements __call__
160 # module that implements __call__
161 if not util.safehasattr(thing, b'instance'):
161 if not util.safehasattr(thing, b'instance'):
162 raise
162 raise
163 return thing
163 return thing
164
164
165
165
166 def islocal(repo):
166 def islocal(repo):
167 '''return true if repo (or path pointing to repo) is local'''
167 '''return true if repo (or path pointing to repo) is local'''
168 if isinstance(repo, bytes):
168 if isinstance(repo, bytes):
169 try:
169 try:
170 return _peerlookup(repo).islocal(repo)
170 return _peerlookup(repo).islocal(repo)
171 except AttributeError:
171 except AttributeError:
172 return False
172 return False
173 return repo.local()
173 return repo.local()
174
174
175
175
176 def openpath(ui, path, sendaccept=True):
176 def openpath(ui, path, sendaccept=True):
177 '''open path with open if local, url.open if remote'''
177 '''open path with open if local, url.open if remote'''
178 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
178 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
179 if pathurl.islocal():
179 if pathurl.islocal():
180 return util.posixfile(pathurl.localpath(), b'rb')
180 return util.posixfile(pathurl.localpath(), b'rb')
181 else:
181 else:
182 return url.open(ui, path, sendaccept=sendaccept)
182 return url.open(ui, path, sendaccept=sendaccept)
183
183
184
184
185 # a list of (ui, repo) functions called for wire peer initialization
185 # a list of (ui, repo) functions called for wire peer initialization
186 wirepeersetupfuncs = []
186 wirepeersetupfuncs = []
187
187
188
188
189 def _peerorrepo(
189 def _peerorrepo(
190 ui, path, create=False, presetupfuncs=None, intents=None, createopts=None
190 ui, path, create=False, presetupfuncs=None, intents=None, createopts=None
191 ):
191 ):
192 """return a repository object for the specified path"""
192 """return a repository object for the specified path"""
193 obj = _peerlookup(path).instance(
193 obj = _peerlookup(path).instance(
194 ui, path, create, intents=intents, createopts=createopts
194 ui, path, create, intents=intents, createopts=createopts
195 )
195 )
196 ui = getattr(obj, "ui", ui)
196 ui = getattr(obj, "ui", ui)
197 for f in presetupfuncs or []:
197 for f in presetupfuncs or []:
198 f(ui, obj)
198 f(ui, obj)
199 ui.log(b'extension', b'- executing reposetup hooks\n')
199 ui.log(b'extension', b'- executing reposetup hooks\n')
200 with util.timedcm('all reposetup') as allreposetupstats:
200 with util.timedcm('all reposetup') as allreposetupstats:
201 for name, module in extensions.extensions(ui):
201 for name, module in extensions.extensions(ui):
202 ui.log(b'extension', b' - running reposetup for %s\n', name)
202 ui.log(b'extension', b' - running reposetup for %s\n', name)
203 hook = getattr(module, 'reposetup', None)
203 hook = getattr(module, 'reposetup', None)
204 if hook:
204 if hook:
205 with util.timedcm('reposetup %r', name) as stats:
205 with util.timedcm('reposetup %r', name) as stats:
206 hook(ui, obj)
206 hook(ui, obj)
207 ui.log(
207 ui.log(
208 b'extension', b' > reposetup for %s took %s\n', name, stats
208 b'extension', b' > reposetup for %s took %s\n', name, stats
209 )
209 )
210 ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats)
210 ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats)
211 if not obj.local():
211 if not obj.local():
212 for f in wirepeersetupfuncs:
212 for f in wirepeersetupfuncs:
213 f(ui, obj)
213 f(ui, obj)
214 return obj
214 return obj
215
215
216
216
217 def repository(
217 def repository(
218 ui,
218 ui,
219 path=b'',
219 path=b'',
220 create=False,
220 create=False,
221 presetupfuncs=None,
221 presetupfuncs=None,
222 intents=None,
222 intents=None,
223 createopts=None,
223 createopts=None,
224 ):
224 ):
225 """return a repository object for the specified path"""
225 """return a repository object for the specified path"""
226 peer = _peerorrepo(
226 peer = _peerorrepo(
227 ui,
227 ui,
228 path,
228 path,
229 create,
229 create,
230 presetupfuncs=presetupfuncs,
230 presetupfuncs=presetupfuncs,
231 intents=intents,
231 intents=intents,
232 createopts=createopts,
232 createopts=createopts,
233 )
233 )
234 repo = peer.local()
234 repo = peer.local()
235 if not repo:
235 if not repo:
236 raise error.Abort(
236 raise error.Abort(
237 _(b"repository '%s' is not local") % (path or peer.url())
237 _(b"repository '%s' is not local") % (path or peer.url())
238 )
238 )
239 return repo.filtered(b'visible')
239 return repo.filtered(b'visible')
240
240
241
241
242 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
242 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
243 '''return a repository peer for the specified path'''
243 '''return a repository peer for the specified path'''
244 rui = remoteui(uiorrepo, opts)
244 rui = remoteui(uiorrepo, opts)
245 return _peerorrepo(
245 return _peerorrepo(
246 rui, path, create, intents=intents, createopts=createopts
246 rui, path, create, intents=intents, createopts=createopts
247 ).peer()
247 ).peer()
248
248
249
249
250 def defaultdest(source):
250 def defaultdest(source):
251 """return default destination of clone if none is given
251 """return default destination of clone if none is given
252
252
253 >>> defaultdest(b'foo')
253 >>> defaultdest(b'foo')
254 'foo'
254 'foo'
255 >>> defaultdest(b'/foo/bar')
255 >>> defaultdest(b'/foo/bar')
256 'bar'
256 'bar'
257 >>> defaultdest(b'/')
257 >>> defaultdest(b'/')
258 ''
258 ''
259 >>> defaultdest(b'')
259 >>> defaultdest(b'')
260 ''
260 ''
261 >>> defaultdest(b'http://example.org/')
261 >>> defaultdest(b'http://example.org/')
262 ''
262 ''
263 >>> defaultdest(b'http://example.org/foo/')
263 >>> defaultdest(b'http://example.org/foo/')
264 'foo'
264 'foo'
265 """
265 """
266 path = urlutil.url(source).path
266 path = urlutil.url(source).path
267 if not path:
267 if not path:
268 return b''
268 return b''
269 return os.path.basename(os.path.normpath(path))
269 return os.path.basename(os.path.normpath(path))
270
270
271
271
272 def sharedreposource(repo):
272 def sharedreposource(repo):
273 """Returns repository object for source repository of a shared repo.
273 """Returns repository object for source repository of a shared repo.
274
274
275 If repo is not a shared repository, returns None.
275 If repo is not a shared repository, returns None.
276 """
276 """
277 if repo.sharedpath == repo.path:
277 if repo.sharedpath == repo.path:
278 return None
278 return None
279
279
280 if util.safehasattr(repo, b'srcrepo') and repo.srcrepo:
280 if util.safehasattr(repo, b'srcrepo') and repo.srcrepo:
281 return repo.srcrepo
281 return repo.srcrepo
282
282
283 # the sharedpath always ends in the .hg; we want the path to the repo
283 # the sharedpath always ends in the .hg; we want the path to the repo
284 source = repo.vfs.split(repo.sharedpath)[0]
284 source = repo.vfs.split(repo.sharedpath)[0]
285 srcurl, branches = urlutil.parseurl(source)
285 srcurl, branches = urlutil.parseurl(source)
286 srcrepo = repository(repo.ui, srcurl)
286 srcrepo = repository(repo.ui, srcurl)
287 repo.srcrepo = srcrepo
287 repo.srcrepo = srcrepo
288 return srcrepo
288 return srcrepo
289
289
290
290
291 def share(
291 def share(
292 ui,
292 ui,
293 source,
293 source,
294 dest=None,
294 dest=None,
295 update=True,
295 update=True,
296 bookmarks=True,
296 bookmarks=True,
297 defaultpath=None,
297 defaultpath=None,
298 relative=False,
298 relative=False,
299 ):
299 ):
300 '''create a shared repository'''
300 '''create a shared repository'''
301
301
302 if not islocal(source):
302 if not islocal(source):
303 raise error.Abort(_(b'can only share local repositories'))
303 raise error.Abort(_(b'can only share local repositories'))
304
304
305 if not dest:
305 if not dest:
306 dest = defaultdest(source)
306 dest = defaultdest(source)
307 else:
307 else:
308 dest = ui.expandpath(dest)
308 dest = ui.expandpath(dest)
309
309
310 if isinstance(source, bytes):
310 if isinstance(source, bytes):
311 origsource = ui.expandpath(source)
311 origsource = ui.expandpath(source)
312 source, branches = urlutil.parseurl(origsource)
312 source, branches = urlutil.parseurl(origsource)
313 srcrepo = repository(ui, source)
313 srcrepo = repository(ui, source)
314 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
314 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
315 else:
315 else:
316 srcrepo = source.local()
316 srcrepo = source.local()
317 checkout = None
317 checkout = None
318
318
319 shareditems = set()
319 shareditems = set()
320 if bookmarks:
320 if bookmarks:
321 shareditems.add(sharedbookmarks)
321 shareditems.add(sharedbookmarks)
322
322
323 r = repository(
323 r = repository(
324 ui,
324 ui,
325 dest,
325 dest,
326 create=True,
326 create=True,
327 createopts={
327 createopts={
328 b'sharedrepo': srcrepo,
328 b'sharedrepo': srcrepo,
329 b'sharedrelative': relative,
329 b'sharedrelative': relative,
330 b'shareditems': shareditems,
330 b'shareditems': shareditems,
331 },
331 },
332 )
332 )
333
333
334 postshare(srcrepo, r, defaultpath=defaultpath)
334 postshare(srcrepo, r, defaultpath=defaultpath)
335 r = repository(ui, dest)
335 r = repository(ui, dest)
336 _postshareupdate(r, update, checkout=checkout)
336 _postshareupdate(r, update, checkout=checkout)
337 return r
337 return r
338
338
339
339
340 def _prependsourcehgrc(repo):
340 def _prependsourcehgrc(repo):
341 """copies the source repo config and prepend it in current repo .hg/hgrc
341 """copies the source repo config and prepend it in current repo .hg/hgrc
342 on unshare. This is only done if the share was perfomed using share safe
342 on unshare. This is only done if the share was perfomed using share safe
343 method where we share config of source in shares"""
343 method where we share config of source in shares"""
344 srcvfs = vfsmod.vfs(repo.sharedpath)
344 srcvfs = vfsmod.vfs(repo.sharedpath)
345 dstvfs = vfsmod.vfs(repo.path)
345 dstvfs = vfsmod.vfs(repo.path)
346
346
347 if not srcvfs.exists(b'hgrc'):
347 if not srcvfs.exists(b'hgrc'):
348 return
348 return
349
349
350 currentconfig = b''
350 currentconfig = b''
351 if dstvfs.exists(b'hgrc'):
351 if dstvfs.exists(b'hgrc'):
352 currentconfig = dstvfs.read(b'hgrc')
352 currentconfig = dstvfs.read(b'hgrc')
353
353
354 with dstvfs(b'hgrc', b'wb') as fp:
354 with dstvfs(b'hgrc', b'wb') as fp:
355 sourceconfig = srcvfs.read(b'hgrc')
355 sourceconfig = srcvfs.read(b'hgrc')
356 fp.write(b"# Config copied from shared source\n")
356 fp.write(b"# Config copied from shared source\n")
357 fp.write(sourceconfig)
357 fp.write(sourceconfig)
358 fp.write(b'\n')
358 fp.write(b'\n')
359 fp.write(currentconfig)
359 fp.write(currentconfig)
360
360
361
361
362 def unshare(ui, repo):
362 def unshare(ui, repo):
363 """convert a shared repository to a normal one
363 """convert a shared repository to a normal one
364
364
365 Copy the store data to the repo and remove the sharedpath data.
365 Copy the store data to the repo and remove the sharedpath data.
366
366
367 Returns a new repository object representing the unshared repository.
367 Returns a new repository object representing the unshared repository.
368
368
369 The passed repository object is not usable after this function is
369 The passed repository object is not usable after this function is
370 called.
370 called.
371 """
371 """
372
372
373 with repo.lock():
373 with repo.lock():
374 # we use locks here because if we race with commit, we
374 # we use locks here because if we race with commit, we
375 # can end up with extra data in the cloned revlogs that's
375 # can end up with extra data in the cloned revlogs that's
376 # not pointed to by changesets, thus causing verify to
376 # not pointed to by changesets, thus causing verify to
377 # fail
377 # fail
378 destlock = copystore(ui, repo, repo.path)
378 destlock = copystore(ui, repo, repo.path)
379 with destlock or util.nullcontextmanager():
379 with destlock or util.nullcontextmanager():
380 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
380 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
381 # we were sharing .hg/hgrc of the share source with the current
381 # we were sharing .hg/hgrc of the share source with the current
382 # repo. We need to copy that while unsharing otherwise it can
382 # repo. We need to copy that while unsharing otherwise it can
383 # disable hooks and other checks
383 # disable hooks and other checks
384 _prependsourcehgrc(repo)
384 _prependsourcehgrc(repo)
385
385
386 sharefile = repo.vfs.join(b'sharedpath')
386 sharefile = repo.vfs.join(b'sharedpath')
387 util.rename(sharefile, sharefile + b'.old')
387 util.rename(sharefile, sharefile + b'.old')
388
388
389 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
389 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
390 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
390 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
391 scmutil.writereporequirements(repo)
391 scmutil.writereporequirements(repo)
392
392
393 # Removing share changes some fundamental properties of the repo instance.
393 # Removing share changes some fundamental properties of the repo instance.
394 # So we instantiate a new repo object and operate on it rather than
394 # So we instantiate a new repo object and operate on it rather than
395 # try to keep the existing repo usable.
395 # try to keep the existing repo usable.
396 newrepo = repository(repo.baseui, repo.root, create=False)
396 newrepo = repository(repo.baseui, repo.root, create=False)
397
397
398 # TODO: figure out how to access subrepos that exist, but were previously
398 # TODO: figure out how to access subrepos that exist, but were previously
399 # removed from .hgsub
399 # removed from .hgsub
400 c = newrepo[b'.']
400 c = newrepo[b'.']
401 subs = c.substate
401 subs = c.substate
402 for s in sorted(subs):
402 for s in sorted(subs):
403 c.sub(s).unshare()
403 c.sub(s).unshare()
404
404
405 localrepo.poisonrepository(repo)
405 localrepo.poisonrepository(repo)
406
406
407 return newrepo
407 return newrepo
408
408
409
409
410 def postshare(sourcerepo, destrepo, defaultpath=None):
410 def postshare(sourcerepo, destrepo, defaultpath=None):
411 """Called after a new shared repo is created.
411 """Called after a new shared repo is created.
412
412
413 The new repo only has a requirements file and pointer to the source.
413 The new repo only has a requirements file and pointer to the source.
414 This function configures additional shared data.
414 This function configures additional shared data.
415
415
416 Extensions can wrap this function and write additional entries to
416 Extensions can wrap this function and write additional entries to
417 destrepo/.hg/shared to indicate additional pieces of data to be shared.
417 destrepo/.hg/shared to indicate additional pieces of data to be shared.
418 """
418 """
419 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
419 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
420 if default:
420 if default:
421 template = b'[paths]\ndefault = %s\n'
421 template = b'[paths]\ndefault = %s\n'
422 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
422 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
423 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
423 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
424 with destrepo.wlock():
424 with destrepo.wlock():
425 narrowspec.copytoworkingcopy(destrepo)
425 narrowspec.copytoworkingcopy(destrepo)
426
426
427
427
428 def _postshareupdate(repo, update, checkout=None):
428 def _postshareupdate(repo, update, checkout=None):
429 """Maybe perform a working directory update after a shared repo is created.
429 """Maybe perform a working directory update after a shared repo is created.
430
430
431 ``update`` can be a boolean or a revision to update to.
431 ``update`` can be a boolean or a revision to update to.
432 """
432 """
433 if not update:
433 if not update:
434 return
434 return
435
435
436 repo.ui.status(_(b"updating working directory\n"))
436 repo.ui.status(_(b"updating working directory\n"))
437 if update is not True:
437 if update is not True:
438 checkout = update
438 checkout = update
439 for test in (checkout, b'default', b'tip'):
439 for test in (checkout, b'default', b'tip'):
440 if test is None:
440 if test is None:
441 continue
441 continue
442 try:
442 try:
443 uprev = repo.lookup(test)
443 uprev = repo.lookup(test)
444 break
444 break
445 except error.RepoLookupError:
445 except error.RepoLookupError:
446 continue
446 continue
447 _update(repo, uprev)
447 _update(repo, uprev)
448
448
449
449
450 def copystore(ui, srcrepo, destpath):
450 def copystore(ui, srcrepo, destpath):
451 """copy files from store of srcrepo in destpath
451 """copy files from store of srcrepo in destpath
452
452
453 returns destlock
453 returns destlock
454 """
454 """
455 destlock = None
455 destlock = None
456 try:
456 try:
457 hardlink = None
457 hardlink = None
458 topic = _(b'linking') if hardlink else _(b'copying')
458 topic = _(b'linking') if hardlink else _(b'copying')
459 with ui.makeprogress(topic, unit=_(b'files')) as progress:
459 with ui.makeprogress(topic, unit=_(b'files')) as progress:
460 num = 0
460 num = 0
461 srcpublishing = srcrepo.publishing()
461 srcpublishing = srcrepo.publishing()
462 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
462 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
463 dstvfs = vfsmod.vfs(destpath)
463 dstvfs = vfsmod.vfs(destpath)
464 for f in srcrepo.store.copylist():
464 for f in srcrepo.store.copylist():
465 if srcpublishing and f.endswith(b'phaseroots'):
465 if srcpublishing and f.endswith(b'phaseroots'):
466 continue
466 continue
467 dstbase = os.path.dirname(f)
467 dstbase = os.path.dirname(f)
468 if dstbase and not dstvfs.exists(dstbase):
468 if dstbase and not dstvfs.exists(dstbase):
469 dstvfs.mkdir(dstbase)
469 dstvfs.mkdir(dstbase)
470 if srcvfs.exists(f):
470 if srcvfs.exists(f):
471 if f.endswith(b'data'):
471 if f.endswith(b'data'):
472 # 'dstbase' may be empty (e.g. revlog format 0)
472 # 'dstbase' may be empty (e.g. revlog format 0)
473 lockfile = os.path.join(dstbase, b"lock")
473 lockfile = os.path.join(dstbase, b"lock")
474 # lock to avoid premature writing to the target
474 # lock to avoid premature writing to the target
475 destlock = lock.lock(dstvfs, lockfile)
475 destlock = lock.lock(dstvfs, lockfile)
476 hardlink, n = util.copyfiles(
476 hardlink, n = util.copyfiles(
477 srcvfs.join(f), dstvfs.join(f), hardlink, progress
477 srcvfs.join(f), dstvfs.join(f), hardlink, progress
478 )
478 )
479 num += n
479 num += n
480 if hardlink:
480 if hardlink:
481 ui.debug(b"linked %d files\n" % num)
481 ui.debug(b"linked %d files\n" % num)
482 else:
482 else:
483 ui.debug(b"copied %d files\n" % num)
483 ui.debug(b"copied %d files\n" % num)
484 return destlock
484 return destlock
485 except: # re-raises
485 except: # re-raises
486 release(destlock)
486 release(destlock)
487 raise
487 raise
488
488
489
489
490 def clonewithshare(
490 def clonewithshare(
491 ui,
491 ui,
492 peeropts,
492 peeropts,
493 sharepath,
493 sharepath,
494 source,
494 source,
495 srcpeer,
495 srcpeer,
496 dest,
496 dest,
497 pull=False,
497 pull=False,
498 rev=None,
498 rev=None,
499 update=True,
499 update=True,
500 stream=False,
500 stream=False,
501 ):
501 ):
502 """Perform a clone using a shared repo.
502 """Perform a clone using a shared repo.
503
503
504 The store for the repository will be located at <sharepath>/.hg. The
504 The store for the repository will be located at <sharepath>/.hg. The
505 specified revisions will be cloned or pulled from "source". A shared repo
505 specified revisions will be cloned or pulled from "source". A shared repo
506 will be created at "dest" and a working copy will be created if "update" is
506 will be created at "dest" and a working copy will be created if "update" is
507 True.
507 True.
508 """
508 """
509 revs = None
509 revs = None
510 if rev:
510 if rev:
511 if not srcpeer.capable(b'lookup'):
511 if not srcpeer.capable(b'lookup'):
512 raise error.Abort(
512 raise error.Abort(
513 _(
513 _(
514 b"src repository does not support "
514 b"src repository does not support "
515 b"revision lookup and so doesn't "
515 b"revision lookup and so doesn't "
516 b"support clone by revision"
516 b"support clone by revision"
517 )
517 )
518 )
518 )
519
519
520 # TODO this is batchable.
520 # TODO this is batchable.
521 remoterevs = []
521 remoterevs = []
522 for r in rev:
522 for r in rev:
523 with srcpeer.commandexecutor() as e:
523 with srcpeer.commandexecutor() as e:
524 remoterevs.append(
524 remoterevs.append(
525 e.callcommand(
525 e.callcommand(
526 b'lookup',
526 b'lookup',
527 {
527 {
528 b'key': r,
528 b'key': r,
529 },
529 },
530 ).result()
530 ).result()
531 )
531 )
532 revs = remoterevs
532 revs = remoterevs
533
533
534 # Obtain a lock before checking for or cloning the pooled repo otherwise
534 # Obtain a lock before checking for or cloning the pooled repo otherwise
535 # 2 clients may race creating or populating it.
535 # 2 clients may race creating or populating it.
536 pooldir = os.path.dirname(sharepath)
536 pooldir = os.path.dirname(sharepath)
537 # lock class requires the directory to exist.
537 # lock class requires the directory to exist.
538 try:
538 try:
539 util.makedir(pooldir, False)
539 util.makedir(pooldir, False)
540 except OSError as e:
540 except OSError as e:
541 if e.errno != errno.EEXIST:
541 if e.errno != errno.EEXIST:
542 raise
542 raise
543
543
544 poolvfs = vfsmod.vfs(pooldir)
544 poolvfs = vfsmod.vfs(pooldir)
545 basename = os.path.basename(sharepath)
545 basename = os.path.basename(sharepath)
546
546
547 with lock.lock(poolvfs, b'%s.lock' % basename):
547 with lock.lock(poolvfs, b'%s.lock' % basename):
548 if os.path.exists(sharepath):
548 if os.path.exists(sharepath):
549 ui.status(
549 ui.status(
550 _(b'(sharing from existing pooled repository %s)\n') % basename
550 _(b'(sharing from existing pooled repository %s)\n') % basename
551 )
551 )
552 else:
552 else:
553 ui.status(
553 ui.status(
554 _(b'(sharing from new pooled repository %s)\n') % basename
554 _(b'(sharing from new pooled repository %s)\n') % basename
555 )
555 )
556 # Always use pull mode because hardlinks in share mode don't work
556 # Always use pull mode because hardlinks in share mode don't work
557 # well. Never update because working copies aren't necessary in
557 # well. Never update because working copies aren't necessary in
558 # share mode.
558 # share mode.
559 clone(
559 clone(
560 ui,
560 ui,
561 peeropts,
561 peeropts,
562 source,
562 source,
563 dest=sharepath,
563 dest=sharepath,
564 pull=True,
564 pull=True,
565 revs=rev,
565 revs=rev,
566 update=False,
566 update=False,
567 stream=stream,
567 stream=stream,
568 )
568 )
569
569
570 # Resolve the value to put in [paths] section for the source.
570 # Resolve the value to put in [paths] section for the source.
571 if islocal(source):
571 if islocal(source):
572 defaultpath = os.path.abspath(urlutil.urllocalpath(source))
572 defaultpath = os.path.abspath(urlutil.urllocalpath(source))
573 else:
573 else:
574 defaultpath = source
574 defaultpath = source
575
575
576 sharerepo = repository(ui, path=sharepath)
576 sharerepo = repository(ui, path=sharepath)
577 destrepo = share(
577 destrepo = share(
578 ui,
578 ui,
579 sharerepo,
579 sharerepo,
580 dest=dest,
580 dest=dest,
581 update=False,
581 update=False,
582 bookmarks=False,
582 bookmarks=False,
583 defaultpath=defaultpath,
583 defaultpath=defaultpath,
584 )
584 )
585
585
586 # We need to perform a pull against the dest repo to fetch bookmarks
586 # We need to perform a pull against the dest repo to fetch bookmarks
587 # and other non-store data that isn't shared by default. In the case of
587 # and other non-store data that isn't shared by default. In the case of
588 # non-existing shared repo, this means we pull from the remote twice. This
588 # non-existing shared repo, this means we pull from the remote twice. This
589 # is a bit weird. But at the time it was implemented, there wasn't an easy
589 # is a bit weird. But at the time it was implemented, there wasn't an easy
590 # way to pull just non-changegroup data.
590 # way to pull just non-changegroup data.
591 exchange.pull(destrepo, srcpeer, heads=revs)
591 exchange.pull(destrepo, srcpeer, heads=revs)
592
592
593 _postshareupdate(destrepo, update)
593 _postshareupdate(destrepo, update)
594
594
595 return srcpeer, peer(ui, peeropts, dest)
595 return srcpeer, peer(ui, peeropts, dest)
596
596
597
597
598 # Recomputing caches is often slow on big repos, so copy them.
598 # Recomputing caches is often slow on big repos, so copy them.
599 def _copycache(srcrepo, dstcachedir, fname):
599 def _copycache(srcrepo, dstcachedir, fname):
600 """copy a cache from srcrepo to destcachedir (if it exists)"""
600 """copy a cache from srcrepo to destcachedir (if it exists)"""
601 srcfname = srcrepo.cachevfs.join(fname)
601 srcfname = srcrepo.cachevfs.join(fname)
602 dstfname = os.path.join(dstcachedir, fname)
602 dstfname = os.path.join(dstcachedir, fname)
603 if os.path.exists(srcfname):
603 if os.path.exists(srcfname):
604 if not os.path.exists(dstcachedir):
604 if not os.path.exists(dstcachedir):
605 os.mkdir(dstcachedir)
605 os.mkdir(dstcachedir)
606 util.copyfile(srcfname, dstfname)
606 util.copyfile(srcfname, dstfname)
607
607
608
608
609 def clone(
609 def clone(
610 ui,
610 ui,
611 peeropts,
611 peeropts,
612 source,
612 source,
613 dest=None,
613 dest=None,
614 pull=False,
614 pull=False,
615 revs=None,
615 revs=None,
616 update=True,
616 update=True,
617 stream=False,
617 stream=False,
618 branch=None,
618 branch=None,
619 shareopts=None,
619 shareopts=None,
620 storeincludepats=None,
620 storeincludepats=None,
621 storeexcludepats=None,
621 storeexcludepats=None,
622 depth=None,
622 depth=None,
623 ):
623 ):
624 """Make a copy of an existing repository.
624 """Make a copy of an existing repository.
625
625
626 Create a copy of an existing repository in a new directory. The
626 Create a copy of an existing repository in a new directory. The
627 source and destination are URLs, as passed to the repository
627 source and destination are URLs, as passed to the repository
628 function. Returns a pair of repository peers, the source and
628 function. Returns a pair of repository peers, the source and
629 newly created destination.
629 newly created destination.
630
630
631 The location of the source is added to the new repository's
631 The location of the source is added to the new repository's
632 .hg/hgrc file, as the default to be used for future pulls and
632 .hg/hgrc file, as the default to be used for future pulls and
633 pushes.
633 pushes.
634
634
635 If an exception is raised, the partly cloned/updated destination
635 If an exception is raised, the partly cloned/updated destination
636 repository will be deleted.
636 repository will be deleted.
637
637
638 Arguments:
638 Arguments:
639
639
640 source: repository object or URL
640 source: repository object or URL
641
641
642 dest: URL of destination repository to create (defaults to base
642 dest: URL of destination repository to create (defaults to base
643 name of source repository)
643 name of source repository)
644
644
645 pull: always pull from source repository, even in local case or if the
645 pull: always pull from source repository, even in local case or if the
646 server prefers streaming
646 server prefers streaming
647
647
648 stream: stream raw data uncompressed from repository (fast over
648 stream: stream raw data uncompressed from repository (fast over
649 LAN, slow over WAN)
649 LAN, slow over WAN)
650
650
651 revs: revision to clone up to (implies pull=True)
651 revs: revision to clone up to (implies pull=True)
652
652
653 update: update working directory after clone completes, if
653 update: update working directory after clone completes, if
654 destination is local repository (True means update to default rev,
654 destination is local repository (True means update to default rev,
655 anything else is treated as a revision)
655 anything else is treated as a revision)
656
656
657 branch: branches to clone
657 branch: branches to clone
658
658
659 shareopts: dict of options to control auto sharing behavior. The "pool" key
659 shareopts: dict of options to control auto sharing behavior. The "pool" key
660 activates auto sharing mode and defines the directory for stores. The
660 activates auto sharing mode and defines the directory for stores. The
661 "mode" key determines how to construct the directory name of the shared
661 "mode" key determines how to construct the directory name of the shared
662 repository. "identity" means the name is derived from the node of the first
662 repository. "identity" means the name is derived from the node of the first
663 changeset in the repository. "remote" means the name is derived from the
663 changeset in the repository. "remote" means the name is derived from the
664 remote's path/URL. Defaults to "identity."
664 remote's path/URL. Defaults to "identity."
665
665
666 storeincludepats and storeexcludepats: sets of file patterns to include and
666 storeincludepats and storeexcludepats: sets of file patterns to include and
667 exclude in the repository copy, respectively. If not defined, all files
667 exclude in the repository copy, respectively. If not defined, all files
668 will be included (a "full" clone). Otherwise a "narrow" clone containing
668 will be included (a "full" clone). Otherwise a "narrow" clone containing
669 only the requested files will be performed. If ``storeincludepats`` is not
669 only the requested files will be performed. If ``storeincludepats`` is not
670 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
670 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
671 ``path:.``. If both are empty sets, no files will be cloned.
671 ``path:.``. If both are empty sets, no files will be cloned.
672 """
672 """
673
673
674 if isinstance(source, bytes):
674 if isinstance(source, bytes):
675 origsource = ui.expandpath(source)
675 origsource = ui.expandpath(source)
676 source, branches = urlutil.parseurl(origsource, branch)
676 source, branches = urlutil.parseurl(origsource, branch)
677 srcpeer = peer(ui, peeropts, source)
677 srcpeer = peer(ui, peeropts, source)
678 else:
678 else:
679 srcpeer = source.peer() # in case we were called with a localrepo
679 srcpeer = source.peer() # in case we were called with a localrepo
680 branches = (None, branch or [])
680 branches = (None, branch or [])
681 origsource = source = srcpeer.url()
681 origsource = source = srcpeer.url()
682 srclock = destlock = cleandir = None
682 srclock = destlock = cleandir = None
683 destpeer = None
683 destpeer = None
684 try:
684 try:
685 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
685 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
686
686
687 if dest is None:
687 if dest is None:
688 dest = defaultdest(source)
688 dest = defaultdest(source)
689 if dest:
689 if dest:
690 ui.status(_(b"destination directory: %s\n") % dest)
690 ui.status(_(b"destination directory: %s\n") % dest)
691 else:
691 else:
692 dest = ui.expandpath(dest)
692 dest = ui.expandpath(dest)
693
693
694 dest = urlutil.urllocalpath(dest)
694 dest = urlutil.urllocalpath(dest)
695 source = urlutil.urllocalpath(source)
695 source = urlutil.urllocalpath(source)
696
696
697 if not dest:
697 if not dest:
698 raise error.InputError(_(b"empty destination path is not valid"))
698 raise error.InputError(_(b"empty destination path is not valid"))
699
699
700 destvfs = vfsmod.vfs(dest, expandpath=True)
700 destvfs = vfsmod.vfs(dest, expandpath=True)
701 if destvfs.lexists():
701 if destvfs.lexists():
702 if not destvfs.isdir():
702 if not destvfs.isdir():
703 raise error.InputError(
703 raise error.InputError(
704 _(b"destination '%s' already exists") % dest
704 _(b"destination '%s' already exists") % dest
705 )
705 )
706 elif destvfs.listdir():
706 elif destvfs.listdir():
707 raise error.InputError(
707 raise error.InputError(
708 _(b"destination '%s' is not empty") % dest
708 _(b"destination '%s' is not empty") % dest
709 )
709 )
710
710
711 createopts = {}
711 createopts = {}
712 narrow = False
712 narrow = False
713
713
714 if storeincludepats is not None:
714 if storeincludepats is not None:
715 narrowspec.validatepatterns(storeincludepats)
715 narrowspec.validatepatterns(storeincludepats)
716 narrow = True
716 narrow = True
717
717
718 if storeexcludepats is not None:
718 if storeexcludepats is not None:
719 narrowspec.validatepatterns(storeexcludepats)
719 narrowspec.validatepatterns(storeexcludepats)
720 narrow = True
720 narrow = True
721
721
722 if narrow:
722 if narrow:
723 # Include everything by default if only exclusion patterns defined.
723 # Include everything by default if only exclusion patterns defined.
724 if storeexcludepats and not storeincludepats:
724 if storeexcludepats and not storeincludepats:
725 storeincludepats = {b'path:.'}
725 storeincludepats = {b'path:.'}
726
726
727 createopts[b'narrowfiles'] = True
727 createopts[b'narrowfiles'] = True
728
728
729 if depth:
729 if depth:
730 createopts[b'shallowfilestore'] = True
730 createopts[b'shallowfilestore'] = True
731
731
732 if srcpeer.capable(b'lfs-serve'):
732 if srcpeer.capable(b'lfs-serve'):
733 # Repository creation honors the config if it disabled the extension, so
733 # Repository creation honors the config if it disabled the extension, so
734 # we can't just announce that lfs will be enabled. This check avoids
734 # we can't just announce that lfs will be enabled. This check avoids
735 # saying that lfs will be enabled, and then saying it's an unknown
735 # saying that lfs will be enabled, and then saying it's an unknown
736 # feature. The lfs creation option is set in either case so that a
736 # feature. The lfs creation option is set in either case so that a
737 # requirement is added. If the extension is explicitly disabled but the
737 # requirement is added. If the extension is explicitly disabled but the
738 # requirement is set, the clone aborts early, before transferring any
738 # requirement is set, the clone aborts early, before transferring any
739 # data.
739 # data.
740 createopts[b'lfs'] = True
740 createopts[b'lfs'] = True
741
741
742 if extensions.disabled_help(b'lfs'):
742 if extensions.disabled_help(b'lfs'):
743 ui.status(
743 ui.status(
744 _(
744 _(
745 b'(remote is using large file support (lfs), but it is '
745 b'(remote is using large file support (lfs), but it is '
746 b'explicitly disabled in the local configuration)\n'
746 b'explicitly disabled in the local configuration)\n'
747 )
747 )
748 )
748 )
749 else:
749 else:
750 ui.status(
750 ui.status(
751 _(
751 _(
752 b'(remote is using large file support (lfs); lfs will '
752 b'(remote is using large file support (lfs); lfs will '
753 b'be enabled for this repository)\n'
753 b'be enabled for this repository)\n'
754 )
754 )
755 )
755 )
756
756
757 shareopts = shareopts or {}
757 shareopts = shareopts or {}
758 sharepool = shareopts.get(b'pool')
758 sharepool = shareopts.get(b'pool')
759 sharenamemode = shareopts.get(b'mode')
759 sharenamemode = shareopts.get(b'mode')
760 if sharepool and islocal(dest):
760 if sharepool and islocal(dest):
761 sharepath = None
761 sharepath = None
762 if sharenamemode == b'identity':
762 if sharenamemode == b'identity':
763 # Resolve the name from the initial changeset in the remote
763 # Resolve the name from the initial changeset in the remote
764 # repository. This returns nullid when the remote is empty. It
764 # repository. This returns nullid when the remote is empty. It
765 # raises RepoLookupError if revision 0 is filtered or otherwise
765 # raises RepoLookupError if revision 0 is filtered or otherwise
766 # not available. If we fail to resolve, sharing is not enabled.
766 # not available. If we fail to resolve, sharing is not enabled.
767 try:
767 try:
768 with srcpeer.commandexecutor() as e:
768 with srcpeer.commandexecutor() as e:
769 rootnode = e.callcommand(
769 rootnode = e.callcommand(
770 b'lookup',
770 b'lookup',
771 {
771 {
772 b'key': b'0',
772 b'key': b'0',
773 },
773 },
774 ).result()
774 ).result()
775
775
776 if rootnode != nullid:
776 if rootnode != nullid:
777 sharepath = os.path.join(sharepool, hex(rootnode))
777 sharepath = os.path.join(sharepool, hex(rootnode))
778 else:
778 else:
779 ui.status(
779 ui.status(
780 _(
780 _(
781 b'(not using pooled storage: '
781 b'(not using pooled storage: '
782 b'remote appears to be empty)\n'
782 b'remote appears to be empty)\n'
783 )
783 )
784 )
784 )
785 except error.RepoLookupError:
785 except error.RepoLookupError:
786 ui.status(
786 ui.status(
787 _(
787 _(
788 b'(not using pooled storage: '
788 b'(not using pooled storage: '
789 b'unable to resolve identity of remote)\n'
789 b'unable to resolve identity of remote)\n'
790 )
790 )
791 )
791 )
792 elif sharenamemode == b'remote':
792 elif sharenamemode == b'remote':
793 sharepath = os.path.join(
793 sharepath = os.path.join(
794 sharepool, hex(hashutil.sha1(source).digest())
794 sharepool, hex(hashutil.sha1(source).digest())
795 )
795 )
796 else:
796 else:
797 raise error.Abort(
797 raise error.Abort(
798 _(b'unknown share naming mode: %s') % sharenamemode
798 _(b'unknown share naming mode: %s') % sharenamemode
799 )
799 )
800
800
801 # TODO this is a somewhat arbitrary restriction.
801 # TODO this is a somewhat arbitrary restriction.
802 if narrow:
802 if narrow:
803 ui.status(
803 ui.status(
804 _(b'(pooled storage not supported for narrow clones)\n')
804 _(b'(pooled storage not supported for narrow clones)\n')
805 )
805 )
806 sharepath = None
806 sharepath = None
807
807
808 if sharepath:
808 if sharepath:
809 return clonewithshare(
809 return clonewithshare(
810 ui,
810 ui,
811 peeropts,
811 peeropts,
812 sharepath,
812 sharepath,
813 source,
813 source,
814 srcpeer,
814 srcpeer,
815 dest,
815 dest,
816 pull=pull,
816 pull=pull,
817 rev=revs,
817 rev=revs,
818 update=update,
818 update=update,
819 stream=stream,
819 stream=stream,
820 )
820 )
821
821
822 srcrepo = srcpeer.local()
822 srcrepo = srcpeer.local()
823
823
824 abspath = origsource
824 abspath = origsource
825 if islocal(origsource):
825 if islocal(origsource):
826 abspath = os.path.abspath(urlutil.urllocalpath(origsource))
826 abspath = os.path.abspath(urlutil.urllocalpath(origsource))
827
827
828 if islocal(dest):
828 if islocal(dest):
829 cleandir = dest
829 cleandir = dest
830
830
831 copy = False
831 copy = False
832 if (
832 if (
833 srcrepo
833 srcrepo
834 and srcrepo.cancopy()
834 and srcrepo.cancopy()
835 and islocal(dest)
835 and islocal(dest)
836 and not phases.hassecret(srcrepo)
836 and not phases.hassecret(srcrepo)
837 ):
837 ):
838 copy = not pull and not revs
838 copy = not pull and not revs
839
839
840 # TODO this is a somewhat arbitrary restriction.
840 # TODO this is a somewhat arbitrary restriction.
841 if narrow:
841 if narrow:
842 copy = False
842 copy = False
843
843
844 if copy:
844 if copy:
845 try:
845 try:
846 # we use a lock here because if we race with commit, we
846 # we use a lock here because if we race with commit, we
847 # can end up with extra data in the cloned revlogs that's
847 # can end up with extra data in the cloned revlogs that's
848 # not pointed to by changesets, thus causing verify to
848 # not pointed to by changesets, thus causing verify to
849 # fail
849 # fail
850 srclock = srcrepo.lock(wait=False)
850 srclock = srcrepo.lock(wait=False)
851 except error.LockError:
851 except error.LockError:
852 copy = False
852 copy = False
853
853
854 if copy:
854 if copy:
855 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
855 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
856 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
856 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
857 if not os.path.exists(dest):
857 if not os.path.exists(dest):
858 util.makedirs(dest)
858 util.makedirs(dest)
859 else:
859 else:
860 # only clean up directories we create ourselves
860 # only clean up directories we create ourselves
861 cleandir = hgdir
861 cleandir = hgdir
862 try:
862 try:
863 destpath = hgdir
863 destpath = hgdir
864 util.makedir(destpath, notindexed=True)
864 util.makedir(destpath, notindexed=True)
865 except OSError as inst:
865 except OSError as inst:
866 if inst.errno == errno.EEXIST:
866 if inst.errno == errno.EEXIST:
867 cleandir = None
867 cleandir = None
868 raise error.Abort(
868 raise error.Abort(
869 _(b"destination '%s' already exists") % dest
869 _(b"destination '%s' already exists") % dest
870 )
870 )
871 raise
871 raise
872
872
873 destlock = copystore(ui, srcrepo, destpath)
873 destlock = copystore(ui, srcrepo, destpath)
874 # copy bookmarks over
874 # copy bookmarks over
875 srcbookmarks = srcrepo.vfs.join(b'bookmarks')
875 srcbookmarks = srcrepo.vfs.join(b'bookmarks')
876 dstbookmarks = os.path.join(destpath, b'bookmarks')
876 dstbookmarks = os.path.join(destpath, b'bookmarks')
877 if os.path.exists(srcbookmarks):
877 if os.path.exists(srcbookmarks):
878 util.copyfile(srcbookmarks, dstbookmarks)
878 util.copyfile(srcbookmarks, dstbookmarks)
879
879
880 dstcachedir = os.path.join(destpath, b'cache')
880 dstcachedir = os.path.join(destpath, b'cache')
881 for cache in cacheutil.cachetocopy(srcrepo):
881 for cache in cacheutil.cachetocopy(srcrepo):
882 _copycache(srcrepo, dstcachedir, cache)
882 _copycache(srcrepo, dstcachedir, cache)
883
883
884 # we need to re-init the repo after manually copying the data
884 # we need to re-init the repo after manually copying the data
885 # into it
885 # into it
886 destpeer = peer(srcrepo, peeropts, dest)
886 destpeer = peer(srcrepo, peeropts, dest)
887 srcrepo.hook(b'outgoing', source=b'clone', node=nullhex)
887 srcrepo.hook(b'outgoing', source=b'clone', node=nullhex)
888 else:
888 else:
889 try:
889 try:
890 # only pass ui when no srcrepo
890 # only pass ui when no srcrepo
891 destpeer = peer(
891 destpeer = peer(
892 srcrepo or ui,
892 srcrepo or ui,
893 peeropts,
893 peeropts,
894 dest,
894 dest,
895 create=True,
895 create=True,
896 createopts=createopts,
896 createopts=createopts,
897 )
897 )
898 except OSError as inst:
898 except OSError as inst:
899 if inst.errno == errno.EEXIST:
899 if inst.errno == errno.EEXIST:
900 cleandir = None
900 cleandir = None
901 raise error.Abort(
901 raise error.Abort(
902 _(b"destination '%s' already exists") % dest
902 _(b"destination '%s' already exists") % dest
903 )
903 )
904 raise
904 raise
905
905
906 if revs:
906 if revs:
907 if not srcpeer.capable(b'lookup'):
907 if not srcpeer.capable(b'lookup'):
908 raise error.Abort(
908 raise error.Abort(
909 _(
909 _(
910 b"src repository does not support "
910 b"src repository does not support "
911 b"revision lookup and so doesn't "
911 b"revision lookup and so doesn't "
912 b"support clone by revision"
912 b"support clone by revision"
913 )
913 )
914 )
914 )
915
915
916 # TODO this is batchable.
916 # TODO this is batchable.
917 remoterevs = []
917 remoterevs = []
918 for rev in revs:
918 for rev in revs:
919 with srcpeer.commandexecutor() as e:
919 with srcpeer.commandexecutor() as e:
920 remoterevs.append(
920 remoterevs.append(
921 e.callcommand(
921 e.callcommand(
922 b'lookup',
922 b'lookup',
923 {
923 {
924 b'key': rev,
924 b'key': rev,
925 },
925 },
926 ).result()
926 ).result()
927 )
927 )
928 revs = remoterevs
928 revs = remoterevs
929
929
930 checkout = revs[0]
930 checkout = revs[0]
931 else:
931 else:
932 revs = None
932 revs = None
933 local = destpeer.local()
933 local = destpeer.local()
934 if local:
934 if local:
935 if narrow:
935 if narrow:
936 with local.wlock(), local.lock():
936 with local.wlock(), local.lock():
937 local.setnarrowpats(storeincludepats, storeexcludepats)
937 local.setnarrowpats(storeincludepats, storeexcludepats)
938 narrowspec.copytoworkingcopy(local)
938 narrowspec.copytoworkingcopy(local)
939
939
940 u = urlutil.url(abspath)
940 u = urlutil.url(abspath)
941 defaulturl = bytes(u)
941 defaulturl = bytes(u)
942 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
942 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
943 if not stream:
943 if not stream:
944 if pull:
944 if pull:
945 stream = False
945 stream = False
946 else:
946 else:
947 stream = None
947 stream = None
948 # internal config: ui.quietbookmarkmove
948 # internal config: ui.quietbookmarkmove
949 overrides = {(b'ui', b'quietbookmarkmove'): True}
949 overrides = {(b'ui', b'quietbookmarkmove'): True}
950 with local.ui.configoverride(overrides, b'clone'):
950 with local.ui.configoverride(overrides, b'clone'):
951 exchange.pull(
951 exchange.pull(
952 local,
952 local,
953 srcpeer,
953 srcpeer,
954 revs,
954 revs,
955 streamclonerequested=stream,
955 streamclonerequested=stream,
956 includepats=storeincludepats,
956 includepats=storeincludepats,
957 excludepats=storeexcludepats,
957 excludepats=storeexcludepats,
958 depth=depth,
958 depth=depth,
959 )
959 )
960 elif srcrepo:
960 elif srcrepo:
961 # TODO lift restriction once exchange.push() accepts narrow
961 # TODO lift restriction once exchange.push() accepts narrow
962 # push.
962 # push.
963 if narrow:
963 if narrow:
964 raise error.Abort(
964 raise error.Abort(
965 _(
965 _(
966 b'narrow clone not available for '
966 b'narrow clone not available for '
967 b'remote destinations'
967 b'remote destinations'
968 )
968 )
969 )
969 )
970
970
971 exchange.push(
971 exchange.push(
972 srcrepo,
972 srcrepo,
973 destpeer,
973 destpeer,
974 revs=revs,
974 revs=revs,
975 bookmarks=srcrepo._bookmarks.keys(),
975 bookmarks=srcrepo._bookmarks.keys(),
976 )
976 )
977 else:
977 else:
978 raise error.Abort(
978 raise error.Abort(
979 _(b"clone from remote to remote not supported")
979 _(b"clone from remote to remote not supported")
980 )
980 )
981
981
982 cleandir = None
982 cleandir = None
983
983
984 destrepo = destpeer.local()
984 destrepo = destpeer.local()
985 if destrepo:
985 if destrepo:
986 template = uimod.samplehgrcs[b'cloned']
986 template = uimod.samplehgrcs[b'cloned']
987 u = urlutil.url(abspath)
987 u = urlutil.url(abspath)
988 u.passwd = None
988 u.passwd = None
989 defaulturl = bytes(u)
989 defaulturl = bytes(u)
990 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
990 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
991 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
991 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
992
992
993 if ui.configbool(b'experimental', b'remotenames'):
993 if ui.configbool(b'experimental', b'remotenames'):
994 logexchange.pullremotenames(destrepo, srcpeer)
994 logexchange.pullremotenames(destrepo, srcpeer)
995
995
996 if update:
996 if update:
997 if update is not True:
997 if update is not True:
998 with srcpeer.commandexecutor() as e:
998 with srcpeer.commandexecutor() as e:
999 checkout = e.callcommand(
999 checkout = e.callcommand(
1000 b'lookup',
1000 b'lookup',
1001 {
1001 {
1002 b'key': update,
1002 b'key': update,
1003 },
1003 },
1004 ).result()
1004 ).result()
1005
1005
1006 uprev = None
1006 uprev = None
1007 status = None
1007 status = None
1008 if checkout is not None:
1008 if checkout is not None:
1009 # Some extensions (at least hg-git and hg-subversion) have
1009 # Some extensions (at least hg-git and hg-subversion) have
1010 # a peer.lookup() implementation that returns a name instead
1010 # a peer.lookup() implementation that returns a name instead
1011 # of a nodeid. We work around it here until we've figured
1011 # of a nodeid. We work around it here until we've figured
1012 # out a better solution.
1012 # out a better solution.
1013 if len(checkout) == 20 and checkout in destrepo:
1013 if len(checkout) == 20 and checkout in destrepo:
1014 uprev = checkout
1014 uprev = checkout
1015 elif scmutil.isrevsymbol(destrepo, checkout):
1015 elif scmutil.isrevsymbol(destrepo, checkout):
1016 uprev = scmutil.revsymbol(destrepo, checkout).node()
1016 uprev = scmutil.revsymbol(destrepo, checkout).node()
1017 else:
1017 else:
1018 if update is not True:
1018 if update is not True:
1019 try:
1019 try:
1020 uprev = destrepo.lookup(update)
1020 uprev = destrepo.lookup(update)
1021 except error.RepoLookupError:
1021 except error.RepoLookupError:
1022 pass
1022 pass
1023 if uprev is None:
1023 if uprev is None:
1024 try:
1024 try:
1025 if destrepo._activebookmark:
1025 if destrepo._activebookmark:
1026 uprev = destrepo.lookup(destrepo._activebookmark)
1026 uprev = destrepo.lookup(destrepo._activebookmark)
1027 update = destrepo._activebookmark
1027 update = destrepo._activebookmark
1028 else:
1028 else:
1029 uprev = destrepo._bookmarks[b'@']
1029 uprev = destrepo._bookmarks[b'@']
1030 update = b'@'
1030 update = b'@'
1031 bn = destrepo[uprev].branch()
1031 bn = destrepo[uprev].branch()
1032 if bn == b'default':
1032 if bn == b'default':
1033 status = _(b"updating to bookmark %s\n" % update)
1033 status = _(b"updating to bookmark %s\n" % update)
1034 else:
1034 else:
1035 status = (
1035 status = (
1036 _(b"updating to bookmark %s on branch %s\n")
1036 _(b"updating to bookmark %s on branch %s\n")
1037 ) % (update, bn)
1037 ) % (update, bn)
1038 except KeyError:
1038 except KeyError:
1039 try:
1039 try:
1040 uprev = destrepo.branchtip(b'default')
1040 uprev = destrepo.branchtip(b'default')
1041 except error.RepoLookupError:
1041 except error.RepoLookupError:
1042 uprev = destrepo.lookup(b'tip')
1042 uprev = destrepo.lookup(b'tip')
1043 if not status:
1043 if not status:
1044 bn = destrepo[uprev].branch()
1044 bn = destrepo[uprev].branch()
1045 status = _(b"updating to branch %s\n") % bn
1045 status = _(b"updating to branch %s\n") % bn
1046 destrepo.ui.status(status)
1046 destrepo.ui.status(status)
1047 _update(destrepo, uprev)
1047 _update(destrepo, uprev)
1048 if update in destrepo._bookmarks:
1048 if update in destrepo._bookmarks:
1049 bookmarks.activate(destrepo, update)
1049 bookmarks.activate(destrepo, update)
1050 if destlock is not None:
1050 if destlock is not None:
1051 release(destlock)
1051 release(destlock)
1052 # here is a tiny windows were someone could end up writing the
1052 # here is a tiny windows were someone could end up writing the
1053 # repository before the cache are sure to be warm. This is "fine"
1053 # repository before the cache are sure to be warm. This is "fine"
1054 # as the only "bad" outcome would be some slowness. That potential
1054 # as the only "bad" outcome would be some slowness. That potential
1055 # slowness already affect reader.
1055 # slowness already affect reader.
1056 with destrepo.lock():
1056 with destrepo.lock():
1057 destrepo.updatecaches(full=True)
1057 destrepo.updatecaches(full=True)
1058 finally:
1058 finally:
1059 release(srclock, destlock)
1059 release(srclock, destlock)
1060 if cleandir is not None:
1060 if cleandir is not None:
1061 shutil.rmtree(cleandir, True)
1061 shutil.rmtree(cleandir, True)
1062 if srcpeer is not None:
1062 if srcpeer is not None:
1063 srcpeer.close()
1063 srcpeer.close()
1064 if destpeer and destpeer.local() is None:
1064 if destpeer and destpeer.local() is None:
1065 destpeer.close()
1065 destpeer.close()
1066 return srcpeer, destpeer
1066 return srcpeer, destpeer
1067
1067
1068
1068
1069 def _showstats(repo, stats, quietempty=False):
1069 def _showstats(repo, stats, quietempty=False):
1070 if quietempty and stats.isempty():
1070 if quietempty and stats.isempty():
1071 return
1071 return
1072 repo.ui.status(
1072 repo.ui.status(
1073 _(
1073 _(
1074 b"%d files updated, %d files merged, "
1074 b"%d files updated, %d files merged, "
1075 b"%d files removed, %d files unresolved\n"
1075 b"%d files removed, %d files unresolved\n"
1076 )
1076 )
1077 % (
1077 % (
1078 stats.updatedcount,
1078 stats.updatedcount,
1079 stats.mergedcount,
1079 stats.mergedcount,
1080 stats.removedcount,
1080 stats.removedcount,
1081 stats.unresolvedcount,
1081 stats.unresolvedcount,
1082 )
1082 )
1083 )
1083 )
1084
1084
1085
1085
1086 def updaterepo(repo, node, overwrite, updatecheck=None):
1086 def updaterepo(repo, node, overwrite, updatecheck=None):
1087 """Update the working directory to node.
1087 """Update the working directory to node.
1088
1088
1089 When overwrite is set, changes are clobbered, merged else
1089 When overwrite is set, changes are clobbered, merged else
1090
1090
1091 returns stats (see pydoc mercurial.merge.applyupdates)"""
1091 returns stats (see pydoc mercurial.merge.applyupdates)"""
1092 repo.ui.deprecwarn(
1092 repo.ui.deprecwarn(
1093 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
1093 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
1094 b'5.7',
1094 b'5.7',
1095 )
1095 )
1096 return mergemod._update(
1096 return mergemod._update(
1097 repo,
1097 repo,
1098 node,
1098 node,
1099 branchmerge=False,
1099 branchmerge=False,
1100 force=overwrite,
1100 force=overwrite,
1101 labels=[b'working copy', b'destination'],
1101 labels=[b'working copy', b'destination'],
1102 updatecheck=updatecheck,
1102 updatecheck=updatecheck,
1103 )
1103 )
1104
1104
1105
1105
1106 def update(repo, node, quietempty=False, updatecheck=None):
1106 def update(repo, node, quietempty=False, updatecheck=None):
1107 """update the working directory to node"""
1107 """update the working directory to node"""
1108 stats = mergemod.update(repo[node], updatecheck=updatecheck)
1108 stats = mergemod.update(repo[node], updatecheck=updatecheck)
1109 _showstats(repo, stats, quietempty)
1109 _showstats(repo, stats, quietempty)
1110 if stats.unresolvedcount:
1110 if stats.unresolvedcount:
1111 repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))
1111 repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))
1112 return stats.unresolvedcount > 0
1112 return stats.unresolvedcount > 0
1113
1113
1114
1114
1115 # naming conflict in clone()
1115 # naming conflict in clone()
1116 _update = update
1116 _update = update
1117
1117
1118
1118
1119 def clean(repo, node, show_stats=True, quietempty=False):
1119 def clean(repo, node, show_stats=True, quietempty=False):
1120 """forcibly switch the working directory to node, clobbering changes"""
1120 """forcibly switch the working directory to node, clobbering changes"""
1121 stats = mergemod.clean_update(repo[node])
1121 stats = mergemod.clean_update(repo[node])
1122 assert stats.unresolvedcount == 0
1122 assert stats.unresolvedcount == 0
1123 if show_stats:
1123 if show_stats:
1124 _showstats(repo, stats, quietempty)
1124 _showstats(repo, stats, quietempty)
1125 return False
1125 return False
1126
1126
1127
1127
1128 # naming conflict in updatetotally()
1128 # naming conflict in updatetotally()
1129 _clean = clean
1129 _clean = clean
1130
1130
1131 _VALID_UPDATECHECKS = {
1131 _VALID_UPDATECHECKS = {
1132 mergemod.UPDATECHECK_ABORT,
1132 mergemod.UPDATECHECK_ABORT,
1133 mergemod.UPDATECHECK_NONE,
1133 mergemod.UPDATECHECK_NONE,
1134 mergemod.UPDATECHECK_LINEAR,
1134 mergemod.UPDATECHECK_LINEAR,
1135 mergemod.UPDATECHECK_NO_CONFLICT,
1135 mergemod.UPDATECHECK_NO_CONFLICT,
1136 }
1136 }
1137
1137
1138
1138
1139 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
1139 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
1140 """Update the working directory with extra care for non-file components
1140 """Update the working directory with extra care for non-file components
1141
1141
1142 This takes care of non-file components below:
1142 This takes care of non-file components below:
1143
1143
1144 :bookmark: might be advanced or (in)activated
1144 :bookmark: might be advanced or (in)activated
1145
1145
1146 This takes arguments below:
1146 This takes arguments below:
1147
1147
1148 :checkout: to which revision the working directory is updated
1148 :checkout: to which revision the working directory is updated
1149 :brev: a name, which might be a bookmark to be activated after updating
1149 :brev: a name, which might be a bookmark to be activated after updating
1150 :clean: whether changes in the working directory can be discarded
1150 :clean: whether changes in the working directory can be discarded
1151 :updatecheck: how to deal with a dirty working directory
1151 :updatecheck: how to deal with a dirty working directory
1152
1152
1153 Valid values for updatecheck are the UPDATECHECK_* constants
1153 Valid values for updatecheck are the UPDATECHECK_* constants
1154 defined in the merge module. Passing `None` will result in using the
1154 defined in the merge module. Passing `None` will result in using the
1155 configured default.
1155 configured default.
1156
1156
1157 * ABORT: abort if the working directory is dirty
1157 * ABORT: abort if the working directory is dirty
1158 * NONE: don't check (merge working directory changes into destination)
1158 * NONE: don't check (merge working directory changes into destination)
1159 * LINEAR: check that update is linear before merging working directory
1159 * LINEAR: check that update is linear before merging working directory
1160 changes into destination
1160 changes into destination
1161 * NO_CONFLICT: check that the update does not result in file merges
1161 * NO_CONFLICT: check that the update does not result in file merges
1162
1162
1163 This returns whether conflict is detected at updating or not.
1163 This returns whether conflict is detected at updating or not.
1164 """
1164 """
1165 if updatecheck is None:
1165 if updatecheck is None:
1166 updatecheck = ui.config(b'commands', b'update.check')
1166 updatecheck = ui.config(b'commands', b'update.check')
1167 if updatecheck not in _VALID_UPDATECHECKS:
1167 if updatecheck not in _VALID_UPDATECHECKS:
1168 # If not configured, or invalid value configured
1168 # If not configured, or invalid value configured
1169 updatecheck = mergemod.UPDATECHECK_LINEAR
1169 updatecheck = mergemod.UPDATECHECK_LINEAR
1170 if updatecheck not in _VALID_UPDATECHECKS:
1170 if updatecheck not in _VALID_UPDATECHECKS:
1171 raise ValueError(
1171 raise ValueError(
1172 r'Invalid updatecheck value %r (can accept %r)'
1172 r'Invalid updatecheck value %r (can accept %r)'
1173 % (updatecheck, _VALID_UPDATECHECKS)
1173 % (updatecheck, _VALID_UPDATECHECKS)
1174 )
1174 )
1175 with repo.wlock():
1175 with repo.wlock():
1176 movemarkfrom = None
1176 movemarkfrom = None
1177 warndest = False
1177 warndest = False
1178 if checkout is None:
1178 if checkout is None:
1179 updata = destutil.destupdate(repo, clean=clean)
1179 updata = destutil.destupdate(repo, clean=clean)
1180 checkout, movemarkfrom, brev = updata
1180 checkout, movemarkfrom, brev = updata
1181 warndest = True
1181 warndest = True
1182
1182
1183 if clean:
1183 if clean:
1184 ret = _clean(repo, checkout)
1184 ret = _clean(repo, checkout)
1185 else:
1185 else:
1186 if updatecheck == mergemod.UPDATECHECK_ABORT:
1186 if updatecheck == mergemod.UPDATECHECK_ABORT:
1187 cmdutil.bailifchanged(repo, merge=False)
1187 cmdutil.bailifchanged(repo, merge=False)
1188 updatecheck = mergemod.UPDATECHECK_NONE
1188 updatecheck = mergemod.UPDATECHECK_NONE
1189 ret = _update(repo, checkout, updatecheck=updatecheck)
1189 ret = _update(repo, checkout, updatecheck=updatecheck)
1190
1190
1191 if not ret and movemarkfrom:
1191 if not ret and movemarkfrom:
1192 if movemarkfrom == repo[b'.'].node():
1192 if movemarkfrom == repo[b'.'].node():
1193 pass # no-op update
1193 pass # no-op update
1194 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
1194 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
1195 b = ui.label(repo._activebookmark, b'bookmarks.active')
1195 b = ui.label(repo._activebookmark, b'bookmarks.active')
1196 ui.status(_(b"updating bookmark %s\n") % b)
1196 ui.status(_(b"updating bookmark %s\n") % b)
1197 else:
1197 else:
1198 # this can happen with a non-linear update
1198 # this can happen with a non-linear update
1199 b = ui.label(repo._activebookmark, b'bookmarks')
1199 b = ui.label(repo._activebookmark, b'bookmarks')
1200 ui.status(_(b"(leaving bookmark %s)\n") % b)
1200 ui.status(_(b"(leaving bookmark %s)\n") % b)
1201 bookmarks.deactivate(repo)
1201 bookmarks.deactivate(repo)
1202 elif brev in repo._bookmarks:
1202 elif brev in repo._bookmarks:
1203 if brev != repo._activebookmark:
1203 if brev != repo._activebookmark:
1204 b = ui.label(brev, b'bookmarks.active')
1204 b = ui.label(brev, b'bookmarks.active')
1205 ui.status(_(b"(activating bookmark %s)\n") % b)
1205 ui.status(_(b"(activating bookmark %s)\n") % b)
1206 bookmarks.activate(repo, brev)
1206 bookmarks.activate(repo, brev)
1207 elif brev:
1207 elif brev:
1208 if repo._activebookmark:
1208 if repo._activebookmark:
1209 b = ui.label(repo._activebookmark, b'bookmarks')
1209 b = ui.label(repo._activebookmark, b'bookmarks')
1210 ui.status(_(b"(leaving bookmark %s)\n") % b)
1210 ui.status(_(b"(leaving bookmark %s)\n") % b)
1211 bookmarks.deactivate(repo)
1211 bookmarks.deactivate(repo)
1212
1212
1213 if warndest:
1213 if warndest:
1214 destutil.statusotherdests(ui, repo)
1214 destutil.statusotherdests(ui, repo)
1215
1215
1216 return ret
1216 return ret
1217
1217
1218
1218
1219 def merge(
1219 def merge(
1220 ctx,
1220 ctx,
1221 force=False,
1221 force=False,
1222 remind=True,
1222 remind=True,
1223 labels=None,
1223 labels=None,
1224 ):
1224 ):
1225 """Branch merge with node, resolving changes. Return true if any
1225 """Branch merge with node, resolving changes. Return true if any
1226 unresolved conflicts."""
1226 unresolved conflicts."""
1227 repo = ctx.repo()
1227 repo = ctx.repo()
1228 stats = mergemod.merge(ctx, force=force, labels=labels)
1228 stats = mergemod.merge(ctx, force=force, labels=labels)
1229 _showstats(repo, stats)
1229 _showstats(repo, stats)
1230 if stats.unresolvedcount:
1230 if stats.unresolvedcount:
1231 repo.ui.status(
1231 repo.ui.status(
1232 _(
1232 _(
1233 b"use 'hg resolve' to retry unresolved file merges "
1233 b"use 'hg resolve' to retry unresolved file merges "
1234 b"or 'hg merge --abort' to abandon\n"
1234 b"or 'hg merge --abort' to abandon\n"
1235 )
1235 )
1236 )
1236 )
1237 elif remind:
1237 elif remind:
1238 repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
1238 repo.ui.status(_(b"(branch merge, don't forget to commit)\n"))
1239 return stats.unresolvedcount > 0
1239 return stats.unresolvedcount > 0
1240
1240
1241
1241
1242 def abortmerge(ui, repo):
1242 def abortmerge(ui, repo):
1243 ms = mergestatemod.mergestate.read(repo)
1243 ms = mergestatemod.mergestate.read(repo)
1244 if ms.active():
1244 if ms.active():
1245 # there were conflicts
1245 # there were conflicts
1246 node = ms.localctx.hex()
1246 node = ms.localctx.hex()
1247 else:
1247 else:
1248 # there were no conficts, mergestate was not stored
1248 # there were no conficts, mergestate was not stored
1249 node = repo[b'.'].hex()
1249 node = repo[b'.'].hex()
1250
1250
1251 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
1251 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
1252 stats = mergemod.clean_update(repo[node])
1252 stats = mergemod.clean_update(repo[node])
1253 assert stats.unresolvedcount == 0
1253 assert stats.unresolvedcount == 0
1254 _showstats(repo, stats)
1254 _showstats(repo, stats)
1255
1255
1256
1256
1257 def _incoming(
1257 def _incoming(
1258 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
1258 displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
1259 ):
1259 ):
1260 """
1260 """
1261 Helper for incoming / gincoming.
1261 Helper for incoming / gincoming.
1262 displaychlist gets called with
1262 displaychlist gets called with
1263 (remoterepo, incomingchangesetlist, displayer) parameters,
1263 (remoterepo, incomingchangesetlist, displayer) parameters,
1264 and is supposed to contain only code that can't be unified.
1264 and is supposed to contain only code that can't be unified.
1265 """
1265 """
1266 source, branches = urlutil.parseurl(
1266 source, branches = urlutil.parseurl(
1267 ui.expandpath(source), opts.get(b'branch')
1267 ui.expandpath(source), opts.get(b'branch')
1268 )
1268 )
1269 other = peer(repo, opts, source)
1269 other = peer(repo, opts, source)
1270 cleanupfn = other.close
1270 cleanupfn = other.close
1271 try:
1271 try:
1272 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
1272 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
1273 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
1273 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
1274
1274
1275 if revs:
1275 if revs:
1276 revs = [other.lookup(rev) for rev in revs]
1276 revs = [other.lookup(rev) for rev in revs]
1277 other, chlist, cleanupfn = bundlerepo.getremotechanges(
1277 other, chlist, cleanupfn = bundlerepo.getremotechanges(
1278 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
1278 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
1279 )
1279 )
1280
1280
1281 if not chlist:
1281 if not chlist:
1282 ui.status(_(b"no changes found\n"))
1282 ui.status(_(b"no changes found\n"))
1283 return subreporecurse()
1283 return subreporecurse()
1284 ui.pager(b'incoming')
1284 ui.pager(b'incoming')
1285 displayer = logcmdutil.changesetdisplayer(
1285 displayer = logcmdutil.changesetdisplayer(
1286 ui, other, opts, buffered=buffered
1286 ui, other, opts, buffered=buffered
1287 )
1287 )
1288 displaychlist(other, chlist, displayer)
1288 displaychlist(other, chlist, displayer)
1289 displayer.close()
1289 displayer.close()
1290 finally:
1290 finally:
1291 cleanupfn()
1291 cleanupfn()
1292 subreporecurse()
1292 subreporecurse()
1293 return 0 # exit code is zero since we found incoming changes
1293 return 0 # exit code is zero since we found incoming changes
1294
1294
1295
1295
1296 def incoming(ui, repo, source, opts):
1296 def incoming(ui, repo, source, opts):
1297 def subreporecurse():
1297 def subreporecurse():
1298 ret = 1
1298 ret = 1
1299 if opts.get(b'subrepos'):
1299 if opts.get(b'subrepos'):
1300 ctx = repo[None]
1300 ctx = repo[None]
1301 for subpath in sorted(ctx.substate):
1301 for subpath in sorted(ctx.substate):
1302 sub = ctx.sub(subpath)
1302 sub = ctx.sub(subpath)
1303 ret = min(ret, sub.incoming(ui, source, opts))
1303 ret = min(ret, sub.incoming(ui, source, opts))
1304 return ret
1304 return ret
1305
1305
1306 def display(other, chlist, displayer):
1306 def display(other, chlist, displayer):
1307 limit = logcmdutil.getlimit(opts)
1307 limit = logcmdutil.getlimit(opts)
1308 if opts.get(b'newest_first'):
1308 if opts.get(b'newest_first'):
1309 chlist.reverse()
1309 chlist.reverse()
1310 count = 0
1310 count = 0
1311 for n in chlist:
1311 for n in chlist:
1312 if limit is not None and count >= limit:
1312 if limit is not None and count >= limit:
1313 break
1313 break
1314 parents = [p for p in other.changelog.parents(n) if p != nullid]
1314 parents = [p for p in other.changelog.parents(n) if p != nullid]
1315 if opts.get(b'no_merges') and len(parents) == 2:
1315 if opts.get(b'no_merges') and len(parents) == 2:
1316 continue
1316 continue
1317 count += 1
1317 count += 1
1318 displayer.show(other[n])
1318 displayer.show(other[n])
1319
1319
1320 return _incoming(display, subreporecurse, ui, repo, source, opts)
1320 return _incoming(display, subreporecurse, ui, repo, source, opts)
1321
1321
1322
1322
1323 def _outgoing(ui, repo, dest, opts, subpath=None):
1323 def _outgoing(ui, repo, dests, opts, subpath=None):
1324 path = ui.getpath(dest, default=(b'default-push', b'default'))
1324 out = set()
1325 if not path:
1325 others = []
1326 raise error.Abort(
1326 for path in urlutil.get_push_paths(repo, ui, dests):
1327 _(b'default repository not configured!'),
1327 dest = path.pushloc or path.loc
1328 hint=_(b"see 'hg help config.paths'"),
1328 if subpath is not None:
1329 )
1329 subpath = urlutil.url(subpath)
1330 dest = path.pushloc or path.loc
1330 if subpath.isabs():
1331 if subpath is not None:
1331 dest = bytes(subpath)
1332 subpath = urlutil.url(subpath)
1332 else:
1333 if subpath.isabs():
1333 p = urlutil.url(dest)
1334 dest = bytes(subpath)
1334 p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
1335 else:
1335 dest = bytes(p)
1336 p = urlutil.url(dest)
1336 branches = path.branch, opts.get(b'branch') or []
1337 p.path = os.path.normpath(b'%s/%s' % (p.path, subpath))
1338 dest = bytes(p)
1339
1337
1340 branches = path.branch, opts.get(b'branch') or []
1338 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1341
1339 revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
1342 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1340 if revs:
1343 revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
1341 revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]
1344 if revs:
1345 revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]
1346
1342
1347 other = peer(repo, opts, dest)
1343 other = peer(repo, opts, dest)
1348 try:
1344 try:
1349 outgoing = discovery.findcommonoutgoing(
1345 outgoing = discovery.findcommonoutgoing(
1350 repo, other, revs, force=opts.get(b'force')
1346 repo, other, revs, force=opts.get(b'force')
1351 )
1347 )
1352 o = outgoing.missing
1348 o = outgoing.missing
1353 if not o:
1349 out.update(o)
1354 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
1350 if not o:
1355 return o, other
1351 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
1356 except: # re-raises
1352 others.append(other)
1357 other.close()
1353 except: # re-raises
1358 raise
1354 other.close()
1355 raise
1356 # make sure this is ordered by revision number
1357 outgoing_revs = list(out)
1358 cl = repo.changelog
1359 outgoing_revs.sort(key=cl.rev)
1360 return outgoing_revs, others
1359
1361
1360
1362
1361 def _outgoing_recurse(ui, repo, dest, opts):
1363 def _outgoing_recurse(ui, repo, dests, opts):
1362 ret = 1
1364 ret = 1
1363 if opts.get(b'subrepos'):
1365 if opts.get(b'subrepos'):
1364 ctx = repo[None]
1366 ctx = repo[None]
1365 for subpath in sorted(ctx.substate):
1367 for subpath in sorted(ctx.substate):
1366 sub = ctx.sub(subpath)
1368 sub = ctx.sub(subpath)
1367 ret = min(ret, sub.outgoing(ui, dest, opts))
1369 ret = min(ret, sub.outgoing(ui, dests, opts))
1368 return ret
1370 return ret
1369
1371
1370
1372
1371 def _outgoing_filter(repo, revs, opts):
1373 def _outgoing_filter(repo, revs, opts):
1372 """apply revision filtering/ordering option for outgoing"""
1374 """apply revision filtering/ordering option for outgoing"""
1373 limit = logcmdutil.getlimit(opts)
1375 limit = logcmdutil.getlimit(opts)
1374 no_merges = opts.get(b'no_merges')
1376 no_merges = opts.get(b'no_merges')
1375 if opts.get(b'newest_first'):
1377 if opts.get(b'newest_first'):
1376 revs.reverse()
1378 revs.reverse()
1377 if limit is None and not no_merges:
1379 if limit is None and not no_merges:
1378 for r in revs:
1380 for r in revs:
1379 yield r
1381 yield r
1380 return
1382 return
1381
1383
1382 count = 0
1384 count = 0
1383 cl = repo.changelog
1385 cl = repo.changelog
1384 for n in revs:
1386 for n in revs:
1385 if limit is not None and count >= limit:
1387 if limit is not None and count >= limit:
1386 break
1388 break
1387 parents = [p for p in cl.parents(n) if p != nullid]
1389 parents = [p for p in cl.parents(n) if p != nullid]
1388 if no_merges and len(parents) == 2:
1390 if no_merges and len(parents) == 2:
1389 continue
1391 continue
1390 count += 1
1392 count += 1
1391 yield n
1393 yield n
1392
1394
1393
1395
1394 def outgoing(ui, repo, dest, opts, subpath=None):
1396 def outgoing(ui, repo, dests, opts, subpath=None):
1395 if opts.get(b'graph'):
1397 if opts.get(b'graph'):
1396 logcmdutil.checkunsupportedgraphflags([], opts)
1398 logcmdutil.checkunsupportedgraphflags([], opts)
1397 o, other = _outgoing(ui, repo, dest, opts, subpath=subpath)
1399 o, others = _outgoing(ui, repo, dests, opts, subpath=subpath)
1398 ret = 1
1400 ret = 1
1399 try:
1401 try:
1400 if o:
1402 if o:
1401 ret = 0
1403 ret = 0
1402
1404
1403 if opts.get(b'graph'):
1405 if opts.get(b'graph'):
1404 revdag = logcmdutil.graphrevs(repo, o, opts)
1406 revdag = logcmdutil.graphrevs(repo, o, opts)
1405 ui.pager(b'outgoing')
1407 ui.pager(b'outgoing')
1406 displayer = logcmdutil.changesetdisplayer(
1408 displayer = logcmdutil.changesetdisplayer(
1407 ui, repo, opts, buffered=True
1409 ui, repo, opts, buffered=True
1408 )
1410 )
1409 logcmdutil.displaygraph(
1411 logcmdutil.displaygraph(
1410 ui, repo, revdag, displayer, graphmod.asciiedges
1412 ui, repo, revdag, displayer, graphmod.asciiedges
1411 )
1413 )
1412 else:
1414 else:
1413 ui.pager(b'outgoing')
1415 ui.pager(b'outgoing')
1414 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1416 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
1415 for n in _outgoing_filter(repo, o, opts):
1417 for n in _outgoing_filter(repo, o, opts):
1416 displayer.show(repo[n])
1418 displayer.show(repo[n])
1417 displayer.close()
1419 displayer.close()
1418 cmdutil.outgoinghooks(ui, repo, other, opts, o)
1420 for oth in others:
1419 ret = min(ret, _outgoing_recurse(ui, repo, dest, opts))
1421 cmdutil.outgoinghooks(ui, repo, oth, opts, o)
1422 ret = min(ret, _outgoing_recurse(ui, repo, dests, opts))
1420 return ret # exit code is zero since we found outgoing changes
1423 return ret # exit code is zero since we found outgoing changes
1421 finally:
1424 finally:
1422 other.close()
1425 for oth in others:
1426 oth.close()
1423
1427
1424
1428
1425 def verify(repo, level=None):
1429 def verify(repo, level=None):
1426 """verify the consistency of a repository"""
1430 """verify the consistency of a repository"""
1427 ret = verifymod.verify(repo, level=level)
1431 ret = verifymod.verify(repo, level=level)
1428
1432
1429 # Broken subrepo references in hidden csets don't seem worth worrying about,
1433 # Broken subrepo references in hidden csets don't seem worth worrying about,
1430 # since they can't be pushed/pulled, and --hidden can be used if they are a
1434 # since they can't be pushed/pulled, and --hidden can be used if they are a
1431 # concern.
1435 # concern.
1432
1436
1433 # pathto() is needed for -R case
1437 # pathto() is needed for -R case
1434 revs = repo.revs(
1438 revs = repo.revs(
1435 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
1439 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
1436 )
1440 )
1437
1441
1438 if revs:
1442 if revs:
1439 repo.ui.status(_(b'checking subrepo links\n'))
1443 repo.ui.status(_(b'checking subrepo links\n'))
1440 for rev in revs:
1444 for rev in revs:
1441 ctx = repo[rev]
1445 ctx = repo[rev]
1442 try:
1446 try:
1443 for subpath in ctx.substate:
1447 for subpath in ctx.substate:
1444 try:
1448 try:
1445 ret = (
1449 ret = (
1446 ctx.sub(subpath, allowcreate=False).verify() or ret
1450 ctx.sub(subpath, allowcreate=False).verify() or ret
1447 )
1451 )
1448 except error.RepoError as e:
1452 except error.RepoError as e:
1449 repo.ui.warn(b'%d: %s\n' % (rev, e))
1453 repo.ui.warn(b'%d: %s\n' % (rev, e))
1450 except Exception:
1454 except Exception:
1451 repo.ui.warn(
1455 repo.ui.warn(
1452 _(b'.hgsubstate is corrupt in revision %s\n')
1456 _(b'.hgsubstate is corrupt in revision %s\n')
1453 % short(ctx.node())
1457 % short(ctx.node())
1454 )
1458 )
1455
1459
1456 return ret
1460 return ret
1457
1461
1458
1462
1459 def remoteui(src, opts):
1463 def remoteui(src, opts):
1460 """build a remote ui from ui or repo and opts"""
1464 """build a remote ui from ui or repo and opts"""
1461 if util.safehasattr(src, b'baseui'): # looks like a repository
1465 if util.safehasattr(src, b'baseui'): # looks like a repository
1462 dst = src.baseui.copy() # drop repo-specific config
1466 dst = src.baseui.copy() # drop repo-specific config
1463 src = src.ui # copy target options from repo
1467 src = src.ui # copy target options from repo
1464 else: # assume it's a global ui object
1468 else: # assume it's a global ui object
1465 dst = src.copy() # keep all global options
1469 dst = src.copy() # keep all global options
1466
1470
1467 # copy ssh-specific options
1471 # copy ssh-specific options
1468 for o in b'ssh', b'remotecmd':
1472 for o in b'ssh', b'remotecmd':
1469 v = opts.get(o) or src.config(b'ui', o)
1473 v = opts.get(o) or src.config(b'ui', o)
1470 if v:
1474 if v:
1471 dst.setconfig(b"ui", o, v, b'copied')
1475 dst.setconfig(b"ui", o, v, b'copied')
1472
1476
1473 # copy bundle-specific options
1477 # copy bundle-specific options
1474 r = src.config(b'bundle', b'mainreporoot')
1478 r = src.config(b'bundle', b'mainreporoot')
1475 if r:
1479 if r:
1476 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
1480 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
1477
1481
1478 # copy selected local settings to the remote ui
1482 # copy selected local settings to the remote ui
1479 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
1483 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
1480 for key, val in src.configitems(sect):
1484 for key, val in src.configitems(sect):
1481 dst.setconfig(sect, key, val, b'copied')
1485 dst.setconfig(sect, key, val, b'copied')
1482 v = src.config(b'web', b'cacerts')
1486 v = src.config(b'web', b'cacerts')
1483 if v:
1487 if v:
1484 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
1488 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
1485
1489
1486 return dst
1490 return dst
1487
1491
1488
1492
1489 # Files of interest
1493 # Files of interest
1490 # Used to check if the repository has changed looking at mtime and size of
1494 # Used to check if the repository has changed looking at mtime and size of
1491 # these files.
1495 # these files.
1492 foi = [
1496 foi = [
1493 (b'spath', b'00changelog.i'),
1497 (b'spath', b'00changelog.i'),
1494 (b'spath', b'phaseroots'), # ! phase can change content at the same size
1498 (b'spath', b'phaseroots'), # ! phase can change content at the same size
1495 (b'spath', b'obsstore'),
1499 (b'spath', b'obsstore'),
1496 (b'path', b'bookmarks'), # ! bookmark can change content at the same size
1500 (b'path', b'bookmarks'), # ! bookmark can change content at the same size
1497 ]
1501 ]
1498
1502
1499
1503
1500 class cachedlocalrepo(object):
1504 class cachedlocalrepo(object):
1501 """Holds a localrepository that can be cached and reused."""
1505 """Holds a localrepository that can be cached and reused."""
1502
1506
1503 def __init__(self, repo):
1507 def __init__(self, repo):
1504 """Create a new cached repo from an existing repo.
1508 """Create a new cached repo from an existing repo.
1505
1509
1506 We assume the passed in repo was recently created. If the
1510 We assume the passed in repo was recently created. If the
1507 repo has changed between when it was created and when it was
1511 repo has changed between when it was created and when it was
1508 turned into a cache, it may not refresh properly.
1512 turned into a cache, it may not refresh properly.
1509 """
1513 """
1510 assert isinstance(repo, localrepo.localrepository)
1514 assert isinstance(repo, localrepo.localrepository)
1511 self._repo = repo
1515 self._repo = repo
1512 self._state, self.mtime = self._repostate()
1516 self._state, self.mtime = self._repostate()
1513 self._filtername = repo.filtername
1517 self._filtername = repo.filtername
1514
1518
1515 def fetch(self):
1519 def fetch(self):
1516 """Refresh (if necessary) and return a repository.
1520 """Refresh (if necessary) and return a repository.
1517
1521
1518 If the cached instance is out of date, it will be recreated
1522 If the cached instance is out of date, it will be recreated
1519 automatically and returned.
1523 automatically and returned.
1520
1524
1521 Returns a tuple of the repo and a boolean indicating whether a new
1525 Returns a tuple of the repo and a boolean indicating whether a new
1522 repo instance was created.
1526 repo instance was created.
1523 """
1527 """
1524 # We compare the mtimes and sizes of some well-known files to
1528 # We compare the mtimes and sizes of some well-known files to
1525 # determine if the repo changed. This is not precise, as mtimes
1529 # determine if the repo changed. This is not precise, as mtimes
1526 # are susceptible to clock skew and imprecise filesystems and
1530 # are susceptible to clock skew and imprecise filesystems and
1527 # file content can change while maintaining the same size.
1531 # file content can change while maintaining the same size.
1528
1532
1529 state, mtime = self._repostate()
1533 state, mtime = self._repostate()
1530 if state == self._state:
1534 if state == self._state:
1531 return self._repo, False
1535 return self._repo, False
1532
1536
1533 repo = repository(self._repo.baseui, self._repo.url())
1537 repo = repository(self._repo.baseui, self._repo.url())
1534 if self._filtername:
1538 if self._filtername:
1535 self._repo = repo.filtered(self._filtername)
1539 self._repo = repo.filtered(self._filtername)
1536 else:
1540 else:
1537 self._repo = repo.unfiltered()
1541 self._repo = repo.unfiltered()
1538 self._state = state
1542 self._state = state
1539 self.mtime = mtime
1543 self.mtime = mtime
1540
1544
1541 return self._repo, True
1545 return self._repo, True
1542
1546
1543 def _repostate(self):
1547 def _repostate(self):
1544 state = []
1548 state = []
1545 maxmtime = -1
1549 maxmtime = -1
1546 for attr, fname in foi:
1550 for attr, fname in foi:
1547 prefix = getattr(self._repo, attr)
1551 prefix = getattr(self._repo, attr)
1548 p = os.path.join(prefix, fname)
1552 p = os.path.join(prefix, fname)
1549 try:
1553 try:
1550 st = os.stat(p)
1554 st = os.stat(p)
1551 except OSError:
1555 except OSError:
1552 st = os.stat(prefix)
1556 st = os.stat(prefix)
1553 state.append((st[stat.ST_MTIME], st.st_size))
1557 state.append((st[stat.ST_MTIME], st.st_size))
1554 maxmtime = max(maxmtime, st[stat.ST_MTIME])
1558 maxmtime = max(maxmtime, st[stat.ST_MTIME])
1555
1559
1556 return tuple(state), maxmtime
1560 return tuple(state), maxmtime
1557
1561
1558 def copy(self):
1562 def copy(self):
1559 """Obtain a copy of this class instance.
1563 """Obtain a copy of this class instance.
1560
1564
1561 A new localrepository instance is obtained. The new instance should be
1565 A new localrepository instance is obtained. The new instance should be
1562 completely independent of the original.
1566 completely independent of the original.
1563 """
1567 """
1564 repo = repository(self._repo.baseui, self._repo.origroot)
1568 repo = repository(self._repo.baseui, self._repo.origroot)
1565 if self._filtername:
1569 if self._filtername:
1566 repo = repo.filtered(self._filtername)
1570 repo = repo.filtered(self._filtername)
1567 else:
1571 else:
1568 repo = repo.unfiltered()
1572 repo = repo.unfiltered()
1569 c = cachedlocalrepo(repo)
1573 c = cachedlocalrepo(repo)
1570 c._state = self._state
1574 c._state = self._state
1571 c.mtime = self.mtime
1575 c.mtime = self.mtime
1572 return c
1576 return c
@@ -1,518 +1,598 b''
1 ====================================================
1 ====================================================
2 Test push/pull from multiple source at the same time
2 Test push/pull from multiple source at the same time
3 ====================================================
3 ====================================================
4
4
5
5
6 Setup
6 Setup
7 =====
7 =====
8
8
9 main repository
9 main repository
10 ---------------
10 ---------------
11
11
12 $ . $RUNTESTDIR/testlib/common.sh
12 $ . $RUNTESTDIR/testlib/common.sh
13 $ hg init main-repo
13 $ hg init main-repo
14 $ cd main-repo
14 $ cd main-repo
15 $ mkcommit A
15 $ mkcommit A
16 $ mkcommit B
16 $ mkcommit B
17 $ mkcommit C
17 $ mkcommit C
18 $ mkcommit D
18 $ mkcommit D
19 $ mkcommit E
19 $ mkcommit E
20 $ hg up 'desc(B)'
20 $ hg up 'desc(B)'
21 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
21 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
22 $ mkcommit F
22 $ mkcommit F
23 created new head
23 created new head
24 $ mkcommit G
24 $ mkcommit G
25 $ hg up 'desc(C)'
25 $ hg up 'desc(C)'
26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
27 $ mkcommit H
27 $ mkcommit H
28 created new head
28 created new head
29 $ hg up null --quiet
29 $ hg up null --quiet
30 $ hg log -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
30 $ hg log -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
31 o H 7
31 o H 7
32 |
32 |
33 | o E 4
33 | o E 4
34 | |
34 | |
35 | o D 3
35 | o D 3
36 |/
36 |/
37 o C 2
37 o C 2
38 |
38 |
39 | o G 6
39 | o G 6
40 | |
40 | |
41 | o F 5
41 | o F 5
42 |/
42 |/
43 o B 1
43 o B 1
44 |
44 |
45 o A 0
45 o A 0
46
46
47 $ cd ..
47 $ cd ..
48
48
49 Various other repositories
49 Various other repositories
50 --------------------------
50 --------------------------
51
51
52 $ hg clone main-repo branch-E --rev 4 -U
52 $ hg clone main-repo branch-E --rev 4 -U
53 adding changesets
53 adding changesets
54 adding manifests
54 adding manifests
55 adding file changes
55 adding file changes
56 added 5 changesets with 5 changes to 5 files
56 added 5 changesets with 5 changes to 5 files
57 new changesets 4a2df7238c3b:a603bfb5a83e
57 new changesets 4a2df7238c3b:a603bfb5a83e
58 $ hg clone main-repo branch-G --rev 6 -U
58 $ hg clone main-repo branch-G --rev 6 -U
59 adding changesets
59 adding changesets
60 adding manifests
60 adding manifests
61 adding file changes
61 adding file changes
62 added 4 changesets with 4 changes to 4 files
62 added 4 changesets with 4 changes to 4 files
63 new changesets 4a2df7238c3b:c521a06b234b
63 new changesets 4a2df7238c3b:c521a06b234b
64 $ hg clone main-repo branch-H --rev 7 -U
64 $ hg clone main-repo branch-H --rev 7 -U
65 adding changesets
65 adding changesets
66 adding manifests
66 adding manifests
67 adding file changes
67 adding file changes
68 added 4 changesets with 4 changes to 4 files
68 added 4 changesets with 4 changes to 4 files
69 new changesets 4a2df7238c3b:40faebb2ec45
69 new changesets 4a2df7238c3b:40faebb2ec45
70
70
71 Test simple bare operation
71 Test simple bare operation
72 ==========================
72 ==========================
73
73
74 pull
74 pull
75 ----
75 ----
76
76
77 $ hg clone main-repo test-repo-bare --rev 0 -U
77 $ hg clone main-repo test-repo-bare --rev 0 -U
78 adding changesets
78 adding changesets
79 adding manifests
79 adding manifests
80 adding file changes
80 adding file changes
81 added 1 changesets with 1 changes to 1 files
81 added 1 changesets with 1 changes to 1 files
82 new changesets 4a2df7238c3b
82 new changesets 4a2df7238c3b
83
83
84 $ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H
84 $ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H
85 pulling from ./branch-E
85 pulling from ./branch-E
86 searching for changes
86 searching for changes
87 adding changesets
87 adding changesets
88 adding manifests
88 adding manifests
89 adding file changes
89 adding file changes
90 added 4 changesets with 4 changes to 4 files
90 added 4 changesets with 4 changes to 4 files
91 new changesets 27547f69f254:a603bfb5a83e
91 new changesets 27547f69f254:a603bfb5a83e
92 (run 'hg update' to get a working copy)
92 (run 'hg update' to get a working copy)
93 pulling from ./branch-G
93 pulling from ./branch-G
94 searching for changes
94 searching for changes
95 adding changesets
95 adding changesets
96 adding manifests
96 adding manifests
97 adding file changes
97 adding file changes
98 added 2 changesets with 2 changes to 2 files (+1 heads)
98 added 2 changesets with 2 changes to 2 files (+1 heads)
99 new changesets 2f3a4c5c1417:c521a06b234b
99 new changesets 2f3a4c5c1417:c521a06b234b
100 (run 'hg heads' to see heads, 'hg merge' to merge)
100 (run 'hg heads' to see heads, 'hg merge' to merge)
101 pulling from ./branch-H
101 pulling from ./branch-H
102 searching for changes
102 searching for changes
103 adding changesets
103 adding changesets
104 adding manifests
104 adding manifests
105 adding file changes
105 adding file changes
106 added 1 changesets with 1 changes to 1 files (+1 heads)
106 added 1 changesets with 1 changes to 1 files (+1 heads)
107 new changesets 40faebb2ec45
107 new changesets 40faebb2ec45
108 (run 'hg heads .' to see heads, 'hg merge' to merge)
108 (run 'hg heads .' to see heads, 'hg merge' to merge)
109 $ hg log -R test-repo-bare -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
109 $ hg log -R test-repo-bare -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
110 o H 7
110 o H 7
111 |
111 |
112 | o E 4
112 | o E 4
113 | |
113 | |
114 | o D 3
114 | o D 3
115 |/
115 |/
116 o C 2
116 o C 2
117 |
117 |
118 | o G 6
118 | o G 6
119 | |
119 | |
120 | o F 5
120 | o F 5
121 |/
121 |/
122 o B 1
122 o B 1
123 |
123 |
124 o A 0
124 o A 0
125
125
126
126
127 push
127 push
128 ----
128 ----
129
129
130 $ cp -R ./branch-E ./branch-E-push
130 $ cp -R ./branch-E ./branch-E-push
131 $ cp -R ./branch-G ./branch-G-push
131 $ cp -R ./branch-G ./branch-G-push
132 $ cp -R ./branch-H ./branch-H-push
132 $ cp -R ./branch-H ./branch-H-push
133 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
134 comparing with ./branch-E-push
135 searching for changes
136 comparing with ./branch-G-push
137 searching for changes
138 comparing with ./branch-H-push
139 searching for changes
140 o changeset: 7:40faebb2ec45
141 | tag: tip
142 | parent: 2:f838bfaca5c7
143 | user: test
144 | date: Thu Jan 01 00:00:00 1970 +0000
145 | summary: H
146 |
147 | o changeset: 6:c521a06b234b
148 | | user: test
149 | | date: Thu Jan 01 00:00:00 1970 +0000
150 | | summary: G
151 | |
152 | o changeset: 5:2f3a4c5c1417
153 | parent: 1:27547f69f254
154 | user: test
155 | date: Thu Jan 01 00:00:00 1970 +0000
156 | summary: F
157 |
158 | o changeset: 4:a603bfb5a83e
159 | | user: test
160 | | date: Thu Jan 01 00:00:00 1970 +0000
161 | | summary: E
162 | |
163 | o changeset: 3:b3325c91a4d9
164 |/ user: test
165 | date: Thu Jan 01 00:00:00 1970 +0000
166 | summary: D
167 |
168 o changeset: 2:f838bfaca5c7
169 user: test
170 date: Thu Jan 01 00:00:00 1970 +0000
171 summary: C
172
133 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
173 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
134 pushing to ./branch-E-push
174 pushing to ./branch-E-push
135 searching for changes
175 searching for changes
136 adding changesets
176 adding changesets
137 adding manifests
177 adding manifests
138 adding file changes
178 adding file changes
139 added 3 changesets with 3 changes to 3 files (+2 heads)
179 added 3 changesets with 3 changes to 3 files (+2 heads)
140 pushing to ./branch-G-push
180 pushing to ./branch-G-push
141 searching for changes
181 searching for changes
142 adding changesets
182 adding changesets
143 adding manifests
183 adding manifests
144 adding file changes
184 adding file changes
145 added 4 changesets with 4 changes to 4 files (+2 heads)
185 added 4 changesets with 4 changes to 4 files (+2 heads)
146 pushing to ./branch-H-push
186 pushing to ./branch-H-push
147 searching for changes
187 searching for changes
148 adding changesets
188 adding changesets
149 adding manifests
189 adding manifests
150 adding file changes
190 adding file changes
151 added 4 changesets with 4 changes to 4 files (+2 heads)
191 added 4 changesets with 4 changes to 4 files (+2 heads)
152 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
192 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
153 o H 7
193 o H 7
154 |
194 |
155 | o E 4
195 | o E 4
156 | |
196 | |
157 | o D 3
197 | o D 3
158 |/
198 |/
159 o C 2
199 o C 2
160 |
200 |
161 | o G 6
201 | o G 6
162 | |
202 | |
163 | o F 5
203 | o F 5
164 |/
204 |/
165 o B 1
205 o B 1
166 |
206 |
167 o A 0
207 o A 0
168
208
169 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
209 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
170 o H 7
210 o H 7
171 |
211 |
172 | o E 6
212 | o E 6
173 | |
213 | |
174 | o D 5
214 | o D 5
175 |/
215 |/
176 o C 4
216 o C 4
177 |
217 |
178 | o G 3
218 | o G 3
179 | |
219 | |
180 | o F 2
220 | o F 2
181 |/
221 |/
182 o B 1
222 o B 1
183 |
223 |
184 o A 0
224 o A 0
185
225
186 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
226 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
187 o G 7
227 o G 7
188 |
228 |
189 o F 6
229 o F 6
190 |
230 |
191 | o E 5
231 | o E 5
192 | |
232 | |
193 | o D 4
233 | o D 4
194 | |
234 | |
195 | | o H 3
235 | | o H 3
196 | |/
236 | |/
197 | o C 2
237 | o C 2
198 |/
238 |/
199 o B 1
239 o B 1
200 |
240 |
201 o A 0
241 o A 0
202
242
203 $ rm -rf ./*-push
243 $ rm -rf ./*-push
204
244
205 Test operation with a target
245 Test operation with a target
206 ============================
246 ============================
207
247
208 pull
248 pull
209 ----
249 ----
210
250
211 $ hg clone main-repo test-repo-rev --rev 0 -U
251 $ hg clone main-repo test-repo-rev --rev 0 -U
212 adding changesets
252 adding changesets
213 adding manifests
253 adding manifests
214 adding file changes
254 adding file changes
215 added 1 changesets with 1 changes to 1 files
255 added 1 changesets with 1 changes to 1 files
216 new changesets 4a2df7238c3b
256 new changesets 4a2df7238c3b
217
257
218 pulling an explicite revision
258 pulling an explicite revision
219
259
220 $ node_b=`hg log -R main-repo --rev 'desc(B)' -T '{node}'`
260 $ node_b=`hg log -R main-repo --rev 'desc(B)' -T '{node}'`
221 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev $node_b
261 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev $node_b
222 pulling from ./branch-E
262 pulling from ./branch-E
223 searching for changes
263 searching for changes
224 adding changesets
264 adding changesets
225 adding manifests
265 adding manifests
226 adding file changes
266 adding file changes
227 added 1 changesets with 1 changes to 1 files
267 added 1 changesets with 1 changes to 1 files
228 new changesets 27547f69f254
268 new changesets 27547f69f254
229 (run 'hg update' to get a working copy)
269 (run 'hg update' to get a working copy)
230 pulling from ./branch-G
270 pulling from ./branch-G
231 no changes found
271 no changes found
232 pulling from ./branch-H
272 pulling from ./branch-H
233 no changes found
273 no changes found
234 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
274 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
235 o B 1
275 o B 1
236 |
276 |
237 o A 0
277 o A 0
238
278
239
279
240 pulling a branch head, the branch head resolve to different revision on the
280 pulling a branch head, the branch head resolve to different revision on the
241 different repositories.
281 different repositories.
242
282
243 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev default
283 $ hg pull -R test-repo-rev ./branch-E ./branch-G ./branch-H --rev default
244 pulling from ./branch-E
284 pulling from ./branch-E
245 searching for changes
285 searching for changes
246 adding changesets
286 adding changesets
247 adding manifests
287 adding manifests
248 adding file changes
288 adding file changes
249 added 3 changesets with 3 changes to 3 files
289 added 3 changesets with 3 changes to 3 files
250 new changesets f838bfaca5c7:a603bfb5a83e
290 new changesets f838bfaca5c7:a603bfb5a83e
251 (run 'hg update' to get a working copy)
291 (run 'hg update' to get a working copy)
252 pulling from ./branch-G
292 pulling from ./branch-G
253 searching for changes
293 searching for changes
254 adding changesets
294 adding changesets
255 adding manifests
295 adding manifests
256 adding file changes
296 adding file changes
257 added 2 changesets with 2 changes to 2 files (+1 heads)
297 added 2 changesets with 2 changes to 2 files (+1 heads)
258 new changesets 2f3a4c5c1417:c521a06b234b
298 new changesets 2f3a4c5c1417:c521a06b234b
259 (run 'hg heads' to see heads, 'hg merge' to merge)
299 (run 'hg heads' to see heads, 'hg merge' to merge)
260 pulling from ./branch-H
300 pulling from ./branch-H
261 searching for changes
301 searching for changes
262 adding changesets
302 adding changesets
263 adding manifests
303 adding manifests
264 adding file changes
304 adding file changes
265 added 1 changesets with 1 changes to 1 files (+1 heads)
305 added 1 changesets with 1 changes to 1 files (+1 heads)
266 new changesets 40faebb2ec45
306 new changesets 40faebb2ec45
267 (run 'hg heads .' to see heads, 'hg merge' to merge)
307 (run 'hg heads .' to see heads, 'hg merge' to merge)
268 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
308 $ hg log -R test-repo-rev -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
269 o H 7
309 o H 7
270 |
310 |
271 | o E 4
311 | o E 4
272 | |
312 | |
273 | o D 3
313 | o D 3
274 |/
314 |/
275 o C 2
315 o C 2
276 |
316 |
277 | o G 6
317 | o G 6
278 | |
318 | |
279 | o F 5
319 | o F 5
280 |/
320 |/
281 o B 1
321 o B 1
282 |
322 |
283 o A 0
323 o A 0
284
324
285
325
286 push
326 push
287 ----
327 ----
288
328
289 We only push a specific branch with --rev
329 We only push a specific branch with --rev
290
330
291 $ cp -R ./branch-E ./branch-E-push
331 $ cp -R ./branch-E ./branch-E-push
292 $ cp -R ./branch-G ./branch-G-push
332 $ cp -R ./branch-G ./branch-G-push
293 $ cp -R ./branch-H ./branch-H-push
333 $ cp -R ./branch-H ./branch-H-push
334 $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
335 comparing with ./branch-E-push
336 searching for changes
337 comparing with ./branch-G-push
338 searching for changes
339 comparing with ./branch-H-push
340 searching for changes
341 no changes found
342 o changeset: 7:40faebb2ec45
343 | tag: tip
344 | parent: 2:f838bfaca5c7
345 | user: test
346 | date: Thu Jan 01 00:00:00 1970 +0000
347 | summary: H
348 |
349 o changeset: 2:f838bfaca5c7
350 user: test
351 date: Thu Jan 01 00:00:00 1970 +0000
352 summary: C
353
294 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
354 $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
295 pushing to ./branch-E-push
355 pushing to ./branch-E-push
296 searching for changes
356 searching for changes
297 adding changesets
357 adding changesets
298 adding manifests
358 adding manifests
299 adding file changes
359 adding file changes
300 added 1 changesets with 1 changes to 1 files (+1 heads)
360 added 1 changesets with 1 changes to 1 files (+1 heads)
301 pushing to ./branch-G-push
361 pushing to ./branch-G-push
302 searching for changes
362 searching for changes
303 adding changesets
363 adding changesets
304 adding manifests
364 adding manifests
305 adding file changes
365 adding file changes
306 added 2 changesets with 2 changes to 2 files (+1 heads)
366 added 2 changesets with 2 changes to 2 files (+1 heads)
307 pushing to ./branch-H-push
367 pushing to ./branch-H-push
308 searching for changes
368 searching for changes
309 no changes found
369 no changes found
310 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
370 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
311 o H 5
371 o H 5
312 |
372 |
313 | o E 4
373 | o E 4
314 | |
374 | |
315 | o D 3
375 | o D 3
316 |/
376 |/
317 o C 2
377 o C 2
318 |
378 |
319 o B 1
379 o B 1
320 |
380 |
321 o A 0
381 o A 0
322
382
323 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
383 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
324 o H 5
384 o H 5
325 |
385 |
326 o C 4
386 o C 4
327 |
387 |
328 | o G 3
388 | o G 3
329 | |
389 | |
330 | o F 2
390 | o F 2
331 |/
391 |/
332 o B 1
392 o B 1
333 |
393 |
334 o A 0
394 o A 0
335
395
336 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
396 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
337 o H 3
397 o H 3
338 |
398 |
339 o C 2
399 o C 2
340 |
400 |
341 o B 1
401 o B 1
342 |
402 |
343 o A 0
403 o A 0
344
404
345 $ rm -rf ./*-push
405 $ rm -rf ./*-push
346
406
347 Same push, but the first one is a no-op
407 Same push, but the first one is a no-op
348
408
349 $ cp -R ./branch-E ./branch-E-push
409 $ cp -R ./branch-E ./branch-E-push
350 $ cp -R ./branch-G ./branch-G-push
410 $ cp -R ./branch-G ./branch-G-push
351 $ cp -R ./branch-H ./branch-H-push
411 $ cp -R ./branch-H ./branch-H-push
412 $ hg out -G -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
413 comparing with ./branch-G-push
414 searching for changes
415 comparing with ./branch-H-push
416 searching for changes
417 no changes found
418 comparing with ./branch-E-push
419 searching for changes
420 o changeset: 7:40faebb2ec45
421 | tag: tip
422 | parent: 2:f838bfaca5c7
423 | user: test
424 | date: Thu Jan 01 00:00:00 1970 +0000
425 | summary: H
426 |
427 o changeset: 2:f838bfaca5c7
428 user: test
429 date: Thu Jan 01 00:00:00 1970 +0000
430 summary: C
431
352 $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
432 $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
353 pushing to ./branch-G-push
433 pushing to ./branch-G-push
354 searching for changes
434 searching for changes
355 adding changesets
435 adding changesets
356 adding manifests
436 adding manifests
357 adding file changes
437 adding file changes
358 added 2 changesets with 2 changes to 2 files (+1 heads)
438 added 2 changesets with 2 changes to 2 files (+1 heads)
359 pushing to ./branch-H-push
439 pushing to ./branch-H-push
360 searching for changes
440 searching for changes
361 no changes found
441 no changes found
362 pushing to ./branch-E-push
442 pushing to ./branch-E-push
363 searching for changes
443 searching for changes
364 adding changesets
444 adding changesets
365 adding manifests
445 adding manifests
366 adding file changes
446 adding file changes
367 added 1 changesets with 1 changes to 1 files (+1 heads)
447 added 1 changesets with 1 changes to 1 files (+1 heads)
368 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
448 $ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
369 o H 5
449 o H 5
370 |
450 |
371 | o E 4
451 | o E 4
372 | |
452 | |
373 | o D 3
453 | o D 3
374 |/
454 |/
375 o C 2
455 o C 2
376 |
456 |
377 o B 1
457 o B 1
378 |
458 |
379 o A 0
459 o A 0
380
460
381 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
461 $ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
382 o H 5
462 o H 5
383 |
463 |
384 o C 4
464 o C 4
385 |
465 |
386 | o G 3
466 | o G 3
387 | |
467 | |
388 | o F 2
468 | o F 2
389 |/
469 |/
390 o B 1
470 o B 1
391 |
471 |
392 o A 0
472 o A 0
393
473
394 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
474 $ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
395 o H 3
475 o H 3
396 |
476 |
397 o C 2
477 o C 2
398 |
478 |
399 o B 1
479 o B 1
400 |
480 |
401 o A 0
481 o A 0
402
482
403 $ rm -rf ./*-push
483 $ rm -rf ./*-push
404
484
405
485
406 Test with --update
486 Test with --update
407 ==================
487 ==================
408
488
409 update without conflicts
489 update without conflicts
410 ------------------------
490 ------------------------
411
491
412 $ hg clone main-repo test-repo-update --rev 0
492 $ hg clone main-repo test-repo-update --rev 0
413 adding changesets
493 adding changesets
414 adding manifests
494 adding manifests
415 adding file changes
495 adding file changes
416 added 1 changesets with 1 changes to 1 files
496 added 1 changesets with 1 changes to 1 files
417 new changesets 4a2df7238c3b
497 new changesets 4a2df7238c3b
418 updating to branch default
498 updating to branch default
419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
499 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
420
500
421 We update for each pull, so the first on get into a branch independant from the
501 We update for each pull, so the first on get into a branch independant from the
422 other and stay there. This is the expected behavior.
502 other and stay there. This is the expected behavior.
423
503
424 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
504 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
425 @ A 0
505 @ A 0
426
506
427 $ hg pull -R test-repo-update ./branch-E ./branch-G ./branch-H --update
507 $ hg pull -R test-repo-update ./branch-E ./branch-G ./branch-H --update
428 pulling from ./branch-E
508 pulling from ./branch-E
429 searching for changes
509 searching for changes
430 adding changesets
510 adding changesets
431 adding manifests
511 adding manifests
432 adding file changes
512 adding file changes
433 added 4 changesets with 4 changes to 4 files
513 added 4 changesets with 4 changes to 4 files
434 new changesets 27547f69f254:a603bfb5a83e
514 new changesets 27547f69f254:a603bfb5a83e
435 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
515 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
436 pulling from ./branch-G
516 pulling from ./branch-G
437 searching for changes
517 searching for changes
438 adding changesets
518 adding changesets
439 adding manifests
519 adding manifests
440 adding file changes
520 adding file changes
441 added 2 changesets with 2 changes to 2 files (+1 heads)
521 added 2 changesets with 2 changes to 2 files (+1 heads)
442 new changesets 2f3a4c5c1417:c521a06b234b
522 new changesets 2f3a4c5c1417:c521a06b234b
443 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
523 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
444 updated to "a603bfb5a83e: E"
524 updated to "a603bfb5a83e: E"
445 1 other heads for branch "default"
525 1 other heads for branch "default"
446 pulling from ./branch-H
526 pulling from ./branch-H
447 searching for changes
527 searching for changes
448 adding changesets
528 adding changesets
449 adding manifests
529 adding manifests
450 adding file changes
530 adding file changes
451 added 1 changesets with 1 changes to 1 files (+1 heads)
531 added 1 changesets with 1 changes to 1 files (+1 heads)
452 new changesets 40faebb2ec45
532 new changesets 40faebb2ec45
453 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
533 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
454 updated to "a603bfb5a83e: E"
534 updated to "a603bfb5a83e: E"
455 2 other heads for branch "default"
535 2 other heads for branch "default"
456 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
536 $ hg log -R test-repo-update -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
457 o H 7
537 o H 7
458 |
538 |
459 | @ E 4
539 | @ E 4
460 | |
540 | |
461 | o D 3
541 | o D 3
462 |/
542 |/
463 o C 2
543 o C 2
464 |
544 |
465 | o G 6
545 | o G 6
466 | |
546 | |
467 | o F 5
547 | o F 5
468 |/
548 |/
469 o B 1
549 o B 1
470 |
550 |
471 o A 0
551 o A 0
472
552
473
553
474 update with conflicts
554 update with conflicts
475 ---------------------
555 ---------------------
476
556
477 $ hg clone main-repo test-repo-conflict --rev 0
557 $ hg clone main-repo test-repo-conflict --rev 0
478 adding changesets
558 adding changesets
479 adding manifests
559 adding manifests
480 adding file changes
560 adding file changes
481 added 1 changesets with 1 changes to 1 files
561 added 1 changesets with 1 changes to 1 files
482 new changesets 4a2df7238c3b
562 new changesets 4a2df7238c3b
483 updating to branch default
563 updating to branch default
484 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
564 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
485
565
486 The update has conflict and interrupt the pull.
566 The update has conflict and interrupt the pull.
487
567
488 $ echo this-will-conflict > test-repo-conflict/D
568 $ echo this-will-conflict > test-repo-conflict/D
489 $ hg add -R test-repo-conflict test-repo-conflict/D
569 $ hg add -R test-repo-conflict test-repo-conflict/D
490 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
570 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
491 @ A 0
571 @ A 0
492
572
493 $ hg pull -R test-repo-conflict ./branch-E ./branch-G ./branch-H --update
573 $ hg pull -R test-repo-conflict ./branch-E ./branch-G ./branch-H --update
494 pulling from ./branch-E
574 pulling from ./branch-E
495 searching for changes
575 searching for changes
496 adding changesets
576 adding changesets
497 adding manifests
577 adding manifests
498 adding file changes
578 adding file changes
499 added 4 changesets with 4 changes to 4 files
579 added 4 changesets with 4 changes to 4 files
500 new changesets 27547f69f254:a603bfb5a83e
580 new changesets 27547f69f254:a603bfb5a83e
501 merging D
581 merging D
502 warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
582 warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
503 3 files updated, 0 files merged, 0 files removed, 1 files unresolved
583 3 files updated, 0 files merged, 0 files removed, 1 files unresolved
504 use 'hg resolve' to retry unresolved file merges
584 use 'hg resolve' to retry unresolved file merges
505 [1]
585 [1]
506 $ hg -R test-repo-conflict resolve -l
586 $ hg -R test-repo-conflict resolve -l
507 U D
587 U D
508 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
588 $ hg log -R test-repo-conflict -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
509 @ E 4
589 @ E 4
510 |
590 |
511 o D 3
591 o D 3
512 |
592 |
513 o C 2
593 o C 2
514 |
594 |
515 o B 1
595 o B 1
516 |
596 |
517 % A 0
597 % A 0
518
598
General Comments 0
You need to be logged in to leave comments. Login now