Changeset 6041e4b76929…
Parent c2bb2915e0f6…
by
Changes to one file · Browse files at 6041e4b76929 Showing diff from parent c2bb2915e0f6 Diff from another changeset...
@@ -25,6 +25,7 @@ import pygtk
pygtk.require('2.0')
import gtk
+import PyQt4
from mercurial import demandimport
demandimport.ignore.append('win32com.shell')
@@ -37,6 +38,7 @@
try:
import tortoisehg.hgtk.hgtk
+ import tortoisehg.hgqt.hgtk
except ImportError:
sys.stderr.write("abort: couldn't find hgtk libraries in [%s]\n" %
';'.join(sys.path))
@@ -52,21 +54,21 @@ sys.exit(1)
if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv:
- sys.exit(tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:]))
+ sys.exit(tortoisehg.hgqt.hgtk.dispatch(sys.argv[1:]))
else:
mystderr = cStringIO.StringIO()
origstderr = sys.stderr
sys.stderr = mystderr
ret = 0
try:
- ret = tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:])
+ ret = tortoisehg.hgqt.hgtk.dispatch(sys.argv[1:])
sys.stderr = origstderr
mystderr.seek(0)
for l in mystderr.readlines():
if l.startswith('Traceback') or l.startswith('TypeError') or \
l.startswith('NameError'):
from tortoisehg.hgtk.bugreport import run
- from tortoisehg.hgtk.hgtk import gtkrun
+ from tortoisehg.hgqt.hgtk import gtkrun
error = 'Recoverable runtime error (stderr):\n'
error += mystderr.getvalue()
opts = {}
|
Loading...