Sat Aug 3 08:30:05 2013 UTC ()
Update to 2.7:

Mercurial 2.7 (2013-08-01)

Regularly scheduled feature release. This release contains an
important fix for a merge ancestor calculation regression in the
2.6 series.

    ancestor: decrement ninteresting correctly (issue3984)
    bookmarks: allow bookmark command to take multiple arguments
    bookmarks: pull --update updates to active bookmark if it moved (issue4007)
    bookmarks: update only proper bookmarks on push -r/-B (issue 3973)
    changegroup: fix fastpath during commit
    checklink: work around sshfs brain-damage (issue3636)
    churn: split email aliases from the right
    commands: add checks for unfinished operations (issue3955)
    commit: enable --secret option
    convert: catch empty origpaths in svn gettags (issue3941)
    convert: fix bad conversion of copies when hg.startrev is specified
    convert: handle changeset sorting errors without traceback (issue3961)
    hgweb: fix incorrect way to count revisions in log (issue3977)
    hgweb: run search instead of showing wrong error for ambigious identifier
    histedit: don't clobber working copy on --abort if not on histedit cset
    histedit: refuse to edit history that contains merges (issue3962)
    import: cut commit messages at --- unconditionally (issue2148)
    largefiles: overridematch() should replace the file path instead of extending (issue3934)
    log: add a log style that is default+phase (issue3436)
    paper: add line wrapping switch to file source view
    paper: code selection without line numbers in file source view
    paper: highlight line which is linked to in source view
    progress: respect HGPLAIN
    rebase: allow aborting when descendants detected
    rebase: continue abort without strip for immutable csets (issue3997)
    rebase: don't clobber wd on --abort when we've updated away (issue4009)
    revert: make backup when unforgetting a file (issue3423)
    revlog: handle hidden revs in _partialmatch (issue3979)
    rollback: mark as deprecated
    splicemap: improve error handling when parsing (issue2084)
    splicemap: support paths with spaces in splicemap (issue3844)
    sslutil: force SSLv3 on Python 2.6 and later (issue3905)
    summary: augment output with info from extensions
    templater: add strip function with chars as an extra argument
    log: show style list when unknown style specified
    tip: deprecate the tip command
    update: add tracking of interrupted updates (issue3113)
    worker: check problem state correctly (issue3982)
    worker: properly report errors from worker processes (issue3982)


(wiz)
diff -r1.91 -r1.92 pkgsrc/devel/mercurial/Makefile
diff -r1.34 -r1.35 pkgsrc/devel/mercurial/PLIST
diff -r1.76 -r1.77 pkgsrc/devel/mercurial/distinfo
cvs diff -r1.91 -r1.92 pkgsrc/devel/mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/mercurial/Makefile 2013/07/02 06:36:27 1.91
+++ pkgsrc/devel/mercurial/Makefile 2013/08/03 08:30:05 1.92
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.91 2013/07/02 06:36:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.92 2013/08/03 08:30:05 wiz Exp $
2 2
3DISTNAME= mercurial-2.6.3 3DISTNAME= mercurial-2.7
4CATEGORIES= devel scm 4CATEGORIES= devel scm
5MASTER_SITES= http://mercurial.selenic.com/release/ 5MASTER_SITES= http://mercurial.selenic.com/release/
6 6
7MAINTAINER= wiz@NetBSD.org 7MAINTAINER= wiz@NetBSD.org
8HOMEPAGE= http://mercurial.selenic.com/ 8HOMEPAGE= http://mercurial.selenic.com/
9COMMENT= Fast, lightweight source control management system 9COMMENT= Fast, lightweight source control management system
10LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 10LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
11 11
12BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 12BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
13BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 13BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
14 14
15USE_TOOLS+= gmake msgfmt 15USE_TOOLS+= gmake msgfmt
16 16
cvs diff -r1.34 -r1.35 pkgsrc/devel/mercurial/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/mercurial/Attic/PLIST 2013/05/03 21:26:14 1.34
+++ pkgsrc/devel/mercurial/Attic/PLIST 2013/08/03 08:30:05 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.34 2013/05/03 21:26:14 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.35 2013/08/03 08:30:05 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
@@ -282,34 +282,38 @@ ${PYSITELIB}/mercurial/fileset.pyc @@ -282,34 +282,38 @@ ${PYSITELIB}/mercurial/fileset.pyc
282${PYSITELIB}/mercurial/fileset.pyo 282${PYSITELIB}/mercurial/fileset.pyo
283${PYSITELIB}/mercurial/formatter.py 283${PYSITELIB}/mercurial/formatter.py
284${PYSITELIB}/mercurial/formatter.pyc 284${PYSITELIB}/mercurial/formatter.pyc
285${PYSITELIB}/mercurial/formatter.pyo 285${PYSITELIB}/mercurial/formatter.pyo
286${PYSITELIB}/mercurial/graphmod.py 286${PYSITELIB}/mercurial/graphmod.py
287${PYSITELIB}/mercurial/graphmod.pyc 287${PYSITELIB}/mercurial/graphmod.pyc
288${PYSITELIB}/mercurial/graphmod.pyo 288${PYSITELIB}/mercurial/graphmod.pyo
289${PYSITELIB}/mercurial/hbisect.py 289${PYSITELIB}/mercurial/hbisect.py
290${PYSITELIB}/mercurial/hbisect.pyc 290${PYSITELIB}/mercurial/hbisect.pyc
291${PYSITELIB}/mercurial/hbisect.pyo 291${PYSITELIB}/mercurial/hbisect.pyo
292${PYSITELIB}/mercurial/help.py 292${PYSITELIB}/mercurial/help.py
293${PYSITELIB}/mercurial/help.pyc 293${PYSITELIB}/mercurial/help.pyc
294${PYSITELIB}/mercurial/help.pyo 294${PYSITELIB}/mercurial/help.pyo
 295${PYSITELIB}/mercurial/help/common.txt
295${PYSITELIB}/mercurial/help/config.txt 296${PYSITELIB}/mercurial/help/config.txt
296${PYSITELIB}/mercurial/help/dates.txt 297${PYSITELIB}/mercurial/help/dates.txt
297${PYSITELIB}/mercurial/help/diffs.txt 298${PYSITELIB}/mercurial/help/diffs.txt
298${PYSITELIB}/mercurial/help/environment.txt 299${PYSITELIB}/mercurial/help/environment.txt
299${PYSITELIB}/mercurial/help/extensions.txt 300${PYSITELIB}/mercurial/help/extensions.txt
300${PYSITELIB}/mercurial/help/filesets.txt 301${PYSITELIB}/mercurial/help/filesets.txt
301${PYSITELIB}/mercurial/help/glossary.txt 302${PYSITELIB}/mercurial/help/glossary.txt
 303${PYSITELIB}/mercurial/help/hg.1.txt
 304${PYSITELIB}/mercurial/help/hgignore.5.txt
302${PYSITELIB}/mercurial/help/hgignore.txt 305${PYSITELIB}/mercurial/help/hgignore.txt
 306${PYSITELIB}/mercurial/help/hgrc.5.txt
303${PYSITELIB}/mercurial/help/hgweb.txt 307${PYSITELIB}/mercurial/help/hgweb.txt
304${PYSITELIB}/mercurial/help/merge-tools.txt 308${PYSITELIB}/mercurial/help/merge-tools.txt
305${PYSITELIB}/mercurial/help/multirevs.txt 309${PYSITELIB}/mercurial/help/multirevs.txt
306${PYSITELIB}/mercurial/help/patterns.txt 310${PYSITELIB}/mercurial/help/patterns.txt
307${PYSITELIB}/mercurial/help/phases.txt 311${PYSITELIB}/mercurial/help/phases.txt
308${PYSITELIB}/mercurial/help/revisions.txt 312${PYSITELIB}/mercurial/help/revisions.txt
309${PYSITELIB}/mercurial/help/revsets.txt 313${PYSITELIB}/mercurial/help/revsets.txt
310${PYSITELIB}/mercurial/help/subrepos.txt 314${PYSITELIB}/mercurial/help/subrepos.txt
311${PYSITELIB}/mercurial/help/templates.txt 315${PYSITELIB}/mercurial/help/templates.txt
312${PYSITELIB}/mercurial/help/urls.txt 316${PYSITELIB}/mercurial/help/urls.txt
313${PYSITELIB}/mercurial/hg.py 317${PYSITELIB}/mercurial/hg.py
314${PYSITELIB}/mercurial/hg.pyc 318${PYSITELIB}/mercurial/hg.pyc
315${PYSITELIB}/mercurial/hg.pyo 319${PYSITELIB}/mercurial/hg.pyo
@@ -540,26 +544,27 @@ ${PYSITELIB}/mercurial/templates/gitweb/ @@ -540,26 +544,27 @@ ${PYSITELIB}/mercurial/templates/gitweb/
540${PYSITELIB}/mercurial/templates/gitweb/helptopics.tmpl 544${PYSITELIB}/mercurial/templates/gitweb/helptopics.tmpl
541${PYSITELIB}/mercurial/templates/gitweb/index.tmpl 545${PYSITELIB}/mercurial/templates/gitweb/index.tmpl
542${PYSITELIB}/mercurial/templates/gitweb/manifest.tmpl 546${PYSITELIB}/mercurial/templates/gitweb/manifest.tmpl
543${PYSITELIB}/mercurial/templates/gitweb/map 547${PYSITELIB}/mercurial/templates/gitweb/map
544${PYSITELIB}/mercurial/templates/gitweb/notfound.tmpl 548${PYSITELIB}/mercurial/templates/gitweb/notfound.tmpl
545${PYSITELIB}/mercurial/templates/gitweb/search.tmpl 549${PYSITELIB}/mercurial/templates/gitweb/search.tmpl
546${PYSITELIB}/mercurial/templates/gitweb/shortlog.tmpl 550${PYSITELIB}/mercurial/templates/gitweb/shortlog.tmpl
547${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl 551${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl
548${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl 552${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
549${PYSITELIB}/mercurial/templates/map-cmdline.bisect 553${PYSITELIB}/mercurial/templates/map-cmdline.bisect
550${PYSITELIB}/mercurial/templates/map-cmdline.changelog 554${PYSITELIB}/mercurial/templates/map-cmdline.changelog
551${PYSITELIB}/mercurial/templates/map-cmdline.compact 555${PYSITELIB}/mercurial/templates/map-cmdline.compact
552${PYSITELIB}/mercurial/templates/map-cmdline.default 556${PYSITELIB}/mercurial/templates/map-cmdline.default
 557${PYSITELIB}/mercurial/templates/map-cmdline.phases
553${PYSITELIB}/mercurial/templates/map-cmdline.xml 558${PYSITELIB}/mercurial/templates/map-cmdline.xml
554${PYSITELIB}/mercurial/templates/monoblue/bookmarks.tmpl 559${PYSITELIB}/mercurial/templates/monoblue/bookmarks.tmpl
555${PYSITELIB}/mercurial/templates/monoblue/branches.tmpl 560${PYSITELIB}/mercurial/templates/monoblue/branches.tmpl
556${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl 561${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl
557${PYSITELIB}/mercurial/templates/monoblue/changelogentry.tmpl 562${PYSITELIB}/mercurial/templates/monoblue/changelogentry.tmpl
558${PYSITELIB}/mercurial/templates/monoblue/changeset.tmpl 563${PYSITELIB}/mercurial/templates/monoblue/changeset.tmpl
559${PYSITELIB}/mercurial/templates/monoblue/error.tmpl 564${PYSITELIB}/mercurial/templates/monoblue/error.tmpl
560${PYSITELIB}/mercurial/templates/monoblue/fileannotate.tmpl 565${PYSITELIB}/mercurial/templates/monoblue/fileannotate.tmpl
561${PYSITELIB}/mercurial/templates/monoblue/filecomparison.tmpl 566${PYSITELIB}/mercurial/templates/monoblue/filecomparison.tmpl
562${PYSITELIB}/mercurial/templates/monoblue/filediff.tmpl 567${PYSITELIB}/mercurial/templates/monoblue/filediff.tmpl
563${PYSITELIB}/mercurial/templates/monoblue/filelog.tmpl 568${PYSITELIB}/mercurial/templates/monoblue/filelog.tmpl
564${PYSITELIB}/mercurial/templates/monoblue/filerevision.tmpl 569${PYSITELIB}/mercurial/templates/monoblue/filerevision.tmpl
565${PYSITELIB}/mercurial/templates/monoblue/footer.tmpl 570${PYSITELIB}/mercurial/templates/monoblue/footer.tmpl
@@ -589,37 +594,40 @@ ${PYSITELIB}/mercurial/templates/paper/f @@ -589,37 +594,40 @@ ${PYSITELIB}/mercurial/templates/paper/f
589${PYSITELIB}/mercurial/templates/paper/footer.tmpl 594${PYSITELIB}/mercurial/templates/paper/footer.tmpl
590${PYSITELIB}/mercurial/templates/paper/graph.tmpl 595${PYSITELIB}/mercurial/templates/paper/graph.tmpl
591${PYSITELIB}/mercurial/templates/paper/header.tmpl 596${PYSITELIB}/mercurial/templates/paper/header.tmpl
592${PYSITELIB}/mercurial/templates/paper/help.tmpl 597${PYSITELIB}/mercurial/templates/paper/help.tmpl
593${PYSITELIB}/mercurial/templates/paper/helptopics.tmpl 598${PYSITELIB}/mercurial/templates/paper/helptopics.tmpl
594${PYSITELIB}/mercurial/templates/paper/index.tmpl 599${PYSITELIB}/mercurial/templates/paper/index.tmpl
595${PYSITELIB}/mercurial/templates/paper/manifest.tmpl 600${PYSITELIB}/mercurial/templates/paper/manifest.tmpl
596${PYSITELIB}/mercurial/templates/paper/map 601${PYSITELIB}/mercurial/templates/paper/map
597${PYSITELIB}/mercurial/templates/paper/notfound.tmpl 602${PYSITELIB}/mercurial/templates/paper/notfound.tmpl
598${PYSITELIB}/mercurial/templates/paper/search.tmpl 603${PYSITELIB}/mercurial/templates/paper/search.tmpl
599${PYSITELIB}/mercurial/templates/paper/shortlog.tmpl 604${PYSITELIB}/mercurial/templates/paper/shortlog.tmpl
600${PYSITELIB}/mercurial/templates/paper/shortlogentry.tmpl 605${PYSITELIB}/mercurial/templates/paper/shortlogentry.tmpl
601${PYSITELIB}/mercurial/templates/paper/tags.tmpl 606${PYSITELIB}/mercurial/templates/paper/tags.tmpl
 607${PYSITELIB}/mercurial/templates/raw/changelog.tmpl
602${PYSITELIB}/mercurial/templates/raw/changeset.tmpl 608${PYSITELIB}/mercurial/templates/raw/changeset.tmpl
603${PYSITELIB}/mercurial/templates/raw/error.tmpl 609${PYSITELIB}/mercurial/templates/raw/error.tmpl
604${PYSITELIB}/mercurial/templates/raw/fileannotate.tmpl 610${PYSITELIB}/mercurial/templates/raw/fileannotate.tmpl
605${PYSITELIB}/mercurial/templates/raw/filediff.tmpl 611${PYSITELIB}/mercurial/templates/raw/filediff.tmpl
606${PYSITELIB}/mercurial/templates/raw/graph.tmpl 612${PYSITELIB}/mercurial/templates/raw/graph.tmpl
607${PYSITELIB}/mercurial/templates/raw/graphedge.tmpl 613${PYSITELIB}/mercurial/templates/raw/graphedge.tmpl
608${PYSITELIB}/mercurial/templates/raw/graphnode.tmpl 614${PYSITELIB}/mercurial/templates/raw/graphnode.tmpl
609${PYSITELIB}/mercurial/templates/raw/index.tmpl 615${PYSITELIB}/mercurial/templates/raw/index.tmpl
 616${PYSITELIB}/mercurial/templates/raw/logentry.tmpl
610${PYSITELIB}/mercurial/templates/raw/manifest.tmpl 617${PYSITELIB}/mercurial/templates/raw/manifest.tmpl
611${PYSITELIB}/mercurial/templates/raw/map 618${PYSITELIB}/mercurial/templates/raw/map
612${PYSITELIB}/mercurial/templates/raw/notfound.tmpl 619${PYSITELIB}/mercurial/templates/raw/notfound.tmpl
 620${PYSITELIB}/mercurial/templates/raw/search.tmpl
613${PYSITELIB}/mercurial/templates/rss/bookmarkentry.tmpl 621${PYSITELIB}/mercurial/templates/rss/bookmarkentry.tmpl
614${PYSITELIB}/mercurial/templates/rss/bookmarks.tmpl 622${PYSITELIB}/mercurial/templates/rss/bookmarks.tmpl
615${PYSITELIB}/mercurial/templates/rss/branchentry.tmpl 623${PYSITELIB}/mercurial/templates/rss/branchentry.tmpl
616${PYSITELIB}/mercurial/templates/rss/branches.tmpl 624${PYSITELIB}/mercurial/templates/rss/branches.tmpl
617${PYSITELIB}/mercurial/templates/rss/changelog.tmpl 625${PYSITELIB}/mercurial/templates/rss/changelog.tmpl
618${PYSITELIB}/mercurial/templates/rss/changelogentry.tmpl 626${PYSITELIB}/mercurial/templates/rss/changelogentry.tmpl
619${PYSITELIB}/mercurial/templates/rss/error.tmpl 627${PYSITELIB}/mercurial/templates/rss/error.tmpl
620${PYSITELIB}/mercurial/templates/rss/filelog.tmpl 628${PYSITELIB}/mercurial/templates/rss/filelog.tmpl
621${PYSITELIB}/mercurial/templates/rss/filelogentry.tmpl 629${PYSITELIB}/mercurial/templates/rss/filelogentry.tmpl
622${PYSITELIB}/mercurial/templates/rss/header.tmpl 630${PYSITELIB}/mercurial/templates/rss/header.tmpl
623${PYSITELIB}/mercurial/templates/rss/map 631${PYSITELIB}/mercurial/templates/rss/map
624${PYSITELIB}/mercurial/templates/rss/tagentry.tmpl 632${PYSITELIB}/mercurial/templates/rss/tagentry.tmpl
625${PYSITELIB}/mercurial/templates/rss/tags.tmpl 633${PYSITELIB}/mercurial/templates/rss/tags.tmpl
cvs diff -r1.76 -r1.77 pkgsrc/devel/mercurial/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/mercurial/Attic/distinfo 2013/07/02 06:36:27 1.76
+++ pkgsrc/devel/mercurial/Attic/distinfo 2013/08/03 08:30:05 1.77
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.76 2013/07/02 06:36:27 wiz Exp $ 1$NetBSD: distinfo,v 1.77 2013/08/03 08:30:05 wiz Exp $
2 2
3SHA1 (mercurial-2.6.3.tar.gz) = d42f6021c1f45e9cf761f07b6d34c8a7e45a4c8d 3SHA1 (mercurial-2.7.tar.gz) = 185be3422fd8e14167a6b188c89cc1e24be894f9
4RMD160 (mercurial-2.6.3.tar.gz) = 4f1f849ad606c3104cf9938741d5feb21fa9501f 4RMD160 (mercurial-2.7.tar.gz) = 792d0a69cab6a6a132a1d1c41f4d903cb9c519e9
5Size (mercurial-2.6.3.tar.gz) = 3736480 bytes 5Size (mercurial-2.7.tar.gz) = 3755724 bytes