Mercurial > hg-stable
view mercurial/commands.py @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 14 Dec 2005 22:19:03 -0600 |
| parents | bcdc030c59f8 |
| children | 5c5aaaa9ab6f |
line wrap: on
line source
# commands.py - command processing for mercurial # # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from demandload import demandload from node import * from i18n import gettext as _ demandload(globals(), "os re sys signal shutil imp urllib pdb") demandload(globals(), "fancyopts ui hg util lock revlog") demandload(globals(), "fnmatch hgweb mdiff random signal time traceback") demandload(globals(), "errno socket version struct atexit sets bz2") class UnknownCommand(Exception): """Exception raised if command is not in the command table.""" class AmbiguousCommand(Exception): """Exception raised if command shortcut matches more than one command.""" def filterfiles(filters, files): l = [x for x in files if x in filters] for t in filters: if t and t[-1] != "/": t += "/" l += [x for x in files if x.startswith(t)] return l def relpath(repo, args): cwd = repo.getcwd() if cwd: return [util.normpath(os.path.join(cwd, x)) for x in args] return args def matchpats(repo, pats=[], opts={}, head=''): cwd = repo.getcwd() if not pats and cwd: opts['include'] = [os.path.join(cwd, i) for i in opts['include']] opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] cwd = '' return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'), opts.get('exclude'), head) + (cwd,) def makewalk(repo, pats, opts, head=''): files, matchfn, anypats, cwd = matchpats(repo, pats, opts, head) exact = dict(zip(files, files)) def walk(): for src, fn in repo.walk(files=files, match=matchfn): yield src, fn, util.pathto(cwd, fn), fn in exact return files, matchfn, walk() def walk(repo, pats, opts, head=''): files, matchfn, results = makewalk(repo, pats, opts, head) for r in results: yield r def walkchangerevs(ui, repo, pats, opts): '''Iterate over files and the revs they changed in. Callers most commonly need to iterate backwards over the history it is interested in. Doing so has awful (quadratic-looking) performance, so we use iterators in a "windowed" way. We walk a window of revisions in the desired order. Within the window, we first walk forwards to gather data, then in the desired order (usually backwards) to display it. This function returns an (iterator, getchange, matchfn) tuple. The getchange function returns the changelog entry for a numeric revision. The iterator yields 3-tuples. They will be of one of the following forms: "window", incrementing, lastrev: stepping through a window, positive if walking forwards through revs, last rev in the sequence iterated over - use to reset state for the current window "add", rev, fns: out-of-order traversal of the given file names fns, which changed during revision rev - use to gather data for possible display "iter", rev, None: in-order traversal of the revs earlier iterated over with "add" - use to display data''' files, matchfn, anypats, cwd = matchpats(repo, pats, opts) if repo.changelog.count() == 0: return [], False, matchfn revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0'])) wanted = {} slowpath = anypats window = 300 fncache = {} chcache = {} def getchange(rev): ch = chcache.get(rev) if ch is None: chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev))) return ch if not slowpath and not files: # No files, no patterns. Display all revs. wanted = dict(zip(revs, revs)) if not slowpath: # Only files, no patterns. Check the history of each file. def filerevgen(filelog): for i in xrange(filelog.count() - 1, -1, -window): revs = [] for j in xrange(max(0, i - window), i + 1): revs.append(filelog.linkrev(filelog.node(j))) revs.reverse() for rev in revs: yield rev minrev, maxrev = min(revs), max(revs) for file in files: filelog = repo.file(file) # A zero count may be a directory or deleted file, so # try to find matching entries on the slow path. if filelog.count() == 0: slowpath = True break for rev in filerevgen(filelog): if rev <= maxrev: if rev < minrev: break fncache.setdefault(rev, []) fncache[rev].append(file) wanted[rev] = 1 if slowpath: # The slow path checks files modified in every changeset. def changerevgen(): for i in xrange(repo.changelog.count() - 1, -1, -window): for j in xrange(max(0, i - window), i + 1): yield j, getchange(j)[3] for rev, changefiles in changerevgen(): matches = filter(matchfn, changefiles) if matches: fncache[rev] = matches wanted[rev] = 1 def iterate(): for i in xrange(0, len(revs), window): yield 'window', revs[0] < revs[-1], revs[-1] nrevs = [rev for rev in revs[i:min(i+window, len(revs))] if rev in wanted] srevs = list(nrevs) srevs.sort() for rev in srevs: fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3]) yield 'add', rev, fns for rev in nrevs: yield 'iter', rev, None return iterate(), getchange, matchfn revrangesep = ':' def revrange(ui, repo, revs, revlog=None): """Yield revision as strings from a list of revision specifications.""" if revlog is None: revlog = repo.changelog revcount = revlog.count() def fix(val, defval): if not val: return defval try: num = int(val) if str(num) != val: raise ValueError if num < 0: num += revcount if num < 0: num = 0 elif num >= revcount: raise ValueError except ValueError: try: num = repo.changelog.rev(repo.lookup(val)) except KeyError: try: num = revlog.rev(revlog.lookup(val)) except KeyError: raise util.Abort(_('invalid revision identifier %s'), val) return num seen = {} for spec in revs: if spec.find(revrangesep) >= 0: start, end = spec.split(revrangesep, 1) start = fix(start, 0) end = fix(end, revcount - 1) step = start > end and -1 or 1 for rev in xrange(start, end+step, step): if rev in seen: continue seen[rev] = 1 yield str(rev) else: rev = fix(spec, None) if rev in seen: continue seen[rev] = 1 yield str(rev) def make_filename(repo, r, pat, node=None, total=None, seqno=None, revwidth=None, pathname=None): node_expander = { 'H': lambda: hex(node), 'R': lambda: str(r.rev(node)), 'h': lambda: short(node), } expander = { '%': lambda: '%', 'b': lambda: os.path.basename(repo.root), } try: if node: expander.update(node_expander) if node and revwidth is not None: expander['r'] = lambda: str(r.rev(node)).zfill(revwidth) if total is not None: expander['N'] = lambda: str(total) if seqno is not None: expander['n'] = lambda: str(seqno) if total is not None and seqno is not None: expander['n'] = lambda:str(seqno).zfill(len(str(total))) if pathname is not None: expander['s'] = lambda: os.path.basename(pathname) expander['d'] = lambda: os.path.dirname(pathname) or '.' expander['p'] = lambda: pathname newname = [] patlen = len(pat) i = 0 while i < patlen: c = pat[i] if c == '%': i += 1 c = pat[i] c = expander[c]() newname.append(c) i += 1 return ''.join(newname) except KeyError, inst: raise util.Abort(_("invalid format spec '%%%s' in output file name"), inst.args[0]) def make_file(repo, r, pat, node=None, total=None, seqno=None, revwidth=None, mode='wb', pathname=None): if not pat or pat == '-': return 'w' in mode and sys.stdout or sys.stdin if hasattr(pat, 'write') and 'w' in mode: return pat if hasattr(pat, 'read') and 'r' in mode: return pat return open(make_filename(repo, r, pat, node, total, seqno, revwidth, pathname), mode) def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, changes=None, text=False): if not changes: (c, a, d, u) = repo.changes(node1, node2, files, match=match) else: (c, a, d, u) = changes if files: c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) if not c and not a and not d: return if node2: change = repo.changelog.read(node2) mmap2 = repo.manifest.read(change[0]) date2 = util.datestr(change[2]) def read(f): return repo.file(f).read(mmap2[f]) else: date2 = util.datestr() if not node1: node1 = repo.dirstate.parents()[0] def read(f): return repo.wfile(f).read() if ui.quiet: r = None else: hexfunc = ui.verbose and hex or short r = [hexfunc(node) for node in [node1, node2] if node] change = repo.changelog.read(node1) mmap = repo.manifest.read(change[0]) date1 = util.datestr(change[2]) for f in c: to = None if f in mmap: to = repo.file(f).read(mmap[f]) tn = read(f) fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) for f in a: to = None tn = read(f) fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) for f in d: to = repo.file(f).read(mmap[f]) tn = None fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) def trimuser(ui, name, rev, revcache): """trim the name of the user who committed a change""" user = revcache.get(rev) if user is None: user = revcache[rev] = ui.shortuser(name) return user def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None): """show a single changeset or file revision""" log = repo.changelog if changenode is None: changenode = log.node(rev) elif not rev: rev = log.rev(changenode) if ui.quiet: ui.write("%d:%s\n" % (rev, short(changenode))) return changes = log.read(changenode) date = util.datestr(changes[2]) parents = [(log.rev(p), ui.verbose and hex(p) or short(p)) for p in log.parents(changenode) if ui.debugflag or p != nullid] if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1: parents = [] if ui.verbose: ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode))) else: ui.write(_("changeset: %d:%s\n") % (rev, short(changenode))) for tag in repo.nodetags(changenode): ui.status(_("tag: %s\n") % tag) for parent in parents: ui.write(_("parent: %d:%s\n") % parent) if brinfo and changenode in brinfo: br = brinfo[changenode] ui.write(_("branch: %s\n") % " ".join(br)) ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]), hex(changes[0]))) ui.status(_("user: %s\n") % changes[1]) ui.status(_("date: %s\n") % date) if ui.debugflag: files = repo.changes(log.parents(changenode)[0], changenode) for key, value in zip([_("files:"), _("files+:"), _("files-:")], files): if value: ui.note("%-12s %s\n" % (key, " ".join(value))) else: ui.note(_("files: %s\n") % " ".join(changes[3])) description = changes[4].strip() if description: if ui.verbose: ui.status(_("description:\n")) ui.status(description) ui.status("\n\n") else: ui.status(_("summary: %s\n") % description.splitlines()[0]) ui.status("\n") def show_version(ui): """output version and copyright information""" ui.write(_("Mercurial Distributed SCM (version %s)\n") % version.get_version()) ui.status(_( "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n" "This is free software; see the source for copying conditions. " "There is NO\nwarranty; " "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" )) def help_(ui, cmd=None, with_version=False): """show help for a given command or all commands""" option_lists = [] if cmd and cmd != 'shortlist': if with_version: show_version(ui) ui.write('\n') aliases, i = find(cmd) # synopsis ui.write("%s\n\n" % i[2]) # description doc = i[0].__doc__ if ui.quiet: doc = doc.splitlines(0)[0] ui.write("%s\n" % doc.rstrip()) if not ui.quiet: # aliases if len(aliases) > 1: ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) # options if i[1]: option_lists.append(("options", i[1])) 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 cmd == "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')) h = {} cmds = {} for c, e in table.items(): f = c.split("|")[0] if cmd == "shortlist" and not f.startswith("^"): continue f = f.lstrip("^") if not ui.debugflag and f.startswith("debug"): continue d = "" if e[0].__doc__: d = e[0].__doc__.splitlines(0)[0].rstrip() h[f] = d cmds[f]=c.lstrip("^") fns = h.keys() fns.sort() m = max(map(len, fns)) for f in fns: if ui.verbose: commands = cmds[f].replace("|",", ") ui.write(" %s:\n %s\n"%(commands,h[f])) else: ui.write(' %-*s %s\n' % (m, f, h[f])) # global options if ui.verbose: 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, default and _(" (default: %s)") % default 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) # Commands start here, listed alphabetically def add(ui, repo, *pats, **opts): """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. If no names are given, add all files in the repository. """ names = [] for src, abs, rel, exact in walk(repo, pats, opts): if exact: if ui.verbose: ui.status(_('adding %s\n') % rel) names.append(abs) elif repo.dirstate.state(abs) == '?': ui.status(_('adding %s\n') % rel) names.append(abs) repo.add(names) def addremove(ui, repo, *pats, **opts): """add all new files, delete all missing files 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. """ add, remove = [], [] for src, abs, rel, exact in walk(repo, pats, opts): if src == 'f' and repo.dirstate.state(abs) == '?': add.append(abs) if ui.verbose or not exact: ui.status(_('adding %s\n') % rel) if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): remove.append(abs) if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) repo.add(add) repo.remove(remove) def annotate(ui, repo, *pats, **opts): """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. """ def getnode(rev): return short(repo.changelog.node(rev)) ucache = {} def getname(rev): cl = repo.changelog.read(repo.changelog.node(rev)) return trimuser(ui, cl[1], rev, ucache) dcache = {} def getdate(rev): datestr = dcache.get(rev) if datestr is None: cl = repo.changelog.read(repo.changelog.node(rev)) datestr = dcache[rev] = util.datestr(cl[2]) return datestr if not pats: raise util.Abort(_('at least one file name or pattern required')) opmap = [['user', getname], ['number', str], ['changeset', getnode], ['date', getdate]] if not opts['user'] and not opts['changeset'] and not opts['date']: opts['number'] = 1 if opts['rev']: node = repo.changelog.lookup(opts['rev']) else: node = repo.dirstate.parents()[0] change = repo.changelog.read(node) mmap = repo.manifest.read(change[0]) for src, abs, rel, exact in walk(repo, pats, opts): if abs not in mmap: ui.warn(_("warning: %s is not in the repository!\n") % rel) continue f = repo.file(abs) if not opts['text'] and util.binary(f.read(mmap[abs])): ui.write(_("%s: binary file\n") % rel) continue lines = f.annotate(mmap[abs]) pieces = [] for o, f in opmap: if opts[o]: l = [f(n) for n, dummy in lines] if l: m = max(map(len, l)) pieces.append(["%*s" % (m, x) for x in l]) if pieces: for p, l in zip(zip(*pieces), lines): ui.write("%s: %s" % (" ".join(p), l[1])) def bundle(ui, repo, fname, dest="default-push", **opts): """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. """ f = open(fname, "wb") dest = ui.expandpath(dest, repo.root) other = hg.repository(ui, dest) o = repo.findoutgoing(other) cg = repo.changegroup(o) try: f.write("HG10") z = bz2.BZ2Compressor(9) while 1: chunk = cg.read(4096) if not chunk: break f.write(z.compress(chunk)) f.write(z.flush()) except: os.unlink(fname) raise def cat(ui, repo, file1, *pats, **opts): """output the latest or given revisions of files Print the specified files as they were at the given revision. If no revision is given then the tip is used. 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 """ mf = {} rev = opts['rev'] if rev: change = repo.changelog.read(repo.lookup(rev)) mf = repo.manifest.read(change[0]) for src, abs, rel, exact in walk(repo, (file1,) + pats, opts): r = repo.file(abs) if rev: try: n = mf[abs] except (hg.RepoError, KeyError): try: n = r.lookup(rev) except KeyError, inst: raise util.Abort(_('cannot find file %s in rev %s'), rel, rev) else: n = r.tip() fp = make_file(repo, r, opts['output'], node=n, pathname=abs) fp.write(r.read(n)) def clone(ui, source, dest=None, **opts): """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 and destination are on the same filesystem. Some filesystems, such as AFS, implement hardlinking incorrectly, but do not report errors. In these cases, use the --pull option to avoid hardlinking. """ if dest is None: dest = os.path.basename(os.path.normpath(source)) if os.path.exists(dest): raise util.Abort(_("destination '%s' already exists"), dest) dest = os.path.realpath(dest) class Dircleanup(object): def __init__(self, dir_): self.rmtree = shutil.rmtree self.dir_ = dir_ os.mkdir(dir_) def close(self): self.dir_ = None def __del__(self): if self.dir_: self.rmtree(self.dir_, True) if opts['ssh']: ui.setconfig("ui", "ssh", opts['ssh']) if opts['remotecmd']: ui.setconfig("ui", "remotecmd", opts['remotecmd']) if not os.path.exists(source): source = ui.expandpath(source) d = Dircleanup(dest) abspath = source other = hg.repository(ui, source) copy = False if other.dev() != -1: abspath = os.path.abspath(source) if not opts['pull'] and not opts['rev']: copy = True if copy: try: # we use a lock here because if we race with commit, we # can end up with extra data in the cloned revlogs that's # not pointed to by changesets, thus causing verify to # fail l1 = lock.lock(os.path.join(source, ".hg", "lock")) except OSError: copy = False if copy: # we lock here to avoid premature writing to the target os.mkdir(os.path.join(dest, ".hg")) l2 = lock.lock(os.path.join(dest, ".hg", "lock")) files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i" for f in files.split(): src = os.path.join(source, ".hg", f) dst = os.path.join(dest, ".hg", f) try: util.copyfiles(src, dst) except OSError, inst: if inst.errno != errno.ENOENT: raise repo = hg.repository(ui, dest) else: revs = None if opts['rev']: if not other.local(): raise util.Abort("clone -r not supported yet for remote repositories.") else: revs = [other.lookup(rev) for rev in opts['rev']] repo = hg.repository(ui, dest, create=1) repo.pull(other, heads = revs) f = repo.opener("hgrc", "w", text=True) f.write("[paths]\n") f.write("default = %s\n" % abspath) f.close() if not opts['noupdate']: update(ui, repo) d.close() def commit(ui, repo, *pats, **opts): """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" will be commited. The HGEDITOR or EDITOR environment variables are used to start an editor to add a commit comment. """ 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)) if opts['addremove']: addremove(ui, repo, *pats, **opts) fns, match, anypats, cwd = matchpats(repo, pats, opts) if pats: c, a, d, u = repo.changes(files=fns, match=match) files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r'] else: files = [] try: repo.commit(files, message, opts['user'], opts['date'], match) except ValueError, inst: raise util.Abort(str(inst)) def docopy(ui, repo, pats, opts): cwd = repo.getcwd() errors = 0 copied = [] targets = {} def okaytocopy(abs, rel, exact): reasons = {'?': _('is not managed'), 'a': _('has been marked for add')} reason = reasons.get(repo.dirstate.state(abs)) if reason: if exact: ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) else: return True def copy(abssrc, relsrc, target, exact): abstarget = util.canonpath(repo.root, cwd, target) reltarget = util.pathto(cwd, abstarget) prevsrc = targets.get(abstarget) if prevsrc is not None: ui.warn(_('%s: not overwriting - %s collides with %s\n') % (reltarget, abssrc, prevsrc)) return if (not opts['after'] and os.path.exists(reltarget) or opts['after'] and repo.dirstate.state(abstarget) not in '?r'): if not opts['force']: ui.warn(_('%s: not overwriting - file exists\n') % reltarget) return if not opts['after']: os.unlink(reltarget) if opts['after']: if not os.path.exists(reltarget): return else: targetdir = os.path.dirname(reltarget) or '.' if not os.path.isdir(targetdir): os.makedirs(targetdir) try: shutil.copyfile(relsrc, reltarget) shutil.copymode(relsrc, reltarget) except shutil.Error, inst: raise util.Abort(str(inst)) except IOError, inst: if inst.errno == errno.ENOENT: ui.warn(_('%s: deleted in working copy\n') % relsrc) else: ui.warn(_('%s: cannot copy - %s\n') % (relsrc, inst.strerror)) errors += 1 return if ui.verbose or not exact: ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) targets[abstarget] = abssrc repo.copy(abssrc, abstarget) copied.append((abssrc, relsrc, exact)) def targetpathfn(pat, dest, srcs): if os.path.isdir(pat): if pat.endswith(os.sep): pat = pat[:-len(os.sep)] if destdirexists: striplen = len(os.path.split(pat)[0]) else: striplen = len(pat) 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)) elif len(util.canonpath(repo.root, cwd, pat)) < 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[1][striplen:]) if os.path.exists(t): score += 1 return score if pat.endswith(os.sep): pat = pat[:-len(os.sep)] striplen = len(pat) + len(os.sep) if os.path.isdir(os.path.join(dest, os.path.split(pat)[1])): score = evalpath(striplen) striplen1 = len(os.path.split(pat)[0]) if striplen1: striplen1 += len(os.sep) if evalpath(striplen1) > score: striplen = striplen1 res = lambda p: os.path.join(dest, p[striplen:]) else: # a file if destdirexists: res = lambda p: os.path.join(dest, os.path.basename(p)) else: res = lambda p: dest return res 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) if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists: raise util.Abort(_('with multiple sources, destination must be an ' 'existing directory')) if opts['after']: tfn = targetpathafterfn else: tfn = targetpathfn copylist = [] for pat in pats: srcs = [] for tag, abssrc, relsrc, exact in walk(repo, [pat], opts): if okaytocopy(abssrc, relsrc, exact): srcs.append((abssrc, relsrc, exact)) if not srcs: continue copylist.append((tfn(pat, dest, srcs), srcs)) if not copylist: raise util.Abort(_('no files to copy')) for targetpath, srcs in copylist: for abssrc, relsrc, exact in srcs: copy(abssrc, relsrc, targetpath(relsrc), exact) if errors: ui.warn(_('(consider using --after)\n')) return errors, copied def copy(ui, repo, *pats, **opts): """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. """ errs, copied = docopy(ui, repo, pats, opts) return errs def debugancestor(ui, index, rev1, rev2): """find the ancestor revision of two revisions in a given index""" r = revlog.revlog(util.opener(os.getcwd()), index, "") a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) ui.write("%d:%s\n" % (r.rev(a), hex(a))) def debugcheckstate(ui, repo): """validate the correctness of the current dirstate""" parent1, parent2 = repo.dirstate.parents() repo.dirstate.read() dc = repo.dirstate.map 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: ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) errors += 1 if state in "a" and f in m1: ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) errors += 1 if state in "m" and f not in m1 and f not in m2: ui.warn(_("%s in state %s, but not in either manifest\n") % (f, state)) errors += 1 for f in m1: state = repo.dirstate.state(f) if state not in "nrm": ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) errors += 1 if errors: raise util.Abort(_(".hg/dirstate inconsistent with current parent's manifest")) def debugconfig(ui): """show combined config settings from all hgrc files""" try: repo = hg.repository(ui) except hg.RepoError: pass for section, name, value in ui.walkconfig(): ui.write('%s.%s=%s\n' % (section, name, value)) def debugsetparents(ui, repo, rev1, rev2=None): """manually set the parents of the current working directory This is useful for writing repository conversion tools, but should be used with care. """ if not rev2: rev2 = hex(nullid) repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) def debugstate(ui, repo): """show the contents of the current dirstate""" repo.dirstate.read() dc = repo.dirstate.map keys = dc.keys() keys.sort() for file_ in keys: 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_)) for f in repo.dirstate.copies: ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f)) def debugdata(ui, file_, rev): """dump the contents of an data file revision""" r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_) try: ui.write(r.revision(r.lookup(rev))) except KeyError: raise util.Abort(_('invalid revision identifier %s'), rev) def debugindex(ui, file_): """dump the contents of an index file""" r = revlog.revlog(util.opener(os.getcwd()), file_, "") ui.write(" rev offset length base linkrev" + " nodeid p1 p2\n") for i in range(r.count()): e = r.index[i] ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( i, e[0], e[1], e[2], e[3], short(e[6]), short(e[4]), short(e[5]))) def debugindexdot(ui, file_): """dump an index DAG as a .dot file""" r = revlog.revlog(util.opener(os.getcwd()), file_, "") ui.write("digraph G {\n") for i in range(r.count()): e = r.index[i] ui.write("\t%d -> %d\n" % (r.rev(e[4]), i)) if e[5] != nullid: ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) ui.write("}\n") def debugrename(ui, repo, file, rev=None): """dump rename information""" r = repo.file(relpath(repo, [file])[0]) if rev: try: # assume all revision numbers are for changesets n = repo.lookup(rev) change = repo.changelog.read(n) m = repo.manifest.read(change[0]) n = m[relpath(repo, [file])[0]] except (hg.RepoError, KeyError): n = r.lookup(rev) else: n = r.tip() m = r.renamed(n) if m: ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1]))) else: ui.write(_("not renamed\n")) def debugwalk(ui, repo, *pats, **opts): """show how files match on given patterns""" items = list(walk(repo, pats, opts)) if not items: return fmt = '%%s %%-%ds %%-%ds %%s' % ( 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: line = fmt % (src, abs, rel, exact and 'exact' or '') ui.write("%s\n" % line.rstrip()) def diff(ui, repo, *pats, **opts): """diff repository (or selected files) 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. """ node1, node2 = None, None revs = [repo.lookup(x) for x in opts['rev']] if len(revs) > 0: node1 = revs[0] if len(revs) > 1: node2 = revs[1] if len(revs) > 2: raise util.Abort(_("too many revisions to diff")) fns, matchfn, anypats, cwd = matchpats(repo, pats, opts) dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn, text=opts['text']) def doexport(ui, repo, changeset, seqno, total, revwidth, opts): node = repo.lookup(changeset) parents = [p for p in repo.changelog.parents(node) if p != nullid] prev = (parents and parents[0]) or nullid change = repo.changelog.read(node) if opts['switch_parent']: parents.reverse() fp = make_file(repo, repo.changelog, opts['output'], node=node, total=total, seqno=seqno, revwidth=revwidth) if fp != sys.stdout: ui.note("%s\n" % fp.name) fp.write("# HG changeset patch\n") fp.write("# User %s\n" % change[1]) fp.write("# Node ID %s\n" % hex(node)) fp.write("# Parent %s\n" % hex(prev)) if len(parents) > 1: fp.write("# Parent %s\n" % hex(parents[1])) fp.write(change[4].rstrip()) fp.write("\n\n") dodiff(fp, ui, repo, prev, node, text=opts['text']) if fp != sys.stdout: fp.close() def export(ui, repo, *changesets, **opts): """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. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge. """ if not changesets: raise util.Abort(_("export requires at least one changeset")) seqno = 0 revs = list(revrange(ui, repo, changesets)) total = len(revs) revwidth = max(map(len, revs)) ui.note(len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")) for cset in revs: seqno += 1 doexport(ui, repo, cset, seqno, total, revwidth, opts) def forget(ui, repo, *pats, **opts): """don't add the specified files on the next commit Undo an 'hg add' scheduled for the next commit. """ forget = [] for src, abs, rel, exact in walk(repo, pats, opts): if repo.dirstate.state(abs) == 'a': forget.append(abs) if ui.verbose or not exact: ui.status(_('forgetting %s\n') % rel) repo.forget(forget) def grep(ui, repo, pattern, *pats, **opts): """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. """ reflags = 0 if opts['ignore_case']: reflags |= re.I regexp = re.compile(pattern, reflags) sep, eol = ':', '\n' if opts['print0']: sep = eol = '\0' fcache = {} def getfile(fn): if fn not in fcache: fcache[fn] = repo.file(fn) return fcache[fn] def matchlines(body): begin = 0 linenum = 0 while True: match = regexp.search(body, begin) if not match: break 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 class linestate(object): def __init__(self, line, linenum, colstart, colend): self.line = line self.linenum = linenum self.colstart = colstart self.colend = colend def __eq__(self, other): return self.line == other.line def __hash__(self): return hash(self.line) matches = {} def grepbody(fn, rev, body): matches[rev].setdefault(fn, {}) m = matches[rev][fn] for lnum, cstart, cend, line in matchlines(body): s = linestate(line, lnum, cstart, cend) m[s] = s prev = {} ucache = {} def display(fn, rev, states, prevstates): diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) diff.sort(lambda x, y: cmp(x.linenum, y.linenum)) counts = {'-': 0, '+': 0} filerevmatches = {} for l in diff: if incrementing or not opts['all']: change = ((l in prevstates) and '-') or '+' r = rev else: change = ((l in states) and '-') or '+' r = prev[fn] cols = [fn, str(rev)] if opts['line_number']: cols.append(str(l.linenum)) if opts['all']: cols.append(change) if opts['user']: cols.append(trimuser(ui, getchange(rev)[1], rev, ucache)) if opts['files_with_matches']: c = (fn, rev) if c in filerevmatches: continue filerevmatches[c] = 1 else: cols.append(l.line) ui.write(sep.join(cols), eol) counts[change] += 1 return counts['+'], counts['-'] fstate = {} skip = {} changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) count = 0 incrementing = False for st, rev, fns in changeiter: 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: if fn in skip: continue fstate.setdefault(fn, {}) try: grepbody(fn, rev, getfile(fn).read(mf[fn])) except KeyError: pass elif st == 'iter': states = matches[rev].items() states.sort() for fn, m in states: if fn in skip: continue if incrementing or not opts['all'] or fstate[fn]: pos, neg = display(fn, rev, m, fstate[fn]) count += pos + neg if pos and not opts['all']: skip[fn] = True fstate[fn] = m prev[fn] = rev if not incrementing: fstate = fstate.items() fstate.sort() for fn, state in fstate: if fn in skip: continue display(fn, rev, {}, state) return (count == 0 and 1) or 0 def heads(ui, repo, **opts): """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. """ if opts['rev']: heads = repo.heads(repo.lookup(opts['rev'])) else: heads = repo.heads() br = None if opts['branches']: br = repo.branchlookup(heads) for n in heads: show_changeset(ui, repo, changenode=n, brinfo=br) def identify(ui, repo): """print information about the working copy 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. """ parents = [p for p in repo.dirstate.parents() if p != nullid] if not parents: ui.write(_("unknown\n")) return hexfunc = ui.verbose and hex or short (c, a, d, u) = repo.changes() output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]), (c or a or d) and "+" or "")] if not ui.quiet: # 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 ' + ' if parenttags: output.append(' + '.join(parenttags)) ui.write("%s\n" % ' '.join(output)) def import_(ui, repo, patch1, *patches, **opts): """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. If a patch looks like a mail message (its first line starts with "From " or looks like an RFC822 header), it will not be applied unless the -f option is used. The importer neither parses nor discards mail headers, so use -f only to override the "mailness" safety check, not to import a real mail message. """ patches = (patch1,) + patches if not opts['force']: (c, a, d, u) = repo.changes() if c or a or d: raise util.Abort(_("outstanding uncommitted changes")) d = opts["base"] strip = opts["strip"] mailre = re.compile(r'(?:From |[\w-]+:)') # attempt to detect the start of a patch # (this heuristic is borrowed from quilt) diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' + 'retrieving revision [0-9]+(\.[0-9]+)*$|' + '(---|\*\*\*)[ \t])') for patch in patches: ui.status(_("applying %s\n") % patch) pf = os.path.join(d, patch) message = [] user = None hgpatch = False for line in file(pf): line = line.rstrip() if (not message and not hgpatch and mailre.match(line) and not opts['force']): if len(line) > 35: line = line[:32] + '...' raise util.Abort(_('first line looks like a ' 'mail header: ') + line) if diffre.match(line): break elif hgpatch: # parse values when importing the result of an hg export if line.startswith("# User "): user = line[7:] ui.debug(_('User: %s\n') % user) elif not line.startswith("# ") and line: message.append(line) hgpatch = False elif line == '# HG changeset patch': hgpatch = True message = [] # We may have collected garbage else: message.append(line) # make sure message isn't empty if not message: message = _("imported patch %s\n") % patch else: message = "%s\n" % '\n'.join(message) ui.debug(_('message:\n%s\n') % message) files = util.patch(strip, pf, ui) if len(files) > 0: addremove(ui, repo, *files) repo.commit(files, message, user) def incoming(ui, repo, source="default", **opts): """show new changesets found in source Show new changesets found in the specified repo or the default pull repo. These are the changesets that would be pulled if a pull was requested. Currently only local repositories are supported. """ source = ui.expandpath(source, repo.root) other = hg.repository(ui, source) if not other.local(): raise util.Abort(_("incoming doesn't work for remote repositories yet")) o = repo.findincoming(other) if not o: return o = other.changelog.nodesbetween(o)[0] if opts['newest_first']: o.reverse() 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 show_changeset(ui, other, changenode=n) if opts['patch']: prev = (parents and parents[0]) or nullid dodiff(ui, ui, other, prev, n) ui.write("\n") def init(ui, dest="."): """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. """ if not os.path.exists(dest): os.mkdir(dest) hg.repository(ui, dest, create=1) def locate(ui, repo, *pats, **opts): """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. """ end = opts['print0'] and '\0' or '\n' for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/|)'): if repo.dirstate.state(abs) == '?': continue if opts['fullpath']: ui.write(os.path.join(repo.root, abs), end) else: ui.write(rel, end) def log(ui, repo, *pats, **opts): """show revision history of entire repository or files Print the revision history of the specified files or the entire project. By default this command outputs: changeset id and hash, tags, 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. """ class dui(object): # Implement and delegate some ui protocol. Save hunks of # output for later display in the desired order. def __init__(self, ui): self.ui = ui self.hunk = {} def bump(self, rev): self.rev = rev self.hunk[rev] = [] def note(self, *args): if self.verbose: self.write(*args) def status(self, *args): if not self.quiet: self.write(*args) def write(self, *args): self.hunk[self.rev].append(args) def debug(self, *args): if self.debugflag: self.write(*args) def __getattr__(self, key): return getattr(self.ui, key) changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) for st, rev, fns in changeiter: if st == 'window': du = dui(ui) elif st == 'add': du.bump(rev) 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: continue if opts['only_merges'] and len(parents) != 2: continue br = None if opts['keyword']: changes = getchange(rev) miss = 0 for k in [kw.lower() for kw in opts['keyword']]: 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 if opts['branch']: br = repo.branchlookup([repo.changelog.node(rev)]) show_changeset(du, repo, rev, brinfo=br) if opts['patch']: prev = (parents and parents[0]) or nullid dodiff(du, du, repo, prev, changenode, match=matchfn) du.write("\n\n") elif st == 'iter': for args in du.hunk[rev]: ui.write(*args) def manifest(ui, repo, rev=None): """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. """ if rev: try: # assume all revision numbers are for changesets n = repo.lookup(rev) change = repo.changelog.read(n) n = change[0] except hg.RepoError: n = repo.manifest.lookup(rev) else: n = repo.manifest.tip() m = repo.manifest.read(n) mf = repo.manifest.readflags(n) files = m.keys() files.sort() for f in files: ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) def outgoing(ui, repo, dest="default-push", **opts): """show changesets not found in destination Show changesets not found in the specified destination repo or the default push repo. These are the changesets that would be pushed if a push was requested. """ dest = ui.expandpath(dest, repo.root) other = hg.repository(ui, dest) o = repo.findoutgoing(other) o = repo.changelog.nodesbetween(o)[0] if opts['newest_first']: o.reverse() for n in o: parents = [p for p in repo.changelog.parents(n) if p != nullid] if opts['no_merges'] and len(parents) == 2: continue show_changeset(ui, repo, changenode=n) if opts['patch']: prev = (parents and parents[0]) or nullid dodiff(ui, ui, repo, prev, n) ui.write("\n") def parents(ui, repo, rev=None): """show the parents of the working dir or revision Print the working directory's parent revisions. """ if rev: p = repo.changelog.parents(repo.lookup(rev)) else: p = repo.dirstate.parents() for n in p: if n != nullid: show_changeset(ui, repo, changenode=n) def paths(ui, search=None): """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. """ try: repo = hg.repository(ui=ui) except hg.RepoError: pass if search: for name, path in ui.configitems("paths"): if name == search: ui.write("%s\n" % path) return ui.warn(_("not found!\n")) return 1 else: for name, path in ui.configitems("paths"): ui.write("%s = %s\n" % (name, path)) def pull(ui, repo, source="default", **opts): """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 http://[user@]host[:port][/path] https://[user@]host[:port][/path] ssh://[user@]host[:port][/path] SSH requires an accessible shell account on the destination machine and a copy of hg in the remote path. With SSH, paths are relative to the remote user's home directory by default; use two slashes at the start of a path to specify it as relative to the filesystem root. """ source = ui.expandpath(source, repo.root) ui.status(_('pulling from %s\n') % (source)) if opts['ssh']: ui.setconfig("ui", "ssh", opts['ssh']) if opts['remotecmd']: ui.setconfig("ui", "remotecmd", opts['remotecmd']) other = hg.repository(ui, source) revs = None if opts['rev'] and not other.local(): raise util.Abort("pull -r doesn't work for remote repositories yet") elif opts['rev']: revs = [other.lookup(rev) for rev in opts['rev']] r = repo.pull(other, heads=revs) if not r: if opts['update']: return update(ui, repo) else: ui.status(_("(run 'hg update' to get a working copy)\n")) return r def push(ui, repo, dest="default-push", force=False, ssh=None, remotecmd=None): """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 ssh://[user@]host[:port][/path] SSH requires an accessible shell account on the destination machine and a copy of hg in the remote path. """ dest = ui.expandpath(dest, repo.root) ui.status('pushing to %s\n' % (dest)) if ssh: ui.setconfig("ui", "ssh", ssh) if remotecmd: ui.setconfig("ui", "remotecmd", remotecmd) other = hg.repository(ui, dest) r = repo.push(other, force) return r def rawcommit(ui, repo, *flist, **rc): """raw commit interface 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. """ message = rc['message'] if not message and rc['logfile']: try: message = open(rc['logfile']).read() except IOError: pass if not message and not rc['logfile']: raise util.Abort(_("missing commit message")) files = relpath(repo, list(flist)) if rc['files']: files += open(rc['files']).read().splitlines() rc['parent'] = map(repo.lookup, rc['parent']) try: repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent']) except ValueError, inst: raise util.Abort(str(inst)) def recover(ui, repo): """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. """ if repo.recover(): return repo.verify() return False def remove(ui, repo, pat, *pats, **opts): """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 directory, they will be deleted from it. """ names = [] def okaytoremove(abs, rel, exact): c, a, d, u = repo.changes(files = [abs]) reason = None if c: reason = _('is modified') elif a: reason = _('has been marked for add') elif u: reason = _('is not managed') if reason: if exact: ui.warn(_('not removing %s: file %s\n') % (rel, reason)) else: return True for src, abs, rel, exact in walk(repo, (pat,) + pats, opts): if okaytoremove(abs, rel, exact): if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) names.append(abs) repo.remove(names, unlink=True) def rename(ui, repo, *pats, **opts): """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. """ errs, copied = docopy(ui, repo, pats, opts) names = [] for abs, rel, exact in copied: if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) names.append(abs) repo.remove(names, unlink=True) return errs def revert(ui, repo, *pats, **opts): """revert modified files or dirs back to their unmodified states Revert any uncommitted modifications made to the named files or directories. This restores the contents of the affected files to an unmodified state. If a file has been deleted, it is recreated. If the executable mode of a file was changed, it is reset. If names are given, all files matching the names are reverted. If no arguments are given, all files in the repository are reverted. """ node = opts['rev'] and repo.lookup(opts['rev']) or \ repo.dirstate.parents()[0] files, choose, anypats, cwd = matchpats(repo, pats, opts) (c, a, d, u) = repo.changes(match=choose) repo.forget(a) repo.undelete(d) return repo.update(node, False, True, choose, False) def root(ui, repo): """print the root (top) of the current working dir Print the root directory of the current repository. """ ui.write(repo.root + "\n") def serve(ui, repo, **opts): """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. """ if opts["stdio"]: fin, fout = sys.stdin, sys.stdout sys.stdout = sys.stderr # Prevent insertion/deletion of CRs util.set_binary(fin) util.set_binary(fout) def getarg(): argline = fin.readline()[:-1] arg, l = argline.split() val = fin.read(int(l)) return arg, val def respond(v): fout.write("%d\n" % len(v)) fout.write(v) fout.flush() lock = None while 1: cmd = fin.readline()[:-1] if cmd == '': return if cmd == "heads": h = repo.heads() respond(" ".join(map(hex, h)) + "\n") if cmd == "lock": lock = repo.lock() respond("") if cmd == "unlock": if lock: lock.release() lock = None respond("") elif cmd == "branches": arg, nodes = getarg() nodes = map(bin, nodes.split(" ")) r = [] for b in repo.branches(nodes): r.append(" ".join(map(hex, b)) + "\n") respond("".join(r)) elif cmd == "between": arg, pairs = getarg() pairs = [map(bin, p.split("-")) for p in pairs.split(" ")] r = [] for b in repo.between(pairs): r.append(" ".join(map(hex, b)) + "\n") respond("".join(r)) elif cmd == "changegroup": nodes = [] arg, roots = getarg() nodes = map(bin, roots.split(" ")) cg = repo.changegroup(nodes) while 1: d = cg.read(4096) if not d: break fout.write(d) fout.flush() elif cmd == "addchangegroup": if not lock: respond("not locked") continue respond("") r = repo.addchangegroup(fin) respond("") optlist = "name templates style address port ipv6 accesslog errorlog" for o in optlist.split(): if opts[o]: ui.setconfig("web", o, opts[o]) try: httpd = hgweb.create_server(repo) except socket.error, inst: raise util.Abort('cannot start server: ' + inst.args[1]) if ui.verbose: addr, port = httpd.socket.getsockname() if addr == '0.0.0.0': addr = socket.gethostname() else: try: addr = socket.gethostbyaddr(addr)[0] except socket.error: pass if port != 80: ui.status(_('listening at http://%s:%d/\n') % (addr, port)) else: ui.status(_('listening at http://%s/\n') % addr) httpd.serve_forever() def status(ui, repo, *pats, **opts): """show changed files in the working directory Show changed files in the repository. If names are given, only files that match are shown. The codes used to show the status of files are: M = modified A = added R = removed ? = not tracked """ files, matchfn, anypats, cwd = matchpats(repo, pats, opts) (c, a, d, u) = [[util.pathto(cwd, x) for x in n] for n in repo.changes(files=files, match=matchfn)] changetypes = [(_('modified'), 'M', c), (_('added'), 'A', a), (_('removed'), 'R', d), (_('unknown'), '?', u)] end = opts['print0'] and '\0' or '\n' for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]] or changetypes): if opts['no_status']: format = "%%s%s" % end else: format = "%s %%s%s" % (char, end); for f in changes: ui.write(format % f) def tag(ui, repo, name, rev=None, **opts): """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. If no revision is given, the tip is used. 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 necessary. """ if name == "tip": raise util.Abort(_("the name 'tip' is reserved")) if 'rev' in opts: rev = opts['rev'] if rev: r = hex(repo.lookup(rev)) else: r = hex(repo.changelog.tip()) disallowed = (revrangesep, '\r', '\n') for c in disallowed: if name.find(c) >= 0: raise util.Abort(_("%s cannot be used in a tag name") % repr(c)) if opts['local']: repo.opener("localtags", "a").write("%s %s\n" % (r, name)) return (c, a, d, u) = repo.changes() for x in (c, a, d, u): if ".hgtags" in x: raise util.Abort(_("working copy of .hgtags is changed " "(please commit .hgtags manually)")) repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name)) if repo.dirstate.state(".hgtags") == '?': repo.add([".hgtags"]) message = (opts['message'] or _("Added tag %s for changeset %s") % (name, r)) try: repo.commit([".hgtags"], message, opts['user'], opts['date']) except ValueError, inst: raise util.Abort(str(inst)) def tags(ui, repo): """list repository tags List the repository tags. This lists both regular and local tags. """ l = repo.tagslist() l.reverse() for t, n in l: try: r = "%5d:%s" % (repo.changelog.rev(n), hex(n)) except KeyError: r = " ?:?" ui.write("%-30s %s\n" % (t, r)) def tip(ui, repo): """show the tip revision Show the tip revision. """ n = repo.changelog.tip() show_changeset(ui, repo, changenode=n) def unbundle(ui, repo, fname): """apply a changegroup file Apply a compressed changegroup file generated by the bundle command. """ f = urllib.urlopen(fname) if f.read(4) != "HG10": raise util.Abort(_("%s: not a Mercurial bundle file") % fname) def bzgenerator(f): zd = bz2.BZ2Decompressor() for chunk in f: yield zd.decompress(chunk) bzgen = bzgenerator(util.filechunkiter(f, 4096)) repo.addchangegroup(util.chunkbuffer(bzgen)) def undo(ui, repo): """undo the last commit or pull Roll back the last pull or commit transaction on the repository, restoring the project to its earlier state. This command should be used with care. There is only one level of undo and there is no redo. This command is not intended for use on public repositories. Once a change is visible for pull by other users, undoing it locally is ineffective. """ repo.undo() def update(ui, repo, node=None, merge=False, clean=False, force=None, branch=None): """update or merge working directory Update the working directory to the specified revision. If there are no outstanding changes in the working directory and there is a linear relationship between the current version and the requested version, the result is the requested version. Otherwise the result is a merge between the contents of the current working directory and the requested version. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed. By default, update will refuse to run if doing so would require merging or discarding local changes. """ if branch: br = repo.branchlookup(branch=branch) found = [] for x in br: if branch in br[x]: found.append(x) if len(found) > 1: ui.warn(_("Found multiple heads for %s\n") % branch) for x in found: show_changeset(ui, repo, changenode=x, brinfo=br) return 1 if len(found) == 1: node = found[0] ui.warn(_("Using head %s for branch %s\n") % (short(node), branch)) else: ui.warn(_("branch %s not found\n") % (branch)) return 1 else: node = node and repo.lookup(node) or repo.changelog.tip() return repo.update(node, allow=merge, force=clean, forcemerge=force) def verify(ui, repo): """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. """ return repo.verify() # Command options and aliases are listed here, alphabetically table = { "^add": (add, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], "hg add [OPTION]... [FILE]..."), "addremove": (addremove, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], "hg addremove [OPTION]... [FILE]..."), "^annotate": (annotate, [('r', 'rev', '', _('annotate the specified revision')), ('a', 'text', None, _('treat all files as text')), ('u', 'user', None, _('list the author')), ('d', 'date', None, _('list the date')), ('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'))], _('hg annotate [OPTION]... FILE...')), "bundle": (bundle, [], _('hg bundle FILE DEST')), "cat": (cat, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('o', 'output', "", _('print output to file with formatted name')), ('r', 'rev', '', _('print the given revision'))], _('hg cat [OPTION]... FILE...')), "^clone": (clone, [('U', 'noupdate', None, _('do not update the new working directory')), ('e', 'ssh', "", _('specify ssh command to use')), ('', 'pull', None, _('use pull protocol to copy metadata')), ('r', 'rev', [], _('a changeset you would like to have after cloning')), ('', 'remotecmd', "", _('specify hg command to run on the remote side'))], _('hg clone [OPTION]... SOURCE [DEST]')), "^commit|ci": (commit, [('A', 'addremove', None, _('run addremove during commit')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('m', 'message', "", _('use <text> as commit message')), ('l', 'logfile', "", _('read the commit message from <file>')), ('d', 'date', "", _('record datecode as commit date')), ('u', 'user', "", _('record user as commiter'))], _('hg commit [OPTION]... [FILE]...')), "copy|cp": (copy, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('A', 'after', None, _('record a copy that has already occurred')), ('f', 'force', None, _('forcibly copy over an existing managed file'))], _('hg copy [OPTION]... [SOURCE]... DEST')), "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), "debugconfig": (debugconfig, [], _('debugconfig')), "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), "debugstate": (debugstate, [], _('debugstate')), "debugdata": (debugdata, [], _('debugdata FILE REV')), "debugindex": (debugindex, [], _('debugindex FILE')), "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), "debugrename": (debugrename, [], _('debugrename FILE [REV]')), "debugwalk": (debugwalk, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _('debugwalk [OPTION]... [FILE]...')), "^diff": (diff, [('r', 'rev', [], _('revision')), ('a', 'text', None, _('treat all files as text')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), "^export": (export, [('o', 'output', "", _('print output to file with formatted name')), ('a', 'text', None, _('treat all files as text')), ('', 'switch-parent', None, _('diff against the second parent'))], "hg export [-a] [-o OUTFILE] REV..."), "forget": (forget, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], "hg forget [OPTION]... FILE..."), "grep": (grep, [('0', 'print0', None, _('end fields with NUL')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('', 'all', None, _('print all revisions that match')), ('i', 'ignore-case', None, _('ignore case when matching')), ('l', 'files-with-matches', None, _('print only filenames and revs that match')), ('n', 'line-number', None, _('print matching line numbers')), ('r', 'rev', [], _('search in given revision range')), ('u', 'user', None, _('print user who committed change'))], "hg grep [OPTION]... PATTERN [FILE]..."), "heads": (heads, [('b', 'branches', None, _('find branch info')), ('r', 'rev', "", _('show only heads which are descendants of rev'))], _('hg heads [-b] [-r <rev>]')), "help": (help_, [], _('hg help [COMMAND]')), "identify|id": (identify, [], _('hg identify')), "import|patch": (import_, [('p', 'strip', 1, _('directory strip option for patch. This has the same\n') + _('meaning as the corresponding patch option')), ('f', 'force', None, _('skip check for outstanding uncommitted changes')), ('b', 'base', "", _('base path'))], "hg import [-f] [-p NUM] [-b BASE] PATCH..."), "incoming|in": (incoming, [('M', 'no-merges', None, _("do not show merges")), ('p', 'patch', None, _('show patch')), ('n', 'newest-first', None, _('show newest record first'))], _('hg incoming [-p] [-n] [-M] [SOURCE]')), "^init": (init, [], _('hg init [DEST]')), "locate": (locate, [('r', 'rev', '', _('search the repository as it stood at rev')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('f', 'fullpath', None, _('print complete paths from the filesystem root')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _('hg locate [OPTION]... [PATTERN]...')), "^log|history": (log, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('b', 'branch', None, _('show branches')), ('k', 'keyword', [], _('search for a keyword')), ('r', 'rev', [], _('show the specified revision or range')), ('M', 'no-merges', None, _("do not show merges")), ('m', 'only-merges', None, _("show only merges")), ('p', 'patch', None, _('show patch'))], _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')), "manifest": (manifest, [], _('hg manifest [REV]')), "outgoing|out": (outgoing, [('M', 'no-merges', None, _("do not show merges")), ('p', 'patch', None, _('show patch')), ('n', 'newest-first', None, _('show newest record first'))], _('hg outgoing [-p] [-n] [-M] [DEST]')), "^parents": (parents, [], _('hg parents [REV]')), "paths": (paths, [], _('hg paths [NAME]')), "^pull": (pull, [('u', 'update', None, _('update the working directory to tip after pull')), ('e', 'ssh', "", _('specify ssh command to use')), ('r', 'rev', [], _('a specific revision you would like to pull')), ('', 'remotecmd', "", _('specify hg command to run on the remote side'))], _('hg pull [-u] [-e FILE] [-r rev] [--remotecmd FILE] [SOURCE]')), "^push": (push, [('f', 'force', None, _('force push')), ('e', 'ssh', "", _('specify ssh command to use')), ('', 'remotecmd', "", _('specify hg command to run on the remote side'))], _('hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]')), "rawcommit": (rawcommit, [('p', 'parent', [], _('parent')), ('d', 'date', "", _('date code')), ('u', 'user', "", _('user')), ('F', 'files', "", _('file list')), ('m', 'message', "", _('commit message')), ('l', 'logfile', "", _('commit message file'))], _('hg rawcommit [OPTION]... [FILE]...')), "recover": (recover, [], _("hg recover")), "^remove|rm": (remove, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _("hg remove [OPTION]... FILE...")), "rename|mv": (rename, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('A', 'after', None, _('record a rename that has already occurred')), ('f', 'force', None, _('forcibly copy over an existing managed file'))], _('hg rename [OPTION]... [SOURCE]... DEST')), "^revert": (revert, [('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ("r", "rev", "", _("revision to revert to"))], _("hg revert [-n] [-r REV] [NAME]...")), "root": (root, [], _("hg root")), "^serve": (serve, [('A', 'accesslog', '', _('name of access log file to write to')), ('E', 'errorlog', '', _('name of error log file to write to')), ('p', 'port', 0, _('port to use (default: 8000)')), ('a', 'address', '', _('address to use')), ('n', 'name', "", _('name to show in web pages (default: working dir)')), ('', 'stdio', None, _('for remote clients')), ('t', 'templates', "", _('web templates to use')), ('', 'style', "", _('template style to use')), ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], _("hg serve [OPTION]...")), "^status|st": (status, [('m', 'modified', None, _('show only modified files')), ('a', 'added', None, _('show only added files')), ('r', 'removed', None, _('show only removed files')), ('u', 'unknown', None, _('show only unknown (not tracked) files')), ('n', 'no-status', None, _('hide status prefix')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _("hg status [OPTION]... [FILE]...")), "tag": (tag, [('l', 'local', None, _('make the tag local')), ('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'))], _('hg tag [OPTION]... NAME [REV]')), "tags": (tags, [], _('hg tags')), "tip": (tip, [], _('hg tip')), "unbundle": (unbundle, [], _('hg unbundle FILE')), "undo": (undo, [], _('hg undo')), "^update|up|checkout|co": (update, [('b', 'branch', "", _('checkout the head of a specific branch')), ('m', 'merge', None, _('allow merging of branches')), ('C', 'clean', None, _('overwrite locally modified files')), ('f', 'force', None, _('force a merge with outstanding changes'))], _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), "verify": (verify, [], _('hg verify')), "version": (show_version, [], _('hg version')), } globalopts = [ ('R', 'repository', "", _("repository root directory")), ('', 'cwd', '', _("change working directory")), ('y', 'noninteractive', None, _("do not prompt, assume 'yes' for any required answers")), ('q', 'quiet', None, _("suppress output")), ('v', 'verbose', None, _("enable additional output")), ('', 'debug', None, _("enable debugging output")), ('', 'debugger', None, _("start debugger")), ('', '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")), ] norepo = ("clone init version help debugancestor debugconfig debugdata" " debugindex debugindexdot paths") def find(cmd): """Return (aliases, command table entry) for command string.""" choice = None for e in table.keys(): aliases = e.lstrip("^").split("|") if cmd in aliases: return aliases, table[e] for a in aliases: if a.startswith(cmd): if choice: raise AmbiguousCommand(cmd) else: choice = aliases, table[e] break if choice: return choice raise UnknownCommand(cmd) class SignalInterrupt(Exception): """Exception raised on SIGTERM and SIGHUP.""" def catchterm(*args): raise SignalInterrupt def run(): sys.exit(dispatch(sys.argv[1:])) class ParseError(Exception): """Exception raised on errors in parsing the command line.""" def parse(ui, args): options = {} cmdoptions = {} try: args = fancyopts.fancyopts(args, globalopts, options) except fancyopts.getopt.GetoptError, inst: raise ParseError(None, inst) if args: cmd, args = args[0], args[1:] aliases, i = find(cmd) cmd = aliases[0] defaults = ui.config("defaults", cmd) if defaults: args = defaults.split() + args c = list(i[1]) else: cmd = None c = [] # combine global options into local for o in globalopts: c.append((o[0], o[1], options[o[1]], o[3])) try: args = fancyopts.fancyopts(args, c, cmdoptions) except fancyopts.getopt.GetoptError, inst: raise ParseError(cmd, inst) # separate global options back out for o in globalopts: n = o[1] options[n] = cmdoptions[n] del cmdoptions[n] return (cmd, cmd and i[0] or None, args, options, cmdoptions) def dispatch(args): signal.signal(signal.SIGTERM, catchterm) try: signal.signal(signal.SIGHUP, catchterm) except AttributeError: pass try: u = ui.ui() except util.Abort, inst: sys.stderr.write(_("abort: %s\n") % inst) sys.exit(1) external = [] for x in u.extensions(): def on_exception(exc, inst): u.warn(_("*** failed to import extension %s\n") % x[1]) u.warn("%s\n" % inst) if "--traceback" in sys.argv[1:]: traceback.print_exc() if x[1]: try: mod = imp.load_source(x[0], x[1]) except Exception, inst: on_exception(Exception, inst) continue else: def importh(name): mod = __import__(name) components = name.split('.') for comp in components[1:]: mod = getattr(mod, comp) return mod try: mod = importh(x[0]) except Exception, inst: on_exception(Exception, inst) continue external.append(mod) for x in external: cmdtable = getattr(x, 'cmdtable', {}) for t in cmdtable: if t in table: u.warn(_("module %s overrides %s\n") % (x.__name__, t)) table.update(cmdtable) try: cmd, func, args, options, cmdoptions = parse(u, args) 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') sys.exit(-1) except AmbiguousCommand, inst: u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0]) sys.exit(1) except UnknownCommand, inst: u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) help_(u, 'shortlist') sys.exit(1) 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"], not options["noninteractive"]) # enter the debugger before command execution if options['debugger']: pdb.set_trace() try: try: if options['help']: help_(u, cmd, options['version']) sys.exit(0) elif options['version']: show_version(u) sys.exit(0) elif not cmd: help_(u, 'shortlist') sys.exit(0) if options['cwd']: try: os.chdir(options['cwd']) except OSError, inst: raise util.Abort('%s: %s' % (options['cwd'], inst.strerror)) if cmd not in norepo.split(): path = options["repository"] or "" repo = hg.repository(ui=u, path=path) for x in external: if hasattr(x, 'reposetup'): x.reposetup(u, repo) d = lambda: func(u, repo, *args, **cmdoptions) else: d = lambda: func(u, *args, **cmdoptions) if options['profile']: import hotshot, hotshot.stats prof = hotshot.Profile("hg.prof") r = prof.runcall(d) prof.close() stats = hotshot.stats.load("hg.prof") stats.strip_dirs() stats.sort_stats('time', 'calls') stats.print_stats(40) return r else: return d() except: # enter the debugger when we hit an exception if options['debugger']: pdb.post_mortem(sys.exc_info()[2]) if options['traceback']: traceback.print_exc() raise except hg.RepoError, inst: u.warn(_("abort: "), inst, "!\n") except revlog.RevlogError, inst: u.warn(_("abort: "), inst, "!\n") except SignalInterrupt: u.warn(_("killed!\n")) except KeyboardInterrupt: try: u.warn(_("interrupted!\n")) except IOError, inst: if inst.errno == errno.EPIPE: if u.debugflag: u.warn(_("\nbroken pipe\n")) else: raise except IOError, inst: if hasattr(inst, "code"): u.warn(_("abort: %s\n") % inst) elif hasattr(inst, "reason"): u.warn(_("abort: error: %s\n") % inst.reason[1]) elif hasattr(inst, "args") and inst[0] == errno.EPIPE: if u.debugflag: u.warn(_("broken pipe\n")) elif getattr(inst, "strerror", None): if getattr(inst, "filename", None): u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename)) else: u.warn(_("abort: %s\n") % inst.strerror) else: raise except OSError, inst: if hasattr(inst, "filename"): u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) else: u.warn(_("abort: %s\n") % inst.strerror) except util.Abort, inst: u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n') sys.exit(1) except TypeError, inst: # was this an argument error? tb = traceback.extract_tb(sys.exc_info()[2]) if len(tb) > 2: # no raise u.debug(inst, "\n") u.warn(_("%s: invalid arguments\n") % cmd) help_(u, cmd) except AmbiguousCommand, inst: u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0]) help_(u, 'shortlist') except UnknownCommand, inst: u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) help_(u, 'shortlist') except SystemExit: # don't catch this in the catch-all below raise except: u.warn(_("** unknown exception encountered, details follow\n")) u.warn(_("** report bug details to mercurial@selenic.com\n")) u.warn(_("** Mercurial Distributed SCM (version %s)\n") % version.get_version()) raise sys.exit(-1)