Commit 9665fd35 authored by Matthias Putz's avatar Matthias Putz

--amend

parent 52eb84ad
bin bin
.idea/workspace.xml workspace.xml
*.bak *.bak
*.pyc *.pyc
.repopickle_* .repopickle_*
This diff is collapsed.
...@@ -61,7 +61,7 @@ global_options.add_option('--time', ...@@ -61,7 +61,7 @@ global_options.add_option('--time',
global_options.add_option('--version', global_options.add_option('--version',
dest='show_version', action='store_true', dest='show_version', action='store_true',
help='display this version of repo') help='display this version of repo')
global_options.add_option("--piped-into-less", action="store_true", dest="pipedIntoLess", default=False) global_options.add_option("--piped-into-pager", action="store_true", dest="pipedIntoPager", default=False)
def _UsePager(name, cmd, gopts, copts): def _UsePager(name, cmd, gopts, copts):
...@@ -410,14 +410,14 @@ def _WindowsPager(repo): ...@@ -410,14 +410,14 @@ 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-less --no-pager %s | %s" % (python, thisScript, ' '.join(args1), ' '.join(args2), pager) shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s | %s" % (python, thisScript, ' '.join(args1), ' '.join(args2), pager)
os.system(shellCommand) os.system(shellCommand)
return True return True
else: else:
# set global variable if output is piped into less; means that pager is simulated, this # set global variable if output is piped into pager; means that pager is simulated, this
# leads to correct coloring in windows # leads to correct coloring in windows
import pager import pager
pager.active = gopts.pipedIntoLess pager.active = gopts.pipedIntoPager
return False return False
......
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