# HG changeset patch
# User Sune Foldager <[email protected]>
# Date 1256435275 -3600
# Branch stable
# Node ID 16228c0459e05d31793a59220ea7247c99139823
# Parent 7ce08d08628a9af8be4e8a941a47a7ab56154ed1
hgtk: add --fork global option to fork even when -R is used
diff --git a/tortoisehg/hgtk/hgtk.py b/tortoisehg/hgtk/hgtk.py
--- a/tortoisehg/hgtk/hgtk.py
+++ b/tortoisehg/hgtk/hgtk.py
@@ -76,8 +76,9 @@
gtkrun(run, u, **opts)
def portable_fork(ui, opts):
- if 'THG_HGTK_SPAWN' in os.environ or \
- opts.get('nofork') or opts.get('repository'):
+ if 'THG_HGTK_SPAWN' in os.environ or (
+ not opts.get('fork') and (
+ opts.get('nofork') or opts.get('repository'))):
return
elif ui.configbool('tortoisehg', 'hgtkfork', None) is not None:
if not ui.configbool('tortoisehg', 'hgtkfork'):
@@ -224,6 +225,8 @@
path = ui.expandpath(path)
cmdoptions['repository'] = path
os.chdir(path)
+ if options['fork']:
+ cmdoptions['fork'] = True
if options['nofork']:
cmdoptions['nofork'] = True
path = paths.find_root(os.getcwd())
@@ -642,6 +645,7 @@
('h', 'help', None, _('display help and exit')),
('', 'debugger', None, _('start debugger')),
('', 'nofork', None, _('do not fork GUI process')),
+ ('', 'fork', None, _('always fork GUI process')),
('', 'listfile', '', _('read file list from file')),
]
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
