Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.1, 1.9.2, and 1.9.3

thg: report hg version mismatch via a bugreport dialog

Changeset a99624328a65…

Parent 41cb584bfbe3…

by Steve Borho

Changes to one file · Browse files at a99624328a65 Showing diff from parent 41cb584bfbe3 Diff from another changeset...

Change 1 of 3 Show Entire File thg Stacked
 
44
45
46
47
 
48
49
50
 
58
59
60
61
62
 
 
63
64
65
66
67
68
69
 
 
 
 
 
 
 
70
71
72
 
90
91
92
93
 
94
95
96
 
44
45
46
 
47
48
49
50
 
58
59
60
 
 
61
62
63
64
65
66
67
68
 
69
70
71
72
73
74
75
76
77
78
 
96
97
98
 
99
100
101
102
@@ -44,7 +44,7 @@
 demandimport.ignore.append('tortoisehg.util.config')  demandimport.ignore.append('workbench_rc')  demandimport.enable() -from mercurial import ui, util +from mercurial import ui as uimod, util  from tortoisehg.util.hgversion import hgversion, checkhgversion  import cStringIO  import traceback @@ -58,15 +58,21 @@
  sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)   -_ui = ui.ui() -capt = _ui.configbool('tortoisehg', 'stderrcapt', True) +ui = uimod.ui() +capt = ui.configbool('tortoisehg', 'stderrcapt', True)    errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError',   'NotImplementedError')    err = checkhgversion(hgversion)  if err: - _ui.warn('abort: %s\n' % err) + from tortoisehg.hgqt.bugreport import run + from tortoisehg.hgqt.run import qtrun + opts = {} + opts['cmd'] = ' '.join(sys.argv[1:]) + opts['error'] = '\n' + err + '\n' + opts['nofork'] = True + qtrun(run, ui, **opts)   sys.exit(1)    if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv: @@ -90,7 +96,7 @@
  opts['cmd'] = ' '.join(sys.argv[1:])   opts['error'] = error   opts['nofork'] = True - qtrun(run, _ui, **opts) + qtrun(run, ui, **opts)   break   sys.exit(ret)   except: