From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Yuri <yuri@rawbw.com>
Subject: Re: [PATCH 2/3] setup_pager: set MORE=R
Date: Fri, 17 Jan 2014 11:57:27 -0800 [thread overview]
Message-ID: <xmqqiotiwfdk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqvbxiwh8y.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 17 Jan 2014 11:17:01 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
>> diff --git a/pager.c b/pager.c
>> index 90d237e..2303164 100644
>> --- a/pager.c
>> +++ b/pager.c
>> @@ -87,6 +87,10 @@ void setup_pager(void)
>> argv_array_push(&env, "LESS=FRSX");
>> if (!getenv("LV"))
>> argv_array_push(&env, "LV=-c");
>> +#ifdef PAGER_MORE_UNDERSTANDS_R
>> + if (!getenv("MORE"))
>> + argv_array_push(&env, "MORE=R");
>> +#endif
>> pager_process.env = argv_array_detach(&env, NULL);
>>
>> if (start_command(&pager_process))
>
> Let me repeat from $gmane/240110:
>
> - Can we generalize this a bit so that a builder can pass a list
> of var=val pairs and demote the existing LESS=FRSX to just a
> canned setting of such a mechanism?
>
> As we need to maintain this "set these environments when unset" here
> and also in git-sh-setup.sh, I think it is about time to do that
> clean-up. Duplicating two settings was borderline OK, but seeing
> the third added fairly soon after the second was added tells me that
> the clean-up must come before adding the third.
Perhaps we can start it like this. Then pager.c can iterate over
the PAGER_ENV string, parse out LESS=, LV=, etc., and do its thing.
We would also need to muck with git-sh-setup.sh but that file is
already preprocessed in the Makefile, so we should be able to do
something similar to "# @@BROKEN_PATH_FIX@@" there.
Makefile | 15 ++++++++++++++-
config.mak.uname | 1 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b4af1e2..c9e7847 100644
--- a/Makefile
+++ b/Makefile
@@ -342,6 +342,14 @@ all::
# Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
# (defaults to "man") if you want to have a different default when
# "git help" is called without a parameter specifying the format.
+#
+# Define PAGER_ENV to a SP separated VAR=VAL pairs to define
+# default environment variables to be passed when a pager is spawned, e.g.
+#
+# PAGER_ENV = LESS=-FRSX LV=-c
+#
+# to say "export LESS=-FRSX (and LV=-c) if the environment variable
+# LESS (and LV) is not set, respectively".
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -1506,6 +1514,10 @@ ifeq ($(PYTHON_PATH),)
NO_PYTHON = NoThanks
endif
+ifndef PAGER_ENV
+PAGER_ENV = LESS=-FRSX LV=-c
+endif
+
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 =
@@ -1585,11 +1597,12 @@ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
DIFF_SQ = $(subst ','\'',$(DIFF))
PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
LIBS = $(GITLIBS) $(EXTLIBS)
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
- $(COMPAT_CFLAGS)
+ $(COMPAT_CFLAGS) -DPAGER_ENV='$(PAGER_ENV_SQ)'
LIB_OBJS += $(COMPAT_OBJS)
# Quote for C
diff --git a/config.mak.uname b/config.mak.uname
index 7d31fad..8aea8a6 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -188,6 +188,7 @@ ifeq ($(uname_S),FreeBSD)
endif
PYTHON_PATH = /usr/local/bin/python
HAVE_PATHS_H = YesPlease
+ PAGER_ENV = LESS=-FRSX LV=-c MORE=-R
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
next prev parent reply other threads:[~2014-01-17 19:57 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 0:34 'git log' escape symbols shown as ESC[33 and ESC[m Yuri
2014-01-17 1:47 ` Jeff King
2014-01-17 2:02 ` Yuri
2014-01-17 2:13 ` Jeff King
2014-01-17 2:28 ` Yuri
2014-01-17 2:32 ` Jeff King
2014-01-17 2:46 ` Yuri
2014-01-17 2:29 ` Jonathan Nieder
2014-01-17 2:35 ` Jeff King
2014-01-17 3:21 ` Jeff King
2014-01-17 4:14 ` [PATCH 0/3] improved out-of-the-box color settings Jeff King
2014-01-17 4:21 ` [PATCH 1/3] setup_pager: refactor LESS/LV environment setting Jeff King
2014-01-17 4:21 ` [PATCH 2/3] setup_pager: set MORE=R Jeff King
2014-01-17 7:26 ` Kyle J. McKay
2014-01-17 19:11 ` Junio C Hamano
2014-01-21 5:30 ` Jeff King
2014-01-21 8:42 ` Kyle J. McKay
2014-01-23 2:14 ` Jeff King
2014-01-23 17:22 ` Junio C Hamano
2014-01-17 19:17 ` Junio C Hamano
2014-01-17 19:57 ` Junio C Hamano [this message]
2014-01-17 23:42 ` Junio C Hamano
2014-01-21 6:13 ` Jeff King
2014-01-21 19:28 ` Junio C Hamano
2014-01-21 5:49 ` Jeff King
2014-01-21 19:23 ` Junio C Hamano
2014-02-04 22:12 ` Jeff King
2014-02-04 22:17 ` Junio C Hamano
2014-02-04 22:25 ` Jeff King
2014-02-04 22:45 ` Yuri
2014-02-04 22:48 ` Jeff King
2014-02-04 22:54 ` Junio C Hamano
2014-02-04 23:00 ` Yuri
2014-02-05 2:11 ` Kyle J. McKay
2014-01-17 4:24 ` [PATCH 3/3] pager: disable colors for some known-bad configurations Jeff King
2014-01-17 9:13 ` [PATCH 0/3] improved out-of-the-box color settings Yuri
2014-01-17 20:15 ` 'git log' escape symbols shown as ESC[33 and ESC[m Yuri
2014-02-05 1:24 ` Yuri
2014-02-05 1:33 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqiotiwfdk.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=yuri@rawbw.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).