commands.py
3404 lines
| 125.7 KiB
| text/x-python
|
PythonLexer
/ mercurial / commands.py
|
r249 | # commands.py - command processing for mercurial | ||
# | ||||
|
r2859 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | ||
|
r249 | # | ||
# 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 _ | ||
|
r3068 | demandload(globals(), "os re sys signal shutil imp urllib pdb shlex") | ||
|
r1944 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") | ||
|
r2874 | demandload(globals(), "fnmatch difflib patch random signal tempfile time") | ||
|
r1944 | demandload(globals(), "traceback errno socket version struct atexit sets bz2") | ||
|
r2866 | demandload(globals(), "archival cStringIO changegroup") | ||
|
r2874 | demandload(globals(), "cmdutil hgweb.server sshserver") | ||
|
r209 | |||
|
r697 | class UnknownCommand(Exception): | ||
"""Exception raised if command is not in the command table.""" | ||||
|
r1518 | class AmbiguousCommand(Exception): | ||
"""Exception raised if command shortcut matches more than one command.""" | ||||
|
r209 | |||
|
r2158 | def bail_if_changed(repo): | ||
|
r2875 | modified, added, removed, deleted = repo.status()[:4] | ||
|
r2158 | if modified or added or removed or deleted: | ||
raise util.Abort(_("outstanding uncommitted changes")) | ||||
|
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 | |||
|
r2799 | def logmessage(opts): | ||
|
r2694 | """ get the log message according to -m and -l option """ | ||
message = opts['message'] | ||||
logfile = opts['logfile'] | ||||
if message and logfile: | ||||
raise util.Abort(_('options --message and --logfile are mutually ' | ||||
'exclusive')) | ||||
if not message and logfile: | ||||
try: | ||||
if logfile == '-': | ||||
message = sys.stdin.read() | ||||
else: | ||||
message = open(logfile).read() | ||||
except IOError, inst: | ||||
raise util.Abort(_("can't read commit message '%s': %s") % | ||||
(logfile, inst.strerror)) | ||||
return message | ||||
|
r1568 | def walkchangerevs(ui, repo, 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. | ||||
|
r1570 | This function returns an (iterator, getchange, matchfn) tuple. The | ||
|
r1146 | 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 | |||
|
r1799 | def increasing_windows(start, end, windowsize=8, sizelimit=512): | ||
if start < end: | ||||
while start < end: | ||||
yield start, min(windowsize, end-start) | ||||
start += windowsize | ||||
if windowsize < sizelimit: | ||||
windowsize *= 2 | ||||
else: | ||||
while start > end: | ||||
yield start, min(windowsize, start-end-1) | ||||
start -= windowsize | ||||
if windowsize < sizelimit: | ||||
windowsize *= 2 | ||||
|
r2882 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r2784 | follow = opts.get('follow') or opts.get('follow_first') | ||
|
r1570 | |||
|
r1337 | if repo.changelog.count() == 0: | ||
|
r1570 | return [], False, matchfn | ||
|
r1337 | |||
|
r2783 | if follow: | ||
|
r3132 | defrange = '%s:0' % repo.changectx().rev() | ||
|
r2783 | else: | ||
defrange = 'tip:0' | ||||
|
r3090 | revs = map(int, cmdutil.revrange(ui, repo, opts['rev'] or [defrange])) | ||
|
r1057 | wanted = {} | ||
slowpath = anypats | ||||
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)) | ||||
|
r2741 | copies = [] | ||
|
r1057 | if not slowpath: | ||
# Only files, no patterns. Check the history of each file. | ||||
|
r2741 | def filerevgen(filelog, node): | ||
|
r2626 | cl_count = repo.changelog.count() | ||
|
r2741 | if node is None: | ||
last = filelog.count() - 1 | ||||
else: | ||||
last = filelog.rev(node) | ||||
for i, window in increasing_windows(last, -1): | ||||
|
r1057 | revs = [] | ||
|
r1800 | for j in xrange(i - window, i + 1): | ||
|
r2741 | n = filelog.node(j) | ||
revs.append((filelog.linkrev(n), | ||||
follow and filelog.renamed(n))) | ||||
|
r1057 | revs.reverse() | ||
for rev in revs: | ||||
|
r2626 | # only yield rev for which we have the changelog, it can | ||
# happen while doing "hg log" during a pull or commit | ||||
|
r2741 | if rev[0] < cl_count: | ||
|
r2626 | yield rev | ||
|
r2741 | def iterfiles(): | ||
for filename in files: | ||||
yield filename, None | ||||
for filename_node in copies: | ||||
yield filename_node | ||||
|
r1057 | minrev, maxrev = min(revs), max(revs) | ||
|
r2741 | for file_, node in iterfiles(): | ||
|
r1749 | filelog = repo.file(file_) | ||
|
r1057 | # 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 | ||||
|
r2741 | for rev, copied in filerevgen(filelog, node): | ||
|
r1057 | if rev <= maxrev: | ||
|
r1065 | if rev < minrev: | ||
break | ||||
|
r1057 | fncache.setdefault(rev, []) | ||
|
r1749 | fncache[rev].append(file_) | ||
|
r1057 | wanted[rev] = 1 | ||
|
r2741 | if follow and copied: | ||
copies.append(copied) | ||||
|
r1057 | if slowpath: | ||
|
r2741 | if follow: | ||
raise util.Abort(_('can only follow copies/renames for explicit ' | ||||
'file names')) | ||||
|
r1057 | # The slow path checks files modified in every changeset. | ||
def changerevgen(): | ||||
|
r1799 | for i, window in increasing_windows(repo.changelog.count()-1, -1): | ||
|
r1800 | for j in xrange(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 | ||||
|
r2901 | class followfilter: | ||
def __init__(self, onlyfirst=False): | ||||
self.startrev = -1 | ||||
self.roots = [] | ||||
self.onlyfirst = onlyfirst | ||||
def match(self, rev): | ||||
def realparents(rev): | ||||
if self.onlyfirst: | ||||
return repo.changelog.parentrevs(rev)[0:1] | ||||
else: | ||||
return filter(lambda x: x != -1, repo.changelog.parentrevs(rev)) | ||||
if self.startrev == -1: | ||||
self.startrev = rev | ||||
return True | ||||
if rev > self.startrev: | ||||
# forward: all descendants | ||||
if not self.roots: | ||||
self.roots.append(self.startrev) | ||||
for parent in realparents(rev): | ||||
if parent in self.roots: | ||||
self.roots.append(rev) | ||||
return True | ||||
else: | ||||
# backwards: all parents | ||||
if not self.roots: | ||||
self.roots.extend(realparents(self.startrev)) | ||||
if rev in self.roots: | ||||
self.roots.remove(rev) | ||||
self.roots.extend(realparents(rev)) | ||||
|
r2782 | return True | ||
|
r2901 | return False | ||
# it might be worthwhile to do this in the iterator if the rev range | ||||
# is descending and the prune args are all within that range | ||||
|
r2911 | for rev in opts.get('prune', ()): | ||
|
r2901 | rev = repo.changelog.rev(repo.lookup(rev)) | ||
ff = followfilter() | ||||
stop = min(revs[0], revs[-1]) | ||||
for x in range(rev, stop-1, -1): | ||||
if ff.match(x) and wanted.has_key(x): | ||||
del wanted[x] | ||||
def iterate(): | ||||
|
r2782 | if follow and not files: | ||
|
r2784 | ff = followfilter(onlyfirst=opts.get('follow_first')) | ||
|
r2782 | def want(rev): | ||
|
r2901 | if ff.match(rev) and rev in wanted: | ||
return True | ||||
return False | ||||
|
r2782 | else: | ||
def want(rev): | ||||
return rev in wanted | ||||
|
r1799 | for i, window in increasing_windows(0, len(revs)): | ||
|
r1146 | yield 'window', revs[0] < revs[-1], revs[-1] | ||
|
r2782 | nrevs = [rev for rev in revs[i:i+window] if want(rev)] | ||
|
r1146 | 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 | ||||
|
r1570 | return iterate(), getchange, matchfn | ||
|
r1057 | |||
|
r1974 | def write_bundle(cg, filename=None, compress=True): | ||
"""Write a bundle file and return its filename. | ||||
Existing files will not be overwritten. | ||||
If no filename is specified, a temporary file is created. | ||||
bz2 compression can be turned off. | ||||
The bundle file will be deleted in case of errors. | ||||
|
r1972 | """ | ||
|
r1943 | class nocompress(object): | ||
def compress(self, x): | ||||
return x | ||||
def flush(self): | ||||
return "" | ||||
|
r1974 | |||
fh = None | ||||
cleanup = None | ||||
|
r1943 | try: | ||
|
r1974 | if filename: | ||
if os.path.exists(filename): | ||||
|
r3072 | raise util.Abort(_("file '%s' already exists") % filename) | ||
|
r1974 | fh = open(filename, "wb") | ||
else: | ||||
|
r2165 | fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg") | ||
|
r1974 | fh = os.fdopen(fd, "wb") | ||
cleanup = filename | ||||
|
r1943 | if compress: | ||
fh.write("HG10") | ||||
z = bz2.BZ2Compressor(9) | ||||
else: | ||||
|
r1980 | fh.write("HG10UN") | ||
|
r1943 | z = nocompress() | ||
|
r1981 | # parse the changegroup data, otherwise we will block | ||
# in case of sshrepo because we don't know the end of the stream | ||||
# an empty chunkiter is the end of the changegroup | ||||
empty = False | ||||
while not empty: | ||||
empty = True | ||||
for chunk in changegroup.chunkiter(cg): | ||||
empty = False | ||||
fh.write(z.compress(changegroup.genchunk(chunk))) | ||||
fh.write(z.compress(changegroup.closechunk())) | ||||
|
r1943 | fh.write(z.flush()) | ||
|
r1974 | cleanup = None | ||
return filename | ||||
finally: | ||||
if fh is not None: | ||||
fh.close() | ||||
if cleanup is not None: | ||||
os.unlink(cleanup) | ||||
|
r1943 | |||
|
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 | |||
|
r1907 | class changeset_printer(object): | ||
|
r1909 | '''show changeset information when templating not requested.''' | ||
|
r1907 | def __init__(self, ui, repo): | ||
self.ui = ui | ||||
self.repo = repo | ||||
def show(self, rev=0, changenode=None, brinfo=None): | ||||
|
r1909 | '''show a single changeset or file revision''' | ||
|
r1907 | log = self.repo.changelog | ||
if changenode is None: | ||||
changenode = log.node(rev) | ||||
elif not rev: | ||||
rev = log.rev(changenode) | ||||
if self.ui.quiet: | ||||
self.ui.write("%d:%s\n" % (rev, short(changenode))) | ||||
return | ||||
changes = log.read(changenode) | ||||
date = util.datestr(changes[2]) | ||||
|
r2966 | hexfunc = self.ui.debugflag and hex or short | ||
parents = [(log.rev(p), hexfunc(p)) for p in log.parents(changenode) | ||||
|
r1907 | if self.ui.debugflag or p != nullid] | ||
if (not self.ui.debugflag and len(parents) == 1 and | ||||
parents[0][0] == rev-1): | ||||
parents = [] | ||||
|
r2966 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) | ||
|
r1907 | |||
for tag in self.repo.nodetags(changenode): | ||||
self.ui.status(_("tag: %s\n") % tag) | ||||
for parent in parents: | ||||
self.ui.write(_("parent: %d:%s\n") % parent) | ||||
if brinfo and changenode in brinfo: | ||||
br = brinfo[changenode] | ||||
self.ui.write(_("branch: %s\n") % " ".join(br)) | ||||
self.ui.debug(_("manifest: %d:%s\n") % | ||||
(self.repo.manifest.rev(changes[0]), hex(changes[0]))) | ||||
self.ui.status(_("user: %s\n") % changes[1]) | ||||
self.ui.status(_("date: %s\n") % date) | ||||
if self.ui.debugflag: | ||||
|
r2875 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] | ||
|
r1907 | for key, value in zip([_("files:"), _("files+:"), _("files-:")], | ||
files): | ||||
if value: | ||||
self.ui.note("%-12s %s\n" % (key, " ".join(value))) | ||||
else: | ||||
self.ui.note(_("files: %s\n") % " ".join(changes[3])) | ||||
description = changes[4].strip() | ||||
if description: | ||||
if self.ui.verbose: | ||||
self.ui.status(_("description:\n")) | ||||
self.ui.status(description) | ||||
self.ui.status("\n\n") | ||||
else: | ||||
self.ui.status(_("summary: %s\n") % | ||||
description.splitlines()[0]) | ||||
self.ui.status("\n") | ||||
def show_changeset(ui, repo, opts): | ||||
|
r1909 | '''show one changeset. uses template or regular display. caller | ||
|
r1913 | can pass in 'style' and 'template' options in opts.''' | ||
|
r1909 | |||
|
r1907 | tmpl = opts.get('template') | ||
if tmpl: | ||||
tmpl = templater.parsestring(tmpl, quoted=False) | ||||
|
r778 | else: | ||
|
r1907 | tmpl = ui.config('ui', 'logtemplate') | ||
if tmpl: tmpl = templater.parsestring(tmpl) | ||||
|
r1914 | mapfile = opts.get('style') or ui.config('ui', 'style') | ||
|
r1907 | if tmpl or mapfile: | ||
if mapfile: | ||||
if not os.path.isfile(mapfile): | ||||
|
r1914 | mapname = templater.templatepath('map-cmdline.' + mapfile) | ||
if not mapname: mapname = templater.templatepath(mapfile) | ||||
|
r1907 | if mapname: mapfile = mapname | ||
try: | ||||
|
r2189 | t = templater.changeset_templater(ui, repo, mapfile) | ||
|
r1907 | except SyntaxError, inst: | ||
raise util.Abort(inst.args[0]) | ||||
if tmpl: t.use_template(tmpl) | ||||
return t | ||||
return changeset_printer(ui, repo) | ||||
|
r329 | |||
|
r2731 | def setremoteconfig(ui, opts): | ||
"copy remote options to ui tree" | ||||
if opts.get('ssh'): | ||||
ui.setconfig("ui", "ssh", opts['ssh']) | ||||
if opts.get('remotecmd'): | ||||
ui.setconfig("ui", "remotecmd", opts['remotecmd']) | ||||
|
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(_( | ||
|
r2859 | "\nCopyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com>\n" | ||
|
r423 | "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 | |||
|
r2553 | def help_(ui, name=None, with_version=False): | ||
"""show help for a command, extension, or list of commands | ||||
With no arguments, print a list of commands and short help. | ||||
|
r2600 | |||
|
r2553 | Given a command name, print help for that command. | ||
Given an extension name, print help for that extension, and the | ||||
commands it provides.""" | ||||
|
r1052 | option_lists = [] | ||
|
r2553 | |||
def helpcmd(name): | ||||
|
r1049 | if with_version: | ||
show_version(ui) | ||||
ui.write('\n') | ||||
|
r2988 | aliases, i = findcmd(ui, name) | ||
|
r849 | # synopsis | ||
|
r848 | ui.write("%s\n\n" % i[2]) | ||
|
r293 | |||
|
r849 | # description | ||
doc = i[0].__doc__ | ||||
|
r1710 | if not doc: | ||
doc = _("(No help text available)") | ||||
|
r849 | if ui.quiet: | ||
doc = doc.splitlines(0)[0] | ||||
ui.write("%s\n" % doc.rstrip()) | ||||
if not ui.quiet: | ||||
|
r1052 | # aliases | ||
|
r1517 | if len(aliases) > 1: | ||
ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) | ||||
|
r849 | |||
|
r1052 | # options | ||
if i[1]: | ||||
option_lists.append(("options", i[1])) | ||||
|
r2600 | |||
|
r2553 | def helplist(select=None): | ||
|
r255 | h = {} | ||
|
r844 | cmds = {} | ||
|
r479 | for c, e in table.items(): | ||
|
r2553 | f = c.split("|", 1)[0] | ||
if select and not select(f): | ||||
continue | ||||
if name == "shortlist" and not f.startswith("^"): | ||||
|
r479 | continue | ||
|
r849 | f = f.lstrip("^") | ||
|
r593 | if not ui.debugflag and f.startswith("debug"): | ||
continue | ||||
|
r1710 | doc = e[0].__doc__ | ||
if not doc: | ||||
doc = _("(No help text available)") | ||||
h[f] = doc.splitlines(0)[0].rstrip() | ||||
|
r1615 | 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("|",", ") | ||||
|
r1615 | ui.write(" %s:\n %s\n"%(commands, h[f])) | ||
|
r844 | else: | ||
ui.write(' %-*s %s\n' % (m, f, h[f])) | ||||
|
r255 | |||
|
r2553 | def helpext(name): | ||
try: | ||||
mod = findext(name) | ||||
except KeyError: | ||||
raise UnknownCommand(name) | ||||
doc = (mod.__doc__ or _('No help text available')).splitlines(0) | ||||
ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) | ||||
for d in doc[1:]: | ||||
ui.write(d, '\n') | ||||
ui.status('\n') | ||||
if ui.verbose: | ||||
ui.status(_('list of commands:\n\n')) | ||||
else: | ||||
ui.status(_('list of commands (use "hg help -v %s" ' | ||||
'to show aliases and global options):\n\n') % name) | ||||
modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable]) | ||||
helplist(modcmds.has_key) | ||||
if name and name != 'shortlist': | ||||
try: | ||||
helpcmd(name) | ||||
except UnknownCommand: | ||||
helpext(name) | ||||
else: | ||||
# program name | ||||
if ui.verbose or with_version: | ||||
show_version(ui) | ||||
else: | ||||
ui.status(_("Mercurial Distributed SCM\n")) | ||||
ui.status('\n') | ||||
# list of commands | ||||
if name == "shortlist": | ||||
ui.status(_('basic commands (use "hg help" ' | ||||
'for the full list or option "-v" for details):\n\n')) | ||||
elif ui.verbose: | ||||
ui.status(_('list of commands:\n\n')) | ||||
else: | ||||
ui.status(_('list of commands (use "hg help -v" ' | ||||
'to show aliases and global options):\n\n')) | ||||
helplist() | ||||
|
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, | ||||
|
r1602 | 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): | ||
|
r1437 | """add the specified files on the next commit | ||
Schedule files to be version controlled and added to the repository. | ||||
The files will be added to the repository at the next commit. | ||||
|
r1568 | If no names are given, add all files in the repository. | ||
|
r1437 | """ | ||
|
r724 | names = [] | ||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): | ||
|
r942 | if exact: | ||
|
r1615 | 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) | ||
|
r2503 | if not opts.get('dry_run'): | ||
|
r2411 | repo.add(names) | ||
|
r213 | |||
|
r766 | def addremove(ui, repo, *pats, **opts): | ||
|
r2181 | """add all new files, delete all missing files (DEPRECATED) | ||
|
r1437 | Add all new files and remove all missing files from the repository. | ||
New files are ignored if they match any of the patterns in .hgignore. As | ||||
with add, these changes take effect at the next commit. | ||||
|
r2958 | |||
Use the -s option to detect renamed files. With a parameter > 0, | ||||
this compares every removed file with every added file and records | ||||
those similar enough as renames. This option takes a percentage | ||||
between 0 (disabled) and 100 (files must be identical) as its | ||||
parameter. Detecting renamed files this way can be expensive. | ||||
|
r1437 | """ | ||
|
r2958 | sim = float(opts.get('similarity') or 0) | ||
if sim < 0 or sim > 100: | ||||
raise util.Abort(_('similarity must be between 0 and 100')) | ||||
return cmdutil.addremove(repo, pats, opts, similarity=sim/100.) | ||||
|
r219 | |||
|
r733 | def annotate(ui, repo, *pats, **opts): | ||
|
r1437 | """show changeset information per file line | ||
List changes in files, showing the revision id responsible for each line | ||||
This command is useful to discover who did a change or when a change took | ||||
place. | ||||
Without the -a option, annotate will avoid processing files it | ||||
detects as binary. With -a, annotate will generate an annotation | ||||
anyway, probably with undesirable results. | ||||
""" | ||||
|
r3146 | getdate = util.cachefunc(lambda x: util.datestr(x.date())) | ||
|
r1522 | |||
|
r744 | if not pats: | ||
|
r1402 | raise util.Abort(_('at least one file name or pattern required')) | ||
|
r744 | |||
|
r3146 | opmap = [['user', lambda x: ui.shortuser(x.user())], | ||
['number', lambda x: str(x.rev())], | ||||
['changeset', lambda x: short(x.node())], | ||||
|
r1523 | ['date', getdate]] | ||
|
r1522 | if not opts['user'] and not opts['changeset'] and not opts['date']: | ||
|
r714 | opts['number'] = 1 | ||
|
r209 | |||
|
r3132 | ctx = repo.changectx(opts['rev']) | ||
|
r1016 | |||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, | ||
node=ctx.node()): | ||||
|
r2566 | fctx = ctx.filectx(abs) | ||
if not opts['text'] and util.binary(fctx.data()): | ||||
|
r1625 | ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) | ||
|
r1016 | continue | ||
|
r2566 | lines = fctx.annotate() | ||
|
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 | |||
|
r2112 | def archive(ui, repo, dest, **opts): | ||
'''create unversioned archive of a repository revision | ||||
By default, the revision used is the parent of the working | ||||
directory; use "-r" to specify a different revision. | ||||
To specify the type of archive to create, use "-t". Valid | ||||
types are: | ||||
"files" (default): a directory full of files | ||||
"tar": tar archive, uncompressed | ||||
"tbz2": tar archive, compressed using bzip2 | ||||
"tgz": tar archive, compressed using gzip | ||||
"uzip": zip archive, uncompressed | ||||
"zip": zip archive, compressed using deflate | ||||
The exact name of the destination archive or directory is given | ||||
using a format string; see "hg help export" for details. | ||||
Each member added to an archive file has a directory prefix | ||||
prepended. Use "-p" to specify a format string for the prefix. | ||||
The default is the basename of the archive, with suffixes removed. | ||||
''' | ||||
|
r3132 | node = repo.changectx(opts['rev']).node() | ||
|
r2874 | dest = cmdutil.make_filename(repo, dest, node) | ||
|
r2112 | if os.path.realpath(dest) == repo.root: | ||
raise util.Abort(_('repository root cannot be destination')) | ||||
|
r2882 | dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts) | ||
|
r2476 | kind = opts.get('type') or 'files' | ||
prefix = opts['prefix'] | ||||
if dest == '-': | ||||
if kind == 'files': | ||||
raise util.Abort(_('cannot archive plain files to stdout')) | ||||
dest = sys.stdout | ||||
if not prefix: prefix = os.path.basename(repo.root) + '-%h' | ||||
|
r2874 | prefix = cmdutil.make_filename(repo, prefix, node) | ||
|
r2476 | archival.archive(repo, dest, node, kind, not opts['no_decode'], | ||
matchfn, prefix) | ||||
|
r2112 | |||
|
r2158 | def backout(ui, repo, rev, **opts): | ||
'''reverse effect of earlier changeset | ||||
|
r2254 | Commit the backed out changes as a new changeset. The new | ||
changeset is a child of the backed out changeset. | ||||
|
r2158 | |||
If you back out a changeset other than the tip, a new head is | ||||
|
r2254 | created. This head is the parent of the working directory. If | ||
you back out an old changeset, your working directory will appear | ||||
old after the backout. You should merge the backout changeset | ||||
with another head. | ||||
The --merge option remembers the parent of the working directory | ||||
before starting the backout, then merges the new head with that | ||||
changeset afterwards. This saves you from doing the merge by | ||||
hand. The result of this merge is not committed, as for a normal | ||||
merge.''' | ||||
|
r2158 | |||
bail_if_changed(repo) | ||||
op1, op2 = repo.dirstate.parents() | ||||
if op2 != nullid: | ||||
raise util.Abort(_('outstanding uncommitted merge')) | ||||
node = repo.lookup(rev) | ||||
|
r2614 | p1, p2 = repo.changelog.parents(node) | ||
if p1 == nullid: | ||||
|
r2158 | raise util.Abort(_('cannot back out a change with no parents')) | ||
if p2 != nullid: | ||||
|
r2614 | if not opts['parent']: | ||
raise util.Abort(_('cannot back out a merge changeset without ' | ||||
'--parent')) | ||||
p = repo.lookup(opts['parent']) | ||||
if p not in (p1, p2): | ||||
raise util.Abort(_('%s is not a parent of %s' % | ||||
(short(p), short(node)))) | ||||
parent = p | ||||
else: | ||||
if opts['parent']: | ||||
raise util.Abort(_('cannot use --parent on non-merge changeset')) | ||||
parent = p1 | ||||
|
r2808 | hg.clean(repo, node, show_stats=False) | ||
|
r2158 | revert_opts = opts.copy() | ||
|
r2982 | revert_opts['all'] = True | ||
|
r2158 | revert_opts['rev'] = hex(parent) | ||
revert(ui, repo, **revert_opts) | ||||
commit_opts = opts.copy() | ||||
commit_opts['addremove'] = False | ||||
|
r2159 | if not commit_opts['message'] and not commit_opts['logfile']: | ||
|
r2158 | commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) | ||
|
r2268 | commit_opts['force_editor'] = True | ||
|
r2158 | commit(ui, repo, **commit_opts) | ||
def nice(node): | ||||
return '%d:%s' % (repo.changelog.rev(node), short(node)) | ||||
ui.status(_('changeset %s backs out changeset %s\n') % | ||||
(nice(repo.changelog.tip()), nice(node))) | ||||
|
r2493 | if op1 != node: | ||
if opts['merge']: | ||||
ui.status(_('merging with changeset %s\n') % nice(op1)) | ||||
|
r2806 | n = _lookup(repo, hex(op1)) | ||
|
r2808 | hg.merge(repo, n) | ||
|
r2493 | else: | ||
ui.status(_('the backout changeset is a new head - ' | ||||
'do not forget to merge\n')) | ||||
|
r2761 | ui.status(_('(use "backout --merge" ' | ||
'if you want to auto-merge)\n')) | ||||
|
r2158 | |||
|
r2494 | def bundle(ui, repo, fname, dest=None, **opts): | ||
|
r1437 | """create a changegroup file | ||
Generate a compressed changegroup file collecting all changesets | ||||
not found in the other repository. | ||||
This file can then be transferred using conventional means and | ||||
applied to another repository with the unbundle command. This is | ||||
useful when native push and pull are not available or when | ||||
exporting an entire repository is undesirable. The standard file | ||||
extension is ".hg". | ||||
Unlike import/export, this exactly preserves all changeset | ||||
contents including permissions, rename data, and revision history. | ||||
""" | ||||
|
r2494 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | ||
|
r1218 | other = hg.repository(ui, dest) | ||
|
r1959 | o = repo.findoutgoing(other, force=opts['force']) | ||
|
r1736 | cg = repo.changegroup(o, 'bundle') | ||
|
r1943 | write_bundle(cg, fname) | ||
|
r1218 | |||
|
r1254 | def cat(ui, repo, file1, *pats, **opts): | ||
|
r1437 | """output the latest or given revisions of files | ||
Print the specified files as they were at the given revision. | ||||
|
r3095 | If no revision is given then working dir parent is used, or tip | ||
if no revision is checked out. | ||||
|
r1437 | |||
Output may be to a file, in which case the name of the file is | ||||
given using a format string. The formatting rules are the same as | ||||
for the export command, with the following additions: | ||||
%s basename of file being printed | ||||
%d dirname of file being printed, or '.' if in repo root | ||||
%p root-relative path name of file being printed | ||||
""" | ||||
|
r3132 | ctx = repo.changectx(opts['rev']) | ||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts, | ||
ctx.node()): | ||||
|
r2874 | fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs) | ||
|
r2565 | fp.write(ctx.filectx(abs).data()) | ||
|
r248 | |||
|
r698 | def clone(ui, source, dest=None, **opts): | ||
|
r1437 | """make a copy of an existing repository | ||
Create a copy of an existing repository in a new directory. | ||||
If no destination directory name is specified, it defaults to the | ||||
basename of the source. | ||||
The location of the source is added to the new repository's | ||||
.hg/hgrc file, as the default to be used for future pulls. | ||||
For efficiency, hardlinks are used for cloning whenever the source | ||||
|
r2762 | and destination are on the same filesystem (note this applies only | ||
to the repository data, not to the checked out files). Some | ||||
filesystems, such as AFS, implement hardlinking incorrectly, but | ||||
do not report errors. In these cases, use the --pull option to | ||||
avoid hardlinking. | ||||
You can safely clone repositories and checked out files using full | ||||
hardlinks with | ||||
$ cp -al REPO REPOCLONE | ||||
which is the fastest way to clone. However, the operation is not | ||||
atomic (making sure REPO is not modified during the operation is | ||||
up to you) and you have to make sure your editor breaks hardlinks | ||||
(Emacs and most Linux Kernel tools do so). | ||||
|
r1811 | |||
|
r2764 | If you use the -r option to clone up to a specific revision, no | ||
subsequent revisions will be present in the cloned repository. | ||||
This option implies --pull, even on local repositories. | ||||
|
r1811 | See pull for valid source format details. | ||
|
r2590 | |||
It is possible to specify an ssh:// URL as the destination, but no | ||||
.hg/hgrc will be created on the remote side. Look at the help text | ||||
for the pull command for important details about ssh:// URLs. | ||||
|
r1437 | """ | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r2597 | hg.clone(ui, ui.expandpath(source), dest, | ||
pull=opts['pull'], | ||||
|
r2620 | stream=opts['uncompressed'], | ||
|
r2597 | rev=opts['rev'], | ||
update=not opts['noupdate']) | ||||
|
r515 | |||
|
r813 | def commit(ui, repo, *pats, **opts): | ||
|
r1437 | """commit the specified files or all outstanding changes | ||
Commit changes to the given files into the repository. | ||||
If a list of files is omitted, all changes reported by "hg status" | ||||
|
r1995 | will be committed. | ||
|
r1437 | |||
|
r1996 | If no commit message is specified, the editor configured in your hgrc | ||
or in the EDITOR environment variable is started to enter a message. | ||||
|
r1437 | """ | ||
|
r2799 | message = logmessage(opts) | ||
|
r289 | |||
|
r354 | if opts['addremove']: | ||
|
r2883 | cmdutil.addremove(repo, pats, opts) | ||
|
r2882 | fns, match, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r813 | if pats: | ||
|
r2875 | modified, added, removed = repo.status(files=fns, match=match)[:3] | ||
|
r1619 | files = modified + added + removed | ||
|
r813 | else: | ||
files = [] | ||||
|
r1202 | try: | ||
|
r2267 | repo.commit(files, message, opts['user'], opts['date'], match, | ||
|
r2268 | force_editor=opts.get('force_editor')) | ||
|
r1202 | except ValueError, inst: | ||
raise util.Abort(str(inst)) | ||||
|
r245 | |||
|
r1822 | def docopy(ui, repo, pats, opts, wlock): | ||
# called with the repo lock held | ||||
|
r1512 | cwd = repo.getcwd() | ||
errors = 0 | ||||
copied = [] | ||||
|
r1514 | targets = {} | ||
|
r1249 | |||
def okaytocopy(abs, rel, exact): | ||||
|
r1402 | reasons = {'?': _('is not managed'), | ||
|
r1634 | 'a': _('has been marked for add'), | ||
'r': _('has been marked for remove')} | ||||
|
r1747 | state = repo.dirstate.state(abs) | ||
reason = reasons.get(state) | ||||
|
r1249 | if reason: | ||
|
r1747 | if state == 'a': | ||
origsrc = repo.dirstate.copied(abs) | ||||
if origsrc is not None: | ||||
return origsrc | ||||
|
r1615 | if exact: | ||
ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) | ||||
|
r1249 | else: | ||
|
r1747 | return abs | ||
def copy(origsrc, abssrc, relsrc, target, exact): | ||||
|
r1512 | abstarget = util.canonpath(repo.root, cwd, target) | ||
reltarget = util.pathto(cwd, abstarget) | ||||
|
r1514 | prevsrc = targets.get(abstarget) | ||
if prevsrc is not None: | ||||
ui.warn(_('%s: not overwriting - %s collides with %s\n') % | ||||
(reltarget, abssrc, prevsrc)) | ||||
return | ||||
|
r1565 | if (not opts['after'] and os.path.exists(reltarget) or | ||
opts['after'] and repo.dirstate.state(abstarget) not in '?r'): | ||||
if not opts['force']: | ||||
|
r1513 | ui.warn(_('%s: not overwriting - file exists\n') % | ||
reltarget) | ||||
return | ||||
|
r2503 | if not opts['after'] and not opts.get('dry_run'): | ||
|
r1565 | os.unlink(reltarget) | ||
if opts['after']: | ||||
if not os.path.exists(reltarget): | ||||
return | ||||
else: | ||||
|
r1512 | targetdir = os.path.dirname(reltarget) or '.' | ||
|
r2503 | if not os.path.isdir(targetdir) and not opts.get('dry_run'): | ||
|
r1512 | os.makedirs(targetdir) | ||
|
r1249 | try: | ||
|
r1822 | restore = repo.dirstate.state(abstarget) == 'r' | ||
|
r2503 | if restore and not opts.get('dry_run'): | ||
|
r1822 | repo.undelete([abstarget], wlock) | ||
try: | ||||
|
r2503 | if not opts.get('dry_run'): | ||
|
r2414 | shutil.copyfile(relsrc, reltarget) | ||
shutil.copymode(relsrc, reltarget) | ||||
|
r1822 | restore = False | ||
finally: | ||||
if restore: | ||||
repo.remove([abstarget], wlock) | ||||
|
r1253 | except shutil.Error, inst: | ||
raise util.Abort(str(inst)) | ||||
|
r1249 | except IOError, inst: | ||
if inst.errno == errno.ENOENT: | ||||
|
r1512 | ui.warn(_('%s: deleted in working copy\n') % relsrc) | ||
|
r1249 | else: | ||
|
r1512 | ui.warn(_('%s: cannot copy - %s\n') % | ||
(relsrc, inst.strerror)) | ||||
errors += 1 | ||||
return | ||||
|
r1565 | if ui.verbose or not exact: | ||
ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | ||||
|
r1514 | targets[abstarget] = abssrc | ||
|
r2503 | if abstarget != origsrc and not opts.get('dry_run'): | ||
|
r1822 | repo.copy(origsrc, abstarget, wlock) | ||
|
r1512 | copied.append((abssrc, relsrc, exact)) | ||
|
r1565 | def targetpathfn(pat, dest, srcs): | ||
if os.path.isdir(pat): | ||||
|
r1633 | abspfx = util.canonpath(repo.root, cwd, pat) | ||
|
r1565 | if destdirexists: | ||
|
r1633 | striplen = len(os.path.split(abspfx)[0]) | ||
|
r1565 | else: | ||
|
r1633 | striplen = len(abspfx) | ||
|
r1565 | if striplen: | ||
striplen += len(os.sep) | ||||
res = lambda p: os.path.join(dest, p[striplen:]) | ||||
elif destdirexists: | ||||
res = lambda p: os.path.join(dest, os.path.basename(p)) | ||||
else: | ||||
res = lambda p: dest | ||||
return res | ||||
def targetpathafterfn(pat, dest, srcs): | ||||
if util.patkind(pat, None)[0]: | ||||
# a mercurial pattern | ||||
res = lambda p: os.path.join(dest, os.path.basename(p)) | ||||
|
r1633 | else: | ||
abspfx = util.canonpath(repo.root, cwd, pat) | ||||
if len(abspfx) < len(srcs[0][0]): | ||||
# A directory. Either the target path contains the last | ||||
# component of the source path or it does not. | ||||
def evalpath(striplen): | ||||
score = 0 | ||||
for s in srcs: | ||||
t = os.path.join(dest, s[0][striplen:]) | ||||
if os.path.exists(t): | ||||
score += 1 | ||||
return score | ||||
|
r1565 | |||
|
r1633 | striplen = len(abspfx) | ||
if striplen: | ||||
striplen += len(os.sep) | ||||
if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | ||||
score = evalpath(striplen) | ||||
striplen1 = len(os.path.split(abspfx)[0]) | ||||
if striplen1: | ||||
striplen1 += len(os.sep) | ||||
if evalpath(striplen1) > score: | ||||
striplen = striplen1 | ||||
res = lambda p: os.path.join(dest, p[striplen:]) | ||||
|
r1565 | else: | ||
|
r1633 | # a file | ||
if destdirexists: | ||||
res = lambda p: os.path.join(dest, os.path.basename(p)) | ||||
else: | ||||
res = lambda p: dest | ||||
|
r1565 | return res | ||
|
r1512 | pats = list(pats) | ||
if not pats: | ||||
raise util.Abort(_('no source or destination specified')) | ||||
if len(pats) == 1: | ||||
raise util.Abort(_('no destination specified')) | ||||
dest = pats.pop() | ||||
destdirexists = os.path.isdir(dest) | ||||
|
r1565 | if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists: | ||
|
r1512 | raise util.Abort(_('with multiple sources, destination must be an ' | ||
'existing directory')) | ||||
|
r1565 | if opts['after']: | ||
tfn = targetpathafterfn | ||||
else: | ||||
tfn = targetpathfn | ||||
copylist = [] | ||||
|
r1512 | for pat in pats: | ||
|
r1565 | srcs = [] | ||
|
r2882 | for tag, abssrc, relsrc, exact in cmdutil.walk(repo, [pat], opts): | ||
|
r1747 | origsrc = okaytocopy(abssrc, relsrc, exact) | ||
if origsrc: | ||||
srcs.append((origsrc, abssrc, relsrc, exact)) | ||||
|
r1565 | if not srcs: | ||
continue | ||||
copylist.append((tfn(pat, dest, srcs), srcs)) | ||||
if not copylist: | ||||
raise util.Abort(_('no files to copy')) | ||||
|
r2414 | for targetpath, srcs in copylist: | ||
for origsrc, abssrc, relsrc, exact in srcs: | ||||
copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact) | ||||
|
r1512 | |||
if errors: | ||||
|
r1402 | ui.warn(_('(consider using --after)\n')) | ||
|
r1512 | return errors, copied | ||
|
r1253 | |||
def copy(ui, repo, *pats, **opts): | ||||
|
r1437 | """mark files as copied for the next commit | ||
Mark dest as having copies of source files. If dest is a | ||||
directory, copies are put in that directory. If dest is a file, | ||||
there can only be one source. | ||||
By default, this command copies the contents of files as they | ||||
stand in the working directory. If invoked with --after, the | ||||
operation is recorded, but no copying is performed. | ||||
This command takes effect in the next commit. | ||||
NOTE: This command should be treated as experimental. While it | ||||
should properly record copied files, this information is not yet | ||||
fully used by merge, nor fully reported by log. | ||||
""" | ||||
|
r2016 | wlock = repo.wlock(0) | ||
errs, copied = docopy(ui, repo, pats, opts, wlock) | ||||
|
r1249 | return errs | ||
|
r363 | |||
|
r1262 | def debugancestor(ui, index, rev1, rev2): | ||
"""find the ancestor revision of two revisions in a given index""" | ||||
|
r2072 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0) | ||
|
r1262 | a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) | ||
ui.write("%d:%s\n" % (r.rev(a), hex(a))) | ||||
|
r2034 | def debugcomplete(ui, cmd='', **opts): | ||
|
r1887 | """returns the completion list associated with the given command""" | ||
|
r2034 | |||
if opts['options']: | ||||
options = [] | ||||
otables = [globalopts] | ||||
if cmd: | ||||
|
r2988 | aliases, entry = findcmd(ui, cmd) | ||
|
r2034 | otables.append(entry[1]) | ||
for t in otables: | ||||
for o in t: | ||||
if o[0]: | ||||
options.append('-%s' % o[0]) | ||||
options.append('--%s' % o[1]) | ||||
ui.write("%s\n" % "\n".join(options)) | ||||
return | ||||
|
r2988 | clist = findpossible(ui, cmd).keys() | ||
|
r1887 | clist.sort() | ||
|
r2034 | ui.write("%s\n" % "\n".join(clist)) | ||
|
r1887 | |||
|
r1755 | def debugrebuildstate(ui, repo, rev=None): | ||
"""rebuild the dirstate as it would look like for the given revision""" | ||||
if not rev: | ||||
rev = repo.changelog.tip() | ||||
else: | ||||
rev = repo.lookup(rev) | ||||
change = repo.changelog.read(rev) | ||||
n = change[0] | ||||
|
r2840 | files = repo.manifest.read(n) | ||
|
r1760 | wlock = repo.wlock() | ||
|
r2840 | repo.dirstate.rebuild(rev, files) | ||
|
r1755 | |||
|
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: | ||||
|
r1602 | error = _(".hg/dirstate inconsistent with current parent's manifest") | ||
raise util.Abort(error) | ||||
|
r460 | |||
|
r2410 | def debugconfig(ui, repo, *values): | ||
"""show combined config settings from all hgrc files | ||||
With no args, print names and values of all config items. | ||||
With one arg of the form section.name, print just the value of | ||||
that config item. | ||||
With multiple args, print names and values of all config items | ||||
with matching section names.""" | ||||
if values: | ||||
if len([v for v in values if '.' in v]) > 1: | ||||
raise util.Abort(_('only one config item permitted')) | ||||
|
r1028 | for section, name, value in ui.walkconfig(): | ||
|
r2410 | sectname = section + '.' + name | ||
if values: | ||||
for v in values: | ||||
if v == section: | ||||
ui.write('%s=%s\n' % (sectname, value)) | ||||
elif v == sectname: | ||||
ui.write(value, '\n') | ||||
else: | ||||
ui.write('%s=%s\n' % (sectname, value)) | ||||
|
r1028 | |||
|
r1395 | def debugsetparents(ui, repo, rev1, rev2=None): | ||
|
r1470 | """manually set the parents of the current working directory | ||
|
r1395 | |||
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""" | ||||
|
r1835 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), | ||
|
r2072 | file_[:-2] + ".i", file_, 0) | ||
|
r1313 | try: | ||
ui.write(r.revision(r.lookup(rev))) | ||||
except KeyError: | ||||
|
r3072 | raise util.Abort(_('invalid revision identifier %s') % rev) | ||
|
r1039 | |||
|
r697 | def debugindex(ui, file_): | ||
|
r596 | """dump the contents of an index file""" | ||
|
r2072 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) | ||
|
r582 | ui.write(" rev offset length base linkrev" + | ||
|
r989 | " nodeid p1 p2\n") | ||
|
r248 | for i in range(r.count()): | ||
|
r2072 | node = r.node(i) | ||
pp = r.parents(node) | ||||
|
r989 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | ||
|
r2072 | i, r.start(i), r.length(i), r.base(i), r.linkrev(node), | ||
short(node), short(pp[0]), short(pp[1]))) | ||||
|
r248 | |||
|
r697 | def debugindexdot(ui, file_): | ||
|
r596 | """dump an index DAG as a .dot file""" | ||
|
r2072 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) | ||
|
r582 | ui.write("digraph G {\n") | ||
|
r248 | for i in range(r.count()): | ||
|
r2287 | node = r.node(i) | ||
pp = r.parents(node) | ||||
ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | ||||
if pp[1] != nullid: | ||||
ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | ||||
|
r582 | 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]] | ||||
|
r1541 | except (hg.RepoError, KeyError): | ||
|
r1116 | 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""" | ||
|
r2882 | items = list(cmdutil.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): | ||
|
r1568 | """diff repository (or selected files) | ||
|
r1437 | |||
Show differences between revisions for the specified files. | ||||
Differences between files are shown using the unified diff format. | ||||
When two revision arguments are given, then changes are shown | ||||
between those revisions. If only one revision is specified then | ||||
that revision is compared to the working directory, and, when no | ||||
revisions are specified, the working directory files are compared | ||||
to its parent. | ||||
Without the -a option, diff will avoid generating diffs of files | ||||
it detects as binary. With -a, diff will generate a diff anyway, | ||||
probably with undesirable results. | ||||
""" | ||||
|
r3090 | node1, node2 = cmdutil.revpair(ui, repo, opts['rev']) | ||
|
r245 | |||
|
r2882 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r1014 | |||
|
r2874 | patch.diff(repo, node1, node2, fns, match=matchfn, | ||
|
r2888 | opts=patch.diffopts(ui, opts)) | ||
|
r396 | |||
|
r580 | def export(ui, repo, *changesets, **opts): | ||
|
r1437 | """dump the header and diffs for one or more changesets | ||
Print the changeset header and diffs for one or more revisions. | ||||
The information shown in the changeset header is: author, | ||||
changeset hash, parent and commit comment. | ||||
Output may be to a file, in which case the name of the file is | ||||
given using a format string. The formatting rules are as follows: | ||||
%% literal "%" character | ||||
%H changeset hash (40 bytes of hexadecimal) | ||||
%N number of patches being generated | ||||
%R changeset revision number | ||||
%b basename of the exporting repository | ||||
%h short-form changeset hash (12 bytes of hexadecimal) | ||||
%n zero-padded sequence number, starting at 1 | ||||
%r zero-padded changeset revision number | ||||
Without the -a option, export will avoid generating diffs of files | ||||
it detects as binary. With -a, export will generate a diff anyway, | ||||
probably with undesirable results. | ||||
|
r1571 | |||
With the --switch-parent option, the diff will be against the second | ||||
parent. It can be useful to review a merge. | ||||
|
r1437 | """ | ||
|
r610 | if not changesets: | ||
|
r1402 | raise util.Abort(_("export requires at least one changeset")) | ||
|
r3090 | revs = list(cmdutil.revrange(ui, repo, changesets)) | ||
|
r2874 | if len(revs) > 1: | ||
ui.note(_('exporting patches:\n')) | ||||
else: | ||||
ui.note(_('exporting patch:\n')) | ||||
patch.export(repo, map(repo.lookup, revs), template=opts['output'], | ||||
|
r2888 | switch_parent=opts['switch_parent'], | ||
opts=patch.diffopts(ui, opts)) | ||||
|
r246 | |||
|
r810 | def forget(ui, repo, *pats, **opts): | ||
|
r2135 | """don't add the specified files on the next commit (DEPRECATED) | ||
(DEPRECATED) | ||||
|
r1437 | Undo an 'hg add' scheduled for the next commit. | ||
|
r2135 | |||
This command is now deprecated and will be removed in a future | ||||
release. Please use revert instead. | ||||
|
r1437 | """ | ||
|
r2135 | ui.warn(_("(the forget command is deprecated; use revert instead)\n")) | ||
|
r810 | forget = [] | ||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): | ||
|
r810 | if repo.dirstate.state(abs) == 'a': | ||
forget.append(abs) | ||||
|
r1255 | if ui.verbose or not exact: | ||
|
r1625 | ui.status(_('forgetting %s\n') % ((pats and rel) or abs)) | ||
|
r810 | repo.forget(forget) | ||
|
r245 | |||
|
r1108 | def grep(ui, repo, pattern, *pats, **opts): | ||
|
r1437 | """search for a pattern in specified files and revisions | ||
Search revisions of files for a regular expression. | ||||
This command behaves differently than Unix grep. It only accepts | ||||
Python/Perl regexps. It searches repository history, not the | ||||
working directory. It always prints the revision number in which | ||||
a match appears. | ||||
By default, grep only prints output for the first revision of a | ||||
file in which it finds a match. To get it to print every revision | ||||
that contains a change in match status ("-" for a match that | ||||
becomes a non-match, or "+" for a non-match that becomes a match), | ||||
use the --all flag. | ||||
""" | ||||
|
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 | |||
|
r1559 | class linestate(object): | ||
|
r1057 | def __init__(self, line, linenum, colstart, colend): | ||
self.line = line | ||||
self.linenum = linenum | ||||
self.colstart = colstart | ||||
self.colend = colend | ||||
|
r2869 | |||
|
r1065 | def __eq__(self, other): | ||
return self.line == other.line | ||||
|
r1057 | |||
matches = {} | ||||
|
r2870 | copies = {} | ||
|
r1057 | def grepbody(fn, rev, body): | ||
|
r2869 | matches[rev].setdefault(fn, []) | ||
|
r1057 | m = matches[rev][fn] | ||
for lnum, cstart, cend, line in matchlines(body): | ||||
s = linestate(line, lnum, cstart, cend) | ||||
|
r2869 | m.append(s) | ||
def difflinestates(a, b): | ||||
sm = difflib.SequenceMatcher(None, a, b) | ||||
for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | ||||
if tag == 'insert': | ||||
for i in range(blo, bhi): | ||||
yield ('+', b[i]) | ||||
elif tag == 'delete': | ||||
for i in range(alo, ahi): | ||||
yield ('-', a[i]) | ||||
elif tag == 'replace': | ||||
for i in range(alo, ahi): | ||||
yield ('-', a[i]) | ||||
for i in range(blo, bhi): | ||||
yield ('+', b[i]) | ||||
|
r1057 | prev = {} | ||
|
r1146 | ucache = {} | ||
|
r1057 | def display(fn, rev, states, prevstates): | ||
|
r1145 | counts = {'-': 0, '+': 0} | ||
|
r1146 | filerevmatches = {} | ||
|
r2869 | if incrementing or not opts['all']: | ||
a, b = prevstates, states | ||||
else: | ||||
a, b = states, prevstates | ||||
for change, l in difflinestates(a, b): | ||||
|
r1212 | if incrementing or not opts['all']: | ||
|
r1057 | r = rev | ||
else: | ||||
r = prev[fn] | ||||
|
r2869 | cols = [fn, str(r)] | ||
|
r1615 | if opts['line_number']: | ||
cols.append(str(l.linenum)) | ||||
if opts['all']: | ||||
cols.append(change) | ||||
if opts['user']: | ||||
|
r2869 | cols.append(trimuser(ui, getchange(r)[1], rev, | ||
ucache)) | ||||
|
r1146 | if opts['files_with_matches']: | ||
c = (fn, rev) | ||||
|
r1615 | if c in filerevmatches: | ||
continue | ||||
|
r1146 | 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 = {} | ||
|
r1570 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) | ||
|
r1146 | count = 0 | ||
|
r1337 | incrementing = False | ||
|
r2870 | follow = opts.get('follow') | ||
|
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: | ||||
|
r1615 | if fn in skip: | ||
continue | ||||
|
r1057 | fstate.setdefault(fn, {}) | ||
try: | ||||
grepbody(fn, rev, getfile(fn).read(mf[fn])) | ||||
|
r2870 | if follow: | ||
copied = getfile(fn).renamed(mf[fn]) | ||||
if copied: | ||||
|
r2931 | copies.setdefault(rev, {})[fn] = copied[0] | ||
|
r1057 | except KeyError: | ||
pass | ||||
elif st == 'iter': | ||||
states = matches[rev].items() | ||||
states.sort() | ||||
for fn, m in states: | ||||
|
r2931 | copy = copies.get(rev, {}).get(fn) | ||
|
r1615 | if fn in skip: | ||
|
r2870 | if copy: | ||
skip[copy] = True | ||||
|
r1615 | 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 | ||
|
r2870 | if copy: | ||
skip[copy] = True | ||||
|
r1057 | fstate[fn] = m | ||
|
r2870 | if copy: | ||
fstate[copy] = m | ||||
|
r1057 | prev[fn] = rev | ||
if not incrementing: | ||||
fstate = fstate.items() | ||||
fstate.sort() | ||||
for fn, state in fstate: | ||||
|
r1615 | if fn in skip: | ||
continue | ||||
|
r2931 | if fn not in copies.get(prev[fn], {}): | ||
|
r2870 | display(fn, rev, {}, state) | ||
|
r1146 | return (count == 0 and 1) or 0 | ||
|
r1057 | |||
|
r898 | def heads(ui, repo, **opts): | ||
|
r1437 | """show current repository heads | ||
Show all repository head changesets. | ||||
Repository "heads" are changesets that don't have children | ||||
changesets. They are where development generally takes place and | ||||
are the usual targets for update and merge operations. | ||||
""" | ||||
|
r1550 | if opts['rev']: | ||
|
r1551 | heads = repo.heads(repo.lookup(opts['rev'])) | ||
|
r1550 | else: | ||
heads = repo.heads() | ||||
|
r898 | br = None | ||
if opts['branches']: | ||||
|
r1551 | br = repo.branchlookup(heads) | ||
|
r1907 | displayer = show_changeset(ui, repo, opts) | ||
|
r1550 | for n in heads: | ||
|
r1907 | displayer.show(changenode=n, brinfo=br) | ||
|
r221 | |||
|
r339 | def identify(ui, repo): | ||
|
r1437 | """print information about the working copy | ||
|
r1470 | |||
|
r1437 | Print a short summary of the current state of the repo. | ||
This summary identifies the repository state using one or two parent | ||||
hash identifiers, followed by a "+" if there are uncommitted changes | ||||
in the working directory, followed by a list of tags for this revision. | ||||
""" | ||||
|
r1092 | parents = [p for p in repo.dirstate.parents() if p != nullid] | ||
|
r340 | if not parents: | ||
|
r1402 | ui.write(_("unknown\n")) | ||
|
r340 | return | ||
|
r2966 | hexfunc = ui.debugflag and hex or short | ||
|
r2875 | modified, added, removed, deleted = repo.status()[:4] | ||
|
r1619 | output = ["%s%s" % | ||
('+'.join([hexfunc(parent) for parent in parents]), | ||||
(modified or added or removed or deleted) and "+" or "")] | ||||
|
r386 | |||
|
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): | ||
|
r1437 | """import an ordered set of patches | ||
Import a list of patches and commit them individually. | ||||
If there are outstanding changes in the working directory, import | ||||
will abort unless given the -f flag. | ||||
|
r2504 | You can import a patch straight from a mail message. Even patches | ||
as attachments work (body part must be type text/plain or | ||||
|
r2515 | text/x-patch to be used). From and Subject headers of email | ||
message are used as default committer and commit message. All | ||||
text/plain body parts before first diff are added to commit | ||||
message. | ||||
|
r2504 | |||
If imported patch was generated by hg export, user and description | ||||
from patch override values from message headers and body. Values | ||||
given on command line with -m and -u override these. | ||||
|
r2400 | |||
To read a patch from standard input, use patch name "-". | ||||
|
r1437 | """ | ||
|
r437 | patches = (patch1,) + patches | ||
|
r500 | |||
|
r966 | if not opts['force']: | ||
|
r2158 | bail_if_changed(repo) | ||
|
r966 | |||
|
r437 | d = opts["base"] | ||
strip = opts["strip"] | ||||
|
r2854 | wlock = repo.wlock() | ||
lock = repo.lock() | ||||
|
r2861 | for p in patches: | ||
pf = os.path.join(d, p) | ||||
|
r437 | |||
|
r2400 | if pf == '-': | ||
ui.status(_("applying patch from stdin\n")) | ||||
|
r2866 | tmpname, message, user, date = patch.extract(ui, sys.stdin) | ||
|
r2400 | else: | ||
|
r2861 | ui.status(_("applying %s\n") % p) | ||
|
r2866 | tmpname, message, user, date = patch.extract(ui, file(pf)) | ||
if tmpname is None: | ||||
raise util.Abort(_('no diffs found')) | ||||
|
r2400 | try: | ||
|
r2458 | if opts['message']: | ||
# pickup the cmdline msg | ||||
message = opts['message'] | ||||
elif message: | ||||
# pickup the patch msg | ||||
|
r2504 | message = message.strip() | ||
|
r2400 | else: | ||
|
r2458 | # launch the editor | ||
message = None | ||||
|
r2400 | ui.debug(_('message:\n%s\n') % message) | ||
|
r2919 | files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root) | ||
|
r2933 | files = patch.updatedir(ui, repo, files, wlock=wlock) | ||
|
r2854 | repo.commit(files, message, user, date, wlock=wlock, lock=lock) | ||
|
r2400 | finally: | ||
|
r2504 | os.unlink(tmpname) | ||
|
r437 | |||
|
r1192 | def incoming(ui, repo, source="default", **opts): | ||
|
r1437 | """show new changesets found in source | ||
|
r1979 | Show new changesets found in the specified path/URL or the default | ||
pull location. These are the changesets that would be pulled if a pull | ||||
|
r1437 | was requested. | ||
|
r1944 | For remote repository, using --bundle avoids downloading the changesets | ||
twice if the incoming is followed by a pull. | ||||
|
r1979 | |||
See pull for valid source format details. | ||||
|
r1437 | """ | ||
|
r1893 | source = ui.expandpath(source) | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r1965 | |||
|
r927 | other = hg.repository(ui, source) | ||
|
r1959 | incoming = repo.findincoming(other, force=opts["force"]) | ||
|
r1944 | if not incoming: | ||
|
r1993 | ui.status(_("no changes found\n")) | ||
|
r931 | return | ||
|
r1944 | |||
cleanup = None | ||||
|
r1974 | try: | ||
fname = opts["bundle"] | ||||
if fname or not other.local(): | ||||
# create a bundle (uncompressed if other repo is not local) | ||||
cg = other.changegroup(incoming, "incoming") | ||||
fname = cleanup = write_bundle(cg, fname, compress=other.local()) | ||||
# keep written bundle? | ||||
if opts["bundle"]: | ||||
cleanup = None | ||||
if not other.local(): | ||||
# use the created uncompressed bundlerepo | ||||
other = bundlerepo.bundlerepository(ui, repo.root, fname) | ||||
|
r2521 | revs = None | ||
if opts['rev']: | ||||
revs = [other.lookup(rev) for rev in opts['rev']] | ||||
o = other.changelog.nodesbetween(incoming, revs)[0] | ||||
|
r1974 | if opts['newest_first']: | ||
o.reverse() | ||||
displayer = show_changeset(ui, other, opts) | ||||
for n in o: | ||||
parents = [p for p in other.changelog.parents(n) if p != nullid] | ||||
if opts['no_merges'] and len(parents) == 2: | ||||
continue | ||||
displayer.show(changenode=n) | ||||
if opts['patch']: | ||||
prev = (parents and parents[0]) or nullid | ||||
|
r2963 | patch.diff(other, prev, n, fp=repo.ui) | ||
|
r1974 | ui.write("\n") | ||
finally: | ||||
if hasattr(other, 'close'): | ||||
other.close() | ||||
if cleanup: | ||||
os.unlink(cleanup) | ||||
|
r1944 | |||
|
r2598 | def init(ui, dest=".", **opts): | ||
|
r1437 | """create a new repository in the given directory | ||
Initialize a new repository in the given directory. If the given | ||||
directory does not exist, it is created. | ||||
If no directory is given, the current directory is used. | ||||
|
r2590 | |||
It is possible to specify an ssh:// URL as the destination. | ||||
Look at the help text for the pull command for important details | ||||
about ssh:// URLs. | ||||
|
r1437 | """ | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r907 | hg.repository(ui, dest, create=1) | ||
|
r338 | |||
|
r627 | def locate(ui, repo, *pats, **opts): | ||
|
r1437 | """locate files matching specific patterns | ||
Print all files under Mercurial control whose names match the | ||||
given patterns. | ||||
This command searches the current directory and its | ||||
subdirectories. To search an entire repository, move to the root | ||||
of the repository. | ||||
If no patterns are given to match, this command prints all file | ||||
names. | ||||
If you want to feed the output of this command into the "xargs" | ||||
command, use the "-0" option to both this command and "xargs". | ||||
This will avoid the problem of "xargs" treating single filenames | ||||
that contain white space as multiple filenames. | ||||
""" | ||||
|
r1065 | end = opts['print0'] and '\0' or '\n' | ||
|
r1622 | rev = opts['rev'] | ||
if rev: | ||||
node = repo.lookup(rev) | ||||
else: | ||||
node = None | ||||
|
r742 | |||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, | ||
head='(?:.*/|)'): | ||||
|
r1622 | if not node and repo.dirstate.state(abs) == '?': | ||
|
r1065 | continue | ||
|
r697 | if opts['fullpath']: | ||
|
r724 | ui.write(os.path.join(repo.root, abs), end) | ||
else: | ||||
|
r1625 | ui.write(((pats and rel) or abs), end) | ||
|
r627 | |||
|
r1031 | def log(ui, repo, *pats, **opts): | ||
|
r1437 | """show revision history of entire repository or files | ||
|
r2741 | Print the revision history of the specified files or the entire | ||
project. | ||||
File history is shown without following rename or copy history of | ||||
|
r2782 | files. Use -f/--follow with a file name to follow history across | ||
renames and copies. --follow without a file name will only show | ||||
|
r2784 | ancestors or descendants of the starting revision. --follow-first | ||
only follows the first parent of merge revisions. | ||||
|
r1437 | |||
|
r2783 | If no revision range is specified, the default is tip:0 unless | ||
--follow is set, in which case the working directory parent is | ||||
used as the starting revision. | ||||
|
r1437 | By default this command outputs: changeset id and hash, tags, | ||
|
r1557 | non-trivial parents, user, date and time, and a summary for each | ||
commit. When the -v/--verbose switch is used, the list of changed | ||||
files and full commit message is shown. | ||||
|
r1437 | """ | ||
|
r1559 | class dui(object): | ||
|
r1057 | # 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 = {} | ||||
|
r2033 | self.header = {} | ||
|
r1057 | def bump(self, rev): | ||
self.rev = rev | ||||
self.hunk[rev] = [] | ||||
|
r2033 | self.header[rev] = [] | ||
|
r1057 | 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) | ||||
|
r2033 | def write_header(self, *args): | ||
self.header[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) | ||||
|
r1756 | |||
|
r1570 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) | ||
|
r1756 | |||
if opts['limit']: | ||||
try: | ||||
limit = int(opts['limit']) | ||||
except ValueError: | ||||
raise util.Abort(_('limit must be a positive integer')) | ||||
if limit <= 0: raise util.Abort(_('limit must be positive')) | ||||
else: | ||||
limit = sys.maxint | ||||
count = 0 | ||||
|
r1907 | displayer = show_changeset(ui, repo, opts) | ||
|
r1146 | for st, rev, fns in changeiter: | ||
|
r1057 | if st == 'window': | ||
|
r1031 | du = dui(ui) | ||
|
r1907 | displayer.ui = du | ||
|
r1057 | elif st == 'add': | ||
du.bump(rev) | ||||
|
r1435 | changenode = repo.changelog.node(rev) | ||
parents = [p for p in repo.changelog.parents(changenode) | ||||
if p != nullid] | ||||
if opts['no_merges'] and len(parents) == 2: | ||||
|
r1615 | continue | ||
|
r1436 | if opts['only_merges'] and len(parents) != 2: | ||
|
r1615 | continue | ||
|
r1435 | |||
|
r1373 | if opts['keyword']: | ||
|
r1570 | changes = getchange(rev) | ||
|
r1373 | 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 | ||||
|
r1764 | br = None | ||
|
r1763 | if opts['branches']: | ||
|
r1405 | br = repo.branchlookup([repo.changelog.node(rev)]) | ||
|
r1907 | displayer.show(rev, brinfo=br) | ||
|
r1057 | if opts['patch']: | ||
|
r1435 | prev = (parents and parents[0]) or nullid | ||
|
r2874 | patch.diff(repo, prev, changenode, match=matchfn, fp=du) | ||
|
r1057 | du.write("\n\n") | ||
elif st == 'iter': | ||||
|
r1756 | if count == limit: break | ||
|
r2033 | if du.header[rev]: | ||
for args in du.header[rev]: | ||||
ui.write_header(*args) | ||||
|
r1765 | if du.hunk[rev]: | ||
count += 1 | ||||
for args in du.hunk[rev]: | ||||
ui.write(*args) | ||||
|
r255 | |||
|
r697 | def manifest(ui, repo, rev=None): | ||
|
r1437 | """output the latest or given revision of the project manifest | ||
Print a list of version controlled files for the given revision. | ||||
The manifest is the list of files being version controlled. If no revision | ||||
is given then the tip is used. | ||||
""" | ||||
|
r255 | 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) | ||
files = m.keys() | ||||
files.sort() | ||||
for f in files: | ||||
|
r2832 | ui.write("%40s %3s %s\n" % (hex(m[f]), | ||
|
r2840 | m.execf(f) and "755" or "644", f)) | ||
|
r255 | |||
|
r2806 | def merge(ui, repo, node=None, force=None, branch=None): | ||
|
r2019 | """Merge working directory with another revision | ||
Merge the contents of the current working directory and the | ||||
requested revision. 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. | ||||
|
r2915 | |||
If no revision is specified, the working directory's parent is a | ||||
head revision, and the repository contains exactly one other head, | ||||
the other head is merged with by default. Otherwise, an explicit | ||||
revision to merge with must be provided. | ||||
|
r2019 | """ | ||
|
r2806 | |||
|
r3071 | if node or branch: | ||
|
r2915 | node = _lookup(repo, node, branch) | ||
else: | ||||
heads = repo.heads() | ||||
if len(heads) > 2: | ||||
raise util.Abort(_('repo has %d heads - ' | ||||
'please merge with an explicit rev') % | ||||
len(heads)) | ||||
if len(heads) == 1: | ||||
raise util.Abort(_('there is nothing to merge - ' | ||||
'use "hg update" instead')) | ||||
parent = repo.dirstate.parents()[0] | ||||
if parent not in heads: | ||||
raise util.Abort(_('working dir not at a head rev - ' | ||||
'use "hg update" or merge with an explicit rev')) | ||||
node = parent == heads[0] and heads[-1] or heads[0] | ||||
|
r2808 | return hg.merge(repo, node, force=force) | ||
|
r2029 | |||
|
r2494 | def outgoing(ui, repo, dest=None, **opts): | ||
|
r1437 | """show changesets not found in destination | ||
|
r1979 | Show changesets not found in the specified destination repository or | ||
the default push location. These are the changesets that would be pushed | ||||
|
r1437 | if a push was requested. | ||
|
r1811 | |||
|
r1979 | See pull for valid destination format details. | ||
|
r1437 | """ | ||
|
r2494 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r2521 | revs = None | ||
if opts['rev']: | ||||
revs = [repo.lookup(rev) for rev in opts['rev']] | ||||
|
r1965 | |||
|
r920 | other = hg.repository(ui, dest) | ||
|
r1959 | o = repo.findoutgoing(other, force=opts['force']) | ||
|
r1994 | if not o: | ||
ui.status(_("no changes found\n")) | ||||
return | ||||
|
r2521 | o = repo.changelog.nodesbetween(o, revs)[0] | ||
|
r1439 | if opts['newest_first']: | ||
o.reverse() | ||||
|
r1907 | displayer = show_changeset(ui, repo, opts) | ||
|
r920 | for n in o: | ||
|
r1435 | parents = [p for p in repo.changelog.parents(n) if p != nullid] | ||
if opts['no_merges'] and len(parents) == 2: | ||||
continue | ||||
|
r1907 | displayer.show(changenode=n) | ||
|
r1192 | if opts['patch']: | ||
|
r1435 | prev = (parents and parents[0]) or nullid | ||
|
r2874 | patch.diff(repo, prev, n) | ||
|
r1192 | ui.write("\n") | ||
|
r920 | |||
|
r2644 | def parents(ui, repo, file_=None, rev=None, branches=None, **opts): | ||
|
r1437 | """show the parents of the working dir or revision | ||
Print the working directory's parent revisions. | ||||
""" | ||||
|
r2644 | # legacy | ||
if file_ and not rev: | ||||
try: | ||||
rev = repo.lookup(file_) | ||||
file_ = None | ||||
except hg.RepoError: | ||||
pass | ||||
else: | ||||
ui.warn(_("'hg parent REV' is deprecated, " | ||||
"please use 'hg parents -r REV instead\n")) | ||||
|
r706 | if rev: | ||
|
r2644 | if file_: | ||
ctx = repo.filectx(file_, changeid=rev) | ||||
else: | ||||
ctx = repo.changectx(rev) | ||||
p = [cp.node() for cp in ctx.parents()] | ||||
|
r255 | else: | ||
p = repo.dirstate.parents() | ||||
|
r1724 | br = None | ||
|
r1763 | if branches is not None: | ||
|
r1724 | br = repo.branchlookup(p) | ||
|
r1907 | displayer = show_changeset(ui, repo, opts) | ||
|
r255 | for n in p: | ||
|
r1092 | if n != nullid: | ||
|
r1907 | displayer.show(changenode=n, brinfo=br) | ||
|
r255 | |||
|
r1858 | def paths(ui, repo, search=None): | ||
|
r1437 | """show definition of symbolic path names | ||
Show definition of symbolic path name NAME. If no name is given, show | ||||
definition of available names. | ||||
Path names are defined in the [paths] section of /etc/mercurial/hgrc | ||||
and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. | ||||
""" | ||||
|
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)) | ||||
|
r2019 | def postincoming(ui, repo, modheads, optupdate): | ||
if modheads == 0: | ||||
return | ||||
if optupdate: | ||||
if modheads == 1: | ||||
|
r2806 | return hg.update(repo, repo.changelog.tip()) # update | ||
|
r2019 | else: | ||
ui.status(_("not updating, since new heads added\n")) | ||||
if modheads > 1: | ||||
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | ||||
else: | ||||
ui.status(_("(run 'hg update' to get a working copy)\n")) | ||||
|
r2029 | |||
|
r404 | def pull(ui, repo, source="default", **opts): | ||
|
r1437 | """pull changes from the specified source | ||
Pull changes from a remote repository to a local one. | ||||
This finds all changes from the repository at the specified path | ||||
or URL and adds them to the local repository. By default, this | ||||
does not update the copy of the project in the working directory. | ||||
Valid URLs are of the form: | ||||
local/filesystem/path | ||||
|
r2589 | http://[user@]host[:port]/[path] | ||
https://[user@]host[:port]/[path] | ||||
ssh://[user@]host[:port]/[path] | ||||
|
r1437 | |||
|
r1979 | Some notes about using SSH with Mercurial: | ||
- SSH requires an accessible shell account on the destination machine | ||||
and a copy of hg in the remote path or specified with as remotecmd. | ||||
|
r2589 | - path is relative to the remote user's home directory by default. | ||
|
r2590 | Use an extra slash at the start of a path to specify an absolute path: | ||
ssh://example.com//tmp/repository | ||||
|
r1979 | - Mercurial doesn't use its own compression via SSH; the right thing | ||
to do is to configure it in your ~/.ssh/ssh_config, e.g.: | ||||
Host *.mylocalnetwork.example.com | ||||
Compression off | ||||
Host * | ||||
Compression on | ||||
Alternatively specify "ssh -C" as your ssh command in your hgrc or | ||||
with the --ssh command line option. | ||||
|
r1437 | """ | ||
|
r1893 | source = ui.expandpath(source) | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r963 | |||
|
r246 | other = hg.repository(ui, source) | ||
|
r2473 | ui.status(_('pulling from %s\n') % (source)) | ||
|
r1465 | revs = None | ||
if opts['rev'] and not other.local(): | ||||
|
r1607 | raise util.Abort(_("pull -r doesn't work for remote repositories yet")) | ||
|
r1465 | elif opts['rev']: | ||
revs = [other.lookup(rev) for rev in opts['rev']] | ||||
|
r2019 | modheads = repo.pull(other, heads=revs, force=opts['force']) | ||
return postincoming(ui, repo, modheads, opts['update']) | ||||
|
r246 | |||
|
r2494 | def push(ui, repo, dest=None, **opts): | ||
|
r1437 | """push changes to the specified destination | ||
Push changes from the local repository to the given destination. | ||||
This is the symmetrical operation for pull. It helps to move | ||||
changes from the current repository to a different one. If the | ||||
destination is local this is identical to a pull in that directory | ||||
from the current one. | ||||
By default, push will refuse to run if it detects the result would | ||||
increase the number of remote heads. This generally indicates the | ||||
the client has forgotten to sync and merge before pushing. | ||||
Valid URLs are of the form: | ||||
local/filesystem/path | ||||
|
r2589 | ssh://[user@]host[:port]/[path] | ||
|
r1437 | |||
|
r1979 | Look at the help text for the pull command for important details | ||
about ssh:// URLs. | ||||
|
r2590 | |||
Pushing to http:// and https:// URLs is possible, too, if this | ||||
feature is enabled on the remote Mercurial server. | ||||
|
r1437 | """ | ||
|
r2494 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | ||
|
r2731 | setremoteconfig(ui, opts) | ||
|
r961 | |||
|
r640 | other = hg.repository(ui, dest) | ||
|
r2473 | ui.status('pushing to %s\n' % (dest)) | ||
|
r1781 | revs = None | ||
if opts['rev']: | ||||
revs = [repo.lookup(rev) for rev in opts['rev']] | ||||
r = repo.push(other, opts['force'], revs=revs) | ||||
|
r2019 | return r == 0 | ||
|
r319 | |||
|
r403 | def rawcommit(ui, repo, *flist, **rc): | ||
|
r1812 | """raw commit interface (DEPRECATED) | ||
|
r1811 | |||
(DEPRECATED) | ||||
|
r1437 | Lowlevel commit, for use in helper scripts. | ||
This command is not intended to be used by normal users, as it is | ||||
primarily useful for importing from other SCMs. | ||||
|
r1657 | |||
This command is now deprecated and will be removed in a future | ||||
release, please use debugsetparents and commit instead. | ||||
|
r1437 | """ | ||
|
r1657 | |||
ui.warn(_("(the rawcommit command is deprecated)\n")) | ||||
|
r1496 | message = rc['message'] | ||
|
r762 | 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): | ||
|
r1437 | """roll back an interrupted transaction | ||
Recover from an interrupted commit or pull. | ||||
This command tries to fix the repository status after an interrupted | ||||
operation. It should only be necessary when Mercurial suggests it. | ||||
""" | ||||
|
r1516 | if repo.recover(): | ||
|
r2778 | return hg.verify(repo) | ||
|
r2057 | return 1 | ||
|
r245 | |||
|
r2179 | def remove(ui, repo, *pats, **opts): | ||
|
r1437 | """remove the specified files on the next commit | ||
Schedule the indicated files for removal from the repository. | ||||
This command schedules the files to be removed at the next commit. | ||||
This only removes files from the current branch, not from the | ||||
entire project history. If the files still exist in the working | ||||
|
r2179 | directory, they will be deleted from it. If invoked with --after, | ||
files that have been manually deleted are marked as removed. | ||||
|
r2309 | |||
Modified files and added files are not removed by default. To | ||||
remove them, use the -f/--force option. | ||||
|
r1437 | """ | ||
|
r1188 | names = [] | ||
|
r2179 | if not opts['after'] and not pats: | ||
raise util.Abort(_('no files specified')) | ||||
|
r2882 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r2309 | exact = dict.fromkeys(files) | ||
|
r2875 | mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5] | ||
|
r2309 | modified, added, removed, deleted, unknown = mardu | ||
remove, forget = [], [] | ||||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): | ||
|
r1189 | reason = None | ||
|
r2309 | if abs not in deleted and opts['after']: | ||
|
r2179 | reason = _('is still present') | ||
|
r2309 | elif abs in modified and not opts['force']: | ||
reason = _('is modified (use -f to force removal)') | ||||
elif abs in added: | ||||
if opts['force']: | ||||
forget.append(abs) | ||||
continue | ||||
reason = _('has been marked for add (use -f to force removal)') | ||||
elif abs in unknown: | ||||
|
r1615 | reason = _('is not managed') | ||
|
r2309 | elif abs in removed: | ||
continue | ||||
|
r1255 | if reason: | ||
|
r1615 | if exact: | ||
ui.warn(_('not removing %s: file %s\n') % (rel, reason)) | ||||
|
r1189 | else: | ||
|
r1615 | if ui.verbose or not exact: | ||
ui.status(_('removing %s\n') % rel) | ||||
|
r2309 | remove.append(abs) | ||
repo.forget(forget) | ||||
repo.remove(remove, unlink=not opts['after']) | ||||
|
r245 | |||
|
r1253 | def rename(ui, repo, *pats, **opts): | ||
|
r1437 | """rename files; equivalent of copy + remove | ||
Mark dest as copies of sources; mark sources for deletion. If | ||||
dest is a directory, copies are put in that directory. If dest is | ||||
a file, there can only be one source. | ||||
By default, this command copies the contents of files as they | ||||
stand in the working directory. If invoked with --after, the | ||||
operation is recorded, but no copying is performed. | ||||
This command takes effect in the next commit. | ||||
NOTE: This command should be treated as experimental. While it | ||||
should properly record rename files, this information is not yet | ||||
fully used by merge, nor fully reported by log. | ||||
""" | ||||
|
r2016 | wlock = repo.wlock(0) | ||
errs, copied = docopy(ui, repo, pats, opts, wlock) | ||||
names = [] | ||||
for abs, rel, exact in copied: | ||||
if ui.verbose or not exact: | ||||
ui.status(_('removing %s\n') % rel) | ||||
names.append(abs) | ||||
|
r2503 | if not opts.get('dry_run'): | ||
|
r2414 | repo.remove(names, True, wlock) | ||
|
r1253 | return errs | ||
|
r1472 | def revert(ui, repo, *pats, **opts): | ||
|
r2227 | """revert files or dirs to their states as of some revision | ||
|
r2204 | |||
|
r2212 | With no revision specified, revert the named files or directories | ||
to the contents they had in the parent of the working directory. | ||||
This restores the contents of the affected files to an unmodified | ||||
state. If the working directory has two parents, you must | ||||
explicitly specify the revision to revert to. | ||||
|
r1811 | |||
|
r2036 | Modified files are saved with a .orig suffix before reverting. | ||
To disable these backups, use --no-backup. | ||||
|
r2029 | |||
|
r3016 | Using the -r option, revert the given files or directories to their | ||
contents as of a specific revision. This can be helpful to "roll | ||||
|
r1811 | back" some or all of a change that should not have been committed. | ||
Revert modifies the working directory. It does not commit any | ||||
|
r2204 | changes, or change the parent of the working directory. If you | ||
revert to a revision other than the parent of the working | ||||
directory, the reverted files will thus appear modified | ||||
afterwards. | ||||
|
r1437 | |||
If a file has been deleted, it is recreated. If the executable | ||||
mode of a file was changed, it is reset. | ||||
|
r1472 | If names are given, all files matching the names are reverted. | ||
|
r1437 | |||
|
r2982 | If no arguments are given, no files are reverted. | ||
|
r1437 | """ | ||
|
r2982 | |||
if not pats and not opts['all']: | ||||
|
r3020 | raise util.Abort(_('no files or directories specified; ' | ||
'use --all to revert the whole repo')) | ||||
|
r2982 | |||
|
r2212 | parent, p2 = repo.dirstate.parents() | ||
|
r3132 | if not opts['rev'] and p2 != nullid: | ||
raise util.Abort(_('uncommitted merge - please provide a ' | ||||
'specific revision')) | ||||
node = repo.changectx(opts['rev']).node() | ||||
|
r2029 | mf = repo.manifest.read(repo.changelog.read(node)[0]) | ||
|
r2407 | if node == parent: | ||
pmf = mf | ||||
else: | ||||
pmf = None | ||||
|
r2029 | |||
wlock = repo.wlock() | ||||
|
r2042 | # need all matching names in dirstate and manifest of target rev, | ||
# so have to walk both. do not print errors if files exist in one | ||||
# but not other. | ||||
|
r2029 | names = {} | ||
|
r2042 | target_only = {} | ||
# walk dirstate. | ||||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, | ||
badmatch=mf.has_key): | ||||
|
r2042 | names[abs] = (rel, exact) | ||
if src == 'b': | ||||
target_only[abs] = True | ||||
# walk target manifest. | ||||
|
r2882 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, | ||
badmatch=names.has_key): | ||||
|
r2042 | if abs in names: continue | ||
names[abs] = (rel, exact) | ||||
target_only[abs] = True | ||||
|
r2029 | |||
|
r2875 | changes = repo.status(match=names.has_key, wlock=wlock)[:5] | ||
|
r2029 | modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) | ||
revert = ([], _('reverting %s\n')) | ||||
add = ([], _('adding %s\n')) | ||||
remove = ([], _('removing %s\n')) | ||||
forget = ([], _('forgetting %s\n')) | ||||
undelete = ([], _('undeleting %s\n')) | ||||
update = {} | ||||
disptable = ( | ||||
# dispatch table: | ||||
# file state | ||||
# action if in target manifest | ||||
# action if not in target manifest | ||||
# make backup if in target manifest | ||||
# make backup if not in target manifest | ||||
(modified, revert, remove, True, True), | ||||
|
r2043 | (added, revert, forget, True, False), | ||
|
r2029 | (removed, undelete, None, False, False), | ||
(deleted, revert, remove, False, False), | ||||
(unknown, add, None, True, False), | ||||
|
r2042 | (target_only, add, None, False, False), | ||
|
r2029 | ) | ||
|
r2042 | entries = names.items() | ||
entries.sort() | ||||
for abs, (rel, exact) in entries: | ||||
|
r2407 | mfentry = mf.get(abs) | ||
|
r2029 | def handle(xlist, dobackup): | ||
xlist[0].append(abs) | ||||
|
r2407 | update[abs] = 1 | ||
|
r2036 | if dobackup and not opts['no_backup'] and os.path.exists(rel): | ||
bakname = "%s.orig" % rel | ||||
ui.note(_('saving current version of %s as %s\n') % | ||||
(rel, bakname)) | ||||
|
r2415 | if not opts.get('dry_run'): | ||
shutil.copyfile(rel, bakname) | ||||
shutil.copymode(rel, bakname) | ||||
|
r2029 | if ui.verbose or not exact: | ||
ui.status(xlist[1] % rel) | ||||
for table, hitlist, misslist, backuphit, backupmiss in disptable: | ||||
if abs not in table: continue | ||||
# file has changed in dirstate | ||||
|
r2407 | if mfentry: | ||
|
r2029 | handle(hitlist, backuphit) | ||
elif misslist is not None: | ||||
handle(misslist, backupmiss) | ||||
else: | ||||
if exact: ui.warn(_('file not managed: %s\n' % rel)) | ||||
break | ||||
else: | ||||
# file has not changed in dirstate | ||||
if node == parent: | ||||
if exact: ui.warn(_('no changes needed to %s\n' % rel)) | ||||
continue | ||||
|
r2407 | if pmf is None: | ||
# only need parent manifest in this unlikely case, | ||||
# so do not read by default | ||||
pmf = repo.manifest.read(repo.changelog.read(parent)[0]) | ||||
if abs in pmf: | ||||
if mfentry: | ||||
# if version of file is same in parent and target | ||||
# manifests, do nothing | ||||
if pmf[abs] != mfentry: | ||||
handle(revert, False) | ||||
else: | ||||
|
r2272 | handle(remove, False) | ||
|
r2029 | |||
|
r2415 | if not opts.get('dry_run'): | ||
repo.dirstate.forget(forget[0]) | ||||
|
r2812 | r = hg.revert(repo, node, update.has_key, wlock) | ||
|
r2415 | repo.dirstate.update(add[0], 'a') | ||
repo.dirstate.update(undelete[0], 'n') | ||||
repo.dirstate.update(remove[0], 'r') | ||||
return r | ||||
|
r588 | |||
|
r2227 | def rollback(ui, repo): | ||
"""roll back the last transaction in this repository | ||||
Roll back the last transaction in this repository, restoring the | ||||
project to its state prior to the transaction. | ||||
Transactions are used to encapsulate the effects of all commands | ||||
that create new changesets or propagate existing changesets into a | ||||
repository. For example, the following commands are transactional, | ||||
and their effects can be rolled back: | ||||
commit | ||||
import | ||||
pull | ||||
push (with this repository as destination) | ||||
unbundle | ||||
This command should be used with care. There is only one level of | ||||
rollback, and there is no way to undo a rollback. | ||||
This command is not intended for use on public repositories. Once | ||||
changes are visible for pull by other users, rolling a transaction | ||||
back locally is ineffective (someone else may already have pulled | ||||
the changes). Furthermore, a race is possible with readers of the | ||||
repository; for example an in-progress pull from the repository | ||||
may fail if a rollback is performed. | ||||
""" | ||||
|
r2362 | repo.rollback() | ||
|
r2227 | |||
|
r468 | def root(ui, repo): | ||
|
r1437 | """print the root (top) of the current working dir | ||
Print the root directory of the current repository. | ||||
""" | ||||
|
r468 | ui.write(repo.root + "\n") | ||
|
r245 | def serve(ui, repo, **opts): | ||
|
r1437 | """export the repository via HTTP | ||
Start a local HTTP repository browser and pull server. | ||||
By default, the server logs accesses to stdout and errors to | ||||
stderr. Use the "-A" and "-E" options to log to files. | ||||
""" | ||||
|
r624 | |||
if opts["stdio"]: | ||||
|
r2127 | if repo is None: | ||
|
r3079 | raise hg.RepoError(_("There is no Mercurial repository here" | ||
" (.hg not found)")) | ||||
|
r2396 | s = sshserver.sshserver(ui, repo) | ||
s.serve_forever() | ||||
|
r2363 | |||
|
r2125 | optlist = ("name templates style address port ipv6" | ||
" accesslog errorlog webdir_conf") | ||||
|
r987 | for o in optlist.split(): | ||
if opts[o]: | ||||
ui.setconfig("web", o, opts[o]) | ||||
|
r2127 | if repo is None and not ui.config("web", "webdir_conf"): | ||
|
r3079 | raise hg.RepoError(_("There is no Mercurial repository here" | ||
" (.hg not found)")) | ||||
|
r2127 | |||
|
r1741 | if opts['daemon'] and not opts['daemon_pipefds']: | ||
|
r1740 | rfd, wfd = os.pipe() | ||
args = sys.argv[:] | ||||
|
r1741 | args.append('--daemon-pipefds=%d,%d' % (rfd, wfd)) | ||
|
r1740 | pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0), | ||
args[0], args) | ||||
os.close(wfd) | ||||
os.read(rfd, 1) | ||||
os._exit(0) | ||||
|
r1177 | try: | ||
|
r2392 | httpd = hgweb.server.create_server(ui, repo) | ||
|
r1177 | except socket.error, inst: | ||
|
r3072 | raise util.Abort(_('cannot start server: %s') % 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) | ||
|
r1740 | |||
if opts['pid_file']: | ||||
fp = open(opts['pid_file'], 'w') | ||||
|
r2571 | fp.write(str(os.getpid()) + '\n') | ||
|
r1740 | fp.close() | ||
|
r1741 | if opts['daemon_pipefds']: | ||
rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')] | ||||
os.close(rfd) | ||||
|
r1740 | os.write(wfd, 'y') | ||
os.close(wfd) | ||||
sys.stdout.flush() | ||||
sys.stderr.flush() | ||||
fd = os.open(util.nulldev, os.O_RDWR) | ||||
if fd != 0: os.dup2(fd, 0) | ||||
if fd != 1: os.dup2(fd, 1) | ||||
if fd != 2: os.dup2(fd, 2) | ||||
if fd not in (0, 1, 2): os.close(fd) | ||||
|
r603 | httpd.serve_forever() | ||
|
r500 | |||
|
r731 | def status(ui, repo, *pats, **opts): | ||
|
r1437 | """show changed files in the working directory | ||
|
r213 | |||
|
r2661 | Show status of files in the repository. If names are given, only | ||
files that match are shown. Files that are clean or ignored, are | ||||
not listed unless -c (clean), -i (ignored) or -A is given. | ||||
|
r1437 | |||
The codes used to show the status of files are: | ||||
|
r746 | M = modified | ||
|
r245 | A = added | ||
R = removed | ||||
|
r2661 | C = clean | ||
|
r1619 | ! = deleted, but still tracked | ||
|
r842 | ? = not tracked | ||
|
r2022 | I = ignored (not shown by default) | ||
|
r2639 | = the previous added file was copied from here | ||
|
r1437 | """ | ||
|
r312 | |||
|
r2661 | all = opts['all'] | ||
|
r2882 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r1625 | cwd = (pats and repo.getcwd()) or '' | ||
|
r2661 | modified, added, removed, deleted, unknown, ignored, clean = [ | ||
|
r1618 | [util.pathto(cwd, x) for x in n] | ||
|
r2661 | for n in repo.status(files=files, match=matchfn, | ||
list_ignored=all or opts['ignored'], | ||||
list_clean=all or opts['clean'])] | ||||
changetypes = (('modified', 'M', modified), | ||||
|
r1966 | ('added', 'A', added), | ||
('removed', 'R', removed), | ||||
('deleted', '!', deleted), | ||||
|
r2022 | ('unknown', '?', unknown), | ||
|
r2661 | ('ignored', 'I', ignored)) | ||
explicit_changetypes = changetypes + (('clean', 'C', clean),) | ||||
|
r842 | |||
|
r1085 | end = opts['print0'] and '\0' or '\n' | ||
|
r1106 | |||
|
r2661 | for opt, char, changes in ([ct for ct in explicit_changetypes | ||
if all or opts[ct[0]]] | ||||
|
r842 | or changetypes): | ||
|
r1105 | if opts['no_status']: | ||
|
r1085 | format = "%%s%s" % end | ||
else: | ||||
|
r1966 | format = "%s %%s%s" % (char, end) | ||
|
r1106 | |||
|
r842 | for f in changes: | ||
|
r1085 | ui.write(format % f) | ||
|
r2661 | if ((all or opts.get('copies')) and not opts.get('no_status') | ||
|
r2639 | and opt == 'added' and repo.dirstate.copies.has_key(f)): | ||
ui.write(' %s%s' % (repo.dirstate.copies[f], end)) | ||||
|
r213 | |||
|
r1596 | def tag(ui, repo, name, rev_=None, **opts): | ||
|
r1437 | """add a tag for the current tip or a given revision | ||
Name a particular revision using <name>. | ||||
Tags are used to name particular revisions of the repository and are | ||||
very useful to compare different revision, to go back to significant | ||||
earlier versions or to mark branch points as releases, etc. | ||||
|
r2647 | If no revision is given, the parent of the working directory is used. | ||
|
r1437 | |||
To facilitate version control, distribution, and merging of tags, | ||||
they are stored as a file named ".hgtags" which is managed | ||||
similarly to other project files and can be hand-edited if | ||||
|
r1654 | necessary. The file '.hg/localtags' is used for local tags (not | ||
shared among repositories). | ||||
|
r1437 | """ | ||
|
r2789 | if name in ['tip', '.']: | ||
raise util.Abort(_("the name '%s' is reserved") % name) | ||||
|
r1654 | if rev_ is not None: | ||
ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " | ||||
|
r1661 | "please use 'hg tag [-r REV] NAME' instead\n")) | ||
|
r1654 | if opts['rev']: | ||
raise util.Abort(_("use only one form to specify the revision")) | ||||
|
r1596 | if opts['rev']: | ||
rev_ = opts['rev'] | ||||
|
r3132 | if not rev_ and repo.dirstate.parents()[1] != nullid: | ||
raise util.Abort(_('uncommitted merge - please provide a ' | ||||
'specific revision')) | ||||
r = repo.changectx(rev_).node() | ||||
|
r2967 | |||
message = opts['message'] | ||||
if not message: | ||||
message = _('Added tag %s for changeset %s') % (name, short(r)) | ||||
repo.tag(name, r, message, opts['local'], opts['user'], opts['date']) | ||||
|
r401 | |||
|
r248 | def tags(ui, repo): | ||
|
r1437 | """list repository tags | ||
List the repository tags. | ||||
This lists both regular and local tags. | ||||
""" | ||||
|
r477 | |||
|
r343 | l = repo.tagslist() | ||
l.reverse() | ||||
|
r2966 | hexfunc = ui.debugflag and hex or short | ||
|
r477 | for t, n in l: | ||
|
r248 | try: | ||
|
r2966 | r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n)) | ||
|
r248 | except KeyError: | ||
|
r477 | r = " ?:?" | ||
|
r2035 | if ui.quiet: | ||
ui.write("%s\n" % t) | ||||
else: | ||||
ui.write("%-30s %s\n" % (t, r)) | ||||
|
r248 | |||
|
r1731 | def tip(ui, repo, **opts): | ||
|
r1437 | """show the tip revision | ||
Show the tip revision. | ||||
""" | ||||
|
r245 | n = repo.changelog.tip() | ||
|
r1762 | br = None | ||
|
r1763 | if opts['branches']: | ||
|
r1762 | br = repo.branchlookup([n]) | ||
|
r1907 | show_changeset(ui, repo, opts).show(changenode=n, brinfo=br) | ||
|
r1731 | if opts['patch']: | ||
|
r2874 | patch.diff(repo, repo.changelog.parents(n)[0], n) | ||
|
r245 | |||
|
r1600 | def unbundle(ui, repo, fname, **opts): | ||
|
r1437 | """apply a changegroup file | ||
Apply a compressed changegroup file generated by the bundle | ||||
command. | ||||
""" | ||||
|
r1218 | f = urllib.urlopen(fname) | ||
|
r1980 | header = f.read(6) | ||
if not header.startswith("HG"): | ||||
raise util.Abort(_("%s: not a Mercurial bundle file") % fname) | ||||
elif not header.startswith("HG10"): | ||||
raise util.Abort(_("%s: unknown bundle version") % fname) | ||||
elif header == "HG10BZ": | ||||
|
r1940 | def generator(f): | ||
zd = bz2.BZ2Decompressor() | ||||
|
r1980 | zd.decompress("BZ") | ||
|
r1940 | for chunk in f: | ||
yield zd.decompress(chunk) | ||||
|
r1980 | elif header == "HG10UN": | ||
|
r1940 | def generator(f): | ||
for chunk in f: | ||||
yield chunk | ||||
else: | ||||
|
r1980 | raise util.Abort(_("%s: unknown bundle compression type") | ||
% fname) | ||||
|
r1940 | gen = generator(util.filechunkiter(f, 4096)) | ||
|
r2673 | modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle', | ||
'bundle:' + fname) | ||||
|
r2019 | return postincoming(ui, repo, modheads, opts['update']) | ||
|
r1218 | |||
|
r212 | def undo(ui, repo): | ||
|
r2227 | """undo the last commit or pull (DEPRECATED) | ||
(DEPRECATED) | ||||
This command is now deprecated and will be removed in a future | ||||
release. Please use the rollback command instead. For usage | ||||
instructions, see the rollback command. | ||||
|
r596 | """ | ||
|
r2238 | ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) | ||
|
r2362 | repo.rollback() | ||
|
r210 | |||
|
r1581 | def update(ui, repo, node=None, merge=False, clean=False, force=None, | ||
|
r2776 | branch=None): | ||
|
r1437 | """update or merge working directory | ||
Update the working directory to the specified revision. | ||||
|
r254 | |||
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. | ||||
|
r2283 | To merge the working directory with another revision, use the | ||
merge command. | ||||
|
r1437 | |||
By default, update will refuse to run if doing so would require | ||||
merging or discarding local changes. | ||||
""" | ||||
|
r2808 | node = _lookup(repo, node, branch) | ||
|
r2283 | if merge: | ||
ui.warn(_('(the -m/--merge option is deprecated; ' | ||||
'use the merge command instead)\n')) | ||||
|
r2808 | return hg.merge(repo, node, force=force) | ||
elif clean: | ||||
return hg.clean(repo, node) | ||||
else: | ||||
return hg.update(repo, node) | ||||
|
r2806 | |||
def _lookup(repo, node, branch=None): | ||||
|
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: | ||||
|
r2806 | repo.ui.warn(_("Found multiple heads for %s\n") % branch) | ||
|
r898 | for x in found: | ||
|
r2776 | show_changeset(ui, repo, {}).show(changenode=x, brinfo=br) | ||
|
r2806 | raise util.Abort("") | ||
|
r898 | if len(found) == 1: | ||
node = found[0] | ||||
|
r2806 | repo.ui.warn(_("Using head %s for branch %s\n") | ||
% (short(node), branch)) | ||||
|
r898 | else: | ||
|
r3072 | raise util.Abort(_("branch %s not found") % branch) | ||
|
r898 | else: | ||
node = node and repo.lookup(node) or repo.changelog.tip() | ||||
|
r2806 | return node | ||
|
r254 | |||
|
r247 | def verify(ui, repo): | ||
|
r1437 | """verify the integrity of the repository | ||
Verify the integrity of the current repository. | ||||
This will perform an extensive check of the repository's | ||||
integrity, validating the hashes and checksums of each entry in | ||||
the changelog, manifest, and tracked files, as well as the | ||||
integrity of their crosslinks and indices. | ||||
""" | ||||
|
r2778 | return hg.verify(repo) | ||
|
r247 | |||
|
r255 | # Command options and aliases are listed here, alphabetically | ||
|
r209 | table = { | ||
|
r841 | "^add": | ||
(add, | ||||
|
r1437 | [('I', 'include', [], _('include names matching the given patterns')), | ||
|
r2411 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | ||
|
r2416 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | ||
|
r1615 | _('hg add [OPTION]... [FILE]...')), | ||
|
r2955 | "addremove": | ||
|
r841 | (addremove, | ||
|
r1437 | [('I', 'include', [], _('include names matching the given patterns')), | ||
|
r2412 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | ||
|
r2958 | ('n', 'dry-run', None, | ||
_('do not perform actions, just print output')), | ||||
('s', 'similarity', '', | ||||
_('guess renamed files by similarity (0<=s<=1)'))], | ||||
|
r1615 | _('hg addremove [OPTION]... [FILE]...')), | ||
|
r697 | "^annotate": | ||
(annotate, | ||||
|
r1437 | [('r', 'rev', '', _('annotate the specified revision')), | ||
|
r1402 | ('a', 'text', None, _('treat all files as text')), | ||
|
r1437 | ('u', 'user', None, _('list the author')), | ||
|
r1522 | ('d', 'date', None, _('list the date')), | ||
|
r1437 | ('n', 'number', None, _('list the revision number (default)')), | ||
('c', 'changeset', None, _('list the changeset')), | ||||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1816 | _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')), | ||
|
r2160 | "archive": | ||
|
r2112 | (archive, | ||
[('', 'no-decode', None, _('do not pass files through decoders')), | ||||
('p', 'prefix', '', _('directory prefix for files in archive')), | ||||
('r', 'rev', '', _('revision to distribute')), | ||||
('t', 'type', '', _('type of distribution to create')), | ||||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
_('hg archive [OPTION]... DEST')), | ||||
|
r2159 | "backout": | ||
|
r2158 | (backout, | ||
|
r2159 | [('', 'merge', None, | ||
_('merge with old dirstate parent after backout')), | ||||
('m', 'message', '', _('use <text> as commit message')), | ||||
|
r2158 | ('l', 'logfile', '', _('read commit message from <file>')), | ||
('d', 'date', '', _('record datecode as commit date')), | ||||
|
r2614 | ('', 'parent', '', _('parent to choose when backing out merge')), | ||
|
r2158 | ('u', 'user', '', _('record user as committer')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r2159 | _('hg backout [OPTION]... REV')), | ||
|
r1218 | "bundle": | ||
(bundle, | ||||
|
r1959 | [('f', 'force', None, | ||
_('run even when remote repository is unrelated'))], | ||||
|
r1402 | _('hg bundle FILE DEST')), | ||
|
r697 | "cat": | ||
(cat, | ||||
|
r1816 | [('o', 'output', '', _('print output to file with formatted name')), | ||
('r', 'rev', '', _('print the given revision')), | ||||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1402 | _('hg cat [OPTION]... FILE...')), | ||
|
r697 | "^clone": | ||
(clone, | ||||
|
r1437 | [('U', 'noupdate', None, _('do not update the new working directory')), | ||
|
r1602 | ('r', 'rev', [], | ||
|
r2764 | _('a changeset you would like to have after cloning')), | ||
|
r1816 | ('', 'pull', None, _('use pull protocol to copy metadata')), | ||
|
r2620 | ('', 'uncompressed', None, | ||
_('use uncompressed transfer (fast over LAN)')), | ||||
|
r1816 | ('e', 'ssh', '', _('specify ssh command to use')), | ||
|
r1615 | ('', 'remotecmd', '', | ||
|
r1602 | _('specify hg command to run on the remote side'))], | ||
|
r1402 | _('hg clone [OPTION]... SOURCE [DEST]')), | ||
|
r697 | "^commit|ci": | ||
(commit, | ||||
|
r2184 | [('A', 'addremove', None, | ||
_('mark new/missing files as added/removed before committing')), | ||||
|
r1615 | ('m', 'message', '', _('use <text> as commit message')), | ||
('l', 'logfile', '', _('read the commit message from <file>')), | ||||
('d', 'date', '', _('record datecode as commit date')), | ||||
|
r1816 | ('u', 'user', '', _('record user as commiter')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1402 | _('hg commit [OPTION]... [FILE]...')), | ||
|
r1615 | "copy|cp": | ||
(copy, | ||||
|
r1816 | [('A', 'after', None, _('record a copy that has already occurred')), | ||
|
r1615 | ('f', 'force', None, | ||
|
r1816 | _('forcibly copy over an existing managed file')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
|
r2413 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | ||
|
r2416 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | ||
|
r1615 | _('hg copy [OPTION]... [SOURCE]... DEST')), | ||
|
r1402 | "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), | ||
|
r2034 | "debugcomplete": | ||
(debugcomplete, | ||||
[('o', 'options', None, _('show the command options'))], | ||||
_('debugcomplete [-o] CMD')), | ||||
|
r1755 | "debugrebuildstate": | ||
(debugrebuildstate, | ||||
|
r1816 | [('r', 'rev', '', _('revision to rebuild to'))], | ||
|
r1755 | _('debugrebuildstate [-r REV] [REV]')), | ||
|
r1402 | "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), | ||
|
r2410 | "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')), | ||
|
r1402 | "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, | ||||
|
r1437 | [('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1402 | _('debugwalk [OPTION]... [FILE]...')), | ||
|
r697 | "^diff": | ||
(diff, | ||||
|
r1402 | [('r', 'rev', [], _('revision')), | ||
('a', 'text', None, _('treat all files as text')), | ||||
|
r1728 | ('p', 'show-function', None, | ||
_('show which function each change is in')), | ||||
|
r2907 | ('g', 'git', None, _('use git extended diff format')), | ||
|
r1728 | ('w', 'ignore-all-space', None, | ||
_('ignore white space when comparing lines')), | ||||
|
r2580 | ('b', 'ignore-space-change', None, | ||
_('ignore changes in the amount of white space')), | ||||
('B', 'ignore-blank-lines', None, | ||||
_('ignore changes whose lines are all blank')), | ||||
|
r1816 | ('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1402 | _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), | ||
|
r697 | "^export": | ||
(export, | ||||
|
r1615 | [('o', 'output', '', _('print output to file with formatted name')), | ||
|
r1571 | ('a', 'text', None, _('treat all files as text')), | ||
|
r3029 | ('g', 'git', None, _('use git extended diff format')), | ||
|
r1571 | ('', 'switch-parent', None, _('diff against the second parent'))], | ||
|
r1812 | _('hg export [-a] [-o OUTFILESPEC] REV...')), | ||
|
r2140 | "debugforget|forget": | ||
|
r841 | (forget, | ||
|
r1437 | [('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1615 | _('hg forget [OPTION]... FILE...')), | ||
|
r1065 | "grep": | ||
(grep, | ||||
|
r1402 | [('0', 'print0', None, _('end fields with NUL')), | ||
|
r1437 | ('', 'all', None, _('print all revisions that match')), | ||
|
r2870 | ('f', 'follow', None, | ||
_('follow changeset history, or file history across copies and renames')), | ||||
|
r1402 | ('i', 'ignore-case', None, _('ignore case when matching')), | ||
|
r1602 | ('l', 'files-with-matches', None, | ||
_('print only filenames and revs that match')), | ||||
|
r1437 | ('n', 'line-number', None, _('print matching line numbers')), | ||
('r', 'rev', [], _('search in given revision range')), | ||||
|
r1816 | ('u', 'user', None, _('print user who committed change')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1615 | _('hg grep [OPTION]... PATTERN [FILE]...')), | ||
|
r905 | "heads": | ||
(heads, | ||||
|
r1763 | [('b', 'branches', None, _('show branches')), | ||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
|
r1907 | ('r', 'rev', '', _('show only heads which are descendants of rev')), | ||
|
r1913 | ('', 'template', '', _('display with template'))], | ||
|
r1550 | _('hg heads [-b] [-r <rev>]')), | ||
|
r1402 | "help": (help_, [], _('hg help [COMMAND]')), | ||
"identify|id": (identify, [], _('hg identify')), | ||||
|
r697 | "import|patch": | ||
(import_, | ||||
|
r1602 | [('p', 'strip', 1, | ||
|
r2125 | _('directory strip option for patch. This has the same\n' | ||
'meaning as the corresponding patch option')), | ||||
|
r2458 | ('m', 'message', '', _('use <text> as commit message')), | ||
|
r1816 | ('b', 'base', '', _('base path')), | ||
|
r1602 | ('f', 'force', None, | ||
|
r1816 | _('skip check for outstanding uncommitted changes'))], | ||
|
r2458 | _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')), | ||
|
r1253 | "incoming|in": (incoming, | ||
|
r1615 | [('M', 'no-merges', None, _('do not show merges')), | ||
|
r1959 | ('f', 'force', None, | ||
_('run even when remote repository is unrelated')), | ||||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
|
r1907 | ('n', 'newest-first', None, _('show newest record first')), | ||
|
r1944 | ('', 'bundle', '', _('file to store the bundles into')), | ||
|
r1439 | ('p', 'patch', None, _('show patch')), | ||
|
r2878 | ('r', 'rev', [], _('a specific revision up to which you would like to pull')), | ||
|
r1965 | ('', 'template', '', _('display with template')), | ||
('e', 'ssh', '', _('specify ssh command to use')), | ||||
('', 'remotecmd', '', | ||||
_('specify hg command to run on the remote side'))], | ||||
|
r2521 | _('hg incoming [-p] [-n] [-M] [-r REV]...' | ||
|
r2544 | ' [--bundle FILENAME] [SOURCE]')), | ||
|
r2598 | "^init": | ||
(init, | ||||
[('e', 'ssh', '', _('specify ssh command to use')), | ||||
('', 'remotecmd', '', | ||||
_('specify hg command to run on the remote side'))], | ||||
_('hg init [-e FILE] [--remotecmd FILE] [DEST]')), | ||||
|
r697 | "locate": | ||
(locate, | ||||
|
r1437 | [('r', 'rev', '', _('search the repository as it stood at rev')), | ||
|
r1602 | ('0', 'print0', None, | ||
_('end filenames with NUL, for use with xargs')), | ||||
('f', 'fullpath', None, | ||||
_('print complete paths from the filesystem root')), | ||||
|
r1437 | ('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1402 | _('hg locate [OPTION]... [PATTERN]...')), | ||
|
r697 | "^log|history": | ||
(log, | ||||
|
r1816 | [('b', 'branches', None, _('show branches')), | ||
|
r2741 | ('f', 'follow', None, | ||
|
r2782 | _('follow changeset history, or file history across copies and renames')), | ||
|
r2784 | ('', 'follow-first', None, | ||
_('only follow the first parent of merge changesets')), | ||||
|
r1402 | ('k', 'keyword', [], _('search for a keyword')), | ||
|
r1756 | ('l', 'limit', '', _('limit number of changes displayed')), | ||
|
r1437 | ('r', 'rev', [], _('show the specified revision or range')), | ||
|
r1615 | ('M', 'no-merges', None, _('do not show merges')), | ||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
|
r1615 | ('m', 'only-merges', None, _('show only merges')), | ||
|
r1816 | ('p', 'patch', None, _('show patch')), | ||
|
r2901 | ('P', 'prune', [], _('do not display revision or any of its ancestors')), | ||
|
r1920 | ('', 'template', '', _('display with template')), | ||
|
r1816 | ('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
_('hg log [OPTION]... [FILE]')), | ||||
|
r1402 | "manifest": (manifest, [], _('hg manifest [REV]')), | ||
|
r2019 | "merge": | ||
|
r2044 | (merge, | ||
[('b', 'branch', '', _('merge with head of a specific branch')), | ||||
('f', 'force', None, _('force a merge with outstanding changes'))], | ||||
_('hg merge [-b TAG] [-f] [REV]')), | ||||
|
r1253 | "outgoing|out": (outgoing, | ||
|
r1615 | [('M', 'no-merges', None, _('do not show merges')), | ||
|
r1959 | ('f', 'force', None, | ||
_('run even when remote repository is unrelated')), | ||||
|
r1439 | ('p', 'patch', None, _('show patch')), | ||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
|
r2521 | ('r', 'rev', [], _('a specific revision you would like to push')), | ||
|
r1907 | ('n', 'newest-first', None, _('show newest record first')), | ||
|
r1965 | ('', 'template', '', _('display with template')), | ||
('e', 'ssh', '', _('specify ssh command to use')), | ||||
('', 'remotecmd', '', | ||||
_('specify hg command to run on the remote side'))], | ||||
|
r2521 | _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')), | ||
|
r1724 | "^parents": | ||
(parents, | ||||
|
r1907 | [('b', 'branches', None, _('show branches')), | ||
|
r2644 | ('r', 'rev', '', _('show parents from the specified rev')), | ||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
('', 'template', '', _('display with template'))], | ||||
|
r2644 | _('hg parents [-b] [-r REV] [FILE]')), | ||
|
r1402 | "paths": (paths, [], _('hg paths [NAME]')), | ||
|
r697 | "^pull": | ||
(pull, | ||||
|
r1602 | [('u', 'update', None, | ||
_('update the working directory to tip after pull')), | ||||
|
r1615 | ('e', 'ssh', '', _('specify ssh command to use')), | ||
|
r1959 | ('f', 'force', None, | ||
_('run even when remote repository is unrelated')), | ||||
|
r2878 | ('r', 'rev', [], _('a specific revision up to which you would like to pull')), | ||
|
r1615 | ('', 'remotecmd', '', | ||
|
r1602 | _('specify hg command to run on the remote side'))], | ||
|
r2598 | _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')), | ||
|
r818 | "^push": | ||
(push, | ||||
|
r1402 | [('f', 'force', None, _('force push')), | ||
|
r1615 | ('e', 'ssh', '', _('specify ssh command to use')), | ||
|
r1781 | ('r', 'rev', [], _('a specific revision you would like to push')), | ||
|
r1615 | ('', 'remotecmd', '', | ||
|
r1602 | _('specify hg command to run on the remote side'))], | ||
|
r2598 | _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')), | ||
|
r1818 | "debugrawcommit|rawcommit": | ||
|
r697 | (rawcommit, | ||
|
r1402 | [('p', 'parent', [], _('parent')), | ||
|
r1615 | ('d', 'date', '', _('date code')), | ||
('u', 'user', '', _('user')), | ||||
('F', 'files', '', _('file list')), | ||||
('m', 'message', '', _('commit message')), | ||||
('l', 'logfile', '', _('commit message file'))], | ||||
|
r1818 | _('hg debugrawcommit [OPTION]... [FILE]...')), | ||
|
r1615 | "recover": (recover, [], _('hg recover')), | ||
"^remove|rm": | ||||
(remove, | ||||
|
r2245 | [('A', 'after', None, _('record remove that has already occurred')), | ||
|
r2179 | ('f', 'force', None, _('remove file even if modified')), | ||
|
r1869 | ('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1615 | _('hg remove [OPTION]... FILE...')), | ||
"rename|mv": | ||||
(rename, | ||||
|
r1816 | [('A', 'after', None, _('record a rename that has already occurred')), | ||
|
r1615 | ('f', 'force', None, | ||
|
r1816 | _('forcibly copy over an existing managed file')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
|
r2414 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | ||
|
r2416 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | ||
|
r1869 | _('hg rename [OPTION]... SOURCE... DEST')), | ||
|
r697 | "^revert": | ||
(revert, | ||||
|
r2983 | [('a', 'all', None, _('revert all changes when no arguments given')), | ||
|
r2982 | ('r', 'rev', '', _('revision to revert to')), | ||
|
r2029 | ('', 'no-backup', None, _('do not save backup copies of files')), | ||
('I', 'include', [], _('include names matching given patterns')), | ||||
|
r2415 | ('X', 'exclude', [], _('exclude names matching given patterns')), | ||
|
r2416 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | ||
|
r1816 | _('hg revert [-r REV] [NAME]...')), | ||
|
r2227 | "rollback": (rollback, [], _('hg rollback')), | ||
|
r1615 | "root": (root, [], _('hg root')), | ||
|
r697 | "^serve": | ||
(serve, | ||||
|
r1437 | [('A', 'accesslog', '', _('name of access log file to write to')), | ||
|
r1740 | ('d', 'daemon', None, _('run server in background')), | ||
|
r1742 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), | ||
|
r1437 | ('E', 'errorlog', '', _('name of error log file to write to')), | ||
('p', 'port', 0, _('port to use (default: 8000)')), | ||||
('a', 'address', '', _('address to use')), | ||||
|
r1615 | ('n', 'name', '', | ||
|
r1602 | _('name to show in web pages (default: working dir)')), | ||
|
r2124 | ('', 'webdir-conf', '', _('name of the webdir config file' | ||
' (serve more than one repo)')), | ||||
|
r1740 | ('', 'pid-file', '', _('name of file to write process ID to')), | ||
|
r1402 | ('', 'stdio', None, _('for remote clients')), | ||
|
r1615 | ('t', 'templates', '', _('web templates to use')), | ||
('', 'style', '', _('template style to use')), | ||||
|
r1402 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], | ||
|
r1615 | _('hg serve [OPTION]...')), | ||
|
r1507 | "^status|st": | ||
|
r840 | (status, | ||
|
r2661 | [('A', 'all', None, _('show status of all files')), | ||
('m', 'modified', None, _('show only modified files')), | ||||
|
r1402 | ('a', 'added', None, _('show only added files')), | ||
('r', 'removed', None, _('show only removed files')), | ||||
|
r1619 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | ||
|
r2661 | ('c', 'clean', None, _('show only files without changes')), | ||
|
r1402 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | ||
|
r2022 | ('i', 'ignored', None, _('show ignored files')), | ||
|
r1402 | ('n', 'no-status', None, _('hide status prefix')), | ||
|
r2639 | ('C', 'copies', None, _('show source of copied files')), | ||
|
r1602 | ('0', 'print0', None, | ||
_('end filenames with NUL, for use with xargs')), | ||||
|
r1437 | ('I', 'include', [], _('include names matching the given patterns')), | ||
('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||||
|
r1615 | _('hg status [OPTION]... [FILE]...')), | ||
|
r697 | "tag": | ||
(tag, | ||||
|
r1402 | [('l', 'local', None, _('make the tag local')), | ||
|
r1615 | ('m', 'message', '', _('message for tag commit log entry')), | ||
('d', 'date', '', _('record datecode as commit date')), | ||||
('u', 'user', '', _('record user as commiter')), | ||||
('r', 'rev', '', _('revision to tag'))], | ||||
|
r1812 | _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')), | ||
|
r1402 | "tags": (tags, [], _('hg tags')), | ||
|
r1762 | "tip": | ||
(tip, | ||||
|
r1763 | [('b', 'branches', None, _('show branches')), | ||
|
r1913 | ('', 'style', '', _('display using template map file')), | ||
|
r1907 | ('p', 'patch', None, _('show patch')), | ||
|
r1913 | ('', 'template', '', _('display with template'))], | ||
|
r1811 | _('hg tip [-b] [-p]')), | ||
|
r1218 | "unbundle": | ||
(unbundle, | ||||
|
r1601 | [('u', 'update', None, | ||
_('update the working directory to tip after unbundle'))], | ||||
|
r1600 | _('hg unbundle [-u] FILE')), | ||
|
r2241 | "debugundo|undo": (undo, [], _('hg undo')), | ||
|
r593 | "^update|up|checkout|co": | ||
|
r697 | (update, | ||
|
r1615 | [('b', 'branch', '', _('checkout the head of a specific branch')), | ||
|
r2283 | ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), | ||
|
r1581 | ('C', 'clean', None, _('overwrite locally modified files')), | ||
|
r2044 | ('f', 'force', None, _('force a merge with outstanding changes'))], | ||
|
r1581 | _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), | ||
|
r1402 | "verify": (verify, [], _('hg verify')), | ||
"version": (show_version, [], _('hg version')), | ||||
|
r1046 | } | ||
|
r209 | |||
|
r1046 | globalopts = [ | ||
|
r1894 | ('R', 'repository', '', | ||
_('repository root directory or symbolic path name')), | ||||
|
r1615 | ('', 'cwd', '', _('change working directory')), | ||
|
r1602 | ('y', 'noninteractive', None, | ||
|
r1615 | _('do not prompt, assume \'yes\' for any required answers')), | ||
('q', 'quiet', None, _('suppress output')), | ||||
('v', 'verbose', None, _('enable additional output')), | ||||
|
r2293 | ('', 'config', [], _('set/override config option')), | ||
|
r1615 | ('', 'debug', None, _('enable debugging output')), | ||
('', 'debugger', None, _('start debugger')), | ||||
|
r2422 | ('', 'lsprof', None, _('print improved command execution profile')), | ||
|
r1615 | ('', 'traceback', None, _('print traceback on exception')), | ||
('', 'time', None, _('time how long the command takes')), | ||||
('', 'profile', None, _('print command execution profile')), | ||||
('', 'version', None, _('output version information and exit')), | ||||
('h', 'help', None, _('display help and exit')), | ||||
|
r1046 | ] | ||
|
r596 | |||
|
r1887 | norepo = ("clone init version help debugancestor debugcomplete debugdata" | ||
|
r1858 | " debugindex debugindexdot") | ||
|
r2127 | optionalrepo = ("paths serve debugconfig") | ||
|
r209 | |||
|
r2988 | def findpossible(ui, cmd): | ||
|
r1887 | """ | ||
Return cmd -> (aliases, command table entry) | ||||
|
r2049 | for each matching command. | ||
Return debug commands (or their aliases) only if no normal command matches. | ||||
|
r1887 | """ | ||
choice = {} | ||||
debugchoice = {} | ||||
|
r212 | for e in table.keys(): | ||
|
r1506 | aliases = e.lstrip("^").split("|") | ||
|
r2049 | found = None | ||
|
r1506 | if cmd in aliases: | ||
|
r2049 | found = cmd | ||
|
r2988 | elif not ui.config("ui", "strict"): | ||
|
r2049 | for a in aliases: | ||
if a.startswith(cmd): | ||||
found = a | ||||
break | ||||
if found is not None: | ||||
if aliases[0].startswith("debug"): | ||||
debugchoice[found] = (aliases, table[e]) | ||||
else: | ||||
choice[found] = (aliases, table[e]) | ||||
|
r1739 | |||
|
r1850 | if not choice and debugchoice: | ||
choice = debugchoice | ||||
|
r1887 | return choice | ||
|
r2988 | def findcmd(ui, cmd): | ||
|
r1887 | """Return (aliases, command table entry) for command string.""" | ||
|
r2988 | choice = findpossible(ui, cmd) | ||
|
r1887 | |||
if choice.has_key(cmd): | ||||
return choice[cmd] | ||||
|
r1848 | if len(choice) > 1: | ||
|
r1887 | clist = choice.keys() | ||
|
r1849 | clist.sort() | ||
|
r1848 | raise AmbiguousCommand(cmd, clist) | ||
|
r1739 | |||
|
r1517 | if choice: | ||
|
r1887 | return choice.values()[0] | ||
|
r212 | |||
raise UnknownCommand(cmd) | ||||
|
r214 | def catchterm(*args): | ||
|
r2153 | raise util.SignalInterrupt | ||
|
r214 | |||
|
r249 | def run(): | ||
sys.exit(dispatch(sys.argv[1:])) | ||||
|
r697 | class ParseError(Exception): | ||
"""Exception raised on errors in parsing the command line.""" | ||||
|
r592 | |||
|
r1453 | def parse(ui, 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:] | ||||
|
r2988 | aliases, i = findcmd(ui, cmd) | ||
|
r1567 | cmd = aliases[0] | ||
|
r1453 | defaults = ui.config("defaults", cmd) | ||
if defaults: | ||||
|
r3068 | args = shlex.split(defaults) + args | ||
|
r1047 | 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 | |||
|
r2553 | external = {} | ||
def findext(name): | ||||
'''return module with given extension name''' | ||||
try: | ||||
|
r2573 | return sys.modules[external[name]] | ||
|
r2553 | except KeyError: | ||
for k, v in external.iteritems(): | ||||
|
r2755 | if k.endswith('.' + name) or k.endswith('/' + name) or v == name: | ||
|
r2573 | return sys.modules[v] | ||
|
r2553 | raise KeyError(name) | ||
|
r2600 | |||
|
r2944 | def load_extensions(ui): | ||
added = [] | ||||
for ext_name, load_from_name in ui.extensions(): | ||||
if ext_name in external: | ||||
continue | ||||
|
r2057 | try: | ||
|
r2573 | if load_from_name: | ||
|
r2405 | # the module will be loaded in sys.modules | ||
# choose an unique name so that it doesn't | ||||
# conflicts with other modules | ||||
|
r2573 | module_name = "hgext_%s" % ext_name.replace('.', '_') | ||
mod = imp.load_source(module_name, load_from_name) | ||||
|
r2057 | else: | ||
def importh(name): | ||||
mod = __import__(name) | ||||
components = name.split('.') | ||||
for comp in components[1:]: | ||||
mod = getattr(mod, comp) | ||||
return mod | ||||
|
r1889 | try: | ||
|
r2573 | mod = importh("hgext.%s" % ext_name) | ||
|
r1889 | except ImportError: | ||
|
r2573 | mod = importh(ext_name) | ||
external[ext_name] = mod.__name__ | ||||
|
r2944 | added.append((mod, ext_name)) | ||
|
r2428 | except (util.SignalInterrupt, KeyboardInterrupt): | ||
raise | ||||
|
r2057 | except Exception, inst: | ||
|
r2943 | ui.warn(_("*** failed to import extension %s: %s\n") % | ||
(ext_name, inst)) | ||||
if ui.print_exc(): | ||||
|
r2057 | return 1 | ||
|
r2944 | for mod, name in added: | ||
|
r2573 | uisetup = getattr(mod, 'uisetup', None) | ||
|
r2330 | if uisetup: | ||
|
r2944 | uisetup(ui) | ||
|
r2573 | cmdtable = getattr(mod, 'cmdtable', {}) | ||
|
r1295 | for t in cmdtable: | ||
|
r1071 | if t in table: | ||
|
r2943 | ui.warn(_("module %s overrides %s\n") % (name, t)) | ||
|
r1295 | table.update(cmdtable) | ||
|
r2943 | |||
def dispatch(args): | ||||
for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': | ||||
num = getattr(signal, name, None) | ||||
if num: signal.signal(num, catchterm) | ||||
try: | ||||
|
r3014 | u = ui.ui(traceback='--traceback' in sys.argv[1:]) | ||
|
r2943 | except util.Abort, inst: | ||
sys.stderr.write(_("abort: %s\n") % inst) | ||||
return -1 | ||||
|
r3014 | load_extensions(u) | ||
u.addreadhook(load_extensions) | ||||
|
r596 | try: | ||
|
r1453 | cmd, func, args, options, cmdoptions = parse(u, args) | ||
|
r1875 | 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() | ||||
u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % | ||||
(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) | ||||
atexit.register(print_time) | ||||
u.updateopts(options["verbose"], options["debug"], options["quiet"], | ||||
|
r2293 | not options["noninteractive"], options["traceback"], | ||
options["config"]) | ||||
|
r1875 | |||
# enter the debugger before command execution | ||||
if options['debugger']: | ||||
pdb.set_trace() | ||||
|
r527 | try: | ||
|
r1859 | if options['cwd']: | ||
try: | ||||
os.chdir(options['cwd']) | ||||
except OSError, inst: | ||||
raise util.Abort('%s: %s' % | ||||
(options['cwd'], inst.strerror)) | ||||
|
r1894 | path = u.expandpath(options["repository"]) or "" | ||
|
r1859 | repo = path and hg.repository(u, path=path) or None | ||
|
r1857 | |||
|
r1048 | if options['help']: | ||
|
r2057 | return help_(u, cmd, options['version']) | ||
|
r1048 | elif options['version']: | ||
|
r2057 | return show_version(u) | ||
|
r1047 | elif not cmd: | ||
|
r2057 | return help_(u, 'shortlist') | ||
|
r1047 | |||
|
r527 | if cmd not in norepo.split(): | ||
|
r1858 | try: | ||
if not repo: | ||||
repo = hg.repository(u, path=path) | ||||
u = repo.ui | ||||
|
r2573 | for name in external.itervalues(): | ||
mod = sys.modules[name] | ||||
if hasattr(mod, 'reposetup'): | ||||
mod.reposetup(u, repo) | ||||
|
r2847 | hg.repo_setup_hooks.append(mod.reposetup) | ||
|
r1858 | except hg.RepoError: | ||
if cmd not in optionalrepo.split(): | ||||
raise | ||||
|
r596 | d = lambda: func(u, repo, *args, **cmdoptions) | ||
|
r527 | else: | ||
|
r596 | d = lambda: func(u, *args, **cmdoptions) | ||
|
r209 | |||
|
r2716 | # reupdate the options, repo/.hg/hgrc may have changed them | ||
u.updateopts(options["verbose"], options["debug"], options["quiet"], | ||||
not options["noninteractive"], options["traceback"], | ||||
options["config"]) | ||||
|
r1837 | try: | ||
if options['profile']: | ||||
import hotshot, hotshot.stats | ||||
prof = hotshot.Profile("hg.prof") | ||||
|
r1832 | try: | ||
try: | ||||
|
r1837 | return prof.runcall(d) | ||
|
r1832 | except: | ||
|
r1837 | try: | ||
u.warn(_('exception raised - generating ' | ||||
'profile anyway\n')) | ||||
except: | ||||
pass | ||||
raise | ||||
finally: | ||||
prof.close() | ||||
stats = hotshot.stats.load("hg.prof") | ||||
stats.strip_dirs() | ||||
stats.sort_stats('time', 'calls') | ||||
stats.print_stats(40) | ||||
|
r2422 | elif options['lsprof']: | ||
try: | ||||
from mercurial import lsprof | ||||
except ImportError: | ||||
raise util.Abort(_( | ||||
'lsprof not available - install from ' | ||||
'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) | ||||
p = lsprof.Profiler() | ||||
p.enable(subcalls=True) | ||||
try: | ||||
return d() | ||||
finally: | ||||
p.disable() | ||||
stats = lsprof.Stats(p.getstats()) | ||||
stats.sort() | ||||
stats.pprint(top=10, file=sys.stderr, climit=5) | ||||
|
r1837 | else: | ||
return d() | ||||
finally: | ||||
u.flush() | ||||
|
r527 | except: | ||
|
r1225 | # enter the debugger when we hit an exception | ||
if options['debugger']: | ||||
pdb.post_mortem(sys.exc_info()[2]) | ||||
|
r2335 | u.print_exc() | ||
|
r527 | raise | ||
|
r1875 | except ParseError, inst: | ||
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, 'shortlist') | ||||
except AmbiguousCommand, inst: | ||||
|
r1920 | u.warn(_("hg: command '%s' is ambiguous:\n %s\n") % | ||
|
r1875 | (inst.args[0], " ".join(inst.args[1]))) | ||
except UnknownCommand, inst: | ||||
u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | ||||
help_(u, 'shortlist') | ||||
|
r499 | except hg.RepoError, inst: | ||
|
r2134 | u.warn(_("abort: %s!\n") % inst) | ||
|
r2016 | except lock.LockHeld, inst: | ||
if inst.errno == errno.ETIMEDOUT: | ||||
reason = _('timed out waiting for lock held by %s') % inst.locker | ||||
else: | ||||
reason = _('lock held by %s') % inst.locker | ||||
u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) | ||||
except lock.LockUnavailable, inst: | ||||
u.warn(_("abort: could not lock %s: %s\n") % | ||||
(inst.desc or inst.filename, inst.strerror)) | ||||
|
r1214 | except revlog.RevlogError, inst: | ||
|
r3072 | u.warn(_("abort: %s!\n") % inst) | ||
|
r2153 | except util.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): | ||
|
r3080 | 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: | ||
|
r3080 | if getattr(inst, "filename", None): | ||
|
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: | ||
|
r3072 | u.warn(_("abort: %s\n") % inst) | ||
|
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) | ||
|
r2057 | except SystemExit, inst: | ||
# Commands shouldn't sys.exit directly, but give a return code. | ||||
# Just in case catch this and and pass exit code to caller. | ||||
return inst.code | ||||
|
r1215 | except: | ||
|
r1402 | u.warn(_("** unknown exception encountered, details follow\n")) | ||
|
r2625 | u.warn(_("** report bug details to " | ||
"http://www.selenic.com/mercurial/bts\n")) | ||||
u.warn(_("** or mercurial@selenic.com\n")) | ||||
|
r1552 | u.warn(_("** Mercurial Distributed SCM (version %s)\n") | ||
% version.get_version()) | ||||
|
r1215 | raise | ||
|
r293 | |||
|
r2057 | return -1 | ||