Mon Nov 2 10:28:29 2015 UTC ()
Update py-mercurial to 3.6:

Mercurial 3.6 (2015-11-1)

Regularly scheduled feature release.

1.1. commands

    bookmark: do not crash when active bookmark is forward and --date is used
    bookmarks: don't deactivate on no-op update (issue4901)
    clone: fix updaterev to update to latest branch changeset (issue4528)
    clonebundles: support for seeding clones from pre-generated bundles
    commit: abort when a committemplate is not changed (BC)
    help: distinguish sections when multiple match (issue4802)
    help: pass around ui to doc loader (API)
    help: pass around ui to rewriter hooks (API)
    merge: perform all premerges before any merges (BC)
    merge: abort on file/directory case folding collisions (issue4892)
    phases: return zero for no-op operations (issue4751) (BC)
    resolve: perform all premerges before performing any file merges (BC)

1.2. core

    cmdutil: make in-memory changes visible to external editor (issue4378)
    cmdutil: stop tryimportone from using dirstateguard (BC)
    context: don't hex encode all unknown 20 char revision specs (issue4890)
    dirstate: batch calls to statfiles (issue4878)
    parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
    revlog: add an aggressivemergedelta option
    revlog: change generaldelta delta parent heuristic
    revset: do not fall through to revspec for literal: branch (issue4838)
    revsets: makes follow() supports file patterns (issue4757) (BC)
    templater: add new docheader/footer components for XML (issue4135)
    templater: create string unescape helper (issue4798)
    templater: do not pre-evaluate generator keyword at runsymbol (issue4868)
    templater: introduce {latesttag()} function to match a pattern (issue4184)
    templater: switch ctx of list expression to rev of revset() (BC)
    ui: change default path fallback mechanism (issue4796)
    util: use tuple accessor to get accurate st_mtime value (issue4836)
    wireproto: properly parse false boolean args (BC)

1.3. extensions

    histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
    largefiles: better handling of merge of largefiles that are not available
    mq: generate patch names from first line of description
    rebase: avoid losing branch commits with --keepbranch (issue4835)
    rebase: fix warning about ignoring tool option on rebase continue (issue4698)
    rebase: fix wrong 'no changes to commit' when using --collapse
    rebase: on abort delete rebase state file no matter what
    rebase: properly abort when destination is public (issue4896)
    rebase: properly handle chains of markers with missing nodes
    shelve: bundle using bundle2 if repository is general delta (issue4862)
    shelve: delete shelve statefile on any exception during abort
    shelve: restore shelved dirstate explicitly after aborting transaction
    shelve: restore unshelved dirstate explicitly after aborting transaction

1.4. hgweb

    hgweb: consume generator inside context manager (issue4756)
    hgweb: ensure both foreground and background colors are specified (issue4872)
    hgweb: overwrite cwd to resolve file patterns relative to repo (issue4568)

1.5. unsorted

    builddeb: actually run make when building the deb (issue4778)
    buildrpm: mkdir -p two needed directories (issue4779)
    bundle2: don't try to recover from a GeneratorExit (issue4785)
    bundle: extend the format of --type to support version and compression
    debian: install bash completion as hg and not mercurial (issue4900)
    debian: install hgk as part of mercurial-common (issue4829)
    dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
    dispatch: stop warning about EPIPE in --debug mode
    graphmod: compute slow revset query once prior to reachableroots (issue4782)
    highlight: add highlightfiles config option which takes a fileset (issue3005)
    highlight: add option to prevent content-only based fallback
    highlight: exit early on textual and unknown files (issue3005)
    incoming: request a bundle2 when possible (BC)
    localrepo: recreate phasecache if changelog was modified (issue4855)
    lock: loop a finite number of times in trylock (issue4787)
    mercurial: add debugextensions command (issue4676)
    minirst: don't treat top level item as children of last item (issue4803)
    notify: fix fromauthor setting for 'incoming' hook type (issue4194)
    posix: shellquote do not require quoting for "+" (issue4818)
    reachableroots: verify integer range of heads argument (issue4775)
    revpair: restrict odd-range handling to top-level x:y expression (issue4774)
    revrange: drop old-style parser in favor of revset (API)
    test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
    traceback: allow providing a local support contact point
    treemanifest: rework lazy-copying code (issue4840)
    windows: read all global config files, not just the first (issue4491) (BC)
    worker: restore old countcpus code (issue4869)


(wiz)
diff -r1.23 -r1.24 pkgsrc/devel/py-mercurial/Makefile.version
diff -r1.7 -r1.8 pkgsrc/devel/py-mercurial/PLIST
diff -r1.24 -r1.25 pkgsrc/devel/py-mercurial/distinfo

cvs diff -r1.23 -r1.24 pkgsrc/devel/py-mercurial/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Attic/Makefile.version 2015/10/15 10:34:52 1.23
+++ pkgsrc/devel/py-mercurial/Attic/Makefile.version 2015/11/02 10:28:29 1.24
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.version,v 1.23 2015/10/15 10:34:52 wiz Exp $ 1# $NetBSD: Makefile.version,v 1.24 2015/11/02 10:28:29 wiz Exp $
2 2
3VERSION= 3.5.2 3VERSION= 3.6
4 4
5PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.4.1 5PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.4.1
6# see also http://mercurial.selenic.com/wiki/SupportedPythonVersions 6# see also http://mercurial.selenic.com/wiki/SupportedPythonVersions
7# 3.x support is not planned for the near future 7# 3.x support is not planned for the near future
8# 8#
9# the following setup argument was requested when compiling 9# the following setup argument was requested when compiling
10# for python-3.x 10# for python-3.x
11#.include "../../lang/python/pyversion.mk" 11#.include "../../lang/python/pyversion.mk"
12# 12#
13#.if "${PYPKGPREFIX}" != "py27" 13#.if "${PYPKGPREFIX}" != "py27"
14#PYSETUPARGS+= --c2to3 14#PYSETUPARGS+= --c2to3
15#.endif 15#.endif

cvs diff -r1.7 -r1.8 pkgsrc/devel/py-mercurial/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/PLIST 2015/08/01 10:12:13 1.7
+++ pkgsrc/devel/py-mercurial/PLIST 2015/11/02 10:28:29 1.8
@@ -1,36 +1,39 @@ @@ -1,36 +1,39 @@
1@comment $NetBSD: PLIST,v 1.7 2015/08/01 10:12:13 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2015/11/02 10:28:29 wiz Exp $
2bin/hg 2bin/hg
3${PYSITELIB}/hgext/__init__.py 3${PYSITELIB}/hgext/__init__.py
4${PYSITELIB}/hgext/__init__.pyc 4${PYSITELIB}/hgext/__init__.pyc
5${PYSITELIB}/hgext/__init__.pyo 5${PYSITELIB}/hgext/__init__.pyo
6${PYSITELIB}/hgext/acl.py 6${PYSITELIB}/hgext/acl.py
7${PYSITELIB}/hgext/acl.pyc 7${PYSITELIB}/hgext/acl.pyc
8${PYSITELIB}/hgext/acl.pyo 8${PYSITELIB}/hgext/acl.pyo
9${PYSITELIB}/hgext/blackbox.py 9${PYSITELIB}/hgext/blackbox.py
10${PYSITELIB}/hgext/blackbox.pyc 10${PYSITELIB}/hgext/blackbox.pyc
11${PYSITELIB}/hgext/blackbox.pyo 11${PYSITELIB}/hgext/blackbox.pyo
12${PYSITELIB}/hgext/bugzilla.py 12${PYSITELIB}/hgext/bugzilla.py
13${PYSITELIB}/hgext/bugzilla.pyc 13${PYSITELIB}/hgext/bugzilla.pyc
14${PYSITELIB}/hgext/bugzilla.pyo 14${PYSITELIB}/hgext/bugzilla.pyo
15${PYSITELIB}/hgext/censor.py 15${PYSITELIB}/hgext/censor.py
16${PYSITELIB}/hgext/censor.pyc 16${PYSITELIB}/hgext/censor.pyc
17${PYSITELIB}/hgext/censor.pyo 17${PYSITELIB}/hgext/censor.pyo
18${PYSITELIB}/hgext/children.py 18${PYSITELIB}/hgext/children.py
19${PYSITELIB}/hgext/children.pyc 19${PYSITELIB}/hgext/children.pyc
20${PYSITELIB}/hgext/children.pyo 20${PYSITELIB}/hgext/children.pyo
21${PYSITELIB}/hgext/churn.py 21${PYSITELIB}/hgext/churn.py
22${PYSITELIB}/hgext/churn.pyc 22${PYSITELIB}/hgext/churn.pyc
23${PYSITELIB}/hgext/churn.pyo 23${PYSITELIB}/hgext/churn.pyo
 24${PYSITELIB}/hgext/clonebundles.py
 25${PYSITELIB}/hgext/clonebundles.pyc
 26${PYSITELIB}/hgext/clonebundles.pyo
24${PYSITELIB}/hgext/color.py 27${PYSITELIB}/hgext/color.py
25${PYSITELIB}/hgext/color.pyc 28${PYSITELIB}/hgext/color.pyc
26${PYSITELIB}/hgext/color.pyo 29${PYSITELIB}/hgext/color.pyo
27${PYSITELIB}/hgext/convert/__init__.py 30${PYSITELIB}/hgext/convert/__init__.py
28${PYSITELIB}/hgext/convert/__init__.pyc 31${PYSITELIB}/hgext/convert/__init__.pyc
29${PYSITELIB}/hgext/convert/__init__.pyo 32${PYSITELIB}/hgext/convert/__init__.pyo
30${PYSITELIB}/hgext/convert/bzr.py 33${PYSITELIB}/hgext/convert/bzr.py
31${PYSITELIB}/hgext/convert/bzr.pyc 34${PYSITELIB}/hgext/convert/bzr.pyc
32${PYSITELIB}/hgext/convert/bzr.pyo 35${PYSITELIB}/hgext/convert/bzr.pyo
33${PYSITELIB}/hgext/convert/common.py 36${PYSITELIB}/hgext/convert/common.py
34${PYSITELIB}/hgext/convert/common.pyc 37${PYSITELIB}/hgext/convert/common.pyc
35${PYSITELIB}/hgext/convert/common.pyo 38${PYSITELIB}/hgext/convert/common.pyo
36${PYSITELIB}/hgext/convert/convcmd.py 39${PYSITELIB}/hgext/convert/convcmd.py
@@ -249,26 +252,29 @@ ${PYSITELIB}/mercurial/copies.pyo @@ -249,26 +252,29 @@ ${PYSITELIB}/mercurial/copies.pyo
249${PYSITELIB}/mercurial/crecord.py 252${PYSITELIB}/mercurial/crecord.py
250${PYSITELIB}/mercurial/crecord.pyc 253${PYSITELIB}/mercurial/crecord.pyc
251${PYSITELIB}/mercurial/crecord.pyo 254${PYSITELIB}/mercurial/crecord.pyo
252${PYSITELIB}/mercurial/dagparser.py 255${PYSITELIB}/mercurial/dagparser.py
253${PYSITELIB}/mercurial/dagparser.pyc 256${PYSITELIB}/mercurial/dagparser.pyc
254${PYSITELIB}/mercurial/dagparser.pyo 257${PYSITELIB}/mercurial/dagparser.pyo
255${PYSITELIB}/mercurial/dagutil.py 258${PYSITELIB}/mercurial/dagutil.py
256${PYSITELIB}/mercurial/dagutil.pyc 259${PYSITELIB}/mercurial/dagutil.pyc
257${PYSITELIB}/mercurial/dagutil.pyo 260${PYSITELIB}/mercurial/dagutil.pyo
258${PYSITELIB}/mercurial/default.d/mergetools.rc 261${PYSITELIB}/mercurial/default.d/mergetools.rc
259${PYSITELIB}/mercurial/demandimport.py 262${PYSITELIB}/mercurial/demandimport.py
260${PYSITELIB}/mercurial/demandimport.pyc 263${PYSITELIB}/mercurial/demandimport.pyc
261${PYSITELIB}/mercurial/demandimport.pyo 264${PYSITELIB}/mercurial/demandimport.pyo
 265${PYSITELIB}/mercurial/destutil.py
 266${PYSITELIB}/mercurial/destutil.pyc
 267${PYSITELIB}/mercurial/destutil.pyo
262${PYSITELIB}/mercurial/diffhelpers.so 268${PYSITELIB}/mercurial/diffhelpers.so
263${PYSITELIB}/mercurial/dirstate.py 269${PYSITELIB}/mercurial/dirstate.py
264${PYSITELIB}/mercurial/dirstate.pyc 270${PYSITELIB}/mercurial/dirstate.pyc
265${PYSITELIB}/mercurial/dirstate.pyo 271${PYSITELIB}/mercurial/dirstate.pyo
266${PYSITELIB}/mercurial/discovery.py 272${PYSITELIB}/mercurial/discovery.py
267${PYSITELIB}/mercurial/discovery.pyc 273${PYSITELIB}/mercurial/discovery.pyc
268${PYSITELIB}/mercurial/discovery.pyo 274${PYSITELIB}/mercurial/discovery.pyo
269${PYSITELIB}/mercurial/dispatch.py 275${PYSITELIB}/mercurial/dispatch.py
270${PYSITELIB}/mercurial/dispatch.pyc 276${PYSITELIB}/mercurial/dispatch.pyc
271${PYSITELIB}/mercurial/dispatch.pyo 277${PYSITELIB}/mercurial/dispatch.pyo
272${PYSITELIB}/mercurial/dummycert.pem 278${PYSITELIB}/mercurial/dummycert.pem
273${PYSITELIB}/mercurial/encoding.py 279${PYSITELIB}/mercurial/encoding.py
274${PYSITELIB}/mercurial/encoding.pyc 280${PYSITELIB}/mercurial/encoding.pyc
@@ -505,26 +511,29 @@ ${PYSITELIB}/mercurial/sshpeer.pyc @@ -505,26 +511,29 @@ ${PYSITELIB}/mercurial/sshpeer.pyc
505${PYSITELIB}/mercurial/sshpeer.pyo 511${PYSITELIB}/mercurial/sshpeer.pyo
506${PYSITELIB}/mercurial/sshserver.py 512${PYSITELIB}/mercurial/sshserver.py
507${PYSITELIB}/mercurial/sshserver.pyc 513${PYSITELIB}/mercurial/sshserver.pyc
508${PYSITELIB}/mercurial/sshserver.pyo 514${PYSITELIB}/mercurial/sshserver.pyo
509${PYSITELIB}/mercurial/sslutil.py 515${PYSITELIB}/mercurial/sslutil.py
510${PYSITELIB}/mercurial/sslutil.pyc 516${PYSITELIB}/mercurial/sslutil.pyc
511${PYSITELIB}/mercurial/sslutil.pyo 517${PYSITELIB}/mercurial/sslutil.pyo
512${PYSITELIB}/mercurial/statichttprepo.py 518${PYSITELIB}/mercurial/statichttprepo.py
513${PYSITELIB}/mercurial/statichttprepo.pyc 519${PYSITELIB}/mercurial/statichttprepo.pyc
514${PYSITELIB}/mercurial/statichttprepo.pyo 520${PYSITELIB}/mercurial/statichttprepo.pyo
515${PYSITELIB}/mercurial/store.py 521${PYSITELIB}/mercurial/store.py
516${PYSITELIB}/mercurial/store.pyc 522${PYSITELIB}/mercurial/store.pyc
517${PYSITELIB}/mercurial/store.pyo 523${PYSITELIB}/mercurial/store.pyo
 524${PYSITELIB}/mercurial/streamclone.py
 525${PYSITELIB}/mercurial/streamclone.pyc
 526${PYSITELIB}/mercurial/streamclone.pyo
518${PYSITELIB}/mercurial/strutil.py 527${PYSITELIB}/mercurial/strutil.py
519${PYSITELIB}/mercurial/strutil.pyc 528${PYSITELIB}/mercurial/strutil.pyc
520${PYSITELIB}/mercurial/strutil.pyo 529${PYSITELIB}/mercurial/strutil.pyo
521${PYSITELIB}/mercurial/subrepo.py 530${PYSITELIB}/mercurial/subrepo.py
522${PYSITELIB}/mercurial/subrepo.pyc 531${PYSITELIB}/mercurial/subrepo.pyc
523${PYSITELIB}/mercurial/subrepo.pyo 532${PYSITELIB}/mercurial/subrepo.pyo
524${PYSITELIB}/mercurial/tagmerge.py 533${PYSITELIB}/mercurial/tagmerge.py
525${PYSITELIB}/mercurial/tagmerge.pyc 534${PYSITELIB}/mercurial/tagmerge.pyc
526${PYSITELIB}/mercurial/tagmerge.pyo 535${PYSITELIB}/mercurial/tagmerge.pyo
527${PYSITELIB}/mercurial/tags.py 536${PYSITELIB}/mercurial/tags.py
528${PYSITELIB}/mercurial/tags.pyc 537${PYSITELIB}/mercurial/tags.pyc
529${PYSITELIB}/mercurial/tags.pyo 538${PYSITELIB}/mercurial/tags.pyo
530${PYSITELIB}/mercurial/templatefilters.py 539${PYSITELIB}/mercurial/templatefilters.py
@@ -677,27 +686,27 @@ ${PYSITELIB}/mercurial/templates/spartan @@ -677,27 +686,27 @@ ${PYSITELIB}/mercurial/templates/spartan
677${PYSITELIB}/mercurial/templates/spartan/notfound.tmpl 686${PYSITELIB}/mercurial/templates/spartan/notfound.tmpl
678${PYSITELIB}/mercurial/templates/spartan/search.tmpl 687${PYSITELIB}/mercurial/templates/spartan/search.tmpl
679${PYSITELIB}/mercurial/templates/spartan/shortlog.tmpl 688${PYSITELIB}/mercurial/templates/spartan/shortlog.tmpl
680${PYSITELIB}/mercurial/templates/spartan/shortlogentry.tmpl 689${PYSITELIB}/mercurial/templates/spartan/shortlogentry.tmpl
681${PYSITELIB}/mercurial/templates/spartan/tags.tmpl 690${PYSITELIB}/mercurial/templates/spartan/tags.tmpl
682${PYSITELIB}/mercurial/templates/static/background.png 691${PYSITELIB}/mercurial/templates/static/background.png
683${PYSITELIB}/mercurial/templates/static/coal-file.png 692${PYSITELIB}/mercurial/templates/static/coal-file.png
684${PYSITELIB}/mercurial/templates/static/coal-folder.png 693${PYSITELIB}/mercurial/templates/static/coal-folder.png
685${PYSITELIB}/mercurial/templates/static/excanvas.js 694${PYSITELIB}/mercurial/templates/static/excanvas.js
686${PYSITELIB}/mercurial/templates/static/feed-icon-14x14.png 695${PYSITELIB}/mercurial/templates/static/feed-icon-14x14.png
687${PYSITELIB}/mercurial/templates/static/hgicon.png 696${PYSITELIB}/mercurial/templates/static/hgicon.png
688${PYSITELIB}/mercurial/templates/static/hglogo.png 697${PYSITELIB}/mercurial/templates/static/hglogo.png
689${PYSITELIB}/mercurial/templates/static/mercurial.js 698${PYSITELIB}/mercurial/templates/static/mercurial.js
690${PYSITELIB}/mercurial/templates/static/style-coal.css 699${PYSITELIB}/mercurial/templates/static/style-extra-coal.css
691${PYSITELIB}/mercurial/templates/static/style-gitweb.css 700${PYSITELIB}/mercurial/templates/static/style-gitweb.css
692${PYSITELIB}/mercurial/templates/static/style-monoblue.css 701${PYSITELIB}/mercurial/templates/static/style-monoblue.css
693${PYSITELIB}/mercurial/templates/static/style-paper.css 702${PYSITELIB}/mercurial/templates/static/style-paper.css
694${PYSITELIB}/mercurial/templates/static/style.css 703${PYSITELIB}/mercurial/templates/static/style.css
695${PYSITELIB}/mercurial/transaction.py 704${PYSITELIB}/mercurial/transaction.py
696${PYSITELIB}/mercurial/transaction.pyc 705${PYSITELIB}/mercurial/transaction.pyc
697${PYSITELIB}/mercurial/transaction.pyo 706${PYSITELIB}/mercurial/transaction.pyo
698${PYSITELIB}/mercurial/treediscovery.py 707${PYSITELIB}/mercurial/treediscovery.py
699${PYSITELIB}/mercurial/treediscovery.pyc 708${PYSITELIB}/mercurial/treediscovery.pyc
700${PYSITELIB}/mercurial/treediscovery.pyo 709${PYSITELIB}/mercurial/treediscovery.pyo
701${PYSITELIB}/mercurial/ui.py 710${PYSITELIB}/mercurial/ui.py
702${PYSITELIB}/mercurial/ui.pyc 711${PYSITELIB}/mercurial/ui.pyc
703${PYSITELIB}/mercurial/ui.pyo 712${PYSITELIB}/mercurial/ui.pyo

cvs diff -r1.24 -r1.25 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2015/10/15 10:34:52 1.24
+++ pkgsrc/devel/py-mercurial/distinfo 2015/11/02 10:28:29 1.25
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.24 2015/10/15 10:34:52 wiz Exp $ 1$NetBSD: distinfo,v 1.25 2015/11/02 10:28:29 wiz Exp $
2 2
3SHA1 (mercurial-3.5.2.tar.gz) = 61055b54f2a4efcdc2f24b94432b1de7f869f1be 3SHA1 (mercurial-3.6.tar.gz) = eaa8b4ddfe0b1c972b95bdf914d07e6ad49bd00c
4RMD160 (mercurial-3.5.2.tar.gz) = 465fe1d458507d0795d7a5bab67b8832383f28d6 4RMD160 (mercurial-3.6.tar.gz) = 69da0b6c2b23306a187a5cffd52e920d3b3a21d0
5SHA512 (mercurial-3.5.2.tar.gz) = d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd 5SHA512 (mercurial-3.6.tar.gz) = 5e3fa99f6cb5a4f5867233946714222c53f05d95b791fd0855afc9d5f3dfade8aeae08b3581ea700ae64516f304a120843b4187d1e309c5cf0c15af798889664
6Size (mercurial-3.5.2.tar.gz) = 4415307 bytes 6Size (mercurial-3.6.tar.gz) = 4516703 bytes