commands.py
898 lines
| 28.1 KiB
| text/x-python
|
PythonLexer
/ mercurial / commands.py
|
r249 | # 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. | ||||
|
r262 | import os, re, sys, signal | ||
|
r419 | import fancyopts, ui, hg, util | ||
|
r262 | from demandload import * | ||
|
r423 | demandload(globals(), "mdiff time hgweb traceback random signal errno version") | ||
|
r209 | |||
class UnknownCommand(Exception): pass | ||||
|
r245 | def filterfiles(filters, files): | ||
l = [ x for x in files if x in filters ] | ||||
|
r213 | |||
|
r245 | for t in filters: | ||
|
r419 | if t and t[-1] != "/": t += "/" | ||
|
r245 | l += [ x for x in files if x.startswith(t) ] | ||
|
r213 | return l | ||
|
r245 | def relfilter(repo, files): | ||
|
r213 | if os.getcwd() != repo.root: | ||
p = os.getcwd()[len(repo.root) + 1: ] | ||||
|
r419 | return filterfiles([util.pconvert(p)], files) | ||
|
r245 | return files | ||
|
r213 | |||
|
r209 | def relpath(repo, args): | ||
if os.getcwd() != repo.root: | ||||
p = os.getcwd()[len(repo.root) + 1: ] | ||||
|
r419 | return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ] | ||
|
r209 | return args | ||
|
r245 | |||
|
r396 | def dodiff(ui, repo, path, files = None, node1 = None, node2 = None): | ||
|
r245 | 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() | ||||
|
r312 | (c, a, d, u) = repo.diffdir(path, node1) | ||
|
r245 | if not node1: | ||
node1 = repo.dirstate.parents()[0] | ||||
|
r417 | def read(f): return repo.wfile(f).read() | ||
|
r245 | |||
|
r396 | if ui.quiet: | ||
r = None | ||||
else: | ||||
hexfunc = ui.verbose and hg.hex or hg.short | ||||
r = [hexfunc(node) for node in [node1, node2] if node] | ||||
|
r245 | 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: | ||||
|
r275 | to = None | ||
if f in mmap: | ||||
to = repo.file(f).read(mmap[f]) | ||||
|
r245 | tn = read(f) | ||
|
r396 | sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r)) | ||
|
r245 | for f in a: | ||
|
r264 | to = None | ||
|
r245 | tn = read(f) | ||
|
r396 | sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r)) | ||
|
r245 | for f in d: | ||
to = repo.file(f).read(mmap[f]) | ||||
|
r264 | tn = None | ||
|
r396 | sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r)) | ||
|
r329 | |||
def show_changeset(ui, repo, rev=0, changenode=None, filelog=None): | ||||
"""show a single changeset or file revision""" | ||||
changelog = repo.changelog | ||||
if filelog: | ||||
log = filelog | ||||
filerev = rev | ||||
node = filenode = filelog.node(filerev) | ||||
changerev = filelog.linkrev(filenode) | ||||
changenode = changenode or changelog.node(changerev) | ||||
else: | ||||
|
r347 | log = changelog | ||
|
r329 | changerev = rev | ||
if changenode is None: | ||||
changenode = changelog.node(changerev) | ||||
elif not changerev: | ||||
rev = changerev = changelog.rev(changenode) | ||||
node = changenode | ||||
if ui.quiet: | ||||
ui.write("%d:%s\n" % (rev, hg.hex(node))) | ||||
return | ||||
changes = changelog.read(changenode) | ||||
parents = [(log.rev(parent), hg.hex(parent)) | ||||
for parent in log.parents(node) | ||||
if ui.debugflag or parent != hg.nullid] | ||||
if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1: | ||||
parents = [] | ||||
if filelog: | ||||
ui.write("revision: %d:%s\n" % (filerev, hg.hex(filenode))) | ||||
for parent in parents: | ||||
ui.write("parent: %d:%s\n" % parent) | ||||
ui.status("changeset: %d:%s\n" % (changerev, hg.hex(changenode))) | ||||
else: | ||||
ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode))) | ||||
|
r387 | for tag in repo.nodetags(changenode): | ||
ui.status("tag: %s\n" % tag) | ||||
|
r329 | for parent in parents: | ||
ui.write("parent: %d:%s\n" % parent) | ||||
ui.note("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]), | ||||
hg.hex(changes[0]))) | ||||
ui.status("user: %s\n" % changes[1]) | ||||
ui.status("date: %s\n" % time.asctime( | ||||
time.localtime(float(changes[2].split(' ')[0])))) | ||||
|
r493 | if ui.debugflag: | ||
|
r490 | files = repo.diffrevs(changelog.parents(changenode)[0], changenode) | ||
for key, value in zip(["files:", "files+:", "files-:"], files): | ||||
if value: | ||||
ui.note("%-12s %s\n" % (key, " ".join(value))) | ||||
|
r493 | else: | ||
ui.note("files: %s\n" % " ".join(changes[3])) | ||||
|
r347 | description = changes[4].strip() | ||
|
r329 | if description: | ||
|
r330 | if ui.verbose: | ||
ui.status("description:\n") | ||||
|
r347 | ui.status(description) | ||
|
r365 | ui.status("\n") | ||
|
r330 | else: | ||
|
r347 | ui.status("summary: %s\n" % description.splitlines()[0]) | ||
|
r329 | ui.status("\n") | ||
|
r470 | def show_version(ui): | ||
|
r423 | """output version and copyright information""" | ||
ui.write("Mercurial version %s\n" % version.get_version()) | ||||
ui.status( | ||||
"\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n" | ||||
"This is free software; see the source for copying conditions. " | ||||
"There is NO\nwarranty; " | ||||
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | ||||
) | ||||
|
r212 | def help(ui, cmd=None): | ||
|
r255 | '''show help for a given command or all commands''' | ||
|
r212 | if cmd: | ||
try: | ||||
i = find(cmd) | ||||
ui.write("%s\n\n" % i[2]) | ||||
|
r293 | |||
if i[1]: | ||||
for s, l, d, c in i[1]: | ||||
opt=' ' | ||||
if s: opt = opt + '-' + s + ' ' | ||||
if l: opt = opt + '--' + l + ' ' | ||||
if d: opt = opt + '(' + str(d) + ')' | ||||
ui.write(opt, "\n") | ||||
if c: ui.write(' %s\n' % c) | ||||
ui.write("\n") | ||||
|
r212 | ui.write(i[0].__doc__, "\n") | ||
except UnknownCommand: | ||||
|
r268 | ui.warn("hg: unknown command %s\n" % cmd) | ||
|
r212 | sys.exit(0) | ||
|
r255 | else: | ||
|
r423 | if not ui.quiet: | ||
|
r470 | show_version(ui) | ||
|
r423 | ui.write('\n') | ||
ui.write('hg commands:\n\n') | ||||
|
r209 | |||
|
r255 | h = {} | ||
|
r479 | for c, e in table.items(): | ||
f = c.split("|")[0] | ||||
if f.startswith("debug"): | ||||
continue | ||||
|
r255 | d = "" | ||
|
r470 | if e[0].__doc__: | ||
d = e[0].__doc__.splitlines(0)[0].rstrip() | ||||
h[f] = d | ||||
|
r255 | |||
fns = h.keys() | ||||
fns.sort() | ||||
m = max(map(len, fns)) | ||||
for f in fns: | ||||
|
r423 | ui.write(' %-*s %s\n' % (m, f, h[f])) | ||
|
r255 | |||
# Commands start here, listed alphabetically | ||||
|
r209 | |||
|
r245 | def add(ui, repo, file, *files): | ||
'''add the specified files on the next commit''' | ||||
repo.add(relpath(repo, (file,) + files)) | ||||
|
r213 | |||
|
r353 | def addremove(ui, repo, *files): | ||
|
r255 | """add all new files, delete all missing files""" | ||
|
r353 | if files: | ||
files = relpath(repo, files) | ||||
d = [] | ||||
u = [] | ||||
for f in files: | ||||
p = repo.wjoin(f) | ||||
s = repo.dirstate.state(f) | ||||
isfile = os.path.isfile(p) | ||||
if s != 'r' and not isfile: | ||||
d.append(f) | ||||
elif s not in 'nmai' and isfile: | ||||
u.append(f) | ||||
else: | ||||
(c, a, d, u) = repo.diffdir(repo.root) | ||||
|
r259 | repo.add(u) | ||
|
r245 | repo.remove(d) | ||
|
r219 | |||
|
r245 | def annotate(u, repo, file, *files, **ops): | ||
|
r255 | """show changeset information per file line""" | ||
|
r209 | 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 | ||||
|
r500 | |||
|
r209 | bcache = {} | ||
opmap = [['user', getname], ['number', str], ['changeset', getnode]] | ||||
if not ops['user'] and not ops['changeset']: | ||||
ops['number'] = 1 | ||||
|
r227 | node = repo.dirstate.parents()[0] | ||
|
r209 | if ops['revision']: | ||
node = repo.changelog.lookup(ops['revision']) | ||||
change = repo.changelog.read(node) | ||||
mmap = repo.manifest.read(change[0]) | ||||
|
r245 | for f in relpath(repo, (file,) + files): | ||
|
r209 | 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]) | ||||
|
r248 | def cat(ui, repo, file, rev = []): | ||
|
r255 | """output the latest or given revision of a file""" | ||
|
r281 | r = repo.file(relpath(repo, [file])[0]) | ||
|
r248 | n = r.tip() | ||
if rev: n = r.lookup(rev) | ||||
sys.stdout.write(r.read(n)) | ||||
|
r485 | def clone(ui, source, dest = None, **opts): | ||
"""make a copy of an existing repository""" | ||||
|
r506 | source = ui.expandpath(source) | ||
|
r485 | |||
|
r503 | created = success = False | ||
|
r500 | |||
|
r485 | if dest is None: | ||
dest = os.getcwd() | ||||
elif not os.path.exists(dest): | ||||
|
r500 | os.mkdir(dest) | ||
created = True | ||||
try: | ||||
dest = os.path.realpath(dest) | ||||
|
r485 | |||
|
r500 | link = 0 | ||
if not source.startswith("http://"): | ||||
source = os.path.realpath(source) | ||||
d1 = os.stat(dest).st_dev | ||||
d2 = os.stat(source).st_dev | ||||
if d1 == d2: link = 1 | ||||
|
r485 | |||
|
r500 | os.chdir(dest) | ||
|
r485 | |||
|
r500 | if link: | ||
ui.debug("copying by hardlink\n") | ||||
|
r508 | util.system("cp -al %s/.hg .hg" % source) | ||
|
r500 | try: | ||
os.remove(".hg/dirstate") | ||||
except: pass | ||||
|
r485 | |||
|
r500 | repo = hg.repository(ui, ".") | ||
|
r485 | |||
|
r500 | else: | ||
repo = hg.repository(ui, ".", create=1) | ||||
other = hg.repository(ui, source) | ||||
cg = repo.getchangegroup(other) | ||||
repo.addchangegroup(cg) | ||||
|
r485 | |||
|
r500 | f = repo.opener("hgrc", "w") | ||
f.write("[paths]\n") | ||||
f.write("default = %s\n" % source) | ||||
|
r485 | |||
|
r505 | if not opts['noupdate']: | ||
|
r500 | update(ui, repo) | ||
|
r503 | |||
success = True | ||||
finally: | ||||
if not success: | ||||
del repo | ||||
|
r500 | import shutil | ||
shutil.rmtree(dest, True) | ||||
|
r503 | |||
|
r289 | def commit(ui, repo, *files, **opts): | ||
|
r245 | """commit the specified files or all outstanding changes""" | ||
|
r289 | text = opts['text'] | ||
if not text and opts['logfile']: | ||||
try: text = open(opts['logfile']).read() | ||||
except IOError: pass | ||||
|
r354 | if opts['addremove']: | ||
addremove(ui, repo, *files) | ||||
|
r317 | repo.commit(relpath(repo, files), text, opts['user'], opts['date']) | ||
|
r245 | |||
|
r363 | def copy(ui, repo, source, dest): | ||
"""mark a file as copied or renamed for the next commit""" | ||||
return repo.copy(*relpath(repo, (source, dest))) | ||||
|
r460 | def debugcheckdirstate(ui, repo): | ||
parent1, parent2 = repo.dirstate.parents() | ||||
dc = repo.dirstate.dup() | ||||
keys = dc.keys() | ||||
keys.sort() | ||||
m1n = repo.changelog.read(parent1)[0] | ||||
m2n = repo.changelog.read(parent2)[0] | ||||
m1 = repo.manifest.read(m1n) | ||||
m2 = repo.manifest.read(m2n) | ||||
errors = 0 | ||||
for f in dc: | ||||
state = repo.dirstate.state(f) | ||||
if state in "nr" and f not in m1: | ||||
print "%s in state %s, but not listed in manifest1" % (f, state) | ||||
errors += 1 | ||||
if state in "a" and f in m1: | ||||
print "%s in state %s, but also listed in manifest1" % (f, state) | ||||
errors += 1 | ||||
if state in "m" and f not in m1 and f not in m2: | ||||
print "%s in state %s, but not listed in either manifest" % (f, state) | ||||
errors += 1 | ||||
for f in m1: | ||||
state = repo.dirstate.state(f) | ||||
if state not in "nrm": | ||||
print "%s in manifest1, but listed as state %s" % (f, state) | ||||
errors += 1 | ||||
if errors: | ||||
print ".hg/dirstate inconsistent with current parent's manifest, aborting" | ||||
sys.exit(1) | ||||
def debugdumpdirstate(ui, repo): | ||||
dc = repo.dirstate.dup() | ||||
keys = dc.keys() | ||||
keys.sort() | ||||
for file in keys: | ||||
print "%s => %c" % (file, dc[file][0]) | ||||
|
r248 | def debugindex(ui, file): | ||
|
r417 | r = hg.revlog(hg.opener(""), file, "") | ||
|
r248 | 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): | ||||
|
r417 | r = hg.revlog(hg.opener(""), file, "") | ||
|
r248 | 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 "}" | ||||
|
r245 | def diff(ui, repo, *files, **opts): | ||
|
r255 | """diff working directory (or selected files)""" | ||
|
r245 | revs = [] | ||
if opts['rev']: | ||||
revs = map(lambda x: repo.lookup(x), opts['rev']) | ||||
|
r396 | |||
|
r245 | if len(revs) > 2: | ||
|
r480 | ui.warn("too many revisions to diff\n") | ||
|
r245 | sys.exit(1) | ||
if files: | ||||
files = relpath(repo, files) | ||||
else: | ||||
files = relpath(repo, [""]) | ||||
|
r396 | dodiff(ui, repo, os.getcwd(), files, *revs) | ||
|
r245 | |||
|
r246 | def export(ui, repo, changeset): | ||
|
r255 | """dump the changeset header and diffs for a revision""" | ||
|
r246 | 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) | ||||
if other != hg.nullid: | ||||
print "# Parent %s" % hg.hex(other) | ||||
print change[4].rstrip() | ||||
|
r396 | |||
dodiff(ui, repo, "", None, prev, node) | ||||
|
r246 | |||
|
r245 | def forget(ui, repo, file, *files): | ||
"""don't add the specified files on the next commit""" | ||||
repo.forget(relpath(repo, (file,) + files)) | ||||
|
r221 | def heads(ui, repo): | ||
|
r329 | """show current repository heads""" | ||
|
r221 | for n in repo.changelog.heads(): | ||
|
r329 | show_changeset(ui, repo, changenode=n) | ||
|
r221 | |||
|
r339 | def identify(ui, repo): | ||
"""print information about the working copy""" | ||||
|
r343 | parents = [p for p in repo.dirstate.parents() if p != hg.nullid] | ||
|
r340 | if not parents: | ||
|
r343 | ui.write("unknown\n") | ||
|
r340 | return | ||
|
r386 | hexfunc = ui.verbose and hg.hex or hg.short | ||
(c, a, d, u) = repo.diffdir(repo.root) | ||||
output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]), | ||||
(c or a or d) and "+" or "")] | ||||
|
r339 | if not ui.quiet: | ||
|
r386 | # multiple tags for a single parent separated by '/' | ||
parenttags = ['/'.join(tags) | ||||
for tags in map(repo.nodetags, parents) if tags] | ||||
# tags for multiple parents separated by ' + ' | ||||
output.append(' + '.join(parenttags)) | ||||
|
r339 | |||
|
r386 | ui.write("%s\n" % ' '.join(output)) | ||
|
r339 | |||
|
r437 | def import_(ui, repo, patch1, *patches, **opts): | ||
"""import an ordered set of patches""" | ||||
try: | ||||
import psyco | ||||
psyco.full() | ||||
except: | ||||
pass | ||||
patches = (patch1,) + patches | ||||
|
r500 | |||
|
r437 | d = opts["base"] | ||
strip = opts["strip"] | ||||
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 | ||||
# make sure text isn't empty | ||||
if not text: text = "imported patch %s\n" % patch | ||||
f = os.popen("patch -p%d < %s" % (strip, pf)) | ||||
files = [] | ||||
for l in f.read().splitlines(): | ||||
l.rstrip('\r\n'); | ||||
|
r481 | ui.status("%s\n" % l) | ||
|
r437 | if l[:14] == 'patching file ': | ||
|
r443 | pf = l[14:] | ||
if pf not in files: | ||||
files.append(pf) | ||||
patcherr = f.close() | ||||
if patcherr: | ||||
sys.stderr.write("patch failed") | ||||
sys.exit(1) | ||||
|
r437 | |||
if len(files) > 0: | ||||
addremove(ui, repo, *files) | ||||
repo.commit(files, text) | ||||
|
r496 | def init(ui, source=None): | ||
"""create a new repository in the current directory""" | ||||
|
r290 | |||
if source: | ||||
|
r496 | ui.warn("no longer supported: use \"hg clone\" instead\n") | ||
sys.exit(1) | ||||
repo = hg.repository(ui, ".", create=1) | ||||
|
r338 | |||
|
r509 | def log(ui, repo, f = None): | ||
"""show the revision history of the repository or a single file""" | ||||
if f: | ||||
f = relpath(repo, [f])[0] | ||||
r = repo.file(f) | ||||
for i in range(r.count() - 1, -1, -1): | ||||
show_changeset(ui, repo, filelog=r, rev=i) | ||||
else: | ||||
for i in range(repo.changelog.count() - 1, -1, -1): | ||||
show_changeset(ui, repo, rev=i) | ||||
|
r255 | |||
def manifest(ui, repo, rev = []): | ||||
"""output the latest or given revision of the project manifest""" | ||||
n = repo.manifest.tip() | ||||
if rev: | ||||
n = repo.manifest.lookup(rev) | ||||
m = repo.manifest.read(n) | ||||
|
r276 | mf = repo.manifest.readflags(n) | ||
|
r255 | files = m.keys() | ||
files.sort() | ||||
for f in files: | ||||
|
r276 | ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) | ||
|
r255 | |||
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: | ||||
|
r329 | show_changeset(ui, repo, changenode=n) | ||
|
r255 | |||
|
r404 | def pull(ui, repo, source="default", **opts): | ||
|
r246 | """pull changes from the specified source""" | ||
|
r506 | source = ui.expandpath(source) | ||
|
r404 | |||
ui.status('pulling from %s\n' % (source)) | ||||
|
r500 | |||
|
r246 | other = hg.repository(ui, source) | ||
cg = repo.getchangegroup(other) | ||||
|
r404 | r = repo.addchangegroup(cg) | ||
if cg and not r: | ||||
if opts['update']: | ||||
return update(ui, repo) | ||||
else: | ||||
ui.status("(run 'hg update' to get a working copy)\n") | ||||
return r | ||||
|
r246 | |||
|
r371 | def push(ui, repo, dest="default-push"): | ||
|
r319 | """push changes to the specified destination""" | ||
|
r506 | dest = ui.expandpath(dest) | ||
|
r500 | |||
|
r319 | if not dest.startswith("ssh://"): | ||
ui.warn("abort: can only push to ssh:// destinations currently\n") | ||||
return 1 | ||||
m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest) | ||||
if not m: | ||||
ui.warn("abort: couldn't parse destination %s\n" % dest) | ||||
return 1 | ||||
user, host, port, path = map(m.group, (2, 3, 5, 7)) | ||||
host = user and ("%s@%s" % (user, host)) or host | ||||
port = port and (" -p %s") % port or "" | ||||
path = path or "" | ||||
sport = random.randrange(30000, 60000) | ||||
cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" | ||||
cmd = cmd % (host, port, sport+1, sport, path, sport+1) | ||||
child = os.fork() | ||||
if not child: | ||||
sys.stdout = file("/dev/null", "w") | ||||
sys.stderr = sys.stdout | ||||
hgweb.server(repo.root, "pull", "", "localhost", sport) | ||||
else: | ||||
r = os.system(cmd) | ||||
os.kill(child, signal.SIGTERM) | ||||
|
r320 | return r | ||
|
r319 | |||
|
r403 | def rawcommit(ui, repo, *flist, **rc): | ||
|
r246 | "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 | ||||
|
r403 | files = relpath(repo, list(flist)) | ||
|
r246 | if rc['files']: | ||
files += open(rc['files']).read().splitlines() | ||||
|
r452 | |||
rc['parent'] = map(repo.lookup, rc['parent']) | ||||
|
r500 | |||
|
r246 | repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) | ||
|
r500 | |||
|
r245 | def recover(ui, repo): | ||
|
r255 | """roll back an interrupted transaction""" | ||
|
r245 | repo.recover() | ||
def remove(ui, repo, file, *files): | ||||
"""remove the specified files on the next commit""" | ||||
repo.remove(relpath(repo, (file,) + files)) | ||||
|
r468 | def root(ui, repo): | ||
"""print the root (top) of the current working dir""" | ||||
ui.write(repo.root + "\n") | ||||
|
r245 | def serve(ui, repo, **opts): | ||
|
r255 | """export the repository via HTTP""" | ||
|
r245 | hgweb.server(repo.root, opts["name"], opts["templates"], | ||
opts["address"], opts["port"]) | ||||
|
r500 | |||
|
r213 | def status(ui, repo): | ||
'''show changed files in the working directory | ||||
|
r245 | C = changed | ||
A = added | ||||
R = removed | ||||
? = not tracked''' | ||||
|
r312 | |||
(c, a, d, u) = repo.diffdir(os.getcwd()) | ||||
|
r220 | (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) | ||
|
r213 | |||
for f in c: print "C", f | ||||
|
r220 | for f in a: print "A", f | ||
|
r213 | for f in d: print "R", f | ||
|
r220 | for f in u: print "?", f | ||
|
r213 | |||
|
r401 | def tag(ui, repo, name, rev = None, **opts): | ||
"""add a tag for the current tip or a given revision""" | ||||
|
r500 | |||
|
r401 | if name == "tip": | ||
ui.warn("abort: 'tip' is a reserved name!\n") | ||||
return -1 | ||||
(c, a, d, u) = repo.diffdir(repo.root) | ||||
for x in (c, a, d, u): | ||||
if ".hgtags" in x: | ||||
ui.warn("abort: working copy of .hgtags is changed!\n") | ||||
ui.status("(please commit .hgtags manually)\n") | ||||
return -1 | ||||
if rev: | ||||
r = hg.hex(repo.lookup(rev)) | ||||
else: | ||||
r = hg.hex(repo.changelog.tip()) | ||||
add = 0 | ||||
if not os.path.exists(repo.wjoin(".hgtags")): add = 1 | ||||
repo.wfile(".hgtags", "a").write("%s %s\n" % (r, name)) | ||||
if add: repo.add([".hgtags"]) | ||||
if not opts['text']: | ||||
opts['text'] = "Added tag %s for changeset %s" % (name, r) | ||||
repo.commit([".hgtags"], opts['text'], opts['user'], opts['date']) | ||||
|
r248 | def tags(ui, repo): | ||
|
r255 | """list repository tags""" | ||
|
r477 | |||
|
r343 | l = repo.tagslist() | ||
l.reverse() | ||||
|
r477 | for t, n in l: | ||
|
r248 | try: | ||
|
r477 | r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n)) | ||
|
r248 | except KeyError: | ||
|
r477 | r = " ?:?" | ||
ui.write("%-30s %s\n" % (t, r)) | ||||
|
r248 | |||
|
r245 | def tip(ui, repo): | ||
|
r255 | """show the tip revision""" | ||
|
r245 | n = repo.changelog.tip() | ||
|
r329 | show_changeset(ui, repo, changenode=n) | ||
|
r245 | |||
|
r212 | def undo(ui, repo): | ||
|
r255 | """undo the last transaction""" | ||
|
r210 | repo.undo() | ||
|
r275 | def update(ui, repo, node=None, merge=False, clean=False): | ||
|
r254 | '''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() | ||||
|
r275 | return repo.update(node, allow=merge, force=clean) | ||
|
r254 | |||
|
r247 | def verify(ui, repo): | ||
"""verify the integrity of the repository""" | ||||
return repo.verify() | ||||
|
r255 | # Command options and aliases are listed here, alphabetically | ||
|
r209 | table = { | ||
|
r245 | "add": (add, [], "hg add [files]"), | ||
|
r353 | "addremove": (addremove, [], "hg addremove [files]"), | ||
|
r437 | "annotate": (annotate, | ||
|
r209 | [('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]'), | ||||
|
r437 | "cat": (cat, [], 'hg cat <file> [rev]'), | ||
|
r505 | "clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')], | ||
|
r485 | 'hg clone [options] <source> [dest]'), | ||
|
r289 | "commit|ci": (commit, | ||
[('t', 'text', "", 'commit text'), | ||||
|
r354 | ('A', 'addremove', None, 'run add/remove during commit'), | ||
|
r317 | ('l', 'logfile', "", 'commit text file'), | ||
('d', 'date', "", 'data'), | ||||
('u', 'user', "", 'user')], | ||||
|
r289 | 'hg commit [files]'), | ||
|
r363 | "copy": (copy, [], 'hg copy <source> <dest>'), | ||
|
r460 | "debugcheckdirstate": (debugcheckdirstate, [], 'debugcheckdirstate'), | ||
"debugdumpdirstate": (debugdumpdirstate, [], 'debugdumpdirstate'), | ||||
|
r248 | "debugindex": (debugindex, [], 'debugindex <file>'), | ||
"debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), | ||||
|
r245 | "diff": (diff, [('r', 'rev', [], 'revision')], | ||
'hg diff [-r A] [-r B] [files]'), | ||||
|
r246 | "export": (export, [], "hg export <changeset>"), | ||
|
r245 | "forget": (forget, [], "hg forget [files]"), | ||
"heads": (heads, [], 'hg heads'), | ||||
"help": (help, [], 'hg help [command]'), | ||||
|
r339 | "identify|id": (identify, [], 'hg identify'), | ||
|
r437 | "import|patch": (import_, | ||
[('p', 'strip', 1, 'path strip'), | ||||
('b', 'base', "", 'base path')], | ||||
"hg import [options] <patches>"), | ||||
|
r496 | "init": (init, [], 'hg init'), | ||
|
r509 | "log|history": (log, [], 'hg log [file]'), | ||
|
r437 | "manifest": (manifest, [], 'hg manifest [rev]'), | ||
|
r227 | "parents": (parents, [], 'hg parents [node]'), | ||
|
r500 | "pull": (pull, | ||
|
r404 | [('u', 'update', None, 'update working directory')], | ||
'hg pull [options] [source]'), | ||||
|
r319 | "push": (push, [], 'hg push <destination>'), | ||
|
r246 | "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]'), | ||||
|
r245 | "recover": (recover, [], "hg recover"), | ||
|
r437 | "remove|rm": (remove, [], "hg remove [files]"), | ||
|
r468 | "root": (root, [], "hg root"), | ||
|
r245 | "serve": (serve, [('p', 'port', 8000, 'listen port'), | ||
('a', 'address', '', 'interface address'), | ||||
('n', 'name', os.getcwd(), 'repository name'), | ||||
('t', 'templates', "", 'template map')], | ||||
"hg serve [options]"), | ||||
|
r213 | "status": (status, [], 'hg status'), | ||
|
r401 | "tag": (tag, [('t', 'text', "", 'commit text'), | ||
('d', 'date', "", 'date'), | ||||
('u', 'user', "", 'user')], | ||||
'hg tag [options] <name> [rev]'), | ||||
|
r248 | "tags": (tags, [], 'hg tags'), | ||
|
r245 | "tip": (tip, [], 'hg tip'), | ||
|
r210 | "undo": (undo, [], 'hg undo'), | ||
|
r437 | "update|up|checkout|co": | ||
(update, | ||||
[('m', 'merge', None, 'allow merging of conflicts'), | ||||
('C', 'clean', None, 'overwrite locally modified files')], | ||||
'hg update [options] [node]'), | ||||
|
r247 | "verify": (verify, [], 'hg verify'), | ||
|
r470 | "version": (show_version, [], 'hg version'), | ||
|
r209 | } | ||
|
r485 | norepo = "clone init version help debugindex debugindexdot" | ||
|
r209 | |||
|
r212 | def find(cmd): | ||
for e in table.keys(): | ||||
|
r335 | if re.match("(%s)$" % e, cmd): | ||
|
r212 | return table[e] | ||
raise UnknownCommand(cmd) | ||||
|
r214 | class SignalInterrupt(Exception): pass | ||
def catchterm(*args): | ||||
raise SignalInterrupt | ||||
|
r249 | def run(): | ||
sys.exit(dispatch(sys.argv[1:])) | ||||
|
r209 | def dispatch(args): | ||
options = {} | ||||
opts = [('v', 'verbose', None, 'verbose'), | ||||
('d', 'debug', None, 'debug'), | ||||
('q', 'quiet', None, 'quiet'), | ||||
|
r309 | ('p', 'profile', None, 'profile'), | ||
|
r209 | ('y', 'noninteractive', None, 'run non-interactively'), | ||
|
r423 | ('', 'version', None, 'output version information and exit'), | ||
|
r209 | ] | ||
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"]) | ||||
|
r423 | if options["version"]: | ||
|
r470 | show_version(u) | ||
|
r423 | sys.exit(0) | ||
|
r252 | try: | ||
i = find(cmd) | ||||
except UnknownCommand: | ||||
|
r268 | u.warn("hg: unknown command '%s'\n" % cmd) | ||
|
r252 | help(u) | ||
sys.exit(1) | ||||
|
r209 | |||
|
r214 | signal.signal(signal.SIGTERM, catchterm) | ||
|
r209 | cmdoptions = {} | ||
|
r293 | try: | ||
args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | ||||
except fancyopts.getopt.GetoptError, inst: | ||||
u.warn("hg %s: %s\n" % (cmd, inst)) | ||||
help(u, cmd) | ||||
sys.exit(-1) | ||||
|
r209 | |||
|
r499 | try: | ||
if cmd not in norepo.split(): | ||||
repo = hg.repository(ui = u) | ||||
d = lambda: i[0](u, repo, *args, **cmdoptions) | ||||
else: | ||||
d = lambda: i[0](u, *args, **cmdoptions) | ||||
|
r209 | |||
|
r309 | if options['profile']: | ||
import hotshot, hotshot.stats | ||||
prof = hotshot.Profile("hg.prof") | ||||
r = prof.runcall(d) | ||||
prof.close() | ||||
stats = hotshot.stats.load("hg.prof") | ||||
stats.strip_dirs() | ||||
stats.sort_stats('time', 'calls') | ||||
stats.print_stats(40) | ||||
return r | ||||
else: | ||||
return d() | ||||
|
r508 | except util.CommandError, inst: | ||
u.warn("abort: %s\n" % inst.args) | ||||
|
r499 | except hg.RepoError, inst: | ||
u.warn("abort: ", inst, "!\n") | ||||
|
r214 | except SignalInterrupt: | ||
u.warn("killed!\n") | ||||
|
r209 | except KeyboardInterrupt: | ||
u.warn("interrupted!\n") | ||||
|
r250 | except IOError, inst: | ||
|
r395 | if hasattr(inst, "code"): | ||
u.warn("abort: %s\n" % inst) | ||||
elif hasattr(inst, "reason"): | ||||
u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1])) | ||||
elif hasattr(inst, "args") and inst[0] == errno.EPIPE: | ||||
|
r250 | u.warn("broken pipe\n") | ||
else: | ||||
raise | ||||
|
r212 | except TypeError, inst: | ||
# was this an argument error? | ||||
tb = traceback.extract_tb(sys.exc_info()[2]) | ||||
if len(tb) > 2: # no | ||||
raise | ||||
|
r293 | u.debug(inst, "\n") | ||
|
r212 | u.warn("%s: invalid arguments\n" % i[0].__name__) | ||
|
r293 | help(u, cmd) | ||
|
r503 | sys.exit(-1) | ||