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