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