[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 5.4.

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 5.4.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Tue, 05 May 2020 13:07:18 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d162d1bd6f8
branches:  trunk
changeset: 430871:6d162d1bd6f8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 05 12:12:47 2020 +0000

description:
py-mercurial: update to 5.4.

Add links to bug reports about test failures.

I think these are the news:

== New Features ==

 * `hg purge`/`hg clean` can now delete ignored files instead of
   untracked files, with the new -i flag.

 * `hg pull` now has a `--confirm` flag to prompt before applying changes.
   Config option `pull.confirm` is also added for that.

 * `hg log` now defaults to using an '%' symbol for commits involved
    in unresolved merge conflicts. That includes unresolved conflicts
    caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
    precedence, so what used to be marked '@' still is.

 * New `conflictlocal()` and `conflictother()` revsets return the
   commits that are being merged, when there are conflicts. Also works
   for conflicts caused by e.g. `hg graft`.

 * `hg copy --forget` can be used to unmark a file as copied.

 * The `format.revlog-compression` configuration entry now accept a list. The
   first available option will be used. for example setting::

     [format]
     revlog-compression=zstd, zlib

   Will use `zstd` compression for new repositories is available, and will
   simply fall back to `zlib` if not.

 * `hg debugmergestate` output is now templated, which may be useful
   e.g. for IDEs that want to help the user resolve merge conflicts.


== New Experimental Features ==

 * `hg copy` now supports a `--at-rev` argument to mark files as
   copied in the specified commit. It only works with `--after` for
   now (i.e., it's only useful for marking files copied using non-hg
   `cp` as copied).

 * Use `hg copy --forget --at-rev REV` to unmark already committed
   copies.

== Bug Fixes  ==

 * Fix server exception when concurrent pushes delete the same bookmark

 * Prevent pushes of divergent bookmarks (foo@remote)

 * The push error "remote repository changed while pushing - please
   try again" now only happens when a concurrent push changed related
   heads (instead of when a concurrent pushed any revision).


== Backwards Compatibility Changes ==

 * When `hg rebase` pauses for merge conflict resolution, the working
   copy will no longer have the rebased node as a second parent. You
   can use the new `conflictparents()` revset for finding the other
   parent during a conflict.

 * `hg rebase` now accepts repeated `--source` and `--base`
   arguments. For example, `hg rebase --source 'A + B'` is equivalent
   to `hg rebase --source A --source B`. This is a
   backwards-incompatible change because it will break overriding an
   alias `myrebase = rebase --source A` by `hg myrebase --source B`
   (it will now rebase `(A + B)::` instead of `B::`).

 * `hg recover` does not verify the validity of the whole repository
   anymore. You can pass `--verify` or call `hg verify` if necessary.

 * `hg debugmergestate` output format changed. Let us know if that is
   causing you problems and we'll roll it back.

 * Resolved merge conflicts are now cleared by `hg commit` even if the
   working copy has no changes.


== Internal API Changes ==

 * The deprecated `ui.progress()` has now been deleted. Please use
   `ui.makeprogress()` instead.

 * `hg.merge()` now takes a `ctx` instead of the previous `repo` and
   `node` arguments.

 * `hg.merge()` has lost its `abort` argument. Please call
   `hg.abortmerge()` directly instead.

 * `hg.merge()` has lost its `mergeforce` argument. It should have
   only ever been called with the same value as the `force` argument.

 * The `*others` argument of `cmdutil.check_incompatible_arguments()`
   changed from being varargs argument to being a single collection.

diffstat:

 devel/py-mercurial/Makefile   |  11 +++++++----
 devel/py-mercurial/PLIST      |  41 ++++++++++++++++++++++++++++++++++++++++-
 devel/py-mercurial/distinfo   |  10 +++++-----
 devel/py-mercurial/version.mk |   4 ++--
 4 files changed, 54 insertions(+), 12 deletions(-)

diffs (118 lines):

diff -r 90468efe8e23 -r 6d162d1bd6f8 devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile       Tue May 05 12:02:59 2020 +0000
+++ b/devel/py-mercurial/Makefile       Tue May 05 12:12:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2020/02/07 07:37:45 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2020/05/05 12:12:47 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -26,9 +26,12 @@
 
 .include "version.mk"
 
-# Known test failures:
-# none as of 5.2.2
-# Ran 820 tests, 76 skipped, 0 failed.
+# Known test failures as of 5.4:
+# test-persistent-nodemap
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6320
+# test-doctest:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6320
+# Ran 841 tests, 78 skipped, 2 failed.
 do-test:
        cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 
diff -r 90468efe8e23 -r 6d162d1bd6f8 devel/py-mercurial/PLIST
--- a/devel/py-mercurial/PLIST  Tue May 05 12:02:59 2020 +0000
+++ b/devel/py-mercurial/PLIST  Tue May 05 12:12:47 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/02/09 14:59:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/05/05 12:12:47 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -135,6 +135,9 @@
 ${PYSITELIB}/hgext/fastannotate/support.py
 ${PYSITELIB}/hgext/fastannotate/support.pyc
 ${PYSITELIB}/hgext/fastannotate/support.pyo
+${PYSITELIB}/hgext/fastexport.py
+${PYSITELIB}/hgext/fastexport.pyc
+${PYSITELIB}/hgext/fastexport.pyo
 ${PYSITELIB}/hgext/fetch.py
 ${PYSITELIB}/hgext/fetch.pyc
 ${PYSITELIB}/hgext/fetch.pyo
@@ -169,6 +172,24 @@
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.py
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyc
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyo
+${PYSITELIB}/hgext/git/__init__.py
+${PYSITELIB}/hgext/git/__init__.pyc
+${PYSITELIB}/hgext/git/__init__.pyo
+${PYSITELIB}/hgext/git/dirstate.py
+${PYSITELIB}/hgext/git/dirstate.pyc
+${PYSITELIB}/hgext/git/dirstate.pyo
+${PYSITELIB}/hgext/git/gitlog.py
+${PYSITELIB}/hgext/git/gitlog.pyc
+${PYSITELIB}/hgext/git/gitlog.pyo
+${PYSITELIB}/hgext/git/gitutil.py
+${PYSITELIB}/hgext/git/gitutil.pyc
+${PYSITELIB}/hgext/git/gitutil.pyo
+${PYSITELIB}/hgext/git/index.py
+${PYSITELIB}/hgext/git/index.pyc
+${PYSITELIB}/hgext/git/index.pyo
+${PYSITELIB}/hgext/git/manifest.py
+${PYSITELIB}/hgext/git/manifest.pyc
+${PYSITELIB}/hgext/git/manifest.pyo
 ${PYSITELIB}/hgext/githelp.py
 ${PYSITELIB}/hgext/githelp.pyc
 ${PYSITELIB}/hgext/githelp.pyo
@@ -190,6 +211,24 @@
 ${PYSITELIB}/hgext/histedit.py
 ${PYSITELIB}/hgext/histedit.pyc
 ${PYSITELIB}/hgext/histedit.pyo
+${PYSITELIB}/hgext/hooklib/__init__.py
+${PYSITELIB}/hgext/hooklib/__init__.pyc
+${PYSITELIB}/hgext/hooklib/__init__.pyo
+${PYSITELIB}/hgext/hooklib/changeset_obsoleted.py
+${PYSITELIB}/hgext/hooklib/changeset_obsoleted.pyc
+${PYSITELIB}/hgext/hooklib/changeset_obsoleted.pyo
+${PYSITELIB}/hgext/hooklib/changeset_published.py
+${PYSITELIB}/hgext/hooklib/changeset_published.pyc
+${PYSITELIB}/hgext/hooklib/changeset_published.pyo
+${PYSITELIB}/hgext/hooklib/enforce_draft_commits.py
+${PYSITELIB}/hgext/hooklib/enforce_draft_commits.pyc
+${PYSITELIB}/hgext/hooklib/enforce_draft_commits.pyo
+${PYSITELIB}/hgext/hooklib/reject_merge_commits.py
+${PYSITELIB}/hgext/hooklib/reject_merge_commits.pyc
+${PYSITELIB}/hgext/hooklib/reject_merge_commits.pyo
+${PYSITELIB}/hgext/hooklib/reject_new_heads.py
+${PYSITELIB}/hgext/hooklib/reject_new_heads.pyc
+${PYSITELIB}/hgext/hooklib/reject_new_heads.pyo
 ${PYSITELIB}/hgext/infinitepush/__init__.py
 ${PYSITELIB}/hgext/infinitepush/__init__.pyc
 ${PYSITELIB}/hgext/infinitepush/__init__.pyo
diff -r 90468efe8e23 -r 6d162d1bd6f8 devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Tue May 05 12:02:59 2020 +0000
+++ b/devel/py-mercurial/distinfo       Tue May 05 12:12:47 2020 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86 2020/04/06 10:27:31 wiz Exp $
+$NetBSD: distinfo,v 1.87 2020/05/05 12:12:47 wiz Exp $
 
-SHA1 (mercurial-5.3.2.tar.gz) = 2d1024a6f5861f3bb49b21626228886ca6b72d03
-RMD160 (mercurial-5.3.2.tar.gz) = 041c8640ae6bfbaf077ef9c668fe6b2b6b8595c3
-SHA512 (mercurial-5.3.2.tar.gz) = b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
-Size (mercurial-5.3.2.tar.gz) = 7514256 bytes
+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
diff -r 90468efe8e23 -r 6d162d1bd6f8 devel/py-mercurial/version.mk
--- a/devel/py-mercurial/version.mk     Tue May 05 12:02:59 2020 +0000
+++ b/devel/py-mercurial/version.mk     Tue May 05 12:12:47 2020 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.13 2020/04/06 10:27:31 wiz Exp $
+# $NetBSD: version.mk,v 1.14 2020/05/05 12:12:47 wiz Exp $
 
-VERSION=       5.3.2
+VERSION=       5.4
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/py-mercurial to 5.4
Next by Date: [pkgsrc/trunk]: pkgsrc/print tex-[t-z]*: update to texlive 2020 package versions
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/py-mercurial to 5.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/print tex-[t-z]*: update to texlive 2020 package versions
Indexes:
Home | Main Index | Thread Index | Old Index