commands.py 135 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, nullid, nullrev, short
9
from lock import release
10
from i18n import _, gettext
Benoit Boissinot's avatar
Benoit Boissinot committed
11 12
import os, re, sys, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, error
13
import patch, help, mdiff, url, encoding, templatekw
14 15
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server
Matt Mackall's avatar
Matt Mackall committed
16
import merge as merge_
17
import minirst
18

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

21
def add(ui, repo, *pats, **opts):
22 23
    """add the specified files on the next commit

24 25
    Schedule files to be version controlled and added to the
    repository.
26

27 28
    The files will be added to the repository at the next commit. To
    undo an add before that, see hg forget.
29

30
    If no names are given, add all files to the repository.
31 32
    """

33
    bad = []
34
    names = []
35
    m = cmdutil.match(repo, pats, opts)
36 37 38 39 40 41 42 43 44
    oldbad = m.bad
    m.bad = lambda x,y: bad.append(x) or oldbad(x,y)

    for f in repo.walk(m):
        exact = m.exact(f)
        if exact or f not in repo.dirstate:
            names.append(f)
            if ui.verbose or not exact:
                ui.status(_('adding %s\n') % m.rel(f))
45
    if not opts.get('dry_run'):
46 47
        bad += [f for f in repo.add(names) if f in m.files()]
    return bad and 1 or 0
48

49
def addremove(ui, repo, *pats, **opts):
50
    """add all new files, delete all missing files
51

52 53
    Add all new files and remove all missing files from the
    repository.
54

55 56 57
    New files are ignored if they match any of the patterns in
    .hgignore. As with add, these changes take effect at the next
    commit.
58

59 60 61 62 63 64
    Use the -s/--similarity option to detect renamed files. With a
    parameter greater than 0, this compares every removed file with
    every added file and records those similar enough as renames. This
    option takes a percentage between 0 (disabled) and 100 (files must
    be identical) as its parameter. Detecting renamed files this way
    can be expensive.
65
    """
66 67 68 69
    try:
        sim = float(opts.get('similarity') or 0)
    except ValueError:
        raise util.Abort(_('similarity must be a number'))
70 71 72
    if sim < 0 or sim > 100:
        raise util.Abort(_('similarity must be between 0 and 100'))
    return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
73

74
def annotate(ui, repo, *pats, **opts):
75
    """show changeset information by line for each file
76

77 78
    List changes in files, showing the revision id responsible for
    each line
79

80 81
    This command is useful for discovering when a change was made and
    by whom.
82

83 84 85 86
    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.
87
    """
88 89
    datefunc = ui.quiet and util.shortdate or util.datestr
    getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
90

91
    if not pats:
92
        raise util.Abort(_('at least one filename or pattern is required'))
93

94 95 96 97 98 99 100
    opmap = [('user', lambda x: ui.shortuser(x[0].user())),
             ('number', lambda x: str(x[0].rev())),
             ('changeset', lambda x: short(x[0].node())),
             ('date', getdate),
             ('follow', lambda x: x[0].path()),
            ]

101 102
    if (not opts.get('user') and not opts.get('changeset') and not opts.get('date')
        and not opts.get('follow')):
103
        opts['number'] = 1
104

105
    linenumber = opts.get('line_number') is not None
106
    if (linenumber and (not opts.get('changeset')) and (not opts.get('number'))):
107 108 109 110 111 112 113
        raise util.Abort(_('at least one of -n/-c is required for -l'))

    funcmap = [func for op, func in opmap if opts.get(op)]
    if linenumber:
        lastfunc = funcmap[-1]
        funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])

114
    ctx = repo[opts.get('rev')]
115

116
    m = cmdutil.match(repo, pats, opts)
Matt Mackall's avatar
Matt Mackall committed
117 118
    for abs in ctx.walk(m):
        fctx = ctx[abs]
119
        if not opts.get('text') and util.binary(fctx.data()):
120
            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
121 122
            continue

123 124
        lines = fctx.annotate(follow=opts.get('follow'),
                              linenumber=linenumber)
125 126
        pieces = []

127 128 129
        for f in funcmap:
            l = [f(n) for n, dummy in lines]
            if l:
130 131
                ml = max(map(len, l))
                pieces.append(["%*s" % (ml, x) for x in l])
132

mpm@selenic.com's avatar
mpm@selenic.com committed
133 134 135
        if pieces:
            for p, l in zip(zip(*pieces), lines):
                ui.write("%s: %s" % (" ".join(p), l[1]))
136

137
def archive(ui, repo, dest, **opts):
138
    '''create an unversioned archive of a repository revision
139

140 141
    By default, the revision used is the parent of the working
    directory; use -r/--rev to specify a different revision.
142

143
    To specify the type of archive to create, use -t/--type. Valid
144
    types are:
145

146 147 148 149 150 151
    :``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
152

153 154
    The exact name of the destination archive or directory is given
    using a format string; see 'hg help export' for details.
155

156 157 158 159
    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.
160 161
    '''

162
    ctx = repo[opts.get('rev')]
163
    if not ctx:
164
        raise util.Abort(_('no working directory: please specify a revision'))
165
    node = ctx.node()
Vadim Gelfer's avatar
Vadim Gelfer committed
166
    dest = cmdutil.make_filename(repo, dest, node)
167 168
    if os.path.realpath(dest) == repo.root:
        raise util.Abort(_('repository root cannot be destination'))
169
    matchfn = cmdutil.match(repo, [], opts)
170
    kind = opts.get('type') or 'files'
171
    prefix = opts.get('prefix')
172 173 174 175 176
    if dest == '-':
        if kind == 'files':
            raise util.Abort(_('cannot archive plain files to stdout'))
        dest = sys.stdout
        if not prefix: prefix = os.path.basename(repo.root) + '-%h'
Vadim Gelfer's avatar
Vadim Gelfer committed
177
    prefix = cmdutil.make_filename(repo, prefix, node)
178
    archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
179
                     matchfn, prefix)
180

Daniel Holth's avatar
Daniel Holth committed
181
def backout(ui, repo, node=None, rev=None, **opts):
Vadim Gelfer's avatar
Vadim Gelfer committed
182 183
    '''reverse effect of earlier changeset

184 185
    Commit the backed out changes as a new changeset. The new
    changeset is a child of the backed out changeset.
Vadim Gelfer's avatar
Vadim Gelfer committed
186

187 188 189
    If you backout a changeset other than the tip, a new head is
    created. This head will be the new tip and you should merge this
    backout changeset with another head.
Vadim Gelfer's avatar
Vadim Gelfer committed
190

191 192 193 194
    The --merge option remembers the parent of the working directory
    before starting the backout, then merges the new head with that
    changeset afterwards. This saves you from doing the merge by hand.
    The result of this merge is not committed, as with a normal merge.
195

196
    See 'hg help dates' for a list of formats valid for -d/--date.
197
    '''
Daniel Holth's avatar
Daniel Holth committed
198 199 200 201 202
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

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

204 205 206
    if not rev:
        raise util.Abort(_("please specify a revision to backout"))

207 208 209 210
    date = opts.get('date')
    if date:
        opts['date'] = util.parsedate(date)

211
    cmdutil.bail_if_changed(repo)
Vadim Gelfer's avatar
Vadim Gelfer committed
212
    node = repo.lookup(rev)
213

214
    op1, op2 = repo.dirstate.parents()
215 216
    a = repo.changelog.ancestor(op1, node)
    if a != node:
217
        raise util.Abort(_('cannot backout change on a different branch'))
218

219 220
    p1, p2 = repo.changelog.parents(node)
    if p1 == nullid:
221
        raise util.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer's avatar
Vadim Gelfer committed
222
    if p2 != nullid:
223
        if not opts.get('parent'):
224
            raise util.Abort(_('cannot backout a merge changeset without '
225 226 227
                               '--parent'))
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
228
            raise util.Abort(_('%s is not a parent of %s') %
229
                             (short(p), short(node)))
230 231
        parent = p
    else:
232
        if opts.get('parent'):
233 234
            raise util.Abort(_('cannot use --parent on non-merge changeset'))
        parent = p1
235

236 237
    # the backout should appear on the same branch
    branch = repo.dirstate.branch()
238
    hg.clean(repo, node, show_stats=False)
239
    repo.dirstate.setbranch(branch)
Vadim Gelfer's avatar
Vadim Gelfer committed
240
    revert_opts = opts.copy()
241
    revert_opts['date'] = None
242
    revert_opts['all'] = True
Vadim Gelfer's avatar
Vadim Gelfer committed
243
    revert_opts['rev'] = hex(parent)
244
    revert_opts['no_backup'] = None
Vadim Gelfer's avatar
Vadim Gelfer committed
245 246 247
    revert(ui, repo, **revert_opts)
    commit_opts = opts.copy()
    commit_opts['addremove'] = False
248
    if not commit_opts['message'] and not commit_opts['logfile']:
249
        # we don't translate commit messages
250
        commit_opts['message'] = "Backed out changeset %s" % short(node)
251
        commit_opts['force_editor'] = True
Vadim Gelfer's avatar
Vadim Gelfer committed
252 253 254 255 256
    commit(ui, repo, **commit_opts)
    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)))
257
    if op1 != node:
258
        hg.clean(repo, op1, show_stats=False)
259
        if opts.get('merge'):
260 261
            ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
            hg.merge(repo, hex(repo.changelog.tip()))
262 263 264
        else:
            ui.status(_('the backout changeset is a new head - '
                        'do not forget to merge\n'))
265 266
            ui.status(_('(use "backout --merge" '
                        'if you want to auto-merge)\n'))
Vadim Gelfer's avatar
Vadim Gelfer committed
267

268
def bisect(ui, repo, rev=None, extra=None, command=None,
269 270 271
               reset=None, good=None, bad=None, skip=None, noupdate=None):
    """subdivision search of changesets

272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288
    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.
    Its exit status 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.
289
    """
290 291 292 293
    def print_result(nodes, good):
        displayer = cmdutil.show_changeset(ui, repo, {})
        if len(nodes) == 1:
            # narrowed it down to a single revision
294 295 296 297
            if good:
                ui.write(_("The first good revision is:\n"))
            else:
                ui.write(_("The first bad revision is:\n"))
298
            displayer.show(repo[nodes[0]])
299 300
        else:
            # multiple possible revisions
301 302 303 304 305 306
            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"))
307
            for n in nodes:
308
                displayer.show(repo[n])
309
        displayer.close()
310 311 312 313 314 315 316 317 318 319 320

    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

321 322 323 324 325 326 327 328 329 330
    # 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
331
    elif extra or good + bad + skip + reset + bool(command) > 1:
332
        raise util.Abort(_('incompatible arguments'))
333 334 335 336 337 338 339

    if reset:
        p = repo.join("bisect.state")
        if os.path.exists(p):
            os.unlink(p)
        return

340 341 342 343
    state = hbisect.load_state(repo)

    if command:
        changesets = 1
344 345 346
        try:
            while changesets:
                # update state
347
                status = util.system(command)
348 349 350 351 352 353 354 355 356 357 358
                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"
359 360 361
                ctx = repo[rev or '.']
                state[transition].append(ctx.node())
                ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
362 363 364 365 366 367 368 369
                check_state(state, interactive=False)
                # bisect
                nodes, changesets, good = hbisect.bisect(repo.changelog, state)
                # update to next check
                cmdutil.bail_if_changed(repo)
                hg.clean(repo, nodes[0], show_stats=False)
        finally:
            hbisect.save_state(repo, state)
370
        return print_result(nodes, good)
371 372 373

    # update state
    node = repo.lookup(rev or '.')
374 375 376 377 378 379 380 381
    if good or bad or skip:
        if good:
            state['good'].append(node)
        elif bad:
            state['bad'].append(node)
        elif skip:
            state['skip'].append(node)
        hbisect.save_state(repo, state)
382

383 384
    if not check_state(state):
        return
385 386

    # actually bisect
387
    nodes, changesets, good = hbisect.bisect(repo.changelog, state)
388
    if changesets == 0:
389
        print_result(nodes, good)
390 391 392
    else:
        assert len(nodes) == 1 # only a single node can be tested next
        node = nodes[0]
393 394 395 396 397
        # 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)
398 399
        ui.write(_("Testing changeset %d:%s "
                   "(%d changesets remaining, ~%d tests)\n")
400
                 % (rev, short(node), changesets, tests))
401 402 403 404
        if not noupdate:
            cmdutil.bail_if_changed(repo)
            return hg.clean(repo, node)

405
def branch(ui, repo, label=None, **opts):
406 407
    """set or show the current branch name

408 409 410 411 412
    With no argument, show the current branch name. With one argument,
    set the working directory branch name (the branch will not exist
    in the repository until the next commit). Standard practice
    recommends that primary development take place on the 'default'
    branch.
413

414 415
    Unless -f/--force is specified, branch will not let you set a
    branch name that already exists, even if it's inactive.
416

417 418 419
    Use -C/--clean to reset the working directory branch to that of
    the parent of the working directory, negating a previous branch
    change.
420

421 422
    Use the command 'hg update' to switch to an existing branch. Use
    'hg commit --close-branch' to mark this branch as closed.
423 424
    """

425 426 427 428 429
    if opts.get('clean'):
        label = repo[None].parents()[0].branch()
        repo.dirstate.setbranch(label)
        ui.status(_('reset working directory to branch %s\n') % label)
    elif label:
430
        if not opts.get('force') and label in repo.branchtags():
431
            if label not in [p.branch() for p in repo.parents()]:
432 433
                raise util.Abort(_('a branch of the same name already exists'
                                   ' (use --force to override)'))
434
        repo.dirstate.setbranch(encoding.fromlocal(label))
435
        ui.status(_('marked working directory as branch %s\n') % label)
436
    else:
437
        ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
438

439
def branches(ui, repo, active=False, closed=False):
440 441
    """list repository named branches

442 443 444
    List the repository's named branches, indicating which ones are
    inactive. If -c/--closed is specified, also list branches which have
    been marked closed (see hg commit --close-branch).
445

446 447
    If -a/--active is specified, only show active branches. A branch
    is considered active if it contains repository heads.
448 449

    Use the command 'hg update' to switch to an existing branch.
450
    """
451

452
    hexfunc = ui.debugflag and hex or short
453
    activebranches = [repo[n].branch() for n in repo.heads()]
454 455 456 457 458
    def testactive(tag, node):
        realhead = tag in activebranches
        open = node in repo.branchheads(tag, closed=False)
        return realhead and open
    branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
459 460
                          for tag, node in repo.branchtags().items()],
                      reverse=True)
461 462 463

    for isactive, node, tag in branches:
        if (not active) or isactive:
464
            encodedtag = encoding.tolocal(tag)
465
            if ui.quiet:
466
                ui.write("%s\n" % encodedtag)
467
            else:
468 469 470 471
                hn = repo.lookup(node)
                if isactive:
                    notice = ''
                elif hn not in repo.branchheads(tag, closed=False):
472 473
                    if not closed:
                        continue
474
                    notice = _(' (closed)')
475
                else:
476
                    notice = _(' (inactive)')
477 478
                rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
                data = encodedtag, rev, hexfunc(hn), notice
479
                ui.write("%s %s:%s%s\n" % data)
480

481
def bundle(ui, repo, fname, dest=None, **opts):
482 483
    """create a changegroup file

484 485
    Generate a compressed changegroup file collecting changesets not
    known to be in another repository.
486

487 488 489 490
    If no destination repository is specified the destination is
    assumed to have all the nodes specified by one or more --base
    parameters. To create a bundle containing all changesets, use
    -a/--all (or --base null).
491

492 493 494
    You can change compression method with the -t/--type option.
    The available compression methods are: none, bzip2, and
    gzip (by default, bundles are compressed using bzip2).
495

496 497 498 499
    The bundle file can then be transferred using conventional means
    and applied to another repository with the unbundle or pull
    command. This is useful when direct push and pull are not
    available or when exporting an entire repository is undesirable.
500

501 502
    Applying bundles preserves all changeset contents including
    permissions, copy/rename information, and revision history.
503
    """
504 505 506
    revs = opts.get('rev') or None
    if revs:
        revs = [repo.lookup(rev) for rev in revs]
507 508 509 510
    if opts.get('all'):
        base = ['null']
    else:
        base = opts.get('base')
511 512
    if base:
        if dest:
513
            raise util.Abort(_("--base is incompatible with specifying "
514
                               "a destination"))
515 516 517
        base = [repo.lookup(rev) for rev in base]
        # create the right base
        # XXX: nodesbetween / changegroup* should be "fixed" instead
518
        o = []
519
        has = set((nullid,))
520
        for n in base:
Matt Mackall's avatar
Matt Mackall committed
521
            has.update(repo.changelog.reachable(n))
522
        if revs:
523
            visit = list(revs)
524
        else:
525
            visit = repo.changelog.heads()
Matt Mackall's avatar
Matt Mackall committed
526
        seen = {}
527 528
        while visit:
            n = visit.pop(0)
Matt Mackall's avatar
Matt Mackall committed
529
            parents = [p for p in repo.changelog.parents(n) if p not in has]
530 531 532
            if len(parents) == 0:
                o.insert(0, n)
            else:
533 534
                for p in parents:
                    if p not in seen:
Matt Mackall's avatar
Matt Mackall committed
535
                        seen[p] = 1
536
                        visit.append(p)
537
    else:
Alexis S. L. Carvalho's avatar
Alexis S. L. Carvalho committed
538
        dest, revs, checkout = hg.parseurl(
Matt Mackall's avatar
Matt Mackall committed
539
            ui.expandpath(dest or 'default-push', dest or 'default'), revs)
Matt Mackall's avatar
Matt Mackall committed
540
        other = hg.repository(cmdutil.remoteui(repo, opts), dest)
541
        o = repo.findoutgoing(other, force=opts.get('force'))
542 543 544 545 546

    if revs:
        cg = repo.changegroupsubset(o, revs, 'bundle')
    else:
        cg = repo.changegroup(o, 'bundle')
547 548 549 550 551 552 553 554

    bundletype = opts.get('type', 'bzip2').lower()
    btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
    bundletype = btypes.get(bundletype)
    if bundletype not in changegroup.bundletypes:
        raise util.Abort(_('unknown bundle type specified with --type'))

    changegroup.writebundle(cg, fname, bundletype)
555

556
def cat(ui, repo, file1, *pats, **opts):
557
    """output the current or given revision of files
558

559 560 561
    Print the specified files as they were at the given revision. If
    no revision is given, the parent of the working directory is used,
    or tip if no revision is checked out.
562

563 564
    Output may be to a file, in which case the name of the file is
    given using a format string. The formatting rules are the same as
565
    for the export command, with the following additions:
566

567 568 569
    :``%s``: basename of file being printed
    :``%d``: dirname of file being printed, or '.' if in repository root
    :``%p``: root-relative path name of file being printed
570
    """
571
    ctx = repo[opts.get('rev')]
Matt Mackall's avatar
Matt Mackall committed
572
    err = 1
573
    m = cmdutil.match(repo, (file1,) + pats, opts)
Matt Mackall's avatar
Matt Mackall committed
574
    for abs in ctx.walk(m):
575
        fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
Matt Mackall's avatar
Matt Mackall committed
576
        data = ctx[abs].data()
577
        if opts.get('decode'):
578 579
            data = repo.wwritedata(abs, data)
        fp.write(data)
Matt Mackall's avatar
Matt Mackall committed
580 581
        err = 0
    return err
mpm@selenic.com's avatar
mpm@selenic.com committed
582

583
def clone(ui, source, dest=None, **opts):
584 585 586 587
    """make a copy of an existing repository

    Create a copy of an existing repository in a new directory.

588 589
    If no destination directory name is specified, it defaults to the
    basename of the source.
590

591 592
    The location of the source is added to the new repository's
    .hg/hgrc file, as the default to be used for future pulls.
593

594 595
    See 'hg help urls' for valid source format details.

596
    It is possible to specify an ``ssh://`` URL as the destination, but no
597
    .hg/hgrc and working directory will be created on the remote side.
598
    Please see 'hg help urls' for important details about ``ssh://`` URLs.
599

600 601 602
    If the -U/--noupdate option is specified, the new clone will contain
    only a repository (.hg) and no working copy (the working copy parent
    will be the null changeset). Otherwise, clone will initially check
603
    out (in order of precedence):
604

605 606 607
    a) the changeset, tag or branch specified with -u/--updaterev
    b) the changeset, tag or branch given with the first -r/--rev
    c) the head of the default branch
608 609 610 611 612 613 614 615

    Use 'hg clone -u . src dst' to checkout the source repository's
    parent changeset (applicable for local source repositories only).

    A set of changesets (tags, or branch names) to pull may be specified
    by listing each changeset (tag, or branch name) with -r/--rev.
    If -r/--rev is used, the cloned repository will contain only a subset
    of the changesets of the source repository. Only the set of changesets
Wagner Bruna's avatar
Wagner Bruna committed
616 617
    defined by all -r/--rev options (including all their ancestors)
    will be pulled into the destination repository.
618 619 620 621 622 623
    No subsequent changesets (including subsequent tags) will be present
    in the destination.

    Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
    local source repositories.

624 625 626 627 628 629
    For efficiency, hardlinks are used for cloning whenever the source
    and destination are on the same filesystem (note this applies only
    to the repository data, not to the checked out files). Some
    filesystems, such as AFS, implement hardlinking incorrectly, but
    do not report errors. In these cases, use the --pull option to
    avoid hardlinking.
630

631 632
    In some cases, you can clone repositories and checked out files
    using full hardlinks with ::
633 634 635

      $ cp -al REPO REPOCLONE

636 637 638 639 640 641
    This is the fastest way to clone, but it is not always safe. The
    operation is not atomic (making sure REPO is not modified during
    the operation is up to you) and you have to make sure your editor
    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
    this is not compatible with certain extensions that place their
    metadata under the .hg directory, such as mq.
642
    """
643 644 645
    if opts.get('noupdate') and opts.get('updaterev'):
        raise util.Abort(_("cannot specify both --noupdate and --updaterev"))

Matt Mackall's avatar
Matt Mackall committed
646
    hg.clone(cmdutil.remoteui(ui, opts), source, dest,
647 648 649
             pull=opts.get('pull'),
             stream=opts.get('uncompressed'),
             rev=opts.get('rev'),
650
             update=opts.get('updaterev') or not opts.get('noupdate'))
mpm@selenic.com's avatar
mpm@selenic.com committed
651

652
def commit(ui, repo, *pats, **opts):
653 654
    """commit the specified files or all outstanding changes

655
    Commit changes to the given files into the repository. Unlike a
656 657
    centralized RCS, this operation is a local operation. See hg push
    for a way to actively distribute your changes.
658

659 660
    If a list of files is omitted, all changes reported by "hg status"
    will be committed.
661

662 663
    If you are committing the result of a merge, do not provide any
    filenames or -I/-X filters.
664

665 666
    If no commit message is specified, the configured editor is
    started to prompt you for a message.
667 668

    See 'hg help dates' for a list of formats valid for -d/--date.
669
    """
670 671 672
    extra = {}
    if opts.get('close_branch'):
        extra['close'] = 1
673 674 675 676
    e = cmdutil.commiteditor
    if opts.get('force_editor'):
        e = cmdutil.commitforceeditor

677
    def commitfunc(ui, repo, message, match, opts):
678 679
        return repo.commit(message, opts.get('user'), opts.get('date'), match,
                           editor=e, extra=extra)
680

681 682
    node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
    if not node:
683
        ui.status(_("nothing changed\n"))
684 685 686 687 688 689
        return
    cl = repo.changelog
    rev = cl.rev(node)
    parents = cl.parentrevs(rev)
    if rev - 1 in parents:
        # one of the parents was the old tip
690 691 692 693
        pass
    elif (parents == (nullrev, nullrev) or
          len(cl.heads(cl.node(parents[0]))) > 1 and
          (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
694
        ui.status(_('created new head\n'))
Bryan O'Sullivan's avatar
Bryan O'Sullivan committed
695

696
    if ui.debugflag:
697
        ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
698
    elif ui.verbose:
699
        ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))
700

Bryan O'Sullivan's avatar
Bryan O'Sullivan committed
701
def copy(ui, repo, *pats, **opts):
702 703
    """mark files as copied for the next commit

704 705 706
    Mark dest as having copies of source files. If dest is a
    directory, copies are put in that directory. If dest is a file,
    the source must be a single file.
707

708 709 710
    By default, this command copies the contents of files as they
    exist in the working directory. If invoked with -A/--after, the
    operation is recorded, but no copying is performed.
711

712 713
    This command takes effect with the next commit. To undo a copy
    before that, see hg revert.
714
    """
Matt Mackall's avatar
Matt Mackall committed
715
    wlock = repo.wlock(False)
716
    try:
Matt Mackall's avatar
Matt Mackall committed
717
        return cmdutil.copy(ui, repo, pats, opts)
718
    finally:
719
        wlock.release()
mpm@selenic.com's avatar
mpm@selenic.com committed
720

721
def debugancestor(ui, repo, *args):
mpm@selenic.com's avatar
mpm@selenic.com committed
722
    """find the ancestor revision of two revisions in a given index"""
723 724
    if len(args) == 3:
        index, rev1, rev2 = args
725
        r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
726
        lookup = r.lookup
727
    elif len(args) == 2:
728 729 730
        if not repo:
            raise util.Abort(_("There is no Mercurial repository here "
                               "(.hg not found)"))
731
        rev1, rev2 = args
732
        r = repo.changelog
733
        lookup = repo.lookup
734 735
    else:
        raise util.Abort(_('either two or three arguments required'))
736
    a = r.ancestor(lookup(rev1), lookup(rev2))
mpm@selenic.com's avatar
mpm@selenic.com committed
737 738
    ui.write("%d:%s\n" % (r.rev(a), hex(a)))

739
def debugcommands(ui, cmd='', *args):
740
    for cmd, vals in sorted(table.iteritems()):
741 742 743 744
        cmd = cmd.split('|')[0].strip('^')
        opts = ', '.join([i[1] for i in vals[1]])
        ui.write('%s: %s\n' % (cmd, opts))

745
def debugcomplete(ui, cmd='', **opts):
Benoit Boissinot's avatar
Benoit Boissinot committed
746
    """returns the completion list associated with the given command"""
747

748
    if opts.get('options'):
749 750 751
        options = []
        otables = [globalopts]
        if cmd:
752
            aliases, entry = cmdutil.findcmd(cmd, table, False)
753 754 755 756 757 758 759 760 761
            otables.append(entry[1])
        for t in otables:
            for o in t:
                if o[0]:
                    options.append('-%s' % o[0])
                options.append('--%s' % o[1])
        ui.write("%s\n" % "\n".join(options))
        return

Brendan Cully's avatar