by
Changes to 3 files · Browse files at 5d96c93923ff Showing diff from parent 4d1d90deccb2 d8d38b17809a Diff from another changeset...
@@ -267,15 +267,15 @@ cmdline += ['--config', 'http_proxy.host=']
if remotecmd:
cmdline.append('--remotecmd')
- cmdline.append(remotecmd)
+ cmdline.append(hglib.fromutf(remotecmd))
if rev:
cmdline.append('--rev')
cmdline.append(rev)
cmdline.append('--verbose')
- cmdline.append(src)
+ cmdline.append(hglib.fromutf(src))
if dest:
- cmdline.append(dest)
+ cmdline.append(hglib.fromutf(dest))
dlg = hgcmd.CmdDialog(cmdline)
dlg.run()
|
@@ -9,40 +9,6 @@ import os
import sys
-def portable_fork():
- # Spawn background process and exit
- if sys.platform[:3] == 'win':
- if 'THG_HGTK_SPAWN' not in os.environ:
- if hasattr(sys, "frozen"):
- args = sys.argv
- else:
- args = [sys.executable] + sys.argv
- args = ['"%s"' % arg for arg in args]
- env = os.environ.copy()
- env['THG_HGTK_SPAWN'] = '1'
- os.spawnve(os.P_NOWAIT, sys.executable, args, env)
- sys.exit(0)
- else:
- assert hasattr(os, 'fork')
- if os.fork():
- sys.exit(0)
-
-from mercurial import ui
-
-_ui = ui.ui()
-fork = _ui.configbool('tortoisehg', 'hgtkfork', True)
-capt = _ui.configbool('tortoisehg', 'stderrcapt', True)
-
-if fork and '--nofork' not in sys.argv:
- for i, arg in enumerate(sys.argv):
- if 'hgtk' in arg and len(sys.argv) > i+1:
- cmd = sys.argv[i+1]
- break
- else:
- cmd = None
- if cmd not in ('version', 'help'):
- portable_fork()
-
if hasattr(sys, "frozen"):
# Prepend C:\Program Files\TortoiseHg\gtk (equiv) to the path
from thgutil import paths
@@ -60,9 +26,10 @@pygtk.require('2.0')
import gtk
-from mercurial import demandimport;
+from mercurial import demandimport
demandimport.ignore.append('win32com.shell')
demandimport.enable()
+from mercurial import ui
import cStringIO
try:
@@ -73,9 +40,13 @@ sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1)
+_ui = ui.ui()
+capt = _ui.configbool('tortoisehg', 'stderrcapt', True)
+
if not capt or 'THGDEBUG' in os.environ:
sys.exit(hggtk.hgtk.dispatch(sys.argv[1:]))
else:
+ import cStringIO
sys.stderr = cStringIO.StringIO()
ret = hggtk.hgtk.dispatch(sys.argv[1:])
sys.stderr.seek(0)
@@ -83,12 +54,11 @@ if l.startswith('Traceback') or l.startswith('TypeError'):
from hggtk.bugreport import run
from hggtk.hgtk import gtkrun
- from mercurial import ui
sys.stderr.seek(0)
error = 'Recoverable runtime error (stderr):\n' + sys.stderr.read()
opts = {}
opts['cmd'] = ' '.join(sys.argv[1:])
opts['error'] = error
- gtkrun(run(ui.ui(), **opts))
+ gtkrun(run(_ui, **opts))
break
sys.exit(ret)
|
Loading...