Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Nov 2009 00:42:53 GMT
From:      Marco Bröder <marco.broeder@gmx.eu>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/140617: [patch] devel/mercurial: Update to 1.4
Message-ID:  <200911170042.nAH0grAV054288@www.freebsd.org>
Resent-Message-ID: <200911170050.nAH0o1ac021679@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         140617
>Category:       ports
>Synopsis:       [patch] devel/mercurial: Update to 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 17 00:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
FreeBSD nx01.nexus.local 8.0-STABLE FreeBSD 8.0-STABLE #0 r199286M: Sun Nov 15 13:16:47 CET 2009     root@nx01.nexus.local:/usr/obj/usr/src/sys/BEASTIE  amd64
>Description:
Changelog:

- update port to version 1.4
- replace spaces with tabs in Makefile
- update and sort pkg-plist

Release Notes:

1.4 - 2009-11-16

core

- summary: new command summarizes current working state
- tags: new tag cache greatly speeds up tag operations
- diff: new --stat option to show diffstat
- diff: add --reverse option to diff
- subrepo: fix a bunch of issues with the experimental subrepo extension
- status: fixes for behavior when working with clock skew
- clone: new -u/--updaterev option
- templater: new latesttag and latesttagdistance keywords
- push/pull: handle some broken pipe errors during large transfers
- config: environment variables and ~user constructs are expanded in pathnames

hgweb

- fix for showing header lines in raw changeset diffs
- try to send better error messages to the client
- use config-supplied ordering by default in hgwebdir index pages
- add web.descend option to disable showing all nested repositories in hgwebdir

documentation and help

- new config help topic
- help texts are now written in reStructuredText format
- many translation updates including a new Swedish translation
- many help text updates and improvements

extensions

- mq: add -1 options to qapplied/qunapplied
- patchbomb: add a --flag option to set a flag value in the Subject header
- patchbomb: correctly handle Unicode domains (using the IDNA encoding scheme)
- color: improve colorization of the qseries command
- inotify: many improvements, this should now be quite stable
- zeroconf: show repository descriptions
- rebase: some performance and correctness fixes
- extdiff: add 3-way diff for merge changesets
- convert: handle directory renaming in Darcs, fixed file renaming
- relink: new extension which helps people re-hardlink their clones

other

- contrib/shrink-revlog.py script that can significantly shrink some internal hg files
- work around non-standard locale settings on OS X

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index b17aff5..cf7fe34 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -16,14 +16,13 @@ COMMENT=	A fast, lightweight source control management system
 USE_GETTEXT=	yes
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=    ${PORTNAME}
-PYDISTUTILS_PKGVERSION= ${PORTVERSION}
-PYDISTUTILS_EGGINFO=    ${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
+PYDISTUTILS_PKGNAME=	${PORTNAME}
+PYDISTUTILS_PKGVERSION=	${PORTVERSION}
+PYDISTUTILS_EGGINFO=	${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
 
 CONTRIB_FILES=	bash_completion \
 		convert-repo \
 		dumprevlog \
-		hg-relink \
 		hg-ssh \
 		hgdiff \
 		hgk \
@@ -31,6 +30,7 @@ CONTRIB_FILES=	bash_completion \
 		mercurial.el \
 		mq.el \
 		sample.hgrc \
+		shrink-revlog.py \
 		simplemerge \
 		tcsh_completion \
 		undumprevlog \
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 22ec17b..495e7b1 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-SIZE (mercurial-1.3.1.tar.gz) = 1770585
-MD5 (mercurial-1.3.1.tar.gz) = 6504f0dc32bd7ecf59a9f7f719432e76
-SHA256 (mercurial-1.3.1.tar.gz) = ff928b557f41374974171df1b0384e33161aff97c5fe1c856a7b91bf3b154a62
+MD5 (mercurial-1.4.tar.gz) = 951ebd4a8153eaa3c56fc0ce2575ab70
+SHA256 (mercurial-1.4.tar.gz) = 0726661abe30421019b1c2d3486e75fcedd059033b659c76c531038b6113c7c1
+SIZE (mercurial-1.4.tar.gz) = 1914030
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 97a106c..581977a 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -119,6 +119,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/record.py
 %%PYTHON_SITELIBDIR%%/hgext/record.pyc
 %%PYTHON_SITELIBDIR%%/hgext/record.pyo
+%%PYTHON_SITELIBDIR%%/hgext/relink.py
+%%PYTHON_SITELIBDIR%%/hgext/relink.pyc
+%%PYTHON_SITELIBDIR%%/hgext/relink.pyo
 %%PYTHON_SITELIBDIR%%/hgext/share.py
 %%PYTHON_SITELIBDIR%%/hgext/share.pyc
 %%PYTHON_SITELIBDIR%%/hgext/share.pyo
@@ -131,12 +134,12 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/win32text.py
 %%PYTHON_SITELIBDIR%%/hgext/win32text.pyc
 %%PYTHON_SITELIBDIR%%/hgext/win32text.pyo
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.py
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyc
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyo
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.py
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.pyc
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.pyo
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.py
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo
@@ -215,6 +218,16 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help.py
 %%PYTHON_SITELIBDIR%%/mercurial/help.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/help.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/help/config.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/dates.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/diffs.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/environment.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/extensions.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/templates.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/urls.txt
 %%PYTHON_SITELIBDIR%%/mercurial/hg.py
 %%PYTHON_SITELIBDIR%%/mercurial/hg.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/hg.pyo
@@ -265,6 +278,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/it.po
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/ja.po
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/pt_BR.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/sv.po
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/zh_CN.po
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/zh_TW.po
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.py
@@ -280,6 +294,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.py
@@ -309,6 +324,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/merge.py
 %%PYTHON_SITELIBDIR%%/mercurial/merge.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/merge.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/minirst.py
+%%PYTHON_SITELIBDIR%%/mercurial/minirst.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/minirst.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
 %%PYTHON_SITELIBDIR%%/mercurial/node.py
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyc
@@ -354,6 +372,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/subrepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/tags.py
+%%PYTHON_SITELIBDIR%%/mercurial/tags.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/tags.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.py
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.pyo
@@ -507,6 +528,7 @@ bin/hg
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/common.txt
 %%PORTDOCS%%%%DOCSDIR%%/hg.1.gendoc.txt
 %%PORTDOCS%%%%DOCSDIR%%/hg.1.html
 %%PORTDOCS%%%%DOCSDIR%%/hg.1.txt
@@ -522,7 +544,6 @@ bin/hg
 %%PORTDATA%%%%DATADIR%%/contrib/git-viz/git-rev-list
 %%PORTDATA%%%%DATADIR%%/contrib/git-viz/git-rev-tree
 %%PORTDATA%%%%DATADIR%%/contrib/git-viz/hg-viz
-%%PORTDATA%%%%DATADIR%%/contrib/hg-relink
 %%PORTDATA%%%%DATADIR%%/contrib/hg-ssh
 %%PORTDATA%%%%DATADIR%%/contrib/hgdiff
 %%PORTDATA%%%%DATADIR%%/contrib/hgk
@@ -532,6 +553,7 @@ bin/hg
 %%PORTDATA%%%%DATADIR%%/contrib/mercurial.el
 %%PORTDATA%%%%DATADIR%%/contrib/mq.el
 %%PORTDATA%%%%DATADIR%%/contrib/sample.hgrc
+%%PORTDATA%%%%DATADIR%%/contrib/shrink-revlog.py
 %%PORTDATA%%%%DATADIR%%/contrib/simplemerge
 %%PORTDATA%%%%DATADIR%%/contrib/tcsh_completion
 %%PORTDATA%%%%DATADIR%%/contrib/undumprevlog
@@ -562,27 +584,30 @@ bin/hg
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/coal
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/atom
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/i18n
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/help
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/zeroconf
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/highlight


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911170042.nAH0grAV054288>