commands.py 219 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, shlex
12
import sys
13
import hg, scmutil, util, revlog, copies, error, bookmarks
14
import patch, help, encoding, templatekw, discovery
15
import archival, changegroup, cmdutil, hbisect
16
import sshserver, hgweb, commandserver
17
import extensions
18
from hgweb import server as hgweb_server
19
import merge as mergemod
20
import minirst, revset, fileset
21
import dagparser, context, simplemerge, graphmod
22 23
import random
import setdiscovery, treediscovery, dagutil, pvec, localrepo
24
import phases, obsolete, exchange
25

26 27 28 29
table = {}

command = cmdutil.command(table)

30 31 32
# Space delimited list of commands that don't require local repositories.
# This should be populated by passing norepo=True into the @command decorator.
norepo = ''
33 34 35 36
# Space delimited list of commands that optionally require local repositories.
# This should be populated by passing optionalrepo=True into the @command
# decorator.
optionalrepo = ''
37 38 39 40 41
# Space delimited list of commands that will examine arguments looking for
# a repository. This should be populated by passing inferrepo=True into the
# @command decorator.
inferrepo = ''

42 43 44 45 46 47 48 49 50
# common command options

globalopts = [
    ('R', 'repository', '',
     _('repository root directory or name of overlay bundle file'),
     _('REPO')),
    ('', 'cwd', '',
     _('change working directory'), _('DIR')),
    ('y', 'noninteractive', None,
51
     _('do not prompt, automatically pick the first choice for all prompts')),
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
    ('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')),
68
    ('', 'hidden', False, _('consider hidden changesets')),
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 104 105
]

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', '',
106
     _('display using template map file (DEPRECATED)'), _('STYLE')),
107
    ('T', 'template', '',
108 109 110 111 112 113 114 115 116 117
     _('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')),
118
    ('G', 'graph', None, _("show the revision DAG")),
119 120 121 122 123 124 125 126
] + 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'))
]

127
diffwsopts = [
128 129 130 131 132 133
    ('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')),
134 135 136 137 138 139
    ]

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

145 146 147 148
mergetoolopts = [
    ('t', 'tool', '', _('specify merge tool')),
]

149 150 151 152 153 154 155 156 157 158
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
159
# Commands start here, listed alphabetically
160

161 162
@command('^add',
    walkopts + subrepoopts + dryrunopts,
163 164
    _('[OPTION]... [FILE]...'),
    inferrepo=True)
165
def add(ui, repo, *pats, **opts):
166 167
    """add the specified files on the next commit

168 169
    Schedule files to be version controlled and added to the
    repository.
170

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

174
    If no names are given, add all files to the repository.
175 176 177 178

    .. container:: verbose

       An example showing how new (unknown) files are added
Martin Geisler's avatar
Martin Geisler committed
179
       automatically by :hg:`add`::
180 181 182 183 184 185 186 187

         $ ls
         foo.c
         $ hg status
         ? foo.c
         $ hg add
         adding foo.c
         $ hg status
188
         A foo.c
189 190

    Returns 0 if all files are successfully added.
191 192
    """

193
    m = scmutil.match(repo[None], pats, opts)
194
    rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
195
                           opts.get('subrepos'), prefix="", explicitonly=False)
196
    return rejected and 1 or 0
197

198 199
@command('addremove',
    similarityopts + walkopts + dryrunopts,
200 201
    _('[OPTION]... [FILE]...'),
    inferrepo=True)
202
def addremove(ui, repo, *pats, **opts):
203
    """add all new files, delete all missing files
204

205 206
    Add all new files and remove all missing files from the
    repository.
207

208
    New files are ignored if they match any of the patterns in
209
    ``.hgignore``. As with add, these changes take effect at the next
210
    commit.
211

212
    Use the -s/--similarity option to detect renamed files. This
213
    option takes a percentage between 0 (disabled) and 100 (files must
214 215 216
    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
217
    can be expensive. After using this option, :hg:`status -C` can be
218 219 220
    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.
221 222

    Returns 0 if all files are successfully added.
223
    """
224
    try:
225
        sim = float(opts.get('similarity') or 100)
226 227
    except ValueError:
        raise util.Abort(_('similarity must be a number'))
228 229
    if sim < 0 or sim > 100:
        raise util.Abort(_('similarity must be between 0 and 100'))
230
    return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
231

232 233 234 235 236 237 238 239 240 241 242 243
@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'))
244
    ] + diffwsopts + walkopts,
245 246
    _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
    inferrepo=True)
247
def annotate(ui, repo, *pats, **opts):
248
    """show changeset information by line for each file
249

250 251
    List changes in files, showing the revision id responsible for
    each line
252

253 254
    This command is useful for discovering when a change was made and
    by whom.
255

256 257 258 259
    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.
260 261

    Returns 0 on success.
262
    """
263 264 265
    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
266
        opts['file'] = True
267

268 269
    datefunc = ui.quiet and util.shortdate or util.datestr
    getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
270

271
    if not pats:
272
        raise util.Abort(_('at least one filename or pattern is required'))
273

274 275
    hexfn = ui.debugflag and hex or short

276 277
    opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
             ('number', ' ', lambda x: str(x[0].rev())),
278
             ('changeset', ' ', lambda x: hexfn(x[0].node())),
279 280 281
             ('date', ' ', getdate),
             ('file', ' ', lambda x: x[0].path()),
             ('line_number', ':', lambda x: str(x[1])),
282 283
            ]

284
    if (not opts.get('user') and not opts.get('changeset')
285
        and not opts.get('date') and not opts.get('file')):
286
        opts['number'] = True
287

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

292 293
    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
294

295 296 297
    def bad(x, y):
        raise util.Abort("%s: %s" % (x, y))

298
    ctx = scmutil.revsingle(repo, opts.get('rev'))
299
    m = scmutil.match(ctx, pats, opts)
300
    m.bad = bad
301
    follow = not opts.get('no_follow')
302
    diffopts = patch.diffopts(ui, opts, section='annotate')
Matt Mackall's avatar
Matt Mackall committed
303 304
    for abs in ctx.walk(m):
        fctx = ctx[abs]
305
        if not opts.get('text') and util.binary(fctx.data()):
306
            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
307 308
            continue

309 310
        lines = fctx.annotate(follow=follow, linenumber=linenumber,
                              diffopts=diffopts)
311 312
        pieces = []

313
        for f, sep in funcmap:
314 315
            l = [f(n) for n, dummy in lines]
            if l:
316 317
                sized = [(x, encoding.colwidth(x)) for x in l]
                ml = max([w for x, w in sized])
318 319
                pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
                               for x, w in sized])
320

mpm@selenic.com's avatar
mpm@selenic.com committed
321 322
        if pieces:
            for p, l in zip(zip(*pieces), lines):
323
                ui.write("%s: %s" % ("".join(p), l[1]))
324

325 326 327
            if lines and not lines[-1][1].endswith('\n'):
                ui.write('\n')

328 329 330 331 332 333 334 335
@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'))
336
def archive(ui, repo, dest, **opts):
337
    '''create an unversioned archive of a repository revision
338

339 340
    By default, the revision used is the parent of the working
    directory; use -r/--rev to specify a different revision.
341

342 343 344
    The archive type is automatically detected based on file
    extension (or override using -t/--type).

Matt Mackall's avatar
Matt Mackall committed
345 346 347 348 349 350 351 352 353 354 355 356
    .. 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*"

357
    Valid types are:
358

359 360 361 362 363 364
    :``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
365

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

369 370 371 372
    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.
373 374

    Returns 0 on success.
375 376
    '''

377
    ctx = scmutil.revsingle(repo, opts.get('rev'))
378
    if not ctx:
379
        raise util.Abort(_('no working directory: please specify a revision'))
380
    node = ctx.node()
381
    dest = cmdutil.makefilename(repo, dest, node)
382
    if os.path.realpath(dest) == repo.root:
383
        raise util.Abort(_('repository root cannot be destination'))
384

385
    kind = opts.get('type') or archival.guesskind(dest) or 'files'
386
    prefix = opts.get('prefix')
387

388 389 390
    if dest == '-':
        if kind == 'files':
            raise util.Abort(_('cannot archive plain files to stdout'))
391
        dest = cmdutil.makefileobj(repo, dest)
392 393
        if not prefix:
            prefix = os.path.basename(repo.root) + '-%h'
394

395
    prefix = cmdutil.makefilename(repo, prefix, node)
396
    matchfn = scmutil.match(ctx, [], opts)
397
    archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
398
                     matchfn, prefix, subrepos=opts.get('subrepos'))
399

400 401
@command('backout',
    [('', 'merge', None, _('merge with old dirstate parent after backout')),
402 403
    ('', 'parent', '',
     _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
404
    ('r', 'rev', '', _('revision to backout'), _('REV')),
405
    ('e', 'edit', False, _('invoke editor on commit messages')),
406
    ] + mergetoolopts + walkopts + commitopts + commitopts2,
407
    _('[OPTION]... [-r] REV'))
Daniel Holth's avatar
Daniel Holth committed
408
def backout(ui, repo, node=None, rev=None, **opts):
Vadim Gelfer's avatar
Vadim Gelfer committed
409 410
    '''reverse effect of earlier changeset

411 412 413
    Prepare a new changeset with the effect of REV undone in the
    current working directory.

414
    If REV is the parent of the working directory, then this new changeset
415 416 417
    is committed automatically. Otherwise, hg needs to merge the
    changes and the merged result is left uncommitted.

418
    .. note::
419

420 421 422
      backout cannot be used to fix either an unwanted or
      incorrect merge.

Matt Mackall's avatar
Matt Mackall committed
423 424 425 426 427 428 429 430 431 432 433
    .. 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.
434

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

437 438
    Returns 0 on success, 1 if nothing to backout or there are unresolved
    files.
439
    '''
Daniel Holth's avatar
Daniel Holth committed
440 441 442 443 444
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

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

446 447 448
    if not rev:
        raise util.Abort(_("please specify a revision to backout"))

449 450 451 452
    date = opts.get('date')
    if date:
        opts['date'] = util.parsedate(date)

453
    cmdutil.checkunfinished(repo)
454
    cmdutil.bailifchanged(repo)
455
    node = scmutil.revsingle(repo, rev).node()
456

457
    op1, op2 = repo.dirstate.parents()
458
    if node not in repo.changelog.commonancestorsheads(op1, node):
459
        raise util.Abort(_('cannot backout change that is not an ancestor'))
460

461 462
    p1, p2 = repo.changelog.parents(node)
    if p1 == nullid:
463
        raise util.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer's avatar
Vadim Gelfer committed
464
    if p2 != nullid:
465
        if not opts.get('parent'):
466
            raise util.Abort(_('cannot backout a merge changeset'))
467 468
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
469
            raise util.Abort(_('%s is not a parent of %s') %
470
                             (short(p), short(node)))
471 472
        parent = p
    else:
473
        if opts.get('parent'):
474 475
            raise util.Abort(_('cannot use --parent on non-merge changeset'))
        parent = p1
476

477
    # the backout should appear on the same branch
478 479 480
    wlock = repo.wlock()
    try:
        branch = repo.dirstate.branch()
481
        bheads = repo.branchheads(branch)
482
        rctx = scmutil.revsingle(repo, hex(parent))
483 484
        if not opts.get('merge') and op1 != node:
            try:
485 486
                ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                             'backout')
487 488
                stats = mergemod.update(repo, parent, True, True, False,
                                        node, False)
489 490 491
                repo.setparents(op1, op2)
                hg._showstats(repo, stats)
                if stats[3]:
492 493 494 495 496 497
                    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))
498
                return stats[3] > 0
499
            finally:
500
                ui.setconfig('ui', 'forcemerge', '', '')
501 502 503 504 505
        else:
            hg.clean(repo, node, show_stats=False)
            repo.dirstate.setbranch(branch)
            cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())

506

507
        def commitfunc(ui, repo, message, match, opts):
508 509
            editform = 'backout'
            e = cmdutil.getcommiteditor(editform=editform, **opts)
510 511 512
            if not message:
                # we don't translate commit messages
                message = "Backed out changeset %s" % short(node)
513
                e = cmdutil.getcommiteditor(edit=True, editform=editform)
514 515 516
            return repo.commit(message, opts.get('user'), opts.get('date'),
                               match, editor=e)
        newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
517 518 519
        if not newnode:
            ui.status(_("nothing changed\n"))
            return 1
520
        cmdutil.commitstatus(repo, newnode, branch, bheads)
521

522 523 524 525 526 527 528 529 530
        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:
531 532
                ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                             'backout')
533 534
                return hg.merge(repo, hex(repo.changelog.tip()))
            finally:
535
                ui.setconfig('ui', 'forcemerge', '', '')
536 537
    finally:
        wlock.release()
538
    return 0
Vadim Gelfer's avatar
Vadim Gelfer committed
539

540 541 542 543 544 545 546 547 548
@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]"))
549
def bisect(ui, repo, rev=None, extra=None, command=None,
550 551
               reset=None, good=None, bad=None, skip=None, extend=None,
               noupdate=None):
552 553
    """subdivision search of changesets

554 555 556 557 558 559 560 561 562 563 564 565 566
    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.
567 568 569 570 571 572
    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.
573

574 575 576 577
    .. container:: verbose

      Some examples:

578
      - start a bisection with known bad revision 34, and good revision 12::
579 580 581 582 583 584 585 586 587 588

          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
589
      - mark the current revision, or a known revision, to be skipped (e.g. if
590 591 592 593 594
        that revision is not usable because of another issue)::

          hg bisect --skip
          hg bisect --skip 23

595
      - skip all revisions that do not touch directories ``foo`` or ``bar``::
596

597
          hg bisect --skip "!( file('path:foo') & file('path:bar') )"
598

599 600 601 602 603 604 605 606 607 608
      - 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
609
          hg bisect --command "make && make tests"
610 611 612 613 614 615

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

          hg log -r "bisect(pruned)"

616 617 618 619 620
      - see the changeset currently being bisected (especially useful
        if running with -U/--noupdate)::

          hg log -r "bisect(current)"

621 622 623 624
      - see all changesets that took part in the current bisection::

          hg log -r "bisect(range)"

625
      - you can even get a nice graph::
626 627 628

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

629 630
      See :hg:`help revsets` for more about the `bisect()` keyword.

631
    Returns 0 on success.
632
    """
633 634 635 636 637 638 639 640
    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
641
                return parents[0].ancestor(parents[1])
642 643
        return None

644 645 646 647
    def print_result(nodes, good):
        displayer = cmdutil.show_changeset(ui, repo, {})
        if len(nodes) == 1:
            # narrowed it down to a single revision
648 649 650 651
            if good:
                ui.write(_("The first good revision is:\n"))
            else:
                ui.write(_("The first bad revision is:\n"))
652
            displayer.show(repo[nodes[0]])
653 654 655 656 657
            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')
658
                         % extendnode)
659 660
        else:
            # multiple possible revisions
661 662 663 664 665 666
            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"))
667
            for n in nodes:
668
                displayer.show(repo[n])
669
        displayer.close()
670 671 672 673 674 675 676 677 678 679 680

    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

681 682 683 684 685 686 687 688 689 690
    # 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
691
    elif extra or good + bad + skip + reset + extend + bool(command) > 1:
692
        raise util.Abort(_('incompatible arguments'))
693

694 695
    cmdutil.checkunfinished(repo)

696 697 698 699 700 701
    if reset:
        p = repo.join("bisect.state")
        if os.path.exists(p):
            os.unlink(p)
        return

702 703 704 705
    state = hbisect.load_state(repo)

    if command:
        changesets = 1
706 707 708 709
        if noupdate:
            try:
                node = state['current'][0]
            except LookupError:
710 711
                raise util.Abort(_('current bisect revision is unknown - '
                                   'start a new bisect to fix'))
712
        else:
713 714 715
            node, p2 = repo.dirstate.parents()
            if p2 != nullid:
                raise util.Abort(_('current bisect revision is a merge'))
716 717 718
        try:
            while changesets:
                # update state
719
                state['current'] = [node]
720
                hbisect.save_state(repo, state)
721 722 723
                status = util.system(command,
                                     environ={'HG_NODE': hex(node)},
                                     out=ui.fout)
724 725 726 727 728 729 730 731 732 733 734
                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"
735
                ctx = scmutil.revsingle(repo, rev, node)
736
                rev = None # clear for future iterations
737
                state[transition].append(ctx.node())
738
                ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
739 740
                check_state(state, interactive=False)
                # bisect
741
                nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
742
                # update to next check
743 744 745 746
                node = nodes[0]
                if not noupdate:
                    cmdutil.bailifchanged(repo)
                    hg.clean(repo, node, show_stats=False)
747
        finally:
748
            state['current'] = [node]
749
            hbisect.save_state(repo, state)
750
        print_result(nodes, bgood)
751
        return
752 753

    # update state
754 755

    if rev:
756
        nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
757 758 759
    else:
        nodes = [repo.lookup('.')]

760 761
    if good or bad or skip:
        if good:
762
            state['good'] += nodes
763
        elif bad:
764
            state['bad'] += nodes
765
        elif skip:
766
            state['skip'] += nodes
767
        hbisect.save_state(repo, state)
768

769 770
    if not check_state(state):
        return
771 772

    # actually bisect
773
    nodes, changesets, good = hbisect.bisect(repo.changelog, state)
774 775 776 777
    if extend:
        if not changesets:
            extendnode = extendbisectrange(nodes, good)
            if extendnode is not None:
778 779
                ui.write(_("Extending search to changeset %d:%s\n")
                         % (extendnode.rev(), extendnode))
780 781
                state['current'] = [extendnode.node()]
                hbisect.save_state(repo, state)
782 783
                if noupdate:
                    return
784
                cmdutil.bailifchanged(repo)
785 786 787
                return hg.clean(repo, extendnode.node())
        raise util.Abort(_("nothing to extend"))

788
    if changesets == 0:
789
        print_result(nodes, good)
790 791 792
    else:
        assert len(nodes) == 1 # only a single node can be tested next
        node = nodes[0]
793 794 795 796 797
        # 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)
798 799
        ui.write(_("Testing changeset %d:%s "
                   "(%d changesets remaining, ~%d tests)\n")
800
                 % (rev, short(node), changesets, tests))
801 802
        state['current'] = [node]
        hbisect.save_state(repo, state)
803
        if not noupdate:
804
            cmdutil.bailifchanged(repo)
805 806
            return hg.clean(repo, node)

807
@command('bookmarks|bookmark',
808 809 810 811
    [('f', 'force', False, _('force')),
    ('r', 'rev', '', _('revision'), _('REV')),
    ('d', 'delete', False, _('delete a given bookmark')),
    ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
812
    ('i', 'inactive', False, _('mark a bookmark inactive'))],
813 814
    _('hg bookmarks [OPTIONS]... [NAME]...'))
def bookmark(ui, repo, *names, **opts):
815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853
    '''create a new bookmark or list existing bookmarks

    Bookmarks are labels on changesets to help track lines of development.
    Bookmarks are unversioned and can be moved, renamed and deleted.
    Deleting or moving a bookmark has no effect on the associated changesets.

    Creating or updating to a bookmark causes it to be marked as 'active'.
    Active bookmarks are indicated with a '*'.
    When a commit is made, an active bookmark will advance to the new commit.
    A plain :hg:`update` will also advance an active bookmark, if possible.
    Updating away from a bookmark will cause it to be deactivated.

    Bookmarks can be pushed and pulled between repositories (see
    :hg:`help push` and :hg:`help pull`). If a shared bookmark has
    diverged, a new 'divergent bookmark' of the form 'name@path' will
    be created. Using :hg:'merge' will resolve the divergence.

    A bookmark named '@' has the special property that :hg:`clone` will
    check it out by default if it exists.

    .. container:: verbose

      Examples:

      - create an active bookmark for a new line of development::

          hg book new-feature

      - create an inactive bookmark as a place marker::

          hg book -i reviewed

      - create an inactive bookmark on another changeset::

          hg book -r .^ tested

      - move the '@' bookmark from another branch::

          hg book -f @
854
    '''
855 856 857 858 859 860
    force = opts.get('force')
    rev = opts.get('rev')
    delete = opts.get('delete')
    rename = opts.get('rename')
    inactive = opts.get('inactive')

861 862 863 864 865
    def checkformat(mark):
        mark = mark.strip()
        if not mark:
            raise util.Abort(_("bookmark names cannot consist entirely of "
                               "whitespace"))
Kevin Bullock's avatar