Mercurial > evolve
changeset 2324:3c7c4d92022f
merge back with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 03 May 2017 13:58:32 +0200 |
| parents | b9ce138eca63 (current diff) 673de955b14d (diff) |
| children | 04a0eda7dea9 |
| files | |
| diffstat | 5 files changed, 22 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed May 03 12:31:11 2017 +0200 +++ b/.hgtags Wed May 03 13:58:32 2017 +0200 @@ -48,3 +48,4 @@ 70694b2621ba9d919bc38303f8901e84caf5da0f 5.6.1 165ad227993de4e7d819cc6c820d5b9f7b38b80d 6.0.0 5ef112a6eb875633a7925cde61b7d2d9e65b3a56 6.0.1 +8510d3fd7c3b312dc731f4c29badc415d504558a 6.1.0
--- a/README Wed May 03 12:31:11 2017 +0200 +++ b/README Wed May 03 13:58:32 2017 +0200 @@ -112,7 +112,7 @@ Changelog ========= -6.1.0 - in progress +6.1.0 -- 2017-05-03 ------------------- - improve message about obsolete working copy parent,
--- a/debian/changelog Wed May 03 12:31:11 2017 +0200 +++ b/debian/changelog Wed May 03 13:58:32 2017 +0200 @@ -1,4 +1,10 @@ -mercurial-evolve (6.0.1-1) UNRELEASED; urgency=medium +mercurial-evolve (6.1.0-1) unstable; urgency=medium + + * New upstream release + + -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Wed, 03 May 2017 13:57:15 +0200 + +mercurial-evolve (6.0.1-1) unstable; urgency=medium * New upstream version
--- a/hgext3rd/evolve/metadata.py Wed May 03 12:31:11 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Wed May 03 13:58:32 2017 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '6.1.0.dev' -testedwith = '3.8.4 3.9.2 4.0.2 4.1.1' +__version__ = '6.1.0' +testedwith = '3.8.4 3.9.2 4.0.2 4.1.2 4.2' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/obscache.py Wed May 03 12:31:11 2017 +0200 +++ b/hgext3rd/evolve/obscache.py Wed May 03 13:58:32 2017 +0200 @@ -17,6 +17,7 @@ obsolete, phases, node, + util, ) from . import ( @@ -306,10 +307,11 @@ if self._cachekey is None or self._cachekey == self._ondiskkey: return - with repo.vfs(self._filepath, 'w', atomictemp=True) as cachefile: - headerdata = struct.pack(self._headerformat, *self._cachekey) - cachefile.write(headerdata) - cachefile.write(self._data) + cachefile = repo.vfs(self._filepath, 'w', atomictemp=True) + headerdata = struct.pack(self._headerformat, *self._cachekey) + cachefile.write(headerdata) + cachefile.write(self._data) + cachefile.close() def load(self, repo): """load data from disk""" @@ -329,7 +331,11 @@ """the set of obsolete revisions""" obs = set() repo = repo.unfiltered() - notpublic = repo._phasecache.getrevset(repo, (phases.draft, phases.secret)) + if util.safehasattr(repo._phasecache, 'getrevset'): + notpublic = repo._phasecache.getrevset(repo, (phases.draft, phases.secret)) + else: + # < hg-4.2 compat + notpublic = repo.revs("not public()") if notpublic: obscache = repo.obsstore.obscache # Since we warm the cache at the end of every transaction, the cache