comparison mercurial/dispatch.py @ 11209:385b95d10410

Merge with stable
author Martin Geisler <mg@aragost.com>
date Fri, 21 May 2010 14:21:27 +0200
parents 355a7535bcac ed71cb07d7b2
children b901bb751999
comparison
equal deleted inserted replaced
11208:2313dc4d9817 11209:385b95d10410
155 except: 155 except:
156 ui.warn(_("** unknown exception encountered, details follow\n")) 156 ui.warn(_("** unknown exception encountered, details follow\n"))
157 ui.warn(_("** report bug details to " 157 ui.warn(_("** report bug details to "
158 "http://mercurial.selenic.com/bts/\n")) 158 "http://mercurial.selenic.com/bts/\n"))
159 ui.warn(_("** or mercurial@selenic.com\n")) 159 ui.warn(_("** or mercurial@selenic.com\n"))
160 ui.warn(_("** Python %s\n") % sys.version.replace('\n', ''))
160 ui.warn(_("** Mercurial Distributed SCM (version %s)\n") 161 ui.warn(_("** Mercurial Distributed SCM (version %s)\n")
161 % util.version()) 162 % util.version())
162 ui.warn(_("** Extensions loaded: %s\n") 163 ui.warn(_("** Extensions loaded: %s\n")
163 % ", ".join([x[0] for x in extensions.extensions()])) 164 % ", ".join([x[0] for x in extensions.extensions()]))
164 raise 165 raise