Patchwork help: clarify the choice of pager

login
register
mail settings
Submitter via Mercurial-devel
Date June 2, 2017, 11:31 a.m.
Message ID <77a4708bafddb2599147.1496403101@xalep.lul.corp.google.com>
Download mbox | patch
Permalink /patch/21136/
State Accepted
Headers show

Comments

via Mercurial-devel - June 2, 2017, 11:31 a.m.
# HG changeset patch
# User Xavier Lepaul <xalep@google.com>
# Date 1496393080 -7200
#      Fri Jun 02 10:44:40 2017 +0200
# Node ID 77a4708bafddb2599147c2dfc6eca47eaf9f3ba2
# Parent  e6ff007e107e434b35eb881711f459c7a75c91b2
help: clarify the choice of pager

This follows the change made in d83e51654c8a to use environment variables
between system and user configuration.
Sean Farley - June 2, 2017, 5:28 p.m.
Xavier Lepaul via Mercurial-devel <mercurial-devel@mercurial-scm.org>
writes:

> # HG changeset patch
> # User Xavier Lepaul <xalep@google.com>
> # Date 1496393080 -7200
> #      Fri Jun 02 10:44:40 2017 +0200
> # Node ID 77a4708bafddb2599147c2dfc6eca47eaf9f3ba2
> # Parent  e6ff007e107e434b35eb881711f459c7a75c91b2
> help: clarify the choice of pager
>
> This follows the change made in d83e51654c8a to use environment variables
> between system and user configuration.

I think this could go on stable? Other reviewers?
Yuya Nishihara - June 3, 2017, 3:09 a.m.
On Fri, 02 Jun 2017 10:28:38 -0700, Sean Farley wrote:
> Xavier Lepaul via Mercurial-devel <mercurial-devel@mercurial-scm.org>
> writes:
> > # HG changeset patch
> > # User Xavier Lepaul <xalep@google.com>
> > # Date 1496393080 -7200
> > #      Fri Jun 02 10:44:40 2017 +0200
> > # Node ID 77a4708bafddb2599147c2dfc6eca47eaf9f3ba2
> > # Parent  e6ff007e107e434b35eb881711f459c7a75c91b2
> > help: clarify the choice of pager
> >
> > This follows the change made in d83e51654c8a to use environment variables
> > between system and user configuration.
> 
> I think this could go on stable? Other reviewers?

Sounds good to me. How's the release of 4.2.1 going?
Augie Fackler - June 3, 2017, 4:51 a.m.
On Sat, Jun 03, 2017 at 12:09:21PM +0900, Yuya Nishihara wrote:
> On Fri, 02 Jun 2017 10:28:38 -0700, Sean Farley wrote:
> > Xavier Lepaul via Mercurial-devel <mercurial-devel@mercurial-scm.org>
> > writes:
> > > # HG changeset patch
> > > # User Xavier Lepaul <xalep@google.com>
> > > # Date 1496393080 -7200
> > > #      Fri Jun 02 10:44:40 2017 +0200
> > > # Node ID 77a4708bafddb2599147c2dfc6eca47eaf9f3ba2
> > > # Parent  e6ff007e107e434b35eb881711f459c7a75c91b2
> > > help: clarify the choice of pager
> > >
> > > This follows the change made in d83e51654c8a to use environment variables
> > > between system and user configuration.
> >
> > I think this could go on stable? Other reviewers?
>
> Sounds good to me. How's the release of 4.2.1 going?

We're unblocked on buildbot, I think, so just needs to happen either
Saturday or Monday. I suspect the latter is more likely.

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Augie Fackler - June 3, 2017, 4:52 a.m.
On Fri, Jun 02, 2017 at 10:28:38AM -0700, Sean Farley wrote:
> Xavier Lepaul via Mercurial-devel <mercurial-devel@mercurial-scm.org>
> writes:
>
> > # HG changeset patch
> > # User Xavier Lepaul <xalep@google.com>
> > # Date 1496393080 -7200
> > #      Fri Jun 02 10:44:40 2017 +0200
> > # Node ID 77a4708bafddb2599147c2dfc6eca47eaf9f3ba2
> > # Parent  e6ff007e107e434b35eb881711f459c7a75c91b2
> > help: clarify the choice of pager
> >
> > This follows the change made in d83e51654c8a to use environment variables
> > between system and user configuration.
>
> I think this could go on stable? Other reviewers?

queued for stable


> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff -r e6ff007e107e -r 77a4708bafdd mercurial/help/pager.txt
--- a/mercurial/help/pager.txt	Thu Jun 01 00:40:52 2017 -0700
+++ b/mercurial/help/pager.txt	Fri Jun 02 10:44:40 2017 +0200
@@ -6,9 +6,10 @@ 
   [pager]
   pager = less -FRX
 
-If no pager is set, Mercurial uses the environment variable
-$PAGER. If neither pager.pager, nor $PAGER is set, a default pager
-will be used, typically `less` on Unix and `more` on Windows.
+If no pager is set in the user or repository configuration, Mercurial uses the
+environment variable $PAGER. If $PAGER is not set, pager.pager from the default
+or system configuration is used. If none of these are set, a default pager will
+be used, typically `less` on Unix and `more` on Windows.
 
 .. container:: windows