commands.py 214 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

8
from node import hex, bin, nullid, nullrev, short
9
from lock import release
10
from i18n import _
11
import os, re, difflib, time, tempfile, errno
12
import hg, scmutil, util, revlog, copies, error, bookmarks
13
import patch, help, encoding, templatekw, discovery
14
import archival, changegroup, cmdutil, hbisect
15 16
import sshserver, hgweb, commandserver
from hgweb import server as hgweb_server
17
import merge as mergemod
18
import minirst, revset, fileset
19
import dagparser, context, simplemerge, graphmod
20 21
import random
import setdiscovery, treediscovery, dagutil, pvec, localrepo
22
import phases, obsolete
23

24 25 26 27 28 29 30 31 32 33 34 35 36
table = {}

command = cmdutil.command(table)

# common command options

globalopts = [
    ('R', 'repository', '',
     _('repository root directory or name of overlay bundle file'),
     _('REPO')),
    ('', 'cwd', '',
     _('change working directory'), _('DIR')),
    ('y', 'noninteractive', None,
37
     _('do not prompt, automatically pick the first choice for all prompts')),
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
    ('q', 'quiet', None, _('suppress output')),
    ('v', 'verbose', None, _('enable additional output')),
    ('', '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')),
54
    ('', 'hidden', False, _('consider hidden changesets')),
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
]

dryrunopts = [('n', 'dry-run', None,
               _('do not perform actions, just print output'))]

remoteopts = [
    ('e', 'ssh', '',
     _('specify ssh command to use'), _('CMD')),
    ('', 'remotecmd', '',
     _('specify hg command to run on the remote side'), _('CMD')),
    ('', 'insecure', None,
     _('do not verify server certificate (ignoring web.cacerts config)')),
]

walkopts = [
    ('I', 'include', [],
     _('include names matching the given patterns'), _('PATTERN')),
    ('X', 'exclude', [],
     _('exclude names matching the given patterns'), _('PATTERN')),
]

commitopts = [
    ('m', 'message', '',
     _('use text as commit message'), _('TEXT')),
    ('l', 'logfile', '',
     _('read commit message from file'), _('FILE')),
]

commitopts2 = [
    ('d', 'date', '',
     _('record the specified date as commit date'), _('DATE')),
    ('u', 'user', '',
     _('record the specified user as committer'), _('USER')),
]

templateopts = [
    ('', 'style', '',
     _('display using template map file'), _('STYLE')),
    ('', 'template', '',
     _('display with template'), _('TEMPLATE')),
]

logopts = [
    ('p', 'patch', None, _('show patch')),
    ('g', 'git', None, _('use git extended diff format')),
    ('l', 'limit', '',
     _('limit number of changes displayed'), _('NUM')),
    ('M', 'no-merges', None, _('do not show merges')),
    ('', 'stat', None, _('output diffstat-style summary of changes')),
104
    ('G', 'graph', None, _("show the revision DAG")),
105 106 107 108 109 110 111 112
] + templateopts

diffopts = [
    ('a', 'text', None, _('treat all files as text')),
    ('g', 'git', None, _('use git extended diff format')),
    ('', 'nodates', None, _('omit dates from diff headers'))
]

113
diffwsopts = [
114 115 116 117 118 119
    ('w', 'ignore-all-space', None,
     _('ignore white space when comparing lines')),
    ('b', 'ignore-space-change', None,
     _('ignore changes in the amount of white space')),
    ('B', 'ignore-blank-lines', None,
     _('ignore changes whose lines are all blank')),
120 121 122 123 124 125
    ]

diffopts2 = [
    ('p', 'show-function', None, _('show which function each change is in')),
    ('', 'reverse', None, _('produce a diff that undoes the changes')),
    ] + diffwsopts + [
126 127 128 129 130
    ('U', 'unified', '',
     _('number of lines of context to show'), _('NUM')),
    ('', 'stat', None, _('output diffstat-style summary of changes')),
]

131 132 133 134
mergetoolopts = [
    ('t', 'tool', '', _('specify merge tool')),
]

135 136 137 138 139 140 141 142 143 144
similarityopts = [
    ('s', 'similarity', '',
     _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
]

subrepoopts = [
    ('S', 'subrepos', None,
     _('recurse into subrepositories'))
]

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

147 148 149
@command('^add',
    walkopts + subrepoopts + dryrunopts,
    _('[OPTION]... [FILE]...'))
150
def add(ui, repo, *pats, **opts):
151 152
    """add the specified files on the next commit

153 154
    Schedule files to be version controlled and added to the
    repository.
155

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

159
    If no names are given, add all files to the repository.
160 161 162 163

    .. container:: verbose

       An example showing how new (unknown) files are added
Martin Geisler's avatar
Martin Geisler committed
164
       automatically by :hg:`add`::
165 166 167 168 169 170 171 172

         $ ls
         foo.c
         $ hg status
         ? foo.c
         $ hg add
         adding foo.c
         $ hg status
173
         A foo.c
174 175

    Returns 0 if all files are successfully added.
176 177
    """

178
    m = scmutil.match(repo[None], pats, opts)
179
    rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
180
                           opts.get('subrepos'), prefix="", explicitonly=False)
181
    return rejected and 1 or 0
182

183 184 185
@command('addremove',
    similarityopts + walkopts + dryrunopts,
    _('[OPTION]... [FILE]...'))
186
def addremove(ui, repo, *pats, **opts):
187
    """add all new files, delete all missing files
188

189 190
    Add all new files and remove all missing files from the
    repository.
191

192
    New files are ignored if they match any of the patterns in
193
    ``.hgignore``. As with add, these changes take effect at the next
194
    commit.
195

196
    Use the -s/--similarity option to detect renamed files. This
197
    option takes a percentage between 0 (disabled) and 100 (files must
198 199 200
    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
201
    can be expensive. After using this option, :hg:`status -C` can be
202 203 204
    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.
205 206

    Returns 0 if all files are successfully added.
207
    """
208
    try:
209
        sim = float(opts.get('similarity') or 100)
210 211
    except ValueError:
        raise util.Abort(_('similarity must be a number'))
212 213
    if sim < 0 or sim > 100:
        raise util.Abort(_('similarity must be between 0 and 100'))
214
    return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
215

216 217 218 219 220 221 222 223 224 225 226 227
@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')),
    ('l', 'line-number', None, _('show line number at the first appearance'))
228
    ] + diffwsopts + walkopts,
229
    _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
230
def annotate(ui, repo, *pats, **opts):
231
    """show changeset information by line for each file
232

233 234
    List changes in files, showing the revision id responsible for
    each line
235

236 237
    This command is useful for discovering when a change was made and
    by whom.
238

239 240 241 242
    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.
243 244

    Returns 0 on success.
245
    """
246 247 248
    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
249
        opts['file'] = True
250

251 252
    datefunc = ui.quiet and util.shortdate or util.datestr
    getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
253

254
    if not pats:
255
        raise util.Abort(_('at least one filename or pattern is required'))
256

257 258
    hexfn = ui.debugflag and hex or short

259 260
    opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
             ('number', ' ', lambda x: str(x[0].rev())),
261
             ('changeset', ' ', lambda x: hexfn(x[0].node())),
262 263 264
             ('date', ' ', getdate),
             ('file', ' ', lambda x: x[0].path()),
             ('line_number', ':', lambda x: str(x[1])),
265 266
            ]

267
    if (not opts.get('user') and not opts.get('changeset')
268
        and not opts.get('date') and not opts.get('file')):
269
        opts['number'] = True
270

271
    linenumber = opts.get('line_number') is not None
272
    if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
273 274
        raise util.Abort(_('at least one of -n/-c is required for -l'))

275 276
    funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
    funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
277

278 279 280
    def bad(x, y):
        raise util.Abort("%s: %s" % (x, y))

281
    ctx = scmutil.revsingle(repo, opts.get('rev'))
282
    m = scmutil.match(ctx, pats, opts)
283
    m.bad = bad
284
    follow = not opts.get('no_follow')
285
    diffopts = patch.diffopts(ui, opts, section='annotate')
Matt Mackall's avatar
Matt Mackall committed
286 287
    for abs in ctx.walk(m):
        fctx = ctx[abs]
288
        if not opts.get('text') and util.binary(fctx.data()):
289
            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
290 291
            continue

292 293
        lines = fctx.annotate(follow=follow, linenumber=linenumber,
                              diffopts=diffopts)
294 295
        pieces = []

296
        for f, sep in funcmap:
297 298
            l = [f(n) for n, dummy in lines]
            if l:
299 300
                sized = [(x, encoding.colwidth(x)) for x in l]
                ml = max([w for x, w in sized])
301 302
                pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
                               for x, w in sized])
303

mpm@selenic.com's avatar
mpm@selenic.com committed
304 305
        if pieces:
            for p, l in zip(zip(*pieces), lines):
306
                ui.write("%s: %s" % ("".join(p), l[1]))
307

308 309 310
            if lines and not lines[-1][1].endswith('\n'):
                ui.write('\n')

311 312 313 314 315 316 317 318
@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'))
319
def archive(ui, repo, dest, **opts):
320
    '''create an unversioned archive of a repository revision
321

322 323
    By default, the revision used is the parent of the working
    directory; use -r/--rev to specify a different revision.
324

325 326 327
    The archive type is automatically detected based on file
    extension (or override using -t/--type).

Matt Mackall's avatar
Matt Mackall committed
328 329 330 331 332 333 334 335 336 337 338 339
    .. 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*"

340
    Valid types are:
341

342 343 344 345 346 347
    :``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
348

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

352 353 354 355
    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.
356 357

    Returns 0 on success.
358 359
    '''

360
    ctx = scmutil.revsingle(repo, opts.get('rev'))
361
    if not ctx:
362
        raise util.Abort(_('no working directory: please specify a revision'))
363
    node = ctx.node()
364
    dest = cmdutil.makefilename(repo, dest, node)
365
    if os.path.realpath(dest) == repo.root:
366
        raise util.Abort(_('repository root cannot be destination'))
367

368
    kind = opts.get('type') or archival.guesskind(dest) or 'files'
369
    prefix = opts.get('prefix')
370

371 372 373
    if dest == '-':
        if kind == 'files':
            raise util.Abort(_('cannot archive plain files to stdout'))
374
        dest = cmdutil.makefileobj(repo, dest)
375 376
        if not prefix:
            prefix = os.path.basename(repo.root) + '-%h'
377

378
    prefix = cmdutil.makefilename(repo, prefix, node)
379
    matchfn = scmutil.match(ctx, [], opts)
380
    archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
381
                     matchfn, prefix, subrepos=opts.get('subrepos'))
382

383 384
@command('backout',
    [('', 'merge', None, _('merge with old dirstate parent after backout')),
385 386
    ('', 'parent', '',
     _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
387
    ('r', 'rev', '', _('revision to backout'), _('REV')),
388
    ] + mergetoolopts + walkopts + commitopts + commitopts2,
389
    _('[OPTION]... [-r] REV'))
Daniel Holth's avatar
Daniel Holth committed
390
def backout(ui, repo, node=None, rev=None, **opts):
Vadim Gelfer's avatar
Vadim Gelfer committed
391 392
    '''reverse effect of earlier changeset

393 394 395
    Prepare a new changeset with the effect of REV undone in the
    current working directory.

396
    If REV is the parent of the working directory, then this new changeset
397 398 399
    is committed automatically. Otherwise, hg needs to merge the
    changes and the merged result is left uncommitted.

400
    .. note::
401

402 403 404
      backout cannot be used to fix either an unwanted or
      incorrect merge.

Matt Mackall's avatar
Matt Mackall committed
405 406 407 408 409 410 411 412 413 414 415
    .. container:: verbose

      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.
416

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

419
    Returns 0 on success, 1 if there are unresolved files.
420
    '''
Daniel Holth's avatar
Daniel Holth committed
421 422 423 424 425
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

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

427 428 429
    if not rev:
        raise util.Abort(_("please specify a revision to backout"))

430 431 432 433
    date = opts.get('date')
    if date:
        opts['date'] = util.parsedate(date)

434
    cmdutil.checkunfinished(repo)
435
    cmdutil.bailifchanged(repo)
436
    node = scmutil.revsingle(repo, rev).node()
437

438
    op1, op2 = repo.dirstate.parents()
439 440
    a = repo.changelog.ancestor(op1, node)
    if a != node:
441
        raise util.Abort(_('cannot backout change on a different branch'))
442

443 444
    p1, p2 = repo.changelog.parents(node)
    if p1 == nullid:
445
        raise util.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer's avatar
Vadim Gelfer committed
446
    if p2 != nullid:
447
        if not opts.get('parent'):
448
            raise util.Abort(_('cannot backout a merge changeset'))
449 450
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
451
            raise util.Abort(_('%s is not a parent of %s') %
452
                             (short(p), short(node)))
453 454
        parent = p
    else:
455
        if opts.get('parent'):
456 457
            raise util.Abort(_('cannot use --parent on non-merge changeset'))
        parent = p1
458

459
    # the backout should appear on the same branch
460 461 462
    wlock = repo.wlock()
    try:
        branch = repo.dirstate.branch()
463
        bheads = repo.branchheads(branch)
464
        rctx = scmutil.revsingle(repo, hex(parent))
465 466 467
        if not opts.get('merge') and op1 != node:
            try:
                ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
468 469
                stats = mergemod.update(repo, parent, True, True, False,
                                        node, False)
470 471 472
                repo.setparents(op1, op2)
                hg._showstats(repo, stats)
                if stats[3]:
473 474 475 476 477 478
                    repo.ui.status(_("use 'hg resolve' to retry unresolved "
                                     "file merges\n"))
                else:
                    msg = _("changeset %s backed out, "
                            "don't forget to commit.\n")
                    ui.status(msg % short(node))
479
                return stats[3] > 0
480 481
            finally:
                ui.setconfig('ui', 'forcemerge', '')
482 483 484 485 486
        else:
            hg.clean(repo, node, show_stats=False)
            repo.dirstate.setbranch(branch)
            cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())

487

488
        e = cmdutil.commiteditor
489
        if not opts['message'] and not opts['logfile']:
490
            # we don't translate commit messages
491
            opts['message'] = "Backed out changeset %s" % short(node)
492 493 494 495 496 497 498
            e = cmdutil.commitforceeditor

        def commitfunc(ui, repo, message, match, opts):
            return repo.commit(message, opts.get('user'), opts.get('date'),
                               match, editor=e)
        newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
        cmdutil.commitstatus(repo, newnode, branch, bheads)
499

500 501 502 503 504 505 506 507 508 509 510 511 512 513 514
        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', ''))
                return hg.merge(repo, hex(repo.changelog.tip()))
            finally:
                ui.setconfig('ui', 'forcemerge', '')
    finally:
        wlock.release()
515
    return 0
Vadim Gelfer's avatar
Vadim Gelfer committed
516

517 518 519 520 521 522 523 524 525
@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]"))
526
def bisect(ui, repo, rev=None, extra=None, command=None,
527 528
               reset=None, good=None, bad=None, skip=None, extend=None,
               noupdate=None):
529 530
    """subdivision search of changesets

531 532 533 534 535 536 537 538 539 540 541 542 543
    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.
544 545 546 547 548 549
    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.
550

551 552 553 554
    .. container:: verbose

      Some examples:

555
      - start a bisection with known bad revision 34, and good revision 12::
556 557 558 559 560 561 562 563 564 565

          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
566
      - mark the current revision, or a known revision, to be skipped (e.g. if
567 568 569 570 571
        that revision is not usable because of another issue)::

          hg bisect --skip
          hg bisect --skip 23

572
      - skip all revisions that do not touch directories ``foo`` or ``bar``::
573

574
          hg bisect --skip "!( file('path:foo') & file('path:bar') )"
575

576 577 578 579 580 581 582 583 584 585
      - 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
586
          hg bisect --command "make && make tests"
587 588 589 590 591 592

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

          hg log -r "bisect(pruned)"

593 594 595 596 597
      - see the changeset currently being bisected (especially useful
        if running with -U/--noupdate)::

          hg log -r "bisect(current)"

598 599 600 601
      - see all changesets that took part in the current bisection::

          hg log -r "bisect(range)"

602
      - you can even get a nice graph::
603 604 605

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

606 607
      See :hg:`help revsets` for more about the `bisect()` keyword.

608
    Returns 0 on success.
609
    """
610 611 612 613 614 615 616 617
    def extendbisectrange(nodes, good):
        # bisect is incomplete when it ends on a merge node and
        # one of the parent was not checked.
        parents = repo[nodes[0]].parents()
        if len(parents) > 1:
            side = good and state['bad'] or state['good']
            num = len(set(i.node() for i in parents) & set(side))
            if num == 1:
Yuya Nishihara's avatar
Yuya Nishihara committed
618
                return parents[0].ancestor(parents[1])
619 620
        return None

621 622 623 624
    def print_result(nodes, good):
        displayer = cmdutil.show_changeset(ui, repo, {})
        if len(nodes) == 1:
            # narrowed it down to a single revision
625 626 627 628
            if good:
                ui.write(_("The first good revision is:\n"))
            else:
                ui.write(_("The first bad revision is:\n"))
629
            displayer.show(repo[nodes[0]])
630 631 632 633 634
            extendnode = extendbisectrange(nodes, good)
            if extendnode is not None:
                ui.write(_('Not all ancestors of this changeset have been'
                           ' checked.\nUse bisect --extend to continue the '
                           'bisection from\nthe common ancestor, %s.\n')
635
                         % extendnode)
636 637
        else:
            # multiple possible revisions
638 639 640 641 642 643
            if good:
                ui.write(_("Due to skipped revisions, the first "
                        "good revision could be any of:\n"))
            else:
                ui.write(_("Due to skipped revisions, the first "
                        "bad revision could be any of:\n"))
644
            for n in nodes:
645
                displayer.show(repo[n])
646
        displayer.close()
647 648 649 650 651 652 653 654 655 656 657

    def check_state(state, interactive=True):
        if not state['good'] or not state['bad']:
            if (good or bad or skip or reset) and interactive:
                return
            if not state['good']:
                raise util.Abort(_('cannot bisect (no known good revisions)'))
            else:
                raise util.Abort(_('cannot bisect (no known bad revisions)'))
        return True

658 659 660 661 662 663 664 665 666 667
    # 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
668
    elif extra or good + bad + skip + reset + extend + bool(command) > 1:
669
        raise util.Abort(_('incompatible arguments'))
670

671 672
    cmdutil.checkunfinished(repo)

673 674 675 676 677 678
    if reset:
        p = repo.join("bisect.state")
        if os.path.exists(p):
            os.unlink(p)
        return

679 680 681 682
    state = hbisect.load_state(repo)

    if command:
        changesets = 1
683 684 685 686
        if noupdate:
            try:
                node = state['current'][0]
            except LookupError:
687 688
                raise util.Abort(_('current bisect revision is unknown - '
                                   'start a new bisect to fix'))
689
        else:
690 691 692
            node, p2 = repo.dirstate.parents()
            if p2 != nullid:
                raise util.Abort(_('current bisect revision is a merge'))
693 694 695
        try:
            while changesets:
                # update state
696
                state['current'] = [node]
697
                hbisect.save_state(repo, state)
698 699 700
                status = util.system(command,
                                     environ={'HG_NODE': hex(node)},
                                     out=ui.fout)
701 702 703 704 705 706 707 708 709 710 711
                if status == 125:
                    transition = "skip"
                elif status == 0:
                    transition = "good"
                # status < 0 means process was killed
                elif status == 127:
                    raise util.Abort(_("failed to execute %s") % command)
                elif status < 0:
                    raise util.Abort(_("%s killed") % command)
                else:
                    transition = "bad"
712
                ctx = scmutil.revsingle(repo, rev, node)
713
                rev = None # clear for future iterations
714
                state[transition].append(ctx.node())
715
                ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
716 717
                check_state(state, interactive=False)
                # bisect
718
                nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
719
                # update to next check
720 721 722 723
                node = nodes[0]
                if not noupdate:
                    cmdutil.bailifchanged(repo)
                    hg.clean(repo, node, show_stats=False)
724
        finally:
725
            state['current'] = [node]
726
            hbisect.save_state(repo, state)
727
        print_result(nodes, bgood)
728
        return
729 730

    # update state
731 732

    if rev:
733
        nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
734 735 736
    else:
        nodes = [repo.lookup('.')]

737 738
    if good or bad or skip:
        if good:
739
            state['good'] += nodes
740
        elif bad:
741
            state['bad'] += nodes
742
        elif skip:
743
            state['skip'] += nodes
744
        hbisect.save_state(repo, state)
745

746 747
    if not check_state(state):
        return
748 749

    # actually bisect
750
    nodes, changesets, good = hbisect.bisect(repo.changelog, state)
751 752 753 754
    if extend:
        if not changesets:
            extendnode = extendbisectrange(nodes, good)
            if extendnode is not None:
755 756
                ui.write(_("Extending search to changeset %d:%s\n")
                         % (extendnode.rev(), extendnode))
757 758
                state['current'] = [extendnode.node()]
                hbisect.save_state(repo, state)
759 760
                if noupdate:
                    return
761
                cmdutil.bailifchanged(repo)
762 763 764
                return hg.clean(repo, extendnode.node())
        raise util.Abort(_("nothing to extend"))

765
    if changesets == 0:
766
        print_result(nodes, good)
767 768 769
    else:
        assert len(nodes) == 1 # only a single node can be tested next
        node = nodes[0]
770 771 772 773 774
        # compute the approximate number of remaining tests
        tests, size = 0, 2
        while size <= changesets:
            tests, size = tests + 1, size * 2
        rev = repo.changelog.rev(node)
775 776
        ui.write(_("Testing changeset %d:%s "
                   "(%d changesets remaining, ~%d tests)\n")
777
                 % (rev, short(node), changesets, tests))
778 779
        state['current'] = [node]
        hbisect.save_state(repo, state)
780
        if not noupdate:
781
            cmdutil.bailifchanged(repo)
782 783
            return hg.clean(repo, node)

784
@command('bookmarks|bookmark',
785 786 787 788
    [('f', 'force', False, _('force')),
    ('r', 'rev', '', _('revision'), _('REV')),
    ('d', 'delete', False, _('delete a given bookmark')),
    ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
789
    ('i', 'inactive', False, _('mark a bookmark inactive'))],
790 791
    _('hg bookmarks [OPTIONS]... [NAME]...'))
def bookmark(ui, repo, *names, **opts):
792 793
    '''track a line of development with movable markers

794 795 796 797
    Bookmarks are pointers to certain commits that move when committing.
    Bookmarks are local. They can be renamed, copied and deleted. It is
    possible to use :hg:`merge NAME` to merge from a given bookmark, and
    :hg:`update NAME` to update to a given bookmark.
798 799 800 801 802 803 804

    You can use :hg:`bookmark NAME` to set a bookmark on the working
    directory's parent revision with the given name. If you specify
    a revision using -r REV (where REV may be an existing bookmark),
    the bookmark is assigned to that revision.

    Bookmarks can be pushed and pulled between repositories (see :hg:`help
805 806 807
    push` and :hg:`help pull`). This requires both the local and remote
    repositories to support bookmarks. For versions prior to 1.8, this means
    the bookmarks extension must be enabled.
808

809 810 811 812
    If you set a bookmark called '@', new clones of the repository will
    have that revision checked out (and the bookmark made active) by
    default.

813 814 815 816
    With -i/--inactive, the new bookmark will not be made the active
    bookmark. If -r/--rev is given, the new bookmark will not be made
    active even if -i/--inactive is not given. If no NAME is given, the
    current active bookmark will be marked inactive.
817
    '''
818 819 820 821 822 823
    force = opts.get('force')
    rev = opts.get('rev')
    delete = opts.get('delete')
    rename = opts.get('rename')
    inactive = opts.get('inactive')

824 825 826 827 828
    def checkformat(mark):
        mark = mark.strip()
        if not mark:
            raise util.Abort(_("bookmark names cannot consist entirely of "
                               "whitespace"))
829
        scmutil.checknewlabel(repo, mark, 'bookmark')
830 831
        return mark

832
    def checkconflict(repo, mark, cur, force=False, target=None):
833
        if mark in marks and not force:
834
            if target:
835 836 837
                if marks[mark] == target and target == cur:
                    # re-activating a bookmark
                    return
838 839
                anc = repo.changelog.ancestors([repo[target].rev()])
                bmctx = repo[marks[mark]]
840 841
                divs = [repo[b].node() for b in marks
                        if b.split('@', 1)[0] == mark.split('@', 1)[0]]
842 843 844 845 846 847 848 849

                # allow resolving a single divergent bookmark even if moving
                # the bookmark across branches when a revision is specified
                # that contains a divergent bookmark
                if bmctx.rev() not in anc and target in divs:
                    bookmarks.deletedivergent(repo, [target], mark)
                    return

850 851 852
                deletefrom = [b for b in divs
                              if repo[b].rev() in anc or b == target]
                bookmarks.deletedivergent(repo, deletefrom, mark)
853
                if bookmarks.validdest(repo, bmctx, repo[target]):
854 855 856
                    ui.status(_("moving bookmark '%s' forward from %s\n") %
                              (mark, short(bmctx.node())))
                    return
857 858 859 860 861 862 863
            raise util.Abort(_("bookmark '%s' already exists "
                               "(use -f to force)") % mark)
        if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
            and not force):
            raise util.Abort(
                _(