Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 5.4.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9bb7c131b49a
branches: trunk
changeset: 433941:9bb7c131b49a
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jun 09 07:07:13 2020 +0000
description:
py-mercurial: update to 5.4.1.
Changes not found, but at least some of the pkgsrc patches are
not needed any longer.
diffstat:
devel/py-mercurial/Makefile | 11 +-
devel/py-mercurial/distinfo | 14 +-
devel/py-mercurial/patches/patch-D8481 | 67 ---------
devel/py-mercurial/patches/patch-D8487 | 27 ---
devel/py-mercurial/patches/patch-D8505 | 53 -------
devel/py-mercurial/patches/patch-D8522 | 229 ---------------------------------
devel/py-mercurial/version.mk | 4 +-
7 files changed, 12 insertions(+), 393 deletions(-)
diffs (truncated from 454 to 300 lines):
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile Tue Jun 09 07:01:55 2020 +0000
+++ b/devel/py-mercurial/Makefile Tue Jun 09 07:07:13 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2020/05/24 01:16:26 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2020/06/09 07:07:13 wiz Exp $
DISTNAME= mercurial-${VERSION}
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= devel scm
MASTER_SITES= https://www.mercurial-scm.org/release/
@@ -27,12 +26,12 @@
.include "version.mk"
-# Known test failures as of 5.4:
-# test-persistent-nodemap
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6320
+# Known test failures as of 5.4.1:
# test-doctest:
# https://bz.mercurial-scm.org/show_bug.cgi?id=6320
-# Ran 841 tests, 78 skipped, 2 failed.
+# test-obsolete-distributed:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6350
+# Ran 842 tests, 78 skipped, 2 failed.
do-test:
cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo Tue Jun 09 07:01:55 2020 +0000
+++ b/devel/py-mercurial/distinfo Tue Jun 09 07:07:13 2020 +0000
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.88 2020/05/24 01:16:26 joerg Exp $
+$NetBSD: distinfo,v 1.89 2020/06/09 07:07:13 wiz Exp $
-SHA1 (mercurial-5.4.tar.gz) = 652a2c61dec85f5e9eb101425861e9648bd6369a
-RMD160 (mercurial-5.4.tar.gz) = 002ccbd67bc903b7e19e470db44503e6cb37a2f2
-SHA512 (mercurial-5.4.tar.gz) = 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d
-Size (mercurial-5.4.tar.gz) = 7722447 bytes
+SHA1 (mercurial-5.4.1.tar.gz) = fb77969c3d9fe1a4df2af282bbec74201c9cbdac
+RMD160 (mercurial-5.4.1.tar.gz) = 040a68d43f4afb4991ddb4aeef951de7891a6d37
+SHA512 (mercurial-5.4.1.tar.gz) = 6173853c38f0aba59d2e29bec7da1c384c27a6004d5d00d1aee70571155122e07514fe6e56cecfdae48ec5f670823a2e6a5c9c8a36dd7041def2b8956fd35703
+Size (mercurial-5.4.1.tar.gz) = 7725893 bytes
SHA1 (patch-D8480) = dca33fd25007a160cff02054ca659cce2a01511c
-SHA1 (patch-D8481) = 71dc7d12f1b892d2705dfc900faddf85a917e4c6
-SHA1 (patch-D8487) = beba279489895c9855f1ca2013c1197ef2f1d86c
SHA1 (patch-D8490) = 96a4eefb403919d17f188573b7d1dc34cef28388
-SHA1 (patch-D8505) = 3244948bd009746941c9bdbfd5844f058c3caf59
-SHA1 (patch-D8522) = 6bc2d7b6fc40b217339b78ee2745c7ca33073642
SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
SHA1 (patch-D8575) = 5f414acb04ba5f8c141ceada93f29f6f7d43a833
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/patches/patch-D8481
--- a/devel/py-mercurial/patches/patch-D8481 Tue Jun 09 07:01:55 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-D8481,v 1.1 2020/05/24 01:16:26 joerg Exp $
-
-# HG changeset patch
-# User Joerg Sonnenberger <joerg%bec.de@localhost>
-# Date 1587751225 -7200
-# Fri Apr 24 20:00:25 2020 +0200
-# Branch stable
-# Node ID 3d5fb6cab832475975c96b6503f66c8adb7b984c
-# Parent ed684a82e29bbea8556c3079f6159a9159689078
-pullbundles: use unfiltered repo for head/base matching
-
-The unfiltered view works even when changeset transistion from draft to
-hidden phase. The normal visibility is already ensured by discovery as
-invisible heads would have been filtered out before. Skipping the
-filtering has a positive impact on performance, too.
-
-Differential Revision: https://phab.mercurial-scm.org/D8481
-
-diff -r ed684a82e29b -r 3d5fb6cab832 mercurial/wireprotov1server.py
---- mercurial/wireprotov1server.py Thu May 07 03:14:52 2020 -0700
-+++ mercurial/wireprotov1server.py Fri Apr 24 20:00:25 2020 +0200
-@@ -391,7 +391,7 @@
- res = exchange.filterclonebundleentries(repo, res)
- if not res:
- return None
-- cl = repo.changelog
-+ cl = repo.unfiltered().changelog
- heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True)
- common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True)
- compformats = clientcompressionsupport(proto)
-diff -r ed684a82e29b -r 3d5fb6cab832 tests/test-pull-bundle.t
---- tests/test-pull-bundle.t Thu May 07 03:14:52 2020 -0700
-+++ tests/test-pull-bundle.t Fri Apr 24 20:00:25 2020 +0200
-@@ -36,6 +36,8 @@
- $ cat <<EOF > .hg/hgrc
- > [server]
- > pullbundle = True
-+ > [experimental]
-+ > evolution = True
- > [extensions]
- > blackbox =
- > EOF
-@@ -185,3 +187,24 @@
- * sending pullbundle "0.hg" (glob)
- * sending pullbundle "0.hg" (glob)
- $ rm repo/.hg/blackbox.log
-+
-+Test processing when nodes used in the pullbundle.manifest end up being hidden
-+
-+ $ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a
-+ 1 new obsolescence markers
-+ obsoleted 1 changesets
-+ $ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log
-+ $ cat hg.pid >> $DAEMON_PIDS
-+ $ hg clone http://localhost:$HGPORT repo-obs
-+ requesting all changes
-+ adding changesets
-+ adding manifests
-+ adding file changes
-+ adding changesets
-+ adding manifests
-+ adding file changes
-+ added 2 changesets with 2 changes to 2 files
-+ new changesets bbd179dfa0a7:effea6de0384
-+ updating to branch default
-+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-+ $ killdaemons.py
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/patches/patch-D8487
--- a/devel/py-mercurial/patches/patch-D8487 Tue Jun 09 07:01:55 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-D8487,v 1.1 2020/05/24 01:16:26 joerg Exp $
-
-# HG changeset patch
-# User Joerg Sonnenberger <joerg%bec.de@localhost>
-# Date 1587944362 -7200
-# Mon Apr 27 01:39:22 2020 +0200
-# Branch stable
-# Node ID 5d309906ed0e4e2b0ade4d1539cbea7dc2c44771
-# Parent a50f33f1ff24466d6d721685cc65a732cb4c522c
-fastexport: downgrade message about already exported changesets to debug
-
-The old warning level is just too noisy for incremental processing.
-
-Differential Revision: https://phab.mercurial-scm.org/D8487
-
-diff -r a50f33f1ff24 -r 5d309906ed0e hgext/fastexport.py
---- hgext/fastexport.py Sun Apr 26 14:29:47 2020 -0400
-+++ hgext/fastexport.py Mon Apr 27 01:39:22 2020 +0200
-@@ -80,7 +80,7 @@
- ctx = repo[rev]
- revid = ctx.hex()
- if revid in marks:
-- ui.warn(_(b"warning: revision %s already exported, skipped\n") % revid)
-+ ui.debug(b"warning: revision %s already exported, skipped\n" % revid)
- return
- parents = [p for p in ctx.parents() if p.rev() != nullrev]
- for p in parents:
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/patches/patch-D8505
--- a/devel/py-mercurial/patches/patch-D8505 Tue Jun 09 07:01:55 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-$NetBSD: patch-D8505,v 1.1 2020/05/24 01:16:26 joerg Exp $
-
-# HG changeset patch
-# User Joerg Sonnenberger <joerg%bec.de@localhost>
-# Date 1588887605 -7200
-# Thu May 07 23:40:05 2020 +0200
-# Branch stable
-# Node ID 9d7d53771e5fa5c17bea578a89258350df6294ac
-# Parent 35bb67427f63abeb02be76238ab79afbe1ded034
-tests: fix timer scaling in wait-on-file
-
-When using the default test timeouts, wait-on-file would not wait for $n
-seconds, but $n/100 seconds. This resulted in easy timeouts on even
-moderately busy fast machines. Fix the scaling to apply in all cases.
-Adjust the stepping slightly to be nicer to systems with the historic
-100Hz time base to ensure that the scheduler actually switches to a
-different process and gives them time to work.
-
-Differential Revision: https://phab.mercurial-scm.org/D8505
-
-diff -r 35bb67427f63 -r 9d7d53771e5f tests/testlib/wait-on-file
---- tests/testlib/wait-on-file Sat May 09 20:25:07 2020 +0200
-+++ tests/testlib/wait-on-file Thu May 07 23:40:05 2020 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.
- #
-@@ -11,9 +11,12 @@
-
- timer="$1"
-
--# if the test timeout have been extended, explicitly extend the provided timer
-+# Scale the timeout to match the sleep steps below, i.e. 1/0.02.
-+timer=$(( 50 * $timer ))
-+# If the test timeout have been extended, also scale the timer relative
-+# to the normal timing.
- if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then
-- timer=$(( ( 100 * $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))
-+ timer=$(( ( $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))
- fi
-
- wait_on="$2"
-@@ -30,7 +33,7 @@
- while [ "$timer" -gt 0 ] && [ ! -f "$wait_on" ];
- do
- timer=$(( $timer - 1))
-- sleep 0.01
-+ sleep 0.02
- done
- if [ "$timer" -le 0 ]; then
- echo "file not created after $1 seconds: $wait_on" >&2
diff -r 8e2fc97c0cc7 -r 9bb7c131b49a devel/py-mercurial/patches/patch-D8522
--- a/devel/py-mercurial/patches/patch-D8522 Tue Jun 09 07:01:55 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-$NetBSD: patch-D8522,v 1.1 2020/05/24 01:16:26 joerg Exp $
-
-# HG changeset patch
-# User Joerg Sonnenberger <joerg%bec.de@localhost>
-# Date 1589314856 -7200
-# Tue May 12 22:20:56 2020 +0200
-# Branch stable
-# Node ID edffab2cf0ead5140fdaa391c1c827ddc53dfe35
-# Parent f71c8eea7161c6292389339557d9e538e0fcdc51
-fastexport: adjust output to be more canonical
-
-For time zones, git doesn't consider +0 and -0 the same timezone, so use
-the former canonically. Add a test case to ensure that non-UTC offsets
-are handled correctly. The real name part of the committer name is
-normally not quoted, so don't enforce that.
-
-Differential Revision: https://phab.mercurial-scm.org/D8522
-
-diff -r f71c8eea7161 -r edffab2cf0ea hgext/fastexport.py
---- hgext/fastexport.py Mon May 11 08:13:40 2020 +0200
-+++ hgext/fastexport.py Tue May 12 22:20:56 2020 +0200
-@@ -53,7 +53,7 @@
-
- def convert_to_git_date(date):
- timestamp, utcoff = date
-- tzsign = b"+" if utcoff < 0 else b"-"
-+ tzsign = b"+" if utcoff <= 0 else b"-"
- if utcoff % 60 != 0:
- raise error.Abort(
- _(b"UTC offset in %b is not an integer number of seconds") % (date,)
-diff -r f71c8eea7161 -r edffab2cf0ea tests/test-fastexport.t
---- tests/test-fastexport.t Mon May 11 08:13:40 2020 +0200
-+++ tests/test-fastexport.t Tue May 12 22:20:56 2020 +0200
-@@ -10,7 +10,7 @@
- $ hg up -r 10
- 13 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg rm nf10
-- $ hg commit -u debugbuilddag --date 'Thu Jan 01 00:00:12 1970 +0000' -m r12
-+ $ hg commit -u debugbuilddag --date 'Thu Jan 01 02:30:12 1970 +0230' -m r12
- created new head
- $ hg up -r 11
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-@@ -20,20 +20,20 @@
- $ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
-
- $ hg log -G
-- @ changeset: 13:e5c379648af4
-+ @ changeset: 13:5544befcb7ce
- |\ branch: both
- | | tag: tip
- | | parent: 11:2cbd52c10e88
-- | | parent: 12:4f31c9604af6
-+ | | parent: 12:66d0c21243be
- | | user: test
- | | date: Thu Jan 01 00:00:13 1970 +0000
- | | summary: debugbuilddag
- | |
-- | o changeset: 12:4f31c9604af6
-+ | o changeset: 12:66d0c21243be
- | | branch: both
- | | parent: 10:9220596cb068
- | | user: debugbuilddag
-- | | date: Thu Jan 01 00:00:12 1970 +0000
-+ | | date: Thu Jan 01 02:30:12 1970 +0230
- | | summary: r12
- | |
- o | changeset: 11:2cbd52c10e88
-@@ -150,7 +150,7 @@
-
- commit refs/heads/default
- mark :3
-- committer "debugbuilddag" <debugbuilddag> 0 -0000
-+ committer "debugbuilddag" <debugbuilddag> 0 +0000
- data 2
- r0
- M 644 :1 mf
-@@ -197,7 +197,7 @@
-
- commit refs/heads/default
- mark :7
-- committer "debugbuilddag" <debugbuilddag> 1 -0000
-+ committer "debugbuilddag" <debugbuilddag> 1 +0000
- data 2
- r1
Home |
Main Index |
Thread Index |
Old Index