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