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