This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2847

remotenames: work around move of ABCs in collections
ClosedPublic

Authored by durin42 on Mar 13 2018, 6:14 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGb710fdebd0db: remotenames: work around move of ABCs in collections
rHG623193ef691b: remotenames: work around move of ABCs in collections
Summary

This starts warning in Python 3.7, and will break in 3.8. The import
is performed in a curious place because import collections.abc
explodes badly on Python 2.7, and from collections import abc flunks
our import checker.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 13 2018, 6:14 PM
durin42 edited the summary of this revision. (Show Details)Mar 13 2018, 11:30 PM
durin42 updated this revision to Diff 7021.
yuja added a subscriber: yuja.Mar 14 2018, 9:55 AM

Could be either import collections.abc or adding collections.abc to
list_stdlib_modules.

durin42 edited the summary of this revision. (Show Details)Mar 14 2018, 1:18 PM
durin42 updated this revision to Diff 7037.
durin42 removed a parent revision: D2846: hghave: fix hardlink-whitelisted check on Python 3.Mar 14 2018, 1:18 PM
In D2847#45947, @yuja wrote:

Could be either import collections.abc or adding collections.abc to
list_stdlib_modules.

Sadly, neither worked :(

The import checker currently bans /all/ from ... import ... statements on stdlib modules (sigh, probably my fault), and import collections.abc goes sideways on Python 2. What I've done seems to work though...

yuja accepted this revision.Mar 15 2018, 10:32 AM
This revision is now accepted and ready to land.Mar 15 2018, 10:32 AM
Closed by commit rHG623193ef691b: remotenames: work around move of ABCs in collections (authored by durin42). · Explain WhyMar 15 2018, 10:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (12 lines)

Diff 7065

hgext/remotenames.py

Boolean value to enable or disable showing of remotebookmarks Boolean value to enable or disable showing of remotebookmarks
remotenames.branches remotenames.branches
Boolean value to enable or disable showing of remotebranches Boolean value to enable or disable showing of remotebranches
""" """
from __future__ import absolute_import from __future__ import absolute_import
import collections
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
bin, bin,
) )
from mercurial import ( from mercurial import (
logexchange, logexchange,
namespaces, namespaces,
pycompat,
registrar, registrar,
revsetlang, revsetlang,
smartset, smartset,
templateutil, templateutil,
) )
if pycompat.ispy3:
import collections.abc
mutablemapping = collections.abc.MutableMapping
else:
import collections
mutablemapping = collections.MutableMapping
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
templatekeyword = registrar.templatekeyword() templatekeyword = registrar.templatekeyword()
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
configitem('remotenames', 'bookmarks', configitem('remotenames', 'bookmarks',
default=True, default=True,
) )
configitem('remotenames', 'branches', configitem('remotenames', 'branches',
default=True, default=True,
) )
class lazyremotenamedict(collections.MutableMapping): class lazyremotenamedict(mutablemapping):
""" """
Read-only dict-like Class to lazily resolve remotename entries Read-only dict-like Class to lazily resolve remotename entries
We are doing that because remotenames startup was slow. We are doing that because remotenames startup was slow.
We lazily read the remotenames file once to figure out the potential entries We lazily read the remotenames file once to figure out the potential entries
and store them in self.potentialentries. Then when asked to resolve an and store them in self.potentialentries. Then when asked to resolve an
entry, if it is not in self.potentialentries, then it isn't there, if it entry, if it is not in self.potentialentries, then it isn't there, if it
is in self.potentialentries we resolve it and store the result in is in self.potentialentries we resolve it and store the result in