From owner-svn-src-head@freebsd.org Sat Aug 25 02:12:11 2018 Return-Path: Delivered-To: svn-src-head@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 95F69109C999; Sat, 25 Aug 2018 02:12:11 +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 4A5DC822C8; Sat, 25 Aug 2018 02:12:11 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 DCC86B95A; Sat, 25 Aug 2018 02:12:10 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf1-f41.google.com with SMTP id q13-v6so8031669lfc.2; Fri, 24 Aug 2018 19:12:10 -0700 (PDT) X-Gm-Message-State: APzg51BxceEY9EwUolVN+kImNHBs0DLBY+WGDKlpgBO2IfMWiZ70mNgW KRTPtrH8AuEZ7zhySAddWRik/fQw5nsqWBNFsXU= X-Google-Smtp-Source: ANB0VdZl+vpmAxcWkQFjJX/ffAg155/ikyAK5xKsS5xlZpuB76LVWTlsUSmApD9p+AUXpja8tvryXIrtHFeyinG8Ub4= X-Received: by 2002:a19:ea52:: with SMTP id i79-v6mr2621448lfh.75.1535163129412; Fri, 24 Aug 2018 19:12:09 -0700 (PDT) MIME-Version: 1.0 References: <201808081924.w78JOKLP061364@repo.freebsd.org> In-Reply-To: <201808081924.w78JOKLP061364@repo.freebsd.org> From: Kyle Evans Date: Fri, 24 Aug 2018 21:11:58 -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" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2018 02:12:11 -0000 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 2018 (r337496) > +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Aug 8 19:24:20 2018 (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=less > ;; > - [mM]|'') > + [mM]) > PAGER=more > ;; > /*) > @@ -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=${PAGER:-more} > +PAGER=${PAGER:-less} > > -if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then > +if [ -n "${VERBOSE}" -a ! "${PAGER}" = "less" ]; then > echo " *** You have ${PAGER} defined as your pager so we will use that" > 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 differ. > # Use user's choice of diff methods; and user's pager if they have one. > - # Use more if not. > + # Use less if not. > # Use unified diffs by default. Context diffs give me a headache. :) > # > # If the user chose the -F option, test for that before proceeding > 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. =) Thanks, Kyle Evans