Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable hgtk: add --fork global option to fork even when -R is used

Changeset 54b1074f6746…

Parent e1b2424eb65f…

by Sune Foldager

Changes to one file · Browse files at 54b1074f6746 Showing diff from parent e1b2424eb65f Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
 
76
77
78
79
80
 
 
 
81
82
83
 
224
225
226
 
 
227
228
229
 
642
643
644
 
645
646
647
 
76
77
78
 
 
79
80
81
82
83
84
 
225
226
227
228
229
230
231
232
 
645
646
647
648
649
650
651
@@ -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')),  ]