commands.py 140 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
import archival, changegroup, cmdutil, sshserver, hbisect
15
from hgweb import server, hgweb_mod, hgwebdir_mod
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 34 35 36 37 38 39 40 41 42 43

    .. container:: verbose

       An example showing how new (unknown) files are added
       automatically by ``hg add``::

         $ ls
         foo.c
         $ hg status
         ? foo.c
         $ hg add
         adding foo.c
         $ hg status
44
         A foo.c
45 46
    """

47
    bad = []
48
    names = []
49
    m = cmdutil.match(repo, pats, opts)
50
    oldbad = m.bad
51
    m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
52 53 54 55 56 57 58

    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))
59
    if not opts.get('dry_run'):
60 61
        bad += [f for f in repo.add(names) if f in m.files()]
    return bad and 1 or 0
62

63
def addremove(ui, repo, *pats, **opts):
64
    """add all new files, delete all missing files
65

66 67
    Add all new files and remove all missing files from the
    repository.
68

69 70 71
    New files are ignored if they match any of the patterns in
    .hgignore. As with add, these changes take effect at the next
    commit.
72

73 74 75 76 77 78
    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.
79
    """
80 81 82 83
    try:
        sim = float(opts.get('similarity') or 0)
    except ValueError:
        raise util.Abort(_('similarity must be a number'))
84 85
    if sim < 0 or sim > 100:
        raise util.Abort(_('similarity must be between 0 and 100'))
86
    return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
87

88
def annotate(ui, repo, *pats, **opts):
89
    """show changeset information by line for each file
90

91 92
    List changes in files, showing the revision id responsible for
    each line
93

94 95
    This command is useful for discovering when a change was made and
    by whom.
96

97 98 99 100
    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.
101
    """
102 103 104 105 106
    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
        opts['file'] = 1

107 108
    datefunc = ui.quiet and util.shortdate or util.datestr
    getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
109

110
    if not pats:
111
        raise util.Abort(_('at least one filename or pattern is required'))
112

113 114 115 116
    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),
117
             ('file', lambda x: x[0].path()),
118 119
            ]

120
    if (not opts.get('user') and not opts.get('changeset')
121
        and not opts.get('date') and not opts.get('file')):
122
        opts['number'] = 1
123

124
    linenumber = opts.get('line_number') is not None
125
    if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
126 127 128 129 130 131 132
        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])

133
    ctx = repo[opts.get('rev')]
134
    m = cmdutil.match(repo, pats, opts)
135
    follow = not opts.get('no_follow')
Matt Mackall's avatar
Matt Mackall committed
136 137
    for abs in ctx.walk(m):
        fctx = ctx[abs]
138
        if not opts.get('text') and util.binary(fctx.data()):
139
            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
140 141
            continue

142
        lines = fctx.annotate(follow=follow, linenumber=linenumber)
143 144
        pieces = []

145 146 147
        for f in funcmap:
            l = [f(n) for n, dummy in lines]
            if l:
148 149
                ml = max(map(len, l))
                pieces.append(["%*s" % (ml, x) for x in l])
150

mpm@selenic.com's avatar
mpm@selenic.com committed
151 152 153
        if pieces:
            for p, l in zip(zip(*pieces), lines):
                ui.write("%s: %s" % (" ".join(p), l[1]))
154

155
def archive(ui, repo, dest, **opts):
156
    '''create an unversioned archive of a repository revision
157

158 159
    By default, the revision used is the parent of the working
    directory; use -r/--rev to specify a different revision.
160

161
    To specify the type of archive to create, use -t/--type. Valid
162
    types are:
163

164 165 166 167 168 169
    :``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
170

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

174 175 176 177
    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.
178 179
    '''

180
    ctx = repo[opts.get('rev')]
181
    if not ctx:
182
        raise util.Abort(_('no working directory: please specify a revision'))
183
    node = ctx.node()
Vadim Gelfer's avatar
Vadim Gelfer committed
184
    dest = cmdutil.make_filename(repo, dest, node)
185 186
    if os.path.realpath(dest) == repo.root:
        raise util.Abort(_('repository root cannot be destination'))
187
    matchfn = cmdutil.match(repo, [], opts)
188
    kind = opts.get('type') or 'files'
189
    prefix = opts.get('prefix')
190 191 192 193
    if dest == '-':
        if kind == 'files':
            raise util.Abort(_('cannot archive plain files to stdout'))
        dest = sys.stdout
194 195
        if not prefix:
            prefix = os.path.basename(repo.root) + '-%h'
Vadim Gelfer's avatar
Vadim Gelfer committed
196
    prefix = cmdutil.make_filename(repo, prefix, node)
197
    archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
198
                     matchfn, prefix)
199

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

203 204
    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
205

206 207 208
    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
209

210 211 212 213
    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.
214

215
    See 'hg help dates' for a list of formats valid for -d/--date.
216
    '''
Daniel Holth's avatar
Daniel Holth committed
217 218 219 220 221
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

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

223 224 225
    if not rev:
        raise util.Abort(_("please specify a revision to backout"))

226 227 228 229
    date = opts.get('date')
    if date:
        opts['date'] = util.parsedate(date)

230
    cmdutil.bail_if_changed(repo)
Vadim Gelfer's avatar
Vadim Gelfer committed
231
    node = repo.lookup(rev)
232

233
    op1, op2 = repo.dirstate.parents()
234 235
    a = repo.changelog.ancestor(op1, node)
    if a != node:
236
        raise util.Abort(_('cannot backout change on a different branch'))
237

238 239
    p1, p2 = repo.changelog.parents(node)
    if p1 == nullid:
240
        raise util.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer's avatar
Vadim Gelfer committed
241
    if p2 != nullid:
242
        if not opts.get('parent'):
243
            raise util.Abort(_('cannot backout a merge changeset without '
244 245 246
                               '--parent'))
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
247
            raise util.Abort(_('%s is not a parent of %s') %
248
                             (short(p), short(node)))
249 250
        parent = p
    else:
251
        if opts.get('parent'):
252 253
            raise util.Abort(_('cannot use --parent on non-merge changeset'))
        parent = p1
254

255 256
    # the backout should appear on the same branch
    branch = repo.dirstate.branch()
257
    hg.clean(repo, node, show_stats=False)
258
    repo.dirstate.setbranch(branch)
Vadim Gelfer's avatar
Vadim Gelfer committed
259
    revert_opts = opts.copy()
260
    revert_opts['date'] = None
261
    revert_opts['all'] = True
Vadim Gelfer's avatar
Vadim Gelfer committed
262
    revert_opts['rev'] = hex(parent)
263
    revert_opts['no_backup'] = None
Vadim Gelfer's avatar
Vadim Gelfer committed
264 265 266
    revert(ui, repo, **revert_opts)
    commit_opts = opts.copy()
    commit_opts['addremove'] = False
267
    if not commit_opts['message'] and not commit_opts['logfile']:
268
        # we don't translate commit messages
269
        commit_opts['message'] = "Backed out changeset %s" % short(node)
270
        commit_opts['force_editor'] = True
Vadim Gelfer's avatar
Vadim Gelfer committed
271 272 273 274 275
    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)))
276
    if op1 != node:
277
        hg.clean(repo, op1, show_stats=False)
278
        if opts.get('merge'):
279 280
            ui.status(_('merging with changeset %s\n')
                      % nice(repo.changelog.tip()))
281
            hg.merge(repo, hex(repo.changelog.tip()))
282 283 284
        else:
            ui.status(_('the backout changeset is a new head - '
                        'do not forget to merge\n'))
285 286
            ui.status(_('(use "backout --merge" '
                        'if you want to auto-merge)\n'))
Vadim Gelfer's avatar
Vadim Gelfer committed
287

288
def bisect(ui, repo, rev=None, extra=None, command=None,
289 290 291
               reset=None, good=None, bad=None, skip=None, noupdate=None):
    """subdivision search of changesets

292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308
    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.
309
    """
310 311 312 313
    def print_result(nodes, good):
        displayer = cmdutil.show_changeset(ui, repo, {})
        if len(nodes) == 1:
            # narrowed it down to a single revision
314 315 316 317
            if good:
                ui.write(_("The first good revision is:\n"))
            else:
                ui.write(_("The first bad revision is:\n"))
318
            displayer.show(repo[nodes[0]])
319 320
        else:
            # multiple possible revisions
321 322 323 324 325 326
            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"))
327
            for n in nodes:
328
                displayer.show(repo[n])
329
        displayer.close()
330 331 332 333 334 335 336 337 338 339 340

    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

341 342 343 344 345 346 347 348 349 350
    # 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
351
    elif extra or good + bad + skip + reset + bool(command) > 1:
352
        raise util.Abort(_('incompatible arguments'))
353 354 355 356 357 358 359

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

360 361 362 363
    state = hbisect.load_state(repo)

    if command:
        changesets = 1
364 365 366
        try:
            while changesets:
                # update state
367
                status = util.system(command)
368 369 370 371 372 373 374 375 376 377 378
                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"
379 380 381
                ctx = repo[rev or '.']
                state[transition].append(ctx.node())
                ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
382 383 384 385 386 387 388 389
                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)
390
        return print_result(nodes, good)
391 392 393

    # update state
    node = repo.lookup(rev or '.')
394 395 396 397 398 399 400 401
    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)
402

403 404
    if not check_state(state):
        return
405 406

    # actually bisect
407
    nodes, changesets, good = hbisect.bisect(repo.changelog, state)
408
    if changesets == 0:
409
        print_result(nodes, good)
410 411 412
    else:
        assert len(nodes) == 1 # only a single node can be tested next
        node = nodes[0]
413 414 415 416 417
        # 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)
418 419
        ui.write(_("Testing changeset %d:%s "
                   "(%d changesets remaining, ~%d tests)\n")
420
                 % (rev, short(node), changesets, tests))
421 422 423 424
        if not noupdate:
            cmdutil.bail_if_changed(repo)
            return hg.clean(repo, node)

425
def branch(ui, repo, label=None, **opts):
426 427
    """set or show the current branch name

428 429 430 431 432
    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.
433

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

437 438 439
    Use -C/--clean to reset the working directory branch to that of
    the parent of the working directory, negating a previous branch
    change.
440

441 442
    Use the command 'hg update' to switch to an existing branch. Use
    'hg commit --close-branch' to mark this branch as closed.
443 444
    """

445 446 447 448 449
    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:
450 451
        utflabel = encoding.fromlocal(label)
        if not opts.get('force') and utflabel in repo.branchtags():
452
            if label not in [p.branch() for p in repo.parents()]:
453
                raise util.Abort(_('a branch of the same name already exists'
454
                                   " (use 'hg update' to switch to it)"))
455
        repo.dirstate.setbranch(utflabel)
456
        ui.status(_('marked working directory as branch %s\n') % label)
457
    else:
458
        ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
459

460
def branches(ui, repo, active=False, closed=False):
461 462
    """list repository named branches

463 464 465
    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).
466

467 468
    If -a/--active is specified, only show active branches. A branch
    is considered active if it contains repository heads.
469 470

    Use the command 'hg update' to switch to an existing branch.
471
    """
472

473
    hexfunc = ui.debugflag and hex or short
474
    activebranches = [repo[n].branch() for n in repo.heads()]
475 476 477 478 479
    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)
480 481
                          for tag, node in repo.branchtags().items()],
                      reverse=True)
482 483 484

    for isactive, node, tag in branches:
        if (not active) or isactive:
485
            encodedtag = encoding.tolocal(tag)
486
            if ui.quiet:
487
                ui.write("%s\n" % encodedtag)
488
            else:
489 490 491 492
                hn = repo.lookup(node)
                if isactive:
                    notice = ''
                elif hn not in repo.branchheads(tag, closed=False):
493 494
                    if not closed:
                        continue
495
                    notice = _(' (closed)')
496
                else:
497
                    notice = _(' (inactive)')
498 499
                rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
                data = encodedtag, rev, hexfunc(hn), notice
500
                ui.write("%s %s:%s%s\n" % data)
501

502
def bundle(ui, repo, fname, dest=None, **opts):
503 504
    """create a changegroup file

505 506
    Generate a compressed changegroup file collecting changesets not
    known to be in another repository.
507

timeless's avatar
timeless committed
508 509
    If you omit the destination repository, then hg assumes the
    destination will have all the nodes you specify with --base
510 511
    parameters. To create a bundle containing all changesets, use
    -a/--all (or --base null).
512

513 514 515
    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).
516

517 518 519 520
    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.
521

522 523
    Applying bundles preserves all changeset contents including
    permissions, copy/rename information, and revision history.
524
    """
525 526 527
    revs = opts.get('rev') or None
    if revs:
        revs = [repo.lookup(rev) for rev in revs]
528 529 530 531
    if opts.get('all'):
        base = ['null']
    else:
        base = opts.get('base')
532 533
    if base:
        if dest:
534
            raise util.Abort(_("--base is incompatible with specifying "
535
                               "a destination"))
536 537 538
        base = [repo.lookup(rev) for rev in base]
        # create the right base
        # XXX: nodesbetween / changegroup* should be "fixed" instead
539
        o = []
540
        has = set((nullid,))
541
        for n in base:
Matt Mackall's avatar
Matt Mackall committed
542
            has.update(repo.changelog.reachable(n))
543
        if revs:
544
            visit = list(revs)
545
            has.difference_update(revs)
546
        else:
547
            visit = repo.changelog.heads()
Matt Mackall's avatar
Matt Mackall committed
548
        seen = {}
549 550
        while visit:
            n = visit.pop(0)
Matt Mackall's avatar
Matt Mackall committed
551
            parents = [p for p in repo.changelog.parents(n) if p not in has]
552
            if len(parents) == 0:
553 554
                if n not in has:
                    o.append(n)
555
            else:
556 557
                for p in parents:
                    if p not in seen:
Matt Mackall's avatar
Matt Mackall committed
558
                        seen[p] = 1
559
                        visit.append(p)
560
    else:
561
        dest = ui.expandpath(dest or 'default-push', dest or 'default')
562
        dest, branches = hg.parseurl(dest, opts.get('branch'))
Matt Mackall's avatar
Matt Mackall committed
563
        other = hg.repository(cmdutil.remoteui(repo, opts), dest)
564
        revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
565
        o = repo.findoutgoing(other, force=opts.get('force'))
566

567 568 569 570
    if not o:
        ui.status(_("no changes found\n"))
        return

571 572 573 574
    if revs:
        cg = repo.changegroupsubset(o, revs, 'bundle')
    else:
        cg = repo.changegroup(o, 'bundle')
575 576 577 578 579 580 581 582

    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)
583

584
def cat(ui, repo, file1, *pats, **opts):
585
    """output the current or given revision of files
586

587 588 589
    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.
590

591 592
    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
593
    for the export command, with the following additions:
594

595 596 597
    :``%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
598
    """
599
    ctx = repo[opts.get('rev')]
Matt Mackall's avatar
Matt Mackall committed
600
    err = 1
601
    m = cmdutil.match(repo, (file1,) + pats, opts)
Matt Mackall's avatar
Matt Mackall committed
602
    for abs in ctx.walk(m):
603
        fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
Matt Mackall's avatar
Matt Mackall committed
604
        data = ctx[abs].data()
605
        if opts.get('decode'):
606 607
            data = repo.wwritedata(abs, data)
        fp.write(data)
Matt Mackall's avatar
Matt Mackall committed
608 609
        err = 0
    return err
mpm@selenic.com's avatar
mpm@selenic.com committed
610

611
def clone(ui, source, dest=None, **opts):
612 613 614 615
    """make a copy of an existing repository

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

616 617
    If no destination directory name is specified, it defaults to the
    basename of the source.
618

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

622 623
    See 'hg help urls' for valid source format details.

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

628 629 630 631
    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
632 633
    defined by all -r/--rev options (including all their ancestors)
    will be pulled into the destination repository.
634 635 636 637 638 639
    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.

640 641
    For efficiency, hardlinks are used for cloning whenever the source
    and destination are on the same filesystem (note this applies only
642
    to the repository data, not to the working directory). Some
643 644 645
    filesystems, such as AFS, implement hardlinking incorrectly, but
    do not report errors. In these cases, use the --pull option to
    avoid hardlinking.
646

647
    In some cases, you can clone repositories and the working directory
648
    using full hardlinks with ::
649 650 651

      $ cp -al REPO REPOCLONE

652 653 654 655 656 657
    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.
658 659 660 661

    Mercurial will update the working directory to the first applicable
    revision from this list:

662 663 664 665 666 667 668 669 670 671
    a) null if -U or the source repository has no changesets
    b) if -u . and the source repository is local, the first parent of
       the source repository's working directory
    c) the changeset specified with -u (if a branch name, this means the
       latest head of that branch)
    d) the changeset specified with -r
    e) the tipmost head specified with -b
    f) the tipmost head specified with the url#branch source syntax
    g) the tipmost head of the default branch
    h) tip
672
    """
673 674 675
    if opts.get('noupdate') and opts.get('updaterev'):
        raise util.Abort(_("cannot specify both --noupdate and --updaterev"))

Matt Mackall's avatar
Matt Mackall committed
676
    hg.clone(cmdutil.remoteui(ui, opts), source, dest,
677 678 679
             pull=opts.get('pull'),
             stream=opts.get('uncompressed'),
             rev=opts.get('rev'),
680 681
             update=opts.get('updaterev') or not opts.get('noupdate'),
             branch=opts.get('branch'))
mpm@selenic.com's avatar
mpm@selenic.com committed
682

683
def commit(ui, repo, *pats, **opts):
684 685
    """commit the specified files or all outstanding changes

686
    Commit changes to the given files into the repository. Unlike a
687 688
    centralized RCS, this operation is a local operation. See hg push
    for a way to actively distribute your changes.
689

690 691
    If a list of files is omitted, all changes reported by "hg status"
    will be committed.
692

693 694
    If you are committing the result of a merge, do not provide any
    filenames or -I/-X filters.
695

696 697
    If no commit message is specified, the configured editor is
    started to prompt you for a message.
698 699

    See 'hg help dates' for a list of formats valid for -d/--date.
700
    """
701 702 703
    extra = {}
    if opts.get('close_branch'):
        extra['close'] = 1
704 705 706 707
    e = cmdutil.commiteditor
    if opts.get('force_editor'):
        e = cmdutil.commitforceeditor

708
    def commitfunc(ui, repo, message, match, opts):
709 710
        return repo.commit(message, opts.get('user'), opts.get('date'), match,
                           editor=e, extra=extra)
711

712 713
    node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
    if not node:
714
        ui.status(_("nothing changed\n"))
715 716 717 718 719 720
        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
721 722 723 724
        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)):
725
        ui.status(_('created new head\n'))
Bryan O'Sullivan's avatar
Bryan O'Sullivan committed
726

727
    if ui.debugflag:
728
        ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
729
    elif ui.verbose:
730
        ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))
731

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

735 736 737
    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.
738

739 740 741
    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.
742

743 744
    This command takes effect with the next commit. To undo a copy
    before that, see hg revert.
745
    """
Matt Mackall's avatar
Matt Mackall committed
746
    wlock = repo.wlock(False)
747
    try:
Matt Mackall's avatar
Matt Mackall committed
748
        return cmdutil.copy(ui, repo, pats, opts)
749
    finally:
750
        wlock.release()
mpm@selenic.com's avatar
mpm@selenic.com committed
751

752
def debugancestor(ui, repo, *args):
mpm@selenic.com's avatar
mpm@selenic.com committed
753
    """find the ancestor revision of two revisions in a given index"""
754 755
    if len(args) == 3:
        index, rev1, rev2 = args
756
        r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
757
        lookup = r.lookup