CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Sep  3 12:46:59 UTC 2018

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-mercurial_scmutil.py
            patch-mercurial_util.py

Log Message:
Merge two fixes from upstream Mercurial. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-mercurial_scmutil.py \
    pkgsrc/devel/py-mercurial/patches/patch-mercurial_util.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-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.23 pkgsrc/devel/py-mercurial/Makefile:1.24
--- pkgsrc/devel/py-mercurial/Makefile:1.23     Sun Jun 17 11:24:12 2018
+++ pkgsrc/devel/py-mercurial/Makefile  Mon Sep  3 12:46:59 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2018/06/17 11:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/09/03 12:46:59 joerg Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.67 pkgsrc/devel/py-mercurial/distinfo:1.68
--- pkgsrc/devel/py-mercurial/distinfo:1.67     Wed Aug 15 14:04:42 2018
+++ pkgsrc/devel/py-mercurial/distinfo  Mon Sep  3 12:46:59 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.67 2018/08/15 14:04:42 joerg Exp $
+$NetBSD: distinfo,v 1.68 2018/09/03 12:46:59 joerg Exp $
 
 SHA1 (mercurial-4.7.tar.gz) = 520f0f50f8763998f1f97667892be42dbae64bfc
 RMD160 (mercurial-4.7.tar.gz) = 182e2382c09a30e779cb56ea5fea3056470891e3
 SHA512 (mercurial-4.7.tar.gz) = a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8
 Size (mercurial-4.7.tar.gz) = 6476268 bytes
+SHA1 (patch-mercurial_scmutil.py) = cf83e31593f48c8e54a8b733972b96ee5b79ceb5
+SHA1 (patch-mercurial_util.py) = 97838dae48198a4b23f0b5fbbcc494f298b27e1d

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-mercurial_scmutil.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-mercurial_scmutil.py:1.1
--- /dev/null   Mon Sep  3 12:46:59 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-mercurial_scmutil.py        Mon Sep  3 12:46:59 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-mercurial_scmutil.py,v 1.1 2018/09/03 12:46:59 joerg Exp $
+
+Upstream: d750a6c9248d
+Avoid quadratic behavior for pull/clone
+
+--- mercurial/scmutil.py.orig  2018-08-01 14:20:18.000000000 +0000
++++ mercurial/scmutil.py
+@@ -1565,7 +1565,10 @@ def registersummarycallback(repo, otr, t
+             """Report statistics of phase changes for changesets pre-existing
+             pull/unbundle.
+             """
+-            newrevs = tr.changes.get('revs', xrange(0, 0))
++            # TODO set() is only appropriate for 4.7 since revs post
++            # 45e05d39d9ce is a pycompat.membershiprange, which has O(n)
++            # membership testing.
++            newrevs = set(tr.changes.get('revs', xrange(0, 0)))
+             phasetracking = tr.changes.get('phases', {})
+             if not phasetracking:
+                 return
Index: pkgsrc/devel/py-mercurial/patches/patch-mercurial_util.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-mercurial_util.py:1.1
--- /dev/null   Mon Sep  3 12:46:59 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-mercurial_util.py   Mon Sep  3 12:46:59 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-mercurial_util.py,v 1.1 2018/09/03 12:46:59 joerg Exp $
+
+Upstream 1af95139e5ec:
+Avoid infinite loops during decompression for truncated input.
+
+--- mercurial/util.py.orig     2018-08-01 14:20:18.000000000 +0000
++++ mercurial/util.py
+@@ -3343,6 +3343,9 @@ class _CompressedStreamReader(object):
+                 return ''.join(buf)
+             chunk = self._reader(65536)
+             self._decompress(chunk)
++            if not chunk and not self._pending and not self._eof:
++                # No progress and no new data, bail out
++                return ''.join(buf)
+ 
+ class _GzipCompressedStreamReader(_CompressedStreamReader):
+     def __init__(self, fh):