diff options
author | wiz <wiz@pkgsrc.org> | 2017-11-07 13:16:07 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-11-07 13:16:07 +0000 |
commit | 270710bde6587ad2ae2ace17d39226bee379c570 (patch) | |
tree | 096b5a40f34964edb6ffb96e380199bdad9090a9 | |
parent | 8b95d17d65425cb449122ec54176df3193247eb9 (diff) | |
download | pkgsrc-270710bde6587ad2ae2ace17d39226bee379c570.tar.gz |
py-mercurial: update to 4.4.
Mercurial 4.4 (2017-11-01)
1.1. Notable changes
1.1.1. Control whitespace settings for annotation on hgweb
/annotate URLs on hgweb now accept query string arguments to influence how whitespace changes impact results.
The arguments "ignorews," "ignorewsamount," "ignorewseol," and "ignoreblanklines" now have the same meaning as their [annotate] config section counterparts. Any provided setting overrides the server default.
HTML checkboxes have been added to the paper and gitweb themes to expose current whitespace settings and to easily modify the current view.
1.1.2. Fast, heuristic copy-tracing
A new fast heuristic algorithm for copytracing which assumes that the files moves are either:
renames in the same directory
moves in other directories with same names
You can use this algorithm by setting 'experimental.copytrace=heuristics'. This setting performs full copytracing if both source and destination branches contains non-public changesets only.
1.1.3. Other changes
Estimated time is more accurate with non-linear progress
"hg status -v" can now show unfinished state. For example, when in an unfinished rebase state, "hg status -v" might show:
# The repository is in an unfinished *rebase* state.
# No unresolved merge conflicts.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
Added '--ignore-space-at-eol' diff option to ignore whitespace differences at line endings.
show: use consistent node length in views
show: decrease minimum displayed hash length from 5 to 4
A new uncommit extension which provides 'hg uncommit' using which one can uncommit part or all of the changeset. This command undoes the effect of a local commit, returning the affected files to their uncommitted state.
'hg clone --uncompressed' uses clone bundles when possible
'hg annotate --skip' now prints a '*' on lines with skipped revisions
New 'commands.update.check' feature to adjust constraints on when 'hg update' will allow updates with a dirty working copy.
Add an experimental -L/--line-range FILE,FROMLINE:TOLINE option to 'hg log' command to follow the history of files by line range. In combination with -p/--patch option, only diff hunks within specified line range will be displayed. Feedback, especially on UX aspects, is welcome.
Print warning when fsmonitor isn't being used on a large repository
1.2. Backwards Compatibility Changes
The config option for copytrace 'experimental.disablecopytrace' is now replaced with 'experimental.copytrace' which defaults to 'on'. If you need to turn off copytracing, add '[experimental] copytrace = off' to your config.
'hg clone --stream' should now be used instead of --uncompressed. --uncompressed is marked as deprecated and is an alias for --stream. There is no schedule for elimination of --uncompressed.
The 'experimental.updatecheck' name for the new 'commands.update.check' feature is now deprecated, and will be removed after this release.
Mercurial subrepositories are now shared instead of cloned when the parent repository is shared. This prevents dangling subrepository references in the share source. Previously shared repositories with cloned subrepositories will continue to function unchanged.
Push no longer triggers a pushkey hook when updating phases. Use the new 'txnclose-phase' and 'txnclose-phase' hooks instead. (Applies when both server and client use version 4.4 or above).
1.3. Bug Fixes
Core rebase algorithm has been rewritten to be more robust (issue5578, issue5630)
Creating a share of a repository with a Mercurial subrepository will now share the subrepository (issue5675)
1.4. Performance Improvements
improved performance when many aliases are defined
1.5. API Changes
1.5.1. remove peer.batch()
Replace with peer.iterbatch().
1.5.2. Other Changes
@peer.batchable can no longer emit local values
@peer.batchable functions must now yield exactly 2 values
Rename attributes on sshpeer to reflect peer API
peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository.
revset.stringset() now takes 'order' as the last argument.
-rw-r--r-- | devel/py-mercurial/Makefile | 4 | ||||
-rw-r--r-- | devel/py-mercurial/Makefile.version | 4 | ||||
-rw-r--r-- | devel/py-mercurial/PLIST | 56 | ||||
-rw-r--r-- | devel/py-mercurial/distinfo | 11 |
4 files changed, 54 insertions, 21 deletions
diff --git a/devel/py-mercurial/Makefile b/devel/py-mercurial/Makefile index 46796565a8b..63db10c34c5 100644 --- a/devel/py-mercurial/Makefile +++ b/devel/py-mercurial/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/10/05 22:32:50 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2017/11/07 13:16:07 wiz Exp $ DISTNAME= mercurial-${VERSION} PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -32,7 +32,7 @@ do-test: post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 - ${INSTALL_DATA} ${WRKSRC}/README \ + ${INSTALL_DATA} ${WRKSRC}/README.rst \ ${DESTDIR}${PREFIX}/share/doc/mercurial .include "../../lang/python/distutils.mk" diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version index 585a2d2d645..376e3e195a4 100644 --- a/devel/py-mercurial/Makefile.version +++ b/devel/py-mercurial/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.52 2017/10/02 12:11:20 wiz Exp $ +# $NetBSD: Makefile.version,v 1.53 2017/11/07 13:16:07 wiz Exp $ -VERSION= 4.3.3 +VERSION= 4.4 PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 3.9 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions diff --git a/devel/py-mercurial/PLIST b/devel/py-mercurial/PLIST index 8057e0e8860..bcfcd99836e 100644 --- a/devel/py-mercurial/PLIST +++ b/devel/py-mercurial/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2017/08/14 01:31:56 maya Exp $ +@comment $NetBSD: PLIST,v 1.17 2017/11/07 13:16:07 wiz Exp $ bin/hg ${PYSITELIB}/hgdemandimport/__init__.py ${PYSITELIB}/hgdemandimport/__init__.pyc @@ -238,6 +238,9 @@ ${PYSITELIB}/hgext/strip.pyo ${PYSITELIB}/hgext/transplant.py ${PYSITELIB}/hgext/transplant.pyc ${PYSITELIB}/hgext/transplant.pyo +${PYSITELIB}/hgext/uncommit.py +${PYSITELIB}/hgext/uncommit.pyc +${PYSITELIB}/hgext/uncommit.pyo ${PYSITELIB}/hgext/win32mbcs.py ${PYSITELIB}/hgext/win32mbcs.pyc ${PYSITELIB}/hgext/win32mbcs.pyo @@ -296,18 +299,12 @@ ${PYSITELIB}/mercurial/cext/parsers.so ${PYSITELIB}/mercurial/cffi/__init__.py ${PYSITELIB}/mercurial/cffi/__init__.pyc ${PYSITELIB}/mercurial/cffi/__init__.pyo -${PYSITELIB}/mercurial/cffi/base85.py -${PYSITELIB}/mercurial/cffi/base85.pyc -${PYSITELIB}/mercurial/cffi/base85.pyo ${PYSITELIB}/mercurial/cffi/bdiff.py ${PYSITELIB}/mercurial/cffi/bdiff.pyc ${PYSITELIB}/mercurial/cffi/bdiff.pyo ${PYSITELIB}/mercurial/cffi/bdiffbuild.py ${PYSITELIB}/mercurial/cffi/bdiffbuild.pyc ${PYSITELIB}/mercurial/cffi/bdiffbuild.pyo -${PYSITELIB}/mercurial/cffi/diffhelpers.py -${PYSITELIB}/mercurial/cffi/diffhelpers.pyc -${PYSITELIB}/mercurial/cffi/diffhelpers.pyo ${PYSITELIB}/mercurial/cffi/mpatch.py ${PYSITELIB}/mercurial/cffi/mpatch.pyc ${PYSITELIB}/mercurial/cffi/mpatch.pyo @@ -320,9 +317,6 @@ ${PYSITELIB}/mercurial/cffi/osutil.pyo ${PYSITELIB}/mercurial/cffi/osutilbuild.py ${PYSITELIB}/mercurial/cffi/osutilbuild.pyc ${PYSITELIB}/mercurial/cffi/osutilbuild.pyo -${PYSITELIB}/mercurial/cffi/parsers.py -${PYSITELIB}/mercurial/cffi/parsers.pyc -${PYSITELIB}/mercurial/cffi/parsers.pyo ${PYSITELIB}/mercurial/changegroup.py ${PYSITELIB}/mercurial/changegroup.pyc ${PYSITELIB}/mercurial/changegroup.pyo @@ -443,6 +437,7 @@ ${PYSITELIB}/mercurial/help/hgweb.txt ${PYSITELIB}/mercurial/help/internals/bundles.txt ${PYSITELIB}/mercurial/help/internals/censor.txt ${PYSITELIB}/mercurial/help/internals/changegroups.txt +${PYSITELIB}/mercurial/help/internals/config.txt ${PYSITELIB}/mercurial/help/internals/requirements.txt ${PYSITELIB}/mercurial/help/internals/revlogs.txt ${PYSITELIB}/mercurial/help/internals/wireprotocol.txt @@ -602,6 +597,9 @@ ${PYSITELIB}/mercurial/pure/base85.pyo ${PYSITELIB}/mercurial/pure/bdiff.py ${PYSITELIB}/mercurial/pure/bdiff.pyc ${PYSITELIB}/mercurial/pure/bdiff.pyo +${PYSITELIB}/mercurial/pure/charencode.py +${PYSITELIB}/mercurial/pure/charencode.pyc +${PYSITELIB}/mercurial/pure/charencode.pyo ${PYSITELIB}/mercurial/pure/diffhelpers.py ${PYSITELIB}/mercurial/pure/diffhelpers.pyc ${PYSITELIB}/mercurial/pure/diffhelpers.pyo @@ -632,6 +630,9 @@ ${PYSITELIB}/mercurial/registrar.pyo ${PYSITELIB}/mercurial/repair.py ${PYSITELIB}/mercurial/repair.pyc ${PYSITELIB}/mercurial/repair.pyo +${PYSITELIB}/mercurial/repository.py +${PYSITELIB}/mercurial/repository.pyc +${PYSITELIB}/mercurial/repository.pyo ${PYSITELIB}/mercurial/repoview.py ${PYSITELIB}/mercurial/repoview.pyc ${PYSITELIB}/mercurial/repoview.pyo @@ -871,6 +872,36 @@ ${PYSITELIB}/mercurial/templates/static/style-gitweb.css ${PYSITELIB}/mercurial/templates/static/style-monoblue.css ${PYSITELIB}/mercurial/templates/static/style-paper.css ${PYSITELIB}/mercurial/templates/static/style.css +${PYSITELIB}/mercurial/thirdparty/__init__.py +${PYSITELIB}/mercurial/thirdparty/__init__.pyc +${PYSITELIB}/mercurial/thirdparty/__init__.pyo +${PYSITELIB}/mercurial/thirdparty/attr/__init__.py +${PYSITELIB}/mercurial/thirdparty/attr/__init__.pyc +${PYSITELIB}/mercurial/thirdparty/attr/__init__.pyo +${PYSITELIB}/mercurial/thirdparty/attr/_compat.py +${PYSITELIB}/mercurial/thirdparty/attr/_compat.pyc +${PYSITELIB}/mercurial/thirdparty/attr/_compat.pyo +${PYSITELIB}/mercurial/thirdparty/attr/_config.py +${PYSITELIB}/mercurial/thirdparty/attr/_config.pyc +${PYSITELIB}/mercurial/thirdparty/attr/_config.pyo +${PYSITELIB}/mercurial/thirdparty/attr/_funcs.py +${PYSITELIB}/mercurial/thirdparty/attr/_funcs.pyc +${PYSITELIB}/mercurial/thirdparty/attr/_funcs.pyo +${PYSITELIB}/mercurial/thirdparty/attr/_make.py +${PYSITELIB}/mercurial/thirdparty/attr/_make.pyc +${PYSITELIB}/mercurial/thirdparty/attr/_make.pyo +${PYSITELIB}/mercurial/thirdparty/attr/converters.py +${PYSITELIB}/mercurial/thirdparty/attr/converters.pyc +${PYSITELIB}/mercurial/thirdparty/attr/converters.pyo +${PYSITELIB}/mercurial/thirdparty/attr/exceptions.py +${PYSITELIB}/mercurial/thirdparty/attr/exceptions.pyc +${PYSITELIB}/mercurial/thirdparty/attr/exceptions.pyo +${PYSITELIB}/mercurial/thirdparty/attr/filters.py +${PYSITELIB}/mercurial/thirdparty/attr/filters.pyc +${PYSITELIB}/mercurial/thirdparty/attr/filters.pyo +${PYSITELIB}/mercurial/thirdparty/attr/validators.py +${PYSITELIB}/mercurial/thirdparty/attr/validators.pyc +${PYSITELIB}/mercurial/thirdparty/attr/validators.pyo ${PYSITELIB}/mercurial/transaction.py ${PYSITELIB}/mercurial/transaction.pyc ${PYSITELIB}/mercurial/transaction.pyo @@ -892,6 +923,9 @@ ${PYSITELIB}/mercurial/upgrade.pyo ${PYSITELIB}/mercurial/url.py ${PYSITELIB}/mercurial/url.pyc ${PYSITELIB}/mercurial/url.pyo +${PYSITELIB}/mercurial/urllibcompat.py +${PYSITELIB}/mercurial/urllibcompat.pyc +${PYSITELIB}/mercurial/urllibcompat.pyo ${PYSITELIB}/mercurial/util.py ${PYSITELIB}/mercurial/util.pyc ${PYSITELIB}/mercurial/util.pyo @@ -917,4 +951,4 @@ ${PYSITELIB}/mercurial/zstd.so man/man1/hg.1 man/man5/hgignore.5 man/man5/hgrc.5 -share/doc/mercurial/README +share/doc/mercurial/README.rst diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo index 609138a2be8..a3fbc13389b 100644 --- a/devel/py-mercurial/distinfo +++ b/devel/py-mercurial/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.54 2017/10/05 22:32:50 wiz Exp $ +$NetBSD: distinfo,v 1.55 2017/11/07 13:16:07 wiz Exp $ -SHA1 (mercurial-4.3.3.tar.gz) = 921c3c6302c4b1d4be6a56fcfa0a41553dd4bd44 -RMD160 (mercurial-4.3.3.tar.gz) = 51122b744a76156bdd7107d929f159beaa5d3cba -SHA512 (mercurial-4.3.3.tar.gz) = 2d5249b6b2ec6b21c548702af2cf6b8e0858197a370514465aa7a880391f2e9efd6aecefb67fc547dfb8759c1c678009dc5a33fc48743bee30fcbdd853ee1cc6 -Size (mercurial-4.3.3.tar.gz) = 5491634 bytes -SHA1 (patch-tests_test-hghave.t) = 91ad66e769f69f1a8a2aa48d52978e31aa3c929e +SHA1 (mercurial-4.4.tar.gz) = f4241cad58d8f00bed56b5539c9186c084dfbdc4 +RMD160 (mercurial-4.4.tar.gz) = 3f8fc6ef15adfdcaae36bd99fb1b9663b0ed0119 +SHA512 (mercurial-4.4.tar.gz) = c8fc00a0ab38040bbbcf41de8eba90feec2df5ae021b9539e543f4f5437550e390e7451f7663b9994dc0d42893786600fd3c20b91156e834e2a97f7b79e2157e +Size (mercurial-4.4.tar.gz) = 5633529 bytes |