CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Aug 15 14:04:42 UTC 2018

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile.version PLIST distinfo

Log Message:
Update Mercurial to 4.7:

- stop/abort/no-commit support for "graft"
- confirm/dry-run support for "rebase"
- "export" of bookmarked branches
- "acl" extension can support bookmarks
- optional word-diff support
- smarter parent selection for changes in merges by default
- sparse-revlog option to allow smaller manifests for very big
  repositories
- fix compression handling on ssh streams, noticable with pullbundles
- various other bugfixes


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/py-mercurial/Makefile.version
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/py-mercurial/distinfo

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.version
diff -u pkgsrc/devel/py-mercurial/Makefile.version:1.63 pkgsrc/devel/py-mercurial/Makefile.version:1.64
--- pkgsrc/devel/py-mercurial/Makefile.version:1.63     Tue Jul  3 05:03:12 2018
+++ pkgsrc/devel/py-mercurial/Makefile.version  Wed Aug 15 14:04:42 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.63 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile.version,v 1.64 2018/08/15 14:04:42 joerg Exp $
 
-VERSION=       4.6.1
+VERSION=       4.7
 
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 4.3
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.19 pkgsrc/devel/py-mercurial/PLIST:1.20
--- pkgsrc/devel/py-mercurial/PLIST:1.19        Sun May 20 10:23:02 2018
+++ pkgsrc/devel/py-mercurial/PLIST     Wed Aug 15 14:04:42 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/05/20 10:23:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2018/08/15 14:04:42 joerg Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -21,6 +21,9 @@ ${PYSITELIB}/hgext/amend.pyo
 ${PYSITELIB}/hgext/automv.py
 ${PYSITELIB}/hgext/automv.pyc
 ${PYSITELIB}/hgext/automv.pyo
+${PYSITELIB}/hgext/beautifygraph.py
+${PYSITELIB}/hgext/beautifygraph.pyc
+${PYSITELIB}/hgext/beautifygraph.pyo
 ${PYSITELIB}/hgext/blackbox.py
 ${PYSITELIB}/hgext/blackbox.pyc
 ${PYSITELIB}/hgext/blackbox.pyo
@@ -253,9 +256,6 @@ ${PYSITELIB}/hgext/narrow/narrowcopies.p
 ${PYSITELIB}/hgext/narrow/narrowdirstate.py
 ${PYSITELIB}/hgext/narrow/narrowdirstate.pyc
 ${PYSITELIB}/hgext/narrow/narrowdirstate.pyo
-${PYSITELIB}/hgext/narrow/narrowmerge.py
-${PYSITELIB}/hgext/narrow/narrowmerge.pyc
-${PYSITELIB}/hgext/narrow/narrowmerge.pyo
 ${PYSITELIB}/hgext/narrow/narrowpatch.py
 ${PYSITELIB}/hgext/narrow/narrowpatch.pyc
 ${PYSITELIB}/hgext/narrow/narrowpatch.pyo
@@ -455,6 +455,9 @@ ${PYSITELIB}/mercurial/destutil.pyo
 ${PYSITELIB}/mercurial/diffhelper.py
 ${PYSITELIB}/mercurial/diffhelper.pyc
 ${PYSITELIB}/mercurial/diffhelper.pyo
+${PYSITELIB}/mercurial/diffutil.py
+${PYSITELIB}/mercurial/diffutil.pyc
+${PYSITELIB}/mercurial/diffutil.pyo
 ${PYSITELIB}/mercurial/dirstate.py
 ${PYSITELIB}/mercurial/dirstate.pyc
 ${PYSITELIB}/mercurial/dirstate.pyo
@@ -509,6 +512,7 @@ ${PYSITELIB}/mercurial/help/color.txt
 ${PYSITELIB}/mercurial/help/common.txt
 ${PYSITELIB}/mercurial/help/config.txt
 ${PYSITELIB}/mercurial/help/dates.txt
+${PYSITELIB}/mercurial/help/deprecated.txt
 ${PYSITELIB}/mercurial/help/diffs.txt
 ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
@@ -772,6 +776,9 @@ ${PYSITELIB}/mercurial/sslutil.pyo
 ${PYSITELIB}/mercurial/stack.py
 ${PYSITELIB}/mercurial/stack.pyc
 ${PYSITELIB}/mercurial/stack.pyo
+${PYSITELIB}/mercurial/state.py
+${PYSITELIB}/mercurial/state.pyc
+${PYSITELIB}/mercurial/state.pyo
 ${PYSITELIB}/mercurial/statichttprepo.py
 ${PYSITELIB}/mercurial/statichttprepo.pyc
 ${PYSITELIB}/mercurial/statichttprepo.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.66 pkgsrc/devel/py-mercurial/distinfo:1.67
--- pkgsrc/devel/py-mercurial/distinfo:1.66     Sun Jun 17 11:24:12 2018
+++ pkgsrc/devel/py-mercurial/distinfo  Wed Aug 15 14:04:42 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.66 2018/06/17 11:24:12 wiz Exp $
+$NetBSD: distinfo,v 1.67 2018/08/15 14:04:42 joerg Exp $
 
-SHA1 (mercurial-4.6.1.tar.gz) = df2bb1487e6a64c7321a93767baf43c6ca1e9b5f
-RMD160 (mercurial-4.6.1.tar.gz) = a9dd32a52d7b46f81d27d89625004b8f09c83552
-SHA512 (mercurial-4.6.1.tar.gz) = 0c7737ca803691b135b4906cc527b20595e314009096d8a19f37814ee192b182e7c5360fbf993f632d6071da1f9fca38677e7190c14ed92bafa8add72a4a27d9
-Size (mercurial-4.6.1.tar.gz) = 6407380 bytes
+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