CVS commit: pkgsrc/devel/py-mercurial

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-mercurial
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 9 Nov 2020 14:42:47 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov  9 14:42:46 UTC 2020

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST distinfo version.mk
Added Files:
        pkgsrc/devel/py-mercurial/patches:
            patch-tests_test-transaction-rollback-on-sigpipe.t

Log Message:
py-mercurial: update to 5.6.

Changes: not documented.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.94 -r1.95 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t

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-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.46 pkgsrc/devel/py-mercurial/Makefile:1.47
--- pkgsrc/devel/py-mercurial/Makefile:1.46     Tue Oct  6 17:50:47 2020
+++ pkgsrc/devel/py-mercurial/Makefile  Mon Nov  9 14:42:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2020/10/06 17:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2020/11/09 14:42:46 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -28,10 +28,13 @@ INSTALLATION_DIRS+= share/doc/mercurial
 .include "version.mk"
 .include "options.mk"
 
-# Known test failures as of 5.5.2
-# test-doctest:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6320
-# Ran 850 tests, 79 skipped, 2 failed.
+# Known test failures as of 5.6
+# None, but:
+# Needed since 5.6 for one test only, see
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6429
+USE_TOOLS+=            bash:test
+#
+# Ran 864 tests, 80 skipped, 0 failed.
 TEST_TARGET=           tests
 TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.30 pkgsrc/devel/py-mercurial/PLIST:1.31
--- pkgsrc/devel/py-mercurial/PLIST:1.30        Wed Aug  5 06:24:32 2020
+++ pkgsrc/devel/py-mercurial/PLIST     Mon Nov  9 14:42:46 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2020/08/05 06:24:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.31 2020/11/09 14:42:46 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -544,6 +544,9 @@ ${PYSITELIB}/mercurial/commands.pyo
 ${PYSITELIB}/mercurial/commandserver.py
 ${PYSITELIB}/mercurial/commandserver.pyc
 ${PYSITELIB}/mercurial/commandserver.pyo
+${PYSITELIB}/mercurial/commit.py
+${PYSITELIB}/mercurial/commit.pyc
+${PYSITELIB}/mercurial/commit.pyo
 ${PYSITELIB}/mercurial/config.py
 ${PYSITELIB}/mercurial/config.pyc
 ${PYSITELIB}/mercurial/config.pyo
@@ -633,6 +636,9 @@ ${PYSITELIB}/mercurial/formatter.pyo
 ${PYSITELIB}/mercurial/graphmod.py
 ${PYSITELIB}/mercurial/graphmod.pyc
 ${PYSITELIB}/mercurial/graphmod.pyo
+${PYSITELIB}/mercurial/grep.py
+${PYSITELIB}/mercurial/grep.pyc
+${PYSITELIB}/mercurial/grep.pyo
 ${PYSITELIB}/mercurial/hbisect.py
 ${PYSITELIB}/mercurial/hbisect.pyc
 ${PYSITELIB}/mercurial/hbisect.pyo
@@ -897,6 +903,9 @@ ${PYSITELIB}/mercurial/repocache.pyo
 ${PYSITELIB}/mercurial/repoview.py
 ${PYSITELIB}/mercurial/repoview.pyc
 ${PYSITELIB}/mercurial/repoview.pyo
+${PYSITELIB}/mercurial/requirements.py
+${PYSITELIB}/mercurial/requirements.pyc
+${PYSITELIB}/mercurial/requirements.pyo
 ${PYSITELIB}/mercurial/revlog.py
 ${PYSITELIB}/mercurial/revlog.pyc
 ${PYSITELIB}/mercurial/revlog.pyo
@@ -1006,6 +1015,12 @@ ${PYSITELIB}/mercurial/templatekw.pyo
 ${PYSITELIB}/mercurial/templater.py
 ${PYSITELIB}/mercurial/templater.pyc
 ${PYSITELIB}/mercurial/templater.pyo
+${PYSITELIB}/mercurial/templates/__init__.py
+${PYSITELIB}/mercurial/templates/__init__.pyc
+${PYSITELIB}/mercurial/templates/__init__.pyo
+${PYSITELIB}/mercurial/templates/atom/__init__.py
+${PYSITELIB}/mercurial/templates/atom/__init__.pyc
+${PYSITELIB}/mercurial/templates/atom/__init__.pyo
 ${PYSITELIB}/mercurial/templates/atom/bookmarkentry.tmpl
 ${PYSITELIB}/mercurial/templates/atom/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/atom/branchentry.tmpl
@@ -1018,8 +1033,14 @@ ${PYSITELIB}/mercurial/templates/atom/he
 ${PYSITELIB}/mercurial/templates/atom/map
 ${PYSITELIB}/mercurial/templates/atom/tagentry.tmpl
 ${PYSITELIB}/mercurial/templates/atom/tags.tmpl
+${PYSITELIB}/mercurial/templates/coal/__init__.py
+${PYSITELIB}/mercurial/templates/coal/__init__.pyc
+${PYSITELIB}/mercurial/templates/coal/__init__.pyo
 ${PYSITELIB}/mercurial/templates/coal/header.tmpl
 ${PYSITELIB}/mercurial/templates/coal/map
+${PYSITELIB}/mercurial/templates/gitweb/__init__.py
+${PYSITELIB}/mercurial/templates/gitweb/__init__.pyc
+${PYSITELIB}/mercurial/templates/gitweb/__init__.pyo
 ${PYSITELIB}/mercurial/templates/gitweb/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/branches.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changelog.tmpl
@@ -1045,6 +1066,9 @@ ${PYSITELIB}/mercurial/templates/gitweb/
 ${PYSITELIB}/mercurial/templates/gitweb/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
+${PYSITELIB}/mercurial/templates/json/__init__.py
+${PYSITELIB}/mercurial/templates/json/__init__.pyc
+${PYSITELIB}/mercurial/templates/json/__init__.pyo
 ${PYSITELIB}/mercurial/templates/json/changelist.tmpl
 ${PYSITELIB}/mercurial/templates/json/graph.tmpl
 ${PYSITELIB}/mercurial/templates/json/map
@@ -1056,6 +1080,9 @@ ${PYSITELIB}/mercurial/templates/map-cmd
 ${PYSITELIB}/mercurial/templates/map-cmdline.show
 ${PYSITELIB}/mercurial/templates/map-cmdline.status
 ${PYSITELIB}/mercurial/templates/map-cmdline.xml
+${PYSITELIB}/mercurial/templates/monoblue/__init__.py
+${PYSITELIB}/mercurial/templates/monoblue/__init__.pyc
+${PYSITELIB}/mercurial/templates/monoblue/__init__.pyo
 ${PYSITELIB}/mercurial/templates/monoblue/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/branches.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl
@@ -1081,6 +1108,9 @@ ${PYSITELIB}/mercurial/templates/monoblu
 ${PYSITELIB}/mercurial/templates/monoblue/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/summary.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/tags.tmpl
+${PYSITELIB}/mercurial/templates/paper/__init__.py
+${PYSITELIB}/mercurial/templates/paper/__init__.pyc
+${PYSITELIB}/mercurial/templates/paper/__init__.pyo
 ${PYSITELIB}/mercurial/templates/paper/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/paper/branches.tmpl
 ${PYSITELIB}/mercurial/templates/paper/changeset.tmpl
@@ -1106,6 +1136,9 @@ ${PYSITELIB}/mercurial/templates/paper/s
 ${PYSITELIB}/mercurial/templates/paper/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/paper/shortlogentry.tmpl
 ${PYSITELIB}/mercurial/templates/paper/tags.tmpl
+${PYSITELIB}/mercurial/templates/raw/__init__.py
+${PYSITELIB}/mercurial/templates/raw/__init__.pyc
+${PYSITELIB}/mercurial/templates/raw/__init__.pyo
 ${PYSITELIB}/mercurial/templates/raw/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/raw/changeset.tmpl
 ${PYSITELIB}/mercurial/templates/raw/error.tmpl
@@ -1120,6 +1153,9 @@ ${PYSITELIB}/mercurial/templates/raw/man
 ${PYSITELIB}/mercurial/templates/raw/map
 ${PYSITELIB}/mercurial/templates/raw/notfound.tmpl
 ${PYSITELIB}/mercurial/templates/raw/search.tmpl
+${PYSITELIB}/mercurial/templates/rss/__init__.py
+${PYSITELIB}/mercurial/templates/rss/__init__.pyc
+${PYSITELIB}/mercurial/templates/rss/__init__.pyo
 ${PYSITELIB}/mercurial/templates/rss/bookmarkentry.tmpl
 ${PYSITELIB}/mercurial/templates/rss/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/rss/branchentry.tmpl
@@ -1133,6 +1169,9 @@ ${PYSITELIB}/mercurial/templates/rss/hea
 ${PYSITELIB}/mercurial/templates/rss/map
 ${PYSITELIB}/mercurial/templates/rss/tagentry.tmpl
 ${PYSITELIB}/mercurial/templates/rss/tags.tmpl
+${PYSITELIB}/mercurial/templates/spartan/__init__.py
+${PYSITELIB}/mercurial/templates/spartan/__init__.pyc
+${PYSITELIB}/mercurial/templates/spartan/__init__.pyo
 ${PYSITELIB}/mercurial/templates/spartan/branches.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/changelogentry.tmpl
@@ -1155,6 +1194,9 @@ ${PYSITELIB}/mercurial/templates/spartan
 ${PYSITELIB}/mercurial/templates/spartan/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/shortlogentry.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/tags.tmpl
+${PYSITELIB}/mercurial/templates/static/__init__.py
+${PYSITELIB}/mercurial/templates/static/__init__.pyc
+${PYSITELIB}/mercurial/templates/static/__init__.pyo
 ${PYSITELIB}/mercurial/templates/static/background.png
 ${PYSITELIB}/mercurial/templates/static/coal-file.png
 ${PYSITELIB}/mercurial/templates/static/coal-folder.png

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.94 pkgsrc/devel/py-mercurial/distinfo:1.95
--- pkgsrc/devel/py-mercurial/distinfo:1.94     Tue Oct  6 17:50:47 2020
+++ pkgsrc/devel/py-mercurial/distinfo  Mon Nov  9 14:42:46 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2020/10/06 17:50:47 wiz Exp $
+$NetBSD: distinfo,v 1.95 2020/11/09 14:42:46 wiz Exp $
 
 SHA1 (aho-corasick-0.7.10.crate) = 46a5f4bc5d99c97eca60043752a0fd47d01fca7d
 RMD160 (aho-corasick-0.7.10.crate) = 925013ea0bce7c4a0ca5e1b017af0a1e553061fd
@@ -396,10 +396,10 @@ SHA1 (memory-module-sys-0.3.0.crate) = 9
 RMD160 (memory-module-sys-0.3.0.crate) = 3f6784e77d53af7281174a8feebc8dbde1591960
 SHA512 (memory-module-sys-0.3.0.crate) = 01df13b8073996098fa038292bb7113630a017e513896ceddfa5c9c760b1738aec5601957f5ca1c1defa205d8b6905b28edb2ef1c0f960600d29a1cd76baf972
 Size (memory-module-sys-0.3.0.crate) = 13808 bytes
-SHA1 (mercurial-5.5.2.tar.gz) = 49ae4debda55a0e78d5b90008ddb79d92bca539a
-RMD160 (mercurial-5.5.2.tar.gz) = 6de828c1b8dc08e68fd9c08b9b108ffcfed3e601
-SHA512 (mercurial-5.5.2.tar.gz) = e154592deed6168a32e7fd075fa034908ca72826ae49a92c84a6ad82b820753906578f064ac623018442d83d125a551eecc057179e66ac7217398a192e903629
-Size (mercurial-5.5.2.tar.gz) = 7761053 bytes
+SHA1 (mercurial-5.6.tar.gz) = 3dbceb8b41bcd0ddf9d0bd039da5375762770805
+RMD160 (mercurial-5.6.tar.gz) = a5ca3e749b38869f0b32ee127f3170116e4a40e1
+SHA512 (mercurial-5.6.tar.gz) = fb0dcbeda972ec7c74d88d3a525e36d07d0b0c20809d58552d9187482863eb079b8f3e374cba3bde24685bde8a603cd5a580cf3cf52acdafcc841b05c81c0f81
+Size (mercurial-5.6.tar.gz) = 7840943 bytes
 SHA1 (micro-timer-0.3.0.crate) = e6a16e55091106648edce4cc0900f17965e648bf
 RMD160 (micro-timer-0.3.0.crate) = d04755052bd4e55ea39fb2676019297572024ef7
 SHA512 (micro-timer-0.3.0.crate) = 9a7150cc19f0a3b006df87097d6f3699313604005ef4fa2a770ae8eeec40f699bf00af19f5561e2b5b72913bd41103bcb2b21670359b5202bd5af828575f40e7
@@ -975,3 +975,4 @@ Size (yaml-rust-0.3.5.crate) = 42087 byt
 SHA1 (patch-D8480) = d97094c64addcc243e54cfde48734ecfe130c3d6
 SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
 SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f
+SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.18 pkgsrc/devel/py-mercurial/version.mk:1.19
--- pkgsrc/devel/py-mercurial/version.mk:1.18   Tue Oct  6 17:50:47 2020
+++ pkgsrc/devel/py-mercurial/version.mk        Mon Nov  9 14:42:46 2020
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.18 2020/10/06 17:50:47 wiz Exp $
+# $NetBSD: version.mk,v 1.19 2020/11/09 14:42:46 wiz Exp $
 
-VERSION=       5.5.2
+VERSION=       5.6

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t:1.1
--- /dev/null   Mon Nov  9 14:42:46 2020
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t        Mon Nov  9 14:42:46 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-tests_test-transaction-rollback-on-sigpipe.t,v 1.1 2020/11/09 14:42:46 wiz Exp $
+
+https://bz.mercurial-scm.org/show_bug.cgi?id=6429
+
+--- tests/test-transaction-rollback-on-sigpipe.t.orig  2020-11-02 19:26:18.000000000 +0000
++++ tests/test-transaction-rollback-on-sigpipe.t
+@@ -22,14 +22,14 @@ disconnecting.
+ 
+   $ killable_pipe=`pwd`/killable_pipe.sh
+   $ script $killable_pipe <<EOF
+-  > #!/bin/bash
++  > #!/usr/bin/env bash
+   > echo \$\$ >> $pidfile
+   > exec cat
+   > EOF
+ 
+   $ remotecmd=`pwd`/remotecmd.sh
+   $ script $remotecmd <<EOF
+-  > #!/bin/bash
++  > #!/usr/bin/env bash
+   > hg "\$@" 1> >($killable_pipe) 2> >($killable_pipe >&2)
+   > EOF
+ 
+@@ -38,7 +38,7 @@ disconnecting. Then exit nonzero, to for
+ 
+   $ hook_script=`pwd`/pretxnchangegroup.sh
+   $ script $hook_script <<EOF
+-  > #!/bin/bash
++  > #!/usr/bin/env bash
+   > for pid in \$(cat $pidfile) ; do
+   >   kill \$pid
+   >   while kill -0 \$pid 2>/dev/null ; do

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index