Changeset f3ab96f025af…
Parent c1b5ab8a847e…
by
Changes to 2 files · Browse files at f3ab96f025af Showing diff from parent c1b5ab8a847e Diff from another changeset...
@@ -5,6 +5,7 @@ #
import gtk
+import os
import pango
from mercurial.i18n import _
from mercurial import extensions
@@ -45,11 +46,13 @@
from about import hgversion
import shlib
- text = _('\n\nPlease report this bug to'
+ text = _('\n** Please report this bug to'
+ ' tortoisehg-discuss@lists.sourceforge.net or'
' http://bitbucket.org/tortoisehg/stable/issues\n')
- text += _('Mercurial version (%s). TortoiseHg version (%s)\n') % (
+ text += _('** Mercurial version (%s). TortoiseHg version (%s)\n') % (
hgversion, shlib.version())
- text += _('Command: %s\n') % (self.opts['cmd'])
+ text += _('** Command: %s\n') % (self.opts['cmd'])
+ text += _('** CWD: %s\n') % os.getcwd()
extlist = [x[0] for x in extensions.extensions()]
text += _('** Extensions loaded: %s\n') % ', '.join(extlist)
text += self.opts['error']
|
@@ -45,12 +45,12 @@ sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1)
-sys.stderr = cStringIO.StringIO()
-ret = hggtk.hgtk.dispatch(sys.argv[1:])
-sys.stderr.seek(0)
if 'THGDEBUG' in os.environ:
- print sys.stderr.read()
+ sys.exit(hggtk.hgtk.dispatch(sys.argv[1:]))
else:
+ sys.stderr = cStringIO.StringIO()
+ ret = hggtk.hgtk.dispatch(sys.argv[1:])
+ sys.stderr.seek(0)
for l in sys.stderr.readlines():
if l.startswith('Traceback') or l.startswith('TypeError'):
from hggtk.bugreport import run
@@ -63,4 +63,4 @@ opts['error'] = error
gtkrun(run(ui.ui(), **opts))
break
-sys.exit(ret)
+ sys.exit(ret)
|
Loading...