mercurial/commands.py
author mpm@selenic.com
Sun, 03 Jul 2005 11:47:45 -0800
changeset 596 9a8daeff0ffa
parent 593 ca3c499e94c6
child 603 bc5d058e65e9
permissions -rw-r--r--
A bunch of parsing/help updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 A bunch of parsing/help updates more explanation of how to get non-basic commands shorten names of debug functions and add docstrings add undo long docstring promote anotate, export, and revert make the global opts array global refactor parsing kill two unused arguments to fancyopts update test-help manifest hash: 459ae2273aaf54f71b4576677a681dc53ab2908c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEDhywK+sNU5EO8RAr0DAJ9LTu8Fc2quLRtuwLPTQzWqlOJWKwCbBpZk pnMkYnshsutVYljcil1P46I= =Sleg -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
249
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     1
# commands.py - command processing for mercurial
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     2
#
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     3
# Copyright 2005 Matt Mackall <mpm@selenic.com>
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     4
#
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     5
# This software may be used and distributed according to the terms
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     6
# of the GNU General Public License, incorporated herein by reference.
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
     7
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 259
diff changeset
     8
import os, re, sys, signal
419
28511fc21073 [PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents: 417
diff changeset
     9
import fancyopts, ui, hg, util
262
3db700146536 implement demand loading hack
mpm@selenic.com
parents: 259
diff changeset
    10
from demandload import *
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
    11
demandload(globals(), "mdiff time hgweb traceback random signal errno version")
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    12
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    13
class UnknownCommand(Exception): pass
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    14
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    15
def filterfiles(filters, files):
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    16
    l = [ x for x in files if x in filters ]
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    17
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    18
    for t in filters:
419
28511fc21073 [PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents: 417
diff changeset
    19
        if t and t[-1] != "/": t += "/"
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    20
        l += [ x for x in files if x.startswith(t) ]
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    21
    return l
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    22
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    23
def relfilter(repo, files):
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    24
    if os.getcwd() != repo.root:
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    25
        p = os.getcwd()[len(repo.root) + 1: ]
419
28511fc21073 [PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents: 417
diff changeset
    26
        return filterfiles([util.pconvert(p)], files)
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    27
    return files
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
    28
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    29
def relpath(repo, args):
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    30
    if os.getcwd() != repo.root:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    31
        p = os.getcwd()[len(repo.root) + 1: ]
554
2f515dcfbc24 Fix some linewrapping
mpm@selenic.com
parents: 553
diff changeset
    32
        return [ util.pconvert(os.path.normpath(os.path.join(p, x)))
2f515dcfbc24 Fix some linewrapping
mpm@selenic.com
parents: 553
diff changeset
    33
                 for x in args ]
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
    34
    return args
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    35
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    36
revrangesep = ':'
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    37
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    38
def revrange(ui, repo, revs = [], revlog = None):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    39
    if revlog is None:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    40
        revlog = repo.changelog
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    41
    revcount = revlog.count()
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    42
    def fix(val, defval):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    43
        if not val: return defval
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    44
        try:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    45
            num = int(val)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    46
            if str(num) != val: raise ValueError
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    47
            if num < 0: num += revcount
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    48
            if not (0 <= num < revcount):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    49
                raise ValueError
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    50
        except ValueError:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    51
            try:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    52
                num = repo.changelog.rev(repo.lookup(val))
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    53
            except KeyError:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    54
                try:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    55
                    num = revlog.rev(revlog.lookup(val))
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    56
                except KeyError:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    57
                    ui.warn('abort: invalid revision identifier %s\n' % val)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    58
                    sys.exit(1)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    59
        return num
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    60
    for spec in revs:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    61
        if spec.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    62
            start, end = spec.split(revrangesep, 1)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    63
            start = fix(start, 0)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    64
            end = fix(end, revcount - 1)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    65
            if end > start:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    66
                end += 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    67
                step = 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    68
            else:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    69
                end -= 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    70
                step = -1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    71
            for rev in xrange(start, end, step):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    72
                yield str(rev)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    73
        else:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    74
            yield spec
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    75
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
    76
def dodiff(fp, ui, repo, files = None, node1 = None, node2 = None):
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    77
    def date(c):
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    78
        return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    79
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 559
diff changeset
    80
    (c, a, d, u) = repo.changes(node1, node2, files)
537
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    81
    if files:
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    82
        c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    83
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    84
    if not c and not a and not d:
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    85
        return
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
    86
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    87
    if node2:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    88
        change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    89
        mmap2 = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    90
        def read(f): return repo.file(f).read(mmap2[f])
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    91
        date2 = date(change)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    92
    else:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    93
        date2 = time.asctime()
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    94
        if not node1:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    95
            node1 = repo.dirstate.parents()[0]
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 404
diff changeset
    96
        def read(f): return repo.wfile(f).read()
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
    97
396
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
    98
    if ui.quiet:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
    99
        r = None
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   100
    else:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   101
        hexfunc = ui.verbose and hg.hex or hg.short
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   102
        r = [hexfunc(node) for node in [node1, node2] if node]
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   103
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   104
    change = repo.changelog.read(node1)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   105
    mmap = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   106
    date1 = date(change)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   107
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   108
    for f in c:
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 270
diff changeset
   109
        to = None
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 270
diff changeset
   110
        if f in mmap:
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 270
diff changeset
   111
            to = repo.file(f).read(mmap[f])
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   112
        tn = read(f)
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   113
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   114
    for f in a:
264
4c1d7072d5cd Attempt to make diff deal with null sources properly
mpm@selenic.com
parents: 262
diff changeset
   115
        to = None
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   116
        tn = read(f)
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   117
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   118
    for f in d:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   119
        to = repo.file(f).read(mmap[f])
264
4c1d7072d5cd Attempt to make diff deal with null sources properly
mpm@selenic.com
parents: 262
diff changeset
   120
        tn = None
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   121
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   122
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   123
def show_changeset(ui, repo, rev=0, changenode=None, filelog=None):
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   124
    """show a single changeset or file revision"""
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   125
    changelog = repo.changelog
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   126
    if filelog:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   127
        log = filelog
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   128
        filerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   129
        node = filenode = filelog.node(filerev)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   130
        changerev = filelog.linkrev(filenode)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   131
        changenode = changenode or changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   132
    else:
347
a0b2758edee7 Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 330
diff changeset
   133
        log = changelog
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   134
        changerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   135
        if changenode is None:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   136
            changenode = changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   137
        elif not changerev:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   138
            rev = changerev = changelog.rev(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   139
        node = changenode
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   140
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   141
    if ui.quiet:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   142
        ui.write("%d:%s\n" % (rev, hg.hex(node)))
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   143
        return
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   144
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   145
    changes = changelog.read(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   146
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   147
    parents = [(log.rev(parent), hg.hex(parent))
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   148
               for parent in log.parents(node)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   149
               if ui.debugflag or parent != hg.nullid]
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   150
    if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   151
        parents = []
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   152
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   153
    if filelog:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   154
        ui.write("revision:    %d:%s\n" % (filerev, hg.hex(filenode)))
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   155
        for parent in parents:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   156
            ui.write("parent:      %d:%s\n" % parent)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   157
        ui.status("changeset:   %d:%s\n" % (changerev, hg.hex(changenode)))
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   158
    else:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   159
        ui.write("changeset:   %d:%s\n" % (changerev, hg.hex(changenode)))
387
c07c6fb2f0a8 Show tags in hg history etc.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 386
diff changeset
   160
        for tag in repo.nodetags(changenode):
c07c6fb2f0a8 Show tags in hg history etc.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 386
diff changeset
   161
            ui.status("tag:         %s\n" % tag)
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   162
        for parent in parents:
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   163
            ui.write("parent:      %d:%s\n" % parent)
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   164
        ui.note("manifest:    %d:%s\n" % (repo.manifest.rev(changes[0]),
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   165
                                          hg.hex(changes[0])))
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   166
    ui.status("user:        %s\n" % changes[1])
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   167
    ui.status("date:        %s\n" % time.asctime(
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   168
        time.localtime(float(changes[2].split(' ')[0]))))
493
30752b14f759 Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 490
diff changeset
   169
    if ui.debugflag:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 535
diff changeset
   170
        files = repo.changes(changelog.parents(changenode)[0], changenode)
490
df9b77f67998 Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
   171
        for key, value in zip(["files:", "files+:", "files-:"], files):
df9b77f67998 Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
   172
            if value:
df9b77f67998 Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
   173
                ui.note("%-12s %s\n" % (key, " ".join(value)))
493
30752b14f759 Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 490
diff changeset
   174
    else:
30752b14f759 Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 490
diff changeset
   175
        ui.note("files:       %s\n" % " ".join(changes[3]))
347
a0b2758edee7 Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 330
diff changeset
   176
    description = changes[4].strip()
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   177
    if description:
330
27d08c0c2a7e Merge with TAH
mpm@selenic.com
parents: 320 329
diff changeset
   178
        if ui.verbose:
27d08c0c2a7e Merge with TAH
mpm@selenic.com
parents: 320 329
diff changeset
   179
            ui.status("description:\n")
347
a0b2758edee7 Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 330
diff changeset
   180
            ui.status(description)
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 542
diff changeset
   181
            ui.status("\n\n")
330
27d08c0c2a7e Merge with TAH
mpm@selenic.com
parents: 320 329
diff changeset
   182
        else:
347
a0b2758edee7 Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 330
diff changeset
   183
            ui.status("summary:     %s\n" % description.splitlines()[0])
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   184
    ui.status("\n")
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   185
470
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   186
def show_version(ui):
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   187
    """output version and copyright information"""
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   188
    ui.write("Mercurial version %s\n" % version.get_version())
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   189
    ui.status(
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   190
        "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   191
        "This is free software; see the source for copying conditions. "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   192
        "There is NO\nwarranty; "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   193
        "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   194
    )
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   195
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   196
def help(ui, cmd=None):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   197
    '''show help for a given command or all commands'''
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   198
    if cmd:
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   199
        try:
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   200
            i = find(cmd)
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   201
            ui.write("%s\n\n" % i[2])
293
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   202
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   203
            if i[1]:
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   204
                for s, l, d, c in i[1]:
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   205
                    opt=' '
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   206
                    if s: opt = opt + '-' + s + ' '
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   207
                    if l: opt = opt + '--' + l + ' '
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   208
                    if d: opt = opt + '(' + str(d) + ')'
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   209
                    ui.write(opt, "\n")
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   210
                    if c: ui.write('   %s\n' % c)
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   211
                ui.write("\n")
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
   212
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   213
            ui.write(i[0].__doc__, "\n")
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   214
        except UnknownCommand:
268
1634a7ea6748 unknown command fixups
mpm@selenic.com
parents: 266
diff changeset
   215
            ui.warn("hg: unknown command %s\n" % cmd)
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   216
        sys.exit(0)
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   217
    else:
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   218
        if ui.verbose:
470
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   219
            show_version(ui)
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   220
            ui.write('\n')
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   221
        if ui.verbose:
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   222
            ui.write('hg commands:\n\n')
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   223
        else:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   224
            ui.write('basic hg commands (use "hg help -v" for more):\n\n')
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   225
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   226
        h = {}
479
7293cb91bf2a Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 477
diff changeset
   227
        for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 477
diff changeset
   228
            f = c.split("|")[0]
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   229
            if not ui.verbose and not f.startswith("^"):
479
7293cb91bf2a Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 477
diff changeset
   230
                continue
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   231
            if not ui.debugflag and f.startswith("debug"):
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   232
                continue
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   233
            f = f.lstrip("^")
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   234
            d = ""
470
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   235
            if e[0].__doc__:
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   236
                d = e[0].__doc__.splitlines(0)[0].rstrip()
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   237
            h[f] = d
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   238
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   239
        fns = h.keys()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   240
        fns.sort()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   241
        m = max(map(len, fns))
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   242
        for f in fns:
423
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 396
diff changeset
   243
            ui.write(' %-*s   %s\n' % (m, f, h[f]))
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   244
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   245
# Commands start here, listed alphabetically
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   246
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   247
def add(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   248
    '''add the specified files on the next commit'''
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   249
    repo.add(relpath(repo, (file,) + files))
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   250
353
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   251
def addremove(ui, repo, *files):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   252
    """add all new files, delete all missing files"""
353
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   253
    if files:
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   254
        files = relpath(repo, files)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   255
        d = []
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   256
        u = []
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   257
        for f in files:
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   258
            p = repo.wjoin(f)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   259
            s = repo.dirstate.state(f)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   260
            isfile = os.path.isfile(p)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   261
            if s != 'r' and not isfile:
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   262
                d.append(f)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   263
            elif s not in 'nmai' and isfile:
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   264
                u.append(f)
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   265
    else:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 535
diff changeset
   266
        (c, a, d, u) = repo.changes(None, None)
259
45c293b71341 fix addremove
mpm@selenic.com
parents: 257
diff changeset
   267
    repo.add(u)
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   268
    repo.remove(d)
219
8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents: 214
diff changeset
   269
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   270
def annotate(u, repo, file, *files, **ops):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   271
    """show changeset information per file line"""
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   272
    def getnode(rev):
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   273
        return hg.short(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   274
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   275
    def getname(rev):
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   276
        try:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   277
            return bcache[rev]
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   278
        except KeyError:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   279
            cl = repo.changelog.read(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   280
            name = cl[1]
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   281
            f = name.find('@')
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   282
            if f >= 0:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   283
                name = name[:f]
534
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents: 532
diff changeset
   284
            f = name.find('<')
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents: 532
diff changeset
   285
            if f >= 0:
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents: 532
diff changeset
   286
                name = name[f+1:]
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   287
            bcache[rev] = name
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   288
            return name
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   289
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   290
    bcache = {}
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   291
    opmap = [['user', getname], ['number', str], ['changeset', getnode]]
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   292
    if not ops['user'] and not ops['changeset']:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   293
        ops['number'] = 1
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   294
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 221
diff changeset
   295
    node = repo.dirstate.parents()[0]
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   296
    if ops['revision']:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   297
        node = repo.changelog.lookup(ops['revision'])
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   298
    change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   299
    mmap = repo.manifest.read(change[0])
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   300
    for f in relpath(repo, (file,) + files):
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   301
        lines = repo.file(f).annotate(mmap[f])
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   302
        pieces = []
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   303
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   304
        for o, f in opmap:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   305
            if ops[o]:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   306
                l = [ f(n) for n,t in lines ]
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   307
                m = max(map(len, l))
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   308
                pieces.append([ "%*s" % (m, x) for x in l])
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   309
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   310
        for p,l in zip(zip(*pieces), lines):
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   311
            u.write(" ".join(p) + ": " + l[1])
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   312
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   313
def cat(ui, repo, file, rev = []):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   314
    """output the latest or given revision of a file"""
281
574420507d8c hg cat: relative file support
mpm@selenic.com
parents: 276
diff changeset
   315
    r = repo.file(relpath(repo, [file])[0])
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   316
    n = r.tip()
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   317
    if rev: n = r.lookup(rev)
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   318
    sys.stdout.write(r.read(n))
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   319
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   320
def clone(ui, source, dest = None, **opts):
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   321
    """make a copy of an existing repository"""
506
1f81ebff98c9 [PATCH] Add ui.expandpath command
mpm@selenic.com
parents: 505
diff changeset
   322
    source = ui.expandpath(source)
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   323
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   324
    if dest is None:
528
648386fabf9c Fix clone bug wth trailing slash
mpm@selenic.com
parents: 527
diff changeset
   325
        dest = os.path.basename(os.path.normpath(source))
532
2e9698a5c92c clone: abort on pre-existing destination directory
mpm@selenic.com
parents: 528
diff changeset
   326
2e9698a5c92c clone: abort on pre-existing destination directory
mpm@selenic.com
parents: 528
diff changeset
   327
    if os.path.exists(dest):
2e9698a5c92c clone: abort on pre-existing destination directory
mpm@selenic.com
parents: 528
diff changeset
   328
        ui.warn("abort: destination '%s' already exists\n" % dest)
2e9698a5c92c clone: abort on pre-existing destination directory
mpm@selenic.com
parents: 528
diff changeset
   329
        return 1
523
003df62ae39f [PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents: 522
diff changeset
   330
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   331
    class dircleanup:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   332
        def __init__(self, dir):
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   333
            self.dir = dir
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   334
            os.mkdir(dir)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   335
        def close(self):
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   336
            self.dir = None
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   337
        def __del__(self):
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   338
            if self.dir:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   339
                import shutil
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   340
                shutil.rmtree(self.dir, True)
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   341
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   342
    d = dircleanup(dest)
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   343
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   344
    link = 0
562
be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents: 561
diff changeset
   345
    abspath = source
542
eda4c32c167a Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de>
parents: 541 535
diff changeset
   346
    if not (source.startswith("http://") or
eda4c32c167a Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de>
parents: 541 535
diff changeset
   347
            source.startswith("hg://") or
eda4c32c167a Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de>
parents: 541 535
diff changeset
   348
            source.startswith("old-http://")):
562
be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents: 561
diff changeset
   349
        abspath = os.path.abspath(source)
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   350
        d1 = os.stat(dest).st_dev
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   351
        d2 = os.stat(source).st_dev
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   352
        if d1 == d2: link = 1
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   353
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   354
    if link:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   355
        ui.note("copying by hardlink\n")
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   356
        util.system("cp -al '%s'/.hg '%s'/.hg" % (source, dest))
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   357
        try:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   358
            os.remove(os.path.join(dest, ".hg", "dirstate"))
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   359
        except: pass
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   360
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   361
        repo = hg.repository(ui, dest)
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   362
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   363
    else:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   364
        repo = hg.repository(ui, dest, create=1)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   365
        other = hg.repository(ui, source)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   366
        fetch = repo.findincoming(other)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   367
        if fetch:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   368
            cg = other.changegroup(fetch)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   369
            repo.addchangegroup(cg)
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 500
diff changeset
   370
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   371
    f = repo.opener("hgrc", "w")
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   372
    f.write("[paths]\n")
562
be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents: 561
diff changeset
   373
    f.write("default = %s\n" % abspath)
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 513
diff changeset
   374
535
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   375
    if not opts['noupdate']:
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   376
        update(ui, repo)
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   377
fba26990604a Deal with failed clone/transaction interaction
mpm@selenic.com
parents: 534
diff changeset
   378
    d.close()
515
03f27b1381f9 Whitespace cleanups
mpm@selenic.com
parents: 513
diff changeset
   379
289
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   380
def commit(ui, repo, *files, **opts):
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   381
    """commit the specified files or all outstanding changes"""
289
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   382
    text = opts['text']
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   383
    if not text and opts['logfile']:
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   384
        try: text = open(opts['logfile']).read()
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   385
        except IOError: pass
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   386
354
e3667e3a18ac hg commit: add -A flag
mpm@selenic.com
parents: 353
diff changeset
   387
    if opts['addremove']:
e3667e3a18ac hg commit: add -A flag
mpm@selenic.com
parents: 353
diff changeset
   388
        addremove(ui, repo, *files)
317
b18ce742566a hg commit: user and date options
mpm@selenic.com
parents: 312
diff changeset
   389
    repo.commit(relpath(repo, files), text, opts['user'], opts['date'])
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   390
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 355
diff changeset
   391
def copy(ui, repo, source, dest):
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 355
diff changeset
   392
    """mark a file as copied or renamed for the next commit"""
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 355
diff changeset
   393
    return repo.copy(*relpath(repo, (source, dest)))
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 355
diff changeset
   394
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   395
def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   396
    """validate the correctness of the current dirstate"""
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   397
    parent1, parent2 = repo.dirstate.parents()
555
39a1cfb03ebd Unbreak dirstate debug commands
mpm@selenic.com
parents: 554
diff changeset
   398
    repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands
mpm@selenic.com
parents: 554
diff changeset
   399
    dc = repo.dirstate.map
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   400
    keys = dc.keys()
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   401
    keys.sort()
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   402
    m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   403
    m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   404
    m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   405
    m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   406
    errors = 0
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   407
    for f in dc:
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   408
        state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   409
        if state in "nr" and f not in m1:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   410
            ui.warn("%s in state %s, but not in manifest1\n" % (f, state))
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   411
            errors += 1
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   412
        if state in "a" and f in m1:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   413
            ui.warn("%s in state %s, but also in manifest1\n" % (f, state))
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   414
            errors += 1
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   415
        if state in "m" and f not in m1 and f not in m2:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   416
            ui.warn("%s in state %s, but not in either manifest\n" %
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   417
                    (f, state))
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   418
            errors += 1
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   419
    for f in m1:
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   420
        state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   421
        if state not in "nrm":
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   422
            ui.warn("%s in manifest1, but listed as state %s" % (f, state))
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   423
            errors += 1
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   424
    if errors:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   425
        ui.warn(".hg/dirstate inconsistent with current parent's manifest\n")
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   426
        sys.exit(1)
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   427
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   428
def debugstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   429
    """show the contents of the current dirstate"""
555
39a1cfb03ebd Unbreak dirstate debug commands
mpm@selenic.com
parents: 554
diff changeset
   430
    repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands
mpm@selenic.com
parents: 554
diff changeset
   431
    dc = repo.dirstate.map
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   432
    keys = dc.keys()
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   433
    keys.sort()
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   434
    for file in keys:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   435
        ui.write("%c %s\n" % (dc[file][0], file))
460
6409d9a0df43 add dirstate debugging commands
mpm@selenic.com
parents: 452
diff changeset
   436
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   437
def debugindex(ui, file):
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   438
    """dump the contents of an index file"""
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 404
diff changeset
   439
    r = hg.revlog(hg.opener(""), file, "")
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   440
    ui.write("   rev    offset  length   base linkrev" +
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   441
             " p1           p2           nodeid\n")
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   442
    for i in range(r.count()):
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   443
        e = r.index[i]
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   444
        ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   445
                i, e[0], e[1], e[2], e[3],
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   446
            hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   447
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   448
def debugindexdot(ui, file):
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   449
    """dump an index DAG as a .dot file"""
417
f2d1f5fd0179 [PATCH] file type fixes for the other 'OS'
mpm@selenic.com
parents: 404
diff changeset
   450
    r = hg.revlog(hg.opener(""), file, "")
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   451
    ui.write("digraph G {\n")
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   452
    for i in range(r.count()):
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   453
        e = r.index[i]
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   454
        ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   455
        if e[5] != hg.nullid:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   456
            ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   457
    ui.write("}\n")
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   458
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   459
def diff(ui, repo, *files, **opts):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   460
    """diff working directory (or selected files)"""
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   461
    revs = []
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   462
    if opts['rev']:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   463
        revs = map(lambda x: repo.lookup(x), opts['rev'])
396
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   464
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   465
    if len(revs) > 2:
480
430a10669928 Fixed call to ui.warn()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 479
diff changeset
   466
        ui.warn("too many revisions to diff\n")
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   467
        sys.exit(1)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   468
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   469
    if files:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   470
        files = relpath(repo, files)
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   471
    else:
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   472
        files = relpath(repo, [""])
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   473
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   474
    dodiff(sys.stdout, ui, repo, files, *revs)
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   475
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   476
def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   477
    node = repo.lookup(changeset)
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   478
    prev, other = repo.changelog.parents(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   479
    change = repo.changelog.read(node)
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   480
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   481
    def expand(name):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   482
        expansions = {
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   483
            '%': lambda: '%',
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   484
            'H': lambda: hg.hex(node),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   485
            'N': lambda: str(total),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   486
            'R': lambda: str(repo.changelog.rev(node)),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   487
            'b': lambda: os.path.basename(repo.root),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   488
            'h': lambda: hg.short(node),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   489
            'n': lambda: str(seqno).zfill(len(str(total))),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   490
            'r': lambda: str(repo.changelog.rev(node)).zfill(revwidth),
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   491
            }
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   492
        newname = []
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   493
        namelen = len(name)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   494
        i = 0
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   495
        while i < namelen:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   496
            c = name[i]
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   497
            if c == '%':
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   498
                i += 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   499
                c = name[i]
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   500
                c = expansions[c]()
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   501
            newname.append(c)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   502
            i += 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   503
        return ''.join(newname)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   504
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   505
    if opts['output'] and opts['output'] != '-':
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   506
        try:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   507
            fp = open(expand(opts['output']), 'w')
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   508
        except KeyError, inst:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   509
            ui.warn("error: invalid format spec '%%%s' in output file name\n" %
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   510
                    inst.args[0])
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   511
            sys.exit(1)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   512
    else:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   513
        fp = sys.stdout
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   514
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   515
    fp.write("# HG changeset patch\n")
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   516
    fp.write("# User %s\n" % change[1])
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   517
    fp.write("# Node ID %s\n" % hg.hex(node))
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   518
    fp.write("# Parent  %s\n" % hg.hex(prev))
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   519
    if other != hg.nullid:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   520
        fp.write("# Parent  %s\n" % hg.hex(other))
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   521
    fp.write(change[4].rstrip())
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   522
    fp.write("\n\n")
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   523
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   524
    dodiff(fp, ui, repo, None, prev, node)
396
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 395
diff changeset
   525
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   526
def export(ui, repo, *changesets, **opts):
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   527
    """dump the header and diffs for one or more changesets"""
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   528
    seqno = 0
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   529
    revs = list(revrange(ui, repo, changesets))
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   530
    total = len(revs)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   531
    revwidth = max(len(revs[0]), len(revs[-1]))
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   532
    for cset in revs:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   533
        seqno += 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   534
        doexport(ui, repo, cset, seqno, total, revwidth, opts)
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   535
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   536
def forget(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   537
    """don't add the specified files on the next commit"""
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   538
    repo.forget(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   539
221
2bfe525ef6ca Beginning of multi-head support
mpm@selenic.com
parents: 220
diff changeset
   540
def heads(ui, repo):
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   541
    """show current repository heads"""
221
2bfe525ef6ca Beginning of multi-head support
mpm@selenic.com
parents: 220
diff changeset
   542
    for n in repo.changelog.heads():
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   543
        show_changeset(ui, repo, changenode=n)
221
2bfe525ef6ca Beginning of multi-head support
mpm@selenic.com
parents: 220
diff changeset
   544
339
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   545
def identify(ui, repo):
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   546
    """print information about the working copy"""
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 340
diff changeset
   547
    parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
340
97a897d32dfc Handle the case where the current working copy is not based on a checkout.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 339
diff changeset
   548
    if not parents:
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 340
diff changeset
   549
        ui.write("unknown\n")
340
97a897d32dfc Handle the case where the current working copy is not based on a checkout.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 339
diff changeset
   550
        return
97a897d32dfc Handle the case where the current working copy is not based on a checkout.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 339
diff changeset
   551
386
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   552
    hexfunc = ui.verbose and hg.hex or hg.short
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 535
diff changeset
   553
    (c, a, d, u) = repo.changes(None, None)
386
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   554
    output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   555
                        (c or a or d) and "+" or "")]
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   556
339
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   557
    if not ui.quiet:
386
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   558
        # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   559
        parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   560
                      for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   561
        # tags for multiple parents separated by ' + '
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   562
        output.append(' + '.join(parenttags))
339
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   563
386
494c8e3f47f3 Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 371
diff changeset
   564
    ui.write("%s\n" % ' '.join(output))
339
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   565
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   566
def import_(ui, repo, patch1, *patches, **opts):
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   567
    """import an ordered set of patches"""
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   568
    try:
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   569
        import psyco
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   570
        psyco.full()
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   571
    except:
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   572
        pass
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   573
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   574
    patches = (patch1,) + patches
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   575
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   576
    d = opts["base"]
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   577
    strip = opts["strip"]
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   578
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   579
    for patch in patches:
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   580
        ui.status("applying %s\n" % patch)
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   581
        pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   582
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   583
        text = ""
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   584
        for l in file(pf):
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   585
            if l[:4] == "--- ": break
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   586
            text += l
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   587
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   588
        # make sure text isn't empty
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   589
        if not text: text = "imported patch %s\n" % patch
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   590
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   591
        f = os.popen("patch -p%d < %s" % (strip, pf))
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   592
        files = []
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   593
        for l in f.read().splitlines():
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   594
            l.rstrip('\r\n');
481
2705d20f77c9 hg import checking for quiet mode didn't work. Fixed using the ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 480
diff changeset
   595
            ui.status("%s\n" % l)
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   596
            if l[:14] == 'patching file ':
443
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   597
                pf = l[14:]
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   598
                if pf not in files:
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   599
                    files.append(pf)
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   600
        patcherr = f.close()
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   601
        if patcherr:
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   602
            sys.stderr.write("patch failed")
470a83212dda hg import error checking
mpm@selenic.com
parents: 437
diff changeset
   603
            sys.exit(1)
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   604
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   605
        if len(files) > 0:
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   606
            addremove(ui, repo, *files)
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   607
        repo.commit(files, text)
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   608
496
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   609
def init(ui, source=None):
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   610
    """create a new repository in the current directory"""
290
07c6cb9fd1c5 replace hg branch with hg init [source]
mpm@selenic.com
parents: 289
diff changeset
   611
07c6cb9fd1c5 replace hg branch with hg init [source]
mpm@selenic.com
parents: 289
diff changeset
   612
    if source:
496
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   613
        ui.warn("no longer supported: use \"hg clone\" instead\n")
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   614
        sys.exit(1)
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   615
    repo = hg.repository(ui, ".", create=1)
338
1e091b3293d5 default path support with .hg/hgrc
mpm@selenic.com
parents: 335
diff changeset
   616
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   617
def log(ui, repo, f=None, **opts):
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 508
diff changeset
   618
    """show the revision history of the repository or a single file"""
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 508
diff changeset
   619
    if f:
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   620
        filelog = repo.file(relpath(repo, [f])[0])
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   621
        log = filelog
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   622
        lookup = filelog.lookup
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 508
diff changeset
   623
    else:
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   624
        filelog = None
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   625
        log = repo.changelog
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   626
        lookup = repo.lookup
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   627
    revlist = []
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   628
    revs = [log.rev(lookup(rev)) for rev in opts['rev']]
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   629
    while revs:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   630
        if len(revs) == 1:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   631
            revlist.append(revs.pop(0))
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   632
        else:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   633
            a = revs.pop(0)
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   634
            b = revs.pop(0)
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   635
            off = a > b and -1 or 1
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   636
            revlist.extend(range(a, b + off, off))
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   637
    for i in revlist or range(log.count() - 1, -1, -1):
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   638
        show_changeset(ui, repo, filelog=filelog, rev=i)
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   639
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   640
def manifest(ui, repo, rev = []):
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   641
    """output the latest or given revision of the project manifest"""
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   642
    n = repo.manifest.tip()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   643
    if rev:
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   644
        n = repo.manifest.lookup(rev)
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   645
    m = repo.manifest.read(n)
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   646
    mf = repo.manifest.readflags(n)
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   647
    files = m.keys()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   648
    files.sort()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   649
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   650
    for f in files:
276
10e325db7347 add tracking of execute permissions
mpm@selenic.com
parents: 275
diff changeset
   651
        ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   652
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   653
def parents(ui, repo, node = None):
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   654
    '''show the parents of the current working dir'''
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   655
    if node:
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   656
        p = repo.changelog.parents(repo.lookup(hg.bin(node)))
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   657
    else:
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   658
        p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   659
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   660
    for n in p:
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   661
        if n != hg.nullid:
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   662
            show_changeset(ui, repo, changenode=n)
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   663
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   664
def pull(ui, repo, source="default", **opts):
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   665
    """pull changes from the specified source"""
506
1f81ebff98c9 [PATCH] Add ui.expandpath command
mpm@selenic.com
parents: 505
diff changeset
   666
    source = ui.expandpath(source)
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   667
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   668
    ui.status('pulling from %s\n' % (source))
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   669
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   670
    other = hg.repository(ui, source)
516
873228c2f6cf Change getchangegroup to findincoming
mpm@selenic.com
parents: 515
diff changeset
   671
    fetch = repo.findincoming(other)
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 518
diff changeset
   672
    if not fetch:
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 518
diff changeset
   673
        ui.status("no changes found\n")
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 518
diff changeset
   674
        return
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 518
diff changeset
   675
516
873228c2f6cf Change getchangegroup to findincoming
mpm@selenic.com
parents: 515
diff changeset
   676
    cg = other.changegroup(fetch)
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   677
    r = repo.addchangegroup(cg)
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   678
    if cg and not r:
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   679
        if opts['update']:
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   680
            return update(ui, repo)
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   681
        else:
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   682
            ui.status("(run 'hg update' to get a working copy)\n")
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   683
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   684
    return r
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   685
371
6e3436082697 hg push: "default-push" default target path
mpm@selenic.com
parents: 367
diff changeset
   686
def push(ui, repo, dest="default-push"):
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   687
    """push changes to the specified destination"""
506
1f81ebff98c9 [PATCH] Add ui.expandpath command
mpm@selenic.com
parents: 505
diff changeset
   688
    dest = ui.expandpath(dest)
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   689
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   690
    if not dest.startswith("ssh://"):
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   691
        ui.warn("abort: can only push to ssh:// destinations currently\n")
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   692
        return 1
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   693
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   694
    m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest)
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   695
    if not m:
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   696
        ui.warn("abort: couldn't parse destination %s\n" % dest)
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   697
        return 1
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   698
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   699
    user, host, port, path = map(m.group, (2, 3, 5, 7))
526
55af04e26bad show connect message on push
mpm@selenic.com
parents: 525
diff changeset
   700
    uhost = user and ("%s@%s" % (user, host)) or host
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   701
    port = port and (" -p %s") % port or ""
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   702
    path = path or ""
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   703
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   704
    sport = random.randrange(30000, 60000)
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   705
    cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'"
526
55af04e26bad show connect message on push
mpm@selenic.com
parents: 525
diff changeset
   706
    cmd = cmd % (uhost, port, sport+1, sport, path, sport+1)
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   707
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   708
    child = os.fork()
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   709
    if not child:
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   710
        sys.stdout = file("/dev/null", "w")
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   711
        sys.stderr = sys.stdout
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   712
        hgweb.server(repo.root, "pull", "", "localhost", sport)
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   713
    else:
526
55af04e26bad show connect message on push
mpm@selenic.com
parents: 525
diff changeset
   714
        ui.status("connecting to %s\n" % host)
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   715
        r = os.system(cmd)
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   716
        os.kill(child, signal.SIGTERM)
320
292e10b5831a hg push: propagate return code
mpm@selenic.com
parents: 319
diff changeset
   717
        return r
319
9ab17e83bce3 stopgap hg push support
mpm@selenic.com
parents: 317
diff changeset
   718
403
fda7bb480020 [PATCH] rawcommit fix again
mpm@selenic.com
parents: 401
diff changeset
   719
def rawcommit(ui, repo, *flist, **rc):
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   720
    "raw commit interface"
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   721
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   722
    text = rc['text']
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   723
    if not text and rc['logfile']:
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   724
        try: text = open(rc['logfile']).read()
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   725
        except IOError: pass
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   726
    if not text and not rc['logfile']:
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   727
        ui.warn("abort: missing commit text\n")
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   728
        return 1
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   729
403
fda7bb480020 [PATCH] rawcommit fix again
mpm@selenic.com
parents: 401
diff changeset
   730
    files = relpath(repo, list(flist))
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   731
    if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   732
        files += open(rc['files']).read().splitlines()
452
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 443
diff changeset
   733
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents: 443
diff changeset
   734
    rc['parent'] = map(repo.lookup, rc['parent'])
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   735
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   736
    repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   737
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   738
def recover(ui, repo):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   739
    """roll back an interrupted transaction"""
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   740
    repo.recover()
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   741
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   742
def remove(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   743
    """remove the specified files on the next commit"""
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   744
    repo.remove(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   745
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   746
def revert(ui, repo, *names, **opts):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   747
    """revert modified files or dirs back to their unmodified states"""
590
38d106db75bc hg revert should revert to parent, not to tip
mpm@selenic.com
parents: 588
diff changeset
   748
    node = opts['rev'] and repo.lookup(opts['rev']) or \
38d106db75bc hg revert should revert to parent, not to tip
mpm@selenic.com
parents: 588
diff changeset
   749
           repo.dirstate.parents()[0]
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   750
    root = os.path.realpath(repo.root)
590
38d106db75bc hg revert should revert to parent, not to tip
mpm@selenic.com
parents: 588
diff changeset
   751
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   752
    def trimpath(p):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   753
        p = os.path.realpath(p)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   754
        if p.startswith(root):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   755
            rest = p[len(root):]
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   756
            if not rest:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   757
                return rest
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   758
            if p.startswith(os.sep):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   759
                return rest[1:]
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   760
            return p
590
38d106db75bc hg revert should revert to parent, not to tip
mpm@selenic.com
parents: 588
diff changeset
   761
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   762
    relnames = map(trimpath, names or [os.getcwd()])
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   763
    chosen = {}
590
38d106db75bc hg revert should revert to parent, not to tip
mpm@selenic.com
parents: 588
diff changeset
   764
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   765
    def choose(name):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   766
        def body(name):
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   767
            for r in relnames:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   768
                if not name.startswith(r): continue
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   769
                rest = name[len(r):]
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   770
                if not rest: return r, True
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   771
                depth = rest.count(os.sep)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   772
                if not r:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   773
                    if depth == 0 or not opts['nonrecursive']: return r, True
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   774
                elif rest[0] == os.sep:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   775
                    if depth == 1 or not opts['nonrecursive']: return r, True
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   776
            return None, False
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   777
        relname, ret = body(name)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   778
        if ret:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   779
            chosen[relname] = 1
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   780
        return ret
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   781
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   782
    r = repo.update(node, False, True, choose, False)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   783
    for n in relnames:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   784
        if n not in chosen:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   785
            ui.warn('error: no matches for %s\n' % n)
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   786
            r = 1
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   787
    sys.stdout.flush()
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   788
    return r
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   789
468
157675add351 [PATCH] add "root" command
mpm@selenic.com
parents: 467
diff changeset
   790
def root(ui, repo):
157675add351 [PATCH] add "root" command
mpm@selenic.com
parents: 467
diff changeset
   791
    """print the root (top) of the current working dir"""
157675add351 [PATCH] add "root" command
mpm@selenic.com
parents: 467
diff changeset
   792
    ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command
mpm@selenic.com
parents: 467
diff changeset
   793
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   794
def serve(ui, repo, **opts):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   795
    """export the repository via HTTP"""
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   796
    hgweb.server(repo.root, opts["name"], opts["templates"],
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   797
                 opts["address"], opts["port"])
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   798
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   799
def status(ui, repo):
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   800
    '''show changed files in the working directory
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   801
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   802
    C = changed
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   803
    A = added
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   804
    R = removed
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   805
    ? = not tracked'''
312
09375250eb31 Optimize diff and status in subdirectories
mpm@selenic.com
parents: 310
diff changeset
   806
537
411e05b04ffa Propagate file list through dodiff
mpm@selenic.com
parents: 536
diff changeset
   807
    (c, a, d, u) = repo.changes(None, None)
220
3113a94c1bff change dircache into dirstate
mpm@selenic.com
parents: 219
diff changeset
   808
    (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   809
582
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   810
    for f in c: ui.write("C ", f, "\n")
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   811
    for f in a: ui.write("A ", f, "\n")
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   812
    for f in d: ui.write("R ", f, "\n")
df8a5a0098d4 Remove all remaining print statements
mpm@selenic.com
parents: 580
diff changeset
   813
    for f in u: ui.write("? ", f, "\n")
213
d2172916ef6c commands: migrate status and branch
mpm@selenic.com
parents: 212
diff changeset
   814
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   815
def tag(ui, repo, name, rev = None, **opts):
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   816
    """add a tag for the current tip or a given revision"""
500
ebc4714a7632 [PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents: 499
diff changeset
   817
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   818
    if name == "tip":
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   819
        ui.warn("abort: 'tip' is a reserved name!\n")
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   820
        return -1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   821
    if name.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   822
        ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   823
        return -1
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   824
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents: 535
diff changeset
   825
    (c, a, d, u) = repo.changes(None, None)
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   826
    for x in (c, a, d, u):
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   827
        if ".hgtags" in x:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   828
            ui.warn("abort: working copy of .hgtags is changed!\n")
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   829
            ui.status("(please commit .hgtags manually)\n")
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   830
            return -1
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   831
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   832
    if rev:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   833
        r = hg.hex(repo.lookup(rev))
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   834
    else:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   835
        r = hg.hex(repo.changelog.tip())
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   836
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   837
    add = 0
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   838
    if not os.path.exists(repo.wjoin(".hgtags")): add = 1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   839
    repo.wfile(".hgtags", "a").write("%s %s\n" % (r, name))
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   840
    if add: repo.add([".hgtags"])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   841
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   842
    if not opts['text']:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   843
        opts['text'] = "Added tag %s for changeset %s" % (name, r)
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   844
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   845
    repo.commit([".hgtags"], opts['text'], opts['user'], opts['date'])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   846
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   847
def tags(ui, repo):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   848
    """list repository tags"""
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 470
diff changeset
   849
343
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 340
diff changeset
   850
    l = repo.tagslist()
d7df759d0e97 rework all code using tags
mpm@selenic.com
parents: 340
diff changeset
   851
    l.reverse()
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 470
diff changeset
   852
    for t, n in l:
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   853
        try:
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 470
diff changeset
   854
            r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   855
        except KeyError:
477
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 470
diff changeset
   856
            r = "    ?:?"
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 470
diff changeset
   857
        ui.write("%-30s %s\n" % (t, r))
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   858
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   859
def tip(ui, repo):
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   860
    """show the tip revision"""
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   861
    n = repo.changelog.tip()
329
67c19ad374a9 Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 320
diff changeset
   862
    show_changeset(ui, repo, changenode=n)
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   863
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   864
def undo(ui, repo):
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   865
    """undo the last commit or pull
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   866
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   867
    Roll back the last pull or commit transaction on the
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   868
    repository, restoring the project to its earlier state.
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   869
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   870
    This command should be used with care. There is only one level of
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   871
    undo and there is no redo.
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   872
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   873
    This command is not intended for use on public repositories. Once
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   874
    a change is visible for pull by other users, undoing it locally is
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   875
    ineffective.
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   876
    """
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 209
diff changeset
   877
    repo.undo()
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 209
diff changeset
   878
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 270
diff changeset
   879
def update(ui, repo, node=None, merge=False, clean=False):
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   880
    '''update or merge working directory
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   881
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   882
    If there are no outstanding changes in the working directory and
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   883
    there is a linear relationship between the current version and the
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   884
    requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   885
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   886
    Otherwise the result is a merge between the contents of the
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   887
    current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   888
    changed between either parent are marked as changed for the next
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   889
    commit and a commit must be performed before any further updates
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   890
    are allowed.
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   891
    '''
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   892
    node = node and repo.lookup(node) or repo.changelog.tip()
275
61d45b0ba8fb various merge improvements
mpm@selenic.com
parents: 270
diff changeset
   893
    return repo.update(node, allow=merge, force=clean)
254
c03f58e5fd2d unify checkout and resolve into update
mpm@selenic.com
parents: 252
diff changeset
   894
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 246
diff changeset
   895
def verify(ui, repo):
863b508c5b36 migrate verify
mpm@selenic.com
parents: 246
diff changeset
   896
    """verify the integrity of the repository"""
863b508c5b36 migrate verify
mpm@selenic.com
parents: 246
diff changeset
   897
    return repo.verify()
863b508c5b36 migrate verify
mpm@selenic.com
parents: 246
diff changeset
   898
255
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   899
# Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only
mpm@selenic.com
parents: 254
diff changeset
   900
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   901
table = {
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   902
    "^add": (add, [], "hg add [files]"),
353
dda243bb34b3 hg addremove: take optional files list
mpm@selenic.com
parents: 350
diff changeset
   903
    "addremove": (addremove, [], "hg addremove [files]"),
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   904
    "^annotate": (annotate,
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   905
                     [('r', 'revision', '', 'revision'),
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   906
                      ('u', 'user', None, 'show user'),
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   907
                      ('n', 'number', None, 'show revision number'),
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   908
                      ('c', 'changeset', None, 'show changeset')],
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   909
                     'hg annotate [-u] [-c] [-n] [-r id] [files]'),
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   910
    "cat": (cat, [], 'hg cat <file> [rev]'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   911
    "^clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')],
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   912
              'hg clone [options] <source> [dest]'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   913
    "^commit|ci": (commit,
289
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   914
                  [('t', 'text', "", 'commit text'),
354
e3667e3a18ac hg commit: add -A flag
mpm@selenic.com
parents: 353
diff changeset
   915
                   ('A', 'addremove', None, 'run add/remove during commit'),
317
b18ce742566a hg commit: user and date options
mpm@selenic.com
parents: 312
diff changeset
   916
                   ('l', 'logfile', "", 'commit text file'),
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 590
diff changeset
   917
                   ('d', 'date', "", 'date code'),
317
b18ce742566a hg commit: user and date options
mpm@selenic.com
parents: 312
diff changeset
   918
                   ('u', 'user', "", 'user')],
289
266396e32006 hg commit: add -t and -l options
mpm@selenic.com
parents: 286
diff changeset
   919
                  'hg commit [files]'),
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents: 355
diff changeset
   920
    "copy": (copy, [], 'hg copy <source> <dest>'),
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   921
    "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   922
    "debugstate": (debugstate, [], 'debugstate'),
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   923
    "debugindex": (debugindex, [], 'debugindex <file>'),
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   924
    "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   925
    "^diff": (diff, [('r', 'rev', [], 'revision')],
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   926
             'hg diff [-r A] [-r B] [files]'),
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   927
    "^export": (export, [('o', 'output', "", 'output to file')],
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   928
               "hg export [-o file] <changeset> ..."),
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   929
    "forget": (forget, [], "hg forget [files]"),
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   930
    "heads": (heads, [], 'hg heads'),
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   931
    "help": (help, [], 'hg help [command]'),
339
a76fc9c4b67b added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 338
diff changeset
   932
    "identify|id": (identify, [], 'hg identify'),
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   933
    "import|patch": (import_,
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   934
                     [('p', 'strip', 1, 'path strip'),
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   935
                      ('b', 'base', "", 'base path')],
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   936
                     "hg import [options] <patches>"),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   937
    "^init": (init, [], 'hg init'),
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   938
    "^log|history": (log,
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   939
                    [('r', 'rev', [], 'revision')],
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 547
diff changeset
   940
                    'hg log [-r A] [-r B] [file]'),
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   941
    "manifest": (manifest, [], 'hg manifest [rev]'),
227
f57519cddd3d move repo.current to dirstate.parents()
mpm@selenic.com
parents: 221
diff changeset
   942
    "parents": (parents, [], 'hg parents [node]'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   943
    "^pull": (pull,
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 403
diff changeset
   944
                  [('u', 'update', None, 'update working directory')],
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 577
diff changeset
   945
                  'hg pull [options] [source]'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   946
    "^push": (push, [], 'hg push <destination>'),
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   947
    "rawcommit": (rawcommit,
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   948
                  [('p', 'parent', [], 'parent'),
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 590
diff changeset
   949
                   ('d', 'date', "", 'date code'),
246
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   950
                   ('u', 'user', "", 'user'),
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   951
                   ('F', 'files', "", 'file list'),
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   952
                   ('t', 'text', "", 'commit text'),
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   953
                   ('l', 'logfile', "", 'commit text file')],
96cde50a746f Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents: 245
diff changeset
   954
                  'hg rawcommit [options] [files]'),
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   955
    "recover": (recover, [], "hg recover"),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   956
    "^remove|rm": (remove, [], "hg remove [files]"),
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   957
    "^revert": (revert,
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   958
               [("n", "nonrecursive", None, "don't recurse into subdirs"),
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   959
                ("r", "rev", "", "revision")],
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 582
diff changeset
   960
               "hg revert [files|dirs]"),
468
157675add351 [PATCH] add "root" command
mpm@selenic.com
parents: 467
diff changeset
   961
    "root": (root, [], "hg root"),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   962
    "^serve": (serve, [('p', 'port', 8000, 'listen port'),
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   963
                      ('a', 'address', '', 'interface address'),
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   964
                      ('n', 'name', os.getcwd(), 'repository name'),
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   965
                      ('t', 'templates', "", 'template map')],
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   966
              "hg serve [options]"),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   967
    "^status": (status, [], 'hg status'),
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   968
    "tag": (tag,  [('t', 'text', "", 'commit text'),
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 590
diff changeset
   969
                   ('d', 'date', "", 'date code'),
401
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   970
                   ('u', 'user', "", 'user')],
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents: 396
diff changeset
   971
            'hg tag [options] <name> [rev]'),
248
b7645b3c86ff migrate remaining commands
mpm@selenic.com
parents: 247
diff changeset
   972
    "tags": (tags, [], 'hg tags'),
245
fef0f8e041aa big heap of command clean-up work
mpm@selenic.com
parents: 241
diff changeset
   973
    "tip": (tip, [], 'hg tip'),
210
d2badbd7d1ad hg undo: fixup working dir state
mpm@selenic.com
parents: 209
diff changeset
   974
    "undo": (undo, [], 'hg undo'),
593
ca3c499e94c6 Shorten help
mpm@selenic.com
parents: 592
diff changeset
   975
    "^update|up|checkout|co":
437
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   976
            (update,
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   977
             [('m', 'merge', None, 'allow merging of conflicts'),
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   978
              ('C', 'clean', None, 'overwrite locally modified files')],
5b38a5af4019 Commands cleanup
mpm@selenic.com
parents: 429
diff changeset
   979
             'hg update [options] [node]'),
247
863b508c5b36 migrate verify
mpm@selenic.com
parents: 246
diff changeset
   980
    "verify": (verify, [], 'hg verify'),
470
0ab093b473c5 Fix up version module name and command conflict
mpm@selenic.com
parents: 468
diff changeset
   981
    "version": (show_version, [], 'hg version'),
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   982
    }
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   983
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   984
globalopts = [('v', 'verbose', None, 'verbose'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   985
              ('', 'debug', None, 'debug'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   986
              ('q', 'quiet', None, 'quiet'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   987
              ('', 'profile', None, 'profile'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   988
              ('R', 'repository', "", 'repository root directory'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   989
              ('', 'traceback', None, 'print traceback on exception'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   990
              ('y', 'noninteractive', None, 'run non-interactively'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   991
              ('', 'version', None, 'output version information and exit'),
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   992
              ]
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   993
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
   994
norepo = "clone init version help debugindex debugindexdot"
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
   995
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   996
def find(cmd):
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   997
    for e in table.keys():
335
74b9332faece Fix misrecognition of commands
mpm@selenic.com
parents: 333
diff changeset
   998
        if re.match("(%s)$" % e, cmd):
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
   999
            return table[e]
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1000
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1001
    raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1002
214
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1003
class SignalInterrupt(Exception): pass
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1004
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1005
def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1006
    raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1007
249
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
  1008
def run():
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
  1009
    sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups
mpm@selenic.com
parents: 248
diff changeset
  1010
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1011
class ParseError(Exception): pass
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1012
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1013
def parse(args):
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1014
    options = {}
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1015
    cmdoptions = {}
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1016
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1017
    try:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1018
        args = fancyopts.fancyopts(args, globalopts, options)
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1019
    except fancyopts.getopt.GetoptError, inst:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1020
        raise ParseError(cmd, inst)
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1021
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1022
    if options["version"]:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1023
        return ("version", show_version, [], options, cmdoptions)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1024
    elif not args:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1025
        return ("help", help, [], options, cmdoptions)
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1026
    else:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1027
        cmd, args = args[0], args[1:]
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1028
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1029
    i = find(cmd)
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1030
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1031
    # combine global options into local
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1032
    c = list(i[1])
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1033
    l = len(c)
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1034
    for o in globalopts:
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1035
        c.append((o[0], o[1], options[o[1]], o[3]))
214
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1036
293
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
  1037
    try:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1038
        args = fancyopts.fancyopts(args, c, cmdoptions)
293
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
  1039
    except fancyopts.getopt.GetoptError, inst:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1040
        raise ParseError(cmd, inst)
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1041
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1042
    # separate global options back out
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1043
    for o in globalopts:
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1044
        n = o[1]
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1045
        options[n] = cmdoptions[n]
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1046
        del cmdoptions[n]
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1047
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1048
    return (cmd, i[0], args, options, cmdoptions)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1049
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1050
def dispatch(args):
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1051
    signal.signal(signal.SIGTERM, catchterm)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1052
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1053
    try:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1054
        cmd, func, args, options, cmdoptions = parse(args)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1055
    except ParseError, inst:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1056
        u = ui.ui()
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1057
        if inst.args[0]:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1058
            u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1059
            help(u, inst.args[0])
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1060
        else:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1061
            u.warn("hg: %s\n" % inst.args[1])
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1062
            help(u)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1063
        sys.exit(-1)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1064
    except UnknownCommand, inst:
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1065
        u = ui.ui()
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1066
        u.warn("hg: unknown command '%s'\n" % inst.args[0])
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1067
        help(u)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1068
        sys.exit(1)
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1069
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1070
    u = ui.ui(options["verbose"], options["debug"], options["quiet"],
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1071
                     not options["noninteractive"])
592
74175ce83378 Restructure option handling
mpm@selenic.com
parents: 591
diff changeset
  1072
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 496
diff changeset
  1073
    try:
527
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1074
        try:
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1075
            if cmd not in norepo.split():
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1076
                path = options["repository"] or ""
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1077
                repo = hg.repository(ui=u, path=path)
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1078
                d = lambda: func(u, repo, *args, **cmdoptions)
527
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1079
            else:
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1080
                d = lambda: func(u, *args, **cmdoptions)
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1081
527
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1082
            if options['profile']:
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1083
                import hotshot, hotshot.stats
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1084
                prof = hotshot.Profile("hg.prof")
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1085
                r = prof.runcall(d)
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1086
                prof.close()
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1087
                stats = hotshot.stats.load("hg.prof")
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1088
                stats.strip_dirs()
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1089
                stats.sort_stats('time', 'calls')
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1090
                stats.print_stats(40)
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1091
                return r
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1092
            else:
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1093
                return d()
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1094
        except:
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1095
            if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1096
                traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option
mpm@selenic.com
parents: 526
diff changeset
  1097
            raise
508
42a660abaf75 [PATCH] Harden os.system
mpm@selenic.com
parents: 506
diff changeset
  1098
    except util.CommandError, inst:
42a660abaf75 [PATCH] Harden os.system
mpm@selenic.com
parents: 506
diff changeset
  1099
        u.warn("abort: %s\n" % inst.args)
499
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 496
diff changeset
  1100
    except hg.RepoError, inst:
81c563a254be Add exception class for repository errors
mpm@selenic.com
parents: 496
diff changeset
  1101
        u.warn("abort: ", inst, "!\n")
214
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1102
    except SignalInterrupt:
2d60aa9bde0a catch TERM signal in command processor
mpm@selenic.com
parents: 213
diff changeset
  1103
        u.warn("killed!\n")
209
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1104
    except KeyboardInterrupt:
63af1db35611 Beginning of new command parsing interface
mpm@selenic.com
parents:
diff changeset
  1105
        u.warn("interrupted!\n")
250
45ee7c4cae4f Catch broken pipes in command interpreter
mpm@selenic.com
parents: 249
diff changeset
  1106
    except IOError, inst:
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents: 393
diff changeset
  1107
        if hasattr(inst, "code"):
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents: 393
diff changeset
  1108
            u.warn("abort: %s\n" % inst)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents: 393
diff changeset
  1109
        elif hasattr(inst, "reason"):
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents: 393
diff changeset
  1110
            u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1]))
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents: 393
diff changeset
  1111
        elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
250
45ee7c4cae4f Catch broken pipes in command interpreter
mpm@selenic.com
parents: 249
diff changeset
  1112
            u.warn("broken pipe\n")
45ee7c4cae4f Catch broken pipes in command interpreter
mpm@selenic.com
parents: 249
diff changeset
  1113
        else:
45ee7c4cae4f Catch broken pipes in command interpreter
mpm@selenic.com
parents: 249
diff changeset
  1114
            raise
549
92b60cabf808 [PATCH] Catch OSError usefully
mpm@selenic.com
parents: 547
diff changeset
  1115
    except OSError, inst:
92b60cabf808 [PATCH] Catch OSError usefully
mpm@selenic.com
parents: 547
diff changeset
  1116
        if hasattr(inst, "filename"):
92b60cabf808 [PATCH] Catch OSError usefully
mpm@selenic.com
parents: 547
diff changeset
  1117
            u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
92b60cabf808 [PATCH] Catch OSError usefully
mpm@selenic.com
parents: 547
diff changeset
  1118
        else:
92b60cabf808 [PATCH] Catch OSError usefully
mpm@selenic.com
parents: 547
diff changeset
  1119
            u.warn("abort: %s\n" % inst.strerror)
212
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1120
    except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1121
        # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1122
        tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1123
        if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help
mpm@selenic.com
parents: 211
diff changeset
  1124
            raise
293
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
  1125
        u.debug(inst, "\n")
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
  1126
        u.warn("%s: invalid arguments\n" % cmd)
293
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
  1127
        help(u, cmd)
11d64332a1cb hg help improvements
mpm@selenic.com
parents: 290
diff changeset
  1128
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 500
diff changeset
  1129
    sys.exit(-1)