##// END OF EJS Templates
Split wrapped demandload line...
Split wrapped demandload line -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Split wrapped demandload line manifest hash: e562d8b7e2c66c83dfc8a09c503edb1dac0fe997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyL/sywK+sNU5EO8RApE9AJwKG7SYhyT3uDteHecQKJPMm+nuAgCglKNp MDDX+bOSNQMhCyAH83CuzRw= =MpjC -----END PGP SIGNATURE-----

File last commit:

r604:40a66d46 default
r604:40a66d46 default
Show More
commands.py
1143 lines | 36.2 KiB | text/x-python | PythonLexer
mpm@selenic.com
import and startup cleanups...
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.
mpm@selenic.com
implement demand loading hack...
r262 import os, re, sys, signal
mpm@selenic.com
[PATCH] file seperator handling for the other 'OS'...
r419 import fancyopts, ui, hg, util
mpm@selenic.com
implement demand loading hack...
r262 from demandload import *
mpm@selenic.com
Split wrapped demandload line...
r604 demandload(globals(), "mdiff time hgweb traceback random signal")
demandload(globals(), "socket errno version")
mpm@selenic.com
Beginning of new command parsing interface...
r209
class UnknownCommand(Exception): pass
mpm@selenic.com
big heap of command clean-up work...
r245 def filterfiles(filters, files):
l = [ x for x in files if x in filters ]
mpm@selenic.com
commands: migrate status and branch...
r213
mpm@selenic.com
big heap of command clean-up work...
r245 for t in filters:
mpm@selenic.com
[PATCH] file seperator handling for the other 'OS'...
r419 if t and t[-1] != "/": t += "/"
mpm@selenic.com
big heap of command clean-up work...
r245 l += [ x for x in files if x.startswith(t) ]
mpm@selenic.com
commands: migrate status and branch...
r213 return l
mpm@selenic.com
big heap of command clean-up work...
r245 def relfilter(repo, files):
mpm@selenic.com
commands: migrate status and branch...
r213 if os.getcwd() != repo.root:
p = os.getcwd()[len(repo.root) + 1: ]
mpm@selenic.com
[PATCH] file seperator handling for the other 'OS'...
r419 return filterfiles([util.pconvert(p)], files)
mpm@selenic.com
big heap of command clean-up work...
r245 return files
mpm@selenic.com
commands: migrate status and branch...
r213
mpm@selenic.com
Beginning of new command parsing interface...
r209 def relpath(repo, args):
if os.getcwd() != repo.root:
p = os.getcwd()[len(repo.root) + 1: ]
mpm@selenic.com
Fix some linewrapping...
r554 return [ util.pconvert(os.path.normpath(os.path.join(p, x)))
for x in args ]
mpm@selenic.com
Beginning of new command parsing interface...
r209 return args
mpm@selenic.com
big heap of command clean-up work...
r245
mpm@selenic.com
[PATCH] New export patch...
r580 revrangesep = ':'
def revrange(ui, repo, revs = [], revlog = None):
if revlog is None:
revlog = repo.changelog
revcount = revlog.count()
def fix(val, defval):
if not val: return defval
try:
num = int(val)
if str(num) != val: raise ValueError
if num < 0: num += revcount
if not (0 <= num < revcount):
raise ValueError
except ValueError:
try:
num = repo.changelog.rev(repo.lookup(val))
except KeyError:
try:
num = revlog.rev(revlog.lookup(val))
except KeyError:
ui.warn('abort: invalid revision identifier %s\n' % val)
sys.exit(1)
return num
for spec in revs:
if spec.find(revrangesep) >= 0:
start, end = spec.split(revrangesep, 1)
start = fix(start, 0)
end = fix(end, revcount - 1)
if end > start:
end += 1
step = 1
else:
end -= 1
step = -1
for rev in xrange(start, end, step):
yield str(rev)
else:
yield spec
def dodiff(fp, ui, repo, files = None, node1 = None, node2 = None):
mpm@selenic.com
big heap of command clean-up work...
r245 def date(c):
return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
mpm@selenic.com
Fix dodiff/changes...
r561 (c, a, d, u) = repo.changes(node1, node2, files)
mpm@selenic.com
Propagate file list through dodiff...
r537 if files:
c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
if not c and not a and not d:
return
mpm@selenic.com
big heap of command clean-up work...
r245 if node2:
change = repo.changelog.read(node2)
mmap2 = repo.manifest.read(change[0])
def read(f): return repo.file(f).read(mmap2[f])
date2 = date(change)
else:
date2 = time.asctime()
if not node1:
node1 = repo.dirstate.parents()[0]
mpm@selenic.com
[PATCH] file type fixes for the other 'OS'...
r417 def read(f): return repo.wfile(f).read()
mpm@selenic.com
big heap of command clean-up work...
r245
Thomas Arendsen Hein
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....
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]
mpm@selenic.com
big heap of command clean-up work...
r245 change = repo.changelog.read(node1)
mmap = repo.manifest.read(change[0])
date1 = date(change)
for f in c:
mpm@selenic.com
various merge improvements...
r275 to = None
if f in mmap:
to = repo.file(f).read(mmap[f])
mpm@selenic.com
big heap of command clean-up work...
r245 tn = read(f)
mpm@selenic.com
[PATCH] New export patch...
r580 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
mpm@selenic.com
big heap of command clean-up work...
r245 for f in a:
mpm@selenic.com
Attempt to make diff deal with null sources properly...
r264 to = None
mpm@selenic.com
big heap of command clean-up work...
r245 tn = read(f)
mpm@selenic.com
[PATCH] New export patch...
r580 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
mpm@selenic.com
big heap of command clean-up work...
r245 for f in d:
to = repo.file(f).read(mmap[f])
mpm@selenic.com
Attempt to make diff deal with null sources properly...
r264 tn = None
mpm@selenic.com
[PATCH] New export patch...
r580 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
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:
Thomas Arendsen Hein
Cleaned up show_changeset()...
r347 log = changelog
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
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)))
Thomas Arendsen Hein
Show tags in hg history etc....
r387 for tag in repo.nodetags(changenode):
ui.status("tag: %s\n" % tag)
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
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]))))
Thomas Arendsen Hein
Make show_changeset show added/deleted files only in debug mode....
r493 if ui.debugflag:
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 files = repo.changes(changelog.parents(changenode)[0], changenode)
Thomas Arendsen Hein
Make show_changeset show added and deleted files in verbose mode....
r490 for key, value in zip(["files:", "files+:", "files-:"], files):
if value:
ui.note("%-12s %s\n" % (key, " ".join(value)))
Thomas Arendsen Hein
Make show_changeset show added/deleted files only in debug mode....
r493 else:
ui.note("files: %s\n" % " ".join(changes[3]))
Thomas Arendsen Hein
Cleaned up show_changeset()...
r347 description = changes[4].strip()
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 if description:
mpm@selenic.com
Merge with TAH...
r330 if ui.verbose:
ui.status("description:\n")
Thomas Arendsen Hein
Cleaned up show_changeset()...
r347 ui.status(description)
Thomas Arendsen Hein
Add an empty line after description in verbose mode of show_changeset....
r546 ui.status("\n\n")
mpm@selenic.com
Merge with TAH...
r330 else:
Thomas Arendsen Hein
Cleaned up show_changeset()...
r347 ui.status("summary: %s\n" % description.splitlines()[0])
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 ui.status("\n")
mpm@selenic.com
Fix up version module name and command conflict...
r470 def show_version(ui):
Thomas Arendsen Hein
Support for 'hg --version'. setup.py stores version from hg repository....
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"
)
mpm@selenic.com
commands: better argument processing, per-command help...
r212 def help(ui, cmd=None):
mpm@selenic.com
hg help: use docstrings only...
r255 '''show help for a given command or all commands'''
mpm@selenic.com
commands: better argument processing, per-command help...
r212 if cmd:
try:
i = find(cmd)
ui.write("%s\n\n" % i[2])
mpm@selenic.com
hg help improvements...
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")
mpm@selenic.com
commands: better argument processing, per-command help...
r212 ui.write(i[0].__doc__, "\n")
except UnknownCommand:
mpm@selenic.com
unknown command fixups...
r268 ui.warn("hg: unknown command %s\n" % cmd)
mpm@selenic.com
commands: better argument processing, per-command help...
r212 sys.exit(0)
mpm@selenic.com
hg help: use docstrings only...
r255 else:
mpm@selenic.com
Shorten help...
r593 if ui.verbose:
mpm@selenic.com
Fix up version module name and command conflict...
r470 show_version(ui)
Thomas Arendsen Hein
Support for 'hg --version'. setup.py stores version from hg repository....
r423 ui.write('\n')
mpm@selenic.com
Shorten help...
r593 if ui.verbose:
ui.write('hg commands:\n\n')
else:
mpm@selenic.com
A bunch of parsing/help updates...
r596 ui.write('basic hg commands (use "hg help -v" for more):\n\n')
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
hg help: use docstrings only...
r255 h = {}
Thomas Arendsen Hein
Cleaned up command alias handling in help....
r479 for c, e in table.items():
f = c.split("|")[0]
mpm@selenic.com
Shorten help...
r593 if not ui.verbose and not f.startswith("^"):
Thomas Arendsen Hein
Cleaned up command alias handling in help....
r479 continue
mpm@selenic.com
Shorten help...
r593 if not ui.debugflag and f.startswith("debug"):
continue
f = f.lstrip("^")
mpm@selenic.com
hg help: use docstrings only...
r255 d = ""
mpm@selenic.com
Fix up version module name and command conflict...
r470 if e[0].__doc__:
d = e[0].__doc__.splitlines(0)[0].rstrip()
h[f] = d
mpm@selenic.com
hg help: use docstrings only...
r255
fns = h.keys()
fns.sort()
m = max(map(len, fns))
for f in fns:
Thomas Arendsen Hein
Support for 'hg --version'. setup.py stores version from hg repository....
r423 ui.write(' %-*s %s\n' % (m, f, h[f]))
mpm@selenic.com
hg help: use docstrings only...
r255
# Commands start here, listed alphabetically
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
big heap of command clean-up work...
r245 def add(ui, repo, file, *files):
'''add the specified files on the next commit'''
repo.add(relpath(repo, (file,) + files))
mpm@selenic.com
commands: migrate status and branch...
r213
mpm@selenic.com
hg addremove: take optional files list...
r353 def addremove(ui, repo, *files):
mpm@selenic.com
hg help: use docstrings only...
r255 """add all new files, delete all missing files"""
mpm@selenic.com
hg addremove: take optional files list...
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:
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 (c, a, d, u) = repo.changes(None, None)
mpm@selenic.com
fix addremove...
r259 repo.add(u)
mpm@selenic.com
big heap of command clean-up work...
r245 repo.remove(d)
mpm@selenic.com
hg checkout: refuse to checkout if there are outstanding changes...
r219
mpm@selenic.com
big heap of command clean-up work...
r245 def annotate(u, repo, file, *files, **ops):
mpm@selenic.com
hg help: use docstrings only...
r255 """show changeset information per file line"""
mpm@selenic.com
Beginning of new command parsing interface...
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]
mpm@selenic.com
[PATCH] Handle 'name firstname <email@server>' correctly in annotate...
r534 f = name.find('<')
if f >= 0:
name = name[f+1:]
mpm@selenic.com
Beginning of new command parsing interface...
r209 bcache[rev] = name
return name
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
Beginning of new command parsing interface...
r209 bcache = {}
opmap = [['user', getname], ['number', str], ['changeset', getnode]]
if not ops['user'] and not ops['changeset']:
ops['number'] = 1
mpm@selenic.com
move repo.current to dirstate.parents()...
r227 node = repo.dirstate.parents()[0]
mpm@selenic.com
Beginning of new command parsing interface...
r209 if ops['revision']:
node = repo.changelog.lookup(ops['revision'])
change = repo.changelog.read(node)
mmap = repo.manifest.read(change[0])
mpm@selenic.com
big heap of command clean-up work...
r245 for f in relpath(repo, (file,) + files):
mpm@selenic.com
Beginning of new command parsing interface...
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])
mpm@selenic.com
migrate remaining commands...
r248 def cat(ui, repo, file, rev = []):
mpm@selenic.com
hg help: use docstrings only...
r255 """output the latest or given revision of a file"""
mpm@selenic.com
hg cat: relative file support...
r281 r = repo.file(relpath(repo, [file])[0])
mpm@selenic.com
migrate remaining commands...
r248 n = r.tip()
if rev: n = r.lookup(rev)
sys.stdout.write(r.read(n))
mpm@selenic.com
[PATCH] add clone command...
r485 def clone(ui, source, dest = None, **opts):
"""make a copy of an existing repository"""
mpm@selenic.com
[PATCH] Add ui.expandpath command...
r506 source = ui.expandpath(source)
mpm@selenic.com
[PATCH] add clone command...
r485
if dest is None:
mpm@selenic.com
Fix clone bug wth trailing slash...
r528 dest = os.path.basename(os.path.normpath(source))
mpm@selenic.com
clone: abort on pre-existing destination directory...
r532
if os.path.exists(dest):
ui.warn("abort: destination '%s' already exists\n" % dest)
return 1
mpm@selenic.com
[PATCH] Force "hg clone" to always create a new directory...
r523
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 class dircleanup:
def __init__(self, dir):
self.dir = dir
os.mkdir(dir)
def close(self):
self.dir = None
def __del__(self):
if self.dir:
import shutil
shutil.rmtree(self.dir, True)
mpm@selenic.com
[PATCH] add clone command...
r485
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 d = dircleanup(dest)
mpm@selenic.com
[PATCH] add clone command...
r485
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 link = 0
mpm@selenic.com
hg clone: only use the absolute path for .hg/hgrc...
r562 abspath = source
Thomas Arendsen Hein
Merge with upstream...
r542 if not (source.startswith("http://") or
source.startswith("hg://") or
source.startswith("old-http://")):
mpm@selenic.com
hg clone: only use the absolute path for .hg/hgrc...
r562 abspath = os.path.abspath(source)
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 d1 = os.stat(dest).st_dev
d2 = os.stat(source).st_dev
if d1 == d2: link = 1
mpm@selenic.com
[PATCH] add clone command...
r485
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 if link:
ui.note("copying by hardlink\n")
util.system("cp -al '%s'/.hg '%s'/.hg" % (source, dest))
try:
os.remove(os.path.join(dest, ".hg", "dirstate"))
except: pass
repo = hg.repository(ui, dest)
mpm@selenic.com
[PATCH] add clone command...
r485
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 else:
repo = hg.repository(ui, dest, create=1)
other = hg.repository(ui, source)
fetch = repo.findincoming(other)
if fetch:
cg = other.changegroup(fetch)
repo.addchangegroup(cg)
mpm@selenic.com
Fix troubles with clone and exception handling...
r503
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 f = repo.opener("hgrc", "w")
f.write("[paths]\n")
mpm@selenic.com
hg clone: only use the absolute path for .hg/hgrc...
r562 f.write("default = %s\n" % abspath)
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Deal with failed clone/transaction interaction...
r535 if not opts['noupdate']:
update(ui, repo)
d.close()
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
hg commit: add -t and -l options...
r289 def commit(ui, repo, *files, **opts):
mpm@selenic.com
big heap of command clean-up work...
r245 """commit the specified files or all outstanding changes"""
mpm@selenic.com
hg commit: add -t and -l options...
r289 text = opts['text']
if not text and opts['logfile']:
try: text = open(opts['logfile']).read()
except IOError: pass
mpm@selenic.com
hg commit: add -A flag...
r354 if opts['addremove']:
addremove(ui, repo, *files)
mpm@selenic.com
hg commit: user and date options...
r317 repo.commit(relpath(repo, files), text, opts['user'], opts['date'])
mpm@selenic.com
big heap of command clean-up work...
r245
mpm@selenic.com
Add hg copy...
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)))
mpm@selenic.com
A bunch of parsing/help updates...
r596 def debugcheckstate(ui, repo):
"""validate the correctness of the current dirstate"""
mpm@selenic.com
add dirstate debugging commands...
r460 parent1, parent2 = repo.dirstate.parents()
mpm@selenic.com
Unbreak dirstate debug commands...
r555 repo.dirstate.read()
dc = repo.dirstate.map
mpm@selenic.com
add dirstate debugging commands...
r460 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:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn("%s in state %s, but not in manifest1\n" % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if state in "a" and f in m1:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn("%s in state %s, but also in manifest1\n" % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if state in "m" and f not in m1 and f not in m2:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn("%s in state %s, but not in either manifest\n" %
(f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
for f in m1:
state = repo.dirstate.state(f)
if state not in "nrm":
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn("%s in manifest1, but listed as state %s" % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if errors:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn(".hg/dirstate inconsistent with current parent's manifest\n")
mpm@selenic.com
add dirstate debugging commands...
r460 sys.exit(1)
mpm@selenic.com
A bunch of parsing/help updates...
r596 def debugstate(ui, repo):
"""show the contents of the current dirstate"""
mpm@selenic.com
Unbreak dirstate debug commands...
r555 repo.dirstate.read()
dc = repo.dirstate.map
mpm@selenic.com
add dirstate debugging commands...
r460 keys = dc.keys()
keys.sort()
for file in keys:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("%c %s\n" % (dc[file][0], file))
mpm@selenic.com
add dirstate debugging commands...
r460
mpm@selenic.com
migrate remaining commands...
r248 def debugindex(ui, file):
mpm@selenic.com
A bunch of parsing/help updates...
r596 """dump the contents of an index file"""
mpm@selenic.com
[PATCH] file type fixes for the other 'OS'...
r417 r = hg.revlog(hg.opener(""), file, "")
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write(" rev offset length base linkrev" +
" p1 p2 nodeid\n")
mpm@selenic.com
migrate remaining commands...
r248 for i in range(r.count()):
e = r.index[i]
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
i, e[0], e[1], e[2], e[3],
hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
mpm@selenic.com
migrate remaining commands...
r248
def debugindexdot(ui, file):
mpm@selenic.com
A bunch of parsing/help updates...
r596 """dump an index DAG as a .dot file"""
mpm@selenic.com
[PATCH] file type fixes for the other 'OS'...
r417 r = hg.revlog(hg.opener(""), file, "")
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("digraph G {\n")
mpm@selenic.com
migrate remaining commands...
r248 for i in range(r.count()):
e = r.index[i]
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
mpm@selenic.com
migrate remaining commands...
r248 if e[5] != hg.nullid:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
ui.write("}\n")
mpm@selenic.com
migrate remaining commands...
r248
mpm@selenic.com
big heap of command clean-up work...
r245 def diff(ui, repo, *files, **opts):
mpm@selenic.com
hg help: use docstrings only...
r255 """diff working directory (or selected files)"""
mpm@selenic.com
big heap of command clean-up work...
r245 revs = []
if opts['rev']:
revs = map(lambda x: repo.lookup(x), opts['rev'])
Thomas Arendsen Hein
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....
r396
mpm@selenic.com
big heap of command clean-up work...
r245 if len(revs) > 2:
Thomas Arendsen Hein
Fixed call to ui.warn()...
r480 ui.warn("too many revisions to diff\n")
mpm@selenic.com
big heap of command clean-up work...
r245 sys.exit(1)
if files:
files = relpath(repo, files)
else:
files = relpath(repo, [""])
mpm@selenic.com
[PATCH] New export patch...
r580 dodiff(sys.stdout, ui, repo, files, *revs)
mpm@selenic.com
big heap of command clean-up work...
r245
mpm@selenic.com
[PATCH] New export patch...
r580 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 node = repo.lookup(changeset)
prev, other = repo.changelog.parents(node)
change = repo.changelog.read(node)
mpm@selenic.com
[PATCH] New export patch...
r580
def expand(name):
expansions = {
'%': lambda: '%',
'H': lambda: hg.hex(node),
'N': lambda: str(total),
'R': lambda: str(repo.changelog.rev(node)),
'b': lambda: os.path.basename(repo.root),
'h': lambda: hg.short(node),
'n': lambda: str(seqno).zfill(len(str(total))),
'r': lambda: str(repo.changelog.rev(node)).zfill(revwidth),
}
newname = []
namelen = len(name)
i = 0
while i < namelen:
c = name[i]
if c == '%':
i += 1
c = name[i]
c = expansions[c]()
newname.append(c)
i += 1
return ''.join(newname)
if opts['output'] and opts['output'] != '-':
try:
fp = open(expand(opts['output']), 'w')
except KeyError, inst:
ui.warn("error: invalid format spec '%%%s' in output file name\n" %
inst.args[0])
sys.exit(1)
else:
fp = sys.stdout
mpm@selenic.com
Remove all remaining print statements...
r582 fp.write("# HG changeset patch\n")
fp.write("# User %s\n" % change[1])
fp.write("# Node ID %s\n" % hg.hex(node))
fp.write("# Parent %s\n" % hg.hex(prev))
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 if other != hg.nullid:
mpm@selenic.com
Remove all remaining print statements...
r582 fp.write("# Parent %s\n" % hg.hex(other))
fp.write(change[4].rstrip())
fp.write("\n\n")
mpm@selenic.com
[PATCH] New export patch...
r580
dodiff(fp, ui, repo, None, prev, node)
Thomas Arendsen Hein
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....
r396
mpm@selenic.com
[PATCH] New export patch...
r580 def export(ui, repo, *changesets, **opts):
"""dump the header and diffs for one or more changesets"""
seqno = 0
revs = list(revrange(ui, repo, changesets))
total = len(revs)
revwidth = max(len(revs[0]), len(revs[-1]))
for cset in revs:
seqno += 1
doexport(ui, repo, cset, seqno, total, revwidth, opts)
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246
mpm@selenic.com
big heap of command clean-up work...
r245 def forget(ui, repo, file, *files):
"""don't add the specified files on the next commit"""
repo.forget(relpath(repo, (file,) + files))
mpm@selenic.com
Beginning of multi-head support...
r221 def heads(ui, repo):
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 """show current repository heads"""
mpm@selenic.com
Beginning of multi-head support...
r221 for n in repo.changelog.heads():
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 show_changeset(ui, repo, changenode=n)
mpm@selenic.com
Beginning of multi-head support...
r221
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339 def identify(ui, repo):
"""print information about the working copy"""
mpm@selenic.com
rework all code using tags...
r343 parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
Thomas Arendsen Hein
Handle the case where the current working copy is not based on a checkout....
r340 if not parents:
mpm@selenic.com
rework all code using tags...
r343 ui.write("unknown\n")
Thomas Arendsen Hein
Handle the case where the current working copy is not based on a checkout....
r340 return
Thomas Arendsen Hein
Improvements for hg identify:...
r386 hexfunc = ui.verbose and hg.hex or hg.short
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 (c, a, d, u) = repo.changes(None, None)
Thomas Arendsen Hein
Improvements for hg identify:...
r386 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
(c or a or d) and "+" or "")]
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339 if not ui.quiet:
Thomas Arendsen Hein
Improvements for hg identify:...
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))
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339
Thomas Arendsen Hein
Improvements for hg identify:...
r386 ui.write("%s\n" % ' '.join(output))
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339
mpm@selenic.com
Commands cleanup...
r437 def import_(ui, repo, patch1, *patches, **opts):
"""import an ordered set of patches"""
try:
import psyco
psyco.full()
except:
pass
patches = (patch1,) + patches
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
Commands cleanup...
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');
Thomas Arendsen Hein
hg import checking for quiet mode didn't work. Fixed using the ui module....
r481 ui.status("%s\n" % l)
mpm@selenic.com
Commands cleanup...
r437 if l[:14] == 'patching file ':
mpm@selenic.com
hg import error checking...
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)
mpm@selenic.com
Commands cleanup...
r437
if len(files) > 0:
addremove(ui, repo, *files)
repo.commit(files, text)
mpm@selenic.com
[PATCH] simplify init...
r496 def init(ui, source=None):
"""create a new repository in the current directory"""
mpm@selenic.com
replace hg branch with hg init [source]...
r290
if source:
mpm@selenic.com
[PATCH] simplify init...
r496 ui.warn("no longer supported: use \"hg clone\" instead\n")
sys.exit(1)
repo = hg.repository(ui, ".", create=1)
mpm@selenic.com
default path support with .hg/hgrc...
r338
Thomas Arendsen Hein
Allow specifying revisions in 'hg log' like with 'hg diff'....
r552 def log(ui, repo, f=None, **opts):
mpm@selenic.com
[PATCH] replace history with log...
r509 """show the revision history of the repository or a single file"""
if f:
Thomas Arendsen Hein
Allow specifying revisions in 'hg log' like with 'hg diff'....
r552 filelog = repo.file(relpath(repo, [f])[0])
log = filelog
lookup = filelog.lookup
mpm@selenic.com
[PATCH] replace history with log...
r509 else:
Thomas Arendsen Hein
Allow specifying revisions in 'hg log' like with 'hg diff'....
r552 filelog = None
log = repo.changelog
lookup = repo.lookup
revlist = []
revs = [log.rev(lookup(rev)) for rev in opts['rev']]
while revs:
if len(revs) == 1:
revlist.append(revs.pop(0))
else:
a = revs.pop(0)
b = revs.pop(0)
off = a > b and -1 or 1
revlist.extend(range(a, b + off, off))
for i in revlist or range(log.count() - 1, -1, -1):
show_changeset(ui, repo, filelog=filelog, rev=i)
mpm@selenic.com
hg help: use docstrings only...
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)
mpm@selenic.com
add tracking of execute permissions...
r276 mf = repo.manifest.readflags(n)
mpm@selenic.com
hg help: use docstrings only...
r255 files = m.keys()
files.sort()
for f in files:
mpm@selenic.com
add tracking of execute permissions...
r276 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
mpm@selenic.com
hg help: use docstrings only...
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:
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 show_changeset(ui, repo, changenode=n)
mpm@selenic.com
hg help: use docstrings only...
r255
mpm@selenic.com
[PATCH] Unintuive use...
r404 def pull(ui, repo, source="default", **opts):
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 """pull changes from the specified source"""
mpm@selenic.com
[PATCH] Add ui.expandpath command...
r506 source = ui.expandpath(source)
mpm@selenic.com
[PATCH] Unintuive use...
r404
ui.status('pulling from %s\n' % (source))
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 other = hg.repository(ui, source)
mpm@selenic.com
Change getchangegroup to findincoming...
r516 fetch = repo.findincoming(other)
mpm@selenic.com
Fix empty pull bug that appeared this morning...
r522 if not fetch:
ui.status("no changes found\n")
return
mpm@selenic.com
Change getchangegroup to findincoming...
r516 cg = other.changegroup(fetch)
mpm@selenic.com
[PATCH] Unintuive use...
r404 r = repo.addchangegroup(cg)
if cg and not r:
if opts['update']:
return update(ui, repo)
mpm@selenic.com
[PATCH] New export patch...
r580 else:
mpm@selenic.com
[PATCH] Unintuive use...
r404 ui.status("(run 'hg update' to get a working copy)\n")
return r
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246
mpm@selenic.com
hg push: "default-push" default target path...
r371 def push(ui, repo, dest="default-push"):
mpm@selenic.com
stopgap hg push support...
r319 """push changes to the specified destination"""
mpm@selenic.com
[PATCH] Add ui.expandpath command...
r506 dest = ui.expandpath(dest)
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
stopgap hg push support...
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))
mpm@selenic.com
show connect message on push...
r526 uhost = user and ("%s@%s" % (user, host)) or host
mpm@selenic.com
stopgap hg push support...
r319 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/'"
mpm@selenic.com
show connect message on push...
r526 cmd = cmd % (uhost, port, sport+1, sport, path, sport+1)
mpm@selenic.com
stopgap hg push support...
r319
child = os.fork()
if not child:
sys.stdout = file("/dev/null", "w")
sys.stderr = sys.stdout
hgweb.server(repo.root, "pull", "", "localhost", sport)
else:
mpm@selenic.com
show connect message on push...
r526 ui.status("connecting to %s\n" % host)
mpm@selenic.com
stopgap hg push support...
r319 r = os.system(cmd)
os.kill(child, signal.SIGTERM)
mpm@selenic.com
hg push: propagate return code...
r320 return r
mpm@selenic.com
stopgap hg push support...
r319
mpm@selenic.com
[PATCH] rawcommit fix again...
r403 def rawcommit(ui, repo, *flist, **rc):
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
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']:
mpm@selenic.com
Remove all remaining print statements...
r582 ui.warn("abort: missing commit text\n")
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 return 1
mpm@selenic.com
[PATCH] rawcommit fix again...
r403 files = relpath(repo, list(flist))
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 if rc['files']:
files += open(rc['files']).read().splitlines()
mpm@selenic.com
rawcommit: do lookup of parents at the appropriate layer...
r452
rc['parent'] = map(repo.lookup, rc['parent'])
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
big heap of command clean-up work...
r245 def recover(ui, repo):
mpm@selenic.com
hg help: use docstrings only...
r255 """roll back an interrupted transaction"""
mpm@selenic.com
big heap of command clean-up work...
r245 repo.recover()
def remove(ui, repo, file, *files):
"""remove the specified files on the next commit"""
repo.remove(relpath(repo, (file,) + files))
mpm@selenic.com
[PATCH] hg revert...
r588 def revert(ui, repo, *names, **opts):
"""revert modified files or dirs back to their unmodified states"""
mpm@selenic.com
hg revert should revert to parent, not to tip...
r590 node = opts['rev'] and repo.lookup(opts['rev']) or \
repo.dirstate.parents()[0]
mpm@selenic.com
[PATCH] hg revert...
r588 root = os.path.realpath(repo.root)
mpm@selenic.com
hg revert should revert to parent, not to tip...
r590
mpm@selenic.com
[PATCH] hg revert...
r588 def trimpath(p):
p = os.path.realpath(p)
if p.startswith(root):
rest = p[len(root):]
if not rest:
return rest
if p.startswith(os.sep):
return rest[1:]
return p
mpm@selenic.com
hg revert should revert to parent, not to tip...
r590
mpm@selenic.com
[PATCH] hg revert...
r588 relnames = map(trimpath, names or [os.getcwd()])
chosen = {}
mpm@selenic.com
hg revert should revert to parent, not to tip...
r590
mpm@selenic.com
[PATCH] hg revert...
r588 def choose(name):
def body(name):
for r in relnames:
if not name.startswith(r): continue
rest = name[len(r):]
if not rest: return r, True
depth = rest.count(os.sep)
if not r:
if depth == 0 or not opts['nonrecursive']: return r, True
elif rest[0] == os.sep:
if depth == 1 or not opts['nonrecursive']: return r, True
return None, False
relname, ret = body(name)
if ret:
chosen[relname] = 1
return ret
r = repo.update(node, False, True, choose, False)
for n in relnames:
if n not in chosen:
ui.warn('error: no matches for %s\n' % n)
r = 1
sys.stdout.flush()
return r
mpm@selenic.com
[PATCH] add "root" command...
r468 def root(ui, repo):
"""print the root (top) of the current working dir"""
ui.write(repo.root + "\n")
mpm@selenic.com
big heap of command clean-up work...
r245 def serve(ui, repo, **opts):
mpm@selenic.com
hg help: use docstrings only...
r255 """export the repository via HTTP"""
mpm@selenic.com
[PATCH] Get "hg serve" to print the URL being served...
r603 httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
opts["address"], opts["port"])
if ui.verbose:
addr, port = httpd.socket.getsockname()
if addr == '0.0.0.0':
addr = socket.gethostname()
else:
try:
addr = socket.gethostbyaddr(addr)[0]
except: pass
if port != 80:
ui.status('listening on http://%s:%d/\n' % (addr, port))
else:
ui.status('listening on http://%s/\n' % addr)
httpd.serve_forever()
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
commands: migrate status and branch...
r213 def status(ui, repo):
'''show changed files in the working directory
mpm@selenic.com
big heap of command clean-up work...
r245 C = changed
A = added
R = removed
? = not tracked'''
mpm@selenic.com
Optimize diff and status in subdirectories...
r312
mpm@selenic.com
Propagate file list through dodiff...
r537 (c, a, d, u) = repo.changes(None, None)
mpm@selenic.com
change dircache into dirstate...
r220 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
mpm@selenic.com
commands: migrate status and branch...
r213
mpm@selenic.com
Remove all remaining print statements...
r582 for f in c: ui.write("C ", f, "\n")
for f in a: ui.write("A ", f, "\n")
for f in d: ui.write("R ", f, "\n")
for f in u: ui.write("? ", f, "\n")
mpm@selenic.com
commands: migrate status and branch...
r213
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 def tag(ui, repo, name, rev = None, **opts):
"""add a tag for the current tip or a given revision"""
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 if name == "tip":
mpm@selenic.com
[PATCH] New export patch...
r580 ui.warn("abort: 'tip' is a reserved name!\n")
return -1
if name.find(revrangesep) >= 0:
ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
return -1
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 (c, a, d, u) = repo.changes(None, None)
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 for x in (c, a, d, u):
mpm@selenic.com
[PATCH] New export patch...
r580 if ".hgtags" in x:
ui.warn("abort: working copy of .hgtags is changed!\n")
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 ui.status("(please commit .hgtags manually)\n")
mpm@selenic.com
[PATCH] New export patch...
r580 return -1
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401
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'])
mpm@selenic.com
migrate remaining commands...
r248 def tags(ui, repo):
mpm@selenic.com
hg help: use docstrings only...
r255 """list repository tags"""
Thomas Arendsen Hein
Handle errors in .hgtags or hgrc [tags] section more gracefully....
r477
mpm@selenic.com
rework all code using tags...
r343 l = repo.tagslist()
l.reverse()
Thomas Arendsen Hein
Handle errors in .hgtags or hgrc [tags] section more gracefully....
r477 for t, n in l:
mpm@selenic.com
migrate remaining commands...
r248 try:
Thomas Arendsen Hein
Handle errors in .hgtags or hgrc [tags] section more gracefully....
r477 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
mpm@selenic.com
migrate remaining commands...
r248 except KeyError:
Thomas Arendsen Hein
Handle errors in .hgtags or hgrc [tags] section more gracefully....
r477 r = " ?:?"
ui.write("%-30s %s\n" % (t, r))
mpm@selenic.com
migrate remaining commands...
r248
mpm@selenic.com
big heap of command clean-up work...
r245 def tip(ui, repo):
mpm@selenic.com
hg help: use docstrings only...
r255 """show the tip revision"""
mpm@selenic.com
big heap of command clean-up work...
r245 n = repo.changelog.tip()
Thomas Arendsen Hein
Use common output function show_changeset() for hg heads|history|log|tip....
r329 show_changeset(ui, repo, changenode=n)
mpm@selenic.com
big heap of command clean-up work...
r245
mpm@selenic.com
commands: better argument processing, per-command help...
r212 def undo(ui, repo):
mpm@selenic.com
A bunch of parsing/help updates...
r596 """undo the last commit or pull
Roll back the last pull or commit transaction on the
repository, restoring the project to its earlier state.
This command should be used with care. There is only one level of
undo and there is no redo.
This command is not intended for use on public repositories. Once
a change is visible for pull by other users, undoing it locally is
ineffective.
"""
mpm@selenic.com
hg undo: fixup working dir state...
r210 repo.undo()
mpm@selenic.com
various merge improvements...
r275 def update(ui, repo, node=None, merge=False, clean=False):
mpm@selenic.com
unify checkout and resolve into update...
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()
mpm@selenic.com
various merge improvements...
r275 return repo.update(node, allow=merge, force=clean)
mpm@selenic.com
unify checkout and resolve into update...
r254
mpm@selenic.com
migrate verify...
r247 def verify(ui, repo):
"""verify the integrity of the repository"""
return repo.verify()
mpm@selenic.com
hg help: use docstrings only...
r255 # Command options and aliases are listed here, alphabetically
mpm@selenic.com
Beginning of new command parsing interface...
r209 table = {
mpm@selenic.com
Shorten help...
r593 "^add": (add, [], "hg add [files]"),
mpm@selenic.com
hg addremove: take optional files list...
r353 "addremove": (addremove, [], "hg addremove [files]"),
mpm@selenic.com
A bunch of parsing/help updates...
r596 "^annotate": (annotate,
mpm@selenic.com
Beginning of new command parsing interface...
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]'),
mpm@selenic.com
Commands cleanup...
r437 "cat": (cat, [], 'hg cat <file> [rev]'),
mpm@selenic.com
Shorten help...
r593 "^clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')],
mpm@selenic.com
[PATCH] add clone command...
r485 'hg clone [options] <source> [dest]'),
mpm@selenic.com
Shorten help...
r593 "^commit|ci": (commit,
mpm@selenic.com
hg commit: add -t and -l options...
r289 [('t', 'text', "", 'commit text'),
mpm@selenic.com
hg commit: add -A flag...
r354 ('A', 'addremove', None, 'run add/remove during commit'),
mpm@selenic.com
hg commit: user and date options...
r317 ('l', 'logfile', "", 'commit text file'),
mpm@selenic.com
options: kill -d for debug...
r591 ('d', 'date', "", 'date code'),
mpm@selenic.com
hg commit: user and date options...
r317 ('u', 'user', "", 'user')],
mpm@selenic.com
hg commit: add -t and -l options...
r289 'hg commit [files]'),
mpm@selenic.com
Add hg copy...
r363 "copy": (copy, [], 'hg copy <source> <dest>'),
mpm@selenic.com
A bunch of parsing/help updates...
r596 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
"debugstate": (debugstate, [], 'debugstate'),
mpm@selenic.com
migrate remaining commands...
r248 "debugindex": (debugindex, [], 'debugindex <file>'),
"debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
mpm@selenic.com
Shorten help...
r593 "^diff": (diff, [('r', 'rev', [], 'revision')],
mpm@selenic.com
big heap of command clean-up work...
r245 'hg diff [-r A] [-r B] [files]'),
mpm@selenic.com
A bunch of parsing/help updates...
r596 "^export": (export, [('o', 'output', "", 'output to file')],
mpm@selenic.com
[PATCH] New export patch...
r580 "hg export [-o file] <changeset> ..."),
mpm@selenic.com
big heap of command clean-up work...
r245 "forget": (forget, [], "hg forget [files]"),
"heads": (heads, [], 'hg heads'),
"help": (help, [], 'hg help [command]'),
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339 "identify|id": (identify, [], 'hg identify'),
mpm@selenic.com
Commands cleanup...
r437 "import|patch": (import_,
[('p', 'strip', 1, 'path strip'),
('b', 'base', "", 'base path')],
"hg import [options] <patches>"),
mpm@selenic.com
Shorten help...
r593 "^init": (init, [], 'hg init'),
"^log|history": (log,
Thomas Arendsen Hein
Allow specifying revisions in 'hg log' like with 'hg diff'....
r552 [('r', 'rev', [], 'revision')],
'hg log [-r A] [-r B] [file]'),
mpm@selenic.com
Commands cleanup...
r437 "manifest": (manifest, [], 'hg manifest [rev]'),
mpm@selenic.com
move repo.current to dirstate.parents()...
r227 "parents": (parents, [], 'hg parents [node]'),
mpm@selenic.com
Shorten help...
r593 "^pull": (pull,
mpm@selenic.com
[PATCH] Unintuive use...
r404 [('u', 'update', None, 'update working directory')],
mpm@selenic.com
[PATCH] New export patch...
r580 'hg pull [options] [source]'),
mpm@selenic.com
Shorten help...
r593 "^push": (push, [], 'hg push <destination>'),
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 "rawcommit": (rawcommit,
[('p', 'parent', [], 'parent'),
mpm@selenic.com
options: kill -d for debug...
r591 ('d', 'date', "", 'date code'),
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246 ('u', 'user', "", 'user'),
('F', 'files', "", 'file list'),
('t', 'text', "", 'commit text'),
('l', 'logfile', "", 'commit text file')],
'hg rawcommit [options] [files]'),
mpm@selenic.com
big heap of command clean-up work...
r245 "recover": (recover, [], "hg recover"),
mpm@selenic.com
Shorten help...
r593 "^remove|rm": (remove, [], "hg remove [files]"),
mpm@selenic.com
A bunch of parsing/help updates...
r596 "^revert": (revert,
mpm@selenic.com
[PATCH] hg revert...
r588 [("n", "nonrecursive", None, "don't recurse into subdirs"),
("r", "rev", "", "revision")],
"hg revert [files|dirs]"),
mpm@selenic.com
[PATCH] add "root" command...
r468 "root": (root, [], "hg root"),
mpm@selenic.com
Shorten help...
r593 "^serve": (serve, [('p', 'port', 8000, 'listen port'),
mpm@selenic.com
big heap of command clean-up work...
r245 ('a', 'address', '', 'interface address'),
('n', 'name', os.getcwd(), 'repository name'),
('t', 'templates', "", 'template map')],
"hg serve [options]"),
mpm@selenic.com
Shorten help...
r593 "^status": (status, [], 'hg status'),
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 "tag": (tag, [('t', 'text', "", 'commit text'),
mpm@selenic.com
options: kill -d for debug...
r591 ('d', 'date', "", 'date code'),
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 ('u', 'user', "", 'user')],
'hg tag [options] <name> [rev]'),
mpm@selenic.com
migrate remaining commands...
r248 "tags": (tags, [], 'hg tags'),
mpm@selenic.com
big heap of command clean-up work...
r245 "tip": (tip, [], 'hg tip'),
mpm@selenic.com
hg undo: fixup working dir state...
r210 "undo": (undo, [], 'hg undo'),
mpm@selenic.com
Shorten help...
r593 "^update|up|checkout|co":
mpm@selenic.com
Commands cleanup...
r437 (update,
[('m', 'merge', None, 'allow merging of conflicts'),
('C', 'clean', None, 'overwrite locally modified files')],
'hg update [options] [node]'),
mpm@selenic.com
migrate verify...
r247 "verify": (verify, [], 'hg verify'),
mpm@selenic.com
Fix up version module name and command conflict...
r470 "version": (show_version, [], 'hg version'),
mpm@selenic.com
Beginning of new command parsing interface...
r209 }
mpm@selenic.com
A bunch of parsing/help updates...
r596 globalopts = [('v', 'verbose', None, 'verbose'),
('', 'debug', None, 'debug'),
('q', 'quiet', None, 'quiet'),
('', 'profile', None, 'profile'),
('R', 'repository', "", 'repository root directory'),
('', 'traceback', None, 'print traceback on exception'),
('y', 'noninteractive', None, 'run non-interactively'),
('', 'version', None, 'output version information and exit'),
]
mpm@selenic.com
[PATCH] add clone command...
r485 norepo = "clone init version help debugindex debugindexdot"
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
commands: better argument processing, per-command help...
r212 def find(cmd):
for e in table.keys():
mpm@selenic.com
Fix misrecognition of commands...
r335 if re.match("(%s)$" % e, cmd):
mpm@selenic.com
commands: better argument processing, per-command help...
r212 return table[e]
raise UnknownCommand(cmd)
mpm@selenic.com
catch TERM signal in command processor...
r214 class SignalInterrupt(Exception): pass
def catchterm(*args):
raise SignalInterrupt
mpm@selenic.com
import and startup cleanups...
r249 def run():
sys.exit(dispatch(sys.argv[1:]))
mpm@selenic.com
A bunch of parsing/help updates...
r596 class ParseError(Exception): pass
mpm@selenic.com
Restructure option handling...
r592
mpm@selenic.com
A bunch of parsing/help updates...
r596 def parse(args):
mpm@selenic.com
Beginning of new command parsing interface...
r209 options = {}
mpm@selenic.com
A bunch of parsing/help updates...
r596 cmdoptions = {}
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
Restructure option handling...
r592 try:
mpm@selenic.com
A bunch of parsing/help updates...
r596 args = fancyopts.fancyopts(args, globalopts, options)
mpm@selenic.com
Restructure option handling...
r592 except fancyopts.getopt.GetoptError, inst:
mpm@selenic.com
A bunch of parsing/help updates...
r596 raise ParseError(cmd, inst)
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
A bunch of parsing/help updates...
r596 if options["version"]:
return ("version", show_version, [], options, cmdoptions)
elif not args:
return ("help", help, [], options, cmdoptions)
mpm@selenic.com
Beginning of new command parsing interface...
r209 else:
cmd, args = args[0], args[1:]
mpm@selenic.com
A bunch of parsing/help updates...
r596 i = find(cmd)
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
Restructure option handling...
r592 # combine global options into local
c = list(i[1])
l = len(c)
mpm@selenic.com
A bunch of parsing/help updates...
r596 for o in globalopts:
mpm@selenic.com
Restructure option handling...
r592 c.append((o[0], o[1], options[o[1]], o[3]))
mpm@selenic.com
catch TERM signal in command processor...
r214
mpm@selenic.com
hg help improvements...
r293 try:
mpm@selenic.com
A bunch of parsing/help updates...
r596 args = fancyopts.fancyopts(args, c, cmdoptions)
mpm@selenic.com
hg help improvements...
r293 except fancyopts.getopt.GetoptError, inst:
mpm@selenic.com
A bunch of parsing/help updates...
r596 raise ParseError(cmd, inst)
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
Restructure option handling...
r592 # separate global options back out
mpm@selenic.com
A bunch of parsing/help updates...
r596 for o in globalopts:
mpm@selenic.com
Restructure option handling...
r592 n = o[1]
options[n] = cmdoptions[n]
del cmdoptions[n]
mpm@selenic.com
A bunch of parsing/help updates...
r596 return (cmd, i[0], args, options, cmdoptions)
def dispatch(args):
signal.signal(signal.SIGTERM, catchterm)
try:
cmd, func, args, options, cmdoptions = parse(args)
except ParseError, inst:
u = ui.ui()
if inst.args[0]:
u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
help(u, inst.args[0])
else:
u.warn("hg: %s\n" % inst.args[1])
help(u)
sys.exit(-1)
except UnknownCommand, inst:
u = ui.ui()
u.warn("hg: unknown command '%s'\n" % inst.args[0])
help(u)
sys.exit(1)
u = ui.ui(options["verbose"], options["debug"], options["quiet"],
not options["noninteractive"])
mpm@selenic.com
Restructure option handling...
r592
mpm@selenic.com
Add exception class for repository errors...
r499 try:
mpm@selenic.com
[PATCH] Add --traceback option...
r527 try:
if cmd not in norepo.split():
path = options["repository"] or ""
repo = hg.repository(ui=u, path=path)
mpm@selenic.com
A bunch of parsing/help updates...
r596 d = lambda: func(u, repo, *args, **cmdoptions)
mpm@selenic.com
[PATCH] Add --traceback option...
r527 else:
mpm@selenic.com
A bunch of parsing/help updates...
r596 d = lambda: func(u, *args, **cmdoptions)
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
[PATCH] Add --traceback option...
r527 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()
except:
if options['traceback']:
traceback.print_exc()
raise
mpm@selenic.com
[PATCH] Harden os.system...
r508 except util.CommandError, inst:
u.warn("abort: %s\n" % inst.args)
mpm@selenic.com
Add exception class for repository errors...
r499 except hg.RepoError, inst:
u.warn("abort: ", inst, "!\n")
mpm@selenic.com
catch TERM signal in command processor...
r214 except SignalInterrupt:
u.warn("killed!\n")
mpm@selenic.com
Beginning of new command parsing interface...
r209 except KeyboardInterrupt:
u.warn("interrupted!\n")
mpm@selenic.com
Catch broken pipes in command interpreter...
r250 except IOError, inst:
mpm@selenic.com
commands: report http exceptions nicely...
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:
mpm@selenic.com
Catch broken pipes in command interpreter...
r250 u.warn("broken pipe\n")
else:
raise
mpm@selenic.com
[PATCH] Catch OSError usefully...
r549 except OSError, inst:
if hasattr(inst, "filename"):
u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
else:
u.warn("abort: %s\n" % inst.strerror)
mpm@selenic.com
commands: better argument processing, per-command help...
r212 except TypeError, inst:
# was this an argument error?
tb = traceback.extract_tb(sys.exc_info()[2])
if len(tb) > 2: # no
raise
mpm@selenic.com
hg help improvements...
r293 u.debug(inst, "\n")
mpm@selenic.com
A bunch of parsing/help updates...
r596 u.warn("%s: invalid arguments\n" % cmd)
mpm@selenic.com
hg help improvements...
r293 help(u, cmd)
mpm@selenic.com
Fix troubles with clone and exception handling...
r503 sys.exit(-1)