Mercurial > evolve
changeset 4349:01f4ee6779d5
obsdiscovery: use consistent filtering during discovery
If we computed revision using an unfiltered repository, we should run the
discovery unfiltered too.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 17 Jan 2019 12:37:40 +0100 |
| parents | 398c33b17d76 |
| children | 5ba82f405453 |
| files | CHANGELOG hgext3rd/evolve/metadata.py hgext3rd/evolve/obsdiscovery.py |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Fri Jan 18 23:09:44 2019 +0530 +++ b/CHANGELOG Thu Jan 17 12:37:40 2019 +0100 @@ -17,6 +17,7 @@ * next: evolve aspiring children by default (use --no-evolve to skip) * next: pick lower part of a split as destination * compat: drop compatibility with Mercurial 4.3 + * compat: add compatibility with Mercurial 4.9 * topics: improve the message around topic changing * stack: introduce a --children flag (see help for details) * topic: make --age compatible with the usual other display for `hg topic`
--- a/hgext3rd/evolve/metadata.py Fri Jan 18 23:09:44 2019 +0530 +++ b/hgext3rd/evolve/metadata.py Thu Jan 17 12:37:40 2019 +0100 @@ -6,6 +6,6 @@ # GNU General Public License version 2 or any later version. __version__ = '8.4.0.dev' -testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8' +testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9' minimumhgversion = '4.4' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/obsdiscovery.py Fri Jan 18 23:09:44 2019 +0530 +++ b/hgext3rd/evolve/obsdiscovery.py Thu Jan 17 12:37:40 2019 +0100 @@ -1088,12 +1088,12 @@ if bundle2 and _canobshashrange(repo, remote): obsexcmsg(repo.ui, "looking for common markers in %i nodes\n" % len(revs)) - boundaries['missing'] = findmissingrange(repo.ui, repo, pullop.remote, + boundaries['missing'] = findmissingrange(repo.ui, unfi, pullop.remote, revs) elif remote.capable('_evoext_obshash_0'): obsexcmsg(repo.ui, "looking for common markers in %i nodes\n" % len(revs)) - boundaries['common'] = findcommonobsmarkers(repo.ui, repo, remote, revs) + boundaries['common'] = findcommonobsmarkers(repo.ui, unfi, remote, revs) else: boundaries['common'] = [node.nullid] return boundaries