commands.py 18.4 KB
Newer Older
mpm@selenic.com's avatar
mpm@selenic.com committed
1 2 3 4 5 6 7 8
# commands.py - command processing for mercurial
#
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

import os, re, sys, signal, time, mdiff
9 10 11 12
from mercurial import fancyopts, ui, hg

class UnknownCommand(Exception): pass

13 14
def filterfiles(filters, files):
    l = [ x for x in files if x in filters ]
15

16 17 18
    for t in filters:
        if t and t[-1] != os.sep: t += os.sep
        l += [ x for x in files if x.startswith(t) ]
19 20
    return l

21
def relfilter(repo, files):
22 23
    if os.getcwd() != repo.root:
        p = os.getcwd()[len(repo.root) + 1: ]
24 25
        return filterfiles(p, files)
    return files
26

27 28 29
def relpath(repo, args):
    if os.getcwd() != repo.root:
        p = os.getcwd()[len(repo.root) + 1: ]
30
        return [ os.path.normpath(os.path.join(p, x)) for x in args ]
31
    return args
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68

def dodiff(repo, files = None, node1 = None, node2 = None):
    def date(c):
        return time.asctime(time.gmtime(float(c[2].split(' ')[0])))

    if node2:
        change = repo.changelog.read(node2)
        mmap2 = repo.manifest.read(change[0])
        (c, a, d) = repo.diffrevs(node1, node2)
        def read(f): return repo.file(f).read(mmap2[f])
        date2 = date(change)
    else:
        date2 = time.asctime()
        (c, a, d, u) = repo.diffdir(repo.root, node1)
        if not node1:
            node1 = repo.dirstate.parents()[0]
        def read(f): return file(os.path.join(repo.root, f)).read()

    change = repo.changelog.read(node1)
    mmap = repo.manifest.read(change[0])
    date1 = date(change)

    if files:
        c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))

    for f in c:
        to = repo.file(f).read(mmap[f])
        tn = read(f)
        sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
    for f in a:
        to = ""
        tn = read(f)
        sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
    for f in d:
        to = repo.file(f).read(mmap[f])
        tn = ""
        sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
69
    
70 71 72 73 74 75 76 77
def help(ui, cmd=None):
    '''show help'''
    if cmd:
        try:
            i = find(cmd)
            ui.write("%s\n\n" % i[2])
            ui.write(i[0].__doc__, "\n")
        except UnknownCommand:
78
            ui.warn("unknown command %s" % cmd)
79 80
        sys.exit(0)
    
81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
    ui.status("""\
 hg commands:

 add [files...]        add the given files in the next commit
 addremove             add all new files, delete all missing files
 annotate [files...]   show changeset number per file line
 branch <path>         create a branch of <path> in this directory
 checkout [changeset]  checkout the latest or given changeset
 commit                commit all changes to the repository
 diff [files...]       diff working directory (or selected files)
 dump <file> [rev]     dump the latest or given revision of a file
 dumpmanifest [rev]    dump the latest or given revision of the manifest
 export <rev>          dump the changeset header and diffs for a revision
 history               show changeset history
 init                  create a new repository in this directory
 log <file>            show revision history of a single file
 merge <path>          merge changes from <path> into local repository
 recover               rollback an interrupted transaction
 remove [files...]     remove the given files in the next commit
 serve                 export the repository via HTTP
 status                show new, missing, and changed files in working dir
 tags                  show current changeset tags
 undo                  undo the last transaction
""")

106 107 108
def add(ui, repo, file, *files):
    '''add the specified files on the next commit'''
    repo.add(relpath(repo, (file,) + files))
109

110
def addremove(ui, repo):
111
    (c, a, d, u) = repo.diffdir(repo.root)
112 113
    repo.add(a)
    repo.remove(d)
114

115
def annotate(u, repo, file, *files, **ops):
116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
    def getnode(rev):
        return hg.short(repo.changelog.node(rev))

    def getname(rev):
        try:
            return bcache[rev]
        except KeyError:
            cl = repo.changelog.read(repo.changelog.node(rev))
            name = cl[1]
            f = name.find('@')
            if f >= 0:
                name = name[:f]
            bcache[rev] = name
            return name
    
    bcache = {}
    opmap = [['user', getname], ['number', str], ['changeset', getnode]]
    if not ops['user'] and not ops['changeset']:
        ops['number'] = 1

136
    node = repo.dirstate.parents()[0]
137 138 139 140 141 142
    if ops['revision']:
        node = repo.changelog.lookup(ops['revision'])
    change = repo.changelog.read(node)
    mmap = repo.manifest.read(change[0])
    maxuserlen = 0
    maxchangelen = 0
143
    for f in relpath(repo, (file,) + files):
144 145 146 147 148 149 150 151 152 153 154 155
        lines = repo.file(f).annotate(mmap[f])
        pieces = []

        for o, f in opmap:
            if ops[o]:
                l = [ f(n) for n,t in lines ]
                m = max(map(len, l))
                pieces.append([ "%*s" % (m, x) for x in l])

        for p,l in zip(zip(*pieces), lines):
            u.write(" ".join(p) + ": " + l[1])

156 157 158 159 160
def branch(ui, path):
    '''branch from a local repository'''
    # this should eventually support remote repos
    os.system("cp -al %s/.hg .hg" % path)

mpm@selenic.com's avatar
mpm@selenic.com committed
161 162 163 164 165 166
def cat(ui, repo, file, rev = []):
    r = repo.file(file)
    n = r.tip()
    if rev: n = r.lookup(rev)
    sys.stdout.write(r.read(n))

167 168 169 170
def commit(ui, repo, *files):
    """commit the specified files or all outstanding changes"""
    repo.commit(relpath(repo, files))

mpm@selenic.com's avatar
mpm@selenic.com committed
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199
def debugaddchangegroup(ui, repo):
    data = sys.stdin.read()
    repo.addchangegroup(data)

def debugchangegroup(ui, repo, roots):
    newer = repo.newer(map(repo.lookup, roots))
    for chunk in repo.changegroup(newer):
        sys.stdout.write(chunk)

def debugindex(ui, file):
    r = hg.revlog(open, file, "")
    print "   rev    offset  length   base linkrev"+\
          " p1           p2           nodeid"
    for i in range(r.count()):
        e = r.index[i]
        print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
            i, e[0], e[1], e[2], e[3],
            hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))

def debugindexdot(ui, file):
    r = hg.revlog(open, file, "")
    print "digraph G {"
    for i in range(r.count()):
        e = r.index[i]
        print "\t%d -> %d" % (r.rev(e[4]), i)
        if e[5] != hg.nullid:
            print "\t%d -> %d" % (r.rev(e[5]), i)
    print "}"

200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215
def diff(ui, repo, *files, **opts):
    revs = []
    if opts['rev']:
        revs = map(lambda x: repo.lookup(x), opts['rev'])
    
    if len(revs) > 2:
        self.ui.warn("too many revisions to diff\n")
        sys.exit(1)

    if files:
        files = relpath(repo, files)
    else:
        files = relpath(repo, [""])

    dodiff(repo, files, *revs)

216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231
def export(ui, repo, changeset):
    node = repo.lookup(changeset)
    prev, other = repo.changelog.parents(node)
    change = repo.changelog.read(node)
    print "# HG changeset patch"
    print "# User %s" % change[1]
    print "# Node ID %s" % hg.hex(node)
    print "# Parent  %s" % hg.hex(prev)
    print
    if other != hg.nullid:
        print "# Parent  %s" % hg.hex(other)
    print change[4].rstrip()
    print
    
    dodiff(repo, None, prev, node)

232 233 234 235
def forget(ui, repo, file, *files):
    """don't add the specified files on the next commit"""
    repo.forget(relpath(repo, (file,) + files))

236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
def heads(ui, repo):
    '''show current repository heads'''
    for n in repo.changelog.heads():
        i = repo.changelog.rev(n)
        changes = repo.changelog.read(n)
        (p1, p2) = repo.changelog.parents(n)
        (h, h1, h2) = map(hg.hex, (n, p1, p2))
        (i1, i2) = map(repo.changelog.rev, (p1, p2))
        print "rev:      %4d:%s" % (i, h)
        print "parents:  %4d:%s" % (i1, h1)
        if i2: print "          %4d:%s" % (i2, h2)
        print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]),
                                    hg.hex(changes[0]))
        print "user:", changes[1]
        print "date:", time.asctime(
            time.localtime(float(changes[2].split(' ')[0])))
        if ui.verbose: print "files:", " ".join(changes[3])
        print "description:"
        print changes[4]

256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
def history(ui, repo):
    """show the changelog history"""
    for i in range(repo.changelog.count()):
        n = repo.changelog.node(i)
        changes = repo.changelog.read(n)
        (p1, p2) = repo.changelog.parents(n)
        (h, h1, h2) = map(hg.hex, (n, p1, p2))
        (i1, i2) = map(repo.changelog.rev, (p1, p2))
        print "rev:      %4d:%s" % (i, h)
        print "parents:  %4d:%s" % (i1, h1)
        if i2: print "          %4d:%s" % (i2, h2)
        print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]),
                                    hg.hex(changes[0]))
        print "user:", changes[1]
        print "date:", time.asctime(
            time.localtime(float(changes[2].split(' ')[0])))
        if ui.verbose: print "files:", " ".join(changes[3])
        print "description:"
        print changes[4]

def patch(ui, repo, patches, opts):
    """import an ordered set of patches"""
    try:
        import psyco
        psyco.full()
    except:
        pass
    
    d = opts["base"]
    strip = opts["strip"]
    quiet = opts["quiet"] and "> /dev/null" or ""

    for patch in patches:
        ui.status("applying %s\n" % patch)
        pf = os.path.join(d, patch)

        text = ""
        for l in file(pf):
            if l[:4] == "--- ": break
            text += l

        f = os.popen("lsdiff --strip %d %s" % (strip, pf))
        files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
        f.close()

        if files:
            if os.system("patch -p%d < %s %s" % (strip, pf, quiet)):
                raise "patch failed!"
        repo.commit(files, text)

306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332
def init(ui):
    """create a repository"""
    hg.repository(ui, ".", create=1)

def log(ui, repo, f):
    f = relpath(repo, [f])[0]

    r = repo.file(f)
    for i in range(r.count()):
        n = r.node(i)
        (p1, p2) = r.parents(n)
        (h, h1, h2) = map(hg.hex, (n, p1, p2))
        (i1, i2) = map(r.rev, (p1, p2))
        cr = r.linkrev(n)
        cn = hg.hex(repo.changelog.node(cr))
        print "rev:       %4d:%s" % (i, h)
        print "changeset: %4d:%s" % (cr, cn)
        print "parents:   %4d:%s" % (i1, h1)
        if i2: print "           %4d:%s" % (i2, h2)
        changes = repo.changelog.read(repo.changelog.node(cr))
        print "user: %s" % changes[1]
        print "date: %s" % time.asctime(
            time.localtime(float(changes[2].split(' ')[0])))
        print "description:"
        print changes[4].rstrip()
        print

mpm@selenic.com's avatar
mpm@selenic.com committed
333 334 335 336 337 338 339 340 341 342 343
def manifest(ui, repo, rev = []):
    n = repo.manifest.tip()
    if rev:
        n = repo.manifest.lookup(rev)
    m = repo.manifest.read(n)
    files = m.keys()
    files.sort()

    for f in files:
        print hg.hex(m[f]), f

344 345 346 347 348 349 350 351 352 353 354
def parents(ui, repo, node = None):
    '''show the parents of the current working dir'''
    if node:
        p = repo.changelog.parents(repo.lookup(hg.bin(node)))
    else:
        p = repo.dirstate.parents()

    for n in p:
        if n != hg.nullid:
            ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n)))

355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388
def pull(ui, repo, source):
    """pull changes from the specified source"""
    paths = {}
    try:
        pf = os.path.expanduser("~/.hgpaths")
        for l in file(pf):
            name, path = l.split()
            paths[name] = path
    except IOError:
        pass

    if source in paths: source = paths[source]
    
    other = hg.repository(ui, source)
    cg = repo.getchangegroup(other)
    repo.addchangegroup(cg)

def rawcommit(ui, repo, files, rc):
    "raw commit interface"

    text = rc['text']
    if not text and rc['logfile']:
        try: text = open(rc['logfile']).read()
        except IOError: pass
    if not text and not rc['logfile']:
        print "missing commit text"
        return 1

    files = relpath(repo, files)
    if rc['files']:
        files += open(rc['files']).read().splitlines()
        
    repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
 
389 390 391 392 393 394 395 396 397 398 399 400
def recover(ui, repo):
    repo.recover()

def remove(ui, repo, file, *files):
    """remove the specified files on the next commit"""
    repo.remove(relpath(repo, (file,) + files))

def serve(ui, repo, **opts):
    from mercurial import hgweb
    hgweb.server(repo.root, opts["name"], opts["templates"],
                 opts["address"], opts["port"])
    
401 402 403
def status(ui, repo):
    '''show changed files in the working directory

404 405 406 407 408
    C = changed
    A = added
    R = removed
    ? = not tracked'''
    
409
    (c, a, d, u) = repo.diffdir(repo.root)
410
    (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
411 412

    for f in c: print "C", f
413
    for f in a: print "A", f
414
    for f in d: print "R", f
415
    for f in u: print "?", f
416

mpm@selenic.com's avatar
mpm@selenic.com committed
417 418 419 420 421 422 423 424 425 426 427
def tags(ui, repo):
    repo.lookup(0) # prime the cache
    i = repo.tags.items()
    i.sort()
    for k, n in i:
        try:
            r = repo.changelog.rev(n)
        except KeyError:
            r = "?"
        print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))

428 429 430 431 432
def tip(ui, repo):
    n = repo.changelog.tip()
    t = repo.changelog.rev(n)
    ui.status("%d:%s\n" % (t, hg.hex(n)))

433
def undo(ui, repo):
434 435
    repo.undo()

436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451
def update(ui, repo, node=None):
    '''update or merge working directory

    If there are no outstanding changes in the working directory and
    there is a linear relationship between the current version and the
    requested version, the result is the requested version.

    Otherwise the result is a merge between the contents of the
    current working directory and the requested version. Files that
    changed between either parent are marked as changed for the next
    commit and a commit must be performed before any further updates
    are allowed.
    '''
    node = node and repo.lookup(node) or repo.changelog.tip()
    repo.update(node)

mpm@selenic.com's avatar
mpm@selenic.com committed
452 453 454 455
def verify(ui, repo):
    """verify the integrity of the repository"""
    return repo.verify()

456
table = {
457 458
    "add": (add, [], "hg add [files]"),
    "addremove": (addremove, [], "hg addremove"),
459 460 461 462 463 464
    "ann|annotate": (annotate,
                     [('r', 'revision', '', 'revision'),
                      ('u', 'user', None, 'show user'),
                      ('n', 'number', None, 'show revision number'),
                      ('c', 'changeset', None, 'show changeset')],
                     'hg annotate [-u] [-c] [-n] [-r id] [files]'),
465
    "branch|clone": (branch, [], 'hg branch [path]'),
mpm@selenic.com's avatar
mpm@selenic.com committed
466
    "cat|dump": (cat, [], 'hg cat <file> [rev]'),
467
    "commit|ci": (commit, [], 'hg commit [files]'),
mpm@selenic.com's avatar
mpm@selenic.com committed
468 469 470 471
    "debugaddchangegroup": (debugaddchangegroup, [], 'debugaddchangegroup'),
    "debugchangegroup": (debugchangegroup, [], 'debugchangegroup [roots]'),
    "debugindex": (debugindex, [], 'debugindex <file>'),
    "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
472 473
    "diff": (diff, [('r', 'rev', [], 'revision')],
             'hg diff [-r A] [-r B] [files]'),
474
    "export": (export, [], "hg export <changeset>"),
475 476
    "forget": (forget, [], "hg forget [files]"),
    "heads": (heads, [], 'hg heads'),
477
    "history": (history, [], 'hg history'),
478 479 480
    "help": (help, [], 'hg help [command]'),
    "init": (init, [], 'hg init'),
    "log": (log, [], 'hg log <file>'),
mpm@selenic.com's avatar
mpm@selenic.com committed
481
    "manifest|dumpmanifest": (manifest, [], 'hg manifest [rev]'),
482
    "parents": (parents, [], 'hg parents [node]'),
483 484 485 486 487 488 489 490 491 492 493 494 495 496
    "patch|import": (patch,
                     [('p', 'strip', 1, 'path strip'),
                      ('b', 'base', "", 'base path'),
                      ('q', 'quiet', "", 'silence diff')],
                     "hg import [options] patches"),
    "pull|merge": (pull, [], 'hg pull [source]'),
    "rawcommit": (rawcommit,
                  [('p', 'parent', [], 'parent'),
                   ('d', 'date', "", 'data'),
                   ('u', 'user', "", 'user'),
                   ('F', 'files', "", 'file list'),
                   ('t', 'text', "", 'commit text'),
                   ('l', 'logfile', "", 'commit text file')],
                  'hg rawcommit [options] [files]'),
497 498 499 500 501 502 503
    "recover": (recover, [], "hg recover"),
    "remove": (remove, [], "hg remove [files]"),
    "serve": (serve, [('p', 'port', 8000, 'listen port'),
                      ('a', 'address', '', 'interface address'),
                      ('n', 'name', os.getcwd(), 'repository name'),
                      ('t', 'templates', "", 'template map')],
              "hg serve [options]"),
504
    "status": (status, [], 'hg status'),
mpm@selenic.com's avatar
mpm@selenic.com committed
505
    "tags": (tags, [], 'hg tags'),
506
    "tip": (tip, [], 'hg tip'),
507
    "undo": (undo, [], 'hg undo'),
508
    "update|up|checkout|co|resolve": (update, [], 'hg update [node]'),
mpm@selenic.com's avatar
mpm@selenic.com committed
509
    "verify": (verify, [], 'hg verify'),
510 511
    }

mpm@selenic.com's avatar
mpm@selenic.com committed
512
norepo = "init branch help debugindex debugindexdot"
513

514 515 516 517 518 519 520 521
def find(cmd):
    i = None
    for e in table.keys():
        if re.match(e + "$", cmd):
            return table[e]

    raise UnknownCommand(cmd)

522 523 524 525 526
class SignalInterrupt(Exception): pass

def catchterm(*args):
    raise SignalInterrupt

mpm@selenic.com's avatar
mpm@selenic.com committed
527 528 529
def run():
    sys.exit(dispatch(sys.argv[1:]))

530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548
def dispatch(args):
    options = {}
    opts = [('v', 'verbose', None, 'verbose'),
            ('d', 'debug', None, 'debug'),
            ('q', 'quiet', None, 'quiet'),
            ('y', 'noninteractive', None, 'run non-interactively'),
            ]

    args = fancyopts.fancyopts(args, opts, options,
                               'hg [options] <command> [options] [files]')

    if not args:
        cmd = "help"
    else:
        cmd, args = args[0], args[1:]

    u = ui.ui(options["verbose"], options["debug"], options["quiet"],
           not options["noninteractive"])

549 550 551 552 553 554
    try:
        i = find(cmd)
    except UnknownCommand:
        u.warn("unknown command '%s'\n" % cmd)
        help(u)
        sys.exit(1)
555

556 557
    signal.signal(signal.SIGTERM, catchterm)

558 559 560 561 562
    cmdoptions = {}
    args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2])

    if cmd not in norepo.split():
        repo = hg.repository(ui = u)
563
        d = lambda: i[0](u, repo, *args, **cmdoptions)
564
    else:
565
        d = lambda: i[0](u, *args, **cmdoptions)
566 567

    try:
568
        return d()
569 570
    except SignalInterrupt:
        u.warn("killed!\n")
571 572
    except KeyboardInterrupt:
        u.warn("interrupted!\n")
573 574 575 576 577
    except IOError, inst:
        if inst.errno == 32:
            u.warn("broken pipe\n")
        else:
            raise
578
    except TypeError, inst:
mpm@selenic.com's avatar
mpm@selenic.com committed
579
        import traceback
580 581 582 583 584 585 586
        # was this an argument error?
        tb = traceback.extract_tb(sys.exc_info()[2])
        if len(tb) > 2: # no
            raise
        u.warn("%s: invalid arguments\n" % i[0].__name__)
        u.warn("syntax: %s\n" % i[2])
        sys.exit(-1)