Commit 966f7ee6 authored by Matthias Putz's avatar Matthias Putz

--amend

parent 6f244db2
...@@ -412,11 +412,11 @@ def _WindowsPager(repo): ...@@ -412,11 +412,11 @@ def _WindowsPager(repo):
args2 = args[argsSplit+1:] args2 = args[argsSplit+1:]
pager = _SelectPager(cmd.manifest.globalConfig) pager = _SelectPager(cmd.manifest.globalConfig)
shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s" % (python, thisScript, ' '.join(args1), ' '.join(args2)) shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s" % (python, thisScript, ' '.join(args1), ' '.join(args2))
#subprocess.call(shellCommand) subprocess.check_output("%s | less" % shellCommand, shell=True)
p1 = subprocess.Popen(shellCommand.split(' '), stdout=subprocess.PIPE) #p1 = subprocess.Popen(shellCommand.split(' '), stdout=subprocess.PIPE)
p2 = subprocess.Popen([pager], stdin=p1.stdout, stdout=subprocess.PIPE) #p2 = subprocess.Popen([pager], stdin=p1.stdout, stdout=subprocess.PIPE)
p1.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits. #p1.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits.
p2.communicate()[0] #p2.communicate()[0]
return True return True
else: else:
# set global variable if output is piped into pager; means that pager is simulated, this # set global variable if output is piped into pager; means that pager is simulated, this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment