commands.py 197 KB
Newer Older
mpm@selenic.com's avatar
mpm@selenic.com committed
1 2
# commands.py - command processing for mercurial
#
3
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
mpm@selenic.com's avatar
mpm@selenic.com committed
4
#
5
# This software may be used and distributed according to the terms of the
Matt Mackall's avatar
Matt Mackall committed
6
# GNU General Public License version 2 or any later version.
mpm@selenic.com's avatar
mpm@selenic.com committed
7

Gregory Szorc's avatar
Gregory Szorc committed
8 9 10 11 12 13
from __future__ import absolute_import

import difflib
import errno
import os
import re
14
import sys
Gregory Szorc's avatar
Gregory Szorc committed
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29

from .i18n import _
from .node import (
    hex,
    nullid,
    nullrev,
    short,
)
from . import (
    archival,
    bookmarks,
    bundle2,
    changegroup,
    cmdutil,
    copies,
30
    debugcommands as debugcommandsmod,
Gregory Szorc's avatar
Gregory Szorc committed
31
    destutil,
32
    dirstateguard,
Gregory Szorc's avatar
Gregory Szorc committed
33 34 35 36 37
    discovery,
    encoding,
    error,
    exchange,
    extensions,
Yuya Nishihara's avatar
Yuya Nishihara committed
38
    formatter,
Gregory Szorc's avatar
Gregory Szorc committed
39 40 41 42 43 44 45 46 47
    graphmod,
    hbisect,
    help,
    hg,
    lock as lockmod,
    merge as mergemod,
    obsolete,
    patch,
    phases,
48
    pycompat,
49
    rcutil,
50
    registrar,
51
    revsetlang,
Gregory Szorc's avatar
Gregory Szorc committed
52
    scmutil,
53
    server,
Gregory Szorc's avatar
Gregory Szorc committed
54 55
    sshserver,
    streamclone,
56
    tags as tagsmod,
Gregory Szorc's avatar
Gregory Szorc committed
57 58 59 60 61 62
    templatekw,
    ui as uimod,
    util,
)

release = lockmod.release
63

64
table = {}
65
table.update(debugcommandsmod.command._table)
66

67
command = registrar.command(table)
68 69 70 71 72 73 74 75 76 77

# common command options

globalopts = [
    ('R', 'repository', '',
     _('repository root directory or name of overlay bundle file'),
     _('REPO')),
    ('', 'cwd', '',
     _('change working directory'), _('DIR')),
    ('y', 'noninteractive', None,
78
     _('do not prompt, automatically pick the first choice for all prompts')),
79 80
    ('q', 'quiet', None, _('suppress output')),
    ('v', 'verbose', None, _('enable additional output')),
81
    ('', 'color', '',
82 83
     # i18n: 'always', 'auto', 'never', and 'debug' are keywords
     # and should not be translated
84
     _("when to colorize (boolean, always, auto, never, or debug)"),
85
     _('TYPE')),
86 87 88 89 90 91 92 93 94 95 96 97 98 99
    ('', 'config', [],
     _('set/override config option (use \'section.name=value\')'),
     _('CONFIG')),
    ('', 'debug', None, _('enable debugging output')),
    ('', 'debugger', None, _('start debugger')),
    ('', 'encoding', encoding.encoding, _('set the charset encoding'),
     _('ENCODE')),
    ('', 'encodingmode', encoding.encodingmode,
     _('set the charset encoding mode'), _('MODE')),
    ('', 'traceback', None, _('always print a traceback on exception')),
    ('', 'time', None, _('time how long the command takes')),
    ('', 'profile', None, _('print command execution profile')),
    ('', 'version', None, _('output version information and exit')),
    ('h', 'help', None, _('display help and exit')),
100
    ('', 'hidden', False, _('consider hidden changesets')),
101 102
    ('', 'pager', 'auto',
     _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 104
]

105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
dryrunopts = cmdutil.dryrunopts
remoteopts = cmdutil.remoteopts
walkopts = cmdutil.walkopts
commitopts = cmdutil.commitopts
commitopts2 = cmdutil.commitopts2
formatteropts = cmdutil.formatteropts
templateopts = cmdutil.templateopts
logopts = cmdutil.logopts
diffopts = cmdutil.diffopts
diffwsopts = cmdutil.diffwsopts
diffopts2 = cmdutil.diffopts2
mergetoolopts = cmdutil.mergetoolopts
similarityopts = cmdutil.similarityopts
subrepoopts = cmdutil.subrepoopts
debugrevlogopts = cmdutil.debugrevlogopts
120

mpm@selenic.com's avatar
mpm@selenic.com committed
121
# Commands start here, listed alphabetically
122

123 124
@command('^add',
    walkopts + subrepoopts + dryrunopts,
125 126
    _('[OPTION]... [FILE]...'),
    inferrepo=True)
127
def add(ui, repo, *pats, **opts):
128 129
    """add the specified files on the next commit

130 131
    Schedule files to be version controlled and added to the
    repository.
132

133
    The files will be added to the repository at the next commit. To
134
    undo an add before that, see :hg:`forget`.
135

timeless's avatar
timeless committed
136 137
    If no names are given, add all files to the repository (except
    files matching ``.hgignore``).
138 139 140

    .. container:: verbose

141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
       Examples:

         - New (unknown) files are added
           automatically by :hg:`add`::

             $ ls
             foo.c
             $ hg status
             ? foo.c
             $ hg add
             adding foo.c
             $ hg status
             A foo.c

         - Specific files to be added can be specified::

             $ ls
             bar.c  foo.c
             $ hg status
             ? bar.c
             ? foo.c
             $ hg add bar.c
             $ hg status
             A bar.c
             ? foo.c
166 167

    Returns 0 if all files are successfully added.
168 169
    """

170
    m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
171
    rejected = cmdutil.add(ui, repo, m, "", False, **opts)
172
    return rejected and 1 or 0
173

174
@command('addremove',
175
    similarityopts + subrepoopts + walkopts + dryrunopts,
176 177
    _('[OPTION]... [FILE]...'),
    inferrepo=True)
178
def addremove(ui, repo, *pats, **opts):
179
    """add all new files, delete all missing files
180

181 182
    Add all new files and remove all missing files from the
    repository.
183

timeless's avatar
timeless committed
184 185 186
    Unless names are given, new files are ignored if they match any of
    the patterns in ``.hgignore``. As with add, these changes take
    effect at the next commit.
187

188
    Use the -s/--similarity option to detect renamed files. This
189
    option takes a percentage between 0 (disabled) and 100 (files must
190 191 192
    be identical) as its parameter. With a parameter greater than 0,
    this compares every removed file with every added file and records
    those similar enough as renames. Detecting renamed files this way
193
    can be expensive. After using this option, :hg:`status -C` can be
194 195 196
    used to check which files were identified as moved or renamed. If
    not specified, -s/--similarity defaults to 100 and only renames of
    identical files are detected.
197

198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237
    .. container:: verbose

       Examples:

         - A number of files (bar.c and foo.c) are new,
           while foobar.c has been removed (without using :hg:`remove`)
           from the repository::

             $ ls
             bar.c foo.c
             $ hg status
             ! foobar.c
             ? bar.c
             ? foo.c
             $ hg addremove
             adding bar.c
             adding foo.c
             removing foobar.c
             $ hg status
             A bar.c
             A foo.c
             R foobar.c

         - A file foobar.c was moved to foo.c without using :hg:`rename`.
           Afterwards, it was edited slightly::

             $ ls
             foo.c
             $ hg status
             ! foobar.c
             ? foo.c
             $ hg addremove --similarity 90
             removing foobar.c
             adding foo.c
             recording removal of foobar.c as rename to foo.c (94% similar)
             $ hg status -C
             A foo.c
               foobar.c
             R foobar.c

238
    Returns 0 if all files are successfully added.
239
    """
240
    opts = pycompat.byteskwargs(opts)
241
    try:
242
        sim = float(opts.get('similarity') or 100)
243
    except ValueError:
244
        raise error.Abort(_('similarity must be a number'))
245
    if sim < 0 or sim > 100:
246
        raise error.Abort(_('similarity must be between 0 and 100'))
247
    matcher = scmutil.match(repo[None], pats, opts)
248
    return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
249

250 251 252 253 254 255 256 257 258 259 260
@command('^annotate|blame',
    [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
    ('', 'follow', None,
     _('follow copies/renames and list the filename (DEPRECATED)')),
    ('', 'no-follow', None, _("don't follow copies and renames")),
    ('a', 'text', None, _('treat all files as text')),
    ('u', 'user', None, _('list the author (long with -v)')),
    ('f', 'file', None, _('list the filename')),
    ('d', 'date', None, _('list the date (short with -q)')),
    ('n', 'number', None, _('list the revision number (default)')),
    ('c', 'changeset', None, _('list the changeset')),
261 262
    ('l', 'line-number', None, _('show line number at the first appearance')),
    ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
263
    ] + diffwsopts + walkopts + formatteropts,
264 265
    _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
    inferrepo=True)
266
def annotate(ui, repo, *pats, **opts):
267
    """show changeset information by line for each file
268

269
    List changes in files, showing the revision id responsible for
270
    each line.
271

272 273
    This command is useful for discovering when a change was made and
    by whom.
274

275 276 277
    If you include --file, --user, or --date, the revision number is
    suppressed unless you also include --number.

278 279 280 281
    Without the -a/--text option, annotate will avoid processing files
    it detects as binary. With -a, annotate will annotate the file
    anyway, although the results will probably be neither useful
    nor desirable.
282 283

    Returns 0 on success.
284
    """
285
    opts = pycompat.byteskwargs(opts)
286
    if not pats:
287
        raise error.Abort(_('at least one filename or pattern is required'))
288

289 290 291
    if opts.get('follow'):
        # --follow is deprecated and now just an alias for -f/--file
        # to mimic the behavior of Mercurial before version 1.5
292
        opts['file'] = True
293

294 295
    ctx = scmutil.revsingle(repo, opts.get('rev'))

296
    rootfm = ui.formatter('annotate', opts)
297 298 299 300
    if ui.quiet:
        datefunc = util.shortdate
    else:
        datefunc = util.datestr
301 302 303 304 305
    if ctx.rev() is None:
        def hexfn(node):
            if node is None:
                return None
            else:
306
                return rootfm.hexfunc(node)
307 308 309 310 311 312 313 314 315 316 317 318 319 320 321
        if opts.get('changeset'):
            # omit "+" suffix which is appended to node hex
            def formatrev(rev):
                if rev is None:
                    return '%d' % ctx.p1().rev()
                else:
                    return '%d' % rev
        else:
            def formatrev(rev):
                if rev is None:
                    return '%d+' % ctx.p1().rev()
                else:
                    return '%d ' % rev
        def formathex(hex):
            if hex is None:
322
                return '%s+' % rootfm.hexfunc(ctx.p1().node())
323 324 325
            else:
                return '%s ' % hex
    else:
326
        hexfn = rootfm.hexfunc
327
        formatrev = formathex = pycompat.bytestr
328

329
    opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
330 331
             ('number', ' ', lambda x: x[0].rev(), formatrev),
             ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
332 333 334
             ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
             ('file', ' ', lambda x: x[0].path(), str),
             ('line_number', ':', lambda x: x[1], str),
335
            ]
336
    fieldnamemap = {'number': 'rev', 'changeset': 'node'}
337

338
    if (not opts.get('user') and not opts.get('changeset')
339
        and not opts.get('date') and not opts.get('file')):
340
        opts['number'] = True
341

342
    linenumber = opts.get('line_number') is not None
343
    if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
344
        raise error.Abort(_('at least one of -n/-c is required for -l'))
345

346 347
    ui.pager('annotate')

348
    if rootfm.isplain():
349
        def makefunc(get, fmt):
350
            return lambda x: fmt(get(x))
351 352
    else:
        def makefunc(get, fmt):
353
            return get
354 355
    funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
               if opts.get(op)]
356
    funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
357 358
    fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
                      if opts.get(op))
359

360
    def bad(x, y):
361
        raise error.Abort("%s: %s" % (x, y))
362

363 364
    m = scmutil.match(ctx, pats, opts, badfn=bad)

365
    follow = not opts.get('no_follow')
366 367
    diffopts = patch.difffeatureopts(ui, opts, section='annotate',
                                     whitespace=True)
368 369 370 371
    skiprevs = opts.get('skip')
    if skiprevs:
        skiprevs = scmutil.revrange(repo, skiprevs)

Matt Mackall's avatar
Matt Mackall committed
372 373
    for abs in ctx.walk(m):
        fctx = ctx[abs]
374 375
        rootfm.startitem()
        rootfm.data(abspath=abs, path=m.rel(abs))
Jun Wu's avatar
Jun Wu committed
376
        if not opts.get('text') and fctx.isbinary():
377 378
            rootfm.plain(_("%s: binary file\n")
                         % ((pats and m.rel(abs)) or abs))
379 380
            continue

381
        fm = rootfm.nested('lines')
382
        lines = fctx.annotate(follow=follow, linenumber=linenumber,
383
                              skiprevs=skiprevs, diffopts=diffopts)
384
        if not lines:
385
            fm.end()
386
            continue
387
        formats = []
388 389
        pieces = []

390
        for f, sep in funcmap:
391
            l = [f(n) for n, dummy in lines]
392
            if fm.isplain():
393 394 395
                sizes = [encoding.colwidth(x) for x in l]
                ml = max(sizes)
                formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
396 397
            else:
                formats.append(['%s' for x in l])
398
            pieces.append(l)
399

400
        for f, p, l in zip(zip(*formats), zip(*pieces), lines):
401 402 403
            fm.startitem()
            fm.write(fields, "".join(f), *p)
            fm.write('line', ": %s", l[1])
404

405
        if not lines[-1][1].endswith('\n'):
406
            fm.plain('\n')
407
        fm.end()
408

409
    rootfm.end()
410

411 412 413 414 415 416 417 418
@command('archive',
    [('', 'no-decode', None, _('do not pass files through decoders')),
    ('p', 'prefix', '', _('directory prefix for files in archive'),
     _('PREFIX')),
    ('r', 'rev', '', _('revision to distribute'), _('REV')),
    ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
    ] + subrepoopts + walkopts,
    _('[OPTION]... DEST'))
419
def archive(ui, repo, dest, **opts):
420
    '''create an unversioned archive of a repository revision
421

422 423
    By default, the revision used is the parent of the working
    directory; use -r/--rev to specify a different revision.
424

425
    The archive type is automatically detected based on file
timeless's avatar
timeless committed
426
    extension (to override, use -t/--type).
427

Matt Mackall's avatar
Matt Mackall committed
428 429 430 431 432 433 434 435 436 437 438 439
    .. container:: verbose

      Examples:

      - create a zip file containing the 1.0 release::

          hg archive -r 1.0 project-1.0.zip

      - create a tarball excluding .hg files::

          hg archive project.tar.gz -X ".hg*"

440
    Valid types are:
441

442 443 444 445 446 447
    :``files``: a directory full of files (default)
    :``tar``:   tar archive, uncompressed
    :``tbz2``:  tar archive, compressed using bzip2
    :``tgz``:   tar archive, compressed using gzip
    :``uzip``:  zip archive, uncompressed
    :``zip``:   zip archive, compressed using deflate
448

449
    The exact name of the destination archive or directory is given
Martin Geisler's avatar
Martin Geisler committed
450
    using a format string; see :hg:`help export` for details.
451

452 453 454 455
    Each member added to an archive file has a directory prefix
    prepended. Use -p/--prefix to specify a format string for the
    prefix. The default is the basename of the archive, with suffixes
    removed.
456 457

    Returns 0 on success.
458 459
    '''

460
    opts = pycompat.byteskwargs(opts)
461
    ctx = scmutil.revsingle(repo, opts.get('rev'))
462
    if not ctx:
463
        raise error.Abort(_('no working directory: please specify a revision'))
464
    node = ctx.node()
465
    dest = cmdutil.makefilename(repo, dest, node)
466
    if os.path.realpath(dest) == repo.root:
467
        raise error.Abort(_('repository root cannot be destination'))
468

469
    kind = opts.get('type') or archival.guesskind(dest) or 'files'
470
    prefix = opts.get('prefix')
471

472 473
    if dest == '-':
        if kind == 'files':
474
            raise error.Abort(_('cannot archive plain files to stdout'))
475
        dest = cmdutil.makefileobj(repo, dest)
476 477
        if not prefix:
            prefix = os.path.basename(repo.root) + '-%h'
478

479
    prefix = cmdutil.makefilename(repo, prefix, node)
480
    matchfn = scmutil.match(ctx, [], opts)
481
    archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
482
                     matchfn, prefix, subrepos=opts.get('subrepos'))
483

484 485
@command('backout',
    [('', 'merge', None, _('merge with old dirstate parent after backout')),
486 487 488
    ('', 'commit', None,
     _('commit if no conflicts were encountered (DEPRECATED)')),
    ('', 'no-commit', None, _('do not commit')),
489 490
    ('', 'parent', '',
     _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
491
    ('r', 'rev', '', _('revision to backout'), _('REV')),
492
    ('e', 'edit', False, _('invoke editor on commit messages')),
493
    ] + mergetoolopts + walkopts + commitopts + commitopts2,
494
    _('[OPTION]... [-r] REV'))
495
def backout(ui, repo, node=None, rev=None, **opts):
Vadim Gelfer's avatar
Vadim Gelfer committed
496 497
    '''reverse effect of earlier changeset

498
    Prepare a new changeset with the effect of REV undone in the
499 500
    current working directory. If no conflicts were encountered,
    it will be committed immediately.
501

502
    If REV is the parent of the working directory, then this new changeset
503
    is committed automatically (unless --no-commit is specified).
504

505
    .. note::
506

507
       :hg:`backout` cannot be used to fix either an unwanted or
508
       incorrect merge.
509

Matt Mackall's avatar
Matt Mackall committed
510 511
    .. container:: verbose

512 513 514 515 516 517 518 519 520 521 522 523
      Examples:

      - Reverse the effect of the parent of the working directory.
        This backout will be committed immediately::

          hg backout -r .

      - Reverse the effect of previous bad revision 23::

          hg backout -r 23

      - Reverse the effect of previous bad revision 23 and
524
        leave changes uncommitted::
525

526 527
          hg backout -r 23 --no-commit
          hg commit -m "Backout revision 23"
528

Matt Mackall's avatar
Matt Mackall committed
529 530 531 532 533 534 535 536 537
      By default, the pending changeset will have one parent,
      maintaining a linear history. With --merge, the pending
      changeset will instead have two parents: the old parent of the
      working directory and a new child of REV that simply undoes REV.

      Before version 1.7, the behavior without --merge was equivalent
      to specifying --merge followed by :hg:`update --clean .` to
      cancel the merge and leave the child of REV as a head to be
      merged separately.
538

Martin Geisler's avatar
Martin Geisler committed
539
    See :hg:`help dates` for a list of formats valid for -d/--date.
540

541 542 543
    See :hg:`help revert` for a way to restore files to the state
    of another revision.

544 545
    Returns 0 on success, 1 if nothing to backout or there are unresolved
    files.
546
    '''
547 548 549 550
    wlock = lock = None
    try:
        wlock = repo.wlock()
        lock = repo.lock()
551
        return _dobackout(ui, repo, node, rev, **opts)
552 553 554
    finally:
        release(lock, wlock)

555
def _dobackout(ui, repo, node=None, rev=None, **opts):
556
    opts = pycompat.byteskwargs(opts)
557 558
    if opts.get('commit') and opts.get('no_commit'):
        raise error.Abort(_("cannot use --commit with --no-commit"))
559 560
    if opts.get('merge') and opts.get('no_commit'):
        raise error.Abort(_("cannot use --merge with --no-commit"))
561

Daniel Holth's avatar
Daniel Holth committed
562
    if rev and node:
563
        raise error.Abort(_("please specify just one revision"))
Daniel Holth's avatar
Daniel Holth committed
564 565 566

    if not rev:
        rev = node
Vadim Gelfer's avatar
Vadim Gelfer committed
567

568
    if not rev:
569
        raise error.Abort(_("please specify a revision to backout"))
570

571 572 573 574
    date = opts.get('date')
    if date:
        opts['date'] = util.parsedate(date)

575
    cmdutil.checkunfinished(repo)
576
    cmdutil.bailifchanged(repo)
577
    node = scmutil.revsingle(repo, rev).node()
578

579
    op1, op2 = repo.dirstate.parents()
580
    if not repo.changelog.isancestor(node, op1):
581
        raise error.Abort(_('cannot backout change that is not an ancestor'))
582

583 584
    p1, p2 = repo.changelog.parents(node)
    if p1 == nullid:
585
        raise error.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer's avatar
Vadim Gelfer committed
586
    if p2 != nullid:
587
        if not opts.get('parent'):
588
            raise error.Abort(_('cannot backout a merge changeset'))
589 590
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
591
            raise error.Abort(_('%s is not a parent of %s') %
592
                             (short(p), short(node)))
593 594
        parent = p
    else:
595
        if opts.get('parent'):
596
            raise error.Abort(_('cannot use --parent on non-merge changeset'))
597
        parent = p1
598

599
    # the backout should appear on the same branch
600 601 602 603
    branch = repo.dirstate.branch()
    bheads = repo.branchheads(branch)
    rctx = scmutil.revsingle(repo, hex(parent))
    if not opts.get('merge') and op1 != node:
604
        dsguard = dirstateguard.dirstateguard(repo, 'backout')
605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623
        try:
            ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                         'backout')
            stats = mergemod.update(repo, parent, True, True, node, False)
            repo.setparents(op1, op2)
            dsguard.close()
            hg._showstats(repo, stats)
            if stats[3]:
                repo.ui.status(_("use 'hg resolve' to retry unresolved "
                                 "file merges\n"))
                return 1
        finally:
            ui.setconfig('ui', 'forcemerge', '', '')
            lockmod.release(dsguard)
    else:
        hg.clean(repo, node, show_stats=False)
        repo.dirstate.setbranch(branch)
        cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())

624 625 626 627 628
    if opts.get('no_commit'):
        msg = _("changeset %s backed out, "
                "don't forget to commit.\n")
        ui.status(msg % short(node))
        return 0
629 630 631

    def commitfunc(ui, repo, message, match, opts):
        editform = 'backout'
632 633
        e = cmdutil.getcommiteditor(editform=editform,
                                    **pycompat.strkwargs(opts))
634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659
        if not message:
            # we don't translate commit messages
            message = "Backed out changeset %s" % short(node)
            e = cmdutil.getcommiteditor(edit=True, editform=editform)
        return repo.commit(message, opts.get('user'), opts.get('date'),
                           match, editor=e)
    newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
    if not newnode:
        ui.status(_("nothing changed\n"))
        return 1
    cmdutil.commitstatus(repo, newnode, branch, bheads)

    def nice(node):
        return '%d:%s' % (repo.changelog.rev(node), short(node))
    ui.status(_('changeset %s backs out changeset %s\n') %
              (nice(repo.changelog.tip()), nice(node)))
    if opts.get('merge') and op1 != node:
        hg.clean(repo, op1, show_stats=False)
        ui.status(_('merging with changeset %s\n')
                  % nice(repo.changelog.tip()))
        try:
            ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                         'backout')
            return hg.merge(repo, hex(repo.changelog.tip()))
        finally:
            ui.setconfig('ui', 'forcemerge', '', '')
660
    return 0
Vadim Gelfer's avatar
Vadim Gelfer committed
661

662 663 664 665 666 667 668 669 670
@command('bisect',
    [('r', 'reset', False, _('reset bisect state')),
    ('g', 'good', False, _('mark changeset good')),
    ('b', 'bad', False, _('mark changeset bad')),
    ('s', 'skip', False, _('skip testing changeset')),
    ('e', 'extend', False, _('extend the bisect range')),
    ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
    ('U', 'noupdate', False, _('do not update to target'))],
    _("[-gbsr] [-U] [-c CMD] [REV]"))
671
def bisect(ui, repo, rev=None, extra=None, command=None,
672 673
               reset=None, good=None, bad=None, skip=None, extend=None,
               noupdate=None):
674 675
    """subdivision search of changesets

676 677 678 679 680 681 682 683 684 685 686 687 688
    This command helps to find changesets which introduce problems. To
    use, mark the earliest changeset you know exhibits the problem as
    bad, then mark the latest changeset which is free from the problem
    as good. Bisect will update your working directory to a revision
    for testing (unless the -U/--noupdate option is specified). Once
    you have performed tests, mark the working directory as good or
    bad, and bisect will either update to another candidate changeset
    or announce that it has found the bad revision.

    As a shortcut, you can also use the revision argument to mark a
    revision as good or bad without checking it out first.

    If you supply a command, it will be used for automatic bisection.
689 690 691 692 693 694
    The environment variable HG_NODE will contain the ID of the
    changeset being tested. The exit status of the command will be
    used to mark revisions as good or bad: status 0 means good, 125
    means to skip the revision, 127 (command not found) will abort the
    bisection, and any other non-zero exit status means the revision
    is bad.
695

696 697 698 699
    .. container:: verbose

      Some examples:

700
      - start a bisection with known bad revision 34, and good revision 12::
701 702 703 704 705 706 707 708 709 710

          hg bisect --bad 34
          hg bisect --good 12

      - advance the current bisection by marking current revision as good or
        bad::

          hg bisect --good
          hg bisect --bad

kiilerix's avatar
kiilerix committed
711
      - mark the current revision, or a known revision, to be skipped (e.g. if
712 713 714 715 716
        that revision is not usable because of another issue)::

          hg bisect --skip
          hg bisect --skip 23

717
      - skip all revisions that do not touch directories ``foo`` or ``bar``::
718

719
          hg bisect --skip "!( file('path:foo') & file('path:bar') )"
720

721 722 723 724 725 726 727 728 729 730
      - forget the current bisection::

          hg bisect --reset

      - use 'make && make tests' to automatically find the first broken
        revision::

          hg bisect --reset
          hg bisect --bad 34
          hg bisect --good 12
731
          hg bisect --command "make && make tests"
732 733 734 735 736 737

      - see all changesets whose states are already known in the current
        bisection::

          hg log -r "bisect(pruned)"

738 739 740 741 742
      - see the changeset currently being bisected (especially useful
        if running with -U/--noupdate)::

          hg log -r "bisect(current)"

743 744 745 746
      - see all changesets that took part in the current bisection::

          hg log -r "bisect(range)"

747
      - you can even get a nice graph::
748 749 750

          hg log --graph -r "bisect(range)"

751
      See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
752

753
    Returns 0 on success.
754 755 756 757 758 759 760 761 762 763 764
    """
    # backward compatibility
    if rev in "good bad reset init".split():
        ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
        cmd, rev, extra = rev, extra, None
        if cmd == "good":
            good = True
        elif cmd == "bad":
            bad = True
        else:
            reset = True
765
    elif extra:
766
        raise error.Abort(_('incompatible arguments'))
767

768 769 770 771 772 773 774 775 776
    incompatibles = {
        '--bad': bad,
        '--command': bool(command),
        '--extend': extend,
        '--good': good,
        '--reset': reset,
        '--skip': skip,
    }

777 778 779 780 781
    enabled = [x for x in incompatibles if incompatibles[x]]

    if len(enabled) > 1:
        raise error.Abort(_('%s and %s are incompatible') %
                          tuple(sorted(enabled)[0:2]))
782

783
    if reset:
784
        hbisect.resetstate(repo)
785 786
        return

787 788
    state = hbisect.load_state(repo)

789 790 791 792 793 794 795 796 797 798 799 800 801
    # update state
    if good or bad or skip:
        if rev:
            nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
        else:
            nodes = [repo.lookup('.')]
        if good:
            state['good'] += nodes
        elif bad:
            state['bad'] += nodes
        elif skip:
            state['skip'] += nodes
        hbisect.save_state(repo, state)
802 803
        if not (state['good'] and state['bad']):
            return
804

805 806 807 808
    def mayupdate(repo, node, show_stats=True):
        """common used update sequence"""
        if noupdate:
            return
809
        cmdutil.checkunfinished(repo)
810 811 812
        cmdutil.bailifchanged(repo)
        return hg.clean(repo, node, show_stats=show_stats)

813 814
    displayer = cmdutil.show_changeset(ui, repo, {})

815 816
    if command:
        changesets = 1
817 818 819 820
        if noupdate:
            try:
                node = state['current'][0]
            except LookupError:
821
                raise error.Abort(_('current bisect revision is unknown - '
822
                                   'start a new bisect to fix'))
823
        else:
824 825
            node, p2 = repo.dirstate.parents()
            if p2 != nullid:
826
                raise error.Abort(_('current bisect revision is a merge'))
827 828
        if rev:
            node = repo[scmutil.revsingle(repo, rev, node)].node()
829 830 831
        try:
            while changesets:
                # update state
832
                state['current'] = [node]
833
                hbisect.save_state(repo, state)
834 835
                status = ui.system(command, environ={'HG_NODE': hex(node)},
                                   blockedtag='bisect_check')
836 837 838 839 840 841
                if status == 125:
                    transition = "skip"
                elif status == 0:
                    transition = "good"
                # status < 0 means process was killed
                elif status == 127:
842
                    raise error.Abort(_("failed to execute %s") % command)
843
                elif status < 0:
844
                    raise error.Abort(_("%s killed") % command)
845 846
                else:
                    transition = "bad"
847 848
                state[transition].append(node)
                ctx = repo[node]
849
                ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
850
                hbisect.checkstate(state)
851
                # bisect
852
                nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
853
                # update to next check
854
                node = nodes[0]
855
                mayupdate(repo, node, show_stats=False)