Mercurial > evolve
changeset 3920:202413cab59f mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:53:01 +0200 |
| parents | e2321901592d (current diff) ca7f02c9fa57 (diff) |
| children | 257481642686 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/stablerange.py Tue Jul 31 12:54:46 2018 +0200 +++ b/hgext3rd/evolve/stablerange.py Thu Aug 02 01:53:01 2018 +0200 @@ -157,29 +157,29 @@ @abc.abstractmethod def subranges(self, repo, rangeid): """return the stable sub-ranges of a rangeid""" - raise NotImplemented() + raise NotImplementedError() @abc.abstractmethod def revsfromrange(self, repo, rangeid): """return revision contained in a range""" - raise NotImplemented() + raise NotImplementedError() @abc.abstractmethod def depthrev(self, repo, rev): """depth a revision""" # Exist to allow basic implementation to ignore the depthcache # Could be demoted to _depthrev. - raise NotImplemented() + raise NotImplementedError() @abc.abstractmethod def warmup(self, repo, upto=None): """warmup the stable range cache""" - raise NotImplemented() + raise NotImplementedError() @abc.abstractmethod def rangelength(self, repo, rangeid): """number of revision in <range>""" - raise NotImplemented() + raise NotImplementedError() def _slicepoint(self, repo, rangeid): """find the standard slicing point for a range"""
--- a/hgext3rd/topic/discovery.py Tue Jul 31 12:54:46 2018 +0200 +++ b/hgext3rd/topic/discovery.py Thu Aug 02 01:53:01 2018 +0200 @@ -16,7 +16,7 @@ try: from mercurial import wireproto wireproto.branchmap -except ImportError: # <= hg-4.5 +except (AttributeError, ImportError): # <= hg-4.5 from mercurial import wireprotov1server as wireproto def _headssummary(orig, pushop, *args, **kwargs):