From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 22 21:10:04 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A578F1065670 for ; Tue, 22 Sep 2009 21:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 82E018FC20 for ; Tue, 22 Sep 2009 21:10:04 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8MLA1GH034685 for ; Tue, 22 Sep 2009 21:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8MLA12T034684; Tue, 22 Sep 2009 21:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 22 Sep 2009 21:10:01 GMT Resent-Message-Id: <200909222110.n8MLA12T034684@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marco Bröder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAC571065670 for ; Tue, 22 Sep 2009 21:04:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id DA4AC8FC16 for ; Tue, 22 Sep 2009 21:04:05 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8ML45qk080658 for ; Tue, 22 Sep 2009 21:04:05 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n8ML455E080656; Tue, 22 Sep 2009 21:04:05 GMT (envelope-from nobody) Message-Id: <200909222104.n8ML455E080656@www.freebsd.org> Date: Tue, 22 Sep 2009 21:04:05 GMT From: Marco Bröder To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139067: [patch] devel/hgsvn: Update port to 0.1.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2009 21:10:04 -0000 >Number: 139067 >Category: ports >Synopsis: [patch] devel/hgsvn: Update port to 0.1.7 >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 Sep 22 21:10:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Marco Bröder >Release: RELENG_8 amd64 >Organization: >Environment: >Description: Port Changelog: - Update port to version 0.1.7 - Trim 'COMMENT' section in 'Makefile' to fit into 80 column wight - Change 'USE_PYTHON' to 'yes' to automatically follow ports tree defaults - Add additional info about 'hgpushsvn' and update project URL in 'pkg-descr' Upstream Changelog: Improvements: * hgpushsvn fully integrated in this version. This command pushes local Mercurial commits back to the SVN repository. * Add a -n/--dry-run flag to hgpullsvn and hgpushsvn to list incoming and outgoing changes without committing them to the local or remote repository. * Add verbosity levels to all command line scripts. The default verbosity level limits the output of hgpullsvn and hgpushsvn to messages that have a certain relevance to the user. Additional messages will be shown with the -v/--verbose flag. The --debug flag enables the output of debugging messages including shell commands. Bug fixes: * Log files from SVN repositories with path-based authentication caused hgpullsvn and hgimportsvn to fail with an XML parsing error. Restricted paths are now silently ignored (issue5, reported by Andreas Sliwka). * Updated the Mercurial-based lock file mechanism introduced in the previous release to work with Mercurial >= 1.2.0. The exception class was moved in Mercurial 1.2.0 (issue4). * hgpullsvn and hgpushsvn can now be called from any sub-directory within the working copy. Both scripts now take care to change their working directory to the root of the working copy (issue3). * hgimportsvn exits with a error message when the target directory is already a Mercurial repository controlled by hgsvn. * Detect conflicts when running SVN update. To avoid conflicts when pulling new SVN revisions, hgpullsvn checks if the hg repository has uncommitted changes before actually pulling new revisions from SVN (issue6, reported and initial patch by Robert). >How-To-Repeat: >Fix: Patch attached with submission follows: diff -r 021187ca56cc -r 99026e9427b1 devel/hgsvn/Makefile --- a/devel/hgsvn/Makefile Tue Sep 22 20:52:12 2009 +0200 +++ b/devel/hgsvn/Makefile Tue Sep 22 22:47:47 2009 +0200 @@ -6,17 +6,16 @@ # PORTNAME= hgsvn -PORTVERSION= 0.1.6 -PORTREVISION= 1 +PORTVERSION= 0.1.7 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= delphij@FreeBSD.org -COMMENT= A set of scripts to work locally on Subversion checkouts using Mercurial +COMMENT= Scripts to work locally on Subversion checkouts using Mercurial DIST_SUBDIR= python -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS=easy_install PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//} RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion \ diff -r 021187ca56cc -r 99026e9427b1 devel/hgsvn/distinfo --- a/devel/hgsvn/distinfo Tue Sep 22 20:52:12 2009 +0200 +++ b/devel/hgsvn/distinfo Tue Sep 22 22:47:47 2009 +0200 @@ -1,3 +1,3 @@ -MD5 (python/hgsvn-0.1.6.tar.gz) = 717f21210fb84e7538d76a95a582a647 -SHA256 (python/hgsvn-0.1.6.tar.gz) = f9291faabc5e183e15766de84e197ff4ac95053cf1c1b0864038da9c3ec7098b -SIZE (python/hgsvn-0.1.6.tar.gz) = 45497 +MD5 (python/hgsvn-0.1.7.tar.gz) = aaa4ef4124ac388832cddc85c1866236 +SHA256 (python/hgsvn-0.1.7.tar.gz) = 45bde2bae7164ec511bdcb78d7ec48b8794fc0d6805017c657cd2c0a999db900 +SIZE (python/hgsvn-0.1.7.tar.gz) = 48576 diff -r 021187ca56cc -r 99026e9427b1 devel/hgsvn/pkg-descr --- a/devel/hgsvn/pkg-descr Tue Sep 22 20:52:12 2009 +0200 +++ b/devel/hgsvn/pkg-descr Tue Sep 22 22:47:47 2009 +0200 @@ -6,12 +6,13 @@ patches to project maintainers, etc. And of course you have fast local operations like "hg log", "hg annotate"... -Currently two scripts are provided: +Three scripts are provided: * hgimportsvn initializes an SVN checkout which is also a Mercurial repository. * hgpullsvn pulls the latest changes from the SVN repository, and updates the Mercurial repository accordingly. It can be run multiple times. + * hgpushsvn pushes your local Mercurial commits back to the SVN repository. -WWW: http://cheeseshop.python.org/pypi/hgsvn +WWW: http://pypi.python.org/pypi/hgsvn diff -r 021187ca56cc -r 99026e9427b1 devel/hgsvn/pkg-plist --- a/devel/hgsvn/pkg-plist Tue Sep 22 20:52:12 2009 +0200 +++ b/devel/hgsvn/pkg-plist Tue Sep 22 22:47:47 2009 +0200 @@ -1,3 +1,4 @@ bin/hgimportsvn bin/hgpullsvn +bin/hgpushsvn %%PYTHON_SITELIBDIR%%/hgsvn-%%VERSION%%-py%%PYVER%%.egg >Release-Note: >Audit-Trail: >Unformatted: