[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: remove obsolete featu...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32801a88b42b
branches:  trunk
changeset: 453063:32801a88b42b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 22 23:11:31 2021 +0000

description:
py-mercurial: remove obsolete feature patch

Ok joerg@

Bump PKGREVISION.

diffstat:

 devel/py-mercurial/Makefile            |    7 +-
 devel/py-mercurial/distinfo            |    3 +-
 devel/py-mercurial/patches/patch-D8574 |  129 ---------------------------------
 3 files changed, 4 insertions(+), 135 deletions(-)

diffs (172 lines):

diff -r 37a725e6520a -r 32801a88b42b devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile       Sat May 22 23:10:26 2021 +0000
+++ b/devel/py-mercurial/Makefile       Sat May 22 23:11:31 2021 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2021/05/20 09:08:27 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2021/05/22 23:11:31 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 
@@ -34,10 +35,8 @@
 # Known test failures as of 5.8
 # test-persistent-nodemap.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6523
-# test-reject_new_heads.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6524
 #
-# Ran 878 tests, 81 skipped, 2 failed.
+# Ran 878 tests, 81 skipped, 1 failed.
 
 TEST_TARGET=           tests
 TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
diff -r 37a725e6520a -r 32801a88b42b devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Sat May 22 23:10:26 2021 +0000
+++ b/devel/py-mercurial/distinfo       Sat May 22 23:11:31 2021 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.102 2021/05/20 09:08:27 wiz Exp $
+$NetBSD: distinfo,v 1.103 2021/05/22 23:11:31 wiz Exp $
 
 SHA1 (mercurial-5.8.tar.gz) = 7ce13257550f9d22d483b42420ecf84b1b9ac3f4
 RMD160 (mercurial-5.8.tar.gz) = fb6b7aaab30c4d82b0a04df51e5899d4acb3e4fe
 SHA512 (mercurial-5.8.tar.gz) = 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
 Size (mercurial-5.8.tar.gz) = 7985326 bytes
-SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
diff -r 37a725e6520a -r 32801a88b42b devel/py-mercurial/patches/patch-D8574
--- a/devel/py-mercurial/patches/patch-D8574    Sat May 22 23:10:26 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-$NetBSD: patch-D8574,v 1.1 2020/05/24 01:16:26 joerg Exp $
-
-# HG changeset patch
-# User Joerg Sonnenberger <joerg%bec.de@localhost>
-# Date 1589846232 -7200
-#      Tue May 19 01:57:12 2020 +0200
-# Branch stable
-# Node ID 423cb450e7220473e144dc6fb089bec01c8d9d44
-# Parent  d658f1dff315336db8525f987af799179a060cbe
-hooks: teach reject_new_heads about phase transitions
-
-Differential Revision: https://phab.mercurial-scm.org/D8574
-
-diff -r d658f1dff315 -r 423cb450e722 hgext/hooklib/reject_new_heads.py
---- hgext/hooklib/reject_new_heads.py  Sun May 17 18:33:45 2020 -0400
-+++ hgext/hooklib/reject_new_heads.py  Tue May 19 01:57:12 2020 +0200
-@@ -4,8 +4,8 @@
- # GNU General Public License version 2 or any later version.
- 
- """reject_new_heads is a hook to check that branches touched by new changesets
--have at most one open head. It can be used to enforce policies for
--merge-before-push or rebase-before-push. It does not handle pre-existing
-+or phase transitions have at most one open head. It can be used to enforce policies
-+for merge-before-push or rebase-before-push. It does not handle pre-existing
- hydras.
- 
- Usage:
-@@ -30,9 +30,14 @@
-         )
-     ctx = repo.unfiltered()[node]
-     branches = set()
--    for rev in repo.changelog.revs(start=ctx.rev()):
--        rev = repo[rev]
--        branches.add(rev.branch())
-+    if ctx.rev():
-+        for rev in repo.changelog.revs(start=ctx.rev()):
-+            rev = repo[rev]
-+            branches.add(rev.branch())
-+    for revs, (old, new) in kwargs.get('changes', {b'phases': []})[b'phases']:
-+        for rev in revs:
-+            branches.add(repo.unfiltered()[rev].branch())
-+
-     for branch in branches:
-         if len(repo.revs("head() and not closed() and branch(%s)", branch)) > 1:
-             raise error.Abort(
-diff -r d658f1dff315 -r 423cb450e722 tests/test-hooklib-reject_new_heads.t
---- tests/test-hooklib-reject_new_heads.t      Sun May 17 18:33:45 2020 -0400
-+++ tests/test-hooklib-reject_new_heads.t      Tue May 19 01:57:12 2020 +0200
-@@ -5,6 +5,7 @@
-   > [phases]
-   > publish = False
-   > EOF
-+
-   $ hg init a
-   $ hg --cwd a debugbuilddag '.:parent.*parent'
-   $ hg --cwd a log -G
-@@ -26,6 +27,7 @@
-      date:        Thu Jan 01 00:00:00 1970 +0000
-      summary:     r0
-   
-+
-   $ hg init b
-   $ cat <<EOF >> b/.hg/hgrc
-   > [hooks]
-@@ -43,11 +45,61 @@
-   rollback completed
-   abort: Changes on branch 'default' resulted in multiple heads
-   [255]
--  $ hg --cwd b pull ../a -r 1ea73414a91b
-+  $ hg --cwd b pull ../a -r 66f7d451a68b
-   pulling from ../a
-   adding changesets
-   adding manifests
-   adding file changes
--  added 1 changesets with 0 changes to 0 files
--  new changesets 1ea73414a91b (1 drafts)
-+  added 2 changesets with 0 changes to 0 files
-+  new changesets 1ea73414a91b:66f7d451a68b (2 drafts)
-   (run 'hg update' to get a working copy)
-+
-+  $ hg --cwd b phase --public 66f7d451a68b
-+  $ hg --cwd b --config hooks.pretxnclose.reject_new_heads= pull ../a
-+  pulling from ../a
-+  searching for changes
-+  adding changesets
-+  adding manifests
-+  adding file changes
-+  added 1 changesets with 0 changes to 0 files (+1 heads)
-+  new changesets fa942426a6fd (1 drafts)
-+  (run 'hg heads' to see heads, 'hg merge' to merge)
-+
-+Test that pushing a draft change to a publishing server having the same
-+change already still triggers the check on the phase transition. The
-+changeset should remain as draft.
-+
-+  $ cat <<EOF >> b/.hg/hgrc
-+  > [serve]
-+  > view = immutable
-+  > 
-+  > [phases]
-+  > publish = True
-+  > EOF
-+
-+  $ cat > web.conf << EOF
-+  > [paths]
-+  > / = *
-+  > 
-+  > [web]
-+  > push_ssl = false
-+  > allow_push = *
-+  > EOF
-+
-+  $ hg --cwd b serve --web-conf ../web.conf -p $HGPORT -d --pid-file ../hg.pid
-+  $ cat hg.pid >> $DAEMON_PIDS
-+
-+  $ hg --cwd a push -f http://localhost:$HGPORT
-+  pushing to http://localhost:$HGPORT/
-+  searching for changes
-+  no changes found
-+  remote: error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads
-+  remote: Changes on branch 'default' resulted in multiple heads
-+  abort: push failed on remote
-+  [255]
-+  $ hg phase --cwd b fa942426a6fd
-+  2: draft
-+
-+Cleanup.
-+
-+  $ killdaemons.py