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

hgtk: make forking and stderr capture ui configurable

Changeset 4a78f577647b…

Parent bc8ce9f33b50…

by Steve Borho

Changes to 2 files · Browse files at 4a78f577647b Showing diff from parent bc8ce9f33b50 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
55
56
57
58
 
 
 
 
 
 
 
59
60
61
 
55
56
57
 
58
59
60
61
62
63
64
65
66
67
@@ -55,7 +55,13 @@
  (_('Bottom Diffs'), 'gtools.diffbottom', ['False', 'True'],   _('Show the diff panel below the file list in status, shelve, and'   ' commit dialogs.' - ' Default: False (show diffs to right of file list)'))) + ' Default: False (show diffs to right of file list)')), + (_('Capture Stderr'), 'tortoisehg.stderrcapt', ['True', 'False'], + _('Redirect stderr to a buffer which is parsed at the end of' + ' the process for runtime errors. Default: True')), + (_('Fork hgtk'), 'tortoisehg.hgtkfork', ['True', 'False'], + _('When running hgtk from the command line, fork a background' + ' process to run graphical dialogs. Default: True')))    _commit_info = (   (_('Username'), 'ui.username', [],
Change 1 of 2 Show Entire File hgtk Stacked
 
27
28
29
30
 
 
 
 
 
 
 
31
32
33
 
67
68
69
70
 
71
72
73
 
27
28
29
 
30
31
32
33
34
35
36
37
38
39
 
73
74
75
 
76
77
78
79
@@ -27,7 +27,13 @@
  if os.fork():   sys.exit(0)   -if '--nofork' not in sys.argv and 'HGTK_NOFORK' not in os.environ: +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] @@ -67,7 +73,7 @@
  sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)   -if 'THGDEBUG' in os.environ: +if not capt or 'THGDEBUG' in os.environ:   sys.exit(hggtk.hgtk.dispatch(sys.argv[1:]))  else:   sys.stderr = cStringIO.StringIO()