Mercurial > public > mercurial-scm > hg

comparison mercurial/dispatch.py @ 11054:355a7535bcac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 01 May 2010 16:15:27 +0200
parents 8d5f5122a732 59d0d715fbfa
children 385b95d10410
comparison
equal deleted inserted replaced
11051:bf7e63fedca1 11054:355a7535bcac
103 except error.UnknownCommand: 103 except error.UnknownCommand:
104 commands.help_(ui, 'shortlist') 104 commands.help_(ui, 'shortlist')
105 except util.Abort, inst: 105 except util.Abort, inst:
106 ui.warn(_("abort: %s\n") % inst) 106 ui.warn(_("abort: %s\n") % inst)
107 except ImportError, inst: 107 except ImportError, inst:
108 ui.warn(_("abort: %s!\n") % inst)
108 m = str(inst).split()[-1] 109 m = str(inst).split()[-1]
109 ui.warn(_("abort: could not import module %s!\n") % m)
110 if m in "mpatch bdiff".split(): 110 if m in "mpatch bdiff".split():
111 ui.warn(_("(did you forget to compile extensions?)\n")) 111 ui.warn(_("(did you forget to compile extensions?)\n"))
112 elif m in "zlib".split(): 112 elif m in "zlib".split():
113 ui.warn(_("(is your Python install correct?)\n")) 113 ui.warn(_("(is your Python install correct?)\n"))
114 except IOError, inst: 114 except IOError, inst: