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: Sun, 2 Dec 2018 12:38:36 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec  2 12:38:36 UTC 2018

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

Log Message:
py-mercurial: update to 4.8.

Two new test failures, reported upstream.

Mercurial 4.8 release

This is an overview of 4.8 release.

1. New Features

    Command templates (aka formatter templates) are stabilized. See hg help <command> -v for details.
    New closehead extension to close arbitrary heads without checking them out.

    New config option commands.resolve.mark-check to warn or abort on resolve --mark when files still have conflict markers

    New config option commands.resolve.confirm to confirm before performing action when no filename is passed.

    Rebase gets new --stop flag to stop interrupted rebase without discarding the already rebased changes.

2. New Experimental Features

    New absorb extension to make working changes "absorbed" into relevant changesets.

        Read more about this feature at https://gregoryszorc.com/blog/2018/11/05/absorbing-commit-changes-in-mercurial-4.8/

    New fastannotate extension to greatly speed up "annotate" with precomputed cache and adding new flags like --deleted.
    The phabricator extension gets into hgext.

3. Other Notable Features

    New http.timeout config option to specify timeout in seconds.

    Several performance optimizations on fileset query.
    Sort out command help by categories.
    Storage extensions such as lfs are now loaded on demand.
    Improvements to zsh completions:
        Completing files, shelve and unshelve commands
        Completing merge tools
        Completing added and removed (in addition to changed) files to commit and diff commands
        Numerous updates to flags and descriptions
        Fixes for minor issues and a couple of performance improvements

4. Bug Fixes

    revlog: reuse cached delta for identical base revision (issue5975)
        This was a performance regression on unbundle in 4.7. Not reusing the delta from the bundle can have a significant performance impact, so we now make sure to do so when possible.

    ancestors: actually iterate over ancestors in topological order (issue5979)
        revlog.ancestors was noticed to sometimes emit nodes before their descendants, contrary to what the docstring said.

    overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
        With rebase.experimental.inmemory, changing a file from +x to -x or vice versa, with no content changes, could produce an exception.

5. Backwards Compatibility Changes

    The experimental narrow extension has undergone perf and correctness improvements, bug fixes and introducing new capabilities to make it more robust. It's expected that narrow clients with new 
mercurial version won't be able to interact with narrow server using older version of mercurial. It is recommended to update both client and server versions if you are using narrow for improvements.
    Emails from the patchbomb extension will always be printed as though they are iso-8859-1 if they're not valid us-ascii. Previously, previewed emails were always claimed to be us-ascii and might 
contain invalid byte sequences.
    'hg debugdata' no longer accepts the path to a revlog file.
    Bulk-renaming of the formatter template keywords:
        "{abspath}" and "{file}" to "{path}". Any "{path}" is a repository-absolute path. Use "{path|relpath}" to convert it to a filesystem path.
        "{copy}" in status command to "{source}".
        "{oldhashes}" and "{newhashes}" in journal template to "{oldnodes}" and "{newnodes}" respectively.
        "{line_number}" to "{lineno}".
        "{status}" of resolve command to "{mergestatus}".

    A repository will no longer use shared storage if it has a ".hg/sharedpath" file but no entry in ".hg/requires" saying it is shared.
    This change should not have any end-user impact, as all shared repos should have a ".hg/requires" file indicating this.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/py-mercurial/Makefile.version
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.1 -r0 \
    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.24 pkgsrc/devel/py-mercurial/Makefile:1.25
--- pkgsrc/devel/py-mercurial/Makefile:1.24     Mon Sep  3 12:46:59 2018
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Dec  2 12:38:36 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2018/09/03 12:46:59 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2018/12/02 12:38:36 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 
@@ -25,8 +24,10 @@ INSTALLATION_DIRS+=  share/doc/mercurial
 .include "Makefile.version"
 
 # Known test failures:
-# test-status-color.t:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=5698
+# test-https.t:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6030
+# test-encoding-align.t:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6031
 do-test:
        cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 

Index: pkgsrc/devel/py-mercurial/Makefile.version
diff -u pkgsrc/devel/py-mercurial/Makefile.version:1.64 pkgsrc/devel/py-mercurial/Makefile.version:1.65
--- pkgsrc/devel/py-mercurial/Makefile.version:1.64     Wed Aug 15 14:04:42 2018
+++ pkgsrc/devel/py-mercurial/Makefile.version  Sun Dec  2 12:38:36 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.64 2018/08/15 14:04:42 joerg Exp $
+# $NetBSD: Makefile.version,v 1.65 2018/12/02 12:38:36 wiz Exp $
 
-VERSION=       4.7
+VERSION=       4.8
 
 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.20 pkgsrc/devel/py-mercurial/PLIST:1.21
--- pkgsrc/devel/py-mercurial/PLIST:1.20        Wed Aug 15 14:04:42 2018
+++ pkgsrc/devel/py-mercurial/PLIST     Sun Dec  2 12:38:36 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2018/08/15 14:04:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2018/12/02 12:38:36 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -9,9 +9,15 @@ ${PYSITELIB}/hgdemandimport/demandimport
 ${PYSITELIB}/hgdemandimport/demandimportpy3.py
 ${PYSITELIB}/hgdemandimport/demandimportpy3.pyc
 ${PYSITELIB}/hgdemandimport/demandimportpy3.pyo
+${PYSITELIB}/hgdemandimport/tracing.py
+${PYSITELIB}/hgdemandimport/tracing.pyc
+${PYSITELIB}/hgdemandimport/tracing.pyo
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
 ${PYSITELIB}/hgext/__init__.pyo
+${PYSITELIB}/hgext/absorb.py
+${PYSITELIB}/hgext/absorb.pyc
+${PYSITELIB}/hgext/absorb.pyo
 ${PYSITELIB}/hgext/acl.py
 ${PYSITELIB}/hgext/acl.pyc
 ${PYSITELIB}/hgext/acl.pyo
@@ -42,6 +48,9 @@ ${PYSITELIB}/hgext/churn.pyo
 ${PYSITELIB}/hgext/clonebundles.py
 ${PYSITELIB}/hgext/clonebundles.pyc
 ${PYSITELIB}/hgext/clonebundles.pyo
+${PYSITELIB}/hgext/closehead.py
+${PYSITELIB}/hgext/closehead.pyc
+${PYSITELIB}/hgext/closehead.pyo
 ${PYSITELIB}/hgext/commitextras.py
 ${PYSITELIB}/hgext/commitextras.pyc
 ${PYSITELIB}/hgext/commitextras.pyo
@@ -99,6 +108,30 @@ ${PYSITELIB}/hgext/extdiff.pyo
 ${PYSITELIB}/hgext/factotum.py
 ${PYSITELIB}/hgext/factotum.pyc
 ${PYSITELIB}/hgext/factotum.pyo
+${PYSITELIB}/hgext/fastannotate/__init__.py
+${PYSITELIB}/hgext/fastannotate/__init__.pyc
+${PYSITELIB}/hgext/fastannotate/__init__.pyo
+${PYSITELIB}/hgext/fastannotate/commands.py
+${PYSITELIB}/hgext/fastannotate/commands.pyc
+${PYSITELIB}/hgext/fastannotate/commands.pyo
+${PYSITELIB}/hgext/fastannotate/context.py
+${PYSITELIB}/hgext/fastannotate/context.pyc
+${PYSITELIB}/hgext/fastannotate/context.pyo
+${PYSITELIB}/hgext/fastannotate/error.py
+${PYSITELIB}/hgext/fastannotate/error.pyc
+${PYSITELIB}/hgext/fastannotate/error.pyo
+${PYSITELIB}/hgext/fastannotate/formatter.py
+${PYSITELIB}/hgext/fastannotate/formatter.pyc
+${PYSITELIB}/hgext/fastannotate/formatter.pyo
+${PYSITELIB}/hgext/fastannotate/protocol.py
+${PYSITELIB}/hgext/fastannotate/protocol.pyc
+${PYSITELIB}/hgext/fastannotate/protocol.pyo
+${PYSITELIB}/hgext/fastannotate/revmap.py
+${PYSITELIB}/hgext/fastannotate/revmap.pyc
+${PYSITELIB}/hgext/fastannotate/revmap.pyo
+${PYSITELIB}/hgext/fastannotate/support.py
+${PYSITELIB}/hgext/fastannotate/support.pyc
+${PYSITELIB}/hgext/fastannotate/support.pyo
 ${PYSITELIB}/hgext/fetch.py
 ${PYSITELIB}/hgext/fetch.pyc
 ${PYSITELIB}/hgext/fetch.pyo
@@ -244,27 +277,15 @@ ${PYSITELIB}/hgext/narrow/__init__.pyo
 ${PYSITELIB}/hgext/narrow/narrowbundle2.py
 ${PYSITELIB}/hgext/narrow/narrowbundle2.pyc
 ${PYSITELIB}/hgext/narrow/narrowbundle2.pyo
-${PYSITELIB}/hgext/narrow/narrowchangegroup.py
-${PYSITELIB}/hgext/narrow/narrowchangegroup.pyc
-${PYSITELIB}/hgext/narrow/narrowchangegroup.pyo
 ${PYSITELIB}/hgext/narrow/narrowcommands.py
 ${PYSITELIB}/hgext/narrow/narrowcommands.pyc
 ${PYSITELIB}/hgext/narrow/narrowcommands.pyo
-${PYSITELIB}/hgext/narrow/narrowcopies.py
-${PYSITELIB}/hgext/narrow/narrowcopies.pyc
-${PYSITELIB}/hgext/narrow/narrowcopies.pyo
 ${PYSITELIB}/hgext/narrow/narrowdirstate.py
 ${PYSITELIB}/hgext/narrow/narrowdirstate.pyc
 ${PYSITELIB}/hgext/narrow/narrowdirstate.pyo
-${PYSITELIB}/hgext/narrow/narrowpatch.py
-${PYSITELIB}/hgext/narrow/narrowpatch.pyc
-${PYSITELIB}/hgext/narrow/narrowpatch.pyo
 ${PYSITELIB}/hgext/narrow/narrowrepo.py
 ${PYSITELIB}/hgext/narrow/narrowrepo.pyc
 ${PYSITELIB}/hgext/narrow/narrowrepo.pyo
-${PYSITELIB}/hgext/narrow/narrowrevlog.py
-${PYSITELIB}/hgext/narrow/narrowrevlog.pyc
-${PYSITELIB}/hgext/narrow/narrowrevlog.pyo
 ${PYSITELIB}/hgext/narrow/narrowtemplates.py
 ${PYSITELIB}/hgext/narrow/narrowtemplates.pyc
 ${PYSITELIB}/hgext/narrow/narrowtemplates.pyo
@@ -280,6 +301,9 @@ ${PYSITELIB}/hgext/pager.pyo
 ${PYSITELIB}/hgext/patchbomb.py
 ${PYSITELIB}/hgext/patchbomb.pyc
 ${PYSITELIB}/hgext/patchbomb.pyo
+${PYSITELIB}/hgext/phabricator.py
+${PYSITELIB}/hgext/phabricator.pyc
+${PYSITELIB}/hgext/phabricator.pyo
 ${PYSITELIB}/hgext/purge.py
 ${PYSITELIB}/hgext/purge.pyc
 ${PYSITELIB}/hgext/purge.pyo
@@ -316,6 +340,9 @@ ${PYSITELIB}/hgext/sparse.pyo
 ${PYSITELIB}/hgext/split.py
 ${PYSITELIB}/hgext/split.pyc
 ${PYSITELIB}/hgext/split.pyo
+${PYSITELIB}/hgext/sqlitestore.py
+${PYSITELIB}/hgext/sqlitestore.pyc
+${PYSITELIB}/hgext/sqlitestore.pyo
 ${PYSITELIB}/hgext/strip.py
 ${PYSITELIB}/hgext/strip.pyc
 ${PYSITELIB}/hgext/strip.pyo
@@ -442,9 +469,6 @@ ${PYSITELIB}/mercurial/dagop.pyo
 ${PYSITELIB}/mercurial/dagparser.py
 ${PYSITELIB}/mercurial/dagparser.pyc
 ${PYSITELIB}/mercurial/dagparser.pyo
-${PYSITELIB}/mercurial/dagutil.py
-${PYSITELIB}/mercurial/dagutil.pyc
-${PYSITELIB}/mercurial/dagutil.pyo
 ${PYSITELIB}/mercurial/debugcommands.py
 ${PYSITELIB}/mercurial/debugcommands.pyc
 ${PYSITELIB}/mercurial/debugcommands.pyo
@@ -480,6 +504,9 @@ ${PYSITELIB}/mercurial/error.pyo
 ${PYSITELIB}/mercurial/exchange.py
 ${PYSITELIB}/mercurial/exchange.pyc
 ${PYSITELIB}/mercurial/exchange.pyo
+${PYSITELIB}/mercurial/exchangev2.py
+${PYSITELIB}/mercurial/exchangev2.pyc
+${PYSITELIB}/mercurial/exchangev2.pyo
 ${PYSITELIB}/mercurial/extensions.py
 ${PYSITELIB}/mercurial/extensions.pyc
 ${PYSITELIB}/mercurial/extensions.pyo
@@ -495,6 +522,9 @@ ${PYSITELIB}/mercurial/filemerge.pyo
 ${PYSITELIB}/mercurial/fileset.py
 ${PYSITELIB}/mercurial/fileset.pyc
 ${PYSITELIB}/mercurial/fileset.pyo
+${PYSITELIB}/mercurial/filesetlang.py
+${PYSITELIB}/mercurial/filesetlang.pyc
+${PYSITELIB}/mercurial/filesetlang.pyo
 ${PYSITELIB}/mercurial/formatter.py
 ${PYSITELIB}/mercurial/formatter.pyc
 ${PYSITELIB}/mercurial/formatter.pyo
@@ -527,12 +557,16 @@ ${PYSITELIB}/mercurial/help/hgrc.5.txt
 ${PYSITELIB}/mercurial/help/hgweb.txt
 ${PYSITELIB}/mercurial/help/internals/bundle2.txt
 ${PYSITELIB}/mercurial/help/internals/bundles.txt
+${PYSITELIB}/mercurial/help/internals/cbor.txt
 ${PYSITELIB}/mercurial/help/internals/censor.txt
 ${PYSITELIB}/mercurial/help/internals/changegroups.txt
 ${PYSITELIB}/mercurial/help/internals/config.txt
+${PYSITELIB}/mercurial/help/internals/linelog.txt
 ${PYSITELIB}/mercurial/help/internals/requirements.txt
 ${PYSITELIB}/mercurial/help/internals/revlogs.txt
 ${PYSITELIB}/mercurial/help/internals/wireprotocol.txt
+${PYSITELIB}/mercurial/help/internals/wireprotocolrpc.txt
+${PYSITELIB}/mercurial/help/internals/wireprotocolv2.txt
 ${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/pager.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
@@ -590,6 +624,9 @@ ${PYSITELIB}/mercurial/i18n.pyo
 ${PYSITELIB}/mercurial/keepalive.py
 ${PYSITELIB}/mercurial/keepalive.pyc
 ${PYSITELIB}/mercurial/keepalive.pyo
+${PYSITELIB}/mercurial/linelog.py
+${PYSITELIB}/mercurial/linelog.pyc
+${PYSITELIB}/mercurial/linelog.pyo
 ${PYSITELIB}/mercurial/locale/da/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/de/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/el/LC_MESSAGES/hg.mo
@@ -731,6 +768,15 @@ ${PYSITELIB}/mercurial/repoview.pyo
 ${PYSITELIB}/mercurial/revlog.py
 ${PYSITELIB}/mercurial/revlog.pyc
 ${PYSITELIB}/mercurial/revlog.pyo
+${PYSITELIB}/mercurial/revlogutils/__init__.py
+${PYSITELIB}/mercurial/revlogutils/__init__.pyc
+${PYSITELIB}/mercurial/revlogutils/__init__.pyo
+${PYSITELIB}/mercurial/revlogutils/constants.py
+${PYSITELIB}/mercurial/revlogutils/constants.pyc
+${PYSITELIB}/mercurial/revlogutils/constants.pyo
+${PYSITELIB}/mercurial/revlogutils/deltas.py
+${PYSITELIB}/mercurial/revlogutils/deltas.pyc
+${PYSITELIB}/mercurial/revlogutils/deltas.pyo
 ${PYSITELIB}/mercurial/revset.py
 ${PYSITELIB}/mercurial/revset.pyc
 ${PYSITELIB}/mercurial/revset.pyo
@@ -980,6 +1026,12 @@ ${PYSITELIB}/mercurial/templates/static/
 ${PYSITELIB}/mercurial/templateutil.py
 ${PYSITELIB}/mercurial/templateutil.pyc
 ${PYSITELIB}/mercurial/templateutil.pyo
+${PYSITELIB}/mercurial/testing/__init__.py
+${PYSITELIB}/mercurial/testing/__init__.pyc
+${PYSITELIB}/mercurial/testing/__init__.pyo
+${PYSITELIB}/mercurial/testing/storage.py
+${PYSITELIB}/mercurial/testing/storage.pyc
+${PYSITELIB}/mercurial/testing/storage.pyo
 ${PYSITELIB}/mercurial/thirdparty/__init__.py
 ${PYSITELIB}/mercurial/thirdparty/__init__.pyc
 ${PYSITELIB}/mercurial/thirdparty/__init__.pyo
@@ -1131,6 +1183,9 @@ ${PYSITELIB}/mercurial/utils/interfaceut
 ${PYSITELIB}/mercurial/utils/procutil.py
 ${PYSITELIB}/mercurial/utils/procutil.pyc
 ${PYSITELIB}/mercurial/utils/procutil.pyo
+${PYSITELIB}/mercurial/utils/storageutil.py
+${PYSITELIB}/mercurial/utils/storageutil.pyc
+${PYSITELIB}/mercurial/utils/storageutil.pyo
 ${PYSITELIB}/mercurial/utils/stringutil.py
 ${PYSITELIB}/mercurial/utils/stringutil.pyc
 ${PYSITELIB}/mercurial/utils/stringutil.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.68 pkgsrc/devel/py-mercurial/distinfo:1.69
--- pkgsrc/devel/py-mercurial/distinfo:1.68     Mon Sep  3 12:46:59 2018
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Dec  2 12:38:36 2018
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.68 2018/09/03 12:46:59 joerg Exp $
+$NetBSD: distinfo,v 1.69 2018/12/02 12:38:36 wiz 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
+SHA1 (mercurial-4.8.tar.gz) = b8aa774be623381fc27b34b1eacef45f6189449f
+RMD160 (mercurial-4.8.tar.gz) = 573b9c84806e83d9a7d6948d7e905b90df10e597
+SHA512 (mercurial-4.8.tar.gz) = 83be5119355da6e43635a8ada3c152420314e72c4a7b98717ac8b5feb628f3ce96c0ca137cb4a624d441e4f800d9ca78ada3351ca403815c06ab151cc720077d
+Size (mercurial-4.8.tar.gz) = 6865809 bytes

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