CVS commit: pkgsrc/devel/py-hg-evolve

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Apr 11 13:27:55 UTC 2019

Modified Files:
        pkgsrc/devel/py-hg-evolve: Makefile distinfo
Added Files:
        pkgsrc/devel/py-hg-evolve/patches:
            patch-hgext3rd_evolve_obsdiscovery.py
            patch-hgext3rd_evolve_stablerangecache.py

Log Message:
Fix interaction between share and evolve extensions. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-hg-evolve/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py \
    pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-hg-evolve/Makefile
diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.4 pkgsrc/devel/py-hg-evolve/Makefile:1.5
--- pkgsrc/devel/py-hg-evolve/Makefile:1.4      Wed Mar  6 14:09:10 2019
+++ pkgsrc/devel/py-hg-evolve/Makefile  Thu Apr 11 13:27:55 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2019/03/06 14:09:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/11 13:27:55 joerg Exp $
 
 DISTNAME=      hg-evolve-8.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel scm
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hg-evolve/}
 

Index: pkgsrc/devel/py-hg-evolve/distinfo
diff -u pkgsrc/devel/py-hg-evolve/distinfo:1.2 pkgsrc/devel/py-hg-evolve/distinfo:1.3
--- pkgsrc/devel/py-hg-evolve/distinfo:1.2      Wed Mar  6 13:11:56 2019
+++ pkgsrc/devel/py-hg-evolve/distinfo  Thu Apr 11 13:27:55 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/03/06 13:11:56 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/04/11 13:27:55 joerg 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

Added files:

Index: pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py
diff -u /dev/null pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py:1.1
--- /dev/null   Thu Apr 11 13:27:55 2019
+++ pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsdiscovery.py     Thu Apr 11 13:27:55 2019
@@ -0,0 +1,21 @@
+$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())
Index: pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py
diff -u /dev/null pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py:1.1
--- /dev/null   Thu Apr 11 13:27:55 2019
+++ pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_stablerangecache.py Thu Apr 11 13:27:55 2019
@@ -0,0 +1,31 @@
+$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