# variable, then default to using 'vi'
#editor: /usr/bin/vi
+# this value overrides the default PAGER environment variable
+#pager: less -S
+
# Different three-way merge tools below. Uncomment the preferred one.
# Note that the 'output' file contains the same data as 'branch1'. This
# is useful for tools that do not take an output parameter
import sys, os
from optparse import OptionParser, make_option
+from pydoc import pager
from stgit.commands.common import *
from stgit.utils import *
if options.stat:
print git.diffstat(args, git_id(rev1), git_id(rev2))
else:
- git.diff(args, git_id(rev1), git_id(rev2), sys.stdout)
+ pager(git.diff(args, git_id(rev1), git_id(rev2)))
import sys, os
from optparse import OptionParser, make_option
+from pydoc import pager
from stgit.commands.common import *
from stgit import git
parser.error('incorrect number of arguments')
commit_id = git_id(patch)
- sys.stdout.write(git.pretty_commit(commit_id))
+ pager(git.pretty_commit(commit_id))
config.read(os.path.expanduser('~/.stgitrc'))
config.read(os.path.join(basedir.get(), 'stgitrc'))
+# Set the PAGER environment to the config value (if any)
+if config.has_option('stgit', 'pager'):
+ os.environ['PAGER'] = config.get('stgit', 'pager')
+
# [gitmergeonefile] section is deprecated. In case it exists copy the
# options/values to the [stgit] one
if config.has_section('gitmergeonefile'):