Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

run: catch ui ParseErrors in a cleaner fashion

Changeset e566bdfb3c4b…

Parent 5ea9730aa847…

by Steve Borho

Changes to one file · Browse files at e566bdfb3c4b Showing diff from parent 5ea9730aa847 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
21
22
23
24
 
25
26
27
 
41
42
43
44
 
45
46
47
48
49
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
 
21
22
23
 
24
25
26
27
 
41
42
43
 
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
 
 
 
 
 
 
 
 
 
75
76
77
@@ -21,7 +21,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -import mercurial.ui as _ui +import mercurial.ui as uimod  from mercurial import hg, util, fancyopts, cmdutil, extensions, error    from tortoisehg.hgqt.i18n import agettext as _ @@ -41,25 +41,37 @@
 def dispatch(args):   """run the command specified in args"""   try: - u = _ui.ui() + u = uimod.ui()   if '--traceback' in args:   u.setconfig('ui', 'traceback', 'on')   if '--debugger' in args:   pdb.set_trace()   return _runcatch(u, args) + except error.ParseError, e: + from tortoisehg.hgqt.bugreport import ExceptionMsgBox + opts = {} + opts['cmd'] = ' '.join(sys.argv[1:]) + opts['values'] = e + errstring = _('Error string "%(arg0)s" at %(arg1)s<br>Please ' + '<a href="#edit:%(arg1)s">edit</a> your config') + main = QApplication(sys.argv) + dlg = ExceptionMsgBox(hglib.tounicode(str(e)), errstring, opts, + parent=None) + dlg.exec_() + except Exception, e: + print e + if '--debugger' in args: + pdb.post_mortem(sys.exc_info()[2]) + errstr = traceback.format_exc() + opts = {} + opts['cmd'] = ' '.join(sys.argv[1:]) + opts['error'] = errstr + opts['nofork'] = True + return qtrun(bugrun, u, **opts)   except SystemExit:   pass   except KeyboardInterrupt:   print _('\nCaught keyboard interrupt, aborting.\n') - except: - if '--debugger' in args: - pdb.post_mortem(sys.exc_info()[2]) - error = traceback.format_exc() - opts = {} - opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = error - opts['nofork'] = True - return qtrun(bugrun, u, **opts)    origwdir = os.getcwd()  def portable_fork(ui, opts):