D1428: logtoprocess: connect all fds to /dev/null to avoid bad interaction with pager
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Tue Nov 28 15:36:47 EST 2017
lothiraldan updated this revision to Diff 3917.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1428?vs=3589&id=3917
REVISION DETAIL
https://phab.mercurial-scm.org/D1428
AFFECTED FILES
hgext/logtoprocess.py
tests/test-logtoprocess.t
CHANGE DETAILS
diff --git a/tests/test-logtoprocess.t b/tests/test-logtoprocess.t
--- a/tests/test-logtoprocess.t
+++ b/tests/test-logtoprocess.t
@@ -122,4 +122,4 @@
$ touch $TESTTMP/wait-for-touched
$ sleep 0.2
$ test -f $TESTTMP/touched && echo "SUCCESS Pager is waiting on ltp" || echo "FAIL Pager is waiting on ltp"
- FAIL Pager is waiting on ltp
+ SUCCESS Pager is waiting on ltp
diff --git a/hgext/logtoprocess.py b/hgext/logtoprocess.py
--- a/hgext/logtoprocess.py
+++ b/hgext/logtoprocess.py
@@ -85,11 +85,16 @@
script = shlex.split(script)
try:
- # connect stdin to devnull to make sure the subprocess can't
- # muck up that stream for mercurial.
+ # connect std* to devnull to make sure the subprocess can't
+ # muck up these stream for mercurial.
+ # Connect all the streams to be more close to Windows behavior
+ # and pager will wait for scripts to end if we don't do that
+ nullrfd = open(os.devnull, 'r')
+ nullwfd = open(os.devnull, 'w')
subprocess.Popen(
- script, shell=shell, stdin=open(os.devnull, 'r'), env=env,
- close_fds=True, **newsession)
+ script, shell=shell, stdin=nullrfd,
+ stdout=nullwfd, stderr=nullwfd,
+ env=env, close_fds=True, **newsession)
finally:
# mission accomplished, this child needs to exit and not
# continue the hg process here.
To: lothiraldan, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list