commands.py 213 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
import random, setdiscovery, treediscovery, dagutil, pvec, localrepo
21
import phases, obsolete
22

23 24 25 26 27 28 29 30 31 32 33 34 35
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,
36
     _('do not prompt, automatically pick the first choice for all prompts')),
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
    ('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')),
53
    ('', 'hidden', False, _('consider hidden changesets')),
54 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
]

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')),
103
    ('G', 'graph', None, _("show the revision DAG")),
104 105 106 107 108 109 110 111
] + 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'))
]

112
diffwsopts = [
113 114 115 116 117 118
    ('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')),
119 120 121 122 123 124
    ]

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

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

134 135 136 137 138 139 140 141 142 143
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
144
# Commands start here, listed alphabetically
145

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

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

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

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

    .. container:: verbose

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

256 257
    hexfn = ui.debugflag and hex or short

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

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

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

274 275
    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
276

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

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

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

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

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

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

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

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

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

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

339
    Valid types are:
340

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

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

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

    Returns 0 on success.
357 358
    '''

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

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

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

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

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

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

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

399 400 401 402
    .. note::
      backout cannot be used to fix either an unwanted or
      incorrect merge.

Matt Mackall's avatar
Matt Mackall committed
403 404 405 406 407 408 409 410 411 412 413
    .. 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.
414

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

    Returns 0 on success.
418
    '''
Daniel Holth's avatar
Daniel Holth committed
419 420 421 422 423
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

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

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

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

432
    cmdutil.checkunfinished(repo)
433
    cmdutil.bailifchanged(repo)
434
    node = scmutil.revsingle(repo, rev).node()
435

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

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

457
    # the backout should appear on the same branch
458 459 460
    wlock = repo.wlock()
    try:
        branch = repo.dirstate.branch()
461
        bheads = repo.branchheads(branch)
462 463
        hg.clean(repo, node, show_stats=False)
        repo.dirstate.setbranch(branch)
464 465
        rctx = scmutil.revsingle(repo, hex(parent))
        cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
466 467 468 469 470 471 472
        if not opts.get('merge') and op1 != node:
            try:
                ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
                return hg.update(repo, op1)
            finally:
                ui.setconfig('ui', 'forcemerge', '')

473
        e = cmdutil.commiteditor
474
        if not opts['message'] and not opts['logfile']:
475
            # we don't translate commit messages
476
            opts['message'] = "Backed out changeset %s" % short(node)
477 478 479 480 481 482 483
            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)
484

485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
        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()
500
    return 0
Vadim Gelfer's avatar
Vadim Gelfer committed
501

502 503 504 505 506 507 508 509 510
@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]"))
511
def bisect(ui, repo, rev=None, extra=None, command=None,
512 513
               reset=None, good=None, bad=None, skip=None, extend=None,
               noupdate=None):
514 515
    """subdivision search of changesets

516 517 518 519 520 521 522 523 524 525 526 527 528
    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.
529 530 531 532 533 534
    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.
535

536 537 538 539 540 541 542 543 544 545 546 547 548 549 550
    .. container:: verbose

      Some examples:

      - start a bisection with known bad revision 12, and good revision 34::

          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
551
      - mark the current revision, or a known revision, to be skipped (e.g. if
552 553 554 555 556
        that revision is not usable because of another issue)::

          hg bisect --skip
          hg bisect --skip 23

557
      - skip all revisions that do not touch directories ``foo`` or ``bar``::
558

559
          hg bisect --skip "!( file('path:foo') & file('path:bar') )"
560

561 562 563 564 565 566 567 568 569 570
      - 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
571
          hg bisect --command "make && make tests"
572 573 574 575 576 577

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

          hg log -r "bisect(pruned)"

578 579 580 581 582
      - see the changeset currently being bisected (especially useful
        if running with -U/--noupdate)::

          hg log -r "bisect(current)"

583 584 585 586 587 588 589 590
      - see all changesets that took part in the current bisection::

          hg log -r "bisect(range)"

      - with the graphlog extension, you can even get a nice graph::

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

591 592
      See :hg:`help revsets` for more about the `bisect()` keyword.

593
    Returns 0 on success.
594
    """
595 596 597 598 599 600 601 602
    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
603
                return parents[0].ancestor(parents[1])
604 605
        return None

606 607 608 609
    def print_result(nodes, good):
        displayer = cmdutil.show_changeset(ui, repo, {})
        if len(nodes) == 1:
            # narrowed it down to a single revision
610 611 612 613
            if good:
                ui.write(_("The first good revision is:\n"))
            else:
                ui.write(_("The first bad revision is:\n"))
614
            displayer.show(repo[nodes[0]])
615 616 617 618 619
            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')
620
                         % extendnode)
621 622
        else:
            # multiple possible revisions
623 624 625 626 627 628
            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"))
629
            for n in nodes:
630
                displayer.show(repo[n])
631
        displayer.close()
632 633 634 635 636 637 638 639 640 641 642

    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

643 644 645 646 647 648 649 650 651 652
    # 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
653
    elif extra or good + bad + skip + reset + extend + bool(command) > 1:
654
        raise util.Abort(_('incompatible arguments'))
655

656 657
    cmdutil.checkunfinished(repo)

658 659 660 661 662 663
    if reset:
        p = repo.join("bisect.state")
        if os.path.exists(p):
            os.unlink(p)
        return

664 665 666 667
    state = hbisect.load_state(repo)

    if command:
        changesets = 1
668 669 670 671 672 673 674 675 676
        try:
            node = state['current'][0]
        except LookupError:
            if noupdate:
                raise util.Abort(_('current bisect revision is unknown - '
                                   'start a new bisect to fix'))
            node, p2 = repo.dirstate.parents()
            if p2 != nullid:
                raise util.Abort(_('current bisect revision is a merge'))
677 678 679
        try:
            while changesets:
                # update state
680
                state['current'] = [node]
681
                hbisect.save_state(repo, state)
682 683 684
                status = util.system(command,
                                     environ={'HG_NODE': hex(node)},
                                     out=ui.fout)
685 686 687 688 689 690 691 692 693 694 695
                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"
696
                ctx = scmutil.revsingle(repo, rev, node)
697
                rev = None # clear for future iterations
698
                state[transition].append(ctx.node())
699
                ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
700 701 702 703
                check_state(state, interactive=False)
                # bisect
                nodes, changesets, good = hbisect.bisect(repo.changelog, state)
                # update to next check
704 705 706 707
                node = nodes[0]
                if not noupdate:
                    cmdutil.bailifchanged(repo)
                    hg.clean(repo, node, show_stats=False)
708
        finally:
709
            state['current'] = [node]
710
            hbisect.save_state(repo, state)
711 712
        print_result(nodes, good)
        return
713 714

    # update state
715 716

    if rev:
717
        nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
718 719 720
    else:
        nodes = [repo.lookup('.')]

721 722
    if good or bad or skip:
        if good:
723
            state['good'] += nodes
724
        elif bad:
725
            state['bad'] += nodes
726
        elif skip:
727
            state['skip'] += nodes
728
        hbisect.save_state(repo, state)
729

730 731
    if not check_state(state):
        return
732 733

    # actually bisect
734
    nodes, changesets, good = hbisect.bisect(repo.changelog, state)
735 736 737 738 739
    if extend:
        if not changesets:
            extendnode = extendbisectrange(nodes, good)
            if extendnode is not None:
                ui.write(_("Extending search to changeset %d:%s\n"
740
                         % (extendnode.rev(), extendnode)))
741 742
                state['current'] = [extendnode.node()]
                hbisect.save_state(repo, state)
743 744
                if noupdate:
                    return
745
                cmdutil.bailifchanged(repo)
746 747 748
                return hg.clean(repo, extendnode.node())
        raise util.Abort(_("nothing to extend"))

749
    if changesets == 0:
750
        print_result(nodes, good)
751 752 753
    else:
        assert len(nodes) == 1 # only a single node can be tested next
        node = nodes[0]
754 755 756 757 758
        # 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)
759 760
        ui.write(_("Testing changeset %d:%s "
                   "(%d changesets remaining, ~%d tests)\n")
761
                 % (rev, short(node), changesets, tests))
762 763
        state['current'] = [node]
        hbisect.save_state(repo, state)
764
        if not noupdate:
765
            cmdutil.bailifchanged(repo)
766 767
            return hg.clean(repo, node)

768
@command('bookmarks|bookmark',
769 770 771 772
    [('f', 'force', False, _('force')),
    ('r', 'rev', '', _('revision'), _('REV')),
    ('d', 'delete', False, _('delete a given bookmark')),
    ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
773
    ('i', 'inactive', False, _('mark a bookmark inactive'))],
774 775
    _('hg bookmarks [OPTIONS]... [NAME]...'))
def bookmark(ui, repo, *names, **opts):
776 777
    '''track a line of development with movable markers

778 779 780 781
    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.
782 783 784 785 786 787 788

    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
789 790 791
    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.
792

793 794 795 796
    If you set a bookmark called '@', new clones of the repository will
    have that revision checked out (and the bookmark made active) by
    default.

797 798 799 800
    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.
801
    '''
802 803 804 805 806 807
    force = opts.get('force')
    rev = opts.get('rev')
    delete = opts.get('delete')
    rename = opts.get('rename')
    inactive = opts.get('inactive')

808 809 810 811
    hexfn = ui.debugflag and hex or short
    marks = repo._bookmarks
    cur   = repo.changectx('.').node()

812 813 814 815 816
    def checkformat(mark):
        mark = mark.strip()
        if not mark:
            raise util.Abort(_("bookmark names cannot consist entirely of "
                               "whitespace"))
817
        scmutil.checknewlabel(repo, mark, 'bookmark')
818 819
        return mark

820
    def checkconflict(repo, mark, force=False, target=None):
821
        if mark in marks and not force:
822
            if target:
823 824 825
                if marks[mark] == target and target == cur:
                    # re-activating a bookmark
                    return
826 827
                anc = repo.changelog.ancestors([repo[target].rev()])
                bmctx = repo[marks[mark]]
828 829
                divs = [repo[b].node() for b in marks
                        if b.split('@', 1)[0] == mark.split('@', 1)[0]]
830 831 832 833 834 835 836 837

                # 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

838 839 840
                deletefrom = [b for b in divs
                              if repo[b].rev() in anc or b == target]
                bookmarks.deletedivergent(repo, deletefrom, mark)
841 842 843 844
                if bmctx.rev() in anc:
                    ui.status(_("moving bookmark '%s' forward from %s\n") %
                              (mark, short(bmctx.node())))
                    return
845 846 847 848 849 850 851
            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(
                _("a bookmark cannot have the name of an existing branch"))

852 853 854 855 856 857
    if delete and rename:
        raise util.Abort(_("--delete and --rename are incompatible"))
    if delete and rev:
        raise util.Abort(_("--rev is incompatible with --delete"))
    if rename and rev:
        raise util.Abort(_("--rev is incompatible with --rename"))
858
    if not names and (delete or rev):
Kevin Bullock's avatar
Kevin Bullock committed
859
        raise util.Abort(_("bookmark name required"))
860

861
    if delete:
862 863 864 865 866 867
        for mark in names:
            if mark not in marks:
                raise util.Abort(_("bookmark '%s' does not exist") % mark)
            if mark == repo._bookmarkcurrent:
                bookmarks.setcurrent(repo, None)
            del marks[mark]
868
        marks.write()
869

Kevin Bullock's avatar
Kevin Bullock committed
870
    elif rename:
871
        if not names:
872
            raise util.Abort(_("new bookmark name required"))
873 874 875
        elif len(names) > 1:
            raise util.Abort(_("only one new bookmark name allowed"))
        mark = checkformat(names[0])
876 877 878
        if rename not in marks:
            raise util.Abort(_("bookmark '%s' does not exist") % rename)
        checkconflict(repo, mark, force)