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

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Jun  1 15:48:20 UTC 2020

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

Log Message:
Sync evolve with Mercurial patches. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-hg-evolve/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsexchange.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.10 pkgsrc/devel/py-hg-evolve/Makefile:1.11
--- pkgsrc/devel/py-hg-evolve/Makefile:1.10     Sun May 10 19:29:58 2020
+++ pkgsrc/devel/py-hg-evolve/Makefile  Mon Jun  1 15:48:20 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/05/10 19:29:58 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2020/06/01 15:48:20 joerg Exp $
 
 DISTNAME=      hg-evolve-10.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hg-evolve/}
 
@@ -10,7 +11,7 @@ HOMEPAGE=     https://www.mercurial-scm.org/
 COMMENT=       Experimental Mercurial extensions from Facebook
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-mercurial>=4.6:../../devel/py-mercurial
+DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.4nb1:../../devel/py-mercurial
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
 
 post-install:

Index: pkgsrc/devel/py-hg-evolve/distinfo
diff -u pkgsrc/devel/py-hg-evolve/distinfo:1.5 pkgsrc/devel/py-hg-evolve/distinfo:1.6
--- pkgsrc/devel/py-hg-evolve/distinfo:1.5      Sun May 10 19:29:58 2020
+++ pkgsrc/devel/py-hg-evolve/distinfo  Mon Jun  1 15:48:20 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/05/10 19:29:58 joerg Exp $
+$NetBSD: distinfo,v 1.6 2020/06/01 15:48:20 joerg Exp $
 
 SHA1 (hg-evolve-10.0.0.tar.gz) = 2ebbe4c2217cd01e75b93afbd9fd84674428b040
 RMD160 (hg-evolve-10.0.0.tar.gz) = cfe96cd1d782631ae8aca7186f6e60d8d6c22a5b
 SHA512 (hg-evolve-10.0.0.tar.gz) = 4c88af31584d61df7fe397015e185d0191a021f89a23630b6d71ead5acb233f4b71638f3637e12e1d04b03fb79f127a754eeac0e85ab2b8d045665645d528d13
 Size (hg-evolve-10.0.0.tar.gz) = 808587 bytes
+SHA1 (patch-hgext3rd_evolve_obsexchange.py) = 12058a8f27c63b259dcc0ffaf77febafcdeeba46

Added files:

Index: pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsexchange.py
diff -u /dev/null pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsexchange.py:1.1
--- /dev/null   Mon Jun  1 15:48:20 2020
+++ pkgsrc/devel/py-hg-evolve/patches/patch-hgext3rd_evolve_obsexchange.py      Mon Jun  1 15:48:20 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-hgext3rd_evolve_obsexchange.py,v 1.1 2020/06/01 15:48:20 joerg Exp $
+
+--- hgext3rd/evolve/obsexchange.py.orig        2020-06-01 15:45:28.403523975 +0000
++++ hgext3rd/evolve/obsexchange.py
+@@ -113,7 +113,7 @@ def _getbundleobsmarkerpart(orig, bundle
+             subset += kwargs['evo_missing_nodes']
+         markers = repo.obsstore.relevantmarkers(subset)
+         if util.safehasattr(bundle2, 'buildobsmarkerspart'):
+-            bundle2.buildobsmarkerspart(bundler, markers)
++            bundle2.buildobsmarkerspart(bundler, markers, mandatory = True)
+         else:
+             exchange.buildobsmarkerspart(bundler, markers)
+