mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:809a870a0e73
+:acee766fcb79
 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
 demandload(globals(), "errno socket version struct")
 class UnknownCommand(Exception):
 """Exception raised if command is not in the command table."""
+class Abort(Exception):
+"""Raised if a command needs to print an error and exit."""
 def filterfiles(filters, files):
 l = [x for x in files if x in filters]
 for t in filters:
 num = repo.changelog.rev(repo.lookup(val))
 except KeyError:
 try:
 num = revlog.rev(revlog.lookup(val))
 except KeyError:
-ui.warn('abort: invalid revision identifier %s\n' % val)
+raise Abort('invalid revision identifier %s', val)
-sys.exit(1)
 return num
 for spec in revs:
 if spec.find(revrangesep) >= 0:
 start, end = spec.split(revrangesep, 1)
 start = fix(start, 0)
 expander = {
 '%': lambda: '%',
 'b': lambda: os.path.basename(repo.root),
 }
-if node:
+try:
-expander.update(node_expander)
+if node:
-if node and revwidth is not None:
+expander.update(node_expander)
-expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
+if node and revwidth is not None:
-if total is not None:
+expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
-expander['N'] = lambda: str(total)
+if total is not None:
-if seqno is not None:
+expander['N'] = lambda: str(total)
-expander['n'] = lambda: str(seqno)
+if seqno is not None:
-if total is not None and seqno is not None:
+expander['n'] = lambda: str(seqno)
-expander['n'] = lambda:str(seqno).zfill(len(str(total)))
+if total is not None and seqno is not None:
+expander['n'] = lambda:str(seqno).zfill(len(str(total)))
-newname = []
-patlen = len(pat)
+newname = []
-i = 0
+patlen = len(pat)
-while i < patlen:
+i = 0
-c = pat[i]
+while i < patlen:
-if c == '%':
+c = pat[i]
+if c == '%':
+i += 1
+c = pat[i]
+c = expander[c]()
+newname.append(c)
 i += 1
-c = pat[i]
+return ''.join(newname)
-c = expander[c]()
+except KeyError, inst:
-newname.append(c)
+raise Abort("invalid format spec '%%%s' in output file name",
-i += 1
+inst.args[0])
-return ''.join(newname)
 def dodiff(fp, ui, repo, files=None, node1=None, node2=None):
 def date(c):
 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
 if rev:
 n = r.lookup(rev)
 else:
 n = r.tip()
 if opts['output'] and opts['output'] != '-':
-try:
+fp = open(make_filename(repo, r, opts['output'], node=n), 'wb')
-outname = make_filename(repo, r, opts['output'], node=n)
-fp = open(outname, 'wb')
-except KeyError, inst:
-ui.warn("error: invlaid format spec '%%%s' in output file name\n" %
-inst.args[0])
-sys.exit(1);
 else:
 fp = sys.stdout
 fp.write(r.read(n))
 def clone(ui, source, dest=None, **opts):
 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:
-ui.warn(".hg/dirstate inconsistent with current parent's manifest\n")
+raise Abort(".hg/dirstate inconsistent with current parent's manifest")
-sys.exit(1)
 def debugstate(ui, repo):
 """show the contents of the current dirstate"""
 repo.dirstate.read()
 dc = repo.dirstate.map
 revs = []
 if opts['rev']:
 revs = map(lambda x: repo.lookup(x), opts['rev'])
 if len(revs) > 2:
-ui.warn("too many revisions to diff\n")
+raise Abort("too many revisions to diff")
-sys.exit(1)
 if files:
 files = relpath(repo, files)
 else:
 files = relpath(repo, [""])
 node = repo.lookup(changeset)
 prev, other = repo.changelog.parents(node)
 change = repo.changelog.read(node)
 if opts['output'] and opts['output'] != '-':
-try:
+outname = make_filename(repo, repo.changelog, opts['output'],
-outname = make_filename(repo, repo.changelog, opts['output'],
+node=node, total=total, seqno=seqno,
-node=node, total=total, seqno=seqno,
+revwidth=revwidth)
-revwidth=revwidth)
+ui.note("Exporting patch to '%s'.\n" % outname)
-ui.note("Exporting patch to '%s'.\n" % outname)
+fp = open(outname, 'wb')
-fp = open(outname, 'wb')
-except KeyError, inst:
-ui.warn("error: invalid format spec '%%%s' in output file name\n" %
-inst.args[0])
-sys.exit(1)
 else:
 fp = sys.stdout
 fp.write("# HG changeset patch\n")
 fp.write("# User %s\n" % change[1])
 dodiff(fp, ui, repo, None, prev, node)
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets"""
 if not changesets:
-ui.warn("error: export requires at least one changeset\n")
+raise Abort("export requires at least one changeset")
-sys.exit(1)
 seqno = 0
 revs = list(revrange(ui, repo, changesets))
 total = len(revs)
 revwidth = max(len(revs[0]), len(revs[-1]))
 for cset in revs:
 pf = l[14:]
 if pf not in files:
 files.append(pf)
 patcherr = f.close()
 if patcherr:
-sys.stderr.write("patch failed")
+raise Abort("patch failed")
-sys.exit(1)
 if len(files) > 0:
 addremove(ui, repo, *files)
 repo.commit(files, text, user)
 def init(ui, source=None):
 """create a new repository in the current directory"""
 if source:
-ui.warn("no longer supported: use \"hg clone\" instead\n")
+raise Abort("no longer supported: use \"hg clone\" instead")
-sys.exit(1)
 hg.repository(ui, ".", create=1)
 def locate(ui, repo, *pats, **opts):
 """locate files matching specific patterns"""
 if opts['print0']: end = '\0'
 i = filelog.linkrev(filenode)
 changenode = repo.changelog.node(i)
 prev, other = repo.changelog.parents(changenode)
 dodiff(sys.stdout, ui, repo, files, prev, changenode)
 ui.write("\n\n")
+def ls(ui, repo, *pats, **opts):
+"""list files"""
+for src, abs, rel in walk(repo, pats, opts):
+ui.write(rel, '\n')
 def manifest(ui, repo, rev=None):
 """output the latest or given revision of the project manifest"""
 if rev:
 try:
 "^log|history":
 (log,
 [('r', 'rev', [], 'revision'),
 ('p', 'patch', None, 'show patch')],
 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
+"list|ls": (ls,
+[('I', 'include', [], 'include path in search'),
+('X', 'exclude', [], 'exclude path from search')],
+"hg ls [OPTION]... [PATTERN]...."),
 "manifest": (manifest, [], 'hg manifest [REV]'),
 "parents": (parents, [], 'hg parents [REV]'),
 "^pull":
 (pull,
 [('u', 'update', None, 'update working directory')],
 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 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

changeset 727	acee766fcb79
parent 726	809a870a0e73
child 729	626aa658e2a9