##// END OF EJS Templates
recover: add a --[no-]verify flag...
marmoute -
r42320:013de80b default
parent child Browse files
Show More
@@ -1,6240 +1,6250 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import difflib
11 11 import errno
12 12 import os
13 13 import re
14 14 import sys
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 wdirhex,
23 23 wdirrev,
24 24 )
25 25 from . import (
26 26 archival,
27 27 bookmarks,
28 28 bundle2,
29 29 changegroup,
30 30 cmdutil,
31 31 copies,
32 32 debugcommands as debugcommandsmod,
33 33 destutil,
34 34 dirstateguard,
35 35 discovery,
36 36 encoding,
37 37 error,
38 38 exchange,
39 39 extensions,
40 40 filemerge,
41 41 formatter,
42 42 graphmod,
43 43 hbisect,
44 44 help,
45 45 hg,
46 46 logcmdutil,
47 47 merge as mergemod,
48 48 narrowspec,
49 49 obsolete,
50 50 obsutil,
51 51 patch,
52 52 phases,
53 53 pycompat,
54 54 rcutil,
55 55 registrar,
56 56 repair,
57 57 revsetlang,
58 58 rewriteutil,
59 59 scmutil,
60 60 server,
61 61 state as statemod,
62 62 streamclone,
63 63 tags as tagsmod,
64 64 ui as uimod,
65 65 util,
66 66 wireprotoserver,
67 67 )
68 68 from .utils import (
69 69 dateutil,
70 70 stringutil,
71 71 )
72 72
73 73 table = {}
74 74 table.update(debugcommandsmod.command._table)
75 75
76 76 command = registrar.command(table)
77 77 INTENT_READONLY = registrar.INTENT_READONLY
78 78
79 79 # common command options
80 80
81 81 globalopts = [
82 82 ('R', 'repository', '',
83 83 _('repository root directory or name of overlay bundle file'),
84 84 _('REPO')),
85 85 ('', 'cwd', '',
86 86 _('change working directory'), _('DIR')),
87 87 ('y', 'noninteractive', None,
88 88 _('do not prompt, automatically pick the first choice for all prompts')),
89 89 ('q', 'quiet', None, _('suppress output')),
90 90 ('v', 'verbose', None, _('enable additional output')),
91 91 ('', 'color', '',
92 92 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
93 93 # and should not be translated
94 94 _("when to colorize (boolean, always, auto, never, or debug)"),
95 95 _('TYPE')),
96 96 ('', 'config', [],
97 97 _('set/override config option (use \'section.name=value\')'),
98 98 _('CONFIG')),
99 99 ('', 'debug', None, _('enable debugging output')),
100 100 ('', 'debugger', None, _('start debugger')),
101 101 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
102 102 _('ENCODE')),
103 103 ('', 'encodingmode', encoding.encodingmode,
104 104 _('set the charset encoding mode'), _('MODE')),
105 105 ('', 'traceback', None, _('always print a traceback on exception')),
106 106 ('', 'time', None, _('time how long the command takes')),
107 107 ('', 'profile', None, _('print command execution profile')),
108 108 ('', 'version', None, _('output version information and exit')),
109 109 ('h', 'help', None, _('display help and exit')),
110 110 ('', 'hidden', False, _('consider hidden changesets')),
111 111 ('', 'pager', 'auto',
112 112 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
113 113 ]
114 114
115 115 dryrunopts = cmdutil.dryrunopts
116 116 remoteopts = cmdutil.remoteopts
117 117 walkopts = cmdutil.walkopts
118 118 commitopts = cmdutil.commitopts
119 119 commitopts2 = cmdutil.commitopts2
120 120 formatteropts = cmdutil.formatteropts
121 121 templateopts = cmdutil.templateopts
122 122 logopts = cmdutil.logopts
123 123 diffopts = cmdutil.diffopts
124 124 diffwsopts = cmdutil.diffwsopts
125 125 diffopts2 = cmdutil.diffopts2
126 126 mergetoolopts = cmdutil.mergetoolopts
127 127 similarityopts = cmdutil.similarityopts
128 128 subrepoopts = cmdutil.subrepoopts
129 129 debugrevlogopts = cmdutil.debugrevlogopts
130 130
131 131 # Commands start here, listed alphabetically
132 132
133 133 @command('add',
134 134 walkopts + subrepoopts + dryrunopts,
135 135 _('[OPTION]... [FILE]...'),
136 136 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
137 137 helpbasic=True, inferrepo=True)
138 138 def add(ui, repo, *pats, **opts):
139 139 """add the specified files on the next commit
140 140
141 141 Schedule files to be version controlled and added to the
142 142 repository.
143 143
144 144 The files will be added to the repository at the next commit. To
145 145 undo an add before that, see :hg:`forget`.
146 146
147 147 If no names are given, add all files to the repository (except
148 148 files matching ``.hgignore``).
149 149
150 150 .. container:: verbose
151 151
152 152 Examples:
153 153
154 154 - New (unknown) files are added
155 155 automatically by :hg:`add`::
156 156
157 157 $ ls
158 158 foo.c
159 159 $ hg status
160 160 ? foo.c
161 161 $ hg add
162 162 adding foo.c
163 163 $ hg status
164 164 A foo.c
165 165
166 166 - Specific files to be added can be specified::
167 167
168 168 $ ls
169 169 bar.c foo.c
170 170 $ hg status
171 171 ? bar.c
172 172 ? foo.c
173 173 $ hg add bar.c
174 174 $ hg status
175 175 A bar.c
176 176 ? foo.c
177 177
178 178 Returns 0 if all files are successfully added.
179 179 """
180 180
181 181 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
182 182 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
183 183 rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
184 184 return rejected and 1 or 0
185 185
186 186 @command('addremove',
187 187 similarityopts + subrepoopts + walkopts + dryrunopts,
188 188 _('[OPTION]... [FILE]...'),
189 189 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
190 190 inferrepo=True)
191 191 def addremove(ui, repo, *pats, **opts):
192 192 """add all new files, delete all missing files
193 193
194 194 Add all new files and remove all missing files from the
195 195 repository.
196 196
197 197 Unless names are given, new files are ignored if they match any of
198 198 the patterns in ``.hgignore``. As with add, these changes take
199 199 effect at the next commit.
200 200
201 201 Use the -s/--similarity option to detect renamed files. This
202 202 option takes a percentage between 0 (disabled) and 100 (files must
203 203 be identical) as its parameter. With a parameter greater than 0,
204 204 this compares every removed file with every added file and records
205 205 those similar enough as renames. Detecting renamed files this way
206 206 can be expensive. After using this option, :hg:`status -C` can be
207 207 used to check which files were identified as moved or renamed. If
208 208 not specified, -s/--similarity defaults to 100 and only renames of
209 209 identical files are detected.
210 210
211 211 .. container:: verbose
212 212
213 213 Examples:
214 214
215 215 - A number of files (bar.c and foo.c) are new,
216 216 while foobar.c has been removed (without using :hg:`remove`)
217 217 from the repository::
218 218
219 219 $ ls
220 220 bar.c foo.c
221 221 $ hg status
222 222 ! foobar.c
223 223 ? bar.c
224 224 ? foo.c
225 225 $ hg addremove
226 226 adding bar.c
227 227 adding foo.c
228 228 removing foobar.c
229 229 $ hg status
230 230 A bar.c
231 231 A foo.c
232 232 R foobar.c
233 233
234 234 - A file foobar.c was moved to foo.c without using :hg:`rename`.
235 235 Afterwards, it was edited slightly::
236 236
237 237 $ ls
238 238 foo.c
239 239 $ hg status
240 240 ! foobar.c
241 241 ? foo.c
242 242 $ hg addremove --similarity 90
243 243 removing foobar.c
244 244 adding foo.c
245 245 recording removal of foobar.c as rename to foo.c (94% similar)
246 246 $ hg status -C
247 247 A foo.c
248 248 foobar.c
249 249 R foobar.c
250 250
251 251 Returns 0 if all files are successfully added.
252 252 """
253 253 opts = pycompat.byteskwargs(opts)
254 254 if not opts.get('similarity'):
255 255 opts['similarity'] = '100'
256 256 matcher = scmutil.match(repo[None], pats, opts)
257 257 relative = scmutil.anypats(pats, opts)
258 258 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
259 259 return scmutil.addremove(repo, matcher, "", uipathfn, opts)
260 260
261 261 @command('annotate|blame',
262 262 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
263 263 ('', 'follow', None,
264 264 _('follow copies/renames and list the filename (DEPRECATED)')),
265 265 ('', 'no-follow', None, _("don't follow copies and renames")),
266 266 ('a', 'text', None, _('treat all files as text')),
267 267 ('u', 'user', None, _('list the author (long with -v)')),
268 268 ('f', 'file', None, _('list the filename')),
269 269 ('d', 'date', None, _('list the date (short with -q)')),
270 270 ('n', 'number', None, _('list the revision number (default)')),
271 271 ('c', 'changeset', None, _('list the changeset')),
272 272 ('l', 'line-number', None, _('show line number at the first appearance')),
273 273 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
274 274 ] + diffwsopts + walkopts + formatteropts,
275 275 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
276 276 helpcategory=command.CATEGORY_FILE_CONTENTS,
277 277 helpbasic=True, inferrepo=True)
278 278 def annotate(ui, repo, *pats, **opts):
279 279 """show changeset information by line for each file
280 280
281 281 List changes in files, showing the revision id responsible for
282 282 each line.
283 283
284 284 This command is useful for discovering when a change was made and
285 285 by whom.
286 286
287 287 If you include --file, --user, or --date, the revision number is
288 288 suppressed unless you also include --number.
289 289
290 290 Without the -a/--text option, annotate will avoid processing files
291 291 it detects as binary. With -a, annotate will annotate the file
292 292 anyway, although the results will probably be neither useful
293 293 nor desirable.
294 294
295 295 .. container:: verbose
296 296
297 297 Template:
298 298
299 299 The following keywords are supported in addition to the common template
300 300 keywords and functions. See also :hg:`help templates`.
301 301
302 302 :lines: List of lines with annotation data.
303 303 :path: String. Repository-absolute path of the specified file.
304 304
305 305 And each entry of ``{lines}`` provides the following sub-keywords in
306 306 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
307 307
308 308 :line: String. Line content.
309 309 :lineno: Integer. Line number at that revision.
310 310 :path: String. Repository-absolute path of the file at that revision.
311 311
312 312 See :hg:`help templates.operators` for the list expansion syntax.
313 313
314 314 Returns 0 on success.
315 315 """
316 316 opts = pycompat.byteskwargs(opts)
317 317 if not pats:
318 318 raise error.Abort(_('at least one filename or pattern is required'))
319 319
320 320 if opts.get('follow'):
321 321 # --follow is deprecated and now just an alias for -f/--file
322 322 # to mimic the behavior of Mercurial before version 1.5
323 323 opts['file'] = True
324 324
325 325 if (not opts.get('user') and not opts.get('changeset')
326 326 and not opts.get('date') and not opts.get('file')):
327 327 opts['number'] = True
328 328
329 329 linenumber = opts.get('line_number') is not None
330 330 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
331 331 raise error.Abort(_('at least one of -n/-c is required for -l'))
332 332
333 333 rev = opts.get('rev')
334 334 if rev:
335 335 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
336 336 ctx = scmutil.revsingle(repo, rev)
337 337
338 338 ui.pager('annotate')
339 339 rootfm = ui.formatter('annotate', opts)
340 340 if ui.debugflag:
341 341 shorthex = pycompat.identity
342 342 else:
343 343 def shorthex(h):
344 344 return h[:12]
345 345 if ui.quiet:
346 346 datefunc = dateutil.shortdate
347 347 else:
348 348 datefunc = dateutil.datestr
349 349 if ctx.rev() is None:
350 350 if opts.get('changeset'):
351 351 # omit "+" suffix which is appended to node hex
352 352 def formatrev(rev):
353 353 if rev == wdirrev:
354 354 return '%d' % ctx.p1().rev()
355 355 else:
356 356 return '%d' % rev
357 357 else:
358 358 def formatrev(rev):
359 359 if rev == wdirrev:
360 360 return '%d+' % ctx.p1().rev()
361 361 else:
362 362 return '%d ' % rev
363 363 def formathex(h):
364 364 if h == wdirhex:
365 365 return '%s+' % shorthex(hex(ctx.p1().node()))
366 366 else:
367 367 return '%s ' % shorthex(h)
368 368 else:
369 369 formatrev = b'%d'.__mod__
370 370 formathex = shorthex
371 371
372 372 opmap = [
373 373 ('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
374 374 ('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
375 375 ('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
376 376 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
377 377 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
378 378 ('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
379 379 ]
380 380 opnamemap = {
381 381 'rev': 'number',
382 382 'node': 'changeset',
383 383 'path': 'file',
384 384 'lineno': 'line_number',
385 385 }
386 386
387 387 if rootfm.isplain():
388 388 def makefunc(get, fmt):
389 389 return lambda x: fmt(get(x))
390 390 else:
391 391 def makefunc(get, fmt):
392 392 return get
393 393 datahint = rootfm.datahint()
394 394 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
395 395 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
396 396 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
397 397 fields = ' '.join(fn for fn, sep, get, fmt in opmap
398 398 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
399 399
400 400 def bad(x, y):
401 401 raise error.Abort("%s: %s" % (x, y))
402 402
403 403 m = scmutil.match(ctx, pats, opts, badfn=bad)
404 404
405 405 follow = not opts.get('no_follow')
406 406 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
407 407 whitespace=True)
408 408 skiprevs = opts.get('skip')
409 409 if skiprevs:
410 410 skiprevs = scmutil.revrange(repo, skiprevs)
411 411
412 412 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
413 413 for abs in ctx.walk(m):
414 414 fctx = ctx[abs]
415 415 rootfm.startitem()
416 416 rootfm.data(path=abs)
417 417 if not opts.get('text') and fctx.isbinary():
418 418 rootfm.plain(_("%s: binary file\n") % uipathfn(abs))
419 419 continue
420 420
421 421 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
422 422 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
423 423 diffopts=diffopts)
424 424 if not lines:
425 425 fm.end()
426 426 continue
427 427 formats = []
428 428 pieces = []
429 429
430 430 for f, sep in funcmap:
431 431 l = [f(n) for n in lines]
432 432 if fm.isplain():
433 433 sizes = [encoding.colwidth(x) for x in l]
434 434 ml = max(sizes)
435 435 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
436 436 else:
437 437 formats.append(['%s' for x in l])
438 438 pieces.append(l)
439 439
440 440 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
441 441 fm.startitem()
442 442 fm.context(fctx=n.fctx)
443 443 fm.write(fields, "".join(f), *p)
444 444 if n.skip:
445 445 fmt = "* %s"
446 446 else:
447 447 fmt = ": %s"
448 448 fm.write('line', fmt, n.text)
449 449
450 450 if not lines[-1].text.endswith('\n'):
451 451 fm.plain('\n')
452 452 fm.end()
453 453
454 454 rootfm.end()
455 455
456 456 @command('archive',
457 457 [('', 'no-decode', None, _('do not pass files through decoders')),
458 458 ('p', 'prefix', '', _('directory prefix for files in archive'),
459 459 _('PREFIX')),
460 460 ('r', 'rev', '', _('revision to distribute'), _('REV')),
461 461 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
462 462 ] + subrepoopts + walkopts,
463 463 _('[OPTION]... DEST'),
464 464 helpcategory=command.CATEGORY_IMPORT_EXPORT)
465 465 def archive(ui, repo, dest, **opts):
466 466 '''create an unversioned archive of a repository revision
467 467
468 468 By default, the revision used is the parent of the working
469 469 directory; use -r/--rev to specify a different revision.
470 470
471 471 The archive type is automatically detected based on file
472 472 extension (to override, use -t/--type).
473 473
474 474 .. container:: verbose
475 475
476 476 Examples:
477 477
478 478 - create a zip file containing the 1.0 release::
479 479
480 480 hg archive -r 1.0 project-1.0.zip
481 481
482 482 - create a tarball excluding .hg files::
483 483
484 484 hg archive project.tar.gz -X ".hg*"
485 485
486 486 Valid types are:
487 487
488 488 :``files``: a directory full of files (default)
489 489 :``tar``: tar archive, uncompressed
490 490 :``tbz2``: tar archive, compressed using bzip2
491 491 :``tgz``: tar archive, compressed using gzip
492 492 :``uzip``: zip archive, uncompressed
493 493 :``zip``: zip archive, compressed using deflate
494 494
495 495 The exact name of the destination archive or directory is given
496 496 using a format string; see :hg:`help export` for details.
497 497
498 498 Each member added to an archive file has a directory prefix
499 499 prepended. Use -p/--prefix to specify a format string for the
500 500 prefix. The default is the basename of the archive, with suffixes
501 501 removed.
502 502
503 503 Returns 0 on success.
504 504 '''
505 505
506 506 opts = pycompat.byteskwargs(opts)
507 507 rev = opts.get('rev')
508 508 if rev:
509 509 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
510 510 ctx = scmutil.revsingle(repo, rev)
511 511 if not ctx:
512 512 raise error.Abort(_('no working directory: please specify a revision'))
513 513 node = ctx.node()
514 514 dest = cmdutil.makefilename(ctx, dest)
515 515 if os.path.realpath(dest) == repo.root:
516 516 raise error.Abort(_('repository root cannot be destination'))
517 517
518 518 kind = opts.get('type') or archival.guesskind(dest) or 'files'
519 519 prefix = opts.get('prefix')
520 520
521 521 if dest == '-':
522 522 if kind == 'files':
523 523 raise error.Abort(_('cannot archive plain files to stdout'))
524 524 dest = cmdutil.makefileobj(ctx, dest)
525 525 if not prefix:
526 526 prefix = os.path.basename(repo.root) + '-%h'
527 527
528 528 prefix = cmdutil.makefilename(ctx, prefix)
529 529 match = scmutil.match(ctx, [], opts)
530 530 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
531 531 match, prefix, subrepos=opts.get('subrepos'))
532 532
533 533 @command('backout',
534 534 [('', 'merge', None, _('merge with old dirstate parent after backout')),
535 535 ('', 'commit', None,
536 536 _('commit if no conflicts were encountered (DEPRECATED)')),
537 537 ('', 'no-commit', None, _('do not commit')),
538 538 ('', 'parent', '',
539 539 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
540 540 ('r', 'rev', '', _('revision to backout'), _('REV')),
541 541 ('e', 'edit', False, _('invoke editor on commit messages')),
542 542 ] + mergetoolopts + walkopts + commitopts + commitopts2,
543 543 _('[OPTION]... [-r] REV'),
544 544 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
545 545 def backout(ui, repo, node=None, rev=None, **opts):
546 546 '''reverse effect of earlier changeset
547 547
548 548 Prepare a new changeset with the effect of REV undone in the
549 549 current working directory. If no conflicts were encountered,
550 550 it will be committed immediately.
551 551
552 552 If REV is the parent of the working directory, then this new changeset
553 553 is committed automatically (unless --no-commit is specified).
554 554
555 555 .. note::
556 556
557 557 :hg:`backout` cannot be used to fix either an unwanted or
558 558 incorrect merge.
559 559
560 560 .. container:: verbose
561 561
562 562 Examples:
563 563
564 564 - Reverse the effect of the parent of the working directory.
565 565 This backout will be committed immediately::
566 566
567 567 hg backout -r .
568 568
569 569 - Reverse the effect of previous bad revision 23::
570 570
571 571 hg backout -r 23
572 572
573 573 - Reverse the effect of previous bad revision 23 and
574 574 leave changes uncommitted::
575 575
576 576 hg backout -r 23 --no-commit
577 577 hg commit -m "Backout revision 23"
578 578
579 579 By default, the pending changeset will have one parent,
580 580 maintaining a linear history. With --merge, the pending
581 581 changeset will instead have two parents: the old parent of the
582 582 working directory and a new child of REV that simply undoes REV.
583 583
584 584 Before version 1.7, the behavior without --merge was equivalent
585 585 to specifying --merge followed by :hg:`update --clean .` to
586 586 cancel the merge and leave the child of REV as a head to be
587 587 merged separately.
588 588
589 589 See :hg:`help dates` for a list of formats valid for -d/--date.
590 590
591 591 See :hg:`help revert` for a way to restore files to the state
592 592 of another revision.
593 593
594 594 Returns 0 on success, 1 if nothing to backout or there are unresolved
595 595 files.
596 596 '''
597 597 with repo.wlock(), repo.lock():
598 598 return _dobackout(ui, repo, node, rev, **opts)
599 599
600 600 def _dobackout(ui, repo, node=None, rev=None, **opts):
601 601 opts = pycompat.byteskwargs(opts)
602 602 if opts.get('commit') and opts.get('no_commit'):
603 603 raise error.Abort(_("cannot use --commit with --no-commit"))
604 604 if opts.get('merge') and opts.get('no_commit'):
605 605 raise error.Abort(_("cannot use --merge with --no-commit"))
606 606
607 607 if rev and node:
608 608 raise error.Abort(_("please specify just one revision"))
609 609
610 610 if not rev:
611 611 rev = node
612 612
613 613 if not rev:
614 614 raise error.Abort(_("please specify a revision to backout"))
615 615
616 616 date = opts.get('date')
617 617 if date:
618 618 opts['date'] = dateutil.parsedate(date)
619 619
620 620 cmdutil.checkunfinished(repo)
621 621 cmdutil.bailifchanged(repo)
622 622 node = scmutil.revsingle(repo, rev).node()
623 623
624 624 op1, op2 = repo.dirstate.parents()
625 625 if not repo.changelog.isancestor(node, op1):
626 626 raise error.Abort(_('cannot backout change that is not an ancestor'))
627 627
628 628 p1, p2 = repo.changelog.parents(node)
629 629 if p1 == nullid:
630 630 raise error.Abort(_('cannot backout a change with no parents'))
631 631 if p2 != nullid:
632 632 if not opts.get('parent'):
633 633 raise error.Abort(_('cannot backout a merge changeset'))
634 634 p = repo.lookup(opts['parent'])
635 635 if p not in (p1, p2):
636 636 raise error.Abort(_('%s is not a parent of %s') %
637 637 (short(p), short(node)))
638 638 parent = p
639 639 else:
640 640 if opts.get('parent'):
641 641 raise error.Abort(_('cannot use --parent on non-merge changeset'))
642 642 parent = p1
643 643
644 644 # the backout should appear on the same branch
645 645 branch = repo.dirstate.branch()
646 646 bheads = repo.branchheads(branch)
647 647 rctx = scmutil.revsingle(repo, hex(parent))
648 648 if not opts.get('merge') and op1 != node:
649 649 with dirstateguard.dirstateguard(repo, 'backout'):
650 650 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
651 651 with ui.configoverride(overrides, 'backout'):
652 652 stats = mergemod.update(repo, parent, branchmerge=True,
653 653 force=True, ancestor=node,
654 654 mergeancestor=False)
655 655 repo.setparents(op1, op2)
656 656 hg._showstats(repo, stats)
657 657 if stats.unresolvedcount:
658 658 repo.ui.status(_("use 'hg resolve' to retry unresolved "
659 659 "file merges\n"))
660 660 return 1
661 661 else:
662 662 hg.clean(repo, node, show_stats=False)
663 663 repo.dirstate.setbranch(branch)
664 664 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
665 665
666 666 if opts.get('no_commit'):
667 667 msg = _("changeset %s backed out, "
668 668 "don't forget to commit.\n")
669 669 ui.status(msg % short(node))
670 670 return 0
671 671
672 672 def commitfunc(ui, repo, message, match, opts):
673 673 editform = 'backout'
674 674 e = cmdutil.getcommiteditor(editform=editform,
675 675 **pycompat.strkwargs(opts))
676 676 if not message:
677 677 # we don't translate commit messages
678 678 message = "Backed out changeset %s" % short(node)
679 679 e = cmdutil.getcommiteditor(edit=True, editform=editform)
680 680 return repo.commit(message, opts.get('user'), opts.get('date'),
681 681 match, editor=e)
682 682 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
683 683 if not newnode:
684 684 ui.status(_("nothing changed\n"))
685 685 return 1
686 686 cmdutil.commitstatus(repo, newnode, branch, bheads)
687 687
688 688 def nice(node):
689 689 return '%d:%s' % (repo.changelog.rev(node), short(node))
690 690 ui.status(_('changeset %s backs out changeset %s\n') %
691 691 (nice(repo.changelog.tip()), nice(node)))
692 692 if opts.get('merge') and op1 != node:
693 693 hg.clean(repo, op1, show_stats=False)
694 694 ui.status(_('merging with changeset %s\n')
695 695 % nice(repo.changelog.tip()))
696 696 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
697 697 with ui.configoverride(overrides, 'backout'):
698 698 return hg.merge(repo, hex(repo.changelog.tip()))
699 699 return 0
700 700
701 701 @command('bisect',
702 702 [('r', 'reset', False, _('reset bisect state')),
703 703 ('g', 'good', False, _('mark changeset good')),
704 704 ('b', 'bad', False, _('mark changeset bad')),
705 705 ('s', 'skip', False, _('skip testing changeset')),
706 706 ('e', 'extend', False, _('extend the bisect range')),
707 707 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
708 708 ('U', 'noupdate', False, _('do not update to target'))],
709 709 _("[-gbsr] [-U] [-c CMD] [REV]"),
710 710 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
711 711 def bisect(ui, repo, rev=None, extra=None, command=None,
712 712 reset=None, good=None, bad=None, skip=None, extend=None,
713 713 noupdate=None):
714 714 """subdivision search of changesets
715 715
716 716 This command helps to find changesets which introduce problems. To
717 717 use, mark the earliest changeset you know exhibits the problem as
718 718 bad, then mark the latest changeset which is free from the problem
719 719 as good. Bisect will update your working directory to a revision
720 720 for testing (unless the -U/--noupdate option is specified). Once
721 721 you have performed tests, mark the working directory as good or
722 722 bad, and bisect will either update to another candidate changeset
723 723 or announce that it has found the bad revision.
724 724
725 725 As a shortcut, you can also use the revision argument to mark a
726 726 revision as good or bad without checking it out first.
727 727
728 728 If you supply a command, it will be used for automatic bisection.
729 729 The environment variable HG_NODE will contain the ID of the
730 730 changeset being tested. The exit status of the command will be
731 731 used to mark revisions as good or bad: status 0 means good, 125
732 732 means to skip the revision, 127 (command not found) will abort the
733 733 bisection, and any other non-zero exit status means the revision
734 734 is bad.
735 735
736 736 .. container:: verbose
737 737
738 738 Some examples:
739 739
740 740 - start a bisection with known bad revision 34, and good revision 12::
741 741
742 742 hg bisect --bad 34
743 743 hg bisect --good 12
744 744
745 745 - advance the current bisection by marking current revision as good or
746 746 bad::
747 747
748 748 hg bisect --good
749 749 hg bisect --bad
750 750
751 751 - mark the current revision, or a known revision, to be skipped (e.g. if
752 752 that revision is not usable because of another issue)::
753 753
754 754 hg bisect --skip
755 755 hg bisect --skip 23
756 756
757 757 - skip all revisions that do not touch directories ``foo`` or ``bar``::
758 758
759 759 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
760 760
761 761 - forget the current bisection::
762 762
763 763 hg bisect --reset
764 764
765 765 - use 'make && make tests' to automatically find the first broken
766 766 revision::
767 767
768 768 hg bisect --reset
769 769 hg bisect --bad 34
770 770 hg bisect --good 12
771 771 hg bisect --command "make && make tests"
772 772
773 773 - see all changesets whose states are already known in the current
774 774 bisection::
775 775
776 776 hg log -r "bisect(pruned)"
777 777
778 778 - see the changeset currently being bisected (especially useful
779 779 if running with -U/--noupdate)::
780 780
781 781 hg log -r "bisect(current)"
782 782
783 783 - see all changesets that took part in the current bisection::
784 784
785 785 hg log -r "bisect(range)"
786 786
787 787 - you can even get a nice graph::
788 788
789 789 hg log --graph -r "bisect(range)"
790 790
791 791 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
792 792
793 793 Returns 0 on success.
794 794 """
795 795 # backward compatibility
796 796 if rev in "good bad reset init".split():
797 797 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
798 798 cmd, rev, extra = rev, extra, None
799 799 if cmd == "good":
800 800 good = True
801 801 elif cmd == "bad":
802 802 bad = True
803 803 else:
804 804 reset = True
805 805 elif extra:
806 806 raise error.Abort(_('incompatible arguments'))
807 807
808 808 incompatibles = {
809 809 '--bad': bad,
810 810 '--command': bool(command),
811 811 '--extend': extend,
812 812 '--good': good,
813 813 '--reset': reset,
814 814 '--skip': skip,
815 815 }
816 816
817 817 enabled = [x for x in incompatibles if incompatibles[x]]
818 818
819 819 if len(enabled) > 1:
820 820 raise error.Abort(_('%s and %s are incompatible') %
821 821 tuple(sorted(enabled)[0:2]))
822 822
823 823 if reset:
824 824 hbisect.resetstate(repo)
825 825 return
826 826
827 827 state = hbisect.load_state(repo)
828 828
829 829 # update state
830 830 if good or bad or skip:
831 831 if rev:
832 832 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
833 833 else:
834 834 nodes = [repo.lookup('.')]
835 835 if good:
836 836 state['good'] += nodes
837 837 elif bad:
838 838 state['bad'] += nodes
839 839 elif skip:
840 840 state['skip'] += nodes
841 841 hbisect.save_state(repo, state)
842 842 if not (state['good'] and state['bad']):
843 843 return
844 844
845 845 def mayupdate(repo, node, show_stats=True):
846 846 """common used update sequence"""
847 847 if noupdate:
848 848 return
849 849 cmdutil.checkunfinished(repo)
850 850 cmdutil.bailifchanged(repo)
851 851 return hg.clean(repo, node, show_stats=show_stats)
852 852
853 853 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
854 854
855 855 if command:
856 856 changesets = 1
857 857 if noupdate:
858 858 try:
859 859 node = state['current'][0]
860 860 except LookupError:
861 861 raise error.Abort(_('current bisect revision is unknown - '
862 862 'start a new bisect to fix'))
863 863 else:
864 864 node, p2 = repo.dirstate.parents()
865 865 if p2 != nullid:
866 866 raise error.Abort(_('current bisect revision is a merge'))
867 867 if rev:
868 868 node = repo[scmutil.revsingle(repo, rev, node)].node()
869 869 try:
870 870 while changesets:
871 871 # update state
872 872 state['current'] = [node]
873 873 hbisect.save_state(repo, state)
874 874 status = ui.system(command, environ={'HG_NODE': hex(node)},
875 875 blockedtag='bisect_check')
876 876 if status == 125:
877 877 transition = "skip"
878 878 elif status == 0:
879 879 transition = "good"
880 880 # status < 0 means process was killed
881 881 elif status == 127:
882 882 raise error.Abort(_("failed to execute %s") % command)
883 883 elif status < 0:
884 884 raise error.Abort(_("%s killed") % command)
885 885 else:
886 886 transition = "bad"
887 887 state[transition].append(node)
888 888 ctx = repo[node]
889 889 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
890 890 transition))
891 891 hbisect.checkstate(state)
892 892 # bisect
893 893 nodes, changesets, bgood = hbisect.bisect(repo, state)
894 894 # update to next check
895 895 node = nodes[0]
896 896 mayupdate(repo, node, show_stats=False)
897 897 finally:
898 898 state['current'] = [node]
899 899 hbisect.save_state(repo, state)
900 900 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
901 901 return
902 902
903 903 hbisect.checkstate(state)
904 904
905 905 # actually bisect
906 906 nodes, changesets, good = hbisect.bisect(repo, state)
907 907 if extend:
908 908 if not changesets:
909 909 extendnode = hbisect.extendrange(repo, state, nodes, good)
910 910 if extendnode is not None:
911 911 ui.write(_("Extending search to changeset %d:%s\n")
912 912 % (extendnode.rev(), extendnode))
913 913 state['current'] = [extendnode.node()]
914 914 hbisect.save_state(repo, state)
915 915 return mayupdate(repo, extendnode.node())
916 916 raise error.Abort(_("nothing to extend"))
917 917
918 918 if changesets == 0:
919 919 hbisect.printresult(ui, repo, state, displayer, nodes, good)
920 920 else:
921 921 assert len(nodes) == 1 # only a single node can be tested next
922 922 node = nodes[0]
923 923 # compute the approximate number of remaining tests
924 924 tests, size = 0, 2
925 925 while size <= changesets:
926 926 tests, size = tests + 1, size * 2
927 927 rev = repo.changelog.rev(node)
928 928 ui.write(_("Testing changeset %d:%s "
929 929 "(%d changesets remaining, ~%d tests)\n")
930 930 % (rev, short(node), changesets, tests))
931 931 state['current'] = [node]
932 932 hbisect.save_state(repo, state)
933 933 return mayupdate(repo, node)
934 934
935 935 @command('bookmarks|bookmark',
936 936 [('f', 'force', False, _('force')),
937 937 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
938 938 ('d', 'delete', False, _('delete a given bookmark')),
939 939 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
940 940 ('i', 'inactive', False, _('mark a bookmark inactive')),
941 941 ('l', 'list', False, _('list existing bookmarks')),
942 942 ] + formatteropts,
943 943 _('hg bookmarks [OPTIONS]... [NAME]...'),
944 944 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
945 945 def bookmark(ui, repo, *names, **opts):
946 946 '''create a new bookmark or list existing bookmarks
947 947
948 948 Bookmarks are labels on changesets to help track lines of development.
949 949 Bookmarks are unversioned and can be moved, renamed and deleted.
950 950 Deleting or moving a bookmark has no effect on the associated changesets.
951 951
952 952 Creating or updating to a bookmark causes it to be marked as 'active'.
953 953 The active bookmark is indicated with a '*'.
954 954 When a commit is made, the active bookmark will advance to the new commit.
955 955 A plain :hg:`update` will also advance an active bookmark, if possible.
956 956 Updating away from a bookmark will cause it to be deactivated.
957 957
958 958 Bookmarks can be pushed and pulled between repositories (see
959 959 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
960 960 diverged, a new 'divergent bookmark' of the form 'name@path' will
961 961 be created. Using :hg:`merge` will resolve the divergence.
962 962
963 963 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
964 964 the active bookmark's name.
965 965
966 966 A bookmark named '@' has the special property that :hg:`clone` will
967 967 check it out by default if it exists.
968 968
969 969 .. container:: verbose
970 970
971 971 Template:
972 972
973 973 The following keywords are supported in addition to the common template
974 974 keywords and functions such as ``{bookmark}``. See also
975 975 :hg:`help templates`.
976 976
977 977 :active: Boolean. True if the bookmark is active.
978 978
979 979 Examples:
980 980
981 981 - create an active bookmark for a new line of development::
982 982
983 983 hg book new-feature
984 984
985 985 - create an inactive bookmark as a place marker::
986 986
987 987 hg book -i reviewed
988 988
989 989 - create an inactive bookmark on another changeset::
990 990
991 991 hg book -r .^ tested
992 992
993 993 - rename bookmark turkey to dinner::
994 994
995 995 hg book -m turkey dinner
996 996
997 997 - move the '@' bookmark from another branch::
998 998
999 999 hg book -f @
1000 1000
1001 1001 - print only the active bookmark name::
1002 1002
1003 1003 hg book -ql .
1004 1004 '''
1005 1005 opts = pycompat.byteskwargs(opts)
1006 1006 force = opts.get('force')
1007 1007 rev = opts.get('rev')
1008 1008 inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
1009 1009
1010 1010 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
1011 1011 if len(selactions) > 1:
1012 1012 raise error.Abort(_('--%s and --%s are incompatible')
1013 1013 % tuple(selactions[:2]))
1014 1014 if selactions:
1015 1015 action = selactions[0]
1016 1016 elif names or rev:
1017 1017 action = 'add'
1018 1018 elif inactive:
1019 1019 action = 'inactive' # meaning deactivate
1020 1020 else:
1021 1021 action = 'list'
1022 1022
1023 1023 if rev and action in {'delete', 'rename', 'list'}:
1024 1024 raise error.Abort(_("--rev is incompatible with --%s") % action)
1025 1025 if inactive and action in {'delete', 'list'}:
1026 1026 raise error.Abort(_("--inactive is incompatible with --%s") % action)
1027 1027 if not names and action in {'add', 'delete'}:
1028 1028 raise error.Abort(_("bookmark name required"))
1029 1029
1030 1030 if action in {'add', 'delete', 'rename', 'inactive'}:
1031 1031 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
1032 1032 if action == 'delete':
1033 1033 names = pycompat.maplist(repo._bookmarks.expandname, names)
1034 1034 bookmarks.delete(repo, tr, names)
1035 1035 elif action == 'rename':
1036 1036 if not names:
1037 1037 raise error.Abort(_("new bookmark name required"))
1038 1038 elif len(names) > 1:
1039 1039 raise error.Abort(_("only one new bookmark name allowed"))
1040 1040 oldname = repo._bookmarks.expandname(opts['rename'])
1041 1041 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1042 1042 elif action == 'add':
1043 1043 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1044 1044 elif action == 'inactive':
1045 1045 if len(repo._bookmarks) == 0:
1046 1046 ui.status(_("no bookmarks set\n"))
1047 1047 elif not repo._activebookmark:
1048 1048 ui.status(_("no active bookmark\n"))
1049 1049 else:
1050 1050 bookmarks.deactivate(repo)
1051 1051 elif action == 'list':
1052 1052 names = pycompat.maplist(repo._bookmarks.expandname, names)
1053 1053 with ui.formatter('bookmarks', opts) as fm:
1054 1054 bookmarks.printbookmarks(ui, repo, fm, names)
1055 1055 else:
1056 1056 raise error.ProgrammingError('invalid action: %s' % action)
1057 1057
1058 1058 @command('branch',
1059 1059 [('f', 'force', None,
1060 1060 _('set branch name even if it shadows an existing branch')),
1061 1061 ('C', 'clean', None, _('reset branch name to parent branch name')),
1062 1062 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1063 1063 ],
1064 1064 _('[-fC] [NAME]'),
1065 1065 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
1066 1066 def branch(ui, repo, label=None, **opts):
1067 1067 """set or show the current branch name
1068 1068
1069 1069 .. note::
1070 1070
1071 1071 Branch names are permanent and global. Use :hg:`bookmark` to create a
1072 1072 light-weight bookmark instead. See :hg:`help glossary` for more
1073 1073 information about named branches and bookmarks.
1074 1074
1075 1075 With no argument, show the current branch name. With one argument,
1076 1076 set the working directory branch name (the branch will not exist
1077 1077 in the repository until the next commit). Standard practice
1078 1078 recommends that primary development take place on the 'default'
1079 1079 branch.
1080 1080
1081 1081 Unless -f/--force is specified, branch will not let you set a
1082 1082 branch name that already exists.
1083 1083
1084 1084 Use -C/--clean to reset the working directory branch to that of
1085 1085 the parent of the working directory, negating a previous branch
1086 1086 change.
1087 1087
1088 1088 Use the command :hg:`update` to switch to an existing branch. Use
1089 1089 :hg:`commit --close-branch` to mark this branch head as closed.
1090 1090 When all heads of a branch are closed, the branch will be
1091 1091 considered closed.
1092 1092
1093 1093 Returns 0 on success.
1094 1094 """
1095 1095 opts = pycompat.byteskwargs(opts)
1096 1096 revs = opts.get('rev')
1097 1097 if label:
1098 1098 label = label.strip()
1099 1099
1100 1100 if not opts.get('clean') and not label:
1101 1101 if revs:
1102 1102 raise error.Abort(_("no branch name specified for the revisions"))
1103 1103 ui.write("%s\n" % repo.dirstate.branch())
1104 1104 return
1105 1105
1106 1106 with repo.wlock():
1107 1107 if opts.get('clean'):
1108 1108 label = repo['.'].branch()
1109 1109 repo.dirstate.setbranch(label)
1110 1110 ui.status(_('reset working directory to branch %s\n') % label)
1111 1111 elif label:
1112 1112
1113 1113 scmutil.checknewlabel(repo, label, 'branch')
1114 1114 if revs:
1115 1115 return cmdutil.changebranch(ui, repo, revs, label)
1116 1116
1117 1117 if not opts.get('force') and label in repo.branchmap():
1118 1118 if label not in [p.branch() for p in repo[None].parents()]:
1119 1119 raise error.Abort(_('a branch of the same name already'
1120 1120 ' exists'),
1121 1121 # i18n: "it" refers to an existing branch
1122 1122 hint=_("use 'hg update' to switch to it"))
1123 1123
1124 1124 repo.dirstate.setbranch(label)
1125 1125 ui.status(_('marked working directory as branch %s\n') % label)
1126 1126
1127 1127 # find any open named branches aside from default
1128 1128 for n, h, t, c in repo.branchmap().iterbranches():
1129 1129 if n != "default" and not c:
1130 1130 return 0
1131 1131 ui.status(_('(branches are permanent and global, '
1132 1132 'did you want a bookmark?)\n'))
1133 1133
1134 1134 @command('branches',
1135 1135 [('a', 'active', False,
1136 1136 _('show only branches that have unmerged heads (DEPRECATED)')),
1137 1137 ('c', 'closed', False, _('show normal and closed branches')),
1138 1138 ('r', 'rev', [], _('show branch name(s) of the given rev'))
1139 1139 ] + formatteropts,
1140 1140 _('[-c]'),
1141 1141 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1142 1142 intents={INTENT_READONLY})
1143 1143 def branches(ui, repo, active=False, closed=False, **opts):
1144 1144 """list repository named branches
1145 1145
1146 1146 List the repository's named branches, indicating which ones are
1147 1147 inactive. If -c/--closed is specified, also list branches which have
1148 1148 been marked closed (see :hg:`commit --close-branch`).
1149 1149
1150 1150 Use the command :hg:`update` to switch to an existing branch.
1151 1151
1152 1152 .. container:: verbose
1153 1153
1154 1154 Template:
1155 1155
1156 1156 The following keywords are supported in addition to the common template
1157 1157 keywords and functions such as ``{branch}``. See also
1158 1158 :hg:`help templates`.
1159 1159
1160 1160 :active: Boolean. True if the branch is active.
1161 1161 :closed: Boolean. True if the branch is closed.
1162 1162 :current: Boolean. True if it is the current branch.
1163 1163
1164 1164 Returns 0.
1165 1165 """
1166 1166
1167 1167 opts = pycompat.byteskwargs(opts)
1168 1168 revs = opts.get('rev')
1169 1169 selectedbranches = None
1170 1170 if revs:
1171 1171 revs = scmutil.revrange(repo, revs)
1172 1172 getbi = repo.revbranchcache().branchinfo
1173 1173 selectedbranches = {getbi(r)[0] for r in revs}
1174 1174
1175 1175 ui.pager('branches')
1176 1176 fm = ui.formatter('branches', opts)
1177 1177 hexfunc = fm.hexfunc
1178 1178
1179 1179 allheads = set(repo.heads())
1180 1180 branches = []
1181 1181 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1182 1182 if selectedbranches is not None and tag not in selectedbranches:
1183 1183 continue
1184 1184 isactive = False
1185 1185 if not isclosed:
1186 1186 openheads = set(repo.branchmap().iteropen(heads))
1187 1187 isactive = bool(openheads & allheads)
1188 1188 branches.append((tag, repo[tip], isactive, not isclosed))
1189 1189 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1190 1190 reverse=True)
1191 1191
1192 1192 for tag, ctx, isactive, isopen in branches:
1193 1193 if active and not isactive:
1194 1194 continue
1195 1195 if isactive:
1196 1196 label = 'branches.active'
1197 1197 notice = ''
1198 1198 elif not isopen:
1199 1199 if not closed:
1200 1200 continue
1201 1201 label = 'branches.closed'
1202 1202 notice = _(' (closed)')
1203 1203 else:
1204 1204 label = 'branches.inactive'
1205 1205 notice = _(' (inactive)')
1206 1206 current = (tag == repo.dirstate.branch())
1207 1207 if current:
1208 1208 label = 'branches.current'
1209 1209
1210 1210 fm.startitem()
1211 1211 fm.write('branch', '%s', tag, label=label)
1212 1212 rev = ctx.rev()
1213 1213 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1214 1214 fmt = ' ' * padsize + ' %d:%s'
1215 1215 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1216 1216 label='log.changeset changeset.%s' % ctx.phasestr())
1217 1217 fm.context(ctx=ctx)
1218 1218 fm.data(active=isactive, closed=not isopen, current=current)
1219 1219 if not ui.quiet:
1220 1220 fm.plain(notice)
1221 1221 fm.plain('\n')
1222 1222 fm.end()
1223 1223
1224 1224 @command('bundle',
1225 1225 [('f', 'force', None, _('run even when the destination is unrelated')),
1226 1226 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1227 1227 _('REV')),
1228 1228 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1229 1229 _('BRANCH')),
1230 1230 ('', 'base', [],
1231 1231 _('a base changeset assumed to be available at the destination'),
1232 1232 _('REV')),
1233 1233 ('a', 'all', None, _('bundle all changesets in the repository')),
1234 1234 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1235 1235 ] + remoteopts,
1236 1236 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1237 1237 helpcategory=command.CATEGORY_IMPORT_EXPORT)
1238 1238 def bundle(ui, repo, fname, dest=None, **opts):
1239 1239 """create a bundle file
1240 1240
1241 1241 Generate a bundle file containing data to be transferred to another
1242 1242 repository.
1243 1243
1244 1244 To create a bundle containing all changesets, use -a/--all
1245 1245 (or --base null). Otherwise, hg assumes the destination will have
1246 1246 all the nodes you specify with --base parameters. Otherwise, hg
1247 1247 will assume the repository has all the nodes in destination, or
1248 1248 default-push/default if no destination is specified, where destination
1249 1249 is the repository you provide through DEST option.
1250 1250
1251 1251 You can change bundle format with the -t/--type option. See
1252 1252 :hg:`help bundlespec` for documentation on this format. By default,
1253 1253 the most appropriate format is used and compression defaults to
1254 1254 bzip2.
1255 1255
1256 1256 The bundle file can then be transferred using conventional means
1257 1257 and applied to another repository with the unbundle or pull
1258 1258 command. This is useful when direct push and pull are not
1259 1259 available or when exporting an entire repository is undesirable.
1260 1260
1261 1261 Applying bundles preserves all changeset contents including
1262 1262 permissions, copy/rename information, and revision history.
1263 1263
1264 1264 Returns 0 on success, 1 if no changes found.
1265 1265 """
1266 1266 opts = pycompat.byteskwargs(opts)
1267 1267 revs = None
1268 1268 if 'rev' in opts:
1269 1269 revstrings = opts['rev']
1270 1270 revs = scmutil.revrange(repo, revstrings)
1271 1271 if revstrings and not revs:
1272 1272 raise error.Abort(_('no commits to bundle'))
1273 1273
1274 1274 bundletype = opts.get('type', 'bzip2').lower()
1275 1275 try:
1276 1276 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1277 1277 except error.UnsupportedBundleSpecification as e:
1278 1278 raise error.Abort(pycompat.bytestr(e),
1279 1279 hint=_("see 'hg help bundlespec' for supported "
1280 1280 "values for --type"))
1281 1281 cgversion = bundlespec.contentopts["cg.version"]
1282 1282
1283 1283 # Packed bundles are a pseudo bundle format for now.
1284 1284 if cgversion == 's1':
1285 1285 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1286 1286 hint=_("use 'hg debugcreatestreamclonebundle'"))
1287 1287
1288 1288 if opts.get('all'):
1289 1289 if dest:
1290 1290 raise error.Abort(_("--all is incompatible with specifying "
1291 1291 "a destination"))
1292 1292 if opts.get('base'):
1293 1293 ui.warn(_("ignoring --base because --all was specified\n"))
1294 1294 base = [nullrev]
1295 1295 else:
1296 1296 base = scmutil.revrange(repo, opts.get('base'))
1297 1297 if cgversion not in changegroup.supportedoutgoingversions(repo):
1298 1298 raise error.Abort(_("repository does not support bundle version %s") %
1299 1299 cgversion)
1300 1300
1301 1301 if base:
1302 1302 if dest:
1303 1303 raise error.Abort(_("--base is incompatible with specifying "
1304 1304 "a destination"))
1305 1305 common = [repo[rev].node() for rev in base]
1306 1306 heads = [repo[r].node() for r in revs] if revs else None
1307 1307 outgoing = discovery.outgoing(repo, common, heads)
1308 1308 else:
1309 1309 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1310 1310 dest, branches = hg.parseurl(dest, opts.get('branch'))
1311 1311 other = hg.peer(repo, opts, dest)
1312 1312 revs = [repo[r].hex() for r in revs]
1313 1313 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1314 1314 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1315 1315 outgoing = discovery.findcommonoutgoing(repo, other,
1316 1316 onlyheads=heads,
1317 1317 force=opts.get('force'),
1318 1318 portable=True)
1319 1319
1320 1320 if not outgoing.missing:
1321 1321 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1322 1322 return 1
1323 1323
1324 1324 if cgversion == '01': #bundle1
1325 1325 bversion = 'HG10' + bundlespec.wirecompression
1326 1326 bcompression = None
1327 1327 elif cgversion in ('02', '03'):
1328 1328 bversion = 'HG20'
1329 1329 bcompression = bundlespec.wirecompression
1330 1330 else:
1331 1331 raise error.ProgrammingError(
1332 1332 'bundle: unexpected changegroup version %s' % cgversion)
1333 1333
1334 1334 # TODO compression options should be derived from bundlespec parsing.
1335 1335 # This is a temporary hack to allow adjusting bundle compression
1336 1336 # level without a) formalizing the bundlespec changes to declare it
1337 1337 # b) introducing a command flag.
1338 1338 compopts = {}
1339 1339 complevel = ui.configint('experimental',
1340 1340 'bundlecomplevel.' + bundlespec.compression)
1341 1341 if complevel is None:
1342 1342 complevel = ui.configint('experimental', 'bundlecomplevel')
1343 1343 if complevel is not None:
1344 1344 compopts['level'] = complevel
1345 1345
1346 1346 # Allow overriding the bundling of obsmarker in phases through
1347 1347 # configuration while we don't have a bundle version that include them
1348 1348 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1349 1349 bundlespec.contentopts['obsolescence'] = True
1350 1350 if repo.ui.configbool('experimental', 'bundle-phases'):
1351 1351 bundlespec.contentopts['phases'] = True
1352 1352
1353 1353 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1354 1354 bundlespec.contentopts, compression=bcompression,
1355 1355 compopts=compopts)
1356 1356
1357 1357 @command('cat',
1358 1358 [('o', 'output', '',
1359 1359 _('print output to file with formatted name'), _('FORMAT')),
1360 1360 ('r', 'rev', '', _('print the given revision'), _('REV')),
1361 1361 ('', 'decode', None, _('apply any matching decode filter')),
1362 1362 ] + walkopts + formatteropts,
1363 1363 _('[OPTION]... FILE...'),
1364 1364 helpcategory=command.CATEGORY_FILE_CONTENTS,
1365 1365 inferrepo=True,
1366 1366 intents={INTENT_READONLY})
1367 1367 def cat(ui, repo, file1, *pats, **opts):
1368 1368 """output the current or given revision of files
1369 1369
1370 1370 Print the specified files as they were at the given revision. If
1371 1371 no revision is given, the parent of the working directory is used.
1372 1372
1373 1373 Output may be to a file, in which case the name of the file is
1374 1374 given using a template string. See :hg:`help templates`. In addition
1375 1375 to the common template keywords, the following formatting rules are
1376 1376 supported:
1377 1377
1378 1378 :``%%``: literal "%" character
1379 1379 :``%s``: basename of file being printed
1380 1380 :``%d``: dirname of file being printed, or '.' if in repository root
1381 1381 :``%p``: root-relative path name of file being printed
1382 1382 :``%H``: changeset hash (40 hexadecimal digits)
1383 1383 :``%R``: changeset revision number
1384 1384 :``%h``: short-form changeset hash (12 hexadecimal digits)
1385 1385 :``%r``: zero-padded changeset revision number
1386 1386 :``%b``: basename of the exporting repository
1387 1387 :``\\``: literal "\\" character
1388 1388
1389 1389 .. container:: verbose
1390 1390
1391 1391 Template:
1392 1392
1393 1393 The following keywords are supported in addition to the common template
1394 1394 keywords and functions. See also :hg:`help templates`.
1395 1395
1396 1396 :data: String. File content.
1397 1397 :path: String. Repository-absolute path of the file.
1398 1398
1399 1399 Returns 0 on success.
1400 1400 """
1401 1401 opts = pycompat.byteskwargs(opts)
1402 1402 rev = opts.get('rev')
1403 1403 if rev:
1404 1404 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1405 1405 ctx = scmutil.revsingle(repo, rev)
1406 1406 m = scmutil.match(ctx, (file1,) + pats, opts)
1407 1407 fntemplate = opts.pop('output', '')
1408 1408 if cmdutil.isstdiofilename(fntemplate):
1409 1409 fntemplate = ''
1410 1410
1411 1411 if fntemplate:
1412 1412 fm = formatter.nullformatter(ui, 'cat', opts)
1413 1413 else:
1414 1414 ui.pager('cat')
1415 1415 fm = ui.formatter('cat', opts)
1416 1416 with fm:
1417 1417 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1418 1418 **pycompat.strkwargs(opts))
1419 1419
1420 1420 @command('clone',
1421 1421 [('U', 'noupdate', None, _('the clone will include an empty working '
1422 1422 'directory (only a repository)')),
1423 1423 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1424 1424 _('REV')),
1425 1425 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1426 1426 ' and its ancestors'), _('REV')),
1427 1427 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1428 1428 ' changesets and their ancestors'), _('BRANCH')),
1429 1429 ('', 'pull', None, _('use pull protocol to copy metadata')),
1430 1430 ('', 'uncompressed', None,
1431 1431 _('an alias to --stream (DEPRECATED)')),
1432 1432 ('', 'stream', None,
1433 1433 _('clone with minimal data processing')),
1434 1434 ] + remoteopts,
1435 1435 _('[OPTION]... SOURCE [DEST]'),
1436 1436 helpcategory=command.CATEGORY_REPO_CREATION,
1437 1437 helpbasic=True, norepo=True)
1438 1438 def clone(ui, source, dest=None, **opts):
1439 1439 """make a copy of an existing repository
1440 1440
1441 1441 Create a copy of an existing repository in a new directory.
1442 1442
1443 1443 If no destination directory name is specified, it defaults to the
1444 1444 basename of the source.
1445 1445
1446 1446 The location of the source is added to the new repository's
1447 1447 ``.hg/hgrc`` file, as the default to be used for future pulls.
1448 1448
1449 1449 Only local paths and ``ssh://`` URLs are supported as
1450 1450 destinations. For ``ssh://`` destinations, no working directory or
1451 1451 ``.hg/hgrc`` will be created on the remote side.
1452 1452
1453 1453 If the source repository has a bookmark called '@' set, that
1454 1454 revision will be checked out in the new repository by default.
1455 1455
1456 1456 To check out a particular version, use -u/--update, or
1457 1457 -U/--noupdate to create a clone with no working directory.
1458 1458
1459 1459 To pull only a subset of changesets, specify one or more revisions
1460 1460 identifiers with -r/--rev or branches with -b/--branch. The
1461 1461 resulting clone will contain only the specified changesets and
1462 1462 their ancestors. These options (or 'clone src#rev dest') imply
1463 1463 --pull, even for local source repositories.
1464 1464
1465 1465 In normal clone mode, the remote normalizes repository data into a common
1466 1466 exchange format and the receiving end translates this data into its local
1467 1467 storage format. --stream activates a different clone mode that essentially
1468 1468 copies repository files from the remote with minimal data processing. This
1469 1469 significantly reduces the CPU cost of a clone both remotely and locally.
1470 1470 However, it often increases the transferred data size by 30-40%. This can
1471 1471 result in substantially faster clones where I/O throughput is plentiful,
1472 1472 especially for larger repositories. A side-effect of --stream clones is
1473 1473 that storage settings and requirements on the remote are applied locally:
1474 1474 a modern client may inherit legacy or inefficient storage used by the
1475 1475 remote or a legacy Mercurial client may not be able to clone from a
1476 1476 modern Mercurial remote.
1477 1477
1478 1478 .. note::
1479 1479
1480 1480 Specifying a tag will include the tagged changeset but not the
1481 1481 changeset containing the tag.
1482 1482
1483 1483 .. container:: verbose
1484 1484
1485 1485 For efficiency, hardlinks are used for cloning whenever the
1486 1486 source and destination are on the same filesystem (note this
1487 1487 applies only to the repository data, not to the working
1488 1488 directory). Some filesystems, such as AFS, implement hardlinking
1489 1489 incorrectly, but do not report errors. In these cases, use the
1490 1490 --pull option to avoid hardlinking.
1491 1491
1492 1492 Mercurial will update the working directory to the first applicable
1493 1493 revision from this list:
1494 1494
1495 1495 a) null if -U or the source repository has no changesets
1496 1496 b) if -u . and the source repository is local, the first parent of
1497 1497 the source repository's working directory
1498 1498 c) the changeset specified with -u (if a branch name, this means the
1499 1499 latest head of that branch)
1500 1500 d) the changeset specified with -r
1501 1501 e) the tipmost head specified with -b
1502 1502 f) the tipmost head specified with the url#branch source syntax
1503 1503 g) the revision marked with the '@' bookmark, if present
1504 1504 h) the tipmost head of the default branch
1505 1505 i) tip
1506 1506
1507 1507 When cloning from servers that support it, Mercurial may fetch
1508 1508 pre-generated data from a server-advertised URL or inline from the
1509 1509 same stream. When this is done, hooks operating on incoming changesets
1510 1510 and changegroups may fire more than once, once for each pre-generated
1511 1511 bundle and as well as for any additional remaining data. In addition,
1512 1512 if an error occurs, the repository may be rolled back to a partial
1513 1513 clone. This behavior may change in future releases.
1514 1514 See :hg:`help -e clonebundles` for more.
1515 1515
1516 1516 Examples:
1517 1517
1518 1518 - clone a remote repository to a new directory named hg/::
1519 1519
1520 1520 hg clone https://www.mercurial-scm.org/repo/hg/
1521 1521
1522 1522 - create a lightweight local clone::
1523 1523
1524 1524 hg clone project/ project-feature/
1525 1525
1526 1526 - clone from an absolute path on an ssh server (note double-slash)::
1527 1527
1528 1528 hg clone ssh://user@server//home/projects/alpha/
1529 1529
1530 1530 - do a streaming clone while checking out a specified version::
1531 1531
1532 1532 hg clone --stream http://server/repo -u 1.5
1533 1533
1534 1534 - create a repository without changesets after a particular revision::
1535 1535
1536 1536 hg clone -r 04e544 experimental/ good/
1537 1537
1538 1538 - clone (and track) a particular named branch::
1539 1539
1540 1540 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1541 1541
1542 1542 See :hg:`help urls` for details on specifying URLs.
1543 1543
1544 1544 Returns 0 on success.
1545 1545 """
1546 1546 opts = pycompat.byteskwargs(opts)
1547 1547 if opts.get('noupdate') and opts.get('updaterev'):
1548 1548 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1549 1549
1550 1550 # --include/--exclude can come from narrow or sparse.
1551 1551 includepats, excludepats = None, None
1552 1552
1553 1553 # hg.clone() differentiates between None and an empty set. So make sure
1554 1554 # patterns are sets if narrow is requested without patterns.
1555 1555 if opts.get('narrow'):
1556 1556 includepats = set()
1557 1557 excludepats = set()
1558 1558
1559 1559 if opts.get('include'):
1560 1560 includepats = narrowspec.parsepatterns(opts.get('include'))
1561 1561 if opts.get('exclude'):
1562 1562 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
1563 1563
1564 1564 r = hg.clone(ui, opts, source, dest,
1565 1565 pull=opts.get('pull'),
1566 1566 stream=opts.get('stream') or opts.get('uncompressed'),
1567 1567 revs=opts.get('rev'),
1568 1568 update=opts.get('updaterev') or not opts.get('noupdate'),
1569 1569 branch=opts.get('branch'),
1570 1570 shareopts=opts.get('shareopts'),
1571 1571 storeincludepats=includepats,
1572 1572 storeexcludepats=excludepats,
1573 1573 depth=opts.get('depth') or None)
1574 1574
1575 1575 return r is None
1576 1576
1577 1577 @command('commit|ci',
1578 1578 [('A', 'addremove', None,
1579 1579 _('mark new/missing files as added/removed before committing')),
1580 1580 ('', 'close-branch', None,
1581 1581 _('mark a branch head as closed')),
1582 1582 ('', 'amend', None, _('amend the parent of the working directory')),
1583 1583 ('s', 'secret', None, _('use the secret phase for committing')),
1584 1584 ('e', 'edit', None, _('invoke editor on commit messages')),
1585 1585 ('i', 'interactive', None, _('use interactive mode')),
1586 1586 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1587 1587 _('[OPTION]... [FILE]...'),
1588 1588 helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
1589 1589 inferrepo=True)
1590 1590 def commit(ui, repo, *pats, **opts):
1591 1591 """commit the specified files or all outstanding changes
1592 1592
1593 1593 Commit changes to the given files into the repository. Unlike a
1594 1594 centralized SCM, this operation is a local operation. See
1595 1595 :hg:`push` for a way to actively distribute your changes.
1596 1596
1597 1597 If a list of files is omitted, all changes reported by :hg:`status`
1598 1598 will be committed.
1599 1599
1600 1600 If you are committing the result of a merge, do not provide any
1601 1601 filenames or -I/-X filters.
1602 1602
1603 1603 If no commit message is specified, Mercurial starts your
1604 1604 configured editor where you can enter a message. In case your
1605 1605 commit fails, you will find a backup of your message in
1606 1606 ``.hg/last-message.txt``.
1607 1607
1608 1608 The --close-branch flag can be used to mark the current branch
1609 1609 head closed. When all heads of a branch are closed, the branch
1610 1610 will be considered closed and no longer listed.
1611 1611
1612 1612 The --amend flag can be used to amend the parent of the
1613 1613 working directory with a new commit that contains the changes
1614 1614 in the parent in addition to those currently reported by :hg:`status`,
1615 1615 if there are any. The old commit is stored in a backup bundle in
1616 1616 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1617 1617 on how to restore it).
1618 1618
1619 1619 Message, user and date are taken from the amended commit unless
1620 1620 specified. When a message isn't specified on the command line,
1621 1621 the editor will open with the message of the amended commit.
1622 1622
1623 1623 It is not possible to amend public changesets (see :hg:`help phases`)
1624 1624 or changesets that have children.
1625 1625
1626 1626 See :hg:`help dates` for a list of formats valid for -d/--date.
1627 1627
1628 1628 Returns 0 on success, 1 if nothing changed.
1629 1629
1630 1630 .. container:: verbose
1631 1631
1632 1632 Examples:
1633 1633
1634 1634 - commit all files ending in .py::
1635 1635
1636 1636 hg commit --include "set:**.py"
1637 1637
1638 1638 - commit all non-binary files::
1639 1639
1640 1640 hg commit --exclude "set:binary()"
1641 1641
1642 1642 - amend the current commit and set the date to now::
1643 1643
1644 1644 hg commit --amend --date now
1645 1645 """
1646 1646 with repo.wlock(), repo.lock():
1647 1647 return _docommit(ui, repo, *pats, **opts)
1648 1648
1649 1649 def _docommit(ui, repo, *pats, **opts):
1650 1650 if opts.get(r'interactive'):
1651 1651 opts.pop(r'interactive')
1652 1652 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1653 1653 cmdutil.recordfilter, *pats,
1654 1654 **opts)
1655 1655 # ret can be 0 (no changes to record) or the value returned by
1656 1656 # commit(), 1 if nothing changed or None on success.
1657 1657 return 1 if ret == 0 else ret
1658 1658
1659 1659 opts = pycompat.byteskwargs(opts)
1660 1660 if opts.get('subrepos'):
1661 1661 if opts.get('amend'):
1662 1662 raise error.Abort(_('cannot amend with --subrepos'))
1663 1663 # Let --subrepos on the command line override config setting.
1664 1664 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1665 1665
1666 1666 cmdutil.checkunfinished(repo, commit=True)
1667 1667
1668 1668 branch = repo[None].branch()
1669 1669 bheads = repo.branchheads(branch)
1670 1670
1671 1671 extra = {}
1672 1672 if opts.get('close_branch'):
1673 1673 extra['close'] = '1'
1674 1674
1675 1675 if not bheads:
1676 1676 raise error.Abort(_('can only close branch heads'))
1677 1677 elif opts.get('amend'):
1678 1678 if (repo['.'].p1().branch() != branch and
1679 1679 repo['.'].p2().branch() != branch):
1680 1680 raise error.Abort(_('can only close branch heads'))
1681 1681
1682 1682 if opts.get('amend'):
1683 1683 if ui.configbool('ui', 'commitsubrepos'):
1684 1684 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1685 1685
1686 1686 old = repo['.']
1687 1687 rewriteutil.precheck(repo, [old.rev()], 'amend')
1688 1688
1689 1689 # Currently histedit gets confused if an amend happens while histedit
1690 1690 # is in progress. Since we have a checkunfinished command, we are
1691 1691 # temporarily honoring it.
1692 1692 #
1693 1693 # Note: eventually this guard will be removed. Please do not expect
1694 1694 # this behavior to remain.
1695 1695 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1696 1696 cmdutil.checkunfinished(repo)
1697 1697
1698 1698 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1699 1699 if node == old.node():
1700 1700 ui.status(_("nothing changed\n"))
1701 1701 return 1
1702 1702 else:
1703 1703 def commitfunc(ui, repo, message, match, opts):
1704 1704 overrides = {}
1705 1705 if opts.get('secret'):
1706 1706 overrides[('phases', 'new-commit')] = 'secret'
1707 1707
1708 1708 baseui = repo.baseui
1709 1709 with baseui.configoverride(overrides, 'commit'):
1710 1710 with ui.configoverride(overrides, 'commit'):
1711 1711 editform = cmdutil.mergeeditform(repo[None],
1712 1712 'commit.normal')
1713 1713 editor = cmdutil.getcommiteditor(
1714 1714 editform=editform, **pycompat.strkwargs(opts))
1715 1715 return repo.commit(message,
1716 1716 opts.get('user'),
1717 1717 opts.get('date'),
1718 1718 match,
1719 1719 editor=editor,
1720 1720 extra=extra)
1721 1721
1722 1722 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1723 1723
1724 1724 if not node:
1725 1725 stat = cmdutil.postcommitstatus(repo, pats, opts)
1726 1726 if stat[3]:
1727 1727 ui.status(_("nothing changed (%d missing files, see "
1728 1728 "'hg status')\n") % len(stat[3]))
1729 1729 else:
1730 1730 ui.status(_("nothing changed\n"))
1731 1731 return 1
1732 1732
1733 1733 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1734 1734
1735 1735 @command('config|showconfig|debugconfig',
1736 1736 [('u', 'untrusted', None, _('show untrusted configuration options')),
1737 1737 ('e', 'edit', None, _('edit user config')),
1738 1738 ('l', 'local', None, _('edit repository config')),
1739 1739 ('g', 'global', None, _('edit global config'))] + formatteropts,
1740 1740 _('[-u] [NAME]...'),
1741 1741 helpcategory=command.CATEGORY_HELP,
1742 1742 optionalrepo=True,
1743 1743 intents={INTENT_READONLY})
1744 1744 def config(ui, repo, *values, **opts):
1745 1745 """show combined config settings from all hgrc files
1746 1746
1747 1747 With no arguments, print names and values of all config items.
1748 1748
1749 1749 With one argument of the form section.name, print just the value
1750 1750 of that config item.
1751 1751
1752 1752 With multiple arguments, print names and values of all config
1753 1753 items with matching section names or section.names.
1754 1754
1755 1755 With --edit, start an editor on the user-level config file. With
1756 1756 --global, edit the system-wide config file. With --local, edit the
1757 1757 repository-level config file.
1758 1758
1759 1759 With --debug, the source (filename and line number) is printed
1760 1760 for each config item.
1761 1761
1762 1762 See :hg:`help config` for more information about config files.
1763 1763
1764 1764 .. container:: verbose
1765 1765
1766 1766 Template:
1767 1767
1768 1768 The following keywords are supported. See also :hg:`help templates`.
1769 1769
1770 1770 :name: String. Config name.
1771 1771 :source: String. Filename and line number where the item is defined.
1772 1772 :value: String. Config value.
1773 1773
1774 1774 Returns 0 on success, 1 if NAME does not exist.
1775 1775
1776 1776 """
1777 1777
1778 1778 opts = pycompat.byteskwargs(opts)
1779 1779 if opts.get('edit') or opts.get('local') or opts.get('global'):
1780 1780 if opts.get('local') and opts.get('global'):
1781 1781 raise error.Abort(_("can't use --local and --global together"))
1782 1782
1783 1783 if opts.get('local'):
1784 1784 if not repo:
1785 1785 raise error.Abort(_("can't use --local outside a repository"))
1786 1786 paths = [repo.vfs.join('hgrc')]
1787 1787 elif opts.get('global'):
1788 1788 paths = rcutil.systemrcpath()
1789 1789 else:
1790 1790 paths = rcutil.userrcpath()
1791 1791
1792 1792 for f in paths:
1793 1793 if os.path.exists(f):
1794 1794 break
1795 1795 else:
1796 1796 if opts.get('global'):
1797 1797 samplehgrc = uimod.samplehgrcs['global']
1798 1798 elif opts.get('local'):
1799 1799 samplehgrc = uimod.samplehgrcs['local']
1800 1800 else:
1801 1801 samplehgrc = uimod.samplehgrcs['user']
1802 1802
1803 1803 f = paths[0]
1804 1804 fp = open(f, "wb")
1805 1805 fp.write(util.tonativeeol(samplehgrc))
1806 1806 fp.close()
1807 1807
1808 1808 editor = ui.geteditor()
1809 1809 ui.system("%s \"%s\"" % (editor, f),
1810 1810 onerr=error.Abort, errprefix=_("edit failed"),
1811 1811 blockedtag='config_edit')
1812 1812 return
1813 1813 ui.pager('config')
1814 1814 fm = ui.formatter('config', opts)
1815 1815 for t, f in rcutil.rccomponents():
1816 1816 if t == 'path':
1817 1817 ui.debug('read config from: %s\n' % f)
1818 1818 elif t == 'items':
1819 1819 for section, name, value, source in f:
1820 1820 ui.debug('set config by: %s\n' % source)
1821 1821 else:
1822 1822 raise error.ProgrammingError('unknown rctype: %s' % t)
1823 1823 untrusted = bool(opts.get('untrusted'))
1824 1824
1825 1825 selsections = selentries = []
1826 1826 if values:
1827 1827 selsections = [v for v in values if '.' not in v]
1828 1828 selentries = [v for v in values if '.' in v]
1829 1829 uniquesel = (len(selentries) == 1 and not selsections)
1830 1830 selsections = set(selsections)
1831 1831 selentries = set(selentries)
1832 1832
1833 1833 matched = False
1834 1834 for section, name, value in ui.walkconfig(untrusted=untrusted):
1835 1835 source = ui.configsource(section, name, untrusted)
1836 1836 value = pycompat.bytestr(value)
1837 1837 if fm.isplain():
1838 1838 source = source or 'none'
1839 1839 value = value.replace('\n', '\\n')
1840 1840 entryname = section + '.' + name
1841 1841 if values and not (section in selsections or entryname in selentries):
1842 1842 continue
1843 1843 fm.startitem()
1844 1844 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1845 1845 if uniquesel:
1846 1846 fm.data(name=entryname)
1847 1847 fm.write('value', '%s\n', value)
1848 1848 else:
1849 1849 fm.write('name value', '%s=%s\n', entryname, value)
1850 1850 matched = True
1851 1851 fm.end()
1852 1852 if matched:
1853 1853 return 0
1854 1854 return 1
1855 1855
1856 1856 @command('copy|cp',
1857 1857 [('A', 'after', None, _('record a copy that has already occurred')),
1858 1858 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1859 1859 ] + walkopts + dryrunopts,
1860 1860 _('[OPTION]... [SOURCE]... DEST'),
1861 1861 helpcategory=command.CATEGORY_FILE_CONTENTS)
1862 1862 def copy(ui, repo, *pats, **opts):
1863 1863 """mark files as copied for the next commit
1864 1864
1865 1865 Mark dest as having copies of source files. If dest is a
1866 1866 directory, copies are put in that directory. If dest is a file,
1867 1867 the source must be a single file.
1868 1868
1869 1869 By default, this command copies the contents of files as they
1870 1870 exist in the working directory. If invoked with -A/--after, the
1871 1871 operation is recorded, but no copying is performed.
1872 1872
1873 1873 This command takes effect with the next commit. To undo a copy
1874 1874 before that, see :hg:`revert`.
1875 1875
1876 1876 Returns 0 on success, 1 if errors are encountered.
1877 1877 """
1878 1878 opts = pycompat.byteskwargs(opts)
1879 1879 with repo.wlock(False):
1880 1880 return cmdutil.copy(ui, repo, pats, opts)
1881 1881
1882 1882 @command(
1883 1883 'debugcommands', [], _('[COMMAND]'),
1884 1884 helpcategory=command.CATEGORY_HELP,
1885 1885 norepo=True)
1886 1886 def debugcommands(ui, cmd='', *args):
1887 1887 """list all available commands and options"""
1888 1888 for cmd, vals in sorted(table.iteritems()):
1889 1889 cmd = cmd.split('|')[0]
1890 1890 opts = ', '.join([i[1] for i in vals[1]])
1891 1891 ui.write('%s: %s\n' % (cmd, opts))
1892 1892
1893 1893 @command('debugcomplete',
1894 1894 [('o', 'options', None, _('show the command options'))],
1895 1895 _('[-o] CMD'),
1896 1896 helpcategory=command.CATEGORY_HELP,
1897 1897 norepo=True)
1898 1898 def debugcomplete(ui, cmd='', **opts):
1899 1899 """returns the completion list associated with the given command"""
1900 1900
1901 1901 if opts.get(r'options'):
1902 1902 options = []
1903 1903 otables = [globalopts]
1904 1904 if cmd:
1905 1905 aliases, entry = cmdutil.findcmd(cmd, table, False)
1906 1906 otables.append(entry[1])
1907 1907 for t in otables:
1908 1908 for o in t:
1909 1909 if "(DEPRECATED)" in o[3]:
1910 1910 continue
1911 1911 if o[0]:
1912 1912 options.append('-%s' % o[0])
1913 1913 options.append('--%s' % o[1])
1914 1914 ui.write("%s\n" % "\n".join(options))
1915 1915 return
1916 1916
1917 1917 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1918 1918 if ui.verbose:
1919 1919 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1920 1920 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1921 1921
1922 1922 @command('diff',
1923 1923 [('r', 'rev', [], _('revision'), _('REV')),
1924 1924 ('c', 'change', '', _('change made by revision'), _('REV'))
1925 1925 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1926 1926 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1927 1927 helpcategory=command.CATEGORY_FILE_CONTENTS,
1928 1928 helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
1929 1929 def diff(ui, repo, *pats, **opts):
1930 1930 """diff repository (or selected files)
1931 1931
1932 1932 Show differences between revisions for the specified files.
1933 1933
1934 1934 Differences between files are shown using the unified diff format.
1935 1935
1936 1936 .. note::
1937 1937
1938 1938 :hg:`diff` may generate unexpected results for merges, as it will
1939 1939 default to comparing against the working directory's first
1940 1940 parent changeset if no revisions are specified.
1941 1941
1942 1942 When two revision arguments are given, then changes are shown
1943 1943 between those revisions. If only one revision is specified then
1944 1944 that revision is compared to the working directory, and, when no
1945 1945 revisions are specified, the working directory files are compared
1946 1946 to its first parent.
1947 1947
1948 1948 Alternatively you can specify -c/--change with a revision to see
1949 1949 the changes in that changeset relative to its first parent.
1950 1950
1951 1951 Without the -a/--text option, diff will avoid generating diffs of
1952 1952 files it detects as binary. With -a, diff will generate a diff
1953 1953 anyway, probably with undesirable results.
1954 1954
1955 1955 Use the -g/--git option to generate diffs in the git extended diff
1956 1956 format. For more information, read :hg:`help diffs`.
1957 1957
1958 1958 .. container:: verbose
1959 1959
1960 1960 Examples:
1961 1961
1962 1962 - compare a file in the current working directory to its parent::
1963 1963
1964 1964 hg diff foo.c
1965 1965
1966 1966 - compare two historical versions of a directory, with rename info::
1967 1967
1968 1968 hg diff --git -r 1.0:1.2 lib/
1969 1969
1970 1970 - get change stats relative to the last change on some date::
1971 1971
1972 1972 hg diff --stat -r "date('may 2')"
1973 1973
1974 1974 - diff all newly-added files that contain a keyword::
1975 1975
1976 1976 hg diff "set:added() and grep(GNU)"
1977 1977
1978 1978 - compare a revision and its parents::
1979 1979
1980 1980 hg diff -c 9353 # compare against first parent
1981 1981 hg diff -r 9353^:9353 # same using revset syntax
1982 1982 hg diff -r 9353^2:9353 # compare against the second parent
1983 1983
1984 1984 Returns 0 on success.
1985 1985 """
1986 1986
1987 1987 opts = pycompat.byteskwargs(opts)
1988 1988 revs = opts.get('rev')
1989 1989 change = opts.get('change')
1990 1990 stat = opts.get('stat')
1991 1991 reverse = opts.get('reverse')
1992 1992
1993 1993 if revs and change:
1994 1994 msg = _('cannot specify --rev and --change at the same time')
1995 1995 raise error.Abort(msg)
1996 1996 elif change:
1997 1997 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1998 1998 ctx2 = scmutil.revsingle(repo, change, None)
1999 1999 ctx1 = ctx2.p1()
2000 2000 else:
2001 2001 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
2002 2002 ctx1, ctx2 = scmutil.revpair(repo, revs)
2003 2003 node1, node2 = ctx1.node(), ctx2.node()
2004 2004
2005 2005 if reverse:
2006 2006 node1, node2 = node2, node1
2007 2007
2008 2008 diffopts = patch.diffallopts(ui, opts)
2009 2009 m = scmutil.match(ctx2, pats, opts)
2010 2010 m = repo.narrowmatch(m)
2011 2011 ui.pager('diff')
2012 2012 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2013 2013 listsubrepos=opts.get('subrepos'),
2014 2014 root=opts.get('root'))
2015 2015
2016 2016 @command('export',
2017 2017 [('B', 'bookmark', '',
2018 2018 _('export changes only reachable by given bookmark'), _('BOOKMARK')),
2019 2019 ('o', 'output', '',
2020 2020 _('print output to file with formatted name'), _('FORMAT')),
2021 2021 ('', 'switch-parent', None, _('diff against the second parent')),
2022 2022 ('r', 'rev', [], _('revisions to export'), _('REV')),
2023 2023 ] + diffopts + formatteropts,
2024 2024 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2025 2025 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2026 2026 helpbasic=True, intents={INTENT_READONLY})
2027 2027 def export(ui, repo, *changesets, **opts):
2028 2028 """dump the header and diffs for one or more changesets
2029 2029
2030 2030 Print the changeset header and diffs for one or more revisions.
2031 2031 If no revision is given, the parent of the working directory is used.
2032 2032
2033 2033 The information shown in the changeset header is: author, date,
2034 2034 branch name (if non-default), changeset hash, parent(s) and commit
2035 2035 comment.
2036 2036
2037 2037 .. note::
2038 2038
2039 2039 :hg:`export` may generate unexpected diff output for merge
2040 2040 changesets, as it will compare the merge changeset against its
2041 2041 first parent only.
2042 2042
2043 2043 Output may be to a file, in which case the name of the file is
2044 2044 given using a template string. See :hg:`help templates`. In addition
2045 2045 to the common template keywords, the following formatting rules are
2046 2046 supported:
2047 2047
2048 2048 :``%%``: literal "%" character
2049 2049 :``%H``: changeset hash (40 hexadecimal digits)
2050 2050 :``%N``: number of patches being generated
2051 2051 :``%R``: changeset revision number
2052 2052 :``%b``: basename of the exporting repository
2053 2053 :``%h``: short-form changeset hash (12 hexadecimal digits)
2054 2054 :``%m``: first line of the commit message (only alphanumeric characters)
2055 2055 :``%n``: zero-padded sequence number, starting at 1
2056 2056 :``%r``: zero-padded changeset revision number
2057 2057 :``\\``: literal "\\" character
2058 2058
2059 2059 Without the -a/--text option, export will avoid generating diffs
2060 2060 of files it detects as binary. With -a, export will generate a
2061 2061 diff anyway, probably with undesirable results.
2062 2062
2063 2063 With -B/--bookmark changesets reachable by the given bookmark are
2064 2064 selected.
2065 2065
2066 2066 Use the -g/--git option to generate diffs in the git extended diff
2067 2067 format. See :hg:`help diffs` for more information.
2068 2068
2069 2069 With the --switch-parent option, the diff will be against the
2070 2070 second parent. It can be useful to review a merge.
2071 2071
2072 2072 .. container:: verbose
2073 2073
2074 2074 Template:
2075 2075
2076 2076 The following keywords are supported in addition to the common template
2077 2077 keywords and functions. See also :hg:`help templates`.
2078 2078
2079 2079 :diff: String. Diff content.
2080 2080 :parents: List of strings. Parent nodes of the changeset.
2081 2081
2082 2082 Examples:
2083 2083
2084 2084 - use export and import to transplant a bugfix to the current
2085 2085 branch::
2086 2086
2087 2087 hg export -r 9353 | hg import -
2088 2088
2089 2089 - export all the changesets between two revisions to a file with
2090 2090 rename information::
2091 2091
2092 2092 hg export --git -r 123:150 > changes.txt
2093 2093
2094 2094 - split outgoing changes into a series of patches with
2095 2095 descriptive names::
2096 2096
2097 2097 hg export -r "outgoing()" -o "%n-%m.patch"
2098 2098
2099 2099 Returns 0 on success.
2100 2100 """
2101 2101 opts = pycompat.byteskwargs(opts)
2102 2102 bookmark = opts.get('bookmark')
2103 2103 changesets += tuple(opts.get('rev', []))
2104 2104
2105 2105 if bookmark and changesets:
2106 2106 raise error.Abort(_("-r and -B are mutually exclusive"))
2107 2107
2108 2108 if bookmark:
2109 2109 if bookmark not in repo._bookmarks:
2110 2110 raise error.Abort(_("bookmark '%s' not found") % bookmark)
2111 2111
2112 2112 revs = scmutil.bookmarkrevs(repo, bookmark)
2113 2113 else:
2114 2114 if not changesets:
2115 2115 changesets = ['.']
2116 2116
2117 2117 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
2118 2118 revs = scmutil.revrange(repo, changesets)
2119 2119
2120 2120 if not revs:
2121 2121 raise error.Abort(_("export requires at least one changeset"))
2122 2122 if len(revs) > 1:
2123 2123 ui.note(_('exporting patches:\n'))
2124 2124 else:
2125 2125 ui.note(_('exporting patch:\n'))
2126 2126
2127 2127 fntemplate = opts.get('output')
2128 2128 if cmdutil.isstdiofilename(fntemplate):
2129 2129 fntemplate = ''
2130 2130
2131 2131 if fntemplate:
2132 2132 fm = formatter.nullformatter(ui, 'export', opts)
2133 2133 else:
2134 2134 ui.pager('export')
2135 2135 fm = ui.formatter('export', opts)
2136 2136 with fm:
2137 2137 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2138 2138 switch_parent=opts.get('switch_parent'),
2139 2139 opts=patch.diffallopts(ui, opts))
2140 2140
2141 2141 @command('files',
2142 2142 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2143 2143 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2144 2144 ] + walkopts + formatteropts + subrepoopts,
2145 2145 _('[OPTION]... [FILE]...'),
2146 2146 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2147 2147 intents={INTENT_READONLY})
2148 2148 def files(ui, repo, *pats, **opts):
2149 2149 """list tracked files
2150 2150
2151 2151 Print files under Mercurial control in the working directory or
2152 2152 specified revision for given files (excluding removed files).
2153 2153 Files can be specified as filenames or filesets.
2154 2154
2155 2155 If no files are given to match, this command prints the names
2156 2156 of all files under Mercurial control.
2157 2157
2158 2158 .. container:: verbose
2159 2159
2160 2160 Template:
2161 2161
2162 2162 The following keywords are supported in addition to the common template
2163 2163 keywords and functions. See also :hg:`help templates`.
2164 2164
2165 2165 :flags: String. Character denoting file's symlink and executable bits.
2166 2166 :path: String. Repository-absolute path of the file.
2167 2167 :size: Integer. Size of the file in bytes.
2168 2168
2169 2169 Examples:
2170 2170
2171 2171 - list all files under the current directory::
2172 2172
2173 2173 hg files .
2174 2174
2175 2175 - shows sizes and flags for current revision::
2176 2176
2177 2177 hg files -vr .
2178 2178
2179 2179 - list all files named README::
2180 2180
2181 2181 hg files -I "**/README"
2182 2182
2183 2183 - list all binary files::
2184 2184
2185 2185 hg files "set:binary()"
2186 2186
2187 2187 - find files containing a regular expression::
2188 2188
2189 2189 hg files "set:grep('bob')"
2190 2190
2191 2191 - search tracked file contents with xargs and grep::
2192 2192
2193 2193 hg files -0 | xargs -0 grep foo
2194 2194
2195 2195 See :hg:`help patterns` and :hg:`help filesets` for more information
2196 2196 on specifying file patterns.
2197 2197
2198 2198 Returns 0 if a match is found, 1 otherwise.
2199 2199
2200 2200 """
2201 2201
2202 2202 opts = pycompat.byteskwargs(opts)
2203 2203 rev = opts.get('rev')
2204 2204 if rev:
2205 2205 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2206 2206 ctx = scmutil.revsingle(repo, rev, None)
2207 2207
2208 2208 end = '\n'
2209 2209 if opts.get('print0'):
2210 2210 end = '\0'
2211 2211 fmt = '%s' + end
2212 2212
2213 2213 m = scmutil.match(ctx, pats, opts)
2214 2214 ui.pager('files')
2215 2215 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2216 2216 with ui.formatter('files', opts) as fm:
2217 2217 return cmdutil.files(ui, ctx, m, uipathfn, fm, fmt,
2218 2218 opts.get('subrepos'))
2219 2219
2220 2220 @command(
2221 2221 'forget',
2222 2222 [('i', 'interactive', None, _('use interactive mode')),
2223 2223 ] + walkopts + dryrunopts,
2224 2224 _('[OPTION]... FILE...'),
2225 2225 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2226 2226 helpbasic=True, inferrepo=True)
2227 2227 def forget(ui, repo, *pats, **opts):
2228 2228 """forget the specified files on the next commit
2229 2229
2230 2230 Mark the specified files so they will no longer be tracked
2231 2231 after the next commit.
2232 2232
2233 2233 This only removes files from the current branch, not from the
2234 2234 entire project history, and it does not delete them from the
2235 2235 working directory.
2236 2236
2237 2237 To delete the file from the working directory, see :hg:`remove`.
2238 2238
2239 2239 To undo a forget before the next commit, see :hg:`add`.
2240 2240
2241 2241 .. container:: verbose
2242 2242
2243 2243 Examples:
2244 2244
2245 2245 - forget newly-added binary files::
2246 2246
2247 2247 hg forget "set:added() and binary()"
2248 2248
2249 2249 - forget files that would be excluded by .hgignore::
2250 2250
2251 2251 hg forget "set:hgignore()"
2252 2252
2253 2253 Returns 0 on success.
2254 2254 """
2255 2255
2256 2256 opts = pycompat.byteskwargs(opts)
2257 2257 if not pats:
2258 2258 raise error.Abort(_('no files specified'))
2259 2259
2260 2260 m = scmutil.match(repo[None], pats, opts)
2261 2261 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2262 2262 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2263 2263 rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn,
2264 2264 explicitonly=False, dryrun=dryrun,
2265 2265 interactive=interactive)[0]
2266 2266 return rejected and 1 or 0
2267 2267
2268 2268 @command(
2269 2269 'graft',
2270 2270 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2271 2271 ('', 'base', '',
2272 2272 _('base revision when doing the graft merge (ADVANCED)'), _('REV')),
2273 2273 ('c', 'continue', False, _('resume interrupted graft')),
2274 2274 ('', 'stop', False, _('stop interrupted graft')),
2275 2275 ('', 'abort', False, _('abort interrupted graft')),
2276 2276 ('e', 'edit', False, _('invoke editor on commit messages')),
2277 2277 ('', 'log', None, _('append graft info to log message')),
2278 2278 ('', 'no-commit', None,
2279 2279 _("don't commit, just apply the changes in working directory")),
2280 2280 ('f', 'force', False, _('force graft')),
2281 2281 ('D', 'currentdate', False,
2282 2282 _('record the current date as commit date')),
2283 2283 ('U', 'currentuser', False,
2284 2284 _('record the current user as committer'))]
2285 2285 + commitopts2 + mergetoolopts + dryrunopts,
2286 2286 _('[OPTION]... [-r REV]... REV...'),
2287 2287 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
2288 2288 def graft(ui, repo, *revs, **opts):
2289 2289 '''copy changes from other branches onto the current branch
2290 2290
2291 2291 This command uses Mercurial's merge logic to copy individual
2292 2292 changes from other branches without merging branches in the
2293 2293 history graph. This is sometimes known as 'backporting' or
2294 2294 'cherry-picking'. By default, graft will copy user, date, and
2295 2295 description from the source changesets.
2296 2296
2297 2297 Changesets that are ancestors of the current revision, that have
2298 2298 already been grafted, or that are merges will be skipped.
2299 2299
2300 2300 If --log is specified, log messages will have a comment appended
2301 2301 of the form::
2302 2302
2303 2303 (grafted from CHANGESETHASH)
2304 2304
2305 2305 If --force is specified, revisions will be grafted even if they
2306 2306 are already ancestors of, or have been grafted to, the destination.
2307 2307 This is useful when the revisions have since been backed out.
2308 2308
2309 2309 If a graft merge results in conflicts, the graft process is
2310 2310 interrupted so that the current merge can be manually resolved.
2311 2311 Once all conflicts are addressed, the graft process can be
2312 2312 continued with the -c/--continue option.
2313 2313
2314 2314 The -c/--continue option reapplies all the earlier options.
2315 2315
2316 2316 .. container:: verbose
2317 2317
2318 2318 The --base option exposes more of how graft internally uses merge with a
2319 2319 custom base revision. --base can be used to specify another ancestor than
2320 2320 the first and only parent.
2321 2321
2322 2322 The command::
2323 2323
2324 2324 hg graft -r 345 --base 234
2325 2325
2326 2326 is thus pretty much the same as::
2327 2327
2328 2328 hg diff -r 234 -r 345 | hg import
2329 2329
2330 2330 but using merge to resolve conflicts and track moved files.
2331 2331
2332 2332 The result of a merge can thus be backported as a single commit by
2333 2333 specifying one of the merge parents as base, and thus effectively
2334 2334 grafting the changes from the other side.
2335 2335
2336 2336 It is also possible to collapse multiple changesets and clean up history
2337 2337 by specifying another ancestor as base, much like rebase --collapse
2338 2338 --keep.
2339 2339
2340 2340 The commit message can be tweaked after the fact using commit --amend .
2341 2341
2342 2342 For using non-ancestors as the base to backout changes, see the backout
2343 2343 command and the hidden --parent option.
2344 2344
2345 2345 .. container:: verbose
2346 2346
2347 2347 Examples:
2348 2348
2349 2349 - copy a single change to the stable branch and edit its description::
2350 2350
2351 2351 hg update stable
2352 2352 hg graft --edit 9393
2353 2353
2354 2354 - graft a range of changesets with one exception, updating dates::
2355 2355
2356 2356 hg graft -D "2085::2093 and not 2091"
2357 2357
2358 2358 - continue a graft after resolving conflicts::
2359 2359
2360 2360 hg graft -c
2361 2361
2362 2362 - show the source of a grafted changeset::
2363 2363
2364 2364 hg log --debug -r .
2365 2365
2366 2366 - show revisions sorted by date::
2367 2367
2368 2368 hg log -r "sort(all(), date)"
2369 2369
2370 2370 - backport the result of a merge as a single commit::
2371 2371
2372 2372 hg graft -r 123 --base 123^
2373 2373
2374 2374 - land a feature branch as one changeset::
2375 2375
2376 2376 hg up -cr default
2377 2377 hg graft -r featureX --base "ancestor('featureX', 'default')"
2378 2378
2379 2379 See :hg:`help revisions` for more about specifying revisions.
2380 2380
2381 2381 Returns 0 on successful completion.
2382 2382 '''
2383 2383 with repo.wlock():
2384 2384 return _dograft(ui, repo, *revs, **opts)
2385 2385
2386 2386 def _dograft(ui, repo, *revs, **opts):
2387 2387 opts = pycompat.byteskwargs(opts)
2388 2388 if revs and opts.get('rev'):
2389 2389 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2390 2390 'revision ordering!\n'))
2391 2391
2392 2392 revs = list(revs)
2393 2393 revs.extend(opts.get('rev'))
2394 2394 basectx = None
2395 2395 if opts.get('base'):
2396 2396 basectx = scmutil.revsingle(repo, opts['base'], None)
2397 2397 # a dict of data to be stored in state file
2398 2398 statedata = {}
2399 2399 # list of new nodes created by ongoing graft
2400 2400 statedata['newnodes'] = []
2401 2401
2402 2402 if opts.get('user') and opts.get('currentuser'):
2403 2403 raise error.Abort(_('--user and --currentuser are mutually exclusive'))
2404 2404 if opts.get('date') and opts.get('currentdate'):
2405 2405 raise error.Abort(_('--date and --currentdate are mutually exclusive'))
2406 2406 if not opts.get('user') and opts.get('currentuser'):
2407 2407 opts['user'] = ui.username()
2408 2408 if not opts.get('date') and opts.get('currentdate'):
2409 2409 opts['date'] = "%d %d" % dateutil.makedate()
2410 2410
2411 2411 editor = cmdutil.getcommiteditor(editform='graft',
2412 2412 **pycompat.strkwargs(opts))
2413 2413
2414 2414 cont = False
2415 2415 if opts.get('no_commit'):
2416 2416 if opts.get('edit'):
2417 2417 raise error.Abort(_("cannot specify --no-commit and "
2418 2418 "--edit together"))
2419 2419 if opts.get('currentuser'):
2420 2420 raise error.Abort(_("cannot specify --no-commit and "
2421 2421 "--currentuser together"))
2422 2422 if opts.get('currentdate'):
2423 2423 raise error.Abort(_("cannot specify --no-commit and "
2424 2424 "--currentdate together"))
2425 2425 if opts.get('log'):
2426 2426 raise error.Abort(_("cannot specify --no-commit and "
2427 2427 "--log together"))
2428 2428
2429 2429 graftstate = statemod.cmdstate(repo, 'graftstate')
2430 2430
2431 2431 if opts.get('stop'):
2432 2432 if opts.get('continue'):
2433 2433 raise error.Abort(_("cannot use '--continue' and "
2434 2434 "'--stop' together"))
2435 2435 if opts.get('abort'):
2436 2436 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2437 2437
2438 2438 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2439 2439 opts.get('date'), opts.get('currentdate'),
2440 2440 opts.get('currentuser'), opts.get('rev'))):
2441 2441 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2442 2442 return _stopgraft(ui, repo, graftstate)
2443 2443 elif opts.get('abort'):
2444 2444 if opts.get('continue'):
2445 2445 raise error.Abort(_("cannot use '--continue' and "
2446 2446 "'--abort' together"))
2447 2447 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2448 2448 opts.get('date'), opts.get('currentdate'),
2449 2449 opts.get('currentuser'), opts.get('rev'))):
2450 2450 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2451 2451
2452 2452 return _abortgraft(ui, repo, graftstate)
2453 2453 elif opts.get('continue'):
2454 2454 cont = True
2455 2455 if revs:
2456 2456 raise error.Abort(_("can't specify --continue and revisions"))
2457 2457 # read in unfinished revisions
2458 2458 if graftstate.exists():
2459 2459 statedata = _readgraftstate(repo, graftstate)
2460 2460 if statedata.get('date'):
2461 2461 opts['date'] = statedata['date']
2462 2462 if statedata.get('user'):
2463 2463 opts['user'] = statedata['user']
2464 2464 if statedata.get('log'):
2465 2465 opts['log'] = True
2466 2466 if statedata.get('no_commit'):
2467 2467 opts['no_commit'] = statedata.get('no_commit')
2468 2468 nodes = statedata['nodes']
2469 2469 revs = [repo[node].rev() for node in nodes]
2470 2470 else:
2471 2471 cmdutil.wrongtooltocontinue(repo, _('graft'))
2472 2472 else:
2473 2473 if not revs:
2474 2474 raise error.Abort(_('no revisions specified'))
2475 2475 cmdutil.checkunfinished(repo)
2476 2476 cmdutil.bailifchanged(repo)
2477 2477 revs = scmutil.revrange(repo, revs)
2478 2478
2479 2479 skipped = set()
2480 2480 if basectx is None:
2481 2481 # check for merges
2482 2482 for rev in repo.revs('%ld and merge()', revs):
2483 2483 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2484 2484 skipped.add(rev)
2485 2485 revs = [r for r in revs if r not in skipped]
2486 2486 if not revs:
2487 2487 return -1
2488 2488 if basectx is not None and len(revs) != 1:
2489 2489 raise error.Abort(_('only one revision allowed with --base '))
2490 2490
2491 2491 # Don't check in the --continue case, in effect retaining --force across
2492 2492 # --continues. That's because without --force, any revisions we decided to
2493 2493 # skip would have been filtered out here, so they wouldn't have made their
2494 2494 # way to the graftstate. With --force, any revisions we would have otherwise
2495 2495 # skipped would not have been filtered out, and if they hadn't been applied
2496 2496 # already, they'd have been in the graftstate.
2497 2497 if not (cont or opts.get('force')) and basectx is None:
2498 2498 # check for ancestors of dest branch
2499 2499 crev = repo['.'].rev()
2500 2500 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2501 2501 # XXX make this lazy in the future
2502 2502 # don't mutate while iterating, create a copy
2503 2503 for rev in list(revs):
2504 2504 if rev in ancestors:
2505 2505 ui.warn(_('skipping ancestor revision %d:%s\n') %
2506 2506 (rev, repo[rev]))
2507 2507 # XXX remove on list is slow
2508 2508 revs.remove(rev)
2509 2509 if not revs:
2510 2510 return -1
2511 2511
2512 2512 # analyze revs for earlier grafts
2513 2513 ids = {}
2514 2514 for ctx in repo.set("%ld", revs):
2515 2515 ids[ctx.hex()] = ctx.rev()
2516 2516 n = ctx.extra().get('source')
2517 2517 if n:
2518 2518 ids[n] = ctx.rev()
2519 2519
2520 2520 # check ancestors for earlier grafts
2521 2521 ui.debug('scanning for duplicate grafts\n')
2522 2522
2523 2523 # The only changesets we can be sure doesn't contain grafts of any
2524 2524 # revs, are the ones that are common ancestors of *all* revs:
2525 2525 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2526 2526 ctx = repo[rev]
2527 2527 n = ctx.extra().get('source')
2528 2528 if n in ids:
2529 2529 try:
2530 2530 r = repo[n].rev()
2531 2531 except error.RepoLookupError:
2532 2532 r = None
2533 2533 if r in revs:
2534 2534 ui.warn(_('skipping revision %d:%s '
2535 2535 '(already grafted to %d:%s)\n')
2536 2536 % (r, repo[r], rev, ctx))
2537 2537 revs.remove(r)
2538 2538 elif ids[n] in revs:
2539 2539 if r is None:
2540 2540 ui.warn(_('skipping already grafted revision %d:%s '
2541 2541 '(%d:%s also has unknown origin %s)\n')
2542 2542 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2543 2543 else:
2544 2544 ui.warn(_('skipping already grafted revision %d:%s '
2545 2545 '(%d:%s also has origin %d:%s)\n')
2546 2546 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2547 2547 revs.remove(ids[n])
2548 2548 elif ctx.hex() in ids:
2549 2549 r = ids[ctx.hex()]
2550 2550 if r in revs:
2551 2551 ui.warn(_('skipping already grafted revision %d:%s '
2552 2552 '(was grafted from %d:%s)\n') %
2553 2553 (r, repo[r], rev, ctx))
2554 2554 revs.remove(r)
2555 2555 if not revs:
2556 2556 return -1
2557 2557
2558 2558 if opts.get('no_commit'):
2559 2559 statedata['no_commit'] = True
2560 2560 for pos, ctx in enumerate(repo.set("%ld", revs)):
2561 2561 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2562 2562 ctx.description().split('\n', 1)[0])
2563 2563 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2564 2564 if names:
2565 2565 desc += ' (%s)' % ' '.join(names)
2566 2566 ui.status(_('grafting %s\n') % desc)
2567 2567 if opts.get('dry_run'):
2568 2568 continue
2569 2569
2570 2570 source = ctx.extra().get('source')
2571 2571 extra = {}
2572 2572 if source:
2573 2573 extra['source'] = source
2574 2574 extra['intermediate-source'] = ctx.hex()
2575 2575 else:
2576 2576 extra['source'] = ctx.hex()
2577 2577 user = ctx.user()
2578 2578 if opts.get('user'):
2579 2579 user = opts['user']
2580 2580 statedata['user'] = user
2581 2581 date = ctx.date()
2582 2582 if opts.get('date'):
2583 2583 date = opts['date']
2584 2584 statedata['date'] = date
2585 2585 message = ctx.description()
2586 2586 if opts.get('log'):
2587 2587 message += '\n(grafted from %s)' % ctx.hex()
2588 2588 statedata['log'] = True
2589 2589
2590 2590 # we don't merge the first commit when continuing
2591 2591 if not cont:
2592 2592 # perform the graft merge with p1(rev) as 'ancestor'
2593 2593 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2594 2594 base = ctx.p1() if basectx is None else basectx
2595 2595 with ui.configoverride(overrides, 'graft'):
2596 2596 stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
2597 2597 # report any conflicts
2598 2598 if stats.unresolvedcount > 0:
2599 2599 # write out state for --continue
2600 2600 nodes = [repo[rev].hex() for rev in revs[pos:]]
2601 2601 statedata['nodes'] = nodes
2602 2602 stateversion = 1
2603 2603 graftstate.save(stateversion, statedata)
2604 2604 hint = _("use 'hg resolve' and 'hg graft --continue'")
2605 2605 raise error.Abort(
2606 2606 _("unresolved conflicts, can't continue"),
2607 2607 hint=hint)
2608 2608 else:
2609 2609 cont = False
2610 2610
2611 2611 # commit if --no-commit is false
2612 2612 if not opts.get('no_commit'):
2613 2613 node = repo.commit(text=message, user=user, date=date, extra=extra,
2614 2614 editor=editor)
2615 2615 if node is None:
2616 2616 ui.warn(
2617 2617 _('note: graft of %d:%s created no changes to commit\n') %
2618 2618 (ctx.rev(), ctx))
2619 2619 # checking that newnodes exist because old state files won't have it
2620 2620 elif statedata.get('newnodes') is not None:
2621 2621 statedata['newnodes'].append(node)
2622 2622
2623 2623 # remove state when we complete successfully
2624 2624 if not opts.get('dry_run'):
2625 2625 graftstate.delete()
2626 2626
2627 2627 return 0
2628 2628
2629 2629 def _abortgraft(ui, repo, graftstate):
2630 2630 """abort the interrupted graft and rollbacks to the state before interrupted
2631 2631 graft"""
2632 2632 if not graftstate.exists():
2633 2633 raise error.Abort(_("no interrupted graft to abort"))
2634 2634 statedata = _readgraftstate(repo, graftstate)
2635 2635 newnodes = statedata.get('newnodes')
2636 2636 if newnodes is None:
2637 2637 # and old graft state which does not have all the data required to abort
2638 2638 # the graft
2639 2639 raise error.Abort(_("cannot abort using an old graftstate"))
2640 2640
2641 2641 # changeset from which graft operation was started
2642 2642 if len(newnodes) > 0:
2643 2643 startctx = repo[newnodes[0]].p1()
2644 2644 else:
2645 2645 startctx = repo['.']
2646 2646 # whether to strip or not
2647 2647 cleanup = False
2648 2648 if newnodes:
2649 2649 newnodes = [repo[r].rev() for r in newnodes]
2650 2650 cleanup = True
2651 2651 # checking that none of the newnodes turned public or is public
2652 2652 immutable = [c for c in newnodes if not repo[c].mutable()]
2653 2653 if immutable:
2654 2654 repo.ui.warn(_("cannot clean up public changesets %s\n")
2655 2655 % ', '.join(bytes(repo[r]) for r in immutable),
2656 2656 hint=_("see 'hg help phases' for details"))
2657 2657 cleanup = False
2658 2658
2659 2659 # checking that no new nodes are created on top of grafted revs
2660 2660 desc = set(repo.changelog.descendants(newnodes))
2661 2661 if desc - set(newnodes):
2662 2662 repo.ui.warn(_("new changesets detected on destination "
2663 2663 "branch, can't strip\n"))
2664 2664 cleanup = False
2665 2665
2666 2666 if cleanup:
2667 2667 with repo.wlock(), repo.lock():
2668 2668 hg.updaterepo(repo, startctx.node(), overwrite=True)
2669 2669 # stripping the new nodes created
2670 2670 strippoints = [c.node() for c in repo.set("roots(%ld)",
2671 2671 newnodes)]
2672 2672 repair.strip(repo.ui, repo, strippoints, backup=False)
2673 2673
2674 2674 if not cleanup:
2675 2675 # we don't update to the startnode if we can't strip
2676 2676 startctx = repo['.']
2677 2677 hg.updaterepo(repo, startctx.node(), overwrite=True)
2678 2678
2679 2679 ui.status(_("graft aborted\n"))
2680 2680 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2681 2681 graftstate.delete()
2682 2682 return 0
2683 2683
2684 2684 def _readgraftstate(repo, graftstate):
2685 2685 """read the graft state file and return a dict of the data stored in it"""
2686 2686 try:
2687 2687 return graftstate.read()
2688 2688 except error.CorruptedState:
2689 2689 nodes = repo.vfs.read('graftstate').splitlines()
2690 2690 return {'nodes': nodes}
2691 2691
2692 2692 def _stopgraft(ui, repo, graftstate):
2693 2693 """stop the interrupted graft"""
2694 2694 if not graftstate.exists():
2695 2695 raise error.Abort(_("no interrupted graft found"))
2696 2696 pctx = repo['.']
2697 2697 hg.updaterepo(repo, pctx.node(), overwrite=True)
2698 2698 graftstate.delete()
2699 2699 ui.status(_("stopped the interrupted graft\n"))
2700 2700 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2701 2701 return 0
2702 2702
2703 2703 @command('grep',
2704 2704 [('0', 'print0', None, _('end fields with NUL')),
2705 2705 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2706 2706 ('', 'diff', None, _('print all revisions when the term was introduced '
2707 2707 'or removed')),
2708 2708 ('a', 'text', None, _('treat all files as text')),
2709 2709 ('f', 'follow', None,
2710 2710 _('follow changeset history,'
2711 2711 ' or file history across copies and renames')),
2712 2712 ('i', 'ignore-case', None, _('ignore case when matching')),
2713 2713 ('l', 'files-with-matches', None,
2714 2714 _('print only filenames and revisions that match')),
2715 2715 ('n', 'line-number', None, _('print matching line numbers')),
2716 2716 ('r', 'rev', [],
2717 2717 _('only search files changed within revision range'), _('REV')),
2718 2718 ('', 'all-files', None,
2719 2719 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2720 2720 ('u', 'user', None, _('list the author (long with -v)')),
2721 2721 ('d', 'date', None, _('list the date (short with -q)')),
2722 2722 ] + formatteropts + walkopts,
2723 2723 _('[OPTION]... PATTERN [FILE]...'),
2724 2724 helpcategory=command.CATEGORY_FILE_CONTENTS,
2725 2725 inferrepo=True,
2726 2726 intents={INTENT_READONLY})
2727 2727 def grep(ui, repo, pattern, *pats, **opts):
2728 2728 """search revision history for a pattern in specified files
2729 2729
2730 2730 Search revision history for a regular expression in the specified
2731 2731 files or the entire project.
2732 2732
2733 2733 By default, grep prints the most recent revision number for each
2734 2734 file in which it finds a match. To get it to print every revision
2735 2735 that contains a change in match status ("-" for a match that becomes
2736 2736 a non-match, or "+" for a non-match that becomes a match), use the
2737 2737 --diff flag.
2738 2738
2739 2739 PATTERN can be any Python (roughly Perl-compatible) regular
2740 2740 expression.
2741 2741
2742 2742 If no FILEs are specified (and -f/--follow isn't set), all files in
2743 2743 the repository are searched, including those that don't exist in the
2744 2744 current branch or have been deleted in a prior changeset.
2745 2745
2746 2746 .. container:: verbose
2747 2747
2748 2748 Template:
2749 2749
2750 2750 The following keywords are supported in addition to the common template
2751 2751 keywords and functions. See also :hg:`help templates`.
2752 2752
2753 2753 :change: String. Character denoting insertion ``+`` or removal ``-``.
2754 2754 Available if ``--diff`` is specified.
2755 2755 :lineno: Integer. Line number of the match.
2756 2756 :path: String. Repository-absolute path of the file.
2757 2757 :texts: List of text chunks.
2758 2758
2759 2759 And each entry of ``{texts}`` provides the following sub-keywords.
2760 2760
2761 2761 :matched: Boolean. True if the chunk matches the specified pattern.
2762 2762 :text: String. Chunk content.
2763 2763
2764 2764 See :hg:`help templates.operators` for the list expansion syntax.
2765 2765
2766 2766 Returns 0 if a match is found, 1 otherwise.
2767 2767 """
2768 2768 opts = pycompat.byteskwargs(opts)
2769 2769 diff = opts.get('all') or opts.get('diff')
2770 2770 all_files = opts.get('all_files')
2771 2771 if diff and opts.get('all_files'):
2772 2772 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2773 2773 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2774 2774 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2775 2775 # experimental config: commands.grep.all-files
2776 2776 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2777 2777 plaingrep = opts.get('all_files') and not opts.get('rev')
2778 2778 if plaingrep:
2779 2779 opts['rev'] = ['wdir()']
2780 2780
2781 2781 reflags = re.M
2782 2782 if opts.get('ignore_case'):
2783 2783 reflags |= re.I
2784 2784 try:
2785 2785 regexp = util.re.compile(pattern, reflags)
2786 2786 except re.error as inst:
2787 2787 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2788 2788 return 1
2789 2789 sep, eol = ':', '\n'
2790 2790 if opts.get('print0'):
2791 2791 sep = eol = '\0'
2792 2792
2793 2793 getfile = util.lrucachefunc(repo.file)
2794 2794
2795 2795 def matchlines(body):
2796 2796 begin = 0
2797 2797 linenum = 0
2798 2798 while begin < len(body):
2799 2799 match = regexp.search(body, begin)
2800 2800 if not match:
2801 2801 break
2802 2802 mstart, mend = match.span()
2803 2803 linenum += body.count('\n', begin, mstart) + 1
2804 2804 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2805 2805 begin = body.find('\n', mend) + 1 or len(body) + 1
2806 2806 lend = begin - 1
2807 2807 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2808 2808
2809 2809 class linestate(object):
2810 2810 def __init__(self, line, linenum, colstart, colend):
2811 2811 self.line = line
2812 2812 self.linenum = linenum
2813 2813 self.colstart = colstart
2814 2814 self.colend = colend
2815 2815
2816 2816 def __hash__(self):
2817 2817 return hash((self.linenum, self.line))
2818 2818
2819 2819 def __eq__(self, other):
2820 2820 return self.line == other.line
2821 2821
2822 2822 def findpos(self):
2823 2823 """Iterate all (start, end) indices of matches"""
2824 2824 yield self.colstart, self.colend
2825 2825 p = self.colend
2826 2826 while p < len(self.line):
2827 2827 m = regexp.search(self.line, p)
2828 2828 if not m:
2829 2829 break
2830 2830 yield m.span()
2831 2831 p = m.end()
2832 2832
2833 2833 matches = {}
2834 2834 copies = {}
2835 2835 def grepbody(fn, rev, body):
2836 2836 matches[rev].setdefault(fn, [])
2837 2837 m = matches[rev][fn]
2838 2838 for lnum, cstart, cend, line in matchlines(body):
2839 2839 s = linestate(line, lnum, cstart, cend)
2840 2840 m.append(s)
2841 2841
2842 2842 def difflinestates(a, b):
2843 2843 sm = difflib.SequenceMatcher(None, a, b)
2844 2844 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2845 2845 if tag == r'insert':
2846 2846 for i in pycompat.xrange(blo, bhi):
2847 2847 yield ('+', b[i])
2848 2848 elif tag == r'delete':
2849 2849 for i in pycompat.xrange(alo, ahi):
2850 2850 yield ('-', a[i])
2851 2851 elif tag == r'replace':
2852 2852 for i in pycompat.xrange(alo, ahi):
2853 2853 yield ('-', a[i])
2854 2854 for i in pycompat.xrange(blo, bhi):
2855 2855 yield ('+', b[i])
2856 2856
2857 2857 uipathfn = scmutil.getuipathfn(repo)
2858 2858 def display(fm, fn, ctx, pstates, states):
2859 2859 rev = scmutil.intrev(ctx)
2860 2860 if fm.isplain():
2861 2861 formatuser = ui.shortuser
2862 2862 else:
2863 2863 formatuser = pycompat.bytestr
2864 2864 if ui.quiet:
2865 2865 datefmt = '%Y-%m-%d'
2866 2866 else:
2867 2867 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2868 2868 found = False
2869 2869 @util.cachefunc
2870 2870 def binary():
2871 2871 flog = getfile(fn)
2872 2872 try:
2873 2873 return stringutil.binary(flog.read(ctx.filenode(fn)))
2874 2874 except error.WdirUnsupported:
2875 2875 return ctx[fn].isbinary()
2876 2876
2877 2877 fieldnamemap = {'linenumber': 'lineno'}
2878 2878 if diff:
2879 2879 iter = difflinestates(pstates, states)
2880 2880 else:
2881 2881 iter = [('', l) for l in states]
2882 2882 for change, l in iter:
2883 2883 fm.startitem()
2884 2884 fm.context(ctx=ctx)
2885 2885 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
2886 2886 fm.plain(uipathfn(fn), label='grep.filename')
2887 2887
2888 2888 cols = [
2889 2889 ('rev', '%d', rev, not plaingrep, ''),
2890 2890 ('linenumber', '%d', l.linenum, opts.get('line_number'), ''),
2891 2891 ]
2892 2892 if diff:
2893 2893 cols.append(
2894 2894 ('change', '%s', change, True,
2895 2895 'grep.inserted ' if change == '+' else 'grep.deleted ')
2896 2896 )
2897 2897 cols.extend([
2898 2898 ('user', '%s', formatuser(ctx.user()), opts.get('user'), ''),
2899 2899 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2900 2900 opts.get('date'), ''),
2901 2901 ])
2902 2902 for name, fmt, data, cond, extra_label in cols:
2903 2903 if cond:
2904 2904 fm.plain(sep, label='grep.sep')
2905 2905 field = fieldnamemap.get(name, name)
2906 2906 label = extra_label + ('grep.%s' % name)
2907 2907 fm.condwrite(cond, field, fmt, data, label=label)
2908 2908 if not opts.get('files_with_matches'):
2909 2909 fm.plain(sep, label='grep.sep')
2910 2910 if not opts.get('text') and binary():
2911 2911 fm.plain(_(" Binary file matches"))
2912 2912 else:
2913 2913 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2914 2914 fm.plain(eol)
2915 2915 found = True
2916 2916 if opts.get('files_with_matches'):
2917 2917 break
2918 2918 return found
2919 2919
2920 2920 def displaymatches(fm, l):
2921 2921 p = 0
2922 2922 for s, e in l.findpos():
2923 2923 if p < s:
2924 2924 fm.startitem()
2925 2925 fm.write('text', '%s', l.line[p:s])
2926 2926 fm.data(matched=False)
2927 2927 fm.startitem()
2928 2928 fm.write('text', '%s', l.line[s:e], label='grep.match')
2929 2929 fm.data(matched=True)
2930 2930 p = e
2931 2931 if p < len(l.line):
2932 2932 fm.startitem()
2933 2933 fm.write('text', '%s', l.line[p:])
2934 2934 fm.data(matched=False)
2935 2935 fm.end()
2936 2936
2937 2937 skip = set()
2938 2938 revfiles = {}
2939 2939 match = scmutil.match(repo[None], pats, opts)
2940 2940 found = False
2941 2941 follow = opts.get('follow')
2942 2942
2943 2943 getrenamed = scmutil.getrenamedfn(repo)
2944 2944 def prep(ctx, fns):
2945 2945 rev = ctx.rev()
2946 2946 pctx = ctx.p1()
2947 2947 parent = pctx.rev()
2948 2948 matches.setdefault(rev, {})
2949 2949 matches.setdefault(parent, {})
2950 2950 files = revfiles.setdefault(rev, [])
2951 2951 for fn in fns:
2952 2952 flog = getfile(fn)
2953 2953 try:
2954 2954 fnode = ctx.filenode(fn)
2955 2955 except error.LookupError:
2956 2956 continue
2957 2957
2958 2958 copy = None
2959 2959 if follow:
2960 2960 copy = getrenamed(fn, rev)
2961 2961 if copy:
2962 2962 copies.setdefault(rev, {})[fn] = copy
2963 2963 if fn in skip:
2964 2964 skip.add(copy)
2965 2965 if fn in skip:
2966 2966 continue
2967 2967 files.append(fn)
2968 2968
2969 2969 if fn not in matches[rev]:
2970 2970 try:
2971 2971 content = flog.read(fnode)
2972 2972 except error.WdirUnsupported:
2973 2973 content = ctx[fn].data()
2974 2974 grepbody(fn, rev, content)
2975 2975
2976 2976 pfn = copy or fn
2977 2977 if pfn not in matches[parent]:
2978 2978 try:
2979 2979 fnode = pctx.filenode(pfn)
2980 2980 grepbody(pfn, parent, flog.read(fnode))
2981 2981 except error.LookupError:
2982 2982 pass
2983 2983
2984 2984 ui.pager('grep')
2985 2985 fm = ui.formatter('grep', opts)
2986 2986 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
2987 2987 rev = ctx.rev()
2988 2988 parent = ctx.p1().rev()
2989 2989 for fn in sorted(revfiles.get(rev, [])):
2990 2990 states = matches[rev][fn]
2991 2991 copy = copies.get(rev, {}).get(fn)
2992 2992 if fn in skip:
2993 2993 if copy:
2994 2994 skip.add(copy)
2995 2995 continue
2996 2996 pstates = matches.get(parent, {}).get(copy or fn, [])
2997 2997 if pstates or states:
2998 2998 r = display(fm, fn, ctx, pstates, states)
2999 2999 found = found or r
3000 3000 if r and not diff and not all_files:
3001 3001 skip.add(fn)
3002 3002 if copy:
3003 3003 skip.add(copy)
3004 3004 del revfiles[rev]
3005 3005 # We will keep the matches dict for the duration of the window
3006 3006 # clear the matches dict once the window is over
3007 3007 if not revfiles:
3008 3008 matches.clear()
3009 3009 fm.end()
3010 3010
3011 3011 return not found
3012 3012
3013 3013 @command('heads',
3014 3014 [('r', 'rev', '',
3015 3015 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3016 3016 ('t', 'topo', False, _('show topological heads only')),
3017 3017 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3018 3018 ('c', 'closed', False, _('show normal and closed branch heads')),
3019 3019 ] + templateopts,
3020 3020 _('[-ct] [-r STARTREV] [REV]...'),
3021 3021 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3022 3022 intents={INTENT_READONLY})
3023 3023 def heads(ui, repo, *branchrevs, **opts):
3024 3024 """show branch heads
3025 3025
3026 3026 With no arguments, show all open branch heads in the repository.
3027 3027 Branch heads are changesets that have no descendants on the
3028 3028 same branch. They are where development generally takes place and
3029 3029 are the usual targets for update and merge operations.
3030 3030
3031 3031 If one or more REVs are given, only open branch heads on the
3032 3032 branches associated with the specified changesets are shown. This
3033 3033 means that you can use :hg:`heads .` to see the heads on the
3034 3034 currently checked-out branch.
3035 3035
3036 3036 If -c/--closed is specified, also show branch heads marked closed
3037 3037 (see :hg:`commit --close-branch`).
3038 3038
3039 3039 If STARTREV is specified, only those heads that are descendants of
3040 3040 STARTREV will be displayed.
3041 3041
3042 3042 If -t/--topo is specified, named branch mechanics will be ignored and only
3043 3043 topological heads (changesets with no children) will be shown.
3044 3044
3045 3045 Returns 0 if matching heads are found, 1 if not.
3046 3046 """
3047 3047
3048 3048 opts = pycompat.byteskwargs(opts)
3049 3049 start = None
3050 3050 rev = opts.get('rev')
3051 3051 if rev:
3052 3052 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3053 3053 start = scmutil.revsingle(repo, rev, None).node()
3054 3054
3055 3055 if opts.get('topo'):
3056 3056 heads = [repo[h] for h in repo.heads(start)]
3057 3057 else:
3058 3058 heads = []
3059 3059 for branch in repo.branchmap():
3060 3060 heads += repo.branchheads(branch, start, opts.get('closed'))
3061 3061 heads = [repo[h] for h in heads]
3062 3062
3063 3063 if branchrevs:
3064 3064 branches = set(repo[r].branch()
3065 3065 for r in scmutil.revrange(repo, branchrevs))
3066 3066 heads = [h for h in heads if h.branch() in branches]
3067 3067
3068 3068 if opts.get('active') and branchrevs:
3069 3069 dagheads = repo.heads(start)
3070 3070 heads = [h for h in heads if h.node() in dagheads]
3071 3071
3072 3072 if branchrevs:
3073 3073 haveheads = set(h.branch() for h in heads)
3074 3074 if branches - haveheads:
3075 3075 headless = ', '.join(b for b in branches - haveheads)
3076 3076 msg = _('no open branch heads found on branches %s')
3077 3077 if opts.get('rev'):
3078 3078 msg += _(' (started at %s)') % opts['rev']
3079 3079 ui.warn((msg + '\n') % headless)
3080 3080
3081 3081 if not heads:
3082 3082 return 1
3083 3083
3084 3084 ui.pager('heads')
3085 3085 heads = sorted(heads, key=lambda x: -x.rev())
3086 3086 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3087 3087 for ctx in heads:
3088 3088 displayer.show(ctx)
3089 3089 displayer.close()
3090 3090
3091 3091 @command('help',
3092 3092 [('e', 'extension', None, _('show only help for extensions')),
3093 3093 ('c', 'command', None, _('show only help for commands')),
3094 3094 ('k', 'keyword', None, _('show topics matching keyword')),
3095 3095 ('s', 'system', [],
3096 3096 _('show help for specific platform(s)'), _('PLATFORM')),
3097 3097 ],
3098 3098 _('[-eck] [-s PLATFORM] [TOPIC]'),
3099 3099 helpcategory=command.CATEGORY_HELP,
3100 3100 norepo=True,
3101 3101 intents={INTENT_READONLY})
3102 3102 def help_(ui, name=None, **opts):
3103 3103 """show help for a given topic or a help overview
3104 3104
3105 3105 With no arguments, print a list of commands with short help messages.
3106 3106
3107 3107 Given a topic, extension, or command name, print help for that
3108 3108 topic.
3109 3109
3110 3110 Returns 0 if successful.
3111 3111 """
3112 3112
3113 3113 keep = opts.get(r'system') or []
3114 3114 if len(keep) == 0:
3115 3115 if pycompat.sysplatform.startswith('win'):
3116 3116 keep.append('windows')
3117 3117 elif pycompat.sysplatform == 'OpenVMS':
3118 3118 keep.append('vms')
3119 3119 elif pycompat.sysplatform == 'plan9':
3120 3120 keep.append('plan9')
3121 3121 else:
3122 3122 keep.append('unix')
3123 3123 keep.append(pycompat.sysplatform.lower())
3124 3124 if ui.verbose:
3125 3125 keep.append('verbose')
3126 3126
3127 3127 commands = sys.modules[__name__]
3128 3128 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3129 3129 ui.pager('help')
3130 3130 ui.write(formatted)
3131 3131
3132 3132
3133 3133 @command('identify|id',
3134 3134 [('r', 'rev', '',
3135 3135 _('identify the specified revision'), _('REV')),
3136 3136 ('n', 'num', None, _('show local revision number')),
3137 3137 ('i', 'id', None, _('show global revision id')),
3138 3138 ('b', 'branch', None, _('show branch')),
3139 3139 ('t', 'tags', None, _('show tags')),
3140 3140 ('B', 'bookmarks', None, _('show bookmarks')),
3141 3141 ] + remoteopts + formatteropts,
3142 3142 _('[-nibtB] [-r REV] [SOURCE]'),
3143 3143 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3144 3144 optionalrepo=True,
3145 3145 intents={INTENT_READONLY})
3146 3146 def identify(ui, repo, source=None, rev=None,
3147 3147 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3148 3148 """identify the working directory or specified revision
3149 3149
3150 3150 Print a summary identifying the repository state at REV using one or
3151 3151 two parent hash identifiers, followed by a "+" if the working
3152 3152 directory has uncommitted changes, the branch name (if not default),
3153 3153 a list of tags, and a list of bookmarks.
3154 3154
3155 3155 When REV is not given, print a summary of the current state of the
3156 3156 repository including the working directory. Specify -r. to get information
3157 3157 of the working directory parent without scanning uncommitted changes.
3158 3158
3159 3159 Specifying a path to a repository root or Mercurial bundle will
3160 3160 cause lookup to operate on that repository/bundle.
3161 3161
3162 3162 .. container:: verbose
3163 3163
3164 3164 Template:
3165 3165
3166 3166 The following keywords are supported in addition to the common template
3167 3167 keywords and functions. See also :hg:`help templates`.
3168 3168
3169 3169 :dirty: String. Character ``+`` denoting if the working directory has
3170 3170 uncommitted changes.
3171 3171 :id: String. One or two nodes, optionally followed by ``+``.
3172 3172 :parents: List of strings. Parent nodes of the changeset.
3173 3173
3174 3174 Examples:
3175 3175
3176 3176 - generate a build identifier for the working directory::
3177 3177
3178 3178 hg id --id > build-id.dat
3179 3179
3180 3180 - find the revision corresponding to a tag::
3181 3181
3182 3182 hg id -n -r 1.3
3183 3183
3184 3184 - check the most recent revision of a remote repository::
3185 3185
3186 3186 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3187 3187
3188 3188 See :hg:`log` for generating more information about specific revisions,
3189 3189 including full hash identifiers.
3190 3190
3191 3191 Returns 0 if successful.
3192 3192 """
3193 3193
3194 3194 opts = pycompat.byteskwargs(opts)
3195 3195 if not repo and not source:
3196 3196 raise error.Abort(_("there is no Mercurial repository here "
3197 3197 "(.hg not found)"))
3198 3198
3199 3199 default = not (num or id or branch or tags or bookmarks)
3200 3200 output = []
3201 3201 revs = []
3202 3202
3203 3203 if source:
3204 3204 source, branches = hg.parseurl(ui.expandpath(source))
3205 3205 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3206 3206 repo = peer.local()
3207 3207 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3208 3208
3209 3209 fm = ui.formatter('identify', opts)
3210 3210 fm.startitem()
3211 3211
3212 3212 if not repo:
3213 3213 if num or branch or tags:
3214 3214 raise error.Abort(
3215 3215 _("can't query remote revision number, branch, or tags"))
3216 3216 if not rev and revs:
3217 3217 rev = revs[0]
3218 3218 if not rev:
3219 3219 rev = "tip"
3220 3220
3221 3221 remoterev = peer.lookup(rev)
3222 3222 hexrev = fm.hexfunc(remoterev)
3223 3223 if default or id:
3224 3224 output = [hexrev]
3225 3225 fm.data(id=hexrev)
3226 3226
3227 3227 @util.cachefunc
3228 3228 def getbms():
3229 3229 bms = []
3230 3230
3231 3231 if 'bookmarks' in peer.listkeys('namespaces'):
3232 3232 hexremoterev = hex(remoterev)
3233 3233 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3234 3234 if bmr == hexremoterev]
3235 3235
3236 3236 return sorted(bms)
3237 3237
3238 3238 if fm.isplain():
3239 3239 if bookmarks:
3240 3240 output.extend(getbms())
3241 3241 elif default and not ui.quiet:
3242 3242 # multiple bookmarks for a single parent separated by '/'
3243 3243 bm = '/'.join(getbms())
3244 3244 if bm:
3245 3245 output.append(bm)
3246 3246 else:
3247 3247 fm.data(node=hex(remoterev))
3248 3248 if bookmarks or 'bookmarks' in fm.datahint():
3249 3249 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
3250 3250 else:
3251 3251 if rev:
3252 3252 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3253 3253 ctx = scmutil.revsingle(repo, rev, None)
3254 3254
3255 3255 if ctx.rev() is None:
3256 3256 ctx = repo[None]
3257 3257 parents = ctx.parents()
3258 3258 taglist = []
3259 3259 for p in parents:
3260 3260 taglist.extend(p.tags())
3261 3261
3262 3262 dirty = ""
3263 3263 if ctx.dirty(missing=True, merge=False, branch=False):
3264 3264 dirty = '+'
3265 3265 fm.data(dirty=dirty)
3266 3266
3267 3267 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3268 3268 if default or id:
3269 3269 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3270 3270 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3271 3271
3272 3272 if num:
3273 3273 numoutput = ["%d" % p.rev() for p in parents]
3274 3274 output.append("%s%s" % ('+'.join(numoutput), dirty))
3275 3275
3276 3276 fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
3277 3277 for p in parents], name='node'))
3278 3278 else:
3279 3279 hexoutput = fm.hexfunc(ctx.node())
3280 3280 if default or id:
3281 3281 output = [hexoutput]
3282 3282 fm.data(id=hexoutput)
3283 3283
3284 3284 if num:
3285 3285 output.append(pycompat.bytestr(ctx.rev()))
3286 3286 taglist = ctx.tags()
3287 3287
3288 3288 if default and not ui.quiet:
3289 3289 b = ctx.branch()
3290 3290 if b != 'default':
3291 3291 output.append("(%s)" % b)
3292 3292
3293 3293 # multiple tags for a single parent separated by '/'
3294 3294 t = '/'.join(taglist)
3295 3295 if t:
3296 3296 output.append(t)
3297 3297
3298 3298 # multiple bookmarks for a single parent separated by '/'
3299 3299 bm = '/'.join(ctx.bookmarks())
3300 3300 if bm:
3301 3301 output.append(bm)
3302 3302 else:
3303 3303 if branch:
3304 3304 output.append(ctx.branch())
3305 3305
3306 3306 if tags:
3307 3307 output.extend(taglist)
3308 3308
3309 3309 if bookmarks:
3310 3310 output.extend(ctx.bookmarks())
3311 3311
3312 3312 fm.data(node=ctx.hex())
3313 3313 fm.data(branch=ctx.branch())
3314 3314 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3315 3315 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3316 3316 fm.context(ctx=ctx)
3317 3317
3318 3318 fm.plain("%s\n" % ' '.join(output))
3319 3319 fm.end()
3320 3320
3321 3321 @command('import|patch',
3322 3322 [('p', 'strip', 1,
3323 3323 _('directory strip option for patch. This has the same '
3324 3324 'meaning as the corresponding patch option'), _('NUM')),
3325 3325 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3326 3326 ('e', 'edit', False, _('invoke editor on commit messages')),
3327 3327 ('f', 'force', None,
3328 3328 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3329 3329 ('', 'no-commit', None,
3330 3330 _("don't commit, just update the working directory")),
3331 3331 ('', 'bypass', None,
3332 3332 _("apply patch without touching the working directory")),
3333 3333 ('', 'partial', None,
3334 3334 _('commit even if some hunks fail')),
3335 3335 ('', 'exact', None,
3336 3336 _('abort if patch would apply lossily')),
3337 3337 ('', 'prefix', '',
3338 3338 _('apply patch to subdirectory'), _('DIR')),
3339 3339 ('', 'import-branch', None,
3340 3340 _('use any branch information in patch (implied by --exact)'))] +
3341 3341 commitopts + commitopts2 + similarityopts,
3342 3342 _('[OPTION]... PATCH...'),
3343 3343 helpcategory=command.CATEGORY_IMPORT_EXPORT)
3344 3344 def import_(ui, repo, patch1=None, *patches, **opts):
3345 3345 """import an ordered set of patches
3346 3346
3347 3347 Import a list of patches and commit them individually (unless
3348 3348 --no-commit is specified).
3349 3349
3350 3350 To read a patch from standard input (stdin), use "-" as the patch
3351 3351 name. If a URL is specified, the patch will be downloaded from
3352 3352 there.
3353 3353
3354 3354 Import first applies changes to the working directory (unless
3355 3355 --bypass is specified), import will abort if there are outstanding
3356 3356 changes.
3357 3357
3358 3358 Use --bypass to apply and commit patches directly to the
3359 3359 repository, without affecting the working directory. Without
3360 3360 --exact, patches will be applied on top of the working directory
3361 3361 parent revision.
3362 3362
3363 3363 You can import a patch straight from a mail message. Even patches
3364 3364 as attachments work (to use the body part, it must have type
3365 3365 text/plain or text/x-patch). From and Subject headers of email
3366 3366 message are used as default committer and commit message. All
3367 3367 text/plain body parts before first diff are added to the commit
3368 3368 message.
3369 3369
3370 3370 If the imported patch was generated by :hg:`export`, user and
3371 3371 description from patch override values from message headers and
3372 3372 body. Values given on command line with -m/--message and -u/--user
3373 3373 override these.
3374 3374
3375 3375 If --exact is specified, import will set the working directory to
3376 3376 the parent of each patch before applying it, and will abort if the
3377 3377 resulting changeset has a different ID than the one recorded in
3378 3378 the patch. This will guard against various ways that portable
3379 3379 patch formats and mail systems might fail to transfer Mercurial
3380 3380 data or metadata. See :hg:`bundle` for lossless transmission.
3381 3381
3382 3382 Use --partial to ensure a changeset will be created from the patch
3383 3383 even if some hunks fail to apply. Hunks that fail to apply will be
3384 3384 written to a <target-file>.rej file. Conflicts can then be resolved
3385 3385 by hand before :hg:`commit --amend` is run to update the created
3386 3386 changeset. This flag exists to let people import patches that
3387 3387 partially apply without losing the associated metadata (author,
3388 3388 date, description, ...).
3389 3389
3390 3390 .. note::
3391 3391
3392 3392 When no hunks apply cleanly, :hg:`import --partial` will create
3393 3393 an empty changeset, importing only the patch metadata.
3394 3394
3395 3395 With -s/--similarity, hg will attempt to discover renames and
3396 3396 copies in the patch in the same way as :hg:`addremove`.
3397 3397
3398 3398 It is possible to use external patch programs to perform the patch
3399 3399 by setting the ``ui.patch`` configuration option. For the default
3400 3400 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3401 3401 See :hg:`help config` for more information about configuration
3402 3402 files and how to use these options.
3403 3403
3404 3404 See :hg:`help dates` for a list of formats valid for -d/--date.
3405 3405
3406 3406 .. container:: verbose
3407 3407
3408 3408 Examples:
3409 3409
3410 3410 - import a traditional patch from a website and detect renames::
3411 3411
3412 3412 hg import -s 80 http://example.com/bugfix.patch
3413 3413
3414 3414 - import a changeset from an hgweb server::
3415 3415
3416 3416 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3417 3417
3418 3418 - import all the patches in an Unix-style mbox::
3419 3419
3420 3420 hg import incoming-patches.mbox
3421 3421
3422 3422 - import patches from stdin::
3423 3423
3424 3424 hg import -
3425 3425
3426 3426 - attempt to exactly restore an exported changeset (not always
3427 3427 possible)::
3428 3428
3429 3429 hg import --exact proposed-fix.patch
3430 3430
3431 3431 - use an external tool to apply a patch which is too fuzzy for
3432 3432 the default internal tool.
3433 3433
3434 3434 hg import --config ui.patch="patch --merge" fuzzy.patch
3435 3435
3436 3436 - change the default fuzzing from 2 to a less strict 7
3437 3437
3438 3438 hg import --config ui.fuzz=7 fuzz.patch
3439 3439
3440 3440 Returns 0 on success, 1 on partial success (see --partial).
3441 3441 """
3442 3442
3443 3443 opts = pycompat.byteskwargs(opts)
3444 3444 if not patch1:
3445 3445 raise error.Abort(_('need at least one patch to import'))
3446 3446
3447 3447 patches = (patch1,) + patches
3448 3448
3449 3449 date = opts.get('date')
3450 3450 if date:
3451 3451 opts['date'] = dateutil.parsedate(date)
3452 3452
3453 3453 exact = opts.get('exact')
3454 3454 update = not opts.get('bypass')
3455 3455 if not update and opts.get('no_commit'):
3456 3456 raise error.Abort(_('cannot use --no-commit with --bypass'))
3457 3457 try:
3458 3458 sim = float(opts.get('similarity') or 0)
3459 3459 except ValueError:
3460 3460 raise error.Abort(_('similarity must be a number'))
3461 3461 if sim < 0 or sim > 100:
3462 3462 raise error.Abort(_('similarity must be between 0 and 100'))
3463 3463 if sim and not update:
3464 3464 raise error.Abort(_('cannot use --similarity with --bypass'))
3465 3465 if exact:
3466 3466 if opts.get('edit'):
3467 3467 raise error.Abort(_('cannot use --exact with --edit'))
3468 3468 if opts.get('prefix'):
3469 3469 raise error.Abort(_('cannot use --exact with --prefix'))
3470 3470
3471 3471 base = opts["base"]
3472 3472 msgs = []
3473 3473 ret = 0
3474 3474
3475 3475 with repo.wlock():
3476 3476 if update:
3477 3477 cmdutil.checkunfinished(repo)
3478 3478 if (exact or not opts.get('force')):
3479 3479 cmdutil.bailifchanged(repo)
3480 3480
3481 3481 if not opts.get('no_commit'):
3482 3482 lock = repo.lock
3483 3483 tr = lambda: repo.transaction('import')
3484 3484 dsguard = util.nullcontextmanager
3485 3485 else:
3486 3486 lock = util.nullcontextmanager
3487 3487 tr = util.nullcontextmanager
3488 3488 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3489 3489 with lock(), tr(), dsguard():
3490 3490 parents = repo[None].parents()
3491 3491 for patchurl in patches:
3492 3492 if patchurl == '-':
3493 3493 ui.status(_('applying patch from stdin\n'))
3494 3494 patchfile = ui.fin
3495 3495 patchurl = 'stdin' # for error message
3496 3496 else:
3497 3497 patchurl = os.path.join(base, patchurl)
3498 3498 ui.status(_('applying %s\n') % patchurl)
3499 3499 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
3500 3500
3501 3501 haspatch = False
3502 3502 for hunk in patch.split(patchfile):
3503 3503 with patch.extract(ui, hunk) as patchdata:
3504 3504 msg, node, rej = cmdutil.tryimportone(ui, repo,
3505 3505 patchdata,
3506 3506 parents, opts,
3507 3507 msgs, hg.clean)
3508 3508 if msg:
3509 3509 haspatch = True
3510 3510 ui.note(msg + '\n')
3511 3511 if update or exact:
3512 3512 parents = repo[None].parents()
3513 3513 else:
3514 3514 parents = [repo[node]]
3515 3515 if rej:
3516 3516 ui.write_err(_("patch applied partially\n"))
3517 3517 ui.write_err(_("(fix the .rej files and run "
3518 3518 "`hg commit --amend`)\n"))
3519 3519 ret = 1
3520 3520 break
3521 3521
3522 3522 if not haspatch:
3523 3523 raise error.Abort(_('%s: no diffs found') % patchurl)
3524 3524
3525 3525 if msgs:
3526 3526 repo.savecommitmessage('\n* * *\n'.join(msgs))
3527 3527 return ret
3528 3528
3529 3529 @command('incoming|in',
3530 3530 [('f', 'force', None,
3531 3531 _('run even if remote repository is unrelated')),
3532 3532 ('n', 'newest-first', None, _('show newest record first')),
3533 3533 ('', 'bundle', '',
3534 3534 _('file to store the bundles into'), _('FILE')),
3535 3535 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3536 3536 ('B', 'bookmarks', False, _("compare bookmarks")),
3537 3537 ('b', 'branch', [],
3538 3538 _('a specific branch you would like to pull'), _('BRANCH')),
3539 3539 ] + logopts + remoteopts + subrepoopts,
3540 3540 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
3541 3541 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
3542 3542 def incoming(ui, repo, source="default", **opts):
3543 3543 """show new changesets found in source
3544 3544
3545 3545 Show new changesets found in the specified path/URL or the default
3546 3546 pull location. These are the changesets that would have been pulled
3547 3547 by :hg:`pull` at the time you issued this command.
3548 3548
3549 3549 See pull for valid source format details.
3550 3550
3551 3551 .. container:: verbose
3552 3552
3553 3553 With -B/--bookmarks, the result of bookmark comparison between
3554 3554 local and remote repositories is displayed. With -v/--verbose,
3555 3555 status is also displayed for each bookmark like below::
3556 3556
3557 3557 BM1 01234567890a added
3558 3558 BM2 1234567890ab advanced
3559 3559 BM3 234567890abc diverged
3560 3560 BM4 34567890abcd changed
3561 3561
3562 3562 The action taken locally when pulling depends on the
3563 3563 status of each bookmark:
3564 3564
3565 3565 :``added``: pull will create it
3566 3566 :``advanced``: pull will update it
3567 3567 :``diverged``: pull will create a divergent bookmark
3568 3568 :``changed``: result depends on remote changesets
3569 3569
3570 3570 From the point of view of pulling behavior, bookmark
3571 3571 existing only in the remote repository are treated as ``added``,
3572 3572 even if it is in fact locally deleted.
3573 3573
3574 3574 .. container:: verbose
3575 3575
3576 3576 For remote repository, using --bundle avoids downloading the
3577 3577 changesets twice if the incoming is followed by a pull.
3578 3578
3579 3579 Examples:
3580 3580
3581 3581 - show incoming changes with patches and full description::
3582 3582
3583 3583 hg incoming -vp
3584 3584
3585 3585 - show incoming changes excluding merges, store a bundle::
3586 3586
3587 3587 hg in -vpM --bundle incoming.hg
3588 3588 hg pull incoming.hg
3589 3589
3590 3590 - briefly list changes inside a bundle::
3591 3591
3592 3592 hg in changes.hg -T "{desc|firstline}\\n"
3593 3593
3594 3594 Returns 0 if there are incoming changes, 1 otherwise.
3595 3595 """
3596 3596 opts = pycompat.byteskwargs(opts)
3597 3597 if opts.get('graph'):
3598 3598 logcmdutil.checkunsupportedgraphflags([], opts)
3599 3599 def display(other, chlist, displayer):
3600 3600 revdag = logcmdutil.graphrevs(other, chlist, opts)
3601 3601 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3602 3602 graphmod.asciiedges)
3603 3603
3604 3604 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3605 3605 return 0
3606 3606
3607 3607 if opts.get('bundle') and opts.get('subrepos'):
3608 3608 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3609 3609
3610 3610 if opts.get('bookmarks'):
3611 3611 source, branches = hg.parseurl(ui.expandpath(source),
3612 3612 opts.get('branch'))
3613 3613 other = hg.peer(repo, opts, source)
3614 3614 if 'bookmarks' not in other.listkeys('namespaces'):
3615 3615 ui.warn(_("remote doesn't support bookmarks\n"))
3616 3616 return 0
3617 3617 ui.pager('incoming')
3618 3618 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3619 3619 return bookmarks.incoming(ui, repo, other)
3620 3620
3621 3621 repo._subtoppath = ui.expandpath(source)
3622 3622 try:
3623 3623 return hg.incoming(ui, repo, source, opts)
3624 3624 finally:
3625 3625 del repo._subtoppath
3626 3626
3627 3627
3628 3628 @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3629 3629 helpcategory=command.CATEGORY_REPO_CREATION,
3630 3630 helpbasic=True, norepo=True)
3631 3631 def init(ui, dest=".", **opts):
3632 3632 """create a new repository in the given directory
3633 3633
3634 3634 Initialize a new repository in the given directory. If the given
3635 3635 directory does not exist, it will be created.
3636 3636
3637 3637 If no directory is given, the current directory is used.
3638 3638
3639 3639 It is possible to specify an ``ssh://`` URL as the destination.
3640 3640 See :hg:`help urls` for more information.
3641 3641
3642 3642 Returns 0 on success.
3643 3643 """
3644 3644 opts = pycompat.byteskwargs(opts)
3645 3645 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3646 3646
3647 3647 @command('locate',
3648 3648 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3649 3649 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3650 3650 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3651 3651 ] + walkopts,
3652 3652 _('[OPTION]... [PATTERN]...'),
3653 3653 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
3654 3654 def locate(ui, repo, *pats, **opts):
3655 3655 """locate files matching specific patterns (DEPRECATED)
3656 3656
3657 3657 Print files under Mercurial control in the working directory whose
3658 3658 names match the given patterns.
3659 3659
3660 3660 By default, this command searches all directories in the working
3661 3661 directory. To search just the current directory and its
3662 3662 subdirectories, use "--include .".
3663 3663
3664 3664 If no patterns are given to match, this command prints the names
3665 3665 of all files under Mercurial control in the working directory.
3666 3666
3667 3667 If you want to feed the output of this command into the "xargs"
3668 3668 command, use the -0 option to both this command and "xargs". This
3669 3669 will avoid the problem of "xargs" treating single filenames that
3670 3670 contain whitespace as multiple filenames.
3671 3671
3672 3672 See :hg:`help files` for a more versatile command.
3673 3673
3674 3674 Returns 0 if a match is found, 1 otherwise.
3675 3675 """
3676 3676 opts = pycompat.byteskwargs(opts)
3677 3677 if opts.get('print0'):
3678 3678 end = '\0'
3679 3679 else:
3680 3680 end = '\n'
3681 3681 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3682 3682
3683 3683 ret = 1
3684 3684 m = scmutil.match(ctx, pats, opts, default='relglob',
3685 3685 badfn=lambda x, y: False)
3686 3686
3687 3687 ui.pager('locate')
3688 3688 if ctx.rev() is None:
3689 3689 # When run on the working copy, "locate" includes removed files, so
3690 3690 # we get the list of files from the dirstate.
3691 3691 filesgen = sorted(repo.dirstate.matches(m))
3692 3692 else:
3693 3693 filesgen = ctx.matches(m)
3694 3694 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
3695 3695 for abs in filesgen:
3696 3696 if opts.get('fullpath'):
3697 3697 ui.write(repo.wjoin(abs), end)
3698 3698 else:
3699 3699 ui.write(uipathfn(abs), end)
3700 3700 ret = 0
3701 3701
3702 3702 return ret
3703 3703
3704 3704 @command('log|history',
3705 3705 [('f', 'follow', None,
3706 3706 _('follow changeset history, or file history across copies and renames')),
3707 3707 ('', 'follow-first', None,
3708 3708 _('only follow the first parent of merge changesets (DEPRECATED)')),
3709 3709 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3710 3710 ('C', 'copies', None, _('show copied files')),
3711 3711 ('k', 'keyword', [],
3712 3712 _('do case-insensitive search for a given text'), _('TEXT')),
3713 3713 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3714 3714 ('L', 'line-range', [],
3715 3715 _('follow line range of specified file (EXPERIMENTAL)'),
3716 3716 _('FILE,RANGE')),
3717 3717 ('', 'removed', None, _('include revisions where files were removed')),
3718 3718 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3719 3719 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3720 3720 ('', 'only-branch', [],
3721 3721 _('show only changesets within the given named branch (DEPRECATED)'),
3722 3722 _('BRANCH')),
3723 3723 ('b', 'branch', [],
3724 3724 _('show changesets within the given named branch'), _('BRANCH')),
3725 3725 ('P', 'prune', [],
3726 3726 _('do not display revision or any of its ancestors'), _('REV')),
3727 3727 ] + logopts + walkopts,
3728 3728 _('[OPTION]... [FILE]'),
3729 3729 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3730 3730 helpbasic=True, inferrepo=True,
3731 3731 intents={INTENT_READONLY})
3732 3732 def log(ui, repo, *pats, **opts):
3733 3733 """show revision history of entire repository or files
3734 3734
3735 3735 Print the revision history of the specified files or the entire
3736 3736 project.
3737 3737
3738 3738 If no revision range is specified, the default is ``tip:0`` unless
3739 3739 --follow is set, in which case the working directory parent is
3740 3740 used as the starting revision.
3741 3741
3742 3742 File history is shown without following rename or copy history of
3743 3743 files. Use -f/--follow with a filename to follow history across
3744 3744 renames and copies. --follow without a filename will only show
3745 3745 ancestors of the starting revision.
3746 3746
3747 3747 By default this command prints revision number and changeset id,
3748 3748 tags, non-trivial parents, user, date and time, and a summary for
3749 3749 each commit. When the -v/--verbose switch is used, the list of
3750 3750 changed files and full commit message are shown.
3751 3751
3752 3752 With --graph the revisions are shown as an ASCII art DAG with the most
3753 3753 recent changeset at the top.
3754 3754 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3755 3755 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3756 3756 changeset from the lines below is a parent of the 'o' merge on the same
3757 3757 line.
3758 3758 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3759 3759 of a '|' indicates one or more revisions in a path are omitted.
3760 3760
3761 3761 .. container:: verbose
3762 3762
3763 3763 Use -L/--line-range FILE,M:N options to follow the history of lines
3764 3764 from M to N in FILE. With -p/--patch only diff hunks affecting
3765 3765 specified line range will be shown. This option requires --follow;
3766 3766 it can be specified multiple times. Currently, this option is not
3767 3767 compatible with --graph. This option is experimental.
3768 3768
3769 3769 .. note::
3770 3770
3771 3771 :hg:`log --patch` may generate unexpected diff output for merge
3772 3772 changesets, as it will only compare the merge changeset against
3773 3773 its first parent. Also, only files different from BOTH parents
3774 3774 will appear in files:.
3775 3775
3776 3776 .. note::
3777 3777
3778 3778 For performance reasons, :hg:`log FILE` may omit duplicate changes
3779 3779 made on branches and will not show removals or mode changes. To
3780 3780 see all such changes, use the --removed switch.
3781 3781
3782 3782 .. container:: verbose
3783 3783
3784 3784 .. note::
3785 3785
3786 3786 The history resulting from -L/--line-range options depends on diff
3787 3787 options; for instance if white-spaces are ignored, respective changes
3788 3788 with only white-spaces in specified line range will not be listed.
3789 3789
3790 3790 .. container:: verbose
3791 3791
3792 3792 Some examples:
3793 3793
3794 3794 - changesets with full descriptions and file lists::
3795 3795
3796 3796 hg log -v
3797 3797
3798 3798 - changesets ancestral to the working directory::
3799 3799
3800 3800 hg log -f
3801 3801
3802 3802 - last 10 commits on the current branch::
3803 3803
3804 3804 hg log -l 10 -b .
3805 3805
3806 3806 - changesets showing all modifications of a file, including removals::
3807 3807
3808 3808 hg log --removed file.c
3809 3809
3810 3810 - all changesets that touch a directory, with diffs, excluding merges::
3811 3811
3812 3812 hg log -Mp lib/
3813 3813
3814 3814 - all revision numbers that match a keyword::
3815 3815
3816 3816 hg log -k bug --template "{rev}\\n"
3817 3817
3818 3818 - the full hash identifier of the working directory parent::
3819 3819
3820 3820 hg log -r . --template "{node}\\n"
3821 3821
3822 3822 - list available log templates::
3823 3823
3824 3824 hg log -T list
3825 3825
3826 3826 - check if a given changeset is included in a tagged release::
3827 3827
3828 3828 hg log -r "a21ccf and ancestor(1.9)"
3829 3829
3830 3830 - find all changesets by some user in a date range::
3831 3831
3832 3832 hg log -k alice -d "may 2008 to jul 2008"
3833 3833
3834 3834 - summary of all changesets after the last tag::
3835 3835
3836 3836 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3837 3837
3838 3838 - changesets touching lines 13 to 23 for file.c::
3839 3839
3840 3840 hg log -L file.c,13:23
3841 3841
3842 3842 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3843 3843 main.c with patch::
3844 3844
3845 3845 hg log -L file.c,13:23 -L main.c,2:6 -p
3846 3846
3847 3847 See :hg:`help dates` for a list of formats valid for -d/--date.
3848 3848
3849 3849 See :hg:`help revisions` for more about specifying and ordering
3850 3850 revisions.
3851 3851
3852 3852 See :hg:`help templates` for more about pre-packaged styles and
3853 3853 specifying custom templates. The default template used by the log
3854 3854 command can be customized via the ``ui.logtemplate`` configuration
3855 3855 setting.
3856 3856
3857 3857 Returns 0 on success.
3858 3858
3859 3859 """
3860 3860 opts = pycompat.byteskwargs(opts)
3861 3861 linerange = opts.get('line_range')
3862 3862
3863 3863 if linerange and not opts.get('follow'):
3864 3864 raise error.Abort(_('--line-range requires --follow'))
3865 3865
3866 3866 if linerange and pats:
3867 3867 # TODO: take pats as patterns with no line-range filter
3868 3868 raise error.Abort(
3869 3869 _('FILE arguments are not compatible with --line-range option')
3870 3870 )
3871 3871
3872 3872 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3873 3873 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3874 3874 if linerange:
3875 3875 # TODO: should follow file history from logcmdutil._initialrevs(),
3876 3876 # then filter the result by logcmdutil._makerevset() and --limit
3877 3877 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3878 3878
3879 3879 getrenamed = None
3880 3880 if opts.get('copies'):
3881 3881 endrev = None
3882 3882 if revs:
3883 3883 endrev = revs.max() + 1
3884 3884 getrenamed = scmutil.getrenamedfn(repo, endrev=endrev)
3885 3885
3886 3886 ui.pager('log')
3887 3887 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3888 3888 buffered=True)
3889 3889 if opts.get('graph'):
3890 3890 displayfn = logcmdutil.displaygraphrevs
3891 3891 else:
3892 3892 displayfn = logcmdutil.displayrevs
3893 3893 displayfn(ui, repo, revs, displayer, getrenamed)
3894 3894
3895 3895 @command('manifest',
3896 3896 [('r', 'rev', '', _('revision to display'), _('REV')),
3897 3897 ('', 'all', False, _("list files from all revisions"))]
3898 3898 + formatteropts,
3899 3899 _('[-r REV]'),
3900 3900 helpcategory=command.CATEGORY_MAINTENANCE,
3901 3901 intents={INTENT_READONLY})
3902 3902 def manifest(ui, repo, node=None, rev=None, **opts):
3903 3903 """output the current or given revision of the project manifest
3904 3904
3905 3905 Print a list of version controlled files for the given revision.
3906 3906 If no revision is given, the first parent of the working directory
3907 3907 is used, or the null revision if no revision is checked out.
3908 3908
3909 3909 With -v, print file permissions, symlink and executable bits.
3910 3910 With --debug, print file revision hashes.
3911 3911
3912 3912 If option --all is specified, the list of all files from all revisions
3913 3913 is printed. This includes deleted and renamed files.
3914 3914
3915 3915 Returns 0 on success.
3916 3916 """
3917 3917 opts = pycompat.byteskwargs(opts)
3918 3918 fm = ui.formatter('manifest', opts)
3919 3919
3920 3920 if opts.get('all'):
3921 3921 if rev or node:
3922 3922 raise error.Abort(_("can't specify a revision with --all"))
3923 3923
3924 3924 res = set()
3925 3925 for rev in repo:
3926 3926 ctx = repo[rev]
3927 3927 res |= set(ctx.files())
3928 3928
3929 3929 ui.pager('manifest')
3930 3930 for f in sorted(res):
3931 3931 fm.startitem()
3932 3932 fm.write("path", '%s\n', f)
3933 3933 fm.end()
3934 3934 return
3935 3935
3936 3936 if rev and node:
3937 3937 raise error.Abort(_("please specify just one revision"))
3938 3938
3939 3939 if not node:
3940 3940 node = rev
3941 3941
3942 3942 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3943 3943 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3944 3944 if node:
3945 3945 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3946 3946 ctx = scmutil.revsingle(repo, node)
3947 3947 mf = ctx.manifest()
3948 3948 ui.pager('manifest')
3949 3949 for f in ctx:
3950 3950 fm.startitem()
3951 3951 fm.context(ctx=ctx)
3952 3952 fl = ctx[f].flags()
3953 3953 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3954 3954 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3955 3955 fm.write('path', '%s\n', f)
3956 3956 fm.end()
3957 3957
3958 3958 @command('merge',
3959 3959 [('f', 'force', None,
3960 3960 _('force a merge including outstanding changes (DEPRECATED)')),
3961 3961 ('r', 'rev', '', _('revision to merge'), _('REV')),
3962 3962 ('P', 'preview', None,
3963 3963 _('review revisions to merge (no merge is performed)')),
3964 3964 ('', 'abort', None, _('abort the ongoing merge')),
3965 3965 ] + mergetoolopts,
3966 3966 _('[-P] [[-r] REV]'),
3967 3967 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
3968 3968 def merge(ui, repo, node=None, **opts):
3969 3969 """merge another revision into working directory
3970 3970
3971 3971 The current working directory is updated with all changes made in
3972 3972 the requested revision since the last common predecessor revision.
3973 3973
3974 3974 Files that changed between either parent are marked as changed for
3975 3975 the next commit and a commit must be performed before any further
3976 3976 updates to the repository are allowed. The next commit will have
3977 3977 two parents.
3978 3978
3979 3979 ``--tool`` can be used to specify the merge tool used for file
3980 3980 merges. It overrides the HGMERGE environment variable and your
3981 3981 configuration files. See :hg:`help merge-tools` for options.
3982 3982
3983 3983 If no revision is specified, the working directory's parent is a
3984 3984 head revision, and the current branch contains exactly one other
3985 3985 head, the other head is merged with by default. Otherwise, an
3986 3986 explicit revision with which to merge with must be provided.
3987 3987
3988 3988 See :hg:`help resolve` for information on handling file conflicts.
3989 3989
3990 3990 To undo an uncommitted merge, use :hg:`merge --abort` which
3991 3991 will check out a clean copy of the original merge parent, losing
3992 3992 all changes.
3993 3993
3994 3994 Returns 0 on success, 1 if there are unresolved files.
3995 3995 """
3996 3996
3997 3997 opts = pycompat.byteskwargs(opts)
3998 3998 abort = opts.get('abort')
3999 3999 if abort and repo.dirstate.p2() == nullid:
4000 4000 cmdutil.wrongtooltocontinue(repo, _('merge'))
4001 4001 if abort:
4002 4002 if node:
4003 4003 raise error.Abort(_("cannot specify a node with --abort"))
4004 4004 if opts.get('rev'):
4005 4005 raise error.Abort(_("cannot specify both --rev and --abort"))
4006 4006 if opts.get('preview'):
4007 4007 raise error.Abort(_("cannot specify --preview with --abort"))
4008 4008 if opts.get('rev') and node:
4009 4009 raise error.Abort(_("please specify just one revision"))
4010 4010 if not node:
4011 4011 node = opts.get('rev')
4012 4012
4013 4013 if node:
4014 4014 node = scmutil.revsingle(repo, node).node()
4015 4015
4016 4016 if not node and not abort:
4017 4017 node = repo[destutil.destmerge(repo)].node()
4018 4018
4019 4019 if opts.get('preview'):
4020 4020 # find nodes that are ancestors of p2 but not of p1
4021 4021 p1 = repo.lookup('.')
4022 4022 p2 = node
4023 4023 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4024 4024
4025 4025 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4026 4026 for node in nodes:
4027 4027 displayer.show(repo[node])
4028 4028 displayer.close()
4029 4029 return 0
4030 4030
4031 4031 # ui.forcemerge is an internal variable, do not document
4032 4032 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4033 4033 with ui.configoverride(overrides, 'merge'):
4034 4034 force = opts.get('force')
4035 4035 labels = ['working copy', 'merge rev']
4036 4036 return hg.merge(repo, node, force=force, mergeforce=force,
4037 4037 labels=labels, abort=abort)
4038 4038
4039 4039 @command('outgoing|out',
4040 4040 [('f', 'force', None, _('run even when the destination is unrelated')),
4041 4041 ('r', 'rev', [],
4042 4042 _('a changeset intended to be included in the destination'), _('REV')),
4043 4043 ('n', 'newest-first', None, _('show newest record first')),
4044 4044 ('B', 'bookmarks', False, _('compare bookmarks')),
4045 4045 ('b', 'branch', [], _('a specific branch you would like to push'),
4046 4046 _('BRANCH')),
4047 4047 ] + logopts + remoteopts + subrepoopts,
4048 4048 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4049 4049 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
4050 4050 def outgoing(ui, repo, dest=None, **opts):
4051 4051 """show changesets not found in the destination
4052 4052
4053 4053 Show changesets not found in the specified destination repository
4054 4054 or the default push location. These are the changesets that would
4055 4055 be pushed if a push was requested.
4056 4056
4057 4057 See pull for details of valid destination formats.
4058 4058
4059 4059 .. container:: verbose
4060 4060
4061 4061 With -B/--bookmarks, the result of bookmark comparison between
4062 4062 local and remote repositories is displayed. With -v/--verbose,
4063 4063 status is also displayed for each bookmark like below::
4064 4064
4065 4065 BM1 01234567890a added
4066 4066 BM2 deleted
4067 4067 BM3 234567890abc advanced
4068 4068 BM4 34567890abcd diverged
4069 4069 BM5 4567890abcde changed
4070 4070
4071 4071 The action taken when pushing depends on the
4072 4072 status of each bookmark:
4073 4073
4074 4074 :``added``: push with ``-B`` will create it
4075 4075 :``deleted``: push with ``-B`` will delete it
4076 4076 :``advanced``: push will update it
4077 4077 :``diverged``: push with ``-B`` will update it
4078 4078 :``changed``: push with ``-B`` will update it
4079 4079
4080 4080 From the point of view of pushing behavior, bookmarks
4081 4081 existing only in the remote repository are treated as
4082 4082 ``deleted``, even if it is in fact added remotely.
4083 4083
4084 4084 Returns 0 if there are outgoing changes, 1 otherwise.
4085 4085 """
4086 4086 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4087 4087 # style URLs, so don't overwrite dest.
4088 4088 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4089 4089 if not path:
4090 4090 raise error.Abort(_('default repository not configured!'),
4091 4091 hint=_("see 'hg help config.paths'"))
4092 4092
4093 4093 opts = pycompat.byteskwargs(opts)
4094 4094 if opts.get('graph'):
4095 4095 logcmdutil.checkunsupportedgraphflags([], opts)
4096 4096 o, other = hg._outgoing(ui, repo, dest, opts)
4097 4097 if not o:
4098 4098 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4099 4099 return
4100 4100
4101 4101 revdag = logcmdutil.graphrevs(repo, o, opts)
4102 4102 ui.pager('outgoing')
4103 4103 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4104 4104 logcmdutil.displaygraph(ui, repo, revdag, displayer,
4105 4105 graphmod.asciiedges)
4106 4106 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4107 4107 return 0
4108 4108
4109 4109 if opts.get('bookmarks'):
4110 4110 dest = path.pushloc or path.loc
4111 4111 other = hg.peer(repo, opts, dest)
4112 4112 if 'bookmarks' not in other.listkeys('namespaces'):
4113 4113 ui.warn(_("remote doesn't support bookmarks\n"))
4114 4114 return 0
4115 4115 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4116 4116 ui.pager('outgoing')
4117 4117 return bookmarks.outgoing(ui, repo, other)
4118 4118
4119 4119 repo._subtoppath = path.pushloc or path.loc
4120 4120 try:
4121 4121 return hg.outgoing(ui, repo, dest, opts)
4122 4122 finally:
4123 4123 del repo._subtoppath
4124 4124
4125 4125 @command('parents',
4126 4126 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4127 4127 ] + templateopts,
4128 4128 _('[-r REV] [FILE]'),
4129 4129 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4130 4130 inferrepo=True)
4131 4131 def parents(ui, repo, file_=None, **opts):
4132 4132 """show the parents of the working directory or revision (DEPRECATED)
4133 4133
4134 4134 Print the working directory's parent revisions. If a revision is
4135 4135 given via -r/--rev, the parent of that revision will be printed.
4136 4136 If a file argument is given, the revision in which the file was
4137 4137 last changed (before the working directory revision or the
4138 4138 argument to --rev if given) is printed.
4139 4139
4140 4140 This command is equivalent to::
4141 4141
4142 4142 hg log -r "p1()+p2()" or
4143 4143 hg log -r "p1(REV)+p2(REV)" or
4144 4144 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4145 4145 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4146 4146
4147 4147 See :hg:`summary` and :hg:`help revsets` for related information.
4148 4148
4149 4149 Returns 0 on success.
4150 4150 """
4151 4151
4152 4152 opts = pycompat.byteskwargs(opts)
4153 4153 rev = opts.get('rev')
4154 4154 if rev:
4155 4155 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4156 4156 ctx = scmutil.revsingle(repo, rev, None)
4157 4157
4158 4158 if file_:
4159 4159 m = scmutil.match(ctx, (file_,), opts)
4160 4160 if m.anypats() or len(m.files()) != 1:
4161 4161 raise error.Abort(_('can only specify an explicit filename'))
4162 4162 file_ = m.files()[0]
4163 4163 filenodes = []
4164 4164 for cp in ctx.parents():
4165 4165 if not cp:
4166 4166 continue
4167 4167 try:
4168 4168 filenodes.append(cp.filenode(file_))
4169 4169 except error.LookupError:
4170 4170 pass
4171 4171 if not filenodes:
4172 4172 raise error.Abort(_("'%s' not found in manifest!") % file_)
4173 4173 p = []
4174 4174 for fn in filenodes:
4175 4175 fctx = repo.filectx(file_, fileid=fn)
4176 4176 p.append(fctx.node())
4177 4177 else:
4178 4178 p = [cp.node() for cp in ctx.parents()]
4179 4179
4180 4180 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4181 4181 for n in p:
4182 4182 if n != nullid:
4183 4183 displayer.show(repo[n])
4184 4184 displayer.close()
4185 4185
4186 4186 @command('paths', formatteropts, _('[NAME]'),
4187 4187 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4188 4188 optionalrepo=True, intents={INTENT_READONLY})
4189 4189 def paths(ui, repo, search=None, **opts):
4190 4190 """show aliases for remote repositories
4191 4191
4192 4192 Show definition of symbolic path name NAME. If no name is given,
4193 4193 show definition of all available names.
4194 4194
4195 4195 Option -q/--quiet suppresses all output when searching for NAME
4196 4196 and shows only the path names when listing all definitions.
4197 4197
4198 4198 Path names are defined in the [paths] section of your
4199 4199 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4200 4200 repository, ``.hg/hgrc`` is used, too.
4201 4201
4202 4202 The path names ``default`` and ``default-push`` have a special
4203 4203 meaning. When performing a push or pull operation, they are used
4204 4204 as fallbacks if no location is specified on the command-line.
4205 4205 When ``default-push`` is set, it will be used for push and
4206 4206 ``default`` will be used for pull; otherwise ``default`` is used
4207 4207 as the fallback for both. When cloning a repository, the clone
4208 4208 source is written as ``default`` in ``.hg/hgrc``.
4209 4209
4210 4210 .. note::
4211 4211
4212 4212 ``default`` and ``default-push`` apply to all inbound (e.g.
4213 4213 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4214 4214 and :hg:`bundle`) operations.
4215 4215
4216 4216 See :hg:`help urls` for more information.
4217 4217
4218 4218 .. container:: verbose
4219 4219
4220 4220 Template:
4221 4221
4222 4222 The following keywords are supported. See also :hg:`help templates`.
4223 4223
4224 4224 :name: String. Symbolic name of the path alias.
4225 4225 :pushurl: String. URL for push operations.
4226 4226 :url: String. URL or directory path for the other operations.
4227 4227
4228 4228 Returns 0 on success.
4229 4229 """
4230 4230
4231 4231 opts = pycompat.byteskwargs(opts)
4232 4232 ui.pager('paths')
4233 4233 if search:
4234 4234 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4235 4235 if name == search]
4236 4236 else:
4237 4237 pathitems = sorted(ui.paths.iteritems())
4238 4238
4239 4239 fm = ui.formatter('paths', opts)
4240 4240 if fm.isplain():
4241 4241 hidepassword = util.hidepassword
4242 4242 else:
4243 4243 hidepassword = bytes
4244 4244 if ui.quiet:
4245 4245 namefmt = '%s\n'
4246 4246 else:
4247 4247 namefmt = '%s = '
4248 4248 showsubopts = not search and not ui.quiet
4249 4249
4250 4250 for name, path in pathitems:
4251 4251 fm.startitem()
4252 4252 fm.condwrite(not search, 'name', namefmt, name)
4253 4253 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4254 4254 for subopt, value in sorted(path.suboptions.items()):
4255 4255 assert subopt not in ('name', 'url')
4256 4256 if showsubopts:
4257 4257 fm.plain('%s:%s = ' % (name, subopt))
4258 4258 fm.condwrite(showsubopts, subopt, '%s\n', value)
4259 4259
4260 4260 fm.end()
4261 4261
4262 4262 if search and not pathitems:
4263 4263 if not ui.quiet:
4264 4264 ui.warn(_("not found!\n"))
4265 4265 return 1
4266 4266 else:
4267 4267 return 0
4268 4268
4269 4269 @command('phase',
4270 4270 [('p', 'public', False, _('set changeset phase to public')),
4271 4271 ('d', 'draft', False, _('set changeset phase to draft')),
4272 4272 ('s', 'secret', False, _('set changeset phase to secret')),
4273 4273 ('f', 'force', False, _('allow to move boundary backward')),
4274 4274 ('r', 'rev', [], _('target revision'), _('REV')),
4275 4275 ],
4276 4276 _('[-p|-d|-s] [-f] [-r] [REV...]'),
4277 4277 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
4278 4278 def phase(ui, repo, *revs, **opts):
4279 4279 """set or show the current phase name
4280 4280
4281 4281 With no argument, show the phase name of the current revision(s).
4282 4282
4283 4283 With one of -p/--public, -d/--draft or -s/--secret, change the
4284 4284 phase value of the specified revisions.
4285 4285
4286 4286 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4287 4287 lower phase to a higher phase. Phases are ordered as follows::
4288 4288
4289 4289 public < draft < secret
4290 4290
4291 4291 Returns 0 on success, 1 if some phases could not be changed.
4292 4292
4293 4293 (For more information about the phases concept, see :hg:`help phases`.)
4294 4294 """
4295 4295 opts = pycompat.byteskwargs(opts)
4296 4296 # search for a unique phase argument
4297 4297 targetphase = None
4298 4298 for idx, name in enumerate(phases.cmdphasenames):
4299 4299 if opts[name]:
4300 4300 if targetphase is not None:
4301 4301 raise error.Abort(_('only one phase can be specified'))
4302 4302 targetphase = idx
4303 4303
4304 4304 # look for specified revision
4305 4305 revs = list(revs)
4306 4306 revs.extend(opts['rev'])
4307 4307 if not revs:
4308 4308 # display both parents as the second parent phase can influence
4309 4309 # the phase of a merge commit
4310 4310 revs = [c.rev() for c in repo[None].parents()]
4311 4311
4312 4312 revs = scmutil.revrange(repo, revs)
4313 4313
4314 4314 ret = 0
4315 4315 if targetphase is None:
4316 4316 # display
4317 4317 for r in revs:
4318 4318 ctx = repo[r]
4319 4319 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4320 4320 else:
4321 4321 with repo.lock(), repo.transaction("phase") as tr:
4322 4322 # set phase
4323 4323 if not revs:
4324 4324 raise error.Abort(_('empty revision set'))
4325 4325 nodes = [repo[r].node() for r in revs]
4326 4326 # moving revision from public to draft may hide them
4327 4327 # We have to check result on an unfiltered repository
4328 4328 unfi = repo.unfiltered()
4329 4329 getphase = unfi._phasecache.phase
4330 4330 olddata = [getphase(unfi, r) for r in unfi]
4331 4331 phases.advanceboundary(repo, tr, targetphase, nodes)
4332 4332 if opts['force']:
4333 4333 phases.retractboundary(repo, tr, targetphase, nodes)
4334 4334 getphase = unfi._phasecache.phase
4335 4335 newdata = [getphase(unfi, r) for r in unfi]
4336 4336 changes = sum(newdata[r] != olddata[r] for r in unfi)
4337 4337 cl = unfi.changelog
4338 4338 rejected = [n for n in nodes
4339 4339 if newdata[cl.rev(n)] < targetphase]
4340 4340 if rejected:
4341 4341 ui.warn(_('cannot move %i changesets to a higher '
4342 4342 'phase, use --force\n') % len(rejected))
4343 4343 ret = 1
4344 4344 if changes:
4345 4345 msg = _('phase changed for %i changesets\n') % changes
4346 4346 if ret:
4347 4347 ui.status(msg)
4348 4348 else:
4349 4349 ui.note(msg)
4350 4350 else:
4351 4351 ui.warn(_('no phases changed\n'))
4352 4352 return ret
4353 4353
4354 4354 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4355 4355 """Run after a changegroup has been added via pull/unbundle
4356 4356
4357 4357 This takes arguments below:
4358 4358
4359 4359 :modheads: change of heads by pull/unbundle
4360 4360 :optupdate: updating working directory is needed or not
4361 4361 :checkout: update destination revision (or None to default destination)
4362 4362 :brev: a name, which might be a bookmark to be activated after updating
4363 4363 """
4364 4364 if modheads == 0:
4365 4365 return
4366 4366 if optupdate:
4367 4367 try:
4368 4368 return hg.updatetotally(ui, repo, checkout, brev)
4369 4369 except error.UpdateAbort as inst:
4370 4370 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4371 4371 hint = inst.hint
4372 4372 raise error.UpdateAbort(msg, hint=hint)
4373 4373 if modheads is not None and modheads > 1:
4374 4374 currentbranchheads = len(repo.branchheads())
4375 4375 if currentbranchheads == modheads:
4376 4376 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4377 4377 elif currentbranchheads > 1:
4378 4378 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4379 4379 "merge)\n"))
4380 4380 else:
4381 4381 ui.status(_("(run 'hg heads' to see heads)\n"))
4382 4382 elif not ui.configbool('commands', 'update.requiredest'):
4383 4383 ui.status(_("(run 'hg update' to get a working copy)\n"))
4384 4384
4385 4385 @command('pull',
4386 4386 [('u', 'update', None,
4387 4387 _('update to new branch head if new descendants were pulled')),
4388 4388 ('f', 'force', None, _('run even when remote repository is unrelated')),
4389 4389 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4390 4390 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4391 4391 ('b', 'branch', [], _('a specific branch you would like to pull'),
4392 4392 _('BRANCH')),
4393 4393 ] + remoteopts,
4394 4394 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
4395 4395 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4396 4396 helpbasic=True)
4397 4397 def pull(ui, repo, source="default", **opts):
4398 4398 """pull changes from the specified source
4399 4399
4400 4400 Pull changes from a remote repository to a local one.
4401 4401
4402 4402 This finds all changes from the repository at the specified path
4403 4403 or URL and adds them to a local repository (the current one unless
4404 4404 -R is specified). By default, this does not update the copy of the
4405 4405 project in the working directory.
4406 4406
4407 4407 When cloning from servers that support it, Mercurial may fetch
4408 4408 pre-generated data. When this is done, hooks operating on incoming
4409 4409 changesets and changegroups may fire more than once, once for each
4410 4410 pre-generated bundle and as well as for any additional remaining
4411 4411 data. See :hg:`help -e clonebundles` for more.
4412 4412
4413 4413 Use :hg:`incoming` if you want to see what would have been added
4414 4414 by a pull at the time you issued this command. If you then decide
4415 4415 to add those changes to the repository, you should use :hg:`pull
4416 4416 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4417 4417
4418 4418 If SOURCE is omitted, the 'default' path will be used.
4419 4419 See :hg:`help urls` for more information.
4420 4420
4421 4421 Specifying bookmark as ``.`` is equivalent to specifying the active
4422 4422 bookmark's name.
4423 4423
4424 4424 Returns 0 on success, 1 if an update had unresolved files.
4425 4425 """
4426 4426
4427 4427 opts = pycompat.byteskwargs(opts)
4428 4428 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4429 4429 msg = _('update destination required by configuration')
4430 4430 hint = _('use hg pull followed by hg update DEST')
4431 4431 raise error.Abort(msg, hint=hint)
4432 4432
4433 4433 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4434 4434 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4435 4435 other = hg.peer(repo, opts, source)
4436 4436 try:
4437 4437 revs, checkout = hg.addbranchrevs(repo, other, branches,
4438 4438 opts.get('rev'))
4439 4439
4440 4440 pullopargs = {}
4441 4441
4442 4442 nodes = None
4443 4443 if opts.get('bookmark') or revs:
4444 4444 # The list of bookmark used here is the same used to actually update
4445 4445 # the bookmark names, to avoid the race from issue 4689 and we do
4446 4446 # all lookup and bookmark queries in one go so they see the same
4447 4447 # version of the server state (issue 4700).
4448 4448 nodes = []
4449 4449 fnodes = []
4450 4450 revs = revs or []
4451 4451 if revs and not other.capable('lookup'):
4452 4452 err = _("other repository doesn't support revision lookup, "
4453 4453 "so a rev cannot be specified.")
4454 4454 raise error.Abort(err)
4455 4455 with other.commandexecutor() as e:
4456 4456 fremotebookmarks = e.callcommand('listkeys', {
4457 4457 'namespace': 'bookmarks'
4458 4458 })
4459 4459 for r in revs:
4460 4460 fnodes.append(e.callcommand('lookup', {'key': r}))
4461 4461 remotebookmarks = fremotebookmarks.result()
4462 4462 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4463 4463 pullopargs['remotebookmarks'] = remotebookmarks
4464 4464 for b in opts.get('bookmark', []):
4465 4465 b = repo._bookmarks.expandname(b)
4466 4466 if b not in remotebookmarks:
4467 4467 raise error.Abort(_('remote bookmark %s not found!') % b)
4468 4468 nodes.append(remotebookmarks[b])
4469 4469 for i, rev in enumerate(revs):
4470 4470 node = fnodes[i].result()
4471 4471 nodes.append(node)
4472 4472 if rev == checkout:
4473 4473 checkout = node
4474 4474
4475 4475 wlock = util.nullcontextmanager()
4476 4476 if opts.get('update'):
4477 4477 wlock = repo.wlock()
4478 4478 with wlock:
4479 4479 pullopargs.update(opts.get('opargs', {}))
4480 4480 modheads = exchange.pull(repo, other, heads=nodes,
4481 4481 force=opts.get('force'),
4482 4482 bookmarks=opts.get('bookmark', ()),
4483 4483 opargs=pullopargs).cgresult
4484 4484
4485 4485 # brev is a name, which might be a bookmark to be activated at
4486 4486 # the end of the update. In other words, it is an explicit
4487 4487 # destination of the update
4488 4488 brev = None
4489 4489
4490 4490 if checkout:
4491 4491 checkout = repo.unfiltered().changelog.rev(checkout)
4492 4492
4493 4493 # order below depends on implementation of
4494 4494 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4495 4495 # because 'checkout' is determined without it.
4496 4496 if opts.get('rev'):
4497 4497 brev = opts['rev'][0]
4498 4498 elif opts.get('branch'):
4499 4499 brev = opts['branch'][0]
4500 4500 else:
4501 4501 brev = branches[0]
4502 4502 repo._subtoppath = source
4503 4503 try:
4504 4504 ret = postincoming(ui, repo, modheads, opts.get('update'),
4505 4505 checkout, brev)
4506 4506 except error.FilteredRepoLookupError as exc:
4507 4507 msg = _('cannot update to target: %s') % exc.args[0]
4508 4508 exc.args = (msg,) + exc.args[1:]
4509 4509 raise
4510 4510 finally:
4511 4511 del repo._subtoppath
4512 4512
4513 4513 finally:
4514 4514 other.close()
4515 4515 return ret
4516 4516
4517 4517 @command('push',
4518 4518 [('f', 'force', None, _('force push')),
4519 4519 ('r', 'rev', [],
4520 4520 _('a changeset intended to be included in the destination'),
4521 4521 _('REV')),
4522 4522 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4523 4523 ('b', 'branch', [],
4524 4524 _('a specific branch you would like to push'), _('BRANCH')),
4525 4525 ('', 'new-branch', False, _('allow pushing a new branch')),
4526 4526 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4527 4527 ('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
4528 4528 ] + remoteopts,
4529 4529 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
4530 4530 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4531 4531 helpbasic=True)
4532 4532 def push(ui, repo, dest=None, **opts):
4533 4533 """push changes to the specified destination
4534 4534
4535 4535 Push changesets from the local repository to the specified
4536 4536 destination.
4537 4537
4538 4538 This operation is symmetrical to pull: it is identical to a pull
4539 4539 in the destination repository from the current one.
4540 4540
4541 4541 By default, push will not allow creation of new heads at the
4542 4542 destination, since multiple heads would make it unclear which head
4543 4543 to use. In this situation, it is recommended to pull and merge
4544 4544 before pushing.
4545 4545
4546 4546 Use --new-branch if you want to allow push to create a new named
4547 4547 branch that is not present at the destination. This allows you to
4548 4548 only create a new branch without forcing other changes.
4549 4549
4550 4550 .. note::
4551 4551
4552 4552 Extra care should be taken with the -f/--force option,
4553 4553 which will push all new heads on all branches, an action which will
4554 4554 almost always cause confusion for collaborators.
4555 4555
4556 4556 If -r/--rev is used, the specified revision and all its ancestors
4557 4557 will be pushed to the remote repository.
4558 4558
4559 4559 If -B/--bookmark is used, the specified bookmarked revision, its
4560 4560 ancestors, and the bookmark will be pushed to the remote
4561 4561 repository. Specifying ``.`` is equivalent to specifying the active
4562 4562 bookmark's name.
4563 4563
4564 4564 Please see :hg:`help urls` for important details about ``ssh://``
4565 4565 URLs. If DESTINATION is omitted, a default path will be used.
4566 4566
4567 4567 .. container:: verbose
4568 4568
4569 4569 The --pushvars option sends strings to the server that become
4570 4570 environment variables prepended with ``HG_USERVAR_``. For example,
4571 4571 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4572 4572 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4573 4573
4574 4574 pushvars can provide for user-overridable hooks as well as set debug
4575 4575 levels. One example is having a hook that blocks commits containing
4576 4576 conflict markers, but enables the user to override the hook if the file
4577 4577 is using conflict markers for testing purposes or the file format has
4578 4578 strings that look like conflict markers.
4579 4579
4580 4580 By default, servers will ignore `--pushvars`. To enable it add the
4581 4581 following to your configuration file::
4582 4582
4583 4583 [push]
4584 4584 pushvars.server = true
4585 4585
4586 4586 Returns 0 if push was successful, 1 if nothing to push.
4587 4587 """
4588 4588
4589 4589 opts = pycompat.byteskwargs(opts)
4590 4590 if opts.get('bookmark'):
4591 4591 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4592 4592 for b in opts['bookmark']:
4593 4593 # translate -B options to -r so changesets get pushed
4594 4594 b = repo._bookmarks.expandname(b)
4595 4595 if b in repo._bookmarks:
4596 4596 opts.setdefault('rev', []).append(b)
4597 4597 else:
4598 4598 # if we try to push a deleted bookmark, translate it to null
4599 4599 # this lets simultaneous -r, -b options continue working
4600 4600 opts.setdefault('rev', []).append("null")
4601 4601
4602 4602 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4603 4603 if not path:
4604 4604 raise error.Abort(_('default repository not configured!'),
4605 4605 hint=_("see 'hg help config.paths'"))
4606 4606 dest = path.pushloc or path.loc
4607 4607 branches = (path.branch, opts.get('branch') or [])
4608 4608 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4609 4609 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4610 4610 other = hg.peer(repo, opts, dest)
4611 4611
4612 4612 if revs:
4613 4613 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4614 4614 if not revs:
4615 4615 raise error.Abort(_("specified revisions evaluate to an empty set"),
4616 4616 hint=_("use different revision arguments"))
4617 4617 elif path.pushrev:
4618 4618 # It doesn't make any sense to specify ancestor revisions. So limit
4619 4619 # to DAG heads to make discovery simpler.
4620 4620 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4621 4621 revs = scmutil.revrange(repo, [expr])
4622 4622 revs = [repo[rev].node() for rev in revs]
4623 4623 if not revs:
4624 4624 raise error.Abort(_('default push revset for path evaluates to an '
4625 4625 'empty set'))
4626 4626
4627 4627 repo._subtoppath = dest
4628 4628 try:
4629 4629 # push subrepos depth-first for coherent ordering
4630 4630 c = repo['.']
4631 4631 subs = c.substate # only repos that are committed
4632 4632 for s in sorted(subs):
4633 4633 result = c.sub(s).push(opts)
4634 4634 if result == 0:
4635 4635 return not result
4636 4636 finally:
4637 4637 del repo._subtoppath
4638 4638
4639 4639 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4640 4640 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4641 4641
4642 4642 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4643 4643 newbranch=opts.get('new_branch'),
4644 4644 bookmarks=opts.get('bookmark', ()),
4645 4645 publish=opts.get('publish'),
4646 4646 opargs=opargs)
4647 4647
4648 4648 result = not pushop.cgresult
4649 4649
4650 4650 if pushop.bkresult is not None:
4651 4651 if pushop.bkresult == 2:
4652 4652 result = 2
4653 4653 elif not result and pushop.bkresult:
4654 4654 result = 2
4655 4655
4656 4656 return result
4657 4657
4658 @command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
4659 def recover(ui, repo):
4658 @command('recover',
4659 [('','verify', True, "run `hg verify` after succesful recover"),
4660 ],
4661 helpcategory=command.CATEGORY_MAINTENANCE)
4662 def recover(ui, repo, **opts):
4660 4663 """roll back an interrupted transaction
4661 4664
4662 4665 Recover from an interrupted commit or pull.
4663 4666
4664 4667 This command tries to fix the repository status after an
4665 4668 interrupted operation. It should only be necessary when Mercurial
4666 4669 suggests it.
4667 4670
4668 4671 Returns 0 if successful, 1 if nothing to recover or verify fails.
4669 4672 """
4670 if repo.recover():
4671 return hg.verify(repo)
4673 ret = repo.recover()
4674 if ret:
4675 if opts['verify']:
4676 return hg.verify(repo)
4677 else:
4678 msg = _("(verify step skipped, run `hg verify` to check your "
4679 "repository content)\n")
4680 ui.warn(msg)
4681 return 0
4672 4682 return 1
4673 4683
4674 4684 @command('remove|rm',
4675 4685 [('A', 'after', None, _('record delete for missing files')),
4676 4686 ('f', 'force', None,
4677 4687 _('forget added files, delete modified files')),
4678 4688 ] + subrepoopts + walkopts + dryrunopts,
4679 4689 _('[OPTION]... FILE...'),
4680 4690 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4681 4691 helpbasic=True, inferrepo=True)
4682 4692 def remove(ui, repo, *pats, **opts):
4683 4693 """remove the specified files on the next commit
4684 4694
4685 4695 Schedule the indicated files for removal from the current branch.
4686 4696
4687 4697 This command schedules the files to be removed at the next commit.
4688 4698 To undo a remove before that, see :hg:`revert`. To undo added
4689 4699 files, see :hg:`forget`.
4690 4700
4691 4701 .. container:: verbose
4692 4702
4693 4703 -A/--after can be used to remove only files that have already
4694 4704 been deleted, -f/--force can be used to force deletion, and -Af
4695 4705 can be used to remove files from the next revision without
4696 4706 deleting them from the working directory.
4697 4707
4698 4708 The following table details the behavior of remove for different
4699 4709 file states (columns) and option combinations (rows). The file
4700 4710 states are Added [A], Clean [C], Modified [M] and Missing [!]
4701 4711 (as reported by :hg:`status`). The actions are Warn, Remove
4702 4712 (from branch) and Delete (from disk):
4703 4713
4704 4714 ========= == == == ==
4705 4715 opt/state A C M !
4706 4716 ========= == == == ==
4707 4717 none W RD W R
4708 4718 -f R RD RD R
4709 4719 -A W W W R
4710 4720 -Af R R R R
4711 4721 ========= == == == ==
4712 4722
4713 4723 .. note::
4714 4724
4715 4725 :hg:`remove` never deletes files in Added [A] state from the
4716 4726 working directory, not even if ``--force`` is specified.
4717 4727
4718 4728 Returns 0 on success, 1 if any warnings encountered.
4719 4729 """
4720 4730
4721 4731 opts = pycompat.byteskwargs(opts)
4722 4732 after, force = opts.get('after'), opts.get('force')
4723 4733 dryrun = opts.get('dry_run')
4724 4734 if not pats and not after:
4725 4735 raise error.Abort(_('no files specified'))
4726 4736
4727 4737 m = scmutil.match(repo[None], pats, opts)
4728 4738 subrepos = opts.get('subrepos')
4729 4739 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
4730 4740 return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
4731 4741 dryrun=dryrun)
4732 4742
4733 4743 @command('rename|move|mv',
4734 4744 [('A', 'after', None, _('record a rename that has already occurred')),
4735 4745 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4736 4746 ] + walkopts + dryrunopts,
4737 4747 _('[OPTION]... SOURCE... DEST'),
4738 4748 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4739 4749 def rename(ui, repo, *pats, **opts):
4740 4750 """rename files; equivalent of copy + remove
4741 4751
4742 4752 Mark dest as copies of sources; mark sources for deletion. If dest
4743 4753 is a directory, copies are put in that directory. If dest is a
4744 4754 file, there can only be one source.
4745 4755
4746 4756 By default, this command copies the contents of files as they
4747 4757 exist in the working directory. If invoked with -A/--after, the
4748 4758 operation is recorded, but no copying is performed.
4749 4759
4750 4760 This command takes effect at the next commit. To undo a rename
4751 4761 before that, see :hg:`revert`.
4752 4762
4753 4763 Returns 0 on success, 1 if errors are encountered.
4754 4764 """
4755 4765 opts = pycompat.byteskwargs(opts)
4756 4766 with repo.wlock(False):
4757 4767 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4758 4768
4759 4769 @command('resolve',
4760 4770 [('a', 'all', None, _('select all unresolved files')),
4761 4771 ('l', 'list', None, _('list state of files needing merge')),
4762 4772 ('m', 'mark', None, _('mark files as resolved')),
4763 4773 ('u', 'unmark', None, _('mark files as unresolved')),
4764 4774 ('n', 'no-status', None, _('hide status prefix')),
4765 4775 ('', 're-merge', None, _('re-merge files'))]
4766 4776 + mergetoolopts + walkopts + formatteropts,
4767 4777 _('[OPTION]... [FILE]...'),
4768 4778 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4769 4779 inferrepo=True)
4770 4780 def resolve(ui, repo, *pats, **opts):
4771 4781 """redo merges or set/view the merge status of files
4772 4782
4773 4783 Merges with unresolved conflicts are often the result of
4774 4784 non-interactive merging using the ``internal:merge`` configuration
4775 4785 setting, or a command-line merge tool like ``diff3``. The resolve
4776 4786 command is used to manage the files involved in a merge, after
4777 4787 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4778 4788 working directory must have two parents). See :hg:`help
4779 4789 merge-tools` for information on configuring merge tools.
4780 4790
4781 4791 The resolve command can be used in the following ways:
4782 4792
4783 4793 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4784 4794 the specified files, discarding any previous merge attempts. Re-merging
4785 4795 is not performed for files already marked as resolved. Use ``--all/-a``
4786 4796 to select all unresolved files. ``--tool`` can be used to specify
4787 4797 the merge tool used for the given files. It overrides the HGMERGE
4788 4798 environment variable and your configuration files. Previous file
4789 4799 contents are saved with a ``.orig`` suffix.
4790 4800
4791 4801 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4792 4802 (e.g. after having manually fixed-up the files). The default is
4793 4803 to mark all unresolved files.
4794 4804
4795 4805 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4796 4806 default is to mark all resolved files.
4797 4807
4798 4808 - :hg:`resolve -l`: list files which had or still have conflicts.
4799 4809 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4800 4810 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4801 4811 the list. See :hg:`help filesets` for details.
4802 4812
4803 4813 .. note::
4804 4814
4805 4815 Mercurial will not let you commit files with unresolved merge
4806 4816 conflicts. You must use :hg:`resolve -m ...` before you can
4807 4817 commit after a conflicting merge.
4808 4818
4809 4819 .. container:: verbose
4810 4820
4811 4821 Template:
4812 4822
4813 4823 The following keywords are supported in addition to the common template
4814 4824 keywords and functions. See also :hg:`help templates`.
4815 4825
4816 4826 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4817 4827 :path: String. Repository-absolute path of the file.
4818 4828
4819 4829 Returns 0 on success, 1 if any files fail a resolve attempt.
4820 4830 """
4821 4831
4822 4832 opts = pycompat.byteskwargs(opts)
4823 4833 confirm = ui.configbool('commands', 'resolve.confirm')
4824 4834 flaglist = 'all mark unmark list no_status re_merge'.split()
4825 4835 all, mark, unmark, show, nostatus, remerge = [
4826 4836 opts.get(o) for o in flaglist]
4827 4837
4828 4838 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4829 4839 if actioncount > 1:
4830 4840 raise error.Abort(_("too many actions specified"))
4831 4841 elif (actioncount == 0
4832 4842 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4833 4843 hint = _('use --mark, --unmark, --list or --re-merge')
4834 4844 raise error.Abort(_('no action specified'), hint=hint)
4835 4845 if pats and all:
4836 4846 raise error.Abort(_("can't specify --all and patterns"))
4837 4847 if not (all or pats or show or mark or unmark):
4838 4848 raise error.Abort(_('no files or directories specified'),
4839 4849 hint=('use --all to re-merge all unresolved files'))
4840 4850
4841 4851 if confirm:
4842 4852 if all:
4843 4853 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4844 4854 b'$$ &Yes $$ &No')):
4845 4855 raise error.Abort(_('user quit'))
4846 4856 if mark and not pats:
4847 4857 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4848 4858 b'$$ &Yes $$ &No')):
4849 4859 raise error.Abort(_('user quit'))
4850 4860 if unmark and not pats:
4851 4861 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4852 4862 b'$$ &Yes $$ &No')):
4853 4863 raise error.Abort(_('user quit'))
4854 4864
4855 4865 uipathfn = scmutil.getuipathfn(repo)
4856 4866
4857 4867 if show:
4858 4868 ui.pager('resolve')
4859 4869 fm = ui.formatter('resolve', opts)
4860 4870 ms = mergemod.mergestate.read(repo)
4861 4871 wctx = repo[None]
4862 4872 m = scmutil.match(wctx, pats, opts)
4863 4873
4864 4874 # Labels and keys based on merge state. Unresolved path conflicts show
4865 4875 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4866 4876 # resolved conflicts.
4867 4877 mergestateinfo = {
4868 4878 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4869 4879 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4870 4880 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4871 4881 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4872 4882 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4873 4883 'D'),
4874 4884 }
4875 4885
4876 4886 for f in ms:
4877 4887 if not m(f):
4878 4888 continue
4879 4889
4880 4890 label, key = mergestateinfo[ms[f]]
4881 4891 fm.startitem()
4882 4892 fm.context(ctx=wctx)
4883 4893 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4884 4894 fm.data(path=f)
4885 4895 fm.plain('%s\n' % uipathfn(f), label=label)
4886 4896 fm.end()
4887 4897 return 0
4888 4898
4889 4899 with repo.wlock():
4890 4900 ms = mergemod.mergestate.read(repo)
4891 4901
4892 4902 if not (ms.active() or repo.dirstate.p2() != nullid):
4893 4903 raise error.Abort(
4894 4904 _('resolve command not applicable when not merging'))
4895 4905
4896 4906 wctx = repo[None]
4897 4907
4898 4908 if (ms.mergedriver
4899 4909 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4900 4910 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4901 4911 ms.commit()
4902 4912 # allow mark and unmark to go through
4903 4913 if not mark and not unmark and not proceed:
4904 4914 return 1
4905 4915
4906 4916 m = scmutil.match(wctx, pats, opts)
4907 4917 ret = 0
4908 4918 didwork = False
4909 4919 runconclude = False
4910 4920
4911 4921 tocomplete = []
4912 4922 hasconflictmarkers = []
4913 4923 if mark:
4914 4924 markcheck = ui.config('commands', 'resolve.mark-check')
4915 4925 if markcheck not in ['warn', 'abort']:
4916 4926 # Treat all invalid / unrecognized values as 'none'.
4917 4927 markcheck = False
4918 4928 for f in ms:
4919 4929 if not m(f):
4920 4930 continue
4921 4931
4922 4932 didwork = True
4923 4933
4924 4934 # don't let driver-resolved files be marked, and run the conclude
4925 4935 # step if asked to resolve
4926 4936 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4927 4937 exact = m.exact(f)
4928 4938 if mark:
4929 4939 if exact:
4930 4940 ui.warn(_('not marking %s as it is driver-resolved\n')
4931 4941 % uipathfn(f))
4932 4942 elif unmark:
4933 4943 if exact:
4934 4944 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4935 4945 % uipathfn(f))
4936 4946 else:
4937 4947 runconclude = True
4938 4948 continue
4939 4949
4940 4950 # path conflicts must be resolved manually
4941 4951 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4942 4952 mergemod.MERGE_RECORD_RESOLVED_PATH):
4943 4953 if mark:
4944 4954 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4945 4955 elif unmark:
4946 4956 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4947 4957 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4948 4958 ui.warn(_('%s: path conflict must be resolved manually\n')
4949 4959 % uipathfn(f))
4950 4960 continue
4951 4961
4952 4962 if mark:
4953 4963 if markcheck:
4954 4964 fdata = repo.wvfs.tryread(f)
4955 4965 if (filemerge.hasconflictmarkers(fdata) and
4956 4966 ms[f] != mergemod.MERGE_RECORD_RESOLVED):
4957 4967 hasconflictmarkers.append(f)
4958 4968 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4959 4969 elif unmark:
4960 4970 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4961 4971 else:
4962 4972 # backup pre-resolve (merge uses .orig for its own purposes)
4963 4973 a = repo.wjoin(f)
4964 4974 try:
4965 4975 util.copyfile(a, a + ".resolve")
4966 4976 except (IOError, OSError) as inst:
4967 4977 if inst.errno != errno.ENOENT:
4968 4978 raise
4969 4979
4970 4980 try:
4971 4981 # preresolve file
4972 4982 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4973 4983 with ui.configoverride(overrides, 'resolve'):
4974 4984 complete, r = ms.preresolve(f, wctx)
4975 4985 if not complete:
4976 4986 tocomplete.append(f)
4977 4987 elif r:
4978 4988 ret = 1
4979 4989 finally:
4980 4990 ms.commit()
4981 4991
4982 4992 # replace filemerge's .orig file with our resolve file, but only
4983 4993 # for merges that are complete
4984 4994 if complete:
4985 4995 try:
4986 4996 util.rename(a + ".resolve",
4987 4997 scmutil.backuppath(ui, repo, f))
4988 4998 except OSError as inst:
4989 4999 if inst.errno != errno.ENOENT:
4990 5000 raise
4991 5001
4992 5002 if hasconflictmarkers:
4993 5003 ui.warn(_('warning: the following files still have conflict '
4994 5004 'markers:\n') + ''.join(' ' + uipathfn(f) + '\n'
4995 5005 for f in hasconflictmarkers))
4996 5006 if markcheck == 'abort' and not all and not pats:
4997 5007 raise error.Abort(_('conflict markers detected'),
4998 5008 hint=_('use --all to mark anyway'))
4999 5009
5000 5010 for f in tocomplete:
5001 5011 try:
5002 5012 # resolve file
5003 5013 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
5004 5014 with ui.configoverride(overrides, 'resolve'):
5005 5015 r = ms.resolve(f, wctx)
5006 5016 if r:
5007 5017 ret = 1
5008 5018 finally:
5009 5019 ms.commit()
5010 5020
5011 5021 # replace filemerge's .orig file with our resolve file
5012 5022 a = repo.wjoin(f)
5013 5023 try:
5014 5024 util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
5015 5025 except OSError as inst:
5016 5026 if inst.errno != errno.ENOENT:
5017 5027 raise
5018 5028
5019 5029 ms.commit()
5020 5030 ms.recordactions()
5021 5031
5022 5032 if not didwork and pats:
5023 5033 hint = None
5024 5034 if not any([p for p in pats if p.find(':') >= 0]):
5025 5035 pats = ['path:%s' % p for p in pats]
5026 5036 m = scmutil.match(wctx, pats, opts)
5027 5037 for f in ms:
5028 5038 if not m(f):
5029 5039 continue
5030 5040 def flag(o):
5031 5041 if o == 're_merge':
5032 5042 return '--re-merge '
5033 5043 return '-%s ' % o[0:1]
5034 5044 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
5035 5045 hint = _("(try: hg resolve %s%s)\n") % (
5036 5046 flags,
5037 5047 ' '.join(pats))
5038 5048 break
5039 5049 ui.warn(_("arguments do not match paths that need resolving\n"))
5040 5050 if hint:
5041 5051 ui.warn(hint)
5042 5052 elif ms.mergedriver and ms.mdstate() != 's':
5043 5053 # run conclude step when either a driver-resolved file is requested
5044 5054 # or there are no driver-resolved files
5045 5055 # we can't use 'ret' to determine whether any files are unresolved
5046 5056 # because we might not have tried to resolve some
5047 5057 if ((runconclude or not list(ms.driverresolved()))
5048 5058 and not list(ms.unresolved())):
5049 5059 proceed = mergemod.driverconclude(repo, ms, wctx)
5050 5060 ms.commit()
5051 5061 if not proceed:
5052 5062 return 1
5053 5063
5054 5064 # Nudge users into finishing an unfinished operation
5055 5065 unresolvedf = list(ms.unresolved())
5056 5066 driverresolvedf = list(ms.driverresolved())
5057 5067 if not unresolvedf and not driverresolvedf:
5058 5068 ui.status(_('(no more unresolved files)\n'))
5059 5069 cmdutil.checkafterresolved(repo)
5060 5070 elif not unresolvedf:
5061 5071 ui.status(_('(no more unresolved files -- '
5062 5072 'run "hg resolve --all" to conclude)\n'))
5063 5073
5064 5074 return ret
5065 5075
5066 5076 @command('revert',
5067 5077 [('a', 'all', None, _('revert all changes when no arguments given')),
5068 5078 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5069 5079 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5070 5080 ('C', 'no-backup', None, _('do not save backup copies of files')),
5071 5081 ('i', 'interactive', None, _('interactively select the changes')),
5072 5082 ] + walkopts + dryrunopts,
5073 5083 _('[OPTION]... [-r REV] [NAME]...'),
5074 5084 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5075 5085 def revert(ui, repo, *pats, **opts):
5076 5086 """restore files to their checkout state
5077 5087
5078 5088 .. note::
5079 5089
5080 5090 To check out earlier revisions, you should use :hg:`update REV`.
5081 5091 To cancel an uncommitted merge (and lose your changes),
5082 5092 use :hg:`merge --abort`.
5083 5093
5084 5094 With no revision specified, revert the specified files or directories
5085 5095 to the contents they had in the parent of the working directory.
5086 5096 This restores the contents of files to an unmodified
5087 5097 state and unschedules adds, removes, copies, and renames. If the
5088 5098 working directory has two parents, you must explicitly specify a
5089 5099 revision.
5090 5100
5091 5101 Using the -r/--rev or -d/--date options, revert the given files or
5092 5102 directories to their states as of a specific revision. Because
5093 5103 revert does not change the working directory parents, this will
5094 5104 cause these files to appear modified. This can be helpful to "back
5095 5105 out" some or all of an earlier change. See :hg:`backout` for a
5096 5106 related method.
5097 5107
5098 5108 Modified files are saved with a .orig suffix before reverting.
5099 5109 To disable these backups, use --no-backup. It is possible to store
5100 5110 the backup files in a custom directory relative to the root of the
5101 5111 repository by setting the ``ui.origbackuppath`` configuration
5102 5112 option.
5103 5113
5104 5114 See :hg:`help dates` for a list of formats valid for -d/--date.
5105 5115
5106 5116 See :hg:`help backout` for a way to reverse the effect of an
5107 5117 earlier changeset.
5108 5118
5109 5119 Returns 0 on success.
5110 5120 """
5111 5121
5112 5122 opts = pycompat.byteskwargs(opts)
5113 5123 if opts.get("date"):
5114 5124 if opts.get("rev"):
5115 5125 raise error.Abort(_("you can't specify a revision and a date"))
5116 5126 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5117 5127
5118 5128 parent, p2 = repo.dirstate.parents()
5119 5129 if not opts.get('rev') and p2 != nullid:
5120 5130 # revert after merge is a trap for new users (issue2915)
5121 5131 raise error.Abort(_('uncommitted merge with no revision specified'),
5122 5132 hint=_("use 'hg update' or see 'hg help revert'"))
5123 5133
5124 5134 rev = opts.get('rev')
5125 5135 if rev:
5126 5136 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5127 5137 ctx = scmutil.revsingle(repo, rev)
5128 5138
5129 5139 if (not (pats or opts.get('include') or opts.get('exclude') or
5130 5140 opts.get('all') or opts.get('interactive'))):
5131 5141 msg = _("no files or directories specified")
5132 5142 if p2 != nullid:
5133 5143 hint = _("uncommitted merge, use --all to discard all changes,"
5134 5144 " or 'hg update -C .' to abort the merge")
5135 5145 raise error.Abort(msg, hint=hint)
5136 5146 dirty = any(repo.status())
5137 5147 node = ctx.node()
5138 5148 if node != parent:
5139 5149 if dirty:
5140 5150 hint = _("uncommitted changes, use --all to discard all"
5141 5151 " changes, or 'hg update %d' to update") % ctx.rev()
5142 5152 else:
5143 5153 hint = _("use --all to revert all files,"
5144 5154 " or 'hg update %d' to update") % ctx.rev()
5145 5155 elif dirty:
5146 5156 hint = _("uncommitted changes, use --all to discard all changes")
5147 5157 else:
5148 5158 hint = _("use --all to revert all files")
5149 5159 raise error.Abort(msg, hint=hint)
5150 5160
5151 5161 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
5152 5162 **pycompat.strkwargs(opts))
5153 5163
5154 5164 @command(
5155 5165 'rollback',
5156 5166 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
5157 5167 helpcategory=command.CATEGORY_MAINTENANCE)
5158 5168 def rollback(ui, repo, **opts):
5159 5169 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5160 5170
5161 5171 Please use :hg:`commit --amend` instead of rollback to correct
5162 5172 mistakes in the last commit.
5163 5173
5164 5174 This command should be used with care. There is only one level of
5165 5175 rollback, and there is no way to undo a rollback. It will also
5166 5176 restore the dirstate at the time of the last transaction, losing
5167 5177 any dirstate changes since that time. This command does not alter
5168 5178 the working directory.
5169 5179
5170 5180 Transactions are used to encapsulate the effects of all commands
5171 5181 that create new changesets or propagate existing changesets into a
5172 5182 repository.
5173 5183
5174 5184 .. container:: verbose
5175 5185
5176 5186 For example, the following commands are transactional, and their
5177 5187 effects can be rolled back:
5178 5188
5179 5189 - commit
5180 5190 - import
5181 5191 - pull
5182 5192 - push (with this repository as the destination)
5183 5193 - unbundle
5184 5194
5185 5195 To avoid permanent data loss, rollback will refuse to rollback a
5186 5196 commit transaction if it isn't checked out. Use --force to
5187 5197 override this protection.
5188 5198
5189 5199 The rollback command can be entirely disabled by setting the
5190 5200 ``ui.rollback`` configuration setting to false. If you're here
5191 5201 because you want to use rollback and it's disabled, you can
5192 5202 re-enable the command by setting ``ui.rollback`` to true.
5193 5203
5194 5204 This command is not intended for use on public repositories. Once
5195 5205 changes are visible for pull by other users, rolling a transaction
5196 5206 back locally is ineffective (someone else may already have pulled
5197 5207 the changes). Furthermore, a race is possible with readers of the
5198 5208 repository; for example an in-progress pull from the repository
5199 5209 may fail if a rollback is performed.
5200 5210
5201 5211 Returns 0 on success, 1 if no rollback data is available.
5202 5212 """
5203 5213 if not ui.configbool('ui', 'rollback'):
5204 5214 raise error.Abort(_('rollback is disabled because it is unsafe'),
5205 5215 hint=('see `hg help -v rollback` for information'))
5206 5216 return repo.rollback(dryrun=opts.get(r'dry_run'),
5207 5217 force=opts.get(r'force'))
5208 5218
5209 5219 @command(
5210 5220 'root', [], intents={INTENT_READONLY},
5211 5221 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5212 5222 def root(ui, repo):
5213 5223 """print the root (top) of the current working directory
5214 5224
5215 5225 Print the root directory of the current repository.
5216 5226
5217 5227 Returns 0 on success.
5218 5228 """
5219 5229 ui.write(repo.root + "\n")
5220 5230
5221 5231 @command('serve',
5222 5232 [('A', 'accesslog', '', _('name of access log file to write to'),
5223 5233 _('FILE')),
5224 5234 ('d', 'daemon', None, _('run server in background')),
5225 5235 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5226 5236 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5227 5237 # use string type, then we can check if something was passed
5228 5238 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5229 5239 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5230 5240 _('ADDR')),
5231 5241 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5232 5242 _('PREFIX')),
5233 5243 ('n', 'name', '',
5234 5244 _('name to show in web pages (default: working directory)'), _('NAME')),
5235 5245 ('', 'web-conf', '',
5236 5246 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5237 5247 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5238 5248 _('FILE')),
5239 5249 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5240 5250 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
5241 5251 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
5242 5252 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5243 5253 ('', 'style', '', _('template style to use'), _('STYLE')),
5244 5254 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5245 5255 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
5246 5256 ('', 'print-url', None, _('start and print only the URL'))]
5247 5257 + subrepoopts,
5248 5258 _('[OPTION]...'),
5249 5259 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5250 5260 helpbasic=True, optionalrepo=True)
5251 5261 def serve(ui, repo, **opts):
5252 5262 """start stand-alone webserver
5253 5263
5254 5264 Start a local HTTP repository browser and pull server. You can use
5255 5265 this for ad-hoc sharing and browsing of repositories. It is
5256 5266 recommended to use a real web server to serve a repository for
5257 5267 longer periods of time.
5258 5268
5259 5269 Please note that the server does not implement access control.
5260 5270 This means that, by default, anybody can read from the server and
5261 5271 nobody can write to it by default. Set the ``web.allow-push``
5262 5272 option to ``*`` to allow everybody to push to the server. You
5263 5273 should use a real web server if you need to authenticate users.
5264 5274
5265 5275 By default, the server logs accesses to stdout and errors to
5266 5276 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5267 5277 files.
5268 5278
5269 5279 To have the server choose a free port number to listen on, specify
5270 5280 a port number of 0; in this case, the server will print the port
5271 5281 number it uses.
5272 5282
5273 5283 Returns 0 on success.
5274 5284 """
5275 5285
5276 5286 opts = pycompat.byteskwargs(opts)
5277 5287 if opts["stdio"] and opts["cmdserver"]:
5278 5288 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5279 5289 if opts["print_url"] and ui.verbose:
5280 5290 raise error.Abort(_("cannot use --print-url with --verbose"))
5281 5291
5282 5292 if opts["stdio"]:
5283 5293 if repo is None:
5284 5294 raise error.RepoError(_("there is no Mercurial repository here"
5285 5295 " (.hg not found)"))
5286 5296 s = wireprotoserver.sshserver(ui, repo)
5287 5297 s.serve_forever()
5288 5298
5289 5299 service = server.createservice(ui, repo, opts)
5290 5300 return server.runservice(opts, initfn=service.init, runfn=service.run)
5291 5301
5292 5302 _NOTTERSE = 'nothing'
5293 5303
5294 5304 @command('status|st',
5295 5305 [('A', 'all', None, _('show status of all files')),
5296 5306 ('m', 'modified', None, _('show only modified files')),
5297 5307 ('a', 'added', None, _('show only added files')),
5298 5308 ('r', 'removed', None, _('show only removed files')),
5299 5309 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5300 5310 ('c', 'clean', None, _('show only files without changes')),
5301 5311 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5302 5312 ('i', 'ignored', None, _('show only ignored files')),
5303 5313 ('n', 'no-status', None, _('hide status prefix')),
5304 5314 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5305 5315 ('C', 'copies', None, _('show source of copied files')),
5306 5316 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5307 5317 ('', 'rev', [], _('show difference from revision'), _('REV')),
5308 5318 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5309 5319 ] + walkopts + subrepoopts + formatteropts,
5310 5320 _('[OPTION]... [FILE]...'),
5311 5321 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5312 5322 helpbasic=True, inferrepo=True,
5313 5323 intents={INTENT_READONLY})
5314 5324 def status(ui, repo, *pats, **opts):
5315 5325 """show changed files in the working directory
5316 5326
5317 5327 Show status of files in the repository. If names are given, only
5318 5328 files that match are shown. Files that are clean or ignored or
5319 5329 the source of a copy/move operation, are not listed unless
5320 5330 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5321 5331 Unless options described with "show only ..." are given, the
5322 5332 options -mardu are used.
5323 5333
5324 5334 Option -q/--quiet hides untracked (unknown and ignored) files
5325 5335 unless explicitly requested with -u/--unknown or -i/--ignored.
5326 5336
5327 5337 .. note::
5328 5338
5329 5339 :hg:`status` may appear to disagree with diff if permissions have
5330 5340 changed or a merge has occurred. The standard diff format does
5331 5341 not report permission changes and diff only reports changes
5332 5342 relative to one merge parent.
5333 5343
5334 5344 If one revision is given, it is used as the base revision.
5335 5345 If two revisions are given, the differences between them are
5336 5346 shown. The --change option can also be used as a shortcut to list
5337 5347 the changed files of a revision from its first parent.
5338 5348
5339 5349 The codes used to show the status of files are::
5340 5350
5341 5351 M = modified
5342 5352 A = added
5343 5353 R = removed
5344 5354 C = clean
5345 5355 ! = missing (deleted by non-hg command, but still tracked)
5346 5356 ? = not tracked
5347 5357 I = ignored
5348 5358 = origin of the previous file (with --copies)
5349 5359
5350 5360 .. container:: verbose
5351 5361
5352 5362 The -t/--terse option abbreviates the output by showing only the directory
5353 5363 name if all the files in it share the same status. The option takes an
5354 5364 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5355 5365 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5356 5366 for 'ignored' and 'c' for clean.
5357 5367
5358 5368 It abbreviates only those statuses which are passed. Note that clean and
5359 5369 ignored files are not displayed with '--terse ic' unless the -c/--clean
5360 5370 and -i/--ignored options are also used.
5361 5371
5362 5372 The -v/--verbose option shows information when the repository is in an
5363 5373 unfinished merge, shelve, rebase state etc. You can have this behavior
5364 5374 turned on by default by enabling the ``commands.status.verbose`` option.
5365 5375
5366 5376 You can skip displaying some of these states by setting
5367 5377 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5368 5378 'histedit', 'merge', 'rebase', or 'unshelve'.
5369 5379
5370 5380 Template:
5371 5381
5372 5382 The following keywords are supported in addition to the common template
5373 5383 keywords and functions. See also :hg:`help templates`.
5374 5384
5375 5385 :path: String. Repository-absolute path of the file.
5376 5386 :source: String. Repository-absolute path of the file originated from.
5377 5387 Available if ``--copies`` is specified.
5378 5388 :status: String. Character denoting file's status.
5379 5389
5380 5390 Examples:
5381 5391
5382 5392 - show changes in the working directory relative to a
5383 5393 changeset::
5384 5394
5385 5395 hg status --rev 9353
5386 5396
5387 5397 - show changes in the working directory relative to the
5388 5398 current directory (see :hg:`help patterns` for more information)::
5389 5399
5390 5400 hg status re:
5391 5401
5392 5402 - show all changes including copies in an existing changeset::
5393 5403
5394 5404 hg status --copies --change 9353
5395 5405
5396 5406 - get a NUL separated list of added files, suitable for xargs::
5397 5407
5398 5408 hg status -an0
5399 5409
5400 5410 - show more information about the repository status, abbreviating
5401 5411 added, removed, modified, deleted, and untracked paths::
5402 5412
5403 5413 hg status -v -t mardu
5404 5414
5405 5415 Returns 0 on success.
5406 5416
5407 5417 """
5408 5418
5409 5419 opts = pycompat.byteskwargs(opts)
5410 5420 revs = opts.get('rev')
5411 5421 change = opts.get('change')
5412 5422 terse = opts.get('terse')
5413 5423 if terse is _NOTTERSE:
5414 5424 if revs:
5415 5425 terse = ''
5416 5426 else:
5417 5427 terse = ui.config('commands', 'status.terse')
5418 5428
5419 5429 if revs and change:
5420 5430 msg = _('cannot specify --rev and --change at the same time')
5421 5431 raise error.Abort(msg)
5422 5432 elif revs and terse:
5423 5433 msg = _('cannot use --terse with --rev')
5424 5434 raise error.Abort(msg)
5425 5435 elif change:
5426 5436 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5427 5437 ctx2 = scmutil.revsingle(repo, change, None)
5428 5438 ctx1 = ctx2.p1()
5429 5439 else:
5430 5440 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5431 5441 ctx1, ctx2 = scmutil.revpair(repo, revs)
5432 5442
5433 5443 forcerelativevalue = None
5434 5444 if ui.hasconfig('commands', 'status.relative'):
5435 5445 forcerelativevalue = ui.configbool('commands', 'status.relative')
5436 5446 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats),
5437 5447 forcerelativevalue=forcerelativevalue)
5438 5448
5439 5449 if opts.get('print0'):
5440 5450 end = '\0'
5441 5451 else:
5442 5452 end = '\n'
5443 5453 copy = {}
5444 5454 states = 'modified added removed deleted unknown ignored clean'.split()
5445 5455 show = [k for k in states if opts.get(k)]
5446 5456 if opts.get('all'):
5447 5457 show += ui.quiet and (states[:4] + ['clean']) or states
5448 5458
5449 5459 if not show:
5450 5460 if ui.quiet:
5451 5461 show = states[:4]
5452 5462 else:
5453 5463 show = states[:5]
5454 5464
5455 5465 m = scmutil.match(ctx2, pats, opts)
5456 5466 if terse:
5457 5467 # we need to compute clean and unknown to terse
5458 5468 stat = repo.status(ctx1.node(), ctx2.node(), m,
5459 5469 'ignored' in show or 'i' in terse,
5460 5470 clean=True, unknown=True,
5461 5471 listsubrepos=opts.get('subrepos'))
5462 5472
5463 5473 stat = cmdutil.tersedir(stat, terse)
5464 5474 else:
5465 5475 stat = repo.status(ctx1.node(), ctx2.node(), m,
5466 5476 'ignored' in show, 'clean' in show,
5467 5477 'unknown' in show, opts.get('subrepos'))
5468 5478
5469 5479 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5470 5480
5471 5481 if (opts.get('all') or opts.get('copies')
5472 5482 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5473 5483 copy = copies.pathcopies(ctx1, ctx2, m)
5474 5484
5475 5485 ui.pager('status')
5476 5486 fm = ui.formatter('status', opts)
5477 5487 fmt = '%s' + end
5478 5488 showchar = not opts.get('no_status')
5479 5489
5480 5490 for state, char, files in changestates:
5481 5491 if state in show:
5482 5492 label = 'status.' + state
5483 5493 for f in files:
5484 5494 fm.startitem()
5485 5495 fm.context(ctx=ctx2)
5486 5496 fm.data(path=f)
5487 5497 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5488 5498 fm.plain(fmt % uipathfn(f), label=label)
5489 5499 if f in copy:
5490 5500 fm.data(source=copy[f])
5491 5501 fm.plain((' %s' + end) % uipathfn(copy[f]),
5492 5502 label='status.copied')
5493 5503
5494 5504 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5495 5505 and not ui.plain()):
5496 5506 cmdutil.morestatus(repo, fm)
5497 5507 fm.end()
5498 5508
5499 5509 @command('summary|sum',
5500 5510 [('', 'remote', None, _('check for push and pull'))],
5501 5511 '[--remote]',
5502 5512 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5503 5513 helpbasic=True,
5504 5514 intents={INTENT_READONLY})
5505 5515 def summary(ui, repo, **opts):
5506 5516 """summarize working directory state
5507 5517
5508 5518 This generates a brief summary of the working directory state,
5509 5519 including parents, branch, commit status, phase and available updates.
5510 5520
5511 5521 With the --remote option, this will check the default paths for
5512 5522 incoming and outgoing changes. This can be time-consuming.
5513 5523
5514 5524 Returns 0 on success.
5515 5525 """
5516 5526
5517 5527 opts = pycompat.byteskwargs(opts)
5518 5528 ui.pager('summary')
5519 5529 ctx = repo[None]
5520 5530 parents = ctx.parents()
5521 5531 pnode = parents[0].node()
5522 5532 marks = []
5523 5533
5524 5534 try:
5525 5535 ms = mergemod.mergestate.read(repo)
5526 5536 except error.UnsupportedMergeRecords as e:
5527 5537 s = ' '.join(e.recordtypes)
5528 5538 ui.warn(
5529 5539 _('warning: merge state has unsupported record types: %s\n') % s)
5530 5540 unresolved = []
5531 5541 else:
5532 5542 unresolved = list(ms.unresolved())
5533 5543
5534 5544 for p in parents:
5535 5545 # label with log.changeset (instead of log.parent) since this
5536 5546 # shows a working directory parent *changeset*:
5537 5547 # i18n: column positioning for "hg summary"
5538 5548 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5539 5549 label=logcmdutil.changesetlabels(p))
5540 5550 ui.write(' '.join(p.tags()), label='log.tag')
5541 5551 if p.bookmarks():
5542 5552 marks.extend(p.bookmarks())
5543 5553 if p.rev() == -1:
5544 5554 if not len(repo):
5545 5555 ui.write(_(' (empty repository)'))
5546 5556 else:
5547 5557 ui.write(_(' (no revision checked out)'))
5548 5558 if p.obsolete():
5549 5559 ui.write(_(' (obsolete)'))
5550 5560 if p.isunstable():
5551 5561 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5552 5562 for instability in p.instabilities())
5553 5563 ui.write(' ('
5554 5564 + ', '.join(instabilities)
5555 5565 + ')')
5556 5566 ui.write('\n')
5557 5567 if p.description():
5558 5568 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5559 5569 label='log.summary')
5560 5570
5561 5571 branch = ctx.branch()
5562 5572 bheads = repo.branchheads(branch)
5563 5573 # i18n: column positioning for "hg summary"
5564 5574 m = _('branch: %s\n') % branch
5565 5575 if branch != 'default':
5566 5576 ui.write(m, label='log.branch')
5567 5577 else:
5568 5578 ui.status(m, label='log.branch')
5569 5579
5570 5580 if marks:
5571 5581 active = repo._activebookmark
5572 5582 # i18n: column positioning for "hg summary"
5573 5583 ui.write(_('bookmarks:'), label='log.bookmark')
5574 5584 if active is not None:
5575 5585 if active in marks:
5576 5586 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5577 5587 marks.remove(active)
5578 5588 else:
5579 5589 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5580 5590 for m in marks:
5581 5591 ui.write(' ' + m, label='log.bookmark')
5582 5592 ui.write('\n', label='log.bookmark')
5583 5593
5584 5594 status = repo.status(unknown=True)
5585 5595
5586 5596 c = repo.dirstate.copies()
5587 5597 copied, renamed = [], []
5588 5598 for d, s in c.iteritems():
5589 5599 if s in status.removed:
5590 5600 status.removed.remove(s)
5591 5601 renamed.append(d)
5592 5602 else:
5593 5603 copied.append(d)
5594 5604 if d in status.added:
5595 5605 status.added.remove(d)
5596 5606
5597 5607 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5598 5608
5599 5609 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5600 5610 (ui.label(_('%d added'), 'status.added'), status.added),
5601 5611 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5602 5612 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5603 5613 (ui.label(_('%d copied'), 'status.copied'), copied),
5604 5614 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5605 5615 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5606 5616 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5607 5617 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5608 5618 t = []
5609 5619 for l, s in labels:
5610 5620 if s:
5611 5621 t.append(l % len(s))
5612 5622
5613 5623 t = ', '.join(t)
5614 5624 cleanworkdir = False
5615 5625
5616 5626 if repo.vfs.exists('graftstate'):
5617 5627 t += _(' (graft in progress)')
5618 5628 if repo.vfs.exists('updatestate'):
5619 5629 t += _(' (interrupted update)')
5620 5630 elif len(parents) > 1:
5621 5631 t += _(' (merge)')
5622 5632 elif branch != parents[0].branch():
5623 5633 t += _(' (new branch)')
5624 5634 elif (parents[0].closesbranch() and
5625 5635 pnode in repo.branchheads(branch, closed=True)):
5626 5636 t += _(' (head closed)')
5627 5637 elif not (status.modified or status.added or status.removed or renamed or
5628 5638 copied or subs):
5629 5639 t += _(' (clean)')
5630 5640 cleanworkdir = True
5631 5641 elif pnode not in bheads:
5632 5642 t += _(' (new branch head)')
5633 5643
5634 5644 if parents:
5635 5645 pendingphase = max(p.phase() for p in parents)
5636 5646 else:
5637 5647 pendingphase = phases.public
5638 5648
5639 5649 if pendingphase > phases.newcommitphase(ui):
5640 5650 t += ' (%s)' % phases.phasenames[pendingphase]
5641 5651
5642 5652 if cleanworkdir:
5643 5653 # i18n: column positioning for "hg summary"
5644 5654 ui.status(_('commit: %s\n') % t.strip())
5645 5655 else:
5646 5656 # i18n: column positioning for "hg summary"
5647 5657 ui.write(_('commit: %s\n') % t.strip())
5648 5658
5649 5659 # all ancestors of branch heads - all ancestors of parent = new csets
5650 5660 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5651 5661 bheads))
5652 5662
5653 5663 if new == 0:
5654 5664 # i18n: column positioning for "hg summary"
5655 5665 ui.status(_('update: (current)\n'))
5656 5666 elif pnode not in bheads:
5657 5667 # i18n: column positioning for "hg summary"
5658 5668 ui.write(_('update: %d new changesets (update)\n') % new)
5659 5669 else:
5660 5670 # i18n: column positioning for "hg summary"
5661 5671 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5662 5672 (new, len(bheads)))
5663 5673
5664 5674 t = []
5665 5675 draft = len(repo.revs('draft()'))
5666 5676 if draft:
5667 5677 t.append(_('%d draft') % draft)
5668 5678 secret = len(repo.revs('secret()'))
5669 5679 if secret:
5670 5680 t.append(_('%d secret') % secret)
5671 5681
5672 5682 if draft or secret:
5673 5683 ui.status(_('phases: %s\n') % ', '.join(t))
5674 5684
5675 5685 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5676 5686 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5677 5687 numtrouble = len(repo.revs(trouble + "()"))
5678 5688 # We write all the possibilities to ease translation
5679 5689 troublemsg = {
5680 5690 "orphan": _("orphan: %d changesets"),
5681 5691 "contentdivergent": _("content-divergent: %d changesets"),
5682 5692 "phasedivergent": _("phase-divergent: %d changesets"),
5683 5693 }
5684 5694 if numtrouble > 0:
5685 5695 ui.status(troublemsg[trouble] % numtrouble + "\n")
5686 5696
5687 5697 cmdutil.summaryhooks(ui, repo)
5688 5698
5689 5699 if opts.get('remote'):
5690 5700 needsincoming, needsoutgoing = True, True
5691 5701 else:
5692 5702 needsincoming, needsoutgoing = False, False
5693 5703 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5694 5704 if i:
5695 5705 needsincoming = True
5696 5706 if o:
5697 5707 needsoutgoing = True
5698 5708 if not needsincoming and not needsoutgoing:
5699 5709 return
5700 5710
5701 5711 def getincoming():
5702 5712 source, branches = hg.parseurl(ui.expandpath('default'))
5703 5713 sbranch = branches[0]
5704 5714 try:
5705 5715 other = hg.peer(repo, {}, source)
5706 5716 except error.RepoError:
5707 5717 if opts.get('remote'):
5708 5718 raise
5709 5719 return source, sbranch, None, None, None
5710 5720 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5711 5721 if revs:
5712 5722 revs = [other.lookup(rev) for rev in revs]
5713 5723 ui.debug('comparing with %s\n' % util.hidepassword(source))
5714 5724 repo.ui.pushbuffer()
5715 5725 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5716 5726 repo.ui.popbuffer()
5717 5727 return source, sbranch, other, commoninc, commoninc[1]
5718 5728
5719 5729 if needsincoming:
5720 5730 source, sbranch, sother, commoninc, incoming = getincoming()
5721 5731 else:
5722 5732 source = sbranch = sother = commoninc = incoming = None
5723 5733
5724 5734 def getoutgoing():
5725 5735 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5726 5736 dbranch = branches[0]
5727 5737 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5728 5738 if source != dest:
5729 5739 try:
5730 5740 dother = hg.peer(repo, {}, dest)
5731 5741 except error.RepoError:
5732 5742 if opts.get('remote'):
5733 5743 raise
5734 5744 return dest, dbranch, None, None
5735 5745 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5736 5746 elif sother is None:
5737 5747 # there is no explicit destination peer, but source one is invalid
5738 5748 return dest, dbranch, None, None
5739 5749 else:
5740 5750 dother = sother
5741 5751 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5742 5752 common = None
5743 5753 else:
5744 5754 common = commoninc
5745 5755 if revs:
5746 5756 revs = [repo.lookup(rev) for rev in revs]
5747 5757 repo.ui.pushbuffer()
5748 5758 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5749 5759 commoninc=common)
5750 5760 repo.ui.popbuffer()
5751 5761 return dest, dbranch, dother, outgoing
5752 5762
5753 5763 if needsoutgoing:
5754 5764 dest, dbranch, dother, outgoing = getoutgoing()
5755 5765 else:
5756 5766 dest = dbranch = dother = outgoing = None
5757 5767
5758 5768 if opts.get('remote'):
5759 5769 t = []
5760 5770 if incoming:
5761 5771 t.append(_('1 or more incoming'))
5762 5772 o = outgoing.missing
5763 5773 if o:
5764 5774 t.append(_('%d outgoing') % len(o))
5765 5775 other = dother or sother
5766 5776 if 'bookmarks' in other.listkeys('namespaces'):
5767 5777 counts = bookmarks.summary(repo, other)
5768 5778 if counts[0] > 0:
5769 5779 t.append(_('%d incoming bookmarks') % counts[0])
5770 5780 if counts[1] > 0:
5771 5781 t.append(_('%d outgoing bookmarks') % counts[1])
5772 5782
5773 5783 if t:
5774 5784 # i18n: column positioning for "hg summary"
5775 5785 ui.write(_('remote: %s\n') % (', '.join(t)))
5776 5786 else:
5777 5787 # i18n: column positioning for "hg summary"
5778 5788 ui.status(_('remote: (synced)\n'))
5779 5789
5780 5790 cmdutil.summaryremotehooks(ui, repo, opts,
5781 5791 ((source, sbranch, sother, commoninc),
5782 5792 (dest, dbranch, dother, outgoing)))
5783 5793
5784 5794 @command('tag',
5785 5795 [('f', 'force', None, _('force tag')),
5786 5796 ('l', 'local', None, _('make the tag local')),
5787 5797 ('r', 'rev', '', _('revision to tag'), _('REV')),
5788 5798 ('', 'remove', None, _('remove a tag')),
5789 5799 # -l/--local is already there, commitopts cannot be used
5790 5800 ('e', 'edit', None, _('invoke editor on commit messages')),
5791 5801 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5792 5802 ] + commitopts2,
5793 5803 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
5794 5804 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
5795 5805 def tag(ui, repo, name1, *names, **opts):
5796 5806 """add one or more tags for the current or given revision
5797 5807
5798 5808 Name a particular revision using <name>.
5799 5809
5800 5810 Tags are used to name particular revisions of the repository and are
5801 5811 very useful to compare different revisions, to go back to significant
5802 5812 earlier versions or to mark branch points as releases, etc. Changing
5803 5813 an existing tag is normally disallowed; use -f/--force to override.
5804 5814
5805 5815 If no revision is given, the parent of the working directory is
5806 5816 used.
5807 5817
5808 5818 To facilitate version control, distribution, and merging of tags,
5809 5819 they are stored as a file named ".hgtags" which is managed similarly
5810 5820 to other project files and can be hand-edited if necessary. This
5811 5821 also means that tagging creates a new commit. The file
5812 5822 ".hg/localtags" is used for local tags (not shared among
5813 5823 repositories).
5814 5824
5815 5825 Tag commits are usually made at the head of a branch. If the parent
5816 5826 of the working directory is not a branch head, :hg:`tag` aborts; use
5817 5827 -f/--force to force the tag commit to be based on a non-head
5818 5828 changeset.
5819 5829
5820 5830 See :hg:`help dates` for a list of formats valid for -d/--date.
5821 5831
5822 5832 Since tag names have priority over branch names during revision
5823 5833 lookup, using an existing branch name as a tag name is discouraged.
5824 5834
5825 5835 Returns 0 on success.
5826 5836 """
5827 5837 opts = pycompat.byteskwargs(opts)
5828 5838 with repo.wlock(), repo.lock():
5829 5839 rev_ = "."
5830 5840 names = [t.strip() for t in (name1,) + names]
5831 5841 if len(names) != len(set(names)):
5832 5842 raise error.Abort(_('tag names must be unique'))
5833 5843 for n in names:
5834 5844 scmutil.checknewlabel(repo, n, 'tag')
5835 5845 if not n:
5836 5846 raise error.Abort(_('tag names cannot consist entirely of '
5837 5847 'whitespace'))
5838 5848 if opts.get('rev') and opts.get('remove'):
5839 5849 raise error.Abort(_("--rev and --remove are incompatible"))
5840 5850 if opts.get('rev'):
5841 5851 rev_ = opts['rev']
5842 5852 message = opts.get('message')
5843 5853 if opts.get('remove'):
5844 5854 if opts.get('local'):
5845 5855 expectedtype = 'local'
5846 5856 else:
5847 5857 expectedtype = 'global'
5848 5858
5849 5859 for n in names:
5850 5860 if repo.tagtype(n) == 'global':
5851 5861 alltags = tagsmod.findglobaltags(ui, repo)
5852 5862 if alltags[n][0] == nullid:
5853 5863 raise error.Abort(_("tag '%s' is already removed") % n)
5854 5864 if not repo.tagtype(n):
5855 5865 raise error.Abort(_("tag '%s' does not exist") % n)
5856 5866 if repo.tagtype(n) != expectedtype:
5857 5867 if expectedtype == 'global':
5858 5868 raise error.Abort(_("tag '%s' is not a global tag") % n)
5859 5869 else:
5860 5870 raise error.Abort(_("tag '%s' is not a local tag") % n)
5861 5871 rev_ = 'null'
5862 5872 if not message:
5863 5873 # we don't translate commit messages
5864 5874 message = 'Removed tag %s' % ', '.join(names)
5865 5875 elif not opts.get('force'):
5866 5876 for n in names:
5867 5877 if n in repo.tags():
5868 5878 raise error.Abort(_("tag '%s' already exists "
5869 5879 "(use -f to force)") % n)
5870 5880 if not opts.get('local'):
5871 5881 p1, p2 = repo.dirstate.parents()
5872 5882 if p2 != nullid:
5873 5883 raise error.Abort(_('uncommitted merge'))
5874 5884 bheads = repo.branchheads()
5875 5885 if not opts.get('force') and bheads and p1 not in bheads:
5876 5886 raise error.Abort(_('working directory is not at a branch head '
5877 5887 '(use -f to force)'))
5878 5888 node = scmutil.revsingle(repo, rev_).node()
5879 5889
5880 5890 if not message:
5881 5891 # we don't translate commit messages
5882 5892 message = ('Added tag %s for changeset %s' %
5883 5893 (', '.join(names), short(node)))
5884 5894
5885 5895 date = opts.get('date')
5886 5896 if date:
5887 5897 date = dateutil.parsedate(date)
5888 5898
5889 5899 if opts.get('remove'):
5890 5900 editform = 'tag.remove'
5891 5901 else:
5892 5902 editform = 'tag.add'
5893 5903 editor = cmdutil.getcommiteditor(editform=editform,
5894 5904 **pycompat.strkwargs(opts))
5895 5905
5896 5906 # don't allow tagging the null rev
5897 5907 if (not opts.get('remove') and
5898 5908 scmutil.revsingle(repo, rev_).rev() == nullrev):
5899 5909 raise error.Abort(_("cannot tag null revision"))
5900 5910
5901 5911 tagsmod.tag(repo, names, node, message, opts.get('local'),
5902 5912 opts.get('user'), date, editor=editor)
5903 5913
5904 5914 @command(
5905 5915 'tags', formatteropts, '',
5906 5916 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5907 5917 intents={INTENT_READONLY})
5908 5918 def tags(ui, repo, **opts):
5909 5919 """list repository tags
5910 5920
5911 5921 This lists both regular and local tags. When the -v/--verbose
5912 5922 switch is used, a third column "local" is printed for local tags.
5913 5923 When the -q/--quiet switch is used, only the tag name is printed.
5914 5924
5915 5925 .. container:: verbose
5916 5926
5917 5927 Template:
5918 5928
5919 5929 The following keywords are supported in addition to the common template
5920 5930 keywords and functions such as ``{tag}``. See also
5921 5931 :hg:`help templates`.
5922 5932
5923 5933 :type: String. ``local`` for local tags.
5924 5934
5925 5935 Returns 0 on success.
5926 5936 """
5927 5937
5928 5938 opts = pycompat.byteskwargs(opts)
5929 5939 ui.pager('tags')
5930 5940 fm = ui.formatter('tags', opts)
5931 5941 hexfunc = fm.hexfunc
5932 5942
5933 5943 for t, n in reversed(repo.tagslist()):
5934 5944 hn = hexfunc(n)
5935 5945 label = 'tags.normal'
5936 5946 tagtype = ''
5937 5947 if repo.tagtype(t) == 'local':
5938 5948 label = 'tags.local'
5939 5949 tagtype = 'local'
5940 5950
5941 5951 fm.startitem()
5942 5952 fm.context(repo=repo)
5943 5953 fm.write('tag', '%s', t, label=label)
5944 5954 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5945 5955 fm.condwrite(not ui.quiet, 'rev node', fmt,
5946 5956 repo.changelog.rev(n), hn, label=label)
5947 5957 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5948 5958 tagtype, label=label)
5949 5959 fm.plain('\n')
5950 5960 fm.end()
5951 5961
5952 5962 @command('tip',
5953 5963 [('p', 'patch', None, _('show patch')),
5954 5964 ('g', 'git', None, _('use git extended diff format')),
5955 5965 ] + templateopts,
5956 5966 _('[-p] [-g]'),
5957 5967 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
5958 5968 def tip(ui, repo, **opts):
5959 5969 """show the tip revision (DEPRECATED)
5960 5970
5961 5971 The tip revision (usually just called the tip) is the changeset
5962 5972 most recently added to the repository (and therefore the most
5963 5973 recently changed head).
5964 5974
5965 5975 If you have just made a commit, that commit will be the tip. If
5966 5976 you have just pulled changes from another repository, the tip of
5967 5977 that repository becomes the current tip. The "tip" tag is special
5968 5978 and cannot be renamed or assigned to a different changeset.
5969 5979
5970 5980 This command is deprecated, please use :hg:`heads` instead.
5971 5981
5972 5982 Returns 0 on success.
5973 5983 """
5974 5984 opts = pycompat.byteskwargs(opts)
5975 5985 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5976 5986 displayer.show(repo['tip'])
5977 5987 displayer.close()
5978 5988
5979 5989 @command('unbundle',
5980 5990 [('u', 'update', None,
5981 5991 _('update to new branch head if changesets were unbundled'))],
5982 5992 _('[-u] FILE...'),
5983 5993 helpcategory=command.CATEGORY_IMPORT_EXPORT)
5984 5994 def unbundle(ui, repo, fname1, *fnames, **opts):
5985 5995 """apply one or more bundle files
5986 5996
5987 5997 Apply one or more bundle files generated by :hg:`bundle`.
5988 5998
5989 5999 Returns 0 on success, 1 if an update has unresolved files.
5990 6000 """
5991 6001 fnames = (fname1,) + fnames
5992 6002
5993 6003 with repo.lock():
5994 6004 for fname in fnames:
5995 6005 f = hg.openpath(ui, fname)
5996 6006 gen = exchange.readbundle(ui, f, fname)
5997 6007 if isinstance(gen, streamclone.streamcloneapplier):
5998 6008 raise error.Abort(
5999 6009 _('packed bundles cannot be applied with '
6000 6010 '"hg unbundle"'),
6001 6011 hint=_('use "hg debugapplystreamclonebundle"'))
6002 6012 url = 'bundle:' + fname
6003 6013 try:
6004 6014 txnname = 'unbundle'
6005 6015 if not isinstance(gen, bundle2.unbundle20):
6006 6016 txnname = 'unbundle\n%s' % util.hidepassword(url)
6007 6017 with repo.transaction(txnname) as tr:
6008 6018 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6009 6019 url=url)
6010 6020 except error.BundleUnknownFeatureError as exc:
6011 6021 raise error.Abort(
6012 6022 _('%s: unknown bundle feature, %s') % (fname, exc),
6013 6023 hint=_("see https://mercurial-scm.org/"
6014 6024 "wiki/BundleFeature for more "
6015 6025 "information"))
6016 6026 modheads = bundle2.combinechangegroupresults(op)
6017 6027
6018 6028 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
6019 6029
6020 6030 @command('update|up|checkout|co',
6021 6031 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6022 6032 ('c', 'check', None, _('require clean working directory')),
6023 6033 ('m', 'merge', None, _('merge uncommitted changes')),
6024 6034 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6025 6035 ('r', 'rev', '', _('revision'), _('REV'))
6026 6036 ] + mergetoolopts,
6027 6037 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
6028 6038 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6029 6039 helpbasic=True)
6030 6040 def update(ui, repo, node=None, **opts):
6031 6041 """update working directory (or switch revisions)
6032 6042
6033 6043 Update the repository's working directory to the specified
6034 6044 changeset. If no changeset is specified, update to the tip of the
6035 6045 current named branch and move the active bookmark (see :hg:`help
6036 6046 bookmarks`).
6037 6047
6038 6048 Update sets the working directory's parent revision to the specified
6039 6049 changeset (see :hg:`help parents`).
6040 6050
6041 6051 If the changeset is not a descendant or ancestor of the working
6042 6052 directory's parent and there are uncommitted changes, the update is
6043 6053 aborted. With the -c/--check option, the working directory is checked
6044 6054 for uncommitted changes; if none are found, the working directory is
6045 6055 updated to the specified changeset.
6046 6056
6047 6057 .. container:: verbose
6048 6058
6049 6059 The -C/--clean, -c/--check, and -m/--merge options control what
6050 6060 happens if the working directory contains uncommitted changes.
6051 6061 At most of one of them can be specified.
6052 6062
6053 6063 1. If no option is specified, and if
6054 6064 the requested changeset is an ancestor or descendant of
6055 6065 the working directory's parent, the uncommitted changes
6056 6066 are merged into the requested changeset and the merged
6057 6067 result is left uncommitted. If the requested changeset is
6058 6068 not an ancestor or descendant (that is, it is on another
6059 6069 branch), the update is aborted and the uncommitted changes
6060 6070 are preserved.
6061 6071
6062 6072 2. With the -m/--merge option, the update is allowed even if the
6063 6073 requested changeset is not an ancestor or descendant of
6064 6074 the working directory's parent.
6065 6075
6066 6076 3. With the -c/--check option, the update is aborted and the
6067 6077 uncommitted changes are preserved.
6068 6078
6069 6079 4. With the -C/--clean option, uncommitted changes are discarded and
6070 6080 the working directory is updated to the requested changeset.
6071 6081
6072 6082 To cancel an uncommitted merge (and lose your changes), use
6073 6083 :hg:`merge --abort`.
6074 6084
6075 6085 Use null as the changeset to remove the working directory (like
6076 6086 :hg:`clone -U`).
6077 6087
6078 6088 If you want to revert just one file to an older revision, use
6079 6089 :hg:`revert [-r REV] NAME`.
6080 6090
6081 6091 See :hg:`help dates` for a list of formats valid for -d/--date.
6082 6092
6083 6093 Returns 0 on success, 1 if there are unresolved files.
6084 6094 """
6085 6095 rev = opts.get(r'rev')
6086 6096 date = opts.get(r'date')
6087 6097 clean = opts.get(r'clean')
6088 6098 check = opts.get(r'check')
6089 6099 merge = opts.get(r'merge')
6090 6100 if rev and node:
6091 6101 raise error.Abort(_("please specify just one revision"))
6092 6102
6093 6103 if ui.configbool('commands', 'update.requiredest'):
6094 6104 if not node and not rev and not date:
6095 6105 raise error.Abort(_('you must specify a destination'),
6096 6106 hint=_('for example: hg update ".::"'))
6097 6107
6098 6108 if rev is None or rev == '':
6099 6109 rev = node
6100 6110
6101 6111 if date and rev is not None:
6102 6112 raise error.Abort(_("you can't specify a revision and a date"))
6103 6113
6104 6114 if len([x for x in (clean, check, merge) if x]) > 1:
6105 6115 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
6106 6116 "or -m/--merge"))
6107 6117
6108 6118 updatecheck = None
6109 6119 if check:
6110 6120 updatecheck = 'abort'
6111 6121 elif merge:
6112 6122 updatecheck = 'none'
6113 6123
6114 6124 with repo.wlock():
6115 6125 cmdutil.clearunfinished(repo)
6116 6126
6117 6127 if date:
6118 6128 rev = cmdutil.finddate(ui, repo, date)
6119 6129
6120 6130 # if we defined a bookmark, we have to remember the original name
6121 6131 brev = rev
6122 6132 if rev:
6123 6133 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
6124 6134 ctx = scmutil.revsingle(repo, rev, default=None)
6125 6135 rev = ctx.rev()
6126 6136 hidden = ctx.hidden()
6127 6137 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
6128 6138 with ui.configoverride(overrides, 'update'):
6129 6139 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
6130 6140 updatecheck=updatecheck)
6131 6141 if hidden:
6132 6142 ctxstr = ctx.hex()[:12]
6133 6143 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
6134 6144
6135 6145 if ctx.obsolete():
6136 6146 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
6137 6147 ui.warn("(%s)\n" % obsfatemsg)
6138 6148 return ret
6139 6149
6140 6150 @command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
6141 6151 def verify(ui, repo):
6142 6152 """verify the integrity of the repository
6143 6153
6144 6154 Verify the integrity of the current repository.
6145 6155
6146 6156 This will perform an extensive check of the repository's
6147 6157 integrity, validating the hashes and checksums of each entry in
6148 6158 the changelog, manifest, and tracked files, as well as the
6149 6159 integrity of their crosslinks and indices.
6150 6160
6151 6161 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6152 6162 for more information about recovery from corruption of the
6153 6163 repository.
6154 6164
6155 6165 Returns 0 on success, 1 if errors are encountered.
6156 6166 """
6157 6167 return hg.verify(repo)
6158 6168
6159 6169 @command(
6160 6170 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
6161 6171 norepo=True, intents={INTENT_READONLY})
6162 6172 def version_(ui, **opts):
6163 6173 """output version and copyright information
6164 6174
6165 6175 .. container:: verbose
6166 6176
6167 6177 Template:
6168 6178
6169 6179 The following keywords are supported. See also :hg:`help templates`.
6170 6180
6171 6181 :extensions: List of extensions.
6172 6182 :ver: String. Version number.
6173 6183
6174 6184 And each entry of ``{extensions}`` provides the following sub-keywords
6175 6185 in addition to ``{ver}``.
6176 6186
6177 6187 :bundled: Boolean. True if included in the release.
6178 6188 :name: String. Extension name.
6179 6189 """
6180 6190 opts = pycompat.byteskwargs(opts)
6181 6191 if ui.verbose:
6182 6192 ui.pager('version')
6183 6193 fm = ui.formatter("version", opts)
6184 6194 fm.startitem()
6185 6195 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6186 6196 util.version())
6187 6197 license = _(
6188 6198 "(see https://mercurial-scm.org for more information)\n"
6189 6199 "\nCopyright (C) 2005-2019 Matt Mackall and others\n"
6190 6200 "This is free software; see the source for copying conditions. "
6191 6201 "There is NO\nwarranty; "
6192 6202 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6193 6203 )
6194 6204 if not ui.quiet:
6195 6205 fm.plain(license)
6196 6206
6197 6207 if ui.verbose:
6198 6208 fm.plain(_("\nEnabled extensions:\n\n"))
6199 6209 # format names and versions into columns
6200 6210 names = []
6201 6211 vers = []
6202 6212 isinternals = []
6203 6213 for name, module in extensions.extensions():
6204 6214 names.append(name)
6205 6215 vers.append(extensions.moduleversion(module) or None)
6206 6216 isinternals.append(extensions.ismoduleinternal(module))
6207 6217 fn = fm.nested("extensions", tmpl='{name}\n')
6208 6218 if names:
6209 6219 namefmt = " %%-%ds " % max(len(n) for n in names)
6210 6220 places = [_("external"), _("internal")]
6211 6221 for n, v, p in zip(names, vers, isinternals):
6212 6222 fn.startitem()
6213 6223 fn.condwrite(ui.verbose, "name", namefmt, n)
6214 6224 if ui.verbose:
6215 6225 fn.plain("%s " % places[p])
6216 6226 fn.data(bundled=p)
6217 6227 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6218 6228 if ui.verbose:
6219 6229 fn.plain("\n")
6220 6230 fn.end()
6221 6231 fm.end()
6222 6232
6223 6233 def loadcmdtable(ui, name, cmdtable):
6224 6234 """Load command functions from specified cmdtable
6225 6235 """
6226 6236 cmdtable = cmdtable.copy()
6227 6237 for cmd in list(cmdtable):
6228 6238 if not cmd.startswith('^'):
6229 6239 continue
6230 6240 ui.deprecwarn("old-style command registration '%s' in extension '%s'"
6231 6241 % (cmd, name), '4.8')
6232 6242 entry = cmdtable.pop(cmd)
6233 6243 entry[0].helpbasic = True
6234 6244 cmdtable[cmd[1:]] = entry
6235 6245
6236 6246 overrides = [cmd for cmd in cmdtable if cmd in table]
6237 6247 if overrides:
6238 6248 ui.warn(_("extension '%s' overrides commands: %s\n")
6239 6249 % (name, " ".join(overrides)))
6240 6250 table.update(cmdtable)
@@ -1,414 +1,414 b''
1 1 Show all commands except debug commands
2 2 $ hg debugcomplete
3 3 add
4 4 addremove
5 5 annotate
6 6 archive
7 7 backout
8 8 bisect
9 9 bookmarks
10 10 branch
11 11 branches
12 12 bundle
13 13 cat
14 14 clone
15 15 commit
16 16 config
17 17 copy
18 18 diff
19 19 export
20 20 files
21 21 forget
22 22 graft
23 23 grep
24 24 heads
25 25 help
26 26 identify
27 27 import
28 28 incoming
29 29 init
30 30 locate
31 31 log
32 32 manifest
33 33 merge
34 34 outgoing
35 35 parents
36 36 paths
37 37 phase
38 38 pull
39 39 push
40 40 recover
41 41 remove
42 42 rename
43 43 resolve
44 44 revert
45 45 rollback
46 46 root
47 47 serve
48 48 status
49 49 summary
50 50 tag
51 51 tags
52 52 tip
53 53 unbundle
54 54 update
55 55 verify
56 56 version
57 57
58 58 Show all commands that start with "a"
59 59 $ hg debugcomplete a
60 60 add
61 61 addremove
62 62 annotate
63 63 archive
64 64
65 65 Do not show debug commands if there are other candidates
66 66 $ hg debugcomplete d
67 67 diff
68 68
69 69 Show debug commands if there are no other candidates
70 70 $ hg debugcomplete debug
71 71 debugancestor
72 72 debugapplystreamclonebundle
73 73 debugbuilddag
74 74 debugbundle
75 75 debugcapabilities
76 76 debugcheckstate
77 77 debugcolor
78 78 debugcommands
79 79 debugcomplete
80 80 debugconfig
81 81 debugcreatestreamclonebundle
82 82 debugdag
83 83 debugdata
84 84 debugdate
85 85 debugdeltachain
86 86 debugdirstate
87 87 debugdiscovery
88 88 debugdownload
89 89 debugextensions
90 90 debugfileset
91 91 debugformat
92 92 debugfsinfo
93 93 debuggetbundle
94 94 debugignore
95 95 debugindex
96 96 debugindexdot
97 97 debugindexstats
98 98 debuginstall
99 99 debugknown
100 100 debuglabelcomplete
101 101 debuglocks
102 102 debugmanifestfulltextcache
103 103 debugmergestate
104 104 debugnamecomplete
105 105 debugobsolete
106 106 debugp1copies
107 107 debugp2copies
108 108 debugpathcomplete
109 109 debugpathcopies
110 110 debugpeer
111 111 debugpickmergetool
112 112 debugpushkey
113 113 debugpvec
114 114 debugrebuilddirstate
115 115 debugrebuildfncache
116 116 debugrename
117 117 debugrevlog
118 118 debugrevlogindex
119 119 debugrevspec
120 120 debugserve
121 121 debugsetparents
122 122 debugssl
123 123 debugsub
124 124 debugsuccessorssets
125 125 debugtemplate
126 126 debuguigetpass
127 127 debuguiprompt
128 128 debugupdatecaches
129 129 debugupgraderepo
130 130 debugwalk
131 131 debugwhyunstable
132 132 debugwireargs
133 133 debugwireproto
134 134
135 135 Do not show the alias of a debug command if there are other candidates
136 136 (this should hide rawcommit)
137 137 $ hg debugcomplete r
138 138 recover
139 139 remove
140 140 rename
141 141 resolve
142 142 revert
143 143 rollback
144 144 root
145 145 Show the alias of a debug command if there are no other candidates
146 146 $ hg debugcomplete rawc
147 147
148 148
149 149 Show the global options
150 150 $ hg debugcomplete --options | sort
151 151 --color
152 152 --config
153 153 --cwd
154 154 --debug
155 155 --debugger
156 156 --encoding
157 157 --encodingmode
158 158 --help
159 159 --hidden
160 160 --noninteractive
161 161 --pager
162 162 --profile
163 163 --quiet
164 164 --repository
165 165 --time
166 166 --traceback
167 167 --verbose
168 168 --version
169 169 -R
170 170 -h
171 171 -q
172 172 -v
173 173 -y
174 174
175 175 Show the options for the "serve" command
176 176 $ hg debugcomplete --options serve | sort
177 177 --accesslog
178 178 --address
179 179 --certificate
180 180 --cmdserver
181 181 --color
182 182 --config
183 183 --cwd
184 184 --daemon
185 185 --daemon-postexec
186 186 --debug
187 187 --debugger
188 188 --encoding
189 189 --encodingmode
190 190 --errorlog
191 191 --help
192 192 --hidden
193 193 --ipv6
194 194 --name
195 195 --noninteractive
196 196 --pager
197 197 --pid-file
198 198 --port
199 199 --prefix
200 200 --print-url
201 201 --profile
202 202 --quiet
203 203 --repository
204 204 --stdio
205 205 --style
206 206 --subrepos
207 207 --templates
208 208 --time
209 209 --traceback
210 210 --verbose
211 211 --version
212 212 --web-conf
213 213 -6
214 214 -A
215 215 -E
216 216 -R
217 217 -S
218 218 -a
219 219 -d
220 220 -h
221 221 -n
222 222 -p
223 223 -q
224 224 -t
225 225 -v
226 226 -y
227 227
228 228 Show an error if we use --options with an ambiguous abbreviation
229 229 $ hg debugcomplete --options s
230 230 hg: command 's' is ambiguous:
231 231 serve showconfig status summary
232 232 [255]
233 233
234 234 Show all commands + options
235 235 $ hg debugcommands
236 236 add: include, exclude, subrepos, dry-run
237 237 addremove: similarity, subrepos, include, exclude, dry-run
238 238 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template
239 239 archive: no-decode, prefix, rev, type, subrepos, include, exclude
240 240 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
241 241 bisect: reset, good, bad, skip, extend, command, noupdate
242 242 bookmarks: force, rev, delete, rename, inactive, list, template
243 243 branch: force, clean, rev
244 244 branches: active, closed, rev, template
245 245 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
246 246 cat: output, rev, decode, include, exclude, template
247 247 clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
248 248 commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos
249 249 config: untrusted, edit, local, global, template
250 250 copy: after, force, include, exclude, dry-run
251 251 debugancestor:
252 252 debugapplystreamclonebundle:
253 253 debugbuilddag: mergeable-file, overwritten-file, new-file
254 254 debugbundle: all, part-type, spec
255 255 debugcapabilities:
256 256 debugcheckstate:
257 257 debugcolor: style
258 258 debugcommands:
259 259 debugcomplete: options
260 260 debugcreatestreamclonebundle:
261 261 debugdag: tags, branches, dots, spaces
262 262 debugdata: changelog, manifest, dir
263 263 debugdate: extended
264 264 debugdeltachain: changelog, manifest, dir, template
265 265 debugdirstate: nodates, dates, datesort
266 266 debugdiscovery: old, nonheads, rev, seed, ssh, remotecmd, insecure
267 267 debugdownload: output
268 268 debugextensions: template
269 269 debugfileset: rev, all-files, show-matcher, show-stage
270 270 debugformat: template
271 271 debugfsinfo:
272 272 debuggetbundle: head, common, type
273 273 debugignore:
274 274 debugindex: changelog, manifest, dir, template
275 275 debugindexdot: changelog, manifest, dir
276 276 debugindexstats:
277 277 debuginstall: template
278 278 debugknown:
279 279 debuglabelcomplete:
280 280 debuglocks: force-lock, force-wlock, set-lock, set-wlock
281 281 debugmanifestfulltextcache: clear, add
282 282 debugmergestate:
283 283 debugnamecomplete:
284 284 debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template
285 285 debugp1copies: rev
286 286 debugp2copies: rev
287 287 debugpathcomplete: full, normal, added, removed
288 288 debugpathcopies: include, exclude
289 289 debugpeer:
290 290 debugpickmergetool: rev, changedelete, include, exclude, tool
291 291 debugpushkey:
292 292 debugpvec:
293 293 debugrebuilddirstate: rev, minimal
294 294 debugrebuildfncache:
295 295 debugrename: rev
296 296 debugrevlog: changelog, manifest, dir, dump
297 297 debugrevlogindex: changelog, manifest, dir, format
298 298 debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized
299 299 debugserve: sshstdio, logiofd, logiofile
300 300 debugsetparents:
301 301 debugssl:
302 302 debugsub: rev
303 303 debugsuccessorssets: closest
304 304 debugtemplate: rev, define
305 305 debuguigetpass: prompt
306 306 debuguiprompt: prompt
307 307 debugupdatecaches:
308 308 debugupgraderepo: optimize, run, backup
309 309 debugwalk: include, exclude
310 310 debugwhyunstable:
311 311 debugwireargs: three, four, five, ssh, remotecmd, insecure
312 312 debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
313 313 diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
314 314 export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
315 315 files: rev, print0, include, exclude, template, subrepos
316 316 forget: interactive, include, exclude, dry-run
317 317 graft: rev, base, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run
318 318 grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude
319 319 heads: rev, topo, active, closed, style, template
320 320 help: extension, command, keyword, system
321 321 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
322 322 import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
323 323 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
324 324 init: ssh, remotecmd, insecure
325 325 locate: rev, print0, fullpath, include, exclude
326 326 log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
327 327 manifest: rev, all, template
328 328 merge: force, rev, preview, abort, tool
329 329 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
330 330 parents: rev, style, template
331 331 paths: template
332 332 phase: public, draft, secret, force, rev
333 333 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
334 334 push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure
335 recover:
335 recover: verify
336 336 remove: after, force, subrepos, include, exclude, dry-run
337 337 rename: after, force, include, exclude, dry-run
338 338 resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
339 339 revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
340 340 rollback: dry-run, force
341 341 root:
342 342 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
343 343 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
344 344 summary: remote
345 345 tag: force, local, rev, remove, edit, message, date, user
346 346 tags: template
347 347 tip: patch, git, style, template
348 348 unbundle: update
349 349 update: clean, check, merge, date, rev, tool
350 350 verify:
351 351 version: template
352 352
353 353 $ hg init a
354 354 $ cd a
355 355 $ echo fee > fee
356 356 $ hg ci -q -Amfee
357 357 $ hg tag fee
358 358 $ mkdir fie
359 359 $ echo dead > fie/dead
360 360 $ echo live > fie/live
361 361 $ hg bookmark fo
362 362 $ hg branch -q fie
363 363 $ hg ci -q -Amfie
364 364 $ echo fo > fo
365 365 $ hg branch -qf default
366 366 $ hg ci -q -Amfo
367 367 $ echo Fum > Fum
368 368 $ hg ci -q -AmFum
369 369 $ hg bookmark Fum
370 370
371 371 Test debugpathcomplete
372 372
373 373 $ hg debugpathcomplete f
374 374 fee
375 375 fie
376 376 fo
377 377 $ hg debugpathcomplete -f f
378 378 fee
379 379 fie/dead
380 380 fie/live
381 381 fo
382 382
383 383 $ hg rm Fum
384 384 $ hg debugpathcomplete -r F
385 385 Fum
386 386
387 387 Test debugnamecomplete
388 388
389 389 $ hg debugnamecomplete
390 390 Fum
391 391 default
392 392 fee
393 393 fie
394 394 fo
395 395 tip
396 396 $ hg debugnamecomplete f
397 397 fee
398 398 fie
399 399 fo
400 400
401 401 Test debuglabelcomplete, a deprecated name for debugnamecomplete that is still
402 402 used for completions in some shells.
403 403
404 404 $ hg debuglabelcomplete
405 405 Fum
406 406 default
407 407 fee
408 408 fie
409 409 fo
410 410 tip
411 411 $ hg debuglabelcomplete f
412 412 fee
413 413 fie
414 414 fo
@@ -1,37 +1,64 b''
1 1 $ hg init
2 2 $ echo a > a
3 3 $ hg ci -Am0
4 4 adding a
5 5
6 6 $ hg -q clone . foo
7 7
8 8 $ touch .hg/store/journal
9 9
10 10 $ echo foo > a
11 11 $ hg ci -Am0
12 12 abort: abandoned transaction found!
13 13 (run 'hg recover' to clean up transaction)
14 14 [255]
15 15
16 16 $ hg recover
17 17 rolling back interrupted transaction
18 18 checking changesets
19 19 checking manifests
20 20 crosschecking files in changesets and manifests
21 21 checking files
22 22 checked 1 changesets with 1 changes to 1 files
23 23
24 recover, explicite verify
25
26 $ touch .hg/store/journal
27 $ hg ci -Am0
28 abort: abandoned transaction found!
29 (run 'hg recover' to clean up transaction)
30 [255]
31 $ hg recover --verify
32 rolling back interrupted transaction
33 checking changesets
34 checking manifests
35 crosschecking files in changesets and manifests
36 checking files
37 checked 1 changesets with 1 changes to 1 files
38
39 recover, no verify
40
41 $ touch .hg/store/journal
42 $ hg ci -Am0
43 abort: abandoned transaction found!
44 (run 'hg recover' to clean up transaction)
45 [255]
46 $ hg recover --no-verify
47 rolling back interrupted transaction
48 (verify step skipped, run `hg verify` to check your repository content)
49
50
24 51 Check that zero-size journals are correctly aborted:
25 52
26 53 #if unix-permissions no-root
27 54 $ hg bundle -qa repo.hg
28 55 $ chmod -w foo/.hg/store/00changelog.i
29 56
30 57 $ hg -R foo unbundle repo.hg
31 58 adding changesets
32 59 abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
33 60 [255]
34 61
35 62 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
36 63 #endif
37 64
General Comments 0
You need to be logged in to leave comments. Login now