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