Patchwork [v2] extensions: rename _ignore to _builtin, add descriptive comment

login
register
mail settings
Submitter Bryan O'Sullivan
Date Nov. 25, 2015, 12:39 a.m.
Message ID <d6b0390abdf10f7fc787.1448411940@bryano-mbp.local>
Download mbox | patch
Permalink /patch/11639/
State Accepted
Headers show

Comments

Bryan O'Sullivan - Nov. 25, 2015, 12:39 a.m.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1448411934 28800
#      Tue Nov 24 16:38:54 2015 -0800
# Node ID d6b0390abdf10f7fc787082d683624c15cafc452
# Parent  f668eef04abc3de94f41b527daa0bb7a0cf76f56
extensions: rename _ignore to _builtin, add descriptive comment

It was previously not at all obvious what this was for.

We also change it to a set to avoid iterating over an admittedly
small list repeatedly at startup time.
Pierre-Yves David - Nov. 25, 2015, 1:10 a.m.
On 11/24/2015 04:39 PM, Bryan O'Sullivan wrote:
> # HG changeset patch
> # User Bryan O'Sullivan <bos@serpentine.com>
> # Date 1448411934 28800
> #      Tue Nov 24 16:38:54 2015 -0800
> # Node ID d6b0390abdf10f7fc787082d683624c15cafc452
> # Parent  f668eef04abc3de94f41b527daa0bb7a0cf76f56
> extensions: rename _ignore to _builtin, add descriptive comment

Sure, pushed to the clowncopter.
Matt Mackall - Dec. 10, 2015, 5:32 p.m.
On Tue, 2015-11-24 at 17:10 -0800, Pierre-Yves David wrote:
> 
> On 11/24/2015 04:39 PM, Bryan O'Sullivan wrote:
> > # HG changeset patch
> > # User Bryan O'Sullivan <bos@serpentine.com>
> > # Date 1448411934 28800
> > #      Tue Nov 24 16:38:54 2015 -0800
> > # Node ID d6b0390abdf10f7fc787082d683624c15cafc452
> > # Parent  f668eef04abc3de94f41b527daa0bb7a0cf76f56
> > extensions: rename _ignore to _builtin, add descriptive comment
> 
> Sure, pushed to the clowncopter.

Niggle: the new name is actually less accurate. Some of these like
inotify are simply gone and not built-in.
timeless - Dec. 10, 2015, 5:47 p.m.
How about _retired ? An item could be retired because it was
integrated or because it was abandoned.

On Thu, Dec 10, 2015 at 12:32 PM, Matt Mackall <mpm@selenic.com> wrote:
> On Tue, 2015-11-24 at 17:10 -0800, Pierre-Yves David wrote:
>>
>> On 11/24/2015 04:39 PM, Bryan O'Sullivan wrote:
>> > # HG changeset patch
>> > # User Bryan O'Sullivan <bos@serpentine.com>
>> > # Date 1448411934 28800
>> > #      Tue Nov 24 16:38:54 2015 -0800
>> > # Node ID d6b0390abdf10f7fc787082d683624c15cafc452
>> > # Parent  f668eef04abc3de94f41b527daa0bb7a0cf76f56
>> > extensions: rename _ignore to _builtin, add descriptive comment
>>
>> Sure, pushed to the clowncopter.
>
> Niggle: the new name is actually less accurate. Some of these like
> inotify are simply gone and not built-in.
>
> --
> Mathematics is the supreme nostalgia of our time.
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
Pierre-Yves David - Dec. 10, 2015, 8:35 p.m.
On 12/10/2015 05:47 PM, timeless wrote:
> How about _retired ? An item could be retired because it was
> integrated or because it was abandoned.

obsolete?
timeless - Dec. 16, 2015, 5:36 a.m.
Other than the conflict with the "obsolete" feature, it's a reasonable term.

On Thu, Dec 10, 2015 at 3:35 PM, Pierre-Yves David
<pierre-yves.david@ens-lyon.org> wrote:
>
>
> On 12/10/2015 05:47 PM, timeless wrote:
>>
>> How about _retired ? An item could be retired because it was
>> integrated or because it was abandoned.
>
>
> obsolete?
>
> --
> Pierre-Yves David

Patch

diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -24,7 +24,8 @@  from . import (
 _extensions = {}
 _aftercallbacks = {}
 _order = []
-_ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify']
+#  former extensions now in core - we ignore these if found in hgrc
+_builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify'])
 
 def extensions(ui=None):
     if ui:
@@ -75,7 +76,7 @@  def load(ui, name, path):
         shortname = name[6:]
     else:
         shortname = name
-    if shortname in _ignore:
+    if shortname in _builtin:
         return None
     if shortname in _extensions:
         return _extensions[shortname]