commands.py
2233 lines
| 75.8 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. | ||||
|
r697 | from demandload import demandload | ||
|
r1092 | from node import * | ||
|
r1400 | from i18n import gettext as _ | ||
|
r1225 | demandload(globals(), "os re sys signal shutil imp urllib pdb") | ||
|
r1093 | demandload(globals(), "fancyopts ui hg util lock revlog") | ||
|
r627 | demandload(globals(), "fnmatch hgweb mdiff random signal time traceback") | ||
|
r1218 | demandload(globals(), "errno socket version struct atexit sets bz2") | ||
|
r209 | |||
|
r697 | class UnknownCommand(Exception): | ||
"""Exception raised if command is not in the command table.""" | ||||
|
r209 | |||
|
r245 | def filterfiles(filters, files): | ||
|
r697 | l = [x for x in files if x in filters] | ||
|
r213 | |||
|
r245 | for t in filters: | ||
|
r697 | if t and t[-1] != "/": | ||
t += "/" | ||||
l += [x for x in files if x.startswith(t)] | ||||
|
r213 | return l | ||
|
r209 | def relpath(repo, args): | ||
|
r628 | cwd = repo.getcwd() | ||
if cwd: | ||||
|
r886 | return [util.normpath(os.path.join(cwd, x)) for x in args] | ||
|
r209 | return args | ||
|
r245 | |||
|
r1062 | def matchpats(repo, cwd, pats=[], opts={}, head=''): | ||
|
r1413 | return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'), | ||
|
r742 | opts.get('exclude'), head) | ||
|
r724 | |||
|
r1062 | def makewalk(repo, pats, opts, head=''): | ||
|
r724 | cwd = repo.getcwd() | ||
|
r1031 | files, matchfn, anypats = matchpats(repo, cwd, pats, opts, head) | ||
|
r942 | exact = dict(zip(files, files)) | ||
|
r837 | def walk(): | ||
|
r1062 | for src, fn in repo.walk(files=files, match=matchfn): | ||
|
r942 | yield src, fn, util.pathto(cwd, fn), fn in exact | ||
|
r837 | return files, matchfn, walk() | ||
|
r1062 | def walk(repo, pats, opts, head=''): | ||
|
r837 | files, matchfn, results = makewalk(repo, pats, opts, head) | ||
|
r1065 | for r in results: | ||
yield r | ||||
|
r724 | |||
|
r1057 | def walkchangerevs(ui, repo, cwd, pats, opts): | ||
|
r1146 | '''Iterate over files and the revs they changed in. | ||
Callers most commonly need to iterate backwards over the history | ||||
it is interested in. Doing so has awful (quadratic-looking) | ||||
performance, so we use iterators in a "windowed" way. | ||||
We walk a window of revisions in the desired order. Within the | ||||
window, we first walk forwards to gather data, then in the desired | ||||
order (usually backwards) to display it. | ||||
This function returns an (iterator, getchange) pair. The | ||||
getchange function returns the changelog entry for a numeric | ||||
revision. The iterator yields 3-tuples. They will be of one of | ||||
the following forms: | ||||
"window", incrementing, lastrev: stepping through a window, | ||||
positive if walking forwards through revs, last rev in the | ||||
sequence iterated over - use to reset state for the current window | ||||
"add", rev, fns: out-of-order traversal of the given file names | ||||
fns, which changed during revision rev - use to gather data for | ||||
possible display | ||||
"iter", rev, None: in-order traversal of the revs earlier iterated | ||||
over with "add" - use to display data''' | ||||
|
r1337 | |||
if repo.changelog.count() == 0: | ||||
return [], False | ||||
|
r1057 | cwd = repo.getcwd() | ||
if not pats and cwd: | ||||
opts['include'] = [os.path.join(cwd, i) for i in opts['include']] | ||||
opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] | ||||
files, matchfn, anypats = matchpats(repo, (pats and cwd) or '', | ||||
pats, opts) | ||||
revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0'])) | ||||
wanted = {} | ||||
slowpath = anypats | ||||
window = 300 | ||||
fncache = {} | ||||
|
r1146 | |||
chcache = {} | ||||
def getchange(rev): | ||||
ch = chcache.get(rev) | ||||
if ch is None: | ||||
chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev))) | ||||
return ch | ||||
|
r1057 | if not slowpath and not files: | ||
# No files, no patterns. Display all revs. | ||||
wanted = dict(zip(revs, revs)) | ||||
if not slowpath: | ||||
# Only files, no patterns. Check the history of each file. | ||||
def filerevgen(filelog): | ||||
for i in xrange(filelog.count() - 1, -1, -window): | ||||
revs = [] | ||||
for j in xrange(max(0, i - window), i + 1): | ||||
revs.append(filelog.linkrev(filelog.node(j))) | ||||
revs.reverse() | ||||
for rev in revs: | ||||
yield rev | ||||
minrev, maxrev = min(revs), max(revs) | ||||
for file in files: | ||||
filelog = repo.file(file) | ||||
# A zero count may be a directory or deleted file, so | ||||
# try to find matching entries on the slow path. | ||||
if filelog.count() == 0: | ||||
slowpath = True | ||||
break | ||||
for rev in filerevgen(filelog): | ||||
if rev <= maxrev: | ||||
|
r1065 | if rev < minrev: | ||
break | ||||
|
r1057 | fncache.setdefault(rev, []) | ||
fncache[rev].append(file) | ||||
wanted[rev] = 1 | ||||
if slowpath: | ||||
# The slow path checks files modified in every changeset. | ||||
def changerevgen(): | ||||
for i in xrange(repo.changelog.count() - 1, -1, -window): | ||||
for j in xrange(max(0, i - window), i + 1): | ||||
|
r1146 | yield j, getchange(j)[3] | ||
|
r1057 | |||
for rev, changefiles in changerevgen(): | ||||
matches = filter(matchfn, changefiles) | ||||
if matches: | ||||
fncache[rev] = matches | ||||
wanted[rev] = 1 | ||||
|
r1146 | def iterate(): | ||
for i in xrange(0, len(revs), window): | ||||
yield 'window', revs[0] < revs[-1], revs[-1] | ||||
nrevs = [rev for rev in revs[i:min(i+window, len(revs))] | ||||
if rev in wanted] | ||||
srevs = list(nrevs) | ||||
srevs.sort() | ||||
for rev in srevs: | ||||
fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3]) | ||||
yield 'add', rev, fns | ||||
for rev in nrevs: | ||||
yield 'iter', rev, None | ||||
return iterate(), getchange | ||||
|
r1057 | |||
|
r580 | revrangesep = ':' | ||
|
r697 | def revrange(ui, repo, revs, revlog=None): | ||
|
r1066 | """Yield revision as strings from a list of revision specifications.""" | ||
|
r580 | if revlog is None: | ||
revlog = repo.changelog | ||||
revcount = revlog.count() | ||||
def fix(val, defval): | ||||
|
r697 | if not val: | ||
return defval | ||||
|
r580 | try: | ||
num = int(val) | ||||
|
r697 | if str(num) != val: | ||
raise ValueError | ||||
|
r1257 | if num < 0: num += revcount | ||
if num < 0: num = 0 | ||||
elif num >= revcount: | ||||
|
r580 | raise ValueError | ||
except ValueError: | ||||
try: | ||||
num = repo.changelog.rev(repo.lookup(val)) | ||||
except KeyError: | ||||
try: | ||||
num = revlog.rev(revlog.lookup(val)) | ||||
except KeyError: | ||||
|
r1402 | raise util.Abort(_('invalid revision identifier %s'), val) | ||
|
r580 | return num | ||
|
r1146 | seen = {} | ||
|
r580 | for spec in revs: | ||
if spec.find(revrangesep) >= 0: | ||||
start, end = spec.split(revrangesep, 1) | ||||
start = fix(start, 0) | ||||
end = fix(end, revcount - 1) | ||||
|
r1066 | step = start > end and -1 or 1 | ||
for rev in xrange(start, end+step, step): | ||||
|
r1146 | if rev in seen: continue | ||
seen[rev] = 1 | ||||
|
r580 | yield str(rev) | ||
else: | ||||
|
r1146 | rev = fix(spec, None) | ||
if rev in seen: continue | ||||
seen[rev] = 1 | ||||
yield str(rev) | ||||
|
r580 | |||
|
r739 | def make_filename(repo, r, pat, node=None, | ||
|
r1254 | total=None, seqno=None, revwidth=None, pathname=None): | ||
|
r632 | node_expander = { | ||
|
r1092 | 'H': lambda: hex(node), | ||
|
r632 | 'R': lambda: str(r.rev(node)), | ||
|
r1092 | 'h': lambda: short(node), | ||
|
r632 | } | ||
expander = { | ||||
'%': lambda: '%', | ||||
'b': lambda: os.path.basename(repo.root), | ||||
} | ||||
|
r727 | try: | ||
if node: | ||||
expander.update(node_expander) | ||||
if node and revwidth is not None: | ||||
expander['r'] = lambda: str(r.rev(node)).zfill(revwidth) | ||||
if total is not None: | ||||
expander['N'] = lambda: str(total) | ||||
if seqno is not None: | ||||
expander['n'] = lambda: str(seqno) | ||||
if total is not None and seqno is not None: | ||||
expander['n'] = lambda:str(seqno).zfill(len(str(total))) | ||||
|
r1254 | if pathname is not None: | ||
expander['s'] = lambda: os.path.basename(pathname) | ||||
expander['d'] = lambda: os.path.dirname(pathname) or '.' | ||||
expander['p'] = lambda: pathname | ||||
|
r632 | |||
|
r727 | newname = [] | ||
patlen = len(pat) | ||||
i = 0 | ||||
while i < patlen: | ||||
c = pat[i] | ||||
if c == '%': | ||||
i += 1 | ||||
c = pat[i] | ||||
c = expander[c]() | ||||
newname.append(c) | ||||
|
r632 | i += 1 | ||
|
r739 | return ''.join(newname) | ||
|
r727 | except KeyError, inst: | ||
|
r1402 | raise util.Abort(_("invalid format spec '%%%s' in output file name"), | ||
|
r727 | inst.args[0]) | ||
|
r632 | |||
|
r739 | def make_file(repo, r, pat, node=None, | ||
|
r1254 | total=None, seqno=None, revwidth=None, mode='wb', pathname=None): | ||
|
r739 | if not pat or pat == '-': | ||
|
r1065 | return 'w' in mode and sys.stdout or sys.stdin | ||
|
r739 | if hasattr(pat, 'write') and 'w' in mode: | ||
return pat | ||||
if hasattr(pat, 'read') and 'r' in mode: | ||||
return pat | ||||
|
r1254 | return open(make_filename(repo, r, pat, node, total, seqno, revwidth, | ||
pathname), | ||||
|
r739 | mode) | ||
|
r1014 | def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, | ||
|
r1015 | changes=None, text=False): | ||
|
r904 | if not changes: | ||
|
r1062 | (c, a, d, u) = repo.changes(node1, node2, files, match=match) | ||
|
r904 | else: | ||
(c, a, d, u) = changes | ||||
|
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 | ||||
|
r245 | if node2: | ||
change = repo.changelog.read(node2) | ||||
mmap2 = repo.manifest.read(change[0]) | ||||
|
r1321 | date2 = util.datestr(change[2]) | ||
|
r697 | def read(f): | ||
return repo.file(f).read(mmap2[f]) | ||||
|
r245 | else: | ||
|
r1320 | date2 = util.datestr() | ||
|
r245 | if not node1: | ||
node1 = repo.dirstate.parents()[0] | ||||
|
r697 | def read(f): | ||
return repo.wfile(f).read() | ||||
|
r245 | |||
|
r396 | if ui.quiet: | ||
r = None | ||||
else: | ||||
|
r1092 | hexfunc = ui.verbose and hex or short | ||
|
r396 | r = [hexfunc(node) for node in [node1, node2] if node] | ||
|
r245 | change = repo.changelog.read(node1) | ||
mmap = repo.manifest.read(change[0]) | ||||
|
r1321 | date1 = util.datestr(change[2]) | ||
|
r245 | |||
for f in c: | ||||
|
r275 | to = None | ||
if f in mmap: | ||||
to = repo.file(f).read(mmap[f]) | ||||
|
r245 | tn = read(f) | ||
|
r1015 | fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) | ||
|
r245 | for f in a: | ||
|
r264 | to = None | ||
|
r245 | tn = read(f) | ||
|
r1015 | fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) | ||
|
r245 | for f in d: | ||
to = repo.file(f).read(mmap[f]) | ||||
|
r264 | tn = None | ||
|
r1015 | fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) | ||
|
r329 | |||
|
r1147 | def trimuser(ui, name, rev, revcache): | ||
|
r1146 | """trim the name of the user who committed a change""" | ||
|
r1147 | user = revcache.get(rev) | ||
if user is None: | ||||
user = revcache[rev] = ui.shortuser(name) | ||||
return user | ||||
|
r1146 | |||
|
r1031 | def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None): | ||
|
r329 | """show a single changeset or file revision""" | ||
|
r1031 | log = repo.changelog | ||
if changenode is None: | ||||
changenode = log.node(rev) | ||||
elif not rev: | ||||
rev = log.rev(changenode) | ||||
|
r329 | |||
if ui.quiet: | ||||
|
r1092 | ui.write("%d:%s\n" % (rev, short(changenode))) | ||
|
r329 | return | ||
|
r1031 | changes = log.read(changenode) | ||
|
r1321 | date = util.datestr(changes[2]) | ||
|
r967 | |||
|
r1092 | parents = [(log.rev(p), ui.verbose and hex(p) or short(p)) | ||
|
r1031 | for p in log.parents(changenode) | ||
|
r1092 | if ui.debugflag or p != nullid] | ||
|
r329 | if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1: | ||
parents = [] | ||||
|
r778 | if ui.verbose: | ||
|
r1402 | ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode))) | ||
|
r778 | else: | ||
|
r1402 | ui.write(_("changeset: %d:%s\n") % (rev, short(changenode))) | ||
|
r778 | |||
|
r687 | for tag in repo.nodetags(changenode): | ||
|
r1402 | ui.status(_("tag: %s\n") % tag) | ||
|
r687 | for parent in parents: | ||
|
r1402 | ui.write(_("parent: %d:%s\n") % parent) | ||
|
r778 | |||
|
r898 | if brinfo and changenode in brinfo: | ||
br = brinfo[changenode] | ||||
|
r1402 | ui.write(_("branch: %s\n") % " ".join(br)) | ||
|
r898 | |||
|
r1402 | ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]), | ||
|
r1092 | hex(changes[0]))) | ||
|
r1402 | ui.status(_("user: %s\n") % changes[1]) | ||
ui.status(_("date: %s\n") % date) | ||||
|
r778 | |||
|
r493 | if ui.debugflag: | ||
|
r1031 | files = repo.changes(log.parents(changenode)[0], changenode) | ||
|
r1402 | for key, value in zip([_("files:"), _("files+:"), _("files-:")], files): | ||
|
r490 | if value: | ||
ui.note("%-12s %s\n" % (key, " ".join(value))) | ||||
|
r493 | else: | ||
|
r1402 | ui.note(_("files: %s\n") % " ".join(changes[3])) | ||
|
r778 | |||
|
r347 | description = changes[4].strip() | ||
|
r329 | if description: | ||
|
r330 | if ui.verbose: | ||
|
r1402 | ui.status(_("description:\n")) | ||
|
r347 | ui.status(description) | ||
|
r546 | ui.status("\n\n") | ||
|
r330 | else: | ||
|
r1402 | ui.status(_("summary: %s\n") % description.splitlines()[0]) | ||
|
r329 | ui.status("\n") | ||
|
r470 | def show_version(ui): | ||
|
r423 | """output version and copyright information""" | ||
|
r1402 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | ||
|
r849 | % version.get_version()) | ||
|
r1402 | ui.status(_( | ||
|
r423 | "\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" | ||||
|
r1402 | )) | ||
|
r423 | |||
|
r1049 | def help_(ui, cmd=None, with_version=False): | ||
|
r697 | """show help for a given command or all commands""" | ||
|
r1052 | option_lists = [] | ||
|
r846 | if cmd and cmd != 'shortlist': | ||
|
r1049 | if with_version: | ||
show_version(ui) | ||||
ui.write('\n') | ||||
|
r849 | key, i = find(cmd) | ||
# synopsis | ||||
|
r848 | ui.write("%s\n\n" % i[2]) | ||
|
r293 | |||
|
r849 | # description | ||
doc = i[0].__doc__ | ||||
if ui.quiet: | ||||
doc = doc.splitlines(0)[0] | ||||
ui.write("%s\n" % doc.rstrip()) | ||||
if not ui.quiet: | ||||
|
r1052 | # aliases | ||
|
r849 | aliases = ', '.join(key.split('|')[1:]) | ||
if aliases: | ||||
|
r1402 | ui.write(_("\naliases: %s\n") % aliases) | ||
|
r849 | |||
|
r1052 | # options | ||
if i[1]: | ||||
option_lists.append(("options", i[1])) | ||||
|
r293 | |||
|
r255 | else: | ||
|
r849 | # program name | ||
|
r1049 | if ui.verbose or with_version: | ||
|
r470 | show_version(ui) | ||
|
r849 | else: | ||
|
r1402 | ui.status(_("Mercurial Distributed SCM\n")) | ||
|
r849 | ui.status('\n') | ||
|
r843 | |||
|
r849 | # list of commands | ||
|
r846 | if cmd == "shortlist": | ||
|
r1402 | ui.status(_('basic commands (use "hg help" ' | ||
'for the full list or option "-v" for details):\n\n')) | ||||
|
r849 | elif ui.verbose: | ||
|
r1402 | ui.status(_('list of commands:\n\n')) | ||
|
r849 | else: | ||
|
r1402 | ui.status(_('list of commands (use "hg help -v" ' | ||
'to show aliases and global options):\n\n')) | ||||
|
r209 | |||
|
r255 | h = {} | ||
|
r844 | cmds = {} | ||
|
r479 | for c, e in table.items(): | ||
f = c.split("|")[0] | ||||
|
r846 | if cmd == "shortlist" and not f.startswith("^"): | ||
|
r479 | continue | ||
|
r849 | f = f.lstrip("^") | ||
|
r593 | if not ui.debugflag and f.startswith("debug"): | ||
continue | ||||
|
r255 | d = "" | ||
|
r470 | if e[0].__doc__: | ||
d = e[0].__doc__.splitlines(0)[0].rstrip() | ||||
h[f] = d | ||||
|
r844 | cmds[f]=c.lstrip("^") | ||
|
r255 | |||
fns = h.keys() | ||||
fns.sort() | ||||
m = max(map(len, fns)) | ||||
for f in fns: | ||||
|
r844 | if ui.verbose: | ||
commands = cmds[f].replace("|",", ") | ||||
ui.write(" %s:\n %s\n"%(commands,h[f])) | ||||
else: | ||||
ui.write(' %-*s %s\n' % (m, f, h[f])) | ||||
|
r255 | |||
|
r849 | # global options | ||
if ui.verbose: | ||||
|
r1052 | option_lists.append(("global options", globalopts)) | ||
# list all option lists | ||||
opt_output = [] | ||||
for title, options in option_lists: | ||||
opt_output.append(("\n%s:\n" % title, None)) | ||||
for shortopt, longopt, default, desc in options: | ||||
opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, | ||||
longopt and " --%s" % longopt), | ||||
"%s%s" % (desc, | ||||
|
r1402 | default and _(" (default: %s)") % default | ||
|
r1052 | or ""))) | ||
if opt_output: | ||||
opts_len = max([len(line[0]) for line in opt_output if line[1]]) | ||||
for first, second in opt_output: | ||||
if second: | ||||
ui.write(" %-*s %s\n" % (opts_len, first, second)) | ||||
else: | ||||
ui.write("%s\n" % first) | ||||
|
r849 | |||
|
r255 | # Commands start here, listed alphabetically | ||
|
r209 | |||
|
r724 | def add(ui, repo, *pats, **opts): | ||
|
r245 | '''add the specified files on the next commit''' | ||
|
r724 | names = [] | ||
|
r942 | for src, abs, rel, exact in walk(repo, pats, opts): | ||
if exact: | ||||
|
r1402 | if ui.verbose: ui.status(_('adding %s\n') % rel) | ||
|
r724 | names.append(abs) | ||
elif repo.dirstate.state(abs) == '?': | ||||
|
r1402 | ui.status(_('adding %s\n') % rel) | ||
|
r724 | names.append(abs) | ||
repo.add(names) | ||||
|
r213 | |||
|
r766 | def addremove(ui, repo, *pats, **opts): | ||
|
r255 | """add all new files, delete all missing files""" | ||
|
r809 | add, remove = [], [] | ||
|
r942 | for src, abs, rel, exact in walk(repo, pats, opts): | ||
|
r880 | if src == 'f' and repo.dirstate.state(abs) == '?': | ||
add.append(abs) | ||||
|
r1255 | if ui.verbose or not exact: | ||
|
r1402 | ui.status(_('adding %s\n') % rel) | ||
|
r880 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): | ||
|
r809 | remove.append(abs) | ||
|
r1255 | if ui.verbose or not exact: | ||
|
r1402 | ui.status(_('removing %s\n') % rel) | ||
|
r809 | repo.add(add) | ||
repo.remove(remove) | ||||
|
r219 | |||
|
r733 | def annotate(ui, repo, *pats, **opts): | ||
|
r255 | """show changeset information per file line""" | ||
|
r209 | def getnode(rev): | ||
|
r1092 | return short(repo.changelog.node(rev)) | ||
|
r209 | |||
|
r1146 | ucache = {} | ||
|
r209 | def getname(rev): | ||
|
r1146 | cl = repo.changelog.read(repo.changelog.node(rev)) | ||
|
r1147 | return trimuser(ui, cl[1], rev, ucache) | ||
|
r500 | |||
|
r744 | if not pats: | ||
|
r1402 | raise util.Abort(_('at least one file name or pattern required')) | ||
|
r744 | |||
|
r209 | opmap = [['user', getname], ['number', str], ['changeset', getnode]] | ||
|
r714 | if not opts['user'] and not opts['changeset']: | ||
opts['number'] = 1 | ||||
|
r209 | |||
|
r715 | if opts['rev']: | ||
node = repo.changelog.lookup(opts['rev']) | ||||
|
r714 | else: | ||
node = repo.dirstate.parents()[0] | ||||
|
r209 | change = repo.changelog.read(node) | ||
mmap = repo.manifest.read(change[0]) | ||||
|
r1016 | |||
|
r942 | for src, abs, rel, exact in walk(repo, pats, opts): | ||
|
r771 | if abs not in mmap: | ||
|
r1402 | ui.warn(_("warning: %s is not in the repository!\n") % rel) | ||
|
r771 | continue | ||
|
r1016 | f = repo.file(abs) | ||
if not opts['text'] and util.binary(f.read(mmap[abs])): | ||||
|
r1402 | ui.write(_("%s: binary file\n") % rel) | ||
|
r1016 | continue | ||
lines = f.annotate(mmap[abs]) | ||||
|
r209 | pieces = [] | ||
for o, f in opmap: | ||||
|
r714 | if opts[o]: | ||
|
r697 | l = [f(n) for n, dummy in lines] | ||
|
r771 | if l: | ||
m = max(map(len, l)) | ||||
pieces.append(["%*s" % (m, x) for x in l]) | ||||
|
r209 | |||
|
r771 | if pieces: | ||
for p, l in zip(zip(*pieces), lines): | ||||
ui.write("%s: %s" % (" ".join(p), l[1])) | ||||
|
r209 | |||
|
r1218 | def bundle(ui, repo, fname, dest="default-push", **opts): | ||
"""create a changegroup file""" | ||||
f = open(fname, "wb") | ||||
dest = ui.expandpath(dest) | ||||
other = hg.repository(ui, dest) | ||||
o = repo.findoutgoing(other) | ||||
cg = repo.changegroup(o) | ||||
try: | ||||
f.write("HG10") | ||||
z = bz2.BZ2Compressor(9) | ||||
while 1: | ||||
chunk = cg.read(4096) | ||||
if not chunk: | ||||
break | ||||
f.write(z.compress(chunk)) | ||||
f.write(z.flush()) | ||||
except: | ||||
os.unlink(fname) | ||||
|
r1366 | raise | ||
|
r1218 | |||
|
r1254 | def cat(ui, repo, file1, *pats, **opts): | ||
"""output the latest or given revisions of files""" | ||||
mf = {} | ||||
if opts['rev']: | ||||
change = repo.changelog.read(repo.lookup(opts['rev'])) | ||||
mf = repo.manifest.read(change[0]) | ||||
for src, abs, rel, exact in walk(repo, (file1,) + pats, opts): | ||||
r = repo.file(abs) | ||||
if opts['rev']: | ||||
|
r1242 | try: | ||
|
r1254 | n = mf[abs] | ||
except (hg.RepoError, KeyError): | ||||
try: | ||||
n = r.lookup(rev) | ||||
except KeyError, inst: | ||||
|
r1402 | raise util.Abort(_('cannot find file %s in rev %s'), rel, rev) | ||
|
r1254 | else: | ||
n = r.tip() | ||||
fp = make_file(repo, r, opts['output'], node=n, pathname=abs) | ||||
fp.write(r.read(n)) | ||||
|
r248 | |||
|
r698 | def clone(ui, source, dest=None, **opts): | ||
|
r485 | """make a copy of an existing repository""" | ||
if dest is None: | ||||
|
r528 | dest = os.path.basename(os.path.normpath(source)) | ||
|
r532 | |||
if os.path.exists(dest): | ||||
|
r1402 | raise util.Abort(_("destination '%s' already exists"), dest) | ||
|
r523 | |||
|
r891 | dest = os.path.realpath(dest) | ||
|
r697 | class Dircleanup: | ||
def __init__(self, dir_): | ||||
|
r625 | self.rmtree = shutil.rmtree | ||
|
r697 | self.dir_ = dir_ | ||
os.mkdir(dir_) | ||||
|
r535 | def close(self): | ||
|
r697 | self.dir_ = None | ||
|
r535 | def __del__(self): | ||
|
r697 | if self.dir_: | ||
self.rmtree(self.dir_, True) | ||||
|
r485 | |||
|
r963 | if opts['ssh']: | ||
ui.setconfig("ui", "ssh", opts['ssh']) | ||||
if opts['remotecmd']: | ||||
ui.setconfig("ui", "remotecmd", opts['remotecmd']) | ||||
|
r1221 | if not os.path.exists(source): | ||
source = ui.expandpath(source) | ||||
|
r1314 | |||
d = Dircleanup(dest) | ||||
|
r562 | abspath = source | ||
|
r634 | other = hg.repository(ui, source) | ||
|
r485 | |||
|
r1244 | copy = False | ||
|
r1315 | if other.dev() != -1: | ||
|
r675 | abspath = os.path.abspath(source) | ||
|
r1315 | if not opts['pull']: | ||
copy = True | ||||
|
r1331 | |||
|
r1244 | if copy: | ||
try: | ||||
# we use a lock here because if we race with commit, we | ||||
# can end up with extra data in the cloned revlogs that's | ||||
# not pointed to by changesets, thus causing verify to | ||||
# fail | ||||
l1 = lock.lock(os.path.join(source, ".hg", "lock")) | ||||
except OSError: | ||||
copy = False | ||||
|
r917 | |||
|
r1244 | if copy: | ||
# we lock here to avoid premature writing to the target | ||||
|
r1208 | os.mkdir(os.path.join(dest, ".hg")) | ||
|
r1209 | l2 = lock.lock(os.path.join(dest, ".hg", "lock")) | ||
|
r1114 | |||
|
r1208 | files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i" | ||
for f in files.split(): | ||||
src = os.path.join(source, ".hg", f) | ||||
dst = os.path.join(dest, ".hg", f) | ||||
|
r1241 | util.copyfiles(src, dst) | ||
|
r535 | |||
repo = hg.repository(ui, dest) | ||||
|
r485 | |||
|
r535 | else: | ||
repo = hg.repository(ui, dest, create=1) | ||||
|
r625 | repo.pull(other) | ||
|
r503 | |||
|
r1331 | f = repo.opener("hgrc", "w", text=True) | ||
|
r1206 | f.write("[paths]\n") | ||
f.write("default = %s\n" % abspath) | ||||
|
r515 | |||
|
r535 | if not opts['noupdate']: | ||
update(ui, repo) | ||||
d.close() | ||||
|
r515 | |||
|
r813 | def commit(ui, repo, *pats, **opts): | ||
|
r245 | """commit the specified files or all outstanding changes""" | ||
|
r763 | if opts['text']: | ||
|
r1402 | ui.warn(_("Warning: -t and --text is deprecated," | ||
" please use -m or --message instead.\n")) | ||||
|
r762 | message = opts['message'] or opts['text'] | ||
|
r697 | logfile = opts['logfile'] | ||
|
r1319 | |||
if message and logfile: | ||||
|
r1402 | raise util.Abort(_('options --message and --logfile are mutually ' | ||
'exclusive')) | ||||
|
r762 | if not message and logfile: | ||
|
r697 | try: | ||
|
r899 | if logfile == '-': | ||
message = sys.stdin.read() | ||||
else: | ||||
message = open(logfile).read() | ||||
|
r1319 | except IOError, inst: | ||
|
r1402 | raise util.Abort(_("can't read commit message '%s': %s") % | ||
|
r1319 | (logfile, inst.strerror)) | ||
|
r289 | |||
|
r354 | if opts['addremove']: | ||
|
r813 | addremove(ui, repo, *pats, **opts) | ||
cwd = repo.getcwd() | ||||
if not pats and cwd: | ||||
opts['include'] = [os.path.join(cwd, i) for i in opts['include']] | ||||
opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] | ||||
|
r1031 | fns, match, anypats = matchpats(repo, (pats and repo.getcwd()) or '', | ||
pats, opts) | ||||
|
r813 | if pats: | ||
|
r1062 | c, a, d, u = repo.changes(files=fns, match=match) | ||
|
r813 | files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r'] | ||
else: | ||||
files = [] | ||||
|
r1202 | try: | ||
repo.commit(files, message, opts['user'], opts['date'], match) | ||||
except ValueError, inst: | ||||
raise util.Abort(str(inst)) | ||||
|
r245 | |||
|
r1253 | def docopy(ui, repo, pats, opts): | ||
|
r1249 | if not pats: | ||
|
r1402 | raise util.Abort(_('no source or destination specified')) | ||
|
r1249 | elif len(pats) == 1: | ||
|
r1402 | raise util.Abort(_('no destination specified')) | ||
|
r1249 | pats = list(pats) | ||
dest = pats.pop() | ||||
sources = [] | ||||
def okaytocopy(abs, rel, exact): | ||||
|
r1402 | reasons = {'?': _('is not managed'), | ||
'a': _('has been marked for add')} | ||||
|
r1249 | reason = reasons.get(repo.dirstate.state(abs)) | ||
if reason: | ||||
|
r1402 | if exact: ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) | ||
|
r1249 | else: | ||
return True | ||||
for src, abs, rel, exact in walk(repo, pats, opts): | ||||
if okaytocopy(abs, rel, exact): | ||||
sources.append((abs, rel, exact)) | ||||
if not sources: | ||||
|
r1402 | raise util.Abort(_('no files to copy')) | ||
|
r1249 | |||
cwd = repo.getcwd() | ||||
absdest = util.canonpath(repo.root, cwd, dest) | ||||
reldest = util.pathto(cwd, absdest) | ||||
if os.path.exists(reldest): | ||||
destisfile = not os.path.isdir(reldest) | ||||
else: | ||||
destisfile = len(sources) == 1 or repo.dirstate.state(absdest) != '?' | ||||
if destisfile: | ||||
if opts['parents']: | ||||
|
r1402 | raise util.Abort(_('with --parents, destination must be a directory')) | ||
|
r1249 | elif len(sources) > 1: | ||
|
r1402 | raise util.Abort(_('with multiple sources, destination must be a ' | ||
'directory')) | ||||
|
r1253 | errs, copied = 0, [] | ||
|
r1249 | for abs, rel, exact in sources: | ||
if opts['parents']: | ||||
mydest = os.path.join(dest, rel) | ||||
elif destisfile: | ||||
mydest = reldest | ||||
else: | ||||
mydest = os.path.join(dest, os.path.basename(rel)) | ||||
myabsdest = util.canonpath(repo.root, cwd, mydest) | ||||
myreldest = util.pathto(cwd, myabsdest) | ||||
if not opts['force'] and repo.dirstate.state(myabsdest) not in 'a?': | ||||
|
r1402 | ui.warn(_('%s: not overwriting - file already managed\n') % myreldest) | ||
|
r1249 | continue | ||
mydestdir = os.path.dirname(myreldest) or '.' | ||||
if not opts['after']: | ||||
try: | ||||
if opts['parents']: os.makedirs(mydestdir) | ||||
elif not destisfile: os.mkdir(mydestdir) | ||||
except OSError, inst: | ||||
if inst.errno != errno.EEXIST: raise | ||||
if ui.verbose or not exact: | ||||
|
r1402 | ui.status(_('copying %s to %s\n') % (rel, myreldest)) | ||
|
r1249 | if not opts['after']: | ||
try: | ||||
shutil.copyfile(rel, myreldest) | ||||
|
r1380 | shutil.copymode(rel, myreldest) | ||
|
r1253 | except shutil.Error, inst: | ||
raise util.Abort(str(inst)) | ||||
|
r1249 | except IOError, inst: | ||
if inst.errno == errno.ENOENT: | ||||
|
r1402 | ui.warn(_('%s: deleted in working copy\n') % rel) | ||
|
r1249 | else: | ||
|
r1402 | ui.warn(_('%s: cannot copy - %s\n') % (rel, inst.strerror)) | ||
|
r1249 | errs += 1 | ||
continue | ||||
repo.copy(abs, myabsdest) | ||||
|
r1253 | copied.append((abs, rel, exact)) | ||
|
r1249 | if errs: | ||
|
r1402 | ui.warn(_('(consider using --after)\n')) | ||
|
r1253 | return errs, copied | ||
def copy(ui, repo, *pats, **opts): | ||||
"""mark files as copied for the next commit""" | ||||
errs, copied = docopy(ui, repo, pats, opts) | ||||
|
r1249 | return errs | ||
|
r363 | |||
|
r1262 | def debugancestor(ui, index, rev1, rev2): | ||
"""find the ancestor revision of two revisions in a given index""" | ||||
r = revlog.revlog(file, index, "") | ||||
a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) | ||||
ui.write("%d:%s\n" % (r.rev(a), hex(a))) | ||||
|
r596 | def debugcheckstate(ui, repo): | ||
"""validate the correctness of the current dirstate""" | ||||
|
r460 | parent1, parent2 = repo.dirstate.parents() | ||
|
r555 | repo.dirstate.read() | ||
dc = repo.dirstate.map | ||||
|
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: | ||||
|
r1402 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | ||
|
r460 | errors += 1 | ||
if state in "a" and f in m1: | ||||
|
r1402 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | ||
|
r460 | errors += 1 | ||
if state in "m" and f not in m1 and f not in m2: | ||||
|
r1402 | ui.warn(_("%s in state %s, but not in either manifest\n") % | ||
|
r582 | (f, state)) | ||
|
r460 | errors += 1 | ||
for f in m1: | ||||
state = repo.dirstate.state(f) | ||||
if state not in "nrm": | ||||
|
r1402 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | ||
|
r460 | errors += 1 | ||
if errors: | ||||
|
r1402 | raise util.Abort(_(".hg/dirstate inconsistent with current parent's manifest")) | ||
|
r460 | |||
|
r1028 | def debugconfig(ui): | ||
|
r1053 | """show combined config settings from all hgrc files""" | ||
|
r1028 | try: | ||
repo = hg.repository(ui) | ||||
|
r1065 | except hg.RepoError: | ||
pass | ||||
|
r1028 | for section, name, value in ui.walkconfig(): | ||
ui.write('%s.%s=%s\n' % (section, name, value)) | ||||
|
r1395 | def debugsetparents(ui, repo, rev1, rev2=None): | ||
""" | ||||
manually set the parents of the current working directory | ||||
This is useful for writing repository conversion tools, but should | ||||
be used with care. | ||||
""" | ||||
if not rev2: | ||||
rev2 = hex(nullid) | ||||
repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) | ||||
|
r596 | def debugstate(ui, repo): | ||
"""show the contents of the current dirstate""" | ||||
|
r555 | repo.dirstate.read() | ||
dc = repo.dirstate.map | ||||
|
r460 | keys = dc.keys() | ||
keys.sort() | ||||
|
r697 | for file_ in keys: | ||
|
r791 | ui.write("%c %3o %10d %s %s\n" | ||
% (dc[file_][0], dc[file_][1] & 0777, dc[file_][2], | ||||
time.strftime("%x %X", | ||||
time.localtime(dc[file_][3])), file_)) | ||||
|
r1116 | for f in repo.dirstate.copies: | ||
|
r1402 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f)) | ||
|
r460 | |||
|
r1039 | def debugdata(ui, file_, rev): | ||
"""dump the contents of an data file revision""" | ||||
|
r1093 | r = revlog.revlog(file, file_[:-2] + ".i", file_) | ||
|
r1313 | try: | ||
ui.write(r.revision(r.lookup(rev))) | ||||
except KeyError: | ||||
|
r1402 | raise util.Abort(_('invalid revision identifier %s'), rev) | ||
|
r1039 | |||
|
r697 | def debugindex(ui, file_): | ||
|
r596 | """dump the contents of an index file""" | ||
|
r1093 | r = revlog.revlog(file, file_, "") | ||
|
r582 | ui.write(" rev offset length base linkrev" + | ||
|
r989 | " nodeid p1 p2\n") | ||
|
r248 | for i in range(r.count()): | ||
e = r.index[i] | ||||
|
r989 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | ||
|
r582 | i, e[0], e[1], e[2], e[3], | ||
|
r1092 | short(e[6]), short(e[4]), short(e[5]))) | ||
|
r248 | |||
|
r697 | def debugindexdot(ui, file_): | ||
|
r596 | """dump an index DAG as a .dot file""" | ||
|
r1093 | r = revlog.revlog(file, file_, "") | ||
|
r582 | ui.write("digraph G {\n") | ||
|
r248 | for i in range(r.count()): | ||
e = r.index[i] | ||||
|
r582 | ui.write("\t%d -> %d\n" % (r.rev(e[4]), i)) | ||
|
r1092 | if e[5] != nullid: | ||
|
r582 | ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) | ||
ui.write("}\n") | ||||
|
r248 | |||
|
r1116 | def debugrename(ui, repo, file, rev=None): | ||
|
r1194 | """dump rename information""" | ||
|
r1116 | r = repo.file(relpath(repo, [file])[0]) | ||
if rev: | ||||
try: | ||||
# assume all revision numbers are for changesets | ||||
n = repo.lookup(rev) | ||||
change = repo.changelog.read(n) | ||||
m = repo.manifest.read(change[0]) | ||||
n = m[relpath(repo, [file])[0]] | ||||
except hg.RepoError, KeyError: | ||||
n = r.lookup(rev) | ||||
else: | ||||
n = r.tip() | ||||
m = r.renamed(n) | ||||
if m: | ||||
|
r1402 | ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1]))) | ||
|
r1116 | else: | ||
|
r1402 | ui.write(_("not renamed\n")) | ||
|
r1116 | |||
|
r820 | def debugwalk(ui, repo, *pats, **opts): | ||
|
r1053 | """show how files match on given patterns""" | ||
|
r820 | items = list(walk(repo, pats, opts)) | ||
|
r1065 | if not items: | ||
return | ||||
|
r1309 | fmt = '%%s %%-%ds %%-%ds %%s' % ( | ||
|
r942 | max([len(abs) for (src, abs, rel, exact) in items]), | ||
max([len(rel) for (src, abs, rel, exact) in items])) | ||||
for src, abs, rel, exact in items: | ||||
|
r1309 | line = fmt % (src, abs, rel, exact and 'exact' or '') | ||
ui.write("%s\n" % line.rstrip()) | ||||
|
r820 | |||
|
r732 | def diff(ui, repo, *pats, **opts): | ||
|
r255 | """diff working directory (or selected files)""" | ||
|
r1015 | node1, node2 = None, None | ||
revs = [repo.lookup(x) for x in opts['rev']] | ||||
|
r396 | |||
|
r1014 | if len(revs) > 0: | ||
node1 = revs[0] | ||||
if len(revs) > 1: | ||||
node2 = revs[1] | ||||
|
r245 | if len(revs) > 2: | ||
|
r1402 | raise util.Abort(_("too many revisions to diff")) | ||
|
r245 | |||
|
r1267 | fns, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts) | ||
|
r1014 | |||
|
r1267 | dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn, | ||
|
r1015 | text=opts['text']) | ||
|
r245 | |||
|
r580 | def doexport(ui, repo, changeset, seqno, total, revwidth, opts): | ||
|
r246 | node = repo.lookup(changeset) | ||
prev, other = repo.changelog.parents(node) | ||||
change = repo.changelog.read(node) | ||||
|
r580 | |||
|
r729 | fp = make_file(repo, repo.changelog, opts['output'], | ||
node=node, total=total, seqno=seqno, | ||||
revwidth=revwidth) | ||||
if fp != sys.stdout: | ||||
|
r755 | ui.note("%s\n" % fp.name) | ||
|
r580 | |||
|
r582 | fp.write("# HG changeset patch\n") | ||
fp.write("# User %s\n" % change[1]) | ||||
|
r1092 | fp.write("# Node ID %s\n" % hex(node)) | ||
fp.write("# Parent %s\n" % hex(prev)) | ||||
if other != nullid: | ||||
fp.write("# Parent %s\n" % hex(other)) | ||||
|
r582 | fp.write(change[4].rstrip()) | ||
fp.write("\n\n") | ||||
|
r580 | |||
|
r1015 | dodiff(fp, ui, repo, prev, node, text=opts['text']) | ||
|
r1065 | if fp != sys.stdout: | ||
fp.close() | ||||
|
r396 | |||
|
r580 | def export(ui, repo, *changesets, **opts): | ||
"""dump the header and diffs for one or more changesets""" | ||||
|
r610 | if not changesets: | ||
|
r1402 | raise util.Abort(_("export requires at least one changeset")) | ||
|
r580 | seqno = 0 | ||
revs = list(revrange(ui, repo, changesets)) | ||||
total = len(revs) | ||||
|
r1067 | revwidth = max(map(len, revs)) | ||
|
r1402 | ui.note(len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")) | ||
|
r580 | for cset in revs: | ||
seqno += 1 | ||||
doexport(ui, repo, cset, seqno, total, revwidth, opts) | ||||
|
r246 | |||
|
r810 | def forget(ui, repo, *pats, **opts): | ||
|
r245 | """don't add the specified files on the next commit""" | ||
|
r810 | forget = [] | ||
|
r942 | for src, abs, rel, exact in walk(repo, pats, opts): | ||
|
r810 | if repo.dirstate.state(abs) == 'a': | ||
forget.append(abs) | ||||
|
r1255 | if ui.verbose or not exact: | ||
|
r1402 | ui.status(_('forgetting %s\n') % rel) | ||
|
r810 | repo.forget(forget) | ||
|
r245 | |||
|
r1108 | def grep(ui, repo, pattern, *pats, **opts): | ||
|
r1060 | """search for a pattern in specified files and revisions""" | ||
|
r1057 | reflags = 0 | ||
|
r1065 | if opts['ignore_case']: | ||
reflags |= re.I | ||||
|
r1057 | regexp = re.compile(pattern, reflags) | ||
|
r1146 | sep, eol = ':', '\n' | ||
|
r1108 | if opts['print0']: | ||
|
r1146 | sep = eol = '\0' | ||
|
r1057 | |||
fcache = {} | ||||
def getfile(fn): | ||||
if fn not in fcache: | ||||
fcache[fn] = repo.file(fn) | ||||
return fcache[fn] | ||||
def matchlines(body): | ||||
|
r1059 | begin = 0 | ||
linenum = 0 | ||||
while True: | ||||
match = regexp.search(body, begin) | ||||
|
r1065 | if not match: | ||
break | ||||
|
r1059 | mstart, mend = match.span() | ||
linenum += body.count('\n', begin, mstart) + 1 | ||||
lstart = body.rfind('\n', begin, mstart) + 1 or begin | ||||
lend = body.find('\n', mend) | ||||
yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | ||||
begin = lend + 1 | ||||
|
r1057 | |||
class linestate: | ||||
def __init__(self, line, linenum, colstart, colend): | ||||
self.line = line | ||||
self.linenum = linenum | ||||
self.colstart = colstart | ||||
self.colend = colend | ||||
|
r1065 | def __eq__(self, other): | ||
return self.line == other.line | ||||
def __hash__(self): | ||||
return hash(self.line) | ||||
|
r1057 | |||
matches = {} | ||||
def grepbody(fn, rev, body): | ||||
matches[rev].setdefault(fn, {}) | ||||
m = matches[rev][fn] | ||||
for lnum, cstart, cend, line in matchlines(body): | ||||
s = linestate(line, lnum, cstart, cend) | ||||
m[s] = s | ||||
prev = {} | ||||
|
r1146 | ucache = {} | ||
|
r1057 | def display(fn, rev, states, prevstates): | ||
|
r1061 | diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) | ||
|
r1057 | diff.sort(lambda x, y: cmp(x.linenum, y.linenum)) | ||
|
r1145 | counts = {'-': 0, '+': 0} | ||
|
r1146 | filerevmatches = {} | ||
|
r1057 | for l in diff: | ||
|
r1212 | if incrementing or not opts['all']: | ||
|
r1057 | change = ((l in prevstates) and '-') or '+' | ||
r = rev | ||||
else: | ||||
change = ((l in states) and '-') or '+' | ||||
r = prev[fn] | ||||
|
r1146 | cols = [fn, str(rev)] | ||
if opts['line_number']: cols.append(str(l.linenum)) | ||||
|
r1212 | if opts['all']: cols.append(change) | ||
|
r1147 | if opts['user']: cols.append(trimuser(ui, getchange(rev)[1], rev, | ||
|
r1146 | ucache)) | ||
if opts['files_with_matches']: | ||||
c = (fn, rev) | ||||
if c in filerevmatches: continue | ||||
filerevmatches[c] = 1 | ||||
else: | ||||
cols.append(l.line) | ||||
ui.write(sep.join(cols), eol) | ||||
|
r1145 | counts[change] += 1 | ||
return counts['+'], counts['-'] | ||||
|
r1057 | |||
fstate = {} | ||||
|
r1145 | skip = {} | ||
|
r1146 | changeiter, getchange = walkchangerevs(ui, repo, repo.getcwd(), pats, opts) | ||
count = 0 | ||||
|
r1337 | incrementing = False | ||
|
r1146 | for st, rev, fns in changeiter: | ||
|
r1057 | if st == 'window': | ||
incrementing = rev | ||||
matches.clear() | ||||
elif st == 'add': | ||||
change = repo.changelog.read(repo.lookup(str(rev))) | ||||
mf = repo.manifest.read(change[0]) | ||||
matches[rev] = {} | ||||
for fn in fns: | ||||
|
r1145 | if fn in skip: continue | ||
|
r1057 | fstate.setdefault(fn, {}) | ||
try: | ||||
grepbody(fn, rev, getfile(fn).read(mf[fn])) | ||||
except KeyError: | ||||
pass | ||||
elif st == 'iter': | ||||
states = matches[rev].items() | ||||
states.sort() | ||||
for fn, m in states: | ||||
|
r1145 | if fn in skip: continue | ||
|
r1212 | if incrementing or not opts['all'] or fstate[fn]: | ||
|
r1145 | pos, neg = display(fn, rev, m, fstate[fn]) | ||
|
r1146 | count += pos + neg | ||
|
r1212 | if pos and not opts['all']: | ||
|
r1145 | skip[fn] = True | ||
|
r1057 | fstate[fn] = m | ||
prev[fn] = rev | ||||
if not incrementing: | ||||
fstate = fstate.items() | ||||
fstate.sort() | ||||
for fn, state in fstate: | ||||
|
r1145 | if fn in skip: continue | ||
|
r1057 | display(fn, rev, {}, state) | ||
|
r1146 | return (count == 0 and 1) or 0 | ||
|
r1057 | |||
|
r898 | def heads(ui, repo, **opts): | ||
|
r329 | """show current repository heads""" | ||
|
r898 | heads = repo.changelog.heads() | ||
br = None | ||||
if opts['branches']: | ||||
br = repo.branchlookup(heads) | ||||
|
r221 | for n in repo.changelog.heads(): | ||
|
r898 | show_changeset(ui, repo, changenode=n, brinfo=br) | ||
|
r221 | |||
|
r339 | def identify(ui, repo): | ||
"""print information about the working copy""" | ||||
|
r1092 | parents = [p for p in repo.dirstate.parents() if p != nullid] | ||
|
r340 | if not parents: | ||
|
r1402 | ui.write(_("unknown\n")) | ||
|
r340 | return | ||
|
r1092 | hexfunc = ui.verbose and hex or short | ||
|
r723 | (c, a, d, u) = repo.changes() | ||
|
r386 | 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 ' + ' | ||||
|
r758 | if parenttags: | ||
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""" | ||||
patches = (patch1,) + patches | ||||
|
r500 | |||
|
r966 | if not opts['force']: | ||
(c, a, d, u) = repo.changes() | ||||
if c or a or d: | ||||
|
r1402 | raise util.Abort(_("outstanding uncommitted changes")) | ||
|
r966 | |||
|
r437 | d = opts["base"] | ||
strip = opts["strip"] | ||||
|
r1193 | mailre = re.compile(r'(?:From |[\w-]+:)') | ||
|
r1390 | |||
# attempt to detect the start of a patch | ||||
# (this heuristic is borrowed from quilt) | ||||
diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' + | ||||
'retrieving revision [0-9]+(\.[0-9]+)*$|' + | ||||
'(---|\*\*\*)[ \t])') | ||||
|
r1190 | |||
|
r437 | for patch in patches: | ||
|
r1402 | ui.status(_("applying %s\n") % patch) | ||
|
r437 | pf = os.path.join(d, patch) | ||
|
r762 | message = [] | ||
|
r701 | user = None | ||
hgpatch = False | ||||
for line in file(pf): | ||||
line = line.rstrip() | ||||
|
r1220 | if (not message and not hgpatch and | ||
mailre.match(line) and not opts['force']): | ||||
|
r1190 | if len(line) > 35: line = line[:32] + '...' | ||
|
r1402 | raise util.Abort(_('first line looks like a ' | ||
'mail header: ') + line) | ||||
|
r1193 | if diffre.match(line): | ||
|
r697 | break | ||
|
r701 | elif hgpatch: | ||
# parse values when importing the result of an hg export | ||||
if line.startswith("# User "): | ||||
user = line[7:] | ||||
|
r1402 | ui.debug(_('User: %s\n') % user) | ||
|
r701 | elif not line.startswith("# ") and line: | ||
|
r762 | message.append(line) | ||
|
r701 | hgpatch = False | ||
elif line == '# HG changeset patch': | ||||
|
r607 | hgpatch = True | ||
|
r852 | message = [] # We may have collected garbage | ||
|
r701 | else: | ||
|
r762 | message.append(line) | ||
|
r607 | |||
|
r762 | # make sure message isn't empty | ||
if not message: | ||||
|
r1402 | message = _("imported patch %s\n") % patch | ||
|
r701 | else: | ||
|
r762 | message = "%s\n" % '\n'.join(message) | ||
|
r1402 | ui.debug(_('message:\n%s\n') % message) | ||
|
r437 | |||
|
r1285 | files = util.patch(strip, pf, ui) | ||
|
r437 | |||
if len(files) > 0: | ||||
addremove(ui, repo, *files) | ||||
|
r762 | repo.commit(files, message, user) | ||
|
r437 | |||
|
r1192 | def incoming(ui, repo, source="default", **opts): | ||
|
r928 | """show new changesets found in source""" | ||
|
r927 | source = ui.expandpath(source) | ||
other = hg.repository(ui, source) | ||||
if not other.local(): | ||||
|
r1402 | raise util.Abort(_("incoming doesn't work for remote repositories yet")) | ||
|
r927 | o = repo.findincoming(other) | ||
|
r931 | if not o: | ||
return | ||||
|
r927 | o = other.newer(o) | ||
for n in o: | ||||
show_changeset(ui, other, changenode=n) | ||||
|
r1192 | if opts['patch']: | ||
prev = other.changelog.parents(n)[0] | ||||
dodiff(ui, ui, other, prev, n) | ||||
ui.write("\n") | ||||
|
r927 | |||
|
r907 | def init(ui, dest="."): | ||
"""create a new repository in the given directory""" | ||||
if not os.path.exists(dest): | ||||
os.mkdir(dest) | ||||
hg.repository(ui, dest, create=1) | ||||
|
r338 | |||
|
r627 | def locate(ui, repo, *pats, **opts): | ||
"""locate files matching specific patterns""" | ||||
|
r1065 | end = opts['print0'] and '\0' or '\n' | ||
|
r742 | |||
|
r942 | for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/|)'): | ||
|
r1065 | if repo.dirstate.state(abs) == '?': | ||
continue | ||||
|
r697 | if opts['fullpath']: | ||
|
r724 | ui.write(os.path.join(repo.root, abs), end) | ||
else: | ||||
ui.write(rel, end) | ||||
|
r627 | |||
|
r1031 | def log(ui, repo, *pats, **opts): | ||
"""show revision history of entire repository or files""" | ||||
|
r1057 | class dui: | ||
# Implement and delegate some ui protocol. Save hunks of | ||||
# output for later display in the desired order. | ||||
def __init__(self, ui): | ||||
self.ui = ui | ||||
self.hunk = {} | ||||
def bump(self, rev): | ||||
self.rev = rev | ||||
self.hunk[rev] = [] | ||||
def note(self, *args): | ||||
|
r1065 | if self.verbose: | ||
self.write(*args) | ||||
|
r1057 | def status(self, *args): | ||
|
r1065 | if not self.quiet: | ||
self.write(*args) | ||||
|
r1057 | def write(self, *args): | ||
self.hunk[self.rev].append(args) | ||||
|
r1381 | def debug(self, *args): | ||
if self.debugflag: | ||||
self.write(*args) | ||||
|
r1057 | def __getattr__(self, key): | ||
return getattr(self.ui, key) | ||||
|
r1037 | cwd = repo.getcwd() | ||
if not pats and cwd: | ||||
opts['include'] = [os.path.join(cwd, i) for i in opts['include']] | ||||
opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] | ||||
|
r1146 | changeiter, getchange = walkchangerevs(ui, repo, (pats and cwd) or '', | ||
pats, opts) | ||||
for st, rev, fns in changeiter: | ||||
|
r1057 | if st == 'window': | ||
|
r1031 | du = dui(ui) | ||
|
r1057 | elif st == 'add': | ||
du.bump(rev) | ||||
|
r1238 | br = None | ||
|
r1373 | if opts['keyword']: | ||
changes = repo.changelog.read(repo.changelog.node(rev)) | ||||
miss = 0 | ||||
|
r1404 | for k in [kw.lower() for kw in opts['keyword']]: | ||
|
r1373 | if not (k in changes[1].lower() or | ||
k in changes[4].lower() or | ||||
k in " ".join(changes[3][:20]).lower()): | ||||
miss = 1 | ||||
break | ||||
if miss: | ||||
continue | ||||
|
r1405 | if opts['branch']: | ||
br = repo.branchlookup([repo.changelog.node(rev)]) | ||||
|
r1238 | show_changeset(du, repo, rev, brinfo=br) | ||
|
r1057 | if opts['patch']: | ||
changenode = repo.changelog.node(rev) | ||||
prev, other = repo.changelog.parents(changenode) | ||||
dodiff(du, du, repo, prev, changenode, fns) | ||||
du.write("\n\n") | ||||
elif st == 'iter': | ||||
for args in du.hunk[rev]: | ||||
ui.write(*args) | ||||
|
r255 | |||
|
r697 | def manifest(ui, repo, rev=None): | ||
|
r255 | """output the latest or given revision of the project manifest""" | ||
if rev: | ||||
|
r689 | try: | ||
# assume all revision numbers are for changesets | ||||
n = repo.lookup(rev) | ||||
change = repo.changelog.read(n) | ||||
n = change[0] | ||||
|
r697 | except hg.RepoError: | ||
|
r689 | n = repo.manifest.lookup(rev) | ||
|
r697 | else: | ||
n = repo.manifest.tip() | ||||
|
r255 | m = repo.manifest.read(n) | ||
|
r276 | mf = repo.manifest.readflags(n) | ||
|
r255 | files = m.keys() | ||
files.sort() | ||||
for f in files: | ||||
|
r1092 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) | ||
|
r255 | |||
|
r1192 | def outgoing(ui, repo, dest="default-push", **opts): | ||
|
r920 | """show changesets not found in destination""" | ||
dest = ui.expandpath(dest) | ||||
other = hg.repository(ui, dest) | ||||
o = repo.findoutgoing(other) | ||||
o = repo.newer(o) | ||||
for n in o: | ||||
show_changeset(ui, repo, changenode=n) | ||||
|
r1192 | if opts['patch']: | ||
prev = repo.changelog.parents(n)[0] | ||||
dodiff(ui, ui, repo, prev, n) | ||||
ui.write("\n") | ||||
|
r920 | |||
|
r706 | def parents(ui, repo, rev=None): | ||
"""show the parents of the working dir or revision""" | ||||
if rev: | ||||
p = repo.changelog.parents(repo.lookup(rev)) | ||||
|
r255 | else: | ||
p = repo.dirstate.parents() | ||||
for n in p: | ||||
|
r1092 | if n != nullid: | ||
|
r329 | show_changeset(ui, repo, changenode=n) | ||
|
r255 | |||
|
r1062 | def paths(ui, search=None): | ||
|
r924 | """show definition of symbolic path names""" | ||
|
r915 | try: | ||
repo = hg.repository(ui=ui) | ||||
|
r1065 | except hg.RepoError: | ||
|
r915 | pass | ||
|
r779 | if search: | ||
for name, path in ui.configitems("paths"): | ||||
if name == search: | ||||
ui.write("%s\n" % path) | ||||
return | ||||
|
r1402 | ui.warn(_("not found!\n")) | ||
|
r779 | return 1 | ||
else: | ||||
for name, path in ui.configitems("paths"): | ||||
ui.write("%s = %s\n" % (name, path)) | ||||
|
r404 | def pull(ui, repo, source="default", **opts): | ||
|
r246 | """pull changes from the specified source""" | ||
|
r506 | source = ui.expandpath(source) | ||
|
r1402 | ui.status(_('pulling from %s\n') % (source)) | ||
|
r500 | |||
|
r963 | if opts['ssh']: | ||
ui.setconfig("ui", "ssh", opts['ssh']) | ||||
if opts['remotecmd']: | ||||
ui.setconfig("ui", "remotecmd", opts['remotecmd']) | ||||
|
r246 | other = hg.repository(ui, source) | ||
|
r625 | r = repo.pull(other) | ||
if not r: | ||||
|
r404 | if opts['update']: | ||
return update(ui, repo) | ||||
|
r580 | else: | ||
|
r1402 | ui.status(_("(run 'hg update' to get a working copy)\n")) | ||
|
r404 | |||
return r | ||||
|
r246 | |||
|
r961 | def push(ui, repo, dest="default-push", force=False, ssh=None, remotecmd=None): | ||
|
r319 | """push changes to the specified destination""" | ||
|
r506 | dest = ui.expandpath(dest) | ||
|
r640 | ui.status('pushing to %s\n' % (dest)) | ||
|
r319 | |||
|
r961 | if ssh: | ||
ui.setconfig("ui", "ssh", ssh) | ||||
if remotecmd: | ||||
ui.setconfig("ui", "remotecmd", remotecmd) | ||||
|
r640 | other = hg.repository(ui, dest) | ||
|
r818 | r = repo.push(other, force) | ||
|
r640 | return r | ||
|
r319 | |||
|
r403 | def rawcommit(ui, repo, *flist, **rc): | ||
|
r246 | "raw commit interface" | ||
|
r763 | if rc['text']: | ||
|
r1402 | ui.warn(_("Warning: -t and --text is deprecated," | ||
" please use -m or --message instead.\n")) | ||||
|
r762 | message = rc['message'] or rc['text'] | ||
if not message and rc['logfile']: | ||||
|
r697 | try: | ||
|
r762 | message = open(rc['logfile']).read() | ||
|
r697 | except IOError: | ||
pass | ||||
|
r762 | if not message and not rc['logfile']: | ||
|
r1402 | raise util.Abort(_("missing commit message")) | ||
|
r246 | |||
|
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 | |||
|
r1202 | try: | ||
repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent']) | ||||
except ValueError, inst: | ||||
raise util.Abort(str(inst)) | ||||
|
r500 | |||
|
r245 | def recover(ui, repo): | ||
|
r255 | """roll back an interrupted transaction""" | ||
|
r245 | repo.recover() | ||
|
r1188 | def remove(ui, repo, pat, *pats, **opts): | ||
|
r245 | """remove the specified files on the next commit""" | ||
|
r1188 | names = [] | ||
|
r1189 | def okaytoremove(abs, rel, exact): | ||
c, a, d, u = repo.changes(files = [abs]) | ||||
reason = None | ||||
|
r1402 | if c: reason = _('is modified') | ||
elif a: reason = _('has been marked for add') | ||||
elif u: reason = _('is not managed') | ||||
|
r1255 | if reason: | ||
|
r1402 | if exact: ui.warn(_('not removing %s: file %s\n') % (rel, reason)) | ||
|
r1189 | else: | ||
return True | ||||
|
r1188 | for src, abs, rel, exact in walk(repo, (pat,) + pats, opts): | ||
|
r1189 | if okaytoremove(abs, rel, exact): | ||
|
r1402 | if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) | ||
|
r1188 | names.append(abs) | ||
|
r1415 | repo.remove(names, unlink=True) | ||
|
r245 | |||
|
r1253 | def rename(ui, repo, *pats, **opts): | ||
"""rename files; equivalent of copy + remove""" | ||||
errs, copied = docopy(ui, repo, pats, opts) | ||||
names = [] | ||||
for abs, rel, exact in copied: | ||||
|
r1402 | if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) | ||
|
r1253 | names.append(abs) | ||
|
r1415 | repo.remove(names, unlink=True) | ||
|
r1253 | return errs | ||
|
r588 | def revert(ui, repo, *names, **opts): | ||
"""revert modified files or dirs back to their unmodified states""" | ||||
|
r590 | node = opts['rev'] and repo.lookup(opts['rev']) or \ | ||
repo.dirstate.parents()[0] | ||||
|
r588 | root = os.path.realpath(repo.root) | ||
|
r590 | |||
|
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 | ||||
|
r590 | |||
|
r588 | relnames = map(trimpath, names or [os.getcwd()]) | ||
chosen = {} | ||||
|
r590 | |||
|
r588 | def choose(name): | ||
def body(name): | ||||
for r in relnames: | ||||
|
r697 | if not name.startswith(r): | ||
continue | ||||
|
r588 | rest = name[len(r):] | ||
|
r697 | if not rest: | ||
return r, True | ||||
|
r588 | depth = rest.count(os.sep) | ||
if not r: | ||||
|
r697 | if depth == 0 or not opts['nonrecursive']: | ||
return r, True | ||||
|
r588 | elif rest[0] == os.sep: | ||
|
r697 | if depth == 1 or not opts['nonrecursive']: | ||
return r, True | ||||
|
r588 | 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: | ||||
|
r1402 | ui.warn(_('error: no matches for %s\n') % n) | ||
|
r588 | r = 1 | ||
sys.stdout.flush() | ||||
return r | ||||
|
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""" | ||
|
r624 | |||
if opts["stdio"]: | ||||
|
r635 | fin, fout = sys.stdin, sys.stdout | ||
sys.stdout = sys.stderr | ||||
|
r624 | def getarg(): | ||
|
r635 | argline = fin.readline()[:-1] | ||
|
r624 | arg, l = argline.split() | ||
|
r635 | val = fin.read(int(l)) | ||
|
r624 | return arg, val | ||
def respond(v): | ||||
|
r635 | fout.write("%d\n" % len(v)) | ||
fout.write(v) | ||||
fout.flush() | ||||
|
r624 | |||
|
r638 | lock = None | ||
|
r624 | while 1: | ||
|
r635 | cmd = fin.readline()[:-1] | ||
|
r624 | if cmd == '': | ||
return | ||||
if cmd == "heads": | ||||
h = repo.heads() | ||||
|
r1092 | respond(" ".join(map(hex, h)) + "\n") | ||
|
r638 | if cmd == "lock": | ||
lock = repo.lock() | ||||
respond("") | ||||
if cmd == "unlock": | ||||
|
r697 | if lock: | ||
lock.release() | ||||
|
r638 | lock = None | ||
respond("") | ||||
|
r624 | elif cmd == "branches": | ||
arg, nodes = getarg() | ||||
|
r1092 | nodes = map(bin, nodes.split(" ")) | ||
|
r624 | r = [] | ||
for b in repo.branches(nodes): | ||||
|
r1092 | r.append(" ".join(map(hex, b)) + "\n") | ||
|
r624 | respond("".join(r)) | ||
elif cmd == "between": | ||||
arg, pairs = getarg() | ||||
|
r1092 | pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] | ||
|
r624 | r = [] | ||
for b in repo.between(pairs): | ||||
|
r1092 | r.append(" ".join(map(hex, b)) + "\n") | ||
|
r624 | respond("".join(r)) | ||
elif cmd == "changegroup": | ||||
nodes = [] | ||||
arg, roots = getarg() | ||||
|
r1092 | nodes = map(bin, roots.split(" ")) | ||
|
r624 | |||
|
r635 | cg = repo.changegroup(nodes) | ||
while 1: | ||||
d = cg.read(4096) | ||||
|
r697 | if not d: | ||
break | ||||
|
r635 | fout.write(d) | ||
|
r624 | |||
|
r667 | fout.flush() | ||
|
r624 | |||
|
r639 | elif cmd == "addchangegroup": | ||
if not lock: | ||||
respond("not locked") | ||||
continue | ||||
respond("") | ||||
r = repo.addchangegroup(fin) | ||||
respond("") | ||||
|
r987 | optlist = "name templates style address port ipv6 accesslog errorlog" | ||
for o in optlist.split(): | ||||
if opts[o]: | ||||
ui.setconfig("web", o, opts[o]) | ||||
|
r1177 | try: | ||
httpd = hgweb.create_server(repo) | ||||
except socket.error, inst: | ||||
raise util.Abort('cannot start server: ' + inst.args[1]) | ||||
|
r987 | |||
|
r603 | if ui.verbose: | ||
addr, port = httpd.socket.getsockname() | ||||
if addr == '0.0.0.0': | ||||
addr = socket.gethostname() | ||||
else: | ||||
try: | ||||
addr = socket.gethostbyaddr(addr)[0] | ||||
|
r697 | except socket.error: | ||
pass | ||||
|
r603 | if port != 80: | ||
|
r1402 | ui.status(_('listening at http://%s:%d/\n') % (addr, port)) | ||
|
r603 | else: | ||
|
r1402 | ui.status(_('listening at http://%s/\n') % addr) | ||
|
r603 | httpd.serve_forever() | ||
|
r500 | |||
|
r731 | def status(ui, repo, *pats, **opts): | ||
|
r213 | '''show changed files in the working directory | ||
|
r746 | M = modified | ||
|
r245 | A = added | ||
R = removed | ||||
|
r842 | ? = not tracked | ||
''' | ||||
|
r312 | |||
|
r820 | cwd = repo.getcwd() | ||
|
r1031 | files, matchfn, anypats = matchpats(repo, cwd, pats, opts) | ||
|
r884 | (c, a, d, u) = [[util.pathto(cwd, x) for x in n] | ||
|
r823 | for n in repo.changes(files=files, match=matchfn)] | ||
|
r213 | |||
|
r1402 | changetypes = [(_('modified'), 'M', c), | ||
(_('added'), 'A', a), | ||||
(_('removed'), 'R', d), | ||||
(_('unknown'), '?', u)] | ||||
|
r842 | |||
|
r1085 | end = opts['print0'] and '\0' or '\n' | ||
|
r1106 | |||
|
r842 | for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]] | ||
or changetypes): | ||||
|
r1105 | if opts['no_status']: | ||
|
r1085 | format = "%%s%s" % end | ||
else: | ||||
format = "%s %%s%s" % (char, end); | ||||
|
r1106 | |||
|
r842 | for f in changes: | ||
|
r1085 | ui.write(format % f) | ||
|
r213 | |||
|
r700 | def tag(ui, repo, name, rev=None, **opts): | ||
|
r401 | """add a tag for the current tip or a given revision""" | ||
|
r763 | if opts['text']: | ||
|
r1402 | ui.warn(_("Warning: -t and --text is deprecated," | ||
" please use -m or --message instead.\n")) | ||||
|
r401 | if name == "tip": | ||
|
r1402 | raise util.Abort(_("the name 'tip' is reserved")) | ||
|
r609 | if rev: | ||
|
r1092 | r = hex(repo.lookup(rev)) | ||
|
r609 | else: | ||
|
r1092 | r = hex(repo.changelog.tip()) | ||
|
r609 | |||
|
r580 | if name.find(revrangesep) >= 0: | ||
|
r1402 | raise util.Abort(_("'%s' cannot be used in a tag name") % revrangesep) | ||
|
r401 | |||
|
r609 | if opts['local']: | ||
repo.opener("localtags", "a").write("%s %s\n" % (r, name)) | ||||
return | ||||
|
r723 | (c, a, d, u) = repo.changes() | ||
|
r401 | for x in (c, a, d, u): | ||
|
r580 | if ".hgtags" in x: | ||
|
r1402 | raise util.Abort(_("working copy of .hgtags is changed " | ||
"(please commit .hgtags manually)")) | ||||
|
r401 | |||
|
r617 | repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name)) | ||
|
r710 | if repo.dirstate.state(".hgtags") == '?': | ||
|
r697 | repo.add([".hgtags"]) | ||
|
r401 | |||
|
r762 | message = (opts['message'] or opts['text'] or | ||
|
r1402 | _("Added tag %s for changeset %s") % (name, r)) | ||
|
r1202 | try: | ||
repo.commit([".hgtags"], message, opts['user'], opts['date']) | ||||
except ValueError, inst: | ||||
raise util.Abort(str(inst)) | ||||
|
r401 | |||
|
r248 | def tags(ui, repo): | ||
|
r255 | """list repository tags""" | ||
|
r477 | |||
|
r343 | l = repo.tagslist() | ||
l.reverse() | ||||
|
r477 | for t, n in l: | ||
|
r248 | try: | ||
|
r1092 | r = "%5d:%s" % (repo.changelog.rev(n), 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 | |||
|
r1218 | def unbundle(ui, repo, fname): | ||
|
r1222 | """apply a changegroup file""" | ||
|
r1218 | f = urllib.urlopen(fname) | ||
if f.read(4) != "HG10": | ||||
|
r1402 | raise util.Abort(_("%s: not a Mercurial bundle file") % fname) | ||
|
r1218 | |||
|
r1374 | def bzgenerator(f): | ||
zd = bz2.BZ2Decompressor() | ||||
for chunk in f: | ||||
yield zd.decompress(chunk) | ||||
yield zd.flush() | ||||
|
r1218 | |||
|
r1374 | bzgen = bzgenerator(util.filechunkiter(f, 4096)) | ||
repo.addchangegroup(util.chunkbuffer(bzgen)) | ||||
|
r1218 | |||
|
r212 | def undo(ui, repo): | ||
|
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. | ||||
""" | ||||
|
r210 | repo.undo() | ||
|
r898 | def update(ui, repo, node=None, merge=False, clean=False, branch=None): | ||
|
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. | ||||
''' | ||||
|
r898 | if branch: | ||
br = repo.branchlookup(branch=branch) | ||||
found = [] | ||||
for x in br: | ||||
if branch in br[x]: | ||||
found.append(x) | ||||
if len(found) > 1: | ||||
|
r1402 | ui.warn(_("Found multiple heads for %s\n") % branch) | ||
|
r898 | for x in found: | ||
show_changeset(ui, repo, changenode=x, brinfo=br) | ||||
return 1 | ||||
if len(found) == 1: | ||||
node = found[0] | ||||
|
r1402 | ui.warn(_("Using head %s for branch %s\n") % (short(node), branch)) | ||
|
r898 | else: | ||
|
r1402 | ui.warn(_("branch %s not found\n") % (branch)) | ||
|
r898 | return 1 | ||
else: | ||||
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 = { | ||
|
r841 | "^add": | ||
(add, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search'))], | ||||
|
r913 | "hg add [OPTION]... [FILE]..."), | ||
|
r841 | "addremove": | ||
(addremove, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_("hg addremove [OPTION]... [FILE]...")), | ||||
|
r697 | "^annotate": | ||
(annotate, | ||||
|
r1402 | [('r', 'rev', '', _('revision')), | ||
('a', 'text', None, _('treat all files as text')), | ||||
('u', 'user', None, _('show user')), | ||||
('n', 'number', None, _('show revision number')), | ||||
('c', 'changeset', None, _('show changeset')), | ||||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_('hg annotate [OPTION]... FILE...')), | ||||
|
r1218 | "bundle": | ||
(bundle, | ||||
[], | ||||
|
r1402 | _('hg bundle FILE DEST')), | ||
|
r697 | "cat": | ||
(cat, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search')), | ||||
('o', 'output', "", _('output to file')), | ||||
('r', 'rev', '', _('revision'))], | ||||
_('hg cat [OPTION]... FILE...')), | ||||
|
r697 | "^clone": | ||
(clone, | ||||
|
r1402 | [('U', 'noupdate', None, _('skip update after cloning')), | ||
('e', 'ssh', "", _('ssh command')), | ||||
('', 'pull', None, _('use pull protocol to copy metadata')), | ||||
('', 'remotecmd', "", _('remote hg command'))], | ||||
_('hg clone [OPTION]... SOURCE [DEST]')), | ||||
|
r697 | "^commit|ci": | ||
(commit, | ||||
|
r1402 | [('A', 'addremove', None, _('run add/remove during commit')), | ||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('exclude path from search')), | ||||
('m', 'message', "", _('commit message')), | ||||
('t', 'text', "", _('commit message (deprecated: use -m)')), | ||||
('l', 'logfile', "", _('commit message file')), | ||||
('d', 'date', "", _('date code')), | ||||
('u', 'user', "", _('user'))], | ||||
_('hg commit [OPTION]... [FILE]...')), | ||||
|
r1249 | "copy|cp": (copy, | ||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search')), | ||||
('A', 'after', None, _('record a copy after it has happened')), | ||||
('f', 'force', None, _('replace destination if it exists')), | ||||
('p', 'parents', None, _('append source path to dest'))], | ||||
_('hg copy [OPTION]... [SOURCE]... DEST')), | ||||
"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), | ||||
"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), | ||||
"debugconfig": (debugconfig, [], _('debugconfig')), | ||||
"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), | ||||
"debugstate": (debugstate, [], _('debugstate')), | ||||
"debugdata": (debugdata, [], _('debugdata FILE REV')), | ||||
"debugindex": (debugindex, [], _('debugindex FILE')), | ||||
"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), | ||||
"debugrename": (debugrename, [], _('debugrename FILE [REV]')), | ||||
|
r841 | "debugwalk": | ||
(debugwalk, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_('debugwalk [OPTION]... [FILE]...')), | ||||
|
r697 | "^diff": | ||
(diff, | ||||
|
r1402 | [('r', 'rev', [], _('revision')), | ||
('a', 'text', None, _('treat all files as text')), | ||||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), | ||||
|
r697 | "^export": | ||
(export, | ||||
|
r1402 | [('o', 'output', "", _('output to file')), | ||
('a', 'text', None, _('treat all files as text'))], | ||||
_("hg export [-a] [-o OUTFILE] REV...")), | ||||
|
r841 | "forget": | ||
(forget, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_("hg forget [OPTION]... FILE...")), | ||||
|
r1065 | "grep": | ||
(grep, | ||||
|
r1402 | [('0', 'print0', None, _('end fields with NUL')), | ||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('include path in search')), | ||||
('', 'all', None, _('print all revisions with matches')), | ||||
('i', 'ignore-case', None, _('ignore case when matching')), | ||||
('l', 'files-with-matches', None, _('print names of files and revs with matches')), | ||||
('n', 'line-number', None, _('print line numbers')), | ||||
('r', 'rev', [], _('search in revision rev')), | ||||
('u', 'user', None, _('print user who made change'))], | ||||
_("hg grep [OPTION]... PATTERN [FILE]...")), | ||||
|
r905 | "heads": | ||
(heads, | ||||
|
r1402 | [('b', 'branches', None, _('find branch info'))], | ||
_('hg heads [-b]')), | ||||
"help": (help_, [], _('hg help [COMMAND]')), | ||||
"identify|id": (identify, [], _('hg identify')), | ||||
|
r697 | "import|patch": | ||
(import_, | ||||
|
r1402 | [('p', 'strip', 1, _('path strip')), | ||
('f', 'force', None, _('skip check for outstanding changes')), | ||||
('b', 'base', "", _('base path'))], | ||||
_("hg import [-f] [-p NUM] [-b BASE] PATCH...")), | ||||
|
r1253 | "incoming|in": (incoming, | ||
|
r1402 | [('p', 'patch', None, _('show patch'))], | ||
_('hg incoming [-p] [SOURCE]')), | ||||
"^init": (init, [], _('hg init [DEST]')), | ||||
|
r697 | "locate": | ||
(locate, | ||||
|
r1402 | [('r', 'rev', '', _('revision')), | ||
('0', 'print0', None, _('end filenames with NUL')), | ||||
('f', 'fullpath', None, _('print complete paths')), | ||||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_('hg locate [OPTION]... [PATTERN]...')), | ||||
|
r697 | "^log|history": | ||
(log, | ||||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search')), | ||||
('b', 'branch', None, _('show branches')), | ||||
('k', 'keyword', [], _('search for a keyword')), | ||||
('r', 'rev', [], _('revision')), | ||||
('p', 'patch', None, _('show patch'))], | ||||
_('hg log [-I] [-X] [-r REV]... [-p] [FILE]')), | ||||
"manifest": (manifest, [], _('hg manifest [REV]')), | ||||
|
r1253 | "outgoing|out": (outgoing, | ||
|
r1402 | [('p', 'patch', None, _('show patch'))], | ||
_('hg outgoing [-p] [DEST]')), | ||||
"parents": (parents, [], _('hg parents [REV]')), | ||||
"paths": (paths, [], _('hg paths [NAME]')), | ||||
|
r697 | "^pull": | ||
(pull, | ||||
|
r1402 | [('u', 'update', None, _('update working directory')), | ||
('e', 'ssh', "", _('ssh command')), | ||||
('', 'remotecmd', "", _('remote hg command'))], | ||||
_('hg pull [-u] [-e FILE] [--remotecmd FILE] [SOURCE]')), | ||||
|
r818 | "^push": | ||
(push, | ||||
|
r1402 | [('f', 'force', None, _('force push')), | ||
('e', 'ssh', "", _('ssh command')), | ||||
('', 'remotecmd', "", _('remote hg command'))], | ||||
_('hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]')), | ||||
|
r697 | "rawcommit": | ||
(rawcommit, | ||||
|
r1402 | [('p', 'parent', [], _('parent')), | ||
('d', 'date', "", _('date code')), | ||||
('u', 'user', "", _('user')), | ||||
('F', 'files', "", _('file list')), | ||||
('m', 'message', "", _('commit message')), | ||||
('t', 'text', "", _('commit message (deprecated: use -m)')), | ||||
('l', 'logfile', "", _('commit message file'))], | ||||
_('hg rawcommit [OPTION]... [FILE]...')), | ||||
"recover": (recover, [], _("hg recover")), | ||||
|
r1188 | "^remove|rm": (remove, | ||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_("hg remove [OPTION]... FILE...")), | ||||
|
r1253 | "rename|mv": (rename, | ||
|
r1402 | [('I', 'include', [], _('include path in search')), | ||
('X', 'exclude', [], _('exclude path from search')), | ||||
('A', 'after', None, _('record a copy after it has happened')), | ||||
('f', 'force', None, _('replace destination if it exists')), | ||||
('p', 'parents', None, _('append source path to dest'))], | ||||
_('hg rename [OPTION]... [SOURCE]... DEST')), | ||||
|
r697 | "^revert": | ||
(revert, | ||||
|
r1402 | [("n", "nonrecursive", None, _("don't recurse into subdirs")), | ||
("r", "rev", "", _("revision"))], | ||||
_("hg revert [-n] [-r REV] [NAME]...")), | ||||
"root": (root, [], _("hg root")), | ||||
|
r697 | "^serve": | ||
(serve, | ||||
|
r1402 | [('A', 'accesslog', '', _('access log file')), | ||
('E', 'errorlog', '', _('error log file')), | ||||
('p', 'port', 0, _('listen port')), | ||||
('a', 'address', '', _('interface address')), | ||||
('n', 'name', "", _('repository name')), | ||||
('', 'stdio', None, _('for remote clients')), | ||||
('t', 'templates', "", _('template directory')), | ||||
('', 'style', "", _('template style')), | ||||
('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], | ||||
_("hg serve [OPTION]...")), | ||||
|
r840 | "^status": | ||
(status, | ||||
|
r1402 | [('m', 'modified', None, _('show only modified files')), | ||
('a', 'added', None, _('show only added files')), | ||||
('r', 'removed', None, _('show only removed files')), | ||||
('u', 'unknown', None, _('show only unknown (not tracked) files')), | ||||
('n', 'no-status', None, _('hide status prefix')), | ||||
('0', 'print0', None, _('end filenames with NUL')), | ||||
('I', 'include', [], _('include path in search')), | ||||
('X', 'exclude', [], _('exclude path from search'))], | ||||
_("hg status [OPTION]... [FILE]...")), | ||||
|
r697 | "tag": | ||
(tag, | ||||
|
r1402 | [('l', 'local', None, _('make the tag local')), | ||
('m', 'message', "", _('commit message')), | ||||
('t', 'text', "", _('commit message (deprecated: use -m)')), | ||||
('d', 'date', "", _('date code')), | ||||
('u', 'user', "", _('user'))], | ||||
_('hg tag [OPTION]... NAME [REV]')), | ||||
"tags": (tags, [], _('hg tags')), | ||||
"tip": (tip, [], _('hg tip')), | ||||
|
r1218 | "unbundle": | ||
(unbundle, | ||||
[], | ||||
|
r1402 | _('hg unbundle FILE')), | ||
"undo": (undo, [], _('hg undo')), | ||||
|
r593 | "^update|up|checkout|co": | ||
|
r697 | (update, | ||
|
r1402 | [('b', 'branch', "", _('checkout the head of a specific branch')), | ||
('m', 'merge', None, _('allow merging of conflicts')), | ||||
('C', 'clean', None, _('overwrite locally modified files'))], | ||||
_('hg update [-b TAG] [-m] [-C] [REV]')), | ||||
"verify": (verify, [], _('hg verify')), | ||||
"version": (show_version, [], _('hg version')), | ||||
|
r1046 | } | ||
|
r209 | |||
|
r1046 | globalopts = [ | ||
|
r1402 | ('R', 'repository', "", _('repository root directory')), | ||
('', 'cwd', '', _('change working directory')), | ||||
('y', 'noninteractive', None, _('run non-interactively')), | ||||
('q', 'quiet', None, _('quiet mode')), | ||||
('v', 'verbose', None, _('verbose mode')), | ||||
('', 'debug', None, _('debug mode')), | ||||
('', 'debugger', None, _('start debugger')), | ||||
('', 'traceback', None, _('print traceback on exception')), | ||||
('', 'time', None, _('time how long the command takes')), | ||||
('', 'profile', None, _('profile')), | ||||
('', 'version', None, _('output version information and exit')), | ||||
('h', 'help', None, _('display help and exit')), | ||||
|
r1046 | ] | ||
|
r596 | |||
|
r1262 | norepo = ("clone init version help debugancestor debugconfig debugdata" | ||
|
r1065 | " debugindex debugindexdot paths") | ||
|
r209 | |||
|
r212 | def find(cmd): | ||
for e in table.keys(): | ||||
|
r335 | if re.match("(%s)$" % e, cmd): | ||
|
r849 | return e, table[e] | ||
|
r212 | |||
raise UnknownCommand(cmd) | ||||
|
r697 | class SignalInterrupt(Exception): | ||
"""Exception raised on SIGTERM and SIGHUP.""" | ||||
|
r214 | |||
def catchterm(*args): | ||||
raise SignalInterrupt | ||||
|
r249 | def run(): | ||
sys.exit(dispatch(sys.argv[1:])) | ||||
|
r697 | class ParseError(Exception): | ||
"""Exception raised on errors in parsing the command line.""" | ||||
|
r592 | |||
|
r596 | def parse(args): | ||
|
r209 | options = {} | ||
|
r596 | cmdoptions = {} | ||
|
r209 | |||
|
r592 | try: | ||
|
r596 | args = fancyopts.fancyopts(args, globalopts, options) | ||
|
r592 | except fancyopts.getopt.GetoptError, inst: | ||
|
r618 | raise ParseError(None, inst) | ||
|
r209 | |||
|
r1047 | if args: | ||
cmd, args = args[0], args[1:] | ||||
i = find(cmd)[1] | ||||
c = list(i[1]) | ||||
|
r209 | else: | ||
|
r1047 | cmd = None | ||
c = [] | ||||
|
r209 | |||
|
r592 | # combine global options into local | ||
|
r596 | for o in globalopts: | ||
|
r592 | c.append((o[0], o[1], options[o[1]], o[3])) | ||
|
r214 | |||
|
r293 | try: | ||
|
r596 | args = fancyopts.fancyopts(args, c, cmdoptions) | ||
|
r293 | except fancyopts.getopt.GetoptError, inst: | ||
|
r596 | raise ParseError(cmd, inst) | ||
|
r209 | |||
|
r592 | # separate global options back out | ||
|
r596 | for o in globalopts: | ||
|
r592 | n = o[1] | ||
options[n] = cmdoptions[n] | ||||
del cmdoptions[n] | ||||
|
r1047 | return (cmd, cmd and i[0] or None, args, options, cmdoptions) | ||
|
r596 | |||
def dispatch(args): | ||||
signal.signal(signal.SIGTERM, catchterm) | ||||
|
r697 | try: | ||
signal.signal(signal.SIGHUP, catchterm) | ||||
except AttributeError: | ||||
pass | ||||
|
r596 | |||
|
r1071 | u = ui.ui() | ||
external = [] | ||||
for x in u.extensions(): | ||||
if x[1]: | ||||
|
r1342 | try: | ||
mod = imp.load_source(x[0], x[1]) | ||||
except: | ||||
|
r1402 | u.warn(_("*** failed to import extension %s\n") % x[1]) | ||
|
r1342 | continue | ||
|
r1071 | else: | ||
def importh(name): | ||||
mod = __import__(name) | ||||
components = name.split('.') | ||||
for comp in components[1:]: | ||||
mod = getattr(mod, comp) | ||||
return mod | ||||
|
r1342 | try: | ||
mod = importh(x[0]) | ||||
except: | ||||
|
r1402 | u.warn(_("failed to import extension %s\n") % x[0]) | ||
|
r1342 | continue | ||
|
r1071 | external.append(mod) | ||
for x in external: | ||||
|
r1295 | cmdtable = getattr(x, 'cmdtable', {}) | ||
for t in cmdtable: | ||||
|
r1071 | if t in table: | ||
|
r1402 | u.warn(_("module %s overrides %s\n") % (x.__name__, t)) | ||
|
r1295 | table.update(cmdtable) | ||
|
r1071 | |||
|
r596 | try: | ||
cmd, func, args, options, cmdoptions = parse(args) | ||||
except ParseError, inst: | ||||
if inst.args[0]: | ||||
|
r1402 | u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) | ||
|
r697 | help_(u, inst.args[0]) | ||
|
r596 | else: | ||
|
r1402 | u.warn(_("hg: %s\n") % inst.args[1]) | ||
|
r848 | help_(u, 'shortlist') | ||
|
r596 | sys.exit(-1) | ||
except UnknownCommand, inst: | ||||
|
r1402 | u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | ||
|
r848 | help_(u, 'shortlist') | ||
|
r596 | sys.exit(1) | ||
|
r783 | if options["time"]: | ||
def get_times(): | ||||
t = os.times() | ||||
if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() | ||||
t = (t[0], t[1], t[2], t[3], time.clock()) | ||||
return t | ||||
s = get_times() | ||||
def print_time(): | ||||
t = get_times() | ||||
|
r1402 | u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % | ||
|
r783 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) | ||
atexit.register(print_time) | ||||
|
r1071 | u.updateopts(options["verbose"], options["debug"], options["quiet"], | ||
|
r697 | not options["noninteractive"]) | ||
|
r592 | |||
|
r1225 | # enter the debugger before command execution | ||
if options['debugger']: | ||||
pdb.set_trace() | ||||
|
r499 | try: | ||
|
r527 | try: | ||
|
r1048 | if options['help']: | ||
|
r1049 | help_(u, cmd, options['version']) | ||
|
r1048 | sys.exit(0) | ||
elif options['version']: | ||||
|
r1047 | show_version(u) | ||
sys.exit(0) | ||||
elif not cmd: | ||||
help_(u, 'shortlist') | ||||
sys.exit(0) | ||||
|
r1050 | if options['cwd']: | ||
try: | ||||
os.chdir(options['cwd']) | ||||
except OSError, inst: | ||||
|
r1227 | raise util.Abort('%s: %s' % | ||
(options['cwd'], inst.strerror)) | ||||
|
r1050 | |||
|
r527 | if cmd not in norepo.split(): | ||
path = options["repository"] or "" | ||||
repo = hg.repository(ui=u, path=path) | ||||
|
r1071 | for x in external: | ||
|
r1295 | if hasattr(x, 'reposetup'): x.reposetup(u, repo) | ||
|
r596 | d = lambda: func(u, repo, *args, **cmdoptions) | ||
|
r527 | else: | ||
|
r596 | d = lambda: func(u, *args, **cmdoptions) | ||
|
r209 | |||
|
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: | ||||
|
r1225 | # enter the debugger when we hit an exception | ||
if options['debugger']: | ||||
pdb.post_mortem(sys.exc_info()[2]) | ||||
|
r527 | if options['traceback']: | ||
traceback.print_exc() | ||||
raise | ||||
|
r499 | except hg.RepoError, inst: | ||
|
r1402 | u.warn(_("abort: "), inst, "!\n") | ||
|
r1214 | except revlog.RevlogError, inst: | ||
|
r1402 | u.warn(_("abort: "), inst, "!\n") | ||
|
r214 | except SignalInterrupt: | ||
|
r1402 | u.warn(_("killed!\n")) | ||
|
r209 | except KeyboardInterrupt: | ||
|
r832 | try: | ||
|
r1402 | u.warn(_("interrupted!\n")) | ||
|
r832 | except IOError, inst: | ||
if inst.errno == errno.EPIPE: | ||||
if u.debugflag: | ||||
|
r1402 | u.warn(_("\nbroken pipe\n")) | ||
|
r832 | else: | ||
raise | ||||
|
r250 | except IOError, inst: | ||
|
r395 | if hasattr(inst, "code"): | ||
|
r1402 | u.warn(_("abort: %s\n") % inst) | ||
|
r395 | elif hasattr(inst, "reason"): | ||
|
r1402 | u.warn(_("abort: error: %s\n") % inst.reason[1]) | ||
|
r395 | elif hasattr(inst, "args") and inst[0] == errno.EPIPE: | ||
|
r1065 | if u.debugflag: | ||
|
r1402 | u.warn(_("broken pipe\n")) | ||
|
r1350 | elif getattr(inst, "strerror", None): | ||
|
r1354 | if getattr(inst, "filename", None): | ||
|
r1402 | u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename)) | ||
|
r1354 | else: | ||
|
r1402 | u.warn(_("abort: %s\n") % inst.strerror) | ||
|
r250 | else: | ||
raise | ||||
|
r549 | except OSError, inst: | ||
if hasattr(inst, "filename"): | ||||
|
r1402 | u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) | ||
|
r549 | else: | ||
|
r1402 | u.warn(_("abort: %s\n") % inst.strerror) | ||
|
r870 | except util.Abort, inst: | ||
|
r1402 | u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n') | ||
|
r727 | sys.exit(1) | ||
|
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") | ||
|
r1402 | u.warn(_("%s: invalid arguments\n") % cmd) | ||
|
r697 | help_(u, cmd) | ||
|
r848 | except UnknownCommand, inst: | ||
|
r1402 | u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | ||
|
r848 | help_(u, 'shortlist') | ||
|
r1215 | except SystemExit: | ||
|
r1229 | # don't catch this in the catch-all below | ||
|
r1215 | raise | ||
except: | ||||
|
r1402 | u.warn(_("** unknown exception encountered, details follow\n")) | ||
u.warn(_("** report bug details to mercurial@selenic.com\n")) | ||||
|
r1215 | raise | ||
|
r293 | |||
|
r503 | sys.exit(-1) | ||