Patchwork [2,of,2,STABLE] setup: filter out devel-warn messages from system hg

login
register
mail settings
Submitter Kevin Bullock
Date Oct. 24, 2017, 3:19 a.m.
Message ID <adc50614340e952d8e98.1508815141@ingalls.lan>
Download mbox | patch
Permalink /patch/25273/
State Accepted
Headers show

Comments

Kevin Bullock - Oct. 24, 2017, 3:19 a.m.
# HG changeset patch
# User Kevin Bullock <kbullock+mercurial@ringworld.org>
# Date 1508814839 18000
#      Mon Oct 23 22:13:59 2017 -0500
# Branch stable
# Node ID adc50614340e952d8e98f5948d35b7bf632c2232
# Parent  f13a8d056d6ebf490e65096391fdcd5916197f48
setup: filter out devel-warn messages from system hg

If we're going to use the user's installed and configured hg command
(which we do since 8b20338b989e), we should prevent devel-warn messages
from interfering with locating it.
Augie Fackler - Oct. 24, 2017, 3:55 a.m.
queued these

> On Oct 23, 2017, at 23:19, Kevin Bullock <kbullock+mercurial@ringworld.org> wrote:
> 
> # HG changeset patch
> # User Kevin Bullock <kbullock+mercurial@ringworld.org>
> # Date 1508814839 18000
> #      Mon Oct 23 22:13:59 2017 -0500
> # Branch stable
> # Node ID adc50614340e952d8e98f5948d35b7bf632c2232
> # Parent  f13a8d056d6ebf490e65096391fdcd5916197f48
> setup: filter out devel-warn messages from system hg
> 
> If we're going to use the user's installed and configured hg command
> (which we do since 8b20338b989e), we should prevent devel-warn messages
> from interfering with locating it.
> 
> diff --git a/setup.py b/setup.py
> --- a/setup.py
> +++ b/setup.py
> @@ -218,7 +218,8 @@ def filterhgerr(err):
>     err = [e for e in err.splitlines()
>            if (not e.startswith(b'not trusting file')
>                and not e.startswith(b'warning: Not importing')
> -               and not e.startswith(b'obsolete feature not enabled'))]
> +               and not e.startswith(b'obsolete feature not enabled')
> +               and not e.startswith(b'devel-warn:'))]
>     return b'\n'.join(b'  ' + e for e in err)
> 
> def findhg():
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -218,7 +218,8 @@  def filterhgerr(err):
     err = [e for e in err.splitlines()
            if (not e.startswith(b'not trusting file')
                and not e.startswith(b'warning: Not importing')
-               and not e.startswith(b'obsolete feature not enabled'))]
+               and not e.startswith(b'obsolete feature not enabled')
+               and not e.startswith(b'devel-warn:'))]
     return b'\n'.join(b'  ' + e for e in err)
 
 def findhg():