Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 7633:08cabecfa8a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: move revlog errors - create error.py for exception classes to reduce demandloading - move revlog exceptions to it - change users to import error and drop revlog import if possible
author Matt Mackall <mpm@selenic.com>
date Sun, 11 Jan 2009 22:48:28 -0600
parents 9626819b2e3d
children 1d54e2f6c0b7
comparison
equal deleted inserted replaced
7632:9626819b2e3d 7633:08cabecfa8a8
7 7
8 from node import hex, nullid, nullrev, short 8 from node import hex, nullid, nullrev, short
9 from repo import RepoError, NoCapability 9 from repo import RepoError, NoCapability
10 from i18n import _, gettext 10 from i18n import _, gettext
11 import os, re, sys 11 import os, re, sys
12 import hg, util, revlog, bundlerepo, extensions, copies, context 12 import hg, util, revlog, bundlerepo, extensions, copies, context, error
13 import difflib, patch, time, help, mdiff, tempfile, url 13 import difflib, patch, time, help, mdiff, tempfile, url
14 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect 14 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
15 import merge as merge_ 15 import merge as merge_
16 16
17 # Commands start here, listed alphabetically 17 # Commands start here, listed alphabetically
1212 fstate.setdefault(fn, []) 1212 fstate.setdefault(fn, [])
1213 if follow: 1213 if follow:
1214 copied = getfile(fn).renamed(ctx.filenode(fn)) 1214 copied = getfile(fn).renamed(ctx.filenode(fn))
1215 if copied: 1215 if copied:
1216 copies.setdefault(rev, {})[fn] = copied[0] 1216 copies.setdefault(rev, {})[fn] = copied[0]
1217 except revlog.LookupError: 1217 except error.LookupError:
1218 pass 1218 pass
1219 elif st == 'iter': 1219 elif st == 'iter':
1220 for fn, m in util.sort(matches[rev].items()): 1220 for fn, m in util.sort(matches[rev].items()):
1221 copy = copies.get(rev, {}).get(fn) 1221 copy = copies.get(rev, {}).get(fn)
1222 if fn in skip: 1222 if fn in skip:
1885 # If linkrev != rev (i.e. rev not found in rcache) fallback to 1885 # If linkrev != rev (i.e. rev not found in rcache) fallback to
1886 # filectx logic. 1886 # filectx logic.
1887 1887
1888 try: 1888 try:
1889 return repo[rev][fn].renamed() 1889 return repo[rev][fn].renamed()
1890 except revlog.LookupError: 1890 except error.LookupError:
1891 pass 1891 pass
1892 return None 1892 return None
1893 1893
1894 df = False 1894 df = False
1895 if opts["date"]: 1895 if opts["date"]:
2084 for cp in ctx.parents(): 2084 for cp in ctx.parents():
2085 if not cp: 2085 if not cp:
2086 continue 2086 continue
2087 try: 2087 try:
2088 filenodes.append(cp.filenode(file_)) 2088 filenodes.append(cp.filenode(file_))
2089 except revlog.LookupError: 2089 except error.LookupError:
2090 pass 2090 pass
2091 if not filenodes: 2091 if not filenodes:
2092 raise util.Abort(_("'%s' not found in manifest!") % file_) 2092 raise util.Abort(_("'%s' not found in manifest!") % file_)
2093 fl = repo.file(file_) 2093 fl = repo.file(file_)
2094 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] 2094 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2855 continue 2855 continue
2856 2856
2857 try: 2857 try:
2858 hn = hexfunc(n) 2858 hn = hexfunc(n)
2859 r = "%5d:%s" % (repo.changelog.rev(n), hn) 2859 r = "%5d:%s" % (repo.changelog.rev(n), hn)
2860 except revlog.LookupError: 2860 except error.LookupError:
2861 r = " ?:%s" % hn 2861 r = " ?:%s" % hn
2862 else: 2862 else:
2863 spaces = " " * (30 - util.locallen(t)) 2863 spaces = " " * (30 - util.locallen(t))
2864 if ui.verbose: 2864 if ui.verbose:
2865 if repo.tagtype(t) == 'local': 2865 if repo.tagtype(t) == 'local':