Submitter | Boris Feld |
---|---|
Date | Oct. 18, 2017, 2:04 p.m. |
Message ID | <a3110a4c8aa98ebd9fc2.1508335471@FB> |
Download | mbox | patch |
Permalink | /patch/25166/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -67,8 +67,9 @@ self._generics.add(item) def get(self, key): - if key in self: - return self[key] + baseitem = super(itemregister, self).get(key) + if baseitem is not None and not baseitem.generic: + return baseitem # search for a matching generic item generics = sorted(self._generics, key=(lambda x: (x.priority, x.name))) @@ -76,8 +77,7 @@ if item._re.match(key): return item - # fallback to dict get - return super(itemregister, self).get(key) + return None coreitems = {}