From owner-svn-src-all@freebsd.org Sat Aug 25 03:17:26 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB228109E5B4; Sat, 25 Aug 2018 03:17:25 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9191484721; Sat, 25 Aug 2018 03:17:25 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 29A37C073; Sat, 25 Aug 2018 03:17:25 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f182.google.com with SMTP id f8-v6so8305009ljk.1; Fri, 24 Aug 2018 20:17:25 -0700 (PDT) X-Gm-Message-State: APzg51B3LrnlFMHM75B5oAK1IXPKRCc/BqIYpK+hnHEteE6SbLPORtpd 5THdRF7oqIoXylO+XKDE/WDvGMt8v74XP1NBXps= X-Google-Smtp-Source: ANB0VdZLwvgYrt/k4PTE/STboSThGpSSBKJybhkBH0zpum0/6yK7hbxaFJ/lH3Lpf/gp09AiUE12Bo8kEzq6hd4qqWE= X-Received: by 2002:a2e:658a:: with SMTP id e10-v6mr2557450ljf.99.1535167043775; Fri, 24 Aug 2018 20:17:23 -0700 (PDT) MIME-Version: 1.0 References: <201808081924.w78JOKLP061364@repo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Fri, 24 Aug 2018 22:17:12 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r337497 - in head: . contrib/mdocml contrib/tnftp/src etc/root share/skel tools/tools/nanobsd/pcengines/Files/root tools/tools/nanobsd/rescue/Files/root usr.bin/mail usr.bin/man usr.bin... To: Alan Somers Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2018 03:17:26 -0000 On Fri, Aug 24, 2018 at 10:12 PM Alan Somers wrote: > > On Fri, Aug 24, 2018 at 8:12 PM Kyle Evans wrote: >> >> On Wed, Aug 8, 2018 at 2:24 PM Alan Somers wrote: >> > >> > Author: asomers >> > Date: Wed Aug 8 19:24:20 2018 >> > New Revision: 337497 >> > URL: https://svnweb.freebsd.org/changeset/base/337497 >> > >> > Log: >> > Switch the default pager for most commands to less >> > >> > Finally, a pager for the nineties. >> > >> > MFC after: Never >> > Relnotes: Yes >> > Differential Revision: https://reviews.freebsd.org/D13465 >> > Poll: https://reviews.freebsd.org/V7 >> > >> >> Hi, >> >> Hurray! >> >> > [... snip ...] >> > --- head/usr.sbin/mergemaster/mergemaster.sh Wed Aug 8 19:21:08 20= 18 (r337496) >> > +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Aug 8 19:24:20 20= 18 (r337497) >> > @@ -426,19 +426,19 @@ check_pager () { >> > echo '' >> > echo " or you may type an absolute path to PAGER for this run" >> > echo '' >> > - echo " Default is to use plain old 'more' " >> > + echo " Default is to use 'less' " >> > echo '' >> > - echo -n "What should I do? [Use 'more'] " >> > + echo -n "What should I do? [Use 'less'] " >> > read FIXPAGER >> > >> > case "${FIXPAGER}" in >> > [eE]) >> > exit 0 >> > ;; >> > - [lL]) >> > + [lL]|'') >> > PAGER=3Dless >> > ;; >> > - [mM]|'') >> > + [mM]) >> > PAGER=3Dmore >> > ;; >> > /*) >> > @@ -458,11 +458,11 @@ check_pager () { >> > esac >> > >> > # If user has a pager defined, or got assigned one above, use it. >> > -# If not, use more. >> > +# If not, use less. >> > # >> > -PAGER=3D${PAGER:-more} >> > +PAGER=3D${PAGER:-less} >> > >> > -if [ -n "${VERBOSE}" -a ! "${PAGER}" =3D "more" ]; then >> > +if [ -n "${VERBOSE}" -a ! "${PAGER}" =3D "less" ]; then >> > echo " *** You have ${PAGER} defined as your pager so we will use t= hat" >> > echo '' >> > sleep 3 >> > @@ -1127,7 +1127,7 @@ for COMPFILE in `find . -type f | sort`; do >> > else >> > # Ok, the files are different, so show the user where they diff= er. >> > # Use user's choice of diff methods; and user's pager if they h= ave one. >> > - # Use more if not. >> > + # Use less if not. >> > # Use unified diffs by default. Context diffs give me a headac= he. :) >> > # >> > # If the user chose the -F option, test for that before proceed= ing >> > >> >> Any chance you'd consider `less -E` for mergemaster, instead of >> unsalted less? After going through a second round of updates since >> this, that one feels super repetitive as you end up with two >> keystrokes at the end per file that differs as opposed to the previous >> one. This is pretty nit-picky, so I won't be upset if you say no. =3D) >> >> Thanks, >> >> Kyle Evans > > > Hmm, "-E" would make sense for mergemaster, even though I hate that behav= ior for man. But if mergemaster's pager is going to use different options = than other applications, then it also should get its own variable; mergemas= ter should use MERGEMASTERPAGER the way that man uses MANPAGER. Agree? > I'm inclined to agree on both counts. While I don't like a proliferation of things to set to override defaults like this in the general case, it seems to make sense for mergemaster. The application of pager here is a different use case than most.