[PATCH 2 of 3 V2] ui: defer setting pager related properties until the pager has spawned

Yuya Nishihara yuya at tcha.org
Tue Mar 28 09:09:23 EDT 2017


On Mon, 27 Mar 2017 22:50:27 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1490490720 14400
> #      Sat Mar 25 21:12:00 2017 -0400
> # Node ID 1c73c5cde39463e03c3c7be10b6fe1256a6e5143
> # Parent  2566b7eac73c4851edc21b73a833f86bf878285e
> ui: defer setting pager related properties until the pager has spawned

>      def _runpager(self, command):
>          """Actually start the pager and set up file descriptors.
> @@ -866,7 +873,7 @@
>          """
>          if command == 'cat':
>              # Save ourselves some work.
> -            return
> +            return False
>          # If the command doesn't contain any of these characters, we
>          # assume it's a binary and exec it directly. This means for
>          # simple pager command configurations, we can degrade
> @@ -896,7 +903,7 @@
>              if e.errno == errno.ENOENT and not shell:
>                  self.warn(_("missing pager command '%s', skipping pager\n")
>                            % command)
> -                return
> +                return False
>              raise

There should be one more 'return False'. Fixed in flight.


More information about the Mercurial-devel mailing list