Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-hg-evolve py-hg-evolve: update to 9.3.1, need...
details: https://anonhg.NetBSD.org/pkgsrc/rev/13f46c21accb
branches: trunk
changeset: 430826:13f46c21accb
user: riastradh <riastradh%pkgsrc.org@localhost>
date: Mon May 04 17:23:28 2020 +0000
description:
py-hg-evolve: update to 9.3.1, needed with mercurial 5
joerg did not raise a clear objection when I asked, just alerted me
that there will be a mercurial and hg-evolve update `real soon now'.
Since it hasn't happened in the two weeks since I prepared this
patch, I'm reading the lack of objection as approval, with the
understanding that this update may be overwritten soon.
diffstat:
devel/py-hg-evolve/Makefile | 9 +-
devel/py-hg-evolve/PLIST | 14 ++++-
devel/py-hg-evolve/distinfo | 12 +--
devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py | 21 ------
devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py | 31 ----------
5 files changed, 22 insertions(+), 65 deletions(-)
diffs (154 lines):
diff -r 199655c96d9f -r 13f46c21accb devel/py-hg-evolve/Makefile
--- a/devel/py-hg-evolve/Makefile Mon May 04 16:18:36 2020 +0000
+++ b/devel/py-hg-evolve/Makefile Mon May 04 17:23:28 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2019/11/03 10:18:27 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/04 17:23:28 riastradh Exp $
-DISTNAME= hg-evolve-8.4.0
+DISTNAME= hg-evolve-9.3.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
CATEGORIES= devel scm
MASTER_SITES= ${MASTER_SITE_PYPI:=h/hg-evolve/}
@@ -12,11 +11,11 @@
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-mercurial>=4.3.1:../../devel/py-mercurial
-
-PYTHON_VERSIONS_ACCEPTED= 27 # See Mercurial itself.
+DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
post-install:
rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__init__.py*
+ rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__pycache__/__init__.*
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 199655c96d9f -r 13f46c21accb devel/py-hg-evolve/PLIST
--- a/devel/py-hg-evolve/PLIST Mon May 04 16:18:36 2020 +0000
+++ b/devel/py-hg-evolve/PLIST Mon May 04 17:23:28 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/03/06 14:09:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/04 17:23:28 riastradh Exp $
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/hgext3rd/evolve/__init__.py
${PYSITELIB}/hgext3rd/evolve/__init__.pyc
@@ -30,6 +30,9 @@
${PYSITELIB}/hgext3rd/evolve/genericcaches.py
${PYSITELIB}/hgext3rd/evolve/genericcaches.pyc
${PYSITELIB}/hgext3rd/evolve/genericcaches.pyo
+${PYSITELIB}/hgext3rd/evolve/headchecking.py
+${PYSITELIB}/hgext3rd/evolve/headchecking.pyc
+${PYSITELIB}/hgext3rd/evolve/headchecking.pyo
${PYSITELIB}/hgext3rd/evolve/legacy.py
${PYSITELIB}/hgext3rd/evolve/legacy.pyc
${PYSITELIB}/hgext3rd/evolve/legacy.pyo
@@ -45,6 +48,9 @@
${PYSITELIB}/hgext3rd/evolve/obsexchange.py
${PYSITELIB}/hgext3rd/evolve/obsexchange.pyc
${PYSITELIB}/hgext3rd/evolve/obsexchange.pyo
+${PYSITELIB}/hgext3rd/evolve/obshashtree.py
+${PYSITELIB}/hgext3rd/evolve/obshashtree.pyc
+${PYSITELIB}/hgext3rd/evolve/obshashtree.pyo
${PYSITELIB}/hgext3rd/evolve/obshistory.py
${PYSITELIB}/hgext3rd/evolve/obshistory.pyc
${PYSITELIB}/hgext3rd/evolve/obshistory.pyo
@@ -93,6 +99,9 @@
${PYSITELIB}/hgext3rd/topic/__init__.py
${PYSITELIB}/hgext3rd/topic/__init__.pyc
${PYSITELIB}/hgext3rd/topic/__init__.pyo
+${PYSITELIB}/hgext3rd/topic/common.py
+${PYSITELIB}/hgext3rd/topic/common.pyc
+${PYSITELIB}/hgext3rd/topic/common.pyo
${PYSITELIB}/hgext3rd/topic/compat.py
${PYSITELIB}/hgext3rd/topic/compat.pyc
${PYSITELIB}/hgext3rd/topic/compat.pyo
@@ -117,6 +126,9 @@
${PYSITELIB}/hgext3rd/topic/revset.py
${PYSITELIB}/hgext3rd/topic/revset.pyc
${PYSITELIB}/hgext3rd/topic/revset.pyo
+${PYSITELIB}/hgext3rd/topic/server.py
+${PYSITELIB}/hgext3rd/topic/server.pyc
+${PYSITELIB}/hgext3rd/topic/server.pyo
${PYSITELIB}/hgext3rd/topic/stack.py
${PYSITELIB}/hgext3rd/topic/stack.pyc
${PYSITELIB}/hgext3rd/topic/stack.pyo
diff -r 199655c96d9f -r 13f46c21accb devel/py-hg-evolve/distinfo
--- a/devel/py-hg-evolve/distinfo Mon May 04 16:18:36 2020 +0000
+++ b/devel/py-hg-evolve/distinfo Mon May 04 17:23:28 2020 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/04/11 13:27:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2020/05/04 17:23:28 riastradh Exp $
-SHA1 (hg-evolve-8.4.0.tar.gz) = 35d050bace70c408f9b46b82093c48262e626fe6
-RMD160 (hg-evolve-8.4.0.tar.gz) = 9c00c54ca9a72f1eb177c948ed40a24fd8c5b966
-SHA512 (hg-evolve-8.4.0.tar.gz) = fa3769ff6d884c5733024d5e8f4474c41b72ad811f4176216f60834cec65d831e78b78ebf15568113953da691c4075b1cf136e0f3531aab90b1afdf5e638b5e1
-Size (hg-evolve-8.4.0.tar.gz) = 738359 bytes
-SHA1 (patch-hgext3rd_evolve_obsdiscovery.py) = 73ec53bd98f1c7047008487278c2ce8dce5691ed
-SHA1 (patch-hgext3rd_evolve_stablerangecache.py) = 576fed4aa2a4899c0a365f04ce8ce06f803d221e
+SHA1 (hg-evolve-9.3.1.tar.gz) = 9c0a933ec7af36c66e12854e937c44a0c64b7d8f
+RMD160 (hg-evolve-9.3.1.tar.gz) = 414ed3c05317ee7a03b30d75e0ba2adbd3d51fa6
+SHA512 (hg-evolve-9.3.1.tar.gz) = 453104989ec1e4a7072098f8c453290d66270f1992ab1a9a7c94be96f1c3e2b9989940796579de1e11f298ffdb7eaf7b9c9bb05def61fba4feeb5e2f39299670
+Size (hg-evolve-9.3.1.tar.gz) = 798989 bytes
diff -r 199655c96d9f -r 13f46c21accb devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py
--- a/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py Mon May 04 16:18:36 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-hgext3rd_evolve_obsdiscovery.py,v 1.1 2019/04/11 13:27:55 joerg Exp $
-
-Fix interaction with share extension.
-
---- hgext3rd/evolve/obsdiscovery.py.orig 2019-01-23 00:11:32.000000000 +0000
-+++ hgext3rd/evolve/obsdiscovery.py
-@@ -412,12 +412,12 @@ class _obshashcache(obscache.dualsourcec
- _schemaversion = 3
-
- _cachename = 'evo-ext-obshashrange' # used for error message
-- _filename = 'cache/evoext_obshashrange_v2.sqlite'
-+ _filename = 'evoext_obshashrange_v2.sqlite'
-
- def __init__(self, repo):
- super(_obshashcache, self).__init__()
- self._vfs = repo.vfs
-- self._path = repo.vfs.join(self._filename)
-+ self._path = repo.cachevfs.join(self._filename)
- self._new = set()
- self._valid = True
- self._repo = weakref.ref(repo.unfiltered())
diff -r 199655c96d9f -r 13f46c21accb devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py
--- a/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py Mon May 04 16:18:36 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-hgext3rd_evolve_stablerangecache.py,v 1.1 2019/04/11 13:27:55 joerg Exp $
-
-Fix interaction with share extension.
-
---- hgext3rd/evolve/stablerangecache.py.orig 2019-01-23 00:11:32.000000000 +0000
-+++ hgext3rd/evolve/stablerangecache.py
-@@ -176,7 +176,7 @@ class stablerangesqlbase(stablerange.sta
- def __init__(self, repo, **kwargs):
- super(stablerangesqlbase, self).__init__(**kwargs)
- self._vfs = repo.vfs
-- self._path = repo.vfs.join(self._cachefile)
-+ self._path = repo.cachevfs.join(self._cachefile)
- self._cl = repo.unfiltered().changelog # (okay to keep an old one)
- self._ondisktiprev = None
- self._ondisktipnode = None
-@@ -390,13 +390,13 @@ class stablerangesql(stablerangesqlbase,
- class mergepointsql(stablerangesql, stablerange.stablerange_mergepoint):
-
- _schemaversion = 3
-- _cachefile = 'cache/evoext_stablerange_v2.sqlite'
-+ _cachefile = 'evoext_stablerange_v2.sqlite'
- _cachename = 'evo-ext-stablerange-mergepoint'
-
- class sqlstablerange(stablerangesqlbase, stablerange.stablerange):
-
- _schemaversion = 1
-- _cachefile = 'cache/evoext_stablerange_v1.sqlite'
-+ _cachefile = 'evoext_stablerange_v1.sqlite'
-
- def warmup(self, repo, upto=None):
- self._con # make sure the data base is loaded
Home |
Main Index |
Thread Index |
Old Index